- Devel - libvirt List Archives

[libvirt] IPv6 in Libvirt LXC
by Thomas Maddox 10 Jun '14

10 Jun '14

Hey all, According to a discussion last week in the Nova-Libvirt subgroup meeting, it was advised, by danpb, that I bring this issue up on the Libvirt mailing list for discussion and resolution. So, here goes - I'm currently using config drive from Nova to generate network configurations for LXC guests that are spun up via Libvirt. Unfortunately, when doing some IPv6 testing, I ran into a snag (with a couple work arounds detailed below). Due to the read-only mount of /proc/sys (http://libvirt.org/drvlxc.html#fsmounts) I am unable to get expected behavior from IPv6 static network configurations. I did some poking around and found this bug from a couple years ago that pretty well outlines the problem: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/964882. I wasn't sure how we might go about correcting this, but it seems like something we'll need to address in Libvirt. Maybe with the user namespaces working, we can begin to provide some read/write mounts instead of read-only with clear documentation on the security implications? =] When using static IPv6 addressing it was attempting the following command: 'sysctl -q -e -w net.ipv6.conf.eth0.autoconf=0'. I tested to see whether the host and the guest share this value. I was able to change it in the host without it being reflected in the guest. The work arounds I've tried that seemed to allow IPv6 to get configured properly: 1. Use the post-up hook on an IPv4 static configuration to configure IPv6 via ifconfig/routes (example: http://paste.openstack.org/show/82446/) 2. Patch Libvirt to include a /proc/sys/net mount as read/write. Cheers! -Thomas

3 2

[libvirt] [PATCH RFC] network: Bring netdevs online later
by Matthew Rosato 10 Jun '14

10 Jun '14

Defer MAC registration until net devices are actually going to be used by the guest. This patch does so by setting the devices online just before starting guest CPUs. This approach is an alternative to my previously proposed 'network: Defer online of macvtap during qemu migration' Laine/Wangrui, is this the sort of thing you had in mind? Previous thread: https://www.redhat.com/archives/libvir-list/2014-May/msg00427.html Associated BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1081461 Signed-off-by: Matthew Rosato <mjrosato(a)linux.vnet.ibm.com> --- src/qemu/qemu_command.c | 45 +++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_command.h | 3 +++ src/qemu/qemu_process.c | 3 +++ src/util/virnetdevmacvlan.c | 5 ----- src/util/virnetdevtap.c | 3 --- 5 files changed, 51 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index e6acced..c161d73 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -571,6 +571,51 @@ qemuNetworkPrepareDevices(virDomainDefPtr def) return ret; } +void +qemuNetworkIfaceUp(virDomainNetDefPtr net) +{ + if (virNetDevSetOnline(net->ifname, true) < 0) { + ignore_value(virNetDevTapDelete(net->ifname)); + } + return; +} + +void +qemuPhysIfaceUp(virDomainNetDefPtr net) +{ + if (virNetDevSetOnline(net->ifname, true) < 0) { + ignore_value(virNetDevVPortProfileDisassociate(net->ifname, + virDomainNetGetActualVirtPortProfile(net), + &net->mac, + virDomainNetGetActualDirectDev(net), + -1, + VIR_NETDEV_VPORT_PROFILE_OP_MIGRATE_IN_FINISH)); + ignore_value(virNetDevMacVLanDelete(net->ifname)); + } + return; +} + +void +qemuNetworkInitializeDevices(virDomainDefPtr def) +{ + size_t i; + + for (i = 0; i < def->nnets; i++) { + virDomainNetDefPtr net = def->nets[i]; + switch(virDomainNetGetActualType(net)) { + case VIR_DOMAIN_NET_TYPE_BRIDGE: + case VIR_DOMAIN_NET_TYPE_NETWORK: + qemuNetworkIfaceUp(net); + break; + case VIR_DOMAIN_NET_TYPE_DIRECT: + qemuPhysIfaceUp(net); + break; + } + } + + return; +} + static int qemuDomainDeviceAliasIndex(const virDomainDeviceInfo *info, const char *prefix) { diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index afbd6ff..4a44464 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -206,6 +206,9 @@ int qemuOpenVhostNet(virDomainDefPtr def, int *vhostfdSize); int qemuNetworkPrepareDevices(virDomainDefPtr def); +void qemuNetworkIfaceUp(virDomainNetDefPtr net); +void qemuPhysIfaceUp(virDomainNetDefPtr net); +void qemuNetworkInitializeDevices(virDomainDefPtr def); /* * NB: def->name can be NULL upon return and the caller diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index d719716..bbc11f3 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2765,6 +2765,9 @@ qemuProcessStartCPUs(virQEMUDriverPtr driver, virDomainObjPtr vm, qemuDomainObjPrivatePtr priv = vm->privateData; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); + /* Bring up netdevs before starting CPUs */ + qemuNetworkInitializeDevices(vm->def); + VIR_DEBUG("Using lock state '%s'", NULLSTR(priv->lockState)); if (virDomainLockProcessResume(driver->lockManager, cfg->uri, vm, priv->lockState) < 0) { diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index cb85b74..3748527 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -898,11 +898,6 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *tgifname, goto link_del_exit; } - if (virNetDevSetOnline(cr_ifname, true) < 0) { - rc = -1; - goto disassociate_exit; - } - if (withTap) { if ((rc = virNetDevMacVLanTapOpen(cr_ifname, 10)) < 0) goto disassociate_exit; diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index 0b444fa..09b9c12 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -574,9 +574,6 @@ int virNetDevTapCreateInBridgePort(const char *brname, goto error; } - if (virNetDevSetOnline(*ifname, !!(flags & VIR_NETDEV_TAP_CREATE_IFUP)) < 0) - goto error; - return 0; error: -- 1.7.9.5

2 2

[libvirt] [PATCH] Report an clear error when try to build lvm2 type pool
by Shanzhi Yu 10 Jun '14

10 Jun '14

STORAGE_POOL_DISK_LVM2 can't be created by "parted mklabel", so report an error when build such type pool Signed-off-by: Shanzhi Yu <shyu(a)redhat.com> --- src/storage/storage_backend_disk.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index 8e12974..5b5a1fa 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -414,13 +414,21 @@ virStorageBackendDiskBuildPool(virConnectPtr conn ATTRIBUTE_UNUSED, goto error; } - if (flags & VIR_STORAGE_POOL_BUILD_OVERWRITE) + if (flags & VIR_STORAGE_POOL_BUILD_OVERWRITE && + pool->def->source.format != VIR_STORAGE_POOL_DISK_LVM2) ok_to_mklabel = true; else { int check; check = virStorageBackendDiskFindLabel( pool->def->source.devices[0].path); + + if (pool->def->source.format == VIR_STORAGE_POOL_DISK_LVM2){ + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("Invalid disk label: lvm2")); + goto error; + } + if (check > 0) { ok_to_mklabel = true; } else if (check < 0) { -- 1.9.3

1 0

[libvirt] [PATCH] qemu: Properly label FDs while saving domain for successful restores in case of static labelling.
by Shivaprasad G Bhat 10 Jun '14

10 Jun '14

Static labelling has the relabel set to no by default and restore of a saved image file fails when the selinux context is static. This is because the saved file doesnt have the context set during the saving. The libvirt has to set the conext of save image file to that of the guest during save. The fix applies to both managedsave and save codepath. The managedsave works as is without the fix as well since the files are saved in the directory having viable default context. Signed-off-by: Shivaprasad G Bhat <shivaprasadbhat(a)gmail.com> --- src/qemu/qemu_driver.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3a7622a..e4390ee 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2966,6 +2966,9 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver, if (fd < 0) goto cleanup; + if (asyncJob == QEMU_ASYNC_JOB_SAVE) + virSecurityManagerSetImageFDLabel(driver->securityManager, vm->def, fd); + if (!(wrapperFd = virFileWrapperFdNew(&fd, path, wrapperFlags))) goto cleanup;

1 0

[libvirt] [PATCH] SELinux: don't silently fail when no label is present
by Ján Tomko 10 Jun '14

10 Jun '14

This fixes startup of a domain with: <seclabel type='none' model='dac'/> on a host with selinux and dac drivers and security_default_confined = 0 https://bugzilla.redhat.com/show_bug.cgi?id=1105939 --- src/security/security_selinux.c | 98 ++++++++++++----------------------------- 1 file changed, 29 insertions(+), 69 deletions(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 8380bba..008c58c 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -585,7 +585,7 @@ virSecuritySELinuxGenSecurityLabel(virSecurityManagerPtr mgr, seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); if (seclabel == NULL) - return rc; + return 0; data = virSecurityManagerGetPrivateData(mgr); @@ -739,11 +739,7 @@ virSecuritySELinuxReserveSecurityLabel(virSecurityManagerPtr mgr, virSecurityLabelDefPtr seclabel; seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); - if (seclabel == NULL) { - return -1; - } - - if (seclabel->type == VIR_DOMAIN_SECLABEL_STATIC) + if (!seclabel || seclabel->type == VIR_DOMAIN_SECLABEL_STATIC) return 0; if (getpidcon_raw(pid, &pctx) == -1) { @@ -1060,7 +1056,7 @@ virSecuritySELinuxSetSecurityTPMFileLabel(virSecurityManagerPtr mgr, seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); if (seclabel == NULL) - return -1; + return 0; switch (tpm->type) { case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH: @@ -1102,7 +1098,7 @@ virSecuritySELinuxRestoreSecurityTPMFileLabelInt(virSecurityManagerPtr mgr, seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); if (seclabel == NULL) - return -1; + return 0; switch (tpm->type) { case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH: @@ -1136,7 +1132,7 @@ virSecuritySELinuxRestoreSecurityImageLabelInt(virSecurityManagerPtr mgr, seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); if (seclabel == NULL) - return -1; + return 0; disk_seclabel = virDomainDiskDefGetSecurityLabelDef(disk, SECURITY_SELINUX_NAME); @@ -1256,10 +1252,7 @@ virSecuritySELinuxSetSecurityImageLabel(virSecurityManagerPtr mgr, cbdata.manager = mgr; cbdata.secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); - if (cbdata.secdef == NULL) - return -1; - - if (cbdata.secdef->norelabel) + if (!cbdata.secdef || cbdata.secdef->norelabel) return 0; if (virDomainDiskGetType(disk) == VIR_STORAGE_TYPE_NETWORK) @@ -1279,7 +1272,7 @@ virSecuritySELinuxSetSecurityHostdevLabelHelper(const char *file, void *opaque) secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); if (secdef == NULL) - return -1; + return 0; return virSecuritySELinuxSetFilecon(file, secdef->imagelabel); } @@ -1397,7 +1390,7 @@ virSecuritySELinuxSetSecurityHostdevCapsLabel(virDomainDefPtr def, secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); if (secdef == NULL) - return -1; + return 0; switch (dev->source.caps.type) { case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_STORAGE: { @@ -1447,10 +1440,7 @@ virSecuritySELinuxSetSecurityHostdevLabel(virSecurityManagerPtr mgr ATTRIBUTE_UN virSecurityLabelDefPtr secdef; secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); - if (secdef == NULL) - return -1; - - if (secdef->norelabel) + if (!secdef || secdef->norelabel) return 0; switch (dev->mode) { @@ -1635,10 +1625,7 @@ virSecuritySELinuxRestoreSecurityHostdevLabel(virSecurityManagerPtr mgr, virSecurityLabelDefPtr secdef; secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); - if (secdef == NULL) - return -1; - - if (secdef->norelabel) + if (!secdef || secdef->norelabel) return 0; switch (dev->mode) { @@ -1667,14 +1654,14 @@ virSecuritySELinuxSetSecurityChardevLabel(virDomainDefPtr def, int ret = -1; seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); - if (seclabel == NULL) - return -1; + if (!seclabel || seclabel->norelabel) + return 0; if (dev) chr_seclabel = virDomainChrDefGetSecurityLabelDef(dev, SECURITY_SELINUX_NAME); - if (seclabel->norelabel || (chr_seclabel && chr_seclabel->norelabel)) + if (chr_seclabel && chr_seclabel->norelabel) return 0; if (chr_seclabel) @@ -1738,13 +1725,13 @@ virSecuritySELinuxRestoreSecurityChardevLabel(virSecurityManagerPtr mgr, int ret = -1; seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); - if (seclabel == NULL) - return -1; + if (!seclabel || seclabel->norelabel) + return 0; if (dev) chr_seclabel = virDomainChrDefGetSecurityLabelDef(dev, SECURITY_SELINUX_NAME); - if (seclabel->norelabel || (chr_seclabel && chr_seclabel->norelabel)) + if (chr_seclabel && chr_seclabel->norelabel) return 0; switch (dev_source->type) { @@ -1864,7 +1851,7 @@ virSecuritySELinuxRestoreSecurityAllLabel(virSecurityManagerPtr mgr, secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); if (secdef == NULL) - return -1; + return 0; if (secdef->norelabel || data->skipAllLabel) return 0; @@ -1925,7 +1912,7 @@ virSecuritySELinuxReleaseSecurityLabel(virSecurityManagerPtr mgr, secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); if (secdef == NULL) - return -1; + return 0; if (secdef->type == VIR_DOMAIN_SECLABEL_DYNAMIC) { if (secdef->label != NULL) { @@ -1953,10 +1940,7 @@ virSecuritySELinuxSetSavedStateLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, virSecurityLabelDefPtr secdef; secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); - if (secdef == NULL) - return -1; - - if (secdef->norelabel) + if (!secdef || secdef->norelabel) return 0; return virSecuritySELinuxSetFilecon(savefile, secdef->imagelabel); @@ -1971,10 +1955,7 @@ virSecuritySELinuxRestoreSavedStateLabel(virSecurityManagerPtr mgr, virSecurityLabelDefPtr secdef; secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); - if (secdef == NULL) - return -1; - - if (secdef->norelabel) + if (!secdef || secdef->norelabel) return 0; return virSecuritySELinuxRestoreSecurityFileLabel(mgr, savefile); @@ -1989,7 +1970,7 @@ virSecuritySELinuxSecurityVerify(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); if (secdef == NULL) - return -1; + return 0; if (!STREQ(SECURITY_SELINUX_NAME, secdef->model)) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -2018,10 +1999,7 @@ virSecuritySELinuxSetSecurityProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UN virSecurityLabelDefPtr secdef; secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); - if (secdef == NULL) - return -1; - - if (secdef->label == NULL) + if (!secdef || !secdef->label) return 0; VIR_DEBUG("label=%s", secdef->label); @@ -2055,10 +2033,7 @@ virSecuritySELinuxSetSecurityChildProcessLabel(virSecurityManagerPtr mgr ATTRIBU virSecurityLabelDefPtr secdef; secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); - if (secdef == NULL) - return -1; - - if (secdef->label == NULL) + if (!secdef || !secdef->label) return 0; VIR_DEBUG("label=%s", secdef->label); @@ -2088,10 +2063,7 @@ virSecuritySELinuxSetSecurityDaemonSocketLabel(virSecurityManagerPtr mgr ATTRIBU int rc = -1; secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); - if (secdef == NULL) - return -1; - - if (secdef->label == NULL) + if (!secdef || !secdef->label) return 0; if (!STREQ(SECURITY_SELINUX_NAME, secdef->model)) { @@ -2138,10 +2110,7 @@ virSecuritySELinuxSetSecuritySocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNU int rc = -1; secdef = virDomainDefGetSecurityLabelDef(vm, SECURITY_SELINUX_NAME); - if (secdef == NULL) - return -1; - - if (secdef->label == NULL) + if (!secdef || !secdef->label) return 0; if (!STREQ(SECURITY_SELINUX_NAME, secdef->model)) { @@ -2179,10 +2148,7 @@ virSecuritySELinuxClearSecuritySocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_U virSecurityLabelDefPtr secdef; secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); - if (secdef == NULL) - return -1; - - if (secdef->label == NULL) + if (!secdef || !secdef->label) return 0; if (!STREQ(SECURITY_SELINUX_NAME, secdef->model)) { @@ -2264,7 +2230,7 @@ virSecuritySELinuxSetSecurityAllLabel(virSecurityManagerPtr mgr, secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); if (secdef == NULL) - return -1; + return 0; if (secdef->norelabel || data->skipAllLabel) return 0; @@ -2337,10 +2303,7 @@ virSecuritySELinuxSetImageFDLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, virSecurityLabelDefPtr secdef; secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); - if (secdef == NULL) - return -1; - - if (secdef->imagelabel == NULL) + if (!secdef || !secdef->imagelabel) return 0; return virSecuritySELinuxFSetFilecon(fd, secdef->imagelabel); @@ -2358,10 +2321,7 @@ virSecuritySELinuxSetTapFDLabel(virSecurityManagerPtr mgr, int rc = -1; secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); - if (secdef == NULL) - return rc; - - if (secdef->label == NULL) + if (!secdef || !secdef->label) return 0; if (fstat(fd, &buf) < 0) { -- 1.8.3.2

2 2

[libvirt] [RFC][PATCH]QEMU: Parse -device vfio-pci commandline
by Olivia Yin 09 Jun '14

09 Jun '14

Signed-off-by: Olivia Yin <Hong-Hua.Yin(a)freescale.com> --- src/qemu/qemu_command.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++ tests/qemuargv2xmltest.c | 2 +- 2 files changed, 68 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index e6acced..4db4a1d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10239,6 +10239,59 @@ qemuParseCommandLinePCI(const char *val) return NULL; } +/* + * Tries to parse a QEMU vfio-pci device + */ +static virDomainHostdevDefPtr +qemuParseCommandLineVFIOPCI(const char *val) +{ + int bus = 0, slot = 0, func = 0; + const char *start; + char *end; + virDomainHostdevDefPtr def = virDomainHostdevDefAlloc(); + + if (!def) + goto error; + + if (!STRPREFIX(val, "host=")) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unknown PCI device syntax '%s'"), val); + goto error; + } + + start = val + strlen("host="); + if (virStrToLong_i(start, &end, 16, &bus) < 0 || *end != ':') { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot extract PCI device bus '%s'"), val); + goto error; + } + start = end + 1; + if (virStrToLong_i(start, &end, 16, &slot) < 0 || *end != '.') { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot extract PCI device slot '%s'"), val); + goto error; + } + start = end + 1; + if (virStrToLong_i(start, &end, 16, &func) < 0 || *end != ',') { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot extract PCI device function '%s'"), val); + goto error; + } + + def->mode = VIR_DOMAIN_HOSTDEV_MODE_SUBSYS; + def->managed = true; + def->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI; + def->source.subsys.u.pci.backend = VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO; + def->source.subsys.u.pci.addr.bus = bus; + def->source.subsys.u.pci.addr.slot = slot; + def->source.subsys.u.pci.addr.function = func; + return def; + + error: + virDomainHostdevDefFree(def); + return NULL; +} + /* * Tries to parse a QEMU USB device @@ -11351,6 +11404,20 @@ qemuParseCommandLine(virCapsPtr qemuCaps, virDomainHostdevDefFree(hostdev); goto error; } + } else if (STREQ(arg, "-device")) { + WANT_VALUE(); + if (STRPREFIX(val, "vfio-pci,")) { + const char *start; + start = val; + virDomainHostdevDefPtr hostdev; + start += strlen("vfio-pci,"); + if (!(hostdev = qemuParseCommandLineVFIOPCI(start))) + goto error; + if (VIR_APPEND_ELEMENT(def->hostdevs, def->nhostdevs, hostdev) < 0) { + virDomainHostdevDefFree(hostdev); + goto error; + } + } } else if (STREQ(arg, "-soundhw")) { const char *start; WANT_VALUE(); diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index 0fc9fcb..b4ba97a 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -251,8 +251,8 @@ mymain(void) DO_TEST("watchdog"); DO_TEST("hostdev-usb-address"); - DO_TEST("hostdev-pci-address"); + DO_TEST("hostdev-vfio"); DO_TEST("smp"); -- 1.8.5

4 14

[libvirt] [PATCHv2] QEMU: Modify qemuParseCommandLinePCI() to parsee '-device vfio-pci'
by Olivia Yin 09 Jun '14

09 Jun '14

Signed-off-by: Olivia Yin <Hong-Hua.Yin(a)freescale.com> Modify qemuParseCommandLinePCI() to support parsing '-device vfio-pci,host=bus:slot.func'. Add test case 'hostdev-vfio' into qemuargv2xmltest to validate this function. The case related to QEMU_CAPS_HOST_PCI_MULTIDOMAIN which uses '-device vfio-pci,host=domain:bus:slot.func' is not supported yet. --- src/qemu/qemu_command.c | 36 ++++++++++++++++++++++++++++++------ tests/qemuargv2xmltest.c | 2 +- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 3cf279e..ae7f94e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10193,7 +10193,7 @@ qemuParseCommandLineNet(virDomainXMLOptionPtr xmlopt, * Tries to parse a QEMU PCI device */ static virDomainHostdevDefPtr -qemuParseCommandLinePCI(const char *val) +qemuParseCommandLinePCI(const char *val, bool vfio) { int bus = 0, slot = 0, func = 0; const char *start; @@ -10222,10 +10222,20 @@ qemuParseCommandLinePCI(const char *val) goto error; } start = end + 1; - if (virStrToLong_i(start, NULL, 16, &func) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot extract PCI device function '%s'"), val); - goto error; + + if (!vfio) { + if (virStrToLong_i(start, NULL, 16, &func) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot extract PCI device function '%s'"), val); + goto error; + } + } else { + if (virStrToLong_i(start, &end, 16, &func) < 0 || *end != ',') { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot extract PCI device function '%s'"), val); + goto error; + } else + def->source.subsys.u.pci.backend = VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO; } def->mode = VIR_DOMAIN_HOSTDEV_MODE_SUBSYS; @@ -11347,12 +11357,26 @@ qemuParseCommandLine(virCapsPtr qemuCaps, } else if (STREQ(arg, "-pcidevice")) { virDomainHostdevDefPtr hostdev; WANT_VALUE(); - if (!(hostdev = qemuParseCommandLinePCI(val))) + if (!(hostdev = qemuParseCommandLinePCI(val,0))) goto error; if (VIR_APPEND_ELEMENT(def->hostdevs, def->nhostdevs, hostdev) < 0) { virDomainHostdevDefFree(hostdev); goto error; } + } else if (STREQ(arg, "-device")) { + WANT_VALUE(); + if (STRPREFIX(val, "vfio-pci,")) { + const char *start; + start = val; + virDomainHostdevDefPtr hostdev; + start += strlen("vfio-pci,"); + if (!(hostdev = qemuParseCommandLinePCI(start,1))) + goto error; + if (VIR_APPEND_ELEMENT(def->hostdevs, def->nhostdevs, hostdev) < 0) { + virDomainHostdevDefFree(hostdev); + goto error; + } + } } else if (STREQ(arg, "-soundhw")) { const char *start; WANT_VALUE(); diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index 0fc9fcb..b4ba97a 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -251,8 +251,8 @@ mymain(void) DO_TEST("watchdog"); DO_TEST("hostdev-usb-address"); - DO_TEST("hostdev-pci-address"); + DO_TEST("hostdev-vfio"); DO_TEST("smp"); -- 1.8.5

2 1

[libvirt] [PATCH] parallels: Avoid possible leak of "cpu" from parallelsBuildCapabilities
by Peter Krempa 09 Jun '14

09 Jun '14

4d06af97d38c3648937eb8f732704379b3cd9e59 introduced a possible memory leak of the memory allocated into the "cpu" pointer in parallelsBuildCapabilities in the case "nodeGetInfo()" would fail right after the allocation. Rearrange the code to avoid the possibility of the leak. Found by Coverity. --- src/parallels/parallels_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c index 153961b..411527c 100644 --- a/src/parallels/parallels_driver.c +++ b/src/parallels/parallels_driver.c @@ -151,10 +151,10 @@ parallelsBuildCapabilities(void) "parallels", NULL, NULL, 0, NULL) == NULL) goto error; - if (VIR_ALLOC(cpu) < 0) + if (nodeGetInfo(&nodeinfo)) goto error; - if (nodeGetInfo(&nodeinfo)) + if (VIR_ALLOC(cpu) < 0) goto error; cpu->arch = caps->host.arch; -- 1.9.3

2 2

Re: [libvirt] [Qemu-devel] Question about how to distinguish a usb device in usb pass-through feature
by Gonglei (Arei) 09 Jun '14

09 Jun '14

Hi, Qemu has supported 3rd method for USB passthrough except two ways that you have pointed: hostbus+hostport -- match for a specific physical port in the host, any device which is plugged in there gets passed to the guest. The method can resolve your all problems. AFAICT, libvirt do not support this way at present. Any Plan? CC'ing libvirt developer mailist. Best regards, -Gonglei From: qemu-devel-bounces+arei.gonglei=huawei.com(a)nongnu.org [mailto:qemu-devel-bounces+arei.gonglei=huawei.com@nongnu.org] On Behalf Of Yuanjing (D) Sent: Monday, June 09, 2014 11:37 AM To: qemu-devel(a)nongnu.org Cc: Liuji (Jeremy) Subject: [Qemu-devel] Question about how to distinguish a usb device in usb pass-through feature Hi, I want to provide feature that pass-through host's usb device to guest os in Openstack. I have question about how to distinguish a usb device. I have read some introductions and made some tests. I think qemu supports two ways to identify a host usb device: (1)host:bus.addr (2)host:vendor_id:product_id I think they both have restriction on some use cases: (1) 'host:bus.addr' is not appropriate if more than one usb devices with the same 'host:bus.addr' in a host. (2) The addr(device number) may change every time unplug/plug usb device of a host. One this happen the guest may reboot failed with wrong host:bus.addr. I noticed that Vmware supports technology 'autoconnection', they pass-through usb device by using usb path of the device on the host(physical topology and port location). Once unplug usb device and plug usb device again with the same usb path, the new device appears and is connected to the guest. I am not a qemu/system programmer and I apologize if I am missing something very obvious. Hope somebody can help me to find the best way to distinguish a usb device? Thanks in advance

1 0

[libvirt] [PATCH] m4: bhyve: Fix check for the required bhyve programs
by Peter Krempa 09 Jun '14

09 Jun '14

