- Devel - libvirt List Archives

[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 15 Apr '15

15 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 15 Apr '15

15 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 15 Apr '15

15 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

[libvirt] [PATCH] qemu: Use 'idx' instead of 'index' for variable name
by John Ferlan 14 Apr '15

14 Apr '15

Apparently for Xen-devel 'index' is a global and causes a build failure, so just use the shortened 'idx' instead to avoid the conflict. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- I did try modify cfg.mk to add a syntax check similar to the ii,jj,kk checks, but it tripped up over 'index' declarations inside structures. I'd be happy to add one, but I need some help formatting it... Here's what I had: sc_prohibit_int_index: @prohibit='\<(int|unsigned) ([^(=]* )*(index)\>(\s|,|;)' \ halt='use different name than 'index' for declaration' \ $(_sc_search_regexp) src/qemu/qemu_driver.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e790664..3510690 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4638,7 +4638,7 @@ static void qemuProcessEventHandler(void *data, void *opaque) static virCgroupPtr qemuDomainAddCgroupForThread(virCgroupPtr cgroup, virCgroupThreadName nameval, - int index, + int idx, char *mem_mask, pid_t pid) { @@ -4646,7 +4646,7 @@ qemuDomainAddCgroupForThread(virCgroupPtr cgroup, int rv = -1; /* Create cgroup */ - if (virCgroupNewThread(cgroup, nameval, index, true, &new_cgroup) < 0) + if (virCgroupNewThread(cgroup, nameval, idx, true, &new_cgroup) < 0) return NULL; if (mem_mask && virCgroupSetCpusetMems(new_cgroup, mem_mask) < 0) @@ -4657,7 +4657,7 @@ qemuDomainAddCgroupForThread(virCgroupPtr cgroup, if (rv < 0) { virReportSystemError(-rv, _("unable to add id %d task %d to cgroup"), - index, pid); + idx, pid); virCgroupRemove(new_cgroup); goto error; } @@ -4671,7 +4671,7 @@ qemuDomainAddCgroupForThread(virCgroupPtr cgroup, static int qemuDomainHotplugAddPin(virBitmapPtr cpumask, - int index, + int idx, virDomainPinDefPtr **pindef_list, size_t *npin) { @@ -4685,7 +4685,7 @@ qemuDomainHotplugAddPin(virBitmapPtr cpumask, VIR_FREE(pindef); goto cleanup; } - pindef->id = index; + pindef->id = idx; if (VIR_APPEND_ELEMENT_COPY(*pindef_list, *npin, pindef) < 0) { virBitmapFree(pindef->cpumask); VIR_FREE(pindef); @@ -4699,7 +4699,7 @@ qemuDomainHotplugAddPin(virBitmapPtr cpumask, static int qemuDomainHotplugPinThread(virBitmapPtr cpumask, - int index, + int idx, pid_t pid, virCgroupPtr cgroup) { @@ -4709,14 +4709,14 @@ qemuDomainHotplugPinThread(virBitmapPtr cpumask, if (qemuSetupCgroupCpusetCpus(cgroup, cpumask) < 0) { virReportError(VIR_ERR_OPERATION_INVALID, _("failed to set cpuset.cpus in cgroup for id %d"), - index); + idx); goto cleanup; } } else { if (virProcessSetAffinity(pid, cpumask) < 0) { virReportError(VIR_ERR_SYSTEM_ERROR, _("failed to set cpu affinity for id %d"), - index); + idx); goto cleanup; } } @@ -4730,12 +4730,12 @@ qemuDomainHotplugPinThread(virBitmapPtr cpumask, static int qemuDomainDelCgroupForThread(virCgroupPtr cgroup, virCgroupThreadName nameval, - int index) + int idx) { virCgroupPtr new_cgroup = NULL; if (cgroup) { - if (virCgroupNewThread(cgroup, nameval, index, false, &new_cgroup) < 0) + if (virCgroupNewThread(cgroup, nameval, idx, false, &new_cgroup) < 0) return -1; /* Remove the offlined cgroup */ -- 2.1.0

2 4

[libvirt] [PATCHv3 0/7] Block job fixes and refactors
by Peter Krempa 14 Apr '15

14 Apr '15

Peter Krempa (7): qemu: monitor: json: Refactor error code class checker qemu: monitor: Extract handling of JSON block job error codes qemu: blockjob: Split qemuDomainBlockJobSetSpeed from qemuDomainBlockJobImpl qemu: blockjob: Separate qemuDomainBlockJobAbort from qemuDomainBlockJobImpl qemu: blockPull: Refactor the rest of qemuDomainBlockJobImpl qemu: drivePivot: Fix assumption when 'block-job-complete' fails qemu: Refactor qemuDomainBlockJobAbort() src/qemu/qemu_driver.c | 367 ++++++++++++++++++++++++------------------- src/qemu/qemu_migration.c | 8 +- src/qemu/qemu_monitor.c | 67 ++++++-- src/qemu/qemu_monitor.h | 29 ++-- src/qemu/qemu_monitor_json.c | 213 ++++++++++++++----------- src/qemu/qemu_monitor_json.h | 24 ++- 6 files changed, 414 insertions(+), 294 deletions(-) -- 2.2.2

2 9

[libvirt] [PATCH 0/5] Refactor vcpupin parser and fix error checking
by Peter Krempa 14 Apr '15

14 Apr '15

Peter Krempa (5): conf: Split out parsing of emulatorpin conf: Split up virDomainVcpuPinDefParseXML conf: Error out if iothread id is missing in iothreadpin conf: Refactor virDomainVcpuPinDefParseXML qemu: Fix condition for checking vcpu when pinning vcpus src/conf/domain_conf.c | 197 +++++++++++++++++++++++++++++-------------------- src/qemu/qemu_driver.c | 13 +++- 2 files changed, 128 insertions(+), 82 deletions(-) -- 2.2.2

2 11

[libvirt] [PATCH] lib: snapshot: Explain that only one layer of images is inserted
by Peter Krempa 14 Apr '15

14 Apr '15

When creating a snapshot with _REUSE_EXTERNAL when the pre-created image does not directly link to the current active layer libvirt would re-detect the backing chain incorrectly and it would not match with qemu's view. Since the configuration is an operator mistake, document that only the top layer image gets inserted. --- src/libvirt-domain-snapshot.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libvirt-domain-snapshot.c b/src/libvirt-domain-snapshot.c index ac858ba..55826fd 100644 --- a/src/libvirt-domain-snapshot.c +++ b/src/libvirt-domain-snapshot.c @@ -177,8 +177,9 @@ virDomainSnapshotGetConnect(virDomainSnapshotPtr snapshot) * the correct image format and metadata including backing store path * (this allows a management app to pre-create files with relative backing * file names, rather than the default of creating with absolute backing - * file names). Note that setting incorrect metadata in the pre-created - * image may lead to the VM being unable to start. + * file names). Note that only the file specified in the snapshot XML is + * inserted as a snapshot thus setting incorrect metadata in the pre-created + * image may lead to the VM being unable to start or other block jobs may fail. * * Be aware that although libvirt prefers to report errors up front with * no other effect, some hypervisors have certain types of failures where -- 2.3.5

2 2

[libvirt] [PATCH 0/2] Fix handling of disk's WWN (world wide name)
by Peter Krempa 14 Apr '15

14 Apr '15

Peter Krempa (2): conf: ABI: Check WWN in disk abi stability check qemu: Enforce WWN to be unique among VM's disks docs/formatdomain.html.in | 3 ++- src/conf/domain_conf.c | 33 +++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 3 +++ src/libvirt_private.syms | 1 + src/qemu/qemu_process.c | 3 +++ 5 files changed, 42 insertions(+), 1 deletion(-) -- 2.2.2

2 4

[libvirt] [PATCH v2 0/9] Implement Add/Del IOThreads
by John Ferlan 14 Apr '15

14 Apr '15

v1: http://www.redhat.com/archives/libvir-list/2015-March/msg01014.html v2 is mostly a completely rewrite of v1 - only smart parts were kept, mostly the "concepts" behind adding/removing a thread Patches 1&2: Couple of simple mods - mostly innocuous Patches 3-5 Since it was determined that just setting the IOThread count and keeping sequential IOThread ID's may not be a desired means to add/remove threads, I decided upon a mechanism which to a degree follows the tune/pin mechanism. Rework the existing IOThread logic to make use of a new domain XML element <iothreadids> which will list each of the <iothread>'s with attributes "id" (required) and "name" (optional). The "id" allows one to generate their own ID number/naming mechanism. If <iothreadids> is not found in the XML, then internally will generate the data structures that support it - IOThreadID's. Work the IOThreadID logic into the "live" iothreadpid lists (or now arrays) to manage the live IOThread data Patches 6-7 Add the API/plumbing for two new API's - virDomainAddIOThread and virDomainDelIOThread to complement the existing virDomainPinIOThread. The "Add" API will take two parameters - an iothread_id and an optional "name". The "Del" API will take just one parameter - the iothread_id Patch 8-9 Implement the qemu backend and virsh front end to manage IOThreads either live or just the config file. I did leave some // comments in Patch 8 as a way to ask a reviewer their thoughts in the add live error path whether 'extra' cleanup should be done or just ignored. Those would be cleaned up and removed for the final version. John Ferlan (9): Rename qemuCheckIothreads to qemuCheckIOThreads Convert virDomainPinIsDuplicate into bool return conf: Add new domain XML element 'iothreadids' qemu: Convert iothreadpids into an array of structures qemu: Use domain iothreadids to populate iothreadpids Implement virDomainAddIOThread and virDomainDelIOThread remote: Add support for AddIOThread and DelIOThread qemu: Add support to Add/Delete IOThreads virsh: Add iothreadadd and iothreaddel commands docs/formatdomain.html.in | 28 ++ docs/schemas/domaincommon.rng | 17 + include/libvirt/libvirt-domain.h | 7 + src/conf/domain_audit.c | 9 + src/conf/domain_audit.h | 6 + src/conf/domain_conf.c | 253 ++++++++++- src/conf/domain_conf.h | 29 +- src/driver-hypervisor.h | 13 + src/libvirt-domain.c | 132 ++++++ src/libvirt_private.syms | 7 + src/libvirt_public.syms | 6 + src/qemu/qemu_cgroup.c | 16 +- src/qemu/qemu_command.c | 108 ++++- src/qemu/qemu_command.h | 4 + src/qemu/qemu_domain.c | 55 ++- src/qemu/qemu_domain.h | 12 +- src/qemu/qemu_driver.c | 467 ++++++++++++++++++++- src/qemu/qemu_process.c | 32 +- src/remote/remote_driver.c | 2 + src/remote/remote_protocol.x | 31 +- src/remote_protocol-structs | 13 + .../qemuxml2argv-iothreads-ids-partial.args | 10 + .../qemuxml2argv-iothreads-ids-partial.xml | 33 ++ .../qemuxml2argv-iothreads-ids.args | 8 + .../qemuxml2argv-iothreads-ids.xml | 33 ++ .../qemuxml2argv-iothreads-name.args | 17 + .../qemuxml2argv-iothreads-name.xml | 44 ++ tests/qemuxml2argvtest.c | 4 + tests/qemuxml2xmltest.c | 3 + tools/virsh-domain.c | 174 ++++++++ tools/virsh.pod | 32 ++ 31 files changed, 1546 insertions(+), 59 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-name.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-name.xml -- 2.1.0

2 20

[libvirt] [python PATCH] Implement the DEVICE_ADDED event
by Ján Tomko 14 Apr '15

14 Apr '15

--- examples/event-test.py | 4 +++ libvirt-override-virConnect.py | 9 +++++++ libvirt-override.c | 57 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+) diff --git a/examples/event-test.py b/examples/event-test.py index 452f659..2c6ce7b 100755 --- a/examples/event-test.py +++ b/examples/event-test.py @@ -527,6 +527,9 @@ def myDomainEventTunableCallback(conn, dom, params, opaque): print("myDomainEventTunableCallback: Domain %s(%s) %s" % (dom.name(), dom.ID(), params)) def myDomainEventAgentLifecycleCallback(conn, dom, state, reason, opaque): print("myDomainEventAgentLifecycleCallback: Domain %s(%s) %s %s" % (dom.name(), dom.ID(), agentLifecycleStateToString(state), agentLifecycleReasonToString(reason))) +def myDomainEventDeviceAddedCallback(conn, dom, dev, opaque): + print("myDomainEventDeviceAddedCallback: Domain %s(%s) device added: %s" % ( + dom.name(), dom.ID(), dev)) ########################################################################## # Network events @@ -638,6 +641,7 @@ def main(): vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_BLOCK_JOB_2, myDomainEventBlockJob2Callback, None) vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_TUNABLE, myDomainEventTunableCallback, None) vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_AGENT_LIFECYCLE, myDomainEventAgentLifecycleCallback, None) + vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_DEVICE_ADDED, myDomainEventDeviceAddedCallback, None) vc.networkEventRegisterAny(None, libvirt.VIR_NETWORK_EVENT_ID_LIFECYCLE, myNetworkEventLifecycleCallback, None) diff --git a/libvirt-override-virConnect.py b/libvirt-override-virConnect.py index 88c864c..821be87 100644 --- a/libvirt-override-virConnect.py +++ b/libvirt-override-virConnect.py @@ -207,6 +207,15 @@ cb(self, virDomain(self, _obj=dom), state, reason, opaque) return 0 + def _dispatchDomainEventDeviceAddedCallback(self, dom, devAlias, cbData): + """Dispatches event to python user domain device added event callbacks + """ + cb = cbData["cb"] + opaque = cbData["opaque"] + + cb(self, virDomain(self, _obj=dom), devAlias, opaque) + return 0 + def domainEventDeregisterAny(self, callbackID): """Removes a Domain Event Callback. De-registering for a domain callback will disable delivery of this event type """ diff --git a/libvirt-override.c b/libvirt-override.c index f770ffe..588dac1 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -6901,6 +6901,58 @@ libvirt_virConnectDomainEventAgentLifecycleCallback(virConnectPtr conn ATTRIBUTE } #endif /* VIR_DOMAIN_EVENT_ID_AGENT_LIFECYCLE */ +#ifdef VIR_DOMAIN_EVENT_ID_DEVICE_ADDED +static int +libvirt_virConnectDomainEventDeviceAddedCallback(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + const char *devAlias, + void *opaque) +{ + PyObject *pyobj_cbData = (PyObject*)opaque; + PyObject *pyobj_dom; + PyObject *pyobj_ret = NULL; + PyObject *pyobj_conn; + PyObject *dictKey; + int ret = -1; + + LIBVIRT_ENSURE_THREAD_STATE; + + if (!(dictKey = libvirt_constcharPtrWrap("conn"))) + goto cleanup; + pyobj_conn = PyDict_GetItem(pyobj_cbData, dictKey); + Py_DECREF(dictKey); + + /* Create a python instance of this virDomainPtr */ + virDomainRef(dom); + if (!(pyobj_dom = libvirt_virDomainPtrWrap(dom))) { + virDomainFree(dom); + goto cleanup; + } + Py_INCREF(pyobj_cbData); + + /* Call the Callback Dispatcher */ + pyobj_ret = PyObject_CallMethod(pyobj_conn, + (char*)"_dispatchDomainEventDeviceAddedCallback", + (char*)"OsO", + pyobj_dom, devAlias, pyobj_cbData); + + Py_DECREF(pyobj_cbData); + Py_DECREF(pyobj_dom); + + cleanup: + if (!pyobj_ret) { + DEBUG("%s - ret:%p\n", __FUNCTION__, pyobj_ret); + PyErr_Print(); + } else { + Py_DECREF(pyobj_ret); + ret = 0; + } + + LIBVIRT_RELEASE_THREAD_STATE; + return ret; + +} +#endif /* VIR_DOMAIN_EVENT_ID_DEVICE_ADDED */ static PyObject * libvirt_virConnectDomainEventRegisterAny(ATTRIBUTE_UNUSED PyObject *self, @@ -6999,6 +7051,11 @@ libvirt_virConnectDomainEventRegisterAny(ATTRIBUTE_UNUSED PyObject *self, cb = VIR_DOMAIN_EVENT_CALLBACK(libvirt_virConnectDomainEventAgentLifecycleCallback); break; #endif /* VIR_DOMAIN_EVENT_ID_AGENT_LIFECYCLE */ +#ifdef VIR_DOMAIN_EVENT_ID_DEVICE_ADDED + case VIR_DOMAIN_EVENT_ID_DEVICE_ADDED: + cb = VIR_DOMAIN_EVENT_CALLBACK(libvirt_virConnectDomainEventDeviceAddedCallback); + break; +#endif /* VIR_DOMAIN_EVENT_ID_DEVICE_ADDED */ case VIR_DOMAIN_EVENT_ID_LAST: break; } -- 2.0.5

2 1

[libvirt] [PATCH] configure: Check for libxl_utils.h instead of libxlutil.h
by Michal Privoznik 14 Apr '15

14 Apr '15

The file provided by xen-devel package (or xen-tools in Gentoo) does not provide libxlutil.h. In fact the package provides libxl_utils.h instead which is the one we are looking for anyway. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 38fbbad..0626492 100644 --- a/configure.ac +++ b/configure.ac @@ -915,7 +915,7 @@ fi if test "$with_libxl" = "yes"; then dnl If building with libxl, use the libxl utility header and lib too - AC_CHECK_HEADERS([libxlutil.h]) + AC_CHECK_HEADERS([libxl_utils.h]) LIBXL_LIBS="$LIBXL_LIBS -lxlutil" AC_DEFINE_UNQUOTED([WITH_LIBXL], 1, [whether libxenlight driver is enabled]) if test "x$LIBXL_FIRMWARE_DIR" != "x"; then -- 2.0.5

3 2

[libvirt] [PATCH] Introduce virnetdevtest
by Michal Privoznik 14 Apr '15

14 Apr '15

This is yet another test for check of basic functionality of our NIC state handling code. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/libvirt_private.syms | 1 + src/util/virnetdev.c | 4 +- src/util/virnetdev.h | 4 ++ tests/Makefile.am | 15 +++++ tests/virnetdevmock.c | 48 ++++++++++++++ tests/virnetdevtest.c | 94 +++++++++++++++++++++++++++ tests/virnetdevtestdata/eth0-broken/operstate | 1 + tests/virnetdevtestdata/eth0-broken/speed | 1 + tests/virnetdevtestdata/eth0/operstate | 1 + tests/virnetdevtestdata/eth0/speed | 1 + tests/virnetdevtestdata/lo/operstate | 1 + tests/virnetdevtestdata/lo/speed | 1 + 12 files changed, 170 insertions(+), 2 deletions(-) create mode 100644 tests/virnetdevmock.c create mode 100644 tests/virnetdevtest.c create mode 100644 tests/virnetdevtestdata/eth0-broken/operstate create mode 100644 tests/virnetdevtestdata/eth0-broken/speed create mode 100644 tests/virnetdevtestdata/eth0/operstate create mode 100644 tests/virnetdevtestdata/eth0/speed create mode 100644 tests/virnetdevtestdata/lo/operstate create mode 100644 tests/virnetdevtestdata/lo/speed diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 9f82926..0b42238 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1741,6 +1741,7 @@ virNetDevSetPromiscuous; virNetDevSetRcvAllMulti; virNetDevSetRcvMulti; virNetDevSetupControl; +virNetDevSysfsFile; virNetDevValidateConfig; diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 54d866e..a2d55a8 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -1519,9 +1519,9 @@ int virNetDevValidateConfig(const char *ifname ATTRIBUTE_UNUSED, #ifdef __linux__ # define NET_SYSFS "/sys/class/net/" -static int +int virNetDevSysfsFile(char **pf_sysfs_device_link, const char *ifname, - const char *file) + const char *file) { if (virAsprintf(pf_sysfs_device_link, NET_SYSFS "%s/%s", ifname, file) < 0) diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index 856127b..999a89a 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -219,4 +219,8 @@ int virNetDevSetRcvAllMulti(const char *ifname, bool receive) ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; int virNetDevGetRcvAllMulti(const char *ifname, bool *receive) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; +int virNetDevSysfsFile(char **pf_sysfs_device_link, + const char *ifname, + const char *file) + ATTRIBUTE_NONNULL(1); #endif /* __VIR_NETDEV_H__ */ diff --git a/tests/Makefile.am b/tests/Makefile.am index 046cd08..9ebedc3 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -176,6 +176,7 @@ test_programs = virshtest sockettest \ domainconftest \ virhostdevtest \ vircaps2xmltest \ + virnetdevtest \ $(NULL) if WITH_REMOTE @@ -402,6 +403,7 @@ test_libraries = libshunload.la \ virnetserverclientmock.la \ vircgroupmock.la \ virpcimock.la \ + virnetdevmock.la \ $(NULL) if WITH_QEMU test_libraries += libqemumonitortestutils.la \ @@ -1029,6 +1031,19 @@ virpcimock_la_LIBADD = $(GNULIB_LIBS) \ virpcimock_la_LDFLAGS = -module -avoid-version \ -rpath /evil/libtool/hack/to/force/shared/lib/creation +virnetdevtest_SOURCES = \ + virnetdevtest.c testutils.h testutils.c +virnetdevtest_CFLAGS = $(AM_CFLAGS) $(LIBNL_CFLAGS) +virnetdevtest_LDADD = $(LDADDS) + +virnetdevmock_la_SOURCES = \ + virnetdevmock.c +virnetdevmock_la_CFLAGS = $(AM_CFLAGS) $(LIBNL_CFLAGS) +virnetdevmock_la_LIBADD = $(GNULIB_LIBS) \ + ../src/libvirt.la +virnetdevmock_la_LDFLAGS = -module -avoid-version \ + -rpath /evil/libtool/hack/to/force/shared/lib/creation + if WITH_LINUX virusbtest_SOURCES = \ virusbtest.c testutils.h testutils.c diff --git a/tests/virnetdevmock.c b/tests/virnetdevmock.c new file mode 100644 index 0000000..681e5fe --- /dev/null +++ b/tests/virnetdevmock.c @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2013 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 + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Author: Michal Privoznik <mprivozn(a)redhat.com> + */ + +#include <config.h> + +#ifdef __linux__ +# include "internal.h" +# include <stdlib.h> +# include <stdio.h> +# include "virstring.h" +# include "virnetdev.h" + +# define NET_DEV_TEST_DATA_PREFIX abs_srcdir "/virnetdevtestdata" + +int +virNetDevSysfsFile(char **pf_sysfs_device_link, + const char *ifname, + const char *file) +{ + + if (virAsprintfQuiet(pf_sysfs_device_link, "%s/%s/%s", + NET_DEV_TEST_DATA_PREFIX, ifname, file) < 0) { + fprintf(stderr, "Out of memory\n"); + abort(); + } + + return 0; +} +#else +/* Nothing to override on non-__linux__ platforms */ +#endif diff --git a/tests/virnetdevtest.c b/tests/virnetdevtest.c new file mode 100644 index 0000000..8795bf1 --- /dev/null +++ b/tests/virnetdevtest.c @@ -0,0 +1,94 @@ +/* + * Copyright (C) 2014 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 + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Author: Michal Privoznik <mprivozn(a)redhat.com> + */ + +#include <config.h> + +#include "testutils.h" + +#ifdef __linux__ + +# include "virnetdev.h" + +# define VIR_FROM_THIS VIR_FROM_NONE + +struct testVirNetDevGetLinkInfoData { + const char *ifname; /* ifname to get info on */ + virInterfaceState state; /* expected state */ + unsigned int speed; /* expected speed */ +}; + +static int +testVirNetDevGetLinkInfo(const void *opaque) +{ + int ret = -1; + const struct testVirNetDevGetLinkInfoData *data = opaque; + virInterfaceLink lnk; + + if (virNetDevGetLinkInfo(data->ifname, &lnk) < 0) + goto cleanup; + + if (lnk.state != data->state) { + fprintf(stderr, + "Fetched link state (%s) doesn't match the expected one (%s)", + virInterfaceStateTypeToString(lnk.state), + virInterfaceStateTypeToString(data->state)); + goto cleanup; + } + + if (lnk.speed != data->speed) { + fprintf(stderr, + "Fetched link speed (%u) doesn't match the expected one (%u)", + lnk.speed, data->speed); + goto cleanup; + } + + ret = 0; + cleanup: + return ret; +} + +static int +mymain(void) +{ + int ret = 0; + +# define DO_TEST_LINK(ifname, state, speed) \ + do { \ + struct testVirNetDevGetLinkInfoData data = {ifname, state, speed}; \ + if (virtTestRun("Link info: " # ifname, \ + testVirNetDevGetLinkInfo, &data) < 0) \ + ret = -1; \ + } while (0) + + DO_TEST_LINK("eth0", VIR_INTERFACE_STATE_UP, 1000); + DO_TEST_LINK("lo", VIR_INTERFACE_STATE_UNKNOWN, 0); + DO_TEST_LINK("eth0-broken", VIR_INTERFACE_STATE_DOWN, 0); + + return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; +} + +VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virnetdevmock.so") +#else +int +main(void) +{ + return EXIT_AM_SKIP; +} +#endif diff --git a/tests/virnetdevtestdata/eth0-broken/operstate b/tests/virnetdevtestdata/eth0-broken/operstate new file mode 100644 index 0000000..eb0e904 --- /dev/null +++ b/tests/virnetdevtestdata/eth0-broken/operstate @@ -0,0 +1 @@ +down diff --git a/tests/virnetdevtestdata/eth0-broken/speed b/tests/virnetdevtestdata/eth0-broken/speed new file mode 100644 index 0000000..4f6ff86 --- /dev/null +++ b/tests/virnetdevtestdata/eth0-broken/speed @@ -0,0 +1 @@ +4294967295 diff --git a/tests/virnetdevtestdata/eth0/operstate b/tests/virnetdevtestdata/eth0/operstate new file mode 100644 index 0000000..e31ee94 --- /dev/null +++ b/tests/virnetdevtestdata/eth0/operstate @@ -0,0 +1 @@ +up diff --git a/tests/virnetdevtestdata/eth0/speed b/tests/virnetdevtestdata/eth0/speed new file mode 100644 index 0000000..83b33d2 --- /dev/null +++ b/tests/virnetdevtestdata/eth0/speed @@ -0,0 +1 @@ +1000 diff --git a/tests/virnetdevtestdata/lo/operstate b/tests/virnetdevtestdata/lo/operstate new file mode 100644 index 0000000..3546645 --- /dev/null +++ b/tests/virnetdevtestdata/lo/operstate @@ -0,0 +1 @@ +unknown diff --git a/tests/virnetdevtestdata/lo/speed b/tests/virnetdevtestdata/lo/speed new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/virnetdevtestdata/lo/speed @@ -0,0 +1 @@ +0 -- 2.0.5

3 2

[libvirt] [PATCH v5 0/3] Parallels disk device attach
by Alexander Burluka 13 Apr '15

13 Apr '15

This patchset implements disk device attachment and allows OpenStack to attach volumes to Parallels-driven instances. Parallels Cloud Server SDK supports live attachment of disk devices and virtual interfaces cards. Alexander Burluka (3): Parallels: remove disk serial number check Parallels: implement domainAttachDeviceFlags Parallels: implemented domainAttachDevice

2 4

[libvirt] [PATCHv1 00/13] Support qcow2 features in external snapshots
by Ján Tomko 13 Apr '15

13 Apr '15

https://bugzilla.redhat.com/show_bug.cgi?id=980327 First ten patches contain no functional change. Patches 11 and 12 potentially change the default qcow2 compatibility level. The last patch contains the proposed XML. Ján Tomko (13): Visually separate snapshot disk subelements Remove feature formating funcs from pool-specific options Separate out virStorageFeatureParse Separate virStorageFeatureFormat Split out storage format 'compat' attribute sanity check Use XPath when parsing snapshot disk definition Rename virStorageBackendCreateQemuImgCmd Introduce struct _virStorageBackendQemuImgInfo Split out qemu-img command generation Remove overengineered loop Use qemu-img to precreate the qcow2 disks Rework qemu-img command generation for inactive external snapshots Add qcow2 features to snapshot XML docs/formatsnapshot.html.in | 50 ++- docs/schemas/domainsnapshot.rng | 10 +- po/POTFILES.in | 1 + src/Makefile.am | 5 + src/conf/snapshot_conf.c | 58 ++-- src/conf/storage_conf.c | 83 +---- src/conf/storage_feature_conf.c | 87 +++++ src/conf/storage_feature_conf.h | 25 ++ src/qemu/qemu_driver.c | 57 ++-- src/storage/storage_backend.c | 376 +++++++++++++-------- src/storage/storage_backend.h | 19 +- src/storage/storage_driver.c | 27 ++ src/storage/storage_driver.h | 4 + src/util/virstoragefile.c | 29 ++ src/util/virstoragefile.h | 1 + .../disk_snapshot_features.xml | 30 ++ .../disk_snapshot_features.xml | 30 ++ tests/domainsnapshotxml2xmltest.c | 2 + tests/storagevolxml2argvtest.c | 5 +- 19 files changed, 589 insertions(+), 310 deletions(-) create mode 100644 src/conf/storage_feature_conf.c create mode 100644 src/conf/storage_feature_conf.h create mode 100644 tests/domainsnapshotxml2xmlin/disk_snapshot_features.xml create mode 100644 tests/domainsnapshotxml2xmlout/disk_snapshot_features.xml -- 2.0.5

2 28

[libvirt] Changing media on network disks (was Re: can't bot from scsi http cdrom)
by Paolo Bonzini 13 Apr '15

13 Apr '15

On 13/04/2015 14:34, Vasiliy Tolstov wrote: > Thanks! This is works fine. Last question - does it possible to create > empty cdrom with type='network'? > I'm try this, but libvrit complains with error: > <disk type='network' device='cdrom'> > <driver name='qemu' type='raw'/> > <target dev='sdb' bus='scsi' tray='open'/> > <address type='drive' controller='0' target='1' bus='0' unit='1'/> > <readonly/> > </disk> No, unfortunately not because "virsh change-media" wouldn't be able to convert its argument to the required libvirt XML. I think you would need a new virsh change-media option, e.g. --xml, that takes a <disk> element instead of a source path + target path pair. However, I am not a libvirt developer. Paolo

1 0

[libvirt] XML Parser failing due to cryptic Serial Number.
by Roz Fx 13 Apr '15

13 Apr '15

I set virt-manager in qemu:///system space and tried to add new VM but it didn't proceed. I figured out its duo to serial numbers is in cryptic form. # cat /sys/devices/virtual/dmi/id/product_serial ÿÿÿÿÿÿÿ #virt-manager --debug Traceback (most recent call last): File "/usr/share/virt-manager/virtManager/libvirtobject.py", line 225, in _reparse_xml self._xmlobj = self._build_xmlobj(self._get_raw_xml()) File "/usr/share/virt-manager/virtManager/libvirtobject.py", line 228, in _build_xmlobj return self._parseclass(self.conn.get_backend(), parsexml=xml) File "/usr/share/virt-manager/virtManager/nodedev.py", line 27, in _parse_convert return NodeDevice.parse(conn, parsexml) File "/usr/share/virt-manager/virtinst/nodedev.py", line 95, in parse tmpdev = NodeDevice(conn, parsexml=xml, allow_node_instantiate=True) File "/usr/share/virt-manager/virtinst/nodedev.py", line 106, in __init__ XMLBuilder.__init__(self, *args, **kwargs) File "/usr/share/virt-manager/virtinst/xmlbuilder.py", line 777, in __init__ parent_xpath, relative_object_xpath) File "/usr/share/virt-manager/virtinst/xmlbuilder.py", line 679, in __init__ self._parse(parsexml, parsexmlnode) File "/usr/share/virt-manager/virtinst/xmlbuilder.py", line 692, in _parse doc = libxml2.parseDoc(xml) File "/usr/lib/python2.7/site-packages/libxml2.py", line 1327, in parseDoc if ret is None:raise parserError('xmlParseDoc() failed') libxml2.parserError: xmlParseDoc() failed [Sun, 12 Apr 2015 06:06:16 virt-manager 4241] DEBUG (create:165) Showing new vm wizard [Sun, 12 Apr 2015 06:06:16 virt-manager 4241] DEBUG (create:892) Guest type set to os_type=hvm, arch=x86_64, dom_type=kvm [Sun, 12 Apr 2015 06:06:16 virt-manager 4241] DEBUG (xmlbuilder:694) Error parsing xml= <device> <name>computer</name> <capability type='system'> <product>Vostro</product> <hardware> <vendor>Dell Inc.</vendor> <version>A10</version> <serial>ÿÿÿÿÿÿÿ</serial> <uuid>REMOVED</uuid> </hardware> <firmware> <vendor>Dell Inc.</vendor> <version>A10</version> <release_date>05/18/2013</release_date> </firmware> </capability> </device> [Sun, 12 Apr 2015 06:06:16 virt-manager 4241] ERROR (create:346) Error setting create wizard conn state. Traceback (most recent call last): File "/usr/share/virt-manager/virtManager/create.py", line 344, in reset_state self.set_conn(activeconn, force_validate=True) File "/usr/share/virt-manager/virtManager/create.py", line 225, in set_conn self.set_conn_state() File "/usr/share/virt-manager/virtManager/create.py", line 626, in set_conn_state self.netlist.reset_state() File "/usr/share/virt-manager/virtManager/netlist.py", line 405, in reset_state self._populate_network_list() File "/usr/share/virt-manager/virtManager/netlist.py", line 253, in _populate_network_list vnet_bridges) File "/usr/share/virt-manager/virtManager/netlist.py", line 185, in _find_physical_devices for nodedev in self.conn.get_nodedevs("net"): File "/usr/share/virt-manager/virtManager/connection.py", line 648, in get_nodedevs xmlobj = dev.get_xmlobj() File "/usr/share/virt-manager/virtManager/libvirtobject.py", line 160, in get_xmlobj self._reparse_xml() File "/usr/share/virt-manager/virtManager/libvirtobject.py", line 225, in _reparse_xml self._xmlobj = self._build_xmlobj(self._get_raw_xml()) File "/usr/share/virt-manager/virtManager/libvirtobject.py", line 228, in _build_xmlobj return self._parseclass(self.conn.get_backend(), parsexml=xml) File "/usr/share/virt-manager/virtManager/nodedev.py", line 27, in _parse_convert return NodeDevice.parse(conn, parsexml) File "/usr/share/virt-manager/virtinst/nodedev.py", line 95, in parse tmpdev = NodeDevice(conn, parsexml=xml, allow_node_instantiate=True) File "/usr/share/virt-manager/virtinst/nodedev.py", line 106, in __init__ XMLBuilder.__init__(self, *args, **kwargs) File "/usr/share/virt-manager/virtinst/xmlbuilder.py", line 777, in __init__ parent_xpath, relative_object_xpath) File "/usr/share/virt-manager/virtinst/xmlbuilder.py", line 679, in __init__ self._parse(parsexml, parsexmlnode) File "/usr/share/virt-manager/virtinst/xmlbuilder.py", line 692, in _parse doc = libxml2.parseDoc(xml) File "/usr/lib/python2.7/site-packages/libxml2.py", line 1327, in parseDoc if ret is None:raise parserError('xmlParseDoc() failed') parserError: xmlParseDoc() failed Regards Roz

1 0

[libvirt] [PATCH 1/2] virBitmap: Place virBitmapIsAllClear check after virBitmapParse calls
by Erik Skultety 13 Apr '15

13 Apr '15

This patch adds checks for empty bitmaps right after the calls of virBitmapParse. These only include spots where set API's are called and where domain's XML is parsed. https://bugzilla.redhat.com/show_bug.cgi?id=1210545 --- src/conf/domain_conf.c | 35 +++++++++++++++++++++++++++++++---- src/conf/numa_conf.c | 23 +++++++++++++++++++---- src/qemu/qemu_driver.c | 5 +++-- src/xenconfig/xen_sxpr.c | 7 +++++++ 4 files changed, 60 insertions(+), 10 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1763305..c9488cf 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11563,6 +11563,12 @@ virDomainMemorySourceDefParseXML(xmlNodePtr node, if (virBitmapParse(nodemask, 0, &def->sourceNodes, VIR_DOMAIN_CPUMASK_LEN) < 0) goto cleanup; + + if (virBitmapIsAllClear(def->sourceNodes)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Invalid value of 'nodemask': %s"), nodemask); + goto cleanup; + } } ret = 0; @@ -13251,6 +13257,13 @@ virDomainVcpuPinDefParseXML(xmlNodePtr node, if (virBitmapParse(tmp, 0, &def->cpumask, VIR_DOMAIN_CPUMASK_LEN) < 0) goto error; + if (virBitmapIsAllClear(def->cpumask)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Invalid value of 'cpuset': %s"), + tmp); + goto error; + } + cleanup: VIR_FREE(tmp); ctxt->node = oldnode; @@ -13352,6 +13365,12 @@ virDomainHugepagesParseXML(xmlNodePtr node, if (virBitmapParse(nodeset, 0, &hugepage->nodemask, VIR_DOMAIN_CPUMASK_LEN) < 0) goto cleanup; + + if (virBitmapIsAllClear(hugepage->nodemask)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Invalid value of 'nodeset': %s"), nodeset); + goto cleanup; + } } ret = 0; @@ -13473,13 +13492,14 @@ virDomainThreadSchedParse(xmlNodePtr node, goto error; } - if (!virBitmapParse(tmp, 0, &sp->ids, - VIR_DOMAIN_CPUMASK_LEN) || - virBitmapIsAllClear(sp->ids) || + if (virBitmapParse(tmp, 0, &sp->ids, VIR_DOMAIN_CPUMASK_LEN) < 0) + goto error; + + if (virBitmapIsAllClear(sp->ids) || virBitmapNextSetBit(sp->ids, -1) < minid || virBitmapLastSetBit(sp->ids) > maxid) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Invalid value of '%s': %s"), name, tmp); goto error; @@ -13847,6 +13867,13 @@ virDomainDefParseXML(xmlDocPtr xml, if (virBitmapParse(tmp, 0, &def->cpumask, VIR_DOMAIN_CPUMASK_LEN) < 0) goto error; + + if (virBitmapIsAllClear(def->cpumask)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Invalid value of 'cpuset': %s"), tmp); + goto error; + } + VIR_FREE(tmp); } } diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c index 8a0f686..7ad3f66 100644 --- a/src/conf/numa_conf.c +++ b/src/conf/numa_conf.c @@ -178,6 +178,12 @@ virDomainNumatuneNodeParseXML(virDomainNumaPtr numa, if (virBitmapParse(tmp, 0, &mem_node->nodeset, VIR_DOMAIN_CPUMASK_LEN) < 0) goto cleanup; + + if (virBitmapIsAllClear(mem_node->nodeset)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Invalid value of 'nodeset': %s"), tmp); + goto cleanup; + } VIR_FREE(tmp); } @@ -233,10 +239,19 @@ virDomainNumatuneParseXML(virDomainNumaPtr numa, } VIR_FREE(tmp); - if ((tmp = virXMLPropString(node, "nodeset")) && - virBitmapParse(tmp, 0, &nodeset, VIR_DOMAIN_CPUMASK_LEN) < 0) - goto cleanup; - VIR_FREE(tmp); + tmp = virXMLPropString(node, "nodeset"); + if (tmp) { + if (virBitmapParse(tmp, 0, &nodeset, VIR_DOMAIN_CPUMASK_LEN) < 0) + goto cleanup; + + if (virBitmapIsAllClear(nodeset)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Invalid value of 'nodeset': %s"), tmp); + goto cleanup; + } + + VIR_FREE(tmp); + } } if (virDomainNumatuneSet(numa, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7eb5a7d..eae2809 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10106,8 +10106,9 @@ qemuDomainSetNumaParameters(virDomainPtr dom, goto endjob; if (virBitmapIsAllClear(nodeset)) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("Invalid nodeset for numatune")); + virReportError(VIR_ERR_OPERATION_INVALID, + _("Invalid nodeset of 'numatune': %s"), + param->value.s); goto endjob; } } diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c index 5a170d3..d77abf3 100644 --- a/src/xenconfig/xen_sxpr.c +++ b/src/xenconfig/xen_sxpr.c @@ -1165,6 +1165,13 @@ xenParseSxpr(const struct sexpr *root, if (virBitmapParse(cpus, 0, &def->cpumask, VIR_DOMAIN_CPUMASK_LEN) < 0) goto error; + + if (virBitmapIsAllClear(def->cpumask)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Invalid value of 'cpumask': %s"), + cpus); + goto error; + } } def->maxvcpus = sexpr_int(root, "domain/vcpus"); -- 1.9.3

2 4

[libvirt] [libvirt-glib] Support setting of compat XML node
by Richa Sehgal 13 Apr '15

13 Apr '15

This change adds support for setting of compat XML node in libvirt gconfig storage volumes target --- libvirt-gconfig/libvirt-gconfig-storage-vol-target.c | 13 +++++++++++++ libvirt-gconfig/libvirt-gconfig-storage-vol-target.h | 2 ++ libvirt-gconfig/libvirt-gconfig.sym | 5 +++++ libvirt-gconfig/tests/test-domain-create.c | 1 + 4 files changed, 21 insertions(+) diff --git a/libvirt-gconfig/libvirt-gconfig-storage-vol-target.c b/libvirt-gconfig/libvirt-gconfig-storage-vol-target.c index d3151d1..b72b304 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-vol-target.c +++ b/libvirt-gconfig/libvirt-gconfig-storage-vol-target.c @@ -99,3 +99,16 @@ void gvir_config_storage_vol_target_set_permissions(GVirConfigStorageVolTarget * "permissions", GVIR_CONFIG_OBJECT(perms)); } + +/** + * gvir_config_storage_vol_target_set_compat: + * @compat: (allow-none): + */ +void gvir_config_storage_vol_target_set_compat(GVirConfigStorageVolTarget *target, + const char *compat) +{ + g_return_if_fail(GVIR_CONFIG_IS_STORAGE_VOL_TARGET(target)); + + gvir_config_object_set_node_content(GVIR_CONFIG_OBJECT(target), + "compat", compat); +} diff --git a/libvirt-gconfig/libvirt-gconfig-storage-vol-target.h b/libvirt-gconfig/libvirt-gconfig-storage-vol-target.h index b572381..c165e2b 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-vol-target.h +++ b/libvirt-gconfig/libvirt-gconfig-storage-vol-target.h @@ -67,6 +67,8 @@ void gvir_config_storage_vol_target_set_format(GVirConfigStorageVolTarget *targe const char *format); void gvir_config_storage_vol_target_set_permissions(GVirConfigStorageVolTarget *target, GVirConfigStoragePermissions *perms); +void gvir_config_storage_vol_target_set_compat(GVirConfigStorageVolTarget *target, + const char *compat); G_END_DECLS diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index 8614126..407a52f 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -714,4 +714,9 @@ global: gvir_config_domain_cpu_set_model; } LIBVIRT_GCONFIG_0.1.8; +LIBVIRT_GCONFIG_0.2.0 { +global: + gvir_config_storage_vol_target_set_compat; +} LIBVIRT_GCONFIG_0.1.9; + # .... define new API here using predicted next version number .... diff --git a/libvirt-gconfig/tests/test-domain-create.c b/libvirt-gconfig/tests/test-domain-create.c index eb4b945..66f618b 100644 --- a/libvirt-gconfig/tests/test-domain-create.c +++ b/libvirt-gconfig/tests/test-domain-create.c @@ -482,6 +482,7 @@ int main(int argc, char **argv) vol_target = gvir_config_storage_vol_target_new(); gvir_config_storage_vol_target_set_format(vol_target, "qcow2"); gvir_config_storage_vol_target_set_permissions(vol_target, perms); + gvir_config_storage_vol_target_set_compat(vol_target, "1.1"); g_object_unref(G_OBJECT(perms)); gvir_config_storage_vol_set_target(vol, vol_target); g_object_unref(G_OBJECT(vol_target)); -- 1.9.1

2 2

[libvirt] luajit binding
by William Adams 13 Apr '15

13 Apr '15

Hello List, I am new to libvirt, and this is my first query. I have started a luajit language binding for libvirt. It can be found here: https://github.com/Wiladams/LJIT2Virt I searched the interwebs before I began, but didn't find any existing lua language bindings. Is this true? Did I just miss it? If it doesn't exist already, I'd like to make this a regular thing, and get it listed on the language bindings page. How can I go about that? -- William =============================== - Shaping clay is easier than digging it out of the ground.

3 2

[libvirt] [PATCH v2 0/3] Honour sparse files on migration
by Michal Privoznik 13 Apr '15

13 Apr '15

When the storage is pre-created on the destination, it might have been allocated as sparse on the source. Let's keep it that way if we can. diff to v1: - in 3/3 I've reworked the handling of @allocation attribute as John suggested Michal Privoznik (3): qemuMigrationPrecreateStorage: Fix debug message qemuMigrationCookieNBD: Turn some items into their own struct qemuMigrationPrecreateDisk: Preserve sparse files src/qemu/qemu_migration.c | 48 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 37 insertions(+), 11 deletions(-) -- 2.0.5

2 5

[libvirt] [PATCH] conf: Don't output <cpu> tag if it contains no information.
by Andrea Bolognani 13 Apr '15

13 Apr '15

The tag is already marked as optional in the schema, so no changes are needed there. RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1202606 --- Hi everyone, this is my first contribution to libvirt so I wholeheartedly welcome any criticism, suggestion or recommendation :) Cheers. src/conf/cpu_conf.c | 33 ++++++++++++++++------ tests/qemuxml2argvdata/qemuxml2argv-cpu-empty.xml | 23 +++++++++++++++ .../qemuxml2xmlout-cpu-empty.xml | 21 ++++++++++++++ tests/qemuxml2xmltest.c | 1 + 4 files changed, 69 insertions(+), 9 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-empty.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-empty.xml diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index cd3882d..8f65d55 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -435,13 +435,14 @@ virCPUDefFormatBufFull(virBufferPtr buf, bool updateCPU) { int ret = -1; + virBuffer attributeBuf = VIR_BUFFER_INITIALIZER; virBuffer childrenBuf = VIR_BUFFER_INITIALIZER; int indent = virBufferGetIndent(buf, false); if (!def) return 0; - virBufferAddLit(buf, "<cpu"); + /* Format attributes */ if (def->type == VIR_CPU_TYPE_GUEST) { const char *tmp; @@ -451,7 +452,7 @@ virCPUDefFormatBufFull(virBufferPtr buf, _("Unexpected CPU mode %d"), def->mode); goto cleanup; } - virBufferAsprintf(buf, " mode='%s'", tmp); + virBufferAsprintf(&attributeBuf, " mode='%s'", tmp); } if (def->model && @@ -463,10 +464,11 @@ virCPUDefFormatBufFull(virBufferPtr buf, def->match); goto cleanup; } - virBufferAsprintf(buf, " match='%s'", tmp); + virBufferAsprintf(&attributeBuf, " match='%s'", tmp); } } + /* Format children */ virBufferAdjustIndent(&childrenBuf, indent + 2); if (def->arch) virBufferAsprintf(&childrenBuf, "<arch>%s</arch>\n", @@ -477,16 +479,29 @@ virCPUDefFormatBufFull(virBufferPtr buf, if (virDomainNumaDefCPUFormat(&childrenBuf, numa) < 0) goto cleanup; - if (virBufferUse(&childrenBuf)) { - virBufferAddLit(buf, ">\n"); - virBufferAddBuffer(buf, &childrenBuf); - virBufferAddLit(buf, "</cpu>\n"); - } else { - virBufferAddLit(buf, "/>\n"); + /* Put it all together */ + if (virBufferUse(&attributeBuf) || virBufferUse(&childrenBuf)) { + + /* Opening tag */ + virBufferAddLit(buf, "<cpu"); + + /* Attributes (if any) */ + if (virBufferUse(&attributeBuf)) + virBufferAddBuffer(buf, &attributeBuf); + + /* Children (if any) and closing tag */ + if (virBufferUse(&childrenBuf)) { + virBufferAddLit(buf, ">\n"); + virBufferAddBuffer(buf, &childrenBuf); + virBufferAddLit(buf, "</cpu>\n"); + } else { + virBufferAddLit(buf, "/>\n"); + } } ret = 0; cleanup: + virBufferFreeAndReset(&attributeBuf); virBufferFreeAndReset(&childrenBuf); return ret; } diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-empty.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-empty.xml new file mode 100644 index 0000000..2a79826 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-empty.xml @@ -0,0 +1,23 @@ +<domain type='kvm'> + <name>cpu-empty</name> + <uuid>1aed4c39-ad6e-4a78-9264-4ce996290d17</uuid> + <memory unit='KiB'>4000768</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <cpu> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-kvm</emulator> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-empty.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-empty.xml new file mode 100644 index 0000000..e678607 --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-empty.xml @@ -0,0 +1,21 @@ +<domain type='kvm'> + <name>cpu-empty</name> + <uuid>1aed4c39-ad6e-4a78-9264-4ce996290d17</uuid> + <memory unit='KiB'>4000768</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-kvm</emulator> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 817e408..cd0b280 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -361,6 +361,7 @@ mymain(void) DO_TEST("clock-utc"); DO_TEST("clock-localtime"); + DO_TEST_DIFFERENT("cpu-empty"); DO_TEST("cpu-kvmclock"); DO_TEST("cpu-host-kvmclock"); DO_TEST("cpu-host-passthrough-features"); -- 2.1.0

2 2

[libvirt] An implementation bug in qemuMigrationWaitForCompletion that introduces an unnecessary sleep of 50 ms when a migration completes
by Xing Lin 13 Apr '15

13 Apr '15

Hi, It seems that I found a bug in the qemuMigrationWaitForCompletion(). It will do a sleep of 50 ms, even when qemuMigrationUpdateJobStatus() detects that a migration has completed. Here is the original implementation of the while loop. while (jobInfo->type == VIR_DOMAIN_JOB_UNBOUNDED) { /* Poll every 50ms for progress & to allow cancellation */ struct timespec ts = { .tv_sec = 0, .tv_nsec = 50 * 1000 * 1000ull }; if (qemuMigrationUpdateJobStatus(driver, vm, job, asyncJob) == -1) break; /* cancel migration if disk I/O error is emitted while migrating */ if (abort_on_error && virDomainObjGetState(vm, &pauseReason) == VIR_DOMAIN_PAUSED && pauseReason == VIR_DOMAIN_PAUSED_IOERROR) { virReportError(VIR_ERR_OPERATION_FAILED, _("%s: %s"), job, _("failed due to I/O error")); break; } if (dconn && virConnectIsAlive(dconn) <= 0) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Lost connection to destination host")); break; } virObjectUnlock(vm); nanosleep(&ts, NULL); virObjectLock(vm); } Even when qemuMigrationUpdateJobStatus() detects a migration has completed, the nanosleep() will be called again. When the while condition is checked, then the program breaks from the while loop. This introduces an unnecessary sleep of 50 ms which can be avoided by doing a sleep first. The code should likely be structured as following. while (jobInfo->type == VIR_DOMAIN_JOB_UNBOUNDED) { /* Poll every 50ms for progress & to allow cancellation */ struct timespec ts = { .tv_sec = 0, .tv_nsec = 50 * 1000 * 1000ull }; // do sleep here. virObjectUnlock(vm); nanosleep(&ts, NULL); virObjectLock(vm); if (qemuMigrationUpdateJobStatus(driver, vm, job, asyncJob) == -1) break; /* cancel migration if disk I/O error is emitted while migrating */ if (abort_on_error && virDomainObjGetState(vm, &pauseReason) == VIR_DOMAIN_PAUSED && pauseReason == VIR_DOMAIN_PAUSED_IOERROR) { virReportError(VIR_ERR_OPERATION_FAILED, _("%s: %s"), job, _("failed due to I/O error")); break; } if (dconn && virConnectIsAlive(dconn) <= 0) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Lost connection to destination host")); break; } } I have filed a bug report at redhat bugzilla, with a bug id 1210502. The link is below. https://bugzilla.redhat.com/show_bug.cgi?id=1210502 I also prepared a patch for fixing it. It is attached. Any comments?

3 4

[libvirt] [PATCH 0/3] Fix usb device version parsing in redir filters
by Ján Tomko 13 Apr '15

13 Apr '15

https://bugzilla.redhat.com/show_bug.cgi?id=1210650 Ján Tomko (3): Do xml->xml test for usb-redir-filter Fix usb device version parsing issues Rewrite usb device version parsing src/conf/domain_conf.c | 68 +++++++--------------- .../qemuxml2argv-usb-redir-filter-version.args | 19 ++++++ .../qemuxml2argv-usb-redir-filter-version.xml | 46 +++++++++++++++ tests/qemuxml2argvtest.c | 6 ++ .../qemuxml2xmlout-usb-redir-filter-version.xml | 46 +++++++++++++++ .../qemuxml2xmlout-usb-redir-filter.xml | 45 ++++++++++++++ tests/qemuxml2xmltest.c | 2 + 7 files changed, 185 insertions(+), 47 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter-version.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter-version.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-redir-filter-version.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-redir-filter.xml -- 2.0.5

2 6

[libvirt] [PATCH 0/2] virsh vcpupin cleanups
by Ján Tomko 13 Apr '15

13 Apr '15

Ján Tomko (2): Rewrite vshPrintPinInfo Rewrite vshParseCPUList tools/virsh-domain.c | 153 ++++++++++----------------------------------------- 1 file changed, 29 insertions(+), 124 deletions(-) -- 2.0.5

2 4

[libvirt] [PATCH] Do not require virtio-pci devices when using virtio-mmio
by Ján Tomko 13 Apr '15

13 Apr '15

On arm, we probe for virtio-*-pci devices, but use their virtio-*-device variants. Set the capabilities based on the -device variants as well, to make them work with qemus with the PCI devices compiled out. --- src/qemu/qemu_capabilities.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index ce6767c..3b49271 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1499,6 +1499,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "virtio-scsi-pci", QEMU_CAPS_VIRTIO_SCSI }, { "virtio-scsi-s390", QEMU_CAPS_VIRTIO_SCSI }, { "virtio-scsi-ccw", QEMU_CAPS_VIRTIO_SCSI }, + { "virtio-scsi-device", QEMU_CAPS_VIRTIO_SCSI }, { "megasas", QEMU_CAPS_SCSI_MEGASAS }, { "spicevmc", QEMU_CAPS_DEVICE_SPICEVMC }, { "qxl-vga", QEMU_CAPS_DEVICE_QXL_VGA }, @@ -1515,6 +1516,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "virtio-rng-pci", QEMU_CAPS_DEVICE_VIRTIO_RNG }, { "virtio-rng-s390", QEMU_CAPS_DEVICE_VIRTIO_RNG }, { "virtio-rng-ccw", QEMU_CAPS_DEVICE_VIRTIO_RNG }, + { "virtio-rng-device", QEMU_CAPS_DEVICE_VIRTIO_RNG }, { "rng-random", QEMU_CAPS_OBJECT_RNG_RANDOM }, { "rng-egd", QEMU_CAPS_OBJECT_RNG_EGD }, { "spapr-nvram", QEMU_CAPS_DEVICE_NVRAM }, -- 2.0.5

2 1

[libvirt] [libvirt-glib] Support setting of compat XML node
by Richa Sehgal 13 Apr '15

13 Apr '15

This change adds support for setting of compat XML node in libvirt gconfig storage volumes target --- libvirt-gconfig/libvirt-gconfig-storage-vol-target.c | 13 +++++++++++++ libvirt-gconfig/libvirt-gconfig-storage-vol-target.h | 2 ++ libvirt-gconfig/libvirt-gconfig.sym | 5 +++++ libvirt-gconfig/tests/test-domain-create.c | 1 + 4 files changed, 21 insertions(+) diff --git a/libvirt-gconfig/libvirt-gconfig-storage-vol-target.c b/libvirt-gconfig/libvirt-gconfig-storage-vol-target.c index d3151d1..b72b304 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-vol-target.c +++ b/libvirt-gconfig/libvirt-gconfig-storage-vol-target.c @@ -99,3 +99,16 @@ void gvir_config_storage_vol_target_set_permissions(GVirConfigStorageVolTarget * "permissions", GVIR_CONFIG_OBJECT(perms)); } + +/** + * gvir_config_storage_vol_target_set_compat: + * @compat: (allow-none): + */ +void gvir_config_storage_vol_target_set_compat(GVirConfigStorageVolTarget *target, + const char *compat) +{ + g_return_if_fail(GVIR_CONFIG_IS_STORAGE_VOL_TARGET(target)); + + gvir_config_object_set_node_content(GVIR_CONFIG_OBJECT(target), + "compat", compat); +} diff --git a/libvirt-gconfig/libvirt-gconfig-storage-vol-target.h b/libvirt-gconfig/libvirt-gconfig-storage-vol-target.h index b572381..c165e2b 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-vol-target.h +++ b/libvirt-gconfig/libvirt-gconfig-storage-vol-target.h @@ -67,6 +67,8 @@ void gvir_config_storage_vol_target_set_format(GVirConfigStorageVolTarget *targe const char *format); void gvir_config_storage_vol_target_set_permissions(GVirConfigStorageVolTarget *target, GVirConfigStoragePermissions *perms); +void gvir_config_storage_vol_target_set_compat(GVirConfigStorageVolTarget *target, + const char *compat); G_END_DECLS diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index 8614126..407a52f 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -714,4 +714,9 @@ global: gvir_config_domain_cpu_set_model; } LIBVIRT_GCONFIG_0.1.8; +LIBVIRT_GCONFIG_0.2.0 { +global: + gvir_config_storage_vol_target_set_compat; +} LIBVIRT_GCONFIG_0.1.9; + # .... define new API here using predicted next version number .... diff --git a/libvirt-gconfig/tests/test-domain-create.c b/libvirt-gconfig/tests/test-domain-create.c index eb4b945..66f618b 100644 --- a/libvirt-gconfig/tests/test-domain-create.c +++ b/libvirt-gconfig/tests/test-domain-create.c @@ -482,6 +482,7 @@ int main(int argc, char **argv) vol_target = gvir_config_storage_vol_target_new(); gvir_config_storage_vol_target_set_format(vol_target, "qcow2"); gvir_config_storage_vol_target_set_permissions(vol_target, perms); + gvir_config_storage_vol_target_set_compat(vol_target, "1.1"); g_object_unref(G_OBJECT(perms)); gvir_config_storage_vol_set_target(vol, vol_target); g_object_unref(G_OBJECT(vol_target)); -- 1.9.1

