August 2018 - Devel - Libvirt List Archives

[libvirt] [jenkins-ci PATCH 0/6] Some coverage fixes and improvements

by Andrea Bolognani

We were installing some unnecessary packages and not building projects on as many platforms as possible. Let's fix that :) Andrea Bolognani (6): guests: Don't prepare Ubuntu 16.04 for virt-manager guests: Don't prepare CentOS 7 for libvirt-sandbox guests: Prepare Debian 8 for libvirt-sandbox projects: Build libvirt-sandbox on Debian 8 guests: Prepare Debian 8 for libvirt-dbus projects: Build libvirt-dbus on Debian 8 guests/host_vars/libvirt-centos-7/main.yml | 1 - guests/host_vars/libvirt-debian-8/main.yml | 2 ++ guests/host_vars/libvirt-ubuntu-16/main.yml | 1 - projects/libvirt-dbus.yaml | 1 + projects/libvirt-sandbox.yaml | 1 + 5 files changed, 4 insertions(+), 2 deletions(-) -- 2.17.1

6 years, 3 months

2
12
0 / 0

[libvirt] [PATCH] storage: add wipeVol to iscsi-direct storage backend

by clem＠lse.epita.fr

From: Clementine Hayat <clem(a)lse.epita.fr> Change set volume capacity to get volume capacity to avoid code duplicate. Signed-off-by: Clementine Hayat <clem(a)lse.epita.fr> --- Set BLOCK_PER_PACKET to 128. Not sure about this value. Should be potentially tuned. src/storage/storage_backend_iscsi_direct.c | 152 +++++++++++++++++++-- 1 file changed, 143 insertions(+), 9 deletions(-) diff --git a/src/storage/storage_backend_iscsi_direct.c b/src/storage/storage_backend_iscsi_direct.c index 0764356b62..094425c101 100644 --- a/src/storage/storage_backend_iscsi_direct.c +++ b/src/storage/storage_backend_iscsi_direct.c @@ -41,6 +41,7 @@ #define ISCSI_DEFAULT_TARGET_PORT 3260 #define VIR_ISCSI_TEST_UNIT_TIMEOUT 30 * 1000 +#define BLOCK_PER_PACKET 128 VIR_LOG_INIT("storage.storage_backend_iscsi_direct"); @@ -237,13 +238,13 @@ virISCSIDirectSetVolumeAttributes(virStoragePoolObjPtr pool, } static int -virISCSIDirectSetVolumeCapacity(struct iscsi_context *iscsi, - virStorageVolDefPtr vol, - int lun) +virISCSIDirectGetVolumeCapacity(struct iscsi_context *iscsi, + int lun, + uint32_t *block_size, + uint32_t *nb_block) { struct scsi_task *task = NULL; struct scsi_inquiry_standard *inq = NULL; - long long size = 0; int ret = -1; if (!(task = iscsi_inquiry_sync(iscsi, lun, 0, 0, 64)) || @@ -282,10 +283,8 @@ virISCSIDirectSetVolumeCapacity(struct iscsi_context *iscsi, goto cleanup; } - size = rc10->block_size; - size *= rc10->lba; - vol->target.capacity = size; - vol->target.allocation = size; + *block_size = rc10->block_size; + *nb_block = rc10->lba; } @@ -303,6 +302,8 @@ virISCSIDirectRefreshVol(virStoragePoolObjPtr pool, { virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); virStorageVolDefPtr vol = NULL; + uint32_t block_size; + uint32_t nb_block; int ret = -1; virStoragePoolObjClearVols(pool); @@ -314,9 +315,12 @@ virISCSIDirectRefreshVol(virStoragePoolObjPtr pool, vol->type = VIR_STORAGE_VOL_NETWORK; - if (virISCSIDirectSetVolumeCapacity(iscsi, vol, lun) < 0) + if (virISCSIDirectGetVolumeCapacity(iscsi, lun, + &block_size, &nb_block) < 0) goto cleanup; + vol->target.capacity = block_size * nb_block; + vol->target.allocation = block_size * nb_block; def->capacity += vol->target.capacity; def->allocation += vol->target.allocation; @@ -584,12 +588,142 @@ virStorageBackendISCSIDirectRefreshPool(virStoragePoolObjPtr pool) return ret; } +static int +virStorageBackendISCSIDirectGetLun(virStorageVolDefPtr vol, + int *lun) +{ + char *name = NULL; + char **name_split = NULL; + int ret = -1; + + if (VIR_STRDUP(name, vol->name) < 0) + return -1; + if (!(name_split = virStringSplit(name, ":", 4))) + goto cleanup; + if (!name_split[3]) + goto cleanup; + if (virStrToLong_i(name_split[3], NULL, 10, lun) < 0) + goto cleanup; + + ret = 0; + cleanup: + VIR_FREE(name); + virStringListFree(name_split); + printf("\n"); + return ret; +} + +static int +virStorageBackendISCSIDirectVolWipeZero(virStorageVolDefPtr vol, + struct iscsi_context *iscsi) +{ + uint32_t lba = 0; + uint32_t block_size; + uint32_t nb_block; + struct scsi_task *task = NULL; + int lun = 0; + int ret = -1; + unsigned char *data; + + if (virStorageBackendISCSIDirectGetLun(vol, &lun) < 0) + return ret; + if (virISCSIDirectTestUnitReady(iscsi, lun) < 0) + return ret; + if (virISCSIDirectGetVolumeCapacity(iscsi, lun, &block_size, &nb_block)) + return ret; + if (VIR_ALLOC_N(data, block_size * BLOCK_PER_PACKET)) + return ret; + + while (lba < nb_block) { + if (nb_block - lba > block_size * BLOCK_PER_PACKET) { + if (!(task = iscsi_write10_sync(iscsi, lun, lba, data, + block_size * BLOCK_PER_PACKET, + block_size, 0, 0, 0, 0, 0))) + goto cleanup; + scsi_free_scsi_task(task); + lba += BLOCK_PER_PACKET; + } + else { + if (!(task = iscsi_write10_sync(iscsi, lun, lba, data, block_size, + block_size, 0, 0, 0, 0, 0))) + goto cleanup; + scsi_free_scsi_task(task); + lba++; + } + } + + ret = 0; + cleanup: + VIR_FREE(data); + return ret; +} + +static int +virStorageBackenISCSIDirectWipeVol(virStoragePoolObjPtr pool, + virStorageVolDefPtr vol, + unsigned int algorithm, + unsigned int flags) +{ + virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); + struct iscsi_context *iscsi = NULL; + char *portal = NULL; + int ret = -1; + + virCheckFlags(0, -1); + + if (!(iscsi = virISCSIDirectCreateContext(def->source.initiator.iqn))) + goto cleanup; + if (!(portal = virStorageBackendISCSIDirectPortal(&def->source))) + goto cleanup; + if (virStorageBackendISCSIDirectSetAuth(iscsi, &def->source) < 0) + goto cleanup; + if (virISCSIDirectSetContext(iscsi, def->source.devices[0].path, ISCSI_SESSION_NORMAL) < 0) + goto cleanup; + if (virISCSIDirectConnect(iscsi, portal) < 0) + goto cleanup; + + + switch ((virStorageVolWipeAlgorithm) algorithm) { + case VIR_STORAGE_VOL_WIPE_ALG_ZERO: + if (virStorageBackendISCSIDirectVolWipeZero(vol, iscsi) < 0) { + virReportSystemError(VIR_ERR_INTERNAL_ERROR, + _("failed to wipe volume %s"), + vol->name); + goto disconnect; + } + break; + case VIR_STORAGE_VOL_WIPE_ALG_TRIM: + case VIR_STORAGE_VOL_WIPE_ALG_NNSA: + case VIR_STORAGE_VOL_WIPE_ALG_DOD: + case VIR_STORAGE_VOL_WIPE_ALG_BSI: + case VIR_STORAGE_VOL_WIPE_ALG_GUTMANN: + case VIR_STORAGE_VOL_WIPE_ALG_SCHNEIER: + case VIR_STORAGE_VOL_WIPE_ALG_PFITZNER7: + case VIR_STORAGE_VOL_WIPE_ALG_PFITZNER33: + case VIR_STORAGE_VOL_WIPE_ALG_RANDOM: + case VIR_STORAGE_VOL_WIPE_ALG_LAST: + virReportError(VIR_ERR_INVALID_ARG, _("unsupported algorithm %d"), + algorithm); + goto disconnect; + } + + ret = 0; + disconnect: + virISCSIDirectDisconnect(iscsi); + cleanup: + VIR_FREE(portal); + iscsi_destroy_context(iscsi); + return ret; +} + + virStorageBackend virStorageBackendISCSIDirect = { .type = VIR_STORAGE_POOL_ISCSI_DIRECT, .checkPool = virStorageBackendISCSIDirectCheckPool, .findPoolSources = virStorageBackendISCSIDirectFindPoolSources, .refreshPool = virStorageBackendISCSIDirectRefreshPool, + .wipeVol = virStorageBackenISCSIDirectWipeVol, }; int -- 2.18.0

6 years, 3 months

2
1
0 / 0

[libvirt] [PATCH v1 0/6] Introduce metadata locking

by Michal Privoznik

