- Devel - libvirt List Archives

[libvirt] [PATCH] logical: Allow [no]overwrite option for poolBuild
by John Ferlan 16 Nov '16

16 Nov '16

https://bugzilla.redhat.com/show_bug.cgi?id=1373711 When using pool-create --build or pool-define and pool-build to create/define and build/initialize the logical pool, the 'pvcreate' command could fail if some previous attempt had been used on the source path previously. So add support for the --override option in order to force usage of the magic override option "-ff" and the option "-y" in order to force creation and answer any questions with yes. NB: Although the reality is part of the process of building the logical pool involves wiping out the first 512 bytes of the disk block to be added (e.g. the partition table) because pvcreate requires that. So, to a degree the device being added is already altered. I suspect the knowlege of whether the disk was in a vg already could be contained outside the range of the first 512 bytes. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/storage/storage_backend_logical.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index ca05fe1..9c76156 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -682,13 +682,18 @@ virStorageBackendLogicalBuildPool(virConnectPtr conn ATTRIBUTE_UNUSED, virStoragePoolObjPtr pool, unsigned int flags) { - virCommandPtr vgcmd; + virCommandPtr vgcmd = NULL; int fd; char zeros[PV_BLANK_SECTOR_SIZE]; int ret = -1; size_t i; - virCheckFlags(0, -1); + virCheckFlags(VIR_STORAGE_POOL_BUILD_OVERWRITE | + VIR_STORAGE_POOL_BUILD_NO_OVERWRITE, ret); + + VIR_EXCLUSIVE_FLAGS_GOTO(VIR_STORAGE_POOL_BUILD_OVERWRITE, + VIR_STORAGE_POOL_BUILD_NO_OVERWRITE, + cleanup); memset(zeros, 0, sizeof(zeros)); @@ -731,10 +736,21 @@ virStorageBackendLogicalBuildPool(virConnectPtr conn ATTRIBUTE_UNUSED, /* * Initialize the physical volume because vgcreate is not * clever enough todo this for us :-( + * + * If this API is called twice for the same device, then because + * vgcmd adds the device to the volume group, the pvcreate will + * fail since the pv is already part of the vg. Allow use of the + * override option inorder to overrule! */ - pvcmd = virCommandNewArgList(PVCREATE, - pool->def->source.devices[i].path, - NULL); + if (flags & VIR_STORAGE_POOL_BUILD_OVERWRITE) + pvcmd = virCommandNewArgList(PVCREATE, + "-ff", "-y", + pool->def->source.devices[i].path, + NULL); + else + pvcmd = virCommandNewArgList(PVCREATE, + pool->def->source.devices[i].path, + NULL); if (virCommandRun(pvcmd, NULL) < 0) { virCommandFree(pvcmd); goto cleanup; -- 2.7.4

2 3

[libvirt] [PATCH RFC] Rework existing code for scsi hostdev scsi_host protocol
by Eric Farman 16 Nov '16

16 Nov '16

