- Devel - libvirt List Archives

[libvirt] [PATCH] Spell TIOCSCTTY right in the error message
by Ján Tomko 30 Oct '14

30 Oct '14

--- src/lxc/lxc_container.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Pushed as trivial. diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 2af2674..f02b959 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -281,7 +281,7 @@ static int lxcContainerSetupFDs(int *ttyfd, if (ioctl(*ttyfd, TIOCSCTTY, NULL) < 0) { virReportSystemError(errno, "%s", - _("ioctl(TIOCSTTY) failed")); + _("ioctl(TIOCSCTTY) failed")); goto cleanup; } -- 2.0.4

1 0

[libvirt] [PATCH v2 1/2] util: Introduce virPidFileForceCleanupPath
by Martin Kletzander 30 Oct '14

30 Oct '14

This function is used to cleanup a pidfile doing whatever it takes, even killing the owning process. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- v2: - Don't use "/proc", but simply just try to acquire the pidfile. - https://www.redhat.com/archives/libvir-list/2014-October/msg00320.html src/libvirt_private.syms | 1 + src/util/virpidfile.c | 42 ++++++++++++++++++++++++++++++++++++++++++ src/util/virpidfile.h | 2 ++ 3 files changed, 45 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index d6265ac..30d100d 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1810,6 +1810,7 @@ virPidFileBuildPath; virPidFileConstructPath; virPidFileDelete; virPidFileDeletePath; +virPidFileForceCleanupPath; virPidFileRead; virPidFileReadIfAlive; virPidFileReadPath; diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c index a3b8846..a64a1cf 100644 --- a/src/util/virpidfile.c +++ b/src/util/virpidfile.c @@ -37,6 +37,7 @@ #include "c-ctype.h" #include "areadlink.h" #include "virstring.h" +#include "virprocess.h" #define VIR_FROM_THIS VIR_FROM_NONE @@ -567,3 +568,44 @@ virPidFileConstructPath(bool privileged, VIR_FREE(rundir); return ret; } + + +/** + * virPidFileForceCleanupPath: + * + * Check if the pidfile is left around and clean it up whatever it + * takes. This doesn't raise an error. This function must not be + * called multiple times with the same path, be it in threads or + * processes. + * + * Returns 0 if the pidfile was successfully cleaned up, -1 otherwise. + */ +int +virPidFileForceCleanupPath(const char *path) +{ + pid_t pid = 0; + int fd = -1; + + if (!virFileExists(path)) + return 0; + + if (virPidFileReadPath(path, &pid) < 0) + return -1; + + if (virPidFileAcquirePath(path, false, 0) == 0) { + virPidFileReleasePath(path, fd); + } else { + virResetLastError(); + + /* Only kill the process if the pid is valid one. 0 means + * there is somebody else doing the same pidfile cleanup + * machinery. */ + if (pid) + virProcessKillPainfully(pid, true); + + if (virPidFileDeletePath(path) < 0) + return -1; + } + + return 0; +} diff --git a/src/util/virpidfile.h b/src/util/virpidfile.h index ca1dbff..eb6516c 100644 --- a/src/util/virpidfile.h +++ b/src/util/virpidfile.h @@ -74,4 +74,6 @@ int virPidFileConstructPath(bool privileged, const char *progname, char **pidfile); +int virPidFileForceCleanupPath(const char *path) ATTRIBUTE_NONNULL(1); + #endif /* __VIR_PIDFILE_H__ */ -- 2.1.2

2 5

[libvirt] [PATCH] Reject live update of offloading options
by Ján Tomko 30 Oct '14

30 Oct '14

https://bugzilla.redhat.com/show_bug.cgi?id=1155441 --- src/qemu/qemu_hotplug.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 33241fb..d3bf392 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1981,7 +1981,18 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, olddev->driver.virtio.txmode != newdev->driver.virtio.txmode || olddev->driver.virtio.ioeventfd != newdev->driver.virtio.ioeventfd || olddev->driver.virtio.event_idx != newdev->driver.virtio.event_idx || - olddev->driver.virtio.queues != newdev->driver.virtio.queues)) { + olddev->driver.virtio.queues != newdev->driver.virtio.queues || + olddev->driver.virtio.host.csum != newdev->driver.virtio.host.csum || + olddev->driver.virtio.host.gso != newdev->driver.virtio.host.gso || + olddev->driver.virtio.host.tso4 != newdev->driver.virtio.host.tso4 || + olddev->driver.virtio.host.tso6 != newdev->driver.virtio.host.tso6 || + olddev->driver.virtio.host.ecn != newdev->driver.virtio.host.ecn || + olddev->driver.virtio.host.ufo != newdev->driver.virtio.host.ufo || + olddev->driver.virtio.guest.csum != newdev->driver.virtio.guest.csum || + olddev->driver.virtio.guest.tso4 != newdev->driver.virtio.guest.tso4 || + olddev->driver.virtio.guest.tso6 != newdev->driver.virtio.guest.tso6 || + olddev->driver.virtio.guest.ecn != newdev->driver.virtio.guest.ecn || + olddev->driver.virtio.guest.ufo != newdev->driver.virtio.guest.ufo)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot modify virtio network device driver attributes")); goto cleanup; -- 2.0.4

2 1

[libvirt] [PATCH 00/19] vbox: Rewrite the storage driver
by Taowei Luo 30 Oct '14

30 Oct '14