All patches are for: https://bugzilla.redhat.com/show_bug.cgi?id=1524792 You can find them on my Github too: https://github.com/zippy2/libvirt/tree/disk_metadata_lock_alt The locking by itself make very little sense. I have a patches waiting that implement restoring original seclabels using XATTRs, that should go on the top of these and can be also found on my Github: https://github.com/zippy2/libvirt/tree/seclabels But those are for different bug therefore I'll send them separately. And a bit of warning, I haven't bothered implementing this feature into sanlock driver. The main reason for that was that we tell users to prefer virtlockd over sanlock and if we really want them to switch lets do it by the former offering more features than the latter. Michal Prívozník (6): virlockspace: Introduce VIR_LOCK_SPACE_ACQUIRE_METADATA flag lock_driver.h: Introduce metadata flag lockd_driver_lockd: Implement metadata flag lock_driver_sanlock: Handle metadata flag gracefully domain_lock: Implement metadata locking qemu_security: Lock metadata while relabelling src/libvirt_private.syms | 8 + src/locking/domain_lock.c | 304 ++++++++++++++++++++++++++++++++++--- src/locking/domain_lock.h | 28 ++++ src/locking/lock_daemon_dispatch.c | 5 +- src/locking/lock_driver.h | 2 + src/locking/lock_driver_lockd.c | 31 ++-- src/locking/lock_driver_lockd.h | 1 + src/locking/lock_driver_sanlock.c | 25 ++- src/qemu/qemu_security.c | 107 +++++++++++++ src/util/virlockspace.c | 40 ++++- src/util/virlockspace.h | 1 + 11 files changed, 504 insertions(+), 48 deletions(-) -- 2.16.4

6 years, 3 months

2
7
0 / 0

[libvirt] [PATCH] Fix link errors in tools/nss and tests

by Jim Fehlig

While local builds succeed fine, a build worker building in a chroot environment is encountering errors when linking some items in tools/nss and tests, e.g. [ 469s] libtool: link: gcc -shared -fPIC -DPIC -Wl,--whole-archive nss/.libs/libnss_libvirt_impl.a -Wl,--no-whole-archive -lpthread -lutil -ltirpc -fstack-protector-strong -grecord-gcc-switches -O2 -fstack-protector-strong -g -Wl,--version-script=./nss/libvirt_nss.syms -Wl,-z -Wl,relro -Wl,-z -Wl,now -Wl,--no-copy-dt-needed-entries -Wl,-z -Wl,defs -grecord-gcc-switches -O2 -fstack-protector-strong -g -pthread -Wl,-soname -Wl,libnss_libvirt.so.2 -o nss/.libs/libnss_libvirt.so.2 [ 469s] nss/.libs/libnss_libvirt_impl.a(libvirt_nss_la-virjsoncompat.o): In function `virJSONJanssonOnce': [ 469s] /home/abuild/rpmbuild/BUILD/libvirt-4.6.0/src/util/virjsoncompat.c:63: undefined reference to `dlopen' [ 469s] /home/abuild/rpmbuild/BUILD/libvirt-4.6.0/src/util/virjsoncompat.c:79: undefined reference to `dlsym' ... A similar problem was fixed in commit b018ada3 and inspires this fix. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- tools/Makefile.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 1452d984a0..26c887649e 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -527,7 +527,8 @@ nss_libnss_libvirt_impl_la_CFLAGS = \ nss_libnss_libvirt_impl_la_LIBADD = \ ../gnulib/lib/libgnu.la \ - ../src/libvirt-nss.la + ../src/libvirt-nss.la \ + $(DLOPEN_LIBS) nss_libnss_libvirt_la_SOURCES = nss_libnss_libvirt_la_LDFLAGS = \ @@ -554,7 +555,8 @@ nss_libnss_libvirt_guest_impl_la_CFLAGS = \ nss_libnss_libvirt_guest_impl_la_LIBADD = \ ../gnulib/lib/libgnu.la \ - ../src/libvirt-nss.la + ../src/libvirt-nss.la \ + $(DLOPEN_LIBS) nss_libnss_libvirt_guest_la_SOURCES = nss_libnss_libvirt_guest_la_LDFLAGS = \ -- 2.18.0

6 years, 3 months

3
4
0 / 0

[libvirt] [PATCH 0/3] libxl: implement virDomainPM* functions

by Marek Marczykowski-Górecki

Needed libxl_domain_suspend_only is supported in Xen >= 4.11. But wakeup should work with older versions. Marek Marczykowski-Górecki (3): libxl: send lifecycle event on suspend libxl: implement virDomainPM* functions libxl: initialize domain state with real data src/libxl/libxl_domain.c | 20 +++--- src/libxl/libxl_driver.c | 137 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 149 insertions(+), 8 deletions(-) base-commit: 3ad77f853230f870efa396636e008292c7f2b1c0 -- git-series 0.9.1

6 years, 3 months

2
6
0 / 0

[libvirt] [PATCH] Fix libvirt-driver-libxl check

by Marek Marczykowski-Górecki