In review feedback for my vhost-scsi series[1], we encountered a conflict where existing structs/functions are named "...SCSIHost..." to represent a hostdev type='scsi' protocol='scsi_host' element. This is somewhat of an abbreviation, but jives well with the other elements for this hostdev. Specifically, a hostdev type='scsi' protocol='iscsi' uses structs and functions named "...SCSIiSCSI..." As my series is intending to add a hostdev type='scsi_host', the phrase "SCSIHost" had to be avoided to prevent conflicts with existing code, which means the abbreviation gets propogated in new and unplesant ways. Let's remove this abbreviation and change the existing code from "SCSIHost" to "SCSISCSIHost" so that a new hostdev type can be added without conflict. The intention being "<type><protocol>" being used going forward. [1] End of https://www.redhat.com/archives/libvir-list/2016-November/msg00738.html Signed-off-by: Eric Farman <farman(a)linux.vnet.ibm.com> --- src/conf/domain_audit.c | 2 +- src/conf/domain_conf.c | 20 ++++++++--------- src/conf/domain_conf.h | 8 +++---- src/qemu/qemu_cgroup.c | 2 +- src/qemu/qemu_command.c | 6 ++--- src/qemu/qemu_conf.c | 2 +- src/qemu/qemu_hotplug.c | 4 ++-- src/security/security_apparmor.c | 2 +- src/security/security_dac.c | 4 ++-- src/security/security_selinux.c | 4 ++-- src/util/virhostdev.c | 47 ++++++++++++++++++++++------------------ 11 files changed, 53 insertions(+), 48 deletions(-) diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index 2decf02..164debb 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -432,7 +432,7 @@ virDomainAuditHostdev(virDomainObjPtr vm, virDomainHostdevDefPtr hostdev, */ goto cleanup; } else { - virDomainHostdevSubsysSCSIHostPtr scsihostsrc = + virDomainHostdevSubsysSCSISCSIHostPtr scsihostsrc = &scsisrc->u.host; if (virAsprintfQuiet(&address, "%s:%u:%u:%llu", scsihostsrc->adapter, scsihostsrc->bus, diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6e008e2..c985e21 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5907,14 +5907,14 @@ virDomainStorageHostParse(xmlNodePtr node, } static int -virDomainHostdevSubsysSCSIHostDefParseXML(xmlNodePtr sourcenode, - virDomainHostdevSubsysSCSIPtr scsisrc) +virDomainHostdevSubsysSCSISCSIHostDefParseXML(xmlNodePtr sourcenode, + virDomainHostdevSubsysSCSIPtr scsisrc) { int ret = -1; bool got_address = false, got_adapter = false; xmlNodePtr cur; char *bus = NULL, *target = NULL, *unit = NULL; - virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host; + virDomainHostdevSubsysSCSISCSIHostPtr scsihostsrc = &scsisrc->u.host; cur = sourcenode->children; while (cur != NULL) { @@ -6081,7 +6081,7 @@ virDomainHostdevSubsysSCSIDefParseXML(xmlNodePtr sourcenode, if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI) ret = virDomainHostdevSubsysSCSIiSCSIDefParseXML(sourcenode, scsisrc); else - ret = virDomainHostdevSubsysSCSIHostDefParseXML(sourcenode, scsisrc); + ret = virDomainHostdevSubsysSCSISCSIHostDefParseXML(sourcenode, scsisrc); cleanup: VIR_FREE(protocol); @@ -13846,12 +13846,12 @@ virDomainHostdevMatchSubsysPCI(virDomainHostdevDefPtr first, } static int -virDomainHostdevMatchSubsysSCSIHost(virDomainHostdevDefPtr first, - virDomainHostdevDefPtr second) +virDomainHostdevMatchSubsysSCSISCSIHost(virDomainHostdevDefPtr first, + virDomainHostdevDefPtr second) { - virDomainHostdevSubsysSCSIHostPtr first_scsihostsrc = + virDomainHostdevSubsysSCSISCSIHostPtr first_scsihostsrc = &first->source.subsys.u.scsi.u.host; - virDomainHostdevSubsysSCSIHostPtr second_scsihostsrc = + virDomainHostdevSubsysSCSISCSIHostPtr second_scsihostsrc = &second->source.subsys.u.scsi.u.host; if (STREQ(first_scsihostsrc->adapter, second_scsihostsrc->adapter) && @@ -13898,7 +13898,7 @@ virDomainHostdevMatchSubsys(virDomainHostdevDefPtr a, VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI) return virDomainHostdevMatchSubsysSCSIiSCSI(a, b); else - return virDomainHostdevMatchSubsysSCSIHost(a, b); + return virDomainHostdevMatchSubsysSCSISCSIHost(a, b); case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: return 0; } @@ -20808,7 +20808,7 @@ virDomainHostdevDefFormatSubsys(virBufferPtr buf, virDomainHostdevSubsysUSBPtr usbsrc = &def->source.subsys.u.usb; virDomainHostdevSubsysPCIPtr pcisrc = &def->source.subsys.u.pci; virDomainHostdevSubsysSCSIPtr scsisrc = &def->source.subsys.u.scsi; - virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host; + virDomainHostdevSubsysSCSISCSIHostPtr scsihostsrc = &scsisrc->u.host; virDomainHostdevSubsysSCSIiSCSIPtr iscsisrc = &scsisrc->u.iscsi; if (def->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI && diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 541b600..4303d0e 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -338,9 +338,9 @@ struct _virDomainHostdevSubsysPCI { int backend; /* enum virDomainHostdevSubsysPCIBackendType */ }; -typedef struct _virDomainHostdevSubsysSCSIHost virDomainHostdevSubsysSCSIHost; -typedef virDomainHostdevSubsysSCSIHost *virDomainHostdevSubsysSCSIHostPtr; -struct _virDomainHostdevSubsysSCSIHost { +typedef struct _virDomainHostdevSubsysSCSISCSIHost virDomainHostdevSubsysSCSISCSIHost; +typedef virDomainHostdevSubsysSCSISCSIHost *virDomainHostdevSubsysSCSISCSIHostPtr; +struct _virDomainHostdevSubsysSCSISCSIHost { char *adapter; unsigned bus; unsigned target; @@ -363,7 +363,7 @@ struct _virDomainHostdevSubsysSCSI { int sgio; /* enum virDomainDeviceSGIO */ int rawio; /* enum virTristateBool */ union { - virDomainHostdevSubsysSCSIHost host; + virDomainHostdevSubsysSCSISCSIHost host; virDomainHostdevSubsysSCSIiSCSI iscsi; } u; }; diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 1443f7e..462f74d 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -357,7 +357,7 @@ qemuSetupHostdevCgroup(virDomainObjPtr vm, VIR_DEBUG("Not updating cgroups for hostdev iSCSI path '%s'", iscsisrc->path); } else { - virDomainHostdevSubsysSCSIHostPtr scsihostsrc = + virDomainHostdevSubsysSCSISCSIHostPtr scsihostsrc = &scsisrc->u.host; if ((scsi = virSCSIDeviceNew(NULL, scsihostsrc->adapter, diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4a5fce3..37ce596 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4706,10 +4706,10 @@ qemuBuildHubCommandLine(virCommandPtr cmd, static char * -qemuBuildSCSIHostHostdevDrvStr(virDomainHostdevDefPtr dev) +qemuBuildSCSISCSIHostHostdevDrvStr(virDomainHostdevDefPtr dev) { virDomainHostdevSubsysSCSIPtr scsisrc = &dev->source.subsys.u.scsi; - virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host; + virDomainHostdevSubsysSCSISCSIHostPtr scsihostsrc = &scsisrc->u.host; return virSCSIDeviceGetSgName(NULL, scsihostsrc->adapter, @@ -4754,7 +4754,7 @@ qemuBuildSCSIHostdevDrvStr(virDomainHostdevDefPtr dev) goto error; virBufferAsprintf(&buf, "file=%s,if=none,format=raw", source); } else { - if (!(source = qemuBuildSCSIHostHostdevDrvStr(dev))) + if (!(source = qemuBuildSCSISCSIHostHostdevDrvStr(dev))) goto error; virBufferAsprintf(&buf, "file=/dev/%s,if=none", source); } diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 0ed88f5..169467f 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1198,7 +1198,7 @@ static char * qemuGetHostdevPath(virDomainHostdevDefPtr hostdev) { virDomainHostdevSubsysSCSIPtr scsisrc = &hostdev->source.subsys.u.scsi; - virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host; + virDomainHostdevSubsysSCSISCSIHostPtr scsihostsrc = &scsisrc->u.host; char *dev_name = NULL; char *dev_path = NULL; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 6b3a068..a3acda6 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2355,7 +2355,7 @@ qemuDomainAttachHostSCSIDevice(virConnectPtr conn, _("Unable to prepare scsi hostdev for iSCSI: %s"), iscsisrc->path); } else { - virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host; + virDomainHostdevSubsysSCSISCSIHostPtr scsihostsrc = &scsisrc->u.host; virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to prepare scsi hostdev: %s:%u:%u:%llu"), scsihostsrc->adapter, scsihostsrc->bus, @@ -4583,7 +4583,7 @@ int qemuDomainDetachHostDevice(virQEMUDriverPtr driver, _("host scsi iSCSI path %s not found"), iscsisrc->path); } else { - virDomainHostdevSubsysSCSIHostPtr scsihostsrc = + virDomainHostdevSubsysSCSISCSIHostPtr scsihostsrc = &scsisrc->u.host; virReportError(VIR_ERR_OPERATION_FAILED, _("host scsi device %s:%u:%u.%llu not found"), diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index beddf6d..521df8e 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -893,7 +893,7 @@ AppArmorSetSecurityHostdevLabel(virSecurityManagerPtr mgr, } case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI: { - virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host; + virDomainHostdevSubsysSCSISCSIHostPtr scsihostsrc = &scsisrc->u.host; virSCSIDevicePtr scsi = virSCSIDeviceNew(NULL, scsihostsrc->adapter, scsihostsrc->bus, diff --git a/src/security/security_dac.c b/src/security/security_dac.c index fd74e8b..e3a01ae 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -658,7 +658,7 @@ virSecurityDACSetHostdevLabel(virSecurityManagerPtr mgr, } case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI: { - virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host; + virDomainHostdevSubsysSCSISCSIHostPtr scsihostsrc = &scsisrc->u.host; virSCSIDevicePtr scsi = virSCSIDeviceNew(NULL, scsihostsrc->adapter, scsihostsrc->bus, @@ -789,7 +789,7 @@ virSecurityDACRestoreHostdevLabel(virSecurityManagerPtr mgr, } case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI: { - virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host; + virDomainHostdevSubsysSCSISCSIHostPtr scsihostsrc = &scsisrc->u.host; virSCSIDevicePtr scsi = virSCSIDeviceNew(NULL, scsihostsrc->adapter, scsihostsrc->bus, diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 89c93dc..c916028 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -1479,7 +1479,7 @@ virSecuritySELinuxSetHostdevSubsysLabel(virSecurityManagerPtr mgr, } case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI: { - virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host; + virDomainHostdevSubsysSCSISCSIHostPtr scsihostsrc = &scsisrc->u.host; virSCSIDevicePtr scsi = virSCSIDeviceNew(NULL, @@ -1684,7 +1684,7 @@ virSecuritySELinuxRestoreHostdevSubsysLabel(virSecurityManagerPtr mgr, } case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI: { - virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host; + virDomainHostdevSubsysSCSISCSIHostPtr scsihostsrc = &scsisrc->u.host; virSCSIDevicePtr scsi = virSCSIDeviceNew(NULL, scsihostsrc->adapter, scsihostsrc->bus, diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c index 9c2262e..13ee522 100644 --- a/src/util/virhostdev.c +++ b/src/util/virhostdev.c @@ -1044,13 +1044,13 @@ virHostdevUpdateActiveUSBDevices(virHostdevManagerPtr mgr, } static int -virHostdevUpdateActiveSCSIHostDevices(virHostdevManagerPtr mgr, - virDomainHostdevDefPtr hostdev, - virDomainHostdevSubsysSCSIPtr scsisrc, - const char *drv_name, - const char *dom_name) +virHostdevUpdateActiveSCSISCSIHostDevices(virHostdevManagerPtr mgr, + virDomainHostdevDefPtr hostdev, + virDomainHostdevSubsysSCSIPtr scsisrc, + const char *drv_name, + const char *dom_name) { - virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host; + virDomainHostdevSubsysSCSISCSIHostPtr scsihostsrc = &scsisrc->u.host; virSCSIDevicePtr scsi = NULL; virSCSIDevicePtr tmp = NULL; int ret = -1; @@ -1107,8 +1107,11 @@ virHostdevUpdateActiveSCSIDevices(virHostdevManagerPtr mgr, if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI) { continue; /* Not supported for iSCSI */ } else { - if (virHostdevUpdateActiveSCSIHostDevices(mgr, hostdev, scsisrc, - drv_name, dom_name) < 0) + if (virHostdevUpdateActiveSCSISCSIHostDevices(mgr, + hostdev, + scsisrc, + drv_name, + dom_name) < 0) goto cleanup; } } @@ -1340,11 +1343,11 @@ virHostdevPrepareUSBDevices(virHostdevManagerPtr mgr, } static int -virHostdevPrepareSCSIHostDevices(virDomainHostdevDefPtr hostdev, - virDomainHostdevSubsysSCSIPtr scsisrc, - virSCSIDeviceListPtr list) +virHostdevPrepareSCSISCSIHostDevices(virDomainHostdevDefPtr hostdev, + virDomainHostdevSubsysSCSIPtr scsisrc, + virSCSIDeviceListPtr list) { - virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host; + virDomainHostdevSubsysSCSISCSIHostPtr scsihostsrc = &scsisrc->u.host; virSCSIDevicePtr scsi; int ret = -1; @@ -1406,7 +1409,9 @@ virHostdevPrepareSCSIDevices(virHostdevManagerPtr mgr, if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI) { continue; /* Not supported for iSCSI */ } else { - if (virHostdevPrepareSCSIHostDevices(hostdev, scsisrc, list) < 0) + if (virHostdevPrepareSCSISCSIHostDevices(hostdev, + scsisrc, + list) < 0) goto cleanup; } } @@ -1533,13 +1538,13 @@ virHostdevReAttachUSBDevices(virHostdevManagerPtr mgr, } static void -virHostdevReAttachSCSIHostDevices(virHostdevManagerPtr mgr, - virDomainHostdevDefPtr hostdev, - virDomainHostdevSubsysSCSIPtr scsisrc, - const char *drv_name, - const char *dom_name) +virHostdevReAttachSCSISCSIHostDevices(virHostdevManagerPtr mgr, + virDomainHostdevDefPtr hostdev, + virDomainHostdevSubsysSCSIPtr scsisrc, + const char *drv_name, + const char *dom_name) { - virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host; + virDomainHostdevSubsysSCSISCSIHostPtr scsihostsrc = &scsisrc->u.host; virSCSIDevicePtr scsi; virSCSIDevicePtr tmp; @@ -1598,8 +1603,8 @@ virHostdevReAttachSCSIDevices(virHostdevManagerPtr mgr, if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI) continue; /* Not supported for iSCSI */ else - virHostdevReAttachSCSIHostDevices(mgr, hostdev, scsisrc, - drv_name, dom_name); + virHostdevReAttachSCSISCSIHostDevices(mgr, hostdev, scsisrc, + drv_name, dom_name); } virObjectUnlock(mgr->activeSCSIHostdevs); } -- 1.9.1

1 0

[libvirt] [PATCH] fs: Add proper switch to create filesystem with overwrite
by John Ferlan 16 Nov '16

16 Nov '16

https://bugzilla.redhat.com/show_bug.cgi?id=1366460 When using the --overwrite switch on a pool-build or pool-create, the The mkfs.ext{2|3|4} commands use mke2fs which requires using the '-F' switch in order to force overwriting the current filesystem on the whole disk. Likewise, the mkfs.vfat command uses mkfs.fat which requires using the '-I' switch in order to force overwriting the current filesystem on the whole disk. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/storage/storage_backend_fs.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 6c8bae2..de0e8d5 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -712,9 +712,17 @@ virStorageBackendExecuteMKFS(const char *device, cmd = virCommandNewArgList(MKFS, "-t", format, NULL); - /* use the force, otherwise mkfs.xfs won't overwrite existing fs */ + /* use the force, otherwise mkfs.xfs won't overwrite existing fs. + * Similarly mkfs.ext2, mkfs.ext3, and mkfs.ext4 require supplying -F + * and mkfs.vfat uses -I */ if (STREQ(format, "xfs")) virCommandAddArg(cmd, "-f"); + else if (STREQ(format, "ext2") || + STREQ(format, "ext3") || + STREQ(format, "ext4")) + virCommandAddArg(cmd, "-F"); + else if (STREQ(format, "vfat")) + virCommandAddArg(cmd, "-I"); virCommandAddArg(cmd, device); -- 2.7.4