This is the last part of rewriting vbox driver. The approache is almost the same as the previous. Some code problems such as copyright and irregular macros are fixed in this series. Taowei Luo (19): vbox: Fix copyright mistake vbox: Remove VBOX_OBJECT_CHECK macro vbox: move common codes to vbox_common.h vbox: Rewrite vbox-independent functions vbox: Rewrite vboxStoragePoolNumOfVolumes vbox: Rewrite vboxStoragePoolListVolumes vbox: Rewrite vboxStorageVolLookupByName vbox: Rewrite vboxStorageVolLookupByKey vbox: Make FindMedium support old vbox versions vbox: Rewrite vboxStorageVolLookupByPath vbox: Make CreateHardDisk support all vbox versions vbox: Rewrite vboxStorageVolCreateXML vbox: Make IMediumAttachment work with vbox2.2 and 3.0 vbox: Rewrite vboxStorageVolDelete vbox: Rewrite vboxStorageVolGetInfo vbox: Rewrite vboxStorageVolGetXMLDesc vbox: Rewrite vboxStorageVolGetPath vbox: New storage driver vbox: Remove unused things in vbox_tmpl.c po/POTFILES.in | 1 + src/Makefile.am | 11 +- src/vbox/vbox_common.c | 416 +++++++++------ src/vbox/vbox_common.h | 117 +++- src/vbox/vbox_driver.c | 99 +--- src/vbox/vbox_get_driver.h | 3 +- src/vbox/vbox_network.c | 30 +- src/vbox/vbox_storage.c | 959 +++++++++++++++++++++++++++++++++ src/vbox/vbox_tmpl.c | 1186 ++++++----------------------------------- src/vbox/vbox_uniformed_api.h | 30 +- 10 files changed, 1555 insertions(+), 1297 deletions(-) create mode 100644 src/vbox/vbox_storage.c -- 1.7.9.5

3 21

[libvirt] [PATCH v6 0/6] Add non-FreeBSD guest support to Bhyve driver.
by Conrad Meyer 30 Oct '14

30 Oct '14

Drvbhyve hardcodes bhyveload(8) as the host bootloader for guests. bhyveload(8) loader only supports FreeBSD guests. This patch series adds <bootloader> and <bootloader_args> handling to bhyve_command, so libvirt can boot non-FreeBSD guests in Bhyve. Additionally, support for grub-bhyve(1)'s --cons-dev argument is added so that interactive GRUB menus can be manipulated with the domain-configured serial device. See patch logs for further details. Thanks, Conrad Changes in v6: - Simplified domain schema changes; just add bootloader section to HVM-type OS, and make the bootloader tag optional. - Update drvbhyve.html.in copy to explicitly state that interactive bootloaders are unsupported. - Move GRUB device.map file creation out of BuildLoadCmd; instead emit device.map as a string. - Add devicemap contents tests to bhyvexml2argv. Conrad Meyer (6): bhyve: Support /domain/bootloader configuration for non-FreeBSD guests. bhyvexml2argv: Add loader argv tests. domaincommon.rng: Add 'bootloader' to os=hvm schema for Bhyve bhyvexml2argv: Add tests for domain-configured bootloader, args bhyve: Add console support for grub-bhyve bootloader bhyvexml2argv: Add test for grub console support docs/drvbhyve.html.in | 100 ++++++++++- docs/formatdomain.html.in | 4 +- docs/schemas/domaincommon.rng | 17 +- src/bhyve/bhyve_command.c | 186 +++++++++++++++++++-- src/bhyve/bhyve_command.h | 5 +- src/bhyve/bhyve_driver.c | 3 +- src/bhyve/bhyve_process.c | 38 ++++- .../bhyvexml2argv-acpiapic.ldargs | 1 + tests/bhyvexml2argvdata/bhyvexml2argv-base.ldargs | 1 + .../bhyvexml2argv-bhyveload-explicitargs.args | 3 + .../bhyvexml2argv-bhyveload-explicitargs.ldargs | 1 + .../bhyvexml2argv-bhyveload-explicitargs.xml | 23 +++ .../bhyvexml2argvdata/bhyvexml2argv-console.ldargs | 1 + .../bhyvexml2argv-custom-loader.args | 3 + .../bhyvexml2argv-custom-loader.ldargs | 1 + .../bhyvexml2argv-custom-loader.xml | 24 +++ .../bhyvexml2argv-disk-cdrom-grub.args | 3 + .../bhyvexml2argv-disk-cdrom-grub.devmap | 1 + .../bhyvexml2argv-disk-cdrom-grub.ldargs | 2 + .../bhyvexml2argv-disk-cdrom-grub.xml | 23 +++ .../bhyvexml2argv-disk-cdrom.ldargs | 1 + .../bhyvexml2argv-disk-virtio.ldargs | 1 + .../bhyvexml2argv-grub-defaults.args | 3 + .../bhyvexml2argv-grub-defaults.devmap | 1 + .../bhyvexml2argv-grub-defaults.ldargs | 2 + .../bhyvexml2argv-grub-defaults.xml | 23 +++ .../bhyvexml2argvdata/bhyvexml2argv-macaddr.ldargs | 1 + .../bhyvexml2argv-serial-grub.args | 4 + .../bhyvexml2argv-serial-grub.devmap | 1 + .../bhyvexml2argv-serial-grub.ldargs | 2 + .../bhyvexml2argv-serial-grub.xml | 26 +++ .../bhyvexml2argvdata/bhyvexml2argv-serial.ldargs | 1 + tests/bhyvexml2argvtest.c | 65 ++++++- 33 files changed, 532 insertions(+), 39 deletions(-) create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-base.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-console.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.devmap create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.devmap create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.devmap create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-serial.ldargs -- 1.9.3

