[10/12] qemu: caps: blacklist QEMU_CAPS_CHARDEV

Message ID	700bd1d9ba60d69712b5a6b4d196a1b8790e3720.1498499391.git.crobinso@redhat.com
State	New
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 674F3C05FFDE From: Cole Robinson <crobinso@redhat.com> To: libvir-list@redhat.com Date: Mon, 26 Jun 2017 14:01:51 -0400 Message-Id: <700bd1d9ba60d69712b5a6b4d196a1b8790e3720.1498499391.git.crobinso@redhat.com> In-Reply-To: <cover.1498499391.git.crobinso@redhat.com> References: <cover.1498499391.git.crobinso@redhat.com> In-Reply-To: <cover.1498499391.git.crobinso@redhat.com> References: <cover.1498499391.git.crobinso@redhat.com> Cc: cdall@linaro.org, drjones@redhat.com, riku.voipio@linaro.org, Andrea Bolognani <abologna@redhat.com> Subject: [libvirt] [PATCH 10/12] qemu: caps: blacklist QEMU_CAPS_CHARDEV Precedence: junk MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com
Series	qemu: support chardev for all machvirt config \| expand [00/12] qemu: support chardev for all machvirt config [01/12] Revert "qemu: Support chardevs with ARM virt machines" [02/12] qemu: caps: Tweak arm conditional in SupportsChardev [03/12] tests: qemuxml2argv: Add an aarch64 pci-serial test [04/12] qemu: command: Remove old style -parallel building [05/12] qemu: command: Drop some QEMU_CAPS_CHARDEV checks [06/12] qemu: command: always use -chardev for monitor config [07/12] tests: qemuxml2argv: drop redundant serial testing [08/12] tests: qemuxml2argv: Drop old style serial testing [09/12] tests: qemuxml2argv: Add some QEMU_CAPS_CHARDEV annotations [10/12] qemu: caps: blacklist QEMU_CAPS_CHARDEV [11/12] qemu: command: support -chardev for platform devices [12/12] qemu: Rename SupportsChardev to IsPlatformDevice

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index d0bc50bd7..a20f405c2 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1275,13 +1275,10 @@ virQEMUCapsComputeCmdFlags(const char *help, virQEMUCapsSet(qemuCaps, QEMU_CAPS_HOST_PCI_MULTIDOMAIN); if (strstr(help, "-mem-path")) virQEMUCapsSet(qemuCaps, QEMU_CAPS_MEM_PATH); - if (strstr(help, "-chardev")) { - virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV); - if (strstr(help, "-chardev spicevmc")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV_SPICEVMC); - if (strstr(help, "-chardev spiceport")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV_SPICEPORT); - } + if (strstr(help, "-chardev spicevmc")) + virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV_SPICEVMC); + if (strstr(help, "-chardev spiceport")) + virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV_SPICEPORT); if (strstr(help, "-nodefconfig")) virQEMUCapsSet(qemuCaps, QEMU_CAPS_NODEFCONFIG); if (strstr(help, "-no-user-config")) @@ -4467,7 +4464,6 @@ virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps) { virQEMUCapsSet(qemuCaps, QEMU_CAPS_MEM_PATH); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_SERIAL); - virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV); virQEMUCapsSet(qemuCaps, QEMU_CAPS_MONITOR_JSON); virQEMUCapsSet(qemuCaps, QEMU_CAPS_SDL); virQEMUCapsSet(qemuCaps, QEMU_CAPS_NETDEV); @@ -5555,12 +5551,9 @@ virQEMUCapsCacheFree(virQEMUCapsCachePtr cache) bool virQEMUCapsSupportsChardev(const virDomainDef *def, - virQEMUCapsPtr qemuCaps, + virQEMUCapsPtr qemuCaps ATTRIBUTE_UNUSED, virDomainChrDefPtr chr) { - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV)) - return false; - if ((def->os.arch == VIR_ARCH_PPC) || ARCH_IS_PPC64(def->os.arch)) { if (!qemuDomainIsPSeries(def)) return false; diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 6e95876e8..829cbaadb 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -77,7 +77,7 @@ typedef enum { /* 20 */ X_QEMU_CAPS_XEN_DOMID, /* -xen-domid */ X_QEMU_CAPS_MIGRATE_QEMU_UNIX, /* qemu migration via unix sockets */ - QEMU_CAPS_CHARDEV, /* Is the new -chardev arg available */ + X_QEMU_CAPS_CHARDEV, /* Is the new -chardev arg available */ QEMU_CAPS_ENABLE_KVM, /* -enable-kvm flag */ QEMU_CAPS_MONITOR_JSON, /* JSON mode for monitor */ diff --git a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml index 5ad406ce1..956284d5d 100644 --- a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml @@ -6,7 +6,6 @@ <flag name='kvm'/> <flag name='mem-path'/> <flag name='drive-serial'/> - <flag name='chardev'/> <flag name='monitor-json'/> <flag name='sdl'/> <flag name='netdev'/> diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml index 4ec731d65..99384ce5e 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml @@ -6,7 +6,6 @@ <flag name='kvm'/> <flag name='mem-path'/> <flag name='drive-serial'/> - <flag name='chardev'/> <flag name='monitor-json'/> <flag name='sdl'/> <flag name='netdev'/> diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml index 601c62e65..aea043c57 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml @@ -6,7 +6,6 @@ <flag name='kvm'/> <flag name='mem-path'/> <flag name='drive-serial'/> - <flag name='chardev'/> <flag name='monitor-json'/> <flag name='sdl'/> <flag name='netdev'/> diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index 14f34b277..6f860e4f2 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -6,7 +6,6 @@ <flag name='kvm'/> <flag name='mem-path'/> <flag name='drive-serial'/> - <flag name='chardev'/> <flag name='monitor-json'/> <flag name='sdl'/> <flag name='netdev'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index 8fc23d6aa..e5dc8360d 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -6,7 +6,6 @@ <flag name='kvm'/> <flag name='mem-path'/> <flag name='drive-serial'/> - <flag name='chardev'/> <flag name='monitor-json'/> <flag name='sdl'/> <flag name='netdev'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index 47c8956b4..86d87eaf0 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -6,7 +6,6 @@ <flag name='kvm'/> <flag name='mem-path'/> <flag name='drive-serial'/> - <flag name='chardev'/> <flag name='monitor-json'/> <flag name='sdl'/> <flag name='netdev'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index afe7d53ff..2fa551b1a 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -6,7 +6,6 @@ <flag name='kvm'/> <flag name='mem-path'/> <flag name='drive-serial'/> - <flag name='chardev'/> <flag name='monitor-json'/> <flag name='sdl'/> <flag name='netdev'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index 5bdc1a2bd..b7ba2240a 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -6,7 +6,6 @@ <flag name='kvm'/> <flag name='mem-path'/> <flag name='drive-serial'/> - <flag name='chardev'/> <flag name='monitor-json'/> <flag name='sdl'/> <flag name='netdev'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index 36bc1342b..f3289df30 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -6,7 +6,6 @@ <flag name='kvm'/> <flag name='mem-path'/> <flag name='drive-serial'/> - <flag name='chardev'/> <flag name='monitor-json'/> <flag name='sdl'/> <flag name='netdev'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml index 33bc46208..af60bf6c6 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml @@ -6,7 +6,6 @@ <flag name='kvm'/> <flag name='mem-path'/> <flag name='drive-serial'/> - <flag name='chardev'/> <flag name='monitor-json'/> <flag name='sdl'/> <flag name='netdev'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml index a8ce6b03b..d4eb19102 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml @@ -6,7 +6,6 @@ <flag name='kvm'/> <flag name='mem-path'/> <flag name='drive-serial'/> - <flag name='chardev'/> <flag name='monitor-json'/> <flag name='sdl'/> <flag name='netdev'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml index 425992f0d..6d031f6f7 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml @@ -6,7 +6,6 @@ <flag name='kvm'/> <flag name='mem-path'/> <flag name='drive-serial'/> - <flag name='chardev'/> <flag name='monitor-json'/> <flag name='sdl'/> <flag name='netdev'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index 97e71ec4f..e4615c02a 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -6,7 +6,6 @@ <flag name='kvm'/> <flag name='mem-path'/> <flag name='drive-serial'/> - <flag name='chardev'/> <flag name='monitor-json'/> <flag name='sdl'/> <flag name='netdev'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index 70cce6417..ec79115cf 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -6,7 +6,6 @@ <flag name='kvm'/> <flag name='mem-path'/> <flag name='drive-serial'/> - <flag name='chardev'/> <flag name='monitor-json'/> <flag name='sdl'/> <flag name='netdev'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index 49c046212..5f98db8d1 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -6,7 +6,6 @@ <flag name='kvm'/> <flag name='mem-path'/> <flag name='drive-serial'/> - <flag name='chardev'/> <flag name='monitor-json'/> <flag name='sdl'/> <flag name='netdev'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index 51be9bce4..ac40ecc7f 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -6,7 +6,6 @@ <flag name='kvm'/> <flag name='mem-path'/> <flag name='drive-serial'/> - <flag name='chardev'/> <flag name='monitor-json'/> <flag name='sdl'/> <flag name='netdev'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index 01edbc88d..e42e47a8e 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -6,7 +6,6 @@ <flag name='kvm'/> <flag name='mem-path'/> <flag name='drive-serial'/> - <flag name='chardev'/> <flag name='monitor-json'/> <flag name='sdl'/> <flag name='netdev'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index 58dd9f637..ae1530b5e 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -6,7 +6,6 @@ <flag name='kvm'/> <flag name='mem-path'/> <flag name='drive-serial'/> - <flag name='chardev'/> <flag name='monitor-json'/> <flag name='sdl'/> <flag name='netdev'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.50.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.50.s390x.xml index 7d46128fd..b9fdd0227 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.50.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.50.s390x.xml @@ -6,7 +6,6 @@ <flag name='kvm'/> <flag name='mem-path'/> <flag name='drive-serial'/> - <flag name='chardev'/> <flag name='monitor-json'/> <flag name='sdl'/> <flag name='netdev'/> diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index d80225c1d..7485d2dcd 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -159,7 +159,6 @@ mymain(void) QEMU_CAPS_DRIVE_SERIAL, QEMU_CAPS_ENABLE_KVM, QEMU_CAPS_SDL, - QEMU_CAPS_CHARDEV, QEMU_CAPS_RTC, QEMU_CAPS_NO_HPET, QEMU_CAPS_BOOT_MENU, @@ -192,7 +191,6 @@ mymain(void) QEMU_CAPS_DRIVE_SERIAL, QEMU_CAPS_MEM_PATH, QEMU_CAPS_SDL, - QEMU_CAPS_CHARDEV, QEMU_CAPS_ENABLE_KVM, QEMU_CAPS_RTC, QEMU_CAPS_NO_HPET, @@ -230,7 +228,6 @@ mymain(void) QEMU_CAPS_DRIVE_SERIAL, QEMU_CAPS_MEM_PATH, QEMU_CAPS_SDL, - QEMU_CAPS_CHARDEV, QEMU_CAPS_ENABLE_KVM, QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_NETDEV, @@ -277,7 +274,6 @@ mymain(void) QEMU_CAPS_DRIVE_SERIAL, QEMU_CAPS_MEM_PATH, QEMU_CAPS_SDL, - QEMU_CAPS_CHARDEV, QEMU_CAPS_ENABLE_KVM, QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_NETDEV, @@ -348,7 +344,6 @@ mymain(void) QEMU_CAPS_DRIVE_SERIAL, QEMU_CAPS_MEM_PATH, QEMU_CAPS_SDL, - QEMU_CAPS_CHARDEV, QEMU_CAPS_ENABLE_KVM, QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_NETDEV, diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 626aebfed..af0b9314e 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -739,7 +739,7 @@ mymain(void) DO_TEST("reboot-timeout-enabled", QEMU_CAPS_REBOOT_TIMEOUT); DO_TEST_FAILURE("reboot-timeout-enabled", NONE); - DO_TEST("bios", QEMU_CAPS_SGA, QEMU_CAPS_CHARDEV); + DO_TEST("bios", QEMU_CAPS_SGA); DO_TEST("bios-nvram", NONE); DO_TEST("bios-nvram-secure", QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, @@ -774,7 +774,7 @@ mymain(void) QEMU_CAPS_KVM, QEMU_CAPS_ENABLE_KVM, QEMU_CAPS_BOOT_MENU, QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_DRIVE_AIO, - QEMU_CAPS_CCID_PASSTHRU, QEMU_CAPS_CHARDEV, + QEMU_CAPS_CCID_PASSTHRU, QEMU_CAPS_CHARDEV_SPICEVMC, QEMU_CAPS_SPICE, QEMU_CAPS_HDA_DUPLEX, QEMU_CAPS_USB_HUB, QEMU_CAPS_DEVICE_CIRRUS_VGA); @@ -1085,7 +1085,7 @@ mymain(void) QEMU_CAPS_DEVICE_QXL); DO_TEST("graphics-spice-usb-redir", QEMU_CAPS_SPICE, - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_USB_HUB, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_USB_REDIR, QEMU_CAPS_CHARDEV_SPICEVMC, QEMU_CAPS_DEVICE_CIRRUS_VGA); @@ -1168,48 +1168,47 @@ mymain(void) QEMU_CAPS_DEVICE_VFIO_PCI); - DO_TEST("serial-file-log", QEMU_CAPS_CHARDEV, QEMU_CAPS_CHARDEV_FILE_APPEND, + DO_TEST("serial-file-log", QEMU_CAPS_CHARDEV_FILE_APPEND, QEMU_CAPS_CHARDEV_LOGFILE); DO_TEST("serial-spiceport", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEPORT); DO_TEST("serial-spiceport-nospice", NONE); - DO_TEST("console-compat", QEMU_CAPS_CHARDEV); - DO_TEST("console-compat-auto", QEMU_CAPS_CHARDEV); + DO_TEST("console-compat", NONE); + DO_TEST("console-compat-auto", NONE); DO_TEST("serial-vc-chardev", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_NODEFCONFIG); DO_TEST("serial-pty-chardev", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_NODEFCONFIG); DO_TEST("serial-dev-chardev", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_NODEFCONFIG); DO_TEST("serial-dev-chardev-iobase", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_NODEFCONFIG); DO_TEST("serial-file-chardev", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_CHARDEV_FILE_APPEND); DO_TEST("serial-unix-chardev", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_NODEFCONFIG); DO_TEST("serial-tcp-chardev", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_NODEFCONFIG); DO_TEST("serial-udp-chardev", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_NODEFCONFIG); DO_TEST("serial-tcp-telnet-chardev", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_NODEFCONFIG); driver.config->chardevTLS = 1; DO_TEST("serial-tcp-tlsx509-chardev", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_OBJECT_TLS_CREDS_X509); driver.config->chardevTLSx509verify = 1; DO_TEST("serial-tcp-tlsx509-chardev-verify", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_OBJECT_TLS_CREDS_X509); driver.config->chardevTLSx509verify = 0; DO_TEST("serial-tcp-tlsx509-chardev-notls", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_OBJECT_TLS_CREDS_X509); VIR_FREE(driver.config->chardevTLSx509certdir); if (VIR_STRDUP_QUIET(driver.config->chardevTLSx509certdir, "/etc/pki/libvirt-chardev") < 0) @@ -1219,54 +1218,54 @@ mymain(void) return EXIT_FAILURE; # ifdef HAVE_GNUTLS_CIPHER_ENCRYPT DO_TEST("serial-tcp-tlsx509-secret-chardev", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_OBJECT_SECRET, QEMU_CAPS_OBJECT_TLS_CREDS_X509); # else DO_TEST_FAILURE("serial-tcp-tlsx509-secret-chardev", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_OBJECT_SECRET, QEMU_CAPS_OBJECT_TLS_CREDS_X509); # endif driver.config->chardevTLS = 0; VIR_FREE(driver.config->chardevTLSx509certdir); DO_TEST("serial-many-chardev", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_NODEFCONFIG); DO_TEST("parallel-tcp-chardev", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_NODEFCONFIG); DO_TEST("parallel-parport-chardev", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_NODEFCONFIG); DO_TEST("console-compat-chardev", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_NODEFCONFIG); DO_TEST("pci-serial-dev-chardev", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_PCI_SERIAL); DO_TEST("channel-guestfwd", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_NODEFCONFIG); DO_TEST("channel-virtio", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_NODEFCONFIG); DO_TEST("channel-virtio-state", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_NODEFCONFIG); DO_TEST("channel-virtio-auto", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_NODEFCONFIG); DO_TEST("channel-virtio-autoassign", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_NODEFCONFIG); DO_TEST("channel-virtio-autoadd", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_NODEFCONFIG); DO_TEST("console-virtio", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_NODEFCONFIG); DO_TEST("console-virtio-many", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_NODEFCONFIG); DO_TEST("console-virtio-s390", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_S390); DO_TEST("console-virtio-ccw", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390); DO_TEST("console-sclp", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_SCLP_S390); DO_TEST("channel-spicevmc", QEMU_CAPS_NODEFCONFIG, @@ -1277,113 +1276,108 @@ mymain(void) QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_SPICEVMC, QEMU_CAPS_DEVICE_CIRRUS_VGA); DO_TEST("channel-virtio-default", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEVMC); DO_TEST("channel-virtio-unix", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_NODEFCONFIG); DO_TEST("smartcard-host", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_CCID_EMULATED); DO_TEST("smartcard-host-certificates", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_CCID_EMULATED); DO_TEST("smartcard-passthrough-tcp", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_CCID_PASSTHRU); DO_TEST("smartcard-passthrough-spicevmc", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_CCID_PASSTHRU, QEMU_CAPS_CHARDEV_SPICEVMC); DO_TEST("smartcard-controller", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_CCID_EMULATED); DO_TEST("usb-controller", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); DO_TEST("usb-piix3-controller", - QEMU_CAPS_CHARDEV, QEMU_CAPS_PIIX3_USB_UHCI, + QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_NODEFCONFIG); DO_TEST("usb-ich9-ehci-addr", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1); DO_TEST("input-usbmouse-addr", QEMU_CAPS_NODEFCONFIG); DO_TEST("usb-ich9-companion", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1); DO_TEST_PARSE_ERROR("usb-ich9-no-companion", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1); DO_TEST("usb-ich9-autoassign", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_USB_HUB); DO_TEST("usb-hub", - QEMU_CAPS_CHARDEV, QEMU_CAPS_USB_HUB, + QEMU_CAPS_USB_HUB, QEMU_CAPS_NODEFCONFIG); DO_TEST("usb-hub-autoadd", - QEMU_CAPS_CHARDEV, QEMU_CAPS_USB_HUB, + QEMU_CAPS_USB_HUB, QEMU_CAPS_NODEFCONFIG); DO_TEST("usb-hub-autoadd-deluxe", - QEMU_CAPS_CHARDEV, QEMU_CAPS_USB_HUB, + QEMU_CAPS_USB_HUB, QEMU_CAPS_NODEFCONFIG); DO_TEST_PARSE_ERROR("usb-hub-conflict", - QEMU_CAPS_CHARDEV, QEMU_CAPS_USB_HUB, + QEMU_CAPS_USB_HUB, QEMU_CAPS_NODEFCONFIG); DO_TEST_PARSE_ERROR("usb-hub-nonexistent", - QEMU_CAPS_CHARDEV, QEMU_CAPS_USB_HUB, + QEMU_CAPS_USB_HUB, QEMU_CAPS_NODEFCONFIG); DO_TEST("usb-port-missing", - QEMU_CAPS_CHARDEV, QEMU_CAPS_USB_HUB, + QEMU_CAPS_USB_HUB, QEMU_CAPS_NODEFCONFIG); DO_TEST_PARSE_ERROR("usb-bus-missing", - QEMU_CAPS_CHARDEV, QEMU_CAPS_USB_HUB, + QEMU_CAPS_USB_HUB, QEMU_CAPS_NODEFCONFIG); DO_TEST("usb-ports", - QEMU_CAPS_CHARDEV, QEMU_CAPS_USB_HUB, + QEMU_CAPS_USB_HUB, QEMU_CAPS_NODEFCONFIG); DO_TEST_PARSE_ERROR("usb-ports-out-of-range", - QEMU_CAPS_CHARDEV, QEMU_CAPS_USB_HUB, + QEMU_CAPS_USB_HUB, QEMU_CAPS_NODEFCONFIG); DO_TEST("usb-port-autoassign", - QEMU_CAPS_CHARDEV, QEMU_CAPS_USB_HUB, + QEMU_CAPS_USB_HUB, QEMU_CAPS_NODEFCONFIG); DO_TEST("usb-redir", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_USB_HUB, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_USB_REDIR, QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEVMC); DO_TEST("usb-redir-boot", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_USB_HUB, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_USB_REDIR, QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEVMC, QEMU_CAPS_BOOTINDEX, QEMU_CAPS_USB_REDIR_BOOTINDEX); DO_TEST("usb-redir-filter", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_USB_HUB, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_USB_REDIR, QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEVMC, QEMU_CAPS_USB_REDIR_FILTER); DO_TEST("usb-redir-filter-version", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_USB_REDIR, QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEVMC, QEMU_CAPS_USB_REDIR_FILTER); DO_TEST("usb1-usb2", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_USB_HUB, QEMU_CAPS_ICH9_USB_EHCI1); DO_TEST("usb-none", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_NODEFCONFIG); DO_TEST_PARSE_ERROR("usb-none-other", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_NODEFCONFIG); DO_TEST_PARSE_ERROR("usb-none-hub", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_USB_HUB); DO_TEST_PARSE_ERROR("usb-none-usbtablet", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_NODEFCONFIG); DO_TEST("usb-controller-default-q35", QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_PCI_OHCI, @@ -1403,14 +1397,14 @@ mymain(void) QEMU_CAPS_PCI_OHCI, QEMU_CAPS_PIIX3_USB_UHCI); DO_TEST("usb-controller-xhci", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PIIX3_USB_UHCI, + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_NEC_USB_XHCI, QEMU_CAPS_NEC_USB_XHCI_PORTS); DO_TEST("usb-xhci-autoassign", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PIIX3_USB_UHCI, + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_NEC_USB_XHCI, QEMU_CAPS_NEC_USB_XHCI_PORTS, QEMU_CAPS_USB_HUB); DO_TEST_PARSE_ERROR("usb-controller-xhci-limit", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PIIX3_USB_UHCI, + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_NEC_USB_XHCI, QEMU_CAPS_NEC_USB_XHCI_PORTS); DO_TEST("usb-controller-qemu-xhci", QEMU_CAPS_DEVICE_QEMU_XHCI); DO_TEST_FAILURE("usb-controller-qemu-xhci-unavailable", NONE); @@ -1426,7 +1420,7 @@ mymain(void) DO_TEST("watchdog-dump", NONE); DO_TEST("watchdog-injectnmi", NONE); DO_TEST("watchdog-diag288", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_S390); DO_TEST("balloon-device", QEMU_CAPS_NODEFCONFIG); DO_TEST("balloon-device-deflate", QEMU_CAPS_NODEFCONFIG, @@ -1624,9 +1618,9 @@ mymain(void) QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_SCSI_LSI); DO_TEST("monitor-json", - QEMU_CAPS_CHARDEV, QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_NODEFCONFIG); DO_TEST("no-shutdown", - QEMU_CAPS_CHARDEV, QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_NO_SHUTDOWN); DO_TEST("seclabel-dynamic", NONE); @@ -1643,48 +1637,46 @@ mymain(void) DO_TEST_PARSE_ERROR("seclabel-device-duplicates", NONE); DO_TEST("pseries-basic", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_NODEFCONFIG); DO_TEST("pseries-vio", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_NODEFCONFIG); DO_TEST("pseries-usb-default", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_PCI_OHCI, QEMU_CAPS_PCI_MULTIFUNCTION); DO_TEST("pseries-usb-multi", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_PCI_OHCI, QEMU_CAPS_PCI_MULTIFUNCTION); DO_TEST("pseries-vio-user-assigned", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_NODEFCONFIG); DO_TEST_PARSE_ERROR("pseries-vio-address-clash", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_NODEFCONFIG); DO_TEST("pseries-nvram", QEMU_CAPS_DEVICE_NVRAM); DO_TEST("pseries-usb-kbd", QEMU_CAPS_PCI_OHCI, - QEMU_CAPS_DEVICE_USB_KBD, QEMU_CAPS_CHARDEV, + QEMU_CAPS_DEVICE_USB_KBD, QEMU_CAPS_NODEFCONFIG); - DO_TEST("pseries-cpu-exact", QEMU_CAPS_CHARDEV, + DO_TEST("pseries-cpu-exact", QEMU_CAPS_NODEFCONFIG); qemuTestSetHostArch(driver.caps, VIR_ARCH_PPC64); DO_TEST("pseries-cpu-compat", QEMU_CAPS_KVM, - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_NODEFCONFIG); DO_TEST("pseries-cpu-le", QEMU_CAPS_KVM, - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_NODEFCONFIG); DO_TEST_FAILURE("pseries-cpu-compat-power9", QEMU_CAPS_KVM); qemuTestSetHostCPU(driver.caps, cpuPower9); DO_TEST("pseries-cpu-compat-power9", - QEMU_CAPS_KVM, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_KVM, QEMU_CAPS_NODEFCONFIG); qemuTestSetHostCPU(driver.caps, NULL); qemuTestSetHostArch(driver.caps, VIR_ARCH_NONE); DO_TEST("pseries-panic-missing", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_NODEFCONFIG); DO_TEST("pseries-panic-no-address", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_NODEFCONFIG); DO_TEST_FAILURE("pseries-panic-address", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_NODEFCONFIG); DO_TEST("disk-ide-drive-split", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_IDE_CD); @@ -1766,32 +1758,32 @@ mymain(void) DO_TEST_PARSE_ERROR("virtio-rng-egd-crash", QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_EGD); DO_TEST("virtio-rng-ccw", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); DO_TEST("s390-allow-bogus-usb-none", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); DO_TEST("s390-allow-bogus-usb-controller", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); DO_TEST("s390-panic-no-address", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390); DO_TEST_FAILURE("s390-panic-address", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390); DO_TEST("s390-panic-missing", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390); DO_TEST("ppc-dtb", QEMU_CAPS_KVM, QEMU_CAPS_DTB); - DO_TEST("ppce500-serial", QEMU_CAPS_KVM, QEMU_CAPS_CHARDEV); + DO_TEST("ppce500-serial", QEMU_CAPS_KVM); DO_TEST("tpm-passthrough", QEMU_CAPS_DEVICE_TPM_PASSTHROUGH, QEMU_CAPS_DEVICE_TPM_TIS); @@ -2001,7 +1993,6 @@ mymain(void) QEMU_CAPS_DEVICE_VIDEO_PRIMARY); DO_TEST("q35-virt-manager-basic", QEMU_CAPS_KVM, - QEMU_CAPS_CHARDEV, QEMU_CAPS_RTC, QEMU_CAPS_ICH9_DISABLE_S3, QEMU_CAPS_ICH9_DISABLE_S4, @@ -2334,7 +2325,7 @@ mymain(void) QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_KVM); DO_TEST("aarch64-pci-serial", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_CHARDEV, + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_PCI_SERIAL, QEMU_CAPS_CHARDEV_LOGFILE, QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_PCI_MULTIFUNCTION, @@ -2528,16 +2519,15 @@ mymain(void) NONE); DO_TEST("name-escape", QEMU_CAPS_NAME_DEBUG_THREADS, - QEMU_CAPS_OBJECT_SECRET, QEMU_CAPS_CHARDEV, QEMU_CAPS_VNC, + QEMU_CAPS_OBJECT_SECRET, QEMU_CAPS_VNC, QEMU_CAPS_NAME_GUEST, QEMU_CAPS_DEVICE_CIRRUS_VGA, QEMU_CAPS_SPICE, QEMU_CAPS_SPICE_UNIX); DO_TEST("debug-threads", QEMU_CAPS_NAME_DEBUG_THREADS); DO_TEST("master-key", QEMU_CAPS_OBJECT_SECRET); - DO_TEST("usb-long-port-path", QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, + DO_TEST("usb-long-port-path", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_USB_HUB); DO_TEST_PARSE_ERROR("usb-too-long-port-path-invalid", - QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_USB_HUB); DO_TEST("acpi-table", NONE);

[10/12] qemu: caps: blacklist QEMU_CAPS_CHARDEV

Commit Message

Comments

Patch