1 0

[libvirt] [libvirt-glib] Support setting of compat XML node
by Richa Sehgal 13 Apr '15

13 Apr '15

This change adds support for setting of compat XML node in libvirt gconfig storage volumes target --- libvirt-gconfig/libvirt-gconfig-storage-vol-target.c | 13 +++++++++++++ libvirt-gconfig/libvirt-gconfig-storage-vol-target.h | 2 ++ libvirt-gconfig/libvirt-gconfig.sym | 5 +++++ libvirt-gconfig/tests/test-domain-create.c | 1 + 4 files changed, 21 insertions(+) diff --git a/libvirt-gconfig/libvirt-gconfig-storage-vol-target.c b/libvirt-gconfig/libvirt-gconfig-storage-vol-target.c index d3151d1..b72b304 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-vol-target.c +++ b/libvirt-gconfig/libvirt-gconfig-storage-vol-target.c @@ -99,3 +99,16 @@ void gvir_config_storage_vol_target_set_permissions(GVirConfigStorageVolTarget * "permissions", GVIR_CONFIG_OBJECT(perms)); } + +/** + * gvir_config_storage_vol_target_set_compat: + * @compat: (allow-none): + */ +void gvir_config_storage_vol_target_set_compat(GVirConfigStorageVolTarget *target, + const char *compat) +{ + g_return_if_fail(GVIR_CONFIG_IS_STORAGE_VOL_TARGET(target)); + + gvir_config_object_set_node_content(GVIR_CONFIG_OBJECT(target), + "compat", compat); +} diff --git a/libvirt-gconfig/libvirt-gconfig-storage-vol-target.h b/libvirt-gconfig/libvirt-gconfig-storage-vol-target.h index b572381..c165e2b 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-vol-target.h +++ b/libvirt-gconfig/libvirt-gconfig-storage-vol-target.h @@ -67,6 +67,8 @@ void gvir_config_storage_vol_target_set_format(GVirConfigStorageVolTarget *targe const char *format); void gvir_config_storage_vol_target_set_permissions(GVirConfigStorageVolTarget *target, GVirConfigStoragePermissions *perms); +void gvir_config_storage_vol_target_set_compat(GVirConfigStorageVolTarget *target, + const char *compat); G_END_DECLS diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index 8614126..407a52f 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -714,4 +714,9 @@ global: gvir_config_domain_cpu_set_model; } LIBVIRT_GCONFIG_0.1.8; +LIBVIRT_GCONFIG_0.2.0 { +global: + gvir_config_storage_vol_target_set_compat; +} LIBVIRT_GCONFIG_0.1.9; + # .... define new API here using predicted next version number .... diff --git a/libvirt-gconfig/tests/test-domain-create.c b/libvirt-gconfig/tests/test-domain-create.c index eb4b945..66f618b 100644 --- a/libvirt-gconfig/tests/test-domain-create.c +++ b/libvirt-gconfig/tests/test-domain-create.c @@ -482,6 +482,7 @@ int main(int argc, char **argv) vol_target = gvir_config_storage_vol_target_new(); gvir_config_storage_vol_target_set_format(vol_target, "qcow2"); gvir_config_storage_vol_target_set_permissions(vol_target, perms); + gvir_config_storage_vol_target_set_compat(vol_target, "1.1"); g_object_unref(G_OBJECT(perms)); gvir_config_storage_vol_set_target(vol, vol_target); g_object_unref(G_OBJECT(vol_target)); -- 1.9.1

