|
 |
3e5111 |
From 0ca6807c400aa86fb9316f4fa481c253f0de1311 Mon Sep 17 00:00:00 2001
|
|
|
3e5111 |
Message-Id: <0ca6807c400aa86fb9316f4fa481c253f0de1311@dist-git>
|
|
|
3e5111 |
From: Pavel Hrdina <phrdina@redhat.com>
|
|
|
3e5111 |
Date: Fri, 28 Apr 2017 11:59:49 +0200
|
|
|
3e5111 |
Subject: [PATCH] qemu: introduce QEMU_CAPS_DEVICE_QEMU_XHCI
|
|
|
3e5111 |
|
|
|
3e5111 |
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
3e5111 |
Acked-by: Andrea Bolognani <abologna@redhat.com>
|
|
|
3e5111 |
(cherry picked from commit 5237a74d4aeb073255a2a7165144a56b9e2e3b53)
|
|
|
3e5111 |
|
|
|
3e5111 |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1438682
|
|
|
3e5111 |
|
|
|
3e5111 |
Conflicts:
|
|
|
3e5111 |
- resolved capabilities flag conflicts due to missing capability
|
|
|
3e5111 |
in downstream code
|
|
|
3e5111 |
|
|
|
3e5111 |
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
3e5111 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
3e5111 |
---
|
|
|
3e5111 |
src/qemu/qemu_capabilities.c | 2 ++
|
|
|
3e5111 |
src/qemu/qemu_capabilities.h | 1 +
|
|
|
3e5111 |
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 +
|
|
|
3e5111 |
3 files changed, 4 insertions(+)
|
|
|
3e5111 |
|
|
|
3e5111 |
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
|
|
|
3e5111 |
index 49de506ed..b76b79342 100644
|
|
|
3e5111 |
--- a/src/qemu/qemu_capabilities.c
|
|
|
3e5111 |
+++ b/src/qemu/qemu_capabilities.c
|
|
|
3e5111 |
@@ -365,6 +365,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
|
|
|
3e5111 |
"block-write-threshold",
|
|
|
3e5111 |
"query-named-block-nodes",
|
|
|
3e5111 |
"cpu-cache",
|
|
|
3e5111 |
+ "qemu-xhci",
|
|
|
3e5111 |
);
|
|
|
3e5111 |
|
|
|
3e5111 |
|
|
|
3e5111 |
@@ -1611,6 +1612,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
|
|
|
3e5111 |
{ "vhost-scsi", QEMU_CAPS_DEVICE_VHOST_SCSI },
|
|
|
3e5111 |
{ "nvdimm", QEMU_CAPS_DEVICE_NVDIMM },
|
|
|
3e5111 |
{ "pcie-root-port", QEMU_CAPS_DEVICE_PCIE_ROOT_PORT },
|
|
|
3e5111 |
+ { "qemu-xhci", QEMU_CAPS_DEVICE_QEMU_XHCI },
|
|
|
3e5111 |
};
|
|
|
3e5111 |
|
|
|
3e5111 |
static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBalloon[] = {
|
|
|
3e5111 |
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
|
|
|
3e5111 |
index 644b8e27b..1cd3ec37d 100644
|
|
|
3e5111 |
--- a/src/qemu/qemu_capabilities.h
|
|
|
3e5111 |
+++ b/src/qemu/qemu_capabilities.h
|
|
|
3e5111 |
@@ -402,6 +402,7 @@ typedef enum {
|
|
|
3e5111 |
QEMU_CAPS_BLOCK_WRITE_THRESHOLD, /* BLOCK_WRITE_THRESHOLD event */
|
|
|
3e5111 |
QEMU_CAPS_QUERY_NAMED_BLOCK_NODES, /* qmp query-named-block-nodes */
|
|
|
3e5111 |
QEMU_CAPS_CPU_CACHE, /* -cpu supports host-cache-info and l3-cache properties */
|
|
|
3e5111 |
+ QEMU_CAPS_DEVICE_QEMU_XHCI, /* -device qemu-xhci */
|
|
|
3e5111 |
|
|
|
3e5111 |
QEMU_CAPS_LAST /* this must always be the last item */
|
|
|
3e5111 |
} virQEMUCapsFlags;
|
|
|
3e5111 |
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
|
|
|
3e5111 |
index 496c9ceb8..83ed0f1c6 100644
|
|
|
3e5111 |
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
|
|
|
3e5111 |
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
|
|
|
3e5111 |
@@ -208,6 +208,7 @@
|
|
|
3e5111 |
<flag name='block-write-threshold'/>
|
|
|
3e5111 |
<flag name='query-named-block-nodes'/>
|
|
|
3e5111 |
<flag name='cpu-cache'/>
|
|
|
3e5111 |
+ <flag name='qemu-xhci'/>
|
|
|
3e5111 |
<version>2008090</version>
|
|
|
3e5111 |
<kvmVersion>0</kvmVersion>
|
|
|
3e5111 |
<package> (v2.9.0-rc0-142-g940a8ce)</package>
|
|
|
3e5111 |
--
|
|
|
3e5111 |
2.12.2
|
|
|
3e5111 |
|