2 8

[libvirt] [PATCH] Teach virt-aa-helper to use TEMPLATE.qemu if the domain is kvm or kqemu
by Cédric Bosdonnat 30 Oct '14

30 Oct '14

Without this patch, kvm and kqemu domains confined with apparmor can't start due to virt-aa-helper not finding TEMPLATE.kvm or TEMPLATE.kqemu. This patch points all kvm-related drivers to TEMPLATE.qemu. --- src/security/virt-aa-helper.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 9afc8db..6b95fdb 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -341,15 +341,25 @@ create_profile(const char *profile, const char *profile_name, int tlen, plen; int fd; int rc = -1; + const char *driver_name = NULL; if (virFileExists(profile)) { vah_error(NULL, 0, _("profile exists")); goto end; } + switch (virtType) { + case VIR_DOMAIN_VIRT_QEMU: + case VIR_DOMAIN_VIRT_KQEMU: + case VIR_DOMAIN_VIRT_KVM: + driver_name = "qemu"; + break; + default: + driver_name = virDomainVirtTypeToString(virtType); + } if (virAsprintfQuiet(&template, "%s/TEMPLATE.%s", APPARMOR_DIR "/libvirt", - virDomainVirtTypeToString(virtType)) < 0) { + driver_name) < 0) { vah_error(NULL, 0, _("template name exceeds maximum length")); goto end; } -- 1.8.4.5

3 3

[libvirt] [PATCH] vbox: don't register NULL driver
by Martin Kletzander 30 Oct '14

30 Oct '14

We were missing check for the fact that the storage driver was found and in case there is no vbox storage driver available, daemon raised the following error each start: error : virRegisterStorageDriver:592 : driver in virRegisterStorageDriver must not be NULL Fixing this makes the condition unified with networkDriver registration in vbox as well. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/vbox/vbox_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vbox/vbox_driver.c b/src/vbox/vbox_driver.c index c64d2d6..b2e35e9 100644 --- a/src/vbox/vbox_driver.c +++ b/src/vbox/vbox_driver.c @@ -74,7 +74,7 @@ int vboxStorageRegister(void) if (VBoxCGlueInit(&uVersion) == 0) storageDriver = vboxGetStorageDriver(uVersion); - if (virRegisterStorageDriver(storageDriver) < 0) + if (storageDriver && virRegisterStorageDriver(storageDriver) < 0) return -1; return 0; } -- 2.1.2

2 1

[libvirt] [PATCH] conf: forbid negative values in virDomainParseScaledValue
by Martin Kletzander 30 Oct '14

30 Oct '14

It makes sense for none of the callers to have negative value as an output and, fortunately, if anyone tried defining domain with negative memory or any other value parsed by virDomainParseScaledValue(), the resulting value was 0. That means we can error out during parsing as it won't break anything. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1155843 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- "it won't break anything" -- famous last words? src/conf/domain_conf.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 39befb0..a351382 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6334,28 +6334,34 @@ virDomainParseScaledValue(const char *xpath, { char *xpath_full = NULL; char *unit = NULL; + char *bytes_str = NULL; int ret = -1; unsigned long long bytes; *val = 0; if (virAsprintf(&xpath_full, "string(%s)", xpath) < 0) goto cleanup; - ret = virXPathULongLong(xpath_full, ctxt, &bytes); - if (ret < 0) { - if (ret == -2) - virReportError(VIR_ERR_XML_ERROR, - _("could not parse element %s"), - xpath); - else if (required) + + bytes_str = virXPathString(xpath_full, ctxt); + if (!bytes_str) { + if (!required) { + ret = 0; + } else { virReportError(VIR_ERR_XML_ERROR, _("missing element %s"), xpath); - else - ret = 0; + } goto cleanup; } VIR_FREE(xpath_full); + if (virStrToLong_ullp(bytes_str, NULL, 10, &bytes) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Invalid value '%s' for element '%s'"), + bytes_str, xpath); + goto cleanup; + } + if (virAsprintf(&xpath_full, "string(%s/@unit)", xpath) < 0) goto cleanup; unit = virXPathString(xpath_full, ctxt); @@ -6366,6 +6372,7 @@ virDomainParseScaledValue(const char *xpath, *val = bytes; ret = 1; cleanup: + VIR_FREE(bytes_str); VIR_FREE(xpath_full); VIR_FREE(unit); return ret; -- 2.1.2

2 2

[libvirt] [PATCH] Fix memory leak in cmdNetworkDHCPLeases
by Luyao Huang 30 Oct '14

30 Oct '14

After use cidr_format in function virAsprintf and vshPrintExtra, need free cidr_format. Fix the following memory leak from valgrind, like: 18 bytes in 1 blocks are definitely lost in loss record 41 of 192 at 0x4C29BBD: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) by 0x85CE36F: __vasprintf_chk (vasprintf_chk.c:80) by 0x4EE52D5: UnknownInlinedFun (stdio2.h:210) by 0x4EE52D5: virVasprintfInternal (virstring.c:459) by 0x4EE53CA: virAsprintfInternal (virstring.c:480) by 0x14FE96: cmdNetworkDHCPLeases (virsh-network.c:1378) by 0x13006B: vshCommandRun (virsh.c:1915) by 0x12A9E1: main (virsh.c:3699) Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- tools/virsh-network.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 90392d3..8ff6fd8 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -1381,6 +1381,8 @@ cmdNetworkDHCPLeases(vshControl *ctl, const vshCmd *cmd) expirytime, EMPTYSTR(lease->mac), EMPTYSTR(typestr), cidr_format, EMPTYSTR(lease->hostname), EMPTYSTR(lease->clientid)); + + VIR_FREE(cidr_format); } ret = true; -- 1.8.3.1