Fix saving CFLAGS in LIBVIRT_DRIVER_CHECK_LIBXL - LIBVIRT_CHECK_LIB will override old_CFLAGS, so use a different name. Signed-off-by: Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com> --- m4/virt-driver-libxl.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/m4/virt-driver-libxl.m4 b/m4/virt-driver-libxl.m4 index 2cc1c062d8..90338eb306 100644 --- a/m4/virt-driver-libxl.m4 +++ b/m4/virt-driver-libxl.m4 @@ -46,10 +46,10 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_LIBXL], [ dnl The libxl driver will make use of this new parameter for specifying dnl the Xen migration stream version. Specify LIBXL_API_VERSION to trigger dnl an error if there is too old xenlight - old_CFLAGS="$CFLAGS" + libxlold_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $LIBXL_API_VERSION" LIBVIRT_CHECK_LIB([LIBXL], [xenlight], [libxl_ctx_alloc], [libxl.h], [fail="1"]) - CFLAGS="$old_CFLAGS" + CFLAGS="$libxlold_CFLAGS" if test $fail = 1; then AC_MSG_ERROR([You must install the libxl Library from Xen >= 4.4 to compile libxenlight driver with -lxl]) -- 2.17.1

6 years, 3 months

2
1
0 / 0

[libvirt] [PATCH] qemuBuildBootCommandLine: remove unused boot_order_str

by Ján Tomko

After commit caccbba this variable is always NULL. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/qemu/qemu_command.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 65bd88a652..12ff09d46d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6457,7 +6457,7 @@ qemuBuildBootCommandLine(virCommandPtr cmd, virQEMUCapsPtr qemuCaps) { virBuffer boot_buf = VIR_BUFFER_INITIALIZER; - char *boot_order_str = NULL, *boot_opts_str = NULL; + char *boot_opts_str = NULL; if (def->os.bootmenu) { if (def->os.bootmenu == VIR_TRISTATE_BOOL_YES) @@ -6499,20 +6499,11 @@ qemuBuildBootCommandLine(virCommandPtr cmd, goto error; boot_opts_str = virBufferContentAndReset(&boot_buf); - if (boot_order_str || boot_opts_str) { + if (boot_opts_str) { virCommandAddArg(cmd, "-boot"); - - if (boot_order_str && boot_opts_str) { - virCommandAddArgFormat(cmd, "order=%s,%s", - boot_order_str, boot_opts_str); - } else if (boot_order_str) { - virCommandAddArg(cmd, boot_order_str); - } else if (boot_opts_str) { - virCommandAddArg(cmd, boot_opts_str); - } + virCommandAddArg(cmd, boot_opts_str); } VIR_FREE(boot_opts_str); - VIR_FREE(boot_order_str); if (def->os.kernel) virCommandAddArgList(cmd, "-kernel", def->os.kernel, NULL); @@ -6533,7 +6524,6 @@ qemuBuildBootCommandLine(virCommandPtr cmd, return 0; error: - VIR_FREE(boot_order_str); VIR_FREE(boot_opts_str); virBufferFreeAndReset(&boot_buf); return -1; -- 2.16.1

6 years, 3 months

2
1
0 / 0

[libvirt] [PATCH] network: restrict usage of port management APIs

by Daniel P. Berrangé

The port allocation APIs are currently called unconditionally for all types of NIC, but (mostly) only do anything for NICs with type=network. The exception is the port allocate API which does some validation even for NICs with type!=network. Relying on this validation is flawed, however, since the network driver may not even be installed, so virt drivers must not delegation validation to it for NICs with type!=network. This change allows us to report errors when the virtual network driver is not registered. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/conf/domain_conf.c | 12 +++++------- src/libxl/libxl_domain.c | 6 ++++-- src/libxl/libxl_driver.c | 9 ++++++--- src/lxc/lxc_driver.c | 6 ++++-- src/lxc/lxc_process.c | 10 ++++++++-- src/network/bridge_driver.c | 22 +++++++++++++++------- src/qemu/qemu_hotplug.c | 17 +++++++++++------ src/qemu/qemu_process.c | 9 ++++++--- 8 files changed, 59 insertions(+), 32 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index adcd8f41b9..e7d2acdcc9 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -29947,13 +29947,11 @@ int virDomainNetAllocateActualDevice(virDomainDefPtr dom, virDomainNetDefPtr iface) { - /* Just silently ignore if network driver isn't present. If something - * has tried to use a NIC with type=network, other code will already - * cause an error. This ensures type=bridge doesn't break when - * network driver is compiled out. - */ - if (!netAllocate) - return 0; + if (!netAllocate) { + virReportError(VIR_ERR_NO_SUPPORT, "%s", + _("Virtual networking driver is not available")); + return -1; + } return netAllocate(dom, iface); } diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 2ab78ac9a5..c78d5ee96c 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -791,7 +791,8 @@ libxlDomainCleanup(libxlDriverPrivatePtr driver, /* cleanup actual device */ virDomainNetRemoveHostdev(vm->def, net); - virDomainNetReleaseActualDevice(vm->def, net); + if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) + virDomainNetReleaseActualDevice(vm->def, net); } } @@ -948,7 +949,8 @@ libxlNetworkPrepareDevices(virDomainDefPtr def) * network's pool of devices, or resolve bridge device name * to the one defined in the network definition. */ - if (virDomainNetAllocateActualDevice(def, net) < 0) + if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK && + virDomainNetAllocateActualDevice(def, net) < 0) return -1; actualType = virDomainNetGetActualType(net); diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 5a5e792957..fb5f046ade 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3264,7 +3264,8 @@ libxlDomainAttachNetDevice(libxlDriverPrivatePtr driver, * network's pool of devices, or resolve bridge device name * to the one defined in the network definition. */ - if (virDomainNetAllocateActualDevice(vm->def, net) < 0) + if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK && + virDomainNetAllocateActualDevice(vm->def, net) < 0) goto cleanup; actualType = virDomainNetGetActualType(net); @@ -3314,7 +3315,8 @@ libxlDomainAttachNetDevice(libxlDriverPrivatePtr driver, vm->def->nets[vm->def->nnets++] = net; } else { virDomainNetRemoveHostdev(vm->def, net); - virDomainNetReleaseActualDevice(vm->def, net); + if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) + virDomainNetReleaseActualDevice(vm->def, net); } virObjectUnref(cfg); return ret; @@ -3737,7 +3739,8 @@ libxlDomainDetachNetDevice(libxlDriverPrivatePtr driver, cleanup: libxl_device_nic_dispose(&nic); if (!ret) { - virDomainNetReleaseActualDevice(vm->def, detach); + if (detach->type == VIR_DOMAIN_NET_TYPE_NETWORK) + virDomainNetReleaseActualDevice(vm->def, detach); virDomainNetRemove(vm->def, detachidx); } virObjectUnref(cfg); diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 8867645cdc..8729fc0174 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3871,7 +3871,8 @@ lxcDomainAttachDeviceNetLive(virConnectPtr conn, * network's pool of devices, or resolve bridge device name * to the one defined in the network definition. */ - if (virDomainNetAllocateActualDevice(vm->def, net) < 0) + if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK && + virDomainNetAllocateActualDevice(vm->def, net) < 0) return -1; actualType = virDomainNetGetActualType(net); @@ -4425,7 +4426,8 @@ lxcDomainDetachDeviceNetLive(virDomainObjPtr vm, ret = 0; cleanup: if (!ret) { - virDomainNetReleaseActualDevice(vm->def, detach); + if (detach->type == VIR_DOMAIN_NET_TYPE_NETWORK) + virDomainNetReleaseActualDevice(vm->def, detach); virDomainNetRemove(vm->def, detachidx); virDomainNetDefFree(detach); } diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 33c806630b..7a6b40d9b8 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -213,7 +213,8 @@ static void virLXCProcessCleanup(virLXCDriverPtr driver, iface->ifname)); ignore_value(virNetDevVethDelete(iface->ifname)); } - virDomainNetReleaseActualDevice(vm->def, iface); + if (iface->type == VIR_DOMAIN_NET_TYPE_NETWORK) + virDomainNetReleaseActualDevice(vm->def, iface); } virDomainConfVMNWFilterTeardown(vm); @@ -547,6 +548,10 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn, if (virLXCProcessValidateInterface(net) < 0) goto cleanup; + if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK && + virDomainNetAllocateActualDevice(def, net) < 0) + goto cleanup; + if (virDomainNetAllocateActualDevice(def, net) < 0) goto cleanup; @@ -626,7 +631,8 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn, ignore_value(virNetDevOpenvswitchRemovePort( virDomainNetGetActualBridgeName(iface), iface->ifname)); - virDomainNetReleaseActualDevice(def, iface); + if (iface->type == VIR_DOMAIN_NET_TYPE_NETWORK) + virDomainNetReleaseActualDevice(def, iface); } } return ret; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index f92cc61e47..c44cb73c5b 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -4458,8 +4458,11 @@ networkAllocateActualDevice(virDomainDefPtr dom, size_t i; int ret = -1; - if (iface->type != VIR_DOMAIN_NET_TYPE_NETWORK) - goto validate; + if (iface->type != VIR_DOMAIN_NET_TYPE_NETWORK) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Expected a interface for a virtual network")); + goto error; + } virDomainActualNetDefFree(iface->data.network.actual); iface->data.network.actual = NULL; @@ -4778,7 +4781,6 @@ networkAllocateActualDevice(virDomainDefPtr dom, if (virNetDevVPortProfileCheckComplete(virtport, true) < 0) goto error; - validate: /* make sure that everything now specified for the device is * actually supported on this type of network. NB: network, * netdev, and iface->data.network.actual may all be NULL. @@ -4881,8 +4883,11 @@ networkNotifyActualDevice(virDomainDefPtr dom, size_t i; char *master = NULL; - if (iface->type != VIR_DOMAIN_NET_TYPE_NETWORK) - return; + if (iface->type != VIR_DOMAIN_NET_TYPE_NETWORK) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Expected a interface for a virtual network")); + goto error; + } obj = virNetworkObjFindByName(driver->networks, iface->data.network.name); if (!obj) { @@ -5114,8 +5119,11 @@ networkReleaseActualDevice(virDomainDefPtr dom, size_t i; int ret = -1; - if (iface->type != VIR_DOMAIN_NET_TYPE_NETWORK) - return 0; + if (iface->type != VIR_DOMAIN_NET_TYPE_NETWORK) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Expected a interface for a virtual network")); + goto error; + } obj = virNetworkObjFindByName(driver->networks, iface->data.network.name); if (!obj) { diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 1488f0a7c2..512fead050 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1062,7 +1062,8 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, * network's pool of devices, or resolve bridge device name * to the one defined in the network definition. */ - if (virDomainNetAllocateActualDevice(vm->def, net) < 0) + if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK && + virDomainNetAllocateActualDevice(vm->def, net) < 0) goto cleanup; actualType = virDomainNetGetActualType(net); @@ -1352,7 +1353,8 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, virDomainNetRemoveHostdev(vm->def, net); - virDomainNetReleaseActualDevice(vm->def, net); + if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) + virDomainNetReleaseActualDevice(vm->def, net); } VIR_FREE(nicstr); @@ -3722,7 +3724,8 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, /* this function doesn't work with HOSTDEV networks yet, thus * no need to change the pointer in the hostdev structure */ - virDomainNetReleaseActualDevice(vm->def, olddev); + if (olddev->type == VIR_DOMAIN_NET_TYPE_NETWORK) + virDomainNetReleaseActualDevice(vm->def, olddev); virDomainNetDefFree(olddev); /* move newdev into the nets list, and NULL it out from the * virDomainDeviceDef that we were given so that the caller @@ -3753,7 +3756,7 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, * that the changes were minor enough that we didn't need to * replace the entire device object. */ - if (newdev) + if (newdev && newdev->type == VIR_DOMAIN_NET_TYPE_NETWORK) virDomainNetReleaseActualDevice(vm->def, newdev); return ret; @@ -4310,7 +4313,8 @@ qemuDomainRemoveHostDevice(virQEMUDriverPtr driver, virDomainHostdevDefFree(hostdev); if (net) { - virDomainNetReleaseActualDevice(vm->def, net); + if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) + virDomainNetReleaseActualDevice(vm->def, net); virDomainNetDefFree(net); } @@ -4406,7 +4410,8 @@ qemuDomainRemoveNetDevice(virQEMUDriverPtr driver, qemuDomainNetDeviceVportRemove(net); - virDomainNetReleaseActualDevice(vm->def, net); + if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) + virDomainNetReleaseActualDevice(vm->def, net); virDomainNetDefFree(net); ret = 0; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c4e33723d1..440e2b326d 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3127,7 +3127,8 @@ qemuProcessNotifyNets(virDomainDefPtr def) if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_DIRECT) ignore_value(virNetDevMacVLanReserveName(net->ifname, false)); - virDomainNetNotifyActualDevice(def, net); + if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) + virDomainNetNotifyActualDevice(def, net); } } @@ -5326,7 +5327,8 @@ qemuProcessNetworkPrepareDevices(virDomainDefPtr def) * network's pool of devices, or resolve bridge device name * to the one defined in the network definition. */ - if (virDomainNetAllocateActualDevice(def, net) < 0) + if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK && + virDomainNetAllocateActualDevice(def, net) < 0) goto cleanup; actualType = virDomainNetGetActualType(net); @@ -7075,7 +7077,8 @@ void qemuProcessStop(virQEMUDriverPtr driver, /* kick the device out of the hostdev list too */ virDomainNetRemoveHostdev(def, net); - virDomainNetReleaseActualDevice(vm->def, net); + if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) + virDomainNetReleaseActualDevice(vm->def, net); } retry: -- 2.17.1

6 years, 3 months

2
4
0 / 0

[libvirt] [PATCH 0/6] qemu: Fix handling of floppy controller setup

by Peter Krempa