2 3

[libvirt] [PATCH 0/2] Detect misconfiguration between disk bus and disk address
by Marc Hartmayer 16 Nov '16

16 Nov '16

This patch series adds the functionality to detect a misconfiguration between disk bus type and disk address type for disks that are using the address type virDomainDeviceDriveAddress. It also adds a test for it. A check for other bus types may be needed. This may require a driver specific function, as it is already implemented in virDomainDeviceDefPostParse(), for example. Marc Hartmayer (2): conf: Detect misconfiguration between disk bus and disk address tests: Add tests for disk configuration validation src/conf/domain_conf.c | 46 ++++++++++++++++++++++ .../qemuxml2argv-disk-fdc-incompatible-address.xml | 22 +++++++++++ .../qemuxml2argv-disk-ide-incompatible-address.xml | 23 +++++++++++ ...qemuxml2argv-disk-sata-incompatible-address.xml | 23 +++++++++++ ...qemuxml2argv-disk-scsi-incompatible-address.xml | 24 +++++++++++ tests/qemuxml2argvtest.c | 8 ++++ 6 files changed, 146 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-fdc-incompatible-address.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-ide-incompatible-address.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-sata-incompatible-address.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-incompatible-address.xml -- 2.5.5

2 4

[libvirt] [PATCH] Avoid compiler warnings in virCPUDefStealModel
by Jiri Denemark 16 Nov '16

16 Nov '16