1 0

[libvirt] [PATCH] AUTHORS: Add my email address to AUTHORS.in
by Dmitry Guryanov 11 Apr '15

11 Apr '15

--- AUTHORS.in | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.in b/AUTHORS.in index 6673b3f..7e4359f 100644 --- a/AUTHORS.in +++ b/AUTHORS.in @@ -14,6 +14,7 @@ Claudio Bley <claudio.bley(a)gmail.com> Cole Robinson <crobinso(a)redhat.com> Daniel Berrange <berrange(a)redhat.com> Daniel Veillard <veillard(a)redhat.com> +Dmitry Guryanov <dguryanov(a)parallels.com> Doug Goldstein <cardoe(a)gentoo.org> Eric Blake <eblake(a)redhat.com> Erik Skultety <eskultet(a)redhat.com> -- 2.1.0

1 0

[libvirt] [PATCH v2 0/5] Refactor cgroup and qemuDomainHotplugVcpus
by John Ferlan 10 Apr '15

10 Apr '15

v1 here: http://www.redhat.com/archives/libvir-list/2015-April/msg00126.html John Ferlan (5): cgroup: Introduce virCgroupNewThread cgroup: Use virCgroupNewThread qemu: qemuDomainHotplugVcpus - separate out the add cgroup qemu: qemuDomainHotplugVcpus - separate out the del cgroup and pin qemu: qemuDomainHotplugVcpus - separate out pin adjustment code src/libvirt_private.syms | 4 +- src/qemu/qemu_cgroup.c | 22 +++-- src/qemu/qemu_driver.c | 233 ++++++++++++++++++++++++++++++----------------- src/util/vircgroup.c | 144 +++++++---------------------- src/util/vircgroup.h | 30 +++--- 5 files changed, 208 insertions(+), 225 deletions(-) -- 2.1.0