bhyveload and bhyvectl wouldn't be checked otherwise as the configure script wouldn't execute one of the tests: checking for bhyve... /usr/local/sbin/bhyve checking for bhyvectl... /usr/local/sbin/bhyvectl checking for bhyveload... /usr/local/sbin/bhyveload ./configure: line 62602: test: too many arguments Fix the shell statement testing the 3 binaries. --- m4/virt-driver-bhyve.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/virt-driver-bhyve.m4 b/m4/virt-driver-bhyve.m4 index 9c0030b..c65b15d 100644 --- a/m4/virt-driver-bhyve.m4 +++ b/m4/virt-driver-bhyve.m4 @@ -28,7 +28,7 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_BHYVE],[ AC_PATH_PROG([BHYVECTL], [bhyvectl], [], [$PATH:/usr/sbin]) AC_PATH_PROG([BHYVELOAD], [bhyveload], [], [$PATH:/usr/sbin/]) - if test -z "$BHYVE" || test -z "$BHYVECTL" \ + if test -z "$BHYVE" || test -z "$BHYVECTL" || \ test -z "$BHYVELOAD" || test "$with_freebsd" = "no"; then if test "$with_bhyve" = "check"; then with_bhyve="no" -- 1.9.3

2 2

[libvirt] [PATCH] vmx: Relax virtualHW.version check
by Matthias Bolte 07 Jun '14

07 Jun '14

The original implementation of the VMX config parser assumed that the virtualHW.version would have more influence on the content of the VMX file than it actually seems to have. It started with accepting only version 4. Additonal versions were added later without any additional changes in the parser itself. This suggests that the influence of the virtualHW.version on the content and format of the VMX file is small or non-existent. The parser worked without any changes across several virtualHW and vSphere versions. So instead of adding new virtualHW.version values to the parser as they come along, or adding an extra flag to allow unknown virtualHW.version values just relax the check to require version 4 or later. --- This patch is meant as a alternative for this patch series: https://www.redhat.com/archives/libvir-list/2014-May/msg00122.html src/vmx/vmx.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 169440c..ce228d4 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -1316,12 +1316,10 @@ virVMXParseConfig(virVMXContext *ctx, goto cleanup; } - if (virtualHW_version != 4 && virtualHW_version != 7 && - virtualHW_version != 8 && virtualHW_version != 9 && - virtualHW_version != 10) { + if (virtualHW_version < 4) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Expecting VMX entry 'virtualHW.version' to be " - "4, 7, 8, 9 or 10 but found %lld"), + "4 or higher but found %lld"), virtualHW_version); goto cleanup; } -- 1.8.1.2

2 2

[libvirt] QMP fallback race in libvirt
by Ron 07 Jun '14

07 Jun '14

Hi, Eric asked me to move this here from #virt so it doesn't get forgotten. I hit a weird bug in a new install of libvirt on Debian Jessie this week where a vm could not be configured to use any CPU type except passthrough. After much digging and headscratching, the immediate cause for that turns out to be one of the (three) files in the qemu/capabilities cache being generated wrongly the first time that libvirtd was started. Instead of being generated from the QMP queries, it appears to have fallen back to the old method of scraping 'qemu -cpu help', and since the output of that changed with qemu 2.0 it leads to things like: <cpu name='SandyBridge Intel Xeon E312xx (Sandy Bridge) '/> and hilarity then ensues when cpuModelIsAllowed() is called by x86Decode(). Since only one of the cache files there was corrupted like this, it would appear libvirt either didn't wait long enough, or didn't try hard enough, to get a connection to the monitor for the QMP query on what was probably also the very first time qemu had been started on this host machine. After nuking the cache files and restarting libvirtd they were then correctly regenerated, and things began to work as expected. This was all done on a new clean install of the host machine, so there was nothing around from any earlier versions to get tangled up with, and possibly means qemu had some first time init of its own to do which took some time before it was ready to be queried. I am also seeing bursts of several of these warnings in the logs: libvirtd[26475]: This thread seems to be the async job owner; entering monitor without asking for a nested job is dangerous Which I haven't confirmed as being related, but doesn't seem to be obviously unrelated either, and at worst is a separate bug. Cheers, Ron

1 0

[libvirt] libvirt, libxl and <channels>
by Dave Scott 06 Jun '14

06 Jun '14

Hi, Two of the applications I’d like to use with libvirt (cloudstack and oVirt) make use of “<channels>” in the domain XML, like this: <channel type='unix'> <source mode='bind' path='/var/lib/libvirt/qemu/s-4-VM.agent'/> <target type='virtio' name='s-4-VM.vport'/> <address type='virtio-serial'/> </channel> I don’t believe these are currently supported by libvirt + libxl — I’d like to see what it would take to hook these up. I chatted with Daniel Berrange at the Xen hackathon last week, and if I understood correctly these channels are analogous to serial ports used for low-bandwidth communication to (e.g.) guest agents. Daniel suggested that the xen console mechanism ought to be adequate to power these things. The other option (if higher bandwidth was required) would be to use the Xen vchan protocol. I think the behaviour is: * bind a unix domain socket on the host (‘/var/lib/libvirt/qemu/…') * connect a bidirectional low-bandwidth channel to the guest * manifest the channel in the guest as a ‘/dev/vport/s-4-VM.vport’ device (?) So an application on the host can connect() to the host socket, an application in the guest can open() the guest device and they can talk privately. [Have I got this right?] I had a quick read of the libxl code and I think the consoles are considered an internal detail: there is a function libxl_console_get_tty to retrieve a console’s endpoint in dom0 but I couldn’t see a way to request additional consoles are created. The libxl_domain_config has disks, nics, pcidevs, vfbs, vkbs, and vtpms but no consoles. (Have I missed something?) Bypassing libxl I was able to manually create a /local/domain/%d/device/console/1 which was recognised by the VM as /dev/hvc1. As an aside, I notice that there are 2 console backends now: xenconsoled seems to only watch for the initial console, while a per-domain qemu process is used for all subsequent consoles, so any enhancements to the dom0 end would have to go into qemu? So to implement channels via consoles I would need to: 1. check if qemu when acting as a console server in dom0 is able to connect the console to a suitably named Unix domain socket in dom0 (signalled via xenstore in the usual way) 2. modify libxl to support consoles as configurable devices alongside disks, nics etc 3. add support to libvirt’s libxl driver 4. see if I can write something like a udev rule in the guest to notice the console, look up the ‘name’ from xenstore and make a suitably-named file? What do you think? Cheers, Dave

2 2

[libvirt] [PATCH] Fix virbitmaptest on 32-bit
by Ján Tomko 06 Jun '14

06 Jun '14

My commit 7d8afc4 was passing the incorrect size to virBitmapDataToString in the newly added test. --- Pushed as a trivial paper-bag build breaker fix. tests/virbitmaptest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/virbitmaptest.c b/tests/virbitmaptest.c index 139b8e2..048946f 100644 --- a/tests/virbitmaptest.c +++ b/tests/virbitmaptest.c @@ -313,7 +313,7 @@ test5(const void *v ATTRIBUTE_UNUSED) if (STRNEQ(str, "0,9,34")) goto error; VIR_FREE(str); - if (!(str = virBitmapDataToString(data2, sizeof(data2)))) + if (!(str = virBitmapDataToString(data2, len2))) goto error; if (STRNEQ(str, "0,2,9,15,34")) goto error; -- 1.8.3.2

1 0

[libvirt] [PATCH] nodedev: Export NUMA node locality for PCI devices
by Michal Privoznik 06 Jun '14

06 Jun '14

A PCI device can be associated with a specific NUMA node. Later, when a guest is pinned to one NUMA node the PCI device can be assigned on different NUMA node. This makes DMA transfers travel across nodes and thus results in suboptimal performance. We should expose the NUMA node locality for PCI devices so management applications can make better decisions. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- The only difference to the previous round is, I'm sending it as standalone patch for easier review. docs/formatnode.html.in | 7 ++++ docs/schemas/nodedev.rng | 10 +++++ src/conf/node_device_conf.c | 44 ++++++++++++++++++++++ src/conf/node_device_conf.h | 1 + src/node_device/node_device_udev.c | 7 ++++ tests/nodedevschemadata/pci_1002_71c4.xml | 1 + tests/nodedevschemadata/pci_8086_10c9_sriov_pf.xml | 1 + 7 files changed, 71 insertions(+) diff --git a/docs/formatnode.html.in b/docs/formatnode.html.in index b424c96..76bf8af 100644 --- a/docs/formatnode.html.in +++ b/docs/formatnode.html.in @@ -110,6 +110,13 @@ have a list of <code>address</code> subelements, one for each VF on this PF. </dd> + <dt><code>numa</code></dt> + <dd> + This optional element contains information on the PCI device + with respect to NUMA. For example, the optional + <code>node</code> attribute tells which NUMA node is the PCI + device associated with. + </dd> </dl> </dd> <dt><code>usb_device</code></dt> diff --git a/docs/schemas/nodedev.rng b/docs/schemas/nodedev.rng index 81ab4d4..02d4106 100644 --- a/docs/schemas/nodedev.rng +++ b/docs/schemas/nodedev.rng @@ -158,6 +158,16 @@ </element> </optional> + <optional> + <element name='numa'> + <optional> + <attribute name='node'> + <data type='int'/> + </attribute> + </optional> + </element> + </optional> + </define> <define name='capusbdev'> diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index e65b5e4..99fa448 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -346,6 +346,9 @@ char *virNodeDeviceDefFormat(const virNodeDeviceDef *def) virBufferAdjustIndent(&buf, -2); virBufferAddLit(&buf, "</iommuGroup>\n"); } + if (data->pci_dev.numa_node >= 0) + virBufferAsprintf(&buf, "<numa node='%d'/>\n", + data->pci_dev.numa_node); break; case VIR_NODE_DEV_CAP_USB_DEV: virBufferAsprintf(&buf, "<bus>%d</bus>\n", data->usb_dev.bus); @@ -520,6 +523,41 @@ char *virNodeDeviceDefFormat(const virNodeDeviceDef *def) return NULL; } +/** + * virNodeDevCapsDefParseIntOptional: + * @xpath: XPath to evaluate + * @ctxt: Context + * @value: Where to store parsed value + * @def: Node device which is parsed + * @invalid_error_fmt: error message to print on invalid format + * + * Returns: -1 on error (invalid int format under @xpath) + * 0 if @xpath was not found (@value is untouched) + * 1 on success + */ +static int +virNodeDevCapsDefParseIntOptional(const char *xpath, + xmlXPathContextPtr ctxt, + int *value, + virNodeDeviceDefPtr def, + const char *invalid_error_fmt) +{ + int ret; + int val; + + ret = virXPathInt(xpath, ctxt, &val); + if (ret < -1) { + virReportError(VIR_ERR_INTERNAL_ERROR, + invalid_error_fmt, + def->name); + return -1; + } else if (ret == -1) { + return 0; + } + *value = val; + return 1; +} + static int virNodeDevCapsDefParseULong(const char *xpath, xmlXPathContextPtr ctxt, @@ -1101,6 +1139,12 @@ virNodeDevCapPCIDevParseXML(xmlXPathContextPtr ctxt, goto out; } } + + if (virNodeDevCapsDefParseIntOptional("number(./numa[1]/@node)", ctxt, + &data->pci_dev.numa_node, def, + _("invalid NUMA node ID supplied for '%s'")) < 0) + goto out; + ret = 0; out: ctxt->node = orignode; diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h index 50e6805..50ce4b3 100644 --- a/src/conf/node_device_conf.h +++ b/src/conf/node_device_conf.h @@ -115,6 +115,7 @@ struct _virNodeDevCapsDef { virPCIDeviceAddressPtr *iommuGroupDevices; size_t nIommuGroupDevices; unsigned int iommuGroupNumber; + int numa_node; } pci_dev; struct { unsigned int bus; diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 9a951d9..8e98ad2 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -493,6 +493,13 @@ static int udevProcessPCI(struct udev_device *device, goto out; } + if (udevGetIntSysfsAttr(device, + "numa_node", + &data->pci_dev.numa_node, + 10) == PROPERTY_ERROR) { + goto out; + } + if (!virPCIGetPhysicalFunction(syspath, &data->pci_dev.physical_function)) data->pci_dev.flags |= VIR_NODE_DEV_CAP_FLAG_PCI_PHYSICAL_FUNCTION; diff --git a/tests/nodedevschemadata/pci_1002_71c4.xml b/tests/nodedevschemadata/pci_1002_71c4.xml index 6de09c1..6d5d85b 100644 --- a/tests/nodedevschemadata/pci_1002_71c4.xml +++ b/tests/nodedevschemadata/pci_1002_71c4.xml @@ -8,5 +8,6 @@ <function>0</function> <product id='0x71c4'>M56GL [Mobility FireGL V5200]</product> <vendor id='0x1002'>ATI Technologies Inc</vendor> + <numa node='1'/> </capability> </device> diff --git a/tests/nodedevschemadata/pci_8086_10c9_sriov_pf.xml b/tests/nodedevschemadata/pci_8086_10c9_sriov_pf.xml index eff8932..6e1dc86 100644 --- a/tests/nodedevschemadata/pci_8086_10c9_sriov_pf.xml +++ b/tests/nodedevschemadata/pci_8086_10c9_sriov_pf.xml @@ -12,5 +12,6 @@ <address domain='0x0000' bus='0x02' slot='0x00' function='0x0'/> <address domain='0x0000' bus='0x02' slot='0x00' function='0x1'/> </iommuGroup> + <numa node='0'/> </capability> </device> -- 2.0.0

2 2

[libvirt] [PATCH 0/6] Print cpu maps in human readable form
by Ján Tomko 06 Jun '14

06 Jun '14

Consistently report errors in virBitmapFormat and introduce a flag for vcpuinfo and nodecpumap for more readable cpu map outputs. Ján Tomko (6): Invert logic in cmdVcpuinfo Separate API calls and result printing in cmdVcpuinfo Format NULL bitmap as an empty string Always report an error if virBitmapFormat fails Introudce virBitmapDataToString Implement pretty flag for vcpuinfo and nodecpumap src/conf/capabilities.c | 4 +- src/conf/domain_conf.c | 19 ++-------- src/conf/network_conf.c | 2 +- src/libvirt_private.syms | 1 + src/libxl/libxl_driver.c | 3 +- src/lxc/lxc_cgroup.c | 11 +----- src/qemu/qemu_cgroup.c | 16 ++------ src/qemu/qemu_driver.c | 12 ++---- src/util/virbitmap.c | 32 +++++++++++++--- src/util/virbitmap.h | 7 +++- src/util/virstring.h | 1 - tests/virbitmaptest.c | 14 ++++++- tools/virsh-domain.c | 97 +++++++++++++++++++++++++----------------------- tools/virsh-host.c | 25 +++++++++++-- 14 files changed, 134 insertions(+), 110 deletions(-) -- 1.8.3.2

3 19

[libvirt] [PATCH 0/3] Parallels: patch set
by Alexander Burluka 06 Jun '14

06 Jun '14

From: A.Burluka <aburluka(a)parallels.com> I've fixed my previous patches after Libvirt community reviews (thanks to Eric Blake and Daniel P. Berrange). Parallels team continues working on Libvirt Parallels driver integration with OpenStack. A.Burluka (3): Parallels: add domainGetVcpus(). Parallels: add connectBaselineCPU(). Parallels: Include CPU info in the capabilities XML

4 9

[libvirt] [PATCH] Remove ssp buffer size setting
by Ján Tomko 06 Jun '14

06 Jun '14

This option only makes sense with -fstack-protector. With -fstack-protector-all, even functions with buffers smaller than this are protected. https://bugzilla.redhat.com/show_bug.cgi?id=1105456 --- m4/virt-compile-warnings.m4 | 8 -------- 1 file changed, 8 deletions(-) diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index 574fbc4..ebc931d 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -171,14 +171,6 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ dnl be great overhead in adding -fstack-protector-all instead dnl wantwarn="$wantwarn -fstack-protector" wantwarn="$wantwarn -fstack-protector-all" - wantwarn="$wantwarn --param=ssp-buffer-size=4" - dnl Even though it supports it, clang complains about - dnl use of --param=ssp-buffer-size=4 unless used with - dnl the -c arg. It doesn't like it when used with args - dnl that just link together .o files. Unfortunately - dnl we can't avoid that with automake, so we must turn - dnl off the following clang specific warning - wantwarn="$wantwarn -Wno-unused-command-line-argument" ;; *-*-freebsd*) dnl FreeBSD ships old gcc 4.2.1 which doesn't handle -- 1.8.3.2

4 4

[libvirt] libvirt / libxl testing emails
by George Dunlap 06 Jun '14

06 Jun '14

Ian / Ian, Daniel V. was lurking on a recent CentOS Virt SIG IRC meetings, and asked about testing the libvirt git repo against libxl. I mentioned that we already had some basic tests to do that, and he asked whether it would make sense to have the push gate e-mail the libvirt list. I have no idea how the libvirt people feel about that, so I'll let DV make his case, and also let he Ians give their opinions. -George

4 7

[libvirt] [PATCH 0/3] Attach USB hostdevs using serial id
by Ján Tomko 06 Jun '14

06 Jun '14

Originally posted a year ago: https://www.redhat.com/archives/libvir-list/2013-June/msg00624.html Rebased, with tests and nodedev 'implementation' and some nits fixed. David Waring (2): Add serials to USB hostdevs in domain XML Add ability to attach host USB devices using serial id Ján Tomko (1): Add USB serials to node device driver docs/formatdomain.html.in | 22 +++++---- docs/schemas/domaincommon.rng | 8 ++++ docs/schemas/nodedev.rng | 9 ++++ src/conf/domain_conf.c | 31 ++++++++++-- src/conf/domain_conf.h | 1 + src/conf/node_device_conf.c | 4 ++ src/conf/node_device_conf.h | 1 + src/node_device/node_device_hal.c | 1 + src/node_device/node_device_udev.c | 6 +++ src/util/virhostdev.c | 17 +++---- src/util/virusb.c | 56 +++++++++++++++++++--- src/util/virusb.h | 2 + tests/nodedevschemadata/usb_1_1_5_3.xml | 11 +++++ tests/nodedevxml2xmltest.c | 1 + .../qemuxml2argvdata/qemuxml2argv-usb-hostdev.xml | 42 ++++++++++++++++ tests/qemuxml2xmltest.c | 2 + tests/virusbtest.c | 40 +++++++++++----- .../sys_bus_usb/devices/1-1.5.3.1/serial | 1 + .../sys_bus_usb/devices/1-1.5.3.3/serial | 1 + .../sys_bus_usb/devices/1-1.5.5/serial | 1 + .../sys_bus_usb/devices/1-1.5.6/serial | 1 + .../sys_bus_usb/devices/1-1.5/serial | 1 + .../sys_bus_usb/devices/1-1.6/serial | 1 + .../virusbtestdata/sys_bus_usb/devices/1-1/serial | 1 + .../sys_bus_usb/devices/2-1.2/serial | 1 + .../virusbtestdata/sys_bus_usb/devices/2-1/serial | 1 + .../virusbtestdata/sys_bus_usb/devices/usb1/serial | 1 + .../virusbtestdata/sys_bus_usb/devices/usb2/serial | 1 + .../virusbtestdata/sys_bus_usb/devices/usb3/serial | 1 + .../virusbtestdata/sys_bus_usb/devices/usb4/serial | 1 + 30 files changed, 227 insertions(+), 40 deletions(-) create mode 100644 tests/nodedevschemadata/usb_1_1_5_3.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-hostdev.xml create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3.1/serial create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3.3/serial create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.5/serial create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.6/serial create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5/serial create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.6/serial create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1/serial create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/2-1.2/serial create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/2-1/serial create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/usb1/serial create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/usb2/serial create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/usb3/serial create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/usb4/serial -- 1.8.3.2

2 4

[libvirt] [PATCH RFC] Add support for QEMU vhost-user feature
by Luke Gorrie 06 Jun '14

06 Jun '14

Howdy! This patch adds support for the QEMU vhost-user feature to Libvirt. vhost-user is an efficient interface between guests and userspace network stacks (vswitches). Our goal is to have vhost-user supported in the OpenStack Juno release. We hope it is okay to start code review on qemu, Libvirt, and OpenStack in parallel. We understand that code will have to be merged first into QEMU and then into Libvirt and then into OpenStack. References: vhost-user qemu patches: http://lists.gnu.org/archive/html/qemu-devel/2014-05/msg05443.html vhost-user high level description: http://www.virtualopensystems.com/en/solutions/guides/snabbswitch-qemu/ OpenStack feature that this is intended to support (Snabb NFV): http://snabb.co/nfv.html https://blueprints.launchpad.net/neutron/+spec/snabb-nfv-mech-driver Luke Gorrie (1): Add support for QEMU vhost-user feature docs/schemas/domaincommon.rng | 23 ++++++++ src/conf/domain_conf.c | 42 ++++++++++++++ src/conf/domain_conf.h | 5 ++ src/lxc/lxc_process.c | 1 + src/qemu/qemu_command.c | 66 +++++++++++++++++++++- src/uml/uml_conf.c | 5 ++ src/xenxs/xen_sxpr.c | 1 + tests/qemuxml2argvdata/qemuxml2argv-hugepages.args | 2 +- 8 files changed, 142 insertions(+), 3 deletions(-) -- 1.9.1

3 8

[libvirt] [PATCH] translations: Don't leave default template fields in .po files
by Martin Kletzander 06 Jun '14

06 Jun '14

New gettext-0.19 doesn't like it and we can't build without it. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: I'm *not* pushing it as a build-breaker as it's not that urgent. It should be updated in transifex as well. @DV: Can you update this in transifex or do I need to go through some special procedure? po/af.po | 3 ++- po/am.po | 3 ++- po/ar.po | 3 ++- po/be.po | 3 ++- po/bg.po | 3 ++- po/bn.po | 3 ++- po/bs.po | 3 ++- po/cy.po | 3 ++- po/da.po | 3 ++- po/el.po | 3 ++- po/et.po | 3 ++- po/eu_ES.po | 3 ++- po/fa.po | 3 ++- po/fi.po | 3 ++- po/gl.po | 3 ++- po/he.po | 3 ++- po/hr.po | 3 ++- po/hu.po | 3 ++- po/hy.po | 3 ++- po/is.po | 3 ++- po/ka.po | 3 ++- po/ku.po | 3 ++- po/lo.po | 3 ++- po/lt.po | 3 ++- po/lv.po | 3 ++- po/mk.po | 3 ++- po/ms.po | 3 ++- po/my.po | 3 ++- po/nb.po | 3 ++- po/nn.po | 3 ++- po/nso.po | 3 ++- po/ro.po | 3 ++- po/si.po | 3 ++- po/sk.po | 3 ++- po/sl.po | 3 ++- po/sq.po | 3 ++- po/sr.po | 3 ++- po/sr(a)latin.po | 3 ++- po/th.po | 3 ++- po/tr.po | 3 ++- po/ur.po | 3 ++- po/vi.po | 3 ++- po/zu.po | 3 ++- 43 files changed, 86 insertions(+), 43 deletions(-) diff --git a/po/af.po b/po/af.po index 47d5709..5983946 100644 --- a/po/af.po +++ b/po/af.po @@ -11,7 +11,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:11+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Afrikaans (http://www.transifex.com/projects/p/" +"fedora/language/af/)\n" "Language: af\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/am.po b/po/am.po index ec8e96a..11c0d57 100644 --- a/po/am.po +++ b/po/am.po @@ -11,7 +11,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:11+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Amharic (http://www.transifex.com/projects/p/" +"fedora/language/am/)\n" "Language: am\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/ar.po b/po/ar.po index 04f4ad6..6b37615 100644 --- a/po/ar.po +++ b/po/ar.po @@ -11,7 +11,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:11+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Arabic (http://www.transifex.com/projects/p/" +"fedora/language/ar/)\n" "Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/be.po b/po/be.po index 869c267..3eb7547 100644 --- a/po/be.po +++ b/po/be.po @@ -11,7 +11,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:11+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Belarusian (http://www.transifex.com/projects/p/" +"fedora/language/be/)\n" "Language: be\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/bg.po b/po/bg.po index a2aad89..376068d 100644 --- a/po/bg.po +++ b/po/bg.po @@ -12,7 +12,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:11+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Bulgarian (http://www.transifex.com/projects/p/" +"fedora/language/bg/)\n" "Language: bg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/bn.po b/po/bn.po index 6a088ad..c00862a 100644 --- a/po/bn.po +++ b/po/bn.po @@ -11,7 +11,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:11+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Bengali (http://www.transifex.com/projects/p/" +"fedora/language/bn/)\n" "Language: bn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/bs.po b/po/bs.po index b7b2b6c..de318fe 100644 --- a/po/bs.po +++ b/po/bs.po @@ -12,7 +12,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:11+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Bosnian (http://www.transifex.com/projects/p/" +"fedora/language/bs/)\n" "Language: bs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/cy.po b/po/cy.po index 40f8755..abf8983 100644 --- a/po/cy.po +++ b/po/cy.po @@ -11,7 +11,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:11+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Welsh (http://www.transifex.com/projects/p/" +"fedora/language/cy/)\n" "Language: cy\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/da.po b/po/da.po index 19c8715..309e20b 100644 --- a/po/da.po +++ b/po/da.po @@ -14,7 +14,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:11+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Danish (http://www.transifex.com/projects/p/" +"fedora/language/da/)\n" "Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/el.po b/po/el.po index e435e18..1b37281 100644 --- a/po/el.po +++ b/po/el.po @@ -12,7 +12,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:11+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Greek (http://www.transifex.com/projects/p/" +"fedora/language/el/)\n" "Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/et.po b/po/et.po index eaa5407..475815c 100644 --- a/po/et.po +++ b/po/et.po @@ -11,7 +11,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:11+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Estonian (http://www.transifex.com/projects/p/" +"fedora/language/et/)\n" "Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/eu_ES.po b/po/eu_ES.po index f331fe7..50a6d47 100644 --- a/po/eu_ES.po +++ b/po/eu_ES.po @@ -11,7 +11,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:12+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/" +"fedora/language/eu_ES/)\n" "Language: eu_ES\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/fa.po b/po/fa.po index 232fe37..b51e1e9 100644 --- a/po/fa.po +++ b/po/fa.po @@ -11,7 +11,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:11+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Persian (http://www.transifex.com/projects/p/" +"fedora/language/fa/)\n" "Language: fa\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/fi.po b/po/fi.po index d8ef7e3..4e72b3b 100644 --- a/po/fi.po +++ b/po/fi.po @@ -11,7 +11,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:11+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Finnish (http://www.transifex.com/projects/p/" +"fedora/language/fi/)\n" "Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/gl.po b/po/gl.po index c13e639..60785ff 100644 --- a/po/gl.po +++ b/po/gl.po @@ -11,7 +11,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:11+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Galician (http://www.transifex.com/projects/p/" +"fedora/language/gl/)\n" "Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/he.po b/po/he.po index f3fe81a..7e96512 100644 --- a/po/he.po +++ b/po/he.po @@ -11,7 +11,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:11+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Hebrew (http://www.transifex.com/projects/p/" +"fedora/language/he/)\n" "Language: he\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/hr.po b/po/hr.po index 20dd8af..a89a097 100644 --- a/po/hr.po +++ b/po/hr.po @@ -11,7 +11,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:11+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Croatian (http://www.transifex.com/projects/p/" +"fedora/language/hr/)\n" "Language: hr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/hu.po b/po/hu.po index 3ca40e8..1ac232c 100644 --- a/po/hu.po +++ b/po/hu.po @@ -13,7 +13,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:11+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Hungarian (http://www.transifex.com/projects/p/" +"fedora/language/hu/)\n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/hy.po b/po/hy.po index f03527c..6d91677 100644 --- a/po/hy.po +++ b/po/hy.po @@ -11,7 +11,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:11+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Armenian (http://www.transifex.com/projects/p/" +"fedora/language/hy/)\n" "Language: hy\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/is.po b/po/is.po index 8bf7060..78841b8 100644 --- a/po/is.po +++ b/po/is.po @@ -11,7 +11,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:11+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Icelandic (http://www.transifex.com/projects/p/" +"fedora/language/is/)\n" "Language: is\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/ka.po b/po/ka.po index 8709719..42b3001 100644 --- a/po/ka.po +++ b/po/ka.po @@ -11,7 +11,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:11+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Georgian (http://www.transifex.com/projects/p/" +"fedora/language/ka/)\n" "Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/ku.po b/po/ku.po index 16d9e4c..351753b 100644 --- a/po/ku.po +++ b/po/ku.po @@ -11,7 +11,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:12+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Kurdish (http://www.transifex.com/projects/p/" +"fedora/language/ku/)\n" "Language: ku\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/lo.po b/po/lo.po index b197727..d989680 100644 --- a/po/lo.po +++ b/po/lo.po @@ -11,7 +11,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:11+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Lao (http://www.transifex.com/projects/p/" +"fedora/language/lo/)\n" "Language: lo\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/lt.po b/po/lt.po index 711a787..a85c614 100644 --- a/po/lt.po +++ b/po/lt.po @@ -11,7 +11,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:11+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Lithuanian (http://www.transifex.com/projects/p/" +"fedora/language/lt/)\n" "Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/lv.po b/po/lv.po index eda0f0b..20686e3 100644 --- a/po/lv.po +++ b/po/lv.po @@ -11,7 +11,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:11+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Latvian (http://www.transifex.com/projects/p/" +"fedora/language/lv/)\n" "Language: lv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/mk.po b/po/mk.po index baa63b8..ea7a345 100644 --- a/po/mk.po +++ b/po/mk.po @@ -13,7 +13,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:12+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Macedonian (http://www.transifex.com/projects/p/" +"fedora/language/mk/)\n" "Language: mk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/ms.po b/po/ms.po index c032193..4b1ba01 100644 --- a/po/ms.po +++ b/po/ms.po @@ -11,7 +11,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:11+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Malay (http://www.transifex.com/projects/p/" +"fedora/language/ms/)\n" "Language: ms\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/my.po b/po/my.po index 92f7928..fedac71 100644 --- a/po/my.po +++ b/po/my.po @@ -11,7 +11,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:12+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Burmese (http://www.transifex.com/projects/p/" +"fedora/language/my/)\n" "Language: my\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/nb.po b/po/nb.po index 5747634..0833e5b 100644 --- a/po/nb.po +++ b/po/nb.po @@ -13,7 +13,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:11+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/" +"fedora/language/nb/)\n" "Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/nn.po b/po/nn.po index 25db485..29a3bfb 100644 --- a/po/nn.po +++ b/po/nn.po @@ -11,7 +11,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:12+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/" +"fedora/language/nn/)\n" "Language: nn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/nso.po b/po/nso.po index a1133f0..1d9d033 100644 --- a/po/nso.po +++ b/po/nso.po @@ -11,7 +11,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:11+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Northern Sotho (http://www.transifex.com/projects/p/" +"fedora/language/nso/)\n" "Language: nso\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/ro.po b/po/ro.po index 1034523..77ac4a6 100644 --- a/po/ro.po +++ b/po/ro.po @@ -11,7 +11,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:11+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Romanian (http://www.transifex.com/projects/p/" +"fedora/language/ro/)\n" "Language: ro\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/si.po b/po/si.po index c49b142..79e193f 100644 --- a/po/si.po +++ b/po/si.po @@ -11,7 +11,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:12+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Sinhala (http://www.transifex.com/projects/p/" +"fedora/language/si/)\n" "Language: si\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/sk.po b/po/sk.po index c1f87e4..8741916 100644 --- a/po/sk.po +++ b/po/sk.po @@ -11,7 +11,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:12+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Slovak (http://www.transifex.com/projects/p/" +"fedora/language/sk/)\n" "Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/sl.po b/po/sl.po index fea62eb..3d0b0d0 100644 --- a/po/sl.po +++ b/po/sl.po @@ -11,7 +11,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:11+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Slovenian (http://www.transifex.com/projects/p/" +"fedora/language/sl/)\n" "Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/sq.po b/po/sq.po index 4a89203..c6e753a 100644 --- a/po/sq.po +++ b/po/sq.po @@ -11,7 +11,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:12+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Albanian (http://www.transifex.com/projects/p/" +"fedora/language/sq/)\n" "Language: sq\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/sr.po b/po/sr.po index cb8d778..89ec973 100644 --- a/po/sr.po +++ b/po/sr.po @@ -12,7 +12,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:12+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Serbian (http://www.transifex.com/projects/p/" +"fedora/language/sr/)\n" "Language: sr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/sr(a)latin.po b/po/sr(a)latin.po index 2259992..ca6ebb3 100644 --- a/po/sr(a)latin.po +++ b/po/sr(a)latin.po @@ -12,7 +12,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:11+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/" +"fedora/language/sr@latin/)\n" "Language: sr@latin\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/th.po b/po/th.po index 3e4b343..5039af4 100644 --- a/po/th.po +++ b/po/th.po @@ -11,7 +11,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:11+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Thai (http://www.transifex.com/projects/p/" +"fedora/language/th/)\n" "Language: th\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/tr.po b/po/tr.po index cf5f540..892fffc 100644 --- a/po/tr.po +++ b/po/tr.po @@ -11,7 +11,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:11+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Turkish (http://www.transifex.com/projects/p/" +"fedora/language/tr/)\n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/ur.po b/po/ur.po index b50e05b..4520fe2 100644 --- a/po/ur.po +++ b/po/ur.po @@ -11,7 +11,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:12+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Urdu (http://www.transifex.com/projects/p/" +"fedora/language/ur/)\n" "Language: ur\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/vi.po b/po/vi.po index 2f76bd4..d4b46c3 100644 --- a/po/vi.po +++ b/po/vi.po @@ -11,7 +11,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:11+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Vietnamese (http://www.transifex.com/projects/p/" +"fedora/language/vi/)\n" "Language: vi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/zu.po b/po/zu.po index 3bacc98..b5c272e 100644 --- a/po/zu.po +++ b/po/zu.po @@ -11,7 +11,8 @@ msgstr "" "POT-Creation-Date: 2014-06-02 09:35+0800\n" "PO-Revision-Date: 2013-01-28 14:11+0000\n" "Last-Translator: Daniel <veillard(a)redhat.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Zulu (http://www.transifex.com/projects/p/" +"fedora/language/zu/)\n" "Language: zu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -- 2.0.0

2 2

[libvirt] [PATCH] manual: Add virsh manual about specified migration host
by Chen Fan 06 Jun '14

06 Jun '14

the 'migration_host' description maybe have a bit of difficulty to understand for user, so add this manual for them. Signed-off-by: Chen Fan <chen.fan.fnst(a)cn.fujitsu.com> --- tools/virsh.pod | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index de9a4f7..8d77a2f 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1238,6 +1238,11 @@ seen from the source machine. When I<migrateuri> is not specified, libvirt will automatically determine the hypervisor specific URI, by looking up the target host's configured hostname. +In particular, some hypervisors support having this migration hostname specified +separately by setting 'migration_host' in definition file, if 'migration_host' +is specified, the hostname or IP address will be used to as the default I<migrateuri> +while running migration from source host. if 'migration_host' is not specified, +the migration hostname is set to the host's configured hostname by default. There are a few scenarios where specifying I<migrateuri> may help: =over 4 @@ -1251,7 +1256,9 @@ explicitly specified, using an IP address, or a correct hostname. interfaces, it might be desirable for the migration data stream to be sent over a specific interface for either security or performance reasons. In this case I<migrateuri> should be explicitly specified, using an IP address associated -with the network to be used. +with the network to be used. In particular, Some hypervisors could be easy to +specify the default network interface by setting 'migration_host'. then the +I<migrateuri> can be omitted. =item * The firewall restricts what ports are available. When libvirt generates a migration URI, it will pick a port number using hypervisor specific rules. -- 1.9.3

3 4

[libvirt] [PATCH 0/3] Fix storage format probing
by Ján Tomko 06 Jun '14

06 Jun '14

https://bugzilla.redhat.com/show_bug.cgi?id=1104908 Ján Tomko (3): Don't reuse 'ret' variable in virStorageBackendProbeTarget Simplify conditions in virStorageBackendProbeTarget Fix storage format probing src/storage/storage_backend_fs.c | 69 ++++++++++++++++------------------- src/storage/storage_backend_gluster.c | 1 + 2 files changed, 32 insertions(+), 38 deletions(-) -- 1.8.3.2

2 7

[libvirt] [PATCH 0/4] Expose link state & speed
by Michal Privoznik 05 Jun '14

05 Jun '14

This is practically a v2, but this time split into more patches and extended. Michal Privoznik (4): virInterface: Expose link state & speed interface_backend_udev: Implement link speed & state interface_backend_netcf: Implement link speed & state node_device: Expose link state & speed docs/formatnode.html.in | 6 ++ docs/schemas/basictypes.rng | 25 ++++++ docs/schemas/interface.rng | 1 + docs/schemas/nodedev.rng | 1 + src/conf/device_conf.c | 62 ++++++++++++++ src/conf/device_conf.h | 27 +++++- src/conf/interface_conf.c | 11 ++- src/conf/interface_conf.h | 2 + src/conf/node_device_conf.c | 7 +- src/conf/node_device_conf.h | 2 + src/interface/interface_backend_netcf.c | 104 ++++++++++++++++++++++++ src/interface/interface_backend_udev.c | 27 ++++++ src/libvirt_private.syms | 4 + src/node_device/node_device_driver.c | 27 ++++-- src/node_device/node_device_hal.c | 9 ++ src/node_device/node_device_hal.h | 1 + src/node_device/node_device_udev.c | 65 +++++++++++++++ src/node_device/node_device_udev.h | 4 + tests/interfaceschemadata/bridge-no-address.xml | 1 + tests/interfaceschemadata/bridge.xml | 1 + tests/interfaceschemadata/ethernet-dhcp.xml | 1 + 21 files changed, 380 insertions(+), 8 deletions(-) -- 2.0.0

2 7

[libvirt] [PATCH v2 0/2] Couple of virCaps improvements
by Michal Privoznik 05 Jun '14

05 Jun '14

diff to v1: -rename the test -drop even more from the original documentation Michal Privoznik (2): vircaps2xmltest: Introduce basic testing formatcaps: Rework and add stubs to document docs/formatcaps.html.in | 139 +++++++++++++++------ tests/Makefile.am | 6 + tests/vircaps2xmldata/vircaps-basic-4-4-2G.xml | 74 +++++++++++ tests/vircaps2xmltest.c | 164 +++++++++++++++++++++++++ 4 files changed, 345 insertions(+), 38 deletions(-) create mode 100644 tests/vircaps2xmldata/vircaps-basic-4-4-2G.xml create mode 100644 tests/vircaps2xmltest.c -- 2.0.0

2 4

[libvirt] [PATCH 0/2] Couple of virCaps improvements
by Michal Privoznik 05 Jun '14

05 Jun '14

Literally couple. As usual, the aim is not completeness, but to prepare environment for future work (if somebody is willing to contribute patches). Michal Privoznik (2): vircapstest: Introduce basic testing formatcaps: Rework and add stubs to document docs/formatcaps.html.in | 158 +++++++++++++++++++++++++++--------- tests/vircapsdata/vircaps-basic.xml | 66 +++++++++++++++ tests/vircapstest.c | 77 +++++++++++++++++- 3 files changed, 262 insertions(+), 39 deletions(-) create mode 100644 tests/vircapsdata/vircaps-basic.xml -- 2.0.0

3 7

[libvirt] [PATCH v2] maint: prohibit empty first lines
by Martin Kletzander 05 Jun '14

05 Jun '14

Based on discussion with Eric: https://www.redhat.com/archives/libvir-list/2014-March/msg01001.html Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- v2: - rebase on current master and s/FILENAME:1:/FILENAME ":1:"/ cfg.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cfg.mk b/cfg.mk index 675af21..80440b5 100644 --- a/cfg.mk +++ b/cfg.mk @@ -938,6 +938,13 @@ sc_require_locale_h: fi; \ done; +sc_prohibit_empty_first_line: + @awk 'BEGIN { fail=0; } \ + FNR == 1 { if ($$0 == "") { print FILENAME ":1:"; fail=1; } } \ + END { if (fail == 1) { \ + print "$(ME): Prohibited empty first line" > "/dev/stderr"; \ + } exit fail; }' $$($(VC_LIST_EXCEPT) | grep '\.[ch]$$'); + # We don't use this feature of maint.mk. prev_version_file = /dev/null -- 2.0.0

3 3

[libvirt] [libvirt-sandbox PATCH] Only set SELinux seclabel if supported by the host.
by Cédric Bosdonnat 05 Jun '14

05 Jun '14

This code depends on new API in libvirt-gconfig to extract the secmodels handled by the host. --- libvirt-sandbox/libvirt-sandbox-builder.c | 68 ++++++++++++++++++++----------- 1 file changed, 45 insertions(+), 23 deletions(-) diff --git a/libvirt-sandbox/libvirt-sandbox-builder.c b/libvirt-sandbox/libvirt-sandbox-builder.c index 48b3acc..547b1c7 100644 --- a/libvirt-sandbox/libvirt-sandbox-builder.c +++ b/libvirt-sandbox/libvirt-sandbox-builder.c @@ -323,38 +323,60 @@ static gboolean gvir_sandbox_builder_construct_devices(GVirSandboxBuilder *build } -static gboolean gvir_sandbox_builder_construct_security(GVirSandboxBuilder *builder G_GNUC_UNUSED, +static gboolean gvir_sandbox_builder_construct_security(GVirSandboxBuilder *builder, GVirSandboxConfig *config G_GNUC_UNUSED, const gchar *statedir G_GNUC_UNUSED, GVirConfigDomain *domain, - GError **error G_GNUC_UNUSED) + GError **error) { GVirConfigDomainSeclabel *sec = gvir_config_domain_seclabel_new(); const char *label = gvir_sandbox_config_get_security_label(config); + GVirConnection *connection = gvir_sandbox_builder_get_connection(builder); + GVirConfigCapabilities *configCapabilities; + GVirConfigCapabilitiesHost *hostCapabilities; + GList *secmodels, *iter; + gboolean supportsSelinux = FALSE; + + /* What security models are available on the host? */ + if (!(configCapabilities = gvir_connection_get_capabilities(connection, error))) { + g_object_unref(sec); + return FALSE; + } + + hostCapabilities = gvir_config_capabilities_get_host(configCapabilities); - gvir_config_domain_seclabel_set_model(sec, "selinux"); - if (gvir_sandbox_config_get_security_dynamic(config)) { - gvir_config_domain_seclabel_set_type(sec, - GVIR_CONFIG_DOMAIN_SECLABEL_DYNAMIC); - if (label) - gvir_config_domain_seclabel_set_baselabel(sec, label); - else if (gvir_config_domain_get_virt_type(domain) == - GVIR_CONFIG_DOMAIN_VIRT_LXC) - gvir_config_domain_seclabel_set_baselabel(sec, "system_u:system_r:svirt_lxc_net_t:s0"); - else if (gvir_config_domain_get_virt_type(domain) == - GVIR_CONFIG_DOMAIN_VIRT_QEMU) - gvir_config_domain_seclabel_set_baselabel(sec, "system_u:system_r:svirt_tcg_t:s0"); - else if (gvir_config_domain_get_virt_type(domain) == - GVIR_CONFIG_DOMAIN_VIRT_KVM) - gvir_config_domain_seclabel_set_baselabel(sec, "system_u:system_r:svirt_t:s0"); - } else { - gvir_config_domain_seclabel_set_type(sec, - GVIR_CONFIG_DOMAIN_SECLABEL_STATIC); - if (label) - gvir_config_domain_seclabel_set_label(sec, label); + secmodels = gvir_config_capabilities_host_get_secmodels(hostCapabilities); + for (iter = secmodels; iter != NULL; iter = iter->next) { + supportsSelinux = g_str_equal(gvir_config_capabilities_secmodel_get_model( + GVIR_CONFIG_CAPABILITIES_SECMODEL(iter->data)), "selinux"); + g_object_unref(iter->data); } - gvir_config_domain_set_seclabel(domain, sec); + if (supportsSelinux) { + gvir_config_domain_seclabel_set_model(sec, "selinux"); + if (gvir_sandbox_config_get_security_dynamic(config)) { + gvir_config_domain_seclabel_set_type(sec, + GVIR_CONFIG_DOMAIN_SECLABEL_DYNAMIC); + if (label) + gvir_config_domain_seclabel_set_baselabel(sec, label); + else if (gvir_config_domain_get_virt_type(domain) == + GVIR_CONFIG_DOMAIN_VIRT_LXC) + gvir_config_domain_seclabel_set_baselabel(sec, "system_u:system_r:svirt_lxc_net_t:s0"); + else if (gvir_config_domain_get_virt_type(domain) == + GVIR_CONFIG_DOMAIN_VIRT_QEMU) + gvir_config_domain_seclabel_set_baselabel(sec, "system_u:system_r:svirt_tcg_t:s0"); + else if (gvir_config_domain_get_virt_type(domain) == + GVIR_CONFIG_DOMAIN_VIRT_KVM) + gvir_config_domain_seclabel_set_baselabel(sec, "system_u:system_r:svirt_t:s0"); + } else { + gvir_config_domain_seclabel_set_type(sec, + GVIR_CONFIG_DOMAIN_SECLABEL_STATIC); + if (label) + gvir_config_domain_seclabel_set_label(sec, label); + } + + gvir_config_domain_set_seclabel(domain, sec); + } g_object_unref(sec); return TRUE; -- 1.8.4.5

1 0

[libvirt] [PATCH] maint: detect VPATH builds when checking for gnulib update
by Eric Blake 05 Jun '14

05 Jun '14

I accidentally typed 'make' in the srcdir of a VPATH build, and was surprised to see this: $ make /bin/sh: s/^[ +-]//;s/ .*//: No such file or directory INFO: gnulib update required; running ./autogen.sh first make: -n: Command not found ./autogen.sh I am going to run ./configure with no arguments - if you wish to pass any to it, please specify them on the ./autogen.sh command line. running bootstrap... ./bootstrap: Bootstrapping from checked-out libvirt sources... ./bootstrap: getting gnulib files... Oops - we're trying to execute some fairly bogus command names, and then trying to configure in-tree (which breaks all existing VPATH builds, since automake refuses to do a VPATH build if it detects an in-tree configure). The third line (executing "-n") is fixed by updating to the latest gnulib; the rest of the problem is fixed by copying the same filtering in our cfg.mk as what gnulib just added, so that we avoid any $(shell) invocations which in turn depend on variables that are only populated by a working Makefile. With that in place, we are back to the much nicer: $ make There seems to be no Makefile in this directory. You must run ./configure before running 'make'. make: *** [abort-due-to-no-makefile] Error 1 Additionally, although harder to see - there was a trailing space in the message warning us that autogen would run an in-tree configure. * .gnulib: Update to latest, in part for maint.mk improvements. * cfg.mk (_update_required): Don't check for update in unconfigured directory. * autogen.sh (no_git): Drop trailing space. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the gnulib maintenance rule. * .gnulib e8e0eb6...d55899f (35): > maintainer-makefile: delete obsolete code > maintainer-makefile: avoid spurious error messages > rename: avoid unused-but-set-variable compiler warning > maint: add ChangeLog entry missing in previous commit > rename: mark a label as potentially unused > gnulib-common.m4: Fix typo in _GL_UNUSED_LABEL. > acl: apply pure attribute to two functions > gnulib-common.m4: add _GL_UNUSED_LABEL > dup2, fcntl, fcntl-h: port to AIX 7.1 > printf, config.rpath: Port to FreeBSD 10. > ftoastr: work around compiler bug in IBM xlc 12.1 > valgrind-tests: fixed misleading help message > isfinite, isinf, isnan tests: fix for little-endian PowerPC > exclude-tests: port to AIX 7.1 > pthread_sigmask, timer-time: use gl_THREADLIB only if needed > gnulib-tool: wget translations using --no-verbose rather than --quiet > gnulib-tool: adjust translation wget to avoid a https redirection > getlogin_r-tests: check return value rather than errno > getlogin_r-tests: fix various issues in recent change > fchdir: port 'open' and 'close' redefinitions to AIX 7.1 > update from texinfo > xalloc: don't potentially generate invalid code for xmemdup calls > getlogin_r-tests: avoid false failure under sudo/ssh etc. > getlogin-tests: avoid false failure under cron > mbrtowc.m4: fix a comment typo > mbrlen, mbrtowc: fix bug with empty input > doc: document mbrtowc and mbrlen problem with empty input > doc: document exec* = spawn+exit bug with non-Cygwin Windows platforms > autoupdate > getlogin-tests: avoid false failure under sudo/ssh etc. > mbsstr, quotearg, xstrtol: pacify IRIX 6.5 cc > update from texinfo > autoupdate > autoupdate > autoupdate .gnulib | 2 +- autogen.sh | 2 +- cfg.mk | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gnulib b/.gnulib index e8e0eb6..d55899f 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit e8e0eb6bfb728685ec8d5afd924e41b18e9d928d +Subproject commit d55899fd2c5794ac85ecb14d5e2f646a89e4b4dd diff --git a/autogen.sh b/autogen.sh index 5aa1990..1965f64 100755 --- a/autogen.sh +++ b/autogen.sh @@ -35,7 +35,7 @@ if test -z "$NOCONFIGURE" ; then echo "Running ./configure with $EXTRA_ARGS $@" else if test -z "$*" && test ! -f "$THEDIR/config.status"; then - echo "I am going to run ./configure with no arguments - if you wish " + echo "I am going to run ./configure with no arguments - if you wish" echo "to pass any to it, please specify them on the $0 command line." fi fi diff --git a/cfg.mk b/cfg.mk index 4601b35..b5f1fa2 100644 --- a/cfg.mk +++ b/cfg.mk @@ -939,6 +939,7 @@ sc_require_locale_h: # We don't use this feature of maint.mk. prev_version_file = /dev/null +ifneq ($(_gl-Makefile),) ifeq (0,$(MAKELEVEL)) _curr_status = .git-module-status # The sed filter accommodates those who check out on a commit from which @@ -971,6 +972,7 @@ ifeq (0,$(MAKELEVEL)) maint.mk Makefile: _autogen endif endif +endif # It is necessary to call autogen any time gnulib changes. Autogen # reruns configure, then we regenerate all Makefiles at once. @@ -980,7 +982,9 @@ _autogen: ./config.status # regenerate HACKING as part of the syntax-check +ifneq ($(_gl-Makefile),) syntax-check: $(top_srcdir)/HACKING bracket-spacing-check +endif bracket-spacing-check: $(AM_V_GEN)files=`$(VC_LIST) | grep '\.c$$'`; \ -- 1.9.3

1 0

[libvirt] [PATCH V7] libxl: add migration support
by Jim Fehlig 04 Jun '14

04 Jun '14

This patch adds initial migration support to the libxl driver, using the VIR_DRV_FEATURE_MIGRATION_PARAMS family of migration functions. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- V6 here https://www.redhat.com/archives/libvir-list/2014-May/msg00017.html In V7: There were no comments on V6, but during testing I noticed that 'virsh migrate --suspend ...' was not being honored. Fixed that in this version so that the domain is paused on the destination once migration completes. po/POTFILES.in | 1 + src/Makefile.am | 3 +- src/libxl/libxl_conf.h | 6 + src/libxl/libxl_domain.h | 1 + src/libxl/libxl_driver.c | 235 ++++++++++++++++++ src/libxl/libxl_migration.c | 581 ++++++++++++++++++++++++++++++++++++++++++++ src/libxl/libxl_migration.h | 79 ++++++ 7 files changed, 905 insertions(+), 1 deletion(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index e35eb82..a72dc1e 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -73,6 +73,7 @@ src/lxc/lxc_process.c src/libxl/libxl_domain.c src/libxl/libxl_driver.c src/libxl/libxl_conf.c +src/libxl/libxl_migration.c src/network/bridge_driver.c src/network/bridge_driver_linux.c src/node_device/node_device_driver.c diff --git a/src/Makefile.am b/src/Makefile.am index e9dc9e0..0dbda7f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -706,7 +706,8 @@ XENAPI_DRIVER_SOURCES = \ LIBXL_DRIVER_SOURCES = \ libxl/libxl_conf.c libxl/libxl_conf.h \ libxl/libxl_domain.c libxl/libxl_domain.h \ - libxl/libxl_driver.c libxl/libxl_driver.h + libxl/libxl_driver.c libxl/libxl_driver.h \ + libxl/libxl_migration.c libxl/libxl_migration.h UML_DRIVER_SOURCES = \ uml/uml_conf.c uml/uml_conf.h \ diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index 24e1720..b798567 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -43,6 +43,9 @@ # define LIBXL_VNC_PORT_MIN 5900 # define LIBXL_VNC_PORT_MAX 65535 +# define LIBXL_MIGRATION_PORT_MIN 49152 +# define LIBXL_MIGRATION_PORT_MAX 49216 + # define LIBXL_CONFIG_DIR SYSCONFDIR "/libvirt/libxl" # define LIBXL_AUTOSTART_DIR LIBXL_CONFIG_DIR "/autostart" # define LIBXL_STATE_DIR LOCALSTATEDIR "/run/libvirt/libxl" @@ -115,6 +118,9 @@ struct _libxlDriverPrivate { /* Immutable pointer, self-locking APIs */ virPortAllocatorPtr reservedVNCPorts; + /* Immutable pointer, self-locking APIs */ + virPortAllocatorPtr migrationPorts; + /* Immutable pointer, lockless APIs*/ virSysinfoDefPtr hostsysinfo; }; diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h index 979ce2a..9d48049 100644 --- a/src/libxl/libxl_domain.h +++ b/src/libxl/libxl_domain.h @@ -69,6 +69,7 @@ struct _libxlDomainObjPrivate { virChrdevsPtr devs; libxl_evgen_domain_death *deathW; libxlDriverPrivatePtr driver; + unsigned short migrationPort; struct libxlDomainJobObj job; }; diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index df7d510..35467ac 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -45,6 +45,7 @@ #include "libxl_domain.h" #include "libxl_driver.h" #include "libxl_conf.h" +#include "libxl_migration.h" #include "xen_xm.h" #include "xen_sxpr.h" #include "virtypedparam.h" @@ -209,6 +210,7 @@ libxlStateCleanup(void) virObjectUnref(libxl_driver->xmlopt); virObjectUnref(libxl_driver->domains); virObjectUnref(libxl_driver->reservedVNCPorts); + virObjectUnref(libxl_driver->migrationPorts); virObjectEventStateFree(libxl_driver->domainEventState); virSysinfoDefFree(libxl_driver->hostsysinfo); @@ -301,6 +303,13 @@ libxlStateInitialize(bool privileged, LIBXL_VNC_PORT_MAX))) goto error; + /* Allocate bitmap for migration port reservation */ + if (!(libxl_driver->migrationPorts = + virPortAllocatorNew(_("migration"), + LIBXL_MIGRATION_PORT_MIN, + LIBXL_MIGRATION_PORT_MAX))) + goto error; + if (!(libxl_driver->domains = virDomainObjListNew())) goto error; @@ -4155,6 +4164,7 @@ libxlConnectSupportsFeature(virConnectPtr conn, int feature) switch (feature) { case VIR_DRV_FEATURE_TYPED_PARAM_STRING: + case VIR_DRV_FEATURE_MIGRATION_PARAMS: return 1; default: return 0; @@ -4333,6 +4343,226 @@ libxlNodeDeviceReset(virNodeDevicePtr dev) return ret; } +static char * +libxlDomainMigrateBegin3Params(virDomainPtr domain, + virTypedParameterPtr params, + int nparams, + char **cookieout ATTRIBUTE_UNUSED, + int *cookieoutlen ATTRIBUTE_UNUSED, + unsigned int flags) +{ + const char *xmlin = NULL; + virDomainObjPtr vm = NULL; + + virCheckFlags(LIBXL_MIGRATION_FLAGS, NULL); + if (virTypedParamsValidate(params, nparams, LIBXL_MIGRATION_PARAMETERS) < 0) + return NULL; + + if (virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_DEST_XML, + &xmlin) < 0) + return NULL; + + if (!(vm = libxlDomObjFromDomain(domain))) + return NULL; + + if (virDomainMigrateBegin3ParamsEnsureACL(domain->conn, vm->def) < 0) { + virObjectUnlock(vm); + return NULL; + } + + if (!virDomainObjIsActive(vm)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + virObjectUnlock(vm); + return NULL; + } + + return libxlDomainMigrationBegin(domain->conn, vm, xmlin); +} + +static int +libxlDomainMigratePrepare3Params(virConnectPtr dconn, + virTypedParameterPtr params, + int nparams, + const char *cookiein ATTRIBUTE_UNUSED, + int cookieinlen ATTRIBUTE_UNUSED, + char **cookieout ATTRIBUTE_UNUSED, + int *cookieoutlen ATTRIBUTE_UNUSED, + char **uri_out, + unsigned int flags) +{ + libxlDriverPrivatePtr driver = dconn->privateData; + virDomainDefPtr def = NULL; + const char *dom_xml = NULL; + const char *dname = NULL; + const char *uri_in = NULL; + + virCheckFlags(LIBXL_MIGRATION_FLAGS, -1); + if (virTypedParamsValidate(params, nparams, LIBXL_MIGRATION_PARAMETERS) < 0) + goto error; + + if (virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_DEST_XML, + &dom_xml) < 0 || + virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_DEST_NAME, + &dname) < 0 || + virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_URI, + &uri_in) < 0) + + goto error; + + if (!(def = libxlDomainMigrationPrepareDef(driver, dom_xml, dname))) + goto error; + + if (virDomainMigratePrepare3ParamsEnsureACL(dconn, def) < 0) + goto error; + + if (libxlDomainMigrationPrepare(dconn, def, uri_in, uri_out, flags) < 0) + goto error; + + return 0; + + error: + virDomainDefFree(def); + return -1; +} + +static int +libxlDomainMigratePerform3Params(virDomainPtr dom, + const char *dconnuri, + virTypedParameterPtr params, + int nparams, + const char *cookiein ATTRIBUTE_UNUSED, + int cookieinlen ATTRIBUTE_UNUSED, + char **cookieout ATTRIBUTE_UNUSED, + int *cookieoutlen ATTRIBUTE_UNUSED, + unsigned int flags) +{ + libxlDriverPrivatePtr driver = dom->conn->privateData; + virDomainObjPtr vm = NULL; + const char *dom_xml = NULL; + const char *dname = NULL; + const char *uri = NULL; + int ret = -1; + + virCheckFlags(LIBXL_MIGRATION_FLAGS, -1); + if (virTypedParamsValidate(params, nparams, LIBXL_MIGRATION_PARAMETERS) < 0) + goto cleanup; + + if (virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_DEST_XML, + &dom_xml) < 0 || + virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_DEST_NAME, + &dname) < 0 || + virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_URI, + &uri) < 0) + + goto cleanup; + + if (!(vm = libxlDomObjFromDomain(dom))) + goto cleanup; + + if (virDomainMigratePerform3ParamsEnsureACL(dom->conn, vm->def) < 0) + goto cleanup; + + if (libxlDomainMigrationPerform(driver, vm, dom_xml, dconnuri, + uri, dname, flags) < 0) { + /* Job terminated and vm unlocked if MigrationPerform failed */ + vm = NULL; + goto cleanup; + } + + ret = 0; + + cleanup: + if (vm) + virObjectUnlock(vm); + return ret; +} + +static virDomainPtr +libxlDomainMigrateFinish3Params(virConnectPtr dconn, + virTypedParameterPtr params, + int nparams, + const char *cookiein ATTRIBUTE_UNUSED, + int cookieinlen ATTRIBUTE_UNUSED, + char **cookieout ATTRIBUTE_UNUSED, + int *cookieoutlen ATTRIBUTE_UNUSED, + unsigned int flags, + int cancelled) +{ + libxlDriverPrivatePtr driver = dconn->privateData; + virDomainObjPtr vm = NULL; + const char *dname = NULL; + + virCheckFlags(LIBXL_MIGRATION_FLAGS, NULL); + if (virTypedParamsValidate(params, nparams, LIBXL_MIGRATION_PARAMETERS) < 0) + return NULL; + + if (virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_DEST_NAME, + &dname) < 0) + return NULL; + + if (!dname || + !(vm = virDomainObjListFindByName(driver->domains, dname))) { + /* Migration obviously failed if the domain doesn't exist */ + virReportError(VIR_ERR_OPERATION_FAILED, + _("Migration failed. No domain on destination host " + "with matching name '%s'"), + NULLSTR(dname)); + return NULL; + } + + if (virDomainMigrateFinish3ParamsEnsureACL(dconn, vm->def) < 0) { + virObjectUnlock(vm); + return NULL; + } + + if (!virDomainObjIsActive(vm)) { + /* Migration failed if domain is inactive */ + virReportError(VIR_ERR_OPERATION_FAILED, + "%s", _("Migration failed. Domain is not running " + "on destination host")); + virObjectUnlock(vm); + return NULL; + } + + return libxlDomainMigrationFinish(dconn, vm, flags, cancelled); +} + +static int +libxlDomainMigrateConfirm3Params(virDomainPtr domain, + virTypedParameterPtr params, + int nparams, + const char *cookiein ATTRIBUTE_UNUSED, + int cookieinlen ATTRIBUTE_UNUSED, + unsigned int flags, + int cancelled) +{ + libxlDriverPrivatePtr driver = domain->conn->privateData; + virDomainObjPtr vm = NULL; + + virCheckFlags(LIBXL_MIGRATION_FLAGS, -1); + if (virTypedParamsValidate(params, nparams, LIBXL_MIGRATION_PARAMETERS) < 0) + return -1; + + if (!(vm = libxlDomObjFromDomain(domain))) + return -1; + + if (virDomainMigrateConfirm3ParamsEnsureACL(domain->conn, vm->def) < 0) { + virObjectUnlock(vm); + return -1; + } + + return libxlDomainMigrationConfirm(driver, vm, flags, cancelled); +} + static virDriver libxlDriver = { .no = VIR_DRV_LIBXL, @@ -4423,6 +4653,11 @@ static virDriver libxlDriver = { .nodeDeviceDetachFlags = libxlNodeDeviceDetachFlags, /* 1.2.3 */ .nodeDeviceReAttach = libxlNodeDeviceReAttach, /* 1.2.3 */ .nodeDeviceReset = libxlNodeDeviceReset, /* 1.2.3 */ + .domainMigrateBegin3Params = libxlDomainMigrateBegin3Params, /* 1.2.3 */ + .domainMigratePrepare3Params = libxlDomainMigratePrepare3Params, /* 1.2.3 */ + .domainMigratePerform3Params = libxlDomainMigratePerform3Params, /* 1.2.3 */ + .domainMigrateFinish3Params = libxlDomainMigrateFinish3Params, /* 1.2.3 */ + .domainMigrateConfirm3Params = libxlDomainMigrateConfirm3Params, /* 1.2.3 */ }; static virStateDriver libxlStateDriver = { diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c new file mode 100644 index 0000000..e3699c5 --- /dev/null +++ b/src/libxl/libxl_migration.c @@ -0,0 +1,581 @@ +/* + * libxl_migration.c: methods for handling migration with libxenlight + * + * Copyright (C) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Authors: + * Jim Fehlig <jfehlig(a)suse.com> + * Chunyan Liu <cyliu(a)suse.com> + */ + +#include <config.h> + +#include "internal.h" +#include "virlog.h" +#include "virerror.h" +#include "virconf.h" +#include "datatypes.h" +#include "virfile.h" +#include "viralloc.h" +#include "viruuid.h" +#include "vircommand.h" +#include "virstring.h" +#include "virobject.h" +#include "rpc/virnetsocket.h" +#include "libxl_domain.h" +#include "libxl_driver.h" +#include "libxl_conf.h" +#include "libxl_migration.h" + +#define VIR_FROM_THIS VIR_FROM_LIBXL + +VIR_LOG_INIT("libxl.libxl_migration"); + +typedef struct _libxlMigrationDstArgs { + virObject parent; + + virConnectPtr conn; + virDomainObjPtr vm; + unsigned int flags; + + /* for freeing listen sockets */ + virNetSocketPtr *socks; + size_t nsocks; +} libxlMigrationDstArgs; + +static virClassPtr libxlMigrationDstArgsClass; + +static void +libxlMigrationDstArgsDispose(void *obj) +{ + libxlMigrationDstArgs *args = obj; + + VIR_FREE(args->socks); +} + +static int +libxlMigrationDstArgsOnceInit(void) +{ + if (!(libxlMigrationDstArgsClass = virClassNew(virClassForObject(), + "libxlMigrationDstArgs", + sizeof(libxlMigrationDstArgs), + libxlMigrationDstArgsDispose))) + return -1; + + return 0; +} + +VIR_ONCE_GLOBAL_INIT(libxlMigrationDstArgs) + +static void +libxlDoMigrateReceive(virNetSocketPtr sock, + int events ATTRIBUTE_UNUSED, + void *opaque) +{ + libxlMigrationDstArgs *args = opaque; + virConnectPtr conn = args->conn; + virDomainObjPtr vm = args->vm; + virNetSocketPtr *socks = args->socks; + size_t nsocks = args->nsocks; + bool paused = args->flags & VIR_MIGRATE_PAUSED; + libxlDriverPrivatePtr driver = conn->privateData; + virNetSocketPtr client_sock; + int recvfd = -1; + size_t i; + int ret; + + virNetSocketAccept(sock, &client_sock); + if (client_sock == NULL) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("Fail to accept migration connection")); + goto cleanup; + } + VIR_DEBUG("Accepted migration connection\n"); + recvfd = virNetSocketDupFD(client_sock, true); + virObjectUnref(client_sock); + + virObjectLock(vm); + ret = libxlDomainStart(driver, vm, paused, recvfd); + virObjectUnlock(vm); + + if (ret < 0 && !vm->persistent) + virDomainObjListRemove(driver->domains, vm); + + cleanup: + /* Remove all listen socks from event handler, and close them. */ + for (i = 0; i < nsocks; i++) { + virNetSocketUpdateIOCallback(socks[i], 0); + virNetSocketRemoveIOCallback(socks[i]); + virNetSocketClose(socks[i]); + virObjectUnref(socks[i]); + } + + VIR_FORCE_CLOSE(recvfd); +} + +static int +libxlDoMigrateSend(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + unsigned long flags, + int sockfd) +{ + libxlDomainObjPrivatePtr priv; + libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); + virObjectEventPtr event = NULL; + int xl_flags = 0; + int ret; + + if (flags & VIR_MIGRATE_LIVE) + xl_flags = LIBXL_SUSPEND_LIVE; + + priv = vm->privateData; + ret = libxl_domain_suspend(priv->ctx, vm->def->id, sockfd, + xl_flags, NULL); + if (ret != 0) { + /* attempt to resume the domain on failure */ + if (libxl_domain_resume(priv->ctx, vm->def->id, 0, 0) != 0) { + VIR_DEBUG("Failed to resume domain following failed migration"); + virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, + VIR_DOMAIN_PAUSED_MIGRATION); + event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_SUSPENDED, + VIR_DOMAIN_EVENT_SUSPENDED_MIGRATED); + ignore_value(virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm)); + } + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to send migration data to destination host")); + ret = -1; + goto cleanup; + } + + cleanup: + if (event) + libxlDomainEventQueue(driver, event); + virObjectUnref(cfg); + return ret; +} + +static bool +libxlDomainMigrationIsAllowed(virDomainDefPtr def) +{ + /* Migration is not allowed if definition contains any hostdevs */ + if (def->nhostdevs > 0) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("domain has assigned host devices")); + return false; + } + + return true; +} + +char * +libxlDomainMigrationBegin(virConnectPtr conn, + virDomainObjPtr vm, + const char *xmlin) +{ + libxlDriverPrivatePtr driver = conn->privateData; + libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); + virDomainDefPtr tmpdef = NULL; + virDomainDefPtr def; + char *xml = NULL; + + if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) + goto cleanup; + + if (xmlin) { + if (!(tmpdef = virDomainDefParseString(xmlin, cfg->caps, + driver->xmlopt, + 1 << VIR_DOMAIN_VIRT_XEN, + VIR_DOMAIN_XML_INACTIVE))) + goto endjob; + + def = tmpdef; + } else { + def = vm->def; + } + + if (!libxlDomainMigrationIsAllowed(def)) + goto endjob; + + xml = virDomainDefFormat(def, VIR_DOMAIN_XML_SECURE); + + cleanup: + if (vm) + virObjectUnlock(vm); + + virDomainDefFree(tmpdef); + virObjectUnref(cfg); + return xml; + + endjob: + if (!libxlDomainObjEndJob(driver, vm)) + vm = NULL; + goto cleanup; +} + +virDomainDefPtr +libxlDomainMigrationPrepareDef(libxlDriverPrivatePtr driver, + const char *dom_xml, + const char *dname) +{ + libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); + virDomainDefPtr def; + char *name = NULL; + + if (!dom_xml) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("no domain XML passed")); + return NULL; + } + + if (!(def = virDomainDefParseString(dom_xml, cfg->caps, driver->xmlopt, + 1 << VIR_DOMAIN_VIRT_XEN, + VIR_DOMAIN_XML_INACTIVE))) + goto cleanup; + + if (dname) { + name = def->name; + if (VIR_STRDUP(def->name, dname) < 0) { + virDomainDefFree(def); + def = NULL; + } + } + + cleanup: + virObjectUnref(cfg); + VIR_FREE(name); + return def; +} + +int +libxlDomainMigrationPrepare(virConnectPtr dconn, + virDomainDefPtr def, + const char *uri_in, + char **uri_out, + unsigned int flags) +{ + libxlDriverPrivatePtr driver = dconn->privateData; + virDomainObjPtr vm = NULL; + char *hostname = NULL; + unsigned short port; + char portstr[100]; + virURIPtr uri = NULL; + virNetSocketPtr *socks = NULL; + size_t nsocks = 0; + int nsocks_listen = 0; + libxlMigrationDstArgs *args; + size_t i; + int ret = -1; + + if (!(vm = virDomainObjListAdd(driver->domains, def, + driver->xmlopt, + VIR_DOMAIN_OBJ_LIST_ADD_LIVE | + VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE, + NULL))) + goto cleanup; + + /* Create socket connection to receive migration data */ + if (!uri_in) { + if ((hostname = virGetHostname()) == NULL) + goto cleanup; + + if (STRPREFIX(hostname, "localhost")) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("hostname on destination resolved to localhost," + " but migration requires an FQDN")); + goto cleanup; + } + + if (virPortAllocatorAcquire(driver->migrationPorts, &port) < 0) + goto cleanup; + + if (virAsprintf(uri_out, "tcp://%s:%d", hostname, port) < 0) + goto cleanup; + } else { + if (!(STRPREFIX(uri_in, "tcp://"))) { + /* not full URI, add prefix tcp:// */ + char *tmp; + if (virAsprintf(&tmp, "tcp://%s", uri_in) < 0) + goto cleanup; + uri = virURIParse(tmp); + VIR_FREE(tmp); + } else { + uri = virURIParse(uri_in); + } + + if (uri == NULL) { + virReportError(VIR_ERR_INVALID_ARG, + _("unable to parse URI: %s"), + uri_in); + goto cleanup; + } + + if (uri->server == NULL) { + virReportError(VIR_ERR_INVALID_ARG, + _("missing host in migration URI: %s"), + uri_in); + goto cleanup; + } else { + hostname = uri->server; + } + + if (uri->port == 0) { + if (virPortAllocatorAcquire(driver->migrationPorts, &port) < 0) + goto cleanup; + + } else { + port = uri->port; + } + + if (virAsprintf(uri_out, "tcp://%s:%d", hostname, port) < 0) + goto cleanup; + } + + snprintf(portstr, sizeof(portstr), "%d", port); + + if (virNetSocketNewListenTCP(hostname, portstr, &socks, &nsocks) < 0) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("Fail to create socket for incoming migration")); + goto cleanup; + } + + if (libxlMigrationDstArgsInitialize() < 0) + goto cleanup; + + if (!(args = virObjectNew(libxlMigrationDstArgsClass))) + goto cleanup; + + args->conn = dconn; + args->vm = vm; + args->flags = flags; + args->socks = socks; + args->nsocks = nsocks; + + for (i = 0; i < nsocks; i++) { + if (virNetSocketSetBlocking(socks[i], true) < 0) + continue; + + if (virNetSocketListen(socks[i], 1) < 0) + continue; + + if (virNetSocketAddIOCallback(socks[i], + VIR_EVENT_HANDLE_READABLE, + libxlDoMigrateReceive, + args, + virObjectFreeCallback) < 0) + continue; + + /* + * Successfully added sock to event loop. Take a ref on args to + * ensure it is not freed until sock is removed from the event loop. + * Ref is dropped in virObjectFreeCallback after being removed + * from the event loop. + */ + virObjectRef(args); + nsocks_listen++; + } + + /* Done with args in this function, drop reference */ + virObjectUnref(args); + + if (!nsocks_listen) + goto cleanup; + + ret = 0; + goto done; + + cleanup: + for (i = 0; i < nsocks; i++) { + virNetSocketClose(socks[i]); + virObjectUnref(socks[i]); + } + + done: + virURIFree(uri); + if (vm) + virObjectUnlock(vm); + return ret; +} + +int +libxlDomainMigrationPerform(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + const char *dom_xml ATTRIBUTE_UNUSED, + const char *dconnuri ATTRIBUTE_UNUSED, + const char *uri_str, + const char *dname ATTRIBUTE_UNUSED, + unsigned int flags) +{ + char *hostname = NULL; + unsigned short port = 0; + char portstr[100]; + virURIPtr uri = NULL; + virNetSocketPtr sock; + int sockfd = -1; + int saved_errno = EINVAL; + int ret = -1; + + /* parse dst host:port from uri */ + uri = virURIParse(uri_str); + if (uri == NULL || uri->server == NULL || uri->port == 0) + goto cleanup; + + hostname = uri->server; + port = uri->port; + snprintf(portstr, sizeof(portstr), "%d", port); + + /* socket connect to dst host:port */ + if (virNetSocketNewConnectTCP(hostname, portstr, &sock) < 0) { + virReportSystemError(saved_errno, + _("unable to connect to '%s:%s'"), + hostname, portstr); + goto cleanup; + } + + if (virNetSocketSetBlocking(sock, true) < 0) { + virObjectUnref(sock); + goto cleanup; + } + + sockfd = virNetSocketDupFD(sock, true); + virObjectUnref(sock); + + /* suspend vm and send saved data to dst through socket fd */ + virObjectUnlock(vm); + ret = libxlDoMigrateSend(driver, vm, flags, sockfd); + virObjectLock(vm); + + cleanup: + /* If failure, terminate the job started in MigrationBegin */ + if (ret == -1) { + if (libxlDomainObjEndJob(driver, vm)) + virObjectUnlock(vm); + } + VIR_FORCE_CLOSE(sockfd); + virURIFree(uri); + return ret; +} + +virDomainPtr +libxlDomainMigrationFinish(virConnectPtr dconn, + virDomainObjPtr vm, + unsigned int flags, + int cancelled) +{ + libxlDriverPrivatePtr driver = dconn->privateData; + libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); + libxlDomainObjPrivatePtr priv = vm->privateData; + virObjectEventPtr event = NULL; + virDomainPtr dom = NULL; + + virPortAllocatorRelease(driver->migrationPorts, priv->migrationPort); + priv->migrationPort = 0; + + if (cancelled) + goto cleanup; + + if (!(flags & VIR_MIGRATE_PAUSED)) { + if (libxl_domain_unpause(priv->ctx, vm->def->id) != 0) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("Failed to unpause domain")); + goto cleanup; + } + + virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, + VIR_DOMAIN_RUNNING_MIGRATED); + event = virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_RESUMED, + VIR_DOMAIN_EVENT_RESUMED_MIGRATED); + } else { + virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_USER); + event = virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_SUSPENDED, + VIR_DOMAIN_EVENT_SUSPENDED_PAUSED); + } + + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + goto cleanup; + + dom = virGetDomain(dconn, vm->def->name, vm->def->uuid); + + if (dom == NULL) { + libxl_domain_destroy(priv->ctx, vm->def->id, NULL); + libxlDomainCleanup(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED); + event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_FAILED); + libxlDomainEventQueue(driver, event); + } + + cleanup: + if (event) + libxlDomainEventQueue(driver, event); + if (vm) + virObjectUnlock(vm); + virObjectUnref(cfg); + return dom; +} + +int +libxlDomainMigrationConfirm(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + unsigned int flags, + int cancelled) +{ + libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); + libxlDomainObjPrivatePtr priv = vm->privateData; + virObjectEventPtr event = NULL; + int ret = -1; + + if (cancelled) { + if (libxl_domain_resume(priv->ctx, vm->def->id, 1, 0) == 0) { + ret = 0; + } else { + VIR_DEBUG("Unable to resume domain '%s' after failed migration", + vm->def->name); + virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, + VIR_DOMAIN_PAUSED_MIGRATION); + event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_SUSPENDED, + VIR_DOMAIN_EVENT_SUSPENDED_MIGRATED); + ignore_value(virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm)); + } + goto cleanup; + } + + libxl_domain_destroy(priv->ctx, vm->def->id, NULL); + libxlDomainCleanup(driver, vm, VIR_DOMAIN_SHUTOFF_MIGRATED); + event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_MIGRATED); + + VIR_DEBUG("Domain '%s' successfully migrated", vm->def->name); + + if (flags & VIR_MIGRATE_UNDEFINE_SOURCE) + virDomainDeleteConfig(cfg->configDir, cfg->autostartDir, vm); + + if (!vm->persistent || (flags & VIR_MIGRATE_UNDEFINE_SOURCE)) + virDomainObjListRemove(driver->domains, vm); + + ret = 0; + + cleanup: + if (!libxlDomainObjEndJob(driver, vm)) + vm = NULL; + if (event) + libxlDomainEventQueue(driver, event); + if (vm) + virObjectUnlock(vm); + virObjectUnref(cfg); + return ret; +} diff --git a/src/libxl/libxl_migration.h b/src/libxl/libxl_migration.h new file mode 100644 index 0000000..aab96f5 --- /dev/null +++ b/src/libxl/libxl_migration.h @@ -0,0 +1,79 @@ +/* + * libxl_migration.h: methods for handling migration with libxenlight + * + * Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Authors: + * Jim Fehlig <jfehlig(a)suse.com> + */ + +#ifndef LIBXL_MIGRATION_H +# define LIBXL_MIGRATION_H + +# include "libxl_conf.h" + +# define LIBXL_MIGRATION_FLAGS \ + (VIR_MIGRATE_LIVE | \ + VIR_MIGRATE_UNDEFINE_SOURCE | \ + VIR_MIGRATE_PAUSED) + +/* All supported migration parameters and their types. */ +# define LIBXL_MIGRATION_PARAMETERS \ + VIR_MIGRATE_PARAM_URI, VIR_TYPED_PARAM_STRING, \ + VIR_MIGRATE_PARAM_DEST_NAME, VIR_TYPED_PARAM_STRING, \ + VIR_MIGRATE_PARAM_DEST_XML, VIR_TYPED_PARAM_STRING, \ + NULL + +char * +libxlDomainMigrationBegin(virConnectPtr conn, + virDomainObjPtr vm, + const char *xmlin); + +virDomainDefPtr +libxlDomainMigrationPrepareDef(libxlDriverPrivatePtr driver, + const char *dom_xml, + const char *dname); + +int +libxlDomainMigrationPrepare(virConnectPtr dconn, + virDomainDefPtr def, + const char *uri_in, + char **uri_out, + unsigned int flags); + +int +libxlDomainMigrationPerform(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + const char *dom_xml, + const char *dconnuri, + const char *uri_str, + const char *dname, + unsigned int flags); + +virDomainPtr +libxlDomainMigrationFinish(virConnectPtr dconn, + virDomainObjPtr vm, + unsigned int flags, + int cancelled); + +int +libxlDomainMigrationConfirm(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + unsigned int flags, + int cancelled); + +#endif /* LIBXL_DRIVER_H */ -- 1.8.1.4

2 3

[libvirt] [PATCH] cfg.mk: Introduce rule for setlocale()
by Michal Privoznik 04 Jun '14

04 Jun '14

In the past we had some issues where setlocale() was called without corresponding include of locale.h. While on some systems this may work, on others the compilation failed. We should have a syntax-check rule for that to prevent this from happening again. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- cfg.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cfg.mk b/cfg.mk index 9e8fcec..36395c6 100644 --- a/cfg.mk +++ b/cfg.mk @@ -929,6 +929,15 @@ sc_prohibit_mixed_case_abbreviations: halt='Use PCI, USB, SCSI, not Pci, Usb, Scsi' \ $(_sc_search_regexp) +# Require #include <locale.h> in all files that call setlocale() +sc_require_locale_h: + @for i in $$($(VC_LIST_EXCEPT) | grep '\.[chx]$$'); do \ + if test -z "$$(grep setlocale $$i)" ; then continue; fi; \ + if test -z "$$(grep 'include <locale.h>' $$i)" ; then \ + echo '$(ME): missing locale.h include in' $$i 1>&2; exit 1; \ + fi; \ + done; + # We don't use this feature of maint.mk. prev_version_file = /dev/null -- 2.0.0

3 4

[libvirt] Parse commandline for -device option
by Hong-Hua.Yin＠freescale.com 04 Jun '14

04 Jun '14

Hi Maintainers, Currently libvirt could only parse commandline for several legacy devices. For example, -pcidevice: qemuParseCommandLinePCI() -usbdevice: qemuParseCommandLineUSB() It also provides test cases for host device assignment. DO_TEST("hostdev-usb-address"); DO_TEST("hostdev-pci-address"); But for other hostdev with -device option, it failed to convert into <hostdev> tag. -device vfio-pci,host=06:12.5,id=hostdev0,bus=pci.0,addr=0x3 $ virsh domxml-from-native qemu-argv kvm.args >kvm.xml <qemu:commandline> <qemu:arg value='-device'/> <qemu:arg value='vfio-pci,host=06:12.5,id=hostdev0,bus=pci.0,addr=0x3'/> </qemu:commandline> Expected XML file should like below: <hostdev mode='subsystem' type='pci' managed='yes'> <driver name='vfio'/> <source> <address domain='0x0000' bus='0x06' slot='0x12' function='0x5'/> </source> </hostdev> Maybe it is not very critical. Is it complicated to add support to -device option in function qemuParseCommandLine()? Do you have any thought or plan about it? Best Regards, Olivia

3 2

[libvirt] Problem connecting to hypervisor.
by Vikas Kokare 04 Jun '14

04 Jun '14

I am trying to establish a connection (using virsh command) to a couple of hypervisor hosts, both on SLES 11.3 environments. The host from where i am making both the connections is a SLES 10.4 instance. *kvmh911351246:~ # virsh -c qemu+ssh://9.113.51.247:22/system <http://9.113.51.247:22/system>libvir: XML-RPC error : authentication requirederror: failed to connect to the hypervisor* The SSH authentication to hypervisor host 9.113.51.247 has already been established. *kvmh911351246:~ # ssh root(a)9.113.51.247 <root(a)9.113.51.247>Last login: Tue Jun 3 11:31:56 2014 from scm-kvmh2-rhel6 SLES11-51-247:~ #* Hence the cause of the authentication failure is not clear. The second connection to another SLES 11.3 host looks like *virsh # connect qemu+ssh://9.121.58.19:22/system <http://9.121.58.19:22/system> bash: socat: command not foundlibvir: Remote error : socket closed unexpectedlyerror: Failed to connect to the hypervisor* where the cause of the error is entirely different. The libvirt packages available on these environments are *9.113.51.247 (SLES 11.3)* *libvirt-cim-0.5.12-0.7.16libvirt-1.0.5.1-0.7.10libvirt-python-1.0.5.1-0.7.10libvirt-client-32bit-1.0.5.1-0.7.10 libvirt-lock-sanlock-1.0.5.1-0.7.10libvirt-client-1.0.5.1-0.7.10* *9.121.58.19 (SLES 11.3)* *libvirt-cim-0.5.12-0.7.16libvirt-client-1.0.5.1-0.7.10libvirt-python-1.0.5.1-0.7.10 libvirt-1.0.5.1-0.7.10* *9.113.51.246 ( SLES 10.4)* *libvirt-python-0.3.3-18.22.1libvirt-devel-0.3.3-18.22.1libvirt-0.3.3-18.22.1* How can these connection failures be debugged? Is there a way to know more information about them?

2 1

[libvirt] [PATCH] virnuma: Check for numa_bitmask_isbitset presence
by Michal Privoznik 04 Jun '14

04 Jun '14

On some systems, libnuma can be present but it's so ancient that it misses some symbols that virNumaGetDistances() needs. To be more precise: numa_bitmask_isbitset() and numa_nodes_ptr are the symbols in question. Fortunately, they were both introduced in the same release so it's sufficient for us to check for only one of them. And the winner is numa_bitmask_isbitset(). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Notes: While this is a build breaker, it's not that critical. Come on - who runs libvirt from git on stable enterprise systems? I'm sending it to know if the check for numa_bitmask_isbitset() is in the right place or should be moved to a different file. m4/virt-numactl.m4 | 4 ++ src/util/virnuma.c | 135 +++++++++++++++++++++++++++-------------------------- 2 files changed, 73 insertions(+), 66 deletions(-) diff --git a/m4/virt-numactl.m4 b/m4/virt-numactl.m4 index 1dcb029..fa66d24 100644 --- a/m4/virt-numactl.m4 +++ b/m4/virt-numactl.m4 @@ -19,6 +19,10 @@ dnl AC_DEFUN([LIBVIRT_CHECK_NUMACTL],[ LIBVIRT_CHECK_LIB([NUMACTL], [numa], [numa_available], [numa.h]) + AC_CHECK_LIB([numa], [numa_bitmask_isbitset], [have_numa_bitmask_isbitset=yes]) + if test "$have_numa_bitmask_isbitset" = "yes"; then + AC_DEFINE_UNQUOTED([HAVE_NUMA_BITMASK_ISBITSET], 1, [whether numa_bitmask_isbitset is available]) + fi ]) AC_DEFUN([LIBVIRT_RESULT_NUMACTL],[ diff --git a/src/util/virnuma.c b/src/util/virnuma.c index 042844b..f979f49 100644 --- a/src/util/virnuma.c +++ b/src/util/virnuma.c @@ -217,61 +217,6 @@ virNumaGetMaxNode(void) /** - * virNumaGetDistances: - * @node: identifier of the requested NUMA node - * @distances: array of distances to sibling nodes - * @ndistances: size of @distances - * - * Get array of distances to sibling nodes from @node. If a - * distances[x] equals to zero, the node x is not enabled or - * doesn't exist. As a special case, if @node itself refers to - * disabled or nonexistent NUMA node, then @distances and - * @ndistances are set to NULL and zero respectively. - * - * The distances are a bit of magic. For a local node the value - * is 10, for remote it's typically 20 meaning that time penalty - * for accessing a remote node is two time bigger than when - * accessing a local node. - * - * Returns 0 on success, -1 otherwise. - */ -int -virNumaGetDistances(int node, - int **distances, - int *ndistances) -{ - int ret = -1; - int max_node; - size_t i; - - if (!numa_bitmask_isbitset(numa_nodes_ptr, node)) { - VIR_DEBUG("Node %d does not exist", node); - *distances = NULL; - *ndistances = 0; - return 0; - } - - if ((max_node = virNumaGetMaxNode()) < 0) - goto cleanup; - - if (VIR_ALLOC_N(*distances, max_node) < 0) - goto cleanup; - - *ndistances = max_node + 1; - - for (i = 0; i<= max_node; i++) { - if (!numa_bitmask_isbitset(numa_nodes_ptr, i)) - continue; - - (*distances)[i] = numa_distance(node, i); - } - - ret = 0; - cleanup: - return ret; -} - -/** * virNumaGetNodeMemory: * @node: identifier of the requested NUMA node * @memsize: returns the total size of memory in the NUMA node @@ -443,17 +388,6 @@ virNumaGetNodeCPUs(int node ATTRIBUTE_UNUSED, _("NUMA isn't available on this host")); return -1; } - -int -virNumaGetDistances(int node ATTRIBUTE_UNUSED, - int **distances, - int *ndistances) -{ - *distances = NULL; - *ndistances = 0; - VIR_DEBUG("NUMA isn't available on this host"); - return 0; -} #endif @@ -469,3 +403,72 @@ virNumaGetMaxCPUs(void) { return NUMA_MAX_N_CPUS; } + + +#ifdef HAVE_NUMA_BITMASK_ISBITSET +/** + * virNumaGetDistances: + * @node: identifier of the requested NUMA node + * @distances: array of distances to sibling nodes + * @ndistances: size of @distances + * + * Get array of distances to sibling nodes from @node. If a + * distances[x] equals to zero, the node x is not enabled or + * doesn't exist. As a special case, if @node itself refers to + * disabled or nonexistent NUMA node, then @distances and + * @ndistances are set to NULL and zero respectively. + * + * The distances are a bit of magic. For a local node the value + * is 10, for remote it's typically 20 meaning that time penalty + * for accessing a remote node is two time bigger than when + * accessing a local node. + * + * Returns 0 on success, -1 otherwise. + */ +int +virNumaGetDistances(int node, + int **distances, + int *ndistances) +{ + int ret = -1; + int max_node; + size_t i; + + if (!numa_bitmask_isbitset(numa_nodes_ptr, node)) { + VIR_DEBUG("Node %d does not exist", node); + *distances = NULL; + *ndistances = 0; + return 0; + } + + if ((max_node = virNumaGetMaxNode()) < 0) + goto cleanup; + + if (VIR_ALLOC_N(*distances, max_node) < 0) + goto cleanup; + + *ndistances = max_node + 1; + + for (i = 0; i<= max_node; i++) { + if (!numa_bitmask_isbitset(numa_nodes_ptr, i)) + continue; + + (*distances)[i] = numa_distance(node, i); + } + + ret = 0; + cleanup: + return ret; +} +#else +int +virNumaGetDistances(int node ATTRIBUTE_UNUSED, + int **distances, + int *ndistances) +{ + *distances = NULL; + *ndistances = 0; + VIR_DEBUG("NUMA isn't available on this host"); + return 0; +} +#endif -- 2.0.0

2 1

[libvirt] [RFC] Atomic Operations
by Tucker DiNapoli 04 Jun '14

04 Jun '14

I'm working on job control which involves a lot of locking and unlocking, often for operations that could be done atomically. I use the existing atomic integer operations in viratomic.h where possible, but there are a lot of parameters involved in jobs (such as time, thread id's, progress information, etc) which don't fit in an integer. I have several ideas of ways to update the existing integer atomic operations to support more types. The easiest way (at least regarding code) would be to use an existing atomic operations library. My suggestion would be the libatomic_ops library, which is licensed under an MIT style license and could be added to the source tree as a git submodule (similar to the way gnulib is) or a specific version could be used and the library source itself added to the git repository. The library can be found at https://github.com/ivmai/libatomic_ops/ . The other way of augmenting atomic operations would be to extend the existing viratomic.h file to support additional types. Personally I have experience working with GCC atomic operations and could implement that myself, but I wouldn't be able to implement the windows versions. Again I think the easiest and most maintainable way of supporting atomic operations is via an external library, but I am not sure of the feasibility of adding another dependency to libvirt. In general atomic operations are an optimization, but they can help make multithreaded programming easier and I think libvirt would be enhanced by having more comprehensive support for atomic operations. Tucker DiNapoli

3 2

[libvirt] [libvirt-sandbox] virt-sandbox-service: fixed /lib/ into /usr/lib for searching unit files
by Cédric Bosdonnat 04 Jun '14

04 Jun '14

--- bin/virt-sandbox-service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/virt-sandbox-service b/bin/virt-sandbox-service index 2dcbfb8..9ed37e0 100755 --- a/bin/virt-sandbox-service +++ b/bin/virt-sandbox-service @@ -1071,7 +1071,7 @@ class CheckUnit(argparse.Action): src = "/etc/systemd/system/" + unit if os.path.exists(src): return src - src = "/lib/systemd/system/" + unit + src = "/usr/lib/systemd/system/" + unit if os.path.exists(src): return src return None -- 1.8.4.5

4 7

[libvirt] [PATCH] virnuma: Implement virNumaGetDistances stub for non-NUMA
by Michal Privoznik 04 Jun '14

04 Jun '14

In case the libvirt is built without numactl support, we're missing the virNumaGetDistances() stub so the linking fails: CCLD libvirt_lxc libvirt_lxc-nodeinfo.o: In function `virNodeCapsGetSiblingInfo': /home/zippy/tmp/libvirt.git/src/nodeinfo.c:1763: undefined reference to `virNumaGetDistances' collect2: error: ld returned 1 exit status make[3]: *** [libvirt_lxc] Error 1 The issue was introduced in 77c830d8c4. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Notes: Pushing under build-breaker and trivial rules. src/util/virnuma.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/util/virnuma.c b/src/util/virnuma.c index e8ceec8..042844b 100644 --- a/src/util/virnuma.c +++ b/src/util/virnuma.c @@ -443,6 +443,17 @@ virNumaGetNodeCPUs(int node ATTRIBUTE_UNUSED, _("NUMA isn't available on this host")); return -1; } + +int +virNumaGetDistances(int node ATTRIBUTE_UNUSED, + int **distances, + int *ndistances) +{ + *distances = NULL; + *ndistances = 0; + VIR_DEBUG("NUMA isn't available on this host"); + return 0; +} #endif -- 2.0.0

1 0

[libvirt] [libvirt-glib] spec: Move .vapi files to -devel RPMs
by Christophe Fergeau 04 Jun '14

04 Jun '14

.vapi files are only needed when building vala programs using libvirt-glib, so they belong to the -devel RPMs, not to the non-devel RPMs which only hold files needed at runtime. --- libvirt-glib.spec.in | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libvirt-glib.spec.in b/libvirt-glib.spec.in index f467767..202e624 100644 --- a/libvirt-glib.spec.in +++ b/libvirt-glib.spec.in @@ -162,28 +162,18 @@ rm -rf $RPM_BUILD_ROOT %if %{with_introspection} %{_libdir}/girepository-1.0/LibvirtGLib-1.0.typelib %endif -%if %{with_vala} -%{_datadir}/vala/vapi/libvirt-glib-1.0.vapi -%endif %files -n libvirt-gconfig %{_libdir}/libvirt-gconfig-1.0.so.* %if %{with_introspection} %{_libdir}/girepository-1.0/LibvirtGConfig-1.0.typelib %endif -%if %{with_vala} -%{_datadir}/vala/vapi/libvirt-gconfig-1.0.vapi -%endif %files -n libvirt-gobject %{_libdir}/libvirt-gobject-1.0.so.* %if %{with_introspection} %{_libdir}/girepository-1.0/LibvirtGObject-1.0.typelib %endif -%if %{with_vala} -%{_datadir}/vala/vapi/libvirt-gobject-1.0.deps -%{_datadir}/vala/vapi/libvirt-gobject-1.0.vapi -%endif %files devel %defattr(-,root,root,-) @@ -198,6 +188,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gir-1.0/LibvirtGLib-1.0.gir %endif %{_datadir}/gtk-doc/html/Libvirt-glib +%if %{with_vala} +%{_datadir}/vala/vapi/libvirt-glib-1.0.vapi +%endif %files -n libvirt-gconfig-devel %defattr(-,root,root,-) @@ -212,6 +205,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gir-1.0/LibvirtGConfig-1.0.gir %endif %{_datadir}/gtk-doc/html/Libvirt-gconfig +%if %{with_vala} +%{_datadir}/vala/vapi/libvirt-gconfig-1.0.vapi +%endif %files -n libvirt-gobject-devel %defattr(-,root,root,-) @@ -226,6 +222,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gir-1.0/LibvirtGObject-1.0.gir %endif %{_datadir}/gtk-doc/html/Libvirt-gobject +%if %{with_vala} +%{_datadir}/vala/vapi/libvirt-gobject-1.0.deps +%{_datadir}/vala/vapi/libvirt-gobject-1.0.vapi +%endif %if %{with_python} %files python -- 1.9.3

2 2

[libvirt] [PATCH] build: fix race in vapi/ subdirectory
by Michael Catanzaro 04 Jun '14

04 Jun '14

libvirt-gobject-1.0.vapi depends on libvirt-gconfig-1.0.vapi --- vapi/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vapi/Makefile.am b/vapi/Makefile.am index 0154104..af10e98 100644 --- a/vapi/Makefile.am +++ b/vapi/Makefile.am @@ -17,7 +17,7 @@ libvirt-glib-1.0.vapi: $(top_builddir)/libvirt-glib/LibvirtGLib-1.0.gir --library libvirt-glib-1.0 \ $< -libvirt-gobject-1.0.vapi: $(top_builddir)/libvirt-gobject/LibvirtGObject-1.0.gir libvirt-glib-1.0.vapi +libvirt-gobject-1.0.vapi: $(top_builddir)/libvirt-gobject/LibvirtGObject-1.0.gir libvirt-glib-1.0.vapi libvirt-gconfig-1.0.vapi $(AM_V_GEN)$(VAPIGEN) \ --vapidir=$(builddir) \ --pkg gobject-2.0 \ -- 1.9.3

3 6

[libvirt] [PATCH v2 0/4] Testing libvirt XML -> libxl_domain_config conversion
by Daniel P. Berrange 03 Jun '14

03 Jun '14

Version 2 of: https://www.redhat.com/archives/libvir-list/2014-May/msg01102.html This tests the conversion of libvirt XML to libxl_domain_config objects by the libvirt libxl driver. Changed in v2: - Compare the parsed JSON object model instead of strcmp() on the string-ified JSON document - To cope with new additions between Xen 4.3 and 4.4 - Ignore case where actual JSON object has gained new keys. This copes with fact that '/c_info' gained a new key called 'pvh' in 4.4 - Ignore case where actual JSON value has changed from 'null' to a non-'null' value type. This copes with fact that the element at /b_info/device_model_version changed from 'null' to a specific value by default in 4.4. - Use libxl_domain_config_to_json instead of libxl_json.h functions, and disable test if running on Xen version which lacks this function (eg 4.2) - Isolate VNC port allocator from host TCP ports so a predictable VNC port is always in the config. Daniel P. Berrange (4): util: Introduce virJSONStringCompare for JSON doc comparisons util: Allow port allocator to skip bind() check tests: Add more test suite mock helpers libxl: Add a test suite for libxl option generator configure.ac | 2 + src/libvirt_private.syms | 1 + src/libxl/libxl_driver.c | 3 +- src/qemu/qemu_driver.c | 9 +- src/util/virjson.c | 185 ++++++++++++++++++++++++++++++++++ src/util/virjson.h | 22 +++++ src/util/virportallocator.c | 14 ++- src/util/virportallocator.h | 7 +- tests/Makefile.am | 25 ++++- tests/libxlxml2jsondata/minimal.json | 172 ++++++++++++++++++++++++++++++++ tests/libxlxml2jsondata/minimal.xml | 36 +++++++ tests/libxlxml2jsontest.c | 186 +++++++++++++++++++++++++++++++++++ tests/virfirewalltest.c | 4 +- tests/virmock.h | 54 +++++++--- tests/virmocklibxl.c | 87 ++++++++++++++++ tests/virportallocatortest.c | 4 +- tests/virsystemdtest.c | 4 +- 17 files changed, 786 insertions(+), 29 deletions(-) create mode 100644 tests/libxlxml2jsondata/minimal.json create mode 100644 tests/libxlxml2jsondata/minimal.xml create mode 100644 tests/libxlxml2jsontest.c create mode 100644 tests/virmocklibxl.c -- 1.9.3

2 8

[libvirt] [PATCH v2 0/2] Expose distance between host NUMA nodes
by Michal Privoznik 03 Jun '14

03 Jun '14

diff to v1: -slight change in the XML format -added description to distances value Michal Privoznik (2): virnuma: Introduce virNumaGetDistances virCaps: Expose distance between host NUMA nodes docs/schemas/capability.rng | 15 +++++++++++ src/conf/capabilities.c | 19 +++++++++++++- src/conf/capabilities.h | 13 +++++++++- src/libvirt_private.syms | 1 + src/libxl/libxl_conf.c | 4 +-- src/nodeinfo.c | 61 ++++++++++++++++++++++++++++++++++++++++++--- src/test/test_driver.c | 2 +- src/util/virnuma.c | 55 ++++++++++++++++++++++++++++++++++++++++ src/util/virnuma.h | 3 +++ src/xen/xend_internal.c | 3 ++- tests/vircapstest.c | 4 +-- 11 files changed, 169 insertions(+), 11 deletions(-) -- 2.0.0

2 4

[libvirt] [PATCH] tests: monitor: json: Fix error message when returning json in json
by Peter Krempa 03 Jun '14

03 Jun '14

The qemu JSON monitor test allows to test also expected command arguments. As the error from the monitor simulator is returned as a simulated qemu error (in JSON) all other JSON contained in the error message needs to be escaped. This will happen if the monitor command under test receives a JSON array as an argument. This will improve the error message from: libvirt: error : internal error: cannot parse json { "error": { "desc": "Invalid value of argument 'keys' of command 'send-key': expected 'ble' got '[{"type":"number","data":43},{"type":"number","data":26}, {"type":"number","data":46},{"type":"number","data":32}]'", "class": "UnexpectedCommand" } }: lexical error: invalid string in json text. To: libvirt: QEMU Driver error : internal error: unable to execute QEMU command 'send-key': Invalid value of argument 'keys' of command 'send-key': expected 'ble' got '[{"type":"number","data":43}, {"type":"number","data":26},{"type":"number","data":46}, {"type":"number","data":32}]' This improvement will not have any effect on tests executing as expected, but it will help test development. --- tests/qemumonitortestutils.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index 30c2153..8155a69 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -145,6 +145,12 @@ qemuMonitorReportError(qemuMonitorTestPtr test, const char *errmsg, ...) goto cleanup; if (test->agent || test->json) { + char *tmp = msg; + msg = qemuMonitorEscapeArg(tmp); + VIR_FREE(tmp); + if (!msg) + goto cleanup; + if (virAsprintf(&jsonmsg, "{ \"error\": " " { \"desc\": \"%s\", " " \"class\": \"UnexpectedCommand\" } }", -- 1.9.3

2 2

[libvirt] parallels: add 2 functions needed by OpenStack
by Alexander Burluka 03 Jun '14

03 Jun '14

Hello, I would like to apologize my for my inattention, that led to unformatted subjects. I'll try to prevent this in the future. -- Regards, Alexander Burluka

2 5

Re: [libvirt] [PATCH 1/2] Parallels: add domainGetVcpus().
by Daniel P. Berrange 03 Jun '14

03 Jun '14

Re-adding the mailing list - please don't drop the list CC when replying. On Mon, Jun 02, 2014 at 09:22:35PM +0400, aburluka wrote: > >Hmm, what error did you get from openstack ? The two uses of the > >'dom.vcpus' function are both wrapped in try/except so that it is > >considered non-fatal if libvirt doesn't provide this. > I have caught this error on Havana release. I would try to reproduce > this error, but it will take some short time to test it on Icehouse. Ok, then I think you should find the lack of this API is non-fatal in Icehouse / Juno now. > >Are you talking about container based virt here or full machine > >based virt ? IIUC Parallels can do both ? With container based > >virt, does parallels have the concept of 'vcpus' at all ? We > >don't have that in LXC at least. > Parallels Cloud Server has that concept in both types of virt. With the full machine virt does Parallels have a separate process or thread for each vCPU, and if so can we identify the PIDs for the vCPUs to let us do proper pCPU<->vCPU mapping & reporting. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

2 2

[libvirt] [PATCH 0/3] Expose distance between host NUMA nodes
by Michal Privoznik 03 Jun '14

03 Jun '14

*** BLURB HERE *** Michal Privoznik (3): virnuma.c: Fix some comments virnuma: Introduce virNumaGetDistances virCaps: Expose distance between host NUMA nodes docs/schemas/capability.rng | 11 ++++++++ src/conf/capabilities.c | 13 +++++++++- src/conf/capabilities.h | 13 +++++++++- src/libvirt_private.syms | 1 + src/libxl/libxl_conf.c | 4 +-- src/nodeinfo.c | 61 ++++++++++++++++++++++++++++++++++++++++++--- src/test/test_driver.c | 2 +- src/util/virnuma.c | 54 +++++++++++++++++++++++++++++++++++++-- src/util/virnuma.h | 3 +++ src/xen/xend_internal.c | 3 ++- tests/vircapstest.c | 4 +-- 11 files changed, 156 insertions(+), 13 deletions(-) -- 2.0.0

2 8

[libvirt] [PATCH] network: bridge: Avoid memory leak from networkBuildDhcpDaemonCommandLine
by Peter Krempa 03 Jun '14

03 Jun '14

If the leasehelper_path couldn't be found the code would leak the freshly constructed command structure. Re-arrange code to avoid the problem. Found by coverity, broken by baafe668fa56767c031468ccd5df3e62eaa11370. --- src/network/bridge_driver.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 51f01fb..4fc4c9a 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1273,15 +1273,14 @@ networkBuildDhcpDaemonCommandLine(virNetworkObjPtr network, goto cleanup; } - cmd = virCommandNew(dnsmasqCapsGetBinaryPath(caps)); - virCommandAddArgFormat(cmd, "--conf-file=%s", configfile); - /* This helper is used to create custom leases file for libvirt */ if (!(leaseshelper_path = virFileFindResource("libvirt_leaseshelper", "src", LIBEXECDIR))) goto cleanup; + cmd = virCommandNew(dnsmasqCapsGetBinaryPath(caps)); + virCommandAddArgFormat(cmd, "--conf-file=%s", configfile); virCommandAddArgFormat(cmd, "--dhcp-script=%s", leaseshelper_path); *cmdout = cmd; -- 1.9.3

2 2

[libvirt] [PATCH] qemu: monitor: Fix type of holdtime argument in qemuMonitorJSONSendKey
by Peter Krempa 03 Jun '14

03 Jun '14

qemuMonitorJSONSendKey declares the "holdtime" argument as unsigned int while the command was constructed in qemuMonitorJSONMakeCommand using the "P" modifier which took a unsigned long from the variable arguments which then made it possible to access uninitialized memory. This broke the qemumonitorjsontest on 32bit fedora 20: 64) qemuMonitorJSONSendKey ... libvirt: QEMU Driver error : internal error: unsupported data type 'W' for arg 'WVSì D$0èwÿÿÃAå' FAILED Uncovered by upstream commit f744b831c66d9e82453f7a96cab5eddf7570c253. Additionally add test for the hold-time option. --- src/qemu/qemu_monitor_json.c | 2 +- tests/qemumonitorjsontest.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 0c44b11..bedd959 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -3610,7 +3610,7 @@ int qemuMonitorJSONSendKey(qemuMonitorPtr mon, cmd = qemuMonitorJSONMakeCommand("send-key", "a:keys", keys, - "P:hold-time", holdtime, + "p:hold-time", holdtime, NULL); if (!cmd) goto cleanup; diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 47d7481..2099dc8 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -1960,6 +1960,38 @@ testQemuMonitorJSONqemuMonitorJSONSendKey(const void *data) } static int +testQemuMonitorJSONqemuMonitorJSONSendKeyHoldtime(const void *data) +{ + virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; + qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + int ret = -1; + unsigned int keycodes[] = {43, 26, 46, 32}; + + if (!test) + return -1; + + if (qemuMonitorTestAddItemParams(test, "send-key", + "{\"return\":{}}", + "hold-time", "31337", + "keys", "[{\"type\":\"number\",\"data\":43}," + "{\"type\":\"number\",\"data\":26}," + "{\"type\":\"number\",\"data\":46}," + "{\"type\":\"number\",\"data\":32}]", + NULL, NULL) < 0) + goto cleanup; + + if (qemuMonitorJSONSendKey(qemuMonitorTestGetMonitor(test), + 31337, keycodes, + ARRAY_CARDINALITY(keycodes)) < 0) + goto cleanup; + + ret = 0; + cleanup: + qemuMonitorTestFree(test); + return ret; +} + +static int testQemuMonitorJSONqemuMonitorJSONGetDumpGuestMemoryCapability(const void *data) { virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; @@ -2230,6 +2262,7 @@ mymain(void) DO_TEST(qemuMonitorJSONGetVirtType); DO_TEST(qemuMonitorJSONSendKey); DO_TEST(qemuMonitorJSONGetDumpGuestMemoryCapability); + DO_TEST(qemuMonitorJSONSendKeyHoldtime); DO_TEST_CPU_DATA("host"); DO_TEST_CPU_DATA("full"); -- 1.9.3

2 2

[libvirt] [PATCH] tests: Build virstoragetest only when storage driver is compiled too
by Peter Krempa 03 Jun '14

03 Jun '14

virstoragetest now requires parts of the storage driver to be built. Without this change the test can't be compiled on platforms that don't build the storage driver (mingw). make[2]: *** No rule to make target `../src/libvirt_driver_storage_impl.la', needed by `virstoragetest.exe'. Stop. Broken by commit 713cc3b0a7ff8ad42b4c13429b624d1b2b5a99f2 --- tests/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index f9f2b84..1fdfd3b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -162,7 +162,6 @@ test_programs = virshtest sockettest \ virstringtest \ virportallocatortest \ sysinfotest \ - virstoragetest \ virnetdevbandwidthtest \ virkmodtest \ vircapstest \ @@ -279,7 +278,8 @@ test_programs += nwfilterxml2firewalltest endif WITH_NWFILTER if WITH_STORAGE -test_programs += storagevolxml2argvtest +test_programs += storagevolxml2argvtest \ + virstoragetest endif WITH_STORAGE if WITH_LINUX -- 1.9.3

2 2

[libvirt] Idea for representing VMX virtualHW.version in domain XML
by Daniel P. Berrange 03 Jun '14

03 Jun '14

At the Xen Hackathon we were discussing dealing hypervisors which have a "virtual hardware version" concept, like VMWares' virtualHW.version. Currently our code mostly ignores the virtualHW.version when reading VMX files, and when writing them, just uses the hypervisor's default virtual hardware version. This is sub-optimal since that means the guest's hardware version could change if the hypervisor is upgraded, which could in turn cause Windows re-activation. It was suggested to me that the virtualHW.version is really akin to QEMU's machine type concept, and so we should map it that way in the XML. eg if the VMX file contains virtualHW.version = "4" Then we might represent that in the XML as <domain type='vmware'> ... <os> <type machine="vmware4">hvm</type> </os> ... </domain> ie we just invent a machine type prefix and append the version number to it. I'm not planning on implementing this myself, just sending this mail so the idea is in the historical record and some other motivated person can wire it up.... Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [PATCH 0/5] Testing libvirt XML -> libxl_domain_config conversion
by Daniel P. Berrange 03 Jun '14

03 Jun '14

At the Xen Hackathon I learnt that libxl provides an API which can serialize a libxl_domain_config instance to a JSON document. This is exactly what we need for testing the XML -> libxl_domain_config conversion process, so I spent the afternoon trying to get such a test working. The result is that we can now just add pairs of XML, JSON files to libvirt to test handling of new config features. I hit a couple of small issues with libxl, which I worked around, when writing this test which I why I'm copying xen-devel - libxl_ctx_alloc() will call xs_daemon_open and xc_interface_open, and stat /var/run/xenstored.pid to see if Xen is actually running. This fails when run on non-Xen hosts (and also possibly if run unprivileged). I used an evil LD_PRELOAD hack to stub out xs_daemon_open and xc_interface_open to return (void*)0x1, and also turn xc_interface_close and xs_daemon_close to no-ops, and make stat() always return success for xenstored.pid. This works (evidenced by the fact that if something was needing these xs/xc handles they would have crashed referencing 0x1), but at the same time it might be an idea to have an officially supported "non live" mode for libxl_ctx_alloc() turned on by a flag of some sort. - The libxl_json.h header file is relying on conditionals that are only set by Xen's build process eg HAVE_YAJL_YAJL_VERSION_H I hacked around this, but it is a little dirty too. libvirt already links to libyajl for the QEMU driver, but we don't really need the raw YAJL objects. It'd be nice to have a char * libxl_domain_config_as_json(libxl_domain_config *p) as a higher level wrapper around libxl_domain_config_gen_json avoiding the pain of dealing with YAJL's different APIs. Ian J mentioned to me that he thought there was already such a method, but AFAICT, the only such code is in the 'xl' command line tool itself (xl_cmdimpl.c - printf_info_one_json) A few further ideas that could be done as a followup - Make virConnectDomainXMLToNative accept 'xl-json" as a data format, so you can feed in a libvirt XML and get back out a JSON document. This could be a useful debugging tool for Xen developers trying to identify bugs in libvirt. - Write out the JSON document to /var/log/libvirt/libxl/$GUEST.log whenever starting a guest. Again this would be a useful debugging aid to Xen developers / support people trying to identify why a guest might be mis-behaving Regards, Daniel Daniel P. Berrange (5): Don't pass virDomainObjPtr to libxlBuildDomainConfig Don't pass libxlDriverPrivatePtr into libxlBuildDomainConfig libxl: Move virDomainXMLOptionNew into libxlCreateXMLConf Add more test suite mock helpers Add a test suite for libxl option generator src/libxl/libxl_conf.c | 38 +++--- src/libxl/libxl_conf.h | 10 +- src/libxl/libxl_domain.c | 7 +- src/libxl/libxl_driver.c | 4 +- tests/Makefile.am | 25 +++- tests/libxlxml2jsondata/minimal.json | 172 +++++++++++++++++++++++++++ tests/libxlxml2jsondata/minimal.xml | 36 ++++++ tests/libxlxml2jsontest.c | 219 +++++++++++++++++++++++++++++++++++ tests/virfirewalltest.c | 4 +- tests/virmock.h | 54 ++++++--- tests/virmocklibxl.c | 87 ++++++++++++++ tests/virsystemdtest.c | 4 +- 12 files changed, 617 insertions(+), 43 deletions(-) create mode 100644 tests/libxlxml2jsondata/minimal.json create mode 100644 tests/libxlxml2jsondata/minimal.xml create mode 100644 tests/libxlxml2jsontest.c create mode 100644 tests/virmocklibxl.c -- 1.9.3

3 17

[libvirt] [libvirt-glib] [PATCH v3] GVirDomainSnapshot: Add gvir_domain_snapshot_delete
by Timm Bäder 03 Jun '14

03 Jun '14

--- libvirt-gobject/libvirt-gobject-domain-snapshot.c | 29 +++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-domain-snapshot.h | 16 +++++++++++++ libvirt-gobject/libvirt-gobject.sym | 6 +++++ 3 files changed, 51 insertions(+) diff --git a/libvirt-gobject/libvirt-gobject-domain-snapshot.c b/libvirt-gobject/libvirt-gobject-domain-snapshot.c index fcf70ed..f835b58 100644 --- a/libvirt-gobject/libvirt-gobject-domain-snapshot.c +++ b/libvirt-gobject/libvirt-gobject-domain-snapshot.c @@ -205,3 +205,32 @@ GVirConfigDomainSnapshot *gvir_domain_snapshot_get_config free(xml); return conf; } + +/** + * gvir_domain_snapshot_delete: + * @snapshot: The domain snapshot + * @flags: Bitwise or of #GVirDomainSnapshotDeleteFlags + * @error: (allow-none): Place-holder for error or NULL + * + * Returns: TRUE on success, FALSE otherwise + */ +gboolean gvir_domain_snapshot_delete (GVirDomainSnapshot *snapshot, + guint flags, + GError **error) +{ + GVirDomainSnapshotPrivate *priv; + int status; + + g_return_if_fail(GVIR_IS_DOMAIN_SNAPSHOT (snapshot)); + g_return_if_fail(error == NULL || *error == NULL); + + priv = snapshot->priv; + status = virDomainSnapshotDelete(priv->handle, flags); + if (status < 0) { + gvir_set_error(error, GVIR_DOMAIN_SNAPSHOT_ERROR, 0, + "Unable to delete snapshot `%s'", + gvir_domain_snapshot_get_name(snapshot)); + return FALSE; + } + return TRUE; +} diff --git a/libvirt-gobject/libvirt-gobject-domain-snapshot.h b/libvirt-gobject/libvirt-gobject-domain-snapshot.h index 5bd827c..b3ebe7f 100644 --- a/libvirt-gobject/libvirt-gobject-domain-snapshot.h +++ b/libvirt-gobject/libvirt-gobject-domain-snapshot.h @@ -58,6 +58,18 @@ struct _GVirDomainSnapshotClass gpointer padding[20]; }; +/** + * GVirDomainSnapshotDeleteFlags: + * @GVIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN: Also delete children + * @GVIR_DOMAIN_SNAPSHOT_DELETE_METADATA_ONLY: Delete just metadata + * @GVIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN_ONLY: Delete just children + */ +typedef enum { + GVIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN = 1, + GVIR_DOMAIN_SNAPSHOT_DELETE_METADATA_ONLY = 2, + GVIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN_ONLY = 4 +} GVirDomainSnapshotDeleteFlags; + GType gvir_domain_snapshot_get_type(void); GType gvir_domain_snapshot_handle_get_type(void); @@ -69,6 +81,10 @@ GVirConfigDomainSnapshot *gvir_domain_snapshot_get_config guint flags, GError **err); +gboolean gvir_domain_snapshot_delete (GVirDomainSnapshot *snapshot, + guint flags, + GError **error); + G_END_DECLS #endif /* __LIBVIRT_GOBJECT_DOMAIN_SNAPSHOT_H__ */ diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index f2419ac..232e63b 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -234,4 +234,10 @@ LIBVIRT_GOBJECT_0.1.5 { gvir_connection_open_read_only_finish; } LIBVIRT_GOBJECT_0.1.4; +LIBVIRT_GOBJECT_0.1.9 { + global: + gvir_domain_snapshot_delete_flags_get_type; + gvir_domain_snapshot_delete; +} LIBVIRT_GOBJECT_0.1.5; + # .... define new API here using predicted next version number .... -- 2.0.0

2 2

[libvirt] [PATCH v2 0/4] qemu: Some more device unplug fixes
by Jiri Denemark 03 Jun '14

03 Jun '14

Jiri Denemark (4): qemu: Remove interface backend only after frontend is gone qemu: Remove disk backend only after frontend is gone qemu: Remove character device backend only after frontend is gone qemu: Return in from qemuDomainRemove*Device src/qemu/qemu_hotplug.c | 162 +++++++++++++++++++++++++----------------------- 1 file changed, 84 insertions(+), 78 deletions(-) -- 2.0.0

2 9

[libvirt] [libvirt-glib] [PATCH] Remove #if 0's from libvirt-gobject-domain-snapshot
by Timm Bäder 03 Jun '14

03 Jun '14

The code seems to be fine. --- I'd like to use this code (in later patches). If anything is wrong with the current implementation, I'd like to know so I can fix it. libvirt-gobject/libvirt-gobject-domain-snapshot.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-domain-snapshot.c b/libvirt-gobject/libvirt-gobject-domain-snapshot.c index d4e9b97..ab23342 100644 --- a/libvirt-gobject/libvirt-gobject-domain-snapshot.c +++ b/libvirt-gobject/libvirt-gobject-domain-snapshot.c @@ -144,9 +144,7 @@ typedef struct virDomainSnapshot GVirDomainSnapshotHandle; static GVirDomainSnapshotHandle* gvir_domain_snapshot_handle_copy(GVirDomainSnapshotHandle *src) { -#if 0 virDomainSnapshotRef((virDomainSnapshotPtr)src); -#endif return src; } @@ -162,7 +160,7 @@ G_DEFINE_BOXED_TYPE(GVirDomainSnapshotHandle, gvir_domain_snapshot_handle, const gchar *gvir_domain_snapshot_get_name(GVirDomainSnapshot *snapshot) { g_return_val_if_fail(GVIR_IS_DOMAIN_SNAPSHOT(snapshot), NULL); -#if 0 + GVirDomainSnapshotPrivate *priv = snapshot->priv; const char *name; @@ -172,12 +170,6 @@ const gchar *gvir_domain_snapshot_get_name(GVirDomainSnapshot *snapshot) } return name; -#else - if (snapshot) - return NULL; -#endif - - g_return_val_if_reached(NULL); } -- 1.9.3

3 3

[libvirt] [PATCH] xenapi_utils: Adapt to enum cleanups
by Michal Privoznik 03 Jun '14

03 Jun '14

It was just very recently that we transfered from: enum virSomeEnumName{ ... }; to: typedef enum { ... } virSomeEnumName; This change requires some code adaptation, which wasn't done for xenapi driver. With this fix we are able to build again. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under build breaker rule. src/xenapi/xenapi_utils.c | 14 +++++++------- src/xenapi/xenapi_utils.h | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c index c9a62d9..156e0c8 100644 --- a/src/xenapi/xenapi_utils.c +++ b/src/xenapi/xenapi_utils.c @@ -127,7 +127,7 @@ xenapiUtil_ParseQuery(virConnectPtr conn, virURIPtr uri, int *noVerify) enum xen_on_normal_exit -actionShutdownLibvirt2XenapiEnum(enum virDomainLifecycleAction action) +actionShutdownLibvirt2XenapiEnum(virDomainLifecycleAction action) { enum xen_on_normal_exit num = XEN_ON_NORMAL_EXIT_RESTART; if (action == VIR_DOMAIN_LIFECYCLE_DESTROY) @@ -139,7 +139,7 @@ actionShutdownLibvirt2XenapiEnum(enum virDomainLifecycleAction action) enum xen_on_crash_behaviour -actionCrashLibvirt2XenapiEnum(enum virDomainLifecycleCrashAction action) +actionCrashLibvirt2XenapiEnum(virDomainLifecycleCrashAction action) { enum xen_on_crash_behaviour num = XEN_ON_CRASH_BEHAVIOUR_RESTART; if (action == VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY) @@ -180,7 +180,7 @@ createXenAPIBootOrderString(int nboot, int *bootDevs) } /* convert boot order string to libvirt boot order enum */ -enum virDomainBootOrder +virDomainBootOrder map2LibvirtBootOrder(char c) { switch (c) { @@ -197,10 +197,10 @@ map2LibvirtBootOrder(char c) } } -enum virDomainLifecycleAction +virDomainLifecycleAction xenapiNormalExitEnum2virDomainLifecycle(enum xen_on_normal_exit action) { - enum virDomainLifecycleAction num = VIR_DOMAIN_LIFECYCLE_RESTART; + virDomainLifecycleAction num = VIR_DOMAIN_LIFECYCLE_RESTART; if (action == XEN_ON_NORMAL_EXIT_DESTROY) num = VIR_DOMAIN_LIFECYCLE_DESTROY; else if (action == XEN_ON_NORMAL_EXIT_RESTART) @@ -209,10 +209,10 @@ xenapiNormalExitEnum2virDomainLifecycle(enum xen_on_normal_exit action) } -enum virDomainLifecycleCrashAction +virDomainLifecycleCrashAction xenapiCrashExitEnum2virDomainLifecycle(enum xen_on_crash_behaviour action) { - enum virDomainLifecycleCrashAction num = VIR_DOMAIN_LIFECYCLE_CRASH_RESTART; + virDomainLifecycleCrashAction num = VIR_DOMAIN_LIFECYCLE_CRASH_RESTART; if (action == XEN_ON_CRASH_BEHAVIOUR_DESTROY) num = VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY; else if (action == XEN_ON_CRASH_BEHAVIOUR_RESTART) diff --git a/src/xenapi/xenapi_utils.h b/src/xenapi/xenapi_utils.h index 31b313b..26e1ac2 100644 --- a/src/xenapi/xenapi_utils.h +++ b/src/xenapi/xenapi_utils.h @@ -43,20 +43,20 @@ int xenapiUtil_ParseQuery(virConnectPtr conn, virURIPtr uri, int *noVerify); enum xen_on_normal_exit -actionShutdownLibvirt2XenapiEnum(enum virDomainLifecycleAction action); +actionShutdownLibvirt2XenapiEnum(virDomainLifecycleAction action); enum xen_on_crash_behaviour -actionCrashLibvirt2XenapiEnum(enum virDomainLifecycleCrashAction action); +actionCrashLibvirt2XenapiEnum(virDomainLifecycleCrashAction action); char * createXenAPIBootOrderString(int nboot, int *bootDevs); -enum virDomainBootOrder map2LibvirtBootOrder(char c); +virDomainBootOrder map2LibvirtBootOrder(char c); -enum virDomainLifecycleAction +virDomainLifecycleAction xenapiNormalExitEnum2virDomainLifecycle(enum xen_on_normal_exit action); -enum virDomainLifecycleCrashAction +virDomainLifecycleCrashAction xenapiCrashExitEnum2virDomainLifecycle(enum xen_on_crash_behaviour action); void getCpuBitMapfromString(char *mask, unsigned char *cpumap, int maplen); -- 2.0.0

1 0

[libvirt] [PATCH 1/3] cpu: use typedefs for enums in "src/cpu/cpu_map.h"
by Julio Faracco 02 Jun '14

02 Jun '14

In "src/cpu/" there are some enumerations (enum) declarations. Similar to the recent cleanup to "src/util", "src/conf" and other directories, it's better to use a typedef for variable types, function types and other usages. Other enumeration and folders will be changed to typedef's in the future. Specially, in files that are in different places of "src/util" and "src/conf". Most of the files changed in this commit are related to CPU (cpu_map.h) enums. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/cpu/cpu.c | 2 +- src/cpu/cpu_map.c | 2 +- src/cpu/cpu_map.h | 6 +++--- src/cpu/cpu_powerpc.c | 2 +- src/cpu/cpu_x86.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c index 528e1a7..c3d66dd 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -729,7 +729,7 @@ struct cpuGetModelsData }; static int -cpuGetArchModelsCb(enum cpuMapElement element, +cpuGetArchModelsCb(cpuMapElement element, xmlXPathContextPtr ctxt, void *cbdata) { diff --git a/src/cpu/cpu_map.c b/src/cpu/cpu_map.c index 68d287a..4706f67 100644 --- a/src/cpu/cpu_map.c +++ b/src/cpu/cpu_map.c @@ -42,7 +42,7 @@ VIR_ENUM_IMPL(cpuMapElement, CPU_MAP_ELEMENT_LAST, static int load(xmlXPathContextPtr ctxt, - enum cpuMapElement element, + cpuMapElement element, cpuMapLoadCallback callback, void *data) { diff --git a/src/cpu/cpu_map.h b/src/cpu/cpu_map.h index 23ce888..fcd6c34 100644 --- a/src/cpu/cpu_map.h +++ b/src/cpu/cpu_map.h @@ -27,19 +27,19 @@ # include "virxml.h" -enum cpuMapElement { +typedef enum { CPU_MAP_ELEMENT_VENDOR, CPU_MAP_ELEMENT_FEATURE, CPU_MAP_ELEMENT_MODEL, CPU_MAP_ELEMENT_LAST -}; +} cpuMapElement; VIR_ENUM_DECL(cpuMapElement) typedef int -(*cpuMapLoadCallback) (enum cpuMapElement element, +(*cpuMapLoadCallback) (cpuMapElement element, xmlXPathContextPtr ctxt, void *data); diff --git a/src/cpu/cpu_powerpc.c b/src/cpu/cpu_powerpc.c index 372272f..05fa55b 100644 --- a/src/cpu/cpu_powerpc.c +++ b/src/cpu/cpu_powerpc.c @@ -273,7 +273,7 @@ ppcModelLoad(xmlXPathContextPtr ctxt, } static int -ppcMapLoadCallback(enum cpuMapElement element, +ppcMapLoadCallback(cpuMapElement element, xmlXPathContextPtr ctxt, void *data) { diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 06fbfba..72c5216 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -1098,7 +1098,7 @@ x86MapFree(struct x86_map *map) static int -x86MapLoadCallback(enum cpuMapElement element, +x86MapLoadCallback(cpuMapElement element, xmlXPathContextPtr ctxt, void *data) { -- 1.7.10.4

2 5

[libvirt] [Question] Collect vNode pinning to pNode run-time information
by Shi, Xiao-Lei (Bruce, HP Servers-PSC-CQ) 02 Jun '14

02 Jun '14

Hi all, I have a question about NUMA. User configured vNode(guest virtual numa node), but he didn't configure cputune and numatune. Now we want to get the information that each vNode run in which pNode(host numa node). It's run-time information that may be modified with high frequency. In current Libvirt's API, we can get the information that each vCpu running on which pCpu through virsh vcpuinfo(there should be a corresponding Libvirt API function). But we didn't find any APIs to get the information that each vNode uses which pNode's memory, or just each vCpu consumes which pNode's memory. We find a command "numastat -mcn -p qemu" that can get the memory consume data of each VM, but it still loses the information that we want(vNode memory consume data), as following: # numastat -mcn -p qemu Per-node process memory usage (in MBs) PID Node 0 Node 1 Total --------------- ------ ------ ----- 8900 (qemu-kvm) 2032 50 2083 17716 (qemu-kvm) 1546 663 2209 22484 (qemu-kvm) 621 1524 2146 29694 (qemu-kvm) 892 1350 2242 --------------- ------ ------ ----- Total 5092 3588 8680 ......... My question is: 1. In Libvirt, are there any ways that we can get our needed data? 2. If no ways in Libvirt, do you have any other suggestions to collect the information? Any feedbacks from you are appreciated. Thanks & Best Regards Shi, Xiao-Lei (Bruce) Hewlett-Packard Co., Ltd. HP Servers Core Platform Software China Telephone +86 23 65683093 Mobile +86 18696583447 Email xiao-lei.shi(a)hp.com<mailto:shiguo.li@hp.com>

2 1

[libvirt] Is there a way to get host uptime in remote libvirt
by coffeeball 02 Jun '14

02 Jun '14

We manage hypervisors (VMWare ESXi/vCenter, KVM, XEN, Hyper-V) by remote Libvirt API, in our case we need to get the host uptime via the same libvirt interface. Is there a way get this info now for all the aforementioned hypervisor types? The APIs virConnectGetSysinfo(), virNodeGetInfo() provide host info but it doesn't include the system uptime. The virNodeGetCPUStats() can returns CPU usage in nanosecond, can we add the user + system + idle + iowait to calculate the system uptime? Looks like the sum value has a huge gap with the real uptime value returned by "uptime" CLI. virsh # nodecpustats user: 2985046540000000 system: 1368209710000000 idle: 388018933920000000 iowait: 43371960000000

2 1

[libvirt] [PATCH] virsh-nodedev: Avoid spurious errors
by Michal Privoznik 02 Jun '14

02 Jun '14

Our public free functions explicitly don't accept NULL pointers (sigh). Therefore, callers must do something like this: if (dev) virNodeDeviceFree(dev); And we are not doing that on two places I've found. This leads to dummy error message thrown by virsh: virsh # nodedev-dumpxml nonexistent-device error: Could not find matching device 'nonexistent-device' error: invalid node device pointer in virNodeDeviceFree Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/virsh-nodedev.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c index a35387a..46e0045 100644 --- a/tools/virsh-nodedev.c +++ b/tools/virsh-nodedev.c @@ -162,7 +162,8 @@ cmdNodeDeviceDestroy(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: virStringFreeList(arr); - virNodeDeviceFree(dev); + if (dev) + virNodeDeviceFree(dev); return ret; } @@ -571,7 +572,8 @@ cmdNodeDeviceDumpXML(vshControl *ctl, const vshCmd *cmd) cleanup: virStringFreeList(arr); VIR_FREE(xml); - virNodeDeviceFree(device); + if (device) + virNodeDeviceFree(device); return ret; } -- 2.0.0

2 2

[libvirt] [libvirt-php] libvirt_domain_new Create a slow vm
by Mario Di Ture 02 Jun '14

02 Jun '14

Hi, I've tested this script on centos 6.5 (libvirt-0.10.2, qemu-kvm-0.12.1.2) and ubuntu server 14.04 (libvirt 1.2.2, qemu-kvm 2.0.0) with the same result. The created vm is very slow compared to the vm created with virt-manager, with the same features/devices on the same host. Can you suggest any configuration that can avoid that slowness? With regards Mario D. <?php $conn = libvirt_connect('null', false); $name="testvm"; $arch="x86_64"; $memMB=1024; $maxmemMB=1536; $vcpus=1; $iso_image="/home/iso/CentOS-6.5-x86_64-minimal.iso"; $disk1 = array( "path" => "/home/vm/centos-script.raw", "driver" => "raw", "bus" => "virtio", "dev" => "hda", "size" => "6G", "flags" => VIR_DOMAIN_DISK_FILE | VIR_DOMAIN_DISK_ACCESS_ALL ); $disks = array( $disk1 ); $network1 = array( 'mac' => '00:11:22:33:44:55', 'network' => 'default', 'model' => 'e1000' ); $networks = array( $network1 ); $flags=VIR_DOMAIN_FLAG_FEATURE_ACPI; $newdom=libvirt_domain_new($conn, $name, $arch, $memMB, $maxmemMB, $vcpus, $iso_image, $disks, $networks, $flags); print_r($newdom); ?>

2 2

[libvirt] parallels: add 2 functions needed by OpenStack
by Alexander Burluka 02 Jun '14

02 Jun '14

Hello, I would like to contribute in Libvirt development. Parallels team continues working on driver to make it compatible with OpenStack. So, this patches are part of our goal. I would gracefully accept your comments and remarks. Thank you! -- Regards, Alexander Burluka

2 3

[libvirt] [PATCH] Don't use AI_ADDRCONFIG when binding to wildcard addresses
by Ján Tomko 02 Jun '14

02 Jun '14

https://bugzilla.redhat.com/show_bug.cgi?id=1098659 With parallel boot, network addresses might not yet be assigned [1], but binding to wildcard addresses should work. For non-wildcard addresses, ADDRCONFIG is still used. Document this in libvirtd.conf. [1] http://www.freedesktop.org/wiki/Software/systemd/NetworkTarget/ --- daemon/libvirtd.conf | 4 ++++ src/rpc/virnetsocket.c | 28 ++++++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf index aeba11d..e5856d4 100644 --- a/daemon/libvirtd.conf +++ b/daemon/libvirtd.conf @@ -48,6 +48,10 @@ # Override the default configuration which binds to all network # interfaces. This can be a numeric IPv4/6 address, or hostname # +# If the libvirtd service is started in parallel with network +# startup (e.g. with systemd), binding to addresses other than +# the wildcards (0.0.0.0/::) might not be available yet. +# #listen_addr = "192.168.0.1" diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index a7e1783..87b39f2 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -226,15 +226,29 @@ int virNetSocketNewListenTCP(const char *nodename, struct addrinfo hints; int fd = -1; size_t i; - int addrInUse = false; + bool addrInUse = false; + bool familyNotSupported = false; + virSocketAddr tmp_addr; *retsocks = NULL; *nretsocks = 0; memset(&hints, 0, sizeof(hints)); - hints.ai_flags = AI_PASSIVE | AI_ADDRCONFIG; + hints.ai_flags = AI_PASSIVE; hints.ai_socktype = SOCK_STREAM; + /* Don't use ADDRCONFIG for binding to the wildcard address. + * Just catch the error returned by socket() if the system has + * no IPv6 support. + * + * This allows libvirtd to be started in parallel with the network + * startup in most cases. + */ + if (nodename && + !(virSocketAddrParse(&tmp_addr, nodename, AF_UNSPEC) > 0 && + virSocketAddrIsWildcard(&tmp_addr))) + hints.ai_flags = AI_ADDRCONFIG; + int e = getaddrinfo(nodename, service, &hints, &ai); if (e != 0) { virReportError(VIR_ERR_SYSTEM_ERROR, @@ -251,6 +265,11 @@ int virNetSocketNewListenTCP(const char *nodename, if ((fd = socket(runp->ai_family, runp->ai_socktype, runp->ai_protocol)) < 0) { + if (errno == EAFNOSUPPORT) { + familyNotSupported = true; + runp = runp->ai_next; + continue; + } virReportSystemError(errno, "%s", _("Unable to create socket")); goto error; } @@ -307,6 +326,11 @@ int virNetSocketNewListenTCP(const char *nodename, fd = -1; } + if (nsocks == 0 && familyNotSupported) { + virReportSystemError(EAFNOSUPPORT, "%s", _("Unable to bind to port")); + goto error; + } + if (nsocks == 0 && addrInUse) { virReportSystemError(EADDRINUSE, "%s", _("Unable to bind to port")); -- 1.8.3.2

3 5

[libvirt] [PATCH] leaseshelper: Include locale.h
by Michal Privoznik 02 Jun '14

02 Jun '14

The commit baafe668 introduces this new helper utility. As in all our programs, there's setlocale() called at the beginning of main(). However, this source file don't include locale.h file which causes build errors on some systems (e.g. mine). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/network/leaseshelper.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c index e53a73c..eb695e4 100644 --- a/src/network/leaseshelper.c +++ b/src/network/leaseshelper.c @@ -28,6 +28,7 @@ #include <stdio.h> #include <stdlib.h> #include <sys/stat.h> +#include <locale.h> #include "virutil.h" #include "virthread.h" -- 2.0.0

2 1

[libvirt] ANNOUNCE: Perl binding Sys-Virt release 1.2.5
by Daniel P. Berrange 02 Jun '14

02 Jun '14

I am pleased to announce that release 1.2.5 of Sys-Virt, the libvirt Perl API binding, is now available for download: http://search.cpan.org/CPAN/authors/id/D/DA/DANBERR/Sys-Virt-1.2.5.tar.gz Changed in the 1.2.5 release: - Add VIR_DOMAIN_{REBOOT,SHUTDOWN}_PARAVIRT constants - Add virDomainFSFreeze/virDomainFSThaw APIs - Add virDomainSetTime/virDomainGetTime APIs Further information, including online API documentation & previous release archives, is available from the CPAN home page http://search.cpan.org/dist/Sys-Virt/ Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [PATCH 0/4] qemu: Some more device unplug fixes
by Jiri Denemark 02 Jun '14

02 Jun '14

This series depends on "qemu: Process DEVICE_DELETED event in a separate thread" series I sent yesterday. Jiri Denemark (4): qemu: Unref cfg when detaching hostdev interface qemu: Remove interface backend only after frontend is gone qemu: Remove disk backend only after frontend is gone qemu: Remove character device backend only after frontend is gone src/qemu/qemu_hotplug.c | 122 ++++++++++++++++++++++++------------------------ 1 file changed, 60 insertions(+), 62 deletions(-) -- 1.9.3

2 9

[libvirt] [PATCH] Fix build on freebsd
by Pavel Hrdina 02 Jun '14

02 Jun '14

On freebsd there isn't known "setlocale" so we have to include locale.h Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed under trivial rule src/network/leaseshelper.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c index e53a73c..b6f6c32 100644 --- a/src/network/leaseshelper.c +++ b/src/network/leaseshelper.c @@ -25,6 +25,7 @@ #include <config.h> +#include <locale.h> #include <stdio.h> #include <stdlib.h> #include <sys/stat.h> -- 1.8.5.5

1 0

[libvirt] [PATCH 0/2] qemu: Process DEVICE_DELETED event in a separate thread
by Jiri Denemark 02 Jun '14

02 Jun '14

Jiri Denemark (2): qemu: Finish device removal in the original thread qemu: Process DEVICE_DELETED event in a separate thread src/qemu/qemu_domain.h | 2 ++ src/qemu/qemu_driver.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- src/qemu/qemu_hotplug.c | 44 +++++++++++++++++++++++++++++++++----------- src/qemu/qemu_hotplug.h | 2 +- src/qemu/qemu_process.c | 30 +++++++++++++++++++++--------- 5 files changed, 103 insertions(+), 23 deletions(-) -- 1.9.3

2 5

[libvirt] Bug: iohelper drops I/O error messages
by Jason J. Herne 02 Jun '14

02 Jun '14

During a recent managed save operation I received the following error message: error: operation failed: domain save job: unexpectedly failed. It turns out that I had run out of disk space. After a brief investigation I discovered that libvirt_iohelper is exec'ed and is used to handle all I/O during a (Qemu) managed save operation. While iohelper appears to be set up to log error conditions when they occur, for some reason the logging is getting lost. I'm hoping someone can help figure out why these errors are getting lost. It would be nice to present a useful error message to the user when a managed save fails because of an I/O error. -- -- Jason J. Herne (jjherne(a)linux.vnet.ibm.com)

1 1

[libvirt] [libvirt-glib] [PATCH v2] GVirDomainSnapshot: Add gvir_domain_snapshot_delete
by Timm Bäder 02 Jun '14

02 Jun '14

--- Whoops, totally forgot about the delete flags in the first version, sorry. As for the underline in domain_snapshot, I took that from gvir_domain_snapshot_get_config so I don't really know what's the correct version. Since this is using gvir_domain_snapshot_get_name now, the patch removing the #if 0's in libvirt-gobject-domain-snapshot.c is needed. libvirt-gobject/libvirt-gobject-domain-snapshot.c | 25 +++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-domain-snapshot.h | 16 +++++++++++++++ libvirt-gobject/libvirt-gobject.sym | 6 ++++++ 3 files changed, 47 insertions(+) diff --git a/libvirt-gobject/libvirt-gobject-domain-snapshot.c b/libvirt-gobject/libvirt-gobject-domain-snapshot.c index fcf70ed..aa0504d 100644 --- a/libvirt-gobject/libvirt-gobject-domain-snapshot.c +++ b/libvirt-gobject/libvirt-gobject-domain-snapshot.c @@ -205,3 +205,28 @@ GVirConfigDomainSnapshot *gvir_domain_snapshot_get_config free(xml); return conf; } + +/** + * gvir_domain_snapshot_delete: + * @snapshot: the domain snapshot + * @flags: Bitwise or of #GVirDomainSnapshotDeleteFlags + * @error: (allow-none): Place-holder for error or NULL + */ +void gvir_domain_snapshot_delete (GVirDomainSnapshot *snapshot, + GVirDomainSnapshotDeleteFlags flags, + GError **error) +{ + GVirDomainSnapshotPrivate *priv; + int status; + + g_return_if_fail(GVIR_IS_DOMAIN_SNAPSHOT (snapshot)); + g_return_if_fail(error == NULL || *error == NULL); + + priv = snapshot->priv; + status = virDomainSnapshotDelete(priv->handle, flags); + if (status < 0) { + gvir_set_error(error, GVIR_DOMAIN_SNAPSHOT_ERROR, 0, + "Unable to delete snapshot `%s'", + gvir_domain_snapshot_get_name(snapshot)); + } +} diff --git a/libvirt-gobject/libvirt-gobject-domain-snapshot.h b/libvirt-gobject/libvirt-gobject-domain-snapshot.h index 5bd827c..3985795 100644 --- a/libvirt-gobject/libvirt-gobject-domain-snapshot.h +++ b/libvirt-gobject/libvirt-gobject-domain-snapshot.h @@ -58,6 +58,18 @@ struct _GVirDomainSnapshotClass gpointer padding[20]; }; +/** + * GVirDomainSnapshotDeleteFlags: + * @GVIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN: Also delete children + * @GVIR_DOMAIN_SNAPSHOT_DELETE_METADATA_ONLY: Delete just metadata + * @GVIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN_ONLY: Delete just children + */ +typedef enum { + GVIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN = 1, + GVIR_DOMAIN_SNAPSHOT_DELETE_METADATA_ONLY = 2, + GVIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN_ONLY = 4 +} GVirDomainSnapshotDeleteFlags; + GType gvir_domain_snapshot_get_type(void); GType gvir_domain_snapshot_handle_get_type(void); @@ -69,6 +81,10 @@ GVirConfigDomainSnapshot *gvir_domain_snapshot_get_config guint flags, GError **err); +void gvir_domain_snapshot_delete (GVirDomainSnapshot *snapshot, + guint flags, + GError **error); + G_END_DECLS #endif /* __LIBVIRT_GOBJECT_DOMAIN_SNAPSHOT_H__ */ diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index f2419ac..232e63b 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -234,4 +234,10 @@ LIBVIRT_GOBJECT_0.1.5 { gvir_connection_open_read_only_finish; } LIBVIRT_GOBJECT_0.1.4; +LIBVIRT_GOBJECT_0.1.9 { + global: + gvir_domain_snapshot_delete_flags_get_type; + gvir_domain_snapshot_delete; +} LIBVIRT_GOBJECT_0.1.5; + # .... define new API here using predicted next version number .... -- 1.9.3

2 1

[libvirt] [PATCH v5] Add helper program to create custom leases
by Nehal J Wani 02 Jun '14

02 Jun '14

Introduce helper program to catch events from dnsmasq and maintain a custom lease file per network. It supports dhcpv4 and dhcpv6. The file is saved as "<interface-name>.status". Each lease contains the following info: <expiry-time (epoch time)> <mac> <iaid> <ip-address> <hostname> <clientid> Example of custom leases file content: [ { "iaid": "1221229", "ip-address": "2001:db8:ca2:2:1::95", "mac-address": "52:54:00:12:a2:6d", "hostname": "Fedora20", "client-id": "00:04:1a:c1:d9:6b:5a:0a:e2:bc:f8:4b:1e:37:2e:38:22:55", "expiry-time": 1393244216 }, { "ip-address": "192.168.150.208", "mac-address": "52:54:00:11:56:b3", "hostname": "Wani-PC", "client-id": "01:52:54:00:11:56:b3", "expiry-time": 1393244248 } ] src/Makefile.am: * Add options to compile the helper program src/network/bridge_driver.c: * Introduce networkDnsmasqLeaseFileNameCustom() * Invoke helper program along with dnsmasq * Delete the .status file when corresponding n/w is destroyed. src/network/leaseshelper.c * Helper program to create the custom lease file --- v5: * More comments added, for better explanation * Use of virFileFindResource() to identify proper path to helper binary * Use of VIR_ENUM_IMPL for handling action events added v4: * Addition of pidfile and a corresponding lock for it * Make correction for dnsmasq < 2.52 (Only IPv4) * Move helper file from src/util to src/network * Increase limit on max size of leases file * Refer: https://www.redhat.com/archives/libvir-list/2014-March/msg01038.html v3: * Improved file handling, removed redundant copying, introduced --help and --version * Refer: https://www.redhat.com/archives/libvir-list/2014-February/msg01431.html v2: * Changed format to JSON * Refer: https://www.redhat.com/archives/libvir-list/2014-January/msg01234.html v1: * Refer: https://www.redhat.com/archives/libvir-list/2014-January/msg00626.html src/Makefile.am | 22 +++ src/network/bridge_driver.c | 27 ++++ src/network/leaseshelper.c | 360 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 409 insertions(+), 0 deletions(-) create mode 100644 src/network/leaseshelper.c diff --git a/src/Makefile.am b/src/Makefile.am index dd0abe7..fbe72c4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -859,6 +859,9 @@ STORAGE_HELPER_DISK_SOURCES = \ UTIL_IO_HELPER_SOURCES = \ util/iohelper.c +NETWORK_LEASES_HELPER_SOURCES = \ + network/leaseshelper.c + # Network filters NWFILTER_DRIVER_SOURCES = \ nwfilter/nwfilter_driver.h nwfilter/nwfilter_driver.c \ @@ -2466,6 +2469,25 @@ libvirt_iohelper_CFLAGS = \ $(AM_CFLAGS) \ $(PIE_CFLAGS) \ $(NULL) + +if WITH_NETWORK +libexec_PROGRAMS += libvirt_leaseshelper +libvirt_leaseshelper_SOURCES = $(NETWORK_LEASES_HELPER_SOURCES) +libvirt_leaseshelper_LDADD = \ + libvirt_util.la \ + ../gnulib/lib/libgnu.la +if WITH_DTRACE_PROBES +libvirt_leaseshelper_LDADD += libvirt_probes.lo +endif WITH_DTRACE_PROBES + +libvirt_leaseshelper_CFLAGS = \ + $(AM_CFLAGS) \ + $(PIE_CFLAGS) \ + $(NULL) +else ! WITH_NETWORK +EXTRA_DIST += $(NETWORK_LEASES_HELPER_SOURCES) +endif ! WITH_NETWORK + endif WITH_LIBVIRTD if WITH_STORAGE_DISK diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 201b22f..ade664d 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -210,6 +210,16 @@ networkDnsmasqLeaseFileNameFunc networkDnsmasqLeaseFileName = networkDnsmasqLeaseFileNameDefault; static char * +networkDnsmasqLeaseFileNameCustom(const char *bridge) +{ + char *leasefile; + + ignore_value(virAsprintf(&leasefile, "%s/%s.status", + driverState->dnsmasqStateDir, bridge)); + return leasefile; +} + +static char * networkDnsmasqConfigFileName(const char *netname) { char *conffile; @@ -245,6 +255,7 @@ networkRemoveInactive(virNetworkDriverStatePtr driver, virNetworkObjPtr net) { char *leasefile = NULL; + char *customleasefile = NULL; char *radvdconfigfile = NULL; char *configfile = NULL; char *radvdpidbase = NULL; @@ -263,6 +274,9 @@ networkRemoveInactive(virNetworkDriverStatePtr driver, if (!(leasefile = networkDnsmasqLeaseFileName(def->name))) goto cleanup; + if (!(customleasefile = networkDnsmasqLeaseFileNameCustom(def->bridge))) + goto cleanup; + if (!(radvdconfigfile = networkRadvdConfigFileName(def->name))) goto cleanup; @@ -279,6 +293,7 @@ networkRemoveInactive(virNetworkDriverStatePtr driver, /* dnsmasq */ dnsmasqDelete(dctx); unlink(leasefile); + unlink(customleasefile); unlink(configfile); /* radvd */ @@ -296,6 +311,7 @@ networkRemoveInactive(virNetworkDriverStatePtr driver, cleanup: VIR_FREE(leasefile); VIR_FREE(configfile); + VIR_FREE(customleasefile); VIR_FREE(radvdconfigfile); VIR_FREE(radvdpidbase); VIR_FREE(statusfile); @@ -1120,6 +1136,7 @@ networkBuildDhcpDaemonCommandLine(virNetworkObjPtr network, int ret = -1; char *configfile = NULL; char *configstr = NULL; + char *leaseshelper_path; network->dnsmasqPid = -1; @@ -1142,11 +1159,21 @@ networkBuildDhcpDaemonCommandLine(virNetworkObjPtr network, cmd = virCommandNew(dnsmasqCapsGetBinaryPath(caps)); virCommandAddArgFormat(cmd, "--conf-file=%s", configfile); + + /* This helper is used to create custom leases file for libvirt */ + if (!(leaseshelper_path = virFileFindResource("libvirt_leaseshelper", + "src", + LIBEXECDIR))) + goto cleanup; + + virCommandAddArgFormat(cmd, "--dhcp-script=%s", leaseshelper_path); + *cmdout = cmd; ret = 0; cleanup: VIR_FREE(configfile); VIR_FREE(configstr); + VIR_FREE(leaseshelper_path); return ret; } diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c new file mode 100644 index 0000000..d580369 --- /dev/null +++ b/src/network/leaseshelper.c @@ -0,0 +1,360 @@ +/* + * leasehelper.c: Helper program to create custom leases file + * + * Copyright (C) 2014 Red Hat, Inc. + * Copyright (C) 2014 Nehal J Wani + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Author: Nehal J Wani <nehaljw.kkd1(a)gmail.com> + * + * For IPv6 support, use dnsmasq >= 2.67 + */ + +#include <config.h> + +#include <stdio.h> +#include <stdlib.h> +#include <sys/stat.h> + +#include "virutil.h" +#include "virthread.h" +#include "virfile.h" +#include "virpidfile.h" +#include "virbuffer.h" +#include "virstring.h" +#include "virerror.h" +#include "viralloc.h" +#include "virjson.h" +#include "configmake.h" + +#define VIR_FROM_THIS VIR_FROM_NETWORK + +/** + * VIR_NETWORK_DHCP_LEASE_FILE_SIZE_MAX: + * + * Macro providing the upper limit on the size of leases file + */ +#define VIR_NETWORK_DHCP_LEASE_FILE_SIZE_MAX (32 * 1024 * 1024) + +static const char *program_name; + +/* Display version information. */ +static void +helperVersion(const char *argv0) +{ + printf("%s (%s) %s\n", argv0, PACKAGE_NAME, PACKAGE_VERSION); +} + +ATTRIBUTE_NORETURN static void +usage(int status) +{ + if (status) { + fprintf(stderr, _("%s: try --help for more details\n"), program_name); + } else { + printf(_("Usage: %s add|old|del mac|clientid ip [hostname]\n" + "Designed for use with 'dnsmasq --dhcp-script'\n" + "Refer to man page of dnsmasq for more details'\n"), + program_name); + } + exit(status); +} + +static int +customLeaseRewriteFile(int fd, void *opaque) +{ + char **data = opaque; + + if (safewrite(fd, *data, strlen(*data)) < 0) + return -1; + + return 0; +} + +/* Flags denoting actions for a lease */ +enum virLeaseActionFlags { + VIR_LEASE_ACTION_ADD, /* Create new lease */ + VIR_LEASE_ACTION_OLD, /* Lease already exists, renew it */ + VIR_LEASE_ACTION_DEL, /* Delete the lease */ + + VIR_LEASE_ACTION_LAST +}; + +VIR_ENUM_DECL(virLeaseAction); + +VIR_ENUM_IMPL(virLeaseAction, VIR_LEASE_ACTION_LAST, + "add", "old", "del"); + +int +main(int argc, char **argv) +{ + char *exptime = NULL; + char *pid_file = NULL; + char *lease_entries = NULL; + char *custom_lease_file = NULL; + const char *ip = NULL; + const char *mac = NULL; + const char *iaid = virGetEnvAllowSUID("DNSMASQ_IAID"); + const char *clientid = virGetEnvAllowSUID("DNSMASQ_CLIENT_ID"); + const char *interface = virGetEnvAllowSUID("DNSMASQ_INTERFACE"); + const char *exptime_tmp = virGetEnvAllowSUID("DNSMASQ_LEASE_EXPIRES"); + const char *hostname = virGetEnvAllowSUID("DNSMASQ_SUPPLIED_HOSTNAME"); + const char *leases_str = NULL; + long long currtime = 0; + long long expirytime = 0; + size_t i = 0; + int size = 0; + int action = -1; + int pid_file_fd = -1; + int rv = EXIT_FAILURE; + int custom_lease_file_len = 0; + bool add = false; + bool delete = false; + virJSONValuePtr lease_new = NULL; + virJSONValuePtr lease_tmp = NULL; + virJSONValuePtr leases_array = NULL; + virJSONValuePtr leases_array_new = NULL; + + virSetErrorFunc(NULL, NULL); + virSetErrorLogPriorityFunc(NULL); + + program_name = argv[0]; + + if (setlocale(LC_ALL, "") == NULL || + bindtextdomain(PACKAGE, LOCALEDIR) == NULL || + textdomain(PACKAGE) == NULL) { + fprintf(stderr, _("%s: initialization failed\n"), program_name); + exit(EXIT_FAILURE); + } + + if (virThreadInitialize() < 0 || + virErrorInitialize() < 0) { + fprintf(stderr, _("%s: initialization failed\n"), program_name); + exit(EXIT_FAILURE); + } + + /* Doesn't hurt to check */ + if (argc > 1) { + if(STREQ(argv[1], "--help")) + usage(EXIT_SUCCESS); + + if (STREQ(argv[1], "--version")) { + helperVersion(argv[0]); + exit(EXIT_SUCCESS); + } + } + + if (argc != 4 && argc != 5) { + /* Refer man page of dnsmasq --dhcp-script for more details */ + usage(EXIT_FAILURE); + } + + /* Make sure dnsmasq knows the interface. The interface name is not known + * when dnsmasq (re)starts and throws 'del' events for expired leases. + * So, if any old lease has expired, it will be automatically removed the + * next time this program is invoked */ + if (!interface) + goto cleanup; + + ip = argv[3]; + mac = argv[2]; + action = virLeaseActionTypeFromString(argv[1]); + + /* In case hostname is known, it is the 5th argument */ + if (argc == 5) + hostname = argv[4]; + + if (VIR_STRDUP(exptime, exptime_tmp) < 0) + goto cleanup; + + /* Removed extraneous trailing space in DNSMASQ_LEASE_EXPIRES (dnsmasq < 2.52) */ + if (exptime[strlen(exptime) - 1] == ' ') + exptime[strlen(exptime) - 1] = '\0'; + + /* Check if it is an IPv6 lease */ + if (virGetEnvAllowSUID("DNSMASQ_IAID")) { + mac = virGetEnvAllowSUID("DNSMASQ_MAC"); + clientid = argv[2]; + } + + if (virAsprintf(&custom_lease_file, + LOCALSTATEDIR "/lib/libvirt/dnsmasq/%s.status", + interface) < 0) + goto cleanup; + + if (VIR_STRDUP(pid_file, LOCALSTATEDIR "/run/leaseshelper.pid") < 0) + goto cleanup; + + /* Try to claim the pidfile, exiting if we can't */ + if ((pid_file_fd = virPidFileAcquirePath(pid_file, true, getpid())) < 0) + goto cleanup; + + /* Since interfaces can be hot plugged, we need to make sure that the + * corresponding custom lease file exists. If not, 'touch' it */ + if (virFileTouch(custom_lease_file, 0644) < 0) + goto cleanup; + + /* Read entire contents */ + if ((custom_lease_file_len = virFileReadAll(custom_lease_file, + VIR_NETWORK_DHCP_LEASE_FILE_SIZE_MAX, + &lease_entries)) < 0) { + goto cleanup; + } + + if (action == VIR_LEASE_ACTION_ADD || + action == VIR_LEASE_ACTION_OLD || + action == VIR_LEASE_ACTION_DEL) { + /* Custom ipv6 leases *will not* be created if the env-var DNSMASQ_MAC + * is not set. In the special case, when the $(interface).status file + * is not already present and dnsmasq is (re)started, the corresponding + * ipv6 custom lease will be created only when the guest sends the + * 'old' action for its existing ipv6 interfaces. + * + * According to rfc3315, the combination of DUID and IAID can be used + * to uniquely identify each ipv6 guest interface. So, in future, if + * we introduce virNetworkGetDHCPLeaseBy(IAID|DUID|IAID+DUID) for ipv6 + * interfaces, then, the following if condition won't be required, as + * the new lease will be created irrespective of whether the MACID is + * known or not. + */ + if (mac || action == VIR_LEASE_ACTION_DEL) { + /* Delete the corresponding lease, if it already exists */ + delete = true; + if (action == VIR_LEASE_ACTION_ADD || + action == VIR_LEASE_ACTION_OLD) { + add = true; + /* Create new lease */ + if (!(lease_new = virJSONValueNewObject())) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to create json")); + goto cleanup; + } + + if (virStrToLong_ll(exptime, NULL, 10, &expirytime) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to convert lease expiry time to long long: %s"), + exptime); + goto cleanup; + } + + if (iaid && virJSONValueObjectAppendString(lease_new, "iaid", iaid) < 0) + goto cleanup; + if (ip && virJSONValueObjectAppendString(lease_new, "ip-address", ip) < 0) + goto cleanup; + if (mac && virJSONValueObjectAppendString(lease_new, "mac-address", mac) < 0) + goto cleanup; + if (hostname && virJSONValueObjectAppendString(lease_new, "hostname", hostname) < 0) + goto cleanup; + if (clientid && virJSONValueObjectAppendString(lease_new, "client-id", clientid) < 0) + goto cleanup; + if (expirytime && virJSONValueObjectAppendNumberLong(lease_new, "expiry-time", expirytime) < 0) + goto cleanup; + } + } + } else { + fprintf(stderr, _("Unsupported action: %s\n"), + virLeaseActionTypeToString(action)); + exit(EXIT_FAILURE); + } + /* Check for previous leases */ + if (custom_lease_file_len) { + if (!(leases_array = virJSONValueFromString(lease_entries))) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("invalid json in file: %s"), custom_lease_file); + goto cleanup; + } + + if ((size = virJSONValueArraySize(leases_array)) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("couldn't fetch array of leases")); + goto cleanup; + } + } + + if (!(leases_array_new = virJSONValueNewArray())) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to create json")); + goto cleanup; + } + + currtime = (long long) time(NULL); + + for (i = 0; i < size; i++) { + const char *ip_tmp = NULL; + long long expirytime_tmp = -1; + + if (!(lease_tmp = virJSONValueArrayGet(leases_array, i))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to parse json")); + goto cleanup; + } + + if (!(ip_tmp = virJSONValueObjectGetString(lease_tmp, "ip-address")) || + (virJSONValueObjectGetNumberLong(lease_tmp, "expiry-time", &expirytime_tmp) < 0)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to parse json")); + goto cleanup; + } + + /* Check whether lease has expired or not */ + if (expirytime_tmp < currtime) + continue; + + /* Check whether lease has to be included or not */ + if (delete && STREQ(ip_tmp, ip)) + continue; + + /* Add old lease to new array */ + if (virJSONValueArrayAppend(leases_array_new, lease_tmp) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to create json")); + goto cleanup; + } + } + + if (add) { + if (virJSONValueArrayAppend(leases_array_new, lease_new) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to create json")); + goto cleanup; + } + } + + if (!(leases_str = virJSONValueToString(leases_array_new, true))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("empty json array")); + goto cleanup; + } + + /* Write to file */ + if (virFileRewrite(custom_lease_file, 0644, + customLeaseRewriteFile, &leases_str) < 0) + goto cleanup; + + rv = EXIT_SUCCESS; + +cleanup: + if (pid_file_fd != -1) + virPidFileReleasePath(pid_file, pid_file_fd); + + VIR_FREE(pid_file); + VIR_FREE(exptime_tmp); + VIR_FREE(custom_lease_file); + virJSONValueFree(lease_new); + virJSONValueFree(leases_array); + virJSONValueFree(leases_array_new); + + return rv; +} -- 1.7.1

2 3

[libvirt] [PATCH v2] qemu: Properly label FDs when restoring domain with static label
by Shivaprasad G Bhat 02 Jun '14

02 Jun '14

The restore of a saved image file fails when the selinux context is static. The libvirt has to set the conext of save image file handle to that of the guest before handing off the FD to qemu. Signed-off-by: Shivaprasad G Bhat <shivaprasadbhat(a)gmail.com> --- src/qemu/qemu_process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 124fe28..47d1f7d 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4052,14 +4052,14 @@ int qemuProcessStart(virConnectPtr conn, */ struct stat stdin_sb; - VIR_DEBUG("setting security label on pipe used for migration"); + VIR_DEBUG("setting security label on fd used for migration or restore"); if (fstat(stdin_fd, &stdin_sb) < 0) { virReportSystemError(errno, _("cannot stat fd %d"), stdin_fd); goto cleanup; } - if (S_ISFIFO(stdin_sb.st_mode) && + if ((S_ISFIFO(stdin_sb.st_mode) || S_ISREG(stdin_sb.st_mode)) && virSecurityManagerSetImageFDLabel(driver->securityManager, vm->def, stdin_fd) < 0) goto cleanup; }

2 1

[libvirt] [PATCH] virsh: Check wether found volume is member of the specified storage pool
by Peter Krempa 02 Jun '14

02 Jun '14

When looking up storage volumes virsh uses multiple lookup steps. Some of the steps don't require a pool name specified. This resulted into a possibility that a volume would be part of a different pool than the user specified: Let's have a /var/lib/libvirt/images/test.qcow image in the 'default' pool and a second pool 'emptypool': Currently we'd return: $ virsh vol-info --pool emptypool /var/lib/libvirt/images/test.qcow Name: test.qcow Type: file Capacity: 100.00 MiB Allocation: 212.00 KiB After the fix: $ tools/virsh vol-info --pool emptypool /var/lib/libvirt/images/test.qcow error: Requested volume '/var/lib/libvirt/images/test.qcow' found in a different pool (default) than specified Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1088667 --- tools/virsh-volume.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index 55bf6f0..6416ba6 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -104,6 +104,26 @@ vshCommandOptVolBy(vshControl *ctl, const vshCmd *cmd, "might help"), n, pooloptname); } + /* If the pool was specified, then make sure that the returned + * volume is from the given pool */ + if (pool && vol) { + virStoragePoolPtr volpool = NULL; + + if ((volpool = virStoragePoolLookupByVolume(vol))) { + if (STRNEQ(virStoragePoolGetName(volpool), + virStoragePoolGetName(pool))) { + vshResetLibvirtError(); + vshError(ctl, + _("Requested volume '%s' found in a different " + "pool (%s) than specified"), + n, virStoragePoolGetName(volpool)); + virStorageVolFree(vol); + vol = NULL; + } + virStoragePoolFree(volpool); + } + } + if (pool) virStoragePoolFree(pool); -- 1.9.3

3 3

[libvirt] Availability of libvirt-python-1.2.5
by Daniel Veillard 02 Jun '14

02 Jun '14

I also made a new release for the python bindings, they are available at: ftp://libvirt.org/libvirt/python they include support for the 2 new set of APIs introduced in 1.2.5 and a memory leak in older python version, so peope are also invited to update: - fix leak in memoryStats with older python (Martin Kletzander) - Implement virDomain{Get,Set}Time APIs (Michal Privoznik) - override: add virDomainFSFreeze and virDomainFSThaw API (Tomoki Sekiyama) thanks everybody ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] Release fo libvirt-1.2.5
by Daniel Veillard 02 Jun '14

02 Jun '14

As planned the release of libvirt 1.2.5 is out, it is tagged in git and available as tarballs and rpms at the usual place: ftp://libvirt.org/libvirt/ This is a relatively small release in the number of commits, around 150, but includes a security fix (which happened to be my fault !) and 2 new set of APIs. There is also some interesting refactoring work and the usual flow of bug fixes, so people are really invited to update: Security: - LSN-2014-0003: Don't expand entities when parsing XML (Daniel P. Berrange) Features: - Introduce virDomain{Get,Set}Time APIs (Michal Privoznik) - Introduce virDomainFSFreeze() and virDomainFSThaw() public API (Tomoki Sekiyama) Portability: - build: avoid compiler warning on 32-bit platform (Eric Blake) - build: fix build with libselinux 2.3 (Cédric Bosdonnat) - qemu: Fix specifying char devs for PPC (Olivia Yin) - change machine name ppce500v2 to ppce500 (Olivia Yin) - tests: avoid dlsym mocking on mingw (Eric Blake) - avoid 'sync' as variable name (Pavel Hrdina) - Fix build wihout macvtap or virtualport (Ján Tomko) Bug Fixes: - util: fix DST end date in virtimetest timezones (Laine Stump) - qemu: snapshot: Improve detection of mixed snapshots (Peter Krempa) - qemu: snapshot: Reject internal active snapshot without memory state (Peter Krempa) - util: storage: Fix crash of libvirtd on network backed guest block-pull (Peter Krempa) - util: fix virTimeLocalOffsetFromUTC DST processing (Laine Stump) - qemu: managedsave: Don't spam logs with warnings about corrupted image (Peter Krempa) - utils: storage: Canonicalize paths only for local filesystems (Peter Krempa) - qemu: reject rather than hang on blockcommit of active layer (Eric Blake) - Clean up chardev sockets on QEMU shutdown (Ján Tomko) - qemu: fix <clock offset='variable' basis='localtime'/> (Laine Stump) - qemu: fix RTC_CHANGE event for <clock offset='variable' basis='utc'/> (Laine Stump) - qemu: Properly abort migration to a file (Jiri Denemark) - qemu: Send migrate_cancel when aborting migration (Jiri Denemark) - Fix error message when TUNNELLED flag is used in non-p2p migration (Jiri Denemark) - conf: fix backing store parse off-by-one (Eric Blake) - Fix crash in DAC driver with no seclabels (Ján Tomko) - util: fix memory leak in failure path of virCgroupKillRecursiveInternal (Chen Hanxiao) - qemu: Avoid leak in qemuDomainCheckRemoveOptionalDisk (Jiri Denemark) - qemu: Ignore temporary job errors when checking migration status (Jiri Denemark) - qemu: snapshot: Terminate job when memory compression program isn't found (Peter Krempa) - sanlock: avoid leak in acquire() (Martin Kletzander) - virsh: domain: Fix output of the VNC display number for domdisplay (Peter Krempa) - sanlock: don't fail with unregistered domains (Martin Kletzander) - storage: Resolve issues in failure path (John Ferlan) - spec: Don't install nonexistent test_libvirt_lockd.aug (Jiri Denemark) - spec: sanlock is x86_64 only on RHEL (Jiri Denemark) - Fix vlan ID detection in udev interface driver (Ján Tomko) Documentation: - bhyve driver documentation improvements (Roman Bogorodskiy) - virsh: fix typos in virsh man page (Eric Blake) - maint: fix typo in previous patch (Eric Blake) - fix documentation of virDomainSet(Get)Metadata (Dan Kenigsberg) - Fix an extra ' in a translated string (Daniel Veillard) - add a serial device with a seclabel example (Ján Tomko) - maint: fix typos related to disk name resolution (Eric Blake) - maint: fix typos related to 'frozen' (Eric Blake) - mention vagrant-libvirt in apps.html (James Shubin) - update documentation of <interface type='hostdev'> (Chunyan Liu) - update README-hacking (Chen Hanxiao) - virerror: Fix an error message typo (Cole Robinson) - fix a typo in formatdomain (Chen Hanxiao) - typos: fix s/it/is/ where applicable (Martin Kletzander) - datatypes: Fix comment of secret uuid (Li Yang) Improvements: - maint: cleanup detection of const'ness of selinux ctx (Jim Fehlig) - storage: fs: Drop-in replace use of virStorageFileGetMetadataFromBuf (Peter Krempa) - storage: Return backing format from virStorageFileGetMetadataFromFD (Peter Krempa) - util: new function virTimeLocalOffsetFromUTC (Laine Stump) - storage: Add storage file API to read file headers (Peter Krempa) - storage: Add support for access to files using provided uid/gid (Peter Krempa) - storage: Add NONE protocol type for network disks (Peter Krempa) - conf: Fix domain disk path iterator to work with networked storage (Peter Krempa) - storage: Rework debugging of storage file access through storage driver (Peter Krempa) - storage: Store gluster volume name separately (Peter Krempa) - qemu: Make qemuDomainPrepareDiskChainElement aware of remote storage (Peter Krempa) - qemu: process: Refresh backing chain info when reconnecting to qemu (Peter Krempa) - Don't log an internal error when the guest hasn't updated balloon stats (Ján Tomko) - qemuSetupCgroupForVcpu: s/virProcessInfoSetAffinity/virProcessSetAffinity/ (Michal Privoznik) - bhyve: fix virObjectUnlock() usage (Roman Bogorodskiy) - virdbus: Show method name in error message (Cole Robinson) - virdbus: Remove redundant error macro (Cole Robinson) - qemu: snapshot: Fix return value of external checkpoint with no disks (Peter Krempa) - qemu: snapshot: Forbid empty snapshots (Peter Krempa) - qemu: snapshot: Forbid partial internal snapshots (Peter Krempa) - qemu: snapshot: Use typecasted switch in qemuDomainSnapshotPrepare() (Peter Krempa) - bhyve: domain events support (Roman Bogorodskiy) - migration: add support for migrateURI configuration (Chen Fan) - util: refactor virNetlinkCommand to fix several bugs / style problems (Laine Stump) - build: nuke more uses of 'sync' (Eric Blake) - Return error when updating cdrom device (Pavel Hrdina) - Revert "maint: prefer enum over int for virstoragefile structs" (Eric Blake) - parallels: create VMs in the default place (Dmitry Guryanov) - parallels: add disks correctly (Dmitry Guryanov) - parallels: set file format in virDomainDef (Dmitry Guryanov) - parallels: add VIR_STORAGE_FILE_PLOOP format (Dmitry Guryanov) - conf: fix seclabels for chardevs (Ján Tomko) - Rename virDomainDiskSourceDefFormatSeclabel (Ján Tomko) - security_dac: honor relabel='no' in chardev config (Jim Fehlig) - security_dac: avoid relabeling hostdevs when relabel='no' (Jim Fehlig) - security_dac: honor relabel='no' in disk config (Jim Fehlig) - security_dac: avoid relabeling when relabel='no' (Jim Fehlig) - security_dac: rework callback parameter passing (Jim Fehlig) - security_dac: cleanup use of enum types (Jim Fehlig) - security_dac: annotate some functions with ATTRIBUTE_NONNULL (Jim Fehlig) - maint: prefer enum over int for virstoragefile structs (Eric Blake) - maint: shorten 'TypeType' function names (Eric Blake) - maint: use enum typedef for virstorageencryption.h (Eric Blake) - vbox: fix stale comment about vdi storage type (Eric Blake) - qemu: Implement virDomain{Get,Set}Time (Michal Privoznik) - virsh: Expose virDomain{Get,Set}Time (Michal Privoznik) - security_dac: Fix indentation (Jim Fehlig) - security_dac: Remove unnecessary curly braces (Jim Fehlig) - security_dac: Remove unnecessary ATTRIBUTE_UNUSED (Jim Fehlig) - virsh: reject undefine --wipe-storage without also naming storage (Li Yang) - conf: use typedefs for enums in "src/conf/snapshot_conf.h" (Julio Faracco) - conf: use typedefs for enums in "src/conf/storage_conf.h" (Julio Faracco) - conf: use typedefs for enums in "src/conf/nwfilter_conf.h" (Julio Faracco) - qemu: Make qemuProcess{Start,Stop}CPUs easier to follow (Jiri Denemark) - qemuDomainObjBeginNestedJob: Return -2 for temporary failures (Jiri Denemark) - qemu: Make qemuDomainObjBeginNestedJob static (Jiri Denemark) - qemu: extract common PCI handling functions (Roman Bogorodskiy) - qemu: extract PCI handling structs (Roman Bogorodskiy) - qemu: Adjust size for qcow2/qed if not on sector boundary (John Ferlan) - sanlock: code movement in virLockManagerSanlockAcquire (Martin Kletzander) - apibuild: Disallow 'returns' return description (Michal Privoznik) - qemu: Support mountpoints option of guest-fsfreeze-freeze (Tomoki Sekiyama) - virsh: Expose new virDomainFSFreeze and virDomainFSThaw API (Tomoki Sekiyama) - qemu: Implement virDomainFSFreeze and virDomainFSThaw (Tomoki Sekiyama) - conf: use typedefs for enums in node_device_conf, nwfilter_params (Julio Faracco) - libxl: fix support for <interface type="hostdev"> syntax (Chunyan Liu) - maint: use $(SED) instead of sed for syntax-check (Roman Bogorodskiy) - bhyve: implement connectGetSysinfo (Roman Bogorodskiy) - qemu: Implement a stub cpuArchDriver.compare() handler for arm and aarch64 (Oleg Strikov) - ESX: add virStorageVolGetInfo in iSCSI backend. (Dawid Zamirski) - parallels: add a set of trivial functions (Dmitry Guryanov) - parallels: don't add domain to the list twice (Dmitry Guryanov) - parallels: don't enable VNC when we define a new domain (Dmitry Guryanov) - parallels: fix virDomainDef.features comparison (Dmitry Guryanov) - Add support for timestamping QEMU logs (Ján Tomko) - qemu: track quiesced status in qemuDomainSnapshotFSFreeze (Tomoki Sekiyama) - remote: Implement virDomainFSFreeze and virDomainFSThaw (Tomoki Sekiyama) - udev: consider the device a CDROM when ID_CDROM=1 (Giuseppe Scrivano) - virdbus: Make virDBusCall static (Cole Robinson) - qemu: specify domain in host-side PCI addresses when needed/supported (Laine Stump) - qemu: add host-pci-multidomain capability (Laine Stump) - storageVolCreateXMLFrom: Allow multiple accesses to origvol (Michal Privoznik) - conf: use typedefs for enums in "src/conf/{network,interface}_conf.h" (Julio Faracco) - conf: use typedefs for enums in "src/conf/cpu_conf.h" (Julio Faracco) - util: use typedefs for enums in "src/util/" directory (Julio Faracco) - virsh: Replace list element to defined variable (Li Yang) - libxl: support PARAVIRT reboot flag (Jim Fehlig) - libxl: support PARAVIRT and ACPI shutdown flags (Jim Fehlig) - Introduce a new flag for controlling shutdown/reboot (Jim Fehlig) - conf: drop extra storage probe (Eric Blake) - bhyve: report cpuTime in bhyveDomainGetInfo (Roman Bogorodskiy) - bhyve: implement connectDomainXMLToNative (Roman Bogorodskiy) - bhyve: improve bhyve_command.c testability (Roman Bogorodskiy) Cleanup: - virSecurityDACRestoreSecurityHostdevLabel: Unmark @def as unused (Michal Privoznik) Thanks everybody who contributed in one way or anither to this release with bug reports, fixes, documentation and patch reviews ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH v5] bhyve: implement PCI address allocation
by Roman Bogorodskiy 01 Jun '14

01 Jun '14

Changes from v4: - Qemu-related part of sharing the common code is complete and pushed, so patch lives on its own now - virBhyveProcessBuildBhyveCmd() modified to loop over disks and nets and call bhyveBuildDiskArgStr() and bhyveBuildNetArgStr() for an individual device to make the latter more readable - Fix double assing / double semicolon typo - Fix spelling in virReportError() for disks - Make bhyveAssignDevicePCISlots() assign nets before disks to reproduce the old behaviour when one net and one disk were supported - Make persistentAddrs of _bhyveDomainObjPrivate bool. Roman Bogorodskiy (1): bhyve: implement PCI address allocation po/POTFILES.in | 1 + src/Makefile.am | 4 + src/bhyve/bhyve_command.c | 112 +++++++------ src/bhyve/bhyve_device.c | 174 +++++++++++++++++++++ src/bhyve/bhyve_device.h | 38 +++++ src/bhyve/bhyve_domain.c | 75 +++++++++ src/bhyve/bhyve_domain.h | 39 +++++ src/bhyve/bhyve_driver.c | 12 +- .../bhyvexml2argvdata/bhyvexml2argv-acpiapic.args | 2 +- tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml | 2 + tests/bhyvexml2argvdata/bhyvexml2argv-base.args | 2 +- tests/bhyvexml2argvdata/bhyvexml2argv-base.xml | 2 + tests/bhyvexml2argvdata/bhyvexml2argv-console.args | 4 +- tests/bhyvexml2argvdata/bhyvexml2argv-console.xml | 2 + .../bhyvexml2argv-disk-virtio.args | 2 +- .../bhyvexml2argv-disk-virtio.xml | 2 + tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args | 2 +- tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.xml | 2 + tests/bhyvexml2argvdata/bhyvexml2argv-serial.args | 4 +- tests/bhyvexml2argvdata/bhyvexml2argv-serial.xml | 2 + 20 files changed, 416 insertions(+), 67 deletions(-) create mode 100644 src/bhyve/bhyve_device.c create mode 100644 src/bhyve/bhyve_device.h create mode 100644 src/bhyve/bhyve_domain.c create mode 100644 src/bhyve/bhyve_domain.h -- 1.9.0

2 6

[libvirt] [PATCH] docs: bhyve driver documentation improvements
by Roman Bogorodskiy 01 Jun '14

01 Jun '14

- Document 'domxml-to-native' command - Mention that the nmdm console support needs an appropriate kernel module loaded --- docs/drvbhyve.html.in | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/docs/drvbhyve.html.in b/docs/drvbhyve.html.in index 603be80..ecd7c0c 100644 --- a/docs/drvbhyve.html.in +++ b/docs/drvbhyve.html.in @@ -98,6 +98,9 @@ the following to the domain XML (Since 1.2.4): </devices> ...</pre> + +Make sure to load the <code>nmdm</code> kernel module if you plan to use that. + Then <code>virsh console</code> command can be used to connect to the text console of a guest. @@ -110,6 +113,24 @@ to let a guest boot or start a guest using: <pre>start --console domname</pre> +<h3><a name="xmltonative">Converting from domain XML to Bhyve args</a></h3> + + +The <code>virsh domxml-to-native</code> command allows to preview the actual <code>bhyve</code> commands +that will be executed for a given domain. It outputs two lines, the first line is a <code>bhyveload</code> +command and the second is a <code>bhyve</code> command. + + +Please note that the <code>virsh domxml-to-native</code> doesn't do any real actions but printing the command, +for example, it doesn't try to find a proper TAP interface and create it, like it's done when starting a domain, and +always returns <code>tap0</code> for the network interface. So if you're going to run these commands manually, most likely +you might want to tweak them. + +<pre> +# virsh -c "bhyve:///system" domxml-to-native --format bhyve-argv --xml /path/to/bhyve.xml +/usr/sbin/bhyveload -m 214 -d /home/user/vm1.img vm1 +/usr/sbin/bhyve -c 2 -m 214 -A -I -H -P -s 0:0,hostbridge -s 3:0,virtio-net,tap0,mac=52:54:00:5d:74:e3 -s 2:0,virtio-blk,/home/user/vm1.img -s 1,lpc -l com1,/dev/nmdm0A vm1 +</pre> </body> </html> -- 1.9.0

3 3

[libvirt] [PATCH] util: fix DST end date in virtimetest timezones
by Laine Stump 01 Jun '14

01 Jun '14

Reported by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> Some of the tests for virTimeLocalOffsetFromUTC set an imaginary timezone that attempts to force dyalight savings time active all the time by setting a start date of 0/00:00:00 and end date of 366/23:59:59. Since the day is 0-based, 366 really means "day 367" which will never occur - this was an attempt to eliminate problems with DST not being active in some cases right around midnight on January 1. Even though it didn't completely solve the problem, it didn't seem to cause harm so it was left in the test timezones. Although Linux glibc doesn't mind having a DST end date of 366, FreeBSD refuses to use such timezones, so the tests fail. This patch changes the 366 to 365. This may or may not cause failure of the remaining DST tests around midnight Jan 1. If so, we will need to disable those tests at year's end too. --- Pushed as a build breaker. tests/virtimetest.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/virtimetest.c b/tests/virtimetest.c index 749a112..859bd13 100644 --- a/tests/virtimetest.c +++ b/tests/virtimetest.c @@ -192,13 +192,13 @@ mymain(void) * have DST in effect; what's more, cover a zone with * with an unusual DST different than a usual one hour */ - TEST_LOCALOFFSET("VIR-00:30VID,0/00:00:00,366/23:59:59", + TEST_LOCALOFFSET("VIR-00:30VID,0/00:00:00,365/23:59:59", ((1 * 60) + 30) * 60); - TEST_LOCALOFFSET("VIR-02:30VID,0/00:00:00,366/23:59:59", + TEST_LOCALOFFSET("VIR-02:30VID,0/00:00:00,365/23:59:59", ((3 * 60) + 30) * 60); - TEST_LOCALOFFSET("VIR-02:30VID-04:30,0/00:00:00,366/23:59:59", + TEST_LOCALOFFSET("VIR-02:30VID-04:30,0/00:00:00,365/23:59:59", ((4 * 60) + 30) * 60); - TEST_LOCALOFFSET("VIR-12:00VID-13:00,0/00:00:00,366/23:59:59", + TEST_LOCALOFFSET("VIR-12:00VID-13:00,0/00:00:00,365/23:59:59", ((13 * 60) + 0) * 60); if (!isNearYearEnd()) { @@ -214,11 +214,11 @@ mymain(void) * tests, except on Dec 31 and Jan 1. */ - TEST_LOCALOFFSET("VIR02:45VID00:45,0/00:00:00,366/23:59:59", + TEST_LOCALOFFSET("VIR02:45VID00:45,0/00:00:00,365/23:59:59", -45 * 60); - TEST_LOCALOFFSET("VIR05:00VID04:00,0/00:00:00,366/23:59:59", + TEST_LOCALOFFSET("VIR05:00VID04:00,0/00:00:00,365/23:59:59", ((-4 * 60) + 0) * 60); - TEST_LOCALOFFSET("VIR11:00VID10:00,0/00:00:00,366/23:59:59", + TEST_LOCALOFFSET("VIR11:00VID10:00,0/00:00:00,365/23:59:59", ((-10 * 60) + 0) * 60); } -- 1.9.3

2 1

[libvirt] [PATCHv2 0/4] qemu: fix broken RTC_CHANGE event when clock offset='variable'
by Laine Stump 01 Jun '14

01 Jun '14

(the cover letter from V1 has been preserved here with small updates) This patch series is all about: https://bugzilla.redhat.com/show_bug.cgi?id=964177 which points out a flaw in qemu's RTC_CHANGE event when the base for the guest's real time clock was given as an explicit date (rather than as 'utc' or 'localtime'). Patch 3/4 explains what qemu does, and how this patch fixes it (for the case of basis='utc' - an additional fix to properly support basis='localtime', both for RTC_CHANGE and when migrating across timezone/DST boundaries, is in Patch 4/4). (NB: the flawed RTC_CHANGE offset has been in QEMU for so long now that it has been documented and cannot be changed, so libvirt must work around it) In the meantime, the fix for basis='localtime' required that we learn the offset of localtime from utc, and that seems like something we might want to do for other reasons, so Patch 1/4 adds a new utility function do get that value that is (I hope!) POSIX compliant. Since the original patch to fix this problem was incorrect, and the new patch doesn't use any of its code, Patch 2/4 reverts that patch completely. Note that I have tested this patch by starting a domain with several variations of <clock> parameters (in a locale that is currently at UTC+3) and using the following short script to add and remove seconds from the guest's RTC while watching both the <clock> line in /var/run/libvirt/qemu/$domain.xml and the offset value sent in libvirt's VIR_DOMAIN_EVENT_ID_RTC_CHANGE event (using examples/domain-events/events-c/event-test from a libvirt source tree that has been built). All cases appear to maintain the adjustment in the status properly, as well as sending the correct value to any event handler. Here is the script I used to add/remove time from the RTC: #!/bin/sh old=$(hwclock --show | cut -f1-7 -d' ') oldabs=$(date +%s --date="$old") newabs=$(expr $oldabs + $1) new=$(date --date="@$newabs") echo Old: $oldabs $old echo New: $newabs $new hwclock --set --date="@$newabs" Laine Stump (4): util: new function virTimeLocalOffsetFromUTC Revert "qemu: Report the offset from host UTC for RTC_CHANGE event" qemu: fix RTC_CHANGE event for <clock offset='variable' basis='utc'/> qemu: fix <clock offset='variable' basis='localtime'/> src/conf/domain_conf.c | 32 +++++++++++++------------------- src/conf/domain_conf.h | 8 +++++--- src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 43 ++++++++++++++++++++++++++++++------------- src/qemu/qemu_process.c | 34 +++++++++++++++++++--------------- src/util/virtime.c | 41 ++++++++++++++++++++++++++++++++++++++++- src/util/virtime.h | 5 +++-- tests/virtimetest.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 155 insertions(+), 53 deletions(-) -- 1.9.0

9 42

[libvirt] [PATCH] build: avoid compiler warning on 32-bit platform
by Eric Blake 31 May '14

31 May '14

On a 32-bit platform: virstringtest.c: In function 'mymain': virstringtest.c:673: warning: this decimal constant is unsigned only in ISO C90 I already had a comment in the file about the 64-bit counterpart; the easiest fix was to make both sites use the standardized macro that is guaranteed to work. * tests/virstringtest.c (mymain): Minimum signed integers are a pain. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. tests/virstringtest.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/virstringtest.c b/tests/virstringtest.c index 1e330f9..96c3784 100644 --- a/tests/virstringtest.c +++ b/tests/virstringtest.c @@ -670,7 +670,7 @@ mymain(void) -1LL, 0, 18446744073709551615ULL, 0); TEST_STRTOL("-2147483647", NULL, -2147483647, 0, 2147483649U, 0, -2147483647LL, 0, 18446744071562067969ULL, 0); - TEST_STRTOL("-2147483648", NULL, -2147483648, 0, 2147483648U, 0, + TEST_STRTOL("-2147483648", NULL, INT32_MIN, 0, 2147483648U, 0, -2147483648LL, 0, 18446744071562067968ULL, 0); TEST_STRTOL("-2147483649", NULL, 0, -1, 2147483647U, 0, -2147483649LL, 0, 18446744071562067967ULL, 0); @@ -680,10 +680,8 @@ mymain(void) -4294967296LL, 0, 18446744069414584320ULL, 0); TEST_STRTOL("-9223372036854775807", NULL, 0, -1, 0U, -1, -9223372036854775807LL, 0, 9223372036854775809ULL, 0); - /* Bah, stupid gcc warning about -9223372036854775808LL being an - * unrepresentable integer constant */ TEST_STRTOL("-9223372036854775808", NULL, 0, -1, 0U, -1, - 0x8000000000000000LL, 0, 9223372036854775808ULL, 0); + INT64_MIN, 0, 9223372036854775808ULL, 0); TEST_STRTOL("-9223372036854775809", NULL, 0, -1, 0U, -1, 0LL, -1, 9223372036854775807ULL, 0); TEST_STRTOL("-18446744073709551615", NULL, 0, -1, 0U, -1, -- 1.9.3

1 0

[libvirt] [PATCH] libxl: add support for cache=directsync to to libxl_device_disk
by Olaf Hering 30 May '14

30 May '14

Up to now xend and libxl did not have any way and need to specify a cache= mode for block devices. At least the libxl driver did just ignore the cachemode value. With xen-4.5 a new knob was added to libxl which instructs qemu to use threads=native cache=directsync in the qdisk driver. This mode was disabled early due to a pvops kernel bug. As a workaround cache=writeback was set as default. The kernel bug is long fixed. I assume the forward ported xenlinux kernel never had this bug. This change exposes the knob to libvirt. If cache=directsync is set qemu is instructed to use native AIO. This change also lays the ground work to set cache=unsafe at some point. It is currently under investigation whether libxl should expose such knob. Signed-off-by: Olaf Hering <olaf(a)aepfle.de> --- src/libxl/libxl_conf.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 4cb062e..79f4a82 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -739,6 +739,20 @@ libxlDiskSetDiscard(libxl_device_disk *x_disk, int discard) #endif } +static void +libxlDiskSetCacheMode(libxl_device_disk *x_disk, int cachemode) +{ + switch (cachemode) { +#if defined(LIBXL_HAVE_DEVICE_DISK_DIRECT_IO_SAFE) + case VIR_DOMAIN_DISK_CACHE_DIRECTSYNC: + x_disk->direct_io_safe = 1; + break; +#endif + default: + break; + } +} + int libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk) @@ -855,6 +869,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk) x_disk->readwrite = !l_disk->readonly; x_disk->is_cdrom = l_disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM ? 1 : 0; libxlDiskSetDiscard(x_disk, l_disk->discard); + libxlDiskSetCacheMode(x_disk, l_disk->cachemode); /* An empty CDROM must have the empty format, otherwise libxl fails. */ if (x_disk->is_cdrom && !x_disk->pdev_path) x_disk->format = LIBXL_DISK_FORMAT_EMPTY;

2 1

[libvirt] Libvrt Migrate an Offline VM
by Sijo Jose 30 May '14

30 May '14

Hi, Is it possible to migrate an Offline VM using libvirt API ? Regards Sijo Jose

2 1

[libvirt] [libvirt-python PATCH] fix leak in memoryStats with older python
by Martin Kletzander 30 May '14

30 May '14

libvirt_virDomainMemoryStats() function creates a dictionary without any checks whether the additions were successful, whether the python objects were created and, most importantly, without decrementing the reference count on the objects added to the dictionary. This is somehow not an issue with current upstream versions, however with python 2.6 this exposes a leak in our bindings. The following patch works on both old and new CPython versions and is already used in other parts of the code, so it's also most straightforward. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- libvirt-override.c | 68 +++++++++++++++++++++++++++++++++++------------------- 1 file changed, 44 insertions(+), 24 deletions(-) diff --git a/libvirt-override.c b/libvirt-override.c index a7a6213..8fd856b 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -734,6 +734,7 @@ libvirt_virDomainMemoryStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { size_t i; virDomainMemoryStatStruct stats[VIR_DOMAIN_MEMORY_STAT_NR]; PyObject *info; + PyObject *key = NULL, *val = NULL; if (!PyArg_ParseTuple(args, (char *)"O:virDomainMemoryStats", &pyobj_domain)) return NULL; @@ -749,31 +750,50 @@ libvirt_virDomainMemoryStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { return VIR_PY_NONE; for (i = 0; i < nr_stats; i++) { - if (stats[i].tag == VIR_DOMAIN_MEMORY_STAT_SWAP_IN) - PyDict_SetItem(info, libvirt_constcharPtrWrap("swap_in"), - libvirt_ulonglongWrap(stats[i].val)); - else if (stats[i].tag == VIR_DOMAIN_MEMORY_STAT_SWAP_OUT) - PyDict_SetItem(info, libvirt_constcharPtrWrap("swap_out"), - libvirt_ulonglongWrap(stats[i].val)); - else if (stats[i].tag == VIR_DOMAIN_MEMORY_STAT_MAJOR_FAULT) - PyDict_SetItem(info, libvirt_constcharPtrWrap("major_fault"), - libvirt_ulonglongWrap(stats[i].val)); - else if (stats[i].tag == VIR_DOMAIN_MEMORY_STAT_MINOR_FAULT) - PyDict_SetItem(info, libvirt_constcharPtrWrap("minor_fault"), - libvirt_ulonglongWrap(stats[i].val)); - else if (stats[i].tag == VIR_DOMAIN_MEMORY_STAT_UNUSED) - PyDict_SetItem(info, libvirt_constcharPtrWrap("unused"), - libvirt_ulonglongWrap(stats[i].val)); - else if (stats[i].tag == VIR_DOMAIN_MEMORY_STAT_AVAILABLE) - PyDict_SetItem(info, libvirt_constcharPtrWrap("available"), - libvirt_ulonglongWrap(stats[i].val)); - else if (stats[i].tag == VIR_DOMAIN_MEMORY_STAT_ACTUAL_BALLOON) - PyDict_SetItem(info, libvirt_constcharPtrWrap("actual"), - libvirt_ulonglongWrap(stats[i].val)); - else if (stats[i].tag == VIR_DOMAIN_MEMORY_STAT_RSS) - PyDict_SetItem(info, libvirt_constcharPtrWrap("rss"), - libvirt_ulonglongWrap(stats[i].val)); + switch (stats[i].tag) { + case VIR_DOMAIN_MEMORY_STAT_SWAP_IN: + key = libvirt_constcharPtrWrap("swap_in"); + break; + case VIR_DOMAIN_MEMORY_STAT_SWAP_OUT: + key = libvirt_constcharPtrWrap("swap_out"); + break; + case VIR_DOMAIN_MEMORY_STAT_MAJOR_FAULT: + key = libvirt_constcharPtrWrap("major_fault"); + break; + case VIR_DOMAIN_MEMORY_STAT_MINOR_FAULT: + key = libvirt_constcharPtrWrap("minor_fault"); + break; + case VIR_DOMAIN_MEMORY_STAT_UNUSED: + key = libvirt_constcharPtrWrap("unused"); + break; + case VIR_DOMAIN_MEMORY_STAT_AVAILABLE: + key = libvirt_constcharPtrWrap("available"); + break; + case VIR_DOMAIN_MEMORY_STAT_ACTUAL_BALLOON: + key = libvirt_constcharPtrWrap("actual"); + break; + case VIR_DOMAIN_MEMORY_STAT_RSS: + key = libvirt_constcharPtrWrap("rss"); + break; + default: + continue; + } + val = libvirt_ulonglongWrap(stats[i].val); + + if (!key || !val || PyDict_SetItem(info, key, val) < 0) { + Py_DECREF(info); + info = NULL; + goto cleanup; + } + Py_DECREF(key); + Py_DECREF(val); + key = NULL; + val = NULL; } + + cleanup: + Py_XDECREF(key); + Py_XDECREF(val); return info; } -- 1.9.3

2 2

[libvirt] Host OS, Storage Info
by Sijo Jose 30 May '14

30 May '14

Hi, Is there any way to get host OS information and host Storage in formations using libvirt API...? Rgds -Sijo

3 6

[libvirt] [libvirt-glib] [PATCH] GVirDomainSnapshot: add gvir_domain_snapshot_delete
by Timm Bäder 30 May '14

30 May '14

--- libvirt-gobject/libvirt-gobject-domain-snapshot.c | 21 +++++++++++++++++++++ libvirt-gobject/libvirt-gobject-domain-snapshot.h | 3 +++ libvirt-gobject/libvirt-gobject.sym | 5 +++++ 3 files changed, 29 insertions(+) diff --git a/libvirt-gobject/libvirt-gobject-domain-snapshot.c b/libvirt-gobject/libvirt-gobject-domain-snapshot.c index ab23342..f46c99b 100644 --- a/libvirt-gobject/libvirt-gobject-domain-snapshot.c +++ b/libvirt-gobject/libvirt-gobject-domain-snapshot.c @@ -206,3 +206,24 @@ GVirConfigDomainSnapshot *gvir_domain_snapshot_get_config free(xml); return conf; } + +/** + * gvir_domain_snapshot_delete: + * @snapshot: the domain_snapshot + * @error: (allow-none): Place-holder for error or NULL + */ +void gvir_domain_snapshot_delete(GVirDomainSnapshot *snapshot, GError **error) +{ + GVirDomainSnapshotPrivate *priv; + int status; + + g_return_if_fail(GVIR_IS_DOMAIN_SNAPSHOT (snapshot)); + g_return_if_fail(error == NULL || *error == NULL); + + priv = snapshot->priv; + status = virDomainSnapshotDelete(priv->handle, 0); + if (status < 0) { + gvir_set_error_literal(error, GVIR_DOMAIN_SNAPSHOT_ERROR, 0, + "Unable to delete snapshot"); + } +} diff --git a/libvirt-gobject/libvirt-gobject-domain-snapshot.h b/libvirt-gobject/libvirt-gobject-domain-snapshot.h index 5bd827c..575f56f 100644 --- a/libvirt-gobject/libvirt-gobject-domain-snapshot.h +++ b/libvirt-gobject/libvirt-gobject-domain-snapshot.h @@ -69,6 +69,9 @@ GVirConfigDomainSnapshot *gvir_domain_snapshot_get_config guint flags, GError **err); +void gvir_domain_snapshot_delete (GVirDomainSnapshot *snapshot, GError **error); + + G_END_DECLS #endif /* __LIBVIRT_GOBJECT_DOMAIN_SNAPSHOT_H__ */ diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index f2419ac..5d12a6a 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -234,4 +234,9 @@ LIBVIRT_GOBJECT_0.1.5 { gvir_connection_open_read_only_finish; } LIBVIRT_GOBJECT_0.1.4; +LIBVIRT_GOBJECT_0.1.9 { + global: + gvir_domain_shapshot_delete; +} LIBVIRT_GOBJECT_0.1.5; + # .... define new API here using predicted next version number .... -- 1.9.3

2 1

[libvirt] GSoC student introduction and work plan
by Taowei Luo 30 May '14

30 May '14

Hi, everyone, My name is Taowei Luo. I'm one of the students working for GSoC this summer. My project is rewriting the vbox driver. Before coding, I really need some discussions about how to implement it. Here I post my first version of plan. I had show as much details as I thought about in this plan. If anyone have ideas or suggestions about my work, I would like to hear. My nick name in #virt IRC channel is uaedante (or dante I used before). If I am offline in IRC, please contract me with my email address uaedante(a)gmail.com. Regards, Taowei. Plan to rewrite vbox driver Introduction: The existing vbox driver codes use vbox API directly. But the vbox API is incompatible between different versions. To support all vbox API versions, the vbox_tmpl.c file provides a template to implement all vbox drivers. Each specified version of vbox driver includes the vbox_tmpl.c file, with the definition in the corresponding head file, they work well. As the vbox API defined in head files is conflict between different versions, even some behavior of vbox APIs are changed. The vbox_tmpl.c contains lots of codes such as “#if VBOX_API_VERSION < 4001000”. These codes is hard to manage or adding new features. Plan: The core idea of my rewriting work is to add a middle layer to uniform the API changes. This modification will not change any functions’ behavior or sematic. The middle layer has a global structure which contains API changes. Like this: struct vboxUniformedAPI { A (*funcA)(A1 a, ….); B (*funcB)(B1 a, ….); } If there is a code segment: #if VBOX_API_VERSION < 4001000 adapter->vtbl->GetHostInterface(adapter, &hostIntUtf16); #else /* VBOX_API_VERSION >= 4001000 */ adapter->vtbl->GetBridgedInterface(adapter, &hostIntUtf16); #endif /* VBOX_API_VERSION >= 4001000 */ This will result to a variable in vboxUniformedAPI structure: RetType (*GetInterface)(INetworkAdapter *a, PRUnichar *b) When using the vbox under 4.1, this variable will points to a function that calls GetHostInterface. When using the vbox later than 4.1 and the variable will points to a function which calls GetBridgedInterface. When replace these code segments with a single function, we need to do living variable analyze and find out what is used and what is changed in these codes. I plan to do these analyze manually. All conflict in function prototype or function implementation will be fixed up though this method. When meeting a conflict in variable type, like: #if VBOX_API_VERSION < 4001000 TypeA var; #else /* VBOX_API_VERSION >= 4001000 */ TypeB var; #endif /* VBOX_API_VERSION >= 4001000 */ I will add a union like this: Union TypeC{ TypeA a;// used in some versions TypeB b;// used in some other versions } If there is any operation using variables with such a union type (or functions use it as an argument or return value), I will add a new function in vboxUniformedAPI to handle this operation. These functions use TypeC as parameter type, dispatch it depends on the vbox version and return TypeC value to conceal type conflict. We still have another kind of conflict. There are some versions have more variables, operations or function calls than other versions. I will reserve all variables even though they may not be used in some situation. And put an empty function if they have nothing to do in the specified function step. (I have a backup solution here. That is adding some flags to indicate whether the procession is necessary in the API version and prevent upper layer from calling a nonexistent function.) Expected result: After rewriting with the rules above, we will have a new vbox_tmpl.c. It gathers version specified code and common code respectively. The common codes use stable vbox API or functions in vboxUniformedAPI. A function named InstallvboxUnifromedAPI will fill the vboxUniformedAPI structure depends on the current vbox API version. In final step, I will put all vbox APIs into the vboxUniformedAPI and make the vbox driver codes use my API only. If this is done, the vbox driver will not be complied for each version anymore. Implementation: First, define the vboxUniformedAPI structure in vbox_tmpl.c, and write the InstallvboxUnifromedAPI function for every vbox API version. Next, rewrite the functions which have conflict codes one by one. Each time rewrite a new function, we can do some tests (here, I am not sure what kind of tests is enough). When rewriting one function in vbox_tmpl.c, the others will not change. At this point, there will split version specified codes and common codes But we still need to build the whole vbox_tmpl.c for each vbox API version. If we want a single object file be generated by vbox_tmpl.c, we need to prevent vbox_tmpl.c from calling vbox API directly. This could be done by putting all of the vbox API calls into the middle vboxUniformedAPI layer, and moving common codes into vbox_common.c. The vbox_common.c should only use APIs in vboxUniformedAPI and will be complied only once.

2 2

[libvirt] Entering freeze for libvirt-1.2.5
by Daniel Veillard 30 May '14

30 May '14

As planned I just tagged candidate release 1 in git and pushed the tarball, and signed rpms to the usual place: ftp://libvirt.org/libvirt/ I gave it a bit of testing, seems to work fine for me, I will probably provide an rc2 on Wed and aim for a release next week-end. In the meantime, please give it a try and report issues you may find ! thanks, Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 1

[libvirt] libvirt: Xen Driver error : Domain not found: xenGetDomainDefForName
by deepanshus 29 May '14

29 May '14

Hi, I have successfully installed xen 3.11 kernel but when I am running the vm I am getting this error: libvirt: Xen Driver error : Domain not found: xenGetDomainDefForName I am sending the xend log file as well error file as an attachment. Thanks And Regards, Deepanshu Saxena ------------------------------------------------------------------------------------------------------------------------------- [ C-DAC is on Social-Media too. Kindly follow us at: Facebook: https://www.facebook.com/CDACINDIA & Twitter: @cdacindia ] This e-mail is for the sole use of the intended recipient(s) and may contain confidential and privileged information. If you are not the intended recipient, please contact the sender by reply e-mail and destroy all copies and the original message. Any unauthorized review, use, disclosure, dissemination, forwarding, printing or copying of this email is strictly prohibited and appropriate legal action will be taken. -------------------------------------------------------------------------------------------------------------------------------

3 2

[libvirt] Weekly meeting minutes May 22nd, 2014
by Daniel P. Berrange 29 May '14

29 May '14

Agenda + minutes from 22/05/2014 * Welcome / rollcall * IRC comments from: * eblake * danpb * pkrempa * derRichard * rbogorodskiy * mkletzan * nehaljwani * mprivozn * Next release schedule * Freeze: Mon May 26th * Release: Mon June 2nd * Patches needing review * pkrempa's gluster patches * 1-27 are nice to have but not release critical * 28+ need to wait for QEMU work * eblake's live commit work * minimum need patch to avoid hang with qemu 2.0 * remaining patches should rebase on top of pkrempa, even if it misses release * vbox snapshot patches - been waiting a long time * Jim Fehlig has libxl migration patches - probably desired for the release * Roman has bhyve pci allocation patches * Refactoring of PCI stuff already merged, just bhyve specific bits left * Nehal has lease helper patch pending * eblake to update to latest gnulib pre-freeze, unless the gnulib change from STREQ macro to inline function streq() requires lots of fallout * Michael has "Keep original file label" left over from March, not release critical though * Richard W suggests to add support for capabilties for LXC * Allows apps to be started with less caps (ie drop CAP_NET_ADMIN to prevent IP changes) * Could also allow uid/gid to be set Thanks to all for attending this first meeting. Set to repeat again on May 29th @ 1400 UTC in #virt-meeting on irc.oftc.net Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

2 1

[libvirt] [PATCH 0/2] qemu: Fix few snapshot issues
by Peter Krempa 29 May '14

29 May '14

Peter Krempa (2): qemu: snapshot: Reject internal active snapshot without memory state qemu: snapshot: Improve detection of mixed snapshots src/qemu/qemu_driver.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) -- 1.9.3

2 6

[libvirt] [PATCH] util: storage: Fix crash of libvirtd on network backed guest block-pull
by Peter Krempa 29 May '14

29 May '14

For guests backed by gluster volumes (or other network storage) we don't fill the backing chain (see qemuDomainDetermineDiskChain). This leaves the "relPath" field of the top image NULL. This causes a crash in virStorageFileChainLookup() when looking up a backing element for such a disk. Since I'm working on adding support for network storage and one of the steps will make the "relPath" field optional let's use STREQ_NULLABLE instead of STREQ in virStorageFileChainLookup() to avoid the problem. --- src/util/virstoragefile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 2feda67..c9b6187 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1591,7 +1591,7 @@ virStorageFileChainLookup(virStorageSourcePtr chain, if (idx == i) break; } else { - if (STREQ(name, chain->relPath)) + if (STREQ_NULLABLE(name, chain->relPath)) break; if (nameIsFile && (chain->type == VIR_STORAGE_TYPE_FILE || chain->type == VIR_STORAGE_TYPE_BLOCK)) { -- 1.9.3

2 2

[libvirt] [PATCH V2] virsh: forbid negative vcpu argument to vcpupin.
by Jincheng Miao 29 May '14

29 May '14

vcpupin will allow argument --vcpu as a signed number, and pass it to virDomainPinVcpu directlly without checking if this value is positive(valid). > virsh vcpupin r7 -1 0 error: numerical overflow: input too large: 4294967295 This message is inaccurate, and the negative vcpu is non-valuable. So forbid vcpu argument as a negative. After patching, the result likes: > virsh vcpupin r6 -1 error: vcpupin: Invalid vCPU number. > virsh vcpupin r6 --cpulist 0-1 error: vcpupin: Missing vCPU number in pin mode. > virsh vcpupin r6 --vcpu ABC error: vcpupin: Invalid vCPU number in query mode. Signed-off-by: Jincheng Miao <jmiao(a)redhat.com> --- tools/virsh-domain.c | 42 ++++++++++++++++++++++++------------------ 1 files changed, 24 insertions(+), 18 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 84a6706..e302459 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -5797,7 +5797,7 @@ cmdVcpuPin(vshControl *ctl, const vshCmd *cmd) { virDomainInfo info; virDomainPtr dom; - int vcpu = -1; + unsigned int vcpu; const char *cpulist = NULL; bool ret = false; unsigned char *cpumap = NULL; @@ -5809,6 +5809,7 @@ cmdVcpuPin(vshControl *ctl, const vshCmd *cmd) bool live = vshCommandOptBool(cmd, "live"); bool current = vshCommandOptBool(cmd, "current"); bool query = false; /* Query mode if no cpulist */ + int get_vcpu; unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; VSH_EXCLUSIVE_OPTIONS_VAR(current, live); @@ -5830,29 +5831,34 @@ cmdVcpuPin(vshControl *ctl, const vshCmd *cmd) query = !cpulist; - /* In query mode, "vcpu" is optional */ - if (vshCommandOptInt(cmd, "vcpu", &vcpu) < !query) { - vshError(ctl, "%s", - _("vcpupin: Invalid or missing vCPU number.")); - virDomainFree(dom); - return false; - } - - if ((maxcpu = vshNodeGetCPUCount(ctl->conn)) < 0) { - virDomainFree(dom); - return false; + get_vcpu = vshCommandOptUInt(cmd, "vcpu", &vcpu); + if (get_vcpu <= 0) { + /* In query mode, "vcpu" is optional */ + if (query && get_vcpu < 0) { + vshError(ctl, "%s", + _("vcpupin: Invalid vCPU number in query mode.")); + goto cleanup; + } + /* In pin mode, "vcpu" is necessary */ + if (!query) { + vshError(ctl, "%s", + _("vcpupin: Missing vCPU number in pin mode.")); + goto cleanup; + } } if (virDomainGetInfo(dom, &info) != 0) { vshError(ctl, "%s", _("vcpupin: failed to get domain information.")); - virDomainFree(dom); - return false; + goto cleanup; } if (vcpu >= info.nrVirtCpu) { vshError(ctl, "%s", _("vcpupin: Invalid vCPU number.")); - virDomainFree(dom); - return false; + goto cleanup; + } + + if ((maxcpu = vshNodeGetCPUCount(ctl->conn)) < 0) { + goto cleanup; } cpumaplen = VIR_CPU_MAPLEN(maxcpu); @@ -5871,7 +5877,7 @@ cmdVcpuPin(vshControl *ctl, const vshCmd *cmd) vshPrintExtra(ctl, "%s %s\n", _("VCPU:"), _("CPU Affinity")); vshPrintExtra(ctl, "----------------------------------\n"); for (i = 0; i < ncpus; i++) { - if (vcpu != -1 && i != vcpu) + if (get_vcpu > 0 && i != vcpu) continue; vshPrint(ctl, "%4zu: ", i); @@ -5880,8 +5886,8 @@ cmdVcpuPin(vshControl *ctl, const vshCmd *cmd) if (!ret) break; } - } + VIR_FREE(cpumaps); goto cleanup; } -- 1.7.1

3 3

[libvirt] [PATCHv2] util: fix virTimeLocalOffsetFromUTC DST processing
by Laine Stump 29 May '14

29 May '14

The original version of virTimeLocalOffsetFromUTC() would fail for certain times of the day if daylight savings time was active. This could most easily be seen by uncommenting the TEST_LOCALOFFSET() cases that include a DST setting. After a lot of experimenting, I found that the way to solve it in almost all test cases is to set tm_isdst = -1 in the stuct tm prior to calling mktime(). Once this is done, the correct offset is returned for all test cases at all times except the two hours just after 00:00:00 Jan 1 UTC - during that time, any timezone that is *behind* UTC, and that is supposed to always be in DST will not have DST accounted for in its offset. I believe that the code of virTimeLocalOffsetFromUTC() is actually correct for all cases, but the problem still encountered is due to our inability to come up with a TZ string that properly forces DST to *always* be active. Since a modfication of the (currently fixed) expected result data to account for this would necessarily use the same functions that we're trying to test, I've instead just made the test program conditionally bypass the problematic cases if the current date is either December 31 or January 1. This way we get maximum testing during 363 days of the year, but don't get false failures on Dec 31 and Jan 1. --- Change from V1: correct typo in commit message pointed out by Eric, and also followed his suggestion to enable the sometimes-failing tests unless the current localtime is Jan 1 or Dec 31. src/util/virtime.c | 3 +++ tests/virtimetest.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 56 insertions(+), 8 deletions(-) diff --git a/src/util/virtime.c b/src/util/virtime.c index 3a56400..c69dff1 100644 --- a/src/util/virtime.c +++ b/src/util/virtime.c @@ -377,6 +377,9 @@ virTimeLocalOffsetFromUTC(long *offset) return -1; } + /* tell mktime to figure out itself whether or not DST is in effect */ + gmtimeinfo.tm_isdst = -1; + /* mktime() also obeys current timezone rules */ if ((utc = mktime(&gmtimeinfo)) == (time_t)-1) { virReportSystemError(errno, "%s", diff --git a/tests/virtimetest.c b/tests/virtimetest.c index bf27682..f378076 100644 --- a/tests/virtimetest.c +++ b/tests/virtimetest.c @@ -101,6 +101,28 @@ testTimeLocalOffset(const void *args) return 0; } + +/* return true if the date is Jan 1 or Dec 31 (localtime) */ +static bool +IsJan1OrDec31(void) +{ + time_t current = time(NULL); + struct tm timeinfo; + + if (current == (time_t)-1) { + VIR_DEBUG("time() failed"); + return false; + } + if (!localtime_r(&current, &timeinfo)) { + VIR_DEBUG("localtime_r() failed"); + return false; + } + + return (timeinfo.tm_mon == 0 && timeinfo.tm_mday == 1) || + (timeinfo.tm_mon == 11 && timeinfo.tm_mday == 31); +} + + static int mymain(void) { @@ -161,21 +183,44 @@ mymain(void) TEST_LOCALOFFSET("VIR00:30", -30 * 60); TEST_LOCALOFFSET("VIR01:30", -90 * 60); + TEST_LOCALOFFSET("VIR05:00", (-5 * 60) * 60); TEST_LOCALOFFSET("UTC", 0); TEST_LOCALOFFSET("VIR-00:30", 30 * 60); TEST_LOCALOFFSET("VIR-01:30", 90 * 60); -#if __TEST_DST + /* test DST processing with timezones that always * have DST in effect; what's more, cover a zone with * with an unusual DST different than a usual one hour */ - /* NB: These tests fail at certain times of the day, so - * must be disabled until we figure out why - */ - TEST_LOCALOFFSET("VIR-00:30VID,0,365", 90 * 60); - TEST_LOCALOFFSET("VIR-02:30VID,0,365", 210 * 60); - TEST_LOCALOFFSET("VIR-02:30VID-04:30,0,365", 270 * 60); -#endif + TEST_LOCALOFFSET("VIR-00:30VID,0/00:00:00,366/23:59:59", + ((1 * 60) + 30) * 60); + TEST_LOCALOFFSET("VIR-02:30VID,0/00:00:00,366/23:59:59", + ((3 * 60) + 30) * 60); + TEST_LOCALOFFSET("VIR-02:30VID-04:30,0/00:00:00,366/23:59:59", + ((4 * 60) + 30) * 60); + TEST_LOCALOFFSET("VIR-12:00VID-13:00,0/00:00:00,366/23:59:59", + ((13 * 60) + 0) * 60); + + if (!IsJan1OrDec31()) { + /* experiments have shown that the following tests will fail + * during certain hours of Dec 31 or Jan 1 (depending on the + * TZ setting in the shell running the test, but in general + * for a period that apparently starts at 00:00:00 UTC Jan 1 + * and continues for 1 - 2 hours). We've determined this is + * due to our inability to specify a timezone with DST on/off + * settings that make it truly *always* on DST - i.e. it is a + * failing of the test data, *not* of the function we are + * testing. So to test as much as possible, we still run these + * tests, except on Dec 31 and Jan 1. + */ + + TEST_LOCALOFFSET("VIR02:45VID00:45,0/00:00:00,366/23:59:59", + -45 * 60); + TEST_LOCALOFFSET("VIR05:00VID04:00,0/00:00:00,366/23:59:59", + ((-4 * 60) + 0) * 60); + TEST_LOCALOFFSET("VIR11:00VID10:00,0/00:00:00,366/23:59:59", + ((-10 * 60) + 0) * 60); + } return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 1.9.3

2 2

[libvirt] [PATCH] Add capability to example AppArmor profile
by Steven Leung 29 May '14

29 May '14

I encountered an AppArmor denial in Ubuntu 14.04. I had filed a bug here https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1324251 I just wanted to see this applied upstream from Ubuntu. This update to the profile is necessary to write to 9pfs mounts. Let me know what you think about the following patch: diff --git a/examples/apparmor/libvirt-qemu b/examples/apparmor/libvirt-qemu index 83814ec..c80294c 100644 --- a/examples/apparmor/libvirt-qemu +++ b/examples/apparmor/libvirt-qemu @@ -9,6 +9,10 @@ capability dac_read_search, capability chown, + # to create and modify with 9p shares + capability fowner, + capability fsetid, + # needed to drop privileges capability setgid, capability setuid, I’m running on libvirt: 1.2.2 My host machine is: x86_64 The hypervisor is: KVM -- Steven

2 1

[libvirt] [patch v3 0/2] add support for migrateURI configuration
by Chen Fan 29 May '14

29 May '14

For now, we set the migration URI via command line '--migrate_uri' or construct the URI by looking up the dest host's hostname which could be solved by DNS automatically. But in cases the dest host have two or more NICs to reach, we may need to send the migration data over a specific NIC which is different from the automatically resloved one for some reason like performance, security, etc. thus we must explicitly specify the migrateuri in command line everytime, but it is too troublesome if there are many such hosts(and don't forget virt-manager). This patches add a configuration file option on dest host to save the default migrate uri which explicitly specify which of this host's addresses is used for transferring data, thus user doesn't boring to specify it in command line everytime. Any comments are welcome. Thank you very much. Chen Fan (2): Add support for migration URI configuration add inotify handler to qemu driver src/qemu/qemu.conf | 5 ++- src/qemu/qemu_conf.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_conf.h | 11 +++++- src/qemu/qemu_driver.c | 25 ++++++++++++- src/qemu/qemu_migration.c | 5 +++ 5 files changed, 132 insertions(+), 3 deletions(-) -- 1.8.1.4

4 10

[libvirt] [PATCH] virsh: fix typos in virsh man page
by Eric Blake 29 May '14

29 May '14

* tools/virsh.pod (attach-disk): Drop duplicate --config, fix typo in --sourcetype. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Puhsing under the trivial rule. tools/virsh.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index de9a4f7..02671b4 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2046,7 +2046,7 @@ expected. =item B<attach-disk> I<domain> I<source> I<target> [[[I<--live>] [I<--config>] | [I<--current>]] | [I<--persistent>]] [I<--driver driver>] [I<--subdriver subdriver>] [I<--cache cache>] -[I<--type type>] [I<--mode mode>] [I<--config>] [I<--sourcetype soucetype>] +[I<--type type>] [I<--mode mode>] [I<--sourcetype sourcetype>] [I<--serial serial>] [I<--wwn wwn>] [I<--rawio>] [I<--address address>] [I<--multifunction>] [I<--print-xml>] -- 1.9.3

1 0

[libvirt] [PATCH] maint: cleanup detection of const'ness of selinux ctx
by Jim Fehlig 29 May '14

29 May '14

Commit 292d3f2d fixed the build with libselinux 2.3, but missed some suggestions by eblake https://www.redhat.com/archives/libvir-list/2014-May/msg00977.html This patch changes the macro introduced in 292d3f2d to either be empty in the case of newer libselinux, or contain 'const' in the case of older libselinux. The macro is then used directly in tests/securityselinuxhelper.c. --- m4/virt-selinux.m4 | 7 +++++-- tests/securityselinuxhelper.c | 24 ++++-------------------- 2 files changed, 9 insertions(+), 22 deletions(-) diff --git a/m4/virt-selinux.m4 b/m4/virt-selinux.m4 index 1d899d5..a6f89ba 100644 --- a/m4/virt-selinux.m4 +++ b/m4/virt-selinux.m4 @@ -39,8 +39,11 @@ int setcon(const security_context_t context); [gt_cv_setcon_param='security_context_t'], [gt_cv_setcon_param='const char*'])]) if test "$gt_cv_setcon_param" = 'const char*'; then - AC_DEFINE_UNQUOTED([SELINUX_CTX_CHAR_PTR], 1, - [SELinux uses newer char * for security context]) + AC_DEFINE([VIR_SELINUX_CTX_CONST], [const], + [SELinux uses newer const char * for security context]) + else + AC_DEFINE([VIR_SELINUX_CTX_CONST], [], + [SELinux uses newer const char * for security context]) fi AC_MSG_CHECKING([SELinux mount point]) diff --git a/tests/securityselinuxhelper.c b/tests/securityselinuxhelper.c index af4fae4..1252c15 100644 --- a/tests/securityselinuxhelper.c +++ b/tests/securityselinuxhelper.c @@ -156,11 +156,7 @@ int getpidcon(pid_t pid, security_context_t *context) return getpidcon_raw(pid, context); } -#ifdef SELINUX_CTX_CHAR_PTR -int setcon_raw(const char *context) -#else -int setcon_raw(security_context_t context) -#endif +int setcon_raw(VIR_SELINUX_CTX_CONST char *context) { if (!is_selinux_enabled()) { errno = EINVAL; @@ -169,21 +165,13 @@ int setcon_raw(security_context_t context) return setenv("FAKE_SELINUX_CONTEXT", context, 1); } -#ifdef SELINUX_CTX_CHAR_PTR -int setcon(const char *context) -#else -int setcon(security_context_t context) -#endif +int setcon(VIR_SELINUX_CTX_CONST char *context) { return setcon_raw(context); } -#ifdef SELINUX_CTX_CHAR_PTR -int setfilecon_raw(const char *path, const char *con) -#else -int setfilecon_raw(const char *path, security_context_t con) -#endif +int setfilecon_raw(const char *path, VIR_SELINUX_CTX_CONST char *con) { const char *constr = con; if (STRPREFIX(path, abs_builddir "/securityselinuxlabeldata/nfs/")) { @@ -194,11 +182,7 @@ int setfilecon_raw(const char *path, security_context_t con) constr, strlen(constr), 0); } -#ifdef SELINUX_CTX_CHAR_PTR -int setfilecon(const char *path, const char *con) -#else -int setfilecon(const char *path, security_context_t con) -#endif +int setfilecon(const char *path, VIR_SELINUX_CTX_CONST char *con) { return setfilecon_raw(path, con); } -- 1.7.9.2

2 2

[libvirt] [PATCH v3] PCI: Introduce new device binding path using pci_dev.driver_override
by Alex Williamson 29 May '14

29 May '14

The driver_override field allows us to specify the driver for a device rather than relying on the driver to provide a positive match of the device. This shortcuts the existing process of looking up the vendor and device ID, adding them to the driver new_id, binding the device, then removing the ID, but it also provides a couple advantages. First, the above existing process allows the driver to bind to any device matching the new_id for the window where it's enabled. This is often not desired, such as the case of trying to bind a single device to a meta driver like pci-stub or vfio-pci. Using driver_override we can do this deterministically using: echo pci-stub > /sys/bus/pci/devices/0000:03:00.0/driver_override echo 0000:03:00.0 > /sys/bus/pci/devices/0000:03:00.0/driver/unbind echo 0000:03:00.0 > /sys/bus/pci/drivers_probe Previously we could not invoke drivers_probe after adding a device to new_id for a driver as we get non-deterministic behavior whether the driver we intend or the standard driver will claim the device. Now it becomes a deterministic process, only the driver matching driver_override will probe the device. To return the device to the standard driver, we simply clear the driver_override and reprobe the device: echo > /sys/bus/pci/devices/0000:03:00.0/driver_override echo 0000:03:00.0 > /sys/bus/pci/devices/0000:03:00.0/driver/unbind echo 0000:03:00.0 > /sys/bus/pci/drivers_probe Another advantage to this approach is that we can specify a driver override to force a specific binding or prevent any binding. For instance when an IOMMU group is exposed to userspace through VFIO we require that all devices within that group are owned by VFIO. However, devices can be hot-added into an IOMMU group, in which case we want to prevent the device from binding to any driver (override driver = "none") or perhaps have it automatically bind to vfio-pci. With driver_override it's a simple matter for this field to be set internally when the device is first discovered to prevent driver matches. Signed-off-by: Alex Williamson <alex.williamson(a)redhat.com> Cc: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- v3: kfree() override buffer on device release, noted by Alex Graf v2: Use strchr() as suggested by Guenter Roeck and adopted by the platform driver version of this same interface. Documentation/ABI/testing/sysfs-bus-pci | 21 ++++++++++++++++ drivers/pci/pci-driver.c | 25 +++++++++++++++++-- drivers/pci/pci-sysfs.c | 40 +++++++++++++++++++++++++++++++ drivers/pci/probe.c | 1 + include/linux/pci.h | 1 + 5 files changed, 85 insertions(+), 3 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-bus-pci b/Documentation/ABI/testing/sysfs-bus-pci index a3c5a66..898ddc4 100644 --- a/Documentation/ABI/testing/sysfs-bus-pci +++ b/Documentation/ABI/testing/sysfs-bus-pci @@ -250,3 +250,24 @@ Description: valid. For example, writing a 2 to this file when sriov_numvfs is not 0 and not 2 already will return an error. Writing a 10 when the value of sriov_totalvfs is 8 will return an error. + +What: /sys/bus/pci/devices/.../driver_override +Date: April 2014 +Contact: Alex Williamson <alex.williamson(a)redhat.com> +Description: + This file allows the driver for a device to be specified which + will override standard static and dynamic ID matching. When + specified, only a driver with a name matching the value written + to driver_override will have an opportunity to bind to the + device. The override is specified by writing a string to the + driver_override file (echo pci-stub > driver_override) and + may be cleared with an empty string (echo > driver_override). + This returns the device to standard matching rules binding. + Writing to driver_override does not automatically unbind the + device from its current driver or make any attempt to + automatically load the specified driver. If no driver with a + matching name is currently loaded in the kernel, the device + will not bind to any driver. This also allows devices to + opt-out of driver binding using a driver_override name such as + "none". Only a single driver may be specified in the override, + there is no support for parsing delimiters. diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index d911e0c..4393c12 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -216,6 +216,13 @@ const struct pci_device_id *pci_match_id(const struct pci_device_id *ids, return NULL; } +static const struct pci_device_id pci_device_id_any = { + .vendor = PCI_ANY_ID, + .device = PCI_ANY_ID, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, +}; + /** * pci_match_device - Tell if a PCI device structure has a matching PCI device id structure * @drv: the PCI driver to match against @@ -229,18 +236,30 @@ static const struct pci_device_id *pci_match_device(struct pci_driver *drv, struct pci_dev *dev) { struct pci_dynid *dynid; + const struct pci_device_id *found_id = NULL; + + /* When driver_override is set, only bind to the matching driver */ + if (dev->driver_override && strcmp(dev->driver_override, drv->name)) + return NULL; /* Look at the dynamic ids first, before the static ones */ spin_lock(&drv->dynids.lock); list_for_each_entry(dynid, &drv->dynids.list, node) { if (pci_match_one_device(&dynid->id, dev)) { - spin_unlock(&drv->dynids.lock); - return &dynid->id; + found_id = &dynid->id; + break; } } spin_unlock(&drv->dynids.lock); - return pci_match_id(drv->id_table, dev); + if (!found_id) + found_id = pci_match_id(drv->id_table, dev); + + /* driver_override will always match, send a dummy id */ + if (!found_id && dev->driver_override) + found_id = &pci_device_id_any; + + return found_id; } struct drv_dev_and_id { diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index 4e0acef..faa4ab5 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -499,6 +499,45 @@ static struct device_attribute sriov_numvfs_attr = sriov_numvfs_show, sriov_numvfs_store); #endif /* CONFIG_PCI_IOV */ +static ssize_t driver_override_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + struct pci_dev *pdev = to_pci_dev(dev); + char *driver_override, *old = pdev->driver_override, *cp; + + if (count > PATH_MAX) + return -EINVAL; + + driver_override = kstrndup(buf, count, GFP_KERNEL); + if (!driver_override) + return -ENOMEM; + + cp = strchr(driver_override, '\n'); + if (cp) + *cp = '\0'; + + if (strlen(driver_override)) { + pdev->driver_override = driver_override; + } else { + kfree(driver_override); + pdev->driver_override = NULL; + } + + kfree(old); + + return count; +} + +static ssize_t driver_override_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct pci_dev *pdev = to_pci_dev(dev); + + return sprintf(buf, "%s\n", pdev->driver_override); +} +static DEVICE_ATTR_RW(driver_override); + static struct attribute *pci_dev_attrs[] = { &dev_attr_resource.attr, &dev_attr_vendor.attr, @@ -521,6 +560,7 @@ static struct attribute *pci_dev_attrs[] = { #if defined(CONFIG_PM_RUNTIME) && defined(CONFIG_ACPI) &dev_attr_d3cold_allowed.attr, #endif + &dev_attr_driver_override.attr, NULL, }; diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index ef09f5f..54268de 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1215,6 +1215,7 @@ static void pci_release_dev(struct device *dev) pci_release_of_node(pci_dev); pcibios_release_device(pci_dev); pci_bus_put(pci_dev->bus); + kfree(pci_dev->driver_override); kfree(pci_dev); } diff --git a/include/linux/pci.h b/include/linux/pci.h index aab57b4..b72af27 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -365,6 +365,7 @@ struct pci_dev { #endif phys_addr_t rom; /* Physical address of ROM if it's not from the BAR */ size_t romlen; /* Length of ROM if it's not from the BAR */ + char *driver_override; /* Driver name to force a match */ }; static inline struct pci_dev *pci_physfn(struct pci_dev *dev)

5 6

[libvirt] [PATCH v2] build: fix build with libselinux 2.3
by Cédric Bosdonnat 28 May '14

28 May '14

Several function signatures changed in libselinux 2.3, now taking a 'const char *' instead of 'security_context_t'. The latter is defined in selinux/selinux.h as typedef char *security_context_t; --- m4/virt-selinux.m4 | 18 ++++++++++++++++++ tests/securityselinuxhelper.c | 16 ++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/m4/virt-selinux.m4 b/m4/virt-selinux.m4 index 003c2a8..c299793 100644 --- a/m4/virt-selinux.m4 +++ b/m4/virt-selinux.m4 @@ -28,6 +28,24 @@ AC_DEFUN([LIBVIRT_CHECK_SELINUX],[ [with_selinux_mount=check]) if test "$with_selinux" = "yes"; then + AC_CACHE_CHECK([for selinux setcon parameter type], [gt_cv_setcon_param], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include <selinux/selinux.h> + +int setcon(const security_context_t context) { + return 0; +} + ]], + [[]])], + [gt_cv_setcon_param='security_context'], + [gt_cv_setcon_param='const char*'])]) + if test "$gt_cv_setcon_param" = 'const char*'; then + AC_DEFINE_UNQUOTED([SELINUX_CTX_CHAR_PTR], 1, + [SELinux uses char * for security context]) + fi + AC_MSG_CHECKING([SELinux mount point]) if test "$with_selinux_mount" = "check" || test -z "$with_selinux_mount"; then if test -d /sys/fs/selinux ; then diff --git a/tests/securityselinuxhelper.c b/tests/securityselinuxhelper.c index dbc4c29..af4fae4 100644 --- a/tests/securityselinuxhelper.c +++ b/tests/securityselinuxhelper.c @@ -156,7 +156,11 @@ int getpidcon(pid_t pid, security_context_t *context) return getpidcon_raw(pid, context); } +#ifdef SELINUX_CTX_CHAR_PTR +int setcon_raw(const char *context) +#else int setcon_raw(security_context_t context) +#endif { if (!is_selinux_enabled()) { errno = EINVAL; @@ -165,13 +169,21 @@ int setcon_raw(security_context_t context) return setenv("FAKE_SELINUX_CONTEXT", context, 1); } +#ifdef SELINUX_CTX_CHAR_PTR +int setcon(const char *context) +#else int setcon(security_context_t context) +#endif { return setcon_raw(context); } +#ifdef SELINUX_CTX_CHAR_PTR +int setfilecon_raw(const char *path, const char *con) +#else int setfilecon_raw(const char *path, security_context_t con) +#endif { const char *constr = con; if (STRPREFIX(path, abs_builddir "/securityselinuxlabeldata/nfs/")) { @@ -182,7 +194,11 @@ int setfilecon_raw(const char *path, security_context_t con) constr, strlen(constr), 0); } +#ifdef SELINUX_CTX_CHAR_PTR +int setfilecon(const char *path, const char *con) +#else int setfilecon(const char *path, security_context_t con) +#endif { return setfilecon_raw(path, con); } -- 1.8.4.5

