- Devel - libvirt List Archives

[libvirt] [REPOST PATCH 0/6] Have 'buildVol' callers to clean up after themselves
by John Ferlan 04 Nov '15

04 Nov '15

Since some time and changes have occurred since the original posting, I figured it would be just easier to updated and repost the remainder of the series: http://www.redhat.com/archives/libvir-list/2015-October/msg00312.html Where the patches 1-3 are v2's of the original patches 8 & 9: http://www.redhat.com/archives/libvir-list/2015-October/msg00515.html http://www.redhat.com/archives/libvir-list/2015-October/msg00516.html http://www.redhat.com/archives/libvir-list/2015-October/msg00518.html Note that patches 4-6 have been ACK'd already as patches 10-12, it's just that without the previous patches it doesn't make much sense to push them alone. John Ferlan (6): storage: Refactor and fix virStorageBackendCreateExecCommand storage: Cleanup failures virStorageBackendCreateExecCommand storage: Cleanup failures in virStorageBackendCreateRaw storage: Pull volume removal from pool in storageVolDeleteInternal Revert "storage: Prior to creating a volume, refresh the pool" storage: On 'buildVol' failure don't delete the volume src/storage/storage_backend.c | 40 ++++++++++++++++++++++++++------------- src/storage/storage_backend.h | 10 ++++++++++ src/storage/storage_driver.c | 44 +++++++++++++++++++++---------------------- 3 files changed, 59 insertions(+), 35 deletions(-) -- 2.1.0

2 17

[libvirt] [PATCH] Revert "utils: Remove the logging of errors from virNetDevSendEthtoolIoctl"
by Daniel P. Berrange 03 Nov '15

03 Nov '15

This reverts commit 6f2a0198e913c91a2ef8b99db79b7d3cc5396957. This commit removed error reporting from virNetDevSendEthtoolIoctl pushing responsibility onto the callers. This is wrong, however, since virNetDevSendEthtoolIoctl calls virNetDevSetupControl which can still report errors. So as a result virNetDevSendEthtoolIoctl may or may not report errors depending on which bit of it fails, and as a result callers now overwrite some errors. It also introduced a regression causing unprivileged libvirtd to spew error messages to the console due to inability to query the NIC features, an error which was previously ignored. virNetDevSetupControlFull:148 : Cannot open network interface control socket: Operation not permitted virNetDevFeatureAvailable:3062 : Cannot get device wlp3s0 flags: Operation not permitted virNetDevSetupControlFull:148 : Cannot open network interface control socket: Operation not permitted virNetDevFeatureAvailable:3062 : Cannot get device wlp3s0 flags: Operation not permitted virNetDevSetupControlFull:148 : Cannot open network interface control socket: Operation not permitted virNetDevFeatureAvailable:3062 : Cannot get device wlp3s0 flags: Operation not permitted virNetDevSetupControlFull:148 : Cannot open network interface control socket: Operation not permitted virNetDevFeatureAvailable:3062 : Cannot get device wlp3s0 flags: Operation not permitted Looking back at the original posting I see no explanation of why thsi refactoring was needed, so reverting the clearly broken error reporting logic looks like the best option. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/util/virnetdev.c | 56 +++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 40 insertions(+), 16 deletions(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 9789e93..657df3a 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -3145,15 +3145,39 @@ static int virNetDevSendEthtoolIoctl(const char *ifname, void *cmd) { int ret = -1; - int fd; - struct ifreq ifr; + int sock = -1; + virIfreq ifr; - if ((fd = virNetDevSetupControl(ifname, &ifr)) < 0) - return ret; + sock = socket(AF_LOCAL, SOCK_DGRAM, 0); + if (sock < 0) { + virReportSystemError(errno, "%s", _("Cannot open control socket")); + goto cleanup; + } + + memset(&ifr, 0, sizeof(ifr)); + strcpy(ifr.ifr_name, ifname); ifr.ifr_data = cmd; - ret = ioctl(fd, SIOCETHTOOL, &ifr); + ret = ioctl(sock, SIOCETHTOOL, &ifr); + if (ret != 0) { + switch (errno) { + case EPERM: + VIR_DEBUG("ethtool ioctl: permission denied"); + break; + case EINVAL: + VIR_DEBUG("ethtool ioctl: invalid request"); + break; + case EOPNOTSUPP: + VIR_DEBUG("ethtool ioctl: request not supported"); + break; + default: + virReportSystemError(errno, "%s", _("ethtool ioctl error")); + goto cleanup; + } + } - VIR_FORCE_CLOSE(fd); + cleanup: + if (sock) + VIR_FORCE_CLOSE(sock); return ret; } @@ -3170,12 +3194,12 @@ virNetDevSendEthtoolIoctl(const char *ifname, void *cmd) static int virNetDevFeatureAvailable(const char *ifname, struct ethtool_value *cmd) { + int ret = -1; + cmd = (void*)cmd; - if (virNetDevSendEthtoolIoctl(ifname, cmd) < 0) { - virReportSystemError(errno, _("Cannot get device %s flags"), ifname); - return -1; - } - return cmd->data > 0 ? 1 : 0; + if (!virNetDevSendEthtoolIoctl(ifname, cmd)) + ret = cmd->data > 0 ? 1 : 0; + return ret; } @@ -3192,12 +3216,12 @@ virNetDevFeatureAvailable(const char *ifname, struct ethtool_value *cmd) static int virNetDevGFeatureAvailable(const char *ifname, struct ethtool_gfeatures *cmd) { + int ret = -1; + cmd = (void*)cmd; - if (virNetDevSendEthtoolIoctl(ifname, cmd) < 0) { - virReportSystemError(errno, _("Cannot get device %s generic features"), ifname); - return -1; - } - return FEATURE_BIT_IS_SET(cmd->features, TX_UDP_TNL, active); + if (!virNetDevSendEthtoolIoctl(ifname, cmd)) + ret = FEATURE_BIT_IS_SET(cmd->features, TX_UDP_TNL, active); + return ret; } # endif -- 2.5.0

2 4

[libvirt] [PATCH] virkeymaps.h: Fix VPATH build with --disable-dependency-tracking
by Michal Privoznik 03 Nov '15

03 Nov '15

Funny things happen when you try to do a VPATH build and pass --disable-dependency-tracking argument to the configure script. Not only the directory structure is not created at the end of configure phase, but also contradictory to others, virkeymaps.h does not depend on src/utils dirstamp. I don't know how to force automake to generate that rule, but this is the diff that makes things work for me again. Yes, as you can see it more or less reverts a9fe620372144db3e432bd7506cb909cc3179ef8. More than less. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Steps to reproduce: 1) mkdir /tmp/test_libvirt && cd $_ 2) $OLDPWD/configure --disable-dependency-tracking 3) make src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 99b4993..f98912f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -181,7 +181,7 @@ MAINTAINERCLEANFILES += util/virkeymaps.h util/virkeymaps.h: $(srcdir)/util/keymaps.csv \ $(srcdir)/util/virkeycode-mapgen.py $(AM_V_GEN)$(PYTHON) $(srcdir)/util/virkeycode-mapgen.py \ - <$(srcdir)/util/keymaps.csv >util/virkeymaps.h + <$(srcdir)/util/keymaps.csv >$(srcdir)/util/virkeymaps.h # Internal generic driver infrastructure NODE_INFO_SOURCES = nodeinfo.h nodeinfo.c nodeinfopriv.h -- 2.4.10

3 5

[libvirt] [PATCH] bhyve: add bootrom support
by Roman Bogorodskiy 03 Nov '15

03 Nov '15

Recently, bhyve got UEFI support that eliminates necessity of having two-step process of starting a VM, i.e. loading OS using loader like bhyveloader or grub and then calling bhyve itself. >From user perspective usage looks the following: if a domain XML contains the '<bootloader>' element and it's value is a path to non-executable file, then it's treated as a path to bootrom file and external loader is not execute. All the existing behavior remains the same, e.g. if bootloader is not specified, bhyveloader is used. If loader is specified and it points to an executable file, it's executed before running bhyve. Implementation consists of two major parts: * Add probing for capability by checking if the current bhyve binary accepts '-l bootrom' argument meaning that UEFI is supported * virBhyveProcessBuildBhyveCmd is extended with 'external_loader' argument. If it decides (based on the schema described above) that external loader is not needed, it sets it to false. All the related code changed accordingly to act based on value of external_loader. --- src/bhyve/bhyve_capabilities.c | 11 ++++ src/bhyve/bhyve_capabilities.h | 1 + src/bhyve/bhyve_command.c | 20 +++++++- src/bhyve/bhyve_command.h | 1 + src/bhyve/bhyve_driver.c | 15 +++--- src/bhyve/bhyve_process.c | 58 ++++++++++++---------- .../bhyvexml2argvdata/bhyvexml2argv-bhyveload.args | 3 ++ .../bhyvexml2argv-bhyveload.ldargs | 1 + .../bhyvexml2argvdata/bhyvexml2argv-bhyveload.xml | 24 +++++++++ tests/bhyvexml2argvdata/bhyvexml2argv-bootrom.args | 4 ++ tests/bhyvexml2argvdata/bhyvexml2argv-bootrom.xml | 23 +++++++++ tests/bhyvexml2argvmock.c | 13 +++++ tests/bhyvexml2argvtest.c | 39 ++++++++------- 13 files changed, 162 insertions(+), 51 deletions(-) create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-bootrom.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-bootrom.xml diff --git a/src/bhyve/bhyve_capabilities.c b/src/bhyve/bhyve_capabilities.c index d2970a2..fbdd63c 100644 --- a/src/bhyve/bhyve_capabilities.c +++ b/src/bhyve/bhyve_capabilities.c @@ -166,6 +166,17 @@ virBhyveProbeCaps(unsigned int *caps) if (strstr(help, "-u:") != NULL) *caps |= BHYVE_CAP_RTC_UTC; + virCommandFree(cmd); + + cmd = virCommandNew(binary); + virCommandAddArgList(cmd, "-l", "bootrom", NULL); + if (virCommandRun(cmd, &exit) < 0) { + ret = -1; + goto out; + } + if (exit == 1) + *caps |= BHYVE_CAP_BOOTROM; + out: VIR_FREE(help); virCommandFree(cmd); diff --git a/src/bhyve/bhyve_capabilities.h b/src/bhyve/bhyve_capabilities.h index 0eb22a4..25dfb2c 100644 --- a/src/bhyve/bhyve_capabilities.h +++ b/src/bhyve/bhyve_capabilities.h @@ -33,6 +33,7 @@ typedef enum { typedef enum { BHYVE_CAP_RTC_UTC = 1, + BHYVE_CAP_BOOTROM = 2, } virBhyveCapsFlags; int virBhyveProbeGrubCaps(virBhyveGrubCapsFlags *caps); diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index 6576029..10d504e 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -216,7 +216,9 @@ bhyveBuildDiskArgStr(const virDomainDef *def ATTRIBUTE_UNUSED, virCommandPtr virBhyveProcessBuildBhyveCmd(virConnectPtr conn, - virDomainDefPtr def, bool dryRun) + virDomainDefPtr def, + bool *external_loader, + bool dryRun) { /* * /usr/sbin/bhyve -c 2 -m 256 -AI -H -P \ @@ -230,6 +232,22 @@ virBhyveProcessBuildBhyveCmd(virConnectPtr conn, virCommandPtr cmd = virCommandNew(BHYVE); + /* Check what loader to use */ + if ((def->os.bootloader != NULL) && + (!virFileIsExecutable(def->os.bootloader))) { + *external_loader = false; + if ((bhyveDriverGetCaps(conn) & BHYVE_CAP_BOOTROM) == 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Installed bhyve binary does not support " + "bootrom")); + goto error; + } + virCommandAddArg(cmd, "-l"); + virCommandAddArgFormat(cmd, "bootrom,%s", def->os.bootloader); + } else { + *external_loader = true; + } + /* CPUs */ virCommandAddArg(cmd, "-c"); virCommandAddArgFormat(cmd, "%d", def->vcpus); diff --git a/src/bhyve/bhyve_command.h b/src/bhyve/bhyve_command.h index 22a959d..20a3bf0 100644 --- a/src/bhyve/bhyve_command.h +++ b/src/bhyve/bhyve_command.h @@ -32,6 +32,7 @@ virCommandPtr virBhyveProcessBuildBhyveCmd(virConnectPtr conn, virDomainDefPtr def, + bool *external_loader, bool dryRun); virCommandPtr diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 4840a0e..7290251 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -698,6 +698,7 @@ bhyveConnectDomainXMLToNative(virConnectPtr conn, virDomainDefPtr def = NULL; virCommandPtr cmd = NULL, loadcmd = NULL; virCapsPtr caps = NULL; + bool external_loader = NULL; char *ret = NULL; virCheckFlags(0, NULL); @@ -721,15 +722,17 @@ bhyveConnectDomainXMLToNative(virConnectPtr conn, if (bhyveDomainAssignAddresses(def, NULL) < 0) goto cleanup; - if (!(loadcmd = virBhyveProcessBuildLoadCmd(conn, def, "<device.map>", - NULL))) + if (!(cmd = virBhyveProcessBuildBhyveCmd(conn, def, &external_loader, true))) goto cleanup; - if (!(cmd = virBhyveProcessBuildBhyveCmd(conn, def, true))) - goto cleanup; + if (external_loader) { + if (!(loadcmd = virBhyveProcessBuildLoadCmd(conn, def, "<device.map>", + NULL))) + goto cleanup; - virBufferAdd(&buf, virCommandToString(loadcmd), -1); - virBufferAddChar(&buf, '\n'); + virBufferAdd(&buf, virCommandToString(loadcmd), -1); + virBufferAddChar(&buf, '\n'); + } virBufferAdd(&buf, virCommandToString(cmd), -1); if (virBufferCheckError(&buf) < 0) diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index 284641a..d62cccd 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -114,6 +114,7 @@ virBhyveProcessStart(virConnectPtr conn, virCommandPtr load_cmd = NULL; bhyveConnPtr privconn = conn->privateData; int ret = -1, rc; + bool external_loader = NULL; if (virAsprintf(&logfile, "%s/%s.log", BHYVE_LOG_DIR, vm->def->name) < 0) @@ -150,6 +151,7 @@ virBhyveProcessStart(virConnectPtr conn, /* Call bhyve to start the VM */ if (!(cmd = virBhyveProcessBuildBhyveCmd(conn, vm->def, + &external_loader, false))) goto cleanup; @@ -159,38 +161,40 @@ virBhyveProcessStart(virConnectPtr conn, virCommandSetPidFile(cmd, privconn->pidfile); virCommandDaemonize(cmd); - /* Now bhyve command is constructed, meaning the - * domain is ready to be started, so we can build - * and execute bhyveload command */ - rc = virBhyveFormatDevMapFile(vm->def->name, &devmap_file); - if (rc < 0) - goto cleanup; - - if (!(load_cmd = virBhyveProcessBuildLoadCmd(conn, vm->def, devmap_file, - &devicemap))) - goto cleanup; - virCommandSetOutputFD(load_cmd, &logfd); - virCommandSetErrorFD(load_cmd, &logfd); + if (external_loader) { + /* Now bhyve command is constructed, meaning the + * domain is ready to be started, so we can build + * and execute bhyveload command */ + rc = virBhyveFormatDevMapFile(vm->def->name, &devmap_file); + if (rc < 0) + goto cleanup; - if (devicemap != NULL) { - rc = virFileWriteStr(devmap_file, devicemap, 0644); - if (rc) { - virReportSystemError(errno, - _("Cannot write device.map '%s'"), - devmap_file); + if (!(load_cmd = virBhyveProcessBuildLoadCmd(conn, vm->def, devmap_file, + &devicemap))) goto cleanup; + virCommandSetOutputFD(load_cmd, &logfd); + virCommandSetErrorFD(load_cmd, &logfd); + + if (devicemap != NULL) { + rc = virFileWriteStr(devmap_file, devicemap, 0644); + if (rc) { + virReportSystemError(errno, + _("Cannot write device.map '%s'"), + devmap_file); + goto cleanup; + } } - } - /* Log generated command line */ - virCommandWriteArgLog(load_cmd, logfd); - if ((pos = lseek(logfd, 0, SEEK_END)) < 0) - VIR_WARN("Unable to seek to end of logfile: %s", - virStrerror(errno, ebuf, sizeof(ebuf))); + /* Log generated command line */ + virCommandWriteArgLog(load_cmd, logfd); + if ((pos = lseek(logfd, 0, SEEK_END)) < 0) + VIR_WARN("Unable to seek to end of logfile: %s", + virStrerror(errno, ebuf, sizeof(ebuf))); - VIR_DEBUG("Loading domain '%s'", vm->def->name); - if (virCommandRun(load_cmd, NULL) < 0) - goto cleanup; + VIR_DEBUG("Loading domain '%s'", vm->def->name); + if (virCommandRun(load_cmd, NULL) < 0) + goto cleanup; + } /* Now we can start the domain */ VIR_DEBUG("Starting domain '%s'", vm->def->name); diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload.args b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload.args new file mode 100644 index 0000000..118735e --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload.args @@ -0,0 +1,3 @@ +/usr/sbin/bhyve -c 1 -m 214 -u -H -P -s 0:0,hostbridge \ +-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ +-s 2:0,ahci-hd,/tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload.ldargs new file mode 100644 index 0000000..56f7fb3 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload.ldargs @@ -0,0 +1 @@ +/usr/sbin/bhyveload -foo diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload.xml new file mode 100644 index 0000000..9dac10c --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload.xml @@ -0,0 +1,24 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <vcpu>1</vcpu> + <bootloader>/usr/sbin/bhyveload</bootloader> + <bootloader_args>-foo</bootloader_args> + <os> + <type>hvm</type> + </os> + <devices> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </disk> + <interface type='bridge'> + <model type='virtio'/> + <source bridge="virbr0"/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + </devices> +</domain> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bootrom.args b/tests/bhyvexml2argvdata/bhyvexml2argv-bootrom.args new file mode 100644 index 0000000..d46ffab --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bootrom.args @@ -0,0 +1,4 @@ +/usr/sbin/bhyve -l bootrom,/path/to/rom.fd \ +-c 1 -m 214 -u -H -P -s 0:0,hostbridge \ +-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ +-s 2:0,ahci-hd,/tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bootrom.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-bootrom.xml new file mode 100644 index 0000000..2da80c5 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bootrom.xml @@ -0,0 +1,23 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <vcpu>1</vcpu> + <bootloader>/path/to/rom.fd</bootloader> + <os> + <type>hvm</type> + </os> + <devices> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </disk> + <interface type='bridge'> + <model type='virtio'/> + <source bridge="virbr0"/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + </devices> +</domain> diff --git a/tests/bhyvexml2argvmock.c b/tests/bhyvexml2argvmock.c index 41058ca..797dc20 100644 --- a/tests/bhyvexml2argvmock.c +++ b/tests/bhyvexml2argvmock.c @@ -1,5 +1,6 @@ #include <config.h> +#include "virfile.h" #include "virstring.h" #include "virnetdev.h" #include "virnetdevtap.h" @@ -48,3 +49,15 @@ int virNetDevSetOnline(const char *ifname ATTRIBUTE_UNUSED, { return 0; } + +bool virFileIsExecutable(const char *file) +{ + if (STREQ(file, "/fizz_buzz_bazz")) + return true; + else if (STREQ(file, "/usr/local/sbin/grub-bhyve")) + return true; + else if (STREQ(file, "/usr/sbin/bhyveload")) + return true; + + return false; +} diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index 3e57a78..2ff1ae3 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -23,6 +23,7 @@ static int testCompareXMLToArgvFiles(const char *xml, virDomainDefPtr vmdef = NULL; virCommandPtr cmd = NULL, ldcmd = NULL; virConnectPtr conn; + bool external_loader = NULL; int ret = -1; if (!(conn = virGetConnect())) @@ -34,33 +35,35 @@ static int testCompareXMLToArgvFiles(const char *xml, conn->privateData = &driver; - if (!(cmd = virBhyveProcessBuildBhyveCmd(conn, vmdef, false))) + if (!(cmd = virBhyveProcessBuildBhyveCmd(conn, vmdef, &external_loader, false))) goto out; if (!(actualargv = virCommandToString(cmd))) goto out; - if (!(ldcmd = virBhyveProcessBuildLoadCmd(conn, vmdef, "<device.map>", - &actualdm))) - goto out; - - if (actualdm != NULL) - virTrimSpaces(actualdm, NULL); - - if (!(actualld = virCommandToString(ldcmd))) - goto out; + if (external_loader) { + if (!(ldcmd = virBhyveProcessBuildLoadCmd(conn, vmdef, "<device.map>", + &actualdm))) + goto out; - if (virtTestCompareToFile(actualargv, cmdline) < 0) - goto out; + if (actualdm != NULL) + virTrimSpaces(actualdm, NULL); - if (virtTestCompareToFile(actualld, ldcmdline) < 0) - goto out; + if (!(actualld = virCommandToString(ldcmd))) + goto out; - if (virFileExists(dmcmdline) || actualdm) { - if (virtTestCompareToFile(actualdm, dmcmdline) < 0) + if (virtTestCompareToFile(actualld, ldcmdline) < 0) goto out; + + if (virFileExists(dmcmdline) || actualdm) { + if (virtTestCompareToFile(actualdm, dmcmdline) < 0) + goto out; + } } + if (virtTestCompareToFile(actualargv, cmdline) < 0) + goto out; + ret = 0; out: @@ -118,7 +121,7 @@ mymain(void) } while (0) driver.grubcaps = BHYVE_GRUB_CAP_CONSDEV; - driver.bhyvecaps = BHYVE_CAP_RTC_UTC; + driver.bhyvecaps = BHYVE_CAP_RTC_UTC | BHYVE_CAP_BOOTROM; DO_TEST("base"); DO_TEST("acpiapic"); @@ -130,8 +133,10 @@ mymain(void) DO_TEST("grub-defaults"); DO_TEST("grub-bootorder"); DO_TEST("grub-bootorder2"); + DO_TEST("bhyveload"); DO_TEST("bhyveload-explicitargs"); DO_TEST("custom-loader"); + DO_TEST("bootrom"); DO_TEST("disk-cdrom-grub"); DO_TEST("serial-grub"); DO_TEST("localtime"); -- 2.6.1

2 3

[libvirt] Ten years of libvirt
by Michal Privoznik 03 Nov '15

03 Nov '15

Dear list, join me on this big day in congratulations to libvirt that has just turned 10 and is starting new decade of its life. At the same time big thanks to all who contributed in any way. Cheers! Michal

6 6

Re: [libvirt] [PATCH 7/8] Postpone reprobing till all the devices in iommu group are unbound from vfio
by Andrea Bolognani 02 Nov '15

02 Nov '15

On Mon, 2015-11-02 at 10:06 +0530, Shivaprasad bhat wrote: > > > +{ > > > + int ret = 0; > > > + virPCIDevicePtr pci = NULL; > > > + > > > + if (!(pci = virPCIDeviceNew(devAddr->domain, devAddr->bus, > > > + devAddr->slot, devAddr->function))) > > > + goto cleanup; > > > + > > > + if (STREQ_NULLABLE(pci->stubDriver, "vfio-pci")) > > > + ret = -1; > > > > As mentioned in the comment for Patch 1, I think this is > > fairly obscure: if I had not read throught the whole > > series, I'd assume this checks whether the device is > > configured to use vfio-pci as stub driver, not whether > > it is currently bound to it, and it would not be > > immediately clear to me how this check fits in a function > > called virPCIDeviceBoundToVFIODriver(). > > > > I think it would be much cleaner to query the driver > > explicitly using virPCIDeviceGetDriverPathAndName() and > > remove that call from virPCIDeviceNew(). > > > > The PCIDeviceNew does exactly the same of going through > the sysfs and populating it. Its only code which is as though > the stubDriver scan is happening inside than explicitly outside. > > The Iterator today takes virPCIDeviceAddressPtr and > virPCIDeviceGetDriverPathAndName for which we anyway need to > call virPCIDevNew. I am just avoiding one extra function call by > moving it inside virPCIDevNew The problem I have with this approach is that, as far as I understand, before your patch dev->stubDriver is a configuration item: you set it to whatever's appropriate, and the value is later inspected in virPCIDeviceBindToStub()[1] to decide what stub driver the device should be bound to. After your patch, depending on the context, it could be either a configuration item, as before, or state, eg. the current stub driver the device is bound to, with no clear way to tell one situation from the other. I think using a single attribute to store related but different information should be avoided, as it has the potential to make the code much harder to understand, especially later on for someone who's not been involved in the implementation. Moreover you only need that value for comparison purposes in a couple of places, and by moving the code to virPCIDeviceNew() you make it so the value is loaded (by performing filesystem operations) every single time a virDevice is created, whether the value is actually used or not. Cheers. [1] Rather virPCIDeviceDetach() in reality - I have a pending patch that moves it to virPCIDeviceBindToStub() where it IMHO belongs -- Andrea Bolognani Software Engineer - Virtualization Team

1 0

[libvirt] [PATCH v6 00/13] qemu: Add quorum support to libvirt
by Matthias Gatto 02 Nov '15

02 Nov '15

The purpose of these patches is to introduce quorum for libvirt I've try to follow this proposal: http://www.redhat.com/archives/libvir-list/2014-May/msg00533.html This feature ask for 6 task: 1) Allow a _virStorageSource to contain more than one backing store. Because all the actual libvirt code use the backingStore field as a pointer and we needs want to change that, I've decide to encapsulate the backingStore field to simplifie the array manipulation. 2) Add the missing field a quorum need in _virStorageSource and the VIR_STORAGE_TYPE_QUORUM and VIR_STORAGE_FILE_QUORUM in their respectives enums. 3) Parse and format the xml Because a quorum allows to have more than one backing store at the same level we need to change virDomainDiskDefFormat and virDomainDiskDefParseXML to call virDomainDiskBackingStoreFormat and virDomainDiskBackingStoreParse in a loop. virDomainDiskBackingStoreFormat and virDomainDiskBackingStoreParse can call themself recursively in a loop because a quorum can contain another quorum 4) Build qemu string As for the xml, we have to call the function which create quorum recursively. But this task have the problem explained here: http://www.redhat.com/archives/libvir-list/2014-October/msg00529.html The _virStorageSource missing some informations that can be passed to a child, and therefore this version of quorum is incomplet. 5) Allow to hotplug/change a disk in a quorum This part is not present in these patches because for this task we have to use blockdev-add, and currently libvirt use device_add for hotpluging that doesn't allow to hotplug quorum childs. There is 3 way to handle this problem: 1) create a virDomainBlockDevAdd function in libvirt witch call blockdev-add. 2) use blockdev-add instead of device_add in qemuMonitorJSONAddDevice 3) write a hack which uses blockdev-add only when attaching a quorum child V2: -Rebase on master -Add Documentation V3: -Transforme the backingStore field in virStorageSource into an array of pointer instead of a pointer -Modify virStorageSourceSetBackingStore to allow it to expand the backingStore size. V4: -Rebase on master V5: -Rebase on master -patch 1-4/9: use patchs from John Ferlan -patch 4/9: check return of virStorageSourceSetBackingStore -patch 5/9: report type of error on virStorageSourceSetBackingStore v6 note: First at all, I'm sorry for the time between v5 and v6, I had other projects to work on and was unable to work at full time on libvirt, moreover I've try at first to support all snapshot and block jobs operations for quorum, but encounter a lot a problems. At the end I had a versions which was only handling some few operations, so I've block all unsupported operations for quorum, I plan to continue working on the quorum unsupported operations, and send it when it will be ready, but in the meantime I hope to upstream this serie of patch which should provide a very basic(but stable) quorum suport. v6 modifications: -Rebase on master -Remove node-name patch -patch 06/13: Add virStorageSourceIsRAID -patch 10/13: Add virDomainDefHasRAID -patch 11-13/13: Block all unsupported operations Matthias Gatto (13): virstoragefile: Add virStorageSourceGetBackingStore virstoragefile: Always use virStorageSourceGetBackingStore to get backing store virstoragefile: Add virStorageSourceSetBackingStore virstoragefile: Always use virStorageSourceSetBackingStore to set backing store virstoragefile: change backingStore to backingStores. virstoragefile: Add virStorageSourceIsRAID virstoragefile: Add quorum in virstoragefile domain_conf: Read and Write quorum config qemu: Add quorum support in qemuBuildDriveDevStr domain: add virDomainDefHasRAID qemu: Block snapshot operation with RAID qemu: qemuDomainGetBlockInfo quorum support qemu: qemuDiskPathToAlias quorum support docs/formatdomain.html.in | 23 +++- docs/schemas/domaincommon.rng | 21 +++- docs/schemas/storagecommon.rng | 1 + docs/schemas/storagevol.rng | 1 + src/conf/domain_conf.c | 196 +++++++++++++++++++++++++--------- src/conf/domain_conf.h | 1 + src/conf/storage_conf.c | 23 ++-- src/libvirt_private.syms | 4 + src/qemu/qemu_cgroup.c | 4 +- src/qemu/qemu_command.c | 94 ++++++++++++++++ src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 50 ++++++--- src/qemu/qemu_migration.c | 1 + src/qemu/qemu_monitor_json.c | 4 +- src/security/security_dac.c | 2 +- src/security/security_selinux.c | 4 +- src/security/virt-aa-helper.c | 2 +- src/storage/storage_backend.c | 22 ++-- src/storage/storage_backend_fs.c | 38 ++++--- src/storage/storage_backend_gluster.c | 11 +- src/storage/storage_backend_logical.c | 15 ++- src/storage/storage_driver.c | 3 +- src/util/virstoragefile.c | 118 +++++++++++++++++--- src/util/virstoragefile.h | 15 ++- tests/virstoragetest.c | 18 ++-- 25 files changed, 523 insertions(+), 150 deletions(-) -- 2.6.1

2 23

[libvirt] [PATCH v3 0/9] Few VFIO related fixes
by Shivaprasad G Bhat 02 Nov '15

02 Nov '15

The following series implements... --- Addressed comments on V2 and V1 Fixed the while loop exit in P8 virPCIDeviceUnbindFromStub() Shivaprasad G Bhat (9): Implement virPCIIsKnownStub function Initialize the stubDriver of pci devices if bound to a valid one Add iommu group number info to virPCIDevice Refuse to reattach from vfio if the iommu group is in use by any domain Wait for vfio-pci device cleanups before reassinging the device to host driver Split reprobe action from the virPCIUnbindFromStub into a new function Pass activeDevs and inactiveDevs to virPCIDeviceUnbindFromStub and virPCIDeviceBindToStub Postpone reprobing till all the devices in iommu group are unbound from vfio Wait for iommmu device to go away before reprobing the host driver src/libvirt_private.syms | 1 src/util/virhostdev.c | 18 +++ src/util/virpci.c | 300 +++++++++++++++++++++++++++++++++++++++------- src/util/virpci.h | 2 tests/virpcimock.c | 187 ++++++++++++++++++++++++++--- tests/virpcitest.c | 152 +++++++++++++++++++---- 6 files changed, 566 insertions(+), 94 deletions(-) -- Signature

1 9

[libvirt] [PATCH 0/4] *** Don't include .c file for editing support ***
by rodinasophie＠gmail.com 02 Nov '15

02 Nov '15

From: sonya <rodinasophie(a)gmail.com> *** BLURB HERE *** sonya (4): General structures and interfaces were added Virsh-edit interface was added Comment in virsh-edit.h was changed Style-errors are fixed tools/Makefile.am | 1 + tools/virsh-domain.c | 187 ++++++++++++++++++++++++++++++++++++------------ tools/virsh-edit.c | 100 ++++++-------------------- tools/virsh-edit.h | 42 +++++++++++ tools/virsh-interface.c | 64 +++++++++++++---- tools/virsh-network.c | 62 ++++++++++++---- tools/virsh-nwfilter.c | 64 +++++++++++++---- tools/virsh-pool.c | 64 +++++++++++++---- tools/virsh-snapshot.c | 76 ++++++++++++++------ 9 files changed, 464 insertions(+), 196 deletions(-) create mode 100644 tools/virsh-edit.h -- 2.1.4

2 6

[libvirt] [PATCH] syntax-check: Add sc_prohibit_space_in_label rule
by Andrea Bolognani 02 Nov '15

02 Nov '15

This guards against code such as cleanup : which is happily accepted by the compiler but does not conform to our style guidelines. --- cfg.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cfg.mk b/cfg.mk index a9bba38..8462051 100644 --- a/cfg.mk +++ b/cfg.mk @@ -919,6 +919,12 @@ sc_require_space_before_label: halt="Top-level labels should be indented by one space" \ $(_sc_search_regexp) +sc_prohibit_space_in_label: + @prohibit='^[_a-zA-Z0-9]+ +:$$' \ + in_vc_files='\.[ch]$$' \ + halt="There should be no space between label name and colon" \ + $(_sc_search_regexp) + # Doesn't catch all cases of mismatched braces across if-else, but it helps sc_require_if_else_matching_braces: @prohibit='( else( if .*\))? {|} else( if .*\))?$$)' \ -- 2.4.3

2 2

[libvirt] [PATCH v2 0/9] Few VFIO related fixes
by Shivaprasad G Bhat 02 Nov '15

02 Nov '15

The following series fixes few VFIO related host crashes during hotplug/unplug or bind/unbind. --- Shivaprasad G Bhat (9): Implement virPCIIsAKnownStub function Initialize the stubDriver of pci devices if bound to a valid one Add iommu group number info to virPCIDevice Refuse to reattach from vfio if the iommu group is in use by any domain Wait for vfio-pci device cleanups before reassinging the device to host driver Split reprobe action from the virPCIUnbindFromStub into a new function Pass activeDevs and inactiveDevs to virPCIDeviceUnbindFromStub and virPCIDeviceBindToStub Postpone reprobing till all the devices in iommu group are unbound from vfio Wait for iommmu device to go away before reprobing the host driver src/libvirt_private.syms | 1 src/util/virhostdev.c | 18 +++ src/util/virpci.c | 289 ++++++++++++++++++++++++++++++++++++++-------- src/util/virpci.h | 2 tests/virpcimock.c | 187 +++++++++++++++++++++++++++--- tests/virpcitest.c | 152 ++++++++++++++++++++---- 6 files changed, 555 insertions(+), 94 deletions(-) -- Signature