2 13

Re: [libvirt] [openstack-dev] [nova] The risk of hanging when shutdown instance.
by zhang bo 10 Apr '15

10 Apr '15

On 2015/3/28 18:06, Rui Chen wrote: > Thank you for reply, Chris. > > > 2015-03-27 23:15 GMT+08:00 Chris Friesen <chris.friesen(a)windriver.com <mailto:chris.friesen@windriver.com>>: > > On 03/26/2015 07:44 PM, Rui Chen wrote: > > Yes, you are right, but we found our instance hang at first dom.shutdown() call, > if the dom.shutdown() don't return, there is no chance to execute dom.destroy(), > right? > > > Correct. The code is written assuming dom.shutdown() cannot block indefinitely. > > The libvirt docs at "https://libvirt.org/html/__libvirt-libvirt-domain.html#__virDomainShutdown <https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainShutdown>" say "...this command returns as soon as the shutdown request is issued rather than blocking until the guest is no longer running." > > If dom.shutdown() blocks indefinitely, then that's a libvirt bug. > > > Chris The API virDomainShutdown's description is out of date, it's not correct. In fact, virDomainShutdown would block or not, depending on its mode. If it's in mode *agent*, then it would be blocked until qemu founds that the guest actually got down. Otherwise, if it's in mode *acpi*, then it would return immediately. Thus, maybe further more work need to be done in Openstack. What's your opinions, Michal and Daniel (from libvirt.org) and Chris (from openstack.org) :)

