- Devel - libvirt List Archives

[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 10 Oct '14

10 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

Re: [libvirt] Implementation of new features for Hyper-V Libvirt driver
by Eric Blake 09 Oct '14

09 Oct '14

[the original message got eaten by the moderator queue because of size violation] On 12/31/1969 05:00 PM, wrote: > Hi all, > > I've just submitted a set of 21 patchs for the implementation of new features in the hyperv libvirt driver. > For your convenience, I have attached to this email a document giving more details about this delivery. Rather than sending a 450k pdf describing the changes, just submit the changes themselves, one email per change. 'git send-email origin --cover-letter --annotate' can work miracles at giving you a chance to write a 0/21 cover letter that summarizes the rest of the series, and then 21 emails at one per patch. Doing it in this manner will make it much more likely that your series gets a timely review. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

2 1

[libvirt] [Question] capabilities.pidfile is left behind while starting and stopping libvirtd repeatly
by Wang Yufei 09 Oct '14

09 Oct '14

Hi, all I started and stopped libvirtd service repeatly with high frequency(1 per second), and found that the file capabilities.pidfile is left behind, as well as a qemu process. If I then restart libvirtd, qemu-kvm will fail to start as it's unable to flock capabilities.pidfile's fd. Steps to reproduce the problem: 1. start libvirtd service per second with a shell script. 2. meanwhile, stop libvirtd service per second with another shell script. 3. then, a process qemu is left behind: /usr/bin/qemu-kvm -S -no-user-config -nodefaults -nographic -M none -qmp unix:/var/lib/libvirt/qemu/capabilities.monitor.sock,server,nowait -pidfile /var/lib/libvirt/qemu/capabilities.pidfile -daemonize 4. file /var/lib/libvirt/qemu/capabilities.pidfile is left behind 5. start libvirtd again, the process qemu-kvm fails to start. The cause of the problem: This file is generated by qemu, and deleted by libvirtd. If libvirtd got killed before it removes the pidfile, it would be left behind then. Question: Would it be fine if I kill qemu-kvm process and unlink capabilities.pidfile, just before virQEMUCapsInitQMP runs this qemu-kvm process? -- Best Regards Wang Yufei

4 5

[libvirt] [PATCH v3 0/3] Add support for shared memory devices
by Martin Kletzander 09 Oct '14

09 Oct '14

v3: - removed the dead code for server start attribute - fixed default path in documentation - removed unnecessary check for shmem size v2 is here: https://www.redhat.com/archives/libvir-list/2014-September/msg01519.html v1 (Maxime's) is here: https://www.redhat.com/archives/libvir-list/2014-August/msg01032.html Martin Kletzander (2): docs, conf, schema: add support for shmem device qemu: Build command line for ivshmem device Maxime Leroy (1): qemu: add capability probing for ivshmem device docs/formatdomain.html.in | 52 ++++++ docs/schemas/domaincommon.rng | 39 ++++ src/conf/domain_conf.c | 198 ++++++++++++++++++++- src/conf/domain_conf.h | 24 +++ src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 118 +++++++++++- src/qemu/qemu_command.h | 1 + src/qemu/qemu_hotplug.c | 1 + tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 1 + tests/qemuhelptest.c | 15 +- .../qemuxml2argv-shmem-invalid-size.xml | 24 +++ .../qemuxml2argv-shmem-msi-only.xml | 24 +++ .../qemuxml2argv-shmem-small-size.xml | 24 +++ tests/qemuxml2argvdata/qemuxml2argv-shmem.args | 16 ++ tests/qemuxml2argvdata/qemuxml2argv-shmem.xml | 51 ++++++ tests/qemuxml2argvtest.c | 7 + tests/qemuxml2xmltest.c | 1 + 24 files changed, 598 insertions(+), 7 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-shmem-invalid-size.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-shmem-msi-only.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-shmem-small-size.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-shmem.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-shmem.xml -- 2.1.1

5 16