- Devel - libvirt List Archives

[libvirt] CPU model versioning separate from machine type versioning ?
by Daniel P. Berrangé 29 Jun '18

29 Jun '18

This post is to raise question about helping use of named CPU models with KVM ie any case not using -cpu host. In the old days (ie before 2018), the world was innocent and we had a nice set of named CPU models that corresponded to different Intel/AMD physical CPU families/generations (lets temporarily ignore the -noTSX fiasco). An application could query libvirt to determine what the host CPU model was/is and use that model name in the guest XML and be fairly happy. If they wanted to, they could explicitly include the extra features listed by capabilities XML, or just rely on the host-model. Then Spectre happened, and QEMU took the decision to almost double the number of x86 models, adding in -IBRS / -IBPB variants for most CPU model, so that applications could get the spec_ctrl / ibpb flags set without having to manually list them. In retrospect this was somewhat pointless, at least at the QEMU level, because there is little difference in complexity between the two approaches: -cpu Westmere,+spec-ctrl -cpu Westmere-IBRS At a higher level the extra named CPU models were slightly useful in so much as many application developers had taken a lazy approach and not provided users any way to explicitly turn on extra flags. This affected oVirt, OpenStack and virt-manager, and probably more. Though OpenStack since added ability to turn on arbitrary flags in response to the Spectre flaw, others have not. Then a recently along came the Speculative Store Bypass hardware vulnerability requiring addition of yet another CPU flag to guest configs. This required use of 'ssbd' on Intel and 'virt-ssbd' on AMD. While QEMU could have now added yet more CPU models, eg Westmere-SSBD, this does not feel like a winning strategy long term. Looking at the models how would a user have any clue whether the -IBRS or -SSBD or -NEXT-FLAW or -YET-ANOTHER-FLAW suffix is "better" ? So QEMU and libvirt took the joint decision to stop adding new named CPU models when CPU vulnerabilities are discovered from this point forwards. Applications / users would be expected to turn on CPU features explicitly as needed and are considered broken if they don't provide this functionality. As briefly mentioned above though, even before Spectre we had the pain of dealing with the -noTSX CPU models working around brokenness in the Intel TSX impl where they had to delete a CPU feature during microcode updates. This was rather painful to roll out at the time. An alternative to adding CPU models is to change meaning of existing CPU models. QEMU has a way todo this by tieing the change to machine types, and it has in fact been used to correct mistakes in the specification of CPU models in the past, when those mistakes have not had dependancies on microcode changes. This is not a particularly attractice way to deal with the errata. Short life distros tend to stick with upstream QEMU machine types and won't want to diverge by adding their own machine types. This gates them on having upstream define the extra machine types which is tricky under embargo. Long life distros do typically take on the burden of defining custom machine types, but usually only add them when doing major updates. The pain point with machine types is that the testing matrix grows at O(n^2) Using machine types for CPU security errata would significant increase the number of machine types and thus the testing matrix. eg if a security fix is needed in rhel-7.3, 7.4, 7.5 we can't just add a pc-rhel-7.5.1 machine with the fix, as it would not be possible to implement that in 7.3. So we would need would need pc-rhel-7.3.1, pc-rhel-7.4.1, pc-rhel-7.5.1, machine types, with 7.5 gaining all three. Finally CPU model changes have host hardware dependancies and machine types need to be independant of the host, since they are decided statically are build time. The only nice thing about machine type is that it is reasonably obvious what the "best" machine type is as they include a version number in the name, and users automatically get the best if they use an unversioned name. What if we can borrow the concept of versioning from machine types and apply it to CPU models directly. For example, considering the history of "Haswell" in QEMU, if we had versioned things, we would by now have: Haswell-1.3.0 - first version (37507094f350b75c62dc059f998e7185de3ab60a) Haswell-2.2.0 - added 'rdrand' (78a611f1936b3eac8ed78a2be2146a742a85212c_ Haswell-2.3.0 - removed 'hle' & 'rtm' (a356850b80b3d13b2ef737dad2acb05e6da03753) Haswell-2.5.0 - added 'abm' (becb66673ec30cb604926d247ab9449a60ad8b11 Haswell-2.12.0 - added 'spec-ctrl' (ac96c41354b7e4c70b756342d9b686e31ab87458) Haswell-3.0.0 - added 'ssbd' (never done) If we followed the machine type approach, then a bare "Haswell" would statically resolve at build time to the most recent Haswell-X.X.X version associated with the QEMU release. This is unhelpful as we have a direct dependancy on the host hardware features. Better would be for a bare "Haswell" to be dynamically resolved at runtime, picking the most recent version that is capable of launching given the current hardware, KVM/TCG impl and QEMU version. ie -cpu Haswell should use Haswell-2.5.0 if on silicon with the TSX errata applied, but use Haswell-2.12.0 if the Spectre errata is applied in microcode, and use Haswell-3.0.0 once Intel finally releases SSBD microcode errata. Versioning of CPU models as opposed to using arbitrary string suffixes (-noTSX, -IBRS) has a number of usability improvements that we would gain with versioned machine types, while avoiding exploding the machine type matrix. With versioned CPU models we can - Automatically tailor the best model based on hardware support - Users always get the best model if they use the bare CPU name - It is obvious to users which is the "best" / "newest" CPU model - Avoid combinatorial expansion of machines since same CPU model version can be added to all releases without adding machine types. - Users can still force a specific downgraded model by using the fully versioned name. Such versioning of CPU models would largely "just work" with existing libvirt versions, but to libvirt would really want to expand the bare CPU name to a versioned CPU name when recording new guest XML, so the ABI is preserved long term. An application like virt-manager which wants a simple UI can forever be happy simply giving users a list of bare CPU model names, and allowing libvirt / QEMU to automatically expand to the best versioned model for their host. An application like oVirt/OpenStack which wants direct control can allow the admin to choice if a bare name, or explicitly picking a versioned name if they need to cope with possibility of outdated hosts. Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

4 14

[libvirt] [dbus PATCH] configure: Use HTTPS URL for libvirt.org
by Andrea Bolognani 29 Jun '18

29 Jun '18

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 1a0a457..d7820dd 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([libvirt-dbus], [1.1.0], [libvir-list(a)redhat.com] [], [http://libvirt.org] +AC_INIT([libvirt-dbus], [1.1.0], [libvir-list(a)redhat.com] [], [https://libvirt.org] AC_CONFIG_SRCDIR(src/main.c) AC_CONFIG_AUX_DIR([build-aux]) -- 2.17.1

1 0

[libvirt] [PATCH] Add support L2 table cache for qcow2 disk
by dujiancheng 29 Jun '18

29 Jun '18

The patch add support L2 table cache for qcow2 disk. L2 table cache can improve IO read and write performance for qcow2 img. Example: random 4K read requests on a fully populated 100GB image (SSD backend and vm with directsync cacha mode), IOPS increased by 7 times. --- src/conf/domain_conf.c | 25 +++++++++++++++++++++++++ src/conf/domain_conf.h | 4 ++++ src/qemu/qemu_command.c | 7 +++++++ src/qemu/qemu_domain.c | 4 ++++ 4 files changed, 40 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b8b5345..cb9fb05 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9502,6 +9502,8 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, char *vendor = NULL; char *product = NULL; char *domain_name = NULL; + char *disk_l2_cache_size = NULL; + char *disk_cache_clean_interval = NULL; if (!(def = virDomainDiskDefNew(xmlopt))) return NULL; @@ -9701,6 +9703,27 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, } } else if (virXMLNodeNameEqual(cur, "boot")) { /* boot is parsed as part of virDomainDeviceInfoParseXML */ + } else if (virXMLNodeNameEqual(cur, "diskCache")) { + disk_l2_cache_size = + virXMLPropString(cur, "disk_l2_cache_size"); + if (disk_l2_cache_size && + virStrToLong_ui(disk_l2_cache_size, NULL, 0, + &def->disk_cache.disk_l2_cache_size) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("invalid disk L2 cache size '%s'"), + disk_l2_cache_size); + goto error; + } + disk_cache_clean_interval = + virXMLPropString(cur, "disk_cache_clean_interval"); + if (disk_cache_clean_interval && + virStrToLong_ui(disk_cache_clean_interval, NULL, 0, + &def->disk_cache.disk_cache_clean_interval) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("invalid disk cache clean interval '%s'"), + disk_cache_clean_interval); + goto error; + } } } @@ -9903,6 +9926,8 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, VIR_FREE(vendor); VIR_FREE(product); VIR_FREE(domain_name); + VIR_FREE(disk_l2_cache_size); + VIR_FREE(disk_cache_clean_interval); ctxt->node = save_ctxt; return def; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 71437dc..6396475 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -647,6 +647,10 @@ struct _virDomainDiskDef { unsigned int physical_block_size; } blockio; + struct { + unsigned int disk_l2_cache_size; + unsigned int disk_cache_clean_interval; + } disk_cache; virDomainBlockIoTuneInfo blkdeviotune; char *driverName; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4fc3176..4bc9412 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1637,6 +1637,13 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, if (qemuBuildDriveSourceStr(disk, qemuCaps, &opt) < 0) goto error; + + if (disk->disk_cache.disk_l2_cache_size > 0) + virBufferAsprintf(&opt, "l2-cache-size=%u,", + disk->disk_cache.disk_l2_cache_size); + if (disk->disk_cache.disk_cache_clean_interval > 0) + virBufferAsprintf(&opt, "cache-clean-interval=%u,", + disk->disk_cache.disk_cache_clean_interval); if (qemuDiskBusNeedsDeviceArg(disk->bus)) { char *drivealias = qemuAliasDiskDriveFromDisk(disk); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index fee4481..4896bf7 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8627,6 +8627,10 @@ qemuDomainDiskChangeSupported(virDomainDiskDefPtr disk, CHECK_EQ(ioeventfd, "ioeventfd", true); CHECK_EQ(event_idx, "event_idx", true); CHECK_EQ(copy_on_read, "copy_on_read", true); + CHECK_EQ(disk_cache.disk_l2_cache_size, + "diskCache disk_l2_cache_size", true); + CHECK_EQ(disk_cache.disk_cache_clean_interval, + "diskCache disk_cache_clean_interval", true); /* "snapshot" is a libvirt internal field and thus can be changed */ /* startupPolicy is allowed to be updated. Therefore not checked here. */ CHECK_EQ(transient, "transient", true); -- 1.8.3.1

4 3

[libvirt] [dbus PATCH] data: Allow system access to users in the libvirt group
by Andrea Bolognani 29 Jun '18

29 Jun '18

This is consistent with libvirt's own polkit configuration, which grants users in the libvirt group full administrative access to the system daemon. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- data/system/org.libvirt.conf.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/data/system/org.libvirt.conf.in b/data/system/org.libvirt.conf.in index fe61b70..45fd4de 100644 --- a/data/system/org.libvirt.conf.in +++ b/data/system/org.libvirt.conf.in @@ -12,4 +12,8 @@ <allow send_destination="org.libvirt"/> </policy> + <policy group="libvirt"> + <allow send_destination="org.libvirt"/> + </policy> + </busconfig> -- 2.17.1

2 1

[libvirt] [dbus PATCH 0/2] Fix polkit rules directory
by Andrea Bolognani 29 Jun '18

29 Jun '18

See patch 2/2 for the details. Andrea Bolognani (2): configure: Make polkit rules directory configurable configure: Fix default polkit rules directory configure.ac | 5 +++++ data/Makefile.am | 2 +- libvirt-dbus.spec.in | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) -- 2.17.1

2 3

[libvirt] [dbus PATCH] data: Fix indentation in Makefile.am
by Andrea Bolognani 29 Jun '18

29 Jun '18

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. data/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/Makefile.am b/data/Makefile.am index b3fa614..b0e6b31 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -23,7 +23,7 @@ interfaces_files = \ org.libvirt.Domain.xml \ org.libvirt.Network.xml \ org.libvirt.NodeDevice.xml \ - org.libvirt.NWFilter.xml \ + org.libvirt.NWFilter.xml \ org.libvirt.Secret.xml \ org.libvirt.StoragePool.xml \ org.libvirt.StorageVol.xml \ -- 2.17.1

1 0

[libvirt] [PATCH] qemu: Report error on unexpected job stats type
by Jiri Denemark 28 Jun '18

28 Jun '18

If we ever fail to properly set jobinfo->statsType, qemuDomainJobInfoToParams would return -1 without setting an error. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_domain.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index fee44812c1..9afe705929 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -730,6 +730,12 @@ qemuDomainJobInfoToParams(qemuDomainJobInfoPtr jobInfo, return qemuDomainDumpJobInfoToParams(jobInfo, type, params, nparams); case QEMU_DOMAIN_JOB_STATS_TYPE_NONE: + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("invalid job statistics type")); + break; + + default: + virReportEnumRangeError(qemuDomainJobStatsType, jobInfo->statsType); break; } -- 2.18.0

2 3

[libvirt] [PATCH python] Fix bugs in nwfilter binding APIs
by Daniel P. Berrangé 28 Jun '18

28 Jun '18

We did not correctly mangle the API names in two cases, and we also forgot to specialize the lookup method name in the sanity test. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- generator.py | 5 ++++- sanitytest.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/generator.py b/generator.py index ae0e45c..bd7ff11 100755 --- a/generator.py +++ b/generator.py @@ -1127,7 +1127,10 @@ def nameFixup(name, classe, type, file): func = func[0:1].lower() + func[1:] elif name[0:27] == "virNWFilterBindingCreateXML": func = name[3:] - func = func[0:1].lower() + func[1:] + func = func[0:3].lower() + func[3:] + elif name[0:24] == "virNWFilterBindingLookup": + func = name[3:] + func = func[0:3].lower() + func[3:] elif name[0:24] == "virNWFilterBindingDefine": func = name[3:] func = func[0:3].lower() + func[3:] diff --git a/sanitytest.py b/sanitytest.py index d5c23dc..68dde6b 100644 --- a/sanitytest.py +++ b/sanitytest.py @@ -260,7 +260,7 @@ for name in sorted(basicklassmap): "LookupByUUIDString", "LookupByVolume" "LookupByName", "LookupByID", "LookupByName", "LookupByKey", "LookupByPath", "LookupByMACString", "LookupByUsage", "LookupByVolume", - "LookupByTargetPath","LookupSCSIHostByWWN", + "LookupByTargetPath","LookupSCSIHostByWWN", "LookupByPortDev", "Restore", "RestoreFlags", "SaveImageDefineXML", "SaveImageGetXMLDesc", "DefineXMLFlags"]: if klass != "virDomain": -- 2.17.1

2 1

[libvirt] [PATCH] qemu: Allow cachetune only for KVM domains
by Michal Privoznik 28 Jun '18

28 Jun '18

https://bugzilla.redhat.com/show_bug.cgi?id=1541921 In TCG mode, there are no vCPU threads and thus there's nothing to be placed into resctrl CGroup. Forbid such configuration. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index fee44812c1..a39d9a46a0 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3980,6 +3980,13 @@ qemuDomainDefValidate(const virDomainDef *def, } } + if (def->ncachetunes && + def->virtType != VIR_DOMAIN_VIRT_KVM) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("cachetune is only supported for KVM domains")); + goto cleanup; + } + if (qemuDomainDefValidateFeatures(def, qemuCaps) < 0) goto cleanup; -- 2.16.4

3 2

[libvirt] [PATCH] security: Add swtpm paths to the domain's AppArmor profile
by Stefan Berger 28 Jun '18

28 Jun '18

