- Devel - libvirt List Archives

[libvirt] [python PATCH 0/3] Fix multiple python binding issues
by Peter Krempa 22 Oct '14

22 Oct '14

Luyao Huang (1): Fix parsing of 'flags' argument for bulk stats functions Peter Krempa (2): Fix function name when parsing arguments in libvirt_virNodeAllocPages Fix rest of unsigned integer handling generator.py | 2 +- libvirt-lxc-override.c | 2 +- libvirt-override.c | 132 ++++++++++++++++++++++++------------------------ libvirt-qemu-override.c | 4 +- 4 files changed, 70 insertions(+), 70 deletions(-) -- 2.1.0

2 7

[libvirt] [PATCH v4] network: Add bandwidth support to ethernet interfaces
by Anirban Chakraborty 22 Oct '14

22 Oct '14

v4: Changed function virNetDevSupportBandwidth to use switch statement. Fixed syntax issues Fold the two patches into one as the second patch was a one liner v3: Addressed issues pointed out in V2 Split into two patches v2: Addressed comments raised in review of V1. Consolidate calls to virNetDevBandwidthSet. Clear bandwidth settings when the interface is detached or domain destroyed. v1: Ethernet interfaces in libvirt currently do not support bandwidth setting. For example, following xml file for an interface will not apply these settings to corresponding qdiscs. <interface type="ethernet"> <mac address="02:36:1d:18:2a:e4"/> <model type="virtio"/> <script path=""/> <target dev="tap361d182a-e4"/> <bandwidth> <inbound average="984" peak="1024" burst="64"/> <outbound average="2000" peak="2048" burst="128"/> </bandwidth> </interface> Signed-off-by: Anirban Chakraborty <abchak(a)juniper.net> --- src/conf/domain_conf.h | 21 +++++++++++++++++++++ src/lxc/lxc_driver.c | 3 +++ src/lxc/lxc_process.c | 18 +++++++++--------- src/qemu/qemu_command.c | 25 +++++++++++++++++++------ src/qemu/qemu_command.h | 2 ++ src/qemu/qemu_driver.c | 3 +++ src/qemu/qemu_hotplug.c | 12 ++++++++++++ src/qemu/qemu_process.c | 3 +++ src/util/virnetdevmacvlan.c | 10 ---------- src/util/virnetdevmacvlan.h | 1 - 10 files changed, 72 insertions(+), 26 deletions(-) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index afa3da6..59fdfb2 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2848,4 +2848,25 @@ int virDomainObjSetMetadata(virDomainObjPtr vm, bool virDomainDefNeedsPlacementAdvice(virDomainDefPtr def) ATTRIBUTE_NONNULL(1); +static inline bool virNetDevSupportBandwidth(virDomainNetType type) +{ + switch (type) { + case VIR_DOMAIN_NET_TYPE_BRIDGE: + case VIR_DOMAIN_NET_TYPE_NETWORK: + case VIR_DOMAIN_NET_TYPE_DIRECT: + case VIR_DOMAIN_NET_TYPE_ETHERNET: + return true; + case VIR_DOMAIN_NET_TYPE_USER: + case VIR_DOMAIN_NET_TYPE_VHOSTUSER: + case VIR_DOMAIN_NET_TYPE_SERVER: + case VIR_DOMAIN_NET_TYPE_CLIENT: + case VIR_DOMAIN_NET_TYPE_MCAST: + case VIR_DOMAIN_NET_TYPE_INTERNAL: + case VIR_DOMAIN_NET_TYPE_HOSTDEV: + case VIR_DOMAIN_NET_TYPE_LAST: + break; + } + return false; +} + #endif /* __DOMAIN_CONF_H */ diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index b3e506f..a6f1f8a 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -72,6 +72,7 @@ #include "viraccessapicheck.h" #include "viraccessapichecklxc.h" #include "virhostdev.h" +#include "qemu/qemu_command.h" #define VIR_FROM_THIS VIR_FROM_LXC @@ -4634,6 +4635,8 @@ lxcDomainDetachDeviceNetLive(virDomainObjPtr vm, detach = vm->def->nets[detachidx]; + qemuDomainClearNetBandwidth(vm); + switch (virDomainNetGetActualType(detach)) { case VIR_DOMAIN_NET_TYPE_BRIDGE: case VIR_DOMAIN_NET_TYPE_NETWORK: diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index ed30c37..3192011 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -274,11 +274,6 @@ char *virLXCProcessSetupInterfaceBridged(virConnectPtr conn, if (virNetDevSetOnline(parentVeth, true) < 0) goto cleanup; - if (virNetDevBandwidthSet(net->ifname, - virDomainNetGetActualBandwidth(net), - false) < 0) - goto cleanup; - if (net->filter && virDomainConfNWFilterInstantiate(conn, vm->uuid, net) < 0) goto cleanup; @@ -300,6 +295,7 @@ char *virLXCProcessSetupInterfaceDirect(virConnectPtr conn, virNetDevBandwidthPtr bw; virNetDevVPortProfilePtr prof; virLXCDriverConfigPtr cfg = virLXCDriverGetConfig(driver); + const char *linkdev = virDomainNetGetActualDirectDev(net); /* XXX how todo bandwidth controls ? * Since the 'net-ifname' is about to be moved to a different @@ -329,14 +325,13 @@ char *virLXCProcessSetupInterfaceDirect(virConnectPtr conn, if (virNetDevMacVLanCreateWithVPortProfile( net->ifname, &net->mac, - virDomainNetGetActualDirectDev(net), + linkdev, virDomainNetGetActualDirectMode(net), false, def->uuid, - virDomainNetGetActualVirtPortProfile(net), + prof, &res_ifname, VIR_NETDEV_VPORT_PROFILE_OP_CREATE, - cfg->stateDir, - virDomainNetGetActualBandwidth(net), 0) < 0) + cfg->stateDir, 0) < 0) goto cleanup; ret = res_ifname; @@ -450,6 +445,11 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn, goto cleanup; } + /* set network bandwidth */ + if (virNetDevBandwidthSet(def->nets[i]->ifname, + virDomainNetGetActualBandwidth(def->nets[i]), false) < 0) + goto cleanup; + (*veths)[(*nveths)-1] = veth; /* Make sure all net definitions will have a name in the container */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 8cb0865..3645ace 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -191,7 +191,6 @@ qemuPhysIfaceConnect(virDomainDefPtr def, virDomainNetGetActualVirtPortProfile(net), &res_ifname, vmop, cfg->stateDir, - virDomainNetGetActualBandwidth(net), macvlan_create_flags); if (rc >= 0) { virDomainAuditNetDevice(def, net, res_ifname, true); @@ -371,11 +370,6 @@ qemuNetworkIfaceConnect(virDomainDefPtr def, &net->mac) < 0) goto cleanup; - if (virNetDevBandwidthSet(net->ifname, - virDomainNetGetActualBandwidth(net), - false) < 0) - goto cleanup; - if (net->filter && virDomainConfNWFilterInstantiate(conn, def->uuid, net) < 0) { goto cleanup; @@ -7427,6 +7421,13 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, goto cleanup; } + /* Set Bandwidth */ + if (virNetDevSupportBandwidth(actualType) && + virNetDevBandwidthSet(net->ifname, + virDomainNetGetActualBandwidth(net), + false) < 0) + goto cleanup; + if ((actualType == VIR_DOMAIN_NET_TYPE_NETWORK || actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || actualType == VIR_DOMAIN_NET_TYPE_ETHERNET || @@ -12452,3 +12453,15 @@ virDomainDefPtr qemuParseCommandLinePid(virCapsPtr qemuCaps, virStringFreeList(progenv); return def; } + +void qemuDomainClearNetBandwidth(virDomainObjPtr vm) +{ + size_t i; + virDomainNetType type; + + for (i = 0; i < vm->def->nnets; i++) { + type = virDomainNetGetActualType(vm->def->nets[i]); + if (virNetDevSupportBandwidth(type)) + virNetDevBandwidthClear(vm->def->nets[i]->ifname); + } +} diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index aa40c9e..7963a91 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -277,4 +277,6 @@ int qemuCheckDiskConfig(virDomainDiskDefPtr disk); bool qemuCheckFips(void); + +void qemuDomainClearNetBandwidth(virDomainObjPtr vm); #endif /* __QEMU_COMMAND_H__*/ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7c9b1ab..8ad644a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2196,6 +2196,9 @@ qemuDomainDestroyFlags(virDomainPtr dom, if (virDomainDestroyFlagsEnsureACL(dom->conn, vm->def) < 0) goto cleanup; + /* Clear network bandwidth */ + qemuDomainClearNetBandwidth(vm); + qemuDomainSetFakeReboot(driver, vm, false); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 1e504ec..f627e69 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -50,6 +50,7 @@ #include "virstring.h" #include "virtime.h" #include "storage/storage_driver.h" +#include "domain_conf.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -948,6 +949,12 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, goto cleanup; } + /* Set Bandwidth */ + if (virNetDevSupportBandwidth(actualType) && + virNetDevBandwidthSet(net->ifname, + virDomainNetGetActualBandwidth(net), false) < 0) + goto cleanup; + for (i = 0; i < tapfdSize; i++) { if (virSecurityManagerSetTapFDLabel(driver->securityManager, vm->def, tapfd[i]) < 0) @@ -3516,6 +3523,11 @@ qemuDomainDetachNetDevice(virQEMUDriverPtr driver, } } + if (virNetDevSupportBandwidth(virDomainNetGetActualType(detach)) && + virNetDevBandwidthClear(detach->ifname) < 0) + VIR_WARN("cannot clear bandwidth setting for device : %s", + detach->ifname); + qemuDomainMarkDeviceForRemoval(vm, &detach->info); qemuDomainObjEnterMonitor(driver, vm); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 95548aa..4d95ec4 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4825,6 +4825,9 @@ void qemuProcessStop(virQEMUDriverPtr driver, virStrerror(errno, ebuf, sizeof(ebuf))); } + /* Clear network bandwidth */ + qemuDomainClearNetBandwidth(vm); + virDomainConfVMNWFilterTeardown(vm); if (cfg->macFilter) { diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index c83341c..956a96b 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -811,7 +811,6 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *tgifname, char **res_ifname, virNetDevVPortProfileOp vmOp, char *stateDir, - virNetDevBandwidthPtr bandwidth, unsigned int flags) { const char *type = (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) ? @@ -925,14 +924,6 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *tgifname, rc = 0; } - if (virNetDevBandwidthSet(cr_ifname, bandwidth, false) < 0) { - if (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) - VIR_FORCE_CLOSE(rc); /* sets rc to -1 */ - else - rc = -1; - goto disassociate_exit; - } - if (vmOp == VIR_NETDEV_VPORT_PROFILE_OP_CREATE || vmOp == VIR_NETDEV_VPORT_PROFILE_OP_RESTORE) { /* Only directly register upon a create or restore (restarting @@ -1076,7 +1067,6 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *ifname ATTRIBUTE_UNUSED, char **res_ifname ATTRIBUTE_UNUSED, virNetDevVPortProfileOp vmop ATTRIBUTE_UNUSED, char *stateDir ATTRIBUTE_UNUSED, - virNetDevBandwidthPtr bandwidth ATTRIBUTE_UNUSED, unsigned int flags) { virCheckFlags(0, -1); diff --git a/src/util/virnetdevmacvlan.h b/src/util/virnetdevmacvlan.h index 41aa4e2..f08d32b 100644 --- a/src/util/virnetdevmacvlan.h +++ b/src/util/virnetdevmacvlan.h @@ -68,7 +68,6 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *ifname, char **res_ifname, virNetDevVPortProfileOp vmop, char *stateDir, - virNetDevBandwidthPtr bandwidth, unsigned int flags) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(6) ATTRIBUTE_NONNULL(8) ATTRIBUTE_NONNULL(10) ATTRIBUTE_RETURN_CHECK; -- 1.9.1

1 2

[libvirt] [PATCH] Fix cast errors with clang
by Roman Bogorodskiy 21 Oct '14

21 Oct '14

Build with clang fails with: CC util/libvirt_util_la-virsocketaddr.lo util/virsocketaddr.c:904:17: error: cast from 'struct sockaddr *' to 'struct sockaddr_in *' increases required alignment from 1 to 4 [-Werror,-Wcast-align] inet4 = (struct sockaddr_in*) res->ai_addr; ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ util/virsocketaddr.c:909:17: error: cast from 'struct sockaddr *' to 'struct sockaddr_in6 *' increases required alignment from 1 to 4 [-Werror,-Wcast-align] inet6 = (struct sockaddr_in6*) res->ai_addr; ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 2 errors generated. Fix by introducing a union of the appropriate sturcts. --- src/util/virsocketaddr.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index 5f54e68..162108c 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -892,22 +892,25 @@ virSocketAddrIsNumericLocalhost(const char *addr) { struct addrinfo *res; struct in_addr tmp = { .s_addr = htonl(INADDR_LOOPBACK) }; - struct sockaddr_in *inet4; - struct sockaddr_in6 *inet6; + union { + struct sockaddr *addr; + struct sockaddr_in *inet4; + struct sockaddr_in6 *inet6; + } sa; bool ret = false; if (virSocketAddrParseInternal(&res, addr, AF_UNSPEC, false) < 0) return ret; + sa.addr = res->ai_addr; + switch (res->ai_addr->sa_family) { case AF_INET: - inet4 = (struct sockaddr_in*) res->ai_addr; - ret = memcmp(&inet4->sin_addr.s_addr, &tmp.s_addr, - sizeof(inet4->sin_addr.s_addr)) == 0; + ret = memcmp(&sa.inet4->sin_addr.s_addr, &tmp.s_addr, + sizeof(sa.inet4->sin_addr.s_addr)) == 0; break; case AF_INET6: - inet6 = (struct sockaddr_in6*) res->ai_addr; - ret = IN6_IS_ADDR_LOOPBACK(&(inet6->sin6_addr)); + ret = IN6_IS_ADDR_LOOPBACK(&(sa.inet6->sin6_addr)); break; } -- 2.0.2

2 2

[libvirt] [libvirt-python PATCH] Fix cannot use VIR_CONNECT_GET_ALL_DOMAINS_STATS_ENFORCE_STATS flags in domainListGetStats
by Luyao Huang 21 Oct '14

21 Oct '14

When set flags=libvirt.VIR_CONNECT_GET_ALL_DOMAINS_STATS_ENFORCE_STATS, python will report a error: OverflowError: signed integer is greater than maximum Because VIR_CONNECT_GET_ALL_DOMAINS_STATS_ENFORCE_STATS = 2147483648 (2**31), and it set a signed int in PyArg_ParseTuple function. if (!PyArg_ParseTuple(args, (char *)"OOii:virDomainListGetStats", &pyobj_conn, &py_domlist, &stats, &flags)) When python >= 2.3, 'I' means unsigned int and 'i' means int,so there should use 'I'. From: https://docs.python.org/2/c-api/arg.html I also found a lot of function use 'i' for a unsigned int, but i didn't change them. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- libvirt-override.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-override.c b/libvirt-override.c index c887b71..6dacdac 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -8126,7 +8126,7 @@ libvirt_virDomainListGetStats(PyObject *self ATTRIBUTE_UNUSED, unsigned int flags; unsigned int stats; - if (!PyArg_ParseTuple(args, (char *)"OOii:virDomainListGetStats", + if (!PyArg_ParseTuple(args, (char *)"OOII:virDomainListGetStats", &pyobj_conn, &py_domlist, &stats, &flags)) return NULL; -- 1.8.3.1

2 1

[libvirt] [PATCH] qemu: unref cfg after TerminateMachine has been called
by Martin Kletzander 21 Oct '14

21 Oct '14

Commit 60627f6d added the code that requests driver cfg, but forgot to unref it. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_cgroup.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index fa894c5..b5bdb36 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -1222,6 +1222,8 @@ qemuRemoveCgroup(virQEMUDriverPtr driver, VIR_DEBUG("Failed to terminate cgroup for %s", vm->def->name); } + virObjectUnref(cfg); + return virCgroupRemove(priv->cgroup); } -- 2.1.2

2 2

[libvirt] [PATCH] docs: Mention repository locations in contributor guidelines
by Martin Kletzander 21 Oct '14

21 Oct '14

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- HACKING | 18 +++++++++++------- docs/hacking.html.in | 5 +++++ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/HACKING b/HACKING index add0841..f8546cb 100644 --- a/HACKING +++ b/HACKING @@ -14,7 +14,11 @@ General tips for contributing patches (1) Discuss any large changes on the mailing list first. Post patches early and listen to feedback. -(2) Post patches in unified diff format, with git rename detection enabled. You +(2) Official upstream repository is kept in git ("git://libvirt.org/libvirt.git") +and is browsable along with other libvirt-related repositories (e.g. +libvirt-python) online <http://libvirt.org>. + +(3) Post patches in unified diff format, with git rename detection enabled. You need a one-time setup of: git config diff.renames true @@ -66,7 +70,7 @@ though). -(3) In your commit message, make the summary line reasonably short (60 characters +(4) In your commit message, make the summary line reasonably short (60 characters is typical), followed by a blank line, followed by any longer description of why your patch makes sense. If the patch fixes a regression, and you know what commit introduced the problem, mentioning that is useful. If the patch @@ -78,7 +82,7 @@ is up to you if you want to include or omit them in the commit message. -(4) Split large changes into a series of smaller patches, self-contained if +(5) Split large changes into a series of smaller patches, self-contained if possible, with an explanation of each patch and an explanation of how the sequence of patches fits together. Moreover, please keep in mind that it's required to be able to compile cleanly (*including* "make check" and "make @@ -89,10 +93,10 @@ things). -(5) Make sure your patches apply against libvirt GIT. Developers only follow GIT +(6) Make sure your patches apply against libvirt GIT. Developers only follow GIT and don't care much about released versions. -(6) Run the automated tests on your code before submitting any changes. In +(7) Run the automated tests on your code before submitting any changes. In particular, configure with compile warnings set to -Werror. This is done automatically for a git checkout; from a tarball, use: @@ -138,7 +142,7 @@ various tests under gdb or Valgrind. -(7) The Valgrind test should produce similar output to "make check". If the output +(8) The Valgrind test should produce similar output to "make check". If the output has traces within libvirt API's, then investigation is required in order to determine the cause of the issue. Output such as the following indicates some sort of leak: @@ -214,7 +218,7 @@ to "tests/.valgrind.supp" in order to suppress the warning: -(8) Update tests and/or documentation, particularly if you are adding a new +(9) Update tests and/or documentation, particularly if you are adding a new feature or changing the output of a program. diff --git a/docs/hacking.html.in b/docs/hacking.html.in index 8f2b9d6..4ab0179 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -11,6 +11,11 @@ <li>Discuss any large changes on the mailing list first. Post patches early and listen to feedback.</li> + <li>Official upstream repository is kept in git + (<code>git://libvirt.org/libvirt.git</code>) and is browsable + along with other libvirt-related repositories + (e.g. libvirt-python) <a href="http://libvirt.org">online</a>.</li> + <li><p>Post patches in unified diff format, with git rename detection enabled. You need a one-time setup of:</p> <pre> -- 2.1.2

2 1

[libvirt] [PATCH] qemu: x86_64 is good enough for i686
by Lubomir Rintel 21 Oct '14

21 Oct '14

virt-manager on Fedora sets up i686 hosts with "/usr/bin/qemu-kvm" emulator, which in turn unconditionally execs qemu-system-x86_64 querying capabilities then fails: Error launching details: invalid argument: architecture from emulator 'x86_64' doesn't match given architecture 'i686' Traceback (most recent call last): File "/usr/share/virt-manager/virtManager/engine.py", line 748, in _show_vm_helper details = self._get_details_dialog(uri, vm.get_connkey()) File "/usr/share/virt-manager/virtManager/engine.py", line 726, in _get_details_dialog obj = vmmDetails(conn.get_vm(connkey)) File "/usr/share/virt-manager/virtManager/details.py", line 399, in __init__ self.init_details() File "/usr/share/virt-manager/virtManager/details.py", line 784, in init_details domcaps = self.vm.get_domain_capabilities() File "/usr/share/virt-manager/virtManager/domain.py", line 518, in get_domain_capabilities self.get_xmlobj().os.machine, self.get_xmlobj().type) File "/usr/lib/python2.7/site-packages/libvirt.py", line 3492, in getDomainCapabilities if ret is None: raise libvirtError ('virConnectGetDomainCapabilities() failed', conn=self) libvirtError: invalid argument: architecture from emulator 'x86_64' doesn't match given architecture 'i686' Journal: Oct 16 21:08:26 goatlord.localdomain libvirtd[1530]: invalid argument: architecture from emulator 'x86_64' doesn't match given architecture 'i686' --- src/qemu/qemu_driver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7377320..e4b2b6c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17809,7 +17809,8 @@ qemuConnectGetDomainCapabilities(virConnectPtr conn, arch_from_caps = virQEMUCapsGetArch(qemuCaps); - if (arch_from_caps != arch) { + if (arch_from_caps != arch && + (arch_from_caps != VIR_ARCH_X86_64 || arch != VIR_ARCH_I686)) { virReportError(VIR_ERR_INVALID_ARG, _("architecture from emulator '%s' doesn't " "match given architecture '%s'"), -- 2.1.0

3 2

[libvirt] [PATCH] qemu: move setting emulatorpin ahead of monitor showing up
by Wang Rui 21 Oct '14

21 Oct '14

From: Zhou yimin <zhouyimin(a)huawei.com> If VM is configured with many devices(including passthrough devices) and large memory, libvirtd will take seconds(in the worst case) to wait for monitor. In this period the qemu process may run on any PCPU though I intend to pin emulator to the specified PCPU in xml configuration. Actually qemu process takes high cpu usage during vm startup. So this is not the strict CPU isolation in this case. Signed-off-by: Zhou yimin <zhouyimin(a)huawei.com> --- src/qemu/qemu_process.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 95548aa..ef258cf 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4553,6 +4553,14 @@ int qemuProcessStart(virConnectPtr conn, if (ret == -1) /* The VM failed to start */ goto cleanup; + VIR_DEBUG("Setting cgroup for emulator (if required)"); + if (qemuSetupCgroupForEmulator(driver, vm, nodemask) < 0) + goto cleanup; + + VIR_DEBUG("Setting affinity of emulator threads"); + if (qemuProcessSetEmulatorAffinity(vm) < 0) + goto cleanup; + VIR_DEBUG("Waiting for monitor to show up"); if (qemuProcessWaitForMonitor(driver, vm, asyncJob, priv->qemuCaps, pos) < 0) goto cleanup; @@ -4588,10 +4596,6 @@ int qemuProcessStart(virConnectPtr conn, if (qemuSetupCgroupForVcpu(vm) < 0) goto cleanup; - VIR_DEBUG("Setting cgroup for emulator (if required)"); - if (qemuSetupCgroupForEmulator(driver, vm, nodemask) < 0) - goto cleanup; - VIR_DEBUG("Setting cgroup for each IOThread (if required)"); if (qemuSetupCgroupForIOThreads(vm) < 0) goto cleanup; @@ -4600,10 +4604,6 @@ int qemuProcessStart(virConnectPtr conn, if (qemuProcessSetVcpuAffinities(vm) < 0) goto cleanup; - VIR_DEBUG("Setting affinity of emulator threads"); - if (qemuProcessSetEmulatorAffinity(vm) < 0) - goto cleanup; - VIR_DEBUG("Setting affinity of IOThread threads"); if (qemuProcessSetIOThreadsAffinity(vm) < 0) goto cleanup; -- 1.7.12.4

2 1

[libvirt] [PATCH] - make virDomainDetachDeviceFlags respect VIR_DOMAIN_DEVICE_MODIFY_FORCE
by Marcin Gibuła 21 Oct '14

21 Oct '14

Hi, currently, there is no way to force disk detach from KVM guest if guest does not cooperate. This patch makes virDomainDetachDeviceFlags() respect VIR_DOMAIN_DEVICE_MODIFY_FORCE flag. When it's on, libvirt will always call drive_del, regardless if guest responsed to ACPI unplug request or not. --- diff -ru libvirt-1.2.6-orig/src/qemu/qemu_driver.c libvirt-1.2.6/src/qemu/qemu_driver.c --- libvirt-1.2.6-orig/src/qemu/qemu_driver.c 2014-07-02 05:35:47.000000000 +0200 +++ libvirt-1.2.6/src/qemu/qemu_driver.c 2014-10-09 13:37:27.863897583 +0200 @@ -6525,14 +6525,15 @@ static int qemuDomainDetachDeviceLive(virDomainObjPtr vm, virDomainDeviceDefPtr dev, - virDomainPtr dom) + virDomainPtr dom, + int flags) { virQEMUDriverPtr driver = dom->conn->privateData; int ret = -1; switch (dev->type) { case VIR_DOMAIN_DEVICE_DISK: - ret = qemuDomainDetachDeviceDiskLive(driver, vm, dev); + ret = qemuDomainDetachDeviceDiskLive(driver, vm, dev, flags); break; case VIR_DOMAIN_DEVICE_CONTROLLER: ret = qemuDomainDetachDeviceControllerLive(driver, vm, dev); @@ -7257,7 +7258,8 @@ virCapsPtr caps = NULL; virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | - VIR_DOMAIN_AFFECT_CONFIG, -1); + VIR_DOMAIN_AFFECT_CONFIG | + VIR_DOMAIN_DEVICE_MODIFY_FORCE, -1); cfg = virQEMUDriverGetConfig(driver); @@ -7343,7 +7345,7 @@ VIR_DOMAIN_DEVICE_ACTION_DETACH) < 0) goto endjob; - if ((ret = qemuDomainDetachDeviceLive(vm, dev_copy, dom)) < 0) + if ((ret = qemuDomainDetachDeviceLive(vm, dev_copy, dom, flags)) < 0) goto endjob; /* * update domain status forcibly because the domain status may be diff -ru libvirt-1.2.6-orig/src/qemu/qemu_hotplug.c libvirt-1.2.6/src/qemu/qemu_hotplug.c --- libvirt-1.2.6-orig/src/qemu/qemu_hotplug.c 2014-06-27 05:50:18.000000000 +0200 +++ libvirt-1.2.6/src/qemu/qemu_hotplug.c 2014-10-09 13:35:55.566375716 +0200 @@ -2906,7 +2906,8 @@ static int qemuDomainDetachVirtioDiskDevice(virQEMUDriverPtr driver, virDomainObjPtr vm, - virDomainDiskDefPtr detach) + virDomainDiskDefPtr detach, + int flags) { int ret = -1; qemuDomainObjPrivatePtr priv = vm->privateData; @@ -2958,7 +2959,7 @@ qemuDomainObjExitMonitor(driver, vm); rc = qemuDomainWaitForDeviceRemoval(vm); - if (rc == 0 || rc == 1) + if (rc == 0 || rc == 1 || (flags & VIR_DOMAIN_DEVICE_MODIFY_FORCE)) ret = qemuDomainRemoveDiskDevice(driver, vm, detach); else ret = 0; @@ -2971,7 +2972,8 @@ static int qemuDomainDetachDiskDevice(virQEMUDriverPtr driver, virDomainObjPtr vm, - virDomainDiskDefPtr detach) + virDomainDiskDefPtr detach, + int flags) { int ret = -1; qemuDomainObjPrivatePtr priv = vm->privateData; @@ -3003,7 +3005,7 @@ qemuDomainObjExitMonitor(driver, vm); rc = qemuDomainWaitForDeviceRemoval(vm); - if (rc == 0 || rc == 1) + if (rc == 0 || rc == 1 || (flags & VIR_DOMAIN_DEVICE_MODIFY_FORCE)) ret = qemuDomainRemoveDiskDevice(driver, vm, detach); else ret = 0; @@ -3030,7 +3032,8 @@ int qemuDomainDetachDeviceDiskLive(virQEMUDriverPtr driver, virDomainObjPtr vm, - virDomainDeviceDefPtr dev) + virDomainDeviceDefPtr dev, + int flags) { virDomainDiskDefPtr disk; int ret = -1; @@ -3047,10 +3050,10 @@ case VIR_DOMAIN_DISK_DEVICE_DISK: case VIR_DOMAIN_DISK_DEVICE_LUN: if (disk->bus == VIR_DOMAIN_DISK_BUS_VIRTIO) - ret = qemuDomainDetachVirtioDiskDevice(driver, vm, disk); + ret = qemuDomainDetachVirtioDiskDevice(driver, vm, disk, flags); else if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI || disk->bus == VIR_DOMAIN_DISK_BUS_USB) - ret = qemuDomainDetachDiskDevice(driver, vm, disk); + ret = qemuDomainDetachDiskDevice(driver, vm, disk, flags); else virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("This type of disk cannot be hot unplugged")); diff -ru libvirt-1.2.6-orig/src/qemu/qemu_hotplug.h libvirt-1.2.6/src/qemu/qemu_hotplug.h --- libvirt-1.2.6-orig/src/qemu/qemu_hotplug.h 2014-06-25 13:25:52.000000000 +0200 +++ libvirt-1.2.6/src/qemu/qemu_hotplug.h 2014-10-09 13:36:22.255659117 +0200 @@ -71,7 +71,8 @@ int linkstate); int qemuDomainDetachDeviceDiskLive(virQEMUDriverPtr driver, virDomainObjPtr vm, - virDomainDeviceDefPtr dev); + virDomainDeviceDefPtr dev, + int flags); int qemuDomainDetachControllerDevice(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainDeviceDefPtr dev); -- mg

2 1

[libvirt] [libvirt-python v3 PATCH] Improve error output when use getTime with a nonzero flags.
by Luyao Huang 20 Oct '14

20 Oct '14

When give a nonzero flags to getTime, c_retval will get -1 and goto cleanup. But py_retval still is NULL,so set py_retval = VIR_PY_NONE. This will make the output message more correct. error will disappear: SystemError: error return without exception set v2: https://www.redhat.com/archives/libvir-list/2014-October/msg00497.html Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- libvirt-override.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libvirt-override.c b/libvirt-override.c index 9ba87eb..8690f4f 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -7757,9 +7757,11 @@ libvirt_virDomainGetTime(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { c_retval = virDomainGetTime(domain, &seconds, &nseconds, flags); LIBVIRT_END_ALLOW_THREADS; - if (c_retval < 0) + if (c_retval < 0) { + py_retval = VIR_PY_NONE; goto cleanup; - + } + if (!(pyobj_seconds = libvirt_longlongWrap(seconds)) || PyDict_SetItemString(dict, "seconds", pyobj_seconds) < 0) goto cleanup; -- 1.8.3.1

2 1

[libvirt] [libvirt-python v2 PATCH] Improve error output when use getTime with a nonzero flags.
by Luyao Huang 20 Oct '14

20 Oct '14

When give a nonzero flags to getTime, c_retval will get -1 and goto cleanup. But py_retval still is NULL,so pass c_retval value to py_retval. This will make the output message more correct. error before use this patch: SystemError: error return without exception set after use the patch: libvirtError: unsupported flags (0x1) in function qemuDomainGetTime v1: https://www.redhat.com/archives/libvir-list/2014-October/msg00482.html Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- libvirt-override.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libvirt-override.c b/libvirt-override.c index 9ba87eb..c779aa3 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -7757,9 +7757,11 @@ libvirt_virDomainGetTime(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { c_retval = virDomainGetTime(domain, &seconds, &nseconds, flags); LIBVIRT_END_ALLOW_THREADS; - if (c_retval < 0) + if (c_retval < 0){ + py_retval = libvirt_intWrap(c_retval); goto cleanup; - + } + if (!(pyobj_seconds = libvirt_longlongWrap(seconds)) || PyDict_SetItemString(dict, "seconds", pyobj_seconds) < 0) goto cleanup; -- 1.8.3.1

2 3

[libvirt] Implement quorum support.
by Matthias Gatto 20 Oct '14

20 Oct '14

Hello, I'm implementing quorum in libvirt. I've try to follow this proposal: http://www.redhat.com/archives/libvir-list/2014-May/msg00546.html At this point I've done this: - add all the field need by quorum in _virStorageSource (nBackingStores, threshold). - handle more than one backing store in virStorageSource by adding a function virStorageSourcePushBackingStore - add support of the quorum syntax for the xml parser. so now i have to work on qemuBuildDriveStr But I've a problem: in qemu a child of a quorum is a BlockDriverState, where it's a virStorageSource in libvirt, so a child in qemu contain more information than a backingStore in libvirt(blockinfo, throttle...). I think about several solution for this problem: - I can handle quorum's child differently than backingStore and create a "virDomainDiskDefPtr childs" field in virDomainDiskDef or virStorageSource. - I can change the virStorageSourcePtr backingStore, to virDomainDiskDefPtr backingStore, and move the field to backingStore to virDomainDiskDef. -I can move all the field need by a quorum's child from virStorageSource to virDomainDiskDef. But i don't know which solution is the best for libvirt, how do you think i can handle this problem ? Best regards, Matthias

1 0

[libvirt] [PATCH] tests: fix incorrect caps for shmem-invalid-size, shmem-small-size
by Maxime Leroy 20 Oct '14

20 Oct '14

VIR_TEST_DEBUG=2 ./qemuxml2argvtest generates the following output: 409) QEMU XML-2-ARGV shmem-invalid-size ... Got expected error: unsupported configuration: ivshmem device is not \ supported with this QEMU binary OK 410) QEMU XML-2-ARGV shmem-small-size ... Got expected error: unsupported configuration: ivshmem device is not \ supported with this QEMU binary OK We should have: 409) QEMU XML-2-ARGV shmem-invalid-size ... Got expected error: XML error: shmem size must be a power of two OK 410) QEMU XML-2-ARGV shmem-small-size ... Got expected error: XML error: shmem size must be at least 1 MiB OK This commit fixes the issue by providing QEMU_CAPS_DEVICE_IVSHMEM caps for shmem-invalid-size, shmem-small-size test. Signed-off-by: Maxime Leroy <maxime.leroy(a)6wind.com> --- tests/qemuxml2argvtest.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index c13aa99..0e9fab9 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1469,8 +1469,10 @@ mymain(void) DO_TEST("shmem", QEMU_CAPS_PCIDEVICE, QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_IVSHMEM); DO_TEST_FAILURE("shmem", NONE); - DO_TEST_FAILURE("shmem-invalid-size", NONE); - DO_TEST_FAILURE("shmem-small-size", NONE); + DO_TEST_FAILURE("shmem-invalid-size", QEMU_CAPS_PCIDEVICE, + QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_IVSHMEM); + DO_TEST_FAILURE("shmem-small-size", QEMU_CAPS_PCIDEVICE, + QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_IVSHMEM); DO_TEST_PARSE_ERROR("shmem-msi-only", NONE); virObjectUnref(driver.config); -- 1.9.3