5 5

[libvirt] [PATCH] conf: fix crash when parse a invalid vcpus in virDomainThreadSchedParse()
by Luyao Huang 10 Apr '15

10 Apr '15

When we set a invalid vcpus in /domain/cputune/vcpusched, like this: <vcpusched vcpus='0,^0' scheduler='fifo' priority='1'/> libvirtd will get segfault, because we will free bitmap (here is sp->ids) we passed in virBitmapParse() then return -1, then call virBitmapIsAllClear() with a null pointer bitmap will crash libvirtd. Split this check in two part to report parse error when cannot parse vcpus, and report invalid argument error when the cpu number is not correct. virBitmapIsAllClear (bitmap=0x0) at util/virbitmap.c:649 649 for (i = 0; i < bitmap->map_len; i++) (gdb) bt #0 virBitmapIsAllClear (bitmap=0x0) at util/virbitmap.c:649 #1 0x00007f28322f1245 in virDomainThreadSchedParse at conf/domain_conf.c:13464 #2 0x00007f283238aec8 in virDomainDefParseXML at conf/domain_conf.c:14059 #3 0x00007f2832390ddb in virDomainDefParseNode at conf/domain_conf.c:15588 #4 0x00007f2832390f02 in virDomainDefParse at conf/domain_conf.c:15530 #5 0x00007f2832390f53 in virDomainDefParseString at conf/domain_conf.c:15546 #6 0x00007f2819d8e8de in qemuDomainDefineXMLFlags at qemu/qemu_driver.c:7385 Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/conf/domain_conf.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1763305..46dfea1 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13473,12 +13473,11 @@ virDomainThreadSchedParse(xmlNodePtr node, goto error; } - if (!virBitmapParse(tmp, 0, &sp->ids, - VIR_DOMAIN_CPUMASK_LEN) || - virBitmapIsAllClear(sp->ids) || - virBitmapNextSetBit(sp->ids, -1) < minid || - virBitmapLastSetBit(sp->ids) > maxid) { + if (virBitmapParse(tmp, 0, &sp->ids, VIR_DOMAIN_CPUMASK_LEN) < 0) + goto error; + if (virBitmapNextSetBit(sp->ids, -1) < minid || + virBitmapLastSetBit(sp->ids) > maxid) { virReportError(VIR_ERR_XML_ERROR, _("Invalid value of '%s': %s"), name, tmp); -- 1.8.3.1