Old GCC on CentOS 6 thinks vendor and vendor_id might be used uninitialized in virCPUDefStealModel. The compiler is wrong, though. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Pushed as a build breaker. src/conf/cpu_conf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index 9eb69c9..1bcceed 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -144,8 +144,8 @@ virCPUDefStealModel(virCPUDefPtr dst, virCPUDefPtr src, bool keepVendor) { - char *vendor; - char *vendor_id; + char *vendor = NULL; + char *vendor_id = NULL; if (keepVendor) { VIR_STEAL_PTR(vendor, dst->vendor); -- 2.10.2

1 0

[libvirt] [PATCH v2 0/9] Add group_name support for <iotune>
by John Ferlan 15 Nov '16

15 Nov '16

v1: http://www.redhat.com/archives/libvir-list/2016-October/msg01336.html Changes from v1: Patches 3-5 are new to address review comments Other adjustments as listed in responses to v1: - Addressed leak in qemuDomainSetBlockIoTune from setting "group_name" defaults - Test adjustment for separate validate routine - Use of Escape function (patches 7 and 8) - Use of vshCommandOptStringReq in patch 9 John Ferlan (9): include: Add new "group_name" definition for iotune throttling caps: Add new capability for the iotune group name qemu: Adjust maxparams logic for qemuDomainGetBlockIoTune qemu: Alter qemuMonitorJSONSetBlockIoThrottle command logic qemu: Adjust various bool BlockIoTune set_ values into mask qemu: Add support for parsing iotune group setting conf: Add support for blkiotune group_name option qemu: Add the group name option to the iotune command line virsh: Add group name to blkdeviotune output docs/formatdomain.html.in | 11 ++ docs/schemas/domaincommon.rng | 5 + include/libvirt/libvirt-domain.h | 15 ++ src/conf/domain_conf.c | 10 ++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 13 ++ src/qemu/qemu_driver.c | 177 +++++++++++++-------- src/qemu/qemu_monitor.c | 2 + src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_monitor_json.c | 97 ++++++----- src/qemu/qemu_monitor_json.h | 1 + tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 + .../caps_2.6.0-gicv2.aarch64.xml | 1 + .../caps_2.6.0-gicv3.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 + tests/qemumonitorjsontest.c | 88 +++++++--- .../qemuxml2argv-blkdeviotune-group-num.args | 32 ++++ .../qemuxml2argv-blkdeviotune-group-num.xml | 61 +++++++ tests/qemuxml2argvtest.c | 4 + .../qemuxml2xmlout-blkdeviotune-group-num.xml | 1 + tests/qemuxml2xmltest.c | 1 + tools/virsh-domain.c | 17 ++ tools/virsh.pod | 5 +- 28 files changed, 428 insertions(+), 124 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-group-num.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-group-num.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune-group-num.xml -- 2.7.4

1 11

[libvirt] [PATCH v3 0/2] bhyve: add e1000 nic support
by Roman Bogorodskiy 15 Nov '16

15 Nov '16

Changes since v2: - Include missing Fabian's probes patch Changes since v1: - Fix indentation - Don't leak nic_model in bhyveBuildNetArgStr, and actually convert it to use 'goto out' to the clean up routine instead of explicit calls to VIR_FREE for every case - Add support for e1000 for argv2xml code, along with tests Fabian Freyer (1): bhyve: Separate out checks from virBhyveProbeCaps Roman Bogorodskiy (1): bhyve: add e1000 nic support src/bhyve/bhyve_capabilities.c | 58 ++++++++++++++--- src/bhyve/bhyve_capabilities.h | 1 + src/bhyve/bhyve_command.c | 74 ++++++++++++++-------- src/bhyve/bhyve_parse_command.c | 9 ++- tests/bhyveargv2xmldata/bhyveargv2xml-e1000.args | 8 +++ tests/bhyveargv2xmldata/bhyveargv2xml-e1000.xml | 28 ++++++++ .../bhyveargv2xmldata/bhyveargv2xml-virtio-net.xml | 2 + .../bhyveargv2xml-virtio-net4.xml | 1 + tests/bhyveargv2xmltest.c | 1 + .../bhyvexml2argvdata/bhyvexml2argv-net-e1000.args | 9 +++ .../bhyvexml2argv-net-e1000.ldargs | 3 + .../bhyvexml2argvdata/bhyvexml2argv-net-e1000.xml | 22 +++++++ tests/bhyvexml2argvtest.c | 7 +- 13 files changed, 184 insertions(+), 39 deletions(-) create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-e1000.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-e1000.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.xml -- 2.9.2

2 7

[libvirt] [PATCH] bhyve: fix memory leaks in bhyvexml2argvtest
by Roman Bogorodskiy 15 Nov '16

15 Nov '16

* virNetDevTapCreateInBridgePort() mock: free '*ifname' before strdupping a hardoded value to it * testCompareXMLToArgvFiles(): unref 'conn' object in cleanup * testCompareXMLToArgvHelper(): free 'ldargs' and 'dmargs' in cleanup --- tests/bhyvexml2argvmock.c | 2 ++ tests/bhyvexml2argvtest.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/tests/bhyvexml2argvmock.c b/tests/bhyvexml2argvmock.c index 41058ca..a851632 100644 --- a/tests/bhyvexml2argvmock.c +++ b/tests/bhyvexml2argvmock.c @@ -1,5 +1,6 @@ #include <config.h> +#include "viralloc.h" #include "virstring.h" #include "virnetdev.h" #include "virnetdevtap.h" @@ -29,6 +30,7 @@ int virNetDevTapCreateInBridgePort(const char *brname ATTRIBUTE_UNUSED, virNetDevVlanPtr virtVlan ATTRIBUTE_UNUSED, unsigned int fakeflags ATTRIBUTE_UNUSED) { + VIR_FREE(*ifname); if (VIR_STRDUP(*ifname, "vnet0") < 0) return -1; return 0; diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index b85439b..22a902c 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -86,6 +86,7 @@ static int testCompareXMLToArgvFiles(const char *xml, virCommandFree(cmd); virCommandFree(ldcmd); virDomainDefFree(vmdef); + virObjectUnref(conn); return ret; } @@ -117,6 +118,8 @@ testCompareXMLToArgvHelper(const void *data) cleanup: VIR_FREE(xml); VIR_FREE(args); + VIR_FREE(ldargs); + VIR_FREE(dmargs); return ret; } -- 2.9.2

2 2

[libvirt] [PATCH v3] qemu: fix libvirtd crash when querying halted cpus info
by Maxim Nestratov 15 Nov '16

15 Nov '16

It was introduced by commit 7a51d9ebb, which started to use monitor commands without job acquiring, which is unsafe and leads to simultaneous access to vm->mon structure by different threads. Crash backtrace is the following (shortened): Program received signal SIGSEGV, Segmentation fault. qemuMonitorSend (mon=mon@entry=0x7f4ef4000d20, msg=msg@entry=0x7f4f18e78640) at qemu/qemu_monitor.c:1011 1011 while (!mon->msg->finished) { 0 qemuMonitorSend () at qemu/qemu_monitor.c:1011 1 0x00007f691abdc720 in qemuMonitorJSONCommandWithFd () at qemu/qemu_monitor_json.c:298 2 0x00007f691abde64a in qemuMonitorJSONCommand at qemu/qemu_monitor_json.c:328 3 qemuMonitorJSONQueryCPUs at qemu/qemu_monitor_json.c:1408 4 0x00007f691abcaebd in qemuMonitorGetCPUInfo g@entry=false) at qemu/qemu_monitor.c:1931 5 0x00007f691ab96863 in qemuDomainRefreshVcpuHalted at qemu/qemu_domain.c:6309 6 0x00007f691ac0af99 in qemuDomainGetStatsVcpu at qemu/qemu_driver.c:18945 7 0x00007f691abef921 in qemuDomainGetStats at qemu/qemu_driver.c:19469 8 qemuConnectGetAllDomainStats at qemu/qemu_driver.c:19559 9 0x00007f693382e806 in virConnectGetAllDomainStats at libvirt-domain.c:11546 10 0x00007f6934470c40 in remoteDispatchConnectGetAllDomainStats at remote.c:6267 (gdb) p mon->msg $1 = (qemuMonitorMessagePtr) 0x0 This change fixes it by calling qemuDomainRefreshVcpuHalted only when job is acquired. Signed-off-by: Maxim Nestratov <mnestratov(a)virtuozzo.com> --- v1-v2: don't output halted cpu info if it wasn't rathered v2-v3: syntax-check recommendation src/qemu/qemu_driver.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a82e58b..05a88c2 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18978,7 +18978,7 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr driver, virDomainObjPtr dom, virDomainStatsRecordPtr record, int *maxparams, - unsigned int privflags ATTRIBUTE_UNUSED) + unsigned int privflags) { size_t i; int ret = -1; @@ -19005,10 +19005,16 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr driver, VIR_ALLOC_N(cpuwait, virDomainDefGetVcpus(dom->def)) < 0) goto cleanup; - if (qemuDomainRefreshVcpuHalted(driver, dom, - QEMU_ASYNC_JOB_NONE) == 0 && - VIR_ALLOC_N(cpuhalted, virDomainDefGetVcpus(dom->def)) < 0) - goto cleanup; + if (HAVE_JOB(privflags) && virDomainObjIsActive(dom)) { + if (qemuDomainRefreshVcpuHalted(driver, dom, + QEMU_ASYNC_JOB_NONE) < 0) { + /* it's ok to be silent and go ahead, because halted vcpu info + * wasn't here from the beginning */ + virResetLastError(); + } else if (VIR_ALLOC_N(cpuhalted, virDomainDefGetVcpus(dom->def)) < 0) { + goto cleanup; + } + } if (qemuDomainHelperGetVcpus(dom, cpuinfo, cpuwait, virDomainDefGetVcpus(dom->def), @@ -19462,7 +19468,7 @@ static struct qemuDomainGetStatsWorker qemuDomainGetStatsWorkers[] = { { qemuDomainGetStatsState, VIR_DOMAIN_STATS_STATE, false }, { qemuDomainGetStatsCpu, VIR_DOMAIN_STATS_CPU_TOTAL, false }, { qemuDomainGetStatsBalloon, VIR_DOMAIN_STATS_BALLOON, true }, - { qemuDomainGetStatsVcpu, VIR_DOMAIN_STATS_VCPU, false }, + { qemuDomainGetStatsVcpu, VIR_DOMAIN_STATS_VCPU, true }, { qemuDomainGetStatsInterface, VIR_DOMAIN_STATS_INTERFACE, false }, { qemuDomainGetStatsBlock, VIR_DOMAIN_STATS_BLOCK, true }, { qemuDomainGetStatsPerf, VIR_DOMAIN_STATS_PERF, false }, -- 2.4.11

2 2

[libvirt] [PATCH v2] qemu: fix libvirtd crash when querying halted cpus info
by Maxim Nestratov 15 Nov '16

15 Nov '16

It was introduced by commit 7a51d9ebb, which started to use monitor commands without job acquiring, which is unsafe and leads to simultaneous access to vm->mon structure by different threads. Crash backtrace is the following (shortened): Program received signal SIGSEGV, Segmentation fault. qemuMonitorSend (mon=mon@entry=0x7f4ef4000d20, msg=msg@entry=0x7f4f18e78640) at qemu/qemu_monitor.c:1011 1011 while (!mon->msg->finished) { 0 qemuMonitorSend () at qemu/qemu_monitor.c:1011 1 0x00007f691abdc720 in qemuMonitorJSONCommandWithFd () at qemu/qemu_monitor_json.c:298 2 0x00007f691abde64a in qemuMonitorJSONCommand at qemu/qemu_monitor_json.c:328 3 qemuMonitorJSONQueryCPUs at qemu/qemu_monitor_json.c:1408 4 0x00007f691abcaebd in qemuMonitorGetCPUInfo g@entry=false) at qemu/qemu_monitor.c:1931 5 0x00007f691ab96863 in qemuDomainRefreshVcpuHalted at qemu/qemu_domain.c:6309 6 0x00007f691ac0af99 in qemuDomainGetStatsVcpu at qemu/qemu_driver.c:18945 7 0x00007f691abef921 in qemuDomainGetStats at qemu/qemu_driver.c:19469 8 qemuConnectGetAllDomainStats at qemu/qemu_driver.c:19559 9 0x00007f693382e806 in virConnectGetAllDomainStats at libvirt-domain.c:11546 10 0x00007f6934470c40 in remoteDispatchConnectGetAllDomainStats at remote.c:6267 (gdb) p mon->msg $1 = (qemuMonitorMessagePtr) 0x0 This change fixes it by calling qemuDomainRefreshVcpuHalted only when job is acquired. Signed-off-by: Maxim Nestratov <mnestratov(a)virtuozzo.com> --- src/qemu/qemu_driver.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a82e58b..55b9566 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18978,7 +18978,7 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr driver, virDomainObjPtr dom, virDomainStatsRecordPtr record, int *maxparams, - unsigned int privflags ATTRIBUTE_UNUSED) + unsigned int privflags) { size_t i; int ret = -1; @@ -19005,10 +19005,15 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr driver, VIR_ALLOC_N(cpuwait, virDomainDefGetVcpus(dom->def)) < 0) goto cleanup; - if (qemuDomainRefreshVcpuHalted(driver, dom, - QEMU_ASYNC_JOB_NONE) == 0 && - VIR_ALLOC_N(cpuhalted, virDomainDefGetVcpus(dom->def)) < 0) - goto cleanup; + if (HAVE_JOB(privflags) && virDomainObjIsActive(dom)) { + if (qemuDomainRefreshVcpuHalted(driver, dom, + QEMU_ASYNC_JOB_NONE) < 0) { + /* it's ok to be silent and go ahead, because halted vcpu info + * wasn't here from the beginning */ + virResetLastError(); + } else if (VIR_ALLOC_N(cpuhalted, virDomainDefGetVcpus(dom->def)) < 0) + goto cleanup; + } if (qemuDomainHelperGetVcpus(dom, cpuinfo, cpuwait, virDomainDefGetVcpus(dom->def), @@ -19462,7 +19467,7 @@ static struct qemuDomainGetStatsWorker qemuDomainGetStatsWorkers[] = { { qemuDomainGetStatsState, VIR_DOMAIN_STATS_STATE, false }, { qemuDomainGetStatsCpu, VIR_DOMAIN_STATS_CPU_TOTAL, false }, { qemuDomainGetStatsBalloon, VIR_DOMAIN_STATS_BALLOON, true }, - { qemuDomainGetStatsVcpu, VIR_DOMAIN_STATS_VCPU, false }, + { qemuDomainGetStatsVcpu, VIR_DOMAIN_STATS_VCPU, true }, { qemuDomainGetStatsInterface, VIR_DOMAIN_STATS_INTERFACE, false }, { qemuDomainGetStatsBlock, VIR_DOMAIN_STATS_BLOCK, true }, { qemuDomainGetStatsPerf, VIR_DOMAIN_STATS_PERF, false }, -- 2.4.11

1 1

[libvirt] [PATCH] qemu: fix libvirtd crash when querying halted cpus info
by Maxim Nestratov 15 Nov '16

15 Nov '16

It was introduced by commit 7a51d9ebb, which started to use monitor commands without job acquiring, which is unsafe and leads to simultaneous access to vm->mon structure by different threads. Crash backtrace is the following (shortened): Program received signal SIGSEGV, Segmentation fault. qemuMonitorSend (mon=mon@entry=0x7f4ef4000d20, msg=msg@entry=0x7f4f18e78640) at qemu/qemu_monitor.c:1011 1011 while (!mon->msg->finished) { 0 qemuMonitorSend () at qemu/qemu_monitor.c:1011 1 0x00007f691abdc720 in qemuMonitorJSONCommandWithFd () at qemu/qemu_monitor_json.c:298 2 0x00007f691abde64a in qemuMonitorJSONCommand at qemu/qemu_monitor_json.c:328 3 qemuMonitorJSONQueryCPUs at qemu/qemu_monitor_json.c:1408 4 0x00007f691abcaebd in qemuMonitorGetCPUInfo g@entry=false) at qemu/qemu_monitor.c:1931 5 0x00007f691ab96863 in qemuDomainRefreshVcpuHalted at qemu/qemu_domain.c:6309 6 0x00007f691ac0af99 in qemuDomainGetStatsVcpu at qemu/qemu_driver.c:18945 7 0x00007f691abef921 in qemuDomainGetStats at qemu/qemu_driver.c:19469 8 qemuConnectGetAllDomainStats at qemu/qemu_driver.c:19559 9 0x00007f693382e806 in virConnectGetAllDomainStats at libvirt-domain.c:11546 10 0x00007f6934470c40 in remoteDispatchConnectGetAllDomainStats at remote.c:6267 (gdb) p mon->msg $1 = (qemuMonitorMessagePtr) 0x0 This change fixes it by calling qemuDomainRefreshVcpuHalted only when job is acquired. Signed-off-by: Maxim Nestratov <mnestratov(a)virtuozzo.com> --- src/qemu/qemu_driver.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index dd1907b..43a546d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18915,7 +18915,7 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr driver, virDomainObjPtr dom, virDomainStatsRecordPtr record, int *maxparams, - unsigned int privflags ATTRIBUTE_UNUSED) + unsigned int privflags) { size_t i; int ret = -1; @@ -18939,14 +18939,20 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr driver, return -1; if (VIR_ALLOC_N(cpuinfo, virDomainDefGetVcpus(dom->def)) < 0 || - VIR_ALLOC_N(cpuwait, virDomainDefGetVcpus(dom->def)) < 0) - goto cleanup; - - if (qemuDomainRefreshVcpuHalted(driver, dom, - QEMU_ASYNC_JOB_NONE) == 0 && + VIR_ALLOC_N(cpuwait, virDomainDefGetVcpus(dom->def)) < 0 || VIR_ALLOC_N(cpuhalted, virDomainDefGetVcpus(dom->def)) < 0) goto cleanup; + if (HAVE_JOB(privflags) && virDomainObjIsActive(dom)) { + + if (qemuDomainRefreshVcpuHalted(driver, dom, + QEMU_ASYNC_JOB_NONE) < 0) { + /* it's ok to be silent and go ahead, because halted vcpu info + * wasn't here from the beginning */ + virResetLastError(); + } + } + if (qemuDomainHelperGetVcpus(dom, cpuinfo, cpuwait, virDomainDefGetVcpus(dom->def), NULL, 0, cpuhalted) < 0) { @@ -19399,7 +19405,7 @@ static struct qemuDomainGetStatsWorker qemuDomainGetStatsWorkers[] = { { qemuDomainGetStatsState, VIR_DOMAIN_STATS_STATE, false }, { qemuDomainGetStatsCpu, VIR_DOMAIN_STATS_CPU_TOTAL, false }, { qemuDomainGetStatsBalloon, VIR_DOMAIN_STATS_BALLOON, true }, - { qemuDomainGetStatsVcpu, VIR_DOMAIN_STATS_VCPU, false }, + { qemuDomainGetStatsVcpu, VIR_DOMAIN_STATS_VCPU, true }, { qemuDomainGetStatsInterface, VIR_DOMAIN_STATS_INTERFACE, false }, { qemuDomainGetStatsBlock, VIR_DOMAIN_STATS_BLOCK, true }, { qemuDomainGetStatsPerf, VIR_DOMAIN_STATS_PERF, false }, -- 2.4.11

3 7

[libvirt] [RFC] why netcf/libvirt lists/dumpxml only unslaved/unsubordinated interfaces?
by Nikolay Shirokovskiy 15 Nov '16

15 Nov '16

It could be useful to dumpxml of slaves/subordinates too to introspect host interfaces tree in dephts. Now it is not possible: 'Interface eth0 does not exist or is not a toplevel interface'. Has it some deeper meaning or netcf can be enhanced? (and *libvirt* as well). Nikolay

2 3

[libvirt] [PATCH] build: update to latest gnulib
by Eric Blake 14 Nov '16

14 Nov '16

In particular, this is a quick gnulib fix for a mingw compile error. * .gnulib: Update to latest. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- I'll be pushing this soon, as a fix for a build-breaker. * .gnulib 5ddd9d7...0602cfd (5): > strerror_r-posix: Another fix, for HAVE_DECL_STRERROR_R on mingw > strptime: fix compile error in recent change > gnulib-tool: Support for the dual "LGPLv3+ or GPLv2" license. > strftime: tune %q > Merge strftime.c changes from glibc .gnulib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gnulib b/.gnulib index 5ddd9d7..0602cfd 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 5ddd9d713d58d6c6d10494a28ceee6988d20ff98 +Subproject commit 0602cfd486655d5b5f0ebdf92f19280f6b6e984c -- 2.7.4

1 0

[libvirt] [PATCH v2 0/3] libvirtd: fix crashes on termination
by Nikolay Shirokovskiy 14 Nov '16

14 Nov '16

diff from v1 ============ 1. drop patches 1-2 of v1. As to "event loop" patch seems nobody has "production" problems due to leaks on termination. Turning freeing callback objects registered in event loop on after it is finished has an impact that is hard to predict. Different parts of libvirt use event loop and the patch can trigger paths that were not passed before. Let's wait for real issue) "Breaking cyclic dependency" patch will not reach its target without "event loop patch" anyway - daemon object will still leak in certain situation so let's drop it too. 2. add code commenting patch It documents another reason why we should not free callback object synchronously in remove handle/timeout function besides Dan's objection: https://www.redhat.com/archives/libvir-list/2016-September/msg01005.html Reproducing: ============ Crash situation of patches 1-2 can easily be simulated, just patch libvirt: diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 30a2830..f6b71d6 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4515,6 +4515,8 @@ processMonitorEOFEvent(virQEMUDriverPtr driver, unsigned int stopFlags = 0; virObjectEventPtr event = NULL; + sleep(3); + if (qemuProcessBeginStopJob(driver, vm, QEMU_JOB_DESTROY, true) < 0) return; then when it is up and running and there is also a qemu domain running: kill -9 $QEMU_DOMAIN && pkill libvirtd By the way there should be no admin connection at the moment or crash will not happen due to leaks. Nikolay Shirokovskiy (3): daemon: keep daemon until all hypervisors drivers are cleaned up qemu: first wait all workers finish on state cleanup util: event loop: document another reason to defer deletion daemon/libvirtd.c | 4 +++- src/qemu/qemu_driver.c | 2 +- src/util/vireventpoll.c | 7 +++++++ 3 files changed, 11 insertions(+), 2 deletions(-) -- 1.8.3.1

2 12

[libvirt] [PATCH] build: update to latest gnulib
by Eric Blake 14 Nov '16

14 Nov '16

In particular, pull in gnulib's fix for the broken SIZE_MAX on s390. * .gnulib: Update to latest. * bootstrap: Resync to upstream. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- A buildbot on an s390 platform was complaining: CC util/libvirt_setuid_rpc_client_la-virconf.lo util/virconf.c: In function 'virConfGetValueSizeT': util/virconf.c:1220:9: error: format '%zu' expects argument of type 'size_t', but argument 9 has type 'unsigned int' [-Werror=format=] virReportError(VIR_ERR_INTERNAL_ERROR, ^ This gnulib update should fix it; since we're between releases, I'm pushing this under the gnulib maintenance rule. * .gnulib e89b4a7...5ddd9d7 (73): > strerror_r-posix: Fix override of AC_FUNC_STRERROR_R > Fix gnulib C++ namespace support and std::frexp > GNULIB_NAMESPACE::func need not pull in rpl_func > manywarnings: fix -Wno-missing-field-initializers detection > non-recursive-gnulib-prefix-hack: revert use of parameterized 'lib' dir > strftime,strptime: support %q to represent the quarter > autoupdate > bootstrap: Fix get_version() for AIX 5.3 > intprops: port to older XL C > autoupdate > backupfile: initialize default suffix within the implementation > futimens: remove FIXME for old Linux kernels > utimensat: remove FIXME for old Linux kernels > maint: update how to make web pages > qsort_r: Fix macrology for platforms that lack the function. > sys_types: fix Texinfo typos > getprogname: port to HP-UX > Update doc about target platforms. > opendir, readdir, closedir: Relicense under LGPLv2+. > Fix conflict between strerror_r-posix module and AC_FUNC_STRERROR_R. > Make the 'argp' module work without the 'error' module. > diffseq: restore TOO_EXPENSIVE heuristic > non-recursive-gnulib-prefix-hack: Don't make assumptions about gnulib-tool's --source-base option value. > iconv: Avoid compilation error when bootstrapping GNU libiconv. > Avoid gnulib-tool warnings about the dependencies of 'parse-datetime'. > system-quote tests: Avoid compiler warning on AIX. > Fix some "gcc -Wall" warnings. > gnulib-tool: Make --create-testdir on all modules work again. > libunistring: change the maintainer to 'all' > Simplify "configure: checking ..." messages. > Simplify "configure: checking ..." messages. > quotearg-tests: pacify gcc -Wall > canonicalize-lgpl: fix for missing SIZE_MAX on older systems > printf.m4: fix a bug in detecting printf %j support > sched: substitute HAVE_SYS_CDEFS_H too > quotearg: never write beyond the returned length > getprogname tests: Avoid failure in packages that use libtool. > getprogname: Fix test failure on Cygwin. Comments. > Make sure the libunistring detection rejects older versions with a known bug. > sh-quote, system-quote: revert regression of unit test. > quotearg: fix stale tests > non-recursive-gnulib-prefix-hack: fix inconsequential typo > Fix a test crash. > test-limits-h: suppress -Woverlength-strings > gettime, timespec, utimens: Relicense under LGPL. > canonicalize-lgpl: Support the case path_max > INT_MAX. > getprogname: IBM z/OS: avoid NULL-dereference > test-stdint: use _GL_VERIFY rather than "verify" for some tests > Add missing ChangeLog entry > stdint: port SIZE_MAX to glibc s390 > getprogname: port to IBM z/OS > maint: remove stray space after "." in AC_DEFINE comment. > long-options: avoid new GCC 7 warning from -Wimplicit-fallthrough > utimecmp: avoid new GCC 7 warning from -Wbool-operation > dfa: save memory for states > wchar, wctype-h: fix for MinGW 3.22.2 > long-options: avoid new GCC 7 warning from -Wimplicit-fallthrough > utimecmp: avoid new GCC 7 warning from -Wbool-operation > autoupdate > quotearg: minimize shell quoting using double quotes > vasnprintf.c: avoid spurious warning from GCC 7 > getprogname: correct the test for a __progname variable > u8-uctomb-aux.c: build: placate GCC 7's new -Wimplicit-fallthrough > dfa: build: avoid warning from GCC 7's new -Wimplicit-fallthrough > getprogname: avoid __progname vs program_invocation_short_name pitfall > getprogname: port to OpenBSD 5.1 > sched: port to GCC 6.2.1 on macOS Sierra > tests/init.sh: port Alpine fix to AIX 7.1 > nl_langinfo: pacify GCC > stdint: also set GL_GENERATE_LIMITS_H > limits-h, stdint: Don't assume extensions, fix typo > getprogname: port to AIX > update from texinfo .gnulib | 2 +- bootstrap | 38 ++++++++++++++++++++------------------ 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/.gnulib b/.gnulib index e89b4a7..5ddd9d7 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit e89b4a7aefce9cb02963920712ba7cdd13641644 +Subproject commit 5ddd9d713d58d6c6d10494a28ceee6988d20ff98 diff --git a/bootstrap b/bootstrap index f060bab..5d3c289 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2016-01-24.06; # UTC +scriptversion=2016-11-03.18; # UTC # Bootstrap this package from checked-out sources. @@ -418,28 +418,30 @@ sort_ver() { # sort -V is not generally available done } +get_version_sed=' +# Move version to start of line. +s/.*[v ]$[0-9]$/\1/ + +# Skip lines that do not start with version. +/^[0-9]/!d + +# Remove characters after the version. +s/[^.a-z0-9-].*// + +# The first component must be digits only. +s/^$[0-9]*$[a-z-].*/\1/ + +#the following essentially does s/5.005/5.5/ +s/\.0*$[1-9]$/.\1/g +p +q' + get_version() { app=$1 $app --version >/dev/null 2>&1 || { $app --version; return 1; } - $app --version 2>&1 | - sed -n '# Move version to start of line. - s/.*[v ]$[0-9]$/\1/ - - # Skip lines that do not start with version. - /^[0-9]/!d - - # Remove characters after the version. - s/[^.a-z0-9-].*// - - # The first component must be digits only. - s/^$[0-9]*$[a-z-].*/\1/ - - #the following essentially does s/5.005/5.5/ - s/\.0*$[1-9]$/.\1/g - p - q' + $app --version 2>&1 | sed -n "$get_version_sed" } check_versions() { -- 2.7.4

3 3

[libvirt] [PATCH v6 00/17] Use more PCIe less legacy PCI
by Laine Stump 14 Nov '16

14 Nov '16

This is a rebase of v5 (, with the addition of patches 16 & 17, which detect the type of VFIO assigned devices and assign them to either an Express or a legacy PCI slot as appropriate, Laine Stump (17): qemu: new functions qemuDomainMachineHasPCI[e]Root() qemu: new functions to calculate/set device pciConnectFlags qemu: set/use info->pciConnectFlags when validating/assigning PCI addresses qemu: set/use proper pciConnectFlags during hotplug qemu: set pciConnectFlags to 0 instead of PCI|HOTPLUGGABLE if device isn't PCI qemu: assign virtio devices to PCIe slot when appropriate qemu: assign e1000e network devices to PCIe slots when appropriate qemu: assign nec-xhci (USB3) controller to a PCIe address when appropriate qemu: only force an available legacy-PCI slot on domains with pci-root qemu: auto-add pcie-root-port/dmi-to-pci-bridge controllers as needed [RFC] qemu: if pci-bridge is in PCIe config w/o dmi-to-pci-bridge, add it qemu: don't force-add a dmi-to-pci-bridge just on principle qemu: add a USB3 controller to Q35 domains by default qemu: try to put ich9 sound device at 00:1B.0 qemu: initially reserve one open pcie-root-port for hotplug qemu: propagate virQEMUDriver object to qemuDomainDeviceCalculatePCIConnectFlags qemu: assign vfio devices to PCIe addresses when appropriate src/conf/device_conf.h | 5 + src/conf/domain_addr.c | 112 ++- src/conf/domain_addr.h | 3 +- src/qemu/qemu_domain.c | 54 +- src/qemu/qemu_domain.h | 2 + src/qemu/qemu_domain_address.c | 880 +++++++++++++++++---- src/qemu/qemu_domain_address.h | 9 +- src/qemu/qemu_hotplug.c | 28 +- src/qemu/qemu_process.c | 13 +- tests/qemuhotplugtest.c | 4 +- tests/qemuxml2argvdata/qemuxml2argv-autoindex.args | 10 +- .../qemuxml2argv-bios-nvram-secure.args | 1 + .../qemuxml2argv-machine-smm-opt.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args | 3 +- .../qemuxml2argv-q35-default-devices-only.args | 23 + .../qemuxml2argv-q35-default-devices-only.xml | 18 + .../qemuxml2argv-q35-pcie-autoadd.args | 57 ++ .../qemuxml2argv-q35-pcie-autoadd.xml | 51 ++ tests/qemuxml2argvdata/qemuxml2argv-q35-pcie.args | 58 ++ tests/qemuxml2argvdata/qemuxml2argv-q35-pcie.xml | 67 ++ .../qemuxml2argv-q35-pm-disable-fallback.args | 1 + .../qemuxml2argv-q35-pm-disable.args | 1 + .../qemuxml2argv-q35-virt-manager-basic.args | 56 ++ .../qemuxml2argv-q35-virt-manager-basic.xml | 76 ++ .../qemuxml2argv-q35-virtio-pci.args | 58 ++ .../qemuxml2argv-q35-virtio-pci.xml | 1 + tests/qemuxml2argvtest.c | 164 +++- .../qemuxml2xmlout-autoindex.xml | 10 +- .../qemuxml2xmlout-pcie-root.xml | 4 - .../qemuxml2xmlout-q35-default-devices-only.xml | 45 ++ .../qemuxml2xmlout-q35-pcie-autoadd.xml | 148 ++++ .../qemuxml2xmloutdata/qemuxml2xmlout-q35-pcie.xml | 152 ++++ .../qemuxml2xmlout-q35-virt-manager-basic.xml | 121 +++ .../qemuxml2xmlout-q35-virtio-pci.xml | 152 ++++ tests/qemuxml2xmltest.c | 136 +++- 35 files changed, 2285 insertions(+), 239 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-default-devices-only.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-default-devices-only.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-pcie-autoadd.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-pcie-autoadd.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-pcie.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-pcie.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-virt-manager-basic.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-virt-manager-basic.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-virtio-pci.args create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-q35-virtio-pci.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-default-devices-only.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-pcie-autoadd.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-pcie.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-virt-manager-basic.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-virtio-pci.xml -- 2.7.4

3 46

[libvirt] [PATCH] conf: Use UNIT_MAX for checking max value of unsigned int
by Nitesh Konkar 14 Nov '16

14 Nov '16

In the current scenario the controller parsing fails when no index is specified .As the docs point out that specifying index is optional, libvirt is expected to fill the index without erroring out. Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- Before the Patch: cat controller.xml <controller model="virtio-scsi" type="scsi" /> virsh attach-device vm1 controller.xml --persistent error: Failed to attach device from controller.xml error: internal error: Cannot parse controller index -1 After the patch: virsh attach-device vm1 controller.xml --persistent Device attached successfully --- src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6e008e2..c52e67f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8374,7 +8374,7 @@ virDomainControllerDefParseXML(xmlNodePtr node, if (idx) { unsigned int idxVal; if (virStrToLong_ui(idx, NULL, 10, &idxVal) < 0 || - idxVal > INT_MAX) { + idxVal > UINT_MAX) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Cannot parse controller index %s"), idx); goto error; -- 2.1.0

3 3

[libvirt] [PATCH 0/2] Replace some leftover vshPrint calls with vshPrintExtra
by Erik Skultety 14 Nov '16

14 Nov '16

Erik Skultety (2): tools: use vshError rather than vshPrint on failure tools: Replace vshPrint with vshPrintExtra on places we forgot about tools/virsh-domain.c | 73 +++++++++++++++++++++++++------------------------ tools/virsh-edit.c | 4 +-- tools/virsh-interface.c | 28 +++++++++---------- tools/virsh-network.c | 37 +++++++++++++------------ tools/virsh-nwfilter.c | 6 ++-- tools/virsh-pool.c | 21 +++++++------- tools/virsh-snapshot.c | 20 +++++++------- tools/virsh-volume.c | 14 +++++----- tools/virt-admin.c | 4 +-- tools/vsh.c | 4 +-- 10 files changed, 107 insertions(+), 104 deletions(-) -- 2.5.5

2 6

[libvirt] [PATCH 0/2] qemu: Enable NUMA node tag in pci-root for PPC64
by Shivaprasad G Bhat 14 Nov '16

14 Nov '16

This patch addresses the same aspects on PPC the bug 1103314 addressed on x86. It sets the target numa node in the pci-root instead of using the pci-expander-bus. The pci-expander-bus is of not much use on PPC, and the approach is to set the value globally for reasons mentioned in Patch 2 commit message. Known issue : If the destination doesn't recognize the NUMA node in the target, then thats dropped during parsing. There is no ABI failure and the migration will be successful. The issue needs us to relook on how to make sure the unparsed tags on the destination which dont fail the ABI could be enforced during migration. Not addressing that in these two patches. --- Shivaprasad G Bhat (2): qemu: capabilitity: Introduce QEMU_CAPS_SPAPR_PCI_HOST_BRIDGE_NUMA_NODE qemu: Enable NUMA node tag in pci-root for PPC docs/formatdomain.html.in | 5 ++ src/qemu/qemu_capabilities.c | 7 ++ src/qemu/qemu_capabilities.h | 1 src/qemu/qemu_command.c | 25 ++++++++ src/qemu/qemu_domain.c | 15 +++-- .../qemucapabilitiesdata/caps_1.2.2.x86_64.replies | 22 +++++-- .../qemucapabilitiesdata/caps_1.3.1.x86_64.replies | 22 +++++-- .../qemucapabilitiesdata/caps_1.4.2.x86_64.replies | 22 +++++-- .../qemucapabilitiesdata/caps_1.5.3.x86_64.replies | 22 +++++-- .../qemucapabilitiesdata/caps_1.6.0.x86_64.replies | 22 +++++-- .../qemucapabilitiesdata/caps_1.7.0.x86_64.replies | 22 +++++-- .../qemucapabilitiesdata/caps_2.1.1.x86_64.replies | 22 +++++-- .../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 22 +++++-- .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 22 +++++-- .../caps_2.6.0-gicv2.aarch64.replies | 22 +++++-- .../caps_2.6.0-gicv3.aarch64.replies | 24 +++++--- .../caps_2.6.0.ppc64le.replies | 60 ++++++++++++++++++-- .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 22 +++++-- .../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 22 +++++-- ...emuxml2argv-spapr-pci-hos-bridge-numa-node.args | 26 +++++++++ ...qemuxml2argv-spapr-pci-hos-bridge-numa-node.xml | 43 ++++++++++++++ tests/qemuxml2argvtest.c | 2 + 22 files changed, 366 insertions(+), 106 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-spapr-pci-hos-bridge-numa-node.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-spapr-pci-hos-bridge-numa-node.xml -- Signature

2 5

[libvirt] [PATCH v2] BlockCopy support rbd external destination file
by Liu Qing 14 Nov '16

14 Nov '16

Currently qemuDomainBlockCopy only support local file. This patch make the rbd external destination file could be passed to qemu driver_mirror. If the flag VIR_DOMAIN_BLOCK_COPY_REUSE_EXT is not set for rbd protocol, qemuDomainBlockCopy will report an error. Signed-off-by: Liu Qing <liuqing(a)chinac.com> --- src/qemu/qemu_driver.c | 119 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 82 insertions(+), 37 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a82e58b..c0b7fda 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16609,6 +16609,12 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, virQEMUDriverConfigPtr cfg = NULL; const char *format = NULL; int desttype = virStorageSourceGetActualType(mirror); + char *mirr_path = NULL; + qemuDomainSecretInfoPtr tmp_secinfo = NULL; + qemuDomainSecretInfoPtr mirr_secinfo = NULL; + qemuDomainSecretInfoPtr tmp_encinfo = NULL; + virStorageSourcePtr tmp_src = NULL; + qemuDomainDiskPrivatePtr diskPriv = NULL; /* Preliminaries: find the disk we are editing, sanity checks */ virCheckFlags(VIR_DOMAIN_BLOCK_COPY_SHALLOW | @@ -16629,6 +16635,8 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, if (!(disk = qemuDomainDiskByName(vm->def, path))) goto endjob; + diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk); + if (!(device = qemuAliasFromDisk(disk))) goto endjob; @@ -16675,51 +16683,67 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, } /* Prepare the destination file. */ - /* XXX Allow non-file mirror destinations */ - if (!virStorageSourceIsLocalStorage(mirror)) { + if (!virStorageSourceIsLocalStorage(mirror) && + (mirror->type != VIR_STORAGE_TYPE_NETWORK || + mirror->protocol != VIR_STORAGE_NET_PROTOCOL_RBD)) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", _("non-file destination not supported yet")); goto endjob; } - if (stat(mirror->path, &st) < 0) { - if (errno != ENOENT) { - virReportSystemError(errno, _("unable to stat for disk %s: %s"), - disk->dst, mirror->path); - goto endjob; - } else if (flags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT || - desttype == VIR_STORAGE_TYPE_BLOCK) { - virReportSystemError(errno, - _("missing destination file for disk %s: %s"), - disk->dst, mirror->path); - goto endjob; - } - } else if (!S_ISBLK(st.st_mode)) { - if (st.st_size && !(flags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("external destination file for disk %s already " - "exists and is not a block device: %s"), - disk->dst, mirror->path); - goto endjob; - } - if (desttype == VIR_STORAGE_TYPE_BLOCK) { - virReportError(VIR_ERR_INVALID_ARG, - _("blockdev flag requested for disk %s, but file " - "'%s' is not a block device"), - disk->dst, mirror->path); - goto endjob; + if (virStorageSourceIsLocalStorage(mirror)) { + if (stat(mirror->path, &st) < 0) { + if (errno != ENOENT) { + virReportSystemError(errno, _("unable to stat for disk %s: %s"), + disk->dst, mirror->path); + goto endjob; + } else if (flags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT || + desttype == VIR_STORAGE_TYPE_BLOCK) { + virReportSystemError(errno, + _("missing destination file for disk %s: %s"), + disk->dst, mirror->path); + goto endjob; + } + } else if (!S_ISBLK(st.st_mode)) { + if (st.st_size && !(flags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("external destination file for disk %s already " + "exists and is not a block device: %s"), + disk->dst, mirror->path); + goto endjob; + } + if (desttype == VIR_STORAGE_TYPE_BLOCK) { + virReportError(VIR_ERR_INVALID_ARG, + _("blockdev flag requested for disk %s, but file " + "'%s' is not a block device"), + disk->dst, mirror->path); + goto endjob; + } } + } else if (!(flags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT)) { + virReportError(VIR_ERR_INVALID_ARG, + "%s", + _("only external destination file is supported for " + "rbd protocol")); + goto endjob; } if (!mirror->format) { - if (!(flags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT)) { - mirror->format = disk->src->format; - } else { - /* If the user passed the REUSE_EXT flag, then either they - * can also pass the RAW flag or use XML to tell us the format. - * So if we get here, we assume it is safe for us to probe the - * format from the file that we will be using. */ - mirror->format = virStorageFileProbeFormat(mirror->path, cfg->user, + if (virStorageSourceIsLocalStorage(mirror)) { + if (!(flags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT)) { + mirror->format = disk->src->format; + } else { + /* If the user passed the REUSE_EXT flag, then either they + * can also pass the RAW flag or use XML to tell us the format. + * So if we get here, we assume it is safe for us to probe the + * format from the file that we will be using. */ + mirror->format = virStorageFileProbeFormat(mirror->path, cfg->user, cfg->group); + } + } else { + virReportError(VIR_ERR_INVALID_ARG, + _("format is required for %s"), + mirror->path); + goto endjob; } } @@ -16745,9 +16769,29 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, goto endjob; } + tmp_secinfo = diskPriv->secinfo; + tmp_encinfo = diskPriv->encinfo; + tmp_src = disk->src; + disk->src = mirror; + + if (qemuDomainSecretDiskPrepare(conn, priv, disk) < 0) { + disk->src = tmp_src; + diskPriv->secinfo = tmp_secinfo; + diskPriv->encinfo = tmp_encinfo; + goto endjob; + } + + disk->src = tmp_src; + mirr_secinfo = diskPriv->secinfo; + diskPriv->secinfo = tmp_secinfo; + diskPriv->encinfo = tmp_encinfo; + + if (qemuGetDriveSourceString(mirror, mirr_secinfo, &mirr_path) < 0) + goto endjob; + /* Actually start the mirroring */ qemuDomainObjEnterMonitor(driver, vm); - ret = qemuMonitorDriveMirror(priv->mon, device, mirror->path, format, + ret = qemuMonitorDriveMirror(priv->mon, device, mirr_path, format, bandwidth, granularity, buf_size, flags); virDomainAuditDisk(vm, NULL, mirror, "mirror", ret >= 0); if (qemuDomainObjExitMonitor(driver, vm) < 0) @@ -16775,6 +16819,7 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, qemuDomainObjEndJob(driver, vm); cleanup: + VIR_FREE(mirr_path); VIR_FREE(device); virObjectUnref(cfg); return ret; -- 1.8.3.1

1 0

[libvirt] [PATCH 00/24] docs: Kill useless spaces in <pre/>
by Michal Privoznik 14 Nov '16

14 Nov '16

Whilst reviewing patches that reworked our web page I've noticed couple of overflows in some example XMLs. For instance: http://libvirt.org/formatnetwork.html#elementsAddress The problem is we have very long lines sometimes. And to make it worse we have a lot of spaces at the beginning of some <pre/> sections. Remove them. Michal Privoznik (24): aclpolkit.html.in: Kill useless spaces in <pre/> cgroups.html.in: Kill useless spaces in <pre/> compiling.html.in: Kill useless spaces in <pre/> devguide.html.in: Kill useless spaces in <pre/> downloads.html.in: Kill useless spaces in <pre/> drvbhyve.html.in: Kill useless spaces in <pre/> drvesx.html.in: Kill useless spaces in <pre/> drvlxc.html.in: Kill useless spaces in <pre/> format.html.in: Kill useless spaces in <pre/> formatcaps.html.in: Kill useless spaces in <pre/> formatdomain.html.in: Kill useless spaces in <pre/> formatnetwork.html.in: Kill useless spaces in <pre/> formatnwfilter.html.in: Kill useless spaces in <pre/> formatsecret.html.in: Kill useless spaces in <pre/> formatstorage.html.in: Kill useless spaces in <pre/> formatstorageencryption.html.in: Kill useless spaces in <pre/> command.html.in: Kill useless spaces in <pre/> locking.html.in: Kill useless spaces in <pre/> rpc.html.in: Kill useless spaces in <pre/> locking-lockd.html.in: Kill useless spaces in <pre/> locking-sanlock.html.in: Kill useless spaces in <pre/> logging.html.in: Kill useless spaces in <pre/> migration.html.in: Kill useless spaces in <pre/> storage.html.in: Kill useless spaces in <pre/> docs/aclpolkit.html.in | 6 +- docs/cgroups.html.in | 10 +- docs/compiling.html.in | 34 +- docs/devguide.html.in | 12 +- docs/downloads.html.in | 6 +- docs/drvbhyve.html.in | 34 +- docs/drvesx.html.in | 44 +- docs/drvlxc.html.in | 12 +- docs/format.html.in | 2 +- docs/formatcaps.html.in | 2 +- docs/formatdomain.html.in | 2338 +++++++++++++++++----------------- docs/formatnetwork.html.in | 320 ++--- docs/formatnwfilter.html.in | 210 +-- docs/formatsecret.html.in | 200 +-- docs/formatstorage.html.in | 280 ++-- docs/formatstorageencryption.html.in | 38 +- docs/internals/command.html.in | 172 +-- docs/internals/locking.html.in | 132 +- docs/internals/rpc.html.in | 220 ++-- docs/locking-lockd.html.in | 32 +- docs/locking-sanlock.html.in | 40 +- docs/logging.html.in | 38 +- docs/migration.html.in | 48 +- docs/storage.html.in | 296 ++--- 24 files changed, 2263 insertions(+), 2263 deletions(-) -- 2.8.4

2 25

[libvirt] [PATCH] BlockCopy support rbd external destination file
by Liu Qing 14 Nov '16

14 Nov '16

Currently qemuDomainBlockCopy only support local file. This patch make the rbd external destination file could be passed to qemu driver_mirror. If the external rbd file is not exist, qemuDomainBlockCopy will report an error. Signed-off-by: Liu Qing <liuqing(a)chinac.com> --- src/qemu/qemu_driver.c | 82 +++++++++++++++++++++++++++++++------------------- 1 file changed, 51 insertions(+), 31 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 38c8414..ee8db69 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16609,6 +16609,7 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, virQEMUDriverConfigPtr cfg = NULL; const char *format = NULL; int desttype = virStorageSourceGetActualType(mirror); + char *mirr_path = NULL; /* Preliminaries: find the disk we are editing, sanity checks */ virCheckFlags(VIR_DOMAIN_BLOCK_COPY_SHALLOW | @@ -16675,42 +16676,50 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, } /* Prepare the destination file. */ - /* XXX Allow non-file mirror destinations */ - if (!virStorageSourceIsLocalStorage(mirror)) { + if (!virStorageSourceIsLocalStorage(mirror) && + (mirror->type != VIR_STORAGE_TYPE_NETWORK || + mirror->protocol != VIR_STORAGE_NET_PROTOCOL_RBD)) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", _("non-file destination not supported yet")); goto endjob; } - if (stat(mirror->path, &st) < 0) { - if (errno != ENOENT) { - virReportSystemError(errno, _("unable to stat for disk %s: %s"), - disk->dst, mirror->path); - goto endjob; - } else if (flags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT || - desttype == VIR_STORAGE_TYPE_BLOCK) { - virReportSystemError(errno, - _("missing destination file for disk %s: %s"), - disk->dst, mirror->path); - goto endjob; - } - } else if (!S_ISBLK(st.st_mode)) { - if (st.st_size && !(flags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("external destination file for disk %s already " - "exists and is not a block device: %s"), - disk->dst, mirror->path); - goto endjob; - } - if (desttype == VIR_STORAGE_TYPE_BLOCK) { - virReportError(VIR_ERR_INVALID_ARG, - _("blockdev flag requested for disk %s, but file " - "'%s' is not a block device"), - disk->dst, mirror->path); - goto endjob; + if (virStorageSourceIsLocalStorage(mirror)) { + if (stat(mirror->path, &st) < 0) { + if (errno != ENOENT) { + virReportSystemError(errno, _("unable to stat for disk %s: %s"), + disk->dst, mirror->path); + goto endjob; + } else if (flags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT || + desttype == VIR_STORAGE_TYPE_BLOCK) { + virReportSystemError(errno, + _("missing destination file for disk %s: %s"), + disk->dst, mirror->path); + goto endjob; + } + } else if (!S_ISBLK(st.st_mode)) { + if (st.st_size && !(flags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("external destination file for disk %s already " + "exists and is not a block device: %s"), + disk->dst, mirror->path); + goto endjob; + } + if (desttype == VIR_STORAGE_TYPE_BLOCK) { + virReportError(VIR_ERR_INVALID_ARG, + _("blockdev flag requested for disk %s, but file " + "'%s' is not a block device"), + disk->dst, mirror->path); + goto endjob; + } } + } else if (!(flags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT)) { + virReportError(VIR_ERR_INVALID_ARG, + _("only external destination file is supported for " + "rbd protocol")); + goto endjob; } - if (!mirror->format) { + if (!mirror->format && virStorageSourceIsLocalStorage(mirror)) { if (!(flags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT)) { mirror->format = disk->src->format; } else { @@ -16721,8 +16730,12 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, mirror->format = virStorageFileProbeFormat(mirror->path, cfg->user, cfg->group); } + } else { + virReportError(VIR_ERR_INVALID_ARG, + _("format is required for %s"), + mirror->path); + goto endjob; } - /* pre-create the image file */ if (!(flags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT)) { int fd = qemuOpenFile(driver, vm, mirror->path, @@ -16744,10 +16757,16 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, qemuDomainDiskChainElementRevoke(driver, vm, mirror); goto endjob; } + if (mirror->protocol == VIR_STORAGE_NET_PROTOCOL_RBD) { + if (qemuGetDriveSourceString(mirror, conn, &mirr_path) < 0) + goto endjob; + } + else if (VIR_STRDUP(mirr_path, mirror->path) < 0) + goto endjob; /* Actually start the mirroring */ qemuDomainObjEnterMonitor(driver, vm); - ret = qemuMonitorDriveMirror(priv->mon, device, mirror->path, format, + ret = qemuMonitorDriveMirror(priv->mon, device, mirr_path, format, bandwidth, granularity, buf_size, flags); virDomainAuditDisk(vm, NULL, mirror, "mirror", ret >= 0); if (qemuDomainObjExitMonitor(driver, vm) < 0) @@ -16775,6 +16794,7 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, qemuDomainObjEndJob(driver, vm); cleanup: + VIR_FREE(mirr_path); VIR_FREE(device); virObjectUnref(cfg); return ret; -- 1.9.1

3 2

[libvirt] Segfault in qemuDomainDefVcpusPostParse:2480
by Nehal J Wani 14 Nov '16

14 Nov '16

The man page of qemu(2.6.2), states the following: -smp [cpus=]n[,cores=cores][,threads=threads][,sockets=sockets][,maxcpus=maxcpus] Simulate an SMP system with n CPUs. On the PC target, up to 255 CPUs are supported. On Sparc32 target, Linux limits the number of usable CPUs to 4. For the PC target, the number of cores per socket, the number of threads per cores and the total number of sockets can be specified. Missing values will be computed. *If any on the three values is given, the total number of CPUs n can be omitted*. maxcpus specifies the maximum number of hotpluggable CPUs. So, I built the master branch of libvirt and tested the following: Client: $ ./run ./tools/virsh domxml-from-native qemu-argv <(echo '/usr/bin/qemu-system-x86_64 -enable-kvm -smp cores=2,threads=1,sockets=1') error: Disconnected from qemu:///session due to I/O error error: Cannot recv data: Connection reset by peer Server: $ ./run gdb ./daemon/libvirtd GNU gdb (GDB) Fedora 7.11.1-86.fc24 ... Starting program: /home/wani/libvirt/daemon/.libs/lt-libvirtd [Thread debugging using libthread_db enabled] ... [Thread 0x7fffc462c700 (LWP 16850) exited] ... Thread 4 "lt-libvirtd" received signal SIGSEGV, Segmentation fault. [Switching to Thread 0x7fffe4cf1700 (LWP 16836)] qemuDomainDefVcpusPostParse (def=0x7fffb8000ec0) at qemu/qemu_domain.c:2480 2480 if (!vcpu->online) { qemuDomainDefVcpusPostParse() calls vcpu = virDomainDefGetVcpu(def, 0), which returns NULL. I'd be happy to send a patch, but I am not sure what the right solution is. - Should not specifying n to -smp allowed? - Should -cpus=n also be parsed in qemuParseCommandLineSmp()? Cheers! Nehal J Wani

3 2

[libvirt] [PATCH 0/4] admin: Fix a leaking conn reference and other improvements
by Erik Skultety 14 Nov '16

14 Nov '16

This series fixes a memory leak in a dangling conn object reference caused by assigning NULL to conn->closeCallback object by the RPC catch-disconnect routine followed by a comparison of equality of conn->closeCallback->callback and the client-registered callback reference. Before fixing the issue itself, there are some new helpers introduced following the same idea as the helpers introduced by series https://www.redhat.com/archives/libvir-list/2016-February/msg00849.html Erik Skultety (4): vsh: Drop conditional error reporting in vshErrorHandler admin: Remove unnecessary @conn object locking datatypes: Introduce some admin-related close callback handling helpers admin: Use the newly introduced close callback handling helpers po/POTFILES.in | 1 + src/admin/admin_remote.c | 6 +--- src/datatypes.c | 67 +++++++++++++++++++++++++++++++++++++++--- src/datatypes.h | 8 +++++ src/libvirt-admin.c | 24 +-------------- src/libvirt_admin_private.syms | 3 ++ tools/vsh.c | 2 -- 7 files changed, 77 insertions(+), 34 deletions(-) -- 2.5.5

2 7

[libvirt] [PATCH] storage_backend_rbd: check the return value of rados_conf_set
by Chen Hanxiao 12 Nov '16

12 Nov '16

From: Chen Hanxiao <chenhanxiao(a)gmail.com> We forget to check the return value of rados_conf_set. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- src/storage/storage_backend_rbd.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 718c4d6..58bcb9a 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -162,10 +162,20 @@ virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr ptr, rados_conf_set(ptr->cluster, "client_mount_timeout", client_mount_timeout); VIR_DEBUG("Setting RADOS option rados_mon_op_timeout to %s", mon_op_timeout); - rados_conf_set(ptr->cluster, "rados_mon_op_timeout", mon_op_timeout); + if (rados_conf_set(ptr->cluster, "rados_mon_op_timeout", mon_op_timeout) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("failed to set RADOS option: %s"), + "rados_mon_op_timeout"); + goto cleanup; + } VIR_DEBUG("Setting RADOS option rados_osd_op_timeout to %s", osd_op_timeout); - rados_conf_set(ptr->cluster, "rados_osd_op_timeout", osd_op_timeout); + if (rados_conf_set(ptr->cluster, "rados_osd_op_timeout", osd_op_timeout) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("failed to set RADOS option: %s"), + "rados_osd_op_timeout"); + goto cleanup; + } /* * Librbd supports creating RBD format 2 images. We no longer have to invoke @@ -173,7 +183,12 @@ virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr ptr, * This leaves us to simply use rbd_create() and use the default behavior of librbd */ VIR_DEBUG("Setting RADOS option rbd_default_format to %s", rbd_default_format); - rados_conf_set(ptr->cluster, "rbd_default_format", rbd_default_format); + if (rados_conf_set(ptr->cluster, "rbd_default_format", rbd_default_format) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("failed to set RADOS option: %s"), + "rbd_default_format"); + goto cleanup; + } ptr->starttime = time(0); if ((r = rados_connect(ptr->cluster)) < 0) { -- 1.8.3.1

2 4