This patch extends the AppArmor domain profile with file paths the swtpm accesses for state, log, pid, and socket files. Both, QEMU and swtpm, use this AppArmor profile. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> Cc: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> --- examples/apparmor/libvirt-qemu | 5 +++++ src/security/virt-aa-helper.c | 45 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/examples/apparmor/libvirt-qemu b/examples/apparmor/libvirt-qemu index 874aca2092..df5f512487 100644 --- a/examples/apparmor/libvirt-qemu +++ b/examples/apparmor/libvirt-qemu @@ -158,6 +158,11 @@ /usr/{lib,lib64}/qemu/*.so mr, /usr/lib/(a){multiarch}/qemu/*.so mr, + # swtpm + /{usr/,}bin/swtpm rmix, + /usr/{lib,lib64}/libswtpm_libtpms.so mr, + /usr/lib/(a){multiarch}/libswtpm_libtpms.so mr, + # for save and resume /{usr/,}bin/dash rmix, /{usr/,}bin/dd rmix, diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 971ee6733c..952b496f21 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -1181,6 +1181,51 @@ get_files(vahControl * ctl) } } + if (ctl->def->tpm) { + char *shortName = NULL; + const char *tpmpath = NULL; + + switch (ctl->def->tpm->type) { + case VIR_DOMAIN_TPM_TYPE_EMULATOR: + shortName = virDomainDefGetShortName(ctl->def); + + switch (ctl->def->tpm->version) { + case VIR_DOMAIN_TPM_VERSION_1_2: + tpmpath = "tpm1.2"; + break; + case VIR_DOMAIN_TPM_VERSION_2_0: + tpmpath = "tpm2"; + break; + case VIR_DOMAIN_TPM_VERSION_DEFAULT: + case VIR_DOMAIN_TPM_VERSION_LAST: + break; + } + + /* Unix socket for QEMU and swtpm to use */ + virBufferAsprintf(&buf, + " \"/run/libvirt/qemu/swtpm/%s-swtpm.sock\" rw,\n", + shortName); + /* Paths for swtpm to use: give it access to its state + * directory, log, and PID files. + */ + virBufferAsprintf(&buf, + " \"%s/lib/libvirt/swtpm/%s/%s/**\" rw,\n", + LOCALSTATEDIR, uuidstr, tpmpath); + virBufferAsprintf(&buf, + " \"%s/log/swtpm/libvirt/qemu/%s-swtpm.log\" a,\n", + LOCALSTATEDIR, ctl->def->name); + virBufferAsprintf(&buf, + " \"/run/libvirt/qemu/swtpm/%s-swtpm.pid\" rw,\n", + shortName); + + VIR_FREE(shortName); + break; + case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH: + case VIR_DOMAIN_TPM_TYPE_LAST: + break; + } + } + if (ctl->def->virtType == VIR_DOMAIN_VIRT_KVM) { for (i = 0; i < ctl->def->nnets; i++) { virDomainNetDefPtr net = ctl->def->nets[i]; -- 2.14.4

2 3

[libvirt] [PATCH] lxc: Rearrange order in lxcDomainUpdateDeviceFlags
by John Ferlan 28 Jun '18

28 Jun '18

Although commit e3497f3f noted that the LIVE option doesn't matter and removed the call to virDomainDefCompatibleDevice, it didn't go quite far enough and change the order of the checks. Since we don't have the possibility of LIVE succeeding and thus the need for a delayed update in order to write the CONFIG change let's just merge the saving of the config into one if statement. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/lxc/lxc_driver.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index bde0ff6ad4..6afb36765a 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -4862,6 +4862,12 @@ static int lxcDomainUpdateDeviceFlags(virDomainPtr dom, goto endjob; } + if (flags & VIR_DOMAIN_AFFECT_LIVE) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("Unable to modify live devices")); + goto endjob; + } + if (flags & VIR_DOMAIN_AFFECT_CONFIG) { /* Make a copy for updated domain. */ vmdef = virDomainObjCopyPersistentDef(vm, caps, driver->xmlopt); @@ -4872,17 +4878,7 @@ static int lxcDomainUpdateDeviceFlags(virDomainPtr dom, * device we're going to update. */ if ((ret = lxcDomainUpdateDeviceConfig(vmdef, dev)) < 0) goto endjob; - } - - if (flags & VIR_DOMAIN_AFFECT_LIVE) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("Unable to modify live devices")); - - goto endjob; - } - /* Finally, if no error until here, we can save config. */ - if (flags & VIR_DOMAIN_AFFECT_CONFIG) { ret = virDomainSaveConfig(cfg->configDir, driver->caps, vmdef); if (!ret) { virDomainObjAssignDef(vm, vmdef, false, NULL); -- 2.14.4

2 1

[libvirt] [PATCH 0/2] tests: qemumonitorjson: Fix blockstats test case
by Peter Krempa 28 Jun '18

28 Jun '18

Peter Krempa (2): tests: qemumonitorjson: Add only required replies for blockstats test tests: qemumonitorjson: Fix name and call apropriate API tests/qemumonitorjsontest.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) -- 2.16.2

2 3

[libvirt] [PATCH] qemu: domain: update only newly detected images in qemuDomainDetermineDiskChain
by Peter Krempa 28 Jun '18

28 Jun '18

The processing code which prepares images should be executed really only for the images which were detected. The code actually tried to update the last user-specified layer as well. Thankfully we don't do anything that would be a problem at this point. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index f8a662f747..0fe9bc4b2a 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8377,7 +8377,7 @@ qemuDomainDetermineDiskChain(virQEMUDriverPtr driver, if (virStorageFileGetMetadata(src, uid, gid, report_broken) < 0) goto cleanup; - for (n = src; virStorageSourceIsBacking(n); n = n->backingStore) { + for (n = src->backingStore; virStorageSourceIsBacking(n); n = n->backingStore) { if (qemuDomainValidateStorageSource(n, priv->qemuCaps) < 0) goto cleanup; -- 2.16.2

2 1

[libvirt] [PATCH] esx_driver: Simplify IsEncrypted and IsSecure
by Marcos Paulo de Souza 28 Jun '18

28 Jun '18

Signed-off-by: Marcos Paulo de Souza <marcos.souza.org(a)gmail.com> --- src/esx/esx_driver.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 60aa5fc252..bb8eeecd42 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -4000,11 +4000,7 @@ esxConnectIsEncrypted(virConnectPtr conn) { esxPrivate *priv = conn->privateData; - if (STRCASEEQ(priv->parsedUri->transport, "https")) { - return 1; - } else { - return 0; - } + return STRCASEEQ(priv->parsedUri->transport, "https"); } @@ -4014,11 +4010,7 @@ esxConnectIsSecure(virConnectPtr conn) { esxPrivate *priv = conn->privateData; - if (STRCASEEQ(priv->parsedUri->transport, "https")) { - return 1; - } else { - return 0; - } + return STRCASEEQ(priv->parsedUri->transport, "https"); } -- 2.17.1

2 1

[libvirt] [PATCH] nwfilter: Remove redundant check if object exists
by Pavel Hrdina 28 Jun '18

28 Jun '18

The same check is done by virNWFilterBindingObjListAdd(). The main issue with the current code is that if the object already exists we would leak 'def' because 'obj' would be set and the cleanup code frees 'def' only if 'obj' is NULL. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/nwfilter/nwfilter_driver.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index ed34586105..ac3a964388 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -752,13 +752,6 @@ nwfilterBindingCreateXML(virConnectPtr conn, if (virNWFilterBindingCreateXMLEnsureACL(conn, def) < 0) goto cleanup; - obj = virNWFilterBindingObjListFindByPortDev(driver->bindings, def->portdevname); - if (obj) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Filter already present for NIC %s"), def->portdevname); - goto cleanup; - } - obj = virNWFilterBindingObjListAdd(driver->bindings, def); if (!obj) -- 2.17.1

2 1

[libvirt] [PATCH] nwfilter: variable 'obj' must be initialized inside nwfilterBindingCreateXML().
by Julio Faracco 28 Jun '18

28 Jun '18

The function nwfilterBindingCreateXML() is failing to compile due to a conditional branch which leads to a undefined 'obj' variable. So 'obj' must have a initial value to avoid compilation errors. See the problem: CC nwfilter/libvirt_driver_nwfilter_impl_la-nwfilter_driver.lo nwfilter/nwfilter_driver.c:752:9: error: variable 'obj' is used uninitialized whenever 'if' condition is true [-Werror,-Wsometimes-uninitialized] if (virNWFilterBindingCreateXMLEnsureACL(conn, def) < 0) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ nwfilter/nwfilter_driver.c:779:10: note: uninitialized use occurs here if (!obj) ^~~ nwfilter/nwfilter_driver.c:752:5: note: remove the 'if' if its condition is always false if (virNWFilterBindingCreateXMLEnsureACL(conn, def) < 0) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ nwfilter/nwfilter_driver.c:742:33: note: initialize the variable 'obj' to silence this warning virNWFilterBindingObjPtr obj; ^ = NULL This commit initialized 'obj' with NULL to fix the error properly. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/nwfilter/nwfilter_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index d385b46f5f..ed34586105 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -739,8 +739,8 @@ nwfilterBindingCreateXML(virConnectPtr conn, const char *xml, unsigned int flags) { - virNWFilterBindingObjPtr obj; virNWFilterBindingDefPtr def; + virNWFilterBindingObjPtr obj = NULL; virNWFilterBindingPtr ret = NULL; virCheckFlags(0, NULL); -- 2.17.1

2 1

[libvirt] [python PATCH] Add support for nwfilter binding objects / apis
by Daniel P. Berrangé 28 Jun '18

28 Jun '18

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- generator.py | 33 ++++++++++++++++++++-- libvirt-override-api.xml | 6 ++++ libvirt-override-virConnect.py | 12 ++++++++ libvirt-override.c | 51 ++++++++++++++++++++++++++++++++++ typewrappers.c | 13 +++++++++ typewrappers.h | 10 +++++++ 6 files changed, 122 insertions(+), 3 deletions(-) diff --git a/generator.py b/generator.py index 353adab..ae0e45c 100755 --- a/generator.py +++ b/generator.py @@ -356,6 +356,10 @@ py_types = { 'virNWFilter *': ('O', "virNWFilter", "virNWFilterPtr", "virNWFilterPtr"), 'const virNWFilter *': ('O', "virNWFilter", "virNWFilterPtr", "virNWFilterPtr"), + 'virNWFilterBindingPtr': ('O', "virNWFilterBinding", "virNWFilterBindingPtr", "virNWFilterBindingPtr"), + 'virNWFilterBinding *': ('O', "virNWFilterBinding", "virNWFilterBindingPtr", "virNWFilterBindingPtr"), + 'const virNWFilterBinding *': ('O', "virNWFilterBinding", "virNWFilterBindingPtr", "virNWFilterBindingPtr"), + 'virStreamPtr': ('O', "virStream", "virStreamPtr", "virStreamPtr"), 'virStream *': ('O', "virStream", "virStreamPtr", "virStreamPtr"), 'const virStream *': ('O', "virStream", "virStreamPtr", "virStreamPtr"), @@ -539,6 +543,7 @@ skip_function = ( 'virConnectListAllInterfaces', # overridden in virConnect.py 'virConnectListAllNodeDevices', # overridden in virConnect.py 'virConnectListAllNWFilters', # overridden in virConnect.py + 'virConnectListAllNWFilterBindings', # overridden in virConnect.py 'virConnectListAllSecrets', # overridden in virConnect.py 'virConnectGetAllDomainStats', # overridden in virConnect.py 'virDomainListGetStats', # overriden in virConnect.py @@ -572,6 +577,7 @@ skip_function = ( "virNodeDeviceRef", "virSecretRef", "virNWFilterRef", + "virNWFilterBindingRef", "virStoragePoolRef", "virStorageVolRef", "virStreamRef", @@ -1010,6 +1016,8 @@ classes_type = { "virSecret *": ("._o", "virSecret(self, _obj=%s)", "virSecret"), "virNWFilterPtr": ("._o", "virNWFilter(self, _obj=%s)", "virNWFilter"), "virNWFilter *": ("._o", "virNWFilter(self, _obj=%s)", "virNWFilter"), + "virNWFilterBindingPtr": ("._o", "virNWFilterBinding(self, _obj=%s)", "virNWFilterBinding"), + "virNWFilterBinding *": ("._o", "virNWFilterBinding(self, _obj=%s)", "virNWFilterBinding"), "virStreamPtr": ("._o", "virStream(self, _obj=%s)", "virStream"), "virStream *": ("._o", "virStream(self, _obj=%s)", "virStream"), "virConnectPtr": ("._o", "virConnect(_obj=%s)", "virConnect"), @@ -1021,7 +1029,8 @@ classes_type = { primary_classes = ["virDomain", "virNetwork", "virInterface", "virStoragePool", "virStorageVol", "virConnect", "virNodeDevice", "virSecret", - "virNWFilter", "virStream", "virDomainSnapshot"] + "virNWFilter", "virNWFilterBinding", + "virStream", "virDomainSnapshot"] classes_destructors = { "virDomain": "virDomainFree", @@ -1032,6 +1041,7 @@ classes_destructors = { "virNodeDevice" : "virNodeDeviceFree", "virSecret": "virSecretFree", "virNWFilter": "virNWFilterFree", + "virNWFilterBinding": "virNWFilterBindingFree", "virDomainSnapshot": "virDomainSnapshotFree", # We hand-craft __del__ for this one #"virStream": "virStreamFree", @@ -1058,6 +1068,8 @@ functions_noexcept = { 'virSecretGetUsageType': True, 'virSecretGetUsageID': True, 'virNWFilterGetName': True, + 'virNWFilterBindingGetFilterName': True, + 'virNWFilterBindingGetPortDev': True, } function_classes = {} @@ -1113,6 +1125,15 @@ def nameFixup(name, classe, type, file): elif name[0:15] == "virSecretLookup": func = name[3:] func = func[0:1].lower() + func[1:] + elif name[0:27] == "virNWFilterBindingCreateXML": + func = name[3:] + func = func[0:1].lower() + func[1:] + elif name[0:24] == "virNWFilterBindingDefine": + func = name[3:] + func = func[0:3].lower() + func[3:] + elif name[0:24] == "virNWFilterBindingLookup": + func = name[3:] + func = func[0:3].lower() + func[3:] elif name[0:17] == "virNWFilterDefine": func = name[3:] func = func[0:3].lower() + func[3:] @@ -1189,6 +1210,12 @@ def nameFixup(name, classe, type, file): elif name[0:9] == 'virSecret': func = name[9:] func = func[0:1].lower() + func[1:] + elif name[0:21] == 'virNWFilterBindingGet': + func = name[21:] + func = func[0:1].lower() + func[1:] + elif name[0:18] == 'virNWFilterBinding': + func = name[18:] + func = func[0:1].lower() + func[1:] elif name[0:14] == 'virNWFilterGet': func = name[14:] func = func[0:1].lower() + func[1:] @@ -1468,7 +1495,7 @@ def buildWrappers(module): classes.write("class %s(object):\n" % (classname)) if classname in [ "virDomain", "virNetwork", "virInterface", "virStoragePool", "virStorageVol", "virNodeDevice", "virSecret","virStream", - "virNWFilter" ]: + "virNWFilter", "virNWFilterBinding" ]: classes.write(" def __init__(self, conn, _obj=None):\n") elif classname in [ 'virDomainSnapshot' ]: classes.write(" def __init__(self, dom, _obj=None):\n") @@ -1476,7 +1503,7 @@ def buildWrappers(module): classes.write(" def __init__(self, _obj=None):\n") if classname in [ "virDomain", "virNetwork", "virInterface", "virNodeDevice", "virSecret", "virStream", - "virNWFilter" ]: + "virNWFilter", "virNWFilterBinding" ]: classes.write(" self._conn = conn\n") elif classname in [ "virStorageVol", "virStoragePool" ]: classes.write(" self._conn = conn\n" + \ diff --git a/libvirt-override-api.xml b/libvirt-override-api.xml index ecbdac2..4e8d6c0 100644 --- a/libvirt-override-api.xml +++ b/libvirt-override-api.xml @@ -485,6 +485,12 @@ <arg name='flags' type='unsigned int' info='optional flags'/> <return type='char *' info='the list of network filters or None in case of error'/> </function> + <function name='virConnectListAllNWFilterBindings' file='python'> + <info>returns list of all network fitler bindings</info> + <arg name='conn' type='virConnectPtr' info='pointer to the hypervisor connection'/> + <arg name='flags' type='unsigned int' info='optional flags'/> + <return type='char *' info='the list of network filter bindings or None in case of error'/> + </function> <function name='virNWFilterLookupByUUID' file='python'> <info>Try to lookup a network filter on the given hypervisor based on its UUID.</info> <return type='virNWFilterPtr' info='a new network filter object or NULL in case of failure'/> diff --git a/libvirt-override-virConnect.py b/libvirt-override-virConnect.py index a24eae7..7fe08e0 100644 --- a/libvirt-override-virConnect.py +++ b/libvirt-override-virConnect.py @@ -531,6 +531,18 @@ return retlist + def listAllNWFilterBindings(self, flags=0): + """Returns a list of network filter binding objects""" + ret = libvirtmod.virConnectListAllNWFilterBindings(self._o, flags) + if ret is None: + raise libvirtError("virConnectListAllNWFilterBindings() failed", conn=self) + + retlist = list() + for filter_ptr in ret: + retlist.append(virNWFilterBinding(self, _obj=filter_ptr)) + + return retlist + def listAllSecrets(self, flags=0): """Returns a list of secret objects""" ret = libvirtmod.virConnectListAllSecrets(self._o, flags) diff --git a/libvirt-override.c b/libvirt-override.c index 012de3f..e74c7dd 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -4446,6 +4446,54 @@ libvirt_virConnectListAllNWFilters(PyObject *self ATTRIBUTE_UNUSED, } #endif /* LIBVIR_CHECK_VERSION(0, 10, 2) */ +#if LIBVIR_CHECK_VERSION(4, 5, 0) +static PyObject * +libvirt_virConnectListAllNWFilterBindings(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + PyObject *pyobj_conn; + PyObject *py_retval = NULL; + virConnectPtr conn; + virNWFilterBindingPtr *bindings = NULL; + int c_retval = 0; + ssize_t i; + unsigned int flags; + + if (!PyArg_ParseTuple(args, (char *)"OI:virConnectListAllNWFilterBindings", + &pyobj_conn, &flags)) + return NULL; + conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virConnectListAllNWFilterBindings(conn, &bindings, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (c_retval < 0) + return VIR_PY_NONE; + + if (!(py_retval = PyList_New(c_retval))) + goto cleanup; + + for (i = 0; i < c_retval; i++) { + VIR_PY_LIST_SET_GOTO(py_retval, i, + libvirt_virNWFilterBindingPtrWrap(bindings[i]), error); + /* python steals the pointer */ + bindings[i] = NULL; + } + + cleanup: + for (i = 0; i < c_retval; i++) + if (bindings[i]) + virNWFilterBindingFree(bindings[i]); + VIR_FREE(bindings); + return py_retval; + + error: + Py_CLEAR(py_retval); + goto cleanup; +} +#endif /* LIBVIR_CHECK_VERSION(4, 5, 0) */ + static PyObject * libvirt_virConnectListInterfaces(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -9971,6 +10019,9 @@ static PyMethodDef libvirtMethods[] = { #if LIBVIR_CHECK_VERSION(0, 10, 2) {(char *) "virConnectListAllNWFilters", libvirt_virConnectListAllNWFilters, METH_VARARGS, NULL}, #endif /* LIBVIR_CHECK_VERSION(0, 10, 2) */ +#if LIBVIR_CHECK_VERSION(4, 5, 0) + {(char *) "virConnectListAllNWFilterBindings", libvirt_virConnectListAllNWFilterBindings, METH_VARARGS, NULL}, +#endif /* LIBVIR_CHECK_VERSION(4, 5, 0) */ {(char *) "virConnectListInterfaces", libvirt_virConnectListInterfaces, METH_VARARGS, NULL}, {(char *) "virConnectListDefinedInterfaces", libvirt_virConnectListDefinedInterfaces, METH_VARARGS, NULL}, #if LIBVIR_CHECK_VERSION(0, 10, 2) diff --git a/typewrappers.c b/typewrappers.c index 99a8fb8..9ba14b4 100644 --- a/typewrappers.c +++ b/typewrappers.c @@ -542,6 +542,19 @@ libvirt_virNWFilterPtrWrap(virNWFilterPtr node) return ret; } +PyObject * +libvirt_virNWFilterBindingPtrWrap(virNWFilterBindingPtr node) +{ + PyObject *ret; + + if (node == NULL) { + return VIR_PY_NONE; + } + + ret = libvirt_buildPyObject(node, "virNWFilterBindingPtr", NULL); + return ret; +} + PyObject * libvirt_virStreamPtrWrap(virStreamPtr node) { diff --git a/typewrappers.h b/typewrappers.h index ed1e4a3..1570c6a 100644 --- a/typewrappers.h +++ b/typewrappers.h @@ -106,6 +106,15 @@ typedef struct { } PyvirNWFilter_Object; +#define PyvirNWFilterBinding_Get(v) (((v) == Py_None) ? NULL : \ + (((PyvirNWFilterBinding_Object *)(v))->obj)) + +typedef struct { + PyObject_HEAD + virNWFilterBindingPtr obj; +} PyvirNWFilterBinding_Object; + + #define PyvirStream_Get(v) (((v) == Py_None) ? NULL : \ (((PyvirStream_Object *)(v))->obj)) @@ -189,6 +198,7 @@ PyObject * libvirt_virVoidPtrWrap(void* node); PyObject * libvirt_virNodeDevicePtrWrap(virNodeDevicePtr node); PyObject * libvirt_virSecretPtrWrap(virSecretPtr node); PyObject * libvirt_virNWFilterPtrWrap(virNWFilterPtr node); +PyObject * libvirt_virNWFilterBindingPtrWrap(virNWFilterBindingPtr node); PyObject * libvirt_virStreamPtrWrap(virStreamPtr node); PyObject * libvirt_virDomainSnapshotPtrWrap(virDomainSnapshotPtr node); -- 2.17.1

2 1

[libvirt] [PATCH v2 00/12] PCI passthrough support on s390
by Yi Min Zhao 28 Jun '18

28 Jun '18

Abstract ======== The PCI representation in QEMU has recently been extended for S390 allowing configuration of zPCI attributes like uid (user-defined identifier) and fid (PCI function identifier). The details can be found here: https://lists.gnu.org/archive/html/qemu-devel/2016-06/msg07262.html To support the new zPCI feature of the S390 platform, two new XML attributes, @uid and @fid, are introduced for device addresses of type 'pci', i.e.: <hostdev mode='subsystem' type='pci'> <driver name='vfio'/> <source> <address domain='0x0001' bus='0x00' slot='0x00' function='0x0'/> </source> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' uid='0x0003' fid='0x00000027'/> </hostdev> uid and fid are optional attributes. If they are defined by the user, unique values within the guest domain must be used. If they are not specified and the architecture requires them, they are automatically generated with non-conflicting values. Current implementation is the most seamless one for the user as it unites the address specific data of a PCI device on one XML element. It could accommodate both specifying our special parameters (uid and fid) and re-using standard statements (domain, bus, slot and function) for PCI devices. User can still specify bus/slot/function for the virtualized PCI devices in the XML. Thus uid/fid act as an extension to the PCI address and are stored in a new structure 'virZPCIDeviceAddress' which is a member of common PCI Address structure. Additionally, two hashtables are used for assignment and reservation of uid/fid. In support of extending the PCI address, a new PCI address extension flag is introduced. This extension flag allows is not only dedicated for the S390 platform but also other architectures needing certain extensions to PCI address space. Code Base ========= commit in master: 0c4408c832368b45c8246175e2a75132d3ff0302 qemu: Don't use asyncJob after stop during snapshot revert Change Log ========== v1->v2: 1. Separate test commit and merge testcases into corresponding commits that introduce the functionalities firstly. 2. Spare some checks for zpci device. 3. Add vsock and controller support. 4. Add uin32 type schema. 5. Rename zpciuid and zpcifid to zpci_uid and zpci_fid. 6. Always return multibus support on S390. Yi Min Zhao (12): conf: Add definitions for 'uid' and 'fid' PCI address attributes qemu: Introduce zPCI capability conf: Introduce a new PCI address extension flag qemu: Enable PCI multi bus for S390 guests qemu: Auto add pci-root for s390/s390x guests conf: Introduce address caching for PCI extensions conf: Introduce parser, formatter for uid and fid conf: Allocate/release 'uid' and 'fid' in PCI address qemu: Generate and use zPCI device in QEMU command line qemu: Add hotpluging support for PCI devices on S390 guests docs: Add 'uid' and 'fid' information news: Update news for PCI address extension attributes docs/formatdomain.html.in | 9 +- docs/news.xml | 11 + docs/schemas/basictypes.rng | 31 ++ docs/schemas/domaincommon.rng | 1 + src/conf/device_conf.c | 73 +++++ src/conf/device_conf.h | 1 + src/conf/domain_addr.c | 346 +++++++++++++++++++++ src/conf/domain_addr.h | 29 ++ src/conf/domain_conf.c | 6 + src/libvirt_private.syms | 4 + src/qemu/qemu_capabilities.c | 6 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 105 +++++++ src/qemu/qemu_command.h | 4 + src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain_address.c | 181 ++++++++++- src/qemu/qemu_hotplug.c | 201 ++++++++++-- src/util/virpci.h | 13 + tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + tests/qemuxml2argvdata/disk-virtio-s390-zpci.args | 27 ++ tests/qemuxml2argvdata/disk-virtio-s390-zpci.xml | 17 + .../hostdev-vfio-zpci-autogenerate.args | 26 ++ .../hostdev-vfio-zpci-autogenerate.xml | 18 ++ .../hostdev-vfio-zpci-boundaries.args | 30 ++ .../hostdev-vfio-zpci-boundaries.xml | 26 ++ .../hostdev-vfio-zpci-multidomain-many.args | 40 +++ .../hostdev-vfio-zpci-multidomain-many.xml | 67 ++++ tests/qemuxml2argvdata/hostdev-vfio-zpci.args | 26 ++ tests/qemuxml2argvdata/hostdev-vfio-zpci.xml | 19 ++ tests/qemuxml2argvtest.c | 14 + tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.xml | 29 ++ tests/qemuxml2xmloutdata/hostdev-vfio-zpci.xml | 30 ++ tests/qemuxml2xmltest.c | 3 + 38 files changed, 1377 insertions(+), 24 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-virtio-s390-zpci.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-s390-zpci.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci.xml create mode 100644 tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-vfio-zpci.xml -- Yi Min

1 12

[libvirt] [dbus PATCH] mailmap: Add mailmap file
by Andrea Bolognani 27 Jun '18

27 Jun '18

The AUTHORS file included in releases contains some duplicated or incorrect information; having a mailmap file will make sure future ones wont't suffer from the same issue. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- .mailmap | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .mailmap diff --git a/.mailmap b/.mailmap new file mode 100644 index 0000000..9a35b7c --- /dev/null +++ b/.mailmap @@ -0,0 +1,9 @@ +# 'git shortlog --help' and look for mailmap for the format of each line + +# Email consolidation: +# <Preferred address in AUTHORS> <other alias used by same author> +<martin(a)piware.de> <martinpitt(a)users.noreply.github.com> + +# Name consolidation: +# Preferred author spelling <preferred email> +Daniel P. Berrangé <berrange(a)redhat.com> -- 2.17.1

2 1

[libvirt] [PATCH v2 0/3] Deny live device alias change
by Michal Privoznik 27 Jun '18

27 Jun '18

v2 of: https://www.redhat.com/archives/libvir-list/2018-June/msg00971.html Note that 1/3 is already reviewed (not pushed though, yet). diff to v1: - Fixed <interface/> hotplug issue raised during review of v1, - Removed alias change checks for disks and interfaces since there's one common place for that now. Michal Privoznik (3): qemuDomainUpdateDeviceFlags: Parse device as live if needed conf: Reintroduce action to virDomainDefCompatibleDevice conf: Forbid device alias change on device-update src/conf/domain_conf.c | 14 +++++++++++++- src/conf/domain_conf.h | 4 +++- src/lxc/lxc_driver.c | 12 +++++++++--- src/qemu/qemu_domain.c | 8 -------- src/qemu/qemu_driver.c | 44 ++++++++++++++++++++++++++++++++------------ src/qemu/qemu_hotplug.c | 5 ----- 6 files changed, 57 insertions(+), 30 deletions(-) -- 2.16.4

2 10

[libvirt] [PATCH python] libvirtaio: Fix compat with python 3.7
by Cole Robinson 27 Jun '18

27 Jun '18

In python 3.7, async is now a keyword, so this throws a syntax error: File "/usr/lib64/python3.7/site-packages/libvirtaio.py", line 49 from asyncio import async as ensure_future ^ SyntaxError: invalid syntax Switch to getattr trickery to accomplish the same goal Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- libvirtaio.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) If we don't care about python3 < 3.4.4 compat, we can just do from asyncio import ensure_future diff --git a/libvirtaio.py b/libvirtaio.py index 1c432dd..9d517e6 100644 --- a/libvirtaio.py +++ b/libvirtaio.py @@ -43,10 +43,12 @@ import warnings import libvirt -try: - from asyncio import ensure_future -except ImportError: - from asyncio import async as ensure_future +# python < 3.4.4: we want 'async' +# python >= 3.4.4 < 3.7, we want 'ensure_future' +# python >= 3.7, 'async' is a reserved keyword, so we can't import it +ensure_future = getattr(asyncio, "ensure_future", None) +if not ensure_future: + ensure_future = getattr(asyncio, "async") class Callback(object): -- 2.17.1

3 5

[libvirt] [PATCH] Fix syntax error on Python 3.7
by Miro Hrončok 27 Jun '18

27 Jun '18

From 0d3b7cc9ba787a139ecbe6dac490b1f5bb021b7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro(a)hroncok.cz> Date: Wed, 27 Jun 2018 13:00:28 +0200 Subject: [PATCH] Fix syntax error on Python 3.7 async is a keyword now. `asyncio import ensure_future` works on Python 3.4 to 3.7 `from asyncio import async as ensure_future` is not needed. --- libvirtaio.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libvirtaio.py b/libvirtaio.py index 1c432dd..b100a5f 100644 --- a/libvirtaio.py +++ b/libvirtaio.py @@ -43,10 +43,7 @@ import warnings import libvirt -try: - from asyncio import ensure_future -except ImportError: - from asyncio import async as ensure_future +from asyncio import ensure_future class Callback(object): -- 2.17.0

2 3

[libvirt] [PATCH] qemu:Add support L2 table cache for qcow2 disk
by Allen Do 27 Jun '18

27 Jun '18

The patch add support L2 table cache for qcow2 disk. L2 table cache can improve IO read and write performance for qcow2 img. Diff follows: src/conf/domain_conf.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 5 +++++ src/qemu/qemu_command.c | 7 +++++++ src/qemu/qemu_domain.c | 6 ++++++ tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml | 3 ++- 6 files changed, 68 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index beca0be..0a6afca 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8058,6 +8058,8 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, char *domain_name = NULL; int expected_secret_usage = -1; int auth_secret_usage = -1; + char *disk_l2_cache_size = NULL; + char *disk_cache_clean_interval = NULL; if (!(def = virDomainDiskDefNew(xmlopt))) return NULL; @@ -8233,6 +8235,27 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, } } else if (xmlStrEqual(cur->name, BAD_CAST "boot")) { /* boot is parsed as part of virDomainDeviceInfoParseXML */ + } else if (xmlStrEqual(cur->name, BAD_CAST "diskCache")) { + disk_l2_cache_size = + virXMLPropString(cur, "disk_l2_cache_size"); + if (disk_l2_cache_size && + virStrToLong_ui(disk_l2_cache_size, NULL, 0, + &def->disk_cache.disk_l2_cache_size) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("invalid disk L2 cache size '%s'"), + disk_l2_cache_size); + goto error; + } + disk_cache_clean_interval = + virXMLPropString(cur, "disk_cache_clean_interval"); + if (disk_cache_clean_interval && + virStrToLong_ui(disk_cache_clean_interval, NULL, 0, + &def->disk_cache.disk_cache_clean_interval) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("invalid disk cache clean interval '%s'"), + disk_cache_clean_interval); + goto error; + } } } @@ -8472,6 +8495,8 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, VIR_FREE(vendor); VIR_FREE(product); VIR_FREE(domain_name); + VIR_FREE(disk_l2_cache_size); + VIR_FREE(disk_cache_clean_interval); ctxt->node = save_ctxt; return def; @@ -20646,6 +20671,27 @@ virDomainDiskBlockIoDefFormat(virBufferPtr buf, } } +static void +virDomainDiskCacheDefFormat(virBufferPtr buf, + virDomainDiskDefPtr def) +{ + if (def->disk_cache.disk_l2_cache_size > 0 || + def->disk_cache.disk_cache_clean_interval > 0) { + virBufferAddLit(buf, "<diskCache"); + if (def->disk_cache.disk_l2_cache_size > 0) { + virBufferAsprintf(buf, + " disk_l2_cache_size='%u'", + def->disk_cache.disk_l2_cache_size); + } + if (def->disk_cache.disk_cache_clean_interval > 0) { + virBufferAsprintf(buf, + " disk_cache_clean_interval='%u'", + def->disk_cache.disk_cache_clean_interval); + } + virBufferAddLit(buf, "/>\n"); + } +} + /* virDomainSourceDefFormatSeclabel: * @@ -20990,6 +21036,7 @@ virDomainDiskDefFormat(virBufferPtr buf, virDomainDiskGeometryDefFormat(buf, def); virDomainDiskBlockIoDefFormat(buf, def); + virDomainDiskCacheDefFormat(buf, def); /* For now, mirroring is currently output-only: we only output it * for live domains, therefore we ignore it on input except for diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 91a33cb..83ea9d3 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -647,6 +647,11 @@ struct _virDomainDiskDef { unsigned int physical_block_size; } blockio; + struct { + unsigned int disk_l2_cache_size; + unsigned int disk_cache_clean_interval; + } disk_cache; + virDomainBlockIoTuneInfo blkdeviotune; char *serial; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index e087891..7c47cd3 100755 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1662,6 +1662,13 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, if (qemuBuildDriveSourceStr(disk, cfg, &opt, qemuCaps) < 0) goto error; + if (disk->disk_cache.disk_l2_cache_size > 0) + virBufferAsprintf(&opt, "l2-cache-size=%u,", + disk->disk_cache.disk_l2_cache_size); + if (disk->disk_cache.disk_cache_clean_interval > 0) + virBufferAsprintf(&opt, "cache-clean-interval=%u,", + disk->disk_cache.disk_cache_clean_interval); + if (emitDeviceSyntax) virBufferAddLit(&opt, "if=none"); else diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 9f165c1..de334a7 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5408,6 +5408,12 @@ qemuDomainDiskChangeSupported(virDomainDiskDefPtr disk, CHECK_EQ(ioeventfd, "ioeventfd", true); CHECK_EQ(event_idx, "event_idx", true); CHECK_EQ(copy_on_read, "copy_on_read", true); + + CHECK_EQ(disk_cache.disk_l2_cache_size, + "diskCache disk_l2_cache_size", true); + CHECK_EQ(disk_cache.disk_cache_clean_interval, + "diskCache disk_cache_clean_interval", true); + /* "snapshot" is a libvirt internal field and thus can be changed */ /* startupPolicy is allowed to be updated. Therefore not checked here. */ CHECK_EQ(transient, "transient", true); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args index b405242..b968302 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args @@ -22,7 +22,7 @@ QEMU_AUDIO_DRV=none \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,media=cdrom,\ id=drive-ide0-1-0,readonly=on \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ --drive file=/tmp/data.img,format=raw,if=none,id=drive-virtio-disk0 \ +-drive file=/tmp/data.img,format=qcow2,l2-cache-size=536870912,cache-clean-interval=900,if=none,id=drive-virtio-disk0 \ -device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,\ id=virtio-disk0 \ -drive file=/tmp/logs.img,format=raw,if=none,id=drive-virtio-disk1 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml index b843878..43298fb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml @@ -28,8 +28,9 @@ <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> <disk type='file' device='disk'> - <driver name='qemu' type='raw'/> + <driver name='qemu' type='qcow2'/> <source file='/tmp/data.img'/> + <diskCache disk_l2_cache_size='53687' disk_cache_clean_interval='900' /> <target dev='vda' bus='virtio'/> </disk> <disk type='file' device='disk'> Thanks