3 3

[libvirt] [PATCH 1/2] virnetdev: stub virNetDev{Add, Del}Multi on FreeBSD
by Roman Bogorodskiy 30 Oct '14

30 Oct '14

Currently, build fails on FreeBSD because its struct ifreq does not have ifr_hwaddr member. In order to fix that, check if this member is present, otherwise fall back to the stub version of the virNetDev{Add,Del}Multi functions. --- configure.ac | 3 ++- src/util/virnetdev.c | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index f7b02ff..31c5fa2 100644 --- a/configure.ac +++ b/configure.ac @@ -2694,7 +2694,8 @@ AC_SUBST([ws_plugindir]) # Check for Linux vs. BSD ifreq members AC_CHECK_MEMBERS([struct ifreq.ifr_newname, struct ifreq.ifr_ifindex, - struct ifreq.ifr_index], + struct ifreq.ifr_index, + struct ifreq.ifr_hwaddr], [], [], [#include <sys/socket.h> #include <net/if.h> diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 127bfb2..ac82a74 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -1971,7 +1971,8 @@ virNetDevGetLinkInfo(const char *ifname, #endif /* defined(__linux__) */ -#if defined(SIOCADDMULTI) && defined(HAVE_STRUCT_IFREQ) +#if defined(SIOCADDMULTI) && defined(HAVE_STRUCT_IFREQ) && \ + defined(HAVE_STRUCT_IFREQ_IFR_HWADDR) /** * virNetDevAddMulti: * @ifname: interface name to which to add multicast MAC address @@ -2019,7 +2020,8 @@ int virNetDevAddMulti(const char *ifname ATTRIBUTE_UNUSED, } #endif -#if defined(SIOCDELMULTI) && defined(HAVE_STRUCT_IFREQ) +#if defined(SIOCDELMULTI) && defined(HAVE_STRUCT_IFREQ) && \ + defined(HAVE_STRUCT_IFREQ_IFR_HWADDR) /** * virNetDevDelMulti: * @ifname: interface name from which to delete the multicast MAC address -- 2.0.2

2 5

[libvirt] [PATCH v2 0/3] virnetdev: Resolve some Coverity issues
by John Ferlan 30 Oct '14

30 Oct '14

A reposting of a patch into 3 separate patches for each of the Coverity issues found from commit id 'cc0e8c24'. The changes were already ACK'd, but I figured I'd repost anyway. v1: http://www.redhat.com/archives/libvir-list/2014-October/msg01012.html John Ferlan (3): virnetdev: Resolve Coverity DEADCODE virnetdev: Resolve Coverity FORWARD_NULL virnetdev: Resolve Coverity RESOURCE_LEAK src/util/virnetdev.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) -- 1.9.3

2 4

[libvirt] [PATCH] virnetdev: Resolve some Coverity issues
by John Ferlan 29 Oct '14

29 Oct '14