3 14

[libvirt] Happy Birthday Libvirt
by Daniel Veillard 02 Nov '15

02 Nov '15

Hello everybody, as the first commits were done on Nov 2 2005, libvirt is more or less ten years old. This has been quite a bit of a journey, but a very successful one in my opinion, the initial goal was to provide a long term stable API for virtualization in the Red Hat ecosystem, and I'm very happy to see the goal has been reached, and we went way beyond that. In the end I think libvirt helped avoid the "balkanization" which is classic in highly competitive domains where you end up with one vertical set of tools per vendor. I also think that libvirt played a key role to keep free and open source software in the main virtualization offerings and even more so for cloud management systems. So it's time to celebrate, there is obviously lot to be done still on libvirt (as the steady stream of patches show !), but I would like to thank everybody who has contributed to the project so far, with a special mention to Dan Berrange who has been leading the effort technically for most of that time. I would also say that I have been very pelased with how the project has been working in that decade, the community is technical but friendly, and it's my hope libvirt, the project as well as the code, will remain as successful for the next decade ! So Thank You everybody, for making this project and community successful ! Enjoy that very special day :-) 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 0/8] Few vfio related fixes
by Shivaprasad G Bhat 02 Nov '15

02 Nov '15

The series fixes 3 issues which lead to host crash. The actual fixes are in p3, p4, p7 and p8. I'll fill in more details / descriptions in v2. The make check fails on virpcitest now, which I am still debugging. I anticipate some rework from review on p7 which I continue to refine. Sending now, to get any feedback that might change things drastically. --- Shivaprasad G Bhat (8): Initialize the stubDriver of pci devices if bound to a valid one Add iommu group number info to virPCIDevice Refuse to reattach from vfio if the iommu group is in use by any domain Wait for vfio-pci device cleanups before reassinging the device to host driver Split reprobe action from the virPCIUnbindFromStub into a new function Pass activeDevs and inactiveDevs to virPCIDeviceUnbindFromStub and virPCIDeviceBindToStub Postpone reprobing till all the devices in iommu group are unbound from vfio Wait for iommmu device to go away before reprobing the host driver src/util/virhostdev.c | 18 ++++ src/util/virpci.c | 206 ++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 177 insertions(+), 47 deletions(-) -- Signature

4 19

[libvirt] Entering freeze for libvirt-1.2.21
by Daniel Veillard 02 Nov '15

02 Nov '15

As pointed our on Tuesday it's time for a new release. I have tagged the release candidate 1 in git and pushed signed tarball and rpms to the usual place at: ftp://libvirt.org/libvirt/ Based on my limited testing this works just fine, but that's very limited and doesn't test portability at all, so please give it a try ! I will likely push rc2 on the week-end and the final version on Tuesday or Wednesday, please raise issues if you fine any, 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/

2 5

[libvirt] Outreachy 2015 DecemberMarch- Enhancing libvirt-designer
by Riyafa Abdul Hameed 01 Nov '15

01 Nov '15

Dear sir, I am Computer Science and Engineering undergraduate at University of Moratuwa, Sri Lanka. I am a keen learner and am much interested in open source. I have worked with WSO2 <http://wso2.com/> on open source projects and am quite familiar with FOSS development. I have a good knowledge in C and in using XML. I would like to participate in "Outreachy 2015 DecemberMarch" with QEMU, but it was already quite late when I came to know of this program as its application deadline closes by tomorrow. I would like to apply for the project "Enhancing libvirt-designer" this time for Outreachy. I sent a mail to the mentor, Michal Privoznik and I couldn't get in touch with him. Because it is already too late can anyone please suggest what I can do before I apply for the program by tomorrow? Thank you. Yours sincerely, Riyafa -- Riyafa Abdul Hameed Undergraduate, University of Moratuwa Email: riyafa3(a)gmail.com Website: https://riyafa.wordpress.com/ <http://riyafa.wordpress.com/> <http://facebook.com/riyafa.ahf> <http://lk.linkedin.com/in/riyafa> <http://twitter.com/Riyafa1>

1 0

[libvirt] [PATCH 1/3] cpu_map.xml: add cmt feature to x86
by Qiaowei Ren 31 Oct '15

31 Oct '15

Some Intel processor families (e.g. the Intel Xeon processor E5 v3 family) introduced CMT (Cache Monitoring Technology) to measure the usage of cache by applications running on the platform. This patch add it into x86 part of cpu_map.xml. Signed-off-by: Qiaowei Ren <qiaowei.ren(a)intel.com> --- .gnulib | 2 +- src/cpu/cpu_map.xml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gnulib b/.gnulib index f39477d..106a386 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit f39477dba778e99392948dd3dd19ec0d46aee932 +Subproject commit 106a3866d01f9dd57ab4f10dbeb0d5a8db73a9f7 diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index b9e95cf..14ccbd8 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -317,6 +317,9 @@ <feature name='rtm'> <cpuid function='0x00000007' ebx='0x00000800'/> </feature> + <feature name='cmt'> + <cpuid function='0x00000007' ebx='0x00001000'/> + </feature> <feature name='rdseed'> <cpuid function='0x00000007' ebx='0x00040000'/> </feature> -- 1.9.1

5 10

[libvirt] [python PATCH] fix crash introduced by commit 1d39dbaf
by Pavel Hrdina 31 Oct '15

31 Oct '15