3 2

[libvirt] [PATCH v2 00/11] RISC-V Guest Support
by Lubomir Rintel 27 Jun '18

27 Jun '18

Hello, here's a second version of the RISV-V support patch set, initally submitted just under a month ago [1]. [1] https://www.redhat.com/archives/libvir-list/2018-May/thread.html#01008 Thanks to the Andrea's suggestions the patch is now considerably thinner, and split to hopefully more manageable changes. Aside from the test suite, my test case is this (with images from [2]): virt-install \ --import --name riscv64 \ --arch riscv64 --machine virt \ --memory 2048 \ --rng /dev/urandom \ --disk /var/lib/libvirt/images/stage4-disk.img,bus=virtio \ --boot kernel=/var/lib/libvirt/images/bbl,kernel_args="console=ttyS0 ro root=/dev/vda" [2] https://fedorapeople.org/groups/risc-v/disk-images/ Note that the large test suite changes that touch the '*.replies' files seem to upset the mail server, thus you're unlikely to receive them from the list. You can get them straight from my repository instead: git fetch https://github.com/lkundrak/libvirt.git lr/riscv-v2:riscv-v2 git checkout riscv-v2 Thanks! Lubo Diffstat follows. Lubomir Rintel (11): qemu: rename qemuDomainMachineIsVirt() qemu: rename qemuDomainArmVirt() util: add RISC-V architectures docs/schemas: add RISC-V architectures qemu: no USB by default on RISC-V machines qemu: assign addresses to virtio devices on RISC-V tests/capabilitiestest: add RISC-V capability tests tests/util: add RISC-V capabilities tests/captest: check RISC-V capabilities lookup tests/qemuxml2argvtest: test RISC-V virt machine arguments tests/virschematest: add RISC-V to capabilityschemadata/caps-qemu-kvm docs/schemas/basictypes.rng | 2 + src/qemu/qemu_capabilities.c | 6 +- src/qemu/qemu_command.c | 4 +- src/qemu/qemu_domain.c | 27 +- src/qemu/qemu_domain.h | 6 +- src/qemu/qemu_domain_address.c | 23 +- src/util/virarch.c | 3 + src/util/virarch.h | 6 + tests/capabilityschemadata/caps-qemu-kvm.xml | 36 + .../caps_2.12.0.riscv32.replies | 14679 ++++++++++++++++ .../caps_2.12.0.riscv32.xml | 126 + .../caps_2.12.0.riscv64.replies | 14679 ++++++++++++++++ .../caps_2.12.0.riscv64.xml | 126 + tests/qemucapabilitiestest.c | 2 + tests/qemuxml2argvdata/riscv64-virt.args | 31 + tests/qemuxml2argvdata/riscv64-virt.xml | 32 + tests/qemuxml2argvtest.c | 3 + .../riscv64-virt.xml | 39 + tests/testutilsqemu.c | 72 + tests/vircapstest.c | 6 + 20 files changed, 29887 insertions(+), 21 deletions(-) create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.riscv32.replies create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.riscv32.xml create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.riscv64.replies create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.riscv64.xml create mode 100644 tests/qemuxml2argvdata/riscv64-virt.args create mode 100644 tests/qemuxml2argvdata/riscv64-virt.xml create mode 100644 tests/qemuxml2startupxmloutdata/riscv64-virt.xml -- 2.17.1

