- Devel - libvirt List Archives

[libvirt] [PATCH] tests: Resolve Coverity RESOURCE_LEAK
by John Ferlan 15 Apr '15

15 Apr '15

Commit id 'b77ce18a2' added a new bitmap, but neglected to virBitmapFree it Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- tests/virbitmaptest.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/virbitmaptest.c b/tests/virbitmaptest.c index 9a84e4c..a6e9a38 100644 --- a/tests/virbitmaptest.c +++ b/tests/virbitmaptest.c @@ -548,6 +548,7 @@ test10(const void *opaque ATTRIBUTE_UNUSED) virBitmapFree(b1); virBitmapFree(b2); virBitmapFree(b3); + virBitmapFree(b4); return ret; } -- 2.1.0

3 2

[libvirt] [PATCH] virsh: fix regression in 'virsh event' by domain
by Eric Blake 15 Apr '15

15 Apr '15

Commit a0670ae caused a regression in 'virsh event' and 'virsh qemu-monitor-event' - if a user tries to filter the command to a specific domain, an error message is printed: $ virsh event dom --loop error: internal error: virsh qemu-monitor-event: no domain VSH_OT_DATA option and then the command continues as though no domain had been supplied (giving events for ALL domains, instead of the requested one). This is because the code was incorrectly assuming that all "domain" options would be supplied via a mandatory VSH_OT_DATA, even though "domain" is optional for these two commands, so we had changed them to VSH_OT_STRING to quit failing for other reasons (ever since it was decided that VSH_OT_DATA and VSH_OT_STRING should no longer be synonyms). In looking at the situation, though, the code for looking up a domain was making a pointless check for whether the option exists prior to finding the option's string value, as vshCommandOptStringReq does just fine at reporting any errors when looking up a string whether or not the option was present. So this is a case of regression fixing by pure code deletion :) * tools/virsh-domain.c (vshCommandOptDomainBy): Drop useless filter. * tools/virsh-interface.c (vshCommandOptInterfaceBy): Likewise. * tools/virsh-network.c (vshCommandOptNetworkBy): Likewise. * tools/virsh-nwfilter.c (vshCommandOptNWFilterBy): Likewise. * tools/virsh-secret.c (vshCommandOptSecret): Likewise. * tools/virsh.h (vshCmdHasOption): Drop unused function. * tools/virsh.c (vshCmdHasOption): Likewise. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- tools/virsh-domain.c | 3 --- tools/virsh-interface.c | 2 -- tools/virsh-network.c | 3 --- tools/virsh-nwfilter.c | 5 +---- tools/virsh-secret.c | 5 +---- tools/virsh.c | 23 ----------------------- tools/virsh.h | 2 -- 7 files changed, 2 insertions(+), 41 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index bc6054a..2fe3924 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -119,9 +119,6 @@ vshCommandOptDomainBy(vshControl *ctl, const vshCmd *cmd, const char *n = NULL; const char *optname = "domain"; - if (!vshCmdHasOption(ctl, cmd, optname)) - return NULL; - if (vshCommandOptStringReq(ctl, cmd, optname, &n) < 0) return NULL; diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c index 3251e01..b9c60c5 100644 --- a/tools/virsh-interface.c +++ b/tools/virsh-interface.c @@ -53,8 +53,6 @@ vshCommandOptInterfaceBy(vshControl *ctl, const vshCmd *cmd, if (!optname) optname = "interface"; - if (!vshCmdHasOption(ctl, cmd, optname)) - return NULL; if (vshCommandOptStringReq(ctl, cmd, optname, &n) < 0) return NULL; diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 09ee11a..b859b49 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -42,9 +42,6 @@ vshCommandOptNetworkBy(vshControl *ctl, const vshCmd *cmd, const char *optname = "network"; virCheckFlags(VSH_BYUUID | VSH_BYNAME, NULL); - if (!vshCmdHasOption(ctl, cmd, optname)) - return NULL; - if (vshCommandOptStringReq(ctl, cmd, optname, &n) < 0) return NULL; diff --git a/tools/virsh-nwfilter.c b/tools/virsh-nwfilter.c index e6bef08..63c1c7e 100644 --- a/tools/virsh-nwfilter.c +++ b/tools/virsh-nwfilter.c @@ -1,7 +1,7 @@ /* * virsh-nwfilter.c: Commands to manage network filters * - * Copyright (C) 2005, 2007-2014 Red Hat, Inc. + * Copyright (C) 2005, 2007-2015 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -41,9 +41,6 @@ vshCommandOptNWFilterBy(vshControl *ctl, const vshCmd *cmd, const char *optname = "nwfilter"; virCheckFlags(VSH_BYUUID | VSH_BYNAME, NULL); - if (!vshCmdHasOption(ctl, cmd, optname)) - return NULL; - if (vshCommandOptStringReq(ctl, cmd, optname, &n) < 0) return NULL; diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c index 5065c6f..c6ceabd 100644 --- a/tools/virsh-secret.c +++ b/tools/virsh-secret.c @@ -1,7 +1,7 @@ /* * virsh-secret.c: Commands to manage secret * - * Copyright (C) 2005, 2007-2014 Red Hat, Inc. + * Copyright (C) 2005, 2007-2015 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -41,9 +41,6 @@ vshCommandOptSecret(vshControl *ctl, const vshCmd *cmd, const char **name) const char *n = NULL; const char *optname = "secret"; - if (!vshCmdHasOption(ctl, cmd, optname)) - return NULL; - if (vshCommandOptStringReq(ctl, cmd, optname, &n) < 0) return NULL; diff --git a/tools/virsh.c b/tools/virsh.c index 889a561..4425774 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1860,29 +1860,6 @@ vshCommandOptArgv(const vshCmd *cmd, const vshCmdOpt *opt) return NULL; } -/* Determine whether CMD->opts includes an option with name OPTNAME. - If not, give a diagnostic and return false. - If so, return true. */ -bool -vshCmdHasOption(vshControl *ctl, const vshCmd *cmd, const char *optname) -{ - /* Iterate through cmd->opts, to ensure that there is an entry - with name OPTNAME and type VSH_OT_DATA. */ - bool found = false; - const vshCmdOpt *opt; - for (opt = cmd->opts; opt; opt = opt->next) { - if (STREQ(opt->def->name, optname) && opt->def->type == VSH_OT_DATA) { - found = true; - break; - } - } - - if (!found) - vshError(ctl, _("internal error: virsh %s: no %s VSH_OT_DATA option"), - cmd->def->name, optname); - return found; -} - /* Parse an optional --timeout parameter in seconds, but store the * value of the timeout in milliseconds. Return -1 on error, 0 if * no timeout was requested, and 1 if timeout was set. */ diff --git a/tools/virsh.h b/tools/virsh.h index e89d315..44a5cd8 100644 --- a/tools/virsh.h +++ b/tools/virsh.h @@ -316,8 +316,6 @@ int vshCommandOptScaledInt(const vshCmd *cmd, const char *name, bool vshCommandOptBool(const vshCmd *cmd, const char *name); const vshCmdOpt *vshCommandOptArgv(const vshCmd *cmd, const vshCmdOpt *opt); -bool vshCmdHasOption(vshControl *ctl, const vshCmd *cmd, const char *optname); - int vshCommandOptTimeoutToMs(vshControl *ctl, const vshCmd *cmd, int *timeout); /* Filter flags for various vshCommandOpt*By() functions */ -- 2.1.0