2 2

[libvirt] [PATCH v3 00/14] parallels: implement managed save
by Dmitry Guryanov 10 Apr '15

10 Apr '15

This patch series is intended to implement all needed code, so that suspend/resume in openstack nova will work. It implements .domainHasManagedSaveImage, .domainManagedSave and .domainManagedSaveRemove functions. It's not possible to change VM configuration, if it is in suspended state in PCS. It's possible for containers, but it has different meaning from the same action in libvirt: libvirt stores domain config in a save file and restores it if a user decided to start domain. But if the user discarded state file - domain will have new configuration. PCS doesn't store domain config for containers, so it will have new configuration either if the user will start it from, save file or discard state file and start after that. So the idea is to forbid changing domain configuration, if a domain is in managed saved state. We can't forbid calling this function in this state, because openstack/nova calls virDomainDefineXML in suspended state. So I compare current virDomainDef with the new one. And if there are no changes - function does nothing and returns success. Dmitry Guryanov (14): parallels: fix headers in parallels_sdk.h parallels: split prlsdkDomainChangeState function parallels: implement virDomainManagedSave parallels: report, that cdroms are readonly parallels: add controllers in prlsdkLoadDomain parallels: fill adapter model in virDomainNetDef parallels: don't fill net adapter model for containers conf: add VIR_DOMAIN_VIDEO_TYPE_PARALLELS video type conf: return proper default video type for parallels conf: add input device type for parallels containers parallels: add implicit input devices conf: fix virDomainDefParseXML for parallels conf: fix virDomainDefFormatInternal for parallels parallels: fix virDomainDefineXML for domain in saved state src/conf/domain_conf.c | 70 +++++++++++++++++++--- src/conf/domain_conf.h | 2 + src/parallels/parallels_driver.c | 104 ++++++++++++++++++++++++++++++-- src/parallels/parallels_sdk.c | 124 ++++++++++++++++++++++++++++++++++----- src/parallels/parallels_sdk.h | 17 ++++-- src/qemu/qemu_command.c | 6 +- 6 files changed, 285 insertions(+), 38 deletions(-) -- 2.1.0