Cleanup always present capability QEMU_CAPS_BOOTINDEX and unused capability QEMU_CAPS_DRIVE_BOOT as a preparation/cleanup step and fix two bugs in setup of the floppy controller for the q35 machine type. Peter Krempa (6): qemu: capabilities: Always assume QEMU_CAPS_BOOTINDEX qemu: capabilities: Remove unused QEMU_CAPS_DRIVE_BOOT qemu: Remove unused argument 'bootable' from qemuBuildDriveStr tests: qemuxml2argv: Add 2 floppy drive tests for q35 with 2.9 and 2.11 machine qemu: command: Don't format -device isa-fdc,... twice with two floppy drives qemu: domain: Fix machine type version check for 'isa-fdc' usage src/qemu/qemu_capabilities.c | 4 +- src/qemu/qemu_capabilities.h | 4 +- src/qemu/qemu_command.c | 233 ++++++++------------- src/qemu/qemu_command.h | 3 +- src/qemu/qemu_domain.c | 12 +- src/qemu/qemu_hotplug.c | 2 +- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 - .../aarch64-aavmf-virtio-mmio.args | 3 +- tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 3 +- .../qemuxml2argvdata/aarch64-cpu-passthrough.args | 3 +- tests/qemuxml2argvdata/aarch64-gic-host.args | 3 +- tests/qemuxml2argvdata/aarch64-gic-none-tcg.args | 3 +- tests/qemuxml2argvdata/aarch64-gic-v2.args | 3 +- tests/qemuxml2argvdata/aarch64-gic-v3.args | 3 +- tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args | 3 +- tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args | 1 - tests/qemuxml2argvdata/aarch64-noacpi-uefi.args | 3 +- tests/qemuxml2argvdata/aarch64-pci-serial.args | 1 - .../qemuxml2argvdata/aarch64-traditional-pci.args | 1 - .../aarch64-usb-controller-nec-xhci.args | 1 - .../aarch64-usb-controller-qemu-xhci.args | 1 - tests/qemuxml2argvdata/aarch64-video-default.args | 1 - .../aarch64-virt-2.6-virtio-pci-default.args | 3 +- .../qemuxml2argvdata/aarch64-virt-default-nic.args | 1 - tests/qemuxml2argvdata/aarch64-virt-virtio.args | 3 +- .../aarch64-virtio-pci-default.args | 3 +- .../aarch64-virtio-pci-manual-addresses.args | 3 +- tests/qemuxml2argvdata/acpi-table.args | 1 - tests/qemuxml2argvdata/arm-vexpressa9-basic.args | 1 - tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args | 1 - tests/qemuxml2argvdata/arm-vexpressa9-virtio.args | 3 +- tests/qemuxml2argvdata/arm-virt-virtio.args | 3 +- tests/qemuxml2argvdata/autoindex.args | 3 +- tests/qemuxml2argvdata/balloon-ccw-deflate.args | 1 - tests/qemuxml2argvdata/balloon-device-auto.args | 4 +- .../balloon-device-deflate-off.args | 4 +- tests/qemuxml2argvdata/balloon-device-deflate.args | 4 +- tests/qemuxml2argvdata/balloon-device-period.args | 4 +- tests/qemuxml2argvdata/balloon-device.args | 4 +- tests/qemuxml2argvdata/balloon-mmio-deflate.args | 1 - tests/qemuxml2argvdata/bios-nvram-secure.args | 4 +- tests/qemuxml2argvdata/bios-nvram.args | 5 +- tests/qemuxml2argvdata/bios.args | 5 +- tests/qemuxml2argvdata/blkdeviotune-group-num.args | 4 +- .../qemuxml2argvdata/blkdeviotune-max-length.args | 4 +- tests/qemuxml2argvdata/blkdeviotune-max.args | 4 +- tests/qemuxml2argvdata/blkiotune-device.args | 4 +- tests/qemuxml2argvdata/blkiotune.args | 4 +- tests/qemuxml2argvdata/boot-cdrom.args | 4 +- tests/qemuxml2argvdata/boot-complex-bootindex.args | 2 +- tests/qemuxml2argvdata/boot-complex.args | 13 +- tests/qemuxml2argvdata/boot-floppy-q35.args | 3 +- tests/qemuxml2argvdata/boot-floppy.args | 4 +- .../qemuxml2argvdata/boot-menu-disable-drive.args | 5 +- tests/qemuxml2argvdata/boot-menu-disable.args | 5 +- .../boot-menu-enable-with-timeout.args | 5 +- tests/qemuxml2argvdata/boot-menu-enable.args | 5 +- tests/qemuxml2argvdata/boot-multi.args | 5 +- tests/qemuxml2argvdata/boot-network.args | 1 - tests/qemuxml2argvdata/boot-strict.args | 2 +- tests/qemuxml2argvdata/channel-guestfwd.args | 4 +- tests/qemuxml2argvdata/channel-spicevmc.args | 4 +- tests/qemuxml2argvdata/channel-virtio-auto.args | 4 +- tests/qemuxml2argvdata/channel-virtio-autoadd.args | 4 +- .../channel-virtio-autoassign.args | 4 +- tests/qemuxml2argvdata/channel-virtio-default.args | 4 +- tests/qemuxml2argvdata/channel-virtio-state.args | 4 +- tests/qemuxml2argvdata/channel-virtio-unix.args | 4 +- tests/qemuxml2argvdata/channel-virtio.args | 4 +- tests/qemuxml2argvdata/chardev-reconnect.args | 1 - tests/qemuxml2argvdata/clock-catchup.args | 4 +- tests/qemuxml2argvdata/clock-france.args | 4 +- tests/qemuxml2argvdata/clock-hpet-off.args | 4 +- .../clock-localtime-basis-localtime.args | 4 +- tests/qemuxml2argvdata/clock-localtime.args | 4 +- tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args | 1 - tests/qemuxml2argvdata/clock-utc.args | 4 +- tests/qemuxml2argvdata/clock-variable.args | 4 +- tests/qemuxml2argvdata/console-compat-auto.args | 4 +- tests/qemuxml2argvdata/console-compat-chardev.args | 4 +- tests/qemuxml2argvdata/console-compat.args | 4 +- tests/qemuxml2argvdata/console-sclp.args | 3 +- tests/qemuxml2argvdata/console-virtio-many.args | 4 +- tests/qemuxml2argvdata/console-virtio.args | 4 +- tests/qemuxml2argvdata/controller-order.args | 6 +- tests/qemuxml2argvdata/cpu-Haswell-noTSX.args | 1 - tests/qemuxml2argvdata/cpu-Haswell.args | 1 - tests/qemuxml2argvdata/cpu-Haswell2.args | 1 - tests/qemuxml2argvdata/cpu-Haswell3.args | 1 - tests/qemuxml2argvdata/cpu-cache-disable.args | 1 - tests/qemuxml2argvdata/cpu-cache-disable2.args | 1 - tests/qemuxml2argvdata/cpu-cache-disable3.args | 1 - tests/qemuxml2argvdata/cpu-cache-emulate-l3.args | 1 - tests/qemuxml2argvdata/cpu-cache-passthrough.args | 1 - tests/qemuxml2argvdata/cpu-cache-passthrough2.args | 1 - tests/qemuxml2argvdata/cpu-check-default-none.args | 1 - .../qemuxml2argvdata/cpu-check-default-none2.args | 1 - .../cpu-check-default-partial.args | 1 - .../cpu-check-default-partial2.args | 1 - tests/qemuxml2argvdata/cpu-check-none.args | 1 - tests/qemuxml2argvdata/cpu-eoi-disabled.args | 1 - tests/qemuxml2argvdata/cpu-eoi-enabled.args | 1 - tests/qemuxml2argvdata/cpu-exact1.args | 1 - tests/qemuxml2argvdata/cpu-exact2-nofallback.args | 1 - tests/qemuxml2argvdata/cpu-exact2.args | 1 - tests/qemuxml2argvdata/cpu-fallback.args | 1 - tests/qemuxml2argvdata/cpu-host-kvmclock.args | 1 - tests/qemuxml2argvdata/cpu-host-model-cmt.args | 1 - .../qemuxml2argvdata/cpu-host-model-fallback.args | 1 - tests/qemuxml2argvdata/cpu-host-model-vendor.args | 1 - tests/qemuxml2argvdata/cpu-host-model.args | 1 - .../cpu-host-passthrough-features.args | 4 +- tests/qemuxml2argvdata/cpu-host-passthrough.args | 1 - tests/qemuxml2argvdata/cpu-hotplug-startup.args | 1 - tests/qemuxml2argvdata/cpu-kvmclock.args | 1 - tests/qemuxml2argvdata/cpu-minimum1.args | 1 - tests/qemuxml2argvdata/cpu-minimum2.args | 1 - tests/qemuxml2argvdata/cpu-numa-disjoint.args | 1 - tests/qemuxml2argvdata/cpu-numa-memshared.args | 1 - .../cpu-numa-no-memory-element.args | 1 - tests/qemuxml2argvdata/cpu-numa1.args | 1 - tests/qemuxml2argvdata/cpu-numa2.args | 1 - tests/qemuxml2argvdata/cpu-s390-features.args | 3 +- tests/qemuxml2argvdata/cpu-s390-zEC12.args | 3 +- tests/qemuxml2argvdata/cpu-strict1.args | 1 - tests/qemuxml2argvdata/cpu-topology1.args | 1 - tests/qemuxml2argvdata/cpu-topology2.args | 1 - tests/qemuxml2argvdata/cpu-topology3.args | 1 - tests/qemuxml2argvdata/cpu-tsc-frequency.args | 1 - tests/qemuxml2argvdata/cputune-numatune.args | 1 - tests/qemuxml2argvdata/cputune-zero-shares.args | 4 +- tests/qemuxml2argvdata/cputune.args | 4 +- tests/qemuxml2argvdata/debug-threads.args | 4 +- tests/qemuxml2argvdata/default-kvm-host-arch.args | 1 - tests/qemuxml2argvdata/default-qemu-host-arch.args | 1 - tests/qemuxml2argvdata/disk-aio.args | 4 +- tests/qemuxml2argvdata/disk-blockio.args | 3 +- tests/qemuxml2argvdata/disk-boot-cdrom.args | 4 +- tests/qemuxml2argvdata/disk-boot-disk.args | 4 +- tests/qemuxml2argvdata/disk-cache.args | 4 +- tests/qemuxml2argvdata/disk-cdrom-network.args | 4 +- tests/qemuxml2argvdata/disk-cdrom-tray.args | 7 +- tests/qemuxml2argvdata/disk-cdrom.args | 4 +- tests/qemuxml2argvdata/disk-copy_on_read.args | 7 +- tests/qemuxml2argvdata/disk-detect-zeroes.args | 7 +- tests/qemuxml2argvdata/disk-discard.args | 7 +- tests/qemuxml2argvdata/disk-error-policy.args | 4 +- .../disk-floppy-q35-2_11.x86_64-latest.args | 35 ++++ tests/qemuxml2argvdata/disk-floppy-q35-2_11.xml | 38 ++++ .../disk-floppy-q35-2_9.x86_64-latest.args | 35 ++++ tests/qemuxml2argvdata/disk-floppy-q35-2_9.xml | 38 ++++ tests/qemuxml2argvdata/disk-floppy-tray.args | 6 +- tests/qemuxml2argvdata/disk-floppy.args | 6 +- .../disk-floppy.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-fmt-qcow.args | 4 +- tests/qemuxml2argvdata/disk-geometry.args | 5 +- .../disk-hostdev-scsi-virtio-iscsi-auth-AES.args | 3 +- tests/qemuxml2argvdata/disk-ide-split.args | 3 +- tests/qemuxml2argvdata/disk-ide-wwn.args | 3 +- tests/qemuxml2argvdata/disk-ioeventfd.args | 7 +- tests/qemuxml2argvdata/disk-iscsi.args | 4 +- tests/qemuxml2argvdata/disk-network-gluster.args | 3 +- .../disk-network-iscsi-modern.args | 3 +- tests/qemuxml2argvdata/disk-network-iscsi.args | 3 +- tests/qemuxml2argvdata/disk-network-nbd.args | 3 +- tests/qemuxml2argvdata/disk-network-sheepdog.args | 4 +- .../qemuxml2argvdata/disk-network-source-auth.args | 3 +- tests/qemuxml2argvdata/disk-network-tlsx509.args | 3 +- tests/qemuxml2argvdata/disk-network-vxhs.args | 3 +- tests/qemuxml2argvdata/disk-order.args | 4 +- tests/qemuxml2argvdata/disk-readonly-disk.args | 4 +- tests/qemuxml2argvdata/disk-sata-device.args | 3 +- tests/qemuxml2argvdata/disk-scsi-device-auto.args | 4 +- tests/qemuxml2argvdata/disk-scsi-device.args | 4 +- tests/qemuxml2argvdata/disk-scsi-disk-split.args | 3 +- tests/qemuxml2argvdata/disk-scsi-disk-vpd.args | 3 +- tests/qemuxml2argvdata/disk-scsi-disk-wwn.args | 3 +- .../disk-scsi-lun-passthrough.args | 3 +- tests/qemuxml2argvdata/disk-scsi-megasas.args | 4 +- tests/qemuxml2argvdata/disk-scsi-mptsas1068.args | 4 +- tests/qemuxml2argvdata/disk-scsi-virtio-scsi.args | 4 +- tests/qemuxml2argvdata/disk-scsi-vscsi.args | 4 +- tests/qemuxml2argvdata/disk-serial.args | 3 +- tests/qemuxml2argvdata/disk-shared-locking.args | 3 +- tests/qemuxml2argvdata/disk-shared.args | 3 +- tests/qemuxml2argvdata/disk-snapshot.args | 4 +- tests/qemuxml2argvdata/disk-source-pool-mode.args | 4 +- tests/qemuxml2argvdata/disk-source-pool.args | 4 +- .../disk-usb-device-removable.args | 4 +- tests/qemuxml2argvdata/disk-usb-device.args | 4 +- tests/qemuxml2argvdata/disk-virtio-ccw-many.args | 4 +- tests/qemuxml2argvdata/disk-virtio-ccw.args | 3 +- tests/qemuxml2argvdata/disk-virtio-queues.args | 3 +- tests/qemuxml2argvdata/disk-virtio-s390.args | 3 +- tests/qemuxml2argvdata/disk-virtio-scsi-ccw.args | 3 +- .../disk-virtio-scsi-cmd_per_lun.args | 3 +- .../disk-virtio-scsi-ioeventfd.args | 3 +- .../disk-virtio-scsi-max_sectors.args | 3 +- .../disk-virtio-scsi-num_queues.args | 3 +- tests/qemuxml2argvdata/disk-virtio.args | 4 +- tests/qemuxml2argvdata/encrypted-disk-usage.args | 3 +- tests/qemuxml2argvdata/encrypted-disk.args | 3 +- tests/qemuxml2argvdata/eoi-disabled.args | 1 - tests/qemuxml2argvdata/eoi-enabled.args | 1 - tests/qemuxml2argvdata/event_idx.args | 7 +- .../fd-memory-no-numa-topology.args | 1 - .../qemuxml2argvdata/fd-memory-numa-topology.args | 1 - .../qemuxml2argvdata/fd-memory-numa-topology2.args | 1 - .../qemuxml2argvdata/fd-memory-numa-topology3.args | 1 - tests/qemuxml2argvdata/fips-enabled.args | 4 +- tests/qemuxml2argvdata/floppy-drive-fat.args | 2 +- tests/qemuxml2argvdata/fs9p-ccw.args | 3 +- tests/qemuxml2argvdata/fs9p.args | 4 +- tests/qemuxml2argvdata/graphics-egl-headless.args | 4 +- .../qemuxml2argvdata/graphics-sdl-fullscreen.args | 4 +- tests/qemuxml2argvdata/graphics-sdl.args | 4 +- .../graphics-spice-agent-file-xfer.args | 4 +- .../graphics-spice-agentmouse.args | 4 +- .../graphics-spice-auto-socket-cfg.args | 1 - .../graphics-spice-auto-socket.args | 1 - .../graphics-spice-compression.args | 4 +- .../graphics-spice-egl-headless.args | 4 +- tests/qemuxml2argvdata/graphics-spice-no-args.args | 1 - tests/qemuxml2argvdata/graphics-spice-qxl-vga.args | 4 +- tests/qemuxml2argvdata/graphics-spice-sasl.args | 4 +- tests/qemuxml2argvdata/graphics-spice-socket.args | 1 - tests/qemuxml2argvdata/graphics-spice-timeout.args | 7 +- .../qemuxml2argvdata/graphics-spice-usb-redir.args | 1 - tests/qemuxml2argvdata/graphics-spice.args | 4 +- .../graphics-vnc-auto-socket-cfg.args | 4 +- .../qemuxml2argvdata/graphics-vnc-auto-socket.args | 1 - .../graphics-vnc-egl-headless.args | 4 +- .../graphics-vnc-no-listen-attr.args | 4 +- tests/qemuxml2argvdata/graphics-vnc-none.args | 1 - tests/qemuxml2argvdata/graphics-vnc-policy.args | 4 +- .../graphics-vnc-remove-generated-socket.args | 4 +- tests/qemuxml2argvdata/graphics-vnc-sasl.args | 4 +- .../graphics-vnc-socket-new-cmdline.args | 1 - tests/qemuxml2argvdata/graphics-vnc-socket.args | 1 - tests/qemuxml2argvdata/graphics-vnc-tls.args | 1 - tests/qemuxml2argvdata/graphics-vnc-websocket.args | 1 - tests/qemuxml2argvdata/graphics-vnc.args | 4 +- .../qemuxml2argvdata/hostdev-mdev-precreated.args | 4 +- .../hostdev-pci-address-device.args | 4 +- tests/qemuxml2argvdata/hostdev-pci-address.args | 4 +- .../hostdev-scsi-lsi-iscsi-auth.args | 4 +- tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.args | 4 +- tests/qemuxml2argvdata/hostdev-scsi-lsi.args | 4 +- tests/qemuxml2argvdata/hostdev-scsi-readonly.args | 4 +- .../hostdev-scsi-vhost-scsi-ccw.args | 3 +- .../hostdev-scsi-vhost-scsi-pci.args | 4 +- .../hostdev-scsi-vhost-scsi-pcie.args | 1 - .../hostdev-scsi-virtio-iscsi-auth.args | 4 +- .../hostdev-scsi-virtio-iscsi.args | 4 +- .../qemuxml2argvdata/hostdev-scsi-virtio-scsi.args | 4 +- .../hostdev-subsys-mdev-vfio-ccw.args | 1 - .../hostdev-usb-address-device.args | 4 +- tests/qemuxml2argvdata/hostdev-usb-address.args | 4 +- .../qemuxml2argvdata/hostdev-vfio-multidomain.args | 4 +- tests/qemuxml2argvdata/hostdev-vfio.args | 4 +- tests/qemuxml2argvdata/hotplug-base.args | 1 - tests/qemuxml2argvdata/hugepages-memaccess.args | 4 +- tests/qemuxml2argvdata/hugepages-memaccess2.args | 4 +- tests/qemuxml2argvdata/hugepages-numa.args | 3 +- tests/qemuxml2argvdata/hugepages-pages.args | 4 +- tests/qemuxml2argvdata/hugepages-pages2.args | 4 +- tests/qemuxml2argvdata/hugepages-pages3.args | 4 +- tests/qemuxml2argvdata/hugepages-pages5.args | 4 +- tests/qemuxml2argvdata/hugepages-pages6.args | 4 +- tests/qemuxml2argvdata/hugepages-pages7.args | 3 +- tests/qemuxml2argvdata/hugepages-shared.args | 4 +- tests/qemuxml2argvdata/hugepages.args | 4 +- tests/qemuxml2argvdata/hyperv-off.args | 1 - tests/qemuxml2argvdata/hyperv-panic.args | 1 - tests/qemuxml2argvdata/hyperv.args | 1 - tests/qemuxml2argvdata/input-usbmouse-addr.args | 4 +- tests/qemuxml2argvdata/input-usbmouse.args | 4 +- tests/qemuxml2argvdata/input-usbtablet.args | 4 +- tests/qemuxml2argvdata/input-virtio-ccw.args | 3 +- .../qemuxml2argvdata/intel-iommu-caching-mode.args | 1 - .../qemuxml2argvdata/intel-iommu-device-iotlb.args | 1 - tests/qemuxml2argvdata/intel-iommu-eim.args | 1 - tests/qemuxml2argvdata/intel-iommu-machine.args | 3 +- tests/qemuxml2argvdata/intel-iommu.args | 1 - .../iothreads-disk-virtio-ccw.args | 3 +- tests/qemuxml2argvdata/iothreads-disk.args | 4 +- tests/qemuxml2argvdata/iothreads-ids-partial.args | 4 +- tests/qemuxml2argvdata/iothreads-ids.args | 4 +- .../iothreads-virtio-scsi-ccw.args | 3 +- .../iothreads-virtio-scsi-pci.args | 4 +- tests/qemuxml2argvdata/iothreads.args | 4 +- tests/qemuxml2argvdata/kvm-features-off.args | 1 - tests/qemuxml2argvdata/kvm-features.args | 1 - tests/qemuxml2argvdata/kvm-pit-delay.args | 4 +- tests/qemuxml2argvdata/kvm-pit-discard.args | 4 +- tests/qemuxml2argvdata/kvmclock+eoi-disabled.args | 1 - tests/qemuxml2argvdata/kvmclock.args | 1 - tests/qemuxml2argvdata/launch-security-sev.args | 4 +- .../qemuxml2argvdata/luks-disks-source-qcow2.args | 3 +- tests/qemuxml2argvdata/luks-disks-source.args | 3 +- tests/qemuxml2argvdata/luks-disks.args | 3 +- .../qemuxml2argvdata/mach-virt-console-virtio.args | 1 - .../qemuxml2argvdata/mach-virt-serial-native.args | 1 - tests/qemuxml2argvdata/mach-virt-serial-pci.args | 1 - tests/qemuxml2argvdata/mach-virt-serial-usb.args | 1 - .../machine-aeskeywrap-off-cap.args | 3 +- .../machine-aeskeywrap-off-caps.args | 3 +- .../machine-aeskeywrap-on-cap.args | 3 +- .../machine-aeskeywrap-on-caps.args | 3 +- tests/qemuxml2argvdata/machine-aliases1.args | 4 +- tests/qemuxml2argvdata/machine-aliases2.args | 4 +- tests/qemuxml2argvdata/machine-core-off.args | 4 +- tests/qemuxml2argvdata/machine-core-on.args | 4 +- .../machine-deakeywrap-off-cap.args | 3 +- .../machine-deakeywrap-off-caps.args | 3 +- .../machine-deakeywrap-on-cap.args | 3 +- .../machine-deakeywrap-on-caps.args | 3 +- .../machine-keywrap-none-caps.args | 3 +- tests/qemuxml2argvdata/machine-keywrap-none.args | 3 +- tests/qemuxml2argvdata/machine-smm-opt.args | 3 +- tests/qemuxml2argvdata/machine-vmport-opt.args | 4 +- tests/qemuxml2argvdata/master-key.args | 4 +- .../qemuxml2argvdata/memory-hotplug-dimm-addr.args | 4 +- tests/qemuxml2argvdata/memory-hotplug-dimm.args | 4 +- .../memory-hotplug-nvdimm-access.args | 4 +- .../memory-hotplug-nvdimm-label.args | 4 +- tests/qemuxml2argvdata/memory-hotplug-nvdimm.args | 4 +- .../memory-hotplug-ppc64-nonuma.args | 1 - tests/qemuxml2argvdata/memory-hotplug.args | 4 +- tests/qemuxml2argvdata/memtune-unlimited.args | 4 +- tests/qemuxml2argvdata/memtune.args | 4 +- tests/qemuxml2argvdata/migrate-numa-unaligned.args | 1 - tests/qemuxml2argvdata/migrate.args | 4 +- tests/qemuxml2argvdata/minimal-msg-timestamp.args | 4 +- tests/qemuxml2argvdata/minimal-sandbox.args | 4 +- tests/qemuxml2argvdata/minimal.args | 4 +- tests/qemuxml2argvdata/misc-acpi.args | 4 +- tests/qemuxml2argvdata/misc-disable-s3.args | 4 +- tests/qemuxml2argvdata/misc-disable-suspends.args | 4 +- tests/qemuxml2argvdata/misc-enable-s4.args | 4 +- tests/qemuxml2argvdata/misc-no-reboot.args | 4 +- tests/qemuxml2argvdata/misc-uuid.args | 4 +- tests/qemuxml2argvdata/mlock-off.args | 1 - tests/qemuxml2argvdata/mlock-on.args | 1 - tests/qemuxml2argvdata/mlock-unsupported.args | 1 - tests/qemuxml2argvdata/monitor-json.args | 4 +- .../qemuxml2argvdata/multifunction-pci-device.args | 4 +- tests/qemuxml2argvdata/name-escape.args | 4 +- tests/qemuxml2argvdata/net-client.args | 4 +- tests/qemuxml2argvdata/net-eth-hostip.args | 4 +- tests/qemuxml2argvdata/net-eth-ifname.args | 4 +- tests/qemuxml2argvdata/net-eth-names.args | 4 +- tests/qemuxml2argvdata/net-eth.args | 4 +- .../qemuxml2argvdata/net-hostdev-multidomain.args | 4 +- .../net-hostdev-vfio-multidomain.args | 4 +- tests/qemuxml2argvdata/net-hostdev-vfio.args | 4 +- tests/qemuxml2argvdata/net-hostdev.args | 4 +- tests/qemuxml2argvdata/net-mcast.args | 4 +- tests/qemuxml2argvdata/net-server.args | 4 +- tests/qemuxml2argvdata/net-udp.args | 4 +- tests/qemuxml2argvdata/net-user-addr.args | 4 +- tests/qemuxml2argvdata/net-user.args | 4 +- tests/qemuxml2argvdata/net-vhostuser-multiq.args | 4 +- tests/qemuxml2argvdata/net-vhostuser.args | 4 +- tests/qemuxml2argvdata/net-virtio-ccw.args | 1 - tests/qemuxml2argvdata/net-virtio-device.args | 4 +- .../net-virtio-disable-offloads.args | 4 +- tests/qemuxml2argvdata/net-virtio-netdev.args | 4 +- .../qemuxml2argvdata/net-virtio-rxtxqueuesize.args | 4 +- tests/qemuxml2argvdata/net-virtio-s390.args | 1 - tests/qemuxml2argvdata/net-virtio.args | 4 +- tests/qemuxml2argvdata/nosharepages.args | 4 +- .../numad-auto-memory-vcpu-cpuset.args | 4 +- ...d-auto-memory-vcpu-no-cpuset-and-placement.args | 4 +- .../numad-auto-vcpu-static-numatune.args | 4 +- .../numad-static-memory-auto-vcpu.args | 4 +- tests/qemuxml2argvdata/numad.args | 4 +- .../numatune-auto-nodeset-invalid.args | 4 +- tests/qemuxml2argvdata/numatune-auto-prefer.args | 1 - tests/qemuxml2argvdata/numatune-distances.args | 1 - .../numatune-memnode-no-memory.args | 1 - tests/qemuxml2argvdata/numatune-memnode.args | 1 - tests/qemuxml2argvdata/numatune-memory.args | 4 +- tests/qemuxml2argvdata/panic-double.args | 1 - tests/qemuxml2argvdata/panic-no-address.args | 4 +- tests/qemuxml2argvdata/panic.args | 4 +- .../qemuxml2argvdata/parallel-parport-chardev.args | 4 +- tests/qemuxml2argvdata/parallel-tcp-chardev.args | 4 +- tests/qemuxml2argvdata/pci-autoadd-addr.args | 1 - tests/qemuxml2argvdata/pci-autoadd-idx.args | 1 - tests/qemuxml2argvdata/pci-autofill-addr.args | 1 - tests/qemuxml2argvdata/pci-bridge-many-disks.args | 3 +- tests/qemuxml2argvdata/pci-bridge.args | 1 - tests/qemuxml2argvdata/pci-expander-bus.args | 1 - tests/qemuxml2argvdata/pci-many.args | 3 +- tests/qemuxml2argvdata/pci-rom-disabled.args | 1 - tests/qemuxml2argvdata/pci-rom.args | 4 +- tests/qemuxml2argvdata/pci-serial-dev-chardev.args | 4 +- tests/qemuxml2argvdata/pcie-expander-bus.args | 3 +- .../pcie-root-port-model-generic.args | 1 - .../pcie-root-port-model-ioh3420.args | 1 - tests/qemuxml2argvdata/pcie-root-port.args | 3 +- tests/qemuxml2argvdata/pcie-root.args | 3 +- .../pcie-switch-downstream-port.args | 3 +- .../pcie-switch-upstream-port.args | 3 +- tests/qemuxml2argvdata/pcihole64-q35.args | 3 +- tests/qemuxml2argvdata/pcihole64.args | 1 - tests/qemuxml2argvdata/pmu-feature-off.args | 1 - tests/qemuxml2argvdata/pmu-feature.args | 1 - tests/qemuxml2argvdata/ppc-dtb.args | 1 - .../ppc64-usb-controller-legacy.args | 1 - .../ppc64-usb-controller-qemu-xhci.args | 1 - tests/qemuxml2argvdata/ppc64-usb-controller.args | 1 - tests/qemuxml2argvdata/ppce500-serial.args | 1 - tests/qemuxml2argvdata/pseries-basic.args | 1 - tests/qemuxml2argvdata/pseries-console-virtio.args | 1 - .../pseries-cpu-compat-power9.args | 1 - tests/qemuxml2argvdata/pseries-cpu-compat.args | 1 - tests/qemuxml2argvdata/pseries-cpu-exact.args | 1 - tests/qemuxml2argvdata/pseries-cpu-le.args | 1 - tests/qemuxml2argvdata/pseries-features.args | 3 +- tests/qemuxml2argvdata/pseries-hostdevs-1.args | 1 - tests/qemuxml2argvdata/pseries-hostdevs-2.args | 1 - tests/qemuxml2argvdata/pseries-hostdevs-3.args | 1 - .../pseries-machine-max-cpu-compat.args | 3 +- tests/qemuxml2argvdata/pseries-many-buses-1.args | 1 - tests/qemuxml2argvdata/pseries-many-buses-2.args | 1 - tests/qemuxml2argvdata/pseries-many-devices.args | 1 - tests/qemuxml2argvdata/pseries-nvram.args | 1 - tests/qemuxml2argvdata/pseries-panic-missing.args | 1 - .../qemuxml2argvdata/pseries-panic-no-address.args | 1 - .../pseries-phb-default-missing.args | 1 - tests/qemuxml2argvdata/pseries-phb-numa-node.args | 1 - tests/qemuxml2argvdata/pseries-phb-simple.args | 1 - tests/qemuxml2argvdata/pseries-serial-native.args | 1 - tests/qemuxml2argvdata/pseries-serial-pci.args | 1 - tests/qemuxml2argvdata/pseries-serial-usb.args | 1 - tests/qemuxml2argvdata/pseries-usb-default.args | 1 - tests/qemuxml2argvdata/pseries-usb-kbd.args | 1 - tests/qemuxml2argvdata/pseries-usb-multi.args | 1 - .../pseries-vio-user-assigned.args | 3 +- tests/qemuxml2argvdata/pseries-vio.args | 3 +- tests/qemuxml2argvdata/pv-spinlock-disabled.args | 1 - tests/qemuxml2argvdata/pv-spinlock-enabled.args | 1 - tests/qemuxml2argvdata/q35-acpi-nouefi.args | 1 - tests/qemuxml2argvdata/q35-acpi-uefi.args | 3 +- .../qemuxml2argvdata/q35-default-devices-only.args | 1 - tests/qemuxml2argvdata/q35-multifunction.args | 1 - tests/qemuxml2argvdata/q35-noacpi-nouefi.args | 1 - tests/qemuxml2argvdata/q35-pci-force-address.args | 1 - tests/qemuxml2argvdata/q35-pcie-autoadd.args | 3 +- tests/qemuxml2argvdata/q35-pcie.args | 3 +- .../qemuxml2argvdata/q35-pm-disable-fallback.args | 1 - tests/qemuxml2argvdata/q35-pm-disable.args | 1 - tests/qemuxml2argvdata/q35-usb2-multi.args | 3 +- tests/qemuxml2argvdata/q35-usb2-reorder.args | 3 +- tests/qemuxml2argvdata/q35-usb2.args | 3 +- tests/qemuxml2argvdata/q35-virt-manager-basic.args | 3 +- tests/qemuxml2argvdata/q35-virtio-pci.args | 3 +- tests/qemuxml2argvdata/q35.args | 3 +- tests/qemuxml2argvdata/qemu-ns-alt.args | 4 +- .../qemuxml2argvdata/qemu-ns-commandline-ns0.args | 4 +- .../qemuxml2argvdata/qemu-ns-commandline-ns1.args | 4 +- tests/qemuxml2argvdata/qemu-ns-commandline.args | 4 +- .../qemu-ns-domain-commandline-ns0.args | 4 +- .../qemu-ns-domain-commandline.args | 4 +- tests/qemuxml2argvdata/qemu-ns-domain-ns0.args | 4 +- tests/qemuxml2argvdata/qemu-ns-no-env.args | 4 +- tests/qemuxml2argvdata/qemu-ns.args | 4 +- .../qemuxml2argvdata/reboot-timeout-disabled.args | 2 +- tests/qemuxml2argvdata/reboot-timeout-enabled.args | 2 +- tests/qemuxml2argvdata/restore-v2-fd.args | 4 +- tests/qemuxml2argvdata/restore-v2.args | 4 +- tests/qemuxml2argvdata/s390-panic-missing.args | 1 - tests/qemuxml2argvdata/s390-panic-no-address.args | 1 - tests/qemuxml2argvdata/s390-serial-2.args | 1 - tests/qemuxml2argvdata/s390-serial-console.args | 1 - tests/qemuxml2argvdata/s390-serial.args | 1 - tests/qemuxml2argvdata/seclabel-dac-none.args | 4 +- .../seclabel-dynamic-baselabel.args | 4 +- .../seclabel-dynamic-labelskip.args | 4 +- .../seclabel-dynamic-override.args | 4 +- .../qemuxml2argvdata/seclabel-dynamic-relabel.args | 4 +- tests/qemuxml2argvdata/seclabel-dynamic.args | 4 +- tests/qemuxml2argvdata/seclabel-none.args | 4 +- .../seclabel-static-labelskip.args | 4 +- .../qemuxml2argvdata/seclabel-static-relabel.args | 4 +- tests/qemuxml2argvdata/seclabel-static.args | 4 +- .../serial-dev-chardev-iobase.args | 4 +- tests/qemuxml2argvdata/serial-dev-chardev.args | 4 +- tests/qemuxml2argvdata/serial-file-chardev.args | 4 +- tests/qemuxml2argvdata/serial-file-log.args | 4 +- tests/qemuxml2argvdata/serial-many-chardev.args | 4 +- tests/qemuxml2argvdata/serial-pty-chardev.args | 4 +- .../qemuxml2argvdata/serial-spiceport-nospice.args | 4 +- tests/qemuxml2argvdata/serial-spiceport.args | 4 +- tests/qemuxml2argvdata/serial-tcp-chardev.args | 4 +- .../serial-tcp-telnet-chardev.args | 4 +- .../serial-tcp-tlsx509-chardev-notls.args | 4 +- .../serial-tcp-tlsx509-chardev-verify.args | 4 +- .../serial-tcp-tlsx509-chardev.args | 4 +- .../serial-tcp-tlsx509-secret-chardev.args | 4 +- tests/qemuxml2argvdata/serial-udp-chardev.args | 4 +- tests/qemuxml2argvdata/serial-unix-chardev.args | 1 - tests/qemuxml2argvdata/serial-vc-chardev.args | 4 +- tests/qemuxml2argvdata/shmem-plain-doorbell.args | 1 - tests/qemuxml2argvdata/shmem.args | 1 - tests/qemuxml2argvdata/smartcard-controller.args | 1 - .../smartcard-host-certificates-database.args | 1 - .../smartcard-host-certificates.args | 1 - tests/qemuxml2argvdata/smartcard-host.args | 1 - .../smartcard-passthrough-spicevmc.args | 1 - .../smartcard-passthrough-tcp.args | 1 - tests/qemuxml2argvdata/smbios.args | 4 +- tests/qemuxml2argvdata/smp.args | 4 +- tests/qemuxml2argvdata/sound-device.args | 4 +- tests/qemuxml2argvdata/sound.args | 4 +- tests/qemuxml2argvdata/tpm-passthrough-crb.args | 2 +- tests/qemuxml2argvdata/tpm-passthrough.args | 2 +- .../usb-controller-default-q35.args | 1 - .../usb-controller-explicit-q35.args | 1 - .../qemuxml2argvdata/usb-controller-qemu-xhci.args | 1 - tests/qemuxml2argvdata/usb-controller-xhci.args | 1 - tests/qemuxml2argvdata/usb-controller.args | 1 - tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args | 1 - tests/qemuxml2argvdata/usb-hub-autoadd.args | 1 - tests/qemuxml2argvdata/usb-hub.args | 1 - tests/qemuxml2argvdata/usb-ich9-autoassign.args | 1 - tests/qemuxml2argvdata/usb-ich9-companion.args | 1 - tests/qemuxml2argvdata/usb-ich9-ehci-addr.args | 1 - tests/qemuxml2argvdata/usb-long-port-path.args | 1 - tests/qemuxml2argvdata/usb-none.args | 1 - tests/qemuxml2argvdata/usb-piix3-controller.args | 1 - tests/qemuxml2argvdata/usb-port-autoassign.args | 1 - tests/qemuxml2argvdata/usb-port-missing.args | 1 - tests/qemuxml2argvdata/usb-ports.args | 1 - .../qemuxml2argvdata/usb-redir-filter-version.args | 1 - tests/qemuxml2argvdata/usb-redir-filter.args | 1 - tests/qemuxml2argvdata/usb-redir.args | 1 - tests/qemuxml2argvdata/usb-xhci-autoassign.args | 1 - tests/qemuxml2argvdata/usb1-usb2.args | 1 - tests/qemuxml2argvdata/user-aliases-usb.args | 1 - tests/qemuxml2argvdata/user-aliases.args | 8 +- tests/qemuxml2argvdata/vcpu-placement-static.args | 3 +- .../video-device-pciaddr-default.args | 4 +- tests/qemuxml2argvdata/video-none-device.args | 4 +- .../qemuxml2argvdata/video-qxl-device-vgamem.args | 4 +- tests/qemuxml2argvdata/video-qxl-device.args | 4 +- tests/qemuxml2argvdata/video-qxl-heads.args | 4 +- tests/qemuxml2argvdata/video-qxl-nodevice.args | 4 +- tests/qemuxml2argvdata/video-qxl-noheads.args | 4 +- .../video-qxl-sec-device-vgamem.args | 4 +- tests/qemuxml2argvdata/video-qxl-sec-device.args | 4 +- .../qemuxml2argvdata/video-vga-device-vgamem.args | 4 +- tests/qemuxml2argvdata/video-vga-device.args | 4 +- tests/qemuxml2argvdata/video-vga-nodevice.args | 4 +- tests/qemuxml2argvdata/video-vga-qxl-heads.args | 4 +- tests/qemuxml2argvdata/video-virtio-gpu-ccw.args | 3 +- .../qemuxml2argvdata/video-virtio-gpu-device.args | 4 +- .../qemuxml2argvdata/video-virtio-gpu-sdl-gl.args | 4 +- .../video-virtio-gpu-secondary.args | 1 - .../video-virtio-gpu-spice-gl.args | 4 +- tests/qemuxml2argvdata/video-virtio-gpu-virgl.args | 4 +- tests/qemuxml2argvdata/video-virtio-vga.args | 4 +- .../qemuxml2argvdata/virtio-input-passthrough.args | 1 - tests/qemuxml2argvdata/virtio-input.args | 1 - tests/qemuxml2argvdata/virtio-lun.args | 4 +- tests/qemuxml2argvdata/virtio-options.args | 3 +- tests/qemuxml2argvdata/virtio-rng-default.args | 1 - tests/qemuxml2argvdata/virtio-rng-egd.args | 1 - tests/qemuxml2argvdata/virtio-rng-multiple.args | 1 - tests/qemuxml2argvdata/virtio-rng-random.args | 1 - tests/qemuxml2argvdata/vmcoreinfo.args | 4 +- tests/qemuxml2argvdata/watchdog-device.args | 4 +- tests/qemuxml2argvdata/watchdog-dump.args | 4 +- tests/qemuxml2argvdata/watchdog-injectnmi.args | 4 +- tests/qemuxml2argvdata/watchdog.args | 4 +- tests/qemuxml2argvdata/x86-kvm-32-on-64.args | 3 +- tests/qemuxml2argvtest.c | 67 ++---- tests/qemuxml2xmltest.c | 5 +- 607 files changed, 935 insertions(+), 1176 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-floppy-q35-2_11.xml create mode 100644 tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-floppy-q35-2_9.xml -- 2.16.2