2 2

[libvirt] [PATCH] node: udev: Remove some redundant error reports
by Peter Krempa 15 Apr '15

15 Apr '15

All the called functions already report an error. --- src/node_device/node_device_udev.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 8c39e5f..1025e80 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -128,9 +128,6 @@ static int udevGetDeviceProperty(struct udev_device *udev_device, /* If this allocation is changed, the comment at the beginning * of the function must also be changed. */ if (VIR_STRDUP(*property_value, udev_value) < 0) { - VIR_ERROR(_("Failed to allocate memory for property value for " - "property key '%s' on device with sysname '%s'"), - property_key, udev_device_get_sysname(udev_device)); ret = PROPERTY_ERROR; goto out; } @@ -213,9 +210,6 @@ static int udevGetDeviceSysfsAttr(struct udev_device *udev_device, /* If this allocation is changed, the comment at the beginning * of the function must also be changed. */ if (VIR_STRDUP(*attr_value, udev_value) < 0) { - VIR_ERROR(_("Failed to allocate memory for sysfs attribute value for " - "sysfs attribute '%s' on device with sysname '%s'"), - attr_name, udev_device_get_sysname(udev_device)); ret = PROPERTY_ERROR; goto out; } @@ -1428,11 +1422,8 @@ static int udevAddOneDevice(struct udev_device *device) /* If this is a device change, the old definition will be freed * and the current definition will take its place. */ dev = virNodeDeviceAssignDef(&driver->devs, def); - - if (dev == NULL) { - VIR_ERROR(_("Failed to create device for '%s'"), def->name); + if (dev == NULL) goto out; - } virNodeDeviceObjUnlock(dev); @@ -1686,10 +1677,8 @@ static int udevSetupSystemDev(void) #endif dev = virNodeDeviceAssignDef(&driver->devs, def); - if (dev == NULL) { - VIR_ERROR(_("Failed to create device for '%s'"), def->name); + if (dev == NULL) goto out; - } virNodeDeviceObjUnlock(dev); -- 2.3.5

2 1

[libvirt] [PATCH] virPidFileConstructPath: Drop useless VIR_FREE()
by Michal Privoznik 15 Apr '15

15 Apr '15

If a virAsprintf() within the function fails, we call VIR_FREE() over @rundir variable and jump onto cleanup label, where it is freed again. It doesn't hurt, but not make much sense too. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed as trivial. src/util/virpidfile.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c index a77a326..8144ff9 100644 --- a/src/util/virpidfile.c +++ b/src/util/virpidfile.c @@ -556,11 +556,8 @@ virPidFileConstructPath(bool privileged, goto cleanup; } - if (virAsprintf(pidfile, "%s/%s.pid", rundir, progname) < 0) { - VIR_FREE(rundir); + if (virAsprintf(pidfile, "%s/%s.pid", rundir, progname) < 0) goto cleanup; - } - } ret = 0; -- 2.0.5

1 0

[libvirt] [PATCHv2 0/7] Fix checking of NULL monitor and clean up code
by Peter Krempa 15 Apr '15

15 Apr '15

This is a v2 to https://www.redhat.com/archives/libvir-list/2015-April/msg00416.html This fixes all commands and cleans up the code in the process. Peter Krempa (7): qemu: monitor: Clean up coding style qemu: monitor: Sanitize control flow in qemuMonitorSetCapabilities qemu: monitor: Ensure that qemuMonitorSetLink is called with non-null name qemu: monitor: Don't use 'ret' variable where not necessary qemu: monitor: @running in qemuMonitorGetStatus is always non-NULL qemu: monitor: Fix qemuMonitorGetAllBlockStatsInfo with HMP qemu: monitor: Refactor and fix monitor checking src/qemu/qemu_monitor.c | 2166 +++++++++++++++++------------------------------ src/qemu/qemu_monitor.h | 24 +- src/qemu/qemu_process.c | 6 + 3 files changed, 810 insertions(+), 1386 deletions(-) -- 2.3.5

3 16

[libvirt] [PATCH] schema: Allow multiple machines for sparc VMs
by Martin Kletzander 15 Apr '15

15 Apr '15

Use the same pattern as there is for x86 machines. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- docs/schemas/domaincommon.rng | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 03fd541..80b30df 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -384,7 +384,9 @@ </optional> <optional> <attribute name="machine"> - <value>sun4m</value> + <data type="string"> + <param name="pattern">[a-zA-Z0-9_\.\-]+</param> + </data> </attribute> </optional> </group> -- 2.3.5

4 4

[libvirt] [PATCH v2] schema: Allow multiple machines for VMs
by Martin Kletzander 15 Apr '15

15 Apr '15

Use the same pattern for all OS types. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- docs/schemas/domaincommon.rng | 160 ++---------------------------------------- 1 file changed, 4 insertions(+), 156 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 03fd541..cb21df7 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -328,152 +328,17 @@ <define name="ostypehvm"> <element name="type"> <optional> - <choice> - <ref name="hvmx86"/> - <ref name="hvmmips"/> - <ref name="hvmsparc"/> - <ref name="hvmppc"/> - <ref name="hvmppc64"/> - <ref name="hvms390"/> - <ref name="hvmarm"/> - <ref name="hvmaarch64"/> - </choice> - </optional> - <value>hvm</value> - </element> - </define> - <define name="hvmx86"> - <group> - <optional> <attribute name="arch"> <choice> <value>i686</value> <value>x86_64</value> - </choice> - </attribute> - </optional> - <optional> - <attribute name="machine"> - <data type="string"> - <param name="pattern">[a-zA-Z0-9_\.\-]+</param> - </data> - </attribute> - </optional> - </group> - </define> - <define name="hvmmips"> - <group> - <optional> - <attribute name="arch"> - <value>mips</value> - </attribute> - </optional> - <optional> - <attribute name="machine"> - <value>mips</value> - </attribute> - </optional> - </group> - </define> - <define name="hvmsparc"> - <group> - <optional> - <attribute name="arch"> - <value>sparc</value> - </attribute> - </optional> - <optional> - <attribute name="machine"> - <value>sun4m</value> - </attribute> - </optional> - </group> - </define> - <define name="hvmppc"> - <group> - <optional> - <attribute name="arch"> - <value>ppc</value> - </attribute> - </optional> - <optional> - <attribute name="machine"> - <choice> - <value>g3beige</value> - <value>mac99</value> - <value>prep</value> - <value>ppce500</value> - </choice> - </attribute> - </optional> - </group> - </define> - <define name="hvmppc64"> - <group> - <optional> - <attribute name="arch"> - <choice> + <value>mips</value> + <value>ppc</value> <value>ppc64</value> <value>ppc64le</value> - </choice> - </attribute> - </optional> - <optional> - <attribute name="machine"> - <choice> - <value>pseries</value> - <value>pseries-2.1</value> - <value>pseries-2.2</value> - </choice> - </attribute> - </optional> - </group> - </define> - <define name="hvms390"> - <group> - <optional> - <attribute name="arch"> - <choice> <value>s390</value> <value>s390x</value> - </choice> - </attribute> - </optional> - <optional> - <attribute name="machine"> - <choice> - <value>s390</value> - <value>s390-virtio</value> - <value>s390-ccw</value> - <value>s390-ccw-virtio</value> - </choice> - </attribute> - </optional> - </group> - </define> - <define name="hvmarm"> - <group> - <optional> - <attribute name="arch"> - <choice> <value>armv7l</value> - </choice> - </attribute> - </optional> - <optional> - <attribute name="machine"> - <data type="string"> - <param name="pattern">[a-zA-Z0-9_\.\-]+</param> - </data> - </attribute> - </optional> - </group> - </define> - <define name="hvmaarch64"> - <group> - <optional> - <attribute name="arch"> - <choice> <value>aarch64</value> </choice> </attribute> @@ -485,25 +350,6 @@ </data> </attribute> </optional> - </group> - </define> - <define name="osexe"> - <element name="os"> - <element name="type"> - <optional> - <attribute name="arch"> - <choice> - <value>i686</value> - <value>x86_64</value> - <value>ppc</value> - <value>ppc64</value> - <value>mips</value> - <value>sparc</value> - </choice> - </attribute> - </optional> - <value>exe</value> - </element> <interleave> <optional> <element name="init"> @@ -516,8 +362,10 @@ </element> </zeroOrMore> </interleave> + <value>hvm</value> </element> </define> + <!-- The Identifiers can be: - an optional id attribute with a number on the domain element -- 2.3.5

2 2

[libvirt] [PATCH 0/2] qemu: add VIR_DOMAIN_EVENT_ID_DEVICE_ADDED event
by Ján Tomko 15 Apr '15

15 Apr '15

https://bugzilla.redhat.com/show_bug.cgi?id=1206114 Ján Tomko (2): Add VIR_DOMAIN_EVENT_ID_DEVICE_ADDED event Emit VIR_DOMAIN_EVENT_ID_DEVICE_ADDED in the QEMU driver daemon/remote.c | 37 +++++++++++++++++++ include/libvirt/libvirt-domain.h | 18 ++++++++++ src/conf/domain_event.c | 77 ++++++++++++++++++++++++++++++++++++++++ src/conf/domain_event.h | 6 ++++ src/libvirt_private.syms | 2 ++ src/qemu/qemu_driver.c | 17 ++++++++- src/qemu/qemu_hotplug.c | 5 +++ src/remote/remote_driver.c | 29 +++++++++++++++ src/remote/remote_protocol.x | 14 +++++++- src/remote_protocol-structs | 6 ++++ tools/virsh-domain.c | 20 +++++++++++ 11 files changed, 229 insertions(+), 2 deletions(-) -- 2.0.5

2 11

[libvirt] [PATCH v2 0/8] Duplicate storage pool source refactoring and checks
by John Ferlan 15 Apr '15

15 Apr '15

v1 here: http://www.redhat.com/archives/libvir-list/2015-April/msg00141.html Changes: Patches 1-3 are refactored into just 1 patch now Patch 2 is the old patch 4 and renames the function as requested and removes the comment Patch 3 is new - it adds a check for different port #'s to the new host source matching function. Patch 4 is the old patch 5, already ACK'd and only changed to use the new name Patch 5 is the old patch 6, already ACK'd Patches 6 & 7 are the old patches 7 & 8. They use the new name and the commit comment is adjusted Patch 8 is the old patch 9 and is unchanged, already ACK'd John Ferlan (8): storage: Refactor iSCSI Source matching storage: Create virStoragePoolSourceMatchSingleHost storage: Add check for different ports for host duplicate matching storage: Use virStoragePoolSourceMatchSingleHost for NETFS storage: Remove default from switch in virStoragePoolSourceFindDuplicate storage: Add duplicate host check for Sheepdog pool def storage: Add duplicate host check for Gluster pool def storage: Add duplicate devices check for zfs pool def src/conf/storage_conf.c | 62 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 46 insertions(+), 16 deletions(-) -- 2.1.0

2 18

[libvirt] [PATCH 0/5] Tiny miscellaneous clean-ups
by Martin Kletzander 15 Apr '15

15 Apr '15

Just a few things I stumbled upon that are needed for future work. Martin Kletzander (5): configure: Align messages Link libvirt_util with datatypes closeCallback is already lockable, initialize it as such Change virConnectPtr into virObjectLocklable json: export non-static functions configure.ac | 4 ++-- src/Makefile.am | 7 ++++--- src/datatypes.c | 16 ++++------------ src/datatypes.h | 12 +++++------- src/libvirt-host.c | 18 +++++++++--------- src/libvirt_private.syms | 2 ++ src/util/virerror.c | 18 +++++++++--------- 7 files changed, 35 insertions(+), 42 deletions(-) -- 2.3.5

2 12

[libvirt] macvtap - no incoming ipv6 traffic processed on kvm host unless i start tcpdump on interface
by Stefan Bauer 15 Apr '15

15 Apr '15

Dear folks, I'm using for the first time macvtap interface for my virtual machines in bridged mode. VM -> HOST -> Router -> INTERNET This works fine for ipv4 connectivity. For ipv6 my virtual machines receive appropriate v6 address from radvd but are not able to receive answer packages from outside (ping -t -6 google.de was started inside VM). I see the ping request/response on my router: 14:10:52.147834 IP6 2a01:198:200:8350:dc8b:cd82:144e:14eb > 2a00:1450:4001:806::1018: ICMP6, echo request, seq 108, length 40 14:10:52.182073 IP6 2a00:1450:4001:806::1018 > 2a01:198:200:8350:dc8b:cd82:144e:14eb: ICMP6, echo reply, seq 108, length 40 14:10:55.179874 IP6 2a01:198:200:350::2 > 2a00:1450:4001:806::1018: ICMP6, destination unreachable, unreachable address 2a01:198:200:8350:dc8b:cd82:144e:14eb, length 88 But i do not receive the reply on the VM. However on the KVM host - when i start a tcpdump on the macvtap interface with root@s1:~# tcpdump -ni macvtap0 ip6 tcpdump: verbose output suppressed, use -v or -vv for full protocol decode listening on macvtap0, link-type EN10MB (Ethernet), capture size 262144 bytes 14:12:37.134516 IP6 2a01:198:200:8350:dc8b:cd82:144e:14eb > 2a00:1450:4001:806::1018: ICMP6, echo request, seq 129, length 40 14:12:37.188529 IP6 fe80::12fe:edff:fee6:cfa > ff02::1:ff4e:14eb: ICMP6, neighbor solicitation, who has 2a01:198:200:8350:dc8b:cd82:144e:14eb, length 32 14:12:37.189040 IP6 2a01:198:200:8350:dc8b:cd82:144e:14eb > fe80::12fe:edff:fee6:cfa: ICMP6, neighbor advertisement, tgt is 2a01:198:200:8350:dc8b:cd82:144e:14eb, length 32 14:12:37.189202 IP6 2a00:1450:4001:806::1018 > 2a01:198:200:8350:dc8b:cd82:144e:14eb: ICMP6, echo reply, seq 129, length 40 packages starting to get processed and VM receives replies. Any idea what is happening here? Cheers, Stefan

3 13

[libvirt] [PATCH 0/9] Duplicate storage pool source refactoring and checks
by John Ferlan 15 Apr '15

15 Apr '15

A precursor to some changes I'm working on - I figured it was better not to hoard the patches and then drop a 15 patch series... Anyway, patches 1-4 refactor the iSCSI <source> duplicate checks into a separate subroutine. While I was at it, I realized the Host checks are duplicate of the NETFS check - so I further separated things out. As I was looking at other possible defs I realized not all of the proposed storage pool defs go through duplicate checks because the switch statement had the 'default:' case - so I removed that, added all the options with the hope that new storage pool types will add their own checking. This left me with a bit of sleuthing for cases I added. I was able to determine that Sheepdog and Gluster both have the possibility of "a" single source host, so I added that check as it doesn't seem like it would be a good idea to have two storage pools looking at the same gluster/sheepdog source For the zfs pool it seems that it's like the DISK, LOGICAL, and FS pools with regard to not having duplicate devices in the pool For mpath there doesn't seem to be any need, but I could be wrong For rbd it wasn't completely clear what to check since multiple hosts are allowed for a single pool - I suppose a proposed definition should check that none of it's definitions match, but then again I'm not clear so I left it alone John Ferlan (9): storage: Refactor iSCSI Source matching storage: Refactor matchISCSISource storage: Invert logic for matchISCSISource storage: Create matchPoolSourceHost storage: Use matchPoolSourceHost for NETFS storage: Remove default from switch in virStoragePoolSourceFindDuplicate storage: Add duplicate host check for Sheepdog pool def storage: Add duplicate host check for Gluster pool def storage: Add duplicate devices check for zfs pool def src/conf/storage_conf.c | 59 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 16 deletions(-) -- 2.1.0

2 23

[libvirt] [PATCH] tools: improve the error info when fail to parse parameter --soft-limit of memtune
by Shanzhi Yu 15 Apr '15

15 Apr '15

When set guest memory with a invalid parameter of --soft-limit, it posts weird error: $ virsh memtune r7 --hard-limit 20417224 --soft-limit 9007199254740992 --swap-hard-limit 35417224 error: Unable to parse integer parameter 'NAME Change it to error: Unable to parse integer parameter soft-limit Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1211550 Signed-off-by: Shanzhi Yu <shyu(a)redhat.com> --- 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 3e2c420..ebdf398 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -8417,7 +8417,7 @@ cmdMemtune(vshControl *ctl, const vshCmd *cmd) #define PARSE_MEMTUNE_PARAM(NAME, FIELD) \ if ((rc = vshMemtuneGetSize(cmd, NAME, &tmpVal)) < 0) { \ - vshError(ctl, "%s", _("Unable to parse integer parameter 'NAME'")); \ + vshError(ctl, _("Unable to parse integer parameter %s"), NAME); \ goto cleanup; \ } \ if (rc == 1) { \ -- 2.1.0

2 4

[libvirt] [PATCH] build: provide virNetDevSysfsFile on non-Linux
by Eric Blake 14 Apr '15

14 Apr '15

Commit 49ed6cff is broken on mingw and other non-linux platforms: CCLD libvirt.la Cannot export virNetDevSysfsFile: symbol not defined collect2: error: ld returned 1 exit status * src/util/virnetdev.c: Provide virNetDevSysfsFile fallback. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. src/util/virnetdev.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 6ee692d..9ef75f2 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -1877,6 +1877,17 @@ virNetDevGetVirtualFunctionInfo(const char *vfname ATTRIBUTE_UNUSED, _("Unable to get virtual function info on this platform")); return -1; } + +int +virNetDevSysfsFile(char **pf_sysfs_device_link ATTRIBUTE_UNUSED, + const char *ifname ATTRIBUTE_UNUSED, + const char *file ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Unable to get sysfs info on this platform")); + return -1; +} + #endif /* !__linux__ */ #if defined(__linux__) && defined(HAVE_LIBNL) && defined(IFLA_VF_MAX) -- 2.1.0

1 0

[libvirt] [PATCH] build: include correct header for time()
by Eric Blake 14 Apr '15

14 Apr '15

Found by ./autobuild.sh during a mingw cross-compile: Commit 8a96e87 was not innocuous - glibc happens to leak the definition of time() through other headers, so that even without <sys/select.h>, virrandom.c compiled just fine. But on mingw, we were not so lucky; <sys/select.h> was important for its side effect of dragging in <time.h>, and we now have nothing providing the declaration of time(): ../../src/util/virrandom.c: In function 'virRandomOnceInit': ../../src/util/virrandom.c:65:5: error: implicit declaration of function 'time' [-Werror=implicit-function-declaration] unsigned int seed = time(NULL) ^ getpid(); ^ ../../src/util/virrandom.c:65:5: error: nested extern declaration of 'time' [-Werror=nested-externs] Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. src/util/virrandom.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util/virrandom.c b/src/util/virrandom.c index 4301f3f..67a8bd0 100644 --- a/src/util/virrandom.c +++ b/src/util/virrandom.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 Red Hat, Inc. + * Copyright (C) 2012-2015 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -25,6 +25,7 @@ #include <inttypes.h> #include <math.h> #include <strings.h> +#include <time.h> #include "virrandom.h" #include "virthread.h" -- 2.1.0

1 0

[libvirt] [PATCH] qemu: monitor: Add check that monitor is non-null to specific commands
by Peter Krempa 14 Apr '15

14 Apr '15

Our monitor locking and cleanup code is weird as it allows to remove the monitor object pointer while we are in the monitor. Additionally EVERY api is using the vm private data after @vm was unlocked. This leads to an unpleasant situation, where when qemu crashes during a monitor session while a command is executed (and locks are down), the priv->mon pointer gets cleared (@vm is unlocked). The next monitor call then crashes on commands that did not check if the monitor is non-NULL. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1209813 and few other possible crashes --- Since this is a workaround rather than a proper fix I'd normally not go this way, but untangling the monitor mess won't be easy so I'll fix the symptoms first. src/qemu/qemu_monitor.c | 42 ++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.h | 12 +++++------- 2 files changed, 47 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 2b0e1a5..e8403be 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1171,6 +1171,12 @@ qemuMonitorUpdateVideoMemorySize(qemuMonitorPtr mon, int ret = -1; char *path = NULL; + if (!mon) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("monitor must not be NULL")); + return -1; + } + if (mon->json) { ret = qemuMonitorFindObjectPath(mon, "/", videoName, &path); if (ret < 0) { @@ -1886,6 +1892,12 @@ qemuMonitorBlockStatsUpdateCapacity(qemuMonitorPtr mon, { VIR_DEBUG("mon=%p, stats=%p, backing=%d", mon, stats, backingChain); + if (!mon) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("monitor must not be NULL")); + return -1; + } + if (!mon->json) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("block capacity/size info requires JSON monitor")); @@ -3246,6 +3258,12 @@ qemuMonitorAddObject(qemuMonitorPtr mon, mon, type, objalias, props); int ret = -1; + if (!mon) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("monitor must not be NULL")); + return -1; + } + if (mon->json) { ret = qemuMonitorJSONAddObject(mon, type, objalias, props); } else { @@ -3265,6 +3283,12 @@ qemuMonitorDelObject(qemuMonitorPtr mon, VIR_DEBUG("mon=%p objalias=%s", mon, objalias); int ret = -1; + if (!mon) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("monitor must not be NULL")); + return -1; + } + if (mon->json) ret = qemuMonitorJSONDelObject(mon, objalias); else @@ -3453,6 +3477,12 @@ qemuMonitorBlockCommit(qemuMonitorPtr mon, const char *device, "bandwidth=%llu", mon, device, top, base, NULLSTR(backingName), bandwidth); + if (!mon) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("monitor must not be NULL")); + return -1; + } + if (mon->json) ret = qemuMonitorJSONBlockCommit(mon, device, top, base, backingName, bandwidth); @@ -3482,6 +3512,12 @@ qemuMonitorDiskNameLookup(qemuMonitorPtr mon, virStorageSourcePtr top, virStorageSourcePtr target) { + if (!mon) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("monitor must not be NULL")); + return NULL; + } + if (!mon->json) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("JSON monitor is required")); @@ -3592,6 +3628,12 @@ qemuMonitorBlockJob(qemuMonitorPtr mon, mon, device, NULLSTR(base), NULLSTR(backingName), bandwidth, mode, modern); + if (!mon) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("monitor must not be NULL")); + return -1; + } + if (mon->json) ret = qemuMonitorJSONBlockJob(mon, device, base, backingName, bandwidth, mode, modern); diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index a3514cf..7e62139 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -246,7 +246,7 @@ void qemuMonitorSetOptions(qemuMonitorPtr mon, virJSONValuePtr options) int qemuMonitorUpdateVideoMemorySize(qemuMonitorPtr mon, virDomainVideoDefPtr video, const char *videName) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); + ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); int qemuMonitorHMPCommandWithFd(qemuMonitorPtr mon, const char *cmd, int scm_fd, @@ -381,7 +381,7 @@ int qemuMonitorGetAllBlockStatsInfo(qemuMonitorPtr mon, int qemuMonitorBlockStatsUpdateCapacity(qemuMonitorPtr mon, virHashTablePtr stats, bool backingChain) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); + ATTRIBUTE_NONNULL(2); int qemuMonitorGetBlockExtent(qemuMonitorPtr mon, const char *dev_name, @@ -730,15 +730,13 @@ int qemuMonitorBlockCommit(qemuMonitorPtr mon, const char *base, const char *backingName, unsigned long long bandwidth) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) - ATTRIBUTE_NONNULL(4); + ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4); bool qemuMonitorSupportsActiveCommit(qemuMonitorPtr mon); char *qemuMonitorDiskNameLookup(qemuMonitorPtr mon, const char *device, virStorageSourcePtr top, virStorageSourcePtr target) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) - ATTRIBUTE_NONNULL(4); + ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4); int qemuMonitorArbitraryCommand(qemuMonitorPtr mon, const char *cmd, @@ -774,7 +772,7 @@ int qemuMonitorBlockJobInfo(qemuMonitorPtr mon, const char *device, virDomainBlockJobInfoPtr info, unsigned long long *bandwidth) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); + ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); int qemuMonitorOpenGraphics(qemuMonitorPtr mon, const char *protocol, -- 2.3.5

2 2

[libvirt] [PATCH] sanlock: Use VIR_ERR_RESOURCE_BUSY if sanlock_acquire fails
by Jiri Denemark 14 Apr '15

14 Apr '15

When acquiring resource via sanlock fails, we would report it as VIR_ERR_INTERNAL_ERROR, which is not very friendly to applications using libvirt. Moreover, the lockd driver would report the same failure as VIR_ERR_RESOURCE_BUSY, which looks better. Unfortunately, in sanlock driver we don't really know if acquiring the resource failed because it was already locked or there was another reason behind. But the end result is the same and I think using VIR_ERR_RESOURCE_BUSY reason for all acquire failures is still better than what we have now. https://bugzilla.redhat.com/show_bug.cgi?id=1165119 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/locking/lock_driver_sanlock.c | 2 +- src/util/virerror.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index dbe79bc..e052875 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -975,7 +975,7 @@ static int virLockManagerSanlockAcquire(virLockManagerPtr lock, priv->res_count, priv->res_args, opt)) < 0) { if (rv <= -200) - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_RESOURCE_BUSY, _("Failed to acquire lock: error %d"), rv); else virReportSystemError(-rv, "%s", diff --git a/src/util/virerror.c b/src/util/virerror.c index c4e84e7..91c8686 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -1326,7 +1326,7 @@ virErrorMsg(virErrorNumber error, const char *info) if (info == NULL) errmsg = _("resource busy"); else - errmsg = _("resource busy %s"); + errmsg = _("resource busy: %s"); break; case VIR_ERR_ACCESS_DENIED: if (info == NULL) -- 2.3.5

2 1

[libvirt] [PATCH] Add articles to virDomainDeviceDetachFlags docs
by Ján Tomko 14 Apr '15

14 Apr '15

Reported by John Ferlan. --- Pushed as trivial. 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 0acfd13..ccacdb4 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -8463,7 +8463,7 @@ virDomainDetachDevice(virDomainPtr domain, const char *xml) * configuration before it was actually removed by the hypervisor causing * various failures on subsequent operations. To check whether the device was * successfully removed, either recheck domain configuration using - * virDomainGetXMLDesc() or add handler for VIR_DOMAIN_EVENT_ID_DEVICE_REMOVED + * virDomainGetXMLDesc() or add a handler for the VIR_DOMAIN_EVENT_ID_DEVICE_REMOVED * event. In case the device is already gone when virDomainDetachDeviceFlags * returns, the event is delivered before this API call ends. To help existing * clients work better in most cases, this API will try to transform an -- 2.0.5

1 0

[libvirt] [PATCH] xen: fix build error on rhel-5
by Pavel Hrdina 14 Apr '15

14 Apr '15

../../src/xen/block_stats.c:82: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/xen/block_stats.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/xen/block_stats.c b/src/xen/block_stats.c index e1e10a2..9dd3a07 100644 --- a/src/xen/block_stats.c +++ b/src/xen/block_stats.c @@ -63,7 +63,7 @@ static int64_t read_stat(const char *path) { char str[64]; - int64_t r; + long long r; size_t i; FILE *fp; @@ -79,10 +79,10 @@ read_stat(const char *path) return -1; str[i] = '\0'; /* make sure the string is nul-terminated */ - if (virStrToLong_ll(str, NULL, 10, (long long *) &r) < 0) + if (virStrToLong_ll(str, NULL, 10, &r) < 0) return -1; - return r; + return (int64_t)r; } static int64_t -- 2.0.5

2 2

[libvirt] [PATCH] hostdev: fix loop index error when resetvfnetconfig
by Huanle Han 14 Apr '15

14 Apr '15

The variable 'last_processed_hostdev_vf' indicates index of the last successfully configed vf. When resetvfnetconfig because of failure, hostdevs[last_processed_hostdev_vf] should also be reset. Signed-off-by: Huanle Han <hanxueluo(a)gmail.com> --- src/util/virhostdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c index 83f567d..b15db70 100644 --- a/src/util/virhostdev.c +++ b/src/util/virhostdev.c @@ -693,7 +693,7 @@ virHostdevPreparePCIDevices(virHostdevManagerPtr hostdev_mgr, resetvfnetconfig: for (i = 0; - last_processed_hostdev_vf != -1 && i < last_processed_hostdev_vf; i++) + last_processed_hostdev_vf != -1 && i <= last_processed_hostdev_vf; i++) virHostdevNetConfigRestore(hostdevs[i], hostdev_mgr->stateDir, NULL); reattachdevs: -- 1.9.1

2 1

[libvirt] [PATCH] qemu: fix index error when clean up vport profile
by Huanle Han 14 Apr '15

14 Apr '15

1. 'last_good_net' indicates the index of last successfully configured net. so def->nets[last_good_net] should also be clean up if error occurs. 2. if error occurs in 'virNetDevMacVLanVPortProfileRegisterCallback' (second 'goto err_exit' in loop), we should also do 'virNetDevVPortProfileDisassociate' cleanup for the 'virNetDevVPortProfileAssociate'(first code block in loop). So we should consider the net is successfully configured after first code block in loop finishes. Signed-off-by: Huanle Han <hanxueluo(a)gmail.com> --- src/qemu/qemu_migration.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 8c45415..e214735 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -5067,6 +5067,7 @@ qemuMigrationVPAssociatePortProfiles(virDomainDefPtr def) net->ifname); goto err_exit; } + last_good_net = i; VIR_DEBUG("Port profile Associate succeeded for %s", net->ifname); if (virNetDevMacVLanVPortProfileRegisterCallback(net->ifname, &net->mac, @@ -5075,13 +5076,12 @@ qemuMigrationVPAssociatePortProfiles(virDomainDefPtr def) VIR_NETDEV_VPORT_PROFILE_OP_CREATE)) goto err_exit; } - last_good_net = i; } return 0; err_exit: - for (i = 0; last_good_net != -1 && i < last_good_net; i++) { + for (i = 0; last_good_net != -1 && i <= last_good_net; i++) { net = def->nets[i]; if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_DIRECT) { ignore_value(virNetDevVPortProfileDisassociate(net->ifname, -- 1.9.1

2 1

[libvirt] [PATCH 0/5] Prohibit use of 'index' for variable
by John Ferlan 14 Apr '15

14 Apr '15

Given the recent Xen-devel build failure/issue - this series of patches will remove our uses of '[unsigned] int index' and then generate a rule for it John Ferlan (5): qemu: Adjust the prototype to match the function util: Use 'idx' instead of 'index' snapshot: Change 'index' to 'idx' nwfilter: Change 'index' to 'idx' cfg: Disallow usage of 'index' as variable name cfg.mk | 5 +++++ src/conf/nwfilter_params.c | 8 ++++---- src/conf/nwfilter_params.h | 2 +- src/conf/snapshot_conf.c | 6 +++--- src/conf/snapshot_conf.h | 2 +- src/qemu/qemu_conf.h | 2 +- src/qemu/qemu_driver.c | 4 ++-- src/util/virnetdev.c | 4 ++-- 8 files changed, 19 insertions(+), 14 deletions(-) -- 2.1.0

2 6

[libvirt] [PATCH 1/1] virt-aa-helper: add unix channels (esp for qemu-guest-agent)
by Serge Hallyn 14 Apr '15

14 Apr '15

The original bug report was at https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1393842 Signed-off-by: Serge Hallyn <serge.hallyn(a)ubuntu.com> --- src/security/virt-aa-helper.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index e53779e..8ec95c1 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -998,6 +998,7 @@ get_files(vahControl * ctl) (ctl->def->channels[i]->source.type == VIR_DOMAIN_CHR_TYPE_PTY || ctl->def->channels[i]->source.type == VIR_DOMAIN_CHR_TYPE_DEV || ctl->def->channels[i]->source.type == VIR_DOMAIN_CHR_TYPE_FILE || + ctl->def->channels[i]->source.type == VIR_DOMAIN_CHR_TYPE_UNIX || ctl->def->channels[i]->source.type == VIR_DOMAIN_CHR_TYPE_PIPE) && ctl->def->channels[i]->source.data.file.path) if (vah_add_file_chardev(&buf, -- 2.1.4

2 5

[libvirt] [PATCH] sparc: Add default PCI root controller
by Martin Kletzander 14 Apr '15

14 Apr '15

It is there even with -nodefaults and -no-user-config, so count with that so we can start sparc domains. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_domain.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ae632c5..603360f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1,7 +1,7 @@ /* * qemu_domain.c: QEMU domain private state * - * Copyright (C) 2006-2014 Red Hat, Inc. + * Copyright (C) 2006-2015 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -999,6 +999,12 @@ qemuDomainDefPostParse(virDomainDefPtr def, case VIR_ARCH_S390X: addDefaultUSB = false; break; + + case VIR_ARCH_SPARC: + case VIR_ARCH_SPARC64: + addPCIRoot = true; + break; + default: break; } -- 2.3.5

2 1

[libvirt] [PATCH] PowerPC: Replace hardcoded values of 'pseries-2*' machine in schema
by Prerna Saxena 14 Apr '15

14 Apr '15

From: Prerna Saxena <prerna(a)linux.vnet.ibm.com> Date: Mon, 6 Apr 2015 22:56:25 -0500 Qemu-system-ppc64 has introduced new variants of pseries machine type, such as 'pseries', 'pseries-2.1'..'pseries-2.3'. Replace the hardcoded values in the schema with a regex that captures this. Signed-off-by: Prerna Saxena <prerna(a)linux.vnet.ibm.com> --- docs/schemas/domaincommon.rng | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 7406d92..a192637 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -421,9 +421,9 @@ <optional> <attribute name="machine"> <choice> - <value>pseries</value> - <value>pseries-2.1</value> - <value>pseries-2.2</value> + <data type="string"> + <param name="pattern">(pseries)(\-2\.[1-9])?</param> + </data> </choice> </attribute> </optional> -- 1.8.3.1 -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India

2 1