2 17

Re: [libvirt] [Qemu-devel] can't bot from scsi http cdrom
by Stefan Hajnoczi 10 Apr '15

10 Apr '15

On Mon, Apr 06, 2015 at 01:15:24PM +0300, Vasiliy Tolstov wrote: > Hi. I'm try to boot from http cdrom and can't do that in case of scsi: > <disk type='network' device='cdrom'> > <driver name='qemu' type='raw' cache='unsafe'/> > <source protocol='http' name='/vps/rescue-4.5.2'> > <host name='xx.xx' port='80'/> > </source> > <backingStore/> > <target dev='sdb' bus='scsi'/> > <readonly/> > <alias name='scsi0-0-0-1'/> > <address type='drive' controller='0' bus='0' target='0' unit='1'/> > </disk> > > but in case of ide: > <disk type='network' device='cdrom'> > <driver name='qemu' type='raw' cache='unsafe'/> > <source protocol='http' name='/vps/rescue-4.5.2'> > <host name='xx.xx' port='80'/> > </source> > <backingStore/> > <target dev='hda' bus='ide'/> > <readonly/> > <alias name='ide0-0-0'/> > <address type='drive' controller='0' bus='0' target='0' unit='0'/> > </disk> > > all works fine. > > libvirt - 1.2.10 > qemu - 2.0.0 > seabios - 1.7.5 This is a libvirt question. I have CCed the libvirt mailing list. Stefan