Coverity discovered a few issues with recent changes in this module from commit id 'cc0e8c24'. This patches fixes those. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/util/virnetdev.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 127bfb2..8bd1af4 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -59,15 +59,20 @@ VIR_LOG_INIT("util.netdev"); #define PROC_NET_DEV_MCAST "/proc/net/dev_mcast" #define MAX_MCAST_SIZE 50*14336 #define VIR_MCAST_NAME_LEN (IFNAMSIZ + 1) -#define VIR_MCAST_INDEX_TOKEN_IDX 0 -#define VIR_MCAST_NAME_TOKEN_IDX 1 -#define VIR_MCAST_USERS_TOKEN_IDX 2 -#define VIR_MCAST_GLOBAL_TOKEN_IDX 3 -#define VIR_MCAST_ADDR_TOKEN_IDX 4 #define VIR_MCAST_NUM_TOKENS 5 #define VIR_MCAST_TOKEN_DELIMS " \n" #define VIR_MCAST_ADDR_LEN (VIR_MAC_HEXLEN + 1) +typedef enum { + VIR_MCAST_TYPE_INDEX_TOKEN, + VIR_MCAST_TYPE_NAME_TOKEN, + VIR_MCAST_TYPE_USERS_TOKEN, + VIR_MCAST_TYPE_GLOBAL_TOKEN, + VIR_MCAST_TYPE_ADDR_TOKEN, + + VIR_MCAST_TYPE_LAST +} virMCastType; + typedef struct _virNetDevMcastEntry virNetDevMcastEntry; typedef virNetDevMcastEntry *virNetDevMcastEntryPtr; struct _virNetDevMcastEntry { @@ -2076,7 +2081,7 @@ static int virNetDevParseMcast(char *buf, virNetDevMcastEntryPtr mcast) char *saveptr; char *endptr; - for (ifindex = 0, next = buf; ifindex < VIR_MCAST_NUM_TOKENS; ifindex++, + for (ifindex = 0, next = buf; ifindex < VIR_MCAST_TYPE_LAST; ifindex++, next = NULL) { token = strtok_r(next, VIR_MCAST_TOKEN_DELIMS, &saveptr); @@ -2087,8 +2092,8 @@ static int virNetDevParseMcast(char *buf, virNetDevMcastEntryPtr mcast) return -1; } - switch (ifindex) { - case VIR_MCAST_INDEX_TOKEN_IDX: + switch ((virMCastType)ifindex) { + case VIR_MCAST_TYPE_INDEX_TOKEN: if (virStrToLong_i(token, &endptr, 10, &num) < 0) { virReportSystemError(EINVAL, _("Failed to parse interface index from '%s'"), @@ -2098,7 +2103,7 @@ static int virNetDevParseMcast(char *buf, virNetDevMcastEntryPtr mcast) } mcast->index = num; break; - case VIR_MCAST_NAME_TOKEN_IDX: + case VIR_MCAST_TYPE_NAME_TOKEN: if (virStrncpy(mcast->name, token, strlen(token), VIR_MCAST_NAME_LEN) == NULL) { virReportSystemError(EINVAL, @@ -2107,7 +2112,7 @@ static int virNetDevParseMcast(char *buf, virNetDevMcastEntryPtr mcast) return -1; } break; - case VIR_MCAST_USERS_TOKEN_IDX: + case VIR_MCAST_TYPE_USERS_TOKEN: if (virStrToLong_i(token, &endptr, 10, &num) < 0) { virReportSystemError(EINVAL, _("Failed to parse users from '%s'"), @@ -2117,7 +2122,7 @@ static int virNetDevParseMcast(char *buf, virNetDevMcastEntryPtr mcast) } mcast->users = num; break; - case VIR_MCAST_GLOBAL_TOKEN_IDX: + case VIR_MCAST_TYPE_GLOBAL_TOKEN: if (virStrToLong_i(token, &endptr, 10, &num) < 0) { virReportSystemError(EINVAL, _("Failed to parse users from '%s'"), @@ -2127,7 +2132,7 @@ static int virNetDevParseMcast(char *buf, virNetDevMcastEntryPtr mcast) } mcast->global = num; break; - case VIR_MCAST_ADDR_TOKEN_IDX: + case VIR_MCAST_TYPE_ADDR_TOKEN: if (virMacAddrParseHex((const char*)token, &mcast->macaddr) < 0) { virReportSystemError(EINVAL, @@ -2135,7 +2140,9 @@ static int virNetDevParseMcast(char *buf, virNetDevMcastEntryPtr mcast) buf); } break; - default: + + /* coverity[dead_error_begin] */ + case VIR_MCAST_TYPE_LAST: break; } } @@ -2194,9 +2201,7 @@ static int virNetDevGetMcastList(const char *ifname, ret = 0; cleanup: - if (ret < 0) - virNetDevMcastListClear(mcast); - + VIR_FREE(buf); VIR_FREE(entry); return ret; -- 1.9.3

2 2

[libvirt] [PATCHv2 0/2] Extend NIC_RX_FILTER_CHANGED event handler to process multicast list
by akrowiak＠linux.vnet.ibm.com 29 Oct '14

29 Oct '14

From: Tony Krowiak <akrowiak(a)linux.vnet.ibm.com> This patch set extends the handler for qemu's NIC_RX_FILTER_CHANGED event. It adds code to compare the old and new multicast MAC address lists and programs the macvtap filters to match the guest. Changes from V1: Responded to review comments from Laine Stump and Eric Blake Tony Krowiak (2): util: Functions to update host network device's multicast filter qemu: change macvtap multicast list in response to NIC_RX_FILTER_CHANGED

5 8

[libvirt] [PATCH] qemu: better error message when block job can't succeed
by Eric Blake 29 Oct '14

29 Oct '14