Some of the libvirt_*Wrap functions steals the reference and we need to set the item in array to NULL no not free it on success. Those three places was accidentally removed by commit 1d39dbaf. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1270977 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed as fix for critical crasher. libvirt-override.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libvirt-override.c b/libvirt-override.c index c6c1da8..5f1c98f 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -2448,6 +2448,7 @@ libvirt_virDomainListAllSnapshots(PyObject *self ATTRIBUTE_UNUSED, for (i = 0; i < c_retval; i++) { VIR_PY_LIST_SET_GOTO(py_retval, i, libvirt_virDomainSnapshotPtrWrap(snaps[i]), error); + snaps[i] = NULL; } cleanup: @@ -2544,9 +2545,11 @@ libvirt_virDomainSnapshotListAllChildren(PyObject *self ATTRIBUTE_UNUSED, if (!(py_retval = PyList_New(c_retval))) goto cleanup; - for (i = 0; i < c_retval; i++) + for (i = 0; i < c_retval; i++) { VIR_PY_LIST_SET_GOTO(py_retval, i, libvirt_virDomainSnapshotPtrWrap(snaps[i]), error); + snaps[i] = NULL; + } cleanup: for (i = 0; i < c_retval; i++) @@ -3117,9 +3120,11 @@ libvirt_virConnectListAllNetworks(PyObject *self ATTRIBUTE_UNUSED, if (!(py_retval = PyList_New(c_retval))) goto cleanup; - for (i = 0; i < c_retval; i++) + for (i = 0; i < c_retval; i++) { VIR_PY_LIST_SET_GOTO(py_retval, i, libvirt_virNetworkPtrWrap(nets[i]), error); + nets[i] = NULL; + } cleanup: for (i = 0; i < c_retval; i++) -- 2.6.2

1 0

[libvirt] RFC: Improve performance of macvtap device creation
by Tony Krowiak 30 Oct '15

30 Oct '15

For a guest domain defined with a large number of macvtap devices, it takes an exceedingly long time to boot the guest. In a test of a guest domain configured with 82 macvtap devices, it took over two minutes for the guest to boot. An strace of the ioctl calls during guest start up showed the SIOCGIFFLAGS ioctl literally being invoked 3,403 times. I was able to isolate the source of the ioctl calls to the*virNetDevMacVLanCreateWithVPortProfile* function in*virnetdevmacvlan.c*. The macvtap interface name is created by looping over a counter variable, starting with zero, and appending the counter value to 'macvtap'. With each iteration, a call is made to*virNetDevExists* (SIOCGIFFLAGS ioctl) to determine if a device with that name already exists, until a unique name is created. In the test case cited above, to create an interface name for the 82nd macvtap device, the*virNetDevExists* function will be called for interface names 'macvtap0' to 'macvtap80' before it is determined that 'mavtap81' can be used. So if N is the number of macvtap interfaces defined for a guest, the SIOCGIFFLAGS ioctl will be invoked (N x N + N)/2 times to find an unused macvtap device names. That's assuming only one guest is being started, who knows how many times the ioctl may have to be called in an installation running a large number of guests defined with macvtap devices. I was able to reduce the amount of time for starting a guest domain defined with 82 macvtap devices from over 2 minutes to about 14 seconds by keeping track of the interface name suffixes previously used. I defined two static bit maps (virBitmap), one each for macvtap and macvlan device name suffixes. When a macvtap/macvlan device is created, the index of the next clear bit (virBitmapNextClearBit) is retrieved to create the name. If an interface with that name does not exist, the device is created and the bit at the index used to create the interface name is set (virBitmapSetBit). When a macvtap/macvlan device is deleted, if the interface name has the pattern 'macvtap%d' or 'macvlan%d', the suffix is parsed into a bit index and used to clear the (virBitMapClearBit) bit in the respective bitmap. I am not sure that is the best design because there is no way to track interface names used to create macvtap devices outside of libvirt, for example using the ip command. There may also be other issues I've not contemplated. I included a couple of additional ideas below and am looking for comments or other suggestions that I have not considered. * Define a global counter variable initialized to 0, that gets incremented each time an interface name is created, to keep track of the last used interface name suffix. At some maximum value, the counter will be set back to 0. * Append a random number to 'macvlan' or 'macvtap' when creating the interface name. Of course, the number of digits would have to be limited so the interface name would not exceed the maximum allowed. * Create the interface name in code that has more knowledge of the environment and pass the name into the *virNetDevMacVLanCreateWithVPortProfile* function via the *tgifname* parameter. For example, the *qemuBuildCommandLine* function in *qemu_command.c* contains the loop that iterates over the network devices defined for the guest domain that ultimately get created via the *virNetDevMacVLanCreateWithVPortProfile* function. That function has access to the network device configuration and at the very least could ensure none of the names previously defined for the guest aren't used. I believe it would be matter of creating a macvtap interface name - e.g., maybe a call to some function in *virnetdevmacvlan.c* - and setting the name in the virDomainNetDef structure prior to invoking *qemuBuildInterfaceCommandLine*? There are shortcomings in all of these ideas, so if you have a better one, feel free to present it.

4 7

[libvirt] RAM backend and guest ABI (was Re: [Qemu-devel] [PATCH v2] pc: memhp: enforce minimal 128Mb) alignment for pc-dimm
by Eduardo Habkost 30 Oct '15

30 Oct '15

(CCing Michal and libvir-list, so libvirt team is aware of this restriction) On Thu, Oct 29, 2015 at 02:36:37PM +0100, Igor Mammedov wrote: > On Tue, 27 Oct 2015 14:36:35 -0200 > Eduardo Habkost <ehabkost(a)redhat.com> wrote: > > > On Tue, Oct 27, 2015 at 10:14:56AM +0100, Igor Mammedov wrote: > > > On Tue, 27 Oct 2015 10:53:08 +0200 > > > "Michael S. Tsirkin" <mst(a)redhat.com> wrote: > > > > > > > On Tue, Oct 27, 2015 at 09:48:37AM +0100, Igor Mammedov wrote: > > > > > On Tue, 27 Oct 2015 10:31:21 +0200 > > > > > "Michael S. Tsirkin" <mst(a)redhat.com> wrote: > > > > > > > > > > > On Mon, Oct 26, 2015 at 02:24:32PM +0100, Igor Mammedov wrote: > > > > > > > Yep it's workaround but it works around QEMU's broken virtio > > > > > > > implementation in a simple way without need for guest side changes. > > > > > > > > > > > > > > Without foreseeable virtio fix it makes memory hotplug unusable and even > > > > > > > more so if there were a virtio fix it won't fix old guests since you've > > > > > > > said that virtio fix would require changes of both QEMU and guest sides. > > > > > > > > > > > > What makes it not foreseeable? > > > > > > Apparently only the fact that we have a work-around in place so no one > > > > > > works on it. I can code it up pretty quickly, but I'm flat out of time > > > > > > for testing as I'm going on vacation soon, and hard freeze is pretty > > > > > > close. > > > > > I can lend a hand for testing part. > > > > > > > > > > > > > > > > > GPA space is kind of cheap, but wasting it in chunks of 512M > > > > > > seems way too aggressive. > > > > > hotplug region is sized with 1Gb alignment reserve per DIMM so we aren't > > > > > actually wasting anything here. > > > > > > > > > > > > > If I allocate two 1G DIMMs, what will be the gap size? 512M? 1G? > > > > It's too much either way. > > > minimum would be 512, and if backend is 1Gb-hugepage gap will be > > > backend's natural alignment (i.e. 1Gb). > > > > Is backend configuration even allowed to affect the machine ABI? We need > > to be able to change backend configuration when migrating the VM to > > another host. > for now, one has to use the same type of backend on both sides > i.e. if source uses 1Gb huge pages backend then target also > need to use it. > The page size of the backend don't even depend on QEMU arguments, but on the kernel command-line or hugetlbfs mount options. So it's possible to have exactly the same QEMU command-line on source and destination (with an explicit versioned machine-type), and get a VM that can't be migrated? That means we are breaking our guarantees about migration and guest ABI. > We could change this for the next machine type to always force > max alignment (1Gb), then it would be possible to change > between backends with different alignments. I'm not sure what's the best solution here. If always using 1GB is too aggressive, we could require management to ask for an explicit alignment as a -machine option if they know they will need a specific backend page size. BTW, are you talking about the behavior introduced by aa8580cddf011e8cedcf87f7a0fdea7549fc4704 ("pc: memhp: force gaps between DIMM's GPA") only, or the backend page size was already affecting GPA allocation before that commit? -- Eduardo

2 1

[libvirt] [PATCH v2 0/3] improve virsh attach-interface
by Pavel Hrdina 30 Oct '15

30 Oct '15

new in v2: - removed netdev name as an option for --source parameter - removed --driver parameter, the default is vfio for new qemu and that's good enough Pavel Hrdina (3): virsh-nodedev: makes struct and functions for NodeDevice list available virsh-domain: update attach-interface to support type=hostdev virsh.pod: update and improve a attach-interface section tools/virsh-domain.c | 34 +++++++++++++++++++-- tools/virsh-nodedev.c | 16 ++++------ tools/virsh-nodedev.h | 11 +++++++ tools/virsh.pod | 82 +++++++++++++++++++++++++++++++-------------------- 4 files changed, 98 insertions(+), 45 deletions(-) -- 2.6.2

2 13

[libvirt] qemu-agent-command via isa-serial for freebsd
by Vasiliy Tolstov 30 Oct '15

30 Oct '15

Hi! I'm need to control freebsd guest via qemu-ga, as i see qemu-ga already supports isa-serial connection. How i need to configure domain via libvirt to able virsh qemu-agent-command to this guest vm? -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru

3 10

[libvirt] [PATCH] util: set error if DAD is not finished
by Luyao Huang 30 Oct '15

30 Oct '15

If DAD not finished in 5 seconds, user will get an unknown error like this: # virsh net-start ipv6 error: Failed to start network ipv6 error: An error occurred, but the cause is unknown Call virReportError to set an error. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- I found the DAD will take 7 seconds on my machine, and i cannot create a network which use ipv6 now :( . Can we offer a way allow user to change this timeout ? maybe add a configuration file option in libvirtd.conf. src/util/virnetdev.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 9789e93..c8861e9 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -1398,7 +1398,13 @@ virNetDevWaitDadFinish(virSocketAddrPtr *addrs, size_t count) VIR_FREE(resp); } /* Check timeout. */ - ret = dad ? -1 : 0; + if (dad) { + virReportError(VIR_ERR_SYSTEM_ERROR, + _("Duplicate Address Detection " + "not finished in %d seconds"), VIR_DAD_WAIT_TIMEOUT); + } else { + ret = 0; + } cleanup: VIR_FREE(resp); -- 1.8.3.1

5 5

[libvirt] Again cgroups and isolcpus
by Henning Schild 29 Oct '15

29 Oct '15

Hi folks, i already started a discussion on the interaction of cgroups and isolcpus a while ago. But now i believe i have got a better understanding of how the two interact and i can describe problems that arise from that. The scenario: A machine that runs realtime tasks on pcpus reserved with isolcpus. It also runs VMs with the help of libvirt. It might also run realtime VMs with the help of libvirt. Moving a task into a new cgroup/cpuset and some modifications of the cpus in that set imply a setaffinity by the kernel. That affinity setting will ignore isolcpus. The result is possible "interference by" or "starvation of" these tasks. Now let me describe one scenario where that implicit setaffinity becomes a problem for our realtime system. libvirt creates a superset called the machine.slice and subsets called emulator and vpuX. By default the machine.slice inherits from the root which contains all pcpus, also the isolated ones. Now moving a task into that superset will place that task on isolcpus where it might interfere or simply starve. Turns out that a fresh qemu actually is put into that superset. That is a bug that should be fixed but let me address that one in another mail. My current point of view is that we need a strong mechanism to isolate cpus. isolcpus just is not good enough. The measure of choice probably is cpusets as well, and this time with the exclusive flag turned on. That will stop every other cpuset user from messing around with those cpus by accident. I am thinking of one or more cpusets where isolated cpus are parked and not used within this cgroup. Anyone wanting to use one of them will have to take it out there and explictily put it into their a new set. Now if libvirt makes the mistake to have tasks running in supersets these tasks will spread to the newly added rt-cpu. Or new tasks that run in supersets will end up on rt-cpus already in use. But at least we have containment in libvirt and the VMs it spawned. For alloc and free of rt-cpus i am planning to use libvirt hooks to begin with, from what i read they should enable me to do what i need. What do you guys think about the general idea to address the described problem? I will implement a prototype of the alloc-free of rt-cpus. My current hope is that libvirt hooks can be abused for that. I am thinking that at some point libvirt should be able to do that without hooks. It should get a notion of reserved ressources that are currently parked in other cgroups. My current suspicion is that the cpusets might just be the tip of the iceberg. -- for now i am running libvirt without cgroups to keep my isolcpus free cgroups/cpusets offer a switch to make a cpu exclusive to a set. That switch is great because it will act as an assert, a second line of defense. Having seen how cpusets and migration mess around with affinities i guess for realtime people have to insist on that second line of defense. Especially in times where cgroups are all over the place. In openstack one would actually say that a pcpu should be "dedicated". That will result in a vcpupin on exactly one pcpu. Unfortunately one meaning of "dedicated" gets lost in translation. It could otherwise be used by libvirtd to set cpuset.cpu_exclusive in the vcpu-cgroup. And i am bringing that up here because i do not think libvirt allows me to influence the cpu_exclusive flag for my vcpu cgroups. Henning

1 0

[libvirt] libvirt guest-agent-command error
by Vasiliy Tolstov 29 Oct '15

29 Oct '15

Hi. I'm debug some issues with guest-agent inside vm and find this bug, that affected me https://bugzilla.redhat.com/show_bug.cgi?id=1090551 Does anybody knows how to properly fix this ? -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru

2 1

[libvirt] [PATCH] wireshark: Install to generic plugin directory
by Michal Privoznik 29 Oct '15

29 Oct '15

There has been a report on the list [1] that we are not installing the wireshark dissector into the correct plugin directory. And in fact we are not. The problem is, the plugin directory path is constructed at compile time. However, it's dependent on the wireshark version, e.g. /usr/lib/wireshark/1.12.6/plugins/ This is rather unfortunate, because if libvirt RPMs were built with one version, but installed on a system with newer one, the plugins are not really loaded. This problem lead fedora packagers to unify plugin path to: /usr/lib/wireshark/plugins/ Cool! But this was enabled just in wireshark-1.12.6-4. Therefore, we must require at least that version. And while at it, on some distributions, the wireshark.pc file already has a variable that defines where plugin dir is. Use that if possible. 1: https://www.redhat.com/archives/libvirt-users/2015-October/msg00063.html Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- libvirt.spec.in | 6 ++++-- m4/virt-wireshark.m4 | 7 ++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 9dff994..469bfca 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1170,7 +1170,7 @@ virtualization capabilities of recent versions of Linux (and other OSes). %package wireshark Summary: Wireshark dissector plugin for libvirt RPC transactions Group: Development/Libraries -Requires: wireshark +Requires: wireshark >= 1.12.6-4 Requires: %{name}-client = %{version}-%{release} %description wireshark @@ -1561,6 +1561,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/connection-driver/*.a %endif %if %{with_wireshark} rm -f $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/libvirt.la +mv $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/libvirt.so \ + $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/libvirt.so %endif # Temporarily get rid of not-installed libvirt-admin.so @@ -2279,7 +2281,7 @@ exit 0 %if %{with_wireshark} %files wireshark -%{_libdir}/wireshark/plugins/*/libvirt.so +%{_libdir}/wireshark/plugins/libvirt.so %endif %if %{with_lxc} diff --git a/m4/virt-wireshark.m4 b/m4/virt-wireshark.m4 index 47204ed..199317e 100644 --- a/m4/virt-wireshark.m4 +++ b/m4/virt-wireshark.m4 @@ -28,7 +28,12 @@ AC_DEFUN([LIBVIRT_CHECK_WIRESHARK],[ dnl Check for system location of wireshark plugins if test "x$with_wireshark_dissector" != "xno" ; then if test "x$with_ws_plugindir" = "xcheck" ; then - ws_plugindir="$libdir/wireshark/plugins/$($PKG_CONFIG --modversion wireshark)" + ws_plugindir="$($PKG_CONFIG --variable plugindir wireshark)" + if test "x$ws_plugindir" = "x" ; then + dnl On some systems the plugindir variable may not be stored within pkg config. + dnl Fall back to older style of constructing the plugin dir path. + ws_plugindir="$libdir/wireshark/plugins/$($PKG_CONFIG --modversion wireshark)" + fi elif test "x$with_ws_plugindir" = "xno" || test "x$with_ws_plugindir" = "xyes"; then AC_MSG_ERROR([ws-plugindir must be used only with valid path]) else -- 2.4.10

2 1

[libvirt] virsh can't support VM offline blockcommit
by justlibvirt＠gmail.com 29 Oct '15

29 Oct '15

Hi everyone! I use the libvirt(version: 1.2.2) and QEMU(version: 2.2.1) to test qemu snapshot features: I tried virsh blockcommit when VM offline, the virsh blockcommit failed: the error messase as below: error: Requested operation is not valid: domain is not running when I start the VM, the virsh blockcommit work fine! my question is：we need virsh support blockcommit when VM offline。how do？ we test qemu snapshot as follows： we need create snapshot of the cycle，and by virsh blockcommit merge snapshot chain，but when VM offline， the virsh blockcommit will fail， someone suggest me：when VM offline，may use qemu-img commit to submit snapshot turn，but qemu-img can't modify snapshot chain backing relation，it need we use qemu-img rebase amend snapshot‘s backingfile， the main question is when we use qemu-img rebase modify snapshot's backingfile, if someone start the VM, it will may lead to VM filesystem readonly。 we should how to solve the question? thanks! justlibvirt(a)gmail.com

2 3

[libvirt] [PATCH] Remove new lines from debug messages
by Jiri Denemark 29 Oct '15

29 Oct '15

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/nwfilter/nwfilter_gentech_driver.c | 2 +- src/nwfilter/nwfilter_learnipaddr.c | 10 +++++----- src/rpc/virnetsocket.c | 2 +- src/util/virfile.c | 2 +- src/util/virhash.c | 2 +- src/util/virnetdevmacvlan.c | 28 +++++++++++++------------- src/util/virprocess.c | 2 +- src/xen/xend_internal.c | 2 +- tests/virhostdevtest.c | 36 +++++++++++++++++----------------- tests/virnetsockettest.c | 2 +- tests/virtimetest.c | 2 +- 11 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index 701f8d8..5a4cff1 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -540,7 +540,7 @@ virNWFilterDetermineMissingVarsRec(virNWFilterDefPtr filter, if (rc) break; } else if (inc) { - VIR_DEBUG("Following filter %s\n", inc->filterref); + VIR_DEBUG("Following filter %s", inc->filterref); obj = virNWFilterObjFindByName(&driver->nwfilters, inc->filterref); if (obj) { diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c index 5b55055..1adbadb 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -413,7 +413,7 @@ learnIPAddressThread(void *arg) handle = pcap_open_live(listen_if, BUFSIZ, 0, PKT_TIMEOUT_MS, errbuf); if (handle == NULL) { - VIR_DEBUG("Couldn't open device %s: %s\n", listen_if, errbuf); + VIR_DEBUG("Couldn't open device %s: %s", listen_if, errbuf); req->status = ENODEV; goto done; } @@ -448,13 +448,13 @@ learnIPAddressThread(void *arg) filter = virBufferContentAndReset(&buf); if (pcap_compile(handle, &fp, filter, 1, 0) != 0) { - VIR_DEBUG("Couldn't compile filter '%s'.\n", filter); + VIR_DEBUG("Couldn't compile filter '%s'", filter); req->status = EINVAL; goto done; } if (pcap_setfilter(handle, &fp) != 0) { - VIR_DEBUG("Couldn't set filter '%s'.\n", filter); + VIR_DEBUG("Couldn't set filter '%s'", filter); req->status = EINVAL; pcap_freecode(&fp); goto done; @@ -626,7 +626,7 @@ learnIPAddressThread(void *arg) req->filtername, req->filterparams); VIR_DEBUG("Result from applying firewall rules on " - "%s with IP addr %s : %d\n", req->ifname, inetaddr, ret); + "%s with IP addr %s : %d", req->ifname, inetaddr, ret); } } else { if (showError) @@ -638,7 +638,7 @@ learnIPAddressThread(void *arg) techdriver->applyDropAllRules(req->ifname); } - VIR_DEBUG("pcap thread terminating for interface %s\n", req->ifname); + VIR_DEBUG("pcap thread terminating for interface %s", req->ifname); virNWFilterUnlockIface(req->ifname); diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 5e5f1ab..526d291 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -196,7 +196,7 @@ int virNetSocketCheckProtocols(bool *hasIPv4, freeaddrinfo(ai); - VIR_DEBUG("Protocols: v4 %d v6 %d\n", *hasIPv4, *hasIPv6); + VIR_DEBUG("Protocols: v4 %d v6 %d", *hasIPv4, *hasIPv6); ret = 0; cleanup: diff --git a/src/util/virfile.c b/src/util/virfile.c index e5cf2c5..f45e18f 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -681,7 +681,7 @@ static int virFileLoopDeviceOpen(char **dev_name) if (virFileLoopDeviceOpenLoopCtl(dev_name, &loop_fd) < 0) return -1; - VIR_DEBUG("Return from loop-control got fd %d\n", loop_fd); + VIR_DEBUG("Return from loop-control got fd %d", loop_fd); if (loop_fd >= 0) return loop_fd; diff --git a/src/util/virhash.c b/src/util/virhash.c index bc90c44..fab621b 100644 --- a/src/util/virhash.c +++ b/src/util/virhash.c @@ -287,7 +287,7 @@ virHashGrow(virHashTablePtr table, size_t size) VIR_FREE(oldtable); #ifdef DEBUG_GROW - VIR_DEBUG("virHashGrow : from %d to %d, %ld elems\n", oldsize, + VIR_DEBUG("virHashGrow : from %d to %d, %ld elems", oldsize, size, nbElem); #endif diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 89985b8..f85bd3e 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -473,16 +473,16 @@ virNetDevMacVLanVPortProfileCallback(struct nlmsghdr *hdr, case RTM_DELLINK: case RTM_SETLINK: case RTM_GETLINK: - VIR_DEBUG(" IFINFOMSG\n"); - VIR_DEBUG(" ifi_family = 0x%02x\n", + VIR_DEBUG(" IFINFOMSG"); + VIR_DEBUG(" ifi_family = 0x%02x", ((struct ifinfomsg *)data)->ifi_family); - VIR_DEBUG(" ifi_type = 0x%x\n", + VIR_DEBUG(" ifi_type = 0x%x", ((struct ifinfomsg *)data)->ifi_type); - VIR_DEBUG(" ifi_index = %i\n", + VIR_DEBUG(" ifi_index = %i", ((struct ifinfomsg *)data)->ifi_index); - VIR_DEBUG(" ifi_flags = 0x%04x\n", + VIR_DEBUG(" ifi_flags = 0x%04x", ((struct ifinfomsg *)data)->ifi_flags); - VIR_DEBUG(" ifi_change = 0x%04x\n", + VIR_DEBUG(" ifi_change = 0x%04x", ((struct ifinfomsg *)data)->ifi_change); } /* DEBUG end */ @@ -544,29 +544,29 @@ virNetDevMacVLanVPortProfileCallback(struct nlmsghdr *hdr, if (tb[IFLA_IFNAME]) { ifname = (char *)RTA_DATA(tb[IFLA_IFNAME]); - VIR_DEBUG("IFLA_IFNAME = %s\n", ifname); + VIR_DEBUG("IFLA_IFNAME = %s", ifname); } if (tb[IFLA_OPERSTATE]) { rem = *(unsigned short *)RTA_DATA(tb[IFLA_OPERSTATE]); - VIR_DEBUG("IFLA_OPERSTATE = %d\n", rem); + VIR_DEBUG("IFLA_OPERSTATE = %d", rem); } if (tb[IFLA_VF_PORTS]) { struct nlattr *tb_vf_ports; - VIR_DEBUG("found IFLA_VF_PORTS\n"); + VIR_DEBUG("found IFLA_VF_PORTS"); nla_for_each_nested(tb_vf_ports, tb[IFLA_VF_PORTS], rem) { - VIR_DEBUG("iterating\n"); + VIR_DEBUG("iterating"); if (nla_type(tb_vf_ports) != IFLA_VF_PORT) { - VIR_DEBUG("not a IFLA_VF_PORT. skipping\n"); + VIR_DEBUG("not a IFLA_VF_PORT. skipping"); continue; } if (nla_parse_nested(tb3, IFLA_PORT_MAX, tb_vf_ports, ifla_port_policy)) { VIR_DEBUG("nested parsing on level 2" - " failed."); + " failed"); } if (tb3[IFLA_PORT_VF]) { VIR_DEBUG("IFLA_PORT_VF = %d", @@ -600,7 +600,7 @@ virNetDevMacVLanVPortProfileCallback(struct nlmsghdr *hdr, uuid = (unsigned char *) RTA_DATA(tb3[IFLA_PORT_INSTANCE_UUID]); instance2str(uuid, instance, sizeof(instance)); - VIR_DEBUG("IFLA_PORT_INSTANCE_UUID = %s\n", + VIR_DEBUG("IFLA_PORT_INSTANCE_UUID = %s", instance); } @@ -615,7 +615,7 @@ virNetDevMacVLanVPortProfileCallback(struct nlmsghdr *hdr, } if (tb3[IFLA_PORT_RESPONSE]) { - VIR_DEBUG("IFLA_PORT_RESPONSE = %d\n", *(uint16_t *) + VIR_DEBUG("IFLA_PORT_RESPONSE = %d", *(uint16_t *) RTA_DATA(tb3[IFLA_PORT_RESPONSE])); } } diff --git a/src/util/virprocess.c b/src/util/virprocess.c index e6b78ef..d2bf360 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -407,7 +407,7 @@ virProcessKillPainfully(pid_t pid, bool force) int virProcessSetAffinity(pid_t pid, virBitmapPtr map) { size_t i; - VIR_DEBUG("Set process affinity on %lld\n", (long long)pid); + VIR_DEBUG("Set process affinity on %lld", (long long)pid); # ifdef CPU_ALLOC /* New method dynamically allocates cpu mask, allowing unlimted cpus */ int numcpus = 1024; diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index 62ce930..21d99e3 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -507,7 +507,7 @@ xend_op_ext(virConnectPtr xend, const char *path, const char *key, va_list ap) return -1; content = virBufferContentAndReset(&buf); - VIR_DEBUG("xend op: %s\n", content); + VIR_DEBUG("xend op: %s", content); ret = http2unix(xend_post(xend, path, content)); VIR_FREE(content); diff --git a/tests/virhostdevtest.c b/tests/virhostdevtest.c index 065b825..faebdd4 100644 --- a/tests/virhostdevtest.c +++ b/tests/virhostdevtest.c @@ -169,14 +169,14 @@ testVirHostdevPreparePCIHostdevs_unmanaged(const void *oaque ATTRIBUTE_UNUSED) count2 = virPCIDeviceListCount(mgr->inactivePCIHostdevs); /* Test normal functionality */ - VIR_DEBUG("Test 0 hostdevs\n"); + VIR_DEBUG("Test 0 hostdevs"); if (virHostdevPreparePCIDevices(mgr, drv_name, dom_name, uuid, NULL, 0, 0) < 0) goto cleanup; CHECK_LIST_COUNT(mgr->activePCIHostdevs, count1); /* Test unmanaged hostdevs */ - VIR_DEBUG("Test >=1 unmanaged hostdevs\n"); + VIR_DEBUG("Test >=1 unmanaged hostdevs"); if (virHostdevPreparePCIDevices(mgr, drv_name, dom_name, uuid, hostdevs, nhostdevs, 0) < 0) goto cleanup; @@ -186,21 +186,21 @@ testVirHostdevPreparePCIHostdevs_unmanaged(const void *oaque ATTRIBUTE_UNUSED) /* Test conflict */ count1 = virPCIDeviceListCount(mgr->activePCIHostdevs); count2 = virPCIDeviceListCount(mgr->inactivePCIHostdevs); - VIR_DEBUG("Test: prepare same hostdevs for same driver/domain again\n"); + VIR_DEBUG("Test: prepare same hostdevs for same driver/domain again"); if (!virHostdevPreparePCIDevices(mgr, drv_name, dom_name, uuid, &hostdevs[0], 1, 0)) goto cleanup; CHECK_LIST_COUNT(mgr->activePCIHostdevs, count1); CHECK_LIST_COUNT(mgr->inactivePCIHostdevs, count2); - VIR_DEBUG("Test: prepare same hostdevs for same driver, diff domain again\n"); + VIR_DEBUG("Test: prepare same hostdevs for same driver, diff domain again"); if (!virHostdevPreparePCIDevices(mgr, drv_name, "test_domain1", uuid, &hostdevs[1], 1, 0)) goto cleanup; CHECK_LIST_COUNT(mgr->activePCIHostdevs, count1); CHECK_LIST_COUNT(mgr->inactivePCIHostdevs, count2); - VIR_DEBUG("Test: prepare same hostdevs for diff driver/domain again\n"); + VIR_DEBUG("Test: prepare same hostdevs for diff driver/domain again"); if (!virHostdevPreparePCIDevices(mgr, "test_driver1", dom_name, uuid, &hostdevs[2], 1, 0)) goto cleanup; @@ -223,7 +223,7 @@ testVirHostdevReAttachPCIHostdevs_unmanaged(const void *oaque ATTRIBUTE_UNUSED) for (i = 0; i < nhostdevs; i++) { if (hostdevs[i]->managed != false) { - VIR_DEBUG("invalid test\n"); + VIR_DEBUG("invalid test"); return -1; } } @@ -231,11 +231,11 @@ testVirHostdevReAttachPCIHostdevs_unmanaged(const void *oaque ATTRIBUTE_UNUSED) count1 = virPCIDeviceListCount(mgr->activePCIHostdevs); count2 = virPCIDeviceListCount(mgr->inactivePCIHostdevs); - VIR_DEBUG("Test 0 hostdevs\n"); + VIR_DEBUG("Test 0 hostdevs"); virHostdevReAttachPCIDevices(mgr, drv_name, dom_name, NULL, 0, NULL); CHECK_LIST_COUNT(mgr->activePCIHostdevs, count1); - VIR_DEBUG("Test >=1 unmanaged hostdevs\n"); + VIR_DEBUG("Test >=1 unmanaged hostdevs"); virHostdevReAttachPCIDevices(mgr, drv_name, dom_name, hostdevs, nhostdevs, NULL); CHECK_LIST_COUNT(mgr->activePCIHostdevs, count1 - 3); @@ -261,7 +261,7 @@ testVirHostdevPreparePCIHostdevs_managed(const void *oaque ATTRIBUTE_UNUSED) count1 = virPCIDeviceListCount(mgr->activePCIHostdevs); /* Test normal functionality */ - VIR_DEBUG("Test >=1 hostdevs\n"); + VIR_DEBUG("Test >=1 hostdevs"); if (virHostdevPreparePCIDevices(mgr, drv_name, dom_name, uuid, hostdevs, nhostdevs, 0) < 0) goto cleanup; @@ -269,19 +269,19 @@ testVirHostdevPreparePCIHostdevs_managed(const void *oaque ATTRIBUTE_UNUSED) /* Test conflict */ count1 = virPCIDeviceListCount(mgr->activePCIHostdevs); - VIR_DEBUG("Test: prepare same hostdevs for same driver/domain again\n"); + VIR_DEBUG("Test: prepare same hostdevs for same driver/domain again"); if (!virHostdevPreparePCIDevices(mgr, drv_name, dom_name, uuid, &hostdevs[0], 1, 0)) goto cleanup; CHECK_LIST_COUNT(mgr->activePCIHostdevs, count1); - VIR_DEBUG("Test: prepare same hostdevs for same driver, diff domain again\n"); + VIR_DEBUG("Test: prepare same hostdevs for same driver, diff domain again"); if (!virHostdevPreparePCIDevices(mgr, drv_name, "test_domain1", uuid, &hostdevs[1], 1, 0)) goto cleanup; CHECK_LIST_COUNT(mgr->activePCIHostdevs, count1); - VIR_DEBUG("Test: prepare same hostdevs for diff driver/domain again\n"); + VIR_DEBUG("Test: prepare same hostdevs for diff driver/domain again"); if (!virHostdevPreparePCIDevices(mgr, "test_driver1", dom_name, uuid, &hostdevs[2], 1, 0)) goto cleanup; @@ -303,18 +303,18 @@ testVirHostdevReAttachPCIHostdevs_managed(const void *oaque ATTRIBUTE_UNUSED) for (i = 0; i < nhostdevs; i++) { if (hostdevs[i]->managed != true) { - VIR_DEBUG("invalid test\n"); + VIR_DEBUG("invalid test"); return -1; } } count1 = virPCIDeviceListCount(mgr->activePCIHostdevs); - VIR_DEBUG("Test 0 hostdevs\n"); + VIR_DEBUG("Test 0 hostdevs"); virHostdevReAttachPCIDevices(mgr, drv_name, dom_name, NULL, 0, NULL); CHECK_LIST_COUNT(mgr->activePCIHostdevs, count1); - VIR_DEBUG("Test >=1 hostdevs\n"); + VIR_DEBUG("Test >=1 hostdevs"); virHostdevReAttachPCIDevices(mgr, drv_name, dom_name, hostdevs, nhostdevs, NULL); CHECK_LIST_COUNT(mgr->activePCIHostdevs, count1 - 3); @@ -392,13 +392,13 @@ testVirHostdevUpdateActivePCIHostdevs(const void *oaque ATTRIBUTE_UNUSED) count1 = virPCIDeviceListCount(mgr->activePCIHostdevs); - VIR_DEBUG("Test 0 hostdevs\n"); + VIR_DEBUG("Test 0 hostdevs"); if (virHostdevUpdateActivePCIDevices(mgr, NULL, 0, drv_name, dom_name) < 0) goto cleanup; CHECK_LIST_COUNT(mgr->activePCIHostdevs, count1); - VIR_DEBUG("Test >=1 hostdevs\n"); + VIR_DEBUG("Test >=1 hostdevs"); if (virHostdevUpdateActivePCIDevices(mgr, hostdevs, nhostdevs, drv_name, dom_name) < 0) goto cleanup; @@ -432,7 +432,7 @@ mymain(void) # define DO_TEST(fnc) \ do { \ - VIR_DEBUG("\nTesting: %s", #fnc); \ + VIR_DEBUG("Testing: %s", #fnc); \ if (virtTestRun(#fnc, fnc, NULL) < 0) \ ret = -1; \ } while (0) diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c index ce9eeab..5786870 100644 --- a/tests/virnetsockettest.c +++ b/tests/virnetsockettest.c @@ -105,7 +105,7 @@ checkProtocols(bool *hasIPv4, bool *hasIPv6, break; } - VIR_DEBUG("Choose port %d\n", *freePort); + VIR_DEBUG("Choose port %d", *freePort); ret = 0; diff --git a/tests/virtimetest.c b/tests/virtimetest.c index 9ab38ae..49040d3 100644 --- a/tests/virtimetest.c +++ b/tests/virtimetest.c @@ -92,7 +92,7 @@ testTimeLocalOffset(const void *args) return -1; if (data->offset != actual) { - VIR_DEBUG("Expect Offset %ld got %ld\n", + VIR_DEBUG("Expect Offset %ld got %ld", data->offset, actual); return -1; } -- 2.6.2

2 3

[libvirt] [libvirt-test-api][PATCH] Add config flag when calling setVcpusFlags with maximum flag
by Hongming Zhang 29 Oct '15

29 Oct '15

Flag 'VIR_DOMAIN_AFFECT_CONFIG' is required by flag 'VIR_DOMAIN_VCPU_MAXIMUM' modified: set_vcpus_config.py --- repos/setVcpus/set_vcpus_config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repos/setVcpus/set_vcpus_config.py b/repos/setVcpus/set_vcpus_config.py index 3bb3984..3ef0992 100644 --- a/repos/setVcpus/set_vcpus_config.py +++ b/repos/setVcpus/set_vcpus_config.py @@ -80,7 +80,7 @@ def set_vcpus_config(params): return 1 if maxvcpu: - flags = libvirt.VIR_DOMAIN_VCPU_MAXIMUM + flags = libvirt.VIR_DOMAIN_VCPU_MAXIMUM|libvirt.VIR_DOMAIN_AFFECT_CONFIG logger.info("the given max vcpu number is %s" % maxvcpu) logger.info("set domain maximum vcpu as %s with flag: %s" % (maxvcpu, flags)) -- 1.9.3

2 1

[libvirt] [libvirt-test-api][PATCH 0/2]Fix issues in the method of getting vcpu thread id of vcpupin_live and cpu_affinity
by Hongming Zhang 29 Oct '15

29 Oct '15

Hongming Zhang (2): Fix the issues in checking method of vcpupin_live Modify the checking method via passing the vcpu thread id repos/domain/cpu_affinity.py | 16 +++++++++------- repos/setVcpus/vcpupin_live.py | 36 ++++++++++++++++++++---------------- 2 files changed, 29 insertions(+), 23 deletions(-) -- 1.9.3

2 3

[libvirt] [PATCH] Fix virNetDevWaitDadFinish stub
by Roman Bogorodskiy 29 Oct '15

29 Oct '15

Build on non-Linux fails because the virNetDevWaitDadFinish() stub has unused parameters. Fix by adding appropriate ATTRIBUTE_UNUSED for these parameters. Pushing under build-breaker rule. --- src/util/virnetdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index b84437e..9789e93 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -1527,7 +1527,8 @@ int virNetDevClearIPAddress(const char *ifname, /* return after DAD finishes for all known IPv6 addresses or an error */ int -virNetDevWaitDadFinish(virSocketAddrPtr *addrs, size_t count) +virNetDevWaitDadFinish(virSocketAddrPtr *addrs ATTRIBUTE_UNUSED, + size_t count ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Unable to wait for IPv6 DAD on this platform")); -- 2.4.6

1 0

[libvirt] [PATCH] util: remove unnecessary code to avoid error overwrite
by Luyao Huang 29 Oct '15

29 Oct '15

virCgroupRemove use VIR_ERROR to log the error and won't change the virLastErr in the thread, so no need do this. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/util/vircgroup.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 0379c2e..a120a15 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -1670,13 +1670,8 @@ virCgroupNewMachineSystemd(const char *name, } if (virCgroupAddTask(*group, pidleader) < 0) { - virErrorPtr saved = virSaveLastError(); virCgroupRemove(*group); virCgroupFree(group); - if (saved) { - virSetError(saved); - virFreeError(saved); - } } ret = 0; @@ -1728,13 +1723,8 @@ virCgroupNewMachineManual(const char *name, goto cleanup; if (virCgroupAddTask(*group, pidleader) < 0) { - virErrorPtr saved = virSaveLastError(); virCgroupRemove(*group); virCgroupFree(group); - if (saved) { - virSetError(saved); - virFreeError(saved); - } } done: -- 1.8.3.1

3 2

[libvirt] [PATCH] qemu: fix wrong nodeset info when numatune placement is auto
by Luyao Huang 29 Oct '15

29 Oct '15

https://bugzilla.redhat.com/show_bug.cgi?id=1270715 Since commit 9deb96f remove check the nodeset from cgroup for a running vm, the numatune nodeset reporting for those guest numatune placement is auto is not right. Pass the autonodeset to virDomainNumatuneFormatNodeset() to fix this. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_driver.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8cd5ee3..8ca55dd 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10177,6 +10177,7 @@ qemuDomainGetNumaParameters(virDomainPtr dom, size_t i; virDomainObjPtr vm = NULL; virDomainNumatuneMemMode tmpmode = VIR_DOMAIN_NUMATUNE_MEM_STRICT; + qemuDomainObjPrivatePtr priv; char *nodeset = NULL; int ret = -1; virDomainDefPtr def = NULL; @@ -10187,6 +10188,7 @@ qemuDomainGetNumaParameters(virDomainPtr dom, if (!(vm = qemuDomObjFromDomain(dom))) return -1; + priv = vm->privateData; if (virDomainGetNumaParametersEnsureACL(dom->conn, vm->def) < 0) goto cleanup; @@ -10214,7 +10216,8 @@ qemuDomainGetNumaParameters(virDomainPtr dom, break; case 1: /* fill numa nodeset here */ - nodeset = virDomainNumatuneFormatNodeset(def->numa, NULL, -1); + nodeset = virDomainNumatuneFormatNodeset(def->numa, + priv->autoNodeset, -1); if (!nodeset || virTypedParameterAssign(param, VIR_DOMAIN_NUMA_NODESET, VIR_TYPED_PARAM_STRING, nodeset) < 0) -- 1.8.3.1

3 2

[libvirt] [PATCHv4 0/2] Added waiting for DAD to finish for bridge address.
by Maxim Perevedentsev 29 Oct '15

29 Oct '15

This is a fix for commit db488c79173b240459c7754f38c3c6af9b432970 dnsmasq main process which is relied on when waiting for DAD to complete exits without actually waiting for DAD. This is dnsmasq daemon's task. It seems to be a race that DAD finished before dnsmasq main process exited. The above commit needs the execution to block until DAD finishes for bridge IPv6 address because then it closes dummy tap device. Thus we need to ensure this ourselves. So we periodically poll the kernel using netlink and check whether there are any IPv6 addresses assigned to bridge which have 'tentative' state. After DAD is finished, execution continues. I guess that is what dnsmasq was assumed to do. We use netlink to dump information about existing IPv6 addresses. Netlink's response is a multi-part message. Unfortunately, the current implementation of virNetlink treats such messages as faulty and throws an error. So the patch 2/2 adds multi-part nelink response support. Update v2: fixed syntax. Update v3: moved to virnetdev. Update v4: added DAD timeout, minor fixes. Maxim Perevedentsev (2): network: added waiting for DAD to finish for bridge address. netlink: add support for multi-part netlink messages. src/libvirt_private.syms | 1 + src/network/bridge_driver.c | 34 +++++++++++++- src/util/virnetdev.c | 110 ++++++++++++++++++++++++++++++++++++++++++++ src/util/virnetdev.h | 2 + src/util/virnetlink.c | 4 +- 5 files changed, 149 insertions(+), 2 deletions(-) -- 1.8.3.1

2 4

[libvirt] [libvirt-glib] gobject: Add wrapper virDomainSetTime()
by Zeeshan Ali (Khattak) 28 Oct '15

28 Oct '15

--- libvirt-gobject/libvirt-gobject-domain.c | 126 +++++++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-domain.h | 25 ++++++ libvirt-gobject/libvirt-gobject.sym | 9 +++ 3 files changed, 160 insertions(+) diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index 34eb7ca..26d0cba 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -1886,3 +1886,129 @@ gboolean gvir_domain_get_has_current_snapshot(GVirDomain *dom, return TRUE; } + +/** + * gvir_domain_set_time: + * @dom: the domain + * @seconds: The seconds since Epoch in UTC. + * @nseconds: The microseconds. + * @flags: bitwise-OR of #GVirDomainSetTimeFlags. + * + * This function tries to set guest time to the given value. The time to set + * (@seconds and @nseconds) should be in seconds relative to the Epoch of + * 1970-01-01 00:00:00 in UTC. + * + * If you pass #GVIR_DOMAIN_TIME_SYNC as @flags, the time is reset using + * domain's RTC and @seconds and @nseconds arguments are ignored. + * + * Please note that some hypervisors may require guest agent to be configured + * and running in order for this function to work. + */ +gboolean gvir_domain_set_time(GVirDomain *dom, + gint64 seconds, + guint nseconds, + guint flags, + GError **err) +{ + GVirDomainPrivate *priv; + int ret; + + g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); + g_return_val_if_fail(flags == 0 || flags & GVIR_DOMAIN_TIME_SYNC, FALSE); + + priv = dom->priv; + ret = virDomainSetTime(priv->handle, seconds, nseconds, flags); + if (ret < 0) { + gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, + 0, + "Unable to set domain time"); + return FALSE; + } + + return TRUE; +} + +typedef struct { + gint64 seconds; + guint nseconds; + guint flags; +} DomainSetTimeData; + +static void domain_set_time_data_free(DomainSetTimeData *data) +{ + g_slice_free(DomainSetTimeData, data); +} + +static void +gvir_domain_set_time_helper(GTask *task, + gpointer object, + gpointer task_data, + GCancellable *cancellable G_GNUC_UNUSED) +{ + GVirDomain *dom = GVIR_DOMAIN(object); + DomainSetTimeData *data = (DomainSetTimeData *) task_data; + GError *err = NULL; + + if (!gvir_domain_set_time(dom, + data->seconds, + data->nseconds, + data->flags, + &err)) + g_task_return_error(task, err); + else + g_task_return_boolean(task, TRUE); +} + +/** + * gvir_domain_set_time_async: + * @dom: the domain + * @dom: the domain + * @seconds: The seconds since Epoch in UTC. + * @nseconds: The microseconds. + * @flags: bitwise-OR of #GVirDomainSetTimeFlags. + * @cancellable: (allow-none)(transfer none): cancellation object + * @callback: (scope async): completion callback + * @user_data: (closure): opaque data for callback + * + * Asynchronous variant of #gvir_domain_set_time. + */ +void gvir_domain_set_time_async(GVirDomain *dom, + gint64 seconds, + guint nseconds, + guint flags, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GTask *task; + DomainSetTimeData *data; + + g_return_if_fail(GVIR_IS_DOMAIN(dom)); + g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); + + data = g_slice_new0(DomainSetTimeData); + data->seconds = seconds; + data->nseconds = nseconds; + data->flags = flags; + + task = g_task_new (G_OBJECT(dom), + cancellable, + callback, + user_data); + g_task_set_task_data (task, data, (GDestroyNotify)domain_set_time_data_free); + g_task_run_in_thread(task, gvir_domain_set_time_helper); + + g_object_unref(task); +} + +gboolean gvir_domain_set_time_finish(GVirDomain *dom, + GAsyncResult *result, + GError **err) +{ + g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); + g_return_val_if_fail(g_task_is_valid(result, G_OBJECT(dom)), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); + + return g_task_propagate_boolean(G_TASK(result), err); +} diff --git a/libvirt-gobject/libvirt-gobject-domain.h b/libvirt-gobject/libvirt-gobject-domain.h index 4fe381e..fbf7173 100644 --- a/libvirt-gobject/libvirt-gobject-domain.h +++ b/libvirt-gobject/libvirt-gobject-domain.h @@ -215,6 +215,15 @@ typedef enum { GVIR_DOMAIN_SNAPSHOT_LIST_EXTERNAL = VIR_DOMAIN_SNAPSHOT_LIST_EXTERNAL } GVirDomainSnapshotListFlags; +/** + * GVirDomainSetTimeFlags: + * @GVIR_DOMAIN_TIME_NONE: Re-sync domain time to given values. + * @GVIR_DOMAIN_TIME_SYNC: Re-sync domain time from domain's RTC. + */ +typedef enum { + GVIR_DOMAIN_TIME_NONE = 0, + GVIR_DOMAIN_TIME_SYNC = VIR_DOMAIN_TIME_SYNC, +} GVirDomainSetTimeFlags; typedef struct _GVirDomainInfo GVirDomainInfo; struct _GVirDomainInfo @@ -401,6 +410,22 @@ gboolean gvir_domain_get_has_current_snapshot(GVirDomain *dom, gboolean *has_current_snapshot, GError **error); +gboolean gvir_domain_set_time(GVirDomain *dom, + gint64 seconds, + guint nseconds, + guint flags, + GError **err); +void gvir_domain_set_time_async(GVirDomain *dom, + gint64 seconds, + guint nseconds, + guint flags, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +gboolean gvir_domain_set_time_finish(GVirDomain *dom, + GAsyncResult *result, + GError **err); + G_END_DECLS #endif /* __LIBVIRT_GOBJECT_DOMAIN_H__ */ diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index ca89a45..cbfaa71 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -304,4 +304,13 @@ LIBVIRT_GOBJECT_0.2.2 { gvir_network_get_dhcp_leases; } LIBVIRT_GOBJECT_0.2.1; +LIBVIRT_GOBJECT_0.2.3 { + global: + gvir_domain_set_time_flags_get_type; + + gvir_domain_set_time; + gvir_domain_set_time_async; + gvir_domain_set_time_finish; +} LIBVIRT_GOBJECT_0.2.2; + # .... define new API here using predicted next version number .... -- 2.5.0

2 3

[libvirt] [PATCH] Use correct pci addresses during device-detach
by Nitesh_Konkar 28 Oct '15

28 Oct '15

From: Nitesh_Konkar <niteshkonkar(a)in.ibm.com> The attach-device on live and persistent copies can be done independently. Thus devices can end up having different pci addresses in live and persistent copies. The detach device should try to detach the device from their respective addresses instead of using the same from live/persistent. Signed-off-by:nitkon12@linux.vnet.ibm.com --- src/driver-nodedev.h | 1 + src/qemu/qemu_driver.c | 25 ++++++++++--------------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/src/driver-nodedev.h b/src/driver-nodedev.h index e846612..dea79bd 100644 --- a/src/driver-nodedev.h +++ b/src/driver-nodedev.h @@ -59,6 +59,7 @@ typedef char * typedef char * (*virDrvNodeDeviceGetParent)(virNodeDevicePtr dev); + typedef int (*virDrvNodeDeviceNumOfCaps)(virNodeDevicePtr dev); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f133b45..6fd58c2 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8708,23 +8708,12 @@ static int qemuDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, !(flags & VIR_DOMAIN_AFFECT_LIVE)) parse_flags |= VIR_DOMAIN_DEF_PARSE_INACTIVE; - dev = dev_copy = virDomainDeviceDefParse(xml, vm->def, + dev_copy = virDomainDeviceDefParse(xml, vm->def, caps, driver->xmlopt, parse_flags); - if (dev == NULL) + if (dev_copy == NULL) goto endjob; - if (flags & VIR_DOMAIN_AFFECT_CONFIG && - flags & VIR_DOMAIN_AFFECT_LIVE) { - /* If we are affecting both CONFIG and LIVE - * create a deep copy of device as adding - * to CONFIG takes one instance. - */ - dev_copy = virDomainDeviceDefCopy(dev, vm->def, caps, driver->xmlopt); - if (!dev_copy) - goto endjob; - } - if (priv->qemuCaps) qemuCaps = virObjectRef(priv->qemuCaps); else if (!(qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, vm->def->emulator))) @@ -8736,6 +8725,13 @@ static int qemuDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, if (!vmdef) goto endjob; + dev = virDomainDeviceDefParse(xml, vmdef, + caps, driver->xmlopt, + parse_flags); + if (!dev) + goto endjob; + + if (virDomainDefCompatibleDevice(vmdef, dev, VIR_DOMAIN_DEVICE_ACTION_DETACH) < 0) goto endjob; @@ -8777,8 +8773,7 @@ static int qemuDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, cleanup: virObjectUnref(qemuCaps); virDomainDefFree(vmdef); - if (dev != dev_copy) - virDomainDeviceDefFree(dev_copy); + virDomainDeviceDefFree(dev_copy); virDomainDeviceDefFree(dev); virDomainObjEndAPI(&vm); virObjectUnref(caps); -- 2.4.0

2 1

[libvirt] [PATCH] qemu: fix migration flags undefinesource cannot work
by Luyao Huang 28 Oct '15

28 Oct '15

In commit f41be296, we moved vm->persistent check into qemuDomainRemoveInactive, but we didn't change the vm->persistent before call qemuDomainRemoveInactive in some place before and just call it to remove the inactive vm. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_migration.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index b53491a..2abf2ee 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -3912,8 +3912,10 @@ qemuMigrationConfirm(virConnectPtr conn, qemuMigrationJobFinish(driver, vm); if (!virDomainObjIsActive(vm)) { - if (flags & VIR_MIGRATE_UNDEFINE_SOURCE) + if (flags & VIR_MIGRATE_UNDEFINE_SOURCE) { virDomainDeleteConfig(cfg->configDir, cfg->autostartDir, vm); + vm->persistent = 0; + } qemuDomainRemoveInactive(driver, vm); } @@ -5405,8 +5407,10 @@ qemuMigrationPerformJob(virQEMUDriverPtr driver, qemuMigrationJobFinish(driver, vm); if (!virDomainObjIsActive(vm) && ret == 0) { - if (flags & VIR_MIGRATE_UNDEFINE_SOURCE) + if (flags & VIR_MIGRATE_UNDEFINE_SOURCE) { virDomainDeleteConfig(cfg->configDir, cfg->autostartDir, vm); + vm->persistent = 0; + } qemuDomainRemoveInactive(driver, vm); } -- 1.8.3.1

3 4

[libvirt] [PATCH] conf: Add serial target type to ABI stability check
by Luyao Huang 28 Oct '15

28 Oct '15

https://bugzilla.redhat.com/show_bug.cgi?id=1273686 There is no ABI check for serial target type attribute, just add it. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/conf/domain_conf.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 02cc8ad..a31bc05 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -17225,6 +17225,14 @@ static bool virDomainSerialDefCheckABIStability(virDomainChrDefPtr src, virDomainChrDefPtr dst) { + if (src->targetType != dst->targetType) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target serial type %s does not match source %s"), + virDomainChrSerialTargetTypeToString(dst->targetType), + virDomainChrSerialTargetTypeToString(src->targetType)); + return false; + } + if (src->target.port != dst->target.port) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target serial port %d does not match source %d"), -- 1.8.3.1

3 2

[libvirt] [PATCH] rbd: Remove snapshots if the FORCED flag has been provided
by Wido den Hollander 27 Oct '15

27 Oct '15

When a RBD volume has snapshots it can not be removed. This patch introduces a new flag to force volume removal, VIR_STORAGE_VOL_DELETE_FORCED. With this flag any existing snapshots will be removed prior to removing the volume. No existing mechanism in libvirt allowed us to pass such information, so that's why a new flag was introduced. Signed-off-by: Wido den Hollander <wido(a)widodh.nl> --- include/libvirt/libvirt-storage.h | 1 + src/storage/storage_backend_rbd.c | 58 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/include/libvirt/libvirt-storage.h b/include/libvirt/libvirt-storage.h index 453089e..36ff979 100644 --- a/include/libvirt/libvirt-storage.h +++ b/include/libvirt/libvirt-storage.h @@ -115,6 +115,7 @@ typedef enum { typedef enum { VIR_STORAGE_VOL_DELETE_NORMAL = 0, /* Delete metadata only (fast) */ VIR_STORAGE_VOL_DELETE_ZEROED = 1 << 0, /* Clear all data to zeros (slow) */ + VIR_STORAGE_VOL_DELETE_FORCED = 2, /* Force removal of volume, even if in use */ } virStorageVolDeleteFlags; typedef enum { diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index ac5085a..ca5e802 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -428,9 +428,13 @@ static int virStorageBackendRBDDeleteVol(virConnectPtr conn, { int ret = -1; int r = 0; + int max_snaps = 128; + int i, snap_count, protected; virStorageBackendRBDState ptr; ptr.cluster = NULL; ptr.ioctx = NULL; + rbd_snap_info_t *snaps; + rbd_image_t image = NULL; VIR_DEBUG("Removing RBD image %s/%s", pool->def->source.name, vol->name); @@ -443,6 +447,59 @@ static int virStorageBackendRBDDeleteVol(virConnectPtr conn, if (virStorageBackendRBDOpenIoCTX(&ptr, pool) < 0) goto cleanup; + r = rbd_open(ptr.ioctx, vol->name, &image, NULL); + if (r < 0) { + virReportSystemError(-r, _("failed to open the RBD image '%s'"), + vol->name); + goto cleanup; + } + + do { + if (VIR_ALLOC_N(snaps, max_snaps)) + goto cleanup; + + snap_count = rbd_snap_list(image, snaps, &max_snaps); + if (snap_count <= 0) { + VIR_FREE(snaps); + } + } while (snap_count == -ERANGE); + + VIR_DEBUG("Found %d snapshots for volume %s/%s", snap_count, + pool->def->source.name, vol->name); + + if (snap_count > 0 && (flags & VIR_STORAGE_VOL_DELETE_FORCED)) { + for (i = 0; i < snap_count; i++) { + if (rbd_snap_is_protected(image, snaps[i].name, &protected)) + goto cleanup; + + if (protected == 1) { + VIR_DEBUG("Snapshot %s/%s@%s is protected needs to be " + "unprotected", pool->def->source.name, vol->name, + snaps[i].name); + + if (rbd_snap_unprotect(image, snaps[i].name) < 0) + goto cleanup; + } + + VIR_DEBUG("Removing snapshot %s/%s@%s", pool->def->source.name, + vol->name, snaps[i].name); + + if (rbd_snap_remove(image, snaps[i].name) < 0) { + virReportSystemError(-r, _("failed to remove snapshot '%s/%s@%s'"), + pool->def->source.name, vol->name, + snaps[i].name); + goto cleanup; + } + } + + rbd_snap_list_end(snaps); + } + + if (rbd_close(image) < 0) + goto cleanup; + + VIR_DEBUG("Removing volume %s/%s", pool->def->source.name, vol->name); + r = rbd_remove(ptr.ioctx, vol->name); if (r < 0 && (-r) != ENOENT) { virReportSystemError(-r, _("failed to remove volume '%s/%s'"), @@ -453,6 +510,7 @@ static int virStorageBackendRBDDeleteVol(virConnectPtr conn, ret = 0; cleanup: + VIR_FREE(snaps); virStorageBackendRBDCloseRADOSConn(&ptr); return ret; } -- 1.9.1

3 9

[libvirt] Plan for next release
by Daniel Veillard 27 Oct '15

27 Oct '15

I'm a bit late, sorry, but I think we should freeze on Thursday for the next release, and then shoot for middle of next week for the actual release, I hope this last moment warning isn't a problem, 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 0

[libvirt] [PATCH] util: implement virProcessGetStartTime on GNU/kFreeBSD
by Pino Toscano 27 Oct '15

27 Oct '15

Use the virProcessGetStartTime implementation also when only the kernel is FreeBSD, such as on GNU/kFreeBSD. --- src/util/virprocess.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index e6b78ef..43118f8 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -36,11 +36,11 @@ # include <sched.h> #endif -#if defined(__FreeBSD__) || HAVE_BSD_CPU_AFFINITY +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || HAVE_BSD_CPU_AFFINITY # include <sys/param.h> #endif -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) # include <sys/sysctl.h> # include <sys/user.h> #endif @@ -937,7 +937,7 @@ int virProcessGetStartTime(pid_t pid, VIR_FREE(buf); return ret; } -#elif defined(__FreeBSD__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) int virProcessGetStartTime(pid_t pid, unsigned long long *timestamp) { -- 2.1.0

4 5

[libvirt] [PATCH] bhyve: implement domainGetOSType
by Roman Bogorodskiy 27 Oct '15

27 Oct '15

--- src/bhyve/bhyve_driver.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index d44cf2c..efba0ae 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -465,6 +465,27 @@ bhyveDomainIsPersistent(virDomainPtr domain) } static char * +bhyveDomainGetOSType(virDomainPtr dom) +{ + virDomainObjPtr vm; + char *ret = NULL; + + if (!(vm = bhyveDomObjFromDomain(dom))) + goto cleanup; + + if (virDomainGetOSTypeEnsureACL(dom->conn, vm->def) < 0) + goto cleanup; + + if (VIR_STRDUP(ret, virDomainOSTypeToString(vm->def->os.type)) < 0) + goto cleanup; + + cleanup: + if (vm) + virObjectUnlock(vm); + return ret; +} + +static char * bhyveDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) { virDomainObjPtr vm; @@ -1487,6 +1508,7 @@ static virHypervisorDriver bhyveHypervisorDriver = { .domainDefineXML = bhyveDomainDefineXML, /* 1.2.2 */ .domainDefineXMLFlags = bhyveDomainDefineXMLFlags, /* 1.2.12 */ .domainUndefine = bhyveDomainUndefine, /* 1.2.2 */ + .domainGetOSType = bhyveDomainGetOSType, /* 1.2.21 */ .domainGetXMLDesc = bhyveDomainGetXMLDesc, /* 1.2.2 */ .domainIsActive = bhyveDomainIsActive, /* 1.2.2 */ .domainIsPersistent = bhyveDomainIsPersistent, /* 1.2.2 */ -- 2.6.1

2 2

[libvirt] [PATCH] qemu: Resolve agent deadlock
by John Ferlan 27 Oct '15

27 Oct '15

If we have a shutdown of a VM by a qemu agent while an agent EOF occurs at relatively the same time, it's possible that a deadlock occurs depending on what happens first. Assume qemuProcessHandleAgentEOF runs first, with the vm->lock it clears priv->agent, then clears the vm->lock. After some agent call such as qemuDomainShutdownFlags will call qemuDomainObjExitAgent in a worker thread with the agent lock. It will then reference the priv->agent field: hasRefs = virObjectUnref(priv->agent); in order to determine whether there are references. However, since priv->agent is NULL, this returns false, so the subsquent: if (hasRefs) virObjectUnlock(priv->agent); will not unlock the agent. Eventually the EOF thread will attempt to call qemuAgentClose which will try to lock the agent, but cannot since it's still locked. This patch resolves this issue by keeping a copy of the priv->agent address prior to releasing the vm->lock in qemuDomainObjEnterAgent. Then rather than assuming priv->agent is valid, use the copy of the agent pointer for the subsequent agent call and qemuDomainObjExitAgent. Within qemuDomainObjExitAgent, use the agent copy in order to release the agent lock, then get the vm->lock again and decide whether to clear the priv->agent based on whether any references still exist. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Recent upstream patch: http://www.redhat.com/archives/libvir-list/2015-September/msg00971.html attempted to undo commit id '1020a504' which appears to be the wrong approach since it would still have the vm->lock during the qemuAgentClose. src/qemu/qemu_domain.c | 11 +++--- src/qemu/qemu_domain.h | 4 +-- src/qemu/qemu_driver.c | 90 +++++++++++++++++++++++++++++++++----------------- 3 files changed, 67 insertions(+), 38 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 890d8ed..a908df8 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1868,19 +1868,20 @@ qemuDomainObjEnterAgent(virDomainObjPtr obj) * Should be paired with an earlier qemuDomainObjEnterAgent() call */ void -qemuDomainObjExitAgent(virDomainObjPtr obj) +qemuDomainObjExitAgent(virDomainObjPtr obj, + qemuAgentPtr agent) { qemuDomainObjPrivatePtr priv = obj->privateData; bool hasRefs; - hasRefs = virObjectUnref(priv->agent); + hasRefs = virObjectUnref(agent); if (hasRefs) - virObjectUnlock(priv->agent); + virObjectUnlock(agent); virObjectLock(obj); - VIR_DEBUG("Exited agent (agent=%p vm=%p name=%s)", - priv->agent, obj, obj->def->name); + VIR_DEBUG("Exited agent (agent=%p vm=%p name=%s hasRefs=%d)", + agent, obj, obj->def->name, hasRefs); priv->agentStart = 0; if (!hasRefs) diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 64cd7e1..def31a9 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -296,8 +296,8 @@ int qemuDomainObjEnterMonitorAsync(virQEMUDriverPtr driver, void qemuDomainObjEnterAgent(virDomainObjPtr obj) ATTRIBUTE_NONNULL(1); -void qemuDomainObjExitAgent(virDomainObjPtr obj) - ATTRIBUTE_NONNULL(1); +void qemuDomainObjExitAgent(virDomainObjPtr obj, qemuAgentPtr agent) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); void qemuDomainObjEnterRemote(virDomainObjPtr obj) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a2cc002..b8c9ff7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1994,9 +1994,10 @@ static int qemuDomainShutdownFlags(virDomainPtr dom, unsigned int flags) qemuDomainSetFakeReboot(driver, vm, isReboot); if (useAgent) { + qemuAgentPtr agent = priv->agent; qemuDomainObjEnterAgent(vm); - ret = qemuAgentShutdown(priv->agent, agentFlag); - qemuDomainObjExitAgent(vm); + ret = qemuAgentShutdown(agent, agentFlag); + qemuDomainObjExitAgent(vm, agent); } /* If we are not enforced to use just an agent, try ACPI @@ -2087,9 +2088,10 @@ qemuDomainReboot(virDomainPtr dom, unsigned int flags) qemuDomainSetFakeReboot(driver, vm, isReboot); if (useAgent) { + qemuAgentPtr agent = priv->agent; qemuDomainObjEnterAgent(vm); - ret = qemuAgentShutdown(priv->agent, agentFlag); - qemuDomainObjExitAgent(vm); + ret = qemuAgentShutdown(agent, agentFlag); + qemuDomainObjExitAgent(vm, agent); } /* If we are not enforced to use just an agent, try ACPI @@ -4864,6 +4866,7 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, qemuAgentCPUInfoPtr cpuinfo = NULL; int ncpuinfo; qemuDomainObjPrivatePtr priv; + qemuAgentPtr agent; size_t i; virCgroupPtr cgroup_temp = NULL; char *mem_mask = NULL; @@ -4924,6 +4927,7 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, } if (flags & VIR_DOMAIN_VCPU_GUEST) { + if (!qemuDomainAgentAvailable(vm, true)) goto endjob; @@ -4935,19 +4939,20 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, goto endjob; } + agent = priv->agent; qemuDomainObjEnterAgent(vm); - ncpuinfo = qemuAgentGetVCPUs(priv->agent, &cpuinfo); - qemuDomainObjExitAgent(vm); + ncpuinfo = qemuAgentGetVCPUs(agent, &cpuinfo); + qemuDomainObjExitAgent(vm, agent); - if (ncpuinfo < 0) + if (ncpuinfo < 0 || agent != priv->agent) goto endjob; if (qemuAgentUpdateCPUInfo(nvcpus, cpuinfo, ncpuinfo) < 0) goto endjob; qemuDomainObjEnterAgent(vm); - ret = qemuAgentSetVCPUs(priv->agent, cpuinfo, ncpuinfo); - qemuDomainObjExitAgent(vm); + ret = qemuAgentSetVCPUs(agent, cpuinfo, ncpuinfo); + qemuDomainObjExitAgent(vm, agent); if (ret < 0) goto endjob; @@ -5515,6 +5520,8 @@ qemuDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags) goto cleanup; if (flags & VIR_DOMAIN_VCPU_GUEST) { + qemuAgentPtr agent; + if (!virDomainObjIsActive(vm)) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("vCPU count provided by the guest agent can only be " @@ -5534,9 +5541,10 @@ qemuDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags) goto endjob; } + agent = priv->agent; qemuDomainObjEnterAgent(vm); - ncpuinfo = qemuAgentGetVCPUs(priv->agent, &cpuinfo); - qemuDomainObjExitAgent(vm); + ncpuinfo = qemuAgentGetVCPUs(agent, &cpuinfo); + qemuDomainObjExitAgent(vm, agent); endjob: qemuDomainObjEndJob(driver, vm); @@ -13513,14 +13521,16 @@ qemuDomainSnapshotFSFreeze(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, unsigned int nmountpoints) { qemuDomainObjPrivatePtr priv = vm->privateData; + qemuAgentPtr agent; int frozen; if (!qemuDomainAgentAvailable(vm, true)) return -1; + agent = priv->agent; qemuDomainObjEnterAgent(vm); - frozen = qemuAgentFSFreeze(priv->agent, mountpoints, nmountpoints); - qemuDomainObjExitAgent(vm); + frozen = qemuAgentFSFreeze(agent, mountpoints, nmountpoints); + qemuDomainObjExitAgent(vm, agent); return frozen < 0 ? -2 : frozen; } @@ -13532,19 +13542,21 @@ qemuDomainSnapshotFSThaw(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, bool report) { qemuDomainObjPrivatePtr priv = vm->privateData; + qemuAgentPtr agent; int thawed; virErrorPtr err = NULL; if (!qemuDomainAgentAvailable(vm, report)) return -1; + agent = priv->agent; qemuDomainObjEnterAgent(vm); if (!report) err = virSaveLastError(); - thawed = qemuAgentFSThaw(priv->agent); + thawed = qemuAgentFSThaw(agent); if (!report) virSetError(err); - qemuDomainObjExitAgent(vm); + qemuDomainObjExitAgent(vm, agent); virFreeError(err); @@ -18146,6 +18158,7 @@ qemuDomainPMSuspendForDuration(virDomainPtr dom, { virQEMUDriverPtr driver = dom->conn->privateData; qemuDomainObjPrivatePtr priv; + qemuAgentPtr agent; virDomainObjPtr vm; int ret = -1; @@ -18218,9 +18231,10 @@ qemuDomainPMSuspendForDuration(virDomainPtr dom, goto endjob; } + agent = priv->agent; qemuDomainObjEnterAgent(vm); - ret = qemuAgentSuspend(priv->agent, target); - qemuDomainObjExitAgent(vm); + ret = qemuAgentSuspend(agent, target); + qemuDomainObjExitAgent(vm, agent); endjob: qemuDomainObjEndJob(driver, vm); @@ -18309,6 +18323,7 @@ qemuDomainQemuAgentCommand(virDomainPtr domain, int ret = -1; char *result = NULL; qemuDomainObjPrivatePtr priv; + qemuAgentPtr agent; virCheckFlags(0, NULL); @@ -18338,9 +18353,10 @@ qemuDomainQemuAgentCommand(virDomainPtr domain, goto endjob; } + agent = priv->agent; qemuDomainObjEnterAgent(vm); - ret = qemuAgentArbitraryCommand(priv->agent, cmd, &result, timeout); - qemuDomainObjExitAgent(vm); + ret = qemuAgentArbitraryCommand(agent, cmd, &result, timeout); + qemuDomainObjExitAgent(vm, agent); if (ret < 0) VIR_FREE(result); @@ -18411,6 +18427,7 @@ qemuDomainFSTrim(virDomainPtr dom, virDomainObjPtr vm; int ret = -1; qemuDomainObjPrivatePtr priv; + qemuAgentPtr agent; virCheckFlags(0, -1); @@ -18447,9 +18464,10 @@ qemuDomainFSTrim(virDomainPtr dom, goto endjob; } + agent = priv->agent; qemuDomainObjEnterAgent(vm); - ret = qemuAgentFSTrim(priv->agent, minimum); - qemuDomainObjExitAgent(vm); + ret = qemuAgentFSTrim(agent, minimum); + qemuDomainObjExitAgent(vm, agent); endjob: qemuDomainObjEndJob(driver, vm); @@ -18600,6 +18618,7 @@ qemuDomainGetTime(virDomainPtr dom, virQEMUDriverPtr driver = dom->conn->privateData; virDomainObjPtr vm = NULL; qemuDomainObjPrivatePtr priv; + qemuAgentPtr agent; int ret = -1; int rv; @@ -18625,9 +18644,10 @@ qemuDomainGetTime(virDomainPtr dom, if (!qemuDomainAgentAvailable(vm, true)) goto endjob; + agent = priv->agent; qemuDomainObjEnterAgent(vm); - rv = qemuAgentGetTime(priv->agent, seconds, nseconds); - qemuDomainObjExitAgent(vm); + rv = qemuAgentGetTime(agent, seconds, nseconds); + qemuDomainObjExitAgent(vm, agent); if (rv < 0) goto endjob; @@ -18650,6 +18670,7 @@ qemuDomainSetTime(virDomainPtr dom, { virQEMUDriverPtr driver = dom->conn->privateData; qemuDomainObjPrivatePtr priv; + qemuAgentPtr agent; virDomainObjPtr vm; bool rtcSync = flags & VIR_DOMAIN_TIME_SYNC; int ret = -1; @@ -18689,9 +18710,10 @@ qemuDomainSetTime(virDomainPtr dom, if (!qemuDomainAgentAvailable(vm, true)) goto endjob; + agent = priv->agent; qemuDomainObjEnterAgent(vm); - rv = qemuAgentSetTime(priv->agent, seconds, nseconds, rtcSync); - qemuDomainObjExitAgent(vm); + rv = qemuAgentSetTime(agent, seconds, nseconds, rtcSync); + qemuDomainObjExitAgent(vm, agent); if (rv < 0) goto endjob; @@ -19647,6 +19669,7 @@ qemuDomainGetFSInfo(virDomainPtr dom, { virQEMUDriverPtr driver = dom->conn->privateData; qemuDomainObjPrivatePtr priv; + qemuAgentPtr agent; virDomainObjPtr vm; int ret = -1; @@ -19672,9 +19695,10 @@ qemuDomainGetFSInfo(virDomainPtr dom, if (!qemuDomainAgentAvailable(vm, true)) goto endjob; + agent = priv->agent; qemuDomainObjEnterAgent(vm); - ret = qemuAgentGetFSInfo(priv->agent, info, vm->def); - qemuDomainObjExitAgent(vm); + ret = qemuAgentGetFSInfo(agent, info, vm->def); + qemuDomainObjExitAgent(vm, agent); endjob: qemuDomainObjEndJob(driver, vm); @@ -19692,6 +19716,7 @@ qemuDomainInterfaceAddresses(virDomainPtr dom, { virQEMUDriverPtr driver = dom->conn->privateData; qemuDomainObjPrivatePtr priv = NULL; + qemuAgentPtr agent; virDomainObjPtr vm = NULL; int ret = -1; @@ -19723,9 +19748,10 @@ qemuDomainInterfaceAddresses(virDomainPtr dom, if (!qemuDomainAgentAvailable(vm, true)) goto endjob; + agent = priv->agent; qemuDomainObjEnterAgent(vm); - ret = qemuAgentGetInterfaces(priv->agent, ifaces); - qemuDomainObjExitAgent(vm); + ret = qemuAgentGetInterfaces(agent, ifaces); + qemuDomainObjExitAgent(vm, agent); endjob: qemuDomainObjEndJob(driver, vm); @@ -19850,6 +19876,7 @@ qemuDomainSetUserPassword(virDomainPtr dom, { virQEMUDriverPtr driver = dom->conn->privateData; qemuDomainObjPrivatePtr priv; + qemuAgentPtr agent; virDomainObjPtr vm; int ret = -1; int rv; @@ -19876,10 +19903,11 @@ qemuDomainSetUserPassword(virDomainPtr dom, if (!qemuDomainAgentAvailable(vm, true)) goto endjob; + agent = priv->agent; qemuDomainObjEnterAgent(vm); - rv = qemuAgentSetUserPassword(priv->agent, user, password, + rv = qemuAgentSetUserPassword(agent, user, password, flags & VIR_DOMAIN_PASSWORD_ENCRYPTED); - qemuDomainObjExitAgent(vm); + qemuDomainObjExitAgent(vm, agent); if (rv < 0) goto endjob; -- 2.1.0

2 4

[libvirt] [PATCH 0/4] improve virsh attache-interface
by Pavel Hrdina 27 Oct '15

27 Oct '15

Pavel Hrdina (4): virsh-domain: use correct base for virStrToLong_ui virsh-nodedev: makes struct and functions for NodeDevice list available virsh-domain: update attach-interface to support type=hostdev virsh.pod: update and improve a attach-interface section tools/virsh-domain.c | 120 ++++++++++++++++++++++++++++++++++++++++++-------- tools/virsh-nodedev.c | 16 +++---- tools/virsh-nodedev.h | 11 +++++ tools/virsh.pod | 85 +++++++++++++++++++++-------------- 4 files changed, 170 insertions(+), 62 deletions(-) -- 2.6.2

3 13

[libvirt] [PATCH] locking: Add io_timeout to sanlock
by Michal Privoznik 27 Oct '15

27 Oct '15

https://bugzilla.redhat.com/show_bug.cgi?id=1251190 So, if domain loses access to storage, sanlock tries to kill it after some timeout. So far, the default is 80 seconds. But for some scenarios this might not be enough. We should allow users to adjust the timeout according to their needs. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/locking/libvirt_sanlock.aug | 1 + src/locking/lock_driver_sanlock.c | 8 +++++++- src/locking/sanlock.conf | 7 +++++++ src/locking/test_libvirt_sanlock.aug.in | 1 + 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/locking/libvirt_sanlock.aug b/src/locking/libvirt_sanlock.aug index a78a444..8843590 100644 --- a/src/locking/libvirt_sanlock.aug +++ b/src/locking/libvirt_sanlock.aug @@ -22,6 +22,7 @@ module Libvirt_sanlock = | int_entry "host_id" | bool_entry "require_lease_for_disks" | bool_entry "ignore_readonly_and_shared_disks" + | int_entry "io_timeout" | str_entry "user" | str_entry "group" let comment = [ label "#comment" . del /#[ \t]*/ "# " . store /([^ \t\n][^\n]*)?/ . del /\n/ "\n" ] diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index e052875..f1dbbaf 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -73,6 +73,7 @@ struct _virLockManagerSanlockDriver { int hostID; bool autoDiskLease; char *autoDiskLeasePath; + unsigned int io_timeout; /* under which permissions does sanlock run */ uid_t user; @@ -151,6 +152,10 @@ static int virLockManagerSanlockLoadConfig(const char *configFile) else driver->requireLeaseForDisks = !driver->autoDiskLease; + p = virConfGetValue(conf, "io_timeout"); + CHECK_TYPE("io_timeout", VIR_CONF_ULONG); + if (p) driver->io_timeout = p->l; + p = virConfGetValue(conf, "user"); CHECK_TYPE("user", VIR_CONF_STRING); if (p) { @@ -338,7 +343,7 @@ static int virLockManagerSanlockSetupLockspace(void) * or we can fallback to polling. */ retry: - if ((rv = sanlock_add_lockspace(&ls, 0)) < 0) { + if ((rv = sanlock_add_lockspace_timeout(&ls, 0, driver->io_timeout)) < 0) { if (-rv == EINPROGRESS && --retries) { #ifdef HAVE_SANLOCK_INQ_LOCKSPACE /* we have this function which blocks until lockspace change the @@ -404,6 +409,7 @@ static int virLockManagerSanlockInit(unsigned int version, driver->requireLeaseForDisks = true; driver->hostID = 0; driver->autoDiskLease = false; + driver->io_timeout = 0; driver->user = (uid_t) -1; driver->group = (gid_t) -1; if (VIR_STRDUP(driver->autoDiskLeasePath, LOCALSTATEDIR "/lib/libvirt/sanlock") < 0) { diff --git a/src/locking/sanlock.conf b/src/locking/sanlock.conf index e5566ef..3a1a51c 100644 --- a/src/locking/sanlock.conf +++ b/src/locking/sanlock.conf @@ -54,6 +54,13 @@ #require_lease_for_disks = 1 # +# Sanlock is able to kill qemu processes on IO timeout. By its internal +# implementation, the current default is 80 seconds. If you need to adjust +# the value change the following variable. Value of zero means use the +# default sanlock timeout. +#io_timeout = 0 + +# # The combination of user and group under which the sanlock # daemon runs. Libvirt will chown created files (like # content of disk_lease_dir) to make sure sanlock daemon can diff --git a/src/locking/test_libvirt_sanlock.aug.in b/src/locking/test_libvirt_sanlock.aug.in index ef98ea6..7f66f81 100644 --- a/src/locking/test_libvirt_sanlock.aug.in +++ b/src/locking/test_libvirt_sanlock.aug.in @@ -6,5 +6,6 @@ module Test_libvirt_sanlock = { "disk_lease_dir" = "/var/lib/libvirt/sanlock" } { "host_id" = "1" } { "require_lease_for_disks" = "1" } +{ "io_timeout" = "0" } { "user" = "root" } { "group" = "root" } -- 2.4.10

2 2

[libvirt] [PATCH 0/4] HACKING: Improve handling
by Andrea Bolognani 27 Oct '15

27 Oct '15

Generate the HACKING file at dist time like we're already doing for NEWS, AUTHORS and ChangeLog. The file shouldn't be tracked by git as it's not a source file but rather a generated one; because of this, it should also be generated in $(builddir) as opposed to $(top_srcdir). Cheers. Andrea Bolognani (4): HACKING: Generate inside the build directory HACKING: Remove generated copy HACKING: Add to ignore file HACKING: Include in EXTRA_DIST .gitignore | 1 + HACKING | 1008 ----------------------------------------------------------- Makefile.am | 3 +- cfg.mk | 3 +- 4 files changed, 4 insertions(+), 1011 deletions(-) delete mode 100644 HACKING -- 2.4.3

3 7

[libvirt] [PATCH v2 0/2] reorder usb controllers correctly
by Pavel Hrdina 27 Oct '15

27 Oct '15

new in v2: - used git format-patch -b - added a test case Pavel Hrdina (2): domain-conf: reorder usb controllers so the master is first test: add test case for usb controller order src/conf/domain_conf.c | 21 +++++++++---- .../qemuxml2argv-controller-usb-order.xml | 32 ++++++++++++++++++++ .../qemuxml2xmlout-controller-usb-order.xml | 34 ++++++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 4 files changed, 83 insertions(+), 5 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-controller-usb-order.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-controller-usb-order.xml -- 2.6.2

2 3

[libvirt] [PATCH] domain-conf: reorder usb controllers so the master is first
by Pavel Hrdina 27 Oct '15

27 Oct '15

USB controllers can share the same 'index' which indicates, that there is some sort of master-companion relationship. Reorder the controllers in XML in to place the master controller before its companions. This is required by QEMU to not fail with error message: error: internal error: process exited while connecting to monitor: 2015-10-26T16:25:17.630265Z qemu-system-x86_64: -device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,multifunction=on,addr=0x6: USB bus 'usb.0' not found Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1166452 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/conf/domain_conf.c | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0c559d2..3f22de2 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13397,6 +13397,7 @@ void virDomainControllerInsertPreAlloced(virDomainDefPtr def, int idx; /* Tenatively plan to insert controller at the end. */ int insertAt = -1; + virDomainControllerDefPtr current = NULL; /* Then work backwards looking for controllers of * the same type. If we find a controller with a @@ -13404,17 +13405,27 @@ void virDomainControllerInsertPreAlloced(virDomainDefPtr def, * that position */ for (idx = (def->ncontrollers - 1); idx >= 0; idx--) { - /* If bus matches and current controller is after - * new controller, then new controller should go here */ - if (def->controllers[idx]->type == controller->type && - def->controllers[idx]->idx > controller->idx) { - insertAt = idx; - } else if (def->controllers[idx]->type == controller->type && - insertAt == -1) { - /* Last controller with match bus is before the - * new controller, then put new controller just after - */ - insertAt = idx + 1; + current = def->controllers[idx]; + if (current->type == controller->type) { + if (current->idx > controller->idx) { + /* If bus matches and current controller is after + * new controller, then new controller should go here + * */ + insertAt = idx; + } else if (controller->info.mastertype == VIR_DOMAIN_CONTROLLER_MASTER_NONE && + current->info.mastertype != VIR_DOMAIN_CONTROLLER_MASTER_NONE && + current->idx == controller->idx) { + /* If bus matches and index matches and new controller is + * master and current isn't a master, then new controller + * should go here to be placed before its companion + */ + insertAt = idx; + } else if (insertAt == -1) { + /* Last controller with match bus is before the + * new controller, then put new controller just after + */ + insertAt = idx + 1; + } } } -- 2.6.2

2 1

[libvirt] [PATCH v2 0/5] qemu: hostdev: Unify naming
by Andrea Bolognani 27 Oct '15

27 Oct '15

Changes in v2: * make new names consistent with virHostdev (thanks John) * rename virHostdevUpdateDomainActiveDevices() as well - this was the only function in virHostdev that didn't conform to the module's naming conventions Cheers. Andrea Bolognani (5): hostdev: Rename virHostdevUpdateDomainActiveDevices() qemu: hostdev: Unify naming for qemuHostdevPrepare*Devices() qemu: hostdev: Unify naming for qemuHostdevReAttach*Devices() qemu: hostdev: Unify naming for qemuHostdevUpdateActive*Devices() qemu: hostdev: Introduce qemuHostdevUpdateActiveDomainDevices() src/libvirt_private.syms | 2 +- src/libxl/libxl_driver.c | 2 +- src/qemu/qemu_hostdev.c | 108 +++++++++++++++++++++++++++-------------------- src/qemu/qemu_hostdev.h | 69 +++++++++++++++--------------- src/qemu/qemu_hotplug.c | 20 ++++----- src/qemu/qemu_process.c | 14 ++---- src/util/virhostdev.c | 2 +- src/util/virhostdev.h | 2 +- 8 files changed, 117 insertions(+), 102 deletions(-) -- 2.4.3

2 7

[libvirt] [PATCH] tests: Fix virnetdaemontest to be skipped in non-yajl environment
by Prerna 27 Oct '15

27 Oct '15

When libvirt is compiled without yajl-devel, virnetdaemontest fails. This causes 'make check' to fail with nondescript errors, such as following: [snip]............................... PASS: read-bufsiz PASS: read-non-seekable PASS: start TEST: virsh-uriprecedence .... 4 OK PASS: virsh-uriprecedence PASS: vcpupin /home/prerna/trees/libvirt/tests/virsh-all: skipping test: This test is very expensive, so it is disabled by default. To run it anyway, rerun: make check VIR_TEST_EXPENSIVE=1 SKIP: virsh-all PASS: virsh-optparse PASS: virsh-schedinfo PASS: virsh-synopsis PASS: virsh-undefine ======================================= 1 of 108 tests failed (7 tests were not run) Please report to libvir-list(a)redhat.com ======================================= make[2]: *** [check-TESTS] Error 1 make[2]: Leaving directory `/home/prerna/build/libvirt/tests' make[1]: *** [check-am] Error 2 make[1]: Leaving directory `/home/prerna/build/libvirt/tests' make: *** [check-recursive] Error 1 ..................................... This patch skips virnetdaemontest in absence of yajl-devel, so that make check gracefully runs to completion. Signed-off-by: Prerna Saxena <saxenap.ltc(a)gmail.com> --- tests/virnetdaemontest.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tests/virnetdaemontest.c b/tests/virnetdaemontest.c index 24cbd54..17d1f7f 100644 --- a/tests/virnetdaemontest.c +++ b/tests/virnetdaemontest.c @@ -290,6 +290,11 @@ mymain(void) { int ret = 0; +#if !WITH_YAJL + fputs("libvirt not compiled with yajl, skipping this test\n", stderr); + return EXIT_AM_SKIP; +#endif + if (virInitialize() < 0 || virEventRegisterDefaultImpl() < 0) { virDispatchError(NULL); -- 1.7.1

2 3

[libvirt] [PATCH 0/4] qemu: hostdev: Unify naming
by Andrea Bolognani 26 Oct '15

26 Oct '15

I was working on the QEMU hostdev code and the inconsistent naming used kept making things just that little harder for me to follow, so I unified it. Cheers. Andrea Bolognani (4): qemu: hostdev: Unify naming for qemuPrepareHost*Devices() qemu: hostdev: Unify naming for qemuDomainReAttachHost*Devices() qemu: hostdev: Unify naming for qemuUpdateActiveHost*Devices() qemu: hostdev: Introduce qemuUpdateActiveHostDevices() src/qemu/qemu_hostdev.c | 74 ++++++++++++++++++++++++++++++------------------- src/qemu/qemu_hostdev.h | 36 ++++++++++++------------ src/qemu/qemu_hotplug.c | 13 ++++----- src/qemu/qemu_process.c | 8 +----- 4 files changed, 72 insertions(+), 59 deletions(-) -- 2.4.3

3 8

[libvirt] [PATCH v2 0/2] tests: Add nodeinfo test data utility scripts
by Andrea Bolognani 23 Oct '15

23 Oct '15

Changes from v1: * use a better approach to copy host data (thanks Martin) * acknowledge the fact that the scripts require bash * other small cleanups and improvements Andrea Bolognani (2): tests: Add script to display nodeinfo test data tests: Add script to copy nodeinfo test data from host tests/nodeinfodata/copy-from-host.sh | 113 +++++++++++++++++++++++++++++++++++ tests/nodeinfodata/display.sh | 113 +++++++++++++++++++++++++++++++++++ 2 files changed, 226 insertions(+) create mode 100755 tests/nodeinfodata/copy-from-host.sh create mode 100755 tests/nodeinfodata/display.sh -- 2.4.3

3 7

[libvirt] outreachy 2015
by mesode akwe 22 Oct '15

22 Oct '15

hello! i am mesode from cameroon and am interested in participating in the libvirt-designer enhancement project. where do i go from here? thanks.

1 0

[libvirt] [RFC] Simplifying usage of {Enter, Exit}Monitor and {Begin/End}Job
by Jiri Denemark 22 Oct '15

22 Oct '15

Hi all. Looking at the qemu driver code, we have a lot of code with the following pattern: if (doSomething() < 0) goto cleanup; if (qemuDomainObjBeginJob() < 0) goto cleanup; if (doSomethingElse() < 0) goto endjob; qemuDomainObjEnterMonitor(); if (qemuMonitorSomething() < 0) { qemuDomainObjExitMonitor(); goto endjob; } if (qemuMonitorSomethingElse() < 0) { qemuDomainObjExitMonitor(); goto endjob; } if (qemuDomainObjExitMonitor() < 0) goto endjob; ... ret = 0; endjob: qemuDomainObjEndJob(); cleanup: ... return ret; Sometimes qemuDomainObjExitMonitor is in its own label instead of being explicitly called on every single error path. Sometimes qemuDomainObjEndJob is called explicitly followed by goto cleanup. In either case, it's pretty easy to get this wrong. It's too easy to jump to a wrong label (especially when moving code around) or forget to call the appropriate exit function before jumping to a label. So what if we make the code more robust by changing who needs to track whether we are in a monitor or have a job. Now it's the caller that tracks it while I think we could teach the job/monitor APIs themselves to track the state: bool inJob = false; bool inMonitor = false; if (doSomething() < 0) goto cleanup; if (qemuDomainObjBeginJob(..., &inJob) < 0) goto cleanup; if (doSomethingElse() < 0) goto cleanup; qemuDomainObjEnterMonitor(..., &inMonitor); if (qemuMonitorSomething() < 0) goto cleanup; if (qemuMonitorSomethingElse() < 0) goto cleanup; if (qemuDomainObjExitMonitor(..., &inMonitor) < 0) goto cleanup; ... ret = 0; cleanup: if (qemuDomainObjExitMonitor(..., &inMonitor) < 0) ret = -1; qemuDomainObjEndJob(..., &inJob); ... return ret; It's not a lot shorter or longer but it saves us from jumping to different labels and it makes sure we always exit the monitor and end the job. So is it worth the effort or do you thing it's even worse than before or do you have any other ideas? Thanks, Jirka

3 4

[libvirt] [PATCHv2] virsh: fix no error when pass a count <= 0 to setvcpus
by Luyao Huang 22 Oct '15

22 Oct '15

https://bugzilla.redhat.com/show_bug.cgi?id=1248277 When count <= 0, the client exit without set an error. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- v2: - use vshCommandOptUInt to forbid negative number, and check if count is zero. (thanks Peter and Andrea) tools/virsh-domain.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 4191548..3f032f4 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6873,7 +6873,7 @@ static bool cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; - int count = 0; + unsigned int count = 0; bool ret = false; bool maximum = vshCommandOptBool(cmd, "maximum"); bool config = vshCommandOptBool(cmd, "config"); @@ -6900,9 +6900,14 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptInt(ctl, cmd, "count", &count) < 0 || count <= 0) + if (vshCommandOptUInt(ctl, cmd, "count", &count) < 0) goto cleanup; + if (count == 0) { + vshError(ctl, _("Can't set 0 processors for a VM")); + goto cleanup; + } + /* none of the options were specified */ if (!current && flags == 0) { if (virDomainSetVcpus(dom, count) != 0) -- 1.8.3.1

3 2

[libvirt] [PATCH] tests: Remove unused nodeinfo test data
by Andrea Bolognani 22 Oct '15

22 Oct '15

A bunch of files that we don't currently parse, and are very unlikely to ever start parsing, made their way into the nodeinfo test data. Get rid of them. --- tests/nodeinfodata/linux-f21-mustang/cpu/modalias | 1 - tests/nodeinfodata/linux-raspberrypi/cpu/cpuidle/current_driver | 1 - tests/nodeinfodata/linux-raspberrypi/cpu/cpuidle/current_governor_ro | 1 - tests/nodeinfodata/linux-rhelsa-3.19.0-mustang/cpu/modalias | 1 - tests/nodeinfodata/linux-test8/cpu/cpuidle/current_driver | 1 - tests/nodeinfodata/linux-test8/cpu/cpuidle/current_governor_ro | 1 - tests/nodeinfodata/linux-test8/cpu/sched_mc_power_savings | 1 - tests/nodeinfodata/linux-test8/cpu/sched_smt_power_savings | 1 - 8 files changed, 8 deletions(-) delete mode 100644 tests/nodeinfodata/linux-f21-mustang/cpu/modalias delete mode 100644 tests/nodeinfodata/linux-raspberrypi/cpu/cpuidle/current_driver delete mode 100644 tests/nodeinfodata/linux-raspberrypi/cpu/cpuidle/current_governor_ro delete mode 100644 tests/nodeinfodata/linux-rhelsa-3.19.0-mustang/cpu/modalias delete mode 100644 tests/nodeinfodata/linux-test8/cpu/cpuidle/current_driver delete mode 100644 tests/nodeinfodata/linux-test8/cpu/cpuidle/current_governor_ro delete mode 100644 tests/nodeinfodata/linux-test8/cpu/sched_mc_power_savings delete mode 100644 tests/nodeinfodata/linux-test8/cpu/sched_smt_power_savings diff --git a/tests/nodeinfodata/linux-f21-mustang/cpu/modalias b/tests/nodeinfodata/linux-f21-mustang/cpu/modalias deleted file mode 100644 index 18bb0b6..0000000 --- a/tests/nodeinfodata/linux-f21-mustang/cpu/modalias +++ /dev/null @@ -1 +0,0 @@ -cpu:type:aarch64:feature:,0000,0001,0002 diff --git a/tests/nodeinfodata/linux-raspberrypi/cpu/cpuidle/current_driver b/tests/nodeinfodata/linux-raspberrypi/cpu/cpuidle/current_driver deleted file mode 100644 index 621e94f..0000000 --- a/tests/nodeinfodata/linux-raspberrypi/cpu/cpuidle/current_driver +++ /dev/null @@ -1 +0,0 @@ -none diff --git a/tests/nodeinfodata/linux-raspberrypi/cpu/cpuidle/current_governor_ro b/tests/nodeinfodata/linux-raspberrypi/cpu/cpuidle/current_governor_ro deleted file mode 100644 index c35a724..0000000 --- a/tests/nodeinfodata/linux-raspberrypi/cpu/cpuidle/current_governor_ro +++ /dev/null @@ -1 +0,0 @@ -menu diff --git a/tests/nodeinfodata/linux-rhelsa-3.19.0-mustang/cpu/modalias b/tests/nodeinfodata/linux-rhelsa-3.19.0-mustang/cpu/modalias deleted file mode 100644 index 18bb0b6..0000000 --- a/tests/nodeinfodata/linux-rhelsa-3.19.0-mustang/cpu/modalias +++ /dev/null @@ -1 +0,0 @@ -cpu:type:aarch64:feature:,0000,0001,0002 diff --git a/tests/nodeinfodata/linux-test8/cpu/cpuidle/current_driver b/tests/nodeinfodata/linux-test8/cpu/cpuidle/current_driver deleted file mode 100644 index 57d5dd3..0000000 --- a/tests/nodeinfodata/linux-test8/cpu/cpuidle/current_driver +++ /dev/null @@ -1 +0,0 @@ -acpi_idle diff --git a/tests/nodeinfodata/linux-test8/cpu/cpuidle/current_governor_ro b/tests/nodeinfodata/linux-test8/cpu/cpuidle/current_governor_ro deleted file mode 100644 index c35a724..0000000 --- a/tests/nodeinfodata/linux-test8/cpu/cpuidle/current_governor_ro +++ /dev/null @@ -1 +0,0 @@ -menu diff --git a/tests/nodeinfodata/linux-test8/cpu/sched_mc_power_savings b/tests/nodeinfodata/linux-test8/cpu/sched_mc_power_savings deleted file mode 100644 index 573541a..0000000 --- a/tests/nodeinfodata/linux-test8/cpu/sched_mc_power_savings +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tests/nodeinfodata/linux-test8/cpu/sched_smt_power_savings b/tests/nodeinfodata/linux-test8/cpu/sched_smt_power_savings deleted file mode 100644 index 573541a..0000000 --- a/tests/nodeinfodata/linux-test8/cpu/sched_smt_power_savings +++ /dev/null @@ -1 +0,0 @@ -0 -- 2.4.3

2 2

[libvirt] [PATCHv2 0/3] improve the error report for virNodeAllocPages and virNodeGetFreePages
by Luyao Huang 22 Oct '15

22 Oct '15

v1: https://www.redhat.com/archives/libvir-list/2015-September/msg01054.html v2: -improve the error message -improve the code struct -add a new patch for rework the exist way to check node and page size Luyao Huang (3): util: split the virNumaGetHugePageInfoPath into separate function util: move the pagesize and node check and error report to one place util: Produce friendlier error message to user src/util/virnuma.c | 113 ++++++++++++++++++++++++++++++++++------------------- 1 file changed, 72 insertions(+), 41 deletions(-) -- 1.8.3.1

3 5

[libvirt] [PATCH] conf: Fix error message to use correct parameter
by John Ferlan 21 Oct '15

21 Oct '15

Fix a cut-n-paste error from commit id '35eecdde' where the previous check for max_sectors seems to have been copied, but the error message parameter not updated to be ioeventfd Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- pushing as trivial src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 02cc8ad..0c559d2 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7985,7 +7985,7 @@ virDomainControllerDefParseXML(xmlNodePtr node, if (ioeventfd && (def->ioeventfd = virTristateSwitchTypeFromString(ioeventfd)) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("Malformed 'ioeventfd' value %s'"), max_sectors); + _("Malformed 'ioeventfd' value %s'"), ioeventfd); goto error; } -- 2.1.0

1 0

[libvirt] gem install ruby-libvirt fails on FreeBSD 10.2
by Rickard von Essen 21 Oct '15

21 Oct '15

Hi, Installing the ruby-libvirt gem fails on FreeBSD 10.2 since it can't locate the lib and include dir. Installing with: gem install ruby-libvirt -- --with-libvirt-include=/usr/local/include/libvirt --with-libvirt-lib=/usr/local/lib/libvirt.so works fine. It would be great if this worked out of the box, e.g. detects that it is building on BSD and applies the above settings as default, or at least it could be provided as a hint if running make fails to guide ruby noobs, like me. Regards, Rickard von Essen

2 2

[libvirt] [PATCH v2] use STRNEQ instead of !STREQ and new syntax-check rule to avoid !STREQ and !STRNEQ
by Ishmanpreet Kaur Khera 21 Oct '15

21 Oct '15

used STRNEQ instead of !STREQ to remove inconsistency and intoduced new syntax-check rule for !STREQ and !STRNEQ so that we don't end up in the same situation again. Signed-off-by: Ishmanpreet Kaur Khera <khera.ishman(a)gmail.com> --- cfg.mk | 18 ++++++++++++++++++ src/bhyve/bhyve_driver.c | 2 +- src/conf/network_conf.c | 4 ++-- src/conf/nwfilter_conf.c | 2 +- src/conf/nwfilter_params.c | 2 +- src/conf/storage_conf.c | 2 +- src/lxc/lxc_fuse.c | 4 ++-- src/openvz/openvz_driver.c | 2 +- src/qemu/qemu_command.c | 6 +++--- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_hotplug.c | 2 +- src/security/security_manager.c | 2 +- src/security/security_selinux.c | 12 ++++++------ src/storage/storage_backend_logical.c | 2 +- src/util/virfile.c | 2 +- src/util/virsystemd.c | 2 +- src/vz/vz_driver.c | 2 +- src/vz/vz_sdk.c | 2 +- src/xen/xend_internal.c | 2 +- src/xenconfig/xen_sxpr.c | 2 +- tests/commandtest.c | 10 +++++----- tests/securityselinuxlabeltest.c | 2 +- tests/virauthconfigtest.c | 2 +- tests/virbitmaptest.c | 12 ++++++------ tests/vircgrouptest.c | 2 +- tests/virkeyfiletest.c | 8 ++++---- tests/virnetsockettest.c | 2 +- tests/virtypedparamtest.c | 2 +- tests/viruritest.c | 16 ++++++++-------- 29 files changed, 74 insertions(+), 56 deletions(-) diff --git a/cfg.mk b/cfg.mk index e436434..7343dfc 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1011,6 +1011,18 @@ sc_prohibit_pthread_create: halt="avoid using 'pthread_create', use 'virThreadCreate' instead" \ $(_sc_search_regexp) +sc_prohibit_not_streq: + @prohibit='!STREQ' \ + exclude='exempt from syntax-check' \ + halt='Use STRNEQ instead of !STREQ' \ + $(_sc_search_regexp) + +sc_prohibit_not_strneq: + @prohibit='!STRNEQ' \ + exclude='exempt from syntax-check' \ + halt='Use STREQ instead of !STRNEQ' \ + $(_sc_search_regexp) + # We don't use this feature of maint.mk. prev_version_file = /dev/null @@ -1213,3 +1225,9 @@ exclude_file_name_regexp--sc_prohibit_sysconf_pagesize = \ exclude_file_name_regexp--sc_prohibit_pthread_create = \ ^(cfg\.mk|src/util/virthread\.c|tests/.*)$$ + +exclude_file_name_regexp--sc_prohibit_not_streq = \ + ^tests/.*\.[ch]$$ + +exclude_file_name_regexp--sc_prohibit_not_strneq = \ + ^tests/.*\.[ch]$$ diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index d44cf2c..e5d56e9 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -197,7 +197,7 @@ bhyveConnectOpen(virConnectPtr conn, if (conn->uri->server) return VIR_DRV_OPEN_DECLINED; - if (!STREQ_NULLABLE(conn->uri->path, "/system")) { + if (STRNEQ_NULLABLE(conn->uri->path, "/system")) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unexpected bhyve URI path '%s', try bhyve:///system"), conn->uri->path); diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index c1cbd76..0ffb325 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -3042,7 +3042,7 @@ virNetworkLoadState(virNetworkObjListPtr nets, if (!(def = virNetworkDefParseXML(ctxt))) goto error; - if (!STREQ(name, def->name)) { + if (STRNEQ(name, def->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Network config filename '%s'" " does not match network name '%s'"), @@ -3152,7 +3152,7 @@ virNetworkObjPtr virNetworkLoadConfig(virNetworkObjListPtr nets, if (!(def = virNetworkDefParseFile(configFile))) goto error; - if (!STREQ(name, def->name)) { + if (STRNEQ(name, def->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Network config filename '%s'" " does not match network name '%s'"), diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index f7ccb75..ced8eb8 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -3082,7 +3082,7 @@ virNWFilterObjAssignDef(virNWFilterObjListPtr nwfilters, nwfilter = virNWFilterObjFindByUUID(nwfilters, def->uuid); if (nwfilter) { - if (!STREQ(def->name, nwfilter->def->name)) { + if (STRNEQ(def->name, nwfilter->def->name)) { virReportError(VIR_ERR_OPERATION_FAILED, _("filter with same UUID but different name " "('%s') already exists"), diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c index 0ac8baa..b6c6e78 100644 --- a/src/conf/nwfilter_params.c +++ b/src/conf/nwfilter_params.c @@ -444,7 +444,7 @@ virNWFilterVarCombIterEntryAreUniqueEntries(virNWFilterVarCombIterEntryPtr cie, /* should never occur to step on a NULL here */ return true; } - if (!STREQ(virNWFilterVarValueGetNthValue(tmp, cie->curValue), + if (STRNEQ(virNWFilterVarValueGetNthValue(tmp, cie->curValue), virNWFilterVarValueGetNthValue(tmp, i))) { isSame = false; break; diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 9dae1a3..9b8abea 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1873,7 +1873,7 @@ virStoragePoolLoadState(virStoragePoolObjListPtr pools, if (!(def = virStoragePoolDefParseXML(ctxt))) goto error; - if (!STREQ(name, def->name)) { + if (STRNEQ(name, def->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Storage pool state file '%s' does not match " "pool name '%s'"), diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c index 34a69cc..862dca3 100644 --- a/src/lxc/lxc_fuse.c +++ b/src/lxc/lxc_fuse.c @@ -90,7 +90,7 @@ static int lxcProcReaddir(const char *path, void *buf, off_t offset ATTRIBUTE_UNUSED, struct fuse_file_info *fi ATTRIBUTE_UNUSED) { - if (!STREQ(path, "/")) + if (STRNEQ(path, "/")) return -ENOENT; filler(buf, ".", NULL, 0); @@ -103,7 +103,7 @@ static int lxcProcReaddir(const char *path, void *buf, static int lxcProcOpen(const char *path ATTRIBUTE_UNUSED, struct fuse_file_info *fi ATTRIBUTE_UNUSED) { - if (!STREQ(path, fuse_meminfo_path)) + if (STRNEQ(path, fuse_meminfo_path)) return -ENOENT; if ((fi->flags & 3) != O_RDONLY) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index d78e2f5..b8c0f50 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -2048,7 +2048,7 @@ openvzUpdateDevice(virDomainDefPtr vmdef, cur = vmdef->fss[pos]; /* We only allow updating the quota */ - if (!STREQ(cur->src, fs->src) + if (STRNEQ(cur->src, fs->src) || cur->type != fs->type || cur->accessmode != fs->accessmode || cur->wrpolicy != fs->wrpolicy diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 7b0879d..8824541 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3008,7 +3008,7 @@ qemuParseDriveURIString(virDomainDiskDefPtr def, virURIPtr uri, if (transp) *transp++ = 0; - if (!STREQ(uri->scheme, scheme)) { + if (STRNEQ(uri->scheme, scheme)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid transport/scheme '%s'"), uri->scheme); goto error; @@ -10027,7 +10027,7 @@ qemuBuildCommandLine(virConnectPtr conn, virDomainDiskDefPtr disk = def->disks[i]; if (disk->src->driverName != NULL && - !STREQ(disk->src->driverName, "qemu")) { + STRNEQ(disk->src->driverName, "qemu")) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unsupported driver name '%s' for disk '%s'"), disk->src->driverName, disk->src->path); @@ -12725,7 +12725,7 @@ qemuParseCommandLineCPU(virDomainDefPtr dom, if (VIR_STRDUP(model, tokens[i]) < 0) goto cleanup; - if (!STREQ(model, "qemu32") && !STREQ(model, "qemu64")) { + if (STRNEQ(model, "qemu32") && STRNEQ(model, "qemu64")) { if (!(cpu = qemuInitGuestCPU(dom))) goto cleanup; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index bdc0e67..890d8ed 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1061,7 +1061,7 @@ qemuDomainDefPostParse(virDomainDefPtr def, if (!STRPREFIX(def->os.machine, "pc-0.") && !STRPREFIX(def->os.machine, "pc-1.") && !STRPREFIX(def->os.machine, "pc-i440") && - !STREQ(def->os.machine, "pc") && + STRNEQ(def->os.machine, "pc") && !STRPREFIX(def->os.machine, "rhel")) break; addPCIRoot = true; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index afc5408..470ab6a 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -783,7 +783,7 @@ qemuDomainAttachDeviceDiskLive(virConnectPtr conn, const char *driverName = virDomainDiskGetDriver(disk); const char *src = virDomainDiskGetSource(disk); - if (driverName && !STREQ(driverName, "qemu")) { + if (driverName && STRNEQ(driverName, "qemu")) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unsupported driver name '%s' for disk '%s'"), driverName, src); diff --git a/src/security/security_manager.c b/src/security/security_manager.c index 5b05a47..07a0522 100644 --- a/src/security/security_manager.c +++ b/src/security/security_manager.c @@ -130,7 +130,7 @@ int virSecurityManagerStackAddNested(virSecurityManagerPtr stack, virSecurityManagerPtr nested) { - if (!STREQ("stack", stack->drv->name)) + if (STRNEQ("stack", stack->drv->name)) return -1; return virSecurityStackAddNested(stack, nested); } diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index c2464c2..80b0886 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -2061,7 +2061,7 @@ virSecuritySELinuxSecurityVerify(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, if (secdef == NULL) return 0; - if (!STREQ(SECURITY_SELINUX_NAME, secdef->model)) { + if (STRNEQ(SECURITY_SELINUX_NAME, secdef->model)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("security label driver mismatch: " "'%s' model configured for domain, but " @@ -2092,7 +2092,7 @@ virSecuritySELinuxSetSecurityProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UN return 0; VIR_DEBUG("label=%s", secdef->label); - if (!STREQ(SECURITY_SELINUX_NAME, secdef->model)) { + if (STRNEQ(SECURITY_SELINUX_NAME, secdef->model)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("security label driver mismatch: " "'%s' model configured for domain, but " @@ -2126,7 +2126,7 @@ virSecuritySELinuxSetSecurityChildProcessLabel(virSecurityManagerPtr mgr ATTRIBU return 0; VIR_DEBUG("label=%s", secdef->label); - if (!STREQ(SECURITY_SELINUX_NAME, secdef->model)) { + if (STRNEQ(SECURITY_SELINUX_NAME, secdef->model)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("security label driver mismatch: " "'%s' model configured for domain, but " @@ -2155,7 +2155,7 @@ virSecuritySELinuxSetSecurityDaemonSocketLabel(virSecurityManagerPtr mgr ATTRIBU if (!secdef || !secdef->label) return 0; - if (!STREQ(SECURITY_SELINUX_NAME, secdef->model)) { + if (STRNEQ(SECURITY_SELINUX_NAME, secdef->model)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("security label driver mismatch: " "'%s' model configured for domain, but " @@ -2202,7 +2202,7 @@ virSecuritySELinuxSetSecuritySocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNU if (!secdef || !secdef->label) return 0; - if (!STREQ(SECURITY_SELINUX_NAME, secdef->model)) { + if (STRNEQ(SECURITY_SELINUX_NAME, secdef->model)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("security label driver mismatch: " "'%s' model configured for domain, but " @@ -2240,7 +2240,7 @@ virSecuritySELinuxClearSecuritySocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_U if (!secdef || !secdef->label) return 0; - if (!STREQ(SECURITY_SELINUX_NAME, secdef->model)) { + if (STRNEQ(SECURITY_SELINUX_NAME, secdef->model)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("security label driver mismatch: " "'%s' model configured for domain, but " diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index f1321db..536e617 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -147,7 +147,7 @@ virStorageBackendLogicalMakeVol(char **const groups, * (lvs outputs "[$lvname_vorigin] for field "origin" if the * lv is created with "--virtualsize"). */ - if (groups[1] && !STREQ(groups[1], "") && (groups[1][0] != '[')) { + if (groups[1] && STRNEQ(groups[1], "") && (groups[1][0] != '[')) { if (VIR_ALLOC(vol->target.backingStore) < 0) goto cleanup; diff --git a/src/util/virfile.c b/src/util/virfile.c index cba00cb5..e5cf2c5 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -1008,7 +1008,7 @@ virFileStripSuffix(char *str, const char *suffix) if (len < suffixlen) return 0; - if (!STREQ(str + len - suffixlen, suffix)) + if (STRNEQ(str + len - suffixlen, suffix)) return 0; str[len-suffixlen] = '\0'; diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 54c409d..1354b08 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -375,7 +375,7 @@ int virSystemdTerminateMachine(const char *name, goto cleanup; if (error.code == VIR_ERR_ERROR && - !STREQ_NULLABLE("org.freedesktop.machine1.NoSuchMachine", + STRNEQ_NULLABLE("org.freedesktop.machine1.NoSuchMachine", error.str1)) { virReportErrorObject(&error); goto cleanup; diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index f6bb696..6f1cbfb 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -300,7 +300,7 @@ vzConnectOpen(virConnectPtr conn, return VIR_DRV_OPEN_DECLINED; /* From this point on, the connection is for us. */ - if (!STREQ_NULLABLE(conn->uri->path, "/system")) { + if (STRNEQ_NULLABLE(conn->uri->path, "/system")) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unexpected Virtuozzo URI path '%s', try vz:///system"), conn->uri->path); diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index c24477c..89c9e89 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -2026,7 +2026,7 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, virDomainDefPtr def) } } else { if (def->os.nBootDevs != 0 || - !STREQ_NULLABLE(def->os.init, "/sbin/init") || + STRNEQ_NULLABLE(def->os.init, "/sbin/init") || (def->os.initargv != NULL && def->os.initargv[0] != NULL)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index b81c0b7..62ce930 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -2552,7 +2552,7 @@ xenDaemonDomainSetAutostart(virConnectPtr conn, if (autonode) { const char *val = (autonode->u.s.car->kind == SEXPR_VALUE ? autonode->u.s.car->u.value : NULL); - if (!val || (!STREQ(val, "ignore") && !STREQ(val, "start"))) { + if (!val || (STRNEQ(val, "ignore") && STRNEQ(val, "start"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("unexpected value from on_xend_start")); goto error; diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c index 033b0eb..7fc9c9d 100644 --- a/src/xenconfig/xen_sxpr.c +++ b/src/xenconfig/xen_sxpr.c @@ -2345,7 +2345,7 @@ xenFormatSxpr(virConnectPtr conn, /* Only xend <= 3.0.2 wants cdrom config here */ if (xendConfigVersion != XEND_CONFIG_VERSION_3_0_2) break; - if (!STREQ(def->disks[i]->dst, "hdc") || !src) + if (STRNEQ(def->disks[i]->dst, "hdc") || !src) break; virBufferEscapeSexpr(&buf, "(cdrom '%s')", src); diff --git a/tests/commandtest.c b/tests/commandtest.c index f001a39..cf5f44a 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -516,7 +516,7 @@ static int test13(const void *unused ATTRIBUTE_UNUSED) virCommandFree(cmd); cmd = NULL; - if (!STREQ(outactual, outexpect)) { + if (STRNEQ(outactual, outexpect)) { virtTestDifference(stderr, outexpect, outactual); goto cleanup; } @@ -580,15 +580,15 @@ static int test14(const void *unused ATTRIBUTE_UNUSED) if (!jointactual) goto cleanup; - if (!STREQ(outactual, outexpect)) { + if (STRNEQ(outactual, outexpect)) { virtTestDifference(stderr, outexpect, outactual); goto cleanup; } - if (!STREQ(erractual, errexpect)) { + if (STRNEQ(erractual, errexpect)) { virtTestDifference(stderr, errexpect, erractual); goto cleanup; } - if (!STREQ(jointactual, jointexpect)) { + if (STRNEQ(jointactual, jointexpect)) { virtTestDifference(stderr, jointexpect, jointactual); goto cleanup; } @@ -666,7 +666,7 @@ static int test16(const void *unused ATTRIBUTE_UNUSED) goto cleanup; } - if (!STREQ(outactual, outexpect)) { + if (STRNEQ(outactual, outexpect)) { virtTestDifference(stderr, outexpect, outactual); goto cleanup; } diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabeltest.c index 86660f4..c82b3f2 100644 --- a/tests/securityselinuxlabeltest.c +++ b/tests/securityselinuxlabeltest.c @@ -282,7 +282,7 @@ testSELinuxCheckLabels(testSELinuxFile *files, size_t nfiles) return -1; } } - if (!STREQ_NULLABLE(files[i].context, ctx)) { + if (STRNEQ_NULLABLE(files[i].context, ctx)) { virReportError(VIR_ERR_INTERNAL_ERROR, "File %s context '%s' did not match epected '%s'", files[i].file, ctx, files[i].context); diff --git a/tests/virauthconfigtest.c b/tests/virauthconfigtest.c index d9e05fd..4c380b9 100644 --- a/tests/virauthconfigtest.c +++ b/tests/virauthconfigtest.c @@ -60,7 +60,7 @@ static int testAuthLookup(const void *args) if (data->expect) { if (!actual || - !STREQ(actual, data->expect)) { + STRNEQ(actual, data->expect)) { VIR_WARN("Expected value '%s' for '%s' '%s' '%s', but got '%s'", data->expect, data->hostname, data->service, data->credname, diff --git a/tests/virbitmaptest.c b/tests/virbitmaptest.c index a6e9a38..8e458d2 100644 --- a/tests/virbitmaptest.c +++ b/tests/virbitmaptest.c @@ -355,7 +355,7 @@ test6(const void *v ATTRIBUTE_UNUSED) if (!str) goto error; - if (!STREQ(str, "")) + if (STRNEQ(str, "")) goto error; VIR_FREE(str); @@ -365,7 +365,7 @@ test6(const void *v ATTRIBUTE_UNUSED) if (!str) goto error; - if (!STREQ(str, "0")) + if (STRNEQ(str, "0")) goto error; VIR_FREE(str); @@ -376,7 +376,7 @@ test6(const void *v ATTRIBUTE_UNUSED) if (!str) goto error; - if (!STREQ(str, "0,4-5")) + if (STRNEQ(str, "0,4-5")) goto error; VIR_FREE(str); @@ -386,7 +386,7 @@ test6(const void *v ATTRIBUTE_UNUSED) if (!str) goto error; - if (!STREQ(str, "0,4-6")) + if (STRNEQ(str, "0,4-6")) goto error; VIR_FREE(str); @@ -399,7 +399,7 @@ test6(const void *v ATTRIBUTE_UNUSED) if (!str) goto error; - if (!STREQ(str, "0,4-6,13-16")) + if (STRNEQ(str, "0,4-6,13-16")) goto error; VIR_FREE(str); @@ -410,7 +410,7 @@ test6(const void *v ATTRIBUTE_UNUSED) if (!str) goto error; - if (!STREQ(str, "0,4-6,13-16,62-63")) + if (STRNEQ(str, "0,4-6,13-16,62-63")) goto error; diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c index 7a87640..731ecc4 100644 --- a/tests/vircgrouptest.c +++ b/tests/vircgrouptest.c @@ -662,7 +662,7 @@ static int testCgroupGetPercpuStats(const void *args ATTRIBUTE_UNUSED) } for (i = 0; i < EXPECTED_NCPUS; i++) { - if (!STREQ(params[i].field, VIR_DOMAIN_CPU_STATS_CPUTIME)) { + if (STRNEQ(params[i].field, VIR_DOMAIN_CPU_STATS_CPUTIME)) { fprintf(stderr, "Wrong parameter name value from virCgroupGetPercpuStats at %zu (is: %s)\n", i, params[i].field); diff --git a/tests/virkeyfiletest.c b/tests/virkeyfiletest.c index c31d2aa..3908fa8 100644 --- a/tests/virkeyfiletest.c +++ b/tests/virkeyfiletest.c @@ -70,17 +70,17 @@ static int testParse(const void *args ATTRIBUTE_UNUSED) VIR_DEBUG("Missing Value 'Foo.three'"); goto cleanup; } - if (!STREQ(virKeyFileGetValueString(kf, "Foo", "one"), + if (STRNEQ(virKeyFileGetValueString(kf, "Foo", "one"), "The first entry is here")) { VIR_DEBUG("Wrong value for 'Foo.one'"); goto cleanup; } - if (!STREQ(virKeyFileGetValueString(kf, "Foo", "two"), + if (STRNEQ(virKeyFileGetValueString(kf, "Foo", "two"), "The second entry")) { VIR_DEBUG("Wrong value for 'Foo.one'"); goto cleanup; } - if (!STREQ(virKeyFileGetValueString(kf, "Foo", "three"), + if (STRNEQ(virKeyFileGetValueString(kf, "Foo", "three"), "The third entry")) { VIR_DEBUG("Wrong value for 'Foo.one'"); goto cleanup; @@ -94,7 +94,7 @@ static int testParse(const void *args ATTRIBUTE_UNUSED) VIR_DEBUG("Missing Value 'Bar.one'"); goto cleanup; } - if (!STREQ(virKeyFileGetValueString(kf, "Bar", "one"), + if (STRNEQ(virKeyFileGetValueString(kf, "Bar", "one"), "The first entry in second group")) { VIR_DEBUG("Wrong value for 'Bar.one'"); goto cleanup; diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c index 1ababad..ce9eeab 100644 --- a/tests/virnetsockettest.c +++ b/tests/virnetsockettest.c @@ -406,7 +406,7 @@ static int testSocketSSH(const void *opaque) } buf[rv] = '\0'; - if (!STREQ(buf, data->expectOut)) { + if (STRNEQ(buf, data->expectOut)) { virtTestDifference(stderr, data->expectOut, buf); goto cleanup; } diff --git a/tests/virtypedparamtest.c b/tests/virtypedparamtest.c index b7bd72f..f4a5792 100644 --- a/tests/virtypedparamtest.c +++ b/tests/virtypedparamtest.c @@ -188,7 +188,7 @@ testTypedParamsGetStringList(const void *opaque ATTRIBUTE_UNUSED) goto cleanup; continue; } - if (!STREQLEN(strings[i], "bar", 3)) + if (STRNEQLEN(strings[i], "bar", 3)) goto cleanup; if (strings[i][3] != l++) goto cleanup; diff --git a/tests/viruritest.c b/tests/viruritest.c index 48b5865..e58e353 100644 --- a/tests/viruritest.c +++ b/tests/viruritest.c @@ -58,13 +58,13 @@ static int testURIParse(const void *args) if (!(uri = virURIParse(data->uri))) goto cleanup; - if (!STREQ(uri->scheme, data->scheme)) { + if (STRNEQ(uri->scheme, data->scheme)) { VIR_DEBUG("Expected scheme '%s', actual '%s'", data->scheme, uri->scheme); goto cleanup; } - if (!STREQ(uri->server, data->server)) { + if (STRNEQ(uri->server, data->server)) { VIR_DEBUG("Expected server '%s', actual '%s'", data->server, uri->server); goto cleanup; @@ -76,31 +76,31 @@ static int testURIParse(const void *args) goto cleanup; } - if (!STREQ_NULLABLE(uri->path, data->path)) { + if (STRNEQ_NULLABLE(uri->path, data->path)) { VIR_DEBUG("Expected path '%s', actual '%s'", data->path, uri->path); goto cleanup; } - if (!STREQ_NULLABLE(uri->query, data->query)) { + if (STRNEQ_NULLABLE(uri->query, data->query)) { VIR_DEBUG("Expected query '%s', actual '%s'", data->query, uri->query); goto cleanup; } - if (!STREQ_NULLABLE(uri->fragment, data->fragment)) { + if (STRNEQ_NULLABLE(uri->fragment, data->fragment)) { VIR_DEBUG("Expected fragment '%s', actual '%s'", data->fragment, uri->fragment); goto cleanup; } for (i = 0; data->params && data->params[i].name && i < uri->paramsCount; i++) { - if (!STREQ_NULLABLE(data->params[i].name, uri->params[i].name)) { + if (STRNEQ_NULLABLE(data->params[i].name, uri->params[i].name)) { VIR_DEBUG("Expected param name %zu '%s', actual '%s'", i, data->params[i].name, uri->params[i].name); goto cleanup; } - if (!STREQ_NULLABLE(data->params[i].value, uri->params[i].value)) { + if (STRNEQ_NULLABLE(data->params[i].value, uri->params[i].value)) { VIR_DEBUG("Expected param value %zu '%s', actual '%s'", i, data->params[i].value, uri->params[i].value); goto cleanup; @@ -123,7 +123,7 @@ static int testURIParse(const void *args) if (!(uristr = virURIFormat(uri))) goto cleanup; - if (!STREQ(uristr, data->uri_out)) { + if (STRNEQ(uristr, data->uri_out)) { VIR_DEBUG("URI did not roundtrip, expect '%s', actual '%s'", data->uri_out, uristr); goto cleanup; -- 1.9.1

2 1

[libvirt] [PATCH] vsh: print help more often
by Michal Privoznik 21 Oct '15

21 Oct '15

So, consider following scenario: virsh # migrate --help In this case migrate help is printed out. So far so good. However, you start writing this long migrate command (I bet you know the arguments there can get quite long), but then, at some point you need to print out the help. Something like this: virsh # migrate --copy-storage-all --migrate-disks --help In this specific case you just want to see the format that --migrate-disks accepts. So you append --help and expect help to be printed out. Well, it will not, because "--help" is taken as data to --migrate-disks. Therefore we will get this error instead: virsh # migrate --copy-storage-all --migrate-disks --help error: command 'migrate' requires <domain> option error: command 'migrate' requires <desturi> option Teach our parsing code, that --help may occur even in argument data, and therefore anywhere on the command line. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/vsh.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/vsh.c b/tools/vsh.c index e57c324..d67f5de 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -1415,7 +1415,8 @@ vshCommandParse(vshControl *ctl, vshCommandParser *parser) /* if we encountered --help, replace parsed command with * 'help <cmdname>' */ for (tmpopt = first; tmpopt; tmpopt = tmpopt->next) { - if (STRNEQ(tmpopt->def->name, "help")) + if (STRNEQ(tmpopt->def->name, "help") && + STRNEQ_NULLABLE(tmpopt->data, "--help")) continue; const vshCmdDef *help = vshCmddefSearch("help"); -- 2.4.10

4 5

[libvirt] [PATCH] virsh: fix no error when pass a count <= 0 to setvcpus
by Luyao Huang 21 Oct '15

21 Oct '15

https://bugzilla.redhat.com/show_bug.cgi?id=1248277 When count <= 0, the client exit without set an error. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- tools/virsh-domain.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index f7edeeb..b6da684 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6744,8 +6744,12 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptInt(ctl, cmd, "count", &count) < 0 || count <= 0) + if (vshCommandOptInt(ctl, cmd, "count", &count) < 0) goto cleanup; + if (count <= 0) { + vshError(ctl, _("Invalid value '%d' for number of virtual CPUs"), count); + goto cleanup; + } /* none of the options were specified */ if (!current && flags == 0) { -- 1.8.3.1

4 9

[libvirt] [PATCH] conf: fix set the wrong fromconfig when specify addr in config
by Luyao Huang 21 Oct '15

21 Oct '15

https://bugzilla.redhat.com/show_bug.cgi?id=1238338#c6 If the user already specify address in xml, we will set the wrong $fromConfig, which will make libvirt output a wrong error message and make hot-plug fail when hot-plug a pci device (see commit 1e15be1 and 9a12b6c). Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/conf/domain_addr.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index ca5803e..49769f7 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -376,6 +376,14 @@ virDomainPCIAddressReserveSlot(virDomainPCIAddressSetPtr addrs, return virDomainPCIAddressReserveAddr(addrs, addr, flags, true, false); } +static int +virDomainPCIAddressReserveSlotFromConfig(virDomainPCIAddressSetPtr addrs, + virDevicePCIAddressPtr addr, + virDomainPCIConnectFlags flags) +{ + return virDomainPCIAddressReserveAddr(addrs, addr, flags, true, true); +} + int virDomainPCIAddressEnsureAddr(virDomainPCIAddressSetPtr addrs, virDomainDeviceInfoPtr dev) @@ -408,7 +416,8 @@ virDomainPCIAddressEnsureAddr(virDomainPCIAddressSetPtr addrs, addrStr, flags, true)) goto cleanup; - ret = virDomainPCIAddressReserveSlot(addrs, &dev->addr.pci, flags); + ret = virDomainPCIAddressReserveSlotFromConfig(addrs, + &dev->addr.pci, flags); } else { ret = virDomainPCIAddressReserveNextSlot(addrs, dev, flags); } -- 1.8.3.1

2 1

[libvirt] [PATCH 00/12] Have 'buildVol' callers to clean up after themselves
by John Ferlan 20 Oct '15

20 Oct '15

NOTE: Although one may consider this a v2 of : http://www.redhat.com/archives/libvir-list/2015-October/msg00196.html It's more tackling the same problem a different way... Rather than pass a 'created' boolean around, this series investigated each of the 'createVol' and 'buildVol' paths in order to make more conscious decisions related to whether or not a volume was created and to handle failures after creation by deleting the volume/file. The end result is that all the 'buildVol' backends will now delete the volume they created on error paths leaving the storage driver to only need to remove the volume from the pool. As such this series will also revert a prior patch in this area. John Ferlan (12): storage: Remove duplicitous refreshVol in RBD buildVol storage: Remove duplicitous refreshVol in Sheepdog buildVol storage: Fix a resource leak in storageVolCreateXML storage: Track successful creation of LV for removal storage: On error unlink created file in virFileOpen{As|Forked} storage: On error rmdir created directory in virDirCreate[NoFork] storage: Rework error paths for virStorageBackendCreateExecCommand storage: Cleanup failures virStorageBackendCreateExecCommand storage: Cleanup failures in virStorageBackendCreateRaw storage: Pull volume removal from pool in storageVolDeleteInternal Revert "storage: Prior to creating a volume, refresh the pool" storage: On 'buildVol' failure don't delete the volume src/storage/storage_backend.c | 38 +++++++++++++++++------ src/storage/storage_backend_logical.c | 5 ++- src/storage/storage_backend_rbd.c | 3 -- src/storage/storage_backend_sheepdog.c | 5 +-- src/storage/storage_driver.c | 56 ++++++++++++++++++++-------------- src/util/virfile.c | 22 ++++++++++++- 6 files changed, 88 insertions(+), 41 deletions(-) -- 2.1.0

2 41

[libvirt] [PATCH v2] lxc: fuse mount for /proc/cpuinfo
by Cédric Bosdonnat 20 Oct '15

20 Oct '15

We already have a fuse mount to reflect the cgroup memory restrictions in the container. This commit adds the same for the number of available CPUs. Only the CPUs listed by virProcessGetAffinity are shown in the container's cpuinfo. --- src/lxc/lxc_container.c | 42 ++++++++++++------- src/lxc/lxc_fuse.c | 106 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 133 insertions(+), 15 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index a433552..7ae13a8 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1055,24 +1055,38 @@ static int lxcContainerMountProcFuse(virDomainDefPtr def, const char *stateDir) { int ret; - char *meminfo_path = NULL; + char *src_path = NULL; + char *dst_path = NULL; + const char *paths[] = {"meminfo", "cpuinfo"}; + size_t i; - VIR_DEBUG("Mount /proc/meminfo stateDir=%s", stateDir); + for (i = 0; i < 2; i++) { + VIR_DEBUG("Mount /proc/%s stateDir=%s", paths[i], stateDir); + + if ((ret = virAsprintf(&src_path, + "/.oldroot/%s/%s.fuse/%s", + stateDir, + def->name, + paths[i])) < 0) + return ret; + + if ((ret = virAsprintf(&dst_path, + "/proc/%s", + paths[i])) < 0) { + VIR_FREE(src_path); + return ret; + } - if ((ret = virAsprintf(&meminfo_path, - "/.oldroot/%s/%s.fuse/meminfo", - stateDir, - def->name)) < 0) - return ret; + if ((ret = mount(src_path, dst_path, + NULL, MS_BIND, NULL)) < 0) { + virReportSystemError(errno, + _("Failed to mount %s on %s"), + src_path, dst_path); + } - if ((ret = mount(meminfo_path, "/proc/meminfo", - NULL, MS_BIND, NULL)) < 0) { - virReportSystemError(errno, - _("Failed to mount %s on /proc/meminfo"), - meminfo_path); + VIR_FREE(src_path); + VIR_FREE(dst_path); } - - VIR_FREE(meminfo_path); return ret; } #else diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c index 34a69cc..0d60434 100644 --- a/src/lxc/lxc_fuse.c +++ b/src/lxc/lxc_fuse.c @@ -42,6 +42,58 @@ #if WITH_FUSE static const char *fuse_meminfo_path = "/meminfo"; +static const char *fuse_cpuinfo_path = "/cpuinfo"; + +static virBufferPtr lxcProcComputeCpuinfo(void) { + FILE *fd = NULL; + char *line = NULL; + size_t n; + bool writeProc = false; + virBuffer buffer = VIR_BUFFER_INITIALIZER; + virBufferPtr new_cpuinfo = &buffer; + pid_t pid; + virBitmapPtr cpuAffinity = NULL; + + fd = fopen("/proc/cpuinfo", "r"); + if (fd == NULL) { + virReportSystemError(errno, "%s", _("Cannot open /proc/cpuinfo")); + goto error; + } + + pid = getpid(); + if (!(cpuAffinity = virProcessGetAffinity(pid))) + goto error; + + while (getline(&line, &n, fd) > 0) { + if (STRPREFIX(line, "processor\t:")) { + unsigned long cpuid = 0; + char *suffix = NULL; + if (virStrToLong_ul(line + 12, &suffix, 10, &cpuid) < 0) + goto error; + + if (virBitmapGetBit(cpuAffinity, cpuid, &writeProc) < 0) + goto error; + } + + if (writeProc) { + virBufferAdd(new_cpuinfo, line, -1); + + if (virBufferCheckError(new_cpuinfo) < 0) + goto error; + } + } + + cleanup: + VIR_FREE(line); + VIR_FORCE_FCLOSE(fd); + virBitmapFree(cpuAffinity); + return new_cpuinfo; + + error: + virBufferFreeAndReset(new_cpuinfo); + new_cpuinfo = NULL; + goto cleanup; +} static int lxcProcGetattr(const char *path, struct stat *stbuf) { @@ -50,6 +102,7 @@ static int lxcProcGetattr(const char *path, struct stat *stbuf) struct stat sb; struct fuse_context *context = fuse_get_context(); virDomainDefPtr def = (virDomainDefPtr)context->private_data; + virBufferPtr cpuinfo = NULL; memset(stbuf, 0, sizeof(struct stat)); if (virAsprintf(&mempath, "/proc/%s", path) < 0) @@ -76,12 +129,36 @@ static int lxcProcGetattr(const char *path, struct stat *stbuf) stbuf->st_atime = sb.st_atime; stbuf->st_ctime = sb.st_ctime; stbuf->st_mtime = sb.st_mtime; + } else if (STREQ(path, fuse_cpuinfo_path)) { + if (!(cpuinfo = lxcProcComputeCpuinfo())) { + res = -EIO; + goto cleanup; + } + + if (stat(mempath, &sb) < 0) { + res = -errno; + goto cleanup; + } + + stbuf->st_uid = def->idmap.uidmap ? def->idmap.uidmap[0].target : 0; + stbuf->st_gid = def->idmap.gidmap ? def->idmap.gidmap[0].target : 0; + stbuf->st_mode = sb.st_mode; + stbuf->st_nlink = 1; + stbuf->st_blksize = sb.st_blksize; + stbuf->st_size = virBufferUse(cpuinfo); + stbuf->st_blocks = stbuf->st_size / 512; + if (stbuf->st_size % 512 != 0) + stbuf->st_blocks++; + stbuf->st_atime = sb.st_atime; + stbuf->st_ctime = sb.st_ctime; + stbuf->st_mtime = sb.st_mtime; } else { res = -ENOENT; } cleanup: VIR_FREE(mempath); + virBufferFreeAndReset(cpuinfo); return res; } @@ -96,6 +173,7 @@ static int lxcProcReaddir(const char *path, void *buf, filler(buf, ".", NULL, 0); filler(buf, "..", NULL, 0); filler(buf, fuse_meminfo_path + 1, NULL, 0); + filler(buf, fuse_cpuinfo_path + 1, NULL, 0); return 0; } @@ -103,7 +181,8 @@ static int lxcProcReaddir(const char *path, void *buf, static int lxcProcOpen(const char *path ATTRIBUTE_UNUSED, struct fuse_file_info *fi ATTRIBUTE_UNUSED) { - if (!STREQ(path, fuse_meminfo_path)) + if (!STREQ(path, fuse_meminfo_path) && + !STREQ(path, fuse_cpuinfo_path)) return -ENOENT; if ((fi->flags & 3) != O_RDONLY) @@ -234,6 +313,28 @@ static int lxcProcReadMeminfo(char *hostpath, virDomainDefPtr def, return res; } +static int lxcProcReadCpuinfo(char *buf, size_t size, off_t offset) +{ + virBufferPtr new_cpuinfo = lxcProcComputeCpuinfo(); + int new_size = -1; + int copied = -1; + + if (!new_cpuinfo) + goto error; + + copied = size; + new_size = virBufferUse(new_cpuinfo); + + if ((new_size - offset) < size) + copied = new_size - offset; + + memcpy(buf, virBufferCurrentContent(new_cpuinfo) + offset, copied); + + error: + virBufferFreeAndReset(new_cpuinfo); + return copied; +} + static int lxcProcRead(const char *path ATTRIBUTE_UNUSED, char *buf ATTRIBUTE_UNUSED, size_t size ATTRIBUTE_UNUSED, @@ -254,6 +355,9 @@ static int lxcProcRead(const char *path ATTRIBUTE_UNUSED, if (STREQ(path, fuse_meminfo_path)) { if ((res = lxcProcReadMeminfo(hostpath, def, buf, size, offset)) < 0) res = lxcProcHostRead(hostpath, buf, size, offset); + } else if (STREQ(path, fuse_cpuinfo_path)) { + if ((res = lxcProcReadCpuinfo(buf, size, offset)) < 0) + res = lxcProcHostRead(hostpath, buf, size, offset); } VIR_FREE(hostpath); -- 2.1.4

6 18

[libvirt] [PATCH 0/3] NEWS: Split releases by year
by Andrea Bolognani 20 Oct '15

20 Oct '15

As agreed, I've followed up with the cleanups by splitting the huge news.html.in file into separate, smaller files, one per year. Along with the split I've also included a fixed XSLT stylesheet so that we can start shipping a meaningful NEWS file again. Cheers. Andrea Bolognani (3): NEWS: Split releases by year (2005-2011) NEWS: Split releases by year (2012-2015) NEWS: Fix XSLT stylesheet docs/news-2005.html.in | 28 + docs/news-2006.html.in | 354 + docs/news-2007.html.in | 534 ++ docs/news-2008.html.in | 580 ++ docs/news-2009.html.in | 1603 ++++ docs/news-2010.html.in | 2218 ++++++ docs/news-2011.html.in | 3314 +++++++++ docs/news-2012.html.in | 3012 ++++++++ docs/news-2013.html.in | 3675 ++++++++++ docs/news-2014.html.in | 3418 +++++++++ docs/news.html.in | 18544 +---------------------------------------------- docs/news.xsl | 30 +- 12 files changed, 18759 insertions(+), 18551 deletions(-) create mode 100644 docs/news-2005.html.in create mode 100644 docs/news-2006.html.in create mode 100644 docs/news-2007.html.in create mode 100644 docs/news-2008.html.in create mode 100644 docs/news-2009.html.in create mode 100644 docs/news-2010.html.in create mode 100644 docs/news-2011.html.in create mode 100644 docs/news-2012.html.in create mode 100644 docs/news-2013.html.in create mode 100644 docs/news-2014.html.in -- 2.4.3

3 6

[libvirt] [PATCH 1/2] Prefer STREQ and STRNEQ
by Ishmanpreet Khera 20 Oct '15

20 Oct '15

use STRNEQ instead of !STREQ to remove inconsistency. Signed-off-by: Ishmanpreet Kaur Khera <khera.ishman(a)gmail.com> --- src/bhyve/bhyve_driver.c | 2 +- src/conf/network_conf.c | 4 ++-- src/conf/nwfilter_conf.c | 2 +- src/conf/nwfilter_params.c | 2 +- src/conf/storage_conf.c | 2 +- src/lxc/lxc_fuse.c | 4 ++-- src/openvz/openvz_driver.c | 2 +- src/qemu/qemu_command.c | 6 +++--- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_hotplug.c | 2 +- src/security/security_manager.c | 2 +- src/security/security_selinux.c | 12 ++++++------ src/storage/storage_backend_logical.c | 2 +- src/util/virfile.c | 2 +- src/util/virsystemd.c | 2 +- src/vz/vz_driver.c | 2 +- src/vz/vz_sdk.c | 2 +- src/xen/xend_internal.c | 2 +- src/xenconfig/xen_sxpr.c | 2 +- tests/commandtest.c | 10 +++++----- tests/securityselinuxlabeltest.c | 2 +- tests/virauthconfigtest.c | 2 +- tests/virbitmaptest.c | 12 ++++++------ tests/vircgrouptest.c | 2 +- tests/virkeyfiletest.c | 8 ++++---- tests/virnetsockettest.c | 2 +- tests/virtypedparamtest.c | 2 +- tests/viruritest.c | 16 ++++++++-------- 28 files changed, 56 insertions(+), 56 deletions(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index d44cf2c..e5d56e9 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -197,7 +197,7 @@ bhyveConnectOpen(virConnectPtr conn, if (conn->uri->server) return VIR_DRV_OPEN_DECLINED; - if (!STREQ_NULLABLE(conn->uri->path, "/system")) { + if (STRNEQ_NULLABLE(conn->uri->path, "/system")) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unexpected bhyve URI path '%s', try bhyve:///system"), conn->uri->path); diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index c1cbd76..0ffb325 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -3042,7 +3042,7 @@ virNetworkLoadState(virNetworkObjListPtr nets, if (!(def = virNetworkDefParseXML(ctxt))) goto error; - if (!STREQ(name, def->name)) { + if (STRNEQ(name, def->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Network config filename '%s'" " does not match network name '%s'"), @@ -3152,7 +3152,7 @@ virNetworkObjPtr virNetworkLoadConfig(virNetworkObjListPtr nets, if (!(def = virNetworkDefParseFile(configFile))) goto error; - if (!STREQ(name, def->name)) { + if (STRNEQ(name, def->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Network config filename '%s'" " does not match network name '%s'"), diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index aed82ad..08c4264 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -3082,7 +3082,7 @@ virNWFilterObjAssignDef(virNWFilterObjListPtr nwfilters, nwfilter = virNWFilterObjFindByUUID(nwfilters, def->uuid); if (nwfilter) { - if (!STREQ(def->name, nwfilter->def->name)) { + if (STRNEQ(def->name, nwfilter->def->name)) { virReportError(VIR_ERR_OPERATION_FAILED, _("filter with same UUID but different name " "('%s') already exists"), diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c index 0ac8baa..b6c6e78 100644 --- a/src/conf/nwfilter_params.c +++ b/src/conf/nwfilter_params.c @@ -444,7 +444,7 @@ virNWFilterVarCombIterEntryAreUniqueEntries(virNWFilterVarCombIterEntryPtr cie, /* should never occur to step on a NULL here */ return true; } - if (!STREQ(virNWFilterVarValueGetNthValue(tmp, cie->curValue), + if (STRNEQ(virNWFilterVarValueGetNthValue(tmp, cie->curValue), virNWFilterVarValueGetNthValue(tmp, i))) { isSame = false; break; diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 9dae1a3..9b8abea 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1873,7 +1873,7 @@ virStoragePoolLoadState(virStoragePoolObjListPtr pools, if (!(def = virStoragePoolDefParseXML(ctxt))) goto error; - if (!STREQ(name, def->name)) { + if (STRNEQ(name, def->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Storage pool state file '%s' does not match " "pool name '%s'"), diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c index 34a69cc..862dca3 100644 --- a/src/lxc/lxc_fuse.c +++ b/src/lxc/lxc_fuse.c @@ -90,7 +90,7 @@ static int lxcProcReaddir(const char *path, void *buf, off_t offset ATTRIBUTE_UNUSED, struct fuse_file_info *fi ATTRIBUTE_UNUSED) { - if (!STREQ(path, "/")) + if (STRNEQ(path, "/")) return -ENOENT; filler(buf, ".", NULL, 0); @@ -103,7 +103,7 @@ static int lxcProcReaddir(const char *path, void *buf, static int lxcProcOpen(const char *path ATTRIBUTE_UNUSED, struct fuse_file_info *fi ATTRIBUTE_UNUSED) { - if (!STREQ(path, fuse_meminfo_path)) + if (STRNEQ(path, fuse_meminfo_path)) return -ENOENT; if ((fi->flags & 3) != O_RDONLY) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index d78e2f5..b8c0f50 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -2048,7 +2048,7 @@ openvzUpdateDevice(virDomainDefPtr vmdef, cur = vmdef->fss[pos]; /* We only allow updating the quota */ - if (!STREQ(cur->src, fs->src) + if (STRNEQ(cur->src, fs->src) || cur->type != fs->type || cur->accessmode != fs->accessmode || cur->wrpolicy != fs->wrpolicy diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f727d0b..d664bf1 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3008,7 +3008,7 @@ qemuParseDriveURIString(virDomainDiskDefPtr def, virURIPtr uri, if (transp) *transp++ = 0; - if (!STREQ(uri->scheme, scheme)) { + if (STRNEQ(uri->scheme, scheme)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid transport/scheme '%s'"), uri->scheme); goto error; @@ -10030,7 +10030,7 @@ qemuBuildCommandLine(virConnectPtr conn, virDomainDiskDefPtr disk = def->disks[i]; if (disk->src->driverName != NULL && - !STREQ(disk->src->driverName, "qemu")) { + STRNEQ(disk->src->driverName, "qemu")) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unsupported driver name '%s' for disk '%s'"), disk->src->driverName, disk->src->path); @@ -12728,7 +12728,7 @@ qemuParseCommandLineCPU(virDomainDefPtr dom, if (VIR_STRDUP(model, tokens[i]) < 0) goto cleanup; - if (!STREQ(model, "qemu32") && !STREQ(model, "qemu64")) { + if (STRNEQ(model, "qemu32") && STRNEQ(model, "qemu64")) { if (!(cpu = qemuInitGuestCPU(dom))) goto cleanup; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index bdc0e67..890d8ed 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1061,7 +1061,7 @@ qemuDomainDefPostParse(virDomainDefPtr def, if (!STRPREFIX(def->os.machine, "pc-0.") && !STRPREFIX(def->os.machine, "pc-1.") && !STRPREFIX(def->os.machine, "pc-i440") && - !STREQ(def->os.machine, "pc") && + STRNEQ(def->os.machine, "pc") && !STRPREFIX(def->os.machine, "rhel")) break; addPCIRoot = true; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index afc5408..470ab6a 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -783,7 +783,7 @@ qemuDomainAttachDeviceDiskLive(virConnectPtr conn, const char *driverName = virDomainDiskGetDriver(disk); const char *src = virDomainDiskGetSource(disk); - if (driverName && !STREQ(driverName, "qemu")) { + if (driverName && STRNEQ(driverName, "qemu")) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unsupported driver name '%s' for disk '%s'"), driverName, src); diff --git a/src/security/security_manager.c b/src/security/security_manager.c index 5b05a47..07a0522 100644 --- a/src/security/security_manager.c +++ b/src/security/security_manager.c @@ -130,7 +130,7 @@ int virSecurityManagerStackAddNested(virSecurityManagerPtr stack, virSecurityManagerPtr nested) { - if (!STREQ("stack", stack->drv->name)) + if (STRNEQ("stack", stack->drv->name)) return -1; return virSecurityStackAddNested(stack, nested); } diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index c2464c2..80b0886 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -2061,7 +2061,7 @@ virSecuritySELinuxSecurityVerify(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, if (secdef == NULL) return 0; - if (!STREQ(SECURITY_SELINUX_NAME, secdef->model)) { + if (STRNEQ(SECURITY_SELINUX_NAME, secdef->model)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("security label driver mismatch: " "'%s' model configured for domain, but " @@ -2092,7 +2092,7 @@ virSecuritySELinuxSetSecurityProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UN return 0; VIR_DEBUG("label=%s", secdef->label); - if (!STREQ(SECURITY_SELINUX_NAME, secdef->model)) { + if (STRNEQ(SECURITY_SELINUX_NAME, secdef->model)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("security label driver mismatch: " "'%s' model configured for domain, but " @@ -2126,7 +2126,7 @@ virSecuritySELinuxSetSecurityChildProcessLabel(virSecurityManagerPtr mgr ATTRIBU return 0; VIR_DEBUG("label=%s", secdef->label); - if (!STREQ(SECURITY_SELINUX_NAME, secdef->model)) { + if (STRNEQ(SECURITY_SELINUX_NAME, secdef->model)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("security label driver mismatch: " "'%s' model configured for domain, but " @@ -2155,7 +2155,7 @@ virSecuritySELinuxSetSecurityDaemonSocketLabel(virSecurityManagerPtr mgr ATTRIBU if (!secdef || !secdef->label) return 0; - if (!STREQ(SECURITY_SELINUX_NAME, secdef->model)) { + if (STRNEQ(SECURITY_SELINUX_NAME, secdef->model)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("security label driver mismatch: " "'%s' model configured for domain, but " @@ -2202,7 +2202,7 @@ virSecuritySELinuxSetSecuritySocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNU if (!secdef || !secdef->label) return 0; - if (!STREQ(SECURITY_SELINUX_NAME, secdef->model)) { + if (STRNEQ(SECURITY_SELINUX_NAME, secdef->model)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("security label driver mismatch: " "'%s' model configured for domain, but " @@ -2240,7 +2240,7 @@ virSecuritySELinuxClearSecuritySocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_U if (!secdef || !secdef->label) return 0; - if (!STREQ(SECURITY_SELINUX_NAME, secdef->model)) { + if (STRNEQ(SECURITY_SELINUX_NAME, secdef->model)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("security label driver mismatch: " "'%s' model configured for domain, but " diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index 070f2bd..90bfa58 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -147,7 +147,7 @@ virStorageBackendLogicalMakeVol(char **const groups, * (lvs outputs "[$lvname_vorigin] for field "origin" if the * lv is created with "--virtualsize"). */ - if (groups[1] && !STREQ(groups[1], "") && (groups[1][0] != '[')) { + if (groups[1] && STRNEQ(groups[1], "") && (groups[1][0] != '[')) { if (VIR_ALLOC(vol->target.backingStore) < 0) goto cleanup; diff --git a/src/util/virfile.c b/src/util/virfile.c index a81f04c..33c7ff1 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -1008,7 +1008,7 @@ virFileStripSuffix(char *str, const char *suffix) if (len < suffixlen) return 0; - if (!STREQ(str + len - suffixlen, suffix)) + if (STRNEQ(str + len - suffixlen, suffix)) return 0; str[len-suffixlen] = '\0'; diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 54c409d..1354b08 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -375,7 +375,7 @@ int virSystemdTerminateMachine(const char *name, goto cleanup; if (error.code == VIR_ERR_ERROR && - !STREQ_NULLABLE("org.freedesktop.machine1.NoSuchMachine", + STRNEQ_NULLABLE("org.freedesktop.machine1.NoSuchMachine", error.str1)) { virReportErrorObject(&error); goto cleanup; diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index d0b4692..c4ba982 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -301,7 +301,7 @@ vzConnectOpen(virConnectPtr conn, return VIR_DRV_OPEN_DECLINED; /* From this point on, the connection is for us. */ - if (!STREQ_NULLABLE(conn->uri->path, "/system")) { + if (STRNEQ_NULLABLE(conn->uri->path, "/system")) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unexpected Virtuozzo URI path '%s', try vz:///system"), conn->uri->path); diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 7a2afd6..d14c732 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -2026,7 +2026,7 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, virDomainDefPtr def) } } else { if (def->os.nBootDevs != 0 || - !STREQ_NULLABLE(def->os.init, "/sbin/init") || + STRNEQ_NULLABLE(def->os.init, "/sbin/init") || (def->os.initargv != NULL && def->os.initargv[0] != NULL)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index b81c0b7..62ce930 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -2552,7 +2552,7 @@ xenDaemonDomainSetAutostart(virConnectPtr conn, if (autonode) { const char *val = (autonode->u.s.car->kind == SEXPR_VALUE ? autonode->u.s.car->u.value : NULL); - if (!val || (!STREQ(val, "ignore") && !STREQ(val, "start"))) { + if (!val || (STRNEQ(val, "ignore") && STRNEQ(val, "start"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("unexpected value from on_xend_start")); goto error; diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c index 033b0eb..7fc9c9d 100644 --- a/src/xenconfig/xen_sxpr.c +++ b/src/xenconfig/xen_sxpr.c @@ -2345,7 +2345,7 @@ xenFormatSxpr(virConnectPtr conn, /* Only xend <= 3.0.2 wants cdrom config here */ if (xendConfigVersion != XEND_CONFIG_VERSION_3_0_2) break; - if (!STREQ(def->disks[i]->dst, "hdc") || !src) + if (STRNEQ(def->disks[i]->dst, "hdc") || !src) break; virBufferEscapeSexpr(&buf, "(cdrom '%s')", src); diff --git a/tests/commandtest.c b/tests/commandtest.c index f001a39..cf5f44a 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -516,7 +516,7 @@ static int test13(const void *unused ATTRIBUTE_UNUSED) virCommandFree(cmd); cmd = NULL; - if (!STREQ(outactual, outexpect)) { + if (STRNEQ(outactual, outexpect)) { virtTestDifference(stderr, outexpect, outactual); goto cleanup; } @@ -580,15 +580,15 @@ static int test14(const void *unused ATTRIBUTE_UNUSED) if (!jointactual) goto cleanup; - if (!STREQ(outactual, outexpect)) { + if (STRNEQ(outactual, outexpect)) { virtTestDifference(stderr, outexpect, outactual); goto cleanup; } - if (!STREQ(erractual, errexpect)) { + if (STRNEQ(erractual, errexpect)) { virtTestDifference(stderr, errexpect, erractual); goto cleanup; } - if (!STREQ(jointactual, jointexpect)) { + if (STRNEQ(jointactual, jointexpect)) { virtTestDifference(stderr, jointexpect, jointactual); goto cleanup; } @@ -666,7 +666,7 @@ static int test16(const void *unused ATTRIBUTE_UNUSED) goto cleanup; } - if (!STREQ(outactual, outexpect)) { + if (STRNEQ(outactual, outexpect)) { virtTestDifference(stderr, outexpect, outactual); goto cleanup; } diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabeltest.c index 86660f4..c82b3f2 100644 --- a/tests/securityselinuxlabeltest.c +++ b/tests/securityselinuxlabeltest.c @@ -282,7 +282,7 @@ testSELinuxCheckLabels(testSELinuxFile *files, size_t nfiles) return -1; } } - if (!STREQ_NULLABLE(files[i].context, ctx)) { + if (STRNEQ_NULLABLE(files[i].context, ctx)) { virReportError(VIR_ERR_INTERNAL_ERROR, "File %s context '%s' did not match epected '%s'", files[i].file, ctx, files[i].context); diff --git a/tests/virauthconfigtest.c b/tests/virauthconfigtest.c index d9e05fd..4c380b9 100644 --- a/tests/virauthconfigtest.c +++ b/tests/virauthconfigtest.c @@ -60,7 +60,7 @@ static int testAuthLookup(const void *args) if (data->expect) { if (!actual || - !STREQ(actual, data->expect)) { + STRNEQ(actual, data->expect)) { VIR_WARN("Expected value '%s' for '%s' '%s' '%s', but got '%s'", data->expect, data->hostname, data->service, data->credname, diff --git a/tests/virbitmaptest.c b/tests/virbitmaptest.c index a6e9a38..8e458d2 100644 --- a/tests/virbitmaptest.c +++ b/tests/virbitmaptest.c @@ -355,7 +355,7 @@ test6(const void *v ATTRIBUTE_UNUSED) if (!str) goto error; - if (!STREQ(str, "")) + if (STRNEQ(str, "")) goto error; VIR_FREE(str); @@ -365,7 +365,7 @@ test6(const void *v ATTRIBUTE_UNUSED) if (!str) goto error; - if (!STREQ(str, "0")) + if (STRNEQ(str, "0")) goto error; VIR_FREE(str); @@ -376,7 +376,7 @@ test6(const void *v ATTRIBUTE_UNUSED) if (!str) goto error; - if (!STREQ(str, "0,4-5")) + if (STRNEQ(str, "0,4-5")) goto error; VIR_FREE(str); @@ -386,7 +386,7 @@ test6(const void *v ATTRIBUTE_UNUSED) if (!str) goto error; - if (!STREQ(str, "0,4-6")) + if (STRNEQ(str, "0,4-6")) goto error; VIR_FREE(str); @@ -399,7 +399,7 @@ test6(const void *v ATTRIBUTE_UNUSED) if (!str) goto error; - if (!STREQ(str, "0,4-6,13-16")) + if (STRNEQ(str, "0,4-6,13-16")) goto error; VIR_FREE(str); @@ -410,7 +410,7 @@ test6(const void *v ATTRIBUTE_UNUSED) if (!str) goto error; - if (!STREQ(str, "0,4-6,13-16,62-63")) + if (STRNEQ(str, "0,4-6,13-16,62-63")) goto error; diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c index 7a87640..731ecc4 100644 --- a/tests/vircgrouptest.c +++ b/tests/vircgrouptest.c @@ -662,7 +662,7 @@ static int testCgroupGetPercpuStats(const void *args ATTRIBUTE_UNUSED) } for (i = 0; i < EXPECTED_NCPUS; i++) { - if (!STREQ(params[i].field, VIR_DOMAIN_CPU_STATS_CPUTIME)) { + if (STRNEQ(params[i].field, VIR_DOMAIN_CPU_STATS_CPUTIME)) { fprintf(stderr, "Wrong parameter name value from virCgroupGetPercpuStats at %zu (is: %s)\n", i, params[i].field); diff --git a/tests/virkeyfiletest.c b/tests/virkeyfiletest.c index c31d2aa..3908fa8 100644 --- a/tests/virkeyfiletest.c +++ b/tests/virkeyfiletest.c @@ -70,17 +70,17 @@ static int testParse(const void *args ATTRIBUTE_UNUSED) VIR_DEBUG("Missing Value 'Foo.three'"); goto cleanup; } - if (!STREQ(virKeyFileGetValueString(kf, "Foo", "one"), + if (STRNEQ(virKeyFileGetValueString(kf, "Foo", "one"), "The first entry is here")) { VIR_DEBUG("Wrong value for 'Foo.one'"); goto cleanup; } - if (!STREQ(virKeyFileGetValueString(kf, "Foo", "two"), + if (STRNEQ(virKeyFileGetValueString(kf, "Foo", "two"), "The second entry")) { VIR_DEBUG("Wrong value for 'Foo.one'"); goto cleanup; } - if (!STREQ(virKeyFileGetValueString(kf, "Foo", "three"), + if (STRNEQ(virKeyFileGetValueString(kf, "Foo", "three"), "The third entry")) { VIR_DEBUG("Wrong value for 'Foo.one'"); goto cleanup; @@ -94,7 +94,7 @@ static int testParse(const void *args ATTRIBUTE_UNUSED) VIR_DEBUG("Missing Value 'Bar.one'"); goto cleanup; } - if (!STREQ(virKeyFileGetValueString(kf, "Bar", "one"), + if (STRNEQ(virKeyFileGetValueString(kf, "Bar", "one"), "The first entry in second group")) { VIR_DEBUG("Wrong value for 'Bar.one'"); goto cleanup; diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c index 1ababad..ce9eeab 100644 --- a/tests/virnetsockettest.c +++ b/tests/virnetsockettest.c @@ -406,7 +406,7 @@ static int testSocketSSH(const void *opaque) } buf[rv] = '\0'; - if (!STREQ(buf, data->expectOut)) { + if (STRNEQ(buf, data->expectOut)) { virtTestDifference(stderr, data->expectOut, buf); goto cleanup; } diff --git a/tests/virtypedparamtest.c b/tests/virtypedparamtest.c index b7bd72f..f4a5792 100644 --- a/tests/virtypedparamtest.c +++ b/tests/virtypedparamtest.c @@ -188,7 +188,7 @@ testTypedParamsGetStringList(const void *opaque ATTRIBUTE_UNUSED) goto cleanup; continue; } - if (!STREQLEN(strings[i], "bar", 3)) + if (STRNEQLEN(strings[i], "bar", 3)) goto cleanup; if (strings[i][3] != l++) goto cleanup; diff --git a/tests/viruritest.c b/tests/viruritest.c index 48b5865..e58e353 100644 --- a/tests/viruritest.c +++ b/tests/viruritest.c @@ -58,13 +58,13 @@ static int testURIParse(const void *args) if (!(uri = virURIParse(data->uri))) goto cleanup; - if (!STREQ(uri->scheme, data->scheme)) { + if (STRNEQ(uri->scheme, data->scheme)) { VIR_DEBUG("Expected scheme '%s', actual '%s'", data->scheme, uri->scheme); goto cleanup; } - if (!STREQ(uri->server, data->server)) { + if (STRNEQ(uri->server, data->server)) { VIR_DEBUG("Expected server '%s', actual '%s'", data->server, uri->server); goto cleanup; @@ -76,31 +76,31 @@ static int testURIParse(const void *args) goto cleanup; } - if (!STREQ_NULLABLE(uri->path, data->path)) { + if (STRNEQ_NULLABLE(uri->path, data->path)) { VIR_DEBUG("Expected path '%s', actual '%s'", data->path, uri->path); goto cleanup; } - if (!STREQ_NULLABLE(uri->query, data->query)) { + if (STRNEQ_NULLABLE(uri->query, data->query)) { VIR_DEBUG("Expected query '%s', actual '%s'", data->query, uri->query); goto cleanup; } - if (!STREQ_NULLABLE(uri->fragment, data->fragment)) { + if (STRNEQ_NULLABLE(uri->fragment, data->fragment)) { VIR_DEBUG("Expected fragment '%s', actual '%s'", data->fragment, uri->fragment); goto cleanup; } for (i = 0; data->params && data->params[i].name && i < uri->paramsCount; i++) { - if (!STREQ_NULLABLE(data->params[i].name, uri->params[i].name)) { + if (STRNEQ_NULLABLE(data->params[i].name, uri->params[i].name)) { VIR_DEBUG("Expected param name %zu '%s', actual '%s'", i, data->params[i].name, uri->params[i].name); goto cleanup; } - if (!STREQ_NULLABLE(data->params[i].value, uri->params[i].value)) { + if (STRNEQ_NULLABLE(data->params[i].value, uri->params[i].value)) { VIR_DEBUG("Expected param value %zu '%s', actual '%s'", i, data->params[i].value, uri->params[i].value); goto cleanup; @@ -123,7 +123,7 @@ static int testURIParse(const void *args) if (!(uristr = virURIFormat(uri))) goto cleanup; - if (!STREQ(uristr, data->uri_out)) { + if (STRNEQ(uristr, data->uri_out)) { VIR_DEBUG("URI did not roundtrip, expect '%s', actual '%s'", data->uri_out, uristr); goto cleanup; -- 1.9.1

2 1

[libvirt] [PATCH 2/2] Prefer STREQ and STRNEQ
by Ishmanpreet Khera 20 Oct '15

20 Oct '15

new syntax-check rule for !STREQ and !STRNEQ so that we don't end up in the same situation again. Signed-off-by: Ishmanpreet Kaur Khera <khera.ishman(a)gmail.com> --- cfg.mk | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/cfg.mk b/cfg.mk index e436434..7343dfc 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1011,6 +1011,18 @@ sc_prohibit_pthread_create: halt="avoid using 'pthread_create', use 'virThreadCreate' instead" \ $(_sc_search_regexp) +sc_prohibit_not_streq: + @prohibit='!STREQ' \ + exclude='exempt from syntax-check' \ + halt='Use STRNEQ instead of !STREQ' \ + $(_sc_search_regexp) + +sc_prohibit_not_strneq: + @prohibit='!STRNEQ' \ + exclude='exempt from syntax-check' \ + halt='Use STREQ instead of !STRNEQ' \ + $(_sc_search_regexp) + # We don't use this feature of maint.mk. prev_version_file = /dev/null @@ -1213,3 +1225,9 @@ exclude_file_name_regexp--sc_prohibit_sysconf_pagesize = \ exclude_file_name_regexp--sc_prohibit_pthread_create = \ ^(cfg\.mk|src/util/virthread\.c|tests/.*)$$ + +exclude_file_name_regexp--sc_prohibit_not_streq = \ + ^tests/.*\.[ch]$$ + +exclude_file_name_regexp--sc_prohibit_not_strneq = \ + ^tests/.*\.[ch]$$ -- 1.9.1

1 1

[libvirt] [PATCH v2 0/3] vz: implement some API calls
by Maxim Nestratov 20 Oct '15

20 Oct '15

v1-v2 change: - removed vzConnectGetType - addressed comments on vzConnectGetMaxVcpus Maxim Nestratov (3): vz: implement connectGetMaxVcpus API calls vz: implement API calls of nodeGetxxx family vz: implement some domain API calls src/vz/vz_driver.c | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) -- 2.4.3

2 4

[libvirt] [PATCH 1/3] vz: implement connectGetType and connectGetMaxVcpus API calls
by Maxim Nestratov 19 Oct '15

19 Oct '15

From: Maxim Nestratov <mnestratov(a)virtuozzo.com> As a connection type we report 'vz'. And because we have no limitation for maximal number of vcpus in containers we report as maximum 1028 just for the sake of common sence. Signed-off-by: Maxim Nestratov <mnestratov(a)virtuozzo.com> --- src/vz/vz_driver.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 15dc70f..3cd6096 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -1337,12 +1337,31 @@ vzDomainMemoryStats(virDomainPtr domain, return ret; } +static int vzConnectGetMaxVcpus(virConnectPtr conn ATTRIBUTE_UNUSED, + const char *type) +{ + /* As far as we have no limitation for containers + * we report maximum */ + if (type == NULL || STRCASEEQ(type, "vz")) + return 1028; + + virReportError(VIR_ERR_INVALID_ARG, + _("unknown type '%s'"), type); + return -1; +} + +static const char *vzConnectGetType(virConnectPtr conn ATTRIBUTE_UNUSED) { + return "vz"; +} + static virHypervisorDriver vzDriver = { .name = "vz", .connectOpen = vzConnectOpen, /* 0.10.0 */ .connectClose = vzConnectClose, /* 0.10.0 */ .connectGetVersion = vzConnectGetVersion, /* 0.10.0 */ .connectGetHostname = vzConnectGetHostname, /* 0.10.0 */ + .connectGetType = vzConnectGetType, /* 1.2.21 */ + .connectGetMaxVcpus = vzConnectGetMaxVcpus, /* 1.2.21 */ .nodeGetInfo = vzNodeGetInfo, /* 0.10.0 */ .connectGetCapabilities = vzConnectGetCapabilities, /* 0.10.0 */ .connectBaselineCPU = vzConnectBaselineCPU, /* 1.2.6 */ -- 1.7.1

3 6

[libvirt] [PATCHv3 0/2] Added waiting for DAD to finish for bridge address.
by Maxim Perevedentsev 19 Oct '15

19 Oct '15

This is a fix for commit db488c79173b240459c7754f38c3c6af9b432970 dnsmasq main process which is relied on when waiting for DAD to complete exits without actually waiting for DAD. This is dnsmasq daemon's task. It seems to be a race that DAD finished before dnsmasq main process exited. The above commit needs the execution to block until DAD finishes for bridge IPv6 address because then it closes dummy tap device. Thus we need to ensure this ourselves. So we periodically poll the kernel using netlink and check whether there are any IPv6 addresses assigned to bridge which have 'tentative' state. After DAD is finished, execution continues. I guess that is what dnsmasq was assumed to do. We use netlink to dump information about existing IPv6 addresses. Netlink's response is a multi-part message. Unfortunately, the current implementation of virNetlink treats such messages as faulty and throws an error. So the patch 2/2 adds multi-part nelink response support. Update v2: fixed syntax. Update v3: moved to virnetdev. Resend: These patches were ignored and buried long ago :-( Maxim Perevedentsev (2): network: added waiting for DAD to finish for bridge address. netlink: add support for multi-part netlink messages. src/libvirt_private.syms | 1 + src/network/bridge_driver.c | 35 +++++++++- src/util/virnetdev.c | 160 ++++++++++++++++++++++++++++++++++++++++++++ src/util/virnetdev.h | 2 + src/util/virnetlink.c | 4 +- 5 files changed, 200 insertions(+), 2 deletions(-) -- 1.8.3.1

3 10

[libvirt] [PATCH v1 00/23] Keep original seclabel
by Michal Privoznik 19 Oct '15

19 Oct '15

So, you may be familiar with this already. Well, I've tried to get these patches in like a year ago (or even more). Point is, these ones are new, written from scratch. However, still based on idea, that virtlockd will keep the track of the original seclabels. So far only DAC driver is fixed, but the infrastructure I'm proposing here is easily extensible to other drivers too. Even if there's some disagreement on the design, the first few patches fix some bugs, so they should make it in. Michal Privoznik (23): virtlockd: Don't SIGSEGV on SIGUSR1 security_dac: Fix TODO marks virSecurityDACSetOwnershipInternal: Don't chown so often security_dac: Introduce remember/recall stubs virSecurityDACSetOwnership: Pass virSecurityDACDataPtr virSecurityDACRestoreSecurityFileLabel: Pass virSecurityDACDataPtr security_dac: Limit usage of virSecurityDACSetOwnershipInternal security_dac: Plug in remember/recall APIs lock_protocol: Add two new remote procedures lock_daemon: Switch to wrapper locking functions locking: Introduce virSeclabelSpace virtlockd: Work virSeclabelSpace in virLockDriver: Introduce virLockDriverRemember and virLockDriverRecall lock_driver_nop: Implement remember and recall APIs lock_driver_lockd: Implement remember and recall APIs lock_manager: Implement remember & recall APIs locking: Favour enum type over int lock_driver: Introduce VIR_LOCK_MANAGER_OBJECT_TYPE_SECLABEL virSecurityManagerNewDAC: Pass locking plugin in security_dac: Remember security labels security_dac: Restore original owner more often security: Introduce virSecurityManagerDomainRestoreDirLabel qemuProcessStop: Restore seclabels on dirs too cfg.mk | 2 +- po/POTFILES.in | 1 + src/Makefile.am | 3 + src/libvirt_private.syms | 3 + src/lock_protocol-structs | 15 + src/locking/lock_daemon.c | 69 ++++- src/locking/lock_daemon.h | 8 + src/locking/lock_daemon_dispatch.c | 68 +++++ src/locking/lock_daemon_seclabels.c | 545 ++++++++++++++++++++++++++++++++++++ src/locking/lock_daemon_seclabels.h | 43 +++ src/locking/lock_driver.h | 42 ++- src/locking/lock_driver_lockd.c | 103 ++++++- src/locking/lock_driver_nop.c | 28 +- src/locking/lock_driver_sanlock.c | 4 +- src/locking/lock_manager.c | 36 ++- src/locking/lock_manager.h | 13 +- src/locking/lock_protocol.x | 29 +- src/qemu/qemu_driver.c | 3 +- src/qemu/qemu_process.c | 22 +- src/security/security_dac.c | 288 +++++++++++++++---- src/security/security_dac.h | 2 + src/security/security_driver.h | 5 +- src/security/security_manager.c | 20 +- src/security/security_manager.h | 7 +- src/security/security_selinux.c | 16 ++ src/security/security_stack.c | 20 ++ 26 files changed, 1310 insertions(+), 85 deletions(-) create mode 100644 src/locking/lock_daemon_seclabels.c create mode 100644 src/locking/lock_daemon_seclabels.h -- 2.4.9

3 49

[libvirt] Need help problem with libvirt
by suresh knv 19 Oct '15

19 Oct '15

Hi, I am trying to install libvirt 1.2.2 on arm64 board with xen. It got installed successfully but when i run the command virsh list --all it is taking too long time and not responding application hangs. When I tried with strace virsh list --all these are the last few lines of the log futex(0x7fae646c48, FUTEX_WAKE_PRIVATE, 2147483647) = 0 gettid() = 8589 gettid() = 8589 gettid() = 8589 gettid() = 8589 gettid() = 8589 gettid() = 8589 gettid() = 8589 gettid() = 8589 gettid() = 8589 gettid() = 8589 gettid() = 8589 gettid() = 8589 gettid() = 8589 gettid() = 8589 gettid() = 8589 write(5, "\0", 1) = 1 futex(0x7fae5e56d0, FUTEX_WAKE_PRIVATE, 1) = 1 rt_sigprocmask(SIG_BLOCK, [PIPE CHLD WINCH], [], 8) = 0 ppoll([{fd=6, events=POLLOUT}, {fd=7, events=POLLIN}], 2, NULL, NULL, 0) = 1 ([{fd=6, revents=POLLOUT}]) rt_sigprocmask(SIG_SETMASK, [], NULL, 8) = 0 write(6, "\0\0\0\34 \0\200\206\0\0\0\1\0\0\0B\0\0\0\0\0\0\0\0\0\0\0\0", 28) = 28 rt_sigprocmask(SIG_BLOCK, [PIPE CHLD WINCH], [], 8) = 0 ppoll([{fd=6, events=POLLIN}, {fd=7, events=POLLIN}], 2, NULL, NULL, 0 I am attaching the complete log with the mail. Can anyone suggest what is going wrong? Thanks Suresh KN V

2 2

[libvirt] [PATCH 0/9] Introduce virt-admin client
by Erik Skultety 16 Oct '15

16 Oct '15

Erik Skultety (9): libvirt: Export libvirt config getters by moving them to util virt-admin: Introduce first working skeleton admin: Do not generate remoteAdminConnect{Open,Close} admin: Add support for connection close callbacks admin: Introduce virAdmConnectGetLibVersion admin: Add URI support and introduce virAdmGetDefaultURI virt-admin: Introduce vshAdmCatchDisconnect handler virt-admin: Register async IO event polling virt-admin: Provide a man page for virt-admin .gitignore | 1 + daemon/admin_server.c | 9 + daemon/libvirtd.c | 3 +- include/libvirt/libvirt-admin.h | 25 ++ po/POTFILES.in | 2 + src/admin/admin_protocol.x | 15 +- src/datatypes.c | 24 ++ src/datatypes.h | 15 +- src/libvirt-admin.c | 387 ++++++++++++++++++-- src/libvirt.c | 55 +-- src/libvirt_admin_private.syms | 1 + src/libvirt_admin_public.syms | 5 + src/libvirt_private.syms | 2 +- src/rpc/gendispatch.pl | 11 +- src/util/virconf.c | 52 +++ src/util/virconf.h | 2 +- tools/Makefile.am | 36 +- tools/virt-admin.c | 759 ++++++++++++++++++++++++++++++++++++++++ tools/virt-admin.h | 71 ++++ tools/virt-admin.pod | 297 ++++++++++++++++ 20 files changed, 1675 insertions(+), 97 deletions(-) create mode 100644 tools/virt-admin.c create mode 100644 tools/virt-admin.h create mode 100644 tools/virt-admin.pod -- 2.4.3

3 19

[libvirt] [PATCH v3] Close the source fd if the destination qemu exits during tunnelled migration
by Shivaprasad G Bhat 16 Oct '15

16 Oct '15

Tunnelled migration can hang if the destination qemu exits despite all the ABI checks. This happens whenever the destination qemu exits before the complete transfer is noticed by source qemu. The savevm state checks at runtime can fail at destination and cause qemu to error out. The source qemu cant notice it as the EPIPE is not propogated to it. The qemuMigrationIOFunc() notices the stream being broken from virStreamSend() and it cleans up the stream alone. The qemuMigrationWaitForCompletion() would never get to 100% transfer completion. The qemuMigrationWaitForCompletion() never breaks out as well since the ssh connection to destination is healthy, and the source qemu also thinks the migration is ongoing as the Fd to which it transfers, is never closed or broken. So, the migration will hang forever. Even Ctrl-C on the virsh migrate wouldn't be honoured. Close the source side FD when there is an error in the stream. That way, the source qemu updates itself and qemuMigrationWaitForCompletion() notices the failure. Close the FD for all kinds of errors to be sure. The error message is not copied for EPIPE so that the destination error is copied instead later. Note: Reproducible with repeated migrations between Power hosts running in different subcores-per-core modes. Changes from v2 -> v3: VIR_FORCE_CLOSE() needn't be called on the qemu source fd as that is closed by qemuMigrationIOFunc() for tunnelled migration. Set the fd to -1. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/qemu/qemu_migration.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 7440108..c982838 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4019,6 +4019,7 @@ static void qemuMigrationIOFunc(void *arg) if (virStreamFinish(data->st) < 0) goto error; + VIR_FORCE_CLOSE(data->sock); VIR_FREE(buffer); return; @@ -4036,7 +4037,11 @@ static void qemuMigrationIOFunc(void *arg) } error: - virCopyLastError(&data->err); + /* Let the source qemu know that the transfer cant continue anymore. + * Don't copy the error for EPIPE as destination has the actual error. */ + VIR_FORCE_CLOSE(data->sock); + if (!virLastErrorIsSystemErrno(EPIPE)) + virCopyLastError(&data->err); virResetLastError(); VIR_FREE(buffer); } @@ -4359,9 +4364,14 @@ qemuMigrationRun(virQEMUDriverPtr driver, } } - if (spec->fwdType != MIGRATION_FWD_DIRECT && - !(iothread = qemuMigrationStartTunnel(spec->fwd.stream, fd))) - goto cancel; + if (spec->fwdType != MIGRATION_FWD_DIRECT) { + if (!(iothread = qemuMigrationStartTunnel(spec->fwd.stream, fd))) + goto cancel; + /* If we've created a tunnel, then the 'fd' will be closed in the + * qemuMigrationIOFunc as data->sock. + */ + fd = -1; + } rc = qemuMigrationWaitForCompletion(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT,

3 4

[libvirt] [PATCH v2 0/4] Fix a couple of iothread bugs
by John Ferlan 16 Oct '15

16 Oct '15

v1: http://www.redhat.com/archives/libvir-list/2015-October/msg00417.html Differences since v1 - many. - Reworked patches 1 & 2 to become patches 1 - 3 in the new series - Patch 1 is new, but the thinking behind patch 3 caused me to generate this patch which essentially changes comparisons with "->iothreads" to use "->niothreadids" instead except for one place where we're building the "iothreadids[]" array based on the difference between iothreads and niothreadids. - Patch 2 is essentially what former patch 1 became, adding a single check for niothreads == 0 rather than checking the capabilities bit. - The former patch 2 was dropped. In it's place is the new Patch 3 which moves the check for the capabilities bit to when the IOThread objects are added to the domain at startup time. Making that change had a couple of side effects and the whole sordid history of how we got into this situation was left in the commit message. Due to moving the check one test started failing, so that was fixed and while I was at it - I added a test which would define iothreads, some iothreadids, and some iothreadpin to show that without the capability the failure will be at start time. - The former patch 3 was already pushed since it was ACK'd - The former patch 4 logic was adjusted (more or less) to what was requested during the review with a couple of tweaks based on the realities I found during testing. NB: I spent some cycles considering how to handle the case where a domain with iothreads/niothreadids > 0 was already running when libvirtd was restarted and how to handle that. In the end I decided upon trying to do the somewhat nice thing and remove all traces and if some domain had iothreadid's defined, then leave a VIR_INFO message indicating the removal. Without this change, then qemuDomainPinIOThread for the live code will need some kind of adjustment in order to handle the case where the capability doesn't exist (some sort of thread_id == 0 check right after the IOThreadIDFind succeeds). John Ferlan (4): qemu: Use 'niothreadids' instead of 'iothreads' qemu: Check for niothreads == 0 in qemuSetupCgroupForIOThreads qemu: Fix qemu startup check for QEMU_CAPS_OBJECT_IOTHREAD conf: Optimize the iothreadid initialization src/conf/domain_audit.c | 4 +- src/conf/domain_conf.c | 43 +++++++++++++++++----- src/qemu/qemu_cgroup.c | 3 ++ src/qemu/qemu_command.c | 19 ++++------ src/qemu/qemu_driver.c | 16 ++++---- src/qemu/qemu_process.c | 32 ++++++++++++++-- .../qemuxml2argv-cputune-numatune.args | 1 + .../qemuxml2argv-iothreads-nocap.xml | 37 +++++++++++++++++++ tests/qemuxml2argvtest.c | 2 + 9 files changed, 122 insertions(+), 35 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-nocap.xml -- 2.1.0

2 9

[libvirt] [PATCH] virsh: Use 'format' argument only when specified
by Peter Krempa 16 Oct '15

16 Oct '15

The condition checking whether --format was specified was incorrect. virsh crashed if the following format was used: virsh dump VM dump --format '' --memory-only Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1272301 --- tools/virsh-domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 456e273..4191548 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -5280,7 +5280,7 @@ doDump(void *opaque) goto out; } - if (vshCommandOptString(ctl, cmd, "format", &format)) { + if (vshCommandOptString(ctl, cmd, "format", &format) > 0) { if (STREQ(format, "kdump-zlib")) { dumpformat = VIR_DOMAIN_CORE_DUMP_FORMAT_KDUMP_ZLIB; } else if (STREQ(format, "kdump-lzo")) { -- 2.4.5

2 2

[libvirt] [PATCH] docs: event impl. registration before hypervisor connection
by Dominik Perpeet 16 Oct '15

16 Oct '15

Event implementations need to be registered before a connection to the Hypervisor is opened, otherwise event handling can be impaired (e.g. delayed messages). This fact is referenced in an e-mail [1], but should also be noted in the documentation of the registration functions. [1] https://www.redhat.com/archives/libvirt-users/2014-April/msg00011.html --- src/util/virevent.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/util/virevent.c b/src/util/virevent.c index 54b6396..e0fd35e 100644 --- a/src/util/virevent.c +++ b/src/util/virevent.c @@ -204,6 +204,9 @@ virEventRemoveTimeout(int timer) * to integrate with the libglib2 event loop, or libevent * or the QT event loop. * + * For proper event handling, it is important that the event implementation + * is registered before a connection to the Hypervisor is opened. + * * Use of the virEventAddHandle() and similar APIs require that the * corresponding handler is registered. Use of the * virConnectDomainEventRegisterAny() and similar APIs requires that @@ -247,6 +250,9 @@ void virEventRegisterImpl(virEventAddHandleFunc addHandle, * not have a need to integrate with an external event * loop impl. * + * For proper event handling, it is important that the event implementation + * is registered before a connection to the Hypervisor is opened. + * * Once registered, the application has to invoke virEventRunDefaultImpl() in * a loop to process events. Failure to do so may result in connections being * closed unexpectedly as a result of keepalive timeout. The default -- 1.8.3.1

3 2

[libvirt] Fwd: [PATCH 2/3] NEWS: Split releases by year (2012-2015)
by Eric Blake 15 Oct '15

15 Oct '15

[moderated for smaller size] -------- Forwarded Message -------- From: Andrea Bolognani <abologna(a)redhat.com> To: libvir-list(a)redhat.com Subject: [PATCH 2/3] NEWS: Split releases by year (2012-2015) Date: Thu, 15 Oct 2015 16:12:09 +0200 Message-Id: <1444918330-15696-3-git-send-email-abologna(a)redhat.com> --- docs/news-2012.html.in | 3012 ++++++++++++++ docs/news-2013.html.in | 3675 +++++++++++++++++ docs/news-2014.html.in | 3418 ++++++++++++++++ docs/news.html.in | 10052 +---------------------------------------------- 4 files changed, 10110 insertions(+), 10047 deletions(-) create mode 100644 docs/news-2012.html.in create mode 100644 docs/news-2013.html.in create mode 100644 docs/news-2014.html.in diff --git a/docs/news-2012.html.in b/docs/news-2012.html.in new file mode 100644 index 0000000..a198d3c --- /dev/null +++ b/docs/news-2012.html.in @@ -0,0 +1,3012 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + </head> + <body> + <h1>Releases (2012)</h1> + <p>Here is the list of official releases made during the year 2012. + A similar list for <a href="news-2011.html">2011</a> is also available. + </p> + <p>It is also possible to just use + the <a href="downloads.html" shape="rect">GIT version or snapshot</a>, + contact the mailing list and check + the <a href="http://libvirt.org/git/?p=libvirt.git;a=log" shape="rect">GIT log</a> + to gauge progress. + </p> + + <h3>1.0.1: Dec 17 2012</h3> + <ul> + <li>Features:<br/> + Introduce virtlockd daemon (Daniel P. Berrange),<br/> [...] diff --git a/docs/news-2013.html.in b/docs/news-2013.html.in new file mode 100644 index 0000000..62b75a5 --- /dev/null +++ b/docs/news-2013.html.in @@ -0,0 +1,3675 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + </head> + <body> + <h1>Releases (2013)</h1> + <p>Here is the list of official releases made during the year 2013. + A similar list for <a href="news-2012.html">2012</a> is also available. + </p> + <p>It is also possible to just use + the <a href="downloads.html" shape="rect">GIT version or snapshot</a>, + contact the mailing list and check + the <a href="http://libvirt.org/git/?p=libvirt.git;a=log" shape="rect">GIT log</a> + to gauge progress. + </p> + + <h3>1.2.0: Dec 02 2013</h3> + <ul> + <li>Features:<br/> + Add support for gluster pool (Eric Blake),<br/> [...] diff --git a/docs/news-2014.html.in b/docs/news-2014.html.in new file mode 100644 index 0000000..5480d5d --- /dev/null +++ b/docs/news-2014.html.in @@ -0,0 +1,3418 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + </head> + <body> + <h1>Releases (2014)</h1> + <p>Here is the list of official releases made during the year 2014. + A similar list for <a href="news-2013.html">2013</a> is also available. + </p> + <p>It is also possible to just use + the <a href="downloads.html">GIT version or snapshot</a>, + contact the mailing list and check + the <a href="http://libvirt.org/git/?p=libvirt.git;a=log">GIT log</a> + to gauge progress. + </p> + + <h3>1.2.11: Dec 13 2014</h3> + <ul> + <li>Features:<br/> + Implement public API for virDomainGetFSInfo (Tomoki Sekiyama),<br/> [...] diff --git a/docs/news.html.in b/docs/news.html.in index 90e6ac7..3e133c2 100644 --- a/docs/news.html.in +++ b/docs/news.html.in @@ -5,8 +5,11 @@ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> </head> <body> - <h1>Releases</h1> - <p>Here is the list of official releases, it is also possible to just use + <h1>Releases (2015)</h1> + <p>Here is the list of official releases made during the year 2015. + A similar list for <a href="news-2014.html">2014</a> is also available. + </p> + <p>It is also possible to just use the <a href="downloads.html">GIT version or snapshot</a>, contact the mailing list and check the <a href="http://libvirt.org/git/?p=libvirt.git;a=log">GIT log</a> @@ -2441,10050 +2444,5 @@ </li> </ul> - <h3>1.2.11: Dec 13 2014</h3> - <ul> - <li>Features:<br/> - Implement public API for virDomainGetFSInfo (Tomoki Sekiyama),<br/> [...] - - <h3>0.9.9: Jan 07 2012</h3> - <ul> - <li>Features:<br/> [...] - <li>Cleanups:<br/> - network_conf: Fix whitespace to pass syntax-check (Peter Krempa)<br/> - </li> - </ul> - </body> </html> -- 2.4.3

1 0

[libvirt] Fwd: [PATCH 1/3] NEWS: Split releases by year (2005-2011)
by Eric Blake 15 Oct '15

15 Oct '15

[moderated for smaller size] -------- Forwarded Message -------- From: Andrea Bolognani <abologna(a)redhat.com> To: libvir-list(a)redhat.com Subject: [PATCH 1/3] NEWS: Split releases by year (2005-2011) Date: Thu, 15 Oct 2015 16:12:08 +0200 Message-Id: <1444918330-15696-2-git-send-email-abologna(a)redhat.com> --- docs/news-2005.html.in | 28 + docs/news-2006.html.in | 354 ++ docs/news-2007.html.in | 534 +++ docs/news-2008.html.in | 580 ++++ docs/news-2009.html.in | 1603 +++++++++ docs/news-2010.html.in | 2218 +++++++++++++ docs/news-2011.html.in | 3314 +++++++++++++++++++ docs/news.html.in | 8492 ------------------------------------------------ 8 files changed, 8631 insertions(+), 8492 deletions(-) create mode 100644 docs/news-2005.html.in create mode 100644 docs/news-2006.html.in create mode 100644 docs/news-2007.html.in create mode 100644 docs/news-2008.html.in create mode 100644 docs/news-2009.html.in create mode 100644 docs/news-2010.html.in create mode 100644 docs/news-2011.html.in diff --git a/docs/news-2005.html.in b/docs/news-2005.html.in new file mode 100644 index 0000000..97a43c6 --- /dev/null +++ b/docs/news-2005.html.in @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + </head> + <body> + <h1>Releases (2005)</h1> + <p>Here is the list of official releases made during the year 2005. + </p> + <p>It is also possible to just use + the <a href="downloads.html" shape="rect">GIT version or snapshot</a>, + contact the mailing list and check + the <a href="http://libvirt.org/git/?p=libvirt.git;a=log" shape="rect">GIT log</a> + to gauge progress. + </p> + + <h3>0.0.1: Dec 19 2005</h3> + <ul> + <li>Features:<br/> + First release,<br/> + Basic management of existing Xen domains,<br/> + Minimal autogenerated Python bindings<br/> + </li> + </ul> + + </body> +</html> diff --git a/docs/news-2006.html.in b/docs/news-2006.html.in new file mode 100644 index 0000000..df29a06 --- /dev/null +++ b/docs/news-2006.html.in @@ -0,0 +1,354 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + </head> + <body> + <h1>Releases (2006)</h1> + <p>Here is the list of official releases made during the year 2006. + A similar list for <a href="news-2005.html">2005</a> is also available. + </p> + <p>It is also possible to just use + the <a href="downloads.html" shape="rect">GIT version or snapshot</a>, + contact the mailing list and check + the <a href="http://libvirt.org/git/?p=libvirt.git;a=log" shape="rect">GIT log</a> + to gauge progress. + </p> + + <h3>0.1.10: Dec 20 2006</h3> + <ul> + <li>Bug Fixes:<br/> + VCPU info breakages on xen 3.0.3,<br/> [...] diff --git a/docs/news-2007.html.in b/docs/news-2007.html.in new file mode 100644 index 0000000..8b08963 --- /dev/null +++ b/docs/news-2007.html.in @@ -0,0 +1,534 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + </head> + <body> + <h1>Releases (2007)</h1> + <p>Here is the list of official releases made during the year 2007. + A similar list for <a href="news-2006.html">2006</a> is also available. + </p> + <p>It is also possible to just use + the <a href="downloads.html" shape="rect">GIT version or snapshot</a>, + contact the mailing list and check + the <a href="http://libvirt.org/git/?p=libvirt.git;a=log" shape="rect">GIT log</a> + to gauge progress. + </p> + + <h3>0.4.0: Dec 18 2007</h3> + <ul> + <li>Features:<br/> + Compilation on Windows cygwin/mingw (Richard Jones),<br/> [...] diff --git a/docs/news-2008.html.in b/docs/news-2008.html.in new file mode 100644 index 0000000..16ee9b1 --- /dev/null +++ b/docs/news-2008.html.in @@ -0,0 +1,580 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + </head> + <body> + <h1>Releases (2008)</h1> + <p>Here is the list of official releases made during the year 2008. + A similar list for <a href="news-2007.html">2007</a> is also available. + </p> + <p>It is also possible to just use + the <a href="downloads.html" shape="rect">GIT version or snapshot</a>, + contact the mailing list and check + the <a href="http://libvirt.org/git/?p=libvirt.git;a=log" shape="rect">GIT log</a> + to gauge progress. + </p> + + <h3>0.5.1: Dec 04 2008</h3> + <ul> + <li>Portability:<br/> [...] + fix parsing for CDRom device with no source (Daniel Berrange),<br/> + use xenstore to list domains to avoid some bugs (Guido GÃ¼nther),<br/> [...] diff --git a/docs/news-2009.html.in b/docs/news-2009.html.in new file mode 100644 index 0000000..c0b48ae --- /dev/null +++ b/docs/news-2009.html.in @@ -0,0 +1,1603 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + </head> + <body> + <h1>Releases (2009)</h1> + <p>Here is the list of official releases made during the year 2009. + A similar list for <a href="news-2008.html">2008</a> is also available. + </p> + <p>It is also possible to just use + the <a href="downloads.html" shape="rect">GIT version or snapshot</a>, + contact the mailing list and check + the <a href="http://libvirt.org/git/?p=libvirt.git;a=log" shape="rect">GIT log</a> + to gauge progress. + </p> + + <h3>0.7.5: Dec 23 2009</h3> + <ul> + <li>Features:<br/> [...] diff --git a/docs/news-2010.html.in b/docs/news-2010.html.in new file mode 100644 index 0000000..0fd8860 --- /dev/null +++ b/docs/news-2010.html.in @@ -0,0 +1,2218 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + </head> + <body> + <h1>Releases (2010)</h1> + <p>Here is the list of official releases made during the year 2010. + A similar list for <a href="news-2009.html">2009</a> is also available. + </p> + <p>It is also possible to just use + the <a href="downloads.html" shape="rect">GIT version or snapshot</a>, + contact the mailing list and check + the <a href="http://libvirt.org/git/?p=libvirt.git;a=log" shape="rect">GIT log</a> + to gauge progress. + </p> + + <h3>0.8.6: Nov 30 2010</h3> + <ul> + <li>Features:<br/> [...] diff --git a/docs/news-2011.html.in b/docs/news-2011.html.in new file mode 100644 index 0000000..5dacb5c --- /dev/null +++ b/docs/news-2011.html.in @@ -0,0 +1,3314 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + </head> + <body> + <h1>Releases (2011)</h1> + <p>Here is the list of official releases made during the year 2011. + A similar list for <a href="news-2010.html">2010</a> is also available. + </p> + <p>It is also possible to just use + the <a href="downloads.html" shape="rect">GIT version or snapshot</a>, + contact the mailing list and check + the <a href="http://libvirt.org/git/?p=libvirt.git;a=log" shape="rect">GIT log</a> + to gauge progress. + </p> + + <h3>0.9.8: Dec 08 2011</h3> + <ul> + <li>Features:<br/> [...] diff --git a/docs/news.html.in b/docs/news.html.in index 0e89fae..90e6ac7 100644 --- a/docs/news.html.in +++ b/docs/news.html.in @@ -12486,8497 +12486,5 @@ </li> </ul> - <h3>0.9.8: Dec 08 2011</h3> - <ul> - <li>Features:<br/> [...] - - <h3>0.0.1: Dec 19 2005</h3> - <ul> - <li>Features:<br/> - First release,<br/> - Basic management of existing Xen domains,<br/> - Minimal autogenerated Python bindings<br/> - </li> - </ul> - </body> </html> -- 2.4.3

1 0

[libvirt] [PATCH v5 0/5] vz: add migration support
by Nikolay Shirokovskiy 15 Oct '15

15 Oct '15

NOTE that minimal command to migrate vz domain is like next: virsh -c vz:///system migrate 200 vz+ssh://shiny0/system --p2p --live --compressed --persistent --undefinesource Difference from v4: 1. move preparation of the migration uri from src to dst as dst intended to do it. 2. change hypervisor migration scheme from 'tcp' to 'vzmigr' 3. declare this scheme in host caps src/vz/vz_driver.c | 356 ++++++++++++++++++++++++++++++++++++++++++++++++++++ src/vz/vz_sdk.c | 86 +++++++++++-- src/vz/vz_sdk.h | 6 + src/vz/vz_utils.h | 4 +- 4 files changed, 437 insertions(+), 15 deletions(-)

4 12

[libvirt] crash in virDomainNumaGetMemorySize
by Olaf Hering 15 Oct '15

15 Oct '15

With current master (56945e1), while toying around with a WS2008R2 Hyper-V host: root@probook:~ # gdb --quiet -ex 'r -c hv dumpxml all-sles12-dev' -ex bt -ex detach -ex quit virsh Reading symbols from virsh...Reading symbols from /usr/lib/debug/usr/bin/virsh.debug...done. done. Starting program: /usr/bin/virsh -c hv dumpxml all-sles12-dev [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib64/libthread_db.so.1". Enter Administrator's password for optiplex.fritz.box: [New Thread 0x7fffee601700 (LWP 26921)] Program received signal SIGSEGV, Segmentation fault. virDomainNumaGetMemorySize (numa=0x0) at conf/numa_conf.c:971 971 for (i = 0; i < numa->nmem_nodes; i++) #0 virDomainNumaGetMemorySize (numa=0x0) at conf/numa_conf.c:971 #1 0x00007ffff793bce0 in virDomainDefGetMemoryActual (def=def@entry=0x55555582ead0) at conf/domain_conf.c:7857 #2 0x00007ffff7948978 in virDomainDefFormatInternal (def=0x55555582ead0, flags=0, buf=buf@entry=0x7fffffffdde0) at conf/domain_conf.c:21677 #3 0x00007ffff794b8bc in virDomainDefFormat (def=<optimized out>, flags=<optimized out>) at conf/domain_conf.c:22507 #4 0x00007ffff7a94c33 in hypervDomainGetXMLDesc (domain=<optimized out>, flags=0) at hyperv/hyperv_driver.c:882 #5 0x00007ffff79b5351 in virDomainGetXMLDesc (domain=domain@entry=0x5555558237a0, flags=0) at libvirt-domain.c:2591 #6 0x000055555558b978 in cmdDumpXML (ctl=0x7fffffffe1c0, cmd=<optimized out>) at virsh-domain.c:9634 #7 0x000055555557d04f in vshCommandRun (ctl=0x7fffffffe1c0, cmd=0x555555822580) at vsh.c:1212 #8 0x0000555555579a4d in main (argc=5, argv=0x7fffffffe3c8) at virsh.c:921 Detaching from program: /usr/bin/virsh, process 26917 root@probook:~ # rpm -qf `which virsh` libvirt-client-20150917T085913.56945e1-3.xen_unstable.1.x86_64 Olaf

2 3

[libvirt] genprotocol.pl generates unstable output
by Olaf Hering 15 Oct '15

15 Oct '15

If the same source gets built twice the resulting files may differ. One example is this: ... [ 305s] /usr/bin/perl -w ./rpc/genprotocol.pl /usr/bin/rpcgen -c \ [ 305s] remote/remote_protocol.x ./remote/remote_protocol.c ... [ 577s] /usr/src/debug/libvirt-20150929T082652.68572de/src/remote/remote_protocol.c differs (C source, ASCII text) [ 577s] --- old//usr/src/debug/libvirt-20150929T082652.68572de/src/remote/remote_protocol.c 2015-09-30 11:34:31.000000000 +0000 [ 577s] +++ new//usr/src/debug/libvirt-20150929T082652.68572de/src/remote/remote_protocol.c 2015-09-30 14:57:39.000000000 +0000 [ 577s] @@ -2084,8 +2084,8 @@ [ 577s] bool_t [ 577s] xdr_remote_domain_get_vcpus_ret (XDR *xdrs, remote_domain_get_vcpus_ret *objp) [ 577s] { [ 577s] - char **objp_cpp1 = (char **) (void *) &objp->cpumaps.cpumaps_val; [ 577s] char **objp_cpp0 = (char **) (void *) &objp->info.info_val; [ 577s] + char **objp_cpp1 = (char **) (void *) &objp->cpumaps.cpumaps_val; [ 577s] [ 577s] if (!xdr_array (xdrs, objp_cpp0, (u_int *) &objp->info.info_len, REMOTE_VCPUINFO_MAX, [ 577s] sizeof (remote_vcpu_info), (xdrproc_t) xdr_remote_vcpu_info)) ... The input is like: bool_t xdr_remote_domain_get_vcpus_ret (XDR *xdrs, remote_domain_get_vcpus_ret *objp) { register int32_t *buf; if (!xdr_array (xdrs, (char **)&objp->info.info_val, (u_int *) &objp->info.info_len, REMOTE_VCPUINFO_MAX, sizeof (remote_vcpu_info), (xdrproc_t) xdr_remote_vcpu_info)) return FALSE; if (!xdr_bytes (xdrs, (char **)&objp->cpumaps.cpumaps_val, (u_int *) &objp->cpumaps.cpumaps_len, REMOTE_CPUMAPS_MAX)) return FALSE; return TRUE; } Looks like the perl script transforms the pointers, but it does not sort them to enforce an order. I think its the map() which does it, but dont know enough perl to be sure. How can this be fixed? Olaf

3 5

[libvirt] [PATCH 1/3] libvirt-domain: Introduce macro to save duplicated codes
by Wei Jiangang 15 Oct '15

15 Oct '15

Signed-off-by: Wei Jiangang <weijg.fnst(a)cn.fujitsu.com> --- src/libvirt-domain.c | 55 ++++++++++++++-------------------------------------- 1 file changed, 15 insertions(+), 40 deletions(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 6e1aacd..ed07c9e 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -33,6 +33,13 @@ VIR_LOG_INIT("libvirt.domain"); #define VIR_FROM_THIS VIR_FROM_DOMAIN +#define VIR_ABSOLUTIZE_PATH(PATH, ABSPATH) \ + if (virFileAbsPath(PATH, ABSPATH) < 0) { \ + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", \ + _("could not build absolute input file path")); \ + goto error; \ + } + /** * virConnectListDomains: @@ -830,11 +837,7 @@ virDomainSave(virDomainPtr domain, const char *to) char *absolute_to; /* We must absolutize the file path as the save is done out of process */ - if (virFileAbsPath(to, &absolute_to) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("could not build absolute output file path")); - goto error; - } + VIR_ABSOLUTIZE_PATH(to, &absolute_to); ret = conn->driver->domainSave(domain, absolute_to); @@ -918,11 +921,7 @@ virDomainSaveFlags(virDomainPtr domain, const char *to, char *absolute_to; /* We must absolutize the file path as the save is done out of process */ - if (virFileAbsPath(to, &absolute_to) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("could not build absolute output file path")); - goto error; - } + VIR_ABSOLUTIZE_PATH(to, &absolute_to); ret = conn->driver->domainSaveFlags(domain, absolute_to, dxml, flags); @@ -968,11 +967,7 @@ virDomainRestore(virConnectPtr conn, const char *from) char *absolute_from; /* We must absolutize the file path as the restore is done out of process */ - if (virFileAbsPath(from, &absolute_from) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("could not build absolute input file path")); - goto error; - } + VIR_ABSOLUTIZE_PATH(from, &absolute_from); ret = conn->driver->domainRestore(conn, absolute_from); @@ -1042,11 +1037,7 @@ virDomainRestoreFlags(virConnectPtr conn, const char *from, const char *dxml, char *absolute_from; /* We must absolutize the file path as the restore is done out of process */ - if (virFileAbsPath(from, &absolute_from) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("could not build absolute input file path")); - goto error; - } + VIR_ABSOLUTIZE_PATH(from, &absolute_from); ret = conn->driver->domainRestoreFlags(conn, absolute_from, dxml, flags); @@ -1107,11 +1098,7 @@ virDomainSaveImageGetXMLDesc(virConnectPtr conn, const char *file, char *absolute_file; /* We must absolutize the file path as the read is done out of process */ - if (virFileAbsPath(file, &absolute_file) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("could not build absolute input file path")); - goto error; - } + VIR_ABSOLUTIZE_PATH(file, &absolute_file); ret = conn->driver->domainSaveImageGetXMLDesc(conn, absolute_file, flags); @@ -1180,11 +1167,7 @@ virDomainSaveImageDefineXML(virConnectPtr conn, const char *file, char *absolute_file; /* We must absolutize the file path as the read is done out of process */ - if (virFileAbsPath(file, &absolute_file) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("could not build absolute input file path")); - goto error; - } + VIR_ABSOLUTIZE_PATH(file, &absolute_file); ret = conn->driver->domainSaveImageDefineXML(conn, absolute_file, dxml, flags); @@ -1255,11 +1238,7 @@ virDomainCoreDump(virDomainPtr domain, const char *to, unsigned int flags) char *absolute_to; /* We must absolutize the file path as the save is done out of process */ - if (virFileAbsPath(to, &absolute_to) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("could not build absolute core file path")); - goto error; - } + VIR_ABSOLUTIZE_PATH(to, &absolute_to); ret = conn->driver->domainCoreDump(domain, absolute_to, flags); @@ -1339,11 +1318,7 @@ virDomainCoreDumpWithFormat(virDomainPtr domain, const char *to, char *absolute_to; /* We must absolutize the file path as the save is done out of process */ - if (virFileAbsPath(to, &absolute_to) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("could not build absolute core file path")); - goto error; - } + VIR_ABSOLUTIZE_PATH(to, &absolute_to); ret = conn->driver->domainCoreDumpWithFormat(domain, absolute_to, dumpformat, flags); -- 1.9.3

4 7

[libvirt] [PATCH] testscripts: make redirects happen in correct order
by Wei Jiangang 15 Oct '15

15 Oct '15

It should redirect stdout to /dev/null firstly, then redirect stderr to whatever stdout currently points at. Signed-off-by: Wei Jiangang <weijg.fnst(a)cn.fujitsu.com> --- tests/test-lib.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test-lib.sh b/tests/test-lib.sh index e612f8f..d36a901 100644 --- a/tests/test-lib.sh +++ b/tests/test-lib.sh @@ -248,9 +248,9 @@ trap '(exit $?); exit $?' 1 2 13 15 cd "$t_" || error_ "failed to cd to $t_" -if ( diff --version < /dev/null 2>&1 | grep GNU ) 2>&1 > /dev/null; then +if ( diff --version < /dev/null 2>&1 | grep GNU ) >/dev/null 2>&1; then compare() { diff -u "$@"; } -elif ( cmp --version < /dev/null 2>&1 | grep GNU ) 2>&1 > /dev/null; then +elif ( cmp --version < /dev/null 2>&1 | grep GNU ) >/dev/null 2>&1; then compare() { cmp -s "$@"; } else compare() { cmp "$@"; } -- 1.9.3

3 2

[libvirt] [PATCH 0/4] Fix a couple of iothread bugs
by John Ferlan 15 Oct '15

15 Oct '15

Details in the patches. John Ferlan (4): qemu: During startup need more QEMU_CAPS_OBJECT_IOTHREAD checks qemu: Check QEMU_CAPS_OBJECT_IOTHREAD for qemuDomainPinIOThread conf: Refactor the iothreadid initialization conf: Optimize the iothreadid initialization src/conf/domain_conf.c | 83 +++++++++++++++++++++++++++++++++++++++---------- src/qemu/qemu_cgroup.c | 3 ++ src/qemu/qemu_driver.c | 6 ++++ src/qemu/qemu_process.c | 18 +++++++---- 4 files changed, 88 insertions(+), 22 deletions(-) -- 2.1.0

2 16

[libvirt] [PATCH 00/15] NEWS: Plenty of fixes and improvements
by Andrea Bolognani 14 Oct '15

14 Oct '15

Oh boy, where to start :) Patch 01 fixes the XSLT stylesheet used to generate the plain text NEWS file from docs/news.html.in. This has been broken for at least two years, based on the oldest release archive available on the website. Patches 02-05 clean up some very simple mistakes. Patches 06-09 are the juicy bits: very old entries were not as tidy as recent ones, so I went through them and polished them up to bring them up to standard. It would be great if someone who was around from the early days, ideally DV, could go over patch 09 in particular, since categorizing old changes I know barely nothing about is by definition prone to error. Patches 10-15 go over everything one last time for that extra shiny finish. Cheers. PS: Patch 07 contains an awfully long line that git-send-email warns me about. I'll try to sent it anyway, but if it doesn't make it to the list that's probably the reason. Andrea Bolognani (15): NEWS: Fix XSLT stylesheet NEWS: Include description for release 0.7.3 NEWS: Remove empty sections NEWS: Split off merged sections NEWS: Properly escape > in HTML NEWS: Split old entries (2009) NEWS: Split old entries (2008) NEWS: Split old entries (2006-2007) NEWS: Organize old entries NEWS: Fix whitespace NEWS: Fix newlines NEWS: Fix indentation NEWS: Add empty lines NEWS: Unify section titles NEWS: Unify date format docs/news.html.in | 6071 ++++++++++++++++++++++++++++++----------------------- docs/news.xsl | 27 +- 2 files changed, 3483 insertions(+), 2615 deletions(-) -- 2.4.3

3 36

[libvirt] cpu affinity, isolcpus and cgroups
by Henning Schild 14 Oct '15

14 Oct '15

Hi, i am currently looking into realtime VMs using libvirt. My first starting point was reserving a couple of cores using isolcpus and later tuning the affinity to place my vcpus on the reserved pcpus. My first observation was that libvirt ignores isolcpus. Affinity masks of new qemus will default to all cpus and will not be inherited from libvirtd. A comment in the code suggests that this is done on purpose. After that i changed the code to use only the available cpus by default. But taskset was still showing all 'f's on my qemus. Then i traced my change down to sched_setaffinity assuming that some other mechanism might have reverted my hack, but it is still in place. Libvirt is setting up cgroups and now my suspicion is that cgroups and taskset might not work well together. > /sys/fs/cgroup/cpu/machine.slice/machine-qemu\x2dvm1.scope/vcpu0# > cpuacct.usage_percpu > 247340587 50851635 89631114 23383025 412639264 1241965 55442753 19923 > 14093629 15863859 27403280 1292195745 82031088 53690508 135826421 > 124915000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 Looks like the last 16 cores are not used. But if i use taskset to ask for the affinity mask i get all 32 cpus. > taskset -p `cat tasks` > pid 12905's current affinity mask: ffffffff I know that is not strictly libvirt but also a kernel question, still you guys are probably able to point me to what i am missing here. > Linux 3.18.11+ #4 SMP PREEMPT RT regards, Henning

2 4

[libvirt] [PATCH RFC 0/7] libxl: domain statistics support
by Joao Martins 14 Oct '15

14 Oct '15

Hey Jim, This series bring support for various statistics about domains regarding CPU, Memory, Network Interfaces and BlockStats. Not all of the statistics are implemented: qdisk support is missing in this series and some of the memory statistics aren't available. With this series we further implement 7 more functions of libvirt APIs. It is organized as follows: * Patch 1, 2: implements cpu/memory statistics. * Patch 3, 4: implements (netback) network statistics and VBD block statistics. QDisk will follow up in a separate series regarding QEMU monitor integration. * Patch 5: implement fetching all domain statistics * Patch 6, 7: implements Job information. Overall it looks big but 70% of the patch is due to #4 and #5 but doesn't add necessarily more complexity to the driver I believe. Patch #6 and #7 are of special importance because GetJobInfo and GetJobStats are now used in Openstack Kilo to monitor live-migration progress. This two patches together with an earlier series [0] I sent before let us sucessfully live-migrate with Openstack Kilo. Further with this series we get to support nova diagnostics. Tested this series on 4.4.3 and 4.5 setups plus Openstack Kilo. Any comments or suggestions are welcome, Thanks! Joao Joao Martins (7): libxl: implement virDomainGetCPUStats libxl: implement virDomainMemorystats libxl: implement virDomainInterfaceStats libxl: implement virDomainBlockStats libxl: implement virConnectGetAllDomainStats libxl: implement virDomainGetJobInfo libxl: implement virDomainGetJobStats configure.ac | 2 +- src/libxl/libxl_domain.c | 29 ++ src/libxl/libxl_domain.h | 6 + src/libxl/libxl_driver.c | 1010 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 1046 insertions(+), 1 deletion(-) -- 2.1.4

3 27

[libvirt] libvirt-php and xpath function from libxml2
by Vasiliy Tolstov 14 Oct '15

14 Oct '15

Hi! I'm test under high load some libvirt-php xpath based function and big memory leak under each function call. I'm try to patch libvirt-php to free some values via xmlFree , but this is not solve leaks. Do we realy need this function? As i see when i'm use plain libvirt function and use returned xml with internal php functions that works with xml and xpath, i'm not get memory leaks. So does we really need it? -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru

2 3

[libvirt] [PATCH] build: get further on cygwin 'make check'
by Eric Blake 14 Oct '15

14 Oct '15

Based on how we generate protocol-structs files for checking that our protocol changes are backwards-compatible, we end up compiling lxc and lockd protocol files on all platforms during 'make check', even though we may never link those files into a final library or executable. For this to work on cygwin, the CFLAGS addition of $(XDR_CFLAGS) must be unconditional. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- I'll wait for review rather than invoking build-breaker rule, as 'make check' is a bit stronger than 'make'. src/Makefile.am | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 99b4993..e2c3e47 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1305,6 +1305,19 @@ EXTRA_DIST += qemu/qemu.conf qemu/libvirtd_qemu.aug \ qemu/test_libvirtd_qemu.aug.in qemu/THREADS.txt +libvirt_driver_lxc_impl_la_CFLAGS = \ + $(LIBNL_CFLAGS) \ + $(FUSE_CFLAGS) \ + $(XDR_CFLAGS) \ + -I$(srcdir)/access \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) +libvirt_driver_lxc_impl_la_LIBADD = \ + $(CAPNG_LIBS) \ + $(LIBNL_LIBS) \ + $(LIBXML_LIBS) \ + $(FUSE_LIBS) + if WITH_LXC noinst_LTLIBRARIES += libvirt_driver_lxc_impl.la libvirt_driver_lxc_la_SOURCES = @@ -1319,19 +1332,6 @@ noinst_LTLIBRARIES += libvirt_driver_lxc.la #libvirt_la_BUILT_LIBADD += libvirt_driver_lxc.la endif ! WITH_DRIVER_MODULES -libvirt_driver_lxc_impl_la_CFLAGS = \ - $(LIBNL_CFLAGS) \ - $(FUSE_CFLAGS) \ - $(XDR_CFLAGS) \ - -I$(srcdir)/access \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) -libvirt_driver_lxc_impl_la_LIBADD = \ - $(CAPNG_LIBS) \ - $(LIBNL_LIBS) \ - $(LIBXML_LIBS) \ - $(FUSE_LIBS) - if WITH_BLKID libvirt_driver_lxc_impl_la_CFLAGS += $(BLKID_CFLAGS) libvirt_driver_lxc_impl_la_LIBADD += $(BLKID_LIBS) @@ -2307,15 +2307,16 @@ endif WITH_LXC lockdriverdir = $(libdir)/libvirt/lock-driver lockdriver_LTLIBRARIES = +lockd_la_CFLAGS = -I$(srcdir)/conf \ + $(XDR_CFLAGS) \ + $(AM_CFLAGS) + if WITH_LIBVIRTD lockdriver_LTLIBRARIES += lockd.la lockd_la_SOURCES = \ $(LOCK_DRIVER_LOCKD_SOURCES) \ $(LOCK_PROTOCOL_GENERATED) \ $(NULL) -lockd_la_CFLAGS = -I$(srcdir)/conf \ - $(XDR_CFLAGS) \ - $(AM_CFLAGS) lockd_la_LDFLAGS = -module -avoid-version lockd_la_LIBADD = ../gnulib/lib/libgnu.la \ libvirt-net-rpc.la \ -- 2.4.3

2 1

[libvirt] [PATCH] build: include xdr cflags for libvirt-admin
by Eric Blake 13 Oct '15

13 Oct '15

Without this, building on cygwin fails with: CC libvirt_admin_la-libvirt-admin.lo libvirt-admin.c:25:21: fatal error: rpc/rpc.h: No such file or directory #include <rpc/rpc.h> ^ Reported by Yaakov Selkowitz <yselkowi(a)redhat.com> Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. src/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Makefile.am b/src/Makefile.am index d5dd9fb..99b4993 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2087,6 +2087,7 @@ libvirt_admin_la_CFLAGS = \ -I$(srcdir)/admin libvirt_admin_la_CFLAGS += \ + $(XDR_CFLAGS) \ $(CAPNG_CFLAGS) \ $(YAJL_CFLAGS) \ $(SSH2_CFLAGS) \ -- 2.4.3

1 0

[libvirt] [RFC] Automatically sync time on domain resume?
by Michal Privoznik 13 Oct '15

13 Oct '15

So I came across this bug: https://bugzilla.redhat.com/show_bug.cgi?id=1156194 There's a request for us to automatically sync guest time on domain resume (e.g. bare virDomainResume(), or virDomainRestore() or after migration). I'd like to explore our options here and what would be acceptable upstream. I can think of two possibilities: 1) Invent new flag to all APIs in question and let mgmt applications call it. If the flag is set we would sync the guest time too. However, this masks two different operations under single API. What should be reported if resuming succeeded but syncing time did not? Success or failure? Mgmt applications will end up calling two APIs to distinguish error states anyway. 2) Do this as best effort. Unconditionally, whenever guest agent is available just issue the time sync command (possibly without waiting for reply). This, however, takes away control from users - they will no longer have possibility to just resume domain without time sync. There's of course the obvious solution - not change anything and have mgmt apps calling two separate APIs - like they oughtta be doing today. What's your view? Michal

4 4

[libvirt] [PATCH 1/3] storage: add gluster backend initialization support for multiple servers
by Prasanna Kumar Kalever 13 Oct '15

13 Oct '15

This patch adds support for initialization of gluster backend with multiple servers which acts as gluster volfile servers for the gluster storage backend. This will help in achieving high availability of gluster backend connectivity via libgfapi i.e. when the first volfile server fails, then other servers specified are used as volfile server to re-establish the backend gluster connectivity. Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever(a)redhat.com> --- src/storage/storage_backend_gluster.c | 77 +++++++++++++++++++---------------- 1 file changed, 41 insertions(+), 36 deletions(-) diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_backend_gluster.c index d2e79bc..53474c1 100644 --- a/src/storage/storage_backend_gluster.c +++ b/src/storage/storage_backend_gluster.c @@ -32,6 +32,9 @@ #include "virstring.h" #include "viruri.h" +#define QEMU_DEFAULT_GLUSTER_PORT 24007 +#define QEMU_DEFAULT_GLUSTER_TRANSPORT "tcp" + #define VIR_FROM_THIS VIR_FROM_STORAGE VIR_LOG_INIT("storage.storage_backend_gluster"); @@ -570,62 +573,64 @@ static int virStorageFileBackendGlusterInit(virStorageSourcePtr src) { virStorageFileBackendGlusterPrivPtr priv = NULL; - virStorageNetHostDefPtr host = &(src->hosts[0]); - const char *hostname; + const char *transport = NULL; int port = 0; + size_t i = 0; - if (src->nhosts != 1) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Expected exactly 1 host for the gluster volume")); - return -1; - } - - hostname = host->name; - - VIR_DEBUG("initializing gluster storage file %p (gluster://%s:%s/%s%s)[%u:%u]", - src, hostname, host->port ? host->port : "0", - NULLSTR(src->volume), src->path, - (unsigned int)src->drv->uid, (unsigned int)src->drv->gid); + VIR_DEBUG("Initializing gluster volume=%s image-path=%s with uid=%u gid=%u", + NULLSTR(src->volume), src->path, + (unsigned int)src->drv->uid, (unsigned int)src->drv->gid); if (!src->volume) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing gluster volume name for path '%s'"), - src->path); + _("missing gluster volume name for path '%s'"), + src->path); return -1; } if (VIR_ALLOC(priv) < 0) return -1; - if (host->port && - virStrToLong_i(host->port, NULL, 10, &port) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to parse port number '%s'"), - host->port); - goto error; - } - - if (host->transport == VIR_STORAGE_NET_HOST_TRANS_UNIX) - hostname = host->socket; - if (!(priv->vol = glfs_new(src->volume))) { virReportOOMError(); goto error; } - if (glfs_set_volfile_server(priv->vol, - virStorageNetHostTransportTypeToString(host->transport), - hostname, port) < 0) { - virReportSystemError(errno, - _("failed to set gluster volfile server '%s'"), - hostname); - goto error; + for (i = 0; i < src->nhosts; i++) { + if (!src->hosts[i].port) { + port = QEMU_DEFAULT_GLUSTER_PORT; + } else if (virStrToLong_i(src->hosts[i].port, NULL, 10, &port) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("failed to parse port number '%s'"), src->hosts[i].port); + goto error; + } + + if (src->hosts[i].transport == VIR_STORAGE_NET_HOST_TRANS_UNIX) { + transport = src->hosts[i].socket; + } else if (!src->hosts[i].transport) { + transport = QEMU_DEFAULT_GLUSTER_TRANSPORT; + } else { + transport = virStorageNetHostTransportTypeToString(src->hosts[i].transport); + } + + if (glfs_set_volfile_server(priv->vol, transport, src->hosts[i].name, + port) < 0) { + virReportSystemError(errno, + _("failed to set gluster volfile server '%s'"), + src->hosts[i].name); + goto error; + } else { + VIR_DEBUG("Successfully set volfile server with server:'%s' " + "port:'%d' transport:'%s'", src->hosts[i].name, + port, transport); + } } if (glfs_init(priv->vol) < 0) { virReportSystemError(errno, - _("failed to initialize gluster connection to " - "server: '%s'"), hostname); + _("failed to initialize gluster connection with given hosts " + "volume : '%s' image-path : '%s'"), + NULLSTR(src->volume), src->path); goto error; } -- 2.1.0

5 9

[libvirt] [RFC PATCH 0/8] Make loading domains with invalid XML possible
by Martin Kletzander 13 Oct '15

13 Oct '15

We always had to deal with new parsing errors in a weird way. All of them needed to go into functions starting the domains. That messes up the code, it's confusing to newcomers and so on. I once had an idea that we can handle this stuff. We know what failed, we have the XML that failed parsing and if the problem is not in the domain name nor UUID, we can create a domain object out of that as well. This way we are able to do something we weren't with this series applied. Example follows. Assume "dummy" is a domain with invalid XML (I just modified the file). Now, just for the purpose of this silly example, let's say we allowed domains with archtecture x86_*, but now we've realized that x86_64 is the only one we want to allow, but there already is a domain defined that has <type arch='x86_256' .../>. With the current master, the domain would be lost, so we would need to modify the funstion starting the domain (e.g. qemuProcessStart for qemu domain). However, with this series, it behaves like this: # virsh list --all Id Name State ---------------------------------------------------- - dummy shut off # virsh domstate --reason dummy shut off (invalid XML) # virsh start dummy error: Failed to start domain dummy error: XML error: domain 'dummy' was not loaded due to an XML error (unsupported configuration: Unknown architecture x86_256), please redefine it # VISUAL='sed -i s/x86_256/x86_64/' virsh edit dummy Domain dummy XML configuration edited. # virsh domstate --reason dummy shut off (unknown) # virsh start dummy Domain dummy started This is a logical next step for us to clean and separate parsing and starting, getting rid of some old code without sacrifying compatibility and maybe generating parser code in the future. Why is this an RFC? - I can certainly easily imagine some people who might not like this - It doesn't work for all drivers (yet) - It does handle status XMLs, but only slightly. All the handling is done in a commit message that says something along the lines of "beware, we should still be careful, but not as much as before". - The error type used for the message is one that is already used for something else and we might want a new type of error for exactly this one error message, although it might be enough for some to have the possibility of checking this by querying the domain state and checking the reason. - Just so you know I came up with something new for which there's no BZ (or at least yet) =) Martin Kletzander (8): conf, virsh: Add new domain shutoff reason qemu: Few whitespace cleanups conf: Extract name-parsing into its own function conf: Extract UUID parsing into its own function conf: Optionally keep domains with invalid XML qemu: Don't lookup invalid domains unless specified otherwise qemu: Prepare basic APIs to handle invalid defs qemu: Load domains with invalid XML on start include/libvirt/libvirt-domain.h | 2 + src/bhyve/bhyve_driver.c | 2 + src/conf/domain_conf.c | 180 +++++++++++++++++++++++++++++++++------ src/conf/domain_conf.h | 5 ++ src/libxl/libxl_driver.c | 3 + src/lxc/lxc_driver.c | 3 + src/qemu/qemu_driver.c | 64 +++++++++++--- src/uml/uml_driver.c | 2 + tools/virsh-domain-monitor.c | 3 +- 9 files changed, 223 insertions(+), 41 deletions(-) -- 2.5.3

4 24

[libvirt] [PATCH] libvirt-domain: Drop virDomainMigrateCheckNotLocal attribute
by Michal Privoznik 13 Oct '15

13 Oct '15

Our apibuild.py script does not cope with ATTRIBUTE_NONNULL: Parse Error: parsing function type, ')' expected Got token ('name', 'char') Last token: ('name', 'char') Token queue: [('op', '*'), ('name', 'dconnuri'), ('sep', ')')] Line 3297 end: Makefile:2441: recipe for target '../../docs/apibuild.py.stamp' failed Let's drop it. Moreover, up until e17ae3ccc2dbc1400 where it was introduced we did not really care about NULL-ity of dconnuri. And moreover the ATTRIBUTE_NONNULL merely checks for static calls over NULL, it won't catch the dynamic ones, where a NULL is passed by a variable at runtime. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/libvirt-domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index e6c8604..6e1aacd 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -3293,7 +3293,7 @@ virDomainMigrateVersion3Params(virDomainPtr domain, } -static int ATTRIBUTE_NONNULL(1) +static int virDomainMigrateCheckNotLocal(const char *dconnuri) { virURIPtr tempuri = NULL; -- 2.4.9

4 4

[libvirt] virsh can't support VM offline blockcommit
by 陈明 13 Oct '15

13 Oct '15

Hi everyone! I use the libvirt(version: 1.2.2) and QEMU(version: 2.2.1) to test qemu snapshot features: I tried virsh blockcommit when VM offline, the virsh blockcommit failed: the error messase as below: * error: Requested operation is not valid: domain is not running* when I start the VM, the virsh blockcommit work fine! my question is : we need virsh support blockcommit when VM offline。how do？ we test qemu snapshot as follows： we need create snapshot of the cycle，and by virsh blockcommit merge snapshot chain，but whenVM offline， the virsh blockcommit will fail， someone suggest me：when VM offline，may use qemu-img commit to submit snapshot turn，but qemu-img can't modify snapshot chain backing relation，it need we use qemu-img rebase amend snapshot‘s backingfile，* the main question* is when we use qemu-img rebase modify snapshot's backingfile, if someone start the VM, it will may lead to VM filesystem readonly。 we should how to solve the question? thanks!

1 0

[libvirt] [PATCH v2] virt-host-validate: check for IOMMU support
by Daniel P. Berrange 12 Oct '15

12 Oct '15

This looks for existance of DMAR (Intel) and IVRS (AMD) files under /sys/firmware/acpi/tables/, as a sign that the platform has IOMMU present & enabled in the BIOS. If these are present and /sys/kernel/iommu_groups does not contain any entries this is taken as a sign that the kernel has not enabled the IOMMU currently. If no ACPI tables are found we can't distinguish between disabled in BIOS and not present in the hardware, so we have to give the user a generic hint. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Changed in v2: - Completely refactor the check to remove false positives and cope with iommu being enabled by default - Add AMD support tools/virt-host-validate-common.c | 64 +++++++++++++++++++++++++++++++++++++++ tools/virt-host-validate-common.h | 3 ++ tools/virt-host-validate-qemu.c | 6 ++++ 3 files changed, 73 insertions(+) diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-common.c index a88fc56..38128b1 100644 --- a/tools/virt-host-validate-common.c +++ b/tools/virt-host-validate-common.c @@ -26,6 +26,7 @@ #include <stdio.h> #include <unistd.h> #include <sys/utsname.h> +#include <sys/stat.h> #include <mntent.h> #include "virutil.h" @@ -341,3 +342,66 @@ int virHostValidateCGroupController(const char *hvname, return -1; return 0; } + +int virHostValidateIOMMU(const char *hvname, + virHostValidateLevel level) +{ + struct stat sb; + const char *bootarg = NULL; + bool isAMD = false, isIntel = false; + + if (virHostValidateHasCPUFlag("vmx")) + isIntel = true; + else if (virHostValidateHasCPUFlag("svm")) + isAMD = true; + else + /* XXX PPC/ARM/etc support */ + return 0; + + virHostMsgCheck(hvname, "%s", _("for device assignment IOMMU support")); + + if (isIntel) { + if (access("/sys/firmware/acpi/tables/DMAR", F_OK) == 0) { + virHostMsgPass(); + bootarg = "intel_iommu=on"; + } else { + virHostMsgFail(level, + "No ACPI DMAR table found, IOMMU either " + "disabled in BIOS or not supported by this " + "hardware platform"); + return -1; + } + } else if (isAMD) { + if (access("/sys/firmware/acpi/tables/IVRS", F_OK) == 0) { + virHostMsgPass(); + bootarg = "iommu=pt iommu=1"; + } else { + virHostMsgFail(level, + "No ACPI IVRS table found, IOMMU either " + "disabled in BIOS or not supported by this " + "hardware platform"); + return -1; + } + } else { + virHostMsgFail(level, + "Unknown if this platform has IOMMU support"); + return -1; + } + + + /* We can only check on newer kernels with iommu groups & vfio */ + if (stat("/sys/kernel/iommu_groups", &sb) < 0) + return 0; + + if (!S_ISDIR(sb.st_mode)) + return 0; + + virHostMsgCheck(hvname, "%s", _("if IOMMU is enabled by kernel")); + if (sb.st_nlink <= 2) { + virHostMsgFail(level, + "IOMMU appears to be disabled in kernel. " + "Add %s to kernel cmdline arguments", bootarg); + return -1; + } + return 0; +} diff --git a/tools/virt-host-validate-common.h b/tools/virt-host-validate-common.h index 1547e22..d4c4759 100644 --- a/tools/virt-host-validate-common.h +++ b/tools/virt-host-validate-common.h @@ -70,4 +70,7 @@ extern int virHostValidateCGroupController(const char *hvname, virHostValidateLevel level, const char *config_name); +extern int virHostValidateIOMMU(const char *hvname, + virHostValidateLevel level); + #endif /* __VIRT_HOST_VALIDATE_COMMON_H__ */ diff --git a/tools/virt-host-validate-qemu.c b/tools/virt-host-validate-qemu.c index b0ae293..044df65 100644 --- a/tools/virt-host-validate-qemu.c +++ b/tools/virt-host-validate-qemu.c @@ -20,6 +20,8 @@ */ #include <config.h> +#include <unistd.h> + #include "virt-host-validate-qemu.h" #include "virt-host-validate-common.h" @@ -87,5 +89,9 @@ int virHostValidateQEMU(void) "BLK_CGROUP") < 0) ret = -1; + if (virHostValidateIOMMU("QEMU", + VIR_HOST_VALIDATE_WARN) < 0) + ret = -1; + return ret; } -- 2.4.3

1 1

[libvirt] [PATCH] virt-host-validate: disable mntent code on Win32
by Daniel P. Berrange 12 Oct '15

12 Oct '15

Win32 does not have support for mntent.h header, so the method which uses this must be stubbed out. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed as a build fix for Mingw tools/virt-host-validate-common.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-common.c index a88fc56..dd41fd4 100644 --- a/tools/virt-host-validate-common.c +++ b/tools/virt-host-validate-common.c @@ -26,7 +26,9 @@ #include <stdio.h> #include <unistd.h> #include <sys/utsname.h> -#include <mntent.h> +#ifdef HAVE_MNTENT_H +# include <mntent.h> +#endif /* HAVE_MNTENT_H */ #include "virutil.h" #include "viralloc.h" @@ -287,6 +289,7 @@ static int virHostValidateCGroupSupport(const char *hvname, return -1; } +#ifdef HAVE_MNTENT_H static int virHostValidateCGroupMount(const char *hvname, const char *cg_name, virHostValidateLevel level) @@ -324,6 +327,16 @@ static int virHostValidateCGroupMount(const char *hvname, cg_name, cg_name); return -1; } +#else /* ! HAVE_MNTENT_H */ +static int virHostValidateCGroupMount(const char *hvname, + const char *cg_name, + virHostValidateLevel level) +{ + virHostMsgCheck(hvname, "for cgroup '%s' controller mount-point", cg_name); + virHostMsgFail(level, "%s", "This platform does not support cgroups"); + return -1; +} +#endif /* ! HAVE_MNTENT_H */ int virHostValidateCGroupController(const char *hvname, const char *cg_name, -- 2.4.3

2 1

[libvirt] [PATCH v2] storage: Fix incorrect format for <disk> <auth> XML
by John Ferlan 12 Oct '15

12 Oct '15

https://bugzilla.redhat.com/show_bug.cgi?id=1256999 After creating a copy of the 'authdef' in a pool -> disk translation, unconditionally clear the 'authType' in the resulting disk auth def structure since that's used for a storage pool and not a disk. This ensures virStorageAuthDefFormat will properly format the <auth> XML for a <disk> (e.g. it won't have a <auth type='%s'.../>). Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/storage/storage_driver.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index ddf4405..0a7ebcc 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -3199,6 +3199,8 @@ virStorageTranslateDiskSourcePoolAuth(virDomainDiskDefPtr def, def->src->auth = virStorageAuthDefCopy(source->auth); if (!def->src->auth) goto cleanup; + /* A <disk> doesn't use <auth type='%s', so clear that out for the disk */ + def->src->auth->authType = VIR_STORAGE_AUTH_TYPE_NONE; ret = 0; cleanup: -- 2.1.0

2 1

[libvirt] [PATCH v4 0/12] migration: support all toURI and proto combos
by Nikolay Shirokovskiy 12 Oct '15

12 Oct '15

Current implementation of 'toURI' migration interfaces does not support all combinations of interface versions and protocol versions. For example 'toURI2' with p2p flag will not migrate if driver supports only v3params proto. This is not convinient as drivers that starts to support migration have to manually support older versions of protocol. I guess this should be done in one place, namely here. Another issue is that there are a lot of code duplication in implementation of toURI interfaces and it is not obvious from code how are they related. This implementation uses extensible parameters as intermediate parameters representation. This is possible as interfaces are done backward compatible in terms of parameters and later versions supports all parameters of former versions. = Changes from version 3 * fix spellings * make error messages more specific as suggested * in 'migration: refactor: introduce params version of unmanaged': fix conversion for null values of explicit string params into virTypedParameterPtr. * squash 'migration: reuse parameters check in toURI2 and toURI3' into 'migration: introduce parameter checking function' * 'migration: refactor: one return in forURI family functions' is dropped as suggested src/libvirt-domain.c | 509 +++++++++++++++++++++++--------------------------- 1 files changed, 237 insertions(+), 272 deletions(-)

2 18