3 4

[libvirt] [PATCH] Managed-Save: False warning on successful managed save restoration
by Jason J. Herne 28 May '14

28 May '14

From: "Jason J. Herne" <jjherne(a)us.ibm.com> qemuDomainObjStart is checking the return code from qemuDomainObjRestore for errors even after determining that the return code is 0. This causes the following error message to appear even when the restore was successful. Unable to restore from managed state [path]. Maybe the file is corrupted? A simple conditional to handle the error case takes care of the problem. Signed-off-by: Jason J. Herne <jjherne(a)us.ibm.com> --- src/qemu/qemu_driver.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2b852eb..cec2b6c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6081,14 +6081,15 @@ qemuDomainObjStart(virConnectPtr conn, else vm->hasManagedSave = false; } - - if (ret > 0) { - VIR_WARN("Ignoring incomplete managed state %s", managed_save); - } else { - VIR_WARN("Unable to restore from managed state %s. " - "Maybe the file is corrupted?", managed_save); - goto cleanup; + else { + if (ret > 0) { + VIR_WARN("Ignoring incomplete managed state %s", managed_save); + } else { + VIR_WARN("Unable to restore from managed state %s. " + "Maybe the file is corrupted?", managed_save); + } } + goto cleanup; } } -- 1.8.3.2

3 5

[libvirt] [PATCH] qemu: managedsave: Don't spam logs with warnings about corrupted image
by Peter Krempa 28 May '14

28 May '14

Even successful start of a VM from a managed save image would spam the logs with the following message: Unable to restore from managed state [path]. Maybe the file is corrupted? Re-arrange the logic to output the warning only when the image is corrupted. The flaw was introduced in commit cfc28c66. --- src/qemu/qemu_driver.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2b852eb..7a29b82 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6080,14 +6080,14 @@ qemuDomainObjStart(virConnectPtr conn, VIR_WARN("Failed to remove the managed state %s", managed_save); else vm->hasManagedSave = false; - } - if (ret > 0) { - VIR_WARN("Ignoring incomplete managed state %s", managed_save); - } else { + goto cleanup; + } else if (ret < 0) { VIR_WARN("Unable to restore from managed state %s. " "Maybe the file is corrupted?", managed_save); goto cleanup; + } else { + VIR_WARN("Ignoring incomplete managed state %s", managed_save); } } } -- 1.9.3

2 2