https://bugzilla.redhat.com/show_bug.cgi?id=1140981 reports that the qemu-kvm shipped as part of RHEL 7.0 intentionally cripples block jobs by removing the 'block-stream' QMP command, but that our probe for whether block jobs work was merely whether 'block-job-cancel' exists. Meanwhile, older qemu spelled the two commands block_stream and block_job_cancel. We know of no qemu build that has block-stream while lacking block-job-cancel, so it is easiest to change our witness to the command that starts a job rather than ends one. On RHEL, this results in changing the message from an ugly: error: Requested operation is not valid: Command 'block-stream' is not found to a nicer: error: unsupported configuration: block jobs not supported with this qemu binary * src/qemu/qemu_capabilities.h (QEMU_CAPS_BLOCKJOB_SYNC): Tweak comment. * src/qemu/qemu_capabilities.c (virQEMUCapsCommands): Look for stream rather than cancel when determining the flavor of block jobs supported. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- src/qemu/qemu_capabilities.c | 4 ++-- src/qemu/qemu_capabilities.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 6fcb5c7..b6c0f1b 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1422,8 +1422,8 @@ struct virQEMUCapsStringFlags { struct virQEMUCapsStringFlags virQEMUCapsCommands[] = { { "system_wakeup", QEMU_CAPS_WAKEUP }, { "transaction", QEMU_CAPS_TRANSACTION }, - { "block_job_cancel", QEMU_CAPS_BLOCKJOB_SYNC }, - { "block-job-cancel", QEMU_CAPS_BLOCKJOB_ASYNC }, + { "block_stream", QEMU_CAPS_BLOCKJOB_SYNC }, + { "block-stream", QEMU_CAPS_BLOCKJOB_ASYNC }, { "dump-guest-memory", QEMU_CAPS_DUMP_GUEST_MEMORY }, { "query-spice", QEMU_CAPS_SPICE }, { "query-kvm", QEMU_CAPS_KVM }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 0214f30..c0e2172 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -127,8 +127,8 @@ typedef enum { QEMU_CAPS_SCSI_DISK_CHANNEL = 87, /* Is scsi-disk.channel available? */ QEMU_CAPS_SCSI_BLOCK = 88, /* -device scsi-block */ QEMU_CAPS_TRANSACTION = 89, /* transaction monitor command */ - QEMU_CAPS_BLOCKJOB_SYNC = 90, /* RHEL 6.2 block_job_cancel */ - QEMU_CAPS_BLOCKJOB_ASYNC = 91, /* qemu 1.1 block-job-cancel */ + QEMU_CAPS_BLOCKJOB_SYNC = 90, /* old block_job_cancel, block_stream */ + QEMU_CAPS_BLOCKJOB_ASYNC = 91, /* new block-job-cancel, block-stream */ QEMU_CAPS_SCSI_CD = 92, /* -device scsi-cd */ QEMU_CAPS_IDE_CD = 93, /* -device ide-cd */ QEMU_CAPS_NO_USER_CONFIG = 94, /* -no-user-config */ -- 1.9.3

2 2

Re: [libvirt] Entering freeze and release of cadidate release 1 of 1.2.10
by Conrad Meyer 29 Oct '14

29 Oct '14

Hi all, The recent commit with SHA1 cc0e8c244d080f56392278e836cc378ba848e7aa, "util: Functions to update host network device's multicast filter," breaks the build on FreeBSD, so please address this before 1.2.10 release. Here is the output from Clang: CC util/libvirt_util_la-virnetdev.lo util/virnetdev.c:1995:9: error: no member named 'ifr_hwaddr' in 'struct ifreq' ifr.ifr_hwaddr.sa_family = AF_UNSPEC; ~~~ ^ util/virnetdev.c:1996:52: error: no member named 'ifr_hwaddr' in 'struct ifreq' virMacAddrGetRaw(macaddr, (unsigned char *)ifr.ifr_hwaddr.sa_data); ~~~ ^ util/virnetdev.c:2043:9: error: no member named 'ifr_hwaddr' in 'struct ifreq' ifr.ifr_hwaddr.sa_family = AF_UNSPEC; ~~~ ^ util/virnetdev.c:2044:52: error: no member named 'ifr_hwaddr' in 'struct ifreq' virMacAddrGetRaw(macaddr, (unsigned char *)ifr.ifr_hwaddr.sa_data); ~~~ ^ 4 errors generated. Thanks, Conrad

3 3

[libvirt] [PATCH for 1.2.10 0/2] Fix crash when parsing backing chain URI with transport
by Peter Krempa 29 Oct '14

29 Oct '14

See patch 1 for explanation. Peter Krempa (2): storage: Fix crash when parsing backing store URI with schema test: Add test to verify helpers used for backing file name parsing src/util/virstoragefile.c | 10 +++++----- tests/virstoragetest.c | 31 +++++++++++++++++++++++++------ tests/virstringtest.c | 3 +++ tests/viruritest.c | 1 + 4 files changed, 34 insertions(+), 11 deletions(-) -- 2.1.0

2 4

[libvirt] [PATCH 0/7] static zero initialization
by Eric Blake 29 Oct '14

29 Oct '14

Based on a comment I just made while reviewing Dan's patches, we might as well adopt a consistent style of relying on the C guarantee that static variables are automatically zero-initialized without any effort on our part. Eric Blake (7): audit: use bool for audit log choice maint: avoid static zero init in core files maint: avoid static zero init in tools maint: avoid static zero init in tests maint: avoid static zero init in helpers maint: avoid static zero init in drivers maint: add syntax check to prohibit static zero init cfg.mk | 8 ++++++++ daemon/libvirtd.c | 2 +- src/conf/nwfilter_conf.c | 2 +- src/cpu/cpu_x86.c | 2 +- src/interface/interface_backend_netcf.c | 2 +- src/libvirt.c | 18 +++++++++--------- src/libxl/libxl_driver.c | 2 +- src/locking/lock_daemon.c | 2 +- src/locking/lock_driver_lockd.c | 4 ++-- src/locking/lock_driver_sanlock.c | 2 +- src/lxc/lxc_controller.c | 2 +- src/network/bridge_driver.c | 2 +- src/node_device/node_device_udev.c | 2 +- src/nwfilter/nwfilter_learnipaddr.c | 2 +- src/openvz/openvz_util.c | 4 ++-- src/phyp/phyp_driver.c | 8 +++++--- src/qemu/qemu_driver.c | 5 +++-- src/remote/remote_driver.c | 2 +- src/rpc/virnetserver.c | 4 ++-- src/security/security_selinux.c | 2 +- src/test/test_driver.c | 2 +- src/uml/uml_driver.c | 2 +- src/util/viralloc.c | 10 +++++----- src/util/viraudit.c | 4 ++-- src/util/viraudit.h | 4 ++-- src/util/virdbus.c | 4 ++-- src/util/virevent.c | 14 +++++++------- src/util/virfile.c | 2 +- src/util/virlog.c | 16 ++++++++-------- src/util/virnetlink.c | 2 +- src/util/virprocess.c | 3 +-- src/util/virthread.h | 4 ++-- src/vbox/vbox_XPCOMCGlue.c | 4 ++-- src/vbox/vbox_tmpl.c | 2 +- src/xen/xen_driver.c | 4 ++-- src/xen/xen_hypervisor.c | 4 ++-- tests/eventtest.c | 6 +++--- tests/testutils.c | 12 ++++++------ tests/virhostdevtest.c | 2 +- tests/virportallocatortest.c | 2 +- tests/virscsitest.c | 2 +- tools/virsh-console.c | 5 +---- tools/virsh-domain.c | 2 +- tools/virsh.c | 4 ++-- tools/virt-host-validate-common.c | 4 ++-- 45 files changed, 102 insertions(+), 95 deletions(-) -- 1.9.3