2 22

[libvirt] [PATCH 0/2] {lxc, util}: Fixing issues with NULL argument for
by Julio Faracco 27 Jun '18

27 Jun '18

This serie fixes the argument 'type' of syscall mount(). Valgrind is throwing a memory issue when that parameter is NULL. The best option to fix this issue is replace NULL to "none" filesystem. Julio Faracco (2): lxc: moving 'type' argument to avoid issues with mount() syscall. util: moving 'type' argument to avoid issues with mount() syscall. src/lxc/lxc_container.c | 26 +++++++++++++------------- src/util/vircgroup.c | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) -- 2.17.1

2 3

[libvirt] [PATCH] spec: list new nwfilter schema files
by Pavel Hrdina 27 Jun '18

27 Jun '18

Commit <41d619e99c2015eab2d56bea874e23ba9f52f829> introduced new RNG schema files for nwfilter but forgot to update spec file. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed under build-breaker rule. libvirt.spec.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 54549cc737..720870e2b1 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -2052,6 +2052,8 @@ exit 0 %{_datadir}/libvirt/schemas/networkcommon.rng %{_datadir}/libvirt/schemas/nodedev.rng %{_datadir}/libvirt/schemas/nwfilter.rng +%{_datadir}/libvirt/schemas/nwfilter_params.rng +%{_datadir}/libvirt/schemas/nwfilterbinding.rng %{_datadir}/libvirt/schemas/secret.rng %{_datadir}/libvirt/schemas/storagecommon.rng %{_datadir}/libvirt/schemas/storagepool.rng -- 2.17.1

1 0

[libvirt] [PATCH] qemu: hotplug: fix mdev attach for vfio-ccw
by Bjoern Walk 27 Jun '18

27 Jun '18