1 0

[libvirt] possible bug regarding cpu flag 'pclmulqdq' in cpu_map.xml
by Sven Kieske 10 Apr '15

10 Apr '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, laine on IRC was so kind to redirect me to this list, so I didn't file a BZ at: https://bugzilla.redhat.com/enter_bug.cgi?product=Virtualization%20Tools &component=libvirt yet. Please keep me CC'ed as I'm not subscribed to the list. So here is my bug report: Description of problem: I believe the flag "pclmulqdq" is wrongly spelled in cpu_map.xml leading to wrong cpu being detected: Version-Release number of selected component (if applicable): current master: https://libvirt.org/git/?p=libvirt.git;a=blob;f=src/cpu/cpu_map.xml;h=21 10c0b9b2a2a70f0334b2ff63416bd1b704b669;hb=HEAD How reproducible: always Steps to Reproduce: 1.install e.g. ovirt, or some other libvirt consumer on a system with a cpu like intel xeon E3-1230 2. it will get reported as nehalem 3. Actual results: cpu gets reported as "nehalem" Expected results: cpu gets reported as "sandy bridge" Additional info: I found no real info on this flag: grep --color pclmuldq /usr/share/libvirt/cpu_map.xml <feature name='pclmuldq'> <feature name='pclmuldq'/> <feature name='pclmuldq'/> wikipedia (not always right, I know) and Intel just seem to know the flag 'pclmulqdq' See: https://en.wikipedia.org/wiki/CLMUL_instruction_set https://en.wikipedia.org/wiki/CPUID#EAX.3D1:_Processor_Info_and_Feature_ Bits https://software.intel.com/file/36945 But the Intel documentation is vast and I might have missed information on their website. So please check if this is the correct cpu flag indeed. Thanks! PS: If this is a real bug, it goes way back into el6 released versions of libvirt, and I would like to see a backport, if possible! Here is the BZ which introduced the flag: https://bugzilla.redhat.com/show_bug.cgi?id=761005 I guess this got wrongly typed, when you look at this comment, which has the correct notation: https://bugzilla.redhat.com/show_bug.cgi?id=761005#c16 - -- Mit freundlichen Grüßen / Regards Sven Kieske Systemadministrator Mittwald CM Service GmbH & Co. KG Königsberger Straße 6 32339 Espelkamp T: +49-5772-293-100 F: +49-5772-293-333 https://www.mittwald.de Geschäftsführer: Robert Meyer St.Nr.: 331/5721/1033, USt-IdNr.: DE814773217, HRA 6640, AG Bad Oeynhaus en Komplementärin: Robert Meyer Verwaltungs GmbH, HRB 13260, AG Bad Oeynhausen -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAEBAgAGBQJVJpqoAAoJEMby9TMDAbQRFlcP/1xajVdbv3fNfQPzJ3wIRa6M szkdbqMkI7HZTBjGvgSFXcf/ufb2RNfCU7AXpMi+FsE+oMB6qafke/J5VM6H/GUW TWuOy1wXz6QLxkP/p0VeU6ZX28XmwPOUMPcCQVhexIAbrmpgYCY42iaiEZUStcNp QQIqapOR6kL57WazTjY0U5GlGkV479oYlStF3E4maaJz+viNUqD6pE3WhXTbpcsu 1U1hPYANkfaMiXglm4MqpLklHw2PqgSfRvPzH58JStByuizPiWXZ9h42xE5ykVkW B7sw4XBSVk0mH99LNwnXC/VIw4pPz7uecTSbxdubZ/p4vvlG8JdszOekMfZVhy1+ ic93VPB+jSbiRGjWx8jkyYAsVOREaPBbmFF3ioLkAo9eVl8v8MXcBNppQQASVv7R vidSBu4qAVeu3ghmY5L+zEqTT3cG8pDcqzrFcELOtY1b6qsOOksgUxiylFv25g6F QPoDZpkpTvJ8YjOZx4H3ZjlfPQBhvBqd3QESNR8fKBUcxgxfGRwBVVU+14otvElE buEhBux0DvEfYrLbbiJtlGFtBmuz28RToPM1bmj52ujnGS1+0xYYYrHL35GhwnPc pvJ8mxAIRMYTdhn5eMsIh50N3uxz9Zky0CU8DJZ5St2Fsds3n7fR7Oao+PXOsOX1 mtJPsI1bYnxJ4RYVaIzk =ergB -----END PGP SIGNATURE-----

2 2