2 9

[libvirt] [PATCH v2 0/3] Resolve libvirtd crash matching scsi_host
by John Ferlan 29 Oct '14

29 Oct '14

https://bugzilla.redhat.com/show_bug.cgi?id=1146837 Rewrite the v1 patch to take a different method to attack the problem. Expose the getHostNumber from scsi check/startup/refresh in the form of virGetSCSIHostNumber. Additionally, expose part of the getAdapterName code in the form of virGetSCSIHostNameByParentaddr. Then use the two functions to determine whether the incoming def matches any of the defined pool defs. v1 is here: http://www.redhat.com/archives/libvir-list/2014-September/msg01746.html John Ferlan (3): virutil: Introduce virGetSCSIHostNumber virutil: Introduce virGetSCSIHostNameByParentaddr storage_conf: Resolve libvirtd crash matching scsi_host src/conf/storage_conf.c | 69 ++++++++++++++---------- src/libvirt_private.syms | 2 + src/storage/storage_backend_scsi.c | 59 ++++----------------- src/util/virutil.c | 106 +++++++++++++++++++++++++++++++++++++ src/util/virutil.h | 10 ++++ 5 files changed, 170 insertions(+), 76 deletions(-) -- 1.9.3

3 13

[libvirt] [PowerPC PATCH 0/3 v4] Libvirt CPU enhancements for Power KVM
by Prerna Saxena 29 Oct '14

29 Oct '14

This patch series is a collection of enhancements for PowerPC CPUs on PowerKVM. Series Summary: ========== Patch 1/3 : Introduce a new architecture 'ppc64le' for libvirt. Patch 2/3 : Add libvirt support for VMs running in 'compat' mode on Power KVM. Patch 3/3 : Improve PVR handling to fall back to cpu generation. Detail: ==== * PowerPC has traditionally been a Big-endian architecture. However, with PowerPC ISA version 2.07, it can run in Little-endian mode as well. IBM Power8 processors, compliant with ISA 2.07 allow launching VMs in little-endian mode. This is signified by 'ppc64le' architecture. Patch 1 adds this support to libvirt, to allow running VMs based on ppc64le architecture. * Patch 2,3 tweak libvirt to correctly model PowerPC CPUs based on recent PowerKVM implementation. PowerKVM permits VMs with vcpus in the following allowed modes : i) Host native mode: where the vcpu seen in the VM belongs to the same processor generation as the host. Example: A POWER7 host, conforming to PowerISA version 2.06, will run VMs with "power7" vcpus. ii) Binary Compatibility ("compat") mode: PowerISA allows processors to run VMs in binary compatibility ("compat") mode supporting an older version of ISA. As an example: In compatibility mode, a POWER7 host can run a "power6" VM, conforming to power ISA v2.05. Similarly, a POWER8 host can run a "power7" VM conforming to PowerISA v2.06. QEMU has recently added support to explicitly denote a VM running in compatibility mode through commits 6d9412ea & 8dfa3a5e85. Henceforth, VMs of type (i) will be invoked with the QEMU invocation "-cpu host", while VMs of type (ii) will be invoked using "-cpu host, compat=power6". Now, an explicit cpu selection using "-cpu POWER6" is not valid. Instead, the recommended practice is to use the matching compat mode, if the requested cpu type differs from the host. Patches 2-3 address various aspects of this change. * Patch 2 : Adds support for generating the correct command line for QEMU. New xml semantics are introduced to signify this type. Corresponding documentation is also added. * Patch 3 : PowerKVM vCPUs differ uniquely across generations ( such as power6, power7, power8). Each generation signifies a new PowerISA version that exhibits features unique to that generation. The higher order 16 bits of PVR denote the processor generation and the lower order 16 bits denote the cpu chip (sub)version. For all practical purposes of launching a VM, we care about the generation the vCPU will belong to, and not specifically the chip version. In fact, PowerKVM does not seek out specification of a unique chip version(such as POWER7_v2.3) for running a vCPU. This patch updates the libvirt PVR check to reflect this relationship. Changelog: ========= v1 : https://www.redhat.com/archives/libvir-list/2014-June/msg01338.html v2 : http://www.redhat.com/archives/libvir-list/2014-October/msg00351.html v3 : http://www.mail-archive.com/libvir-list@redhat.com/msg104010.html Changes since v3: i) Added documentation for describing 'compat' mode to formatdomain.html.in ( Thanks for pointing this out, Michal ) ii) Minor corrections ( Indentation fix; Added check for PPC64LE in virDomainVideoDefaultType ) Regards, -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India