Mediated devices of model 'vfio-ccw' are using CCW addresses, so make sure to call the correct address preparation code for the model. Reviewed-by: Shalini Chellathurai Saroja <shalini(a)linux.ibm.com> Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> Signed-off-by: Bjoern Walk <bwalk(a)linux.ibm.com> --- src/qemu/qemu_hotplug.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 7a1bbc7c..46d30ddd 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2446,8 +2446,15 @@ qemuDomainAttachMediatedDevice(virQEMUDriverPtr driver, virDomainDeviceDef dev = { VIR_DOMAIN_DEVICE_HOSTDEV, { .hostdev = hostdev } }; - if (qemuDomainEnsurePCIAddress(vm, &dev, driver) < 0) - return -1; + switch (hostdev->source.subsys.u.mdev.model) { + case VIR_MDEV_MODEL_TYPE_VFIO_PCI: + if (qemuDomainEnsurePCIAddress(vm, &dev, driver) < 0) + return -1; + break; + case VIR_MDEV_MODEL_TYPE_VFIO_CCW: + case VIR_MDEV_MODEL_TYPE_LAST: + break; + } if (qemuHostdevPrepareMediatedDevices(driver, vm->def->name, -- 2.17.0

2 2

[libvirt] [PATCH] syms: Fix placement of virDomainGetBlkioParametersAssignFromDef
by Cole Robinson 26 Jun '18

26 Jun '18

It's in the domain_addr.h section, but should be in the domain_conf.h section Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- Pushed as trivial src/libvirt_private.syms | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index f81333baf6..5499a368c0 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -110,7 +110,6 @@ virDomainCCWAddressReleaseAddr; virDomainCCWAddressSetCreate; virDomainCCWAddressSetFree; virDomainCCWAddressValidate; -virDomainGetBlkioParametersAssignFromDef; virDomainPCIAddressAsString; virDomainPCIAddressBusIsFullyReserved; virDomainPCIAddressBusSetModel; @@ -364,6 +363,7 @@ virDomainFSTypeToString; virDomainFSWrpolicyTypeFromString; virDomainFSWrpolicyTypeToString; virDomainGenerateMachineName; +virDomainGetBlkioParametersAssignFromDef; virDomainGetFilesystemForTarget; virDomainGraphicsAuthConnectedTypeFromString; virDomainGraphicsAuthConnectedTypeToString; -- 2.17.1

1 0

[libvirt] [PATCH] domain_addr: Fix weird comment format
by Cole Robinson 26 Jun '18

26 Jun '18

Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- Pushed as trivial src/conf/domain_addr.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 8964973e03..39f22b82eb 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1348,12 +1348,12 @@ virDomainVirtioSerialAddrSetFree(virDomainVirtioSerialAddrSetPtr addrs) /* virDomainVirtioSerialAddrSetCreateFromDomain -+ * -+ * @def: Domain def to introspect -+ * -+ * Inspect the domain definition and return an address set containing -+ * every virtio serial address we find -+ */ + * + * @def: Domain def to introspect + * + * Inspect the domain definition and return an address set containing + * every virtio serial address we find + */ virDomainVirtioSerialAddrSetPtr virDomainVirtioSerialAddrSetCreateFromDomain(virDomainDefPtr def) { -- 2.17.1

1 0

[libvirt] [PATCH v4 0/6] nwfilter: refactor the driver to make it independent of virt drivers
by Daniel P. Berrangé 26 Jun '18

26 Jun '18

v1: https://www.redhat.com/archives/libvir-list/2018-April/msg02616.html v2: https://www.redhat.com/archives/libvir-list/2018-May/msg01145.html v3: https://www.redhat.com/archives/libvir-list/2018-June/msg01121.html Today the nwfilter driver is entangled with the virt drivers in both directions. At various times when rebuilding filters nwfilter will call out to the virt driver to iterate over running guest's NICs. This has caused very complicated lock ordering rules to be required. If we are to split the virt drivers out into separate daemons we need to get rid of this coupling since we don't want the separate daemons calling each other, as that risks deadlock if all of the RPC workers are busy. The obvious way to solve this is to have the nwfilter driver remember all the filters it has active, avoiding the need to iterate over running guests. Changed in v4: - Merged already reviewed patches - Correctly handle nwfilter recreate on daemon startup - Added virsh docs Changed in v3: - Updated API version numbers - Use accessors for virNWFilterBindingObjPtr struct - Other fixes John mentioned Changed in v2: - The virNWFilterBindingPtr was renamed virNWFilterBindingDefPtr - New virNWFilterBindingObjPtr & virNWFilterBindingObjListPtr structs added to track the objects in the driver - New virNWFilterBindingPtr public API type was added - New public APIs for listing filter bindings, querying XML, and creating/deleting them - Convert the virt drivers to use the public API for creating and deleting bindings - Persistent active bindings out to disk so they're preserved across restarts - Added RNG schema and XML-2-XML test - New virsh commands for listing/querying XML/creating/deleting bindings Daniel P. Berrangé (6): virsh: add manpage docs for nwfilter-binding commands. nwfilter: keep track of active filter bindings nwfilter: remove virt driver callback layer for rebuilding filters nwfilter: wire up new APIs for listing and querying filter bindings nwfilter: wire up new APIs for creating and deleting nwfilter bindings nwfilter: convert virt drivers to use public API for nwfilter bindings src/conf/domain_nwfilter.c | 135 ++++++++++++-- src/conf/domain_nwfilter.h | 16 +- src/conf/nwfilter_conf.c | 136 ++------------ src/conf/nwfilter_conf.h | 51 +----- src/conf/virnwfilterobj.c | 4 +- src/conf/virnwfilterobj.h | 4 + src/libvirt_private.syms | 8 +- src/lxc/lxc_driver.c | 28 --- src/lxc/lxc_process.c | 2 +- src/nwfilter/nwfilter_driver.c | 236 ++++++++++++++++++++----- src/nwfilter/nwfilter_gentech_driver.c | 187 ++++++++++---------- src/nwfilter/nwfilter_gentech_driver.h | 8 +- src/qemu/qemu_driver.c | 25 --- src/qemu/qemu_hotplug.c | 4 +- src/qemu/qemu_interface.c | 4 +- src/qemu/qemu_process.c | 6 +- src/remote/remote_daemon.c | 1 + src/uml/uml_conf.c | 2 +- src/uml/uml_driver.c | 29 --- tools/virsh.pod | 35 ++++ 20 files changed, 478 insertions(+), 443 deletions(-) -- 2.17.1

2 9

[libvirt] [PATCH 0/2] qemu: add comma escaping in qemuBuildSCSIiSCSIHostdevDrvStr
by Anya Harter 26 Jun '18

26 Jun '18

In order to use the virQEMUBuildBufferEscapeComma function to escape the commas, the function first had to be converted to use a buffer. Added a test case for comma escaping in name-escape.xml. This should complete the BiteSizedTask entry at https://wiki.libvirt.org/page/BiteSizedTasks#qemu:_Use_comma_escaping_for_m…. Anya Harter (2): qemu: use virBuffer in qemuBuildSCSIiSCSIHostdevDrvStr qemu: Escape commas for qemuBuildSCSIiSCSIHostdevDrvStr src/qemu/qemu_command.c | 19 +++++++++++++------ tests/qemuxml2argvdata/name-escape.args | 6 +++++- tests/qemuxml2argvdata/name-escape.xml | 7 +++++++ tests/qemuxml2argvtest.c | 5 ++++- 4 files changed, 29 insertions(+), 8 deletions(-) -- 2.17.1

2 6

[libvirt] [PATCH v2] qemuDomainObjBeginJobInternal: Report agent job in error message
by Michal Privoznik 26 Jun '18

26 Jun '18

If a thread is unable to acquire a job (e.g. because of timeout) an error is reported and the error message contains reference to the other thread holding the job. Well, the error message should report agent job too as it is yet another source of possible failure. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v1: - Expand messages to cover all @blocker and @agentBlocker possibilities (as Jira requested in review) src/qemu/qemu_domain.c | 46 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 95c3e3a8aa..3410774781 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6420,6 +6420,7 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, bool async = job == QEMU_JOB_ASYNC; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); const char *blocker = NULL; + const char *agentBlocker = NULL; int ret = -1; unsigned long long duration = 0; unsigned long long agentDuration = 0; @@ -6549,16 +6550,32 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, priv->job.apiFlags, duration / 1000, agentDuration / 1000, asyncDuration / 1000); - if (nested || qemuDomainNestedJobAllowed(priv, job)) - blocker = priv->job.ownerAPI; - else - blocker = priv->job.asyncOwnerAPI; + if (job) { + if (nested || qemuDomainNestedJobAllowed(priv, job)) + blocker = priv->job.ownerAPI; + else + blocker = priv->job.asyncOwnerAPI; + } + + if (agentJob) + agentBlocker = priv->job.agentOwnerAPI; if (errno == ETIMEDOUT) { - if (blocker) { + if (blocker && agentBlocker) { virReportError(VIR_ERR_OPERATION_TIMEOUT, - _("cannot acquire state change lock (held by %s)"), + _("cannot acquire state change " + "lock (held by monitor=%s agent=%s)"), + blocker, agentBlocker); + } else if (blocker) { + virReportError(VIR_ERR_OPERATION_TIMEOUT, + _("cannot acquire state change " + "lock (held by monitor=%s)"), blocker); + } else if (agentBlocker) { + virReportError(VIR_ERR_OPERATION_TIMEOUT, + _("cannot acquire state change " + "lock (held by agent=%s)"), + agentBlocker); } else { virReportError(VIR_ERR_OPERATION_TIMEOUT, "%s", _("cannot acquire state change lock")); @@ -6566,11 +6583,24 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, ret = -2; } else if (cfg->maxQueuedJobs && priv->jobs_queued > cfg->maxQueuedJobs) { - if (blocker) { + if (blocker && agentBlocker) { virReportError(VIR_ERR_OPERATION_FAILED, - _("cannot acquire state change lock (held by %s) " + _("cannot acquire state change " + "lock (held by monitor=%s agent=%s) " + "due to max_queued limit"), + blocker, agentBlocker); + } else if (blocker) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("cannot acquire state change " + "lock (held by monitor=%s) " "due to max_queued limit"), blocker); + } else if (agentBlocker) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("cannot acquire state change " + "lock (held by agent=%s) " + "due to max_queued limit"), + agentBlocker); } else { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("cannot acquire state change lock " -- 2.16.4

2 1

[libvirt] [PATCH v2 0/2] Alter qemu live/cold device attach algorithm
by John Ferlan 26 Jun '18

26 Jun '18

v1: https://www.redhat.com/archives/libvir-list/2018-June/msg00465.html The first patch is essentially a repeat of the v1 patch, but with a more correct commit message. During testing if the same address was supplied for the --config it wasn't checked. The second patch rearranges qemuDomainAttachDeviceLiveAndConfig to perform CONFIG and LIVE actions separately since the generated @devConf or @devLive could be different depending on whether the incoming XML has an <address> or not and whether the corresponding domain parse and post parse algorithms need to generate some sort of address for the device. John Ferlan (2): qemu: Check for existing hostdev address for cold attach device qemu: Use the correct vm def on cold attach src/qemu/qemu_driver.c | 58 +++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) -- 2.14.4

4 16

[libvirt] [PATCH] set-lifecycle-action: add description of type and action
by Chen Hanxiao 26 Jun '18

26 Jun '18

From: Chen Hanxiao <chenhanxiao(a)gmail.com> In [1], <type> are described as "on_poweroff", "on_reboot", "on_crash". but we accept "poweroff", "reboot" and "crash". This patch adds docs about them. [1]: https://libvirt.org/formatdomain.html#elementsEvents Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- tools/virsh.pod | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 7cb8c8a6e4..1b479f318d 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2414,8 +2414,12 @@ the B<virsh dominfo> command. =item B<set-lifecycle-action> I<domain> I<type> I<action> [[I<--config>] [I<--live>] | [I<--current>]] -Set the lifecycle I<action> for specified lifecycle I<type>. For the list of -lifecycle types and actions and possible combinations see the documentation at +Set the lifecycle I<action> for specified lifecycle I<type>. +The valid I<type> are "poweroff", "reboot" and "crash", each of them +allow valid I<action> are "destroy", "restart", "rename-restart", "preserve". +For I<type> "crash", additional actions "coredump-destroy" +and "coredump-restart" are supported. For the list of lifecycle types +and actions and possible combinations see the documentation at L<https://libvirt.org/formatdomain.html#elementsEvents>. =item B<set-user-password> I<domain> I<user> I<password> [I<--encrypted>] -- 2.17.1

2 2

[libvirt] [PATCH v3 00/10] Storage encryption adjustments
by John Ferlan 26 Jun '18

26 Jun '18

v2: https://www.redhat.com/archives/libvir-list/2018-May/msg01268.html Try #3 - this time since Peter removed support for qcow encrypted volumes for domains, I'm taking the same approach for storage. This is totally different from the previous approach which tried to actually create a qcow2 encrypted volume. This time slowly extricate the qcow2 encryption support from the storage driver - at least anything that can have a result via qemu-img. Additionally, added some more luks tests and added the capability to create a luks encrypted volume from a raw image using the two step process that was part of v2. John Ferlan (10): storage: Don't allow encryption secretPath to be NULL tests: Add luks creation examples to storagevolxml2argvtest storage: Rename encryption info variable for clarity tests: Remove qcow2 encryption from storagevol tests storage: Disallow create/resize of qcow2 encrypted images storage: Clean up storageBackendCreateQemuImgCheckEncryption storage: Clean up storageBackendCreateQemuImgOpts storage: Remove storageBackendGenerateSecretData storage: Add support for using inputvol for encryption docs: Add news article for volume encryption modifications docs/formatsecret.html.in | 22 +- docs/formatstorageencryption.html.in | 29 +- docs/news.xml | 25 ++ src/storage/storage_util.c | 303 +++++++-------------- src/storage/storage_util.h | 10 +- src/util/virqemu.c | 26 +- tests/storagevolxml2argvdata/luks-cipher.argv | 5 + tests/storagevolxml2argvdata/luks-convert.argv | 9 + tests/storagevolxml2argvdata/luks.argv | 4 + tests/storagevolxml2argvdata/qcow2-1.1.argv | 2 +- tests/storagevolxml2argvdata/qcow2-compat.argv | 2 +- .../qcow2-from-logical-compat.argv | 2 +- tests/storagevolxml2argvdata/qcow2-lazy.argv | 2 +- .../qcow2-nobacking-convert-prealloc-compat.argv | 2 +- .../qcow2-nobacking-prealloc-compat.argv | 2 +- .../qcow2-nocapacity-convert-prealloc.argv | 2 +- tests/storagevolxml2argvdata/qcow2-nocapacity.argv | 2 +- .../storagevolxml2argvdata/qcow2-nocow-compat.argv | 2 +- tests/storagevolxml2argvtest.c | 76 +++++- tests/storagevolxml2xmlin/vol-luks-convert.xml | 21 ++ tests/storagevolxml2xmlin/vol-qcow2-0.10-lazy.xml | 3 - tests/storagevolxml2xmlin/vol-qcow2-1.1.xml | 3 - tests/storagevolxml2xmlin/vol-qcow2-encryption.xml | 31 +++ tests/storagevolxml2xmlin/vol-qcow2-lazy.xml | 3 - tests/storagevolxml2xmlin/vol-qcow2-nobacking.xml | 3 - .../vol-qcow2-nocapacity-backing.xml | 3 - tests/storagevolxml2xmlin/vol-qcow2-nocapacity.xml | 3 - tests/storagevolxml2xmlin/vol-qcow2-nocow.xml | 3 - tests/storagevolxml2xmlin/vol-qcow2.xml | 3 - tests/storagevolxml2xmlout/vol-qcow2-0.10-lazy.xml | 3 - tests/storagevolxml2xmlout/vol-qcow2-1.1.xml | 3 - .../storagevolxml2xmlout/vol-qcow2-encryption.xml | 31 +++ tests/storagevolxml2xmlout/vol-qcow2-lazy.xml | 3 - tests/storagevolxml2xmlout/vol-qcow2-nobacking.xml | 3 - .../storagevolxml2xmlout/vol-qcow2-nocapacity.xml | 3 - tests/storagevolxml2xmlout/vol-qcow2-nocow.xml | 3 - tests/storagevolxml2xmlout/vol-qcow2.xml | 3 - tests/storagevolxml2xmltest.c | 1 + 38 files changed, 344 insertions(+), 312 deletions(-) create mode 100644 tests/storagevolxml2argvdata/luks-cipher.argv create mode 100644 tests/storagevolxml2argvdata/luks-convert.argv create mode 100644 tests/storagevolxml2argvdata/luks.argv create mode 100644 tests/storagevolxml2xmlin/vol-luks-convert.xml create mode 100644 tests/storagevolxml2xmlin/vol-qcow2-encryption.xml create mode 100644 tests/storagevolxml2xmlout/vol-qcow2-encryption.xml -- 2.14.4

2 12

[libvirt] [PATCH 0/7] qemu: Support page size tuning for pSeries guests
by Andrea Bolognani 26 Jun '18

26 Jun '18

This applies cleanly on top of a0d6894af1b1. Patch 1/7 is too big to go through the list; it can be fetched, along with the rest of the series, from [1]. Patch 2/7 conflicts with patch 1/3 from [2], but making this one depend on it didn't feel right; whichever of the two series gets reviewed and merged first, I'll probably post a rebase of the other one immediately afterwards. Changes from [RFC]: * the QEMU interface has changed based on feedback, which means some of the code is no longer useful and has been dropped; * switched to virXMLFormatElement(), as suggested during review; * added documentation and release notes entry. [1] https://github.com/andreabolognani/libvirt/tree/pseries-hpt-maxpagesize [2] https://www.redhat.com/archives/libvir-list/2018-June/msg01374.html [RFC] https://www.redhat.com/archives/libvir-list/2018-May/msg01710.html Andrea Bolognani (7): tests: Add replies for QEMU 3.0.0 on ppc64 qemu: Add capability for the HPT maxpagesize feature conf: Reintroduce virDomainDef::hpt_resizing conf: Tweak HPT feature parsing and formatting conf: Parse and format HPT maxpagesize qemu: Format HPT maxpagesize on the command line news: Update for HPT maxpagesize feature docs/formatdomain.html.in | 11 +- docs/news.xml | 11 + docs/schemas/domaincommon.rng | 21 +- src/conf/domain_conf.c | 60 +- src/conf/domain_conf.h | 2 + src/qemu/qemu_capabilities.c | 8 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 43 +- src/qemu/qemu_domain.c | 2 +- .../caps_2.12.0.aarch64.replies | 48 +- .../caps_2.12.0.aarch64.xml | 2 +- .../caps_2.12.0.ppc64.replies | 197 +- .../caps_2.12.0.ppc64.xml | 2 +- .../caps_2.12.0.s390x.replies | 52 +- .../caps_2.12.0.s390x.xml | 2 +- .../caps_2.12.0.x86_64.replies | 64 +- .../caps_2.12.0.x86_64.xml | 2 +- ...ppc64.replies => caps_3.0.0.ppc64.replies} | 5268 ++++++++++------- ..._2.12.0.ppc64.xml => caps_3.0.0.ppc64.xml} | 19 +- tests/qemucapabilitiestest.c | 1 + tests/qemuxml2argvdata/pseries-features.args | 3 +- tests/qemuxml2argvdata/pseries-features.xml | 18 +- tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmloutdata/pseries-features.xml | 31 +- tests/qemuxml2xmltest.c | 1 + 25 files changed, 3624 insertions(+), 2246 deletions(-) copy tests/qemucapabilitiesdata/{caps_2.12.0.ppc64.replies => caps_3.0.0.ppc64.replies} (92%) copy tests/qemucapabilitiesdata/{caps_2.12.0.ppc64.xml => caps_3.0.0.ppc64.xml} (99%) mode change 120000 => 100644 tests/qemuxml2xmloutdata/pseries-features.xml -- 2.17.1

2 12

[libvirt] [jenkins-ci PATCH v2] jobs: Change git URL to fast external mirrors
by Pavel Hrdina 26 Jun '18

26 Jun '18

We had our own local copy of all projects synchronized by cron on the host where we have the CI VMs. This was to save the traffic from libvirt.org repositories and to make the cloning for our Jenkins jobs faster. We might move our VMs into a cloud in future we would not be able to have any local copy so this changes the git URL to use fast external mirrors. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- v1: <https://www.redhat.com/archives/libvir-list/2018-June/msg01513.html> jobs/autotools.yaml | 2 +- jobs/generic.yaml | 2 +- jobs/go.yaml | 2 +- jobs/perl-modulebuild.yaml | 2 +- jobs/python-distutils.yaml | 2 +- projects/libosinfo.yaml | 1 + projects/libvirt-cim.yaml | 1 + projects/libvirt-dbus.yaml | 1 + projects/libvirt-glib.yaml | 1 + projects/libvirt-go-xml.yaml | 1 + projects/libvirt-go.yaml | 1 + projects/libvirt-perl.yaml | 1 + projects/libvirt-python.yaml | 1 + projects/libvirt-sandbox.yaml | 1 + projects/libvirt-tck.yaml | 1 + projects/libvirt.yaml | 1 + projects/osinfo-db-tools.yaml | 1 + projects/osinfo-db.yaml | 1 + projects/virt-manager.yaml | 1 + projects/virt-viewer.yaml | 1 + 20 files changed, 20 insertions(+), 5 deletions(-) diff --git a/jobs/autotools.yaml b/jobs/autotools.yaml index f526ed2..c1d0f27 100644 --- a/jobs/autotools.yaml +++ b/jobs/autotools.yaml @@ -21,7 +21,7 @@ num-to-keep: 1000 scm: - git: - url: git://n64.pufty.ci.centos.org/{name}.git + url: '{git-url}' branches: - origin/{branch} clean: diff --git a/jobs/generic.yaml b/jobs/generic.yaml index 3e20962..6c59c63 100644 --- a/jobs/generic.yaml +++ b/jobs/generic.yaml @@ -21,7 +21,7 @@ num-to-keep: 1000 scm: - git: - url: git://n64.pufty.ci.centos.org/{name}.git + url: '{git-url}' branches: - origin/{branch} clean: diff --git a/jobs/go.yaml b/jobs/go.yaml index bffe56e..10518c4 100644 --- a/jobs/go.yaml +++ b/jobs/go.yaml @@ -21,7 +21,7 @@ num-to-keep: 1000 scm: - git: - url: git://n64.pufty.ci.centos.org/{name}.git + url: '{git-url}' branches: - origin/{branch} clean: diff --git a/jobs/perl-modulebuild.yaml b/jobs/perl-modulebuild.yaml index 4a79bab..934b216 100644 --- a/jobs/perl-modulebuild.yaml +++ b/jobs/perl-modulebuild.yaml @@ -21,7 +21,7 @@ num-to-keep: 1000 scm: - git: - url: git://n64.pufty.ci.centos.org/{name}.git + url: '{git-url}' branches: - origin/{branch} clean: diff --git a/jobs/python-distutils.yaml b/jobs/python-distutils.yaml index c075245..0b20b17 100644 --- a/jobs/python-distutils.yaml +++ b/jobs/python-distutils.yaml @@ -21,7 +21,7 @@ num-to-keep: 1000 scm: - git: - url: git://n64.pufty.ci.centos.org/{name}.git + url: '{git-url}' branches: - origin/{branch} clean: diff --git a/projects/libosinfo.yaml b/projects/libosinfo.yaml index 8e3d105..22c957e 100644 --- a/projects/libosinfo.yaml +++ b/projects/libosinfo.yaml @@ -3,6 +3,7 @@ name: libosinfo machines: '{all_machines}' title: libosinfo + git-url: https://gitlab.com/libosinfo/libosinfo.git jobs: - autotools-build-job: parent_jobs: 'osinfo-db-master-build' diff --git a/projects/libvirt-cim.yaml b/projects/libvirt-cim.yaml index dff3976..c6a7a6d 100644 --- a/projects/libvirt-cim.yaml +++ b/projects/libvirt-cim.yaml @@ -3,6 +3,7 @@ name: libvirt-cim machines: '{rpm_machines}' title: libvirt CIM + git-url: https://github.com/libvirt/libvirt-cim.git jobs: - autotools-build-job: parent_jobs: 'libvirt-master-build' diff --git a/projects/libvirt-dbus.yaml b/projects/libvirt-dbus.yaml index c460db4..44d1b23 100644 --- a/projects/libvirt-dbus.yaml +++ b/projects/libvirt-dbus.yaml @@ -2,6 +2,7 @@ - project: name: libvirt-dbus title: Libvirt D-Bus + git-url: https://github.com/libvirt/libvirt-dbus.git jobs: - autotools-build-job: parent_jobs: 'libvirt-glib-master-build' diff --git a/projects/libvirt-glib.yaml b/projects/libvirt-glib.yaml index 286d25b..f61ca1e 100644 --- a/projects/libvirt-glib.yaml +++ b/projects/libvirt-glib.yaml @@ -3,6 +3,7 @@ name: libvirt-glib machines: '{all_machines}' title: Libvirt GLib + git-url: https://github.com/libvirt/libvirt-glib.git jobs: - autotools-build-job: parent_jobs: 'libvirt-master-build' diff --git a/projects/libvirt-go-xml.yaml b/projects/libvirt-go-xml.yaml index 8d9c16d..6eb7ef0 100644 --- a/projects/libvirt-go-xml.yaml +++ b/projects/libvirt-go-xml.yaml @@ -3,6 +3,7 @@ name: libvirt-go-xml machines: '{all_machines}' title: Libvirt Go XML + git-url: https://github.com/libvirt/libvirt-go-xml.git jobs: - go-build-job: parent_jobs: 'libvirt-master-build' diff --git a/projects/libvirt-go.yaml b/projects/libvirt-go.yaml index f2eb87e..0495374 100644 --- a/projects/libvirt-go.yaml +++ b/projects/libvirt-go.yaml @@ -3,6 +3,7 @@ name: libvirt-go machines: '{all_machines}' title: Libvirt Go + git-url: https://github.com/libvirt/libvirt-go.git jobs: - go-build-job: parent_jobs: 'libvirt-master-build' diff --git a/projects/libvirt-perl.yaml b/projects/libvirt-perl.yaml index 28288e8..956ba93 100644 --- a/projects/libvirt-perl.yaml +++ b/projects/libvirt-perl.yaml @@ -3,6 +3,7 @@ name: libvirt-perl machines: '{all_machines}' title: Libvirt Perl + git-url: https://github.com/libvirt/libvirt-perl.git jobs: - perl-modulebuild-build-job: parent_jobs: 'libvirt-master-build' diff --git a/projects/libvirt-python.yaml b/projects/libvirt-python.yaml index 1e742da..fdc55e0 100644 --- a/projects/libvirt-python.yaml +++ b/projects/libvirt-python.yaml @@ -3,6 +3,7 @@ name: libvirt-python machines: '{all_machines}' title: Libvirt Python + git-url: https://github.com/libvirt/libvirt-python.git jobs: - python-distutils-build-job: parent_jobs: 'libvirt-master-build' diff --git a/projects/libvirt-sandbox.yaml b/projects/libvirt-sandbox.yaml index bb8bda6..518080a 100644 --- a/projects/libvirt-sandbox.yaml +++ b/projects/libvirt-sandbox.yaml @@ -7,6 +7,7 @@ - libvirt-fedora-28 - libvirt-fedora-rawhide title: Libvirt Sandbox + git-url: https://github.com/libvirt/libvirt-sandbox.git jobs: - autotools-build-job: parent_jobs: 'libvirt-glib-master-build' diff --git a/projects/libvirt-tck.yaml b/projects/libvirt-tck.yaml index 065678d..c406fda 100644 --- a/projects/libvirt-tck.yaml +++ b/projects/libvirt-tck.yaml @@ -10,6 +10,7 @@ - libvirt-freebsd-10 - libvirt-freebsd-11 title: Libvirt TCK + git-url: https://github.com/libvirt/libvirt-tck.git jobs: - perl-modulebuild-build-job: parent_jobs: 'libvirt-perl-master-build' diff --git a/projects/libvirt.yaml b/projects/libvirt.yaml index 7a8392e..c64ac5b 100644 --- a/projects/libvirt.yaml +++ b/projects/libvirt.yaml @@ -4,6 +4,7 @@ machines: '{all_machines}' title: Libvirt archive_format: xz + git-url: https://github.com/libvirt/libvirt.git jobs: - autotools-build-job: parent_jobs: diff --git a/projects/osinfo-db-tools.yaml b/projects/osinfo-db-tools.yaml index cab85af..d4cef11 100644 --- a/projects/osinfo-db-tools.yaml +++ b/projects/osinfo-db-tools.yaml @@ -3,6 +3,7 @@ name: osinfo-db-tools machines: '{all_machines}' title: osinfo database tools + git-url: https://gitlab.com/libosinfo/osinfo-db-tools.git jobs: - autotools-build-job: parent_jobs: diff --git a/projects/osinfo-db.yaml b/projects/osinfo-db.yaml index a197bbd..141a373 100644 --- a/projects/osinfo-db.yaml +++ b/projects/osinfo-db.yaml @@ -4,6 +4,7 @@ machines: '{all_machines}' title: osinfo database archive_format: xz + git-url: https://gitlab.com/libosinfo/osinfo-db.git jobs: - generic-build-job: parent_jobs: 'osinfo-db-tools-master-build' diff --git a/projects/virt-manager.yaml b/projects/virt-manager.yaml index 74f7fc1..84a95a6 100644 --- a/projects/virt-manager.yaml +++ b/projects/virt-manager.yaml @@ -9,6 +9,7 @@ - libvirt-freebsd-10 - libvirt-freebsd-11 title: Virtual Machine Manager + git-url: https://github.com/virt-manager/virt-manager.git jobs: - python-distutils-build-job: parent_jobs: diff --git a/projects/virt-viewer.yaml b/projects/virt-viewer.yaml index 633ac9a..12335f3 100644 --- a/projects/virt-viewer.yaml +++ b/projects/virt-viewer.yaml @@ -3,6 +3,7 @@ name: virt-viewer machines: '{all_machines}' title: Virt Viewer + git-url: https://pagure.io/virt-viewer.git jobs: - autotools-build-job: parent_jobs: 'libvirt-glib-master-build' -- 2.17.1

2 1

[libvirt] [PATCH] qemu: monitor: Fix memory leak in qemuMonitorJSONNBDServerStart()
by w00251574 26 Jun '18

26 Jun '18

Subject: [PATCH] qemu: monitor: Fix memory leak in qemuMonitorJSONNBDServerStart() Exiting early through the return path did result in 'port_str' being leaked. Signed-off-by: Jie Wang <wangjie88.huawei.com> --- src/qemu/qemu_monitor_json.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index aa89ea7056..3e90279b71 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -6540,7 +6540,7 @@ qemuMonitorJSONNBDServerStart(qemuMonitorPtr mon, return ret; if (!(addr = qemuMonitorJSONBuildInetSocketAddress(host, port_str))) - return ret; + goto cleanup; if (!(cmd = qemuMonitorJSONMakeCommand("nbd-server-start", "a:addr", &addr, -- 2.15.0.windows.1

3 2

[libvirt] [PATCH 0/2] Deny live device alias change
by Michal Privoznik 26 Jun '18

26 Jun '18

*** BLURB HERE *** Michal Privoznik (2): qemuDomainUpdateDeviceFlags: Parse device as live if needed conf: Forbid device alias change on device-update src/conf/domain_conf.c | 12 +++++++++++- src/conf/domain_conf.h | 3 ++- src/lxc/lxc_driver.c | 6 +++--- src/qemu/qemu_driver.c | 28 ++++++++++++++++------------ 4 files changed, 32 insertions(+), 17 deletions(-) -- 2.16.4

2 5

[libvirt] Plan for next releases
by Daniel Veillard 26 Jun '18

26 Jun '18

The end of the month is coming quickly, and if we want to release on time it seems we should enter freeze tomorrow wed 27. Then I can make RC2 on Friday and push next Monday assuming thereis no blocker. Hope this works for everybody, thanks, Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [GSoC] Code design for scalar and external types
by Sukrit Bhatnagar 26 Jun '18

26 Jun '18

Hi, I am starting this discussion thread as a continuation of my GSoC weekly meeting with Erik and Pavel on 8th June. I was going through src/util/virstring.c for adding cleanup macros and saw that virStringListFree takes on char ** as an argument, and equivalently, we declare a list of strings as char **. For the cleanup function defined by VIR_DEFINE_AUTOPTR_FUNC, it is required that the associated type has a name like virSomethingPtr. It was also discussed that there are similar issues with DBus types, but VIR_AUTOFREE can work there as we use VIR_ALLOC. I honestly don't know much about that. We discussed that we have two solutions: - Create a virSomethingPtr by typedef-ing char** As Pavel told, GLib has typedef gchar** GStrv; which is used together with g_auto and it has g_strfreev(gchar **str_array) which is the same as we have virStringListFree() I have tried adding the following in src/util/virstrnig.h, and it seems to work fine: typedef char **virStringList; VIR_DEFINE_AUTOPTR_FUNC(virStringList, virStringListFree) We can use it as: VIR_AUTOPTR(virStringList) lines = NULL; There may be other scalar and external types where this problem occurs, and it is not good to create a typedef for each of them, but maybe we can make an exception for char ** and create a type for it. - Overload VIR_AUTOFREE macro by making it variadic As Erik told, we could make VIR_AUTOFREE a variadic macro whose varying parameter can be the Free function name. If left blank, we use virFree. I went ahead with trying it and after reading some posts on StackOverflow, I came up with this: #define _VIR_AUTOFREE_0(type) __attribute__((cleanup(virFree))) type #define _VIR_AUTOFREE_1(type, func) __attribute__((cleanup(func))) type #define _VIR_AUTOFREE_OVERLOADER(_1, _2, NAME, ...) NAME #define VIR_AUTOFREE(...) _VIR_AUTOFREE_OVERLOADER(__VA_ARGS__, _VIR_AUTOFREE_1, _VIR_AUTOFREE_0)(__VA_ARGS__) The required functionality is working as expected; passing only one argument will use virFree, and passing two arguments will use the function specified as 2nd argument. Passing more than 2 arguments will result in an error. The macros with _ prefix are meant to be for internal use only. Also, @func needs to be a wrapper around virStringListFree as it will take char ***, not just char **. We probably need to define a new function. Here we are specifying the Free function to use at the time of usage of the VIR_AUTOFREE macro, which may make the code look bad: VIR_AUTOFREE(char **, virStringListSomethingFree) lines = NULL; Suggestions and opinions are welcome. Thanks, Sukrit

6 20

[libvirt] [PATCH] util: fix mount issue by moving NULL value to "none" in syscall.
by Julio Faracco 26 Jun '18

26 Jun '18

After running libvirt daemon with valgrind tools, some errors are appearing when you try to start a domain. One example: ==18012== Syscall param mount(type) points to unaddressable byte(s) ==18012== at 0x6FEE3CA: mount (syscall-template.S:78) ==18012== by 0x531344D: virFileMoveMount (virfile.c:3828) ==18012== by 0x27FE7675: qemuDomainBuildNamespace (qemu_domain.c:11501) ==18012== by 0x2800C44E: qemuProcessHook (qemu_process.c:2870) ==18012== by 0x52F7E1D: virExec (vircommand.c:726) ==18012== by 0x52F7E1D: virCommandRunAsync (vircommand.c:2477) ==18012== by 0x52F4EDD: virCommandRun (vircommand.c:2309) ==18012== by 0x2800A731: qemuProcessLaunch (qemu_process.c:6235) ==18012== by 0x2800D6B4: qemuProcessStart (qemu_process.c:6569) ==18012== by 0x28074876: qemuDomainObjStart (qemu_driver.c:7314) ==18012== by 0x280522EB: qemuDomainCreateWithFlags (qemu_driver.c:7367) ==18012== by 0x55484BF: virDomainCreate (libvirt-domain.c:6531) ==18012== by 0x12CDBD: remoteDispatchDomainCreate (remote_daemon_dispatch_stubs.h:4350) ==18012== by 0x12CDBD: remoteDispatchDomainCreateHelper (remote_daemon_dispatch_stubs.h:4326) ==18012== Address 0x0 is not stack'd, malloc'd or (recently) free'd Some documentation recommends to use "none" when you don't have a filesystem type to use. Specially, for bind and move actions. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/util/virfile.c | 2 +- src/util/virprocess.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 9296ccbe2a..378d03ecf0 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -3825,7 +3825,7 @@ virFileMoveMount(const char *src, { const unsigned long mount_flags = MS_MOVE; - if (mount(src, dst, NULL, mount_flags, NULL) < 0) { + if (mount(src, dst, "none", mount_flags, NULL) < 0) { virReportSystemError(errno, _("Unable to move %s mount to %s"), src, dst); diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 1fbbbb3a27..f92b0dce37 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -1181,7 +1181,7 @@ virProcessSetupPrivateMountNS(void) goto cleanup; } - if (mount("", "/", NULL, MS_SLAVE|MS_REC, NULL) < 0) { + if (mount("", "/", "none", MS_SLAVE|MS_REC, NULL) < 0) { virReportSystemError(errno, "%s", _("Failed to switch root mount into slave mode")); goto cleanup; -- 2.17.1

2 1

[libvirt] [RFC PATCH 0/3] RFC for X86 RDT Cache Monitoring Technology (CMT) support
by Wang Huaqiang 26 Jun '18

26 Jun '18

This is an RFC request for supporting CPU Cache Monitoring Technology (CMT) feature in libvirt. Since MBM is also another feature which is very close to CMT, for simplicity we only discuss CMT here. MBM is the followup that will be implemented after CMT. About CMT please refer to Intel x86 SDM section 17.18 of volume 3 (link:https://software.intel.com/en-us/articles/intel-sdm) ## About '_virResctrlMon' interface The cache allocation technology (CAT) has already been implemented in util/virresctrl.* which interacts with Linux kernel resctrl file system. Very simlimar to CAT, the CMT object is represented by 'struct _virResctrlMon', which is ``` struct _virResctrlMon { virObject parent; /* pairedalloc: pointer to a resctrl allocaion it paried with. * NULL for a resctrl monitoring group not associated with * any allocation. */ virResctrlAllocPtr pairedalloc; /* The identifier (any unique string for now) */ char *id; /* libvirt-generated path, may be identical to alloction path * may not if allocation is ready */ char *path; }; ``` Almost following the same logic behind '_virResctrlAlloc' which is mainly presented in file 'virresctrl.c', a group of APIs has been designed to manipulate '_virResctrlMon'. The '_virResctrlMon' shares a lot in common with '_virResctrlAlloc' except field 'pairedalloc'. 'pairedalloc' stores the pointer of paired resctrl allocation object. With current libvirt resctrl implementation, if a resctrl '_virResctrlAlloc' object is created, the CMT hardware is enabled automatically and shares the same folder under same resctrlfs, I call the CMT '_virResctrlMon' object that shares the same folder under resctrlfs as 'paired' _virResctrlMon, further, one '_virResctrlMon' and one '_virResctrlAlloc' are a pare. In '_virResctrlMon' the paired '_virResctrlAlloc' is tracked through pairedalloc. paired mon group could not be dynamically enabled or disabled during runtime. 'pairedalloc' could be set to NULL, which creates a non-paired mon group object. Which is necessory because CMT could work independently to monitor the utilization of critical CPU resouces (cache or memory bandwidth) without allocating any dedicated cache or memory bandwidth. A non-paired mon group object represents an independent working CMT. Non-paired mon group could be enabled or disabled during runtime. ## About virsh command 'resctrl' To set or get the resctrl mon group (hardware CMT), a virsh command 'resctrl' is created. here are the common usages: ``` [root@dl-c200 david]# virsh list --all Id Name State ---------------------------------------------------- 1 vm3 running 3 vm2 running - vm1 shut off ``` ### Test on a running domain vm3 To get RDT monitoring status, type 'virsh resctrl <domain>' ``` [root@dl-c200 david]# virsh resctrl vm3 RDT Monitoring Status: Enabled ``` To enable RDT monitoring, type 'virsh resctrl <domain> --enable' ``` [root@dl-c200 david]# virsh resctrl vm3 --enable RDT Monitoring Status: Enabled ``` To diable RDT monitoring, type 'virsh resctrl <domain> --disable' ``` [root@dl-c200 david]# virsh resctrl vm3 --disable RDT Monitoring Status: Disabled [root@dl-c200 david]# virsh resctrl vm3 RDT Monitoring Status: Disabled ``` ### test on domain not running vm1 if domain is not active, it will fail to set RDT monitoring status, and also get the state of 'disabled' ``` [root@dl-c200 david]# virsh resctrl vm1 RDT Monitoring Status: Disabled [root@dl-c200 david]# virsh resctrl vm1 --enable error: Requested operation is not valid: domain is not running [root@dl-c200 david]# virsh resctrl vm1 --disable error: Requested operation is not valid: domain is not running ``` ### test on domain vm2 domain vm2 is active and the CAT functionality is enabled through 'cachetune' (configured in 'cputune/cachetune' section). So the resctrl mon group is a 'paried' one, for 'pared' mon group, the RDT monitoring could not be disabled. If it is allowed to disable 'paire' mon group, we have to destroy resctrl allocation folders which is not supported by current cache allocation design. ``` [root@dl-c200 libvirt]# virsh resctrl vm2 --enable RDT Monitoring Status: Enabled (forced by cachetune) [root@dl-c200 libvirt]# virsh resctrl vm2 --disable RDT Monitoring Status: Enabled (forced by cachetune) [root@dl-c200 libvirt]# virsh resctrl vm2 RDT Monitoring Status: Enabled (forced by cachetune) ``` ## About showing the utilization information of RDT A domstats field has been created to show the utilization of RDT resources, the command is like this: ``` [root@dl-c200 libvirt]# virsh domstats --resctrl Domain: 'vm1' resctrl.cmt=0 Domain: 'vm3' resctrl.cmt=180224 Domain: 'vm2' resctrl.cmt=2613248 ``` Wang Huaqiang (3): util: add Intel x86 RDT/CMT support tools: virsh: add command for controling/monitoring resctrl tools: virsh domstats: show RDT CMT resource utilization information include/libvirt/libvirt-domain.h | 10 ++ src/conf/domain_conf.c | 28 ++++ src/conf/domain_conf.h | 3 + src/driver-hypervisor.h | 8 + src/libvirt-domain.c | 92 +++++++++++ src/libvirt_private.syms | 9 + src/libvirt_public.syms | 6 + src/qemu/qemu_driver.c | 189 +++++++++++++++++++++ src/qemu/qemu_process.c | 65 +++++++- src/remote/remote_daemon_dispatch.c | 45 +++++ src/remote/remote_driver.c | 2 + src/remote/remote_protocol.x | 28 +++- src/remote_protocol-structs | 12 ++ src/util/virresctrl.c | 316 +++++++++++++++++++++++++++++++++++- src/util/virresctrl.h | 44 +++++ tools/virsh-domain-monitor.c | 7 + tools/virsh-domain.c | 74 +++++++++ 17 files changed, 933 insertions(+), 5 deletions(-) -- 2.7.4

3 11

[libvirt] [PATCH] appdev-guide/Connections: Remove duplicated entries
by Marcos Paulo de Souza 26 Jun '18

26 Jun '18

Both /hosts/cpu/arch and /hosts/cpu/features appear twice in the documentation. Signed-off-by: Marcos Paulo de Souza <marcos.souza.org(a)gmail.com> --- This is my first submission to libvirt, so let me know if I forgot something. en-US/Connections.xml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/en-US/Connections.xml b/en-US/Connections.xml index 96fe011..d7b6af6 100644 --- a/en-US/Connections.xml +++ b/en-US/Connections.xml @@ -963,17 +963,6 @@ int main(int argc, char *argv[]) CPU architecture. As of this writing, all libvirt drivers initialize this from the output of uname(2). </para> - <para> - <literal>/host/cpu/features</literal> is an optional sub-document that describes additional cpu - features present on the host. As of this writing, it is only used by the - xen driver to report on the presence or lack of the svm or vmx flag, and to - report on the presence or lack of the pae flag. - </para> - <para> - <literal>/host/cpu/arch</literal> is a required XML node that describes the underlying - host CPU architecture. As of this writing, all libvirt drivers - initialize this from the output of uname(2). - </para> <para> <literal>/host/cpu/model</literal> is an optional element that describes the CPU model that the host CPUs most closely resemble. The list of CPU models -- 2.17.1

2 4

[libvirt] [PATCH] docs: schema: Add missing <interleave> to devices
by Han Han 25 Jun '18

25 Jun '18

For input,hub,redirdev devices, their sub-elements should be interleaved. input device: interleave for <driver>, <alias>, <address> hub device: interleave for <alias>, <address> redirdev device: interleave for <source>, <alias>, <address>, <boot> Signed-off-by: Han Han <hhan(a)redhat.com> --- docs/schemas/domaincommon.rng | 60 +++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 4a454dddb4..d262eb2b1b 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -4270,11 +4270,19 @@ <define name="input"> <element name="input"> - <optional> - <element name="driver"> - <ref name="virtioOptions"/> - </element> - </optional> + <interleave> + <optional> + <element name="driver"> + <ref name="virtioOptions"/> + </element> + </optional> + <optional> + <ref name="alias"/> + </optional> + <optional> + <ref name="address"/> + </optional> + </interleave> <choice> <group> <attribute name="type"> @@ -4309,12 +4317,6 @@ </element> </group> </choice> - <optional> - <ref name="alias"/> - </optional> - <optional> - <ref name="address"/> - </optional> </element> </define> <define name="hub"> @@ -4322,12 +4324,14 @@ <attribute name="type"> <value>usb</value> </attribute> - <optional> - <ref name="alias"/> - </optional> - <optional> - <ref name="address"/> - </optional> + <interleave> + <optional> + <ref name="alias"/> + </optional> + <optional> + <ref name="address"/> + </optional> + </interleave> </element> </define> <define name="redirdev"> @@ -4338,16 +4342,18 @@ <attribute name="type"> <ref name="qemucdevSrcTypeChoice"/> </attribute> - <ref name="qemucdevSrcDef"/> - <optional> - <ref name="alias"/> - </optional> - <optional> - <ref name="address"/> - </optional> - <optional> - <ref name="deviceBoot"/> - </optional> + <interleave> + <ref name="qemucdevSrcDef"/> + <optional> + <ref name="alias"/> + </optional> + <optional> + <ref name="address"/> + </optional> + <optional> + <ref name="deviceBoot"/> + </optional> + </interleave> </element> </define> <define name="redirfilter"> -- 2.17.1

2 1

[libvirt] [PATCH] qemu: Fix memory leak in qemuDomainBlockJobSetSpeed()
by w00251574 25 Jun '18

25 Jun '18

Subject: [PATCH] qemu: Fix memory leak in qemuDomainBlockJobSetSpeed() fix 'device' leak in qemuDomainBlockJobSetSpeed Signed-off-by: Jie Wang <wangjie88.huawei.com> --- src/qemu/qemu_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 921aafcd79..b45c26eb3b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17395,6 +17395,7 @@ qemuDomainBlockJobSetSpeed(virDomainPtr dom, qemuDomainObjEndJob(driver, vm); cleanup: + VIR_FREE(device); virDomainObjEndAPI(&vm); return ret; -- 2.15.0.windows.1

2 1

[libvirt] [PATCH] spec: Move SASL configuration file from -libs to -daemon
by Andrea Bolognani 25 Jun '18

25 Jun '18

SASL authentication is configured server-side, so the sample configuration file should be shipped along with the daemon rather than with the libraries. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- libvirt.spec.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index ace05820aa..54549cc737 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1773,6 +1773,7 @@ exit 0 %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf %config(noreplace) %{_sysconfdir}/libvirt/virtlogd.conf %config(noreplace) %{_sysconfdir}/libvirt/virtlockd.conf +%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf %config(noreplace) %{_prefix}/lib/sysctl.d/60-libvirtd.conf %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd @@ -2060,8 +2061,6 @@ exit 0 %{_datadir}/libvirt/test-screenshot.png -%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf - %files admin %{_mandir}/man1/virt-admin.1* %{_bindir}/virt-admin -- 2.17.1

2 1

[libvirt] [PATCH v1 00/21] use GCC's cleanup attribute in src/util
by Sukrit Bhatnagar 25 Jun '18

25 Jun '18

This series of patches introduces a new set of macros which help in using GCC's __attribute__((cleanup)) in the code. Then the patches modify a few files in src/util to use VIR_AUTOFREE and VIR_AUTOPTR for automatic freeing of memory and get rid of some VIR_FREE macro invocations and *Free function calls. Sukrit Bhatnagar (21): add macros for implementing automatic cleanup functionality util: arptable: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: iohelper: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: audit: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: fcp: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: eventpoll: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: filecache: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: authconfig: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: authconfig: remove redundant include directive util: authconfig: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: auth: remove redundant include directive util: auth: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: auth: use VIR_AUTOPTR for aggregate types util: json: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: json: remove redundant include directive util: json: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: json: use VIR_AUTOPTR for aggregate types util: identity: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: bitmap: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: bitmap: remove redundant include directive util: bitmap: use VIR_AUTOPTR for aggregate types src/util/iohelper.c | 4 +-- src/util/viralloc.h | 68 ++++++++++++++++++++++++++++++++++++++++++++++++ src/util/virarptable.c | 14 +++------- src/util/viraudit.c | 3 +-- src/util/virauth.c | 61 +++++++++++++------------------------------ src/util/virauthconfig.c | 35 +++++++++---------------- src/util/virauthconfig.h | 3 +++ src/util/virbitmap.c | 8 ++---- src/util/virbitmap.h | 3 +++ src/util/vireventpoll.c | 7 ++--- src/util/virfcp.c | 20 +++++--------- src/util/virfilecache.c | 35 ++++++++----------------- src/util/viridentity.c | 54 ++++++++++++++++---------------------- src/util/virjson.c | 45 +++++++++----------------------- src/util/virjson.h | 3 +++ 15 files changed, 168 insertions(+), 195 deletions(-) -- 1.8.3.1

2 22

[libvirt] [dbus PATCH] connect: fix deregistering of NodeDevice events
by Anya Harter 25 Jun '18

25 Jun '18

Signed-off-by: Anya Harter <aharter(a)redhat.com> --- src/connect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/connect.c b/src/connect.c index 09e5628..32dda14 100644 --- a/src/connect.c +++ b/src/connect.c @@ -68,7 +68,7 @@ virtDBusConnectClose(virtDBusConnect *connect, for (gint i = 0; i < VIR_NODE_DEVICE_EVENT_ID_LAST; i++) { if (connect->nodeDevCallbackIds[i] >= 0) { if (deregisterEvents) { - virConnectNetworkEventDeregisterAny(connect->connection, + virConnectNodeDeviceEventDeregisterAny(connect->connection, connect->nodeDevCallbackIds[i]); } connect->nodeDevCallbackIds[i] = -1; -- 2.17.1

2 1

[libvirt] [PATCH] qemu: format serial, geometry and error policy on frontend disk device
by Daniel P. Berrangé 25 Jun '18

25 Jun '18

Currently we format the serial, geometry and error policy on the -drive backend argument. QEMU added the ability to set serial and geometry on the frontend in the 1.2 release, and ability to set error policy in the 2.7 release. usb-storage is an oddity, however, as it lacks error policy support right now. Setting any of these on -drive has been deprecated and support for this will be removed very soon. Note that some disk buses (sd) still don't support -device. Although QEMU allowed these properties to be set on -drive for if=sd, they have been ignored so we don't loose anything by removing this. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 31 ++++++++++++++++--- .../caps_2.10.0.aarch64.xml | 1 + .../caps_2.10.0.ppc64.xml | 1 + .../caps_2.10.0.s390x.xml | 1 + .../caps_2.10.0.x86_64.xml | 1 + .../caps_2.11.0.s390x.xml | 1 + .../caps_2.12.0.aarch64.xml | 1 + .../caps_2.12.0.ppc64.xml | 1 + .../caps_2.12.0.s390x.xml | 1 + .../caps_2.12.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 + .../caps_2.7.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 + .../caps_2.8.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + .../caps_2.9.0.x86_64.xml | 1 + .../disk-drive-network-tlsx509.args | 12 +++---- .../disk-drive-network-vxhs.args | 4 +-- tests/qemuxml2argvdata/disk-drive-shared.args | 5 +-- tests/qemuxml2argvdata/disk-geometry.args | 6 ++-- tests/qemuxml2argvdata/disk-ide-wwn.args | 5 ++- .../qemuxml2argvdata/disk-scsi-disk-wwn.args | 4 +-- tests/qemuxml2argvdata/disk-serial.args | 10 +++--- tests/qemuxml2argvdata/disk-serial.xml | 1 - tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmloutdata/disk-serial.xml | 1 - 29 files changed, 69 insertions(+), 30 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 419208ad5c..b9a6c2d612 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -500,6 +500,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, /* 310 */ "sev-guest", + "disk-error", ); @@ -1162,6 +1163,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioBlk[] = { { "iommu_platform", QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM }, { "ats", QEMU_CAPS_VIRTIO_PCI_ATS }, { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE }, + { "werror", QEMU_CAPS_DISK_ERROR }, }; static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioNet[] = { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 3519a194e9..1245fb46cf 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -484,6 +484,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ /* 310 */ QEMU_CAPS_SEV_GUEST, /* -object sev-guest,... */ + QEMU_CAPS_DISK_ERROR, /* -device $DISK,werror=,rerror=X */ QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 446df3e1d8..e97158fe64 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1621,8 +1621,6 @@ qemuBuildDiskFrontendAttributes(virDomainDiskDefPtr disk, virBufferAddLit(buf, ",serial="); virBufferEscape(buf, '\\', " ", "%s", disk->serial); } - - qemuBuildDiskFrontendAttributeErrorPolicy(disk, buf); } @@ -1662,11 +1660,29 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, virBufferAsprintf(&opt, "if=%s", virDomainDiskQEMUBusTypeToString(disk->bus)); virBufferAsprintf(&opt, ",index=%d", idx); + + if (disk->serial) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Serial property not supported for drive bus '%s'"), + virDomainDiskBusTypeToString(disk->bus)); + goto error; + } + if (disk->geometry.cylinders > 0 && + disk->geometry.heads > 0 && + disk->geometry.sectors > 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Geometry not supported for drive bus '%s'"), + virDomainDiskBusTypeToString(disk->bus)); + goto error; + } } - /* Format attributes for the drive itself (not the storage backing it) which - * we've formatted historically with -drive */ - qemuBuildDiskFrontendAttributes(disk, &opt); + /* werror/rerror are really frontend attributes, but older + * qemu requires them on -drive instead of -device */ + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DISK_ERROR) || + disk->bus == VIR_DOMAIN_DISK_BUS_USB) + qemuBuildDiskFrontendAttributeErrorPolicy(disk, &opt); + /* While this is a frontend attribute, it only makes sense to be used when * legacy -drive is used. In modern qemu the 'ide-cd' or 'scsi-cd' are used. @@ -2125,6 +2141,11 @@ qemuBuildDriveDevStr(const virDomainDef *def, if (qemuBuildDriveDevCacheStr(disk, &opt, qemuCaps) < 0) goto error; + qemuBuildDiskFrontendAttributes(disk, &opt); + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DISK_ERROR) && + disk->bus != VIR_DOMAIN_DISK_BUS_USB) + qemuBuildDiskFrontendAttributeErrorPolicy(disk, &opt); + if (virBufferCheckError(&opt) < 0) goto error; diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index 169641063c..35893bdac4 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -159,6 +159,7 @@ <flag name='hda-output'/> <flag name='blockdev-del'/> <flag name='vhost-vsock'/> + <flag name='disk-error'/> <version>2010000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>307647</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index 92c095abd2..0c7249a24b 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -158,6 +158,7 @@ <flag name='hda-output'/> <flag name='blockdev-del'/> <flag name='vhost-vsock'/> + <flag name='disk-error'/> <version>2010000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>386992</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index 5e22e21224..7576c59cb0 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -119,6 +119,7 @@ <flag name='sdl-gl'/> <flag name='blockdev-del'/> <flag name='vhost-vsock'/> + <flag name='disk-error'/> <version>2010000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>307899</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index 10b066bff1..2cc10e2192 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -203,6 +203,7 @@ <flag name='vmgenid'/> <flag name='vhost-vsock'/> <flag name='mch'/> + <flag name='disk-error'/> <version>2010000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>367995</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index 6ca2e57ef8..58ec9f4e02 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -126,6 +126,7 @@ <flag name='blockdev-del'/> <flag name='vhost-vsock'/> <flag name='tpm-emulator'/> + <flag name='disk-error'/> <version>2011000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>346751</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index 5ed0290397..3073ea10f5 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -169,6 +169,7 @@ <flag name='vhost-vsock'/> <flag name='chardev-fd-pass'/> <flag name='tpm-emulator'/> + <flag name='disk-error'/> <version>2011090</version> <kvmVersion>0</kvmVersion> <microcodeVersion>347313</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index c61029e479..acd6a8d8c4 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -166,6 +166,7 @@ <flag name='vhost-vsock'/> <flag name='chardev-fd-pass'/> <flag name='tpm-emulator'/> + <flag name='disk-error'/> <version>2011090</version> <kvmVersion>0</kvmVersion> <microcodeVersion>424244</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index 6fac6d6906..7aa7e8d889 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -133,6 +133,7 @@ <flag name='vhost-vsock'/> <flag name='chardev-fd-pass'/> <flag name='tpm-emulator'/> + <flag name='disk-error'/> <version>2012000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>375762</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 2167f06976..92871de23f 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -211,6 +211,7 @@ <flag name='mch'/> <flag name='mch.extended-tseg-mbytes'/> <flag name='sev-guest'/> + <flag name='disk-error'/> <version>2011090</version> <kvmVersion>0</kvmVersion> <microcodeVersion>415959</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index 9ed25178f8..ce1752934c 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -107,6 +107,7 @@ <flag name='nbd-tls'/> <flag name='virtual-css-bridge'/> <flag name='sdl-gl'/> + <flag name='disk-error'/> <version>2007000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>220792</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index 959a858349..3be3b383ec 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -180,6 +180,7 @@ <flag name='sdl-gl'/> <flag name='hda-output'/> <flag name='mch'/> + <flag name='disk-error'/> <version>2007000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>244005</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index 646239ff25..1cecf68b23 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -110,6 +110,7 @@ <flag name='virtual-css-bridge'/> <flag name='sdl-gl'/> <flag name='vhost-vsock'/> + <flag name='disk-error'/> <version>2007093</version> <kvmVersion>0</kvmVersion> <microcodeVersion>246206</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index 3af44f0904..6ed95782ae 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -183,6 +183,7 @@ <flag name='hda-output'/> <flag name='vhost-vsock'/> <flag name='mch'/> + <flag name='disk-error'/> <version>2008000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>260660</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index 70a5936439..1ee5079ee8 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -150,6 +150,7 @@ <flag name='hda-output'/> <flag name='blockdev-del'/> <flag name='vhost-vsock'/> + <flag name='disk-error'/> <version>2009000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>350708</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index 09d68e1f18..a25f49f375 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -114,6 +114,7 @@ <flag name='sdl-gl'/> <flag name='blockdev-del'/> <flag name='vhost-vsock'/> + <flag name='disk-error'/> <version>2009000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>269625</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index 31ce52c787..0627d42bf3 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -198,6 +198,7 @@ <flag name='vmgenid'/> <flag name='vhost-vsock'/> <flag name='mch'/> + <flag name='disk-error'/> <version>2009000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>343984</microcodeVersion> diff --git a/tests/qemuxml2argvdata/disk-drive-network-tlsx509.args b/tests/qemuxml2argvdata/disk-drive-network-tlsx509.args index e25f45742c..b5e73064c0 100644 --- a/tests/qemuxml2argvdata/disk-drive-network-tlsx509.args +++ b/tests/qemuxml2argvdata/disk-drive-network-tlsx509.args @@ -28,22 +28,22 @@ server,nowait \ -drive file.driver=vxhs,file.tls-creds=objvirtio-disk0_tls0,\ file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc251,\ file.server.host=192.168.0.1,file.server.port=9999,format=raw,if=none,\ -id=drive-virtio-disk0,serial=eb90327c-8302-4725-9e1b-4e85ed4dc251,cache=none \ +id=drive-virtio-disk0,cache=none \ -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ -id=virtio-disk0 \ +id=virtio-disk0,serial=eb90327c-8302-4725-9e1b-4e85ed4dc251 \ -object tls-creds-x509,id=objvirtio-disk1_tls0,dir=/etc/pki/libvirt-vxhs/dummy,\ ,path,endpoint=client,verify-peer=yes \ -drive file.driver=vxhs,file.tls-creds=objvirtio-disk1_tls0,\ file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc252,\ file.server.host=192.168.0.2,file.server.port=9999,format=raw,if=none,\ -id=drive-virtio-disk1,serial=eb90327c-8302-4725-9e1b-4e85ed4dc252,cache=none \ +id=drive-virtio-disk1,cache=none \ -device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,\ -id=virtio-disk1 \ +id=virtio-disk1,serial=eb90327c-8302-4725-9e1b-4e85ed4dc252 \ -drive file.driver=vxhs,file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc253,\ file.server.host=192.168.0.3,file.server.port=9999,format=raw,if=none,\ -id=drive-virtio-disk2,serial=eb90327c-8302-4725-9e1b-4e85ed4dc252,cache=none \ +id=drive-virtio-disk2,cache=none \ -device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk2,\ -id=virtio-disk2 \ +id=virtio-disk2,serial=eb90327c-8302-4725-9e1b-4e85ed4dc252 \ -object tls-creds-x509,id=objvirtio-disk3_tls0,dir=/etc/pki/libvirt-nbd/dummy,,\ path,endpoint=client,verify-peer=yes \ -drive file.driver=nbd,file.server.type=inet,file.server.host=example.com,\ diff --git a/tests/qemuxml2argvdata/disk-drive-network-vxhs.args b/tests/qemuxml2argvdata/disk-drive-network-vxhs.args index c2a1d4681f..fad4dfd942 100644 --- a/tests/qemuxml2argvdata/disk-drive-network-vxhs.args +++ b/tests/qemuxml2argvdata/disk-drive-network-vxhs.args @@ -25,6 +25,6 @@ server,nowait \ -usb \ -drive file.driver=vxhs,file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc251,\ file.server.host=192.168.0.1,file.server.port=9999,format=raw,if=none,\ -id=drive-virtio-disk0,serial=eb90327c-8302-4725-9e1b-4e85ed4dc251,cache=none \ +id=drive-virtio-disk0,cache=none \ -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ -id=virtio-disk0 +id=virtio-disk0,serial=eb90327c-8302-4725-9e1b-4e85ed4dc251 diff --git a/tests/qemuxml2argvdata/disk-drive-shared.args b/tests/qemuxml2argvdata/disk-drive-shared.args index 5306fdf750..032e86e291 100644 --- a/tests/qemuxml2argvdata/disk-drive-shared.args +++ b/tests/qemuxml2argvdata/disk-drive-shared.args @@ -23,8 +23,9 @@ server,nowait \ -boot c \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0,\ -serial=XYZXYZXYZYXXYZYZYXYZY,cache=none \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +cache=none \ +-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ +serial=XYZXYZXYZYXXYZYZYXYZY \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-1-0,\ media=cdrom,readonly=on \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ diff --git a/tests/qemuxml2argvdata/disk-geometry.args b/tests/qemuxml2argvdata/disk-geometry.args index b173ab6407..db0c7fb561 100644 --- a/tests/qemuxml2argvdata/disk-geometry.args +++ b/tests/qemuxml2argvdata/disk-geometry.args @@ -22,7 +22,7 @@ server,nowait \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0,\ -cyls=16383,heads=16,secs=63,trans=lba \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ +-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,cyls=16383,\ +heads=16,secs=63,trans=lba \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/disk-ide-wwn.args b/tests/qemuxml2argvdata/disk-ide-wwn.args index e6d2758ec3..a0e3f06b68 100644 --- a/tests/qemuxml2argvdata/disk-ide-wwn.args +++ b/tests/qemuxml2argvdata/disk-ide-wwn.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-1,\ -serial=WD-WMAP9A966149 \ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-1 \ -device ide-hd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1,\ -wwn=0x5000c50015ea71ad \ +wwn=0x5000c50015ea71ad,serial=WD-WMAP9A966149 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args index 29607e8927..6407fd002d 100644 --- a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args +++ b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args @@ -25,9 +25,9 @@ server,nowait \ -device lsi,id=scsi1,bus=pci.0,addr=0x4 \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-scsi0-0-1-0,\ -serial=WD-WMAP9A966149,readonly=on \ +readonly=on \ -device scsi-cd,bus=scsi0.0,channel=0,scsi-id=1,lun=0,drive=drive-scsi0-0-1-0,\ -id=scsi0-0-1-0,wwn=0x5000c50015ea71ac \ +id=scsi0-0-1-0,wwn=0x5000c50015ea71ac,serial=WD-WMAP9A966149 \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-scsi0-0-0-0 \ -device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,\ id=scsi0-0-0-0,wwn=0x5000c50015ea71ad \ diff --git a/tests/qemuxml2argvdata/disk-serial.args b/tests/qemuxml2argvdata/disk-serial.args index 88310b009f..5892f64c29 100644 --- a/tests/qemuxml2argvdata/disk-serial.args +++ b/tests/qemuxml2argvdata/disk-serial.args @@ -22,11 +22,11 @@ server,nowait \ -no-acpi \ -boot c \ -usb \ --drive 'file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-1,\ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-1 \ +-device 'ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1,\ serial=\ \ WD-WMAP9A966149' \ --device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ --drive 'file=/dev/HostVG/AllSerialChars,format=raw,if=none,id=drive-ide0-0-2,\ +-drive file=/dev/HostVG/AllSerialChars,format=raw,if=none,id=drive-ide0-0-2 \ +-device 'ide-drive,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2,\ serial=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_\ .+' \ --device ide-drive,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2 \ --drive file=/some/file,format=raw,if=sd,index=0,serial=sdserial \ +-drive file=/some/file,format=raw,if=sd,index=0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/disk-serial.xml b/tests/qemuxml2argvdata/disk-serial.xml index ea71f2c339..18e72bb4ba 100644 --- a/tests/qemuxml2argvdata/disk-serial.xml +++ b/tests/qemuxml2argvdata/disk-serial.xml @@ -29,7 +29,6 @@ <disk type='file' device='disk'> <source file='/some/file'/> <target dev='sda' bus='sd'/> - <serial>sdserial</serial> </disk> <controller type='usb' index='0'/> <controller type='ide' index='0'/> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 582a9de7bb..06b94be625 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1038,6 +1038,7 @@ mymain(void) DO_TEST("disk-drive-error-policy-stop", NONE); DO_TEST("disk-drive-error-policy-enospace", NONE); DO_TEST("disk-drive-error-policy-wreport-rignore", NONE); + DO_TEST("disk-drive-error-policy-front", QEMU_CAPS_DISK_ERROR); DO_TEST("disk-drive-cache-v2-wt", NONE); DO_TEST("disk-drive-cache-v2-wb", NONE); DO_TEST("disk-drive-cache-v2-none", NONE); diff --git a/tests/qemuxml2xmloutdata/disk-serial.xml b/tests/qemuxml2xmloutdata/disk-serial.xml index 9313c699b6..a803cd959c 100644 --- a/tests/qemuxml2xmloutdata/disk-serial.xml +++ b/tests/qemuxml2xmloutdata/disk-serial.xml @@ -32,7 +32,6 @@ <driver name='qemu' type='raw'/> <source file='/some/file'/> <target dev='sda' bus='sd'/> - <serial>sdserial</serial> </disk> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> -- 2.17.1

2 3