6 years, 3 months

2
14
0 / 0

[libvirt] [PATCH] qemuxml2xmloutdata: Use more symlinks

by Michal Privoznik

There are couple of files that are the same in both qemuxml2argvdata and qemuxml2xmloutdata directories. Link them instead of having full copy. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/qemuxml2xmloutdata/boot-floppy-q35.xml | 33 +--------------- tests/qemuxml2xmloutdata/bootindex-floppy-q35.xml | 33 +--------------- tests/qemuxml2xmloutdata/disk-virtio-queues.xml | 35 +--------------- tests/qemuxml2xmloutdata/intel-iommu-machine.xml | 27 +------------ tests/qemuxml2xmloutdata/intel-iommu.xml | 27 +------------ tests/qemuxml2xmloutdata/luks-disks.xml | 46 +--------------------- tests/qemuxml2xmloutdata/vcpu-placement-static.xml | 34 +--------------- 7 files changed, 7 insertions(+), 228 deletions(-) mode change 100644 => 120000 tests/qemuxml2xmloutdata/boot-floppy-q35.xml mode change 100644 => 120000 tests/qemuxml2xmloutdata/bootindex-floppy-q35.xml mode change 100644 => 120000 tests/qemuxml2xmloutdata/disk-virtio-queues.xml mode change 100644 => 120000 tests/qemuxml2xmloutdata/intel-iommu-machine.xml mode change 100644 => 120000 tests/qemuxml2xmloutdata/intel-iommu.xml mode change 100644 => 120000 tests/qemuxml2xmloutdata/luks-disks.xml mode change 100644 => 120000 tests/qemuxml2xmloutdata/vcpu-placement-static.xml diff --git a/tests/qemuxml2xmloutdata/boot-floppy-q35.xml b/tests/qemuxml2xmloutdata/boot-floppy-q35.xml deleted file mode 100644 index af685d9c98..0000000000 --- a/tests/qemuxml2xmloutdata/boot-floppy-q35.xml +++ /dev/null @@ -1,32 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='x86_64' machine='pc-q35-2.4'>hvm</type> - <boot dev='fd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <disk type='file' device='floppy'> - <driver name='qemu' type='raw'/> - <source file='/tmp/firmware.img'/> - <target dev='fda' bus='fdc'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <controller type='sata' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/> - </controller> - <controller type='pci' index='0' model='pcie-root'/> - <controller type='fdc' index='0'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/boot-floppy-q35.xml b/tests/qemuxml2xmloutdata/boot-floppy-q35.xml new file mode 120000 index 0000000000..2543835ffb --- /dev/null +++ b/tests/qemuxml2xmloutdata/boot-floppy-q35.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/boot-floppy-q35.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/bootindex-floppy-q35.xml b/tests/qemuxml2xmloutdata/bootindex-floppy-q35.xml deleted file mode 100644 index af685d9c98..0000000000 --- a/tests/qemuxml2xmloutdata/bootindex-floppy-q35.xml +++ /dev/null @@ -1,32 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='x86_64' machine='pc-q35-2.4'>hvm</type> - <boot dev='fd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <disk type='file' device='floppy'> - <driver name='qemu' type='raw'/> - <source file='/tmp/firmware.img'/> - <target dev='fda' bus='fdc'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <controller type='sata' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/> - </controller> - <controller type='pci' index='0' model='pcie-root'/> - <controller type='fdc' index='0'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/bootindex-floppy-q35.xml b/tests/qemuxml2xmloutdata/bootindex-floppy-q35.xml new file mode 120000 index 0000000000..0ab2dad20f --- /dev/null +++ b/tests/qemuxml2xmloutdata/bootindex-floppy-q35.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/bootindex-floppy-q35.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/disk-virtio-queues.xml b/tests/qemuxml2xmloutdata/disk-virtio-queues.xml deleted file mode 100644 index 37885c6f9c..0000000000 --- a/tests/qemuxml2xmloutdata/disk-virtio-queues.xml +++ /dev/null @@ -1,34 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='file' device='disk'> - <driver name='qemu' type='raw' queues='4'/> - <source file='/tmp/data.img'/> - <target dev='vda' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </disk> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='ide' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/disk-virtio-queues.xml b/tests/qemuxml2xmloutdata/disk-virtio-queues.xml new file mode 120000 index 0000000000..d6773202b7 --- /dev/null +++ b/tests/qemuxml2xmloutdata/disk-virtio-queues.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/disk-virtio-queues.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/intel-iommu-machine.xml b/tests/qemuxml2xmloutdata/intel-iommu-machine.xml deleted file mode 100644 index 0961e4288d..0000000000 --- a/tests/qemuxml2xmloutdata/intel-iommu-machine.xml +++ /dev/null @@ -1,26 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='x86_64' machine='q35'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <controller type='pci' index='0' model='pcie-root'/> - <controller type='sata' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/> - </controller> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - <iommu model='intel'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/intel-iommu-machine.xml b/tests/qemuxml2xmloutdata/intel-iommu-machine.xml new file mode 120000 index 0000000000..dd29ce5ff0 --- /dev/null +++ b/tests/qemuxml2xmloutdata/intel-iommu-machine.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/intel-iommu-machine.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/intel-iommu.xml b/tests/qemuxml2xmloutdata/intel-iommu.xml deleted file mode 100644 index 0961e4288d..0000000000 --- a/tests/qemuxml2xmloutdata/intel-iommu.xml +++ /dev/null @@ -1,26 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='x86_64' machine='q35'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <controller type='pci' index='0' model='pcie-root'/> - <controller type='sata' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/> - </controller> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - <iommu model='intel'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/intel-iommu.xml b/tests/qemuxml2xmloutdata/intel-iommu.xml new file mode 120000 index 0000000000..97f38b1296 --- /dev/null +++ b/tests/qemuxml2xmloutdata/intel-iommu.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/intel-iommu.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/luks-disks.xml b/tests/qemuxml2xmloutdata/luks-disks.xml deleted file mode 100644 index c84af442a6..0000000000 --- a/tests/qemuxml2xmloutdata/luks-disks.xml +++ /dev/null @@ -1,45 +0,0 @@ -<domain type='qemu'> - <name>encryptdisk</name> - <uuid>496898a6-e6ff-f7c8-5dc2-3cf410945ee9</uuid> - <memory unit='KiB'>1048576</memory> - <currentMemory unit='KiB'>524288</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='x86_64' machine='pc-i440fx-2.1'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <disk type='file' device='disk'> - <driver name='qemu' type='raw'/> - <source file='/storage/guest_disks/encryptdisk'/> - <target dev='vda' bus='virtio'/> - <encryption format='luks'> - <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> - </encryption> - <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> - </disk> - <disk type='file' device='disk'> - <driver name='qemu' type='raw'/> - <source file='/storage/guest_disks/encryptdisk2'/> - <target dev='vdb' bus='virtio'/> - <encryption format='luks'> - <secret type='passphrase' usage='/storage/guest_disks/encryptdisk2'/> - </encryption> - <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> - </disk> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </memballoon> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/luks-disks.xml b/tests/qemuxml2xmloutdata/luks-disks.xml new file mode 120000 index 0000000000..d65e470c32 --- /dev/null +++ b/tests/qemuxml2xmloutdata/luks-disks.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/luks-disks.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/vcpu-placement-static.xml b/tests/qemuxml2xmloutdata/vcpu-placement-static.xml deleted file mode 100644 index a777f50f86..0000000000 --- a/tests/qemuxml2xmloutdata/vcpu-placement-static.xml +++ /dev/null @@ -1,33 +0,0 @@ -<domain type='kvm'> - <name>dummy2</name> - <uuid>4d92ec27-9ebf-400b-ae91-20c71c647c19</uuid> - <memory unit='KiB'>131072</memory> - <currentMemory unit='KiB'>65536</currentMemory> - <vcpu placement='static' current='2'>6</vcpu> - <iothreads>2</iothreads> - <cputune> - <emulatorpin cpuset='1-3'/> - <iothreadpin iothread='1' cpuset='2'/> - </cputune> - <numatune> - <memory mode='strict' placement='auto'/> - </numatune> - <os> - <type arch='x86_64' machine='pc-q35-2.3'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <controller type='sata' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/> - </controller> - <controller type='pci' index='0' model='pcie-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/vcpu-placement-static.xml b/tests/qemuxml2xmloutdata/vcpu-placement-static.xml new file mode 120000 index 0000000000..9966cf47a7 --- /dev/null +++ b/tests/qemuxml2xmloutdata/vcpu-placement-static.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/vcpu-placement-static.xml \ No newline at end of file -- 2.16.4

6 years, 3 months

2
1
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Devel August 2018