2 7

[libvirt] [PATCH] src/Makefile.am: Add forgotten backslash
by Michal Privoznik 29 Oct '14

29 Oct '14

As I've pushed 5892944f I haven't noticed one small nitpick. There was this backslash missing on the line 1231 in the enumeration of libraries to be added to vbox storage driver. This resulted in nondeterministic build which sometimes succeeded and sometimes failed. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial and build-breaker rules. src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 5b81432..d8fe624 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1228,7 +1228,7 @@ libvirt_driver_vbox_storage_impl_la_CFLAGS = \ libvirt_driver_vbox_storage_impl_la_LDFLAGS = $(AM_LDFLAGS) libvirt_driver_vbox_storage_impl_la_LIBADD = $(DLOPEN_LIBS) \ $(MSCOM_LIBS) \ - $(LIBXML_LIBS) + $(LIBXML_LIBS) \ libvirt_driver_vbox_impl.la libvirt_driver_vbox_storage_impl_la_SOURCES = $(VBOX_STORAGE_DRIVER_SOURCES) endif WITH_VBOX -- 2.0.4

2 1

[libvirt] [PATCH] util: fix libvirtd crash caused by virStorageNetHostTransportTypeFromString
by Shanzhi Yu 29 Oct '14

29 Oct '14

When split uri->scheme into two strings with "+", the second one will be "rdma://server/..", pass it to virStorageNetHostTransportTypeFromString will lead libvirtd crash. So a second virStringSplit call is needed. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1156288 Signed-off-by: Shanzhi Yu <shyu(a)redhat.com> --- src/util/virstoragefile.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 960aa23..795c188 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -2144,6 +2144,9 @@ virStorageSourceParseBackingURI(virStorageSourcePtr src, goto cleanup; } + if (!(scheme = virStringSplit(scheme[1], ":", 2))) + goto cleanup; + if (scheme[1] && (src->hosts->transport = virStorageNetHostTransportTypeFromString(scheme[1])) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, -- 1.9.3

3 3

[libvirt] [PATCH v2 0/3] add nodeset check in numatune
by Chen Fan 29 Oct '14

29 Oct '14

when setting elements memnode and nodeset in attribute numatune more than the host nodes in XML file, VM boot should fail. so add check for that. Chen Fan (3): numatune: add check for numatune nodeset range lxc controller: add check for numatune virnuma: remove redundant check for numanode src/conf/numatune_conf.c | 21 ------- src/conf/numatune_conf.h | 19 ++++++ src/libvirt_private.syms | 1 + src/lxc/lxc_controller.c | 3 +- src/qemu/qemu_command.c | 3 + src/qemu/qemu_command.h | 1 + src/util/virnuma.c | 70 +++++++++++++++++----- src/util/virnuma.h | 2 + ...rgv-numatune-static-nodeset-exceed-hostnode.xml | 35 +++++++++++ tests/qemuxml2argvmock.c | 9 +++ tests/qemuxml2argvtest.c | 1 + 11 files changed, 128 insertions(+), 37 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-numatune-static-nodeset-exceed-hostnode.xml -- 1.9.3

3 7

[libvirt] [PATCH 0/2] libssh2 connection fixes
by Cédric Bosdonnat 29 Oct '14

29 Oct '14

Hi guys, Here are 2 trivial patches to fixes issues connecting using libssh2. The first one fixes a -1 use with a size_t, and the second one discards callbacks with no prompt called by the SSH server. Cédric Bosdonnat (2): Fix test wanting a negative size_t Fix handling keyboard-interactive callbacks for libssh2 src/rpc/virnetsshsession.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) -- 1.8.4.5

3 5

[libvirt] [PATCH 0/2] Add non-FreeBSD guest support to Bhyve driver.
by Conrad Meyer 29 Oct '14

29 Oct '14

2 6

[libvirt] [PATCH v3 0/7] hotplug: Fix libvirtd crash on qemu-attached guest
by John Ferlan 29 Oct '14

29 Oct '14

v2 is here: http://www.redhat.com/archives/libvir-list/2014-September/msg01575.html As Michal pointed out in his review - other devices could have the same issue - so take care of each of them separately (I already knew the answer to my last question...) Totally different approach this time - rather than error out, follow the example I from the Controller Detach code which will generate an alias for the device (although it did miss one minor check to see if it was already set leading to a potential memory leak since the alias code would overwrite whatever was there). Note: In a way 1/7 was already ACK'd - I just hadn't separated it yet for a push and wanted to keep these closer together when/if they were pushed. Whether 7/7 is now necessary is debateable - I keep it only for completeness and environment setup in much the same way the start code handles aliases. John Ferlan (7): virsh: Adjust the text in man page regarding qemu-attach hotplug: Check for alias in controller detach hotplug: Check for alias in disk detach hotplug: Check for alias in hostdev detach hotplug: Check for alias in chrdev detach hotplug: Check for alias in net detach qemu-attach: Assign device aliases src/qemu/qemu_driver.c | 3 +++ src/qemu/qemu_hotplug.c | 28 +++++++++++++++++++++++++++- tools/virsh.pod | 5 +++-- 3 files changed, 33 insertions(+), 3 deletions(-) -- 1.9.3

2 11