|
 |
6d3351 |
From 4dea9b6452bf7fdb45f475ee3c6de047e67d5273 Mon Sep 17 00:00:00 2001
|
|
|
6d3351 |
Message-Id: <4dea9b6452bf7fdb45f475ee3c6de047e67d5273@dist-git>
|
|
|
6d3351 |
From: Cole Robinson <crobinso@redhat.com>
|
|
|
6d3351 |
Date: Tue, 11 Jul 2017 10:57:47 +0200
|
|
|
6d3351 |
Subject: [PATCH] qemu: caps: blacklist QEMU_CAPS_CHARDEV
|
|
|
6d3351 |
|
|
|
6d3351 |
Every qemu version we support has QEMU_CAPS_CHARDEV, so stop
|
|
|
6d3351 |
explicitly tracking it and blacklist it like we've done for many
|
|
|
6d3351 |
other feature flags.
|
|
|
6d3351 |
|
|
|
6d3351 |
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
|
|
|
6d3351 |
Signed-off-by: Cole Robinson <crobinso@redhat.com>
|
|
|
6d3351 |
(cherry picked from commit b4d560435041216fab4e4b417aef708107c83c4b)
|
|
|
6d3351 |
|
|
|
6d3351 |
Conflicts:
|
|
|
6d3351 |
|
|
|
6d3351 |
* tests/qemucapabilitiesdata/caps_2.9.50.s390x.xml:
|
|
|
6d3351 |
|
|
|
6d3351 |
caused by the commit introducing the file,
|
|
|
6d3351 |
b24eaf6210ebaf5dc8d29621063873c8419c517e, not being in the
|
|
|
6d3351 |
tree; resolved by dropping the hunk that would have updated it.
|
|
|
6d3351 |
|
|
|
6d3351 |
Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1435681
|
|
|
6d3351 |
|
|
|
6d3351 |
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
|
|
6d3351 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
6d3351 |
---
|
|
|
6d3351 |
src/qemu/qemu_capabilities.c | 17 +-
|
|
|
6d3351 |
src/qemu/qemu_capabilities.h | 2 +-
|
|
|
6d3351 |
tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml | 1 -
|
|
|
6d3351 |
tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 1 -
|
|
|
6d3351 |
tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 1 -
|
|
|
6d3351 |
tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 -
|
|
|
6d3351 |
tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 -
|
|
|
6d3351 |
tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 -
|
|
|
6d3351 |
tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 -
|
|
|
6d3351 |
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 -
|
|
|
6d3351 |
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 -
|
|
|
6d3351 |
.../caps_2.6.0-gicv2.aarch64.xml | 1 -
|
|
|
6d3351 |
.../caps_2.6.0-gicv3.aarch64.xml | 1 -
|
|
|
6d3351 |
tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 1 -
|
|
|
6d3351 |
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 -
|
|
|
6d3351 |
tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 -
|
|
|
6d3351 |
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 -
|
|
|
6d3351 |
tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 -
|
|
|
6d3351 |
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 -
|
|
|
6d3351 |
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 -
|
|
|
6d3351 |
tests/qemuhelptest.c | 5 -
|
|
|
6d3351 |
tests/qemuxml2argvtest.c | 397 ++++++++++++---------
|
|
|
6d3351 |
tests/qemuxml2xmltest.c | 1 -
|
|
|
6d3351 |
23 files changed, 235 insertions(+), 205 deletions(-)
|
|
|
6d3351 |
|
|
|
6d3351 |
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
|
|
|
6d3351 |
index d5dd262ff2..0e611c343c 100644
|
|
|
6d3351 |
--- a/src/qemu/qemu_capabilities.c
|
|
|
6d3351 |
+++ b/src/qemu/qemu_capabilities.c
|
|
|
6d3351 |
@@ -1218,13 +1218,10 @@ virQEMUCapsComputeCmdFlags(const char *help,
|
|
|
6d3351 |
virQEMUCapsSet(qemuCaps, QEMU_CAPS_HOST_PCI_MULTIDOMAIN);
|
|
|
6d3351 |
if (strstr(help, "-mem-path"))
|
|
|
6d3351 |
virQEMUCapsSet(qemuCaps, QEMU_CAPS_MEM_PATH);
|
|
|
6d3351 |
- if (strstr(help, "-chardev")) {
|
|
|
6d3351 |
- virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV);
|
|
|
6d3351 |
- if (strstr(help, "-chardev spicevmc"))
|
|
|
6d3351 |
- virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV_SPICEVMC);
|
|
|
6d3351 |
- if (strstr(help, "-chardev spiceport"))
|
|
|
6d3351 |
- virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV_SPICEPORT);
|
|
|
6d3351 |
- }
|
|
|
6d3351 |
+ if (strstr(help, "-chardev spicevmc"))
|
|
|
6d3351 |
+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV_SPICEVMC);
|
|
|
6d3351 |
+ if (strstr(help, "-chardev spiceport"))
|
|
|
6d3351 |
+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV_SPICEPORT);
|
|
|
6d3351 |
if (strstr(help, "-nodefconfig"))
|
|
|
6d3351 |
virQEMUCapsSet(qemuCaps, QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
if (strstr(help, "-no-user-config"))
|
|
|
6d3351 |
@@ -4410,7 +4407,6 @@ virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
|
|
|
6d3351 |
{
|
|
|
6d3351 |
virQEMUCapsSet(qemuCaps, QEMU_CAPS_MEM_PATH);
|
|
|
6d3351 |
virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_SERIAL);
|
|
|
6d3351 |
- virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV);
|
|
|
6d3351 |
virQEMUCapsSet(qemuCaps, QEMU_CAPS_MONITOR_JSON);
|
|
|
6d3351 |
virQEMUCapsSet(qemuCaps, QEMU_CAPS_SDL);
|
|
|
6d3351 |
virQEMUCapsSet(qemuCaps, QEMU_CAPS_NETDEV);
|
|
|
6d3351 |
@@ -5507,12 +5503,9 @@ virQEMUCapsCacheFree(virQEMUCapsCachePtr cache)
|
|
|
6d3351 |
|
|
|
6d3351 |
bool
|
|
|
6d3351 |
virQEMUCapsSupportsChardev(const virDomainDef *def,
|
|
|
6d3351 |
- virQEMUCapsPtr qemuCaps,
|
|
|
6d3351 |
+ virQEMUCapsPtr qemuCaps ATTRIBUTE_UNUSED,
|
|
|
6d3351 |
virDomainChrDefPtr chr)
|
|
|
6d3351 |
{
|
|
|
6d3351 |
- if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV))
|
|
|
6d3351 |
- return false;
|
|
|
6d3351 |
-
|
|
|
6d3351 |
if ((def->os.arch == VIR_ARCH_PPC) || ARCH_IS_PPC64(def->os.arch)) {
|
|
|
6d3351 |
if (!qemuDomainIsPSeries(def))
|
|
|
6d3351 |
return false;
|
|
|
6d3351 |
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
|
|
|
6d3351 |
index bbc6f6812f..433aa7f90b 100644
|
|
|
6d3351 |
--- a/src/qemu/qemu_capabilities.h
|
|
|
6d3351 |
+++ b/src/qemu/qemu_capabilities.h
|
|
|
6d3351 |
@@ -77,7 +77,7 @@ typedef enum {
|
|
|
6d3351 |
/* 20 */
|
|
|
6d3351 |
X_QEMU_CAPS_XEN_DOMID, /* -xen-domid */
|
|
|
6d3351 |
X_QEMU_CAPS_MIGRATE_QEMU_UNIX, /* qemu migration via unix sockets */
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, /* Is the new -chardev arg available */
|
|
|
6d3351 |
+ X_QEMU_CAPS_CHARDEV, /* Is the new -chardev arg available */
|
|
|
6d3351 |
QEMU_CAPS_ENABLE_KVM, /* -enable-kvm flag */
|
|
|
6d3351 |
QEMU_CAPS_MONITOR_JSON, /* JSON mode for monitor */
|
|
|
6d3351 |
|
|
|
6d3351 |
diff --git a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml
|
|
|
6d3351 |
index 5ad406ce1b..956284d5d3 100644
|
|
|
6d3351 |
--- a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml
|
|
|
6d3351 |
+++ b/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml
|
|
|
6d3351 |
@@ -6,7 +6,6 @@
|
|
|
6d3351 |
<flag name='kvm'/>
|
|
|
6d3351 |
<flag name='mem-path'/>
|
|
|
6d3351 |
<flag name='drive-serial'/>
|
|
|
6d3351 |
- <flag name='chardev'/>
|
|
|
6d3351 |
<flag name='monitor-json'/>
|
|
|
6d3351 |
<flag name='sdl'/>
|
|
|
6d3351 |
<flag name='netdev'/>
|
|
|
6d3351 |
diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml
|
|
|
6d3351 |
index 4ec731d655..99384ce5e6 100644
|
|
|
6d3351 |
--- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml
|
|
|
6d3351 |
+++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml
|
|
|
6d3351 |
@@ -6,7 +6,6 @@
|
|
|
6d3351 |
<flag name='kvm'/>
|
|
|
6d3351 |
<flag name='mem-path'/>
|
|
|
6d3351 |
<flag name='drive-serial'/>
|
|
|
6d3351 |
- <flag name='chardev'/>
|
|
|
6d3351 |
<flag name='monitor-json'/>
|
|
|
6d3351 |
<flag name='sdl'/>
|
|
|
6d3351 |
<flag name='netdev'/>
|
|
|
6d3351 |
diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml
|
|
|
6d3351 |
index 601c62e65a..aea043c57d 100644
|
|
|
6d3351 |
--- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml
|
|
|
6d3351 |
+++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml
|
|
|
6d3351 |
@@ -6,7 +6,6 @@
|
|
|
6d3351 |
<flag name='kvm'/>
|
|
|
6d3351 |
<flag name='mem-path'/>
|
|
|
6d3351 |
<flag name='drive-serial'/>
|
|
|
6d3351 |
- <flag name='chardev'/>
|
|
|
6d3351 |
<flag name='monitor-json'/>
|
|
|
6d3351 |
<flag name='sdl'/>
|
|
|
6d3351 |
<flag name='netdev'/>
|
|
|
6d3351 |
diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
|
|
|
6d3351 |
index 14f34b2771..6f860e4f25 100644
|
|
|
6d3351 |
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
|
|
|
6d3351 |
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
|
|
|
6d3351 |
@@ -6,7 +6,6 @@
|
|
|
6d3351 |
<flag name='kvm'/>
|
|
|
6d3351 |
<flag name='mem-path'/>
|
|
|
6d3351 |
<flag name='drive-serial'/>
|
|
|
6d3351 |
- <flag name='chardev'/>
|
|
|
6d3351 |
<flag name='monitor-json'/>
|
|
|
6d3351 |
<flag name='sdl'/>
|
|
|
6d3351 |
<flag name='netdev'/>
|
|
|
6d3351 |
diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
|
|
|
6d3351 |
index 8fc23d6aad..e5dc8360de 100644
|
|
|
6d3351 |
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
|
|
|
6d3351 |
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
|
|
|
6d3351 |
@@ -6,7 +6,6 @@
|
|
|
6d3351 |
<flag name='kvm'/>
|
|
|
6d3351 |
<flag name='mem-path'/>
|
|
|
6d3351 |
<flag name='drive-serial'/>
|
|
|
6d3351 |
- <flag name='chardev'/>
|
|
|
6d3351 |
<flag name='monitor-json'/>
|
|
|
6d3351 |
<flag name='sdl'/>
|
|
|
6d3351 |
<flag name='netdev'/>
|
|
|
6d3351 |
diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
|
|
|
6d3351 |
index 47c8956b44..86d87eaf0c 100644
|
|
|
6d3351 |
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
|
|
|
6d3351 |
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
|
|
|
6d3351 |
@@ -6,7 +6,6 @@
|
|
|
6d3351 |
<flag name='kvm'/>
|
|
|
6d3351 |
<flag name='mem-path'/>
|
|
|
6d3351 |
<flag name='drive-serial'/>
|
|
|
6d3351 |
- <flag name='chardev'/>
|
|
|
6d3351 |
<flag name='monitor-json'/>
|
|
|
6d3351 |
<flag name='sdl'/>
|
|
|
6d3351 |
<flag name='netdev'/>
|
|
|
6d3351 |
diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
|
|
|
6d3351 |
index afe7d53ff4..2fa551b1a0 100644
|
|
|
6d3351 |
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
|
|
|
6d3351 |
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
|
|
|
6d3351 |
@@ -6,7 +6,6 @@
|
|
|
6d3351 |
<flag name='kvm'/>
|
|
|
6d3351 |
<flag name='mem-path'/>
|
|
|
6d3351 |
<flag name='drive-serial'/>
|
|
|
6d3351 |
- <flag name='chardev'/>
|
|
|
6d3351 |
<flag name='monitor-json'/>
|
|
|
6d3351 |
<flag name='sdl'/>
|
|
|
6d3351 |
<flag name='netdev'/>
|
|
|
6d3351 |
diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
|
|
|
6d3351 |
index 5bdc1a2bdd..b7ba2240aa 100644
|
|
|
6d3351 |
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
|
|
|
6d3351 |
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
|
|
|
6d3351 |
@@ -6,7 +6,6 @@
|
|
|
6d3351 |
<flag name='kvm'/>
|
|
|
6d3351 |
<flag name='mem-path'/>
|
|
|
6d3351 |
<flag name='drive-serial'/>
|
|
|
6d3351 |
- <flag name='chardev'/>
|
|
|
6d3351 |
<flag name='monitor-json'/>
|
|
|
6d3351 |
<flag name='sdl'/>
|
|
|
6d3351 |
<flag name='netdev'/>
|
|
|
6d3351 |
diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
|
|
|
6d3351 |
index 36bc1342bb..f3289df306 100644
|
|
|
6d3351 |
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
|
|
|
6d3351 |
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
|
|
|
6d3351 |
@@ -6,7 +6,6 @@
|
|
|
6d3351 |
<flag name='kvm'/>
|
|
|
6d3351 |
<flag name='mem-path'/>
|
|
|
6d3351 |
<flag name='drive-serial'/>
|
|
|
6d3351 |
- <flag name='chardev'/>
|
|
|
6d3351 |
<flag name='monitor-json'/>
|
|
|
6d3351 |
<flag name='sdl'/>
|
|
|
6d3351 |
<flag name='netdev'/>
|
|
|
6d3351 |
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
|
|
|
6d3351 |
index 33bc462084..af60bf6c6e 100644
|
|
|
6d3351 |
--- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
|
|
|
6d3351 |
+++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
|
|
|
6d3351 |
@@ -6,7 +6,6 @@
|
|
|
6d3351 |
<flag name='kvm'/>
|
|
|
6d3351 |
<flag name='mem-path'/>
|
|
|
6d3351 |
<flag name='drive-serial'/>
|
|
|
6d3351 |
- <flag name='chardev'/>
|
|
|
6d3351 |
<flag name='monitor-json'/>
|
|
|
6d3351 |
<flag name='sdl'/>
|
|
|
6d3351 |
<flag name='netdev'/>
|
|
|
6d3351 |
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
|
|
|
6d3351 |
index a8ce6b03b1..d4eb19102c 100644
|
|
|
6d3351 |
--- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
|
|
|
6d3351 |
+++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
|
|
|
6d3351 |
@@ -6,7 +6,6 @@
|
|
|
6d3351 |
<flag name='kvm'/>
|
|
|
6d3351 |
<flag name='mem-path'/>
|
|
|
6d3351 |
<flag name='drive-serial'/>
|
|
|
6d3351 |
- <flag name='chardev'/>
|
|
|
6d3351 |
<flag name='monitor-json'/>
|
|
|
6d3351 |
<flag name='sdl'/>
|
|
|
6d3351 |
<flag name='netdev'/>
|
|
|
6d3351 |
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
|
|
|
6d3351 |
index 425992f0d5..6d031f6f70 100644
|
|
|
6d3351 |
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
|
|
|
6d3351 |
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
|
|
|
6d3351 |
@@ -6,7 +6,6 @@
|
|
|
6d3351 |
<flag name='kvm'/>
|
|
|
6d3351 |
<flag name='mem-path'/>
|
|
|
6d3351 |
<flag name='drive-serial'/>
|
|
|
6d3351 |
- <flag name='chardev'/>
|
|
|
6d3351 |
<flag name='monitor-json'/>
|
|
|
6d3351 |
<flag name='sdl'/>
|
|
|
6d3351 |
<flag name='netdev'/>
|
|
|
6d3351 |
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
|
|
|
6d3351 |
index 97e71ec4f4..e4615c02ab 100644
|
|
|
6d3351 |
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
|
|
|
6d3351 |
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
|
|
|
6d3351 |
@@ -6,7 +6,6 @@
|
|
|
6d3351 |
<flag name='kvm'/>
|
|
|
6d3351 |
<flag name='mem-path'/>
|
|
|
6d3351 |
<flag name='drive-serial'/>
|
|
|
6d3351 |
- <flag name='chardev'/>
|
|
|
6d3351 |
<flag name='monitor-json'/>
|
|
|
6d3351 |
<flag name='sdl'/>
|
|
|
6d3351 |
<flag name='netdev'/>
|
|
|
6d3351 |
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
|
|
|
6d3351 |
index 70cce64179..ec79115cf1 100644
|
|
|
6d3351 |
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
|
|
|
6d3351 |
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
|
|
|
6d3351 |
@@ -6,7 +6,6 @@
|
|
|
6d3351 |
<flag name='kvm'/>
|
|
|
6d3351 |
<flag name='mem-path'/>
|
|
|
6d3351 |
<flag name='drive-serial'/>
|
|
|
6d3351 |
- <flag name='chardev'/>
|
|
|
6d3351 |
<flag name='monitor-json'/>
|
|
|
6d3351 |
<flag name='sdl'/>
|
|
|
6d3351 |
<flag name='netdev'/>
|
|
|
6d3351 |
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
|
|
|
6d3351 |
index 49c046212b..5f98db8d1a 100644
|
|
|
6d3351 |
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
|
|
|
6d3351 |
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
|
|
|
6d3351 |
@@ -6,7 +6,6 @@
|
|
|
6d3351 |
<flag name='kvm'/>
|
|
|
6d3351 |
<flag name='mem-path'/>
|
|
|
6d3351 |
<flag name='drive-serial'/>
|
|
|
6d3351 |
- <flag name='chardev'/>
|
|
|
6d3351 |
<flag name='monitor-json'/>
|
|
|
6d3351 |
<flag name='sdl'/>
|
|
|
6d3351 |
<flag name='netdev'/>
|
|
|
6d3351 |
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
|
|
|
6d3351 |
index 51be9bce4d..ac40ecc7fc 100644
|
|
|
6d3351 |
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
|
|
|
6d3351 |
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
|
|
|
6d3351 |
@@ -6,7 +6,6 @@
|
|
|
6d3351 |
<flag name='kvm'/>
|
|
|
6d3351 |
<flag name='mem-path'/>
|
|
|
6d3351 |
<flag name='drive-serial'/>
|
|
|
6d3351 |
- <flag name='chardev'/>
|
|
|
6d3351 |
<flag name='monitor-json'/>
|
|
|
6d3351 |
<flag name='sdl'/>
|
|
|
6d3351 |
<flag name='netdev'/>
|
|
|
6d3351 |
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
|
|
|
6d3351 |
index 01edbc88da..e42e47a8ee 100644
|
|
|
6d3351 |
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
|
|
|
6d3351 |
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
|
|
|
6d3351 |
@@ -6,7 +6,6 @@
|
|
|
6d3351 |
<flag name='kvm'/>
|
|
|
6d3351 |
<flag name='mem-path'/>
|
|
|
6d3351 |
<flag name='drive-serial'/>
|
|
|
6d3351 |
- <flag name='chardev'/>
|
|
|
6d3351 |
<flag name='monitor-json'/>
|
|
|
6d3351 |
<flag name='sdl'/>
|
|
|
6d3351 |
<flag name='netdev'/>
|
|
|
6d3351 |
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
|
|
|
6d3351 |
index 2140eab398..a418f084c2 100644
|
|
|
6d3351 |
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
|
|
|
6d3351 |
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
|
|
|
6d3351 |
@@ -6,7 +6,6 @@
|
|
|
6d3351 |
<flag name='kvm'/>
|
|
|
6d3351 |
<flag name='mem-path'/>
|
|
|
6d3351 |
<flag name='drive-serial'/>
|
|
|
6d3351 |
- <flag name='chardev'/>
|
|
|
6d3351 |
<flag name='monitor-json'/>
|
|
|
6d3351 |
<flag name='sdl'/>
|
|
|
6d3351 |
<flag name='netdev'/>
|
|
|
6d3351 |
diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c
|
|
|
6d3351 |
index c7355e3d53..0a9b2b94f6 100644
|
|
|
6d3351 |
--- a/tests/qemuhelptest.c
|
|
|
6d3351 |
+++ b/tests/qemuhelptest.c
|
|
|
6d3351 |
@@ -155,7 +155,6 @@ mymain(void)
|
|
|
6d3351 |
QEMU_CAPS_DRIVE_SERIAL,
|
|
|
6d3351 |
QEMU_CAPS_ENABLE_KVM,
|
|
|
6d3351 |
QEMU_CAPS_SDL,
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV,
|
|
|
6d3351 |
QEMU_CAPS_RTC,
|
|
|
6d3351 |
QEMU_CAPS_NO_HPET,
|
|
|
6d3351 |
QEMU_CAPS_BOOT_MENU,
|
|
|
6d3351 |
@@ -188,7 +187,6 @@ mymain(void)
|
|
|
6d3351 |
QEMU_CAPS_DRIVE_SERIAL,
|
|
|
6d3351 |
QEMU_CAPS_MEM_PATH,
|
|
|
6d3351 |
QEMU_CAPS_SDL,
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV,
|
|
|
6d3351 |
QEMU_CAPS_ENABLE_KVM,
|
|
|
6d3351 |
QEMU_CAPS_RTC,
|
|
|
6d3351 |
QEMU_CAPS_NO_HPET,
|
|
|
6d3351 |
@@ -226,7 +224,6 @@ mymain(void)
|
|
|
6d3351 |
QEMU_CAPS_DRIVE_SERIAL,
|
|
|
6d3351 |
QEMU_CAPS_MEM_PATH,
|
|
|
6d3351 |
QEMU_CAPS_SDL,
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV,
|
|
|
6d3351 |
QEMU_CAPS_ENABLE_KVM,
|
|
|
6d3351 |
QEMU_CAPS_MONITOR_JSON,
|
|
|
6d3351 |
QEMU_CAPS_NETDEV,
|
|
|
6d3351 |
@@ -273,7 +270,6 @@ mymain(void)
|
|
|
6d3351 |
QEMU_CAPS_DRIVE_SERIAL,
|
|
|
6d3351 |
QEMU_CAPS_MEM_PATH,
|
|
|
6d3351 |
QEMU_CAPS_SDL,
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV,
|
|
|
6d3351 |
QEMU_CAPS_ENABLE_KVM,
|
|
|
6d3351 |
QEMU_CAPS_MONITOR_JSON,
|
|
|
6d3351 |
QEMU_CAPS_NETDEV,
|
|
|
6d3351 |
@@ -344,7 +340,6 @@ mymain(void)
|
|
|
6d3351 |
QEMU_CAPS_DRIVE_SERIAL,
|
|
|
6d3351 |
QEMU_CAPS_MEM_PATH,
|
|
|
6d3351 |
QEMU_CAPS_SDL,
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV,
|
|
|
6d3351 |
QEMU_CAPS_ENABLE_KVM,
|
|
|
6d3351 |
QEMU_CAPS_MONITOR_JSON,
|
|
|
6d3351 |
QEMU_CAPS_NETDEV,
|
|
|
6d3351 |
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
|
|
|
6d3351 |
index 58c7a32043..d4afaef06e 100644
|
|
|
6d3351 |
--- a/tests/qemuxml2argvtest.c
|
|
|
6d3351 |
+++ b/tests/qemuxml2argvtest.c
|
|
|
6d3351 |
@@ -748,8 +748,7 @@ mymain(void)
|
|
|
6d3351 |
DO_TEST_FAILURE("reboot-timeout-enabled", NONE);
|
|
|
6d3351 |
|
|
|
6d3351 |
DO_TEST("bios",
|
|
|
6d3351 |
- QEMU_CAPS_SGA,
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV);
|
|
|
6d3351 |
+ QEMU_CAPS_SGA);
|
|
|
6d3351 |
DO_TEST("bios-nvram", NONE);
|
|
|
6d3351 |
DO_TEST("bios-nvram-secure",
|
|
|
6d3351 |
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
|
|
|
6d3351 |
@@ -781,12 +780,17 @@ mymain(void)
|
|
|
6d3351 |
DO_TEST("cpu-eoi-disabled", QEMU_CAPS_ENABLE_KVM);
|
|
|
6d3351 |
DO_TEST("cpu-eoi-enabled", QEMU_CAPS_ENABLE_KVM);
|
|
|
6d3351 |
DO_TEST("controller-order",
|
|
|
6d3351 |
- QEMU_CAPS_KVM, QEMU_CAPS_ENABLE_KVM,
|
|
|
6d3351 |
- QEMU_CAPS_BOOT_MENU, QEMU_CAPS_PIIX3_USB_UHCI,
|
|
|
6d3351 |
- QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_DRIVE_AIO,
|
|
|
6d3351 |
- QEMU_CAPS_CCID_PASSTHRU, QEMU_CAPS_CHARDEV,
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV_SPICEVMC, QEMU_CAPS_SPICE,
|
|
|
6d3351 |
- QEMU_CAPS_HDA_DUPLEX, QEMU_CAPS_USB_HUB,
|
|
|
6d3351 |
+ QEMU_CAPS_KVM,
|
|
|
6d3351 |
+ QEMU_CAPS_ENABLE_KVM,
|
|
|
6d3351 |
+ QEMU_CAPS_BOOT_MENU,
|
|
|
6d3351 |
+ QEMU_CAPS_PIIX3_USB_UHCI,
|
|
|
6d3351 |
+ QEMU_CAPS_PCI_MULTIFUNCTION,
|
|
|
6d3351 |
+ QEMU_CAPS_DRIVE_AIO,
|
|
|
6d3351 |
+ QEMU_CAPS_CCID_PASSTHRU,
|
|
|
6d3351 |
+ QEMU_CAPS_CHARDEV_SPICEVMC,
|
|
|
6d3351 |
+ QEMU_CAPS_SPICE,
|
|
|
6d3351 |
+ QEMU_CAPS_HDA_DUPLEX,
|
|
|
6d3351 |
+ QEMU_CAPS_USB_HUB,
|
|
|
6d3351 |
QEMU_CAPS_DEVICE_CIRRUS_VGA);
|
|
|
6d3351 |
DO_TEST("eoi-disabled", NONE);
|
|
|
6d3351 |
DO_TEST("eoi-enabled", NONE);
|
|
|
6d3351 |
@@ -1095,10 +1099,13 @@ mymain(void)
|
|
|
6d3351 |
QEMU_CAPS_DEVICE_QXL);
|
|
|
6d3351 |
DO_TEST("graphics-spice-usb-redir",
|
|
|
6d3351 |
QEMU_CAPS_SPICE,
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
- QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_USB_HUB,
|
|
|
6d3351 |
- QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_USB_REDIR,
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV_SPICEVMC, QEMU_CAPS_DEVICE_CIRRUS_VGA);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
+ QEMU_CAPS_PCI_MULTIFUNCTION,
|
|
|
6d3351 |
+ QEMU_CAPS_USB_HUB,
|
|
|
6d3351 |
+ QEMU_CAPS_ICH9_USB_EHCI1,
|
|
|
6d3351 |
+ QEMU_CAPS_USB_REDIR,
|
|
|
6d3351 |
+ QEMU_CAPS_CHARDEV_SPICEVMC,
|
|
|
6d3351 |
+ QEMU_CAPS_DEVICE_CIRRUS_VGA);
|
|
|
6d3351 |
DO_TEST("graphics-spice-agent-file-xfer",
|
|
|
6d3351 |
QEMU_CAPS_SPICE,
|
|
|
6d3351 |
QEMU_CAPS_DEVICE_QXL,
|
|
|
6d3351 |
@@ -1178,50 +1185,50 @@ mymain(void)
|
|
|
6d3351 |
QEMU_CAPS_DEVICE_VFIO_PCI);
|
|
|
6d3351 |
|
|
|
6d3351 |
|
|
|
6d3351 |
- DO_TEST("serial-file-log", QEMU_CAPS_CHARDEV, QEMU_CAPS_CHARDEV_FILE_APPEND,
|
|
|
6d3351 |
+ DO_TEST("serial-file-log",
|
|
|
6d3351 |
+ QEMU_CAPS_CHARDEV_FILE_APPEND,
|
|
|
6d3351 |
QEMU_CAPS_CHARDEV_LOGFILE);
|
|
|
6d3351 |
DO_TEST("serial-spiceport",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV,
|
|
|
6d3351 |
- QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
+ QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
|
|
|
6d3351 |
QEMU_CAPS_DEVICE_QXL,
|
|
|
6d3351 |
- QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEPORT);
|
|
|
6d3351 |
+ QEMU_CAPS_SPICE,
|
|
|
6d3351 |
+ QEMU_CAPS_CHARDEV_SPICEPORT);
|
|
|
6d3351 |
DO_TEST("serial-spiceport-nospice", NONE);
|
|
|
6d3351 |
|
|
|
6d3351 |
- DO_TEST("console-compat",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV);
|
|
|
6d3351 |
- DO_TEST("console-compat-auto",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV);
|
|
|
6d3351 |
+ DO_TEST("console-compat", NONE);
|
|
|
6d3351 |
+ DO_TEST("console-compat-auto", NONE);
|
|
|
6d3351 |
|
|
|
6d3351 |
DO_TEST("serial-vc-chardev",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST("serial-pty-chardev",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST("serial-dev-chardev",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST("serial-dev-chardev-iobase",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST("serial-file-chardev",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
QEMU_CAPS_CHARDEV_FILE_APPEND);
|
|
|
6d3351 |
DO_TEST("serial-unix-chardev",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST("serial-tcp-chardev",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST("serial-udp-chardev",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST("serial-tcp-telnet-chardev",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
driver.config->chardevTLS = 1;
|
|
|
6d3351 |
DO_TEST("serial-tcp-tlsx509-chardev",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
QEMU_CAPS_OBJECT_TLS_CREDS_X509);
|
|
|
6d3351 |
driver.config->chardevTLSx509verify = 1;
|
|
|
6d3351 |
DO_TEST("serial-tcp-tlsx509-chardev-verify",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
QEMU_CAPS_OBJECT_TLS_CREDS_X509);
|
|
|
6d3351 |
driver.config->chardevTLSx509verify = 0;
|
|
|
6d3351 |
DO_TEST("serial-tcp-tlsx509-chardev-notls",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
QEMU_CAPS_OBJECT_TLS_CREDS_X509);
|
|
|
6d3351 |
VIR_FREE(driver.config->chardevTLSx509certdir);
|
|
|
6d3351 |
if (VIR_STRDUP_QUIET(driver.config->chardevTLSx509certdir, "/etc/pki/libvirt-chardev") < 0)
|
|
|
6d3351 |
@@ -1231,171 +1238,195 @@ mymain(void)
|
|
|
6d3351 |
return EXIT_FAILURE;
|
|
|
6d3351 |
# ifdef HAVE_GNUTLS_CIPHER_ENCRYPT
|
|
|
6d3351 |
DO_TEST("serial-tcp-tlsx509-secret-chardev",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
QEMU_CAPS_OBJECT_SECRET,
|
|
|
6d3351 |
QEMU_CAPS_OBJECT_TLS_CREDS_X509);
|
|
|
6d3351 |
# else
|
|
|
6d3351 |
DO_TEST_FAILURE("serial-tcp-tlsx509-secret-chardev",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
QEMU_CAPS_OBJECT_SECRET,
|
|
|
6d3351 |
QEMU_CAPS_OBJECT_TLS_CREDS_X509);
|
|
|
6d3351 |
# endif
|
|
|
6d3351 |
driver.config->chardevTLS = 0;
|
|
|
6d3351 |
VIR_FREE(driver.config->chardevTLSx509certdir);
|
|
|
6d3351 |
DO_TEST("serial-many-chardev",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST("parallel-tcp-chardev",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST("parallel-parport-chardev",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST("console-compat-chardev",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST("pci-serial-dev-chardev",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
QEMU_CAPS_DEVICE_PCI_SERIAL);
|
|
|
6d3351 |
|
|
|
6d3351 |
DO_TEST("channel-guestfwd",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST("channel-virtio",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST("channel-virtio-state",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST("channel-virtio-auto",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST("channel-virtio-autoassign",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST("channel-virtio-autoadd",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST("console-virtio",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST("console-virtio-many",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST("console-virtio-s390",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
- QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_S390);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
+ QEMU_CAPS_BOOTINDEX,
|
|
|
6d3351 |
+ QEMU_CAPS_VIRTIO_S390);
|
|
|
6d3351 |
DO_TEST("console-virtio-ccw",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
- QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_CCW,
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
+ QEMU_CAPS_BOOTINDEX,
|
|
|
6d3351 |
+ QEMU_CAPS_VIRTIO_CCW,
|
|
|
6d3351 |
QEMU_CAPS_VIRTIO_S390);
|
|
|
6d3351 |
DO_TEST("console-sclp",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
- QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_SCLP_S390);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
+ QEMU_CAPS_VIRTIO_S390,
|
|
|
6d3351 |
+ QEMU_CAPS_SCLP_S390);
|
|
|
6d3351 |
DO_TEST("channel-spicevmc",
|
|
|
6d3351 |
QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
- QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEVMC,
|
|
|
6d3351 |
+ QEMU_CAPS_SPICE,
|
|
|
6d3351 |
+ QEMU_CAPS_CHARDEV_SPICEVMC,
|
|
|
6d3351 |
QEMU_CAPS_DEVICE_CIRRUS_VGA);
|
|
|
6d3351 |
DO_TEST("channel-spicevmc-old",
|
|
|
6d3351 |
QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
- QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_SPICEVMC,
|
|
|
6d3351 |
+ QEMU_CAPS_SPICE,
|
|
|
6d3351 |
+ QEMU_CAPS_DEVICE_SPICEVMC,
|
|
|
6d3351 |
QEMU_CAPS_DEVICE_CIRRUS_VGA);
|
|
|
6d3351 |
DO_TEST("channel-virtio-default",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
- QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEVMC);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
+ QEMU_CAPS_SPICE,
|
|
|
6d3351 |
+ QEMU_CAPS_CHARDEV_SPICEVMC);
|
|
|
6d3351 |
DO_TEST("channel-virtio-unix",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
|
|
|
6d3351 |
DO_TEST("smartcard-host",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV,
|
|
|
6d3351 |
- QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_CCID_EMULATED);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
+ QEMU_CAPS_CCID_EMULATED);
|
|
|
6d3351 |
DO_TEST("smartcard-host-certificates",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV,
|
|
|
6d3351 |
- QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_CCID_EMULATED);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
+ QEMU_CAPS_CCID_EMULATED);
|
|
|
6d3351 |
DO_TEST("smartcard-passthrough-tcp",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV,
|
|
|
6d3351 |
- QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_CCID_PASSTHRU);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
+ QEMU_CAPS_CCID_PASSTHRU);
|
|
|
6d3351 |
DO_TEST("smartcard-passthrough-spicevmc",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
- QEMU_CAPS_CCID_PASSTHRU, QEMU_CAPS_CHARDEV_SPICEVMC);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
+ QEMU_CAPS_CCID_PASSTHRU,
|
|
|
6d3351 |
+ QEMU_CAPS_CHARDEV_SPICEVMC);
|
|
|
6d3351 |
DO_TEST("smartcard-controller",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV,
|
|
|
6d3351 |
- QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_CCID_EMULATED);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
+ QEMU_CAPS_CCID_EMULATED);
|
|
|
6d3351 |
|
|
|
6d3351 |
DO_TEST("usb-controller",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV,
|
|
|
6d3351 |
QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST("usb-piix3-controller",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_PIIX3_USB_UHCI,
|
|
|
6d3351 |
- QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
+ QEMU_CAPS_PIIX3_USB_UHCI,
|
|
|
6d3351 |
+ QEMU_CAPS_PCI_MULTIFUNCTION,
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST("usb-ich9-ehci-addr",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
- QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
+ QEMU_CAPS_PCI_MULTIFUNCTION,
|
|
|
6d3351 |
+ QEMU_CAPS_ICH9_USB_EHCI1);
|
|
|
6d3351 |
DO_TEST("input-usbmouse-addr",
|
|
|
6d3351 |
QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST("usb-ich9-companion",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
- QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
+ QEMU_CAPS_PCI_MULTIFUNCTION,
|
|
|
6d3351 |
+ QEMU_CAPS_ICH9_USB_EHCI1);
|
|
|
6d3351 |
DO_TEST_PARSE_ERROR("usb-ich9-no-companion",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
- QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
+ QEMU_CAPS_PCI_MULTIFUNCTION,
|
|
|
6d3351 |
+ QEMU_CAPS_ICH9_USB_EHCI1);
|
|
|
6d3351 |
DO_TEST("usb-ich9-autoassign",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
- QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1,
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
+ QEMU_CAPS_PCI_MULTIFUNCTION,
|
|
|
6d3351 |
+ QEMU_CAPS_ICH9_USB_EHCI1,
|
|
|
6d3351 |
QEMU_CAPS_USB_HUB);
|
|
|
6d3351 |
DO_TEST("usb-hub",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_USB_HUB,
|
|
|
6d3351 |
+ QEMU_CAPS_USB_HUB,
|
|
|
6d3351 |
QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST("usb-hub-autoadd",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_USB_HUB,
|
|
|
6d3351 |
+ QEMU_CAPS_USB_HUB,
|
|
|
6d3351 |
QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST("usb-hub-autoadd-deluxe",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_USB_HUB,
|
|
|
6d3351 |
+ QEMU_CAPS_USB_HUB,
|
|
|
6d3351 |
QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST_PARSE_ERROR("usb-hub-conflict",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_USB_HUB,
|
|
|
6d3351 |
+ QEMU_CAPS_USB_HUB,
|
|
|
6d3351 |
QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST_PARSE_ERROR("usb-hub-nonexistent",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_USB_HUB,
|
|
|
6d3351 |
+ QEMU_CAPS_USB_HUB,
|
|
|
6d3351 |
QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST("usb-port-missing",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_USB_HUB,
|
|
|
6d3351 |
+ QEMU_CAPS_USB_HUB,
|
|
|
6d3351 |
QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST_PARSE_ERROR("usb-bus-missing",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_USB_HUB,
|
|
|
6d3351 |
+ QEMU_CAPS_USB_HUB,
|
|
|
6d3351 |
QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST("usb-ports",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_USB_HUB,
|
|
|
6d3351 |
+ QEMU_CAPS_USB_HUB,
|
|
|
6d3351 |
QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST_PARSE_ERROR("usb-ports-out-of-range",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_USB_HUB,
|
|
|
6d3351 |
+ QEMU_CAPS_USB_HUB,
|
|
|
6d3351 |
QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST("usb-port-autoassign",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_USB_HUB,
|
|
|
6d3351 |
+ QEMU_CAPS_USB_HUB,
|
|
|
6d3351 |
QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST("usb-redir",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
- QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_USB_HUB,
|
|
|
6d3351 |
- QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_USB_REDIR,
|
|
|
6d3351 |
- QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEVMC);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
+ QEMU_CAPS_PCI_MULTIFUNCTION,
|
|
|
6d3351 |
+ QEMU_CAPS_USB_HUB,
|
|
|
6d3351 |
+ QEMU_CAPS_ICH9_USB_EHCI1,
|
|
|
6d3351 |
+ QEMU_CAPS_USB_REDIR,
|
|
|
6d3351 |
+ QEMU_CAPS_SPICE,
|
|
|
6d3351 |
+ QEMU_CAPS_CHARDEV_SPICEVMC);
|
|
|
6d3351 |
DO_TEST("usb-redir-boot",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
- QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_USB_HUB,
|
|
|
6d3351 |
- QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_USB_REDIR,
|
|
|
6d3351 |
- QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEVMC, QEMU_CAPS_BOOTINDEX,
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
+ QEMU_CAPS_PCI_MULTIFUNCTION,
|
|
|
6d3351 |
+ QEMU_CAPS_USB_HUB,
|
|
|
6d3351 |
+ QEMU_CAPS_ICH9_USB_EHCI1,
|
|
|
6d3351 |
+ QEMU_CAPS_USB_REDIR,
|
|
|
6d3351 |
+ QEMU_CAPS_SPICE,
|
|
|
6d3351 |
+ QEMU_CAPS_CHARDEV_SPICEVMC,
|
|
|
6d3351 |
+ QEMU_CAPS_BOOTINDEX,
|
|
|
6d3351 |
QEMU_CAPS_USB_REDIR_BOOTINDEX);
|
|
|
6d3351 |
DO_TEST("usb-redir-filter",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
- QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_USB_HUB,
|
|
|
6d3351 |
- QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_USB_REDIR,
|
|
|
6d3351 |
- QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEVMC,
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
+ QEMU_CAPS_PCI_MULTIFUNCTION,
|
|
|
6d3351 |
+ QEMU_CAPS_USB_HUB,
|
|
|
6d3351 |
+ QEMU_CAPS_ICH9_USB_EHCI1,
|
|
|
6d3351 |
+ QEMU_CAPS_USB_REDIR,
|
|
|
6d3351 |
+ QEMU_CAPS_SPICE,
|
|
|
6d3351 |
+ QEMU_CAPS_CHARDEV_SPICEVMC,
|
|
|
6d3351 |
QEMU_CAPS_USB_REDIR_FILTER);
|
|
|
6d3351 |
DO_TEST("usb-redir-filter-version",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
QEMU_CAPS_USB_REDIR,
|
|
|
6d3351 |
- QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEVMC,
|
|
|
6d3351 |
+ QEMU_CAPS_SPICE,
|
|
|
6d3351 |
+ QEMU_CAPS_CHARDEV_SPICEVMC,
|
|
|
6d3351 |
QEMU_CAPS_USB_REDIR_FILTER);
|
|
|
6d3351 |
DO_TEST("usb1-usb2",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
- QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_PIIX3_USB_UHCI,
|
|
|
6d3351 |
- QEMU_CAPS_USB_HUB, QEMU_CAPS_ICH9_USB_EHCI1);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
+ QEMU_CAPS_PCI_MULTIFUNCTION,
|
|
|
6d3351 |
+ QEMU_CAPS_PIIX3_USB_UHCI,
|
|
|
6d3351 |
+ QEMU_CAPS_USB_HUB,
|
|
|
6d3351 |
+ QEMU_CAPS_ICH9_USB_EHCI1);
|
|
|
6d3351 |
DO_TEST("usb-none",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST_PARSE_ERROR("usb-none-other",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST_PARSE_ERROR("usb-none-hub",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
QEMU_CAPS_USB_HUB);
|
|
|
6d3351 |
DO_TEST_PARSE_ERROR("usb-none-usbtablet",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST("usb-controller-default-q35",
|
|
|
6d3351 |
QEMU_CAPS_DEVICE_IOH3420,
|
|
|
6d3351 |
QEMU_CAPS_PCI_OHCI,
|
|
|
6d3351 |
@@ -1415,15 +1446,21 @@ mymain(void)
|
|
|
6d3351 |
QEMU_CAPS_PCI_OHCI,
|
|
|
6d3351 |
QEMU_CAPS_PIIX3_USB_UHCI);
|
|
|
6d3351 |
DO_TEST("usb-controller-xhci",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PIIX3_USB_UHCI,
|
|
|
6d3351 |
- QEMU_CAPS_NEC_USB_XHCI, QEMU_CAPS_NEC_USB_XHCI_PORTS);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
+ QEMU_CAPS_PIIX3_USB_UHCI,
|
|
|
6d3351 |
+ QEMU_CAPS_NEC_USB_XHCI,
|
|
|
6d3351 |
+ QEMU_CAPS_NEC_USB_XHCI_PORTS);
|
|
|
6d3351 |
DO_TEST("usb-xhci-autoassign",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PIIX3_USB_UHCI,
|
|
|
6d3351 |
- QEMU_CAPS_NEC_USB_XHCI, QEMU_CAPS_NEC_USB_XHCI_PORTS,
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
+ QEMU_CAPS_PIIX3_USB_UHCI,
|
|
|
6d3351 |
+ QEMU_CAPS_NEC_USB_XHCI,
|
|
|
6d3351 |
+ QEMU_CAPS_NEC_USB_XHCI_PORTS,
|
|
|
6d3351 |
QEMU_CAPS_USB_HUB);
|
|
|
6d3351 |
DO_TEST_PARSE_ERROR("usb-controller-xhci-limit",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PIIX3_USB_UHCI,
|
|
|
6d3351 |
- QEMU_CAPS_NEC_USB_XHCI, QEMU_CAPS_NEC_USB_XHCI_PORTS);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
+ QEMU_CAPS_PIIX3_USB_UHCI,
|
|
|
6d3351 |
+ QEMU_CAPS_NEC_USB_XHCI,
|
|
|
6d3351 |
+ QEMU_CAPS_NEC_USB_XHCI_PORTS);
|
|
|
6d3351 |
DO_TEST("usb-controller-qemu-xhci", QEMU_CAPS_DEVICE_QEMU_XHCI);
|
|
|
6d3351 |
DO_TEST_FAILURE("usb-controller-qemu-xhci-unavailable", NONE);
|
|
|
6d3351 |
DO_TEST_PARSE_ERROR("usb-controller-qemu-xhci-limit",
|
|
|
6d3351 |
@@ -1438,7 +1475,7 @@ mymain(void)
|
|
|
6d3351 |
DO_TEST("watchdog-dump", NONE);
|
|
|
6d3351 |
DO_TEST("watchdog-injectnmi", NONE);
|
|
|
6d3351 |
DO_TEST("watchdog-diag288",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_S390);
|
|
|
6d3351 |
DO_TEST("balloon-device", QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST("balloon-device-deflate", QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
@@ -1636,9 +1673,11 @@ mymain(void)
|
|
|
6d3351 |
QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_SCSI_LSI);
|
|
|
6d3351 |
|
|
|
6d3351 |
DO_TEST("monitor-json",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
+ QEMU_CAPS_MONITOR_JSON,
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST("no-shutdown",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
+ QEMU_CAPS_MONITOR_JSON,
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
QEMU_CAPS_NO_SHUTDOWN);
|
|
|
6d3351 |
|
|
|
6d3351 |
DO_TEST("seclabel-dynamic", NONE);
|
|
|
6d3351 |
@@ -1655,48 +1694,51 @@ mymain(void)
|
|
|
6d3351 |
DO_TEST_PARSE_ERROR("seclabel-device-duplicates", NONE);
|
|
|
6d3351 |
|
|
|
6d3351 |
DO_TEST("pseries-basic",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST("pseries-vio",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST("pseries-usb-default",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV,
|
|
|
6d3351 |
- QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PIIX3_USB_UHCI,
|
|
|
6d3351 |
- QEMU_CAPS_PCI_OHCI, QEMU_CAPS_PCI_MULTIFUNCTION);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
+ QEMU_CAPS_PIIX3_USB_UHCI,
|
|
|
6d3351 |
+ QEMU_CAPS_PCI_OHCI,
|
|
|
6d3351 |
+ QEMU_CAPS_PCI_MULTIFUNCTION);
|
|
|
6d3351 |
DO_TEST("pseries-usb-multi",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV,
|
|
|
6d3351 |
- QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PIIX3_USB_UHCI,
|
|
|
6d3351 |
- QEMU_CAPS_PCI_OHCI, QEMU_CAPS_PCI_MULTIFUNCTION);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
+ QEMU_CAPS_PIIX3_USB_UHCI,
|
|
|
6d3351 |
+ QEMU_CAPS_PCI_OHCI,
|
|
|
6d3351 |
+ QEMU_CAPS_PCI_MULTIFUNCTION);
|
|
|
6d3351 |
DO_TEST("pseries-vio-user-assigned",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST_PARSE_ERROR("pseries-vio-address-clash",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST("pseries-nvram", QEMU_CAPS_DEVICE_NVRAM);
|
|
|
6d3351 |
DO_TEST("pseries-usb-kbd", QEMU_CAPS_PCI_OHCI,
|
|
|
6d3351 |
- QEMU_CAPS_DEVICE_USB_KBD, QEMU_CAPS_CHARDEV,
|
|
|
6d3351 |
+ QEMU_CAPS_DEVICE_USB_KBD,
|
|
|
6d3351 |
QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
- DO_TEST("pseries-cpu-exact", QEMU_CAPS_CHARDEV,
|
|
|
6d3351 |
+ DO_TEST("pseries-cpu-exact",
|
|
|
6d3351 |
QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
|
|
|
6d3351 |
qemuTestSetHostArch(driver.caps, VIR_ARCH_PPC64);
|
|
|
6d3351 |
DO_TEST("pseries-cpu-compat", QEMU_CAPS_KVM,
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST("pseries-cpu-le", QEMU_CAPS_KVM,
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST_FAILURE("pseries-cpu-compat-power9", QEMU_CAPS_KVM);
|
|
|
6d3351 |
|
|
|
6d3351 |
qemuTestSetHostCPU(driver.caps, cpuPower9);
|
|
|
6d3351 |
DO_TEST("pseries-cpu-compat-power9",
|
|
|
6d3351 |
- QEMU_CAPS_KVM, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
+ QEMU_CAPS_KVM,
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
qemuTestSetHostCPU(driver.caps, NULL);
|
|
|
6d3351 |
|
|
|
6d3351 |
qemuTestSetHostArch(driver.caps, VIR_ARCH_NONE);
|
|
|
6d3351 |
|
|
|
6d3351 |
DO_TEST("pseries-panic-missing",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST("pseries-panic-no-address",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST_FAILURE("pseries-panic-address",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG);
|
|
|
6d3351 |
DO_TEST("disk-ide-drive-split",
|
|
|
6d3351 |
QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
QEMU_CAPS_IDE_CD);
|
|
|
6d3351 |
@@ -1767,43 +1809,61 @@ mymain(void)
|
|
|
6d3351 |
QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
|
|
|
6d3351 |
DO_TEST_PARSE_ERROR("video-invalid", NONE);
|
|
|
6d3351 |
|
|
|
6d3351 |
- DO_TEST("virtio-rng-default", QEMU_CAPS_DEVICE_VIRTIO_RNG,
|
|
|
6d3351 |
+ DO_TEST("virtio-rng-default",
|
|
|
6d3351 |
+ QEMU_CAPS_DEVICE_VIRTIO_RNG,
|
|
|
6d3351 |
QEMU_CAPS_OBJECT_RNG_RANDOM);
|
|
|
6d3351 |
- DO_TEST("virtio-rng-random", QEMU_CAPS_DEVICE_VIRTIO_RNG,
|
|
|
6d3351 |
+ DO_TEST("virtio-rng-random",
|
|
|
6d3351 |
+ QEMU_CAPS_DEVICE_VIRTIO_RNG,
|
|
|
6d3351 |
QEMU_CAPS_OBJECT_RNG_RANDOM);
|
|
|
6d3351 |
- DO_TEST("virtio-rng-egd", QEMU_CAPS_DEVICE_VIRTIO_RNG,
|
|
|
6d3351 |
+ DO_TEST("virtio-rng-egd",
|
|
|
6d3351 |
+ QEMU_CAPS_DEVICE_VIRTIO_RNG,
|
|
|
6d3351 |
QEMU_CAPS_OBJECT_RNG_EGD);
|
|
|
6d3351 |
- DO_TEST("virtio-rng-multiple", QEMU_CAPS_DEVICE_VIRTIO_RNG,
|
|
|
6d3351 |
- QEMU_CAPS_OBJECT_RNG_EGD, QEMU_CAPS_OBJECT_RNG_RANDOM);
|
|
|
6d3351 |
+ DO_TEST("virtio-rng-multiple",
|
|
|
6d3351 |
+ QEMU_CAPS_DEVICE_VIRTIO_RNG,
|
|
|
6d3351 |
+ QEMU_CAPS_OBJECT_RNG_EGD,
|
|
|
6d3351 |
+ QEMU_CAPS_OBJECT_RNG_RANDOM);
|
|
|
6d3351 |
DO_TEST_PARSE_ERROR("virtio-rng-egd-crash",
|
|
|
6d3351 |
- QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_EGD);
|
|
|
6d3351 |
+ QEMU_CAPS_DEVICE_VIRTIO_RNG,
|
|
|
6d3351 |
+ QEMU_CAPS_OBJECT_RNG_EGD);
|
|
|
6d3351 |
DO_TEST("virtio-rng-ccw",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
- QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_CCW,
|
|
|
6d3351 |
- QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_DEVICE_VIRTIO_RNG,
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
+ QEMU_CAPS_BOOTINDEX,
|
|
|
6d3351 |
+ QEMU_CAPS_VIRTIO_CCW,
|
|
|
6d3351 |
+ QEMU_CAPS_VIRTIO_S390,
|
|
|
6d3351 |
+ QEMU_CAPS_DEVICE_VIRTIO_RNG,
|
|
|
6d3351 |
QEMU_CAPS_OBJECT_RNG_RANDOM);
|
|
|
6d3351 |
|
|
|
6d3351 |
DO_TEST("s390-allow-bogus-usb-none",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
- QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_S390,
|
|
|
6d3351 |
- QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
+ QEMU_CAPS_BOOTINDEX,
|
|
|
6d3351 |
+ QEMU_CAPS_VIRTIO_S390,
|
|
|
6d3351 |
+ QEMU_CAPS_DEVICE_VIRTIO_RNG,
|
|
|
6d3351 |
+ QEMU_CAPS_OBJECT_RNG_RANDOM);
|
|
|
6d3351 |
DO_TEST("s390-allow-bogus-usb-controller",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
- QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_S390,
|
|
|
6d3351 |
- QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
+ QEMU_CAPS_BOOTINDEX,
|
|
|
6d3351 |
+ QEMU_CAPS_VIRTIO_S390,
|
|
|
6d3351 |
+ QEMU_CAPS_DEVICE_VIRTIO_RNG,
|
|
|
6d3351 |
+ QEMU_CAPS_OBJECT_RNG_RANDOM);
|
|
|
6d3351 |
|
|
|
6d3351 |
DO_TEST("s390-panic-no-address",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
- QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
+ QEMU_CAPS_VIRTIO_CCW,
|
|
|
6d3351 |
+ QEMU_CAPS_VIRTIO_S390);
|
|
|
6d3351 |
DO_TEST_FAILURE("s390-panic-address",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
- QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
+ QEMU_CAPS_VIRTIO_CCW,
|
|
|
6d3351 |
+ QEMU_CAPS_VIRTIO_S390);
|
|
|
6d3351 |
DO_TEST("s390-panic-missing",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
- QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
|
|
|
6d3351 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
+ QEMU_CAPS_VIRTIO_CCW,
|
|
|
6d3351 |
+ QEMU_CAPS_VIRTIO_S390);
|
|
|
6d3351 |
|
|
|
6d3351 |
- DO_TEST("ppc-dtb", QEMU_CAPS_KVM, QEMU_CAPS_DTB);
|
|
|
6d3351 |
- DO_TEST("ppce500-serial", QEMU_CAPS_KVM, QEMU_CAPS_CHARDEV);
|
|
|
6d3351 |
+ DO_TEST("ppc-dtb",
|
|
|
6d3351 |
+ QEMU_CAPS_KVM,
|
|
|
6d3351 |
+ QEMU_CAPS_DTB);
|
|
|
6d3351 |
+ DO_TEST("ppce500-serial",
|
|
|
6d3351 |
+ QEMU_CAPS_KVM);
|
|
|
6d3351 |
|
|
|
6d3351 |
DO_TEST("tpm-passthrough",
|
|
|
6d3351 |
QEMU_CAPS_DEVICE_TPM_PASSTHROUGH, QEMU_CAPS_DEVICE_TPM_TIS);
|
|
|
6d3351 |
@@ -2013,7 +2073,6 @@ mymain(void)
|
|
|
6d3351 |
QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
|
|
|
6d3351 |
DO_TEST("q35-virt-manager-basic",
|
|
|
6d3351 |
QEMU_CAPS_KVM,
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV,
|
|
|
6d3351 |
QEMU_CAPS_RTC,
|
|
|
6d3351 |
QEMU_CAPS_ICH9_DISABLE_S3,
|
|
|
6d3351 |
QEMU_CAPS_ICH9_DISABLE_S4,
|
|
|
6d3351 |
@@ -2344,7 +2403,6 @@ mymain(void)
|
|
|
6d3351 |
QEMU_CAPS_KVM);
|
|
|
6d3351 |
DO_TEST("aarch64-pci-serial",
|
|
|
6d3351 |
QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV,
|
|
|
6d3351 |
QEMU_CAPS_DEVICE_PCI_SERIAL,
|
|
|
6d3351 |
QEMU_CAPS_CHARDEV_LOGFILE,
|
|
|
6d3351 |
QEMU_CAPS_OBJECT_GPEX,
|
|
|
6d3351 |
@@ -2519,17 +2577,20 @@ mymain(void)
|
|
|
6d3351 |
VIR_DOMAIN_DEF_PARSE_SKIP_OSTYPE_CHECKS,
|
|
|
6d3351 |
NONE);
|
|
|
6d3351 |
|
|
|
6d3351 |
- DO_TEST("name-escape", QEMU_CAPS_NAME_DEBUG_THREADS,
|
|
|
6d3351 |
- QEMU_CAPS_OBJECT_SECRET, QEMU_CAPS_CHARDEV, QEMU_CAPS_VNC,
|
|
|
6d3351 |
- QEMU_CAPS_NAME_GUEST, QEMU_CAPS_DEVICE_CIRRUS_VGA,
|
|
|
6d3351 |
- QEMU_CAPS_SPICE, QEMU_CAPS_SPICE_UNIX);
|
|
|
6d3351 |
+ DO_TEST("name-escape",
|
|
|
6d3351 |
+ QEMU_CAPS_NAME_DEBUG_THREADS,
|
|
|
6d3351 |
+ QEMU_CAPS_OBJECT_SECRET,
|
|
|
6d3351 |
+ QEMU_CAPS_VNC,
|
|
|
6d3351 |
+ QEMU_CAPS_NAME_GUEST,
|
|
|
6d3351 |
+ QEMU_CAPS_DEVICE_CIRRUS_VGA,
|
|
|
6d3351 |
+ QEMU_CAPS_SPICE,
|
|
|
6d3351 |
+ QEMU_CAPS_SPICE_UNIX);
|
|
|
6d3351 |
DO_TEST("debug-threads", QEMU_CAPS_NAME_DEBUG_THREADS);
|
|
|
6d3351 |
|
|
|
6d3351 |
DO_TEST("master-key", QEMU_CAPS_OBJECT_SECRET);
|
|
|
6d3351 |
- DO_TEST("usb-long-port-path", QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
+ DO_TEST("usb-long-port-path", QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
QEMU_CAPS_USB_HUB);
|
|
|
6d3351 |
DO_TEST_PARSE_ERROR("usb-too-long-port-path-invalid",
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV,
|
|
|
6d3351 |
QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_USB_HUB);
|
|
|
6d3351 |
|
|
|
6d3351 |
DO_TEST("acpi-table", NONE);
|
|
|
6d3351 |
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
|
|
|
6d3351 |
index 73bc87f87c..d026bdfa68 100644
|
|
|
6d3351 |
--- a/tests/qemuxml2xmltest.c
|
|
|
6d3351 |
+++ b/tests/qemuxml2xmltest.c
|
|
|
6d3351 |
@@ -1065,7 +1065,6 @@ mymain(void)
|
|
|
6d3351 |
QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_BOOTINDEX);
|
|
|
6d3351 |
DO_TEST("aarch64-pci-serial",
|
|
|
6d3351 |
QEMU_CAPS_NODEFCONFIG,
|
|
|
6d3351 |
- QEMU_CAPS_CHARDEV,
|
|
|
6d3351 |
QEMU_CAPS_DEVICE_PCI_SERIAL,
|
|
|
6d3351 |
QEMU_CAPS_CHARDEV_LOGFILE,
|
|
|
6d3351 |
QEMU_CAPS_OBJECT_GPEX,
|
|
|
6d3351 |
--
|
|
|
6d3351 |
2.13.3
|
|
|
6d3351 |
|