2 1

[libvirt] [PATCH] conf: tests: fix virDomainNetDefFormat for vhost-user in client mode
by Maxime Leroy 20 Oct '14

20 Oct '14

The mode attribute is required for the source element of vhost-user. Thus virDomainNetDefFormat should always generate a xml with it, and not only when the mode is server. The commit fixes the issue. And it adds a vhostuser interface in 'client' mode to qemuxml2argv-net-vhostuser.(args|xml) to test this usecase. Signed-off-by: Maxime Leroy <maxime.leroy(a)6wind.com> --- src/conf/domain_conf.c | 5 +++-- tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args | 7 +++++-- tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.xml | 7 ++++++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 42c0223..73c199e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -17082,8 +17082,9 @@ virDomainNetDefFormat(virBufferPtr buf, virBufferAddLit(buf, "<source type='unix'"); virBufferEscapeString(buf, " path='%s'", def->data.vhostuser->data.nix.path); - if (def->data.vhostuser->data.nix.listen) - virBufferAddLit(buf, " mode='server'"); + virBufferAsprintf(buf, " mode='%s'", + def->data.vhostuser->data.nix.listen ? + "server" : "client"); virBufferAddLit(buf, "/>\n"); } break; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args index cc66ec3..26daac3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args @@ -2,6 +2,9 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ /usr/bin/qemu -S -M \ pc -m 214 -smp 1 -nographic -nodefaults -monitor unix:/tmp/test-monitor,server,nowait \ -no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 \ --chardev socket,id=charnet0,path=/tmp/vhost.sock,server \ +-chardev socket,id=charnet0,path=/tmp/vhost0.sock,server \ -netdev type=vhost-user,id=hostnet0,chardev=charnet0 \ --device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:ee:96:6b,bus=pci.0,addr=0x3 +-device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:ee:96:6b,bus=pci.0,addr=0x3 \ +-chardev socket,id=charnet1,path=/tmp/vhost1.sock \ +-netdev type=vhost-user,id=hostnet1,chardev=charnet1 \ +-device virtio-net-pci,netdev=hostnet1,id=net1,mac=52:54:00:ee:96:6c,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.xml index b49d48e..e5b6242 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.xml @@ -25,7 +25,12 @@ <controller type='pci' index='0' model='pci-root'/> <interface type='vhostuser'> <mac address='52:54:00:ee:96:6b'/> - <source type='unix' path='/tmp/vhost.sock' mode='server'/> + <source type='unix' path='/tmp/vhost0.sock' mode='server'/> + <model type='virtio'/> + </interface> + <interface type='vhostuser'> + <mac address='52:54:00:ee:96:6c'/> + <source type='unix' path='/tmp/vhost1.sock' mode='client'/> <model type='virtio'/> </interface> <memballoon model='none'/> -- 1.9.3

2 1

[libvirt] [PATCH] docs: apps: Update references to virt-p2v and virt-v2v.
by Richard W.M. Jones 20 Oct '14

20 Oct '14

These tools have been rewritten upstream, so you don't need to link to the old tools, link to the new ones and mention they are part of libguestfs. Also remove the link to "Poor man's P2V". There's no real reason to use that technique any longer since the rewritten tools are simple, fast and highly capable. --- docs/apps.html.in | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/docs/apps.html.in b/docs/apps.html.in index 70e7b41..4403ce6 100644 --- a/docs/apps.html.in +++ b/docs/apps.html.in @@ -163,25 +163,21 @@ <h2><a name="conversion">Conversion</a></h2> <dl> - <dt><a href="https://rwmj.wordpress.com/2009/10/13/poor-mans-p2v/">Poor mans p2v</a></dt> + <dt><a href="http://libguestfs.org/virt-p2v.1.html">virt-p2v</a></dt> <dd> - A simple approach for converting a physical machine to a virtual - machine, using a rescue CD. + Convert a physical machine to run on KVM. It is a LiveCD + which is booted on the machine to be converted. It collects a + little information from the user, then copies the disks over + to a remote machine and defines the XML for a domain to run + the guest. (Note this tool is included with libguestfs) </dd> - <dt><a href="http://et.redhat.com/~rjones/virt-p2v/">virt-p2v</a></dt> + <dt><a href="http://libguestfs.org/virt-v2v.1.html">virt-v2v</a></dt> <dd> - An older tool for converting a physical machine into a virtual - machine. It is a LiveCD which is booted on the machine to be - converted. It collects a little information from the user, then - copies the disks over to a remote machine and defines the XML for a - domain to run the guest. - </dd> - <dt><a href="http://git.fedorahosted.org/git/?p=virt-v2v.git;a=summary">virt-v2v</a></dt> - <dd> - virt-v2v converts guests from a foreign hypervisor to run on KVM, - managed by libvirt. It can currently convert Red Hat Enterprise - Linux (RHEL) and Fedora guests running on Xen and VMware ESX. It + virt-v2v converts guests from a foreign hypervisor to run on + KVM, managed by libvirt. It can convert guests from VMware or + Xen to run on OpenStack, oVirt (RHEV-M), or local libvirt. It will enable VirtIO drivers in the converted guest if possible. + (Note this tool is included with libguestfs) </dd> <dd> For RHEL customers of Red Hat, conversion of Windows guests is also -- 2.0.4

2 1

[libvirt] [PATCH v3 repost] esx: Add the actual product version to the error
by Richard W.M. Jones 19 Oct '14

19 Oct '14

No change, just a repost of this trivial patch which is sitting in my queue. Previous post: http://www.redhat.com/archives/libvir-list/2014-September/msg00417.html

2 3

[libvirt] [PATCH] esx: Simplify VI (vSphere) API and VMware product version handling
by Matthias Bolte 19 Oct '14

19 Oct '14

Store version numbers in this format version = 1000000 * major + 1000 * minor + micro produces by virParseVersionString instead of dedicated enums. Split the complex esxVI_ProductVersion enum into a simpler sxVI_ProductLine enum and a product version number. Relax API and product version number check to accept anything that is equal or greater than the supported minimum version. VMware ESX went through 3 major version and constantly stayed backward compatible. This commit assumes that this will be true for future versions. --- src/esx/esx_driver.c | 59 +++++--------- src/esx/esx_vi.c | 215 ++++++++++++++++++++++++++------------------------- src/esx/esx_vi.h | 55 +++---------- 3 files changed, 140 insertions(+), 189 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 39784b9..4f62774 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -646,9 +646,9 @@ esxConnectToHost(esxPrivate *priv, esxVI_String *propertyNameList = NULL; esxVI_ObjectContent *hostSystem = NULL; esxVI_Boolean inMaintenanceMode = esxVI_Boolean_Undefined; - esxVI_ProductVersion expectedProductVersion = STRCASEEQ(conn->uri->scheme, "esx") - ? esxVI_ProductVersion_ESX - : esxVI_ProductVersion_GSX; + esxVI_ProductLine expectedProductLine = STRCASEEQ(conn->uri->scheme, "esx") + ? esxVI_ProductLine_ESX + : esxVI_ProductLine_GSX; if (!vCenterIpAddress || *vCenterIpAddress) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); @@ -695,25 +695,13 @@ esxConnectToHost(esxPrivate *priv, goto cleanup; } - if (expectedProductVersion == esxVI_ProductVersion_ESX) { - if (priv->host->productVersion != esxVI_ProductVersion_ESX35 && - priv->host->productVersion != esxVI_ProductVersion_ESX40 && - priv->host->productVersion != esxVI_ProductVersion_ESX41 && - priv->host->productVersion != esxVI_ProductVersion_ESX4x && - priv->host->productVersion != esxVI_ProductVersion_ESX50 && - priv->host->productVersion != esxVI_ProductVersion_ESX51 && - priv->host->productVersion != esxVI_ProductVersion_ESX5x) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s is neither an ESX 3.5, 4.x nor 5.x host"), - conn->uri->server); - goto cleanup; - } - } else { /* GSX */ - if (priv->host->productVersion != esxVI_ProductVersion_GSX20) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s isn't a GSX 2.0 host"), conn->uri->server); - goto cleanup; - } + if (priv->host->productLine != expectedProductLine) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Expecting '%s' to be a %s host, but found a %s host"), + conn->uri->server, + esxVI_ProductLineToDisplayName(expectedProductLine), + esxVI_ProductLineToDisplayName(priv->host->productLine)); + goto cleanup; } /* Query the host for maintenance mode and vCenter IP address */ @@ -815,16 +803,12 @@ esxConnectToVCenter(esxPrivate *priv, goto cleanup; } - if (priv->vCenter->productVersion != esxVI_ProductVersion_VPX25 && - priv->vCenter->productVersion != esxVI_ProductVersion_VPX40 && - priv->vCenter->productVersion != esxVI_ProductVersion_VPX41 && - priv->vCenter->productVersion != esxVI_ProductVersion_VPX4x && - priv->vCenter->productVersion != esxVI_ProductVersion_VPX50 && - priv->vCenter->productVersion != esxVI_ProductVersion_VPX51 && - priv->vCenter->productVersion != esxVI_ProductVersion_VPX5x) { + if (priv->vCenter->productLine != esxVI_ProductLine_VPX) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s is neither a vCenter 2.5, 4.x nor 5.x server"), - hostname); + _("Expecting '%s' to be a %s host but found a %s host"), + conn->uri->server, + esxVI_ProductLineToDisplayName(esxVI_ProductLine_VPX), + esxVI_ProductLineToDisplayName(priv->vCenter->productLine)); goto cleanup; } @@ -1217,14 +1201,7 @@ esxConnectGetVersion(virConnectPtr conn, unsigned long *version) { esxPrivate *priv = conn->privateData; - if (virParseVersionString(priv->primary->service->about->version, - version, false) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse version number from '%s'"), - priv->primary->service->about->version); - - return -1; - } + *version = priv->primary->productVersion; return 0; } @@ -2934,7 +2911,7 @@ esxConnectDomainXMLToNative(virConnectPtr conn, const char *nativeFormat, } virtualHW_version = esxVI_ProductVersionToDefaultVirtualHWVersion - (priv->primary->productVersion); + (priv->primary->productLine, priv->primary->productVersion); if (virtualHW_version < 0) { return NULL; @@ -3190,7 +3167,7 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml) /* Build VMX from domain XML */ virtualHW_version = esxVI_ProductVersionToDefaultVirtualHWVersion - (priv->primary->productVersion); + (priv->primary->productLine, priv->primary->productVersion); if (virtualHW_version < 0) { goto cleanup; diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index b00d8e7..7c4af14 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -1040,98 +1040,77 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, return -1; } - if (STREQ(ctx->service->about->apiType, "HostAgent") || - STREQ(ctx->service->about->apiType, "VirtualCenter")) { - if (STRPREFIX(ctx->service->about->apiVersion, "2.5")) { - ctx->apiVersion = esxVI_APIVersion_25; - } else if (STRPREFIX(ctx->service->about->apiVersion, "4.0")) { - ctx->apiVersion = esxVI_APIVersion_40; - } else if (STRPREFIX(ctx->service->about->apiVersion, "4.1")) { - ctx->apiVersion = esxVI_APIVersion_41; - } else if (STRPREFIX(ctx->service->about->apiVersion, "4.")) { - ctx->apiVersion = esxVI_APIVersion_4x; - } else if (STRPREFIX(ctx->service->about->apiVersion, "5.0")) { - ctx->apiVersion = esxVI_APIVersion_50; - } else if (STRPREFIX(ctx->service->about->apiVersion, "5.1")) { - ctx->apiVersion = esxVI_APIVersion_51; - } else if (STRPREFIX(ctx->service->about->apiVersion, "5.")) { - ctx->apiVersion = esxVI_APIVersion_5x; - } else { + if (STRNEQ(ctx->service->about->apiType, "HostAgent") && + STRNEQ(ctx->service->about->apiType, "VirtualCenter")) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Expecting VI API type 'HostAgent' or 'VirtualCenter' " + "but found '%s'"), ctx->service->about->apiType); + return -1; + } + + if (virParseVersionString(ctx->service->about->apiVersion, + &ctx->apiVersion, true) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not parse VI API version '%s'"), + ctx->service->about->apiVersion); + return -1; + } + + if (ctx->apiVersion < 1000000 * 2 + 1000 * 5 /* 2.5 */) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Minimum supported %s version is %s but found version '%s'"), + "VI API", "2.5", ctx->service->about->apiVersion); + return -1; + } + + if (virParseVersionString(ctx->service->about->version, + &ctx->productVersion, true) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not parse product version '%s'"), + ctx->service->about->version); + return -1; + } + + if (STREQ(ctx->service->about->productLineId, "gsx")) { + if (ctx->productVersion < 1000000 * 2 + 1000 * 0 /* 2.0 */) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting VI API major/minor version '2.5', '4.x' or " - "'5.x' but found '%s'"), ctx->service->about->apiVersion); + _("Minimum supported %s version is %s but found version '%s'"), + esxVI_ProductLineToDisplayName(esxVI_ProductLine_GSX), + "2.0", ctx->service->about->version); return -1; } - if (STREQ(ctx->service->about->productLineId, "gsx")) { - if (STRPREFIX(ctx->service->about->version, "2.0")) { - ctx->productVersion = esxVI_ProductVersion_GSX20; - } else { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting GSX major/minor version '2.0' but " - "found '%s'"), ctx->service->about->version); - return -1; - } - } else if (STREQ(ctx->service->about->productLineId, "esx") || - STREQ(ctx->service->about->productLineId, "embeddedEsx")) { - if (STRPREFIX(ctx->service->about->version, "3.5")) { - ctx->productVersion = esxVI_ProductVersion_ESX35; - } else if (STRPREFIX(ctx->service->about->version, "4.0")) { - ctx->productVersion = esxVI_ProductVersion_ESX40; - } else if (STRPREFIX(ctx->service->about->version, "4.1")) { - ctx->productVersion = esxVI_ProductVersion_ESX41; - } else if (STRPREFIX(ctx->service->about->version, "4.")) { - ctx->productVersion = esxVI_ProductVersion_ESX4x; - } else if (STRPREFIX(ctx->service->about->version, "5.0")) { - ctx->productVersion = esxVI_ProductVersion_ESX50; - } else if (STRPREFIX(ctx->service->about->version, "5.1")) { - ctx->productVersion = esxVI_ProductVersion_ESX51; - } else if (STRPREFIX(ctx->service->about->version, "5.")) { - ctx->productVersion = esxVI_ProductVersion_ESX5x; - } else { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting ESX major/minor version '3.5', " - "'4.x' or '5.x' but found '%s'"), - ctx->service->about->version); - return -1; - } - } else if (STREQ(ctx->service->about->productLineId, "vpx")) { - if (STRPREFIX(ctx->service->about->version, "2.5")) { - ctx->productVersion = esxVI_ProductVersion_VPX25; - } else if (STRPREFIX(ctx->service->about->version, "4.0")) { - ctx->productVersion = esxVI_ProductVersion_VPX40; - } else if (STRPREFIX(ctx->service->about->version, "4.1")) { - ctx->productVersion = esxVI_ProductVersion_VPX41; - } else if (STRPREFIX(ctx->service->about->version, "4.")) { - ctx->productVersion = esxVI_ProductVersion_VPX4x; - } else if (STRPREFIX(ctx->service->about->version, "5.0")) { - ctx->productVersion = esxVI_ProductVersion_VPX50; - } else if (STRPREFIX(ctx->service->about->version, "5.1")) { - ctx->productVersion = esxVI_ProductVersion_VPX51; - } else if (STRPREFIX(ctx->service->about->version, "5.")) { - ctx->productVersion = esxVI_ProductVersion_VPX5x; - } else { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting VPX major/minor version '2.5', '4.x' " - "or '5.x' but found '%s'"), - ctx->service->about->version); - return -1; - } - } else { + ctx->productLine = esxVI_ProductLine_GSX; + } else if (STREQ(ctx->service->about->productLineId, "esx") || + STREQ(ctx->service->about->productLineId, "embeddedEsx")) { + if (ctx->productVersion < 1000000 * 3 + 1000 * 5 /* 3.5 */) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Minimum supported %s version is %s but found version '%s'"), + esxVI_ProductLineToDisplayName(esxVI_ProductLine_ESX), + "3.5", ctx->service->about->version); + return -1; + } + + ctx->productLine = esxVI_ProductLine_ESX; + } else if (STREQ(ctx->service->about->productLineId, "vpx")) { + if (ctx->productVersion < 1000000 * 2 + 1000 * 5 /* 2.5 */) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting product 'gsx' or 'esx' or 'embeddedEsx' " - "or 'vpx' but found '%s'"), - ctx->service->about->productLineId); + _("Minimum supported %s version is %s but found version '%s'"), + esxVI_ProductLineToDisplayName(esxVI_ProductLine_VPX), + "2.5", ctx->service->about->version); return -1; } + + ctx->productLine = esxVI_ProductLine_VPX; } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting VI API type 'HostAgent' or 'VirtualCenter' " - "but found '%s'"), ctx->service->about->apiType); + _("Expecting product 'gsx' or 'esx' or 'embeddedEsx' " + "or 'vpx' but found '%s'"), + ctx->service->about->productLineId); return -1; } - if (ctx->productVersion & esxVI_ProductVersion_ESX) { + if (ctx->productLine == esxVI_ProductLine_ESX) { /* * FIXME: Actually this should be detected by really calling * QueryVirtualDiskUuid and checking if a NotImplemented fault is @@ -1142,7 +1121,7 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, ctx->hasQueryVirtualDiskUuid = true; } - if (ctx->productVersion & esxVI_ProductVersion_VPX) { + if (ctx->productLine == esxVI_ProductLine_VPX) { ctx->hasSessionIsActive = true; } @@ -4770,9 +4749,33 @@ esxVI_ParseHostCpuIdInfo(esxVI_ParsedHostCpuIdInfo *parsedHostCpuIdInfo, +const char * +esxVI_ProductLineToDisplayName(esxVI_ProductLine productLine) +{ + switch (productLine) { + case esxVI_ProductLine_GSX: + return "GSX"; + + case esxVI_ProductLine_ESX: + return "ESX(i)"; + + case esxVI_ProductLine_VPX: + return "vCenter/VPX"; + + default: + return "<unknown>"; + } +} + + + int -esxVI_ProductVersionToDefaultVirtualHWVersion(esxVI_ProductVersion productVersion) +esxVI_ProductVersionToDefaultVirtualHWVersion(esxVI_ProductLine productLine, + unsigned long productVersion) { + /* product version == 1000000 * major + 1000 * minor + micro */ + int major = productVersion / 1000000; + /* * virtualHW.version compatibility matrix: * @@ -4785,35 +4788,39 @@ esxVI_ProductVersionToDefaultVirtualHWVersion(esxVI_ProductVersion productVersio * ESX 5.5 + + + + + 5.5 * GSX 2.0 + + 2.5 */ - switch (productVersion) { - case esxVI_ProductVersion_ESX35: - case esxVI_ProductVersion_VPX25: - return 4; - - case esxVI_ProductVersion_GSX20: - case esxVI_ProductVersion_ESX40: - case esxVI_ProductVersion_ESX41: - case esxVI_ProductVersion_VPX40: - case esxVI_ProductVersion_VPX41: + switch (productLine) { + case esxVI_ProductLine_GSX: return 7; - case esxVI_ProductVersion_ESX4x: - case esxVI_ProductVersion_VPX4x: - return 7; + case esxVI_ProductLine_ESX: + switch (major) { + case 3: + return 4; - case esxVI_ProductVersion_ESX50: - case esxVI_ProductVersion_VPX50: - return 8; + case 4: + return 7; - case esxVI_ProductVersion_ESX51: - case esxVI_ProductVersion_ESX5x: - case esxVI_ProductVersion_VPX51: - case esxVI_ProductVersion_VPX5x: - return 8; + case 5: + default: + return 8; + } + + case esxVI_ProductLine_VPX: + switch (major) { + case 2: + return 4; + + case 4: + return 7; + + case 5: + default: + return 8; + } default: virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unexpected product version")); + _("Unexpected product line")); return -1; } } diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index dac36cd..b7f0160 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -75,8 +75,7 @@ -typedef enum _esxVI_APIVersion esxVI_APIVersion; -typedef enum _esxVI_ProductVersion esxVI_ProductVersion; +typedef enum _esxVI_ProductLine esxVI_ProductLine; typedef enum _esxVI_Occurrence esxVI_Occurrence; typedef struct _esxVI_ParsedHostCpuIdInfo esxVI_ParsedHostCpuIdInfo; typedef struct _esxVI_CURL esxVI_CURL; @@ -90,45 +89,10 @@ typedef struct _esxVI_List esxVI_List; -enum _esxVI_APIVersion { - esxVI_APIVersion_Undefined = 0, - esxVI_APIVersion_Unknown, - esxVI_APIVersion_25, - esxVI_APIVersion_40, - esxVI_APIVersion_41, - esxVI_APIVersion_4x, /* > 4.1 */ - esxVI_APIVersion_50, - esxVI_APIVersion_51, - esxVI_APIVersion_5x /* > 5.1 */ -}; - -/* - * AAAABBBB: where AAAA0000 is the product and BBBB the version. this format - * allows simple bitmask testing for a product independent of the version - */ -enum _esxVI_ProductVersion { - esxVI_ProductVersion_Undefined = 0, - - esxVI_ProductVersion_GSX = (1 << 0) << 16, - esxVI_ProductVersion_GSX20 = esxVI_ProductVersion_GSX | 1, - - esxVI_ProductVersion_ESX = (1 << 1) << 16, - esxVI_ProductVersion_ESX35 = esxVI_ProductVersion_ESX | 1, - esxVI_ProductVersion_ESX40 = esxVI_ProductVersion_ESX | 2, - esxVI_ProductVersion_ESX41 = esxVI_ProductVersion_ESX | 3, - esxVI_ProductVersion_ESX4x = esxVI_ProductVersion_ESX | 4, /* > 4.1 */ - esxVI_ProductVersion_ESX50 = esxVI_ProductVersion_ESX | 5, - esxVI_ProductVersion_ESX51 = esxVI_ProductVersion_ESX | 6, - esxVI_ProductVersion_ESX5x = esxVI_ProductVersion_ESX | 7, /* > 5.1 */ - - esxVI_ProductVersion_VPX = (1 << 2) << 16, - esxVI_ProductVersion_VPX25 = esxVI_ProductVersion_VPX | 1, - esxVI_ProductVersion_VPX40 = esxVI_ProductVersion_VPX | 2, - esxVI_ProductVersion_VPX41 = esxVI_ProductVersion_VPX | 3, - esxVI_ProductVersion_VPX4x = esxVI_ProductVersion_VPX | 4, /* > 4.1 */ - esxVI_ProductVersion_VPX50 = esxVI_ProductVersion_VPX | 5, - esxVI_ProductVersion_VPX51 = esxVI_ProductVersion_VPX | 6, - esxVI_ProductVersion_VPX5x = esxVI_ProductVersion_VPX | 7 /* > 5.1 */ +enum _esxVI_ProductLine { + esxVI_ProductLine_GSX = 0, + esxVI_ProductLine_ESX, + esxVI_ProductLine_VPX }; enum _esxVI_Occurrence { @@ -226,8 +190,9 @@ struct _esxVI_Context { char *username; char *password; esxVI_ServiceContent *service; - esxVI_APIVersion apiVersion; - esxVI_ProductVersion productVersion; + unsigned long apiVersion; /* = 1000000 * major + 1000 * minor + micro */ + esxVI_ProductLine productLine; + unsigned long productVersion; /* = 1000000 * major + 1000 * minor + micro */ esxVI_UserSession *session; /* ... except the session ... */ virMutexPtr sessionLock; /* ... that is protected by this mutex */ esxVI_Datacenter *datacenter; @@ -536,8 +501,10 @@ int esxVI_WaitForTaskCompletion(esxVI_Context *ctx, int esxVI_ParseHostCpuIdInfo(esxVI_ParsedHostCpuIdInfo *parsedHostCpuIdInfo, esxVI_HostCpuIdInfo *hostCpuIdInfo); +const char *esxVI_ProductLineToDisplayName(esxVI_ProductLine productLine); + int esxVI_ProductVersionToDefaultVirtualHWVersion - (esxVI_ProductVersion productVersion); + (esxVI_ProductLine productLine, unsigned long productVersion); int esxVI_LookupHostInternetScsiHbaStaticTargetByName (esxVI_Context *ctx, const char *name, -- 1.8.3.2

1 1

[libvirt] ANNOUNCE: libguestfs 1.28 released
by Richard W.M. Jones 18 Oct '14

18 Oct '14

I'm pleased to announce libguestfs 1.28, a library and set of tools for accessing and modifying virtual machine disk images. This release took 7 months of work by a considerable number of people, and has many new features (see release notes below), including new 'virt-v2v' and 'virt-p2v' tools for importing guests from foreign hypervisors to KVM, and 'virt-log' which is a tool for extracting log files from guests (including Windows). You can get libguestfs 1.28 here: Main website: http://libguestfs.org/ Source: http://libguestfs.org/download/1.28-stable/ You will also need latest supermin from here: http://libguestfs.org/download/supermin/ Fedora 21: http://koji.fedoraproject.org/koji/packageinfo?packageID=8391 It will appear as an update for F21 in about a week. Debian/experimental coming soon, see: https://packages.debian.org/experimental/libguestfs0 [ From http://libguestfs.org/guestfs-release-notes.1.html ] RELEASE NOTES FOR LIBGUESTFS 1.28 New features Tools virt-v2v(1) and virt-p2v(1) are tools for converting from foreign hypervisors (such as VMware or Xen) or physical machines, to KVM. These tools were previously a separate project. The code for both tools has been integrated into the libguestfs tree. As part of the refactoring, virt-p2v has been rewritten (from Ruby, now C), and virt-v2v now uses several modern features of qemu which make it run many times faster than before. virt-v2v(1) can import from: VMware vCenter, VMware OVA files, local disk files, libvirt, RHEL 5 Xen. It can output to: oVirt or Red Hat Enterprise Virtualization (RHEV-M), OpenStack Glance, libvirt, qemu, local disk files. virt-log(1) is a new tool for listing log files from guests. It supports a variety of guests including Linux traditional, Linux using journal, and Windows event log. virt-builder(1) has a new --machine-readable option to make it simpler to consume virt-builder from other programs. New virt-builder(1) and virt-customize(1) --chmod option. virt-sysprep(1) will now remove: systemd journals, anaconda logs, lightdm logs, debian-installer files, apt logs, exim logs, ConsoleKit logs, firewalld logs, grubby logs, proftpd logs, libvirt/libxml logs, and several other log files. The virt-sysprep user-account operation is now able to remove or keep particular user accounts. (Pino Toscano). New guestmount(1) --fd option, allowing you to run guestmount captive under another process. virt-sparsify(1) has a new --tmp option allowing you to precisely control where temporary files are stored. virt-sparsify(1) can now write to a block device. virt-customize(1) and virt-sysprep(1) now support adding firstboot scripts to Windows guests. virt-cat(1), virt-edit(1), virt-ls(1) now support the -m option, allowing you to override automatic inspection of guests and instead specify where to mount partitions (Pino Toscano). The virt tools now have coloured output: green for OK, red for errors, blue for warnings. Language bindings You can build a Python distribution using make -C python sdist Ruby bindings have switched from Test::Unit to MiniTest. The Java bindings are now compatible with OpenJDK 8 (Pino Toscano). Inspection Oracle Linux is returned as oraclelinux (Nikos Skalkotos). Linux guests which do not have /etc/fstab can now be handled (Pino Toscano). Minix is returned as minix (Pino Toscano). Architectures Aarch64 (64 bit ARM) support has been added. Inspection and the guestfs_file_architecture call can now recognize arm (32 bit) and aarch64 guests. Security CVE-2014-0191 Network usage and entity resolution in XML parsing Libguestfs previously used unsafe libxml2 APIs for parsing libvirt XML. These APIs defaulted to allowing network connections to be made when certain XML documents were presented. Using a malformed XML document it was also possible to exhaust all CPU, memory or file descriptors on the machine. Since the libvirt XML comes from a trusted source (the libvirt daemon) it is not thought that this could have been exploitable. This was fixed in libguestfs ≥ 1.27.9 and the fix was backported to stable versions ≥ 1.26.2, ≥ 1.24.9, ≥ 1.22.10 and ≥ 1.20.13. (Thanks: Dan Berrange, Pino Toscano). Shellshock (bash CVE-2014-6271) This bash bug indirectly affects libguestfs. For more information see: https://www.redhat.com/archives/libguestfs/2014-September/msg00252.html API New APIs guestfs_clear_backend_setting guestfs_get_backend_setting guestfs_set_backend_setting Use these APIs to set individual backend settings. guestfs_cpio_out Convert a directory within the disk image to cpio format. guestfs_journal_get_realtime_usec Fetch precise journal times, see sd_journal_get_realtime_usec(3). guestfs_lstatns guestfs_lstatnslist guestfs_statns Enhanced versions of guestfs_lstat, guestfs_lstatlist, guestfs_stat which return nanosecond timestamps. Build changes Libguestfs can now be built with qemu 2.x. Add support for packaging the appliance on Mageia (Joseph Wang, Thierry Vignaud). Augeas is now a required dependency. Flex and bison are now required dependencies. Internals User-Mode Linux (UML) is no longer a supported backend (although still available). It will be supported again once someone steps in and fixes various regressions and brokenness in the UML (Linux) kernel. You can now connect gdb to qemu by specifying LIBGUESTFS_BACKEND_SETTINGS=gdb Serial BIOS (sgabios) is now used by the libvirt backend (on x86 only) so that we see early BIOS messages. For the OCaml virt tools, exceptions are now handled and printed by a common function. A GCC warning about large stack frames is now enabled by default. Several places that used large arrays and structures on the stack have been fixed. There is now a test for booting the appliance repeatedly. Useful for finding kernel leaks. See: tests/qemu/qemu-boot.c There is a test for testing the speed of various qemu features such as virtio-serial uploads and block device writes. See: tests/qemu/qemu-speed-test.c GCC warnings are now enabled for OCaml-C bindings in the OCaml virt tools. The code for editing files used by virt-edit(1), guestfish(1) edit command, virt-customize(1) --edit option and more is now shared between all these utilities (thanks Pino Toscano). The FUSE tests were rewritten in C to ensure finer control over how system calls are tested. The update-bugs.sh script has been fixed so it should no longer create an empty BUGS file if the Bugzilla server is unavailable. The virt-resize(1) tests now use a stochastic method to ensure much deeper and broader testing. When the network is enabled, the appliance now uses DHCP to acquire an IP address. If libvirt is being used then the appliance will connect to virbr0 (can be overridden by setting LIBGUESTFS_BACKEND_SETTINGS=network_bridge=<some_bridge>). This enables full-featured network connections, with working ICMP, ping and so on. Bugs fixed https://bugzilla.redhat.com/1153515 empty (but set) LIBGUESTFS_BACKEND prints libguestfs: error: invalid backend: https://bugzilla.redhat.com/1151766 libguestfs-bash-completion package contains file /usr/share/bash-completion/completions/virt-log, but no _virt_log() function in that file https://bugzilla.redhat.com/1151738 typo error in man page of virt-edit https://bugzilla.redhat.com/1151033 virt-v2v conversions from VMware vCenter server run slowly https://bugzilla.redhat.com/1150880 virt-v2v: warning: display <graphics type='sdl'> was ignored when converting rhel5 guest with sdl graphics https://bugzilla.redhat.com/1150867 'copy-file-to-file /src /dest' create file /dest even if command 'copy-file-to-file /src /dest' failed https://bugzilla.redhat.com/1150815 Can not find "RECURSIVE LONG LISTING" in 'man virt-diff' https://bugzilla.redhat.com/1150701 virt-v2v does not fstrim data disks and non-mounted filesystems https://bugzilla.redhat.com/1150475 Exporting 2+ disk guest to RHEV, only one disk shows after import https://bugzilla.redhat.com/1148355 virt-filesystems: incorrect LVM vg name when listing Fedora 21 Alpha Atomic image filesystems https://bugzilla.redhat.com/1148072 Option missing --no-selinux-relabel https://bugzilla.redhat.com/1148012 RFE: Allow qemu-bridge-helper to be used to implement guestfs_set_network https://bugzilla.redhat.com/1146815 virt-v2v prints warning: /files/etc/fstab/8/spec references unknown device "cdrom" https://bugzilla.redhat.com/1146275 regression setting root password with virt-builder/virt-customize https://bugzilla.redhat.com/1146017 virt-v2v -v -x during windows guest conversion will hang at hivex: hivex_open: used block id …… https://bugzilla.redhat.com/1145995 Improve the error info when converting windows guest with unclean file system https://bugzilla.redhat.com/1145916 virt-v2v fails to convert win7 guest https://bugzilla.redhat.com/1144891 RFE: stat calls do not return nanosecond timestamps https://bugzilla.redhat.com/1144766 futimens() is a no-op via guestmount https://bugzilla.redhat.com/1144201 guestfish can not restore terminal's output colour when exit guestfish, if the terminal's background colour is black then it will make a inconvenient https://bugzilla.redhat.com/1143949 virt-customize option '--password-crypto' do not work https://bugzilla.redhat.com/1143887 Warning shows when converting guests to rhev:chown: changing ownership of ‘/tmp/v2v.u48xag/*.ovf’: Invalid argument https://bugzilla.redhat.com/1143883 warning shows when converting rhel7 guest:virt-v2v:could not update grub2 console: aug_get: no matching node (ignored) https://bugzilla.redhat.com/1143866 virt-v2v fails with error: cannot open Packages index using db5 https://bugzilla.redhat.com/1142416 part-get-name give 'libguestfs: error: part_get_name: parted does not support the machine output (-m)' error message when run 'part-get-name /dev/sda 1' https://bugzilla.redhat.com/1142186 virt-sysprep option '--mount-options' don't work well https://bugzilla.redhat.com/1142158 Illegal command 'part-get-name /dev/sda1 1' cause libguestfs appliance crashed https://bugzilla.redhat.com/1142004 virt-v2v prints waring:WARNING:/files/boot/grub/device.map references unknown device "xvda" https://bugzilla.redhat.com/1141723 virt-v2v: error: disk sda has no defined format shows when converting xen hvm guest https://bugzilla.redhat.com/1141680 [RFE] virt-v2 should support convert a domain with using domain's UUID instead of domain name https://bugzilla.redhat.com/1141631 [RFE] virt-v2 should support convert a guest to a dir-pool with using pool's uuid https://bugzilla.redhat.com/1141157 virt-sysprep option '--user-accounts' don't work well https://bugzilla.redhat.com/1141145 virt-v2v fails to convert xen pv guests. https://bugzilla.redhat.com/1141113 virt-v2v fails to convert esx guests https://bugzilla.redhat.com/1140946 qemu-img shows error message for backing file twice https://bugzilla.redhat.com/1140894 No error messages output if append '--format qcow2' after '-a guest.img', guest.img is a raw format image file https://bugzilla.redhat.com/1140547 virt-builder option '--format' don't work well https://bugzilla.redhat.com/1140156 RFE: Export to RHEV data domain https://bugzilla.redhat.com/1140050 No error shows when multiple conflicting options used with virt-v2v https://bugzilla.redhat.com/1139973 Improve the error info when converting xen guest with no passwordless SSH access configured https://bugzilla.redhat.com/1139543 Improve the error info when converting guest with no space left https://bugzilla.redhat.com/1138586 No error shows when converting running guest with virt-v2v https://bugzilla.redhat.com/1138184 virt-v2v will fail when converting guests with initramfs-*kdump.img under /boot https://bugzilla.redhat.com/1138182 xen guest will be kernel panic after converted by virt-v2v https://bugzilla.redhat.com/1130189 Annoying message about permissions of /dev/kvm https://bugzilla.redhat.com/1123007 libguestfs 'direct' backend should close file descriptors before exec-ing qemu to avoid leaking !O_CLOEXEC fds https://bugzilla.redhat.com/1122557 virt-sparsify overwrites block devices if used as output files https://bugzilla.redhat.com/1113156 Empty fstab breaks libguestfs inspection https://bugzilla.redhat.com/1111662 Guestfs.Error("vgchange_uuid_all: Volume group has active logical volumes") https://bugzilla.redhat.com/1109174 virt-win-reg manual page is corrupted https://bugzilla.redhat.com/1106548 root gets an error accessing to a non-root dir on a snapshot guestmount VMDK img https://bugzilla.redhat.com/1103877 These APIs also need to add to `guestfish -h` command list https://bugzilla.redhat.com/1102448 mageia package list is incorrect https://bugzilla.redhat.com/1102447 libguestfs 1.27.13 does not build due to libxml library order https://bugzilla.redhat.com/1100498 RFE: non-polling mechanism to detect guestmount --no-fork readiness https://bugzilla.redhat.com/1099490 scrub-file can't handle link file https://bugzilla.redhat.com/1099284 typo errors in man pages https://bugzilla.redhat.com/1098718 RFE: virt-builder aliases https://bugzilla.redhat.com/1096465 virt-builder "proxy=off" setting doesn't turn off the proxy for downloads https://bugzilla.redhat.com/1094746 virt-sparsify man failes to mention what happens to snapshots within a qcow2 image (they are discarded) https://bugzilla.redhat.com/1092753 virt-builder: If several repos contain the same os-version images, then they are duplicated in -l output https://bugzilla.redhat.com/1091803 tar-in-opts execute failed that cause libguestfs appliance crashed https://bugzilla.redhat.com/1088424 virt-resize: libguestfs error: part_set_name: parted: /dev/sdb: Error during translation: Invalid or incomplete multibyte or wide character https://bugzilla.redhat.com/1088262 virt-builder cannot write to a block device https://bugzilla.redhat.com/1085029 Ruby tests fail with latest Ruby https://bugzilla.redhat.com/1079210 virt-sparsify --in-place cannot sparsify as much as it should https://bugzilla.redhat.com/1079182 virt-df cannot report used disk space of windows guest when updated to 6.5 https://bugzilla.redhat.com/1077817 virt-builder error: "syntax error at line 3: syntax error" https://bugzilla.redhat.com/1056290 virt-sparsify overwrites block devices if used as output files https://bugzilla.redhat.com/812970 virt-rescue cannot set ≥<rescue> prompt, on Ubuntu 12.04 -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into KVM guests. http://libguestfs.org/virt-v2v

1 0

[libvirt] [PATCH] tests: Adding SELINUX_LIBS to fix viridentitytest linker bug.
by Julio Faracco 18 Oct '14

18 Oct '14

Recently, I tryed to recompile libvirt in a clean build system, but the process failed when it tryed to compile the test v:iridentitytest. See the error below: [...] CC viridentitytest.o CCLD viridentitytest /usr/bin/ld: viridentitytest.o: undefined reference to symbol 'security_disable' //lib/x86_64-linux-gnu/libselinux.so.1: error adding symbols: DSO missing from command line collect2: error: ld returned 1 exit status make: *** [viridentitytest] Error 1 So, adding the variable SELINUX_LIBS in viridentitytest rules solved the issue. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- tests/Makefile.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 4c3d4ef..363c902 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -926,11 +926,13 @@ virstoragetest_LDADD = $(LDADDS) \ viridentitytest_SOURCES = \ viridentitytest.c testutils.h testutils.c -viridentitytest_LDADD = $(LDADDS) if WITH_SELINUX +viridentitytest_LDADD = $(LDADDS) $(SELINUX_LIBS) viridentitytest_DEPENDENCIES = libsecurityselinuxhelper.la \ ../src/libvirt.la -endif WITH_SELINUX +else ! WITH_SELINUX +viridentitytest_LDADD = $(LDADDS) +endif ! WITH_SELINUX viriscsitest_SOURCES = \ viriscsitest.c testutils.h testutils.c -- 1.9.1

1 0

[libvirt] [PATCHv2 0/4] Another attempt at improving virsh autocompletion
by Solly Ross 18 Oct '14

18 Oct '14

Version 2: Electric Boogaloo Version 1: https://www.redhat.com/archives/libvir-list/2014-March/msg01898.html This version of the patch introduces the following new things: - Tests (a whole bunch of them, in fact)! - A new `complete` command to run get newline-separated completion results from the command line - Support for completing partial quotes (e.g. `virsh complete "fake-command ab \"i "`) - Passing the syntax checks (sorry about that) A brief overview of the patch set follows: 1. Extract parsing logic from the vshCommandParse so that it can be used elsewhere. The new method returns states and sets passed in pointers. Calling methods can interpret these states and deal with them as needed (completion ignores many, while vshCommandParse throws errors). 2. Implement (and test!) an improved completion engine with support for virsh quoting rules, flags, positional arguments, no duplication, and more. 3. Add (and test!) a method for retrieve a global vshControl object should readline be enabled. This allows for "smart completion" of options like "domain". 4. Extract the domain listing code from virsh-domain-monitor, and move it to virsh-completer. Implement a domain completer, which is then used for all the cases of "domain" options (note that it current does not have any flags specified for which commands should list active vs inactive domains, as this commit is mainly to allow people to test out "smart completion") Solly Ross (4): Improve virsh autocompletion (extract parser) Improve virsh autocompletion (base framework) Improve virsh autocompletion (global ctl object) Improve virsh autocompletion (domain completer) po/POTFILES.in | 1 + tests/virshtest.c | 268 +++++++++++++ tools/Makefile.am | 3 +- tools/virsh-completer.c | 355 +++++++++++++++++ tools/virsh-completer.h | 85 +++++ tools/virsh-domain-monitor.c | 287 +------------- tools/virsh-domain.c | 72 ++++ tools/virsh-snapshot.c | 11 + tools/virsh.c | 880 +++++++++++++++++++++++++++++++++++++------ tools/virsh.h | 20 + 10 files changed, 1582 insertions(+), 400 deletions(-) create mode 100644 tools/virsh-completer.c create mode 100644 tools/virsh-completer.h -- 1.8.3.2

2 6

[libvirt] [PATCH 0/4] Enable spapr-pci-vfio-host-bridge controllers for VFIO passthrough support
by Shivaprasad G Bhat 18 Oct '14

18 Oct '14

The following series of patches enable spapr-pci-vfio-host-bridge controllers on PPC64-pseries machine which is required for supporting host device passthrough using VFIO. There were some initial enablement work on the same at http://www.redhat.com/archives/libvir-list/2013-September/msg00838.html. The testing revealed contrasting observations and the current patch series solve the same. Unlike other architectures, on pseries(ppc64) the vfio host devices(will refer as hostdevs here on) cannot be assigned to the default emulated pci-host- bus controller(like the default pci.0). On pseries, the hostdevs goto spapr-pci-vfio-host-bridge. The hostdevs belonging to the same iommu group share the same spapr-pci-vfio-host-bridge. Henceforth, new spapr-pci-host-bridge needs to be added for every hostdev belonging to any new iommu group. The hostdevs appear in new pci domain inside the guest. The spapr-pci-vfio-host-bridge is a generic bridge and it can host both pci and pci-e host devices. The model pci-root is chosen for this controller just for convenience. The patch series take care to add the new controller. Each new controller creates up a new pci domain in the guest. Every hostdev get their pci address in the relavent domain. Tha patch series take care of device addressing in passthrough hostdevs, SR-IOV interfaces and network interface from SRIOV virtual function pools. --- Shivaprasad G Bhat (4): qemu: Add SPAPR_VFIO_HOST_BRIDGE capability for PPC platform qemu: parse and add spapr-vfio-pci controller into domain qemu: assign addresses for spapr vfio hostdevices and generate cli qemu: add test case for spapr-pci-vfio-host-bridge docs/schemas/domaincommon.rng | 28 ++ src/bhyve/bhyve_domain.c | 2 src/conf/domain_addr.c | 8 - src/conf/domain_addr.h | 1 src/conf/domain_conf.c | 149 ++++++++++- src/conf/domain_conf.h | 19 + src/libvirt_private.syms | 2 src/qemu/qemu_capabilities.c | 2 src/qemu/qemu_capabilities.h | 1 src/qemu/qemu_command.c | 279 +++++++++++++++++++- src/qemu/qemu_command.h | 17 + src/qemu/qemu_domain.c | 12 - src/qemu/qemu_driver.c | 6 tests/qemuhotplugtest.c | 2 .../qemuxml2argv-hostdev-spapr-vfio.args | 16 + .../qemuxml2argv-hostdev-spapr-vfio.xml | 76 +++++ tests/qemuxml2argvtest.c | 8 + 17 files changed, 591 insertions(+), 37 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-spapr-vfio.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-spapr-vfio.xml -- Signature

1 4

[libvirt] Tunneled migration failures
by Gary Hook 17 Oct '14

17 Oct '14

So here¹s the thing: I have an environment running without tunneling. I can move a modestly sized (3.2GB disk space, 2GB RAM) VM back and forth between two systems all day long, using peer-peer migration, with these flags set: VIR_MIGRATE_UNDEFINE_SOURCE VIR_MIGRATE_PEER2PEER VIR_MIGRATE_PERSIST_DEST VIR_MIGRATE_NON_SHARED_INC By invoking libvirt_domain_migrate_to_uri2() in libvirt-php via apache. We are not using shared storage, but as stated, the function invocations and XML appear to be correct insofar as non-tunneled migrations are successful. As soon as I enable tunneling by adding the VIR_MIGRATE_TUNNELLED to the above options, the migration fails with this debug message: qemuMigrationUpdateJobStatus:1788 : operation failed: migration job: unexpectedly failed Not very helpful. This is with no other changes to the invoking code. I have been _trying_ to track down the source of the failure, and in so doing I have increased the arbitrary timeout value in qemu_domain.c from 30 to 100 seconds. The copy of the disk is successful; nabbing a copy and booting it in an alternate VM works just fine, so I have every reason to believe that the disk is being migrated properly. That said, what I need is to understand how to trace the monitoring thread over on the destination, to understand where and why it is returning an error to the source host. The debug output is silent on finding and error and sending it back to the source system. I¹ve been instrumenting the calls in src/qemu, but haven¹t located the right code. A pointer to where I should be looking would be helpful. I can provide much more detail from tracing (that I have had to add to the code) on the source side, but the destination side log entries get to virStreamFinish() and then the thread exits while the sender gets an error back. Ostensibly from another thread. The migration gets cancelled for no obvious reason, from no obvious source. Here¹s the kicker: this exact same scenario using a smaller VM (1.5GB disk, 2GB RAM) succeeds. The issue appears to be related to VM size and timeout values? Again, if a developer could provide a pointer to how I might trace the monitoring thread on the destination side, that¹d be great. Thanks in advance. Gary

1 0

[libvirt] [PATCH] fix storage volume creation error messages
by Adam Spiers 17 Oct '14

17 Oct '14

It seems that raising of error messages associated with creation of storage volumes contained copy'n'paste errors due to the code being copied from network creation code. Signed-off-by: Adam Spiers <aspiers(a)suse.com> --- ext/libvirt/storage.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/libvirt/storage.c b/ext/libvirt/storage.c index a01edbc..1703aaf 100644 --- a/ext/libvirt/storage.c +++ b/ext/libvirt/storage.c @@ -498,7 +498,7 @@ static VALUE libvirt_storage_pool_create_volume_xml(int argc, VALUE *argv, vol = virStorageVolCreateXML(pool_get(p), StringValueCStr(xml), ruby_libvirt_value_to_uint(flags)); - ruby_libvirt_raise_error_if(vol == NULL, e_Error, "virNetworkCreateXML", + ruby_libvirt_raise_error_if(vol == NULL, e_Error, "virStorageVolCreateXML", ruby_libvirt_connect_get(p)); return vol_new(vol, ruby_libvirt_conn_attr(p)); @@ -525,7 +525,7 @@ static VALUE libvirt_storage_pool_create_volume_xml_from(int argc, VALUE *argv, vol_get(cloneval), ruby_libvirt_value_to_uint(flags)); ruby_libvirt_raise_error_if(vol == NULL, e_Error, - "virNetworkCreateXMLFrom", + "virStorageVolCreateXMLFrom", ruby_libvirt_connect_get(p)); return vol_new(vol, ruby_libvirt_conn_attr(p)); -- 2.1.2.330.g565301e

3 4

[libvirt] [PATCH] libxl: add missing 'break' from commit 1298daca
by Jim Fehlig 17 Oct '14

17 Oct '14

Add missing 'break's from commit 1298daca, as noted by John Ferlan https://www.redhat.com/archives/libvir-list/2014-October/msg00430.html Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_domain.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index f2cd07b..9c62291 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -522,6 +522,7 @@ libxlDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, else dev->data.video->vram = 8 * 1024; } + break; case VIR_DOMAIN_VIDEO_TYPE_CIRRUS: if (dev->data.video->vram == 0) { if (dm_type == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) @@ -529,6 +530,7 @@ libxlDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, else dev->data.video->vram = 4 * 1024; } + break; } } -- 1.8.4.5

2 2

[libvirt] [PATCH 0/5] libxl: user-specified domain config improvements
by Jim Fehlig 17 Oct '14

17 Oct '14

This is essentially a V2 of Stefan's patch to add support for user-specified video device in the libxl driver. https://www.redhat.com/archives/libvir-list/2014-September/msg01157.html It goes a bit further and adds support for user-specfied <emulator>, which was trivial to add after introducing libxlDomainGetEmulatorType in patch 3. To ease review, the series has been split up as follows: - Missed keymap config from commit 4dfc34c3 split out to patch 1 - Patch 2 added to defer setting default vram value to the Xen drivers - Patch 3 added to detect old qemu-dm vs qemu with xen support - Patch 4 is a slightly reworked version of Stefan's patch - Patch 5 added to support user-specified <emulator> Jim Fehlig (4): libxl: Copy user-specified keymap to libxl build info struct Xen: Defer setting default vram value to Xen drivers libxl: Add function to determine device model type libxl: Support user-specified <emulator> Stefan Bader (1): libxl: Implement basic video device selection src/conf/domain_conf.c | 4 ++ src/libxl/libxl_conf.c | 124 +++++++++++++++++++++++++++++++++++++++++++++++ src/libxl/libxl_conf.h | 3 ++ src/libxl/libxl_domain.c | 22 +++++++++ src/xen/xen_driver.c | 19 ++++++++ 5 files changed, 172 insertions(+) -- 1.8.4.5

3 13

[libvirt] [docs] Couple of wiki pages with examples of live block operations
by Kashyap Chamarthy 16 Oct '14

16 Oct '14

Heya, Here are some examples of live block operations (to begin with, active blockcommit) after some testing and from discussions with Eric Blake on IRC/email: http://wiki.libvirt.org/page/Live-disk-backup-with-active-blockcommit http://wiki.libvirt.org/page/Live-merge-an-entire-disk-image-chain-includin… I linked the above two pages here: http://wiki.libvirt.org/page/Main_Page#Examples_of_live_block_opertaions Will try to add more examples (like blockcopy, etc) and post them for review here. If you have comments/rewording/corrections you can provide here and I can update the wiki or you can just edit the wiki yourself. PS: I wondered breifly whether to post the plain text of the wiki content to the list but decided against it to keep the email brief :-) -- /kashyap

1 0

Re: [libvirt] [GIT PULL] namespace updates for v3.17-rc1
by Adrian Davey 16 Oct '14

16 Oct '14

On 21.08.2014 08:54:57, writes Eric W. Biederman: > Richard Weinberger <richard nod at> writes: > >> Am 21.08.2014 08:29, schrieb Richard Weinberger: >>> Am 21.08.2014 06:53, schrieb Eric W. Biederman: >>>> The bugs fixed are security issues, so if we have to break a small >>>> number of userspace applications we will. Anything that we can >>>> reasonably do to avoid regressions will be done. >>>> >>>> Could you please look at my user-namespace.git#for-next branch I >>>> have a >>>> fix for at least one regresion causing issue in there. I think it >>>> may >>>> fix your issues but I am not fully certain more comments below. >>> >>> I'll run this on my LXC testbed today. >> >> Looks good. With these patches applied libvirt works again. :) > > Darn I read my email in the wrong order. I am glad to hear that my > changes were enough to fix libvirt-lxc. > > I will aim at pushing this to Linus after the conference is over and I > can trust myself to think clearly. > > Eric Apologies for the poor etiquette on posting (normal email client is broken so using a web version). I am trying to track down if my issues with libvirt_lxc are down to me missing the changes in libvirt or the kernel (libvirt 1.2.9, Linux 3.16.3) that are mentioned from this thread. I am looking for either the git changes in both libvirt and linux (currently failing to find either) or if indeed these changes made it upstream? Is anyone able to point me in the right direction please? This is for the issue I have with proc remounting while using <idmap> which I believe is the problem talked about in this thread, but I could well be barking up the wrong tree. virsh # start testvm error: Failed to start domain testvm error: internal error: guest failed to start: Failed to re-mount /proc/sys on /proc/sys flags=1021: Operation not permitted Many thanks, Adrian

1 0

[libvirt] [libvirt-python PATCH] Improve error output when use getTime with a nonzero flags.
by Luyao Huang 16 Oct '14

16 Oct '14

When give a nonzero flags to getTime, c_retval will get -1 and goto cleanup. But py_retval still is NULL,so pass c_retval value to py_retval. This will make the output message more correct. error before use this patch: SystemError: error return without exception set after use the patch: libvirtError: unsupported flags (0x1) in function qemuDomainGetTime Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- libvirt-override.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libvirt-override.c b/libvirt-override.c index 9ba87eb..eed8d50 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -7758,6 +7758,7 @@ libvirt_virDomainGetTime(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { LIBVIRT_END_ALLOW_THREADS; if (c_retval < 0) + py_retval = libvirt_intWrap(c_retval); goto cleanup; if (!(pyobj_seconds = libvirt_longlongWrap(seconds)) || -- 1.8.3.1

1 0

[libvirt] [libvirt-python PATCH 1/1] Change the comment in getPyNodeCPUCount method reflecting correct called methods
by Pradipta Kr. Banerjee 16 Oct '14

16 Oct '14

Comment mentions virGetNodeCPUMap whereas the actual method is virNodeGetCPUMap. Similarly comment mentions virGetNodeInfo whereas the actual method is virNodeGetInfo Signed-off-by: Pradipta Kr. Banerjee <bpradip(a)in.ibm.com> --- libvirt-override.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt-override.c b/libvirt-override.c index 8b3c503..9ba87eb 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -437,10 +437,10 @@ cleanup: /* * Utility function to retrieve the number of node CPUs present. - * It first tries virGetNodeCPUMap, which will return the + * It first tries virNodeGetCPUMap, which will return the * number reliably, if available. * As a fallback and for compatibility with backlevel libvirt - * versions virGetNodeInfo will be called to calculate the + * versions virNodeGetInfo will be called to calculate the * CPU number, which has the potential to return a too small * number if some host CPUs are offline. */ -- 1.9.3

2 1

[libvirt] [PATCH] tools: compatible with old wireshark
by Jincheng Miao 16 Oct '14

16 Oct '14

Old version wireshark doesn't have ws_symbol_export.h, which is added from wireshark-v1.10.0. But some distros, like RHEL6u5, only have wireshark-v1.8, so libvirt should be compatible with these wiresharks. Signed-off-by: Jincheng Miao <jmiao(a)redhat.com> --- configure.ac | 2 +- tools/wireshark/util/make-dissector-reg | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index f7b02ff..c62f934 100644 --- a/configure.ac +++ b/configure.ac @@ -2667,7 +2667,7 @@ if test "$with_wireshark_dissector" != "no"; then LIBVIRT_WS_HANDLE_ERROR([wireshark/config.h is required for wireshark-dissector support]) ]) AC_CHECK_HEADERS([wireshark/epan/packet.h wireshark/epan/dissectors/packet-tcp.h],, [ - LIBVIRT_WS_HANDLE_ERROR([wireshark/epan/{packet,packet-tcp}.h are required for wireshark-dissector support]) + LIBVIRT_WS_HANDLE_ERROR([wireshark/epan/{packet,/dissectors/packet-tcp}.h are required for wireshark-dissector support]) ], [ #include <wireshark/config.h> ]) diff --git a/tools/wireshark/util/make-dissector-reg b/tools/wireshark/util/make-dissector-reg index 6fa25c1..2524f09 100755 --- a/tools/wireshark/util/make-dissector-reg +++ b/tools/wireshark/util/make-dissector-reg @@ -53,7 +53,21 @@ then /* plugins are DLLs */ #define WS_BUILD_DLL -#include "ws_symbol_export.h" + +/* File ws_symbol_export.h is introduced from commit id + * 45c2884 (1.10.0). For compatability with old wireshark, + * which is provided by some distros, like RHEL6u5, + * here define WS_DLL_PUBLIC_NOEXTERN manually. + */ +#if WIRESHARK_VERSION < 1010000 +# if __GNUC__ >= 4 +# define WS_DLL_PUBLIC_NOEXTERN __attribute__ ((visibility("default"))) +# else +# define WS_DLL_PUBLIC_NOEXTERN __attribute__ ((dllexport)) +# endif +#else +# include "ws_symbol_export.h" +#endif /* In 1.12 wireshark WS_DLL_PUBLIC_NOEXTERN was substitued with * WS_DLL_PUBLIC_DEF. See wireshark's commit -- 1.9.3

1 0

[libvirt] [PATCH 0/5] qemu: Fix rest of hot/cold-add/remove device functions to use typecasted switch
by Peter Krempa 15 Oct '14

15 Oct '14

Tweak the rest of the stuff to get notified at compile time when adding a new device type to implement it's backend functions. Peter Krempa (5): qemu: Convert qemuDomainDetachDeviceLive to typecasted enum qemu: Convert qemuDomainUpdateDeviceLive to typecasted enum qemu: Convert qemuDomainAttachDeviceConfig to typecasted enum qemu: Convert qemuDomainDetachDeviceConfig to typecasted enum qemu: Convert qemuDomainUpdateDeviceConfig to typecasted enum src/qemu/qemu_driver.c | 96 ++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 85 insertions(+), 11 deletions(-) -- 2.1.0

2 7

[libvirt] [PATCH] conf: fix an memory leak in virSocketAddrIsNumericLocalhost()
by Chen Fan 15 Oct '14

15 Oct '14

Signed-off-by: Chen Fan <chen.fan.fnst(a)cn.fujitsu.com> --- src/util/virsocketaddr.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index 8c9f05f..5f54e68 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -894,19 +894,24 @@ virSocketAddrIsNumericLocalhost(const char *addr) struct in_addr tmp = { .s_addr = htonl(INADDR_LOOPBACK) }; struct sockaddr_in *inet4; struct sockaddr_in6 *inet6; + bool ret = false; if (virSocketAddrParseInternal(&res, addr, AF_UNSPEC, false) < 0) - return false; + return ret; switch (res->ai_addr->sa_family) { case AF_INET: inet4 = (struct sockaddr_in*) res->ai_addr; - return memcmp(&inet4->sin_addr.s_addr, &tmp.s_addr, - sizeof(inet4->sin_addr.s_addr)) == 0; + ret = memcmp(&inet4->sin_addr.s_addr, &tmp.s_addr, + sizeof(inet4->sin_addr.s_addr)) == 0; + break; case AF_INET6: inet6 = (struct sockaddr_in6*) res->ai_addr; - return IN6_IS_ADDR_LOOPBACK(&(inet6->sin6_addr)); + ret = IN6_IS_ADDR_LOOPBACK(&(inet6->sin6_addr)); + break; } - return false; + + freeaddrinfo(res); + return ret; } -- 1.9.3

2 1

[libvirt] [PATCH v3 0/3] Check migration configuration
by Chen Fan 15 Oct '14

15 Oct '14

add some check in migration configuration. Chen Fan (3): migration: add migration_host support for Ipv6 address without brackets conf: add check if migration_host is a localhost address conf: Check migration_address whether is localhost src/libvirt_private.syms | 3 +- src/qemu/qemu.conf | 2 +- src/qemu/qemu_conf.c | 58 ++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_conf.h | 2 ++ src/qemu/qemu_migration.c | 49 ++++++++++++++++---------------- src/qemu/test_libvirtd_qemu.aug.in | 2 +- src/util/virsocketaddr.c | 43 +++++++++++++++++++++------- src/util/virsocketaddr.h | 4 ++- tests/sockettest.c | 2 +- 9 files changed, 125 insertions(+), 40 deletions(-) -- 1.9.3

4 11

[libvirt] [PATCH 0/9] ABI/JSON/other fixes
by Peter Krempa 15 Oct '14

15 Oct '14

I've split out these patches from my work on supporting memory hotplug in qemu so that the resulting series is not extremely huge. Peter Krempa (9): conf: Improve adding of new address types conf: shmem: Add ABI stability check conf: Add compile time check that devices were checked for ABI stability qemu: hotplug: Use typecasted switch statement when plugging new devices util: json: Split out code to create json value objects util: json: Improve handling and docs for adding JSON objects qemu: monitor: Add functions for object hot-add/remove Implement empty post parse callbacks for all drivers conf: Move definition of virDomainParseMemory src/bhyve/bhyve_domain.c | 10 ++ src/conf/domain_conf.c | 179 +++++++++++++++++++++++-------- src/conf/domain_conf.h | 2 +- src/libvirt_private.syms | 2 + src/parallels/parallels_driver.c | 21 ++++ src/phyp/phyp_driver.c | 29 ++++- src/qemu/qemu_driver.c | 17 ++- src/qemu/qemu_monitor.c | 48 +++++++++ src/qemu/qemu_monitor.h | 8 ++ src/qemu/qemu_monitor_json.c | 217 ++++++++++--------------------------- src/qemu/qemu_monitor_json.h | 8 ++ src/uml/uml_driver.c | 10 ++ src/util/virjson.c | 224 +++++++++++++++++++++++++++++++++++++++ src/util/virjson.h | 5 + src/vbox/vbox_common.c | 19 ++++ src/vmware/vmware_driver.c | 24 ++++- src/vmx/vmx.c | 18 ++++ src/xenapi/xenapi_driver.c | 10 ++ 18 files changed, 645 insertions(+), 206 deletions(-) -- 2.1.0

2 21

[libvirt] [PATCH] libvirt: Document UNDEFINE_NVRAM in UndefineFlags doc
by Cole Robinson 15 Oct '14

15 Oct '14

--- src/libvirt.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/libvirt.c b/src/libvirt.c index caacc2e..dfca4f6 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -8760,6 +8760,10 @@ virDomainUndefine(virDomainPtr domain) * whether this flag is present. On hypervisors where snapshots do * not use libvirt metadata, this flag has no effect. * + * If the domain has any nvram specified, then including + * VIR_DOMAIN_UNDEFINE_NVRAM will also remove that file, and omitting the flag + * will cause the undefine process to fail. + * * Returns 0 in case of success, -1 in case of error */ int -- 2.1.0

2 2

[libvirt] [PATCH] Cleanup maintainers list
by Jiri Denemark 15 Oct '14

15 Oct '14

These Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- AUTHORS.in | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/AUTHORS.in b/AUTHORS.in index 0e0e613..3c783f7 100644 --- a/AUTHORS.in +++ b/AUTHORS.in @@ -8,32 +8,25 @@ Daniel Veillard <veillard(a)redhat.com> or <daniel(a)veillard.com> The primary maintainers and people with commit access rights: Alex Jia <ajia(a)redhat.com> -Anthony Liguori <aliguori(a)us.ibm.com> Cédric Bosdonnat <cbosdonnat(a)suse.com> -Chris Lalancette <clalance(a)redhat.com> Christophe Fergeau <cfergeau(a)redhat.com> Claudio Bley <cbley(a)av-test.de> Cole Robinson <crobinso(a)redhat.com> Daniel Berrange <berrange(a)redhat.com> Daniel Veillard <veillard(a)redhat.com> -Dave Allan <dallan(a)redhat.com> Doug Goldstein <cardoe(a)gentoo.org> Eric Blake <eblake(a)redhat.com> Gao Feng <gaofeng(a)cn.fujitsu.com> -Guannan Ren <gren(a)redhat.com> Guido Günther <agx(a)sigxcpu.org> Ján Tomko <jtomko(a)redhat.com> Jim Fehlig <jfehlig(a)suse.com> -Jim Meyering <meyering(a)redhat.com> Jiří Denemark <jdenemar(a)redhat.com> John Ferlan <jferlan(a)redhat.com> -John Levon <john.levon(a)sun.com> Laine Stump <laine(a)redhat.com> Mark McLoughlin <markmc(a)redhat.com> Martin Kletzander <mkletzan(a)redhat.com> Matthias Bolte <matthias.bolte(a)googlemail.com> Michal Prívozník <mprivozn(a)redhat.com> -Osier Yang <jyang(a)redhat.com> Pavel Hrdina <phrdina(a)redhat.com> Peter Krempa <pkrempa(a)redhat.com> Richard W.M. Jones <rjones(a)redhat.com> @@ -43,11 +36,18 @@ Wen Congyang <wency(a)cn.fujitsu.com> Previous maintainers: +Anthony Liguori <aliguori(a)us.ibm.com> Atsushi SAKAI <sakaia(a)jp.fujitsu.com> +Chris Lalancette <clalance(a)redhat.com> Dan Smith <danms(a)us.ibm.com> +Dave Allan <dallan(a)redhat.com> Dave Leskovec <dlesko(a)linux.vnet.ibm.com> +Guannan Ren <gren(a)redhat.com> +Jim Meyering <meyering(a)redhat.com> +John Levon <john.levon(a)sun.com> Justin Clift <jclift(a)redhat.com> Karel Zak <kzak(a)redhat.com> +Osier Yang <jyang(a)redhat.com> Patches have also been contributed by: -- 2.1.2

3 3

[libvirt] [PATCH] conf: fix a wrong comment in virSocketAddrNumericFamily()
by Chen Fan 15 Oct '14

15 Oct '14

Signed-off-by: Chen Fan <chen.fan.fnst(a)cn.fujitsu.com> --- src/util/virsocketaddr.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index a19e3af..8c9f05f 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -859,8 +859,7 @@ virSocketAddrGetIpPrefix(const virSocketAddr *address, * virSocketAddrNumericFamily: * @address: address to check * - * Check if passed address is an IP address in numeric format. and - * return the address family, otherwise return 0. + * Check if passed address is an IP address in numeric format. * * Returns: AF_INET or AF_INET6 if @address is an numeric IP address, * -1 otherwise. -- 1.9.3

2 2

[libvirt] [PATCHv2 1/2] util: Functions to update host network device's multicast filter
by akrowiak＠linux.vnet.ibm.com 14 Oct '14

14 Oct '14

From: Tony Krowiak <akrowiak(a)linux.vnet.ibm.com> This patch provides the utility functions to needed to synchronize the changes made to a guest domain network device's multicast filter with the corresponding macvtap device's filter on the host: * Get/add/remove multicast MAC addresses * Get the macvtap device's RX filter list Signed-off-by: Tony Krowiak <akrowiak(a)linux.vnet.ibm.com> --- Changes from V1: * Using virHexToBin function to parse HEX MAC address instead of sscanf in virMacAddrParseHex function * Using ENOSYS in error messages for empty functions * Reading entire file with virFileReadAll function when parsing /proc/net/dev_mcast file * Using VIR_APPEND_ELEMENT macro when appending array of /proc/net/dev_mcast file objects * Misc. formatting changes src/libvirt_private.syms | 4 + src/util/virmacaddr.c | 37 +++++ src/util/virmacaddr.h | 4 + src/util/virnetdev.c | 360 ++++++++++++++++++++++++++++++++++++++++++++++ src/util/virnetdev.h | 11 ++ 5 files changed, 416 insertions(+), 0 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index d6265ac..6d06a2c 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1590,13 +1590,16 @@ virMacAddrIsBroadcastRaw; virMacAddrIsMulticast; virMacAddrIsUnicast; virMacAddrParse; +virMacAddrParseHex; virMacAddrSet; virMacAddrSetRaw; # util/virnetdev.h +virNetDevAddMulti; virNetDevAddRoute; virNetDevClearIPv4Address; +virNetDevDelMulti; virNetDevExists; virNetDevGetIndex; virNetDevGetIPv4Address; @@ -1604,6 +1607,7 @@ virNetDevGetLinkInfo; virNetDevGetMAC; virNetDevGetMTU; virNetDevGetPhysicalFunction; +virNetDevGetRxFilter; virNetDevGetVirtualFunctionIndex; virNetDevGetVirtualFunctionInfo; virNetDevGetVirtualFunctions; diff --git a/src/util/virmacaddr.c b/src/util/virmacaddr.c index ebd1182..ae5e5d2 100644 --- a/src/util/virmacaddr.c +++ b/src/util/virmacaddr.c @@ -198,6 +198,43 @@ virMacAddrFormat(const virMacAddr *addr, return str; } +/** + * virMacAddrParseHex: + * @str: string hexadecimal representation of MAC address, e.g., "F801EFCE3aCB" + * @addr: 6-byte MAC address + * + * Parse the hexadecimal representation of a MAC address + * + * Return 0 upon success, or -1 in case of error. + */ +int +virMacAddrParseHex(const char* str, virMacAddrPtr addr) +{ + if (strlen(str) != VIR_MAC_HEXLEN) + return -1; + + size_t iaddr; + size_t istr; + + + for (istr = 0, iaddr = 0; iaddr < VIR_MAC_BUFLEN; istr += 2, iaddr++) { + unsigned int hex; + + if (sscanf(&str[istr], "%02x", &hex) != 1) + break; + + if (hex > UCHAR_MAX) + break; + + addr->addr[iaddr] = hex; + } + + if (istr == VIR_MAC_HEXLEN) + return 0; + + return -1; +} + void virMacAddrGenerate(const unsigned char prefix[VIR_MAC_PREFIX_BUFLEN], virMacAddrPtr addr) { diff --git a/src/util/virmacaddr.h b/src/util/virmacaddr.h index 49efc36..72a285a 100644 --- a/src/util/virmacaddr.h +++ b/src/util/virmacaddr.h @@ -27,6 +27,7 @@ # include "internal.h" # define VIR_MAC_BUFLEN 6 +#define VIR_MAC_HEXLEN (VIR_MAC_BUFLEN * 2) # define VIR_MAC_PREFIX_BUFLEN 3 # define VIR_MAC_STRING_BUFLEN (VIR_MAC_BUFLEN * 3) @@ -50,6 +51,9 @@ void virMacAddrGenerate(const unsigned char prefix[VIR_MAC_PREFIX_BUFLEN], virMacAddrPtr addr); int virMacAddrParse(const char* str, virMacAddrPtr addr) ATTRIBUTE_RETURN_CHECK; +int virMacAddrParseHex(const char* str, + virMacAddrPtr addr) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; bool virMacAddrIsUnicast(const virMacAddr *addr); bool virMacAddrIsMulticast(const virMacAddr *addr); bool virMacAddrIsBroadcastRaw(const unsigned char s[VIR_MAC_BUFLEN]); diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index db5623a..5e53f5f 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -56,6 +56,33 @@ VIR_LOG_INIT("util.netdev"); +# define VIR_MCAST_NAME_LEN (IFNAMSIZ + 1) +# define VIR_MCAST_INDEX_TOKEN_IDX 0 +# define VIR_MCAST_NAME_TOKEN_IDX 1 +# define VIR_MCAST_USERS_TOKEN_IDX 2 +# define VIR_MCAST_GLOBAL_TOKEN_IDX 3 +# define VIR_MCAST_ADDR_TOKEN_IDX 4 +# define VIR_MCAST_NUM_TOKENS 5 +# define VIR_MCAST_TOKEN_DELIMS " \n" +# define VIR_MCAST_ADDR_LEN (VIR_MAC_HEXLEN + 1) + +typedef struct _virNetDevMcastEntry virNetDevMcastEntry; +typedef virNetDevMcastEntry *virNetDevMcastEntryPtr; +struct _virNetDevMcastEntry { + int index; + char name[VIR_MCAST_NAME_LEN]; + int users; + bool global; + virMacAddr macaddr; +}; + +typedef struct _virNetDevMcast virNetDevMcast; +typedef virNetDevMcast *virNetDevMcastPtr; +struct _virNetDevMcast { + size_t nentries; + virNetDevMcastEntryPtr *entries; +}; + #if defined(HAVE_STRUCT_IFREQ) static int virNetDevSetupControlFull(const char *ifname, struct ifreq *ifr, @@ -1934,6 +1961,266 @@ virNetDevGetLinkInfo(const char *ifname, #endif /* defined(__linux__) */ +#if defined(SIOCADDMULTI) && defined(HAVE_STRUCT_IFREQ) +/** + * virNetDevAddMulti: + * @ifname: interface name to which to add multicast MAC address + * @macaddr: MAC address + * + * This function adds the @macaddr to the multicast list for a given interface + * @ifname. + * + * Returns 0 in case of success or -1 on failure + */ +int virNetDevAddMulti(const char *ifname, + virMacAddrPtr macaddr) +{ + int fd = -1; + int ret = -1; + struct ifreq ifr; + + if ((fd = virNetDevSetupControl(ifname, &ifr)) < 0) + return -1; + + ifr.ifr_hwaddr.sa_family = AF_UNSPEC; + virMacAddrGetRaw(macaddr, (unsigned char *)ifr.ifr_hwaddr.sa_data); + + if (ioctl(fd, SIOCADDMULTI, &ifr) < 0) { + char macstr[VIR_MAC_STRING_BUFLEN]; + virReportSystemError(errno, + _("Cannot add multicast MAC %s on '%s' interface"), + virMacAddrFormat(macaddr, macstr), ifname); + goto cleanup; + } + + ret = 0; + + cleanup: + VIR_FORCE_CLOSE(fd); + return ret; +} +#else +int virNetDevAddMulti(const char *ifname, + virMacAddrPtr macaddr ATTRIBUTE_UNUSED) +{ + char macstr[VIR_MAC_STRING_BUFLEN]; + virReportSystemError(errno, + _("Cannot add multicast MAC %s on '%s' interface"), + virMacAddrFormat(macaddr, macstr), ifname); + return -1; +} +#endif + +#if defined(SIOCDELMULTI) && defined(HAVE_STRUCT_IFREQ) +/** + * virNetDevDelMulti: + * @ifname: interface name from which to delete the multicast MAC address + * @macaddr: MAC address + * + * This function deletes the @macaddr from the multicast list for a given + * interface @ifname. + * + * Returns 0 in case of success or -1 on failure + */ +int virNetDevDelMulti(const char *ifname, + virMacAddrPtr macaddr) +{ + int fd = -1; + int ret = -1; + struct ifreq ifr; + + if ((fd = virNetDevSetupControl(ifname, &ifr)) < 0) + return -1; + + ifr.ifr_hwaddr.sa_family = AF_UNSPEC; + virMacAddrGetRaw(macaddr, (unsigned char *)ifr.ifr_hwaddr.sa_data); + + if (ioctl(fd, SIOCDELMULTI, &ifr) < 0) { + char macstr[VIR_MAC_STRING_BUFLEN]; + virReportSystemError(errno, + _("Cannot add multicast MAC %s on '%s' interface"), + virMacAddrFormat(macaddr, macstr), ifname); + goto cleanup; + } + + ret = 0; + + cleanup: + VIR_FORCE_CLOSE(fd); + return ret; +} +#else +int virNetDevDelMulti(const char *ifname, + virMacAddrPtr macaddr ATTRIBUTE_UNUSED) +{ + char macstr[VIR_MAC_STRING_BUFLEN]; + virReportSystemError(errno, + _("Cannot delete multicast MAC %s on '%s' interface"), + virMacAddrFormat(macaddr, macstr), ifname); + return -1; +} +#endif + +static int virNetDevParseMcast(char *buf, virNetDevMcastEntryPtr mcast) +{ + int ifindex; + int num; + char *next; + char *token; + char *saveptr; + char *endptr; + + for (ifindex = 0, next = buf; ifindex < VIR_MCAST_NUM_TOKENS; ifindex++, + next = NULL) { + token = strtok_r(next, VIR_MCAST_TOKEN_DELIMS, &saveptr); + + if (token == NULL) { + virReportSystemError(EINVAL, + _("failed to parse multicast address from '%s'"), + buf); + return -1; + } + + switch (ifindex) { + case VIR_MCAST_INDEX_TOKEN_IDX: + if (virStrToLong_i(token, &endptr, 10, &num) < 0) { + virReportSystemError(EINVAL, + _("Failed to parse index from '%s'"), + buf); + return -1; + + } + + mcast->index = num; + + break; + case VIR_MCAST_NAME_TOKEN_IDX: + if (virStrncpy(mcast->name, token, strlen(token), + VIR_MCAST_NAME_LEN) == NULL) { + virReportSystemError(EINVAL, + _("Failed to parse NIC name from '%s'"), + buf); + return -1; + } + + break; + case VIR_MCAST_USERS_TOKEN_IDX: + if (virStrToLong_i(token, &endptr, 10, &num) < 0) { + virReportSystemError(EINVAL, + _("Failed to parse users from '%s'"), + buf); + return -1; + + } + + mcast->users = num; + + break; + case VIR_MCAST_GLOBAL_TOKEN_IDX: + if (virStrToLong_i(token, &endptr, 10, &num) < 0) { + virReportSystemError(EINVAL, + _("Failed to parse users from '%s'"), + buf); + return -1; + + } + + mcast->global = num; + + break; + case VIR_MCAST_ADDR_TOKEN_IDX: + if (virMacAddrParseHex((const char*)token, + &mcast->macaddr) < 0) { + virReportSystemError(EINVAL, + _("Failed to parse MAC address from '%s'"), + buf); + } + + break; + default: + break; + } + } + + return 0; +} + + +static int virNetDevGetMcast(const char *ifname, + virNetDevMcastPtr mcast) +{ + FILE *file; + const char *path = "/proc/net/dev_mcast"; + char buf[256]; + int ret = -1; + virNetDevMcastEntry entry; + virNetDevMcastEntryPtr *entries = NULL; + size_t nentries = 0; + size_t entries_sz = 0; + size_t i; + mcast->entries = NULL; + mcast->nentries = 0; + + file = fopen(path, "r"); + + if (!file) { + virReportSystemError(errno, + _("cannot open multicast address file %s"), path); + return -1; + } + + while (fgets(buf, sizeof(buf), file)) { + if (virNetDevParseMcast(buf, &entry) < 0) { + goto error; + } + + if (entry.global && STREQ(ifname, entry.name)) { + if (VIR_RESIZE_N(entries, entries_sz, + nentries, 1) < 0) { + virReportSystemError(ENOMEM, + _("Failed to resize multicast MAC address array: " + "ptr=%p, alloc=%zu, count=%zu, add=1"), + entries, entries_sz, nentries); + goto error; + } + + if (VIR_ALLOC(entries[nentries]) < 0) { + char addr[VIR_MAC_STRING_BUFLEN]; + virReportSystemError(ENOMEM, + _("Failed to allocate storage for MAC address %s"), + virMacAddrFormat(&mcast->entries[nentries]->macaddr, + addr)); + goto error; + } + + memcpy(entries[nentries++], &entry, + sizeof(virNetDevMcastEntry)); + } + + memset(buf, 0, sizeof(buf)); + memset(&entry, 0, sizeof(virNetDevMcastEntry)); + } + + + mcast->nentries = nentries; + mcast->entries = entries; + ret = 0; + + error: + VIR_FORCE_FCLOSE(file); + + if ((ret < 0) && (nentries > 0)) { + for (i = 0; i < nentries; i++) { + VIR_FREE(entries[i]); + } + + VIR_FREE(entries); + } + + return ret; +} + + VIR_ENUM_IMPL(virNetDevRxFilterMode, VIR_NETDEV_RX_FILTER_MODE_LAST, "none", @@ -1941,6 +2228,37 @@ VIR_ENUM_IMPL(virNetDevRxFilterMode, "all"); +static int virNetDevGetMulticastTable(const char *ifname, + virNetDevRxFilterPtr filter) +{ + int i; + int ret = -1; + virNetDevMcast mcast; + filter->multicast.nTable = 0; + filter->multicast.table = NULL; + + if (virNetDevGetMcast(ifname, &mcast) < 0) + goto error; + + if (mcast.nentries > 0) { + if (VIR_ALLOC_N(filter->multicast.table, mcast.nentries)) + goto error; + + for (i = 0; i < mcast.nentries; i++) { + virMacAddrSet(&filter->multicast.table[i], + &mcast.entries[i]->macaddr); + } + + filter->multicast.nTable = mcast.nentries; + } + + ret = 0; + + error: + return ret; +} + + virNetDevRxFilterPtr virNetDevRxFilterNew(void) { @@ -1963,3 +2281,45 @@ virNetDevRxFilterFree(virNetDevRxFilterPtr filter) VIR_FREE(filter); } } + + +/** + * virNetDevGetRxFilter: + * This function supplies the RX filter list for a given device interface + * + * @ifname: Name of the interface + * @filter: The RX filter list + * + * Returns 0 or -1 on failure. + */ +int virNetDevGetRxFilter(const char *ifname, + virNetDevRxFilterPtr *filter) +{ + int ret = -1; + virNetDevRxFilterPtr fil = virNetDevRxFilterNew(); + + if (!fil) { + virReportSystemError(ENOMEM, + _("Failed to allocate filter for %s interface"), + ifname); + + } + + if (virNetDevGetMAC(ifname, &fil->mac)) + goto cleanup; + + if (virNetDevGetMulticastTable(ifname, fil)) + goto cleanup; + + ret = 0; + + cleanup: + if (ret < 0) { + virNetDevRxFilterFree(fil); + fil = NULL; + } + + *filter = fil; + + return ret; +} diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index 2a6e67d..1d274b3 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -30,6 +30,7 @@ # include "virmacaddr.h" # include "virpci.h" # include "device_conf.h" +# include "virutil.h" # ifdef HAVE_STRUCT_IFREQ typedef struct ifreq virIfreq; @@ -189,5 +190,15 @@ int virNetDevGetLinkInfo(const char *ifname, virNetDevRxFilterPtr virNetDevRxFilterNew(void) ATTRIBUTE_RETURN_CHECK; void virNetDevRxFilterFree(virNetDevRxFilterPtr filter); +int virNetDevGetRxFilter(const char *ifname, + virNetDevRxFilterPtr *filter) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + +int virNetDevAddMulti(const char *ifname, + virMacAddrPtr macaddr) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; +int virNetDevDelMulti(const char *ifname, + virMacAddrPtr macaddr) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; #endif /* __VIR_NETDEV_H__ */ -- 1.7.1

2 3

[libvirt] [PATCH] "pclmuldq" was introduced with Westmere, not Sandy Bridge. This feature is important to get proper performance for aes-128-gcm in openssl, an important cipher for https communication.
by Jan-Frode Myklebust 14 Oct '14

14 Oct '14

Signed-off-by: Jan-Frode Myklebust <janfrode(a)tanso.net> --- src/cpu/cpu_map.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index 18c7b0d..94f1458 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -488,11 +488,11 @@ <model name='Westmere'> <model name='Nehalem'/> <feature name='aes'/> + <feature name='pclmuldq'/> </model> <model name='SandyBridge'> <model name='Westmere'/> - <feature name='pclmuldq'/> <feature name='x2apic'/> <feature name='tsc-deadline'/> <feature name='xsave'/> -- 1.7.1

4 5

[libvirt] [PATCH] virsh: domain: Use global constant for XML file size limit
by Peter Krempa 14 Oct '14

14 Oct '14

Few places still used hardcoded limit for maximum XML size for commands that accept XML files. The hardcoded limits ranged from 8k to 1M. Use VSH_MAX_XML_FILE to express this limit in a unified way. This will bump the limit for the commands that used hardcoded string lengths to 10M. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1152427 --- tools/virsh-domain.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 12550ff..94ae3d3 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1984,7 +1984,7 @@ cmdBlockCopy(vshControl *ctl, const vshCmd *cmd) } if (xml) { - if (virFileReadAll(xml, 8192, &xmlstr) < 0) { + if (virFileReadAll(xml, VSH_MAX_XML_FILE, &xmlstr) < 0) { vshReportError(ctl); goto cleanup; } @@ -3889,7 +3889,7 @@ doSave(void *opaque) goto out; if (xmlfile && - virFileReadAll(xmlfile, 8192, &xml) < 0) { + virFileReadAll(xmlfile, VSH_MAX_XML_FILE, &xml) < 0) { vshReportError(ctl); goto out; } @@ -4182,7 +4182,7 @@ cmdSaveImageDefine(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptStringReq(ctl, cmd, "xml", &xmlfile) < 0) return false; - if (virFileReadAll(xmlfile, 8192, &xml) < 0) + if (virFileReadAll(xmlfile, VSH_MAX_XML_FILE, &xml) < 0) goto cleanup; if (virDomainSaveImageDefineXML(ctl->conn, file, xml, flags) < 0) { @@ -4765,7 +4765,7 @@ cmdRestore(vshControl *ctl, const vshCmd *cmd) return false; if (xmlfile && - virFileReadAll(xmlfile, 8192, &xml) < 0) + virFileReadAll(xmlfile, VSH_MAX_XML_FILE, &xml) < 0) goto cleanup; if (((flags || xml) @@ -8945,7 +8945,7 @@ cmdDomXMLFromNative(vshControl *ctl, const vshCmd *cmd) vshCommandOptStringReq(ctl, cmd, "config", &configFile) < 0) return false; - if (virFileReadAll(configFile, 1024*1024, &configData) < 0) + if (virFileReadAll(configFile, VSH_MAX_XML_FILE, &configData) < 0) return false; xmlData = virConnectDomainXMLFromNative(ctl->conn, format, configData, flags); @@ -9001,7 +9001,7 @@ cmdDomXMLToNative(vshControl *ctl, const vshCmd *cmd) vshCommandOptStringReq(ctl, cmd, "xml", &xmlFile) < 0) return false; - if (virFileReadAll(xmlFile, 1024*1024, &xmlData) < 0) + if (virFileReadAll(xmlFile, VSH_MAX_XML_FILE, &xmlData) < 0) return false; configData = virConnectDomainXMLToNative(ctl->conn, format, xmlData, flags); @@ -9318,7 +9318,7 @@ doMigrate(void *opaque) if (opt) { char *xml; - if (virFileReadAll(opt, 1024 * 1024, &xml) < 0) { + if (virFileReadAll(opt, VSH_MAX_XML_FILE, &xml) < 0) { vshError(ctl, _("cannot read file '%s'"), opt); goto save_error; } -- 2.1.0

2 2

[libvirt] [PATCH] virsh: man: Fix description of --live/--config usage
by Peter Krempa 14 Oct '14

14 Oct '14

dommemstat and blkdeviotune's man page incorrectly stated the usage of --live and --config. --- Notes: Pushed as trivial. tools/virsh.pod | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index eae9195..cc55821 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -772,7 +772,7 @@ respectfully with average value of zero. If I<--live> is specified, affect a running guest. If I<--config> is specified, affect the next boot of a persistent guest. If I<--current> is specified, affect the current guest state. -Both I<--live> and I<--current> flags may be given, but I<--current> is +Both I<--live> and I<--config> flags may be given, but I<--current> is exclusive. If no flag is specified, behavior is different depending on hypervisor. @@ -1078,7 +1078,7 @@ cannot be mixed with non-zero values for read or write. If I<--live> is specified, affect a running guest. If I<--config> is specified, affect the next boot of a persistent guest. If I<--current> is specified, affect the current guest state. -Both I<--live> and I<--current> flags may be given, but I<--current> is +Both I<--live> and I<--config> flags may be given, but I<--current> is exclusive. If no flag is specified, behavior is different depending on hypervisor. -- 2.1.0

1 0

[libvirt] [PATCH] conf: improve the comments for "xmlopt"
by Wang Rui 13 Oct '14

13 Oct '14

Signed-off-by: Wang Rui <moon.wangrui(a)huawei.com> --- src/conf/domain_conf.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 5dc4b62..35bbd91 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2417,6 +2417,7 @@ virDomainObjPtr virDomainObjListAdd(virDomainObjListPtr doms, * operations do not persist past shutdown. * * @param caps pointer to capabilities info + * @param xmlopt pointer to XML parser configuration object * @param domain domain object pointer * @param live if true, run this operation even for an inactive domain. * this allows freely updated domain->def with runtime defaults before @@ -2454,6 +2455,7 @@ virDomainObjSetDefTransient(virCapsPtr caps, * return the running config. * * @param caps pointer to capabilities info + * @param xmlopt pointer to XML parser configuration object * @param domain domain object pointer * @return NULL on error, virDOmainDefPtr on success */ -- 1.7.12.4

2 1

[libvirt] libvirt internal snapshots incremental or not.
by Sijo Jose 13 Oct '14

13 Oct '14

Hi, Is libvirt internal snapshots are incremental or not..? Consider the example, There are 3 snapshots, created respectively snp1 first, after some changes snp2, again after some changes snp3. Question, 1.Is there any dependency that is ...snp2 depended upon snp1 and snp3 depended upon snp2 OR snp1 OR both 2.So if I remove snp2, does it makes snp3 invalid, OR can I use snp3 further. -- *Regards* *Sijo Jose*

3 2

[libvirt] [PATCH 0/2] qemu: kill junk process
by Martin Kletzander 11 Oct '14

11 Oct '14

First patch tries to kill qemu possibly left running by previous daemon and second patch is just a reproducer for the issue; if you start daemon with that patch applied, it will kill itself in the appropriate time so you don't have to quickly start/kill the daemon over and over again. Martin Kletzander (2): qemu: make sure capability probing process can start DO NOT APPLY: Reproducer for patch 1/2 src/qemu/qemu_capabilities.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) -- 2.1.2

5 13

[libvirt] [RFC PATCH] iface-unbridge: Output in-use domain list instead of removing a in-used bridge forcibly
by Lin Ma 11 Oct '14

11 Oct '14

virsh iface-unbridge directly removes the bridge even though there are guest interfaces attach to. This patch outputs in-use domain list instead of removing bridge in this case. I knew that generally virsh-*.[ch] files are self contained, But for iterating all of domains, The patch broke this rule, So I sent it as RFC to see whether the patch makes sense or if there is a better way. Signed-off-by: Lin Ma <lma(a)suse.com> --- tools/virsh-domain-monitor.c | 275 ------------------------------------------- tools/virsh-domain.c | 268 +++++++++++++++++++++++++++++++++++++++++ tools/virsh-domain.h | 13 ++ tools/virsh-interface.c | 99 ++++++++++++++++ 4 files changed, 380 insertions(+), 275 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 2af0d4f..b3d1b31 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -1478,281 +1478,6 @@ static const vshCmdInfo info_list[] = { {.name = NULL} }; -/* compare domains, pack NULLed ones at the end*/ -static int -vshDomainSorter(const void *a, const void *b) -{ - virDomainPtr *da = (virDomainPtr *) a; - virDomainPtr *db = (virDomainPtr *) b; - unsigned int ida; - unsigned int idb; - unsigned int inactive = (unsigned int) -1; - - if (*da && !*db) - return -1; - - if (!*da) - return *db != NULL; - - ida = virDomainGetID(*da); - idb = virDomainGetID(*db); - - if (ida == inactive && idb == inactive) - return vshStrcasecmp(virDomainGetName(*da), virDomainGetName(*db)); - - if (ida != inactive && idb != inactive) { - if (ida > idb) - return 1; - else if (ida < idb) - return -1; - } - - if (ida != inactive) - return -1; - else - return 1; -} - -struct vshDomainList { - virDomainPtr *domains; - size_t ndomains; -}; -typedef struct vshDomainList *vshDomainListPtr; - -static void -vshDomainListFree(vshDomainListPtr domlist) -{ - size_t i; - - if (domlist && domlist->domains) { - for (i = 0; i < domlist->ndomains; i++) { - if (domlist->domains[i]) - virDomainFree(domlist->domains[i]); - } - VIR_FREE(domlist->domains); - } - VIR_FREE(domlist); -} - -static vshDomainListPtr -vshDomainListCollect(vshControl *ctl, unsigned int flags) -{ - vshDomainListPtr list = vshMalloc(ctl, sizeof(*list)); - size_t i; - int ret; - int *ids = NULL; - int nids = 0; - char **names = NULL; - int nnames = 0; - virDomainPtr dom; - bool success = false; - size_t deleted = 0; - int persistent; - int autostart; - int state; - int nsnap; - int mansave; - - /* try the list with flags support (0.9.13 and later) */ - if ((ret = virConnectListAllDomains(ctl->conn, &list->domains, - flags)) >= 0) { - list->ndomains = ret; - goto finished; - } - - /* check if the command is actually supported */ - if (last_error && last_error->code == VIR_ERR_NO_SUPPORT) { - vshResetLibvirtError(); - goto fallback; - } - - if (last_error && last_error->code == VIR_ERR_INVALID_ARG) { - /* try the new API again but mask non-guaranteed flags */ - unsigned int newflags = flags & (VIR_CONNECT_LIST_DOMAINS_ACTIVE | - VIR_CONNECT_LIST_DOMAINS_INACTIVE); - - vshResetLibvirtError(); - if ((ret = virConnectListAllDomains(ctl->conn, &list->domains, - newflags)) >= 0) { - list->ndomains = ret; - goto filter; - } - } - - /* there was an error during the first or second call */ - vshError(ctl, "%s", _("Failed to list domains")); - goto cleanup; - - - fallback: - /* fall back to old method (0.9.12 and older) */ - vshResetLibvirtError(); - - /* list active domains, if necessary */ - if (!VSH_MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE) || - VSH_MATCH(VIR_CONNECT_LIST_DOMAINS_ACTIVE)) { - if ((nids = virConnectNumOfDomains(ctl->conn)) < 0) { - vshError(ctl, "%s", _("Failed to list active domains")); - goto cleanup; - } - - if (nids) { - ids = vshMalloc(ctl, sizeof(int) * nids); - - if ((nids = virConnectListDomains(ctl->conn, ids, nids)) < 0) { - vshError(ctl, "%s", _("Failed to list active domains")); - goto cleanup; - } - } - } - - if (!VSH_MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE) || - VSH_MATCH(VIR_CONNECT_LIST_DOMAINS_INACTIVE)) { - if ((nnames = virConnectNumOfDefinedDomains(ctl->conn)) < 0) { - vshError(ctl, "%s", _("Failed to list inactive domains")); - goto cleanup; - } - - if (nnames) { - names = vshMalloc(ctl, sizeof(char *) * nnames); - - if ((nnames = virConnectListDefinedDomains(ctl->conn, names, - nnames)) < 0) { - vshError(ctl, "%s", _("Failed to list inactive domains")); - goto cleanup; - } - } - } - - list->domains = vshMalloc(ctl, sizeof(virDomainPtr) * (nids + nnames)); - list->ndomains = 0; - - /* get active domains */ - for (i = 0; i < nids; i++) { - if (!(dom = virDomainLookupByID(ctl->conn, ids[i]))) - continue; - list->domains[list->ndomains++] = dom; - } - - /* get inactive domains */ - for (i = 0; i < nnames; i++) { - if (!(dom = virDomainLookupByName(ctl->conn, names[i]))) - continue; - list->domains[list->ndomains++] = dom; - } - - /* truncate domains that weren't found */ - deleted = (nids + nnames) - list->ndomains; - - filter: - /* filter list the list if the list was acquired by fallback means */ - for (i = 0; i < list->ndomains; i++) { - dom = list->domains[i]; - - /* persistence filter */ - if (VSH_MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_PERSISTENT)) { - if ((persistent = virDomainIsPersistent(dom)) < 0) { - vshError(ctl, "%s", _("Failed to get domain persistence info")); - goto cleanup; - } - - if (!((VSH_MATCH(VIR_CONNECT_LIST_DOMAINS_PERSISTENT) && persistent) || - (VSH_MATCH(VIR_CONNECT_LIST_DOMAINS_TRANSIENT) && !persistent))) - goto remove_entry; - } - - /* domain state filter */ - if (VSH_MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_STATE)) { - if (virDomainGetState(dom, &state, NULL, 0) < 0) { - vshError(ctl, "%s", _("Failed to get domain state")); - goto cleanup; - } - - if (!((VSH_MATCH(VIR_CONNECT_LIST_DOMAINS_RUNNING) && - state == VIR_DOMAIN_RUNNING) || - (VSH_MATCH(VIR_CONNECT_LIST_DOMAINS_PAUSED) && - state == VIR_DOMAIN_PAUSED) || - (VSH_MATCH(VIR_CONNECT_LIST_DOMAINS_SHUTOFF) && - state == VIR_DOMAIN_SHUTOFF) || - (VSH_MATCH(VIR_CONNECT_LIST_DOMAINS_OTHER) && - (state != VIR_DOMAIN_RUNNING && - state != VIR_DOMAIN_PAUSED && - state != VIR_DOMAIN_SHUTOFF)))) - goto remove_entry; - } - - /* autostart filter */ - if (VSH_MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_AUTOSTART)) { - if (virDomainGetAutostart(dom, &autostart) < 0) { - vshError(ctl, "%s", _("Failed to get domain autostart state")); - goto cleanup; - } - - if (!((VSH_MATCH(VIR_CONNECT_LIST_DOMAINS_AUTOSTART) && autostart) || - (VSH_MATCH(VIR_CONNECT_LIST_DOMAINS_NO_AUTOSTART) && !autostart))) - goto remove_entry; - } - - /* managed save filter */ - if (VSH_MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_MANAGEDSAVE)) { - if ((mansave = virDomainHasManagedSaveImage(dom, 0)) < 0) { - vshError(ctl, "%s", - _("Failed to check for managed save image")); - goto cleanup; - } - - if (!((VSH_MATCH(VIR_CONNECT_LIST_DOMAINS_MANAGEDSAVE) && mansave) || - (VSH_MATCH(VIR_CONNECT_LIST_DOMAINS_NO_MANAGEDSAVE) && !mansave))) - goto remove_entry; - } - - /* snapshot filter */ - if (VSH_MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_SNAPSHOT)) { - if ((nsnap = virDomainSnapshotNum(dom, 0)) < 0) { - vshError(ctl, "%s", _("Failed to get snapshot count")); - goto cleanup; - } - if (!((VSH_MATCH(VIR_CONNECT_LIST_DOMAINS_HAS_SNAPSHOT) && nsnap > 0) || - (VSH_MATCH(VIR_CONNECT_LIST_DOMAINS_NO_SNAPSHOT) && nsnap == 0))) - goto remove_entry; - } - - /* the domain matched all filters, it may stay */ - continue; - - remove_entry: - /* the domain has to be removed as it failed one of the filters */ - virDomainFree(list->domains[i]); - list->domains[i] = NULL; - deleted++; - } - - finished: - /* sort the list */ - if (list->domains && list->ndomains) - qsort(list->domains, list->ndomains, sizeof(*list->domains), - vshDomainSorter); - - /* truncate the list if filter simulation deleted entries */ - if (deleted) - VIR_SHRINK_N(list->domains, list->ndomains, deleted); - - success = true; - - cleanup: - for (i = 0; nnames != -1 && i < nnames; i++) - VIR_FREE(names[i]); - - if (!success) { - vshDomainListFree(list); - list = NULL; - } - - VIR_FREE(names); - VIR_FREE(ids); - return list; -} - static const vshCmdOptDef opts_list[] = { {.name = "inactive", .type = VSH_OT_BOOL, diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 12550ff..b83e670 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -60,6 +60,274 @@ # define SA_SIGINFO 0 #endif +/* compare domains, pack NULLed ones at the end*/ +int +vshDomainSorter(const void *a, const void *b) +{ + virDomainPtr *da = (virDomainPtr *) a; + virDomainPtr *db = (virDomainPtr *) b; + unsigned int ida; + unsigned int idb; + unsigned int inactive = (unsigned int) -1; + + if (*da && !*db) + return -1; + + if (!*da) + return *db != NULL; + + ida = virDomainGetID(*da); + idb = virDomainGetID(*db); + + if (ida == inactive && idb == inactive) + return vshStrcasecmp(virDomainGetName(*da), virDomainGetName(*db)); + + if (ida != inactive && idb != inactive) { + if (ida > idb) + return 1; + else if (ida < idb) + return -1; + } + + if (ida != inactive) + return -1; + else + return 1; +} + +void +vshDomainListFree(vshDomainListPtr domlist) +{ + size_t i; + + if (domlist && domlist->domains) { + for (i = 0; i < domlist->ndomains; i++) { + if (domlist->domains[i]) + virDomainFree(domlist->domains[i]); + } + VIR_FREE(domlist->domains); + } + VIR_FREE(domlist); +} + +vshDomainListPtr +vshDomainListCollect(vshControl *ctl, unsigned int flags) +{ + vshDomainListPtr list = vshMalloc(ctl, sizeof(*list)); + size_t i; + int ret; + int *ids = NULL; + int nids = 0; + char **names = NULL; + int nnames = 0; + virDomainPtr dom; + bool success = false; + size_t deleted = 0; + int persistent; + int autostart; + int state; + int nsnap; + int mansave; + + /* try the list with flags support (0.9.13 and later) */ + if ((ret = virConnectListAllDomains(ctl->conn, &list->domains, + flags)) >= 0) { + list->ndomains = ret; + goto finished; + } + + /* check if the command is actually supported */ + if (last_error && last_error->code == VIR_ERR_NO_SUPPORT) { + vshResetLibvirtError(); + goto fallback; + } + + if (last_error && last_error->code == VIR_ERR_INVALID_ARG) { + /* try the new API again but mask non-guaranteed flags */ + unsigned int newflags = flags & (VIR_CONNECT_LIST_DOMAINS_ACTIVE | + VIR_CONNECT_LIST_DOMAINS_INACTIVE); + + vshResetLibvirtError(); + if ((ret = virConnectListAllDomains(ctl->conn, &list->domains, + newflags)) >= 0) { + list->ndomains = ret; + goto filter; + } + } + + /* there was an error during the first or second call */ + vshError(ctl, "%s", _("Failed to list domains")); + goto cleanup; + + + fallback: + /* fall back to old method (0.9.12 and older) */ + vshResetLibvirtError(); + + /* list active domains, if necessary */ + if (!VSH_MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE) || + VSH_MATCH(VIR_CONNECT_LIST_DOMAINS_ACTIVE)) { + if ((nids = virConnectNumOfDomains(ctl->conn)) < 0) { + vshError(ctl, "%s", _("Failed to list active domains")); + goto cleanup; + } + + if (nids) { + ids = vshMalloc(ctl, sizeof(int) * nids); + + if ((nids = virConnectListDomains(ctl->conn, ids, nids)) < 0) { + vshError(ctl, "%s", _("Failed to list active domains")); + goto cleanup; + } + } + } + + if (!VSH_MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE) || + VSH_MATCH(VIR_CONNECT_LIST_DOMAINS_INACTIVE)) { + if ((nnames = virConnectNumOfDefinedDomains(ctl->conn)) < 0) { + vshError(ctl, "%s", _("Failed to list inactive domains")); + goto cleanup; + } + + if (nnames) { + names = vshMalloc(ctl, sizeof(char *) * nnames); + + if ((nnames = virConnectListDefinedDomains(ctl->conn, names, + nnames)) < 0) { + vshError(ctl, "%s", _("Failed to list inactive domains")); + goto cleanup; + } + } + } + + list->domains = vshMalloc(ctl, sizeof(virDomainPtr) * (nids + nnames)); + list->ndomains = 0; + + /* get active domains */ + for (i = 0; i < nids; i++) { + if (!(dom = virDomainLookupByID(ctl->conn, ids[i]))) + continue; + list->domains[list->ndomains++] = dom; + } + + /* get inactive domains */ + for (i = 0; i < nnames; i++) { + if (!(dom = virDomainLookupByName(ctl->conn, names[i]))) + continue; + list->domains[list->ndomains++] = dom; + } + + /* truncate domains that weren't found */ + deleted = (nids + nnames) - list->ndomains; + + filter: + /* filter list the list if the list was acquired by fallback means */ + for (i = 0; i < list->ndomains; i++) { + dom = list->domains[i]; + + /* persistence filter */ + if (VSH_MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_PERSISTENT)) { + if ((persistent = virDomainIsPersistent(dom)) < 0) { + vshError(ctl, "%s", _("Failed to get domain persistence info")); + goto cleanup; + } + + if (!((VSH_MATCH(VIR_CONNECT_LIST_DOMAINS_PERSISTENT) && persistent) || + (VSH_MATCH(VIR_CONNECT_LIST_DOMAINS_TRANSIENT) && !persistent))) + goto remove_entry; + } + + /* domain state filter */ + if (VSH_MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_STATE)) { + if (virDomainGetState(dom, &state, NULL, 0) < 0) { + vshError(ctl, "%s", _("Failed to get domain state")); + goto cleanup; + } + + if (!((VSH_MATCH(VIR_CONNECT_LIST_DOMAINS_RUNNING) && + state == VIR_DOMAIN_RUNNING) || + (VSH_MATCH(VIR_CONNECT_LIST_DOMAINS_PAUSED) && + state == VIR_DOMAIN_PAUSED) || + (VSH_MATCH(VIR_CONNECT_LIST_DOMAINS_SHUTOFF) && + state == VIR_DOMAIN_SHUTOFF) || + (VSH_MATCH(VIR_CONNECT_LIST_DOMAINS_OTHER) && + (state != VIR_DOMAIN_RUNNING && + state != VIR_DOMAIN_PAUSED && + state != VIR_DOMAIN_SHUTOFF)))) + goto remove_entry; + } + + /* autostart filter */ + if (VSH_MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_AUTOSTART)) { + if (virDomainGetAutostart(dom, &autostart) < 0) { + vshError(ctl, "%s", _("Failed to get domain autostart state")); + goto cleanup; + } + + if (!((VSH_MATCH(VIR_CONNECT_LIST_DOMAINS_AUTOSTART) && autostart) || + (VSH_MATCH(VIR_CONNECT_LIST_DOMAINS_NO_AUTOSTART) && !autostart))) + goto remove_entry; + } + + /* managed save filter */ + if (VSH_MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_MANAGEDSAVE)) { + if ((mansave = virDomainHasManagedSaveImage(dom, 0)) < 0) { + vshError(ctl, "%s", + _("Failed to check for managed save image")); + goto cleanup; + } + + if (!((VSH_MATCH(VIR_CONNECT_LIST_DOMAINS_MANAGEDSAVE) && mansave) || + (VSH_MATCH(VIR_CONNECT_LIST_DOMAINS_NO_MANAGEDSAVE) && !mansave))) + goto remove_entry; + } + + /* snapshot filter */ + if (VSH_MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_SNAPSHOT)) { + if ((nsnap = virDomainSnapshotNum(dom, 0)) < 0) { + vshError(ctl, "%s", _("Failed to get snapshot count")); + goto cleanup; + } + if (!((VSH_MATCH(VIR_CONNECT_LIST_DOMAINS_HAS_SNAPSHOT) && nsnap > 0) || + (VSH_MATCH(VIR_CONNECT_LIST_DOMAINS_NO_SNAPSHOT) && nsnap == 0))) + goto remove_entry; + } + + /* the domain matched all filters, it may stay */ + continue; + + remove_entry: + /* the domain has to be removed as it failed one of the filters */ + virDomainFree(list->domains[i]); + list->domains[i] = NULL; + deleted++; + } + + finished: + /* sort the list */ + if (list->domains && list->ndomains) + qsort(list->domains, list->ndomains, sizeof(*list->domains), + vshDomainSorter); + + /* truncate the list if filter simulation deleted entries */ + if (deleted) + VIR_SHRINK_N(list->domains, list->ndomains, deleted); + + success = true; + + cleanup: + for (i = 0; nnames != -1 && i < nnames; i++) + VIR_FREE(names[i]); + + if (!success) { + vshDomainListFree(list); + list = NULL; + } + + VIR_FREE(names); + VIR_FREE(ids); + return list; +} static virDomainPtr vshLookupDomainInternal(vshControl *ctl, diff --git a/tools/virsh-domain.h b/tools/virsh-domain.h index f46538f..2e0d11a 100644 --- a/tools/virsh-domain.h +++ b/tools/virsh-domain.h @@ -41,4 +41,17 @@ virDomainPtr vshCommandOptDomainBy(vshControl *ctl, const vshCmd *cmd, extern const vshCmdDef domManagementCmds[]; +int vshDomainSorter(const void *a, const void *b); + +struct vshDomainList { + virDomainPtr *domains; + size_t ndomains; +}; + +typedef struct vshDomainList *vshDomainListPtr; + +void vshDomainListFree(vshDomainListPtr domlist); + +vshDomainListPtr vshDomainListCollect(vshControl *ctl, unsigned int flags); + #endif /* VIRSH_DOMAIN_H */ diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c index 6cacaf1..28b9e22 100644 --- a/tools/virsh-interface.c +++ b/tools/virsh-interface.c @@ -25,6 +25,7 @@ #include <config.h> #include "virsh-interface.h" +#include "virsh-domain.h" #include <libxml/parser.h> #include <libxml/tree.h> @@ -40,6 +41,91 @@ #include "virxml.h" #include "virstring.h" +static bool +vshBridgeInUse(vshControl *ctl, const char *br_name, char ***inuse_domnames) +{ + bool ret = false; + char **inuse_list = NULL; + vshDomainListPtr list = NULL; + virDomainPtr dom; + size_t i,j; + char *xml = NULL; + xmlDocPtr xmldoc = NULL; + xmlXPathContextPtr ctxt = NULL; + int ninterfaces; + int count = 0; + xmlNodePtr *interfaces = NULL; + + if (!(list = vshDomainListCollect(ctl, VIR_CONNECT_LIST_DOMAINS_ACTIVE))) { + vshError(ctl, "%s", _("Failed to get active domains list")); + exit(EXIT_FAILURE); + } + + if (list->ndomains <= 0) + goto cleanup; + + if (VIR_ALLOC_N(inuse_list, list->ndomains) < 0) { + vshError(ctl, "%s", _("Failed to allocate inuse_list")); + exit(EXIT_FAILURE); + } + + for (i = 0; i < list->ndomains; i++) { + dom = list->domains[i]; + xml = virDomainGetXMLDesc(dom, 0); + + if (!xml) { + vshError(ctl, "%s", _("Failed to get domain xml desc")); + exit(EXIT_FAILURE); + } + + xmldoc = virXMLParseStringCtxt(xml, _("(domain_definition)"), &ctxt); + + if (!xmldoc) { + vshError(ctl, "%s", _("Failed to parse string context")); + exit(EXIT_FAILURE); + } + + ninterfaces = virXPathNodeSet("./devices/interface", ctxt, &interfaces); + + if (ninterfaces < 0) { + vshError(ctl, "%s", _("Failed to count interfaces")); + exit(EXIT_FAILURE); + } + + for (j = 0; j < ninterfaces; j++) { + char *source = NULL; + char *target = NULL; + ctxt->node = interfaces[j]; + source = virXPathString("string(./source/@bridge" + "|./source/@dev" + "|./source/@network" + "|./source/@name)", ctxt); + target = virXPathString("string(./target/@dev)", ctxt); + + if (target && source && br_name && STREQ(source, br_name)) { + inuse_list[count++] = vshStrdup(ctl, virDomainGetName(dom)); + ret = true; + VIR_FREE(source); + VIR_FREE(target); + break; + } + + VIR_FREE(source); + VIR_FREE(target); + } + + VIR_FREE(interfaces); + VIR_FREE(xml); + xmlFreeDoc(xmldoc); + xmlXPathFreeContext(ctxt); + } + *inuse_domnames = inuse_list; + + cleanup: + vshDomainListFree(list); + return ret; +} + virInterfacePtr vshCommandOptInterfaceBy(vshControl *ctl, const vshCmd *cmd, const char *optname, @@ -1043,6 +1129,9 @@ cmdInterfaceUnbridge(vshControl *ctl, const vshCmd *cmd) xmlDocPtr xml_doc = NULL; xmlXPathContextPtr ctxt = NULL; xmlNodePtr top_node, if_node, cur; + int i; + size_t inuse_count; + char **inuse_list = NULL; /* Get a handle to the original device */ if (!(br_handle = vshCommandOptInterfaceBy(ctl, cmd, "bridge", @@ -1084,6 +1173,16 @@ cmdInterfaceUnbridge(vshControl *ctl, const vshCmd *cmd) } VIR_FREE(if_name); + if (vshBridgeInUse(ctl, br_name, &inuse_list)) { + inuse_count = virStringListLength(inuse_list); + vshPrint(ctl, "The bridge %s is in use by other guests:", br_name); + for (i = 0; i < inuse_count; i++) + vshPrint(ctl, "%s %s", i != 0 ? "," : "", inuse_list[i]); + vshPrint(ctl, "\n"); + virStringFreeList(inuse_list); + goto cleanup; + } + /* Find the <bridge> node under <interface>. */ if (virXPathNode("./bridge", ctxt) == NULL) { vshError(ctl, "%s", _("No bridge node in xml document")); -- 1.8.4

1 0

[libvirt] [PATCH v3 2/2] network: Add code for setting network bandwidth for ethernet interfaces
by Anirban Chakraborty 11 Oct '14

11 Oct '14

Signed-off-by: Anirban Chakraborty <abchak(a)juniper.net> --- src/conf/domain_conf.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index f03599e..91da1ec 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2852,7 +2852,8 @@ static inline bool virNetDevSupportBandwidth(int type) { return ((type == VIR_DOMAIN_NET_TYPE_BRIDGE || type == VIR_DOMAIN_NET_TYPE_NETWORK || - type == VIR_DOMAIN_NET_TYPE_DIRECT) ? true : false); + type == VIR_DOMAIN_NET_TYPE_DIRECT || + type == VIR_DOMAIN_NET_TYPE_ETHERNET) ? true : false); }; #endif /* __DOMAIN_CONF_H */ -- 1.9.1

2 9

[libvirt] [PowerPC Patch 0/4] Libvirt CPU enhancements for Power KVM
by Prerna Saxena 10 Oct '14

10 Oct '14

This patch series is a collection of enhancements for PowerPC CPUs on PowerKVM. Series Summary: ========== Patch 1/4 : Introduce a new architecture 'ppc64le' for libvirt. Patch 2/4 : Add libvirt support for VMs running in 'compat' mode on Power KVM. Patch 3/4 : Optimize PVR comparison for PowerPC CPUs. Patch 4/4 : Correctly model available CPUs in response to PowerPC QEMU implementation. Detail: ==== * PowerPC has traditionally been a Big-endian architecture. However, with PowerPC ISA version 2.07, it can run in Little-endian mode as well. IBM Power8 processors, compliant with ISA 2.07 allow launching VMs in little-endian mode. This is signified by 'ppc64le' architecture. Patch 1 adds this support to libvirt, to allow running VMs based on ppc64le architecture. * Patch 2-4 tweak libvirt to correctly model PowerPC CPUs based on recent PowerKVM implementation. PowerKVM permits VMs with vcpus in the following allowed modes : i) Host native mode: where the vcpu seen in the VM belongs to the same processor generation as the host. Example: A power8 host, conforming to PowerISA version 2.07, will run VMs with "power8" vcpus. ii) Binary Compatibility ("compat") mode: PowerISA allows processors to run VMs in binary compatibility ("compat") mode supporting an older version of ISA. As an example: In compatibility mode, a POWER8 host can run a "power7" VM conforming to PowerISA v2.06, while a POWER7 host can run a "power6" VM, conforming to power ISA v2.05. QEMU has recently added support to explicitly denote a VM running in compatibility mode through commits 6d9412ea & 8dfa3a5e85. Henceforth, VMs of type (i) will be invoked with the QEMU invocation "-cpu host", while VMs of type (ii) will be invoked using "-cpu host, compat=power6". Now, an explicit cpu selection using "-cpu POWER6" is moot, and the recommended practice is to use the matching compat mode, if the requested cpu type differs from the host. Patches 2-4 address various aspects of this change. * Patch 2 : Adds support for generating the correct command line for QEMU. New xml semantics are introduced to signify this type. * Patch 3 : PowerKVM vCPUs differ uniquely across generations ( such as power6, power7, power8). Each generation signifies a new PowerISA version that exhibits features unique to that generation. The higher order 16 bits of PVR denote the processor generation and the lower order 16 bits denote the cpu chip (sub)version. For all practical purposes of launching a VM, we care about the generation the vCPU will belong to, and not specifically the chip version. In fact, PowerKVM does not seek out specification of a unique chip version(such as POWER7_v2.3) for running a vCPU. This patch updates the libvirt PVR check to reflect this relationship. * Patch 4: As specified in QEMU commit 8dfa3a5e85, the supported modes for a "compat" CPU are power6/power7/power8. This patch amends cpu_map.xml to understand these modes. PPC64 CPU Test cases are also updated accordingly. This patch also includes a test case for compat mode, introduced in patch 2. Changelog: ====== Patch 1/4 : This is v1. Patch 2/4 : Rebased initial patch https://www.redhat.com/archives/libvir-list/2014-June/msg01338.html Patch 3/4, 4/4 : This is v2, addressing response https://www.redhat.com/archives/libvir-list/2014-August/msg00859.html -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India

2 13

[libvirt] [PATCHv2 0/3] Save domain satus after change some parameters
by Shanzhi Yu 09 Oct '14

09 Oct '14

Related bug: https://bugzilla.redhat.com/show_bug.cgi?id=1146511 Also add BeginJob/EndJob in qemuDomainSetBlkioParameters, qemuDomainSetInterfaceParameters,qemuDomainSetNumaParameters Shanzhi Yu (3): qemu: save domain status after set the blkio parameters qemu: call qemuDomainObjBeginJob/qemuDomainObjEndJob in qemuDomainSetInterfaceParameters qemu: save domain status after set domain's numa parameters src/qemu/qemu_driver.c | 76 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 52 insertions(+), 24 deletions(-) -- 1.9.3

2 4

[libvirt] [PATCH V3 0/3] Some improvements for video model
by Wang Rui 09 Oct '14

09 Oct '14

From: Zeng Junliang <zengjunliang(a)huawei.com> http://www.redhat.com/archives/libvir-list/2014-July/msg00644.html diff to v2: - hide vram attribute silently instead of reporting an error. - introduce three new capabilities for vga.vgamem_mb, vmvga.vgamem_mb and qxl.vgamem_mb. - fix some error reported by building libvirt. Zeng Junliang (3): qemu: Hide vram attribute for some useless cases. qemu: Introduce vgamem attribute for video model qemu: Add secondary-vga support docs/formatdomain.html.in | 46 +++--- docs/schemas/domaincommon.rng | 6 + src/conf/domain_conf.c | 57 +++++++- src/conf/domain_conf.h | 3 + src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 17 +++ src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_command.c | 162 +++++++++++++++------ src/qemu/qemu_domain.c | 12 ++ tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 3 + tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 3 + tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 3 + tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 3 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 3 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 3 + tests/qemuhelptest.c | 10 +- ...qemuhotplug-console-compat-2+console-virtio.xml | 2 +- .../qemuxml2argv-console-compat-2.xml | 2 +- .../qemuxml2argv-controller-order.xml | 2 +- .../qemuxml2argv-graphics-listen-network.xml | 2 +- .../qemuxml2argv-graphics-listen-network2.xml | 2 +- .../qemuxml2argv-graphics-sdl-fullscreen.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml | 2 +- ...emuxml2argv-graphics-spice-agent-file-xfer.args | 5 +- ...qemuxml2argv-graphics-spice-agent-file-xfer.xml | 4 +- .../qemuxml2argv-graphics-spice-agentmouse.xml | 2 +- .../qemuxml2argv-graphics-spice-compression.args | 4 +- .../qemuxml2argv-graphics-spice-compression.xml | 4 +- .../qemuxml2argv-graphics-spice-listen-network.xml | 4 +- .../qemuxml2argv-graphics-spice-qxl-vga.args | 4 +- .../qemuxml2argv-graphics-spice-qxl-vga.xml | 4 +- .../qemuxml2argv-graphics-spice-sasl.args | 3 +- .../qemuxml2argv-graphics-spice-sasl.xml | 2 +- .../qemuxml2argv-graphics-spice-timeout.xml | 2 +- .../qemuxml2argv-graphics-spice.args | 5 +- .../qemuxml2argv-graphics-spice.xml | 4 +- .../qemuxml2argv-graphics-vnc-policy.xml | 2 +- .../qemuxml2argv-graphics-vnc-sasl.xml | 2 +- .../qemuxml2argv-graphics-vnc-secondary-vga.args | 7 + .../qemuxml2argv-graphics-vnc-secondary-vga.xml | 39 +++++ .../qemuxml2argv-graphics-vnc-socket.xml | 2 +- .../qemuxml2argv-graphics-vnc-std-vga.args | 4 + .../qemuxml2argv-graphics-vnc-std-vga.xml | 36 +++++ .../qemuxml2argv-graphics-vnc-tls.xml | 2 +- .../qemuxml2argv-graphics-vnc-vmware-svga.args | 4 + .../qemuxml2argv-graphics-vnc-vmware-svga.xml | 36 +++++ .../qemuxml2argv-graphics-vnc-websocket.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml | 2 +- .../qemuxml2argv-net-bandwidth.xml | 2 +- .../qemuxml2argv-pci-autoadd-addr.xml | 2 +- .../qemuxml2argv-pci-autoadd-idx.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-pci-bridge.xml | 2 +- .../qemuxml2argv-pcihole64-q35.args | 3 +- .../qemuxml2argv-pcihole64-q35.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-pseries-disk.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-q35.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-q35.xml | 2 +- .../qemuxml2argv-serial-spiceport.args | 4 +- .../qemuxml2argv-serial-spiceport.xml | 2 +- .../qemuxml2argv-video-device-pciaddr-default.args | 9 +- .../qemuxml2argv-video-device-pciaddr-default.xml | 6 +- tests/qemuxml2argvtest.c | 26 +++- .../qemuxml2xmlout-graphics-listen-network2.xml | 2 +- .../qemuxml2xmlout-graphics-spice-timeout.xml | 2 +- .../qemuxml2xmlout-pci-autoadd-addr.xml | 2 +- .../qemuxml2xmlout-pci-autoadd-idx.xml | 2 +- tests/qemuxml2xmloutdata/qemuxml2xmlout-q35.xml | 2 +- tests/qemuxml2xmltest.c | 3 + 68 files changed, 494 insertions(+), 121 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-secondary-vga.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-secondary-vga.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-std-vga.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-std-vga.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-vmware-svga.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-vmware-svga.xml -- 1.7.12.4

3 11

[libvirt] [PATCH] Fix leftover typo '&' -> '&&'
by Martin Kletzander 09 Oct '14

09 Oct '14

The actual origin of this so called typo are two commits. The first one was commit 72f8a7f that came up with the following condition: if ((i == 8) & (flags & VIR_QEMU_PROCESS_KILL_FORCE)) Fortunately this succeeded thanks to bool being (int)1 and VIR_QEMU_PROCESS_KILL_FORCE having the value of 1 << 0. The check was then moved and altered in 8fd38231179c394f07d8a26bcbf3a0faa5eeaf24 to current state: if ((i == 50) & force) that will work again (both sides of '&' being booleans), but since this was missed so many times, it may pose a problem in the future in case it gets copy-pasted again. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/util/virprocess.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 486123a..6266cbe 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -354,7 +354,7 @@ virProcessKillPainfully(pid_t pid, bool force) int signum; if (i == 0) { signum = SIGTERM; /* kindly suggest it should exit */ - } else if ((i == 50) & force) { + } else if ((i == 50) && force) { VIR_DEBUG("Timed out waiting after SIGTERM to process %lld, " "sending SIGKILL", (long long)pid); /* No SIGKILL kill on Win32 ! Use SIGABRT instead which our -- 2.1.2

2 1