- Devel - libvirt List Archives

[libvirt] [PATCH] Add support for firewalld
by Thomas Woerner 24 Apr '12

24 Apr '12

Add support for firewalld * bridge_driver, nwfilter_driver: new dbus filters to get FirewallD1.Reloaded signal and DBus.NameOwnerChanged on org.fedoraproject.FirewallD1 * iptables, ebtables, nwfilter_ebiptables_driver: use firewall-cmd direct passthrough interface --- configure.ac | 9 ++++++ src/Makefile.am | 8 ++--- src/network/bridge_driver.c | 50 +++++++++++++++++++++++++++++ src/nwfilter/nwfilter_driver.c | 49 ++++++++++++++++++++++++++++ src/nwfilter/nwfilter_ebiptables_driver.c | 27 ++++++++++++++++ src/util/ebtables.c | 32 ++++++++++++++++++ src/util/iptables.c | 25 ++++++++++++--- 7 files changed, 192 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 89fe818..41d9371 100644 --- a/configure.ac +++ b/configure.ac @@ -1191,6 +1191,15 @@ AM_CONDITIONAL([HAVE_POLKIT1], [test "x$with_polkit1" = "xyes"]) AC_SUBST([POLKIT_CFLAGS]) AC_SUBST([POLKIT_LIBS]) +dnl firewalld +AC_ARG_WITH([firewalld], + AC_HELP_STRING([--with-firewalld], [enable firewalld support])) +if test "x$with_firewalld" = "xyes" ; then + AC_DEFINE_UNQUOTED([HAVE_FIREWALLD], [1], [whether firewalld support is enabled]) +fi +AM_CONDITIONAL([HAVE_FIREWALLD], [test "x$with_firewalld" = "xyes"]) + + dnl Avahi library AC_ARG_WITH([avahi], AC_HELP_STRING([--with-avahi], [use avahi to advertise remote daemon @<:@default=check@:>@]), diff --git a/src/Makefile.am b/src/Makefile.am index e48dfa5..e60a8af 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -941,9 +941,9 @@ noinst_LTLIBRARIES += libvirt_driver_network.la #libvirt_la_BUILT_LIBADD += libvirt_driver_network.la endif libvirt_driver_network_la_CFLAGS = \ - -I$(top_srcdir)/src/conf $(AM_CFLAGS) + -I$(top_srcdir)/src/conf $(AM_CFLAGS) $(DBUS_CFLAGS) if WITH_DRIVER_MODULES -libvirt_driver_network_la_LIBADD = ../gnulib/lib/libgnu.la +libvirt_driver_network_la_LIBADD = ../gnulib/lib/libgnu.la $(DBUS_LIBS) libvirt_driver_network_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) endif libvirt_driver_network_la_SOURCES = $(NETWORK_DRIVER_SOURCES) @@ -1086,9 +1086,9 @@ libvirt_la_BUILT_LIBADD += libvirt_driver_nwfilter.la noinst_LTLIBRARIES += libvirt_driver_nwfilter.la endif libvirt_driver_nwfilter_la_CFLAGS = $(LIBPCAP_CFLAGS) \ - -I$(top_srcdir)/src/conf $(AM_CFLAGS) + -I$(top_srcdir)/src/conf $(AM_CFLAGS) $(DBUS_CFLAGS) libvirt_driver_nwfilter_la_LDFLAGS = $(LD_AMFLAGS) -libvirt_driver_nwfilter_la_LIBADD = $(LIBPCAP_LIBS) +libvirt_driver_nwfilter_la_LIBADD = $(LIBPCAP_LIBS) $(DBUS_LIBS) if WITH_DRIVER_MODULES libvirt_driver_nwfilter_la_LIBADD += ../gnulib/lib/libgnu.la libvirt_driver_nwfilter_la_LDFLAGS += -module -avoid-version diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index d82212f..094bbae 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -63,6 +63,11 @@ #include "virnetdevbridge.h" #include "virnetdevtap.h" +#if HAVE_FIREWALLD +#include "virdbus.h" +#include "logging.h" +#endif + #define NETWORK_PID_DIR LOCALSTATEDIR "/run/libvirt/network" #define NETWORK_STATE_DIR LOCALSTATEDIR "/lib/libvirt/network" @@ -253,6 +258,24 @@ networkAutostartConfigs(struct network_driver *driver) { } } +#if HAVE_FIREWALLD +static DBusHandlerResult +firewalld_dbus_filter_bridge(DBusConnection *connection ATTRIBUTE_UNUSED, DBusMessage *message, void *user_data) { + struct network_driver *_driverState = (struct network_driver *) user_data; + + if (dbus_message_is_signal(message, DBUS_INTERFACE_DBUS, + "NameOwnerChanged") || + dbus_message_is_signal(message, "org.fedoraproject.FirewallD1", + "Reloaded")) + { + VIR_DEBUG("Reload in bridge_driver because of firewalld."); + networkReloadIptablesRules(_driverState); + } + + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; +} +#endif + /** * networkStartup: * @@ -262,6 +285,9 @@ static int networkStartup(int privileged) { uid_t uid = geteuid(); char *base = NULL; +#ifdef HAVE_FIREWALLD + DBusConnection *sysbus = NULL; +#endif if (VIR_ALLOC(driverState) < 0) goto error; @@ -326,6 +352,30 @@ networkStartup(int privileged) { networkDriverUnlock(driverState); +#ifdef HAVE_FIREWALLD + if (!(sysbus = virDBusGetSystemBus())) { + virErrorPtr err = virGetLastError(); + VIR_WARN("DBus not available, disabling firewalld support in bridge_driver: %s", err->message); + } else { + /* add matches for + * NameOwnerChanged on org.freedesktop.DBus for firewalld start/stop + * Reloaded on org.fedoraproject.FirewallD1 for firewalld reload + */ + dbus_bus_add_match(sysbus, + "type='signal'" + ",interface='"DBUS_INTERFACE_DBUS"'" + ",member='NameOwnerChanged'" + ",arg0='org.fedoraproject.FirewallD1'", + NULL); + dbus_bus_add_match(sysbus, + "type='signal'" + ",interface='org.fedoraproject.FirewallD1'" + ",member='Reloaded'", + NULL); + dbus_connection_add_filter(sysbus, firewalld_dbus_filter_bridge, (void *)driverState, NULL); + } +#endif + return 0; out_of_memory: diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index ffb4b5d..da9f4a0 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -27,6 +27,11 @@ #include <config.h> +#if HAVE_FIREWALLD +#include "virdbus.h" +#include "logging.h" +#endif + #include "internal.h" #include "virterror_internal.h" @@ -47,6 +52,8 @@ static virNWFilterDriverStatePtr driverState; static int nwfilterDriverShutdown(void); +static int nwfilterDriverReload(void); + static void nwfilterDriverLock(virNWFilterDriverStatePtr driver) { virMutexLock(&driver->lock); @@ -57,6 +64,22 @@ static void nwfilterDriverUnlock(virNWFilterDriverStatePtr driver) } +#if HAVE_FIREWALLD +static DBusHandlerResult +firewalld_dbus_filter_nwfilter(DBusConnection *connection ATTRIBUTE_UNUSED, DBusMessage *message, void *user_data ATTRIBUTE_UNUSED) { + if (dbus_message_is_signal(message, DBUS_INTERFACE_DBUS, + "NameOwnerChanged") || + dbus_message_is_signal(message, "org.fedoraproject.FirewallD1", + "Reloaded")) + { + VIR_DEBUG("Reload in nwfilter_driver because of firewalld."); + nwfilterDriverReload(); + } + + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; +} +#endif + /** * virNWFilterStartup: * @@ -66,6 +89,32 @@ static int nwfilterDriverStartup(int privileged) { char *base = NULL; +#ifdef HAVE_FIREWALLD + DBusConnection *sysbus = NULL; + + if (!(sysbus = virDBusGetSystemBus())) { + virErrorPtr err = virGetLastError(); + VIR_WARN("DBus not available, disabling firewalld support in nwfilter_driver: %s", err->message); + } else { + /* add matches for + * NameOwnerChanged on org.freedesktop.DBus for firewalld start/stop + * Reloaded on org.fedoraproject.FirewallD1 for firewalld reload + */ + dbus_bus_add_match(sysbus, + "type='signal'" + ",interface='"DBUS_INTERFACE_DBUS"'" + ",member='NameOwnerChanged'" + ",arg0='org.fedoraproject.FirewallD1'", + NULL); + dbus_bus_add_match(sysbus, + "type='signal'" + ",interface='org.fedoraproject.FirewallD1'" + ",member='Reloaded'", + NULL); + dbus_connection_add_filter(sysbus, firewalld_dbus_filter_nwfilter, NULL, NULL); + } +#endif + if (virNWFilterLearnInit() < 0) return -1; diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index 8e4436f..0cd047a 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -4051,6 +4051,7 @@ ebiptablesDriverInit(bool privileged) { virBuffer buf = VIR_BUFFER_INITIALIZER; char *errmsg = NULL; + char *firewall_cmd_path = NULL; if (!privileged) return 0; @@ -4061,6 +4062,30 @@ ebiptablesDriverInit(bool privileged) gawk_cmd_path = virFindFileInPath("gawk"); grep_cmd_path = virFindFileInPath("grep"); + firewall_cmd_path = virFindFileInPath("firewall-cmd"); + if (firewall_cmd_path) { + virBufferAsprintf(&buf, "IPT=%s\n", firewall_cmd_path); + /* basic probing */ + virBufferAsprintf(&buf, + CMD_DEF("$IPT --state") CMD_SEPARATOR + CMD_EXEC + "%s", + CMD_STOPONERR(1)); + + if (ebiptablesExecCLI(&buf, NULL, NULL) >= 0) { + VIR_DEBUG("Using firewall-cmd in nwfilter_ebiptables_driver."); + ebtables_cmd_path = NULL; + iptables_cmd_path = NULL; + ip6tables_cmd_path = NULL; + virAsprintf(&ebtables_cmd_path, "%s --direct --passthrough eb", firewall_cmd_path); + virAsprintf(&iptables_cmd_path, "%s --direct --passthrough ipv4", firewall_cmd_path); + virAsprintf(&ip6tables_cmd_path, "%s --direct --passthrough ipv6", firewall_cmd_path); + } + VIR_FREE(firewall_cmd_path); + } + if (ebtables_cmd_path == NULL || iptables_cmd_path == NULL || + ip6tables_cmd_path == NULL) { + ebtables_cmd_path = virFindFileInPath("ebtables"); if (ebtables_cmd_path) { NWFILTER_SET_EBTABLES_SHELLVAR(&buf); @@ -4099,6 +4124,8 @@ ebiptablesDriverInit(bool privileged) VIR_WARN("Could not find 'iptables' executable"); } + } + ip6tables_cmd_path = virFindFileInPath("ip6tables"); if (ip6tables_cmd_path) { NWFILTER_SET_IP6TABLES_SHELLVAR(&buf); diff --git a/src/util/ebtables.c b/src/util/ebtables.c index dcb3eb9..b7773ea 100644 --- a/src/util/ebtables.c +++ b/src/util/ebtables.c @@ -176,11 +176,34 @@ ebtablesAddRemoveRule(ebtRules *rules, int action, const char *arg, ...) const char *s; int n, command_idx; +#if HAVE_FIREWALLD + int ret; + char *firewall_cmd_path = NULL; + virCommandPtr cmd = NULL; + + firewall_cmd_path = virFindFileInPath("firewall-cmd"); + if (firewall_cmd_path) { + cmd = virCommandNew(firewall_cmd_path); + virCommandAddArgList(cmd, "--state", NULL); + ret = virCommandRun(cmd, NULL); + if (ret != 0) { + VIR_FREE(firewall_cmd_path); + firewall_cmd_path = NULL; + } + virCommandFree(cmd); + } +#endif + n = 1 + /* /sbin/ebtables */ 2 + /* --table foo */ 2 + /* --insert bar */ 1; /* arg */ +#if HAVE_FIREWALLD + if (firewall_cmd_path) + n += 3; /* --direct --passthrough eb */ +#endif + va_start(args, arg); while (va_arg(args, const char *)) n++; @@ -192,6 +215,15 @@ ebtablesAddRemoveRule(ebtRules *rules, int action, const char *arg, ...) n = 0; +#if HAVE_FIREWALLD + if (firewall_cmd_path) { + if (!(argv[n++] = strdup(firewall_cmd_path))) + goto error; + argv[n++] = strdup("--direct"); + argv[n++] = strdup("--passthrough"); + argv[n++] = strdup("eb"); + } else +#endif if (!(argv[n++] = strdup(EBTABLES_PATH))) goto error; diff --git a/src/util/iptables.c b/src/util/iptables.c index 3023900..0cb3293 100644 --- a/src/util/iptables.c +++ b/src/util/iptables.c @@ -104,11 +104,28 @@ iptablesAddRemoveRule(iptRules *rules, int family, int action, { va_list args; int ret; - virCommandPtr cmd; + virCommandPtr cmd = NULL; const char *s; - - cmd = virCommandNew((family == AF_INET6) - ? IP6TABLES_PATH : IPTABLES_PATH); + char *firewall_cmd_path = NULL; + +#if HAVE_FIREWALLD + firewall_cmd_path = virFindFileInPath("firewall-cmd"); + if (firewall_cmd_path) { + cmd = virCommandNew(firewall_cmd_path); + virCommandAddArgList(cmd, "--state", NULL); + ret = virCommandRun(cmd, NULL); + if (ret == 0) { + cmd = virCommandNew(firewall_cmd_path); + virCommandAddArgList(cmd, "--direct", "--passthrough", + (family == AF_INET6) ? "ipv6" : "ipv4", NULL); + } else + cmd = NULL; + VIR_FREE(firewall_cmd_path); + } + if (!cmd) +#endif + cmd = virCommandNew((family == AF_INET6) + ? IP6TABLES_PATH : IPTABLES_PATH); virCommandAddArgList(cmd, "--table", rules->table, action == ADD ? "--insert" : "--delete", -- 1.7.10

3 7

[libvirt] [PATCH] keepalive: Add ability to disable keepalive messages
by Peter Krempa 24 Apr '12

24 Apr '12

The docs for virConnectSetKeepAlive() advertise that this function should be able to disable keepalives on negative or zero interval time. This patch removes the check that prohibited this and adds code to disable keepalives on negative/zero interval. * src/libvirt.c: virConnectSetKeepAlive(): - remove check for negative values * src/rpc/virnetclient.c * src/rpc/virnetclient.h: - add virNetClientKeepAliveStop() to disable keepalive messages * src/remote/remote_driver.c: remoteSetKeepAlive(): -add ability to disable keepalives --- src/libvirt.c | 6 ------ src/remote/remote_driver.c | 7 ++++++- src/rpc/virnetclient.c | 8 ++++++++ src/rpc/virnetclient.h | 2 ++ 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index af42d3b..3f043e1 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -18452,12 +18452,6 @@ int virConnectSetKeepAlive(virConnectPtr conn, return -1; } - if (interval <= 0) { - virLibConnError(VIR_ERR_INVALID_ARG, - _("negative or zero interval make no sense")); - goto error; - } - if (conn->driver->setKeepAlive) { ret = conn->driver->setKeepAlive(conn, interval, count); if (ret < 0) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index af46384..7863b73 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -4631,7 +4631,12 @@ remoteSetKeepAlive(virConnectPtr conn, int interval, unsigned int count) goto cleanup; } - ret = virNetClientKeepAliveStart(priv->client, interval, count); + if (interval > 0) { + ret = virNetClientKeepAliveStart(priv->client, interval, count); + } else { + virNetClientKeepAliveStop(priv->client); + ret = 0; + } cleanup: remoteDriverUnlock(priv); diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 33b7701..2629c14 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -248,6 +248,14 @@ virNetClientKeepAliveStart(virNetClientPtr client, return ret; } +void +virNetClientKeepAliveStop(virNetClientPtr client) +{ + virNetClientLock(client); + virKeepAliveStop(client->keepalive); + virNetClientUnlock(client); +} + static void virNetClientKeepAliveDeadCB(void *opaque) { diff --git a/src/rpc/virnetclient.h b/src/rpc/virnetclient.h index 7c30d2b..13b4f96 100644 --- a/src/rpc/virnetclient.h +++ b/src/rpc/virnetclient.h @@ -104,4 +104,6 @@ int virNetClientKeepAliveStart(virNetClientPtr client, int interval, unsigned int count); +void virNetClientKeepAliveStop(virNetClientPtr client); + #endif /* __VIR_NET_CLIENT_H__ */ -- 1.7.3.4

2 1

[libvirt] [PATCH] fix memleak in linuxParseCPUmap
by Hu Tao 24 Apr '12

24 Apr '12

--- src/nodeinfo.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 7e993a9..e842474 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -605,6 +605,7 @@ linuxParseCPUmap(int *max_cpuid, const char *path) } *max_cpuid = max_id; + VIR_FREE(str); return map; error: -- 1.7.1

2 1

[libvirt] [PATCH 0/5] -no-user-config option, move CPU models to /usr/share
by Eduardo Habkost 24 Apr '12

24 Apr '12

This is the first try of the new -no-user-config option. Patches 1 to 3 just move some code around, patch 4 just adds the new option without adding any new config file. Patch 5 finally creates a /usr/share/qemu /cpus-x86_64.conf file, with the CPU models we currently have on Qemu. Reference to previous discussion: - http://marc.info/?l=qemu-devel&m=133278877315665 This series depends on the following: Subject: [PATCH v5 00/14] configure: --with-confsuffix option Message-Id: <1334778950-18660-1-git-send-email-ehabkost(a)redhat.com> Eduardo Habkost (5): move code to read default config files to a separate function eliminate arch_config_name variable move list of default config files to an array implement -no-user-config command-line option move CPU definitions to /usr/share/qemu/cpus-x86_64.conf Makefile | 12 +++- arch_init.c | 31 ++++++++- arch_init.h | 6 +- qemu-options.hx | 16 ++++- sysconfigs/target/cpus-x86_64.conf | 128 ++++++++++++++++++++++++++++++++++ sysconfigs/target/target-x86_64.conf | 128 ---------------------------------- vl.c | 14 ++-- 7 files changed, 190 insertions(+), 145 deletions(-) create mode 100644 sysconfigs/target/cpus-x86_64.conf -- 1.7.3.2

3 7

[libvirt] [PATCH v2] Improve on virAtomic implementation
by Stefan Berger 24 Apr '12

24 Apr '12

This patch improves the previously added virAtomicInt implementation by using gcc-builtins if possible. The needed builtins are available since GCC >= 4.1. At least the 4.0 docs don't mention them. --- src/util/viratomic.h | 95 ++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 79 insertions(+), 16 deletions(-) Index: libvirt-acl/src/util/viratomic.h =================================================================== --- libvirt-acl.orig/src/util/viratomic.h +++ libvirt-acl/src/util/viratomic.h @@ -30,6 +30,29 @@ typedef struct _virAtomicInt virAtomicInt; typedef virAtomicInt *virAtomicIntPtr; +# define __VIR_ATOMIC_USES_LOCK + +# if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 1)) || (__GNUC__ > 4) +# undef __VIR_ATOMIC_USES_LOCK +# endif + +static inline int virAtomicIntInit(virAtomicIntPtr vaip) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; +static inline int virAtomicIntRead(virAtomicIntPtr vaip) + ATTRIBUTE_NONNULL(1); +static inline void virAtomicIntSet(virAtomicIntPtr vaip, int val) + ATTRIBUTE_NONNULL(1); +static inline int virAtomicIntAdd(virAtomicIntPtr vaip, int add) + ATTRIBUTE_NONNULL(1); +static inline int virAtomicIntSub(virAtomicIntPtr vaip, int add) + ATTRIBUTE_NONNULL(1); +static inline int virAtomicIntInc(virAtomicIntPtr vaip) + ATTRIBUTE_NONNULL(1); +static inline int virAtomicIntDec(virAtomicIntPtr vaip) + ATTRIBUTE_NONNULL(1); + +# ifdef __VIR_ATOMIC_USES_LOCK + struct _virAtomicInt { virMutex lock; int value; @@ -42,22 +65,6 @@ virAtomicIntInit(virAtomicIntPtr vaip) return virMutexInit(&vaip->lock); } -static inline void -virAtomicIntSet(virAtomicIntPtr vaip, int value) -{ - virMutexLock(&vaip->lock); - - vaip->value = value; - - virMutexUnlock(&vaip->lock); -} - -static inline int -virAtomicIntRead(virAtomicIntPtr vaip) -{ - return vaip->value; -} - static inline int virAtomicIntAdd(virAtomicIntPtr vaip, int add) { @@ -88,4 +95,60 @@ virAtomicIntSub(virAtomicIntPtr vaip, in return ret; } +# else /* __VIR_ATOMIC_USES_LOCK */ + +struct _virAtomicInt { + int value; +}; + +static inline int +virAtomicIntInit(virAtomicIntPtr vaip) +{ + vaip->value = 0; + return 0; +} + +static inline int +virAtomicIntAdd(virAtomicIntPtr vaip, int add) +{ + return __sync_add_and_fetch(&vaip->value, add); +} + +static inline int +virAtomicIntSub(virAtomicIntPtr vaip, int sub) +{ + return __sync_sub_and_fetch(&vaip->value, sub); +} + +# endif /* __VIR_ATOMIC_USES_LOCK */ + + + +/* common operations that need no locking or build on others */ + + +static inline void +virAtomicIntSet(virAtomicIntPtr vaip, int value) +{ + vaip->value = value; +} + +static inline int +virAtomicIntRead(virAtomicIntPtr vaip) +{ + return *(volatile int *)&vaip->value; +} + +static inline int +virAtomicIntInc(virAtomicIntPtr vaip) +{ + return virAtomicIntAdd(vaip, 1); +} + +static inline int +virAtomicIntDec(virAtomicIntPtr vaip) +{ + return virAtomicIntSub(vaip, 1); +} + #endif /* __VIR_ATOMIC_H */

3 3

[libvirt] [PATCH] docs: Update libvirt-daemon-arch figure
by Michal Privoznik 24 Apr '12

24 Apr '12

Currently, we are showing libvirt client contains qemu and lxc drivers. This is not correct as qemu and lxc drivers are always accessed via remote driver. Therefore we need to substitute those two so we don't confuse users. I've chosen vbox and vmware. --- docs/libvirt-daemon-arch.fig | 62 +++++++++++++++++++++--------------------- docs/libvirt-daemon-arch.png | Bin 16479 -> 8070 bytes 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/docs/libvirt-daemon-arch.fig b/docs/libvirt-daemon-arch.fig index 53e9c6d..d352583 100644 --- a/docs/libvirt-daemon-arch.fig +++ b/docs/libvirt-daemon-arch.fig @@ -1,72 +1,72 @@ -#FIG 3.2 Produced by xfig version 3.2.5 +#FIG 3.2 Produced by xfig version 3.2.5b Landscape Center Inches -Letter +Letter 100.00 Single -2 1200 2 -6 75 150 13050 5100 +6 75 150 13050 5025 6 4425 764 5938 1150 2 2 0 1 0 7 50 -1 -1 4.000 0 0 7 0 0 5 4425 764 5938 764 5938 1150 4425 1150 4425 764 -4 0 0 50 -1 16 15 0.0000 4 131 415 4519 1053 xen\001 +4 0 0 50 -1 16 15 0.0000 4 135 390 4519 1053 xen\001 -6 6 4425 1246 5938 1631 2 2 0 1 0 7 50 -1 -1 4.000 0 0 7 0 0 5 4425 1246 5938 1246 5938 1631 4425 1631 4425 1246 -4 0 0 50 -1 16 15 0.0000 4 178 640 4519 1535 qemu\001 +4 0 0 50 -1 16 15 0.0000 4 180 510 4519 1535 vbox\001 -6 6 4425 1728 5938 2113 2 2 0 1 0 7 50 -1 -1 4.000 0 0 7 0 0 5 4425 1728 5938 1728 5938 2113 4425 2113 4425 1728 -4 0 0 50 -1 16 15 0.0000 4 178 829 4519 2017 openvz\001 +4 0 0 50 -1 16 15 0.0000 4 195 780 4519 2017 openvz\001 -6 6 4425 2210 5938 2595 2 2 0 1 0 7 50 -1 -1 4.000 0 0 7 0 0 5 4425 2210 5938 2210 5938 2595 4425 2595 4425 2210 -4 0 0 50 -1 16 15 0.0000 4 178 320 4519 2499 lxc\001 +4 0 0 50 -1 16 15 0.0000 4 135 855 4519 2499 vmware\001 -6 6 4425 2691 5938 3077 2 2 0 1 0 7 50 -1 -1 4.000 0 0 7 0 0 5 4425 2691 5938 2691 5938 3077 4425 3077 4425 2691 -4 0 0 50 -1 16 15 0.0000 4 166 415 4519 2980 test\001 --6 -6 4425 3173 5938 3559 -2 2 0 1 0 7 50 -1 -1 4.000 0 0 7 0 0 5 - 4425 3173 5938 3173 5938 3559 4425 3559 4425 3173 -4 0 0 50 -1 16 15 0.0000 4 166 794 4519 3462 remote\001 +4 0 0 50 -1 16 15 0.0000 4 165 405 4519 2980 test\001 -6 6 11328 764 12842 1150 2 2 0 1 0 7 50 -1 -1 4.000 0 0 7 0 0 5 11328 764 12842 764 12842 1150 11328 1150 11328 764 -4 0 0 50 -1 16 15 0.0000 4 131 415 11423 1053 xen\001 +4 0 0 50 -1 16 15 0.0000 4 135 390 11423 1053 xen\001 -6 6 11328 1246 12842 1631 2 2 0 1 0 7 50 -1 -1 4.000 0 0 7 0 0 5 11328 1246 12842 1246 12842 1631 11328 1631 11328 1246 -4 0 0 50 -1 16 15 0.0000 4 178 640 11423 1535 qemu\001 +4 0 0 50 -1 16 15 0.0000 4 195 615 11423 1535 qemu\001 -6 6 11328 1728 12842 2113 2 2 0 1 0 7 50 -1 -1 4.000 0 0 7 0 0 5 11328 1728 12842 1728 12842 2113 11328 2113 11328 1728 -4 0 0 50 -1 16 15 0.0000 4 178 829 11423 2017 openvz\001 +4 0 0 50 -1 16 15 0.0000 4 195 780 11423 2017 openvz\001 -6 6 11328 2210 12842 2595 2 2 0 1 0 7 50 -1 -1 4.000 0 0 7 0 0 5 11328 2210 12842 2210 12842 2595 11328 2595 11328 2210 -4 0 0 50 -1 16 15 0.0000 4 178 320 11423 2499 lxc\001 +4 0 0 50 -1 16 15 0.0000 4 180 285 11423 2499 lxc\001 -6 6 11328 2691 12842 3077 2 2 0 1 0 7 50 -1 -1 4.000 0 0 7 0 0 5 11328 2691 12842 2691 12842 3077 11328 3077 11328 2691 -4 0 0 50 -1 16 15 0.0000 4 166 415 11423 2980 test\001 +4 0 0 50 -1 16 15 0.0000 4 165 405 11423 2980 test\001 -6 6 11328 3173 12842 3559 2 2 0 1 0 7 50 -1 -1 4.000 0 0 7 0 0 5 11328 3173 12842 3173 12842 3559 11328 3559 11328 3173 -4 0 0 50 -1 16 15 0.0000 4 166 794 11423 3462 remote\001 +4 0 0 50 -1 16 15 0.0000 4 165 765 11423 3462 remote\001 +-6 +6 4425 3173 5938 3559 +2 2 0 1 0 7 50 -1 -1 4.000 0 0 7 0 0 5 + 4425 3173 5938 3173 5938 3559 4425 3559 4425 3173 +4 0 0 50 -1 16 15 0.0000 4 165 765 4519 3462 remote\001 -6 2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 75 1342 1587 1342 1587 2113 75 2113 75 1342 @@ -99,16 +99,16 @@ Single 10004 572 10004 3751 2 1 2 5 0 7 50 -1 -1 3.000 0 0 -1 0 0 2 10760 572 10760 3751 -4 0 0 50 -1 16 15 0.0000 4 225 1256 170 1728 Application\001 -4 0 0 50 -1 16 13 0.0000 4 154 367 1966 1631 URI\001 -4 0 0 50 -1 16 15 5.3233 4 178 1149 3763 4040 Driver API\001 -4 0 0 50 -1 16 15 5.3233 4 178 1173 3101 4040 Public API\001 -4 0 0 50 -1 16 15 5.3233 4 225 1233 4992 4040 Driver Impl\001 -4 0 0 50 -1 16 18 0.0000 4 213 652 3763 379 libvirt\001 -4 0 0 50 -1 16 13 0.0000 4 154 901 1966 2017 lxc://host/\001 -4 0 0 50 -1 16 15 0.0000 4 178 747 7734 1728 libvirtd\001 -4 0 0 50 -1 16 15 5.3233 4 178 1149 10666 4040 Driver API\001 -4 0 0 50 -1 16 15 5.3233 4 178 1173 10004 4040 Public API\001 -4 0 0 50 -1 16 15 5.3233 4 225 1233 11896 4040 Driver Impl\001 -4 0 0 50 -1 16 18 0.0000 4 213 652 10666 379 libvirt\001 +4 0 0 50 -1 16 15 0.0000 4 240 1170 170 1728 Application\001 +4 0 0 50 -1 16 13 0.0000 4 165 360 1966 1631 URI\001 +4 0 0 50 -1 16 15 5.3233 4 180 1095 3763 4040 Driver API\001 +4 0 0 50 -1 16 15 5.3233 4 180 1110 3101 4040 Public API\001 +4 0 0 50 -1 16 15 5.3233 4 240 1155 4992 4040 Driver Impl\001 +4 0 0 50 -1 16 18 0.0000 4 210 675 3763 379 libvirt\001 +4 0 0 50 -1 16 13 0.0000 4 165 885 1966 2017 lxc://host/\001 +4 0 0 50 -1 16 15 0.0000 4 180 675 7734 1728 libvirtd\001 +4 0 0 50 -1 16 15 5.3233 4 180 1095 10666 4040 Driver API\001 +4 0 0 50 -1 16 15 5.3233 4 180 1110 10004 4040 Public API\001 +4 0 0 50 -1 16 15 5.3233 4 240 1155 11896 4040 Driver Impl\001 +4 0 0 50 -1 16 18 0.0000 4 210 675 10666 379 libvirt\001 -6 diff --git a/docs/libvirt-daemon-arch.png b/docs/libvirt-daemon-arch.png index b7ed2f689112e45ffd5b108ed7a03f9808618d96..26a7abae2308cfa40057cc292f1fb73ea9feff2d 100644 GIT binary patch literal 8070 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 literal 16479 zcmeIZcT`hZ_%3`91q(<~2^|p|iZlx-1W*JVQBhEO2_S+>5fKtfAdDkLkXTSqnu35z z?<FBHLkXfZ=`~8Eh7dyt0Yb>PlbQM5Z{5GY@BVSu?6q7R4`;V`zvbEQ`w)Beikawk z+3gSniT-xsyd?w)N<+}5o8m&?&0ir7s^Eu^o4MI}F28NFWsQP2+wNVk3jjYa@c)^9 zzH7jH8FcTg=fC}-&!3!%Ajt6TZ|BcmM-5ZQ>f&y?*z5k9)sT~J^`riFUEF#N_t*B{ z&siLiePH(2EqLterGuFW<aebmLAU*CJ;l<=YCVV#XLYLYzSnHe`TY|4@psc6HR+h` zoE;qoy{RLCIOm0eGZtfOVb6P*_wzdH(0OzEtkW98Sboz03j*!i%BR3Be?Qjl*W^E7 z9{l$J{U-#V3;zk>KOy|*6aG(G0b-jlzhSZ2c)a5>-DJdLL=1uu+<ZBj8XNVB0|j9> z3qi%DlH#eUTSb6*ew3gYDU!UL1fb-Eo*v6_QdQySpt<1tmTe4%rL$xC_;JwPs!6Ya zC9?bsbdCQ`=eOm`KzNR&1qAKII>o94Wv4eRUQ*ryso44!_GM))u0)G58CmgcY{J|C znoCH`FgRv|#VWbuJScX)q|sjEY%-d>>dz&+4;=~F*X~@!<O)ELH0jP=^YXaRCOu8K zq%>4~($kYkl^$MS_EB|@S!}<|!OxuC9oazlXT7Abv+xAxf^hmqcbB1lJ|!4w6LLa9 zK5>LL-u#NmfuM$sHd$5-5&?UCZaY+YP`0Va1*xPeO0V7nkL>7ZV-yvAp(Zz;-1IvR zw{~M<gUxm|&Q(%eo7)CKzwq<^Sd?&3tORcj98t<Q459WDjk>J+INfAS@v`y)jnMI_ zR$vpDrL>d?pHLV)z+3L|%t!+{O9l9=iH)^jVD>oEQNgdt{OPA0(VtGVlJFmCX-vl> z@Rtj;FN{p$)f3;{7y9$^7V**1{h<IK%pdg^(^T9h0u8>IIlc75xCTzKyWVDdNqs7w zDi@+Kl9rLAExSmay7wggTK0I<O+m2DH_oFf<B>r;={qnMoK&-Zga=r)v1sNp0d?u= z2HZ1rJSy#7Tu{-`ag7iI^m_FeOBjL{Uti>P6WQ4&TpxInAGD!c@eO}Je0%o)^~0(u zWjmx<_>kWk8}CzAsuSz!a@p(6E^3qY8+TQ?lzRIC7)E1k3~s=0`sIb&pqthc=`UW~ zr`UvNC)Tg!Wv_Q~)g~<>hHKNIu-OellOBup#n=DpDK95~sKrv}r=RbXA*FL8Khbc* zpR#tvSm*5SeP?%XQ^6QKyO*%Jh3Z3*6)?JWU||-Q$$Y4kxX32?Id$F^r$O$gPpi^9 znwv`<q$352lfu{CVXZCK4#iJwx*4<M8Hw#o3E33<lJ=~>0>Y@Sezs`RBlCKFthab| zC{h3t%pc}KHH1wJ64S3XA<7rydv{<jB3Gk~oSk1epp8E<ZGplB0mbsVyh#ue!qvM_ z!+`}lDUS;b1A$`%E@HFt^7@&evvdmhs$CYKM9_@R0Ois&dcA9TDkl+(4Ga$GsRbP& ziX;sx;AyweVdGC077hb~U<KY23U5!U{OfVSfno&Ox@L9!+6uC=*1Fkjw9`_dd=i;_ zpE92xh(_o~M^6TDmVGF1Ajta-YC3pw1s~z!3kT8{i=SSr4I|JN><7++^$tF5Y_uF7 ze-+iqlj5J^2aM|Q-cG=|Xa}PX1JRjK-ZY3G7zc8!+L!KU!Q0^=OVJFN$b(oQlzbp1 zUi(KV7OK1M8vKFNGmaGi5;!m}VE+Ov_0Pg0^C2hlpZk14x58aCh<X75H9*<K?lC7y z2<RPu8829VkSFj&<vy*%wO_^IOFzy&RDz(v8@!DJ%aNX+&rh_N{-eO0CtH<&WvgZn zl>X97AXaK#{~rEQpqb}<@uU_fC1vAlK7RS~rJp%+a<V!t?d2k4+OlJ6m>Q}-HC2EG zZi<87;F{Gr;X86In3N`}j-S2KAuy{Dy`#GS3385Tg9Tn|UYoywwc145c%R2;XK9-_ zQ`gtVCObZAx%*lTX9KP3QeRj_s8OAy`UIyve0ZPTmuH!ts;}ggmYS%oXb3NGnO?38 zmxrL`NR+2qUW?x3s+d^dKKHR|Gkl{jf4vtU(iRF6yD{<K+=3d<BX)~2u}bE_fqRHG zqX{NkXtXb!5~uZu1sY|*p*L%0t#;fuD8dOyDESn<<KQtl+8-qoiu9eh=6&NpvjQ!$ zW?t`xN8S=;?h856e07FMbft~^v;tL%_pCr2ir)i#=-@F^-Z3zy6`yEFEth@@iFvRj z|2Qg4<l{~;F(x%h!~O8mx^kZ%sdC&9$YjezTD$GB@of`|%P;sAAp5wi#+b6WR369) z8i^Lmj#uu5!6t!3>Z%==Y#$4u)wHGKLd_83kw#07z(&$l#)sZ}kkj@qxElV3fS}un zQLNSAnn2WG+DJuA6k4PtAu43^RU$EaeZ2;RmY3R7b5E#1zbZZZP=};g397km958#_ zNlgfWsr9^66>Y9oC<XVheec^~n8vPf{<<*vWwl7sIL8J}lD<F2LgD?m3}8JMfnCeW z(t6`^HI#T8_W&E`w^`s8Ai){`&HpG-J1=;GwpRhz8Umwz$Xo58LfnT(IK8-Bun^qE zfAsXBlS`7e6nux6Si#+X>v`^w-L|kRSL_G2M(OE$I|)J<sw7RH_N(~HQp4`1X#$+5 zKW~?GYjJm-u-<dzi4|Z7>fn<i`HU(*VBtBJc!qTt?&Eeiu*!3}@u3iqcyV5np3z;N zlNcPbQ_bku=8y!IhBF0gP~k1xwtOcz{v-6AUBfm7NBQf9x;*$tGxbLuUacy9=g08@ zMf1t()YL==t)J^Z-UZens>$TV8UwhG(=G^ec^7{PDJi;&1r))?W_z81fk_5Bbfngl zKP@v*6=yiFJ_rkzHPAe-&>#rS@1S=u_TNvAs#S4Q<omDNALecYwYtP}fd89o`x<QD zMkLn8*IWg%<9kRSs_OeT*bTM0Zl@;Upp=^7NDsTOFeqJ8L)&A*WH}a$;q!fKyjRSf zr`iWRJqzygHf(`!-5m=PK%|)3H?bG4h;7b!yR=*H^lc|G1TvBK<bOHAMK&t155$nJ z1k|(J;u@t`p8Wb7{+7%)ncF}#^M~LGz=3?^`B<5MeHUMviKksPG|Ynotdf$F3Mf^1 zbL6#ID^(>W^VQV=RZ=~cO`#@WDO_VDZi8!HH<qHq45FW*^8gX&T8FdYRNF#-zy@1A zToHKO7bwr;O?t)p|C`&G6Y^J+T3PmysSUq()we#}sjaLm1jh@TAOciXF@uVnUuw&C zphelXsmI%j>eVM_Z=)kntEGhlt2HJD0L$&9ci4h~&+zr>gfwm8qKs(kVV*Dd(=jpT zOzcbW)VCxNs*~%-IOt&K&DJI0XU!g#Swq+K+$V3=udV{(I&sTAa9(jJ&s|`s?Qtl< z21x6Vs?o=aTFSB^vdej=&m8eM(ZGJ7gr&M&sCf4of;9j5=i_Z6$xl}V@}k8HH`e>Y zw`RSQG*+Z7SQiM-6K1yU5@m~Lh>5QC>FXzI%g&%{vBaPslV4`EcC&f~Y+2mC;Y`jJ z2qOiIQIghh1R$HG$D7Z)*ro3=-s-;7bWmfGA#NODVL>U?`<XQ9==4%ssv@Pmz@D_w zF)KS_B4|(v5aDz@4|k5-F+vJH9=f`4UvI9&D@F&%Jn4Uyi0~OZ4HJm^B>2wjZN$n| ztVmo`7_wu)OP4qi&`q8JAs~G1dRuZCk|AINe{V1+7il_gu^&UGFN~G}yWAavyvV5x zD1W`(>Vm-CyyKJ*=i-dE>AkYa7SY!!uglZds^RePvGj|~pl(b!^G+R$nz80PMubr< z+9yyD^mFg{kO+OJnnwH9_{Bf<4Y49loGq`-!Xh6GY@NXwrZ{~(bh<Z#nClVTKV-N1 z?s2+cF*Z{`3Vt!OS5pvkBVW$1kJ_6H3p?dh-%k`qlmR8y`)rD6$}}1q!9D-{<eeim z`rJz)ACd0IHQQB;Q*zUP_9xjD!5*!xlmx=xWv{XKK!d4j{$JOaD1$44twh%DE_;TA zG}BGp|Lh4#DKj(Xqi^_$9dN1Rcbqczg(x=fGq9t4uJ-l&GCjp%uQ5)t@y%rV`VG=q zK_Rb#FtO&*LXL5&KynlqQ<sU7%@t@!0#Lq3Kk{1Bg*Y}l<l1*OdySr(DQy0=*`=*B zgQDEzuZ-+Bazx^$DJ5PP7(ZM&1iC?nLEqhNO^nWtIU;%WT4%16cY6dERsVrh%1k}B zuNO_4#!l1e>mi0?7N>qNDQn9_ER&1VbIW9}-xwpY(y+y1QxQdGGH^8kjIwpgnU5NZ zu`4-pw52L{od4JR^y}q2_NAvZzh;(s`rFr`n;gbgP7Kpm^;QIW02Z@1*M4-}v1_3t z4Hht`VZXn6<l!Wxh%%yNkhr*x4^IoMa<IWW@4w|tQ1e)NidFh!MnVbxlSDWcn?|A3 zM(Txz>l}B`d1_%nruzy86IKKsD=uH_T=3sEMwSsU!uvUXPvFE73tnqh-p9LNV2@M< z*341VI({WhH&5SUQeC&(vo^OMBVZ>sbxcj|kEV9J%Pz+4yjN0vTPGnFwSS^8m+t)F z>tm{Wd(~ukXDv2@6IkApf$hn3mf#Y?;f4v67I!E`W!%nme@o!}&5Miq{yl1u*L1d$ zH-)o)50d{d6Db+Dg{9Dtm$$ab_k=h(kR10uCB_zs^I#oc){spt6Y{P>BW=<L&>Xvm z6$C@cy(w!E=VfU1bN)4igeDW#hNWzzfMy``dO%L9AR<MIh@7NX`B5aqh(spMX8*Z< z(eF5>?afM|n>su5cgaXZm<Ve@_OYZF{Y;GNUHwg2dMB@ov{OUF_d{#4PtmYt@&-XM zfZ|(~KP0=Ep)pV7lx@BOKT)H19W^BM>r?Grk9f4cKu&JDtlu))rKvZ@G*zHsIbW7| zK1_ywTPLz)Au%tn#iu*LcDF@r6^1GSeD+Ca!K{(SpWoj)w2+w$_JjHhI2P;V-hnY+ zyD}<8Lgu)Cglau|?7rX9hgb<we@C~Axh2O6r>luuk`IMIE%NOk&Ow)4>P|Hk7L^nq zPMAFixxF{O6s$|pwZ^s%mVdBu;lQX$^HFPS(F_^Pv=4f-DIDp!e)X8_bKLxO%aRZF zqe`%iwf;fr+A+88@5hRiL`e)r$c!J}B_B?QMO>?I^Pagkq(0>(+Ng1_(7IDsU3<Rx zG(9-3({(icGTf%kmTh{jWDf{K$q8P5O&5N7vCQ;T)Qip7DwGSDNir^^;LqfJIuivx zot)7pp;?{*NKui1{No4c!BppgnHD{}dcPbCfC2iwwtpOQ%!~_<nKOAy7S8uO^0B&0 z$x1zNpnt}p(QS-sy(eJ8<RJt2J5wX^fcN3FP>+auX2Ay=c!jlm^dMJEsf}FZ+@2Aj zFU3wUnU{)fe(kpTf(x8@M!g|v?lcy+?d#B^N0!S6bT_6W>}kSKvEE$u{1|S5%xwLm z874onaJg4yBKg<C7{mWklg+b+!QRv<3o?+Q0;?{<g>@AhlwPrA$cM>l@9A_;E2gjs zw>faZhRXG@i<u`+<%eIbg^gBL3-VJNCBnJ6U;5q0sL7T0ox^CMll`6H{j~<g_zS3w zwW6fOs_?wT`jt3F2A6liJ7jp<iE(?Sj&yXgh-0rx{{1tF%OM;LqXeCM;HYUCqZ(rp zp4CXaXE)sU^SVnz!cNnXH{ZOTxok{YnzG5r@Z3a0&TUolIkw?O7UPYoxJG5~6C{C= zX1VcAqdj87kYlA9v6R(+G9xMm89r%qakZZ7&{oeGK|evBTXl|+xly`q&?x>)Ga*u# zTtRYcqI@FBJ%Q1q;=`BA&|HCo(Y3kPmQblq-#>904HLD)Z70r|op@hM;G$uYE!S8V zIPE00Nu~9(s#S32d26yx*xN@Tk7WjPRybIR%_&@if(TNr6%-w@nq;}r=Mp&Zc;?^~ z;!IPVdtSXp=6phRa<d-uk^<W4e#DXrH`l+nUYH)SN;Xu_M&(xH0ti}L>_+?mI{Vyv zckH~NmipGFM{yhJ^HPl?g$upt$rbJb%@^5i0p%Ps-SGC^xwx?VTK0Tl@DHS@wC~1+ zv6b*x)x3h>XU&XlcesZTjDyb`VwBhOPJI{{+ldIcC`g|j?fH44-s~Hf9pPWU!vGSg zT2)<{BjsH#;6PpVQ%a}Xu}HV}<_oAem&o>^)y*xn#vd+w2sEHFr)^Kn*K??A;Q+x{ zACKs^hrHg&(Za~n1H0TsCAWzn0)h+xEISrBeWoB6dU0475tE#0yiXo;YOO!$uzx3; zRX`EGMB?M!o?WmvnbDF^zDl^+{w9Ie!%|i-7L@Y$^;~v7DQVIgd4Z|1eoj@VYUT)J z6@;=4A^3)iia^Pp;rLw}WW%`;Q;|*N|GA=4mF28{15kDT69IKda=s*4r(p%4lwFn~ zruqhzg~as`kf>Rl`9RwkWnxc%upwFG6fDKp;f{i9U*aUVh4(WB5mmj^op3t=uRM+M zShmA}Sh4}wm3aczTrfBEY!wa2+c%1Oi2XTHiE;$?Yp0m`>JQ`nx;&IA;(?v+8yOo- zTx?HSTP@+RS!2{WDi%u_2wo#Fs^X@J%OHe~5UF-z6(QVof-eU@xS_!<4IkSmWpX8K zZ7y~H_)8qZeP6CDH|*@NAGitf7E^T_-t3t!<%J*3I{<ns_cCe{YhNcChUZ6MCWKFf z|9Ztyj+<^bJ(4)0CFvS;ww|`JMkgpu46zM?rFo2!SdC*`0|u#xrn^iN>p4~b119=` z7GA}!LF@re?R?jlr0g)}r$m28oK;{mr~BT<8l^UV$HOw}94!__nz0MI*M%mnlA`GZ zf9~w<I&}QkSzj2-P;_O2T{HT)<`?&;#Y7-w088El(=Vvogrm${=(L8kXX21^E4ssF zQVi!OC~#Z>fj6*A60CVWu!-WuElL454D@?t=2y<v5DEo<4uL%>m0pN>5P`a4VLl{U zP7c0?HDN_>9VJJrI@hxs!5w|xMHRq~77iU>SZ(NRSgEIXlosKCO$m!~9?0alewx51 zlZw}}43A{1Hov-|gUAYFsY{g<nCY4rSNL^|d9A49oWc^oMVvvZi!+;}g6PJ2LhJKA zcbuSfYg?b!TOx<KfuvN-un!RG-6KeZvC)X_5C+`^qxG`PMmgo=y(j4%Pf>?rLYJSI z;9dQiU~9Zvvr_)hmbHE1Zzs-e%tz<1cQr9Qt;oFr8%QQ|?>x;;*U(?w*b>*7pj4Zr zL5Z?DAu<tY5RvXuzY-Zg5GxX~<Y@aU{dw;kqcY-y8smW+9<7oxu|Y7p-ACQmy<6p5 zzrthu!iD@5gSig063GIjORHie0<O`3U$>9^Iwz5qvv)HBW<vZNgKfX6nSshpjN@I= zhk*YmM&2@JSdWz|c6S#kz8SoHSii3RWvOA2%K#j5`{VQKDnmtmkt*iXbp0kUwfD`L zLWdZE^*U>t-kQMH)=UXYJ_B`}6I!))&$b#EYOocmvOK%h&e~@nyT3;;@8FnQT3`Zb z7os>cSZG4OGS)~KIeV|aF+(F3DFyr+op;(+7ycZNc?K)n+_awlgN`EE!|296PLzE) zIgfW#&>O$$WcS*t?777(7-)(K`I^)Ai4ywYy3X!QgE2*cxcEB5OD{IJl+Ja!C(`S7 zWzf8yni*I6b@bShbNq0==T12vlKl%EH)Vouk+ZWp6oVsWjnRreaJ{$d!$%QE60jLc zL))R#eN>dy%(4UxkD@!`tp<!oja@ejU9w&O)kIB}E8d7)TlzSfpcJ2c=T2n|lJkj< zUl8+B+q6eTY9B=FFd0O0Yi}`+c_2T1SO|YK$hG~68!>*zUdQ1U@fI0#syQv=N<o*$ z$TJ_$xJt!6pH(eQT``yqCy-Z~Q;Wtv{yOIft*?|M(obW#Hpox4(u*5QXo~9m8o{PT zvPg+UDpTb=UXVSnWZ046R)l*c@ic=Z4BfZeO#_#<+{7`Sx*guHi8xp5GRVxlG}ipO zHqIHz?1Wd(pm8cE?r<VkGnG<T*|4IjJLs(3#)%5`Hio+dW0EC&Ya%S}W7|@`)6KC? z<gxzp*}K13b$;vhYX&Uz$g#DJ$6R*iv<W(+KeW3ys9|AtIczg#45k2CT!~jpwZJnb zn(?UI@bv2Fzjj+T%&dhQ*>GIjeebXvL)^T4RQ-JCw4+8_#0Pk}z@*wZyG=$rzclMP z<y~nP>FNY|7-==xnXz<}vgX#g)A|D6&7Xa*98`s5m_)rX&wi^tGOk-i_&M5M<9jfz z$-$teEk<!T0bHZ(Z_v$hdwkEH*!V1!I1TJ?_{Q+R^RN%~Lpp*&rQ1yri6bQ+WK-Pk z=pb}v-)%R#k_RRp`}kf>$RH6FjouF;&_j?dEXB2$ocNiAuOATHhJk5J{Qk5;1LVQJ zwCEkr`L?A+TQgF^I2BxHgmmY%;omWn1^t2tr{bSHleV%zcpcI-8QvCudk${N*{Nv~ zE<C6avaUh?^=s9n-4)in_0w|y6-2Lb(~|TiO!Gch3Ha06xbK&vgElp2?-a{Dv#*l| zLC3Wu$v@w(8(ccH^9Y*(vbiA*iRixCO;GWd%-qX73EuA)%q19QPlKexQ&K5N&Fph^ z-LF`D<}Q#aLaV%V<i+8fj+r@}66Rwb%s6elbqAE=)raytc;@~~lA%HkrVk|I8X)Fw znJ?e&2@m=`YtXEaglY<4w54EF%z4vbCj}g)nO}o|iL$COTN=Vo8>A1*e}{@~*B8># zDhjt1>+!SEZaW9>=jr8As6I7Dfg!_n^@(O?*{RNAqqgshMjt~aVn=iKs_P>S2Oy}Y z%o)$PzJI~SK~JTAZRL_ip}SIZyu`qO-I-CIGC&lk*7zvuYOt#Nm7$MqJ-;HAbENK- zIWb2`lC{u$RQrR`<l)3xByv*M$q|$jM6Myve{I}t2^E_#9gD2)Rtx^ZZ{5o5+Kk9( z&K%F_-6D0IpIsBB@lr*}l1D~KNq;o=^{p2$8@3E;_`jPP!}XsOz<7wnA=jF=E}@)a z(Qh+AkqCkuEU`_37>;GQF!1{YzUMZ7SLG)LnIZCzqN9`DzsX8K?1tV*X#SNey<?x& z%ibUFHXC*kf%<wKjJik(-mH0p=@ygI3SnNaIO*%%b=tL8gP*){Os)m#VzRr__~??4 z4YvAe1C(5O0U>=`xWU&>XWZ_6lW~buR5Ly@Jm={q%%AG&7l+bhZw@JU<?P-TXfc_R zA~`58UtS1n(9}9<`gK(l!rk=3m$hzOQaCUk`S+=2|9ShOILLm6RPLfR4P%JJl#qJc zyIG^P_;}Va4?KxlP@%h52_!ihpzf}O^b>(K^H*oQisfRvbLBJ2%0QN+7w*jT=dPbt zEc&w0#X_Zl^f*mP6V9Yzp248`9RG<l6SpHDrC)0jE?i1nq>kLD;gHO-j?ORPPR{+4 zQ*(RxIrL`ur58Y&nzm|Z27DUKEYeNjF%y4Td;29U6(*}x?M&?GG?y_R&N|db8IX9} z8^CDs4__@!ELm<PVkd*U$!(8J5o&a_$9qKx=k0~>(HJH%x2<0UYjmK(DfuR;Kv zP8{KKNZIRE5l1Htxr{EPz0UYYm&wLx%g3R~Qh%q*)-%u6sBeq!J8$uE#%{Ohs#gqY z{1rRvogzGkuu<zfLmGQI-AwV=mWY{+`KVb~Xg{zS>esr0FPmqlrdJMkp79r_8#f7a zH)z@GKg7&s{LPwnNnqnW{6SD~7;P*EretKy+`?)XyF4DqY<(<!M^SWb#&vh5vLR*Y zB$s(g=_vr0)Ls=mw<Fnh_^apfn&wx%ap}PMoc+6d0~Cl&&NcpYayRjYu%g!cGa*vo zBGoofL}7cvUx>UEI#sZdUb^)#g!4H<zmg{HmGsv3CP?SUgeITj<?#^R#}7vRG?ig# ze7QP4*)&=xaj)qrBl$S1J>|^aSZ%3Eiu!^=z@PTLJEhIzKYT&DZicLNtnoe0{Y@r5 z{`lh&5l#P`RYSGt_Zf)?DBXx_m7E(1=1WG8&v(w=9(yqdPMOPQb(eh_O<-qD4^DSx z$CE<?JrY6?j@`y5)qg<^zQa#;Y~cLHP`Qe?l^0y!0M5|fCtF39ky^BnYqbv_u5I{Y zixz^q1@nsz+2TwDBGD=mqL6;YM^x^W6S3g9_$rw_{iXdf$iGq+r*2i)#HAmXVh9cT zNW!2?jn(v>4Rd_2bI~H{2i!4}7=QXVfgr2ZjfBnRCdWahs$@a|6UfW&&d${AC{EcI zSrTCdZGsvO^7H+@DhCr1=FDic0f+s^q<jEoZyJVyl7OaYN-Pq3<q7h{?-{?YZhGX4 z;pL8t4f%7O>LDM_QH<T(Qn>u{Nl1OLRi~(!rotqfx>7wl+()|$C3kL(n@n78nDhXS z8nqa<Z~$yPZRio#a$($Yj=B2?3<k0f#diG!fC{hksx{uvRo{a$!?&KPe@lR6bCf>V z#%1L##c~M=Z7dcjkiCH#l3NmxkTpNGF9r9ljq@|q7YTK;dIlC(;B#bLz?NS==psuY z3}2?_YFTz{k%w}A`?sdn8&_pOeRd-MPwp@AqWZg$#vhULSX~26(Mg6^fuJ)!8C`!` z2};gsZ_&enf`sjk9XUT23d0B^$lekmQ0fc{vIeYy+IaTBp2&v6!bcL337dtiw3h<f z%bQpu8_v}N2qo_$<FB_9BUL}ch;l&ef{BXTv<}S=PW*1WdF#MH0Sh_C>2gm~?P^TO z-6>YKbV(3%dC(hwe2<o-2`GRarC*`g>+|-v|GJC#NFVSPR)_q7v83GOmoq{RJAzv4 znDQ&FMT8gj0IU@%{a`jR3P=rNkoUJBaM<CzT7>N-YOjK}zV*b}O@e!qE+8D8KzxF{ z$8*U4d|))|Uq0LHK%-?5i)wBNXvb7&fTKkW0|yB$m4Us!hrwF&AAyOXc`?4zh>x%S z*G-F{IU!AtHVYXYoeYIfZJb)%gy9s=qJ$9={4e)QgPTY2y{k#Nxn#n~4_69j?3Jxr zaUyk>&d{7-x#V4!<Tf$TV+`dPaWhV%v`?78!x?(+5t7o)Al8+gcw5#dJV?k=35XPg z$gNT?H}k}H^GhtV?-r*nkGUUc)A4ITSJ{3It&NSBe(p??Gw!#z;<i0$)p*D-B7w|Z zrx3Y^(v?Oc)@>~$%Bl?turQDq{}x0}n{_xvu+>?RplO<b5sQzzbujH72HbJG5Q6p- zxr|lp)EZcz`f%25iZ05;CfGeB_<k_!%mjXi>V7eKC<x8`IB-xPCqMn-4^TrwLzuCO z!-Nld`Nw$GwB%C1@<Jf6(r?AM+Tjjd^OkjV+CvT~*RoiX)%Bq;EVx>pJFpM|^7b$o z!$l+HM6>@BZdUqDBO6EY!77>)v^*9>R(KppPNz`T0-N+MJ>)So1m{i<<mx@@Wn>CJ zIMD=Zk@;%ah?Oq*6(&8DQ=9l~>)LwFc*p3nk<EV1Fi<W_sSE+s2iG>>ZV;H&faj(% z#^Ew%$hlXbkl7mGGK79~p9>0F?p_b{H9|DeD_v=FQiDi;*9L$b=3(?JJ19KLM@}pF zFVLiGy$UiVA9px)t9X){o=zwCoSX`&tB%<bHyNa_2$R=PpEH@sd>0;g!{zDxM!n;Q zKhV~lXQ^yp*_Bk3C#gV@m8hLl3sCqm{t?2jBOTm2da|;T1uK~TgYgTQV<omuYI6z! zb>SP131;4~fO-O2kIQuH7+47MmnRX@A{;%Lsv~tFeN$X9Z|uh`XwYvMm(r``k~l(X z;jPq!hiX1Vj|1Z_e=X#KcaCpLcHWdFUv<HD$!-b7VrE8P`?^gp2#uMIedZvgu?1mR z5sS?6yB2m$Y2XG~oW8SX-@iy#FWT#buFlJbnDmoc*QGK3&DS6FnC}*BSgcf_L0|c( ztfb|yAd*JT)462~DCSCcRsyRkEV8$OAloF90jR~=;-%})Ef7@xx6P_QZ~`_9N+y1l z#OL5VQzU=|WC9E5KQ%4@&<;kz(Iu%g^xfSamHmo}nYqQy45;P7gP);$pmTXBVI$t= zZihx5-4v6RWqAwNC1q8F54Ms#)}1B8D@IGMefenisbM$I#?SJGOFL;Uo~RvSS^<lD zlH?GTD7gA^huAam{;b`Q?bqG*#lcc^AwZhgQk0TnX<*Pl+1{QrUUfy>c84HBp68J@ zDjp-D-+4I2=(qhK-WNPd{|h1m53wlnS{U={ev@8<0S`w)-<#uLrsV>Vkva$&4Uoso zgZ#4+0lCp^Hg)MI8g-bdYtT{J>ip5dajU+8ualCr)oSW%H?Jdew4*A+(0B9G6KVK1 zdaUYU*NY1aZPPe3dl10I!Qf}bt*;Kptli9miTDTg*9v)`3$v)OfCNFsm;LmA9P7^+ z|J|_B(&hEobh(iHvXQ0Yl+u;@$_)cyj3Zd%5L_Qv<nNNS^1@~--uiatML!6Nejr$! z+Ss^=4gq<^gAmjZ|BqW81<59QiMpR}r9;YcfE75`o@YnL1(u)v9hcl$ptuj;zD)$< z@p6ZTR#g#zeVP`9DB(df-q<%sNhw)MAP<DT-EjwkT3dOywzms^hN5f@W#ej^_l=}T z!DF%v)LRAgX)|6pQV&$@aK9M{lE--Xv!er4FWKUvtL-{7=HKsy-UW*SWTIvI&f<E$ z5kJ?huJ&@m+E;n*9_owR>+Cr5St!NIz|YKV@>Rt{==<r@WQCxY)zN`KKcTc8A=A^@ z@jF7VjgQ|!_*%xNKEwRpUbegiGLoB6w04*918Z|!smI5s?+*+P9?G#66Px5D`H8=3 zYT}?(NrZw>`{pf#7cUlTX{3S4)nK^Jf-Ui60vXiafp=9co#4z(!wvd7DTW)&Aiwe6 zk!DI0w}MMwEdu*(6H{87yJ1M9mxRCkFyMWp_#J!4gXUovF#cbusq~J8kt9^^c%dP1 z!N25rSBPQ?#WG0akBT>M_RmSgJ}Pmk$GOyV+1dE&4<uR<w>B|?g{0J3Adg{->I?lM zK*178YkSn%)3dmt^?bi<Z&DH?nn0uwH<~DB`wm8(B64*UvD68s`^}5;tU-0tPxvsq zHm`<=74egYM-=3HMb~<ILN31;RCflU*h8MQK6Pu;2S4=Djk$xx5H#E-MZ46zL{8h6 z^EgD7)mwD@LB#7LytuY^B=KTk<9$@;#LPA;UlZd~vQK|R8>&raaD(Ns{u&L=PA><Z zJUiewp2&7@Y6b9rgG2%)FAj~AR9Xb8W*lALz<oLF6=tB0)^(-a!#tu)+?tEi%MpKp zuxpKaQkUiLM#xNg8p`P*=E9xh0so@36)Xmn&__8QcYq#X(obss1y0DJAhMe}w1*k5 z+%opAwcu;i1vBH&4aUTVNA5~nZ9UNHdlPA?Y;!44@y7^Eb#}{mh!nK@ZOBSrYY`t; zgBR6`u7gl;;l4`^HKcFbyTa;-A!U{w3kK)_DHri&4yBdcX1#J{9(-vUO=ZYgYvmpy zKUV(S-9=S@tT5?aLccul;mWV`GIyVzM`tQ48UN*O7~~fr01b*wq)9DS@Otw?`h0vy zLf_V8x1If+8Rjx^^^bfypU5&FEB9P00+b#ZEB`>s9zcn?r)Mz!1Qf)fmSQ<7H;|mB z85atoFE*cT&Lb^g1m;ZoYmL3!FXniJri)97iWY`Kbs-h62V6MxGv861kczb>8nKI4 zQV)zlo^mHmq=m3e*ec`iZt)BWw5JI?cZT7!wXXBnS^(_u8;=MGd|_&F$;=|Sg0^Jd z1g~*s05IO#t_sXV<RgzD0!Uz(5?(jnA&A!0YfPr-WJmXZ{tdA00FS7kNsq^r5Fmdp zTYkd#C$gW2#L0e8?44;eo-KKR9H>nnv0m1bl;#6p2+F^LXW&b@fLFPnr&>HlS9h^k z_frx{2o7L2g;(k3MN5pL4meHziV1fBg_YMZ>imm$NJ%BQAN@_a<FUT}rrZ(KK?WYp zZ8WC50bh&!4?FB4Rwb?<yy*dN?0NW(*Pa6O3ix|~BJ(e@D=$<6^VRa$BD~ACK-<%~ zo}T|j*aLGQp1WyP*xsb-kyIzS92ZsYFEMlM>lZKjPj2Cb0}YVImx;T%35qkpGpK$8 zEbg*j5^8#}G*DDPdg|>>O9vYeI6y<R{J+V6yf=In;Qvn#eE#o!JzZWyh0Tw1S9lF| zud6oP?zC_G=he+nvCOa?#eY=#1tWGE+>II>$AtcfYP>J6)ABQH6ErA7%?C_3@MV+s z&bHX@T3M*P@=l|2dOb~4g!n}3bOr>SGS<5bPmpuJZ&0!m9MQ5P>1w-=Pkr9fZr4j4 zhagP5I4!=6G@L8)Bg}0ph$Qe`qR}RzF(#r+^xb=Ep`+I5x_-8a+&`b@o3RtYu+lF~ z@B+)%T^a!=_mr-+&o7HU!WM1sSBz~C0x)YR-3A_D@D>E9<)mkOep@GNl~1=46m+Hn z086I)!1(J3{c;PLhm2S)9(38>udpfaN3%Yd1JeGd>t3)~`(?C5A%R1q{8`~gjPBC~ zySXnx^UBaxoZe*&Iu<`i`?a#{nAN%o`a~eCuBf2Cu;E;uIF10DK)s6ktNLrnm*iBy zmu`$fwq&E*z%xh_Pc-WQT!cwI@sn6G?>~Px`8E5622WTm%HuM`uI1Y-e{MAA;J9l# z4?kf>t(|V(z1H}^C0|zjHi9lcy$fo%6@%>0;*Y0K1c>x&g>PrH$8=%u_YboIE&Lff zchSn<rL{??ny~>A#CVFP1z0vt1Sg1rqY!}dP4Q(43A^0yDN+vsV|!KV+nME&QLkZ5 zot>=ydkS4Z#Ib)6R&HSzg^Gr00Df!3b8DXl7MxHd`nW`@>LE;nw=?%$w0QTSCKF1? z^AuFH2Dnu>>`i&27evxE;H!`(ASLO_D*=TW)^Mo+Hv!!3KB0#~&G)00*MH~lx*rh# zM5tE0FT{X>A&zxlwXHl`JjYl*0L_fJh#u?z0hCRem@|>Kz{pi(ffG15-4hN#0wV9L z)9DQ5V*W&3QHnplP^*?zjde5lBtYq#LqaQ=ijr}Xa<cn@1y>dTGKdce1_QVFDS*{5 zXV;>v9Y%c}jRg;_Jm=}oX+XU^J6a~oU(6d`UdUAIgljhokM_H|bQ1q{_466tmMJoC zip6PPbNTY`S-Qa^IbSxtDN;7)Zx{IN>~b7m5Bo2J>?86nUm;HT06<hMAt^<kQOxi) zHgAl(!BeM}1Fl-}%c|f+F7r}g-pyU7-C2E^%Eg=ZTl4ljC_?WD0h;=Par;epdgvV| zQD`~Mq;krkQXpp<_T?T=o0Z33`;9H%CM~mr);|FJ{u|g>j<wTKcaofBUPsAD1&xS( z!&?ww3gy``QOvpyf|A*GddCS{K|##He(H~6nkYLk^s#hi2hRj}7Mbrkb72SdI${6# zYax&;?&|#{%0T<HA`4{2Py6z9y;x=<&9&SL*pOEhIC3K^_IRV0Qv!^yT;5SAPibKP zy4au;K*scHOMUUT!-k?jWPuPWYny^1&;0GuM_fTjflMnFGG78WHx!GkGzS~_&F;i` zJugJByiQaXV=IKvD<2skS8IWi#W8RwLEk<Fd{!Spq@4ki%m(w_6qWC$P=|!U?=9tq zt!}x<$tTFAl+UmJ(BA~1(u3F`@;aw}!@mGNSRnZiFWn{Phwi7zo&N57zNEwQmcs<0 z@4>^oQEVTf4)JW_;Ge09yg?r-UIe$t>@k8Om@Ni5yvF;xH-w0+5XFvFZPJ+UP&uwt zdACofwo?^q2r173>g>9eeq|>J(g?|Z>TEF$e%~7Ii|!nFOR~rdzmf{v3`K&L52(H3 z6KV3mQzRz_$}O_TH5JZmt_)pYKCpKpIIcs<I9~v=2813gD*CcG%{v-k?!g^n@9Mkn z&79i1T<1!HI~P=XRu#x@tt`~w6Q}c$czd5t-(58CBoM=16nkUe+_+rlIxLE?rk?%A z3MpX4os!z}72WCQ<OgBqfujUB{)6-@av-W+dK@*Y85eS=nMxq%MplxduH5db-Qb@{ z6!;2A{z*mzf)}V-O6F7FPkoX%HEKE&wg5rk*WS^n=s-1g&El#9FVu%#ZhTO-mQX~l zRf<{`nIG8+VJ2gcmByoG8U2@Sm;4D|d6gOSuDwoA6c6Zo_C*mG!hHRtNU(m%`*-RB znS7U#eg8$`S8;rxp@r-cH~{5wyC>Dr9x<UU%qM`#jk$E<f{n`eAE(jN#8TrAHctDm z0Ydoq;E6P5Oem_Oav~j&F?i!V5}N%auaSOyd9`G2AJDPhauQG_da6$|oUKR$f2V<| z%Q;*722G{^SskVBHXX17Dwe0_fKj9yYyGjEJ|Mnh>fWE-PAxd|C^AYPY5@1Br^Hh5 zw<4aPb`L?8-!Q@ulmj4QD*w6*5#B2UYy?>6o+p9T^BbQ?%zJvzBa{C3@ShO=(}e%5 z;6E$)zt;*FT!A*->=%ii3%>(JS9)M#``}){nG3fqJp#`81^V8+?dy5Y4+Wjl(njf= z);_9vRI|2RrW$;@>z_|Ac?5ZQLuYULxp^GZR@dA+aky@TXEMK;TsdEO4)Oc{15a_B AuK)l5 -- 1.7.8.5

1 0

[libvirt] [libvirt-glib][PATCH] test-domain-create: Don't shadow global variable
by Michal Privoznik 24 Apr '12

24 Apr '12

In function create_usb_controller variable 'index' shadows a global declaration. --- libvirt-gconfig/tests/test-domain-create.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt-gconfig/tests/test-domain-create.c b/libvirt-gconfig/tests/test-domain-create.c index 699c255..00bd620 100644 --- a/libvirt-gconfig/tests/test-domain-create.c +++ b/libvirt-gconfig/tests/test-domain-create.c @@ -45,7 +45,7 @@ const char *features[] = { "foo", "bar", "baz", NULL }; static GVirConfigDomainControllerUsb * -create_usb_controller(GVirConfigDomainControllerUsbModel model, guint index, +create_usb_controller(GVirConfigDomainControllerUsbModel model, guint indx, GVirConfigDomainControllerUsb *master, guint start_port, guint domain, guint bus, guint slot, guint function, gboolean multifunction) @@ -55,7 +55,7 @@ create_usb_controller(GVirConfigDomainControllerUsbModel model, guint index, controller = gvir_config_domain_controller_usb_new(); gvir_config_domain_controller_usb_set_model(controller, model); - gvir_config_domain_controller_set_index(GVIR_CONFIG_DOMAIN_CONTROLLER(controller), index); + gvir_config_domain_controller_set_index(GVIR_CONFIG_DOMAIN_CONTROLLER(controller), indx); if (master) gvir_config_domain_controller_usb_set_master(controller, master, start_port); address = gvir_config_domain_address_pci_new(); -- 1.7.8.5

2 2

[libvirt] [PATCH 0/2] physical cpu usages of virtual cpus
by Hu Tao 24 Apr '12

24 Apr '12

See patch 1 and patch 4 for the purpose of this series. patches 1,2 are for libvirt. patch 3 is for ocaml-libvirt. patch 4 is for virt-top. Hu Tao (2): Add a new flag VIR_DOMAIN_CPU_STATS_F_VCPU to virDomainGetCPUStats Adds support to VIR_DOMAIN_CPU_STATS_F_VCPU in qemu_driver. include/libvirt/libvirt.h.in | 10 +++ src/qemu/qemu_driver.c | 152 +++++++++++++++++++++++++++++++++++++----- src/util/cgroup.c | 4 +- tools/virsh.c | 17 +++-- 4 files changed, 160 insertions(+), 23 deletions(-)

3 9

[libvirt] [PATCH] openvz: read vmguarpages/privvmpages to set memory tunables
by Guido Günther 23 Apr '12

23 Apr '12

--- OpenVZ's memory paramters [1,2] aren't very well supported at the moment. Let's make a start with privvmpages/vmguarpages using already available memtune parameters. I hope the mapping looks correct. Cheers, -- Guido [1] http://wiki.openvz.org/UBC_primary_parameters [2] http://wiki.openvz.org/UBC_secondary_parameters src/openvz/openvz_conf.c | 103 +++++++++++++++++++++++ src/openvz/openvz_driver.c | 200 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 303 insertions(+) diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index 5848ec4..579fcfc 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -423,6 +423,108 @@ error: } +/* Parse config values of the form barrier:limit into barrier and limit */ +static int +openvzParseBarrierAndLimit(const char* value, + unsigned long *barrier, + unsigned long *limit) +{ + char *token; + char *saveptr = NULL; + char *str = strdup(value); + + if (str == NULL) { + virReportOOMError(); + goto error; + } + + token = strtok_r(str, ":", &saveptr); + if (token == NULL) { + goto error; + } else { + if (barrier != NULL) { + if (virStrToLong_ul(token, NULL, 10, barrier)) + goto error; + } + } + token = strtok_r(NULL, ":", &saveptr); + if (token == NULL) { + goto error; + } else { + if (limit != NULL) { + if (virStrToLong_ul(token, NULL, 10, limit)) + goto error; + } + } + return 0; +error: + VIR_FREE(str); + return -1; +} + + +static int +openvzReadMemConf(virDomainDefPtr def, int veid) +{ + int ret; + char *temp = NULL; + unsigned long barrier, limit; + const char *param; + unsigned long kb_per_pages; + + kb_per_pages = sysconf(_SC_PAGESIZE) / 1024; + if (kb_per_pages == -1) { + openvzError(VIR_ERR_INTERNAL_ERROR, + _("Can't determine page size")); + goto error; + } + + /* Memory allocation guarantee */ + param = "VMGUARPAGES"; + ret = openvzReadVPSConfigParam(veid, param, &temp); + if (ret < 0) { + openvzError(VIR_ERR_INTERNAL_ERROR, + _("Could not read '%s' from config for container %d"), + param, veid); + goto error; + } else if (ret > 0) { + ret = openvzParseBarrierAndLimit(temp, &barrier, NULL); + if (ret < 0) { + openvzError(VIR_ERR_INTERNAL_ERROR, + _("Could not parse barrier of '%s' " + "from config for container %d"), param, veid); + goto error; + } + def->mem.min_guarantee = barrier * kb_per_pages; + } + + /* Memory hard and soft limits */ + param = "PRIVVMPAGES"; + ret = openvzReadVPSConfigParam(veid, param, &temp); + if (ret < 0) { + openvzError(VIR_ERR_INTERNAL_ERROR, + _("Could not read '%s' from config for container %d"), + param, veid); + goto error; + } else if (ret > 0) { + ret = openvzParseBarrierAndLimit(temp, &barrier, &limit); + if (ret < 0) { + openvzError(VIR_ERR_INTERNAL_ERROR, + _("Could not parse barrier and limit of '%s' " + "from config for container %d"), param, veid); + goto error; + } + def->mem.soft_limit = barrier * kb_per_pages; + def->mem.hard_limit = limit * kb_per_pages; + } + + ret = 0; +error: + VIR_FREE(temp); + return ret; +} + + /* Free all memory associated with a openvz_driver structure */ void openvzFreeDriver(struct openvz_driver *driver) @@ -535,6 +637,7 @@ int openvzLoadDomains(struct openvz_driver *driver) { openvzReadNetworkConf(dom->def, veid); openvzReadFSConf(dom->def, veid); + openvzReadMemConf(dom->def, veid); virUUIDFormat(dom->def->uuid, uuidstr); if (virHashAddEntry(driver->domains.objs, uuidstr, dom) < 0) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index e8b6915..6f8a6a8 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -54,6 +54,7 @@ #include "nodeinfo.h" #include "memory.h" #include "virfile.h" +#include "virtypedparam.h" #include "logging.h" #include "command.h" #include "viruri.h" @@ -65,6 +66,8 @@ #define CMDBUF_LEN 1488 #define CMDOP_LEN 288 +#define OPENVZ_NB_MEM_PARAM 3 + static int openvzGetProcessInfo(unsigned long long *cpuTime, int vpsid); static int openvzGetMaxVCPUs(virConnectPtr conn, const char *type); static int openvzDomainGetMaxVcpus(virDomainPtr dom); @@ -1631,6 +1634,201 @@ cleanup: return -1; } + +static int +openvzDomainGetBarrierLimit(virDomainPtr domain, + const char *param, + long *barrier, + long *limit) +{ + int status, ret = -1; + char *output = NULL; + virCommandPtr cmd = virCommandNewArgList(VZLIST, "--no-header", NULL); + + virCommandSetOutputBuffer(cmd, &output); + virCommandAddArgFormat(cmd, "-o%s.b,%s.l", param, param); + virCommandAddArg(cmd, domain->name); + if (virCommandRun(cmd, &status)) { + openvzError(VIR_ERR_OPERATION_FAILED, + _("Failed to get %s for %s: %d"), param, domain->name, + status); + goto cleanup; + } + + if (sscanf(output, "%ld %ld", barrier, limit) != 2) { + openvzError(VIR_ERR_INTERNAL_ERROR, + _("Can't parse "VZLIST" output, got %s"), output); + goto cleanup; + } + + ret = 0; +cleanup: + VIR_FREE(output); + virCommandFree(cmd); + return ret; +} + + +static int +openvzDomainSetBarrierLimit(virDomainPtr domain, + const char *param, + long barrier, + long limit) +{ + int status, ret = -1; + virCommandPtr cmd = virCommandNewArgList(VZCTL, "--quiet", "set", NULL); + + virCommandAddArg(cmd, domain->name); + virCommandAddArgFormat(cmd, "--%s", param); + virCommandAddArgFormat(cmd, "%ld:%ld", barrier, limit); + virCommandAddArg(cmd, "--save"); + if (virCommandRun(cmd, &status)) { + openvzError(VIR_ERR_OPERATION_FAILED, + _("Failed to set %s for %s: %d"), param, domain->name, + status); + goto cleanup; + } + + ret = 0; +cleanup: + virCommandFree(cmd); + return ret; +} + + +static int +openvzDomainGetMemoryParameters(virDomainPtr domain, + virTypedParameterPtr params, + int *nparams, + unsigned int flags) +{ + int i, result = -1; + const char *name; + long barrier, limit, kb_per_pages; + unsigned long long int val; + + virCheckFlags(0, -1); + + kb_per_pages = sysconf(_SC_PAGESIZE) / 1024; + if (kb_per_pages == -1) { + openvzError(VIR_ERR_INTERNAL_ERROR, + _("Can't determine page size")); + goto cleanup; + } + + if (*nparams == 0) { + *nparams = OPENVZ_NB_MEM_PARAM; + return 0; + } + + for (i = 0; i <= *nparams; i++) { + virMemoryParameterPtr param = &params[i]; + + switch (i) { + case 0: + name = "privvmpages"; + if (openvzDomainGetBarrierLimit(domain, name, &barrier, &limit) < 0) + goto cleanup; + + val = limit * kb_per_pages; + if (virTypedParameterAssign(param, VIR_DOMAIN_MEMORY_HARD_LIMIT, + VIR_TYPED_PARAM_ULLONG, val) < 0) + goto cleanup; + break; + + case 1: + name = "privvmpages"; + if (openvzDomainGetBarrierLimit(domain, name, &barrier, &limit) < 0) + goto cleanup; + + val = barrier * kb_per_pages; + if (virTypedParameterAssign(param, VIR_DOMAIN_MEMORY_SOFT_LIMIT, + VIR_TYPED_PARAM_ULLONG, val) < 0) + goto cleanup; + break; + + case 2: + name = "vmguarpages"; + if (openvzDomainGetBarrierLimit(domain, name, &barrier, &limit) < 0) + goto cleanup; + + val = barrier * kb_per_pages; + if (virTypedParameterAssign(param, VIR_DOMAIN_MEMORY_MIN_GUARANTEE, + VIR_TYPED_PARAM_ULLONG, val) < 0) + goto cleanup; + break; + } + } + + if (*nparams > OPENVZ_NB_MEM_PARAM) + *nparams = OPENVZ_NB_MEM_PARAM; + result = 0; + +cleanup: + return result; +} + + +static int +openvzDomainSetMemoryParameters(virDomainPtr domain, + virTypedParameterPtr params, + int nparams, + unsigned int flags) +{ + int i, result = -1; + long kb_per_pages; + + kb_per_pages = sysconf(_SC_PAGESIZE) / 1024; + if (kb_per_pages == -1) { + openvzError(VIR_ERR_INTERNAL_ERROR, + _("Can't determine page size")); + goto cleanup; + } + + virCheckFlags(0, -1); + if (virTypedParameterArrayValidate(params, nparams, + VIR_DOMAIN_MEMORY_HARD_LIMIT, + VIR_TYPED_PARAM_ULLONG, + VIR_DOMAIN_MEMORY_SOFT_LIMIT, + VIR_TYPED_PARAM_ULLONG, + VIR_DOMAIN_MEMORY_MIN_GUARANTEE, + VIR_TYPED_PARAM_ULLONG, + NULL) < 0) + return -1; + + for (i = 0; i < nparams; i++) { + virTypedParameterPtr param = &params[i]; + long barrier, limit; + + if (STREQ(param->field, VIR_DOMAIN_MEMORY_HARD_LIMIT)) { + if (openvzDomainGetBarrierLimit(domain, "privvmpages", + &barrier, &limit) < 0) + goto cleanup; + limit = params[i].value.ul / kb_per_pages; + if (openvzDomainSetBarrierLimit(domain, "privvmpages", + barrier, limit) < 0) + goto cleanup; + } else if (STREQ(param->field, VIR_DOMAIN_MEMORY_SOFT_LIMIT)) { + if (openvzDomainGetBarrierLimit(domain, "privvmpages", + &barrier, &limit) < 0) + goto cleanup; + barrier = params[i].value.ul / kb_per_pages; + if (openvzDomainSetBarrierLimit(domain, "privvmpages", + barrier, limit) < 0) + goto cleanup; + } else if (STREQ(param->field, VIR_DOMAIN_MEMORY_MIN_GUARANTEE)) { + barrier = params[i].value.ul / kb_per_pages; + if (openvzDomainSetBarrierLimit(domain, "vmguarpages", + barrier, LONG_MAX) < 0) + goto cleanup; + } + } + result = 0; +cleanup: + return result; +} + + static int openvzGetVEStatus(virDomainObjPtr vm, int *status, int *reason) { @@ -1752,6 +1950,8 @@ static virDriver openvzDriver = { .domainDestroy = openvzDomainShutdown, /* 0.3.1 */ .domainDestroyFlags = openvzDomainShutdownFlags, /* 0.9.4 */ .domainGetOSType = openvzGetOSType, /* 0.3.1 */ + .domainGetMemoryParameters = openvzDomainGetMemoryParameters, /* 0.9.12 */ + .domainSetMemoryParameters = openvzDomainSetMemoryParameters, /* 0.9.12 */ .domainGetInfo = openvzDomainGetInfo, /* 0.3.1 */ .domainGetState = openvzDomainGetState, /* 0.9.2 */ .domainSetVcpus = openvzDomainSetVcpus, /* 0.4.6 */ -- 1.7.10

1 0

[libvirt] [PATCH] vbox: Fix passing an empty IMedium* array to IMachine::Delete
by Matthias Bolte 23 Apr '12

23 Apr '12

vboxArray is not castable to a COM item type. vboxArray is a wrapper around the XPCOM and MSCOM specific array handling. In this case we can avoid passing NULL as an empty array to IMachine::Delete by passing a dummy IMedium* array with a single NULL item. --- Jean-Baptiste, I can not reproduce the assertion you mentioned, or I don't know where to look for it. So could you verify that is patch avoids this assertion? src/vbox/vbox_tmpl.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 57c18a4..4b0ee2e 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -5294,11 +5294,10 @@ vboxDomainUndefineFlags(virDomainPtr dom, unsigned int flags) ((IMachine_Delete)machine->vtbl->Delete)(machine, &safeArray, &progress); # else - union { - vboxArray array; - IMedium *medium; - } u = { .array = VBOX_ARRAY_INITIALIZER }; - machine->vtbl->Delete(machine, 0, &u.medium, &progress); + /* XPCOM doesn't like NULL as an array, even when the array size is 0. + * Instead pass it a dummy array to avoid passing NULL. */ + IMedium *array[] = { NULL }; + machine->vtbl->Delete(machine, 0, array, &progress); # endif if (progress != NULL) { progress->vtbl->WaitForCompletion(progress, -1); -- 1.7.4.1

3 3

[libvirt] [PATCH] openvz: add network interface stats
by Guido Günther 23 Apr '12

23 Apr '12

This will only work for veth devices since venet devices don't have a target element. --- src/openvz/openvz_driver.c | 52 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 7ec327d..e8b6915 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -57,6 +57,7 @@ #include "logging.h" #include "command.h" #include "viruri.h" +#include "stats_linux.h" #define VIR_FROM_THIS VIR_FROM_OPENVZ @@ -1672,6 +1673,56 @@ cleanup: return ret; } +static int +openvzDomainInterfaceStats (virDomainPtr dom, + const char *path, + struct _virDomainInterfaceStats *stats) +{ + struct openvz_driver *driver = dom->conn->privateData; + virDomainObjPtr vm; + int i; + int ret = -1; + + openvzDriverLock(driver); + vm = virDomainFindByUUID(&driver->domains, dom->uuid); + openvzDriverUnlock(driver); + + if (!vm) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(dom->uuid, uuidstr); + openvzError(VIR_ERR_NO_DOMAIN, + _("no domain with matching uuid '%s'"), uuidstr); + goto cleanup; + } + + if (!virDomainObjIsActive(vm)) { + openvzError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + goto cleanup; + } + + /* Check the path is one of the domain's network interfaces. */ + for (i = 0 ; i < vm->def->nnets ; i++) { + if (vm->def->nets[i]->ifname && + STREQ (vm->def->nets[i]->ifname, path)) { + ret = 0; + break; + } + } + + if (ret == 0) + ret = linuxDomainInterfaceStats(path, stats); + else + openvzError(VIR_ERR_INVALID_ARG, + _("invalid path, '%s' is not a known interface"), path); + +cleanup: + if (vm) + virDomainObjUnlock(vm); + return ret; +} + + static virDriver openvzDriver = { .no = VIR_DRV_OPENVZ, .name = "OPENVZ", @@ -1717,6 +1768,7 @@ static virDriver openvzDriver = { .domainUndefineFlags = openvzDomainUndefineFlags, /* 0.9.4 */ .domainGetAutostart = openvzDomainGetAutostart, /* 0.4.6 */ .domainSetAutostart = openvzDomainSetAutostart, /* 0.4.6 */ + .domainInterfaceStats = openvzDomainInterfaceStats, /* 0.9.12 */ .isEncrypted = openvzIsEncrypted, /* 0.7.3 */ .isSecure = openvzIsSecure, /* 0.7.3 */ .domainIsActive = openvzDomainIsActive, /* 0.7.3 */ -- 1.7.10

2 2

[libvirt] Should we always dump an usb controlled in XML domains
by Daniel Veillard 23 Apr '12

23 Apr '12

I realize that we have that behaviour for quite some times but I wonder about it, basically we always dump an usb controller on the XML domain format: <controller type='usb' index='0'/> even if there is no USB device connected to the machine. The drawback I see is that if we try to reuse (or migrate) that domain to an older verlion of libvirt without that USB controller support, then we just fail to parse the domain, even though we don't need the missing capability. So I wonder if the correct thing isn't to add the USB controller only if there is an USB device associated to the domain, then failure to migrate on an older libvirt does make sense because we require the feature. I would assume that application using the USB support wouldn't need to have the USB hub exposed to allow adding an USB device, and once the USB device is added then changing the kind of USB hub to select a different version does make sense. In general I'm tempted to not dump in the XML things which are there by default and would be automatically added if changed or used in some ways. I think there is two advantages to this: - keep the XML smaller and somehow more readable - avoid portability problems on unsupported but unused constructs One drawback I could perceive though is that having defaults values not explicitely dumped in the XML could lead to change of guest behaviour if we changed the default meaning of such default value. But we can just document this (like for reserved PCI default slots) and do our best to not breakdefault behaviour. Opinion ? Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

3 2

[libvirt] [PATCHv5 00/23] live block migration
by Eric Blake 23 Apr '12

23 Apr '12

This series shows how to do live block migration using both streaming mirror (as proposed for upstream qemu 1.1) and snapshot+mirror (as proposed for RHEL 6.3, although not as actively tested, since streaming mirror seems so much nicer). v4 (blockjob): https://www.redhat.com/archives/libvir-list/2012-April/msg00330.html v1 (snapshot): https://www.redhat.com/archives/libvir-list/2012-March/msg00578.html I've hopefully resolved the review comments Jiri gave against v4, and have tested this against Paolo's proposed builds of qemu for RHEL 6.3. Patches 1-14 are ready to apply if qemu commits to the 'drive-mirror' interface for qemu 1.1. Patches 15-17 need a bit more thought to decide if we also want to support partial streaming support (similar to the optional 'base' argument to 'block-stream') in 'drive-mirror' in qemu 1.2; it might be wiser to defer these until we know for sure what happens with qemu. Patches 18-23 are only valid for the RHEL 6.3 build, although patches 19-23 would be useful if qemu 1.2 enhances 'drive-mirror' to support snapshot+mirror. I've tried to give more details in the various commits up to 14, which are the most important to review for purposes of backporting; other changes in later patches include fixing a use-after-free bug in the snapshot+mirror code, and altering patch 18 to match the difference in what RHEL 6.3 will probably be providing. Available here as well: git fetch git://repo.or.cz/libvirt/ericb.git snapshot http://repo.or.cz/w/libvirt/ericb.git/shortlog/refs/heads/snapshot I think 1-3 can be applied without controversy, 4-7 can be applied _if_ we think that the libvirt API is reasonable no matter what qemu throws at us (and I'm pretty positive that it is, as I have already been through several rounds of design changes on the qemu side where the libvirt API still held up without problem), and 8 onwards should be delayed until we have a firm commitment on the actual qemu 1.1 implementation. Eric Blake (23): virsh: minor syntactic cleanups qemu: use consistent error when qemu binary is too old blockjob: add virsh blockpull --wait blockjob: add new API flags blockjob: add 'blockcopy' to virsh blockjob: enhance xml to track mirrors across libvirtd restart blockjob: react to active block copy blockjob: add qemu capabilities related to block jobs blockjob: return appropriate event and info blockjob: support pivot operation on cancel blockjob: implement block copy for qemu blockjob: relax block job behavior when setting speed up front blockjob: allow for existing files blockjob: allow mirroring under SELinux blockjob: add virDomainBlockCopy blockjob: enhance virsh 'blockcopy' blockjob: wire up qemu and RPC for block copy blockjob: accommodate RHEL backport names snapshot: allow for creation of mirrored snapshots snapshot: add new snapshot delete flags snapshot: make it possible to check for mirrored snapshot snapshot: implement new snapshot delete flags in qemu snapshot: enable mirrored snapshots on transient vm docs/apibuild.py | 1 + docs/formatdomain.html.in | 13 + docs/formatsnapshot.html.in | 31 + docs/schemas/domaincommon.rng | 24 +- docs/schemas/domainsnapshot.rng | 8 + include/libvirt/libvirt.h.in | 50 ++- include/libvirt/virterror.h | 1 + src/conf/domain_conf.c | 125 ++++- src/conf/domain_conf.h | 8 + src/driver.h | 5 + src/libvirt.c | 268 ++++++++- src/libvirt_private.syms | 2 + src/libvirt_public.syms | 5 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 2 +- src/qemu/qemu_driver.c | 624 +++++++++++++++++++- src/qemu/qemu_hotplug.c | 9 +- src/qemu/qemu_monitor.c | 56 ++- src/qemu/qemu_monitor.h | 12 + src/qemu/qemu_monitor_json.c | 94 +++ src/qemu/qemu_monitor_json.h | 19 +- src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 12 +- src/remote_protocol-structs | 9 + src/rpc/gendispatch.pl | 1 + src/util/virterror.c | 6 + .../disk_snapshot_mirror.xml | 13 + .../disk_snapshot_mirror.xml | 49 ++ tests/domainsnapshotxml2xmltest.c | 4 +- .../qemuxml2argvdata/qemuxml2argv-disk-mirror.xml | 42 ++ .../qemuxml2xmlout-disk-mirror.xml | 40 ++ tests/qemuxml2xmltest.c | 42 +- tools/virsh.c | 558 ++++++++++++++---- tools/virsh.pod | 84 +++- 35 files changed, 2012 insertions(+), 210 deletions(-) create mode 100644 tests/domainsnapshotxml2xmlin/disk_snapshot_mirror.xml create mode 100644 tests/domainsnapshotxml2xmlout/disk_snapshot_mirror.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-mirror.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror.xml -- 1.7.7.6

4 45

[libvirt] [test-API PATCH] remove original 'util' object in testcases
by Guannan Ren 23 Apr '12

23 Apr '12

--- repos/domain/cpu_affinity.py | 4 ++-- repos/domain/cpu_topology.py | 8 ++++---- repos/domain/ownership_test.py | 12 ++++++------ repos/domain/restore.py | 8 ++++---- repos/domain/save.py | 10 +++++----- repos/libvirtd/qemu_hang.py | 12 ++++++------ repos/libvirtd/restart.py | 12 ++++++------ repos/libvirtd/upstart.py | 6 +++--- repos/network/network_list.py | 12 ++++++------ repos/remoteAccess/tcp_setup.py | 8 ++++---- repos/remoteAccess/tls_setup.py | 28 ++++++++++++++-------------- repos/sVirt/domain_nfs_start.py | 8 ++++---- 12 files changed, 64 insertions(+), 64 deletions(-) diff --git a/repos/domain/cpu_affinity.py b/repos/domain/cpu_affinity.py index 8b65e2f..ee585e6 100644 --- a/repos/domain/cpu_affinity.py +++ b/repos/domain/cpu_affinity.py @@ -38,7 +38,7 @@ def redefine_vcpu_number(domobj, domain_name, vcpu): return doc.toxml() -def set_vcpus(util, domobj, domain_name, vcpu): +def set_vcpus(domobj, domain_name, vcpu): """set the value of virtual machine to vcpu offline , then boot up the virtual machine """ @@ -225,7 +225,7 @@ def cpu_affinity(params): if vcpunum != vcpu: logger.info("set the vcpu of the guest to %s" % vcpu) - ret = set_vcpus(util, domobj, domain_name, vcpu) + ret = set_vcpus(domobj, domain_name, vcpu) if ret != 0: return 1 diff --git a/repos/domain/cpu_topology.py b/repos/domain/cpu_topology.py index 120273a..f0f081c 100644 --- a/repos/domain/cpu_topology.py +++ b/repos/domain/cpu_topology.py @@ -86,7 +86,7 @@ def guest_define(domobj, domxml, logger): return 0 -def guest_start(domobj, guestname, util, logger): +def guest_start(domobj, guestname, logger): """start guest""" timeout = 600 ip = '' @@ -121,7 +121,7 @@ def guest_start(domobj, guestname, util, logger): return 0, ip def cpu_topology_check(ip, username, password, - sockets, cores, threads, util, logger): + sockets, cores, threads, logger): """login the guest, run lscpu command to check the result""" lscpu = "lscpu" # sleep for 5 seconds @@ -190,12 +190,12 @@ def cpu_topology(params): if guest_define(domobj, domxml, logger): return 1 - ret, ip = guest_start(domobj, guestname, util, logger) + ret, ip = guest_start(domobj, guestname, logger) if ret: return 1 if cpu_topology_check(ip, username, password, - sockets, cores, threads, util, logger): + sockets, cores, threads, logger): return 1 return 0 diff --git a/repos/domain/ownership_test.py b/repos/domain/ownership_test.py index acb56c1..b479708 100644 --- a/repos/domain/ownership_test.py +++ b/repos/domain/ownership_test.py @@ -35,7 +35,7 @@ def check_domain_running(conn, guestname, logger): else: return 0 -def nfs_setup(util, logger): +def nfs_setup(logger): """setup nfs on localhost """ logger.info("set nfs service") @@ -57,7 +57,7 @@ def nfs_setup(util, logger): return 0 -def chown_file(util, filepath, logger): +def chown_file(filepath, logger): """touch a file and setting the chown """ if os.path.exists(filepath): @@ -87,7 +87,7 @@ def chown_file(util, filepath, logger): return 0 -def prepare_env(util, dynamic_ownership, use_nfs, logger): +def prepare_env(dynamic_ownership, use_nfs, logger): """configure dynamic_ownership in /etc/libvirt/qemu.conf, set chown of the file to save """ @@ -126,12 +126,12 @@ def prepare_env(util, dynamic_ownership, use_nfs, logger): logger.error("wrong use_nfs value") return 1 - ret = chown_file(util, filepath, logger) + ret = chown_file(filepath, logger) if ret: return 1 if use_nfs == 'enable': - ret = nfs_setup(util, logger) + ret = nfs_setup(logger) if ret: return 1 @@ -175,7 +175,7 @@ def ownership_test(params): # set env logger.info("prepare the environment") - ret = prepare_env(util, dynamic_ownership, use_nfs, logger) + ret = prepare_env(dynamic_ownership, use_nfs, logger) if ret: logger.error("failed to prepare the environment") return 1 diff --git a/repos/domain/restore.py b/repos/domain/restore.py index 4ac68be..3a1a5a9 100644 --- a/repos/domain/restore.py +++ b/repos/domain/restore.py @@ -16,7 +16,7 @@ optional_params = {} def get_guest_ipaddr(*args): """Get guest ip address""" - (guestname, util, logger) = args + (guestname, logger) = args mac = utils.get_dom_mac_addr(guestname) logger.debug("guest mac address: %s" % mac) @@ -47,10 +47,10 @@ def check_guest_restore(*args): """Check restore domain result, if restore domain is successful, guest status will not be paused and can be ping """ - (guestname, domobj, util, logger) = args + (guestname, domobj, logger) = args if check_guest_status(domobj, logger): - if get_guest_ipaddr(guestname, util, logger): + if get_guest_ipaddr(guestname, logger): return True else: return False @@ -73,7 +73,7 @@ def restore(params): try: conn.restore(filepath) - if check_guest_restore(guestname, domobj, util, logger): + if check_guest_restore(guestname, domobj, logger): logger.info("restore %s domain successful" % guestname) else: logger.error("Error: fail to check restore domain") diff --git a/repos/domain/save.py b/repos/domain/save.py index 677adb4..236420d 100644 --- a/repos/domain/save.py +++ b/repos/domain/save.py @@ -16,7 +16,7 @@ optional_params = {} def get_guest_ipaddr(*args): """Get guest ip address""" - (guestname, util, logger) = args + (guestname, logger) = args mac = utils.get_dom_mac_addr(guestname) logger.debug("guest mac address: %s" %mac) @@ -50,10 +50,10 @@ def check_guest_save(*args): guestname.save will exist under /tmp directory and guest can't be ping and status is paused """ - (guestname, domobj, util, logger) = args + (guestname, domobj, logger) = args if not check_guest_status(domobj, logger): - if not get_guest_ipaddr(guestname, util, logger): + if not get_guest_ipaddr(guestname, logger): return True else: return False @@ -70,7 +70,7 @@ def save(params): domobj = conn.lookupByName(guestname) # Save domain - ipaddr = get_guest_ipaddr(guestname, util, logger) + ipaddr = get_guest_ipaddr(guestname, logger) if not check_guest_status(domobj, logger): logger.error("Error: current guest status is shutoff") @@ -82,7 +82,7 @@ def save(params): try: domobj.save(filepath) - if check_guest_save(guestname, domobj, util, logger): + if check_guest_save(guestname, domobj, logger): logger.info("save %s domain successful" %guestname) else: logger.error("Error: fail to check save domain") diff --git a/repos/libvirtd/qemu_hang.py b/repos/libvirtd/qemu_hang.py index 894949c..7a58f50 100644 --- a/repos/libvirtd/qemu_hang.py +++ b/repos/libvirtd/qemu_hang.py @@ -33,7 +33,7 @@ def check_domain_running(conn, guestname, logger): else: return 0 -def libvirtd_check(util, logger): +def libvirtd_check(logger): """check libvirtd status """ cmd = "service libvirtd status" @@ -55,7 +55,7 @@ def libvirtd_check(util, logger): return 0 -def get_domain_pid(util, logger, guestname): +def get_domain_pid(logger, guestname): """get the pid of running domain""" logger.info("get the pid of running domain %s" % guestname) get_pid_cmd = "cat /var/run/libvirt/qemu/%s.pid" % guestname @@ -82,11 +82,11 @@ def qemu_hang(params): return 1 logger.info("check the libvirtd status:") - ret = libvirtd_check(util, logger) + ret = libvirtd_check(logger) if ret: return 1 - ret, pid = get_domain_pid(util, logger, guestname) + ret, pid = get_domain_pid(logger, guestname) if ret: return 1 @@ -98,7 +98,7 @@ def qemu_hang(params): return 1 logger.info("recheck libvirtd status:") - ret = libvirtd_check(util, logger) + ret = libvirtd_check(logger) if ret: return 1 @@ -109,7 +109,7 @@ def qemu_hang_clean(params): logger = params['logger'] guestname = params['guestname'] - ret = get_domain_pid(util, logger, guestname) + ret = get_domain_pid(logger, guestname) cmd = "kill -CONT %s" % ret[1] ret = utils.exec_cmd(cmd, shell=True) if ret[0]: diff --git a/repos/libvirtd/restart.py b/repos/libvirtd/restart.py index c095fc7..803fa2e 100644 --- a/repos/libvirtd/restart.py +++ b/repos/libvirtd/restart.py @@ -33,7 +33,7 @@ def check_domain_running(conn, guestname, logger): else: return 0 -def libvirtd_check(util, logger): +def libvirtd_check(logger): """check libvirtd status """ cmd = "service libvirtd status" @@ -55,7 +55,7 @@ def libvirtd_check(util, logger): return 0 -def get_domain_pid(util, logger, guestname): +def get_domain_pid(logger, guestname): """get the pid of running domain""" logger.info("get the pid of running domain %s" % guestname) get_pid_cmd = "cat /var/run/libvirt/qemu/%s.pid" % guestname @@ -82,7 +82,7 @@ def restart(params): return 1 logger.info("check the libvirtd status:") - ret = libvirtd_check(util, logger) + ret = libvirtd_check(logger) if ret: return 1 @@ -102,7 +102,7 @@ def restart(params): logger.error("fail to ping domain %s" % guestname) return 1 - ret, pid_before = get_domain_pid(util, logger, guestname) + ret, pid_before = get_domain_pid(logger, guestname) if ret: return 1 @@ -118,7 +118,7 @@ def restart(params): logger.info(out[i]) logger.info("recheck libvirtd status:") - ret = libvirtd_check(util, logger) + ret = libvirtd_check(logger) if ret: return 1 @@ -129,7 +129,7 @@ def restart(params): logger.error("fail to ping domain %s" % guestname) return 1 - ret, pid_after = get_domain_pid(util, logger, guestname) + ret, pid_after = get_domain_pid(logger, guestname) if ret: return 1 diff --git a/repos/libvirtd/upstart.py b/repos/libvirtd/upstart.py index 7746d20..13cb349 100644 --- a/repos/libvirtd/upstart.py +++ b/repos/libvirtd/upstart.py @@ -20,7 +20,7 @@ INITCTL_RELOAD_CMD = "initctl reload-configuration" SYSTEMCTL_RELOAD_CMD = "systemctl daemon-reload" INIT_CONF = "/etc/init/libvirtd.conf" -def libvirtd_check(util, logger): +def libvirtd_check(logger): """check libvirtd status """ cmd = "service libvirtd status" @@ -133,7 +133,7 @@ def upstart(params): time.sleep(5) logger.info("check the libvirtd status:") - ret = libvirtd_check(util, logger) + ret = libvirtd_check(logger) if ret: return 1 @@ -149,7 +149,7 @@ def upstart(params): time.sleep(5) logger.info("recheck libvirtd status:") - ret = libvirtd_check(util, logger) + ret = libvirtd_check(logger) if ret: return 1 else: diff --git a/repos/network/network_list.py b/repos/network/network_list.py index c04a183..7c34f69 100644 --- a/repos/network/network_list.py +++ b/repos/network/network_list.py @@ -47,7 +47,7 @@ def get_output(logger, command, flag): logger.error(ret) return status, ret -def check_all_option(conn, util, logger): +def check_all_option(conn, logger): """check the output of virsh net-list with --all option """ all_network = [] @@ -73,7 +73,7 @@ def check_all_option(conn, util, logger): return 1 return 0 -def check_inactive_option(conn, util, logger): +def check_inactive_option(conn, logger): """check the output of virsh net-list with --inactive option """ inactive_network = [] @@ -105,7 +105,7 @@ def check_inactive_option(conn, util, logger): return 0 -def check_default_option(conn, util, logger): +def check_default_option(conn, logger): """check the output of virsh net-list """ active_network = [] @@ -158,7 +158,7 @@ def network_list(params): for option in option_list: if option == ' ': logger.info("check the output of virsh net-list") - if not check_default_option(conn, util, logger): + if not check_default_option(conn, logger): logger.info("virsh net-list checking succeeded") execute_virsh_netlist(option, logger) else: @@ -166,7 +166,7 @@ def network_list(params): return 1 elif option == '--inactive': logger.info("check the output of virsh net-list --inactive") - if not check_inactive_option(conn, util, logger): + if not check_inactive_option(conn, logger): logger.info("virsh net-list --inactive checking succeeded") execute_virsh_netlist(option, logger) else: @@ -174,7 +174,7 @@ def network_list(params): return 1 elif option == '--all': logger.info("check the output of virsh net-list --all") - if not check_all_option(conn, util, logger): + if not check_all_option(conn, logger): logger.info("virsh net-list --all checking succeeded") execute_virsh_netlist(option, logger) else: diff --git a/repos/remoteAccess/tcp_setup.py b/repos/remoteAccess/tcp_setup.py index ec76c84..ddbe333 100644 --- a/repos/remoteAccess/tcp_setup.py +++ b/repos/remoteAccess/tcp_setup.py @@ -22,7 +22,7 @@ SASLPASSWD2 = "/usr/sbin/saslpasswd2" LIBVIRTD_CONF = "/etc/libvirt/libvirtd.conf" SYSCONFIG_LIBVIRTD = "/etc/sysconfig/libvirtd" -def sasl_user_add(target_machine, username, password, util, logger): +def sasl_user_add(target_machine, username, password, logger): """ execute saslpasswd2 to add sasl user """ logger.info("add sasl user on server side") saslpasswd2_add = "echo %s | %s -a libvirt %s" % (password, SASLPASSWD2, username) @@ -35,7 +35,7 @@ def sasl_user_add(target_machine, username, password, util, logger): return 0 def tcp_libvirtd_set(target_machine, username, password, - listen_tcp, auth_tcp, util, logger): + listen_tcp, auth_tcp, logger): """ configure libvirtd.conf on libvirt server """ logger.info("setting libvirtd.conf on libvirt server") # open libvirtd --listen option @@ -156,11 +156,11 @@ def tcp_setup(params): return 1 if auth_tcp == 'sasl': - if sasl_user_add(target_machine, username, password, util, logger): + if sasl_user_add(target_machine, username, password, logger): return 1 if tcp_libvirtd_set(target_machine, username, password, - listen_tcp, auth_tcp, util, logger): + listen_tcp, auth_tcp, logger): return 1 if listen_tcp == 'disable': diff --git a/repos/remoteAccess/tls_setup.py b/repos/remoteAccess/tls_setup.py index 4e7c60d..f8b3cea 100644 --- a/repos/remoteAccess/tls_setup.py +++ b/repos/remoteAccess/tls_setup.py @@ -37,7 +37,7 @@ SERVERCERT = os.path.join(TEMP_TLS_FOLDER, 'servercert.pem') CLIENTKEY = os.path.join(TEMP_TLS_FOLDER, 'clientkey.pem') CLIENTCERT = os.path.join(TEMP_TLS_FOLDER, 'clientcert.pem') -def CA_setting_up(util, logger): +def CA_setting_up(logger): """ setting up a Certificate Authority """ # Create a private key for CA logger.info("generate CA certificates") @@ -72,7 +72,7 @@ def CA_setting_up(util, logger): logger.info("done the CA certificates job") return 0 -def tls_server_cert(target_machine, util, logger): +def tls_server_cert(target_machine, logger): """ generating server certificates """ # Create tls server key logger.info("generate server certificates") @@ -114,7 +114,7 @@ def tls_server_cert(target_machine, util, logger): logger.info("done the server certificates job") return 0 -def tls_client_cert(local_machine, util, logger): +def tls_client_cert(local_machine, logger): """ generating client certificates """ # Create tls client key logger.info("generate client certificates") @@ -160,7 +160,7 @@ def tls_client_cert(local_machine, util, logger): logger.info("done the client certificates job") return 0 -def deliver_cert(target_machine, username, password, pkipath, util, logger): +def deliver_cert(target_machine, username, password, pkipath, logger): """ deliver CA, server and client certificates """ # transmit cacert.pem to remote host logger.info("deliver CA, server and client certificates to both local and remote server") @@ -218,7 +218,7 @@ def deliver_cert(target_machine, username, password, pkipath, util, logger): logger.info("done to delivery") return 0 -def sasl_user_add(target_machine, username, password, util, logger): +def sasl_user_add(target_machine, username, password, logger): """ execute saslpasswd2 to add sasl user """ logger.info("add sasl user on server side") saslpasswd2_add = "echo %s | %s -a libvirt %s" % (password, SASLPASSWD2, username) @@ -231,7 +231,7 @@ def sasl_user_add(target_machine, username, password, util, logger): return 0 def tls_libvirtd_set(target_machine, username, password, - listen_tls, auth_tls, util, logger): + listen_tls, auth_tls, logger): """ configure libvirtd.conf on tls server """ logger.info("setting libvirtd.conf on tls server") # open libvirtd --listen option @@ -272,7 +272,7 @@ def tls_libvirtd_set(target_machine, username, password, logger.info("done to libvirtd configuration") return 0 -def iptables_stop(target_machine, username, password, util, logger): +def iptables_stop(target_machine, username, password, logger): """ This is a temprory method in favor of migration """ logger.info("stop local and remote iptables temprorily") iptables_stop_cmd = "service iptables stop" @@ -375,28 +375,28 @@ def tls_setup(params): os.mkdir(TEMP_TLS_FOLDER) - if iptables_stop(target_machine, username, password, util, logger): + if iptables_stop(target_machine, username, password, logger): return 1 - if CA_setting_up(util, logger): + if CA_setting_up(logger): return 1 - if tls_server_cert(target_machine, util, logger): + if tls_server_cert(target_machine, logger): return 1 - if tls_client_cert(local_machine, util, logger): + if tls_client_cert(local_machine, logger): return 1 if deliver_cert(target_machine, username, - password, pkipath, util, logger): + password, pkipath, logger): return 1 if auth_tls == 'sasl': - if sasl_user_add(target_machine, username, password, util, logger): + if sasl_user_add(target_machine, username, password, logger): return 1 if tls_libvirtd_set(target_machine, username, password, - listen_tls, auth_tls, util, logger): + listen_tls, auth_tls, logger): return 1 if listen_tls == 'disable': diff --git a/repos/sVirt/domain_nfs_start.py b/repos/sVirt/domain_nfs_start.py index 59cb267..88d349c 100644 --- a/repos/sVirt/domain_nfs_start.py +++ b/repos/sVirt/domain_nfs_start.py @@ -25,7 +25,7 @@ optional_params = {} QEMU_CONF = "/etc/libvirt/qemu.conf" -def nfs_setup(util, root_squash, logger): +def nfs_setup(root_squash, logger): """setup nfs on localhost """ logger.info("set nfs service") @@ -55,7 +55,7 @@ def nfs_setup(util, root_squash, logger): return 0 -def prepare_env(util, d_ownership, virt_use_nfs, guestname, root_squash, \ +def prepare_env(d_ownership, virt_use_nfs, guestname, root_squash, \ disk_file, img_dir, logger): """set virt_use_nfs SElinux boolean, configure dynamic_ownership in /etc/libvirt/qemu.conf @@ -105,7 +105,7 @@ def prepare_env(util, d_ownership, virt_use_nfs, guestname, root_squash, \ copy(disk_file, "/tmp") logger.info("set up nfs service on localhost") - ret = nfs_setup(util, root_squash, logger) + ret = nfs_setup(root_squash, logger) if ret: return 1 @@ -165,7 +165,7 @@ def domain_nfs_start(params): # set env logger.info("prepare the environment") - ret = prepare_env(util, dynamic_ownership, virt_use_nfs, guestname, \ + ret = prepare_env(dynamic_ownership, virt_use_nfs, guestname, \ root_squash, disk_file, img_dir, logger) if ret: logger.error("failed to prepare the environment") -- 1.7.7.5

2 2

[libvirt] [PATCH] cpu: Improve error reporting on incompatible CPUs
by Peter Krempa 23 Apr '12

23 Apr '12

This patch modifies the CPU comparrison function to report the incompatibilities in more detail to ease identification of problems. * src/cpu/cpu.h: cpuGuestData(): Add argument to return detailed error message. * src/cpu/cpu.c: cpuGuestData(): Add passthrough for error argument. * src/cpu/cpu_x86.c x86FeatureNames(): Add function to convert a CPU definition to flag names. x86Compute(): - Add error message parameter - Add macro for reporting detailed error messages. - Improve error reporting. - Simplify calculation of forbidden flags. x86DataIteratorInit(): x86cpuidMatchAny(): Remove functions that are no longer needed. * src/qemu/qemu_command.c: qemuBuildCpuArgStr(): - Modify for new function prototype - Add detailed error reports - Change error code on incompatible processors to VIR_ERR_CONFIG_UNSUPPORTED instead of internal error * tests/cputest.c: cpuTestGuestData(): Modify for new function prototype --- Sample of error message: $ virsh start Bare error: Failed to start domain Bare error: unsupported configuration: guest and host CPU are not compatible: Host CPU does not provide required features: svm, avx src/cpu/cpu.c | 7 ++- src/cpu/cpu.h | 6 ++- src/cpu/cpu_x86.c | 123 +++++++++++++++++++++++++++++++---------------- src/qemu/qemu_command.c | 12 ++++- tests/cputest.c | 2 +- 5 files changed, 100 insertions(+), 50 deletions(-) diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c index 01c31bb..b8ccd24 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -248,11 +248,12 @@ cpuNodeData(const char *arch) virCPUCompareResult cpuGuestData(virCPUDefPtr host, virCPUDefPtr guest, - union cpuData **data) + union cpuData **data, + char **msg) { struct cpuArchDriver *driver; - VIR_DEBUG("host=%p, guest=%p, data=%p", host, guest, data); + VIR_DEBUG("host=%p, guest=%p, data=%p, msg=%p", host, guest, data, msg); if ((driver = cpuGetSubDriver(host->arch)) == NULL) return VIR_CPU_COMPARE_ERROR; @@ -264,7 +265,7 @@ cpuGuestData(virCPUDefPtr host, return VIR_CPU_COMPARE_ERROR; } - return driver->guestData(host, guest, data); + return driver->guestData(host, guest, data, msg); } diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h index 9f01f17..d7bc54e 100644 --- a/src/cpu/cpu.h +++ b/src/cpu/cpu.h @@ -70,7 +70,8 @@ typedef union cpuData * typedef virCPUCompareResult (*cpuArchGuestData) (virCPUDefPtr host, virCPUDefPtr guest, - union cpuData **data); + union cpuData **data, + char **message); typedef virCPUDefPtr (*cpuArchBaseline) (virCPUDefPtr *cpus, @@ -138,7 +139,8 @@ cpuNodeData (const char *arch); extern virCPUCompareResult cpuGuestData(virCPUDefPtr host, virCPUDefPtr guest, - union cpuData **data); + union cpuData **data, + char **msg); extern char * cpuBaselineXML(const char **xmlCPUs, diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 8d92649..e1500bf 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -31,6 +31,7 @@ #include "cpu.h" #include "cpu_map.h" #include "cpu_x86.h" +#include "buf.h" #define VIR_FROM_THIS VIR_FROM_CPU @@ -89,16 +90,6 @@ struct data_iterator { { data, -1, false } -static void -x86DataIteratorInit(struct data_iterator *iter, - union cpuData *data) -{ - struct data_iterator init = DATA_ITERATOR_INIT(data); - - *iter = init; -} - - static int x86cpuidMatch(const struct cpuX86cpuid *cpuid1, const struct cpuX86cpuid *cpuid2) @@ -121,17 +112,6 @@ x86cpuidMatchMasked(const struct cpuX86cpuid *cpuid, } -static int -x86cpuidMatchAny(const struct cpuX86cpuid *cpuid, - const struct cpuX86cpuid *mask) -{ - return ((cpuid->eax & mask->eax) || - (cpuid->ebx & mask->ebx) || - (cpuid->ecx & mask->ecx) || - (cpuid->edx & mask->edx)); -} - - static void x86cpuidSetBits(struct cpuX86cpuid *cpuid, const struct cpuX86cpuid *mask) @@ -649,6 +629,34 @@ x86FeatureFind(const struct x86_map *map, } +static char * +x86FeatureNames(const struct x86_map *map, + const char *separator, + union cpuData *data) +{ + virBuffer ret = VIR_BUFFER_INITIALIZER; + bool first = true; + + struct x86_feature *next_feature = map->features; + + virBufferAdd(&ret, "", 0); + + while (next_feature) { + if (x86DataIsSubset(data, next_feature->data)) { + if (!first) + virBufferAdd(&ret, separator, -1); + else + first = false; + + virBufferAdd(&ret, next_feature->name, -1); + } + next_feature = next_feature->next; + } + + return virBufferContentAndReset(&ret); +} + + static int x86FeatureLoad(xmlXPathContextPtr ctxt, struct x86_map *map) @@ -1115,10 +1123,34 @@ error: } +/* A helper macro to exit the cpu computation function without writing + * redundant code: + * MSG: error message + * CPU_DEF: a union cpuData pointer with flags that are conflicting + * RET: return code to set + * + * This macro generates the error string outputs it into logs. + */ +#define virX86CpuIncompatible(MSG, CPU_DEF) \ + do { \ + char *flagsStr = NULL; \ + if (!(flagsStr = x86FeatureNames(map, ", ", (CPU_DEF)))) \ + goto no_memory; \ + if (message && \ + virAsprintf(message, "%s: %s", _(MSG), flagsStr) < 0) { \ + VIR_FREE(flagsStr); \ + goto no_memory; \ + } \ + VIR_DEBUG("%s: %s", MSG, flagsStr); \ + VIR_FREE(flagsStr); \ + ret = VIR_CPU_COMPARE_INCOMPATIBLE; \ + } while (0); + static virCPUCompareResult x86Compute(virCPUDefPtr host, virCPUDefPtr cpu, - union cpuData **guest) + union cpuData **guest, + char **message) { struct x86_map *map = NULL; struct x86_model *host_model = NULL; @@ -1129,8 +1161,6 @@ x86Compute(virCPUDefPtr host, struct x86_model *cpu_forbid = NULL; struct x86_model *diff = NULL; struct x86_model *guest_model = NULL; - struct data_iterator iter; - const struct cpuX86cpuid *cpuid; virCPUCompareResult ret; enum compare_result result; unsigned int i; @@ -1147,6 +1177,11 @@ x86Compute(virCPUDefPtr host, if (!found) { VIR_DEBUG("CPU arch %s does not match host arch", cpu->arch); + if (message && + virAsprintf(message, + _("CPU arch %s does not match host arch"), + cpu->arch) < 0) + goto no_memory; return VIR_CPU_COMPARE_INCOMPATIBLE; } } @@ -1155,6 +1190,12 @@ x86Compute(virCPUDefPtr host, (!host->vendor || STRNEQ(cpu->vendor, host->vendor))) { VIR_DEBUG("host CPU vendor does not match required CPU vendor %s", cpu->vendor); + if (message && + virAsprintf(message, + _("host CPU vendor does not match required " + "CPU vendor %s"), + cpu->vendor) < 0) + goto no_memory; return VIR_CPU_COMPARE_INCOMPATIBLE; } @@ -1167,24 +1208,19 @@ x86Compute(virCPUDefPtr host, !(cpu_forbid = x86ModelFromCPU(cpu, map, VIR_CPU_FEATURE_FORBID))) goto error; - x86DataIteratorInit(&iter, cpu_forbid->data); - while ((cpuid = x86DataCpuidNext(&iter))) { - const struct cpuX86cpuid *cpuid2; - - cpuid2 = x86DataCpuid(host_model->data, cpuid->function); - if (cpuid2 != NULL && x86cpuidMatchAny(cpuid2, cpuid)) { - VIR_DEBUG("Host CPU provides forbidden features in CPUID function 0x%x", - cpuid->function); - ret = VIR_CPU_COMPARE_INCOMPATIBLE; - goto out; - } + x86DataIntersect(cpu_forbid->data, host_model->data); + if (!x86DataIsEmpty(cpu_forbid->data)) { + virX86CpuIncompatible("Host CPU provides forbidden features", + cpu_forbid->data); + goto out; } x86DataSubtract(cpu_require->data, cpu_disable->data); result = x86ModelCompare(host_model, cpu_require); if (result == SUBSET || result == UNRELATED) { - VIR_DEBUG("Host CPU does not provide all required features"); - ret = VIR_CPU_COMPARE_INCOMPATIBLE; + x86DataSubtract(cpu_require->data, host_model->data); + virX86CpuIncompatible("Host CPU does not provide required features", + cpu_require->data); goto out; } @@ -1204,8 +1240,9 @@ x86Compute(virCPUDefPtr host, if (ret == VIR_CPU_COMPARE_SUPERSET && cpu->type == VIR_CPU_TYPE_GUEST && cpu->match == VIR_CPU_MATCH_STRICT) { - VIR_DEBUG("Host CPU does not strictly match guest CPU"); - ret = VIR_CPU_COMPARE_INCOMPATIBLE; + virX86CpuIncompatible("Host CPU does not strictly match guest CPU: " + "Extra features", + diff->data); goto out; } @@ -1246,22 +1283,24 @@ error: ret = VIR_CPU_COMPARE_ERROR; goto out; } +#undef virX86CpuIncompatible static virCPUCompareResult x86Compare(virCPUDefPtr host, virCPUDefPtr cpu) { - return x86Compute(host, cpu, NULL); + return x86Compute(host, cpu, NULL, NULL); } static virCPUCompareResult x86GuestData(virCPUDefPtr host, virCPUDefPtr guest, - union cpuData **data) + union cpuData **data, + char **message) { - return x86Compute(host, guest, data); + return x86Compute(host, guest, data, message); } diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 8dedd80..45cd417 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3704,6 +3704,7 @@ qemuBuildCpuArgStr(const struct qemud_driver *driver, const char *default_model; union cpuData *data = NULL; bool have_cpu = false; + char *compare_msg = NULL; int ret = -1; virBuffer buf = VIR_BUFFER_INITIALIZER; int i; @@ -3740,11 +3741,17 @@ qemuBuildCpuArgStr(const struct qemud_driver *driver, cpuUpdate(cpu, host) < 0) goto cleanup; - cmp = cpuGuestData(host, cpu, &data); + cmp = cpuGuestData(host, cpu, &data, &compare_msg); switch (cmp) { case VIR_CPU_COMPARE_INCOMPATIBLE: - qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + if (compare_msg) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("guest and host CPU are not compatible: %s"), + compare_msg); + } else { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("guest CPU is not compatible with host CPU")); + } /* fall through */ case VIR_CPU_COMPARE_ERROR: goto cleanup; @@ -3848,6 +3855,7 @@ qemuBuildCpuArgStr(const struct qemud_driver *driver, ret = 0; cleanup: + VIR_FREE(compare_msg); if (host) cpuDataFree(host->arch, data); virCPUDefFree(guest); diff --git a/tests/cputest.c b/tests/cputest.c index 01db8f1..ccc17fd 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -269,7 +269,7 @@ cpuTestGuestData(const void *arg) !(cpu = cpuTestLoadXML(data->arch, data->name))) goto cleanup; - cmpResult = cpuGuestData(host, cpu, &guestData); + cmpResult = cpuGuestData(host, cpu, &guestData, NULL); if (cmpResult == VIR_CPU_COMPARE_ERROR || cmpResult == VIR_CPU_COMPARE_INCOMPATIBLE) goto cleanup; -- 1.7.3.4

3 3

[libvirt] [test-API PATCH] Fix a bug in the case that clean flag is used
by Guannan Ren 23 Apr '12

23 Apr '12

When clean flag is used in testcase, the framework reports 'KeyError'. The bug is caused is by getting mod_case earlier than checking whether the 'clean' flag is present or not. The testcases without flag set doesn't be affected. --- src/generator.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/generator.py b/src/generator.py index 6a46889..2e4ae07 100644 --- a/src/generator.py +++ b/src/generator.py @@ -115,11 +115,11 @@ class FuncGen(object): clean_flag = False mod_case_func = self.case_name_list[i] - mod_case = mod_case_func.rsplit(":", 1)[0] if mod_case_func.endswith(':clean'): mod_case_func = mod_case_func[:-6] clean_flag = True + mod_case = mod_case_func.rsplit(":", 1)[0] self.fmt.print_start(mod_case, env_logger) case_params = self.case_params_list[i] -- 1.7.7.5

2 2

[libvirt] [test-API PATCH 0/2] support variables share across testcases
by Guannan Ren 23 Apr '12

23 Apr '12

These two patch is to create a shared module in the root of test-API The framework will create connection object for shared use in testcases based on environment checking results. sharedmod.py # This is a module for variable sharing across testcases during # running. You have to import it in each of testcases which want # to share data. The framwork have already set 'conn' for use in # testcases. # connection object in libvirt.py conn = None # shared variables for customized use in testcases # Note: please set them to None at the end of sharing defined_var1 = None defined_var2 = None defined_var3 = None

3 16

[libvirt] [test-API 00/17] Reorgnize/refactoring round 4
by Osier Yang 23 Apr '12

23 Apr '12

Perhaps this set shouldn't be called reorgnize/refactoring, but to keep the same title in the series, it's still used. The mainly work this set do is to use the TERM "domain" instead of "guest" in codes. Osier Yang (17): Destroy src/dist and move env_inspect.py back Substitute guest_names with domain_names Rename src/env_parser.py as src/global_parser.py Substitute guest_ with domain_ Substitue guestobj with domobj Substitute guestxml with domxml Substitute _guest with _domain Substitute 'guest ' with 'domain ' Substitute guestos with os_type Substitute guestarch with os_arch Substitute 'guestip' with 'domip' Substitute 'guest"' with 'domain"' Substitute '\<gname\>' with 'domname' Change the section name 'guest' into 'domain' in global.cfg Substitute 'guestinstxml' with 'domxml' Substitute '\<guest\>' with 'domain' Substitute 'guestname' with 'domain_name' cases/consumption_cpu_topology.conf | 14 +- cases/consumption_domain_nfs_start.conf | 8 +- cases/consumption_eventhandler.conf | 12 +- cases/consumption_libvirtd.conf | 10 +- cases/consumption_ownership_test.conf | 8 +- cases/domain_linux_net_inst.conf | 12 +- cases/linux_domain.conf | 52 +++--- cases/migration/ssh_persistent_paused_no_dst.conf | 74 ++++---- .../migration/ssh_persistent_paused_with_dst.conf | 98 ++++++------ cases/migration/ssh_persistent_running_no_dst.conf | 74 ++++---- .../migration/ssh_persistent_running_with_dst.conf | 98 ++++++------ cases/migration/ssh_transient_paused_no_dst.conf | 48 +++--- cases/migration/ssh_transient_paused_with_dst.conf | 74 ++++---- cases/migration/ssh_transient_running_no_dst.conf | 50 +++--- .../migration/ssh_transient_running_with_dst.conf | 74 ++++---- cases/migration/tcp_persistent_paused_no_dst.conf | 74 ++++---- .../migration/tcp_persistent_paused_with_dst.conf | 98 ++++++------ cases/migration/tcp_persistent_running_no_dst.conf | 74 ++++---- .../migration/tcp_persistent_running_with_dst.conf | 98 ++++++------ .../tcp_sasl_persistent_paused_no_dst.conf | 26 ++-- .../tcp_sasl_persistent_paused_with_dst.conf | 34 ++-- .../tcp_sasl_persistent_running_no_dst.conf | 26 ++-- .../tcp_sasl_persistent_running_with_dst.conf | 34 ++-- .../tcp_sasl_transient_paused_no_dst.conf | 18 +- .../tcp_sasl_transient_paused_with_dst.conf | 26 ++-- .../tcp_sasl_transient_running_no_dst.conf | 18 +- .../tcp_sasl_transient_running_with_dst.conf | 26 ++-- cases/migration/tcp_transient_paused_no_dst.conf | 48 +++--- cases/migration/tcp_transient_paused_with_dst.conf | 74 ++++---- cases/migration/tcp_transient_running_no_dst.conf | 50 +++--- .../migration/tcp_transient_running_with_dst.conf | 74 ++++---- cases/migration/tls_persistent_paused_no_dst.conf | 74 ++++---- .../migration/tls_persistent_paused_with_dst.conf | 98 ++++++------ cases/migration/tls_persistent_running_no_dst.conf | 74 ++++---- .../migration/tls_persistent_running_with_dst.conf | 98 ++++++------ .../tls_sasl_persistent_paused_no_dst.conf | 26 ++-- .../tls_sasl_persistent_paused_with_dst.conf | 34 ++-- .../tls_sasl_persistent_running_no_dst.conf | 26 ++-- .../tls_sasl_persistent_running_with_dst.conf | 34 ++-- .../tls_sasl_transient_paused_no_dst.conf | 18 +- .../tls_sasl_transient_paused_with_dst.conf | 26 ++-- .../tls_sasl_transient_running_no_dst.conf | 18 +- .../tls_sasl_transient_running_with_dst.conf | 26 ++-- cases/migration/tls_transient_paused_no_dst.conf | 48 +++--- cases/migration/tls_transient_paused_with_dst.conf | 74 ++++---- cases/migration/tls_transient_running_no_dst.conf | 50 +++--- .../migration/tls_transient_running_with_dst.conf | 74 ++++---- cases/snapshot.conf | 30 ++-- cases/windows_domain.conf | 50 +++--- .../en-US/Creating_a_configuration_file.xml | 116 ++++++------ .../en-US/Understanding_libvirt-test-API.xml | 8 +- .../en-US/Writing_a_test_case.xml | 74 ++++---- .../libvirt-test-API_Guide/en-US/extras/log.txt | 18 +- global.cfg | 34 ++-- repos/domain/attach_disk.py | 20 +- repos/domain/attach_interface.py | 20 +- repos/domain/autostart.py | 24 ++-- repos/domain/balloon_memory.py | 64 ++++---- repos/domain/blkstats.py | 12 +- repos/domain/console_io.py | 12 +- repos/domain/console_mutex.py | 8 +- repos/domain/cpu_affinity.py | 44 +++--- repos/domain/cpu_topology.py | 72 ++++---- repos/domain/create.py | 22 ++-- repos/domain/define.py | 16 +- repos/domain/destroy.py | 28 ++-- repos/domain/detach_disk.py | 20 +- repos/domain/detach_interface.py | 22 ++-- repos/domain/domain_blkinfo.py | 26 ++-- repos/domain/domain_id.py | 18 +- repos/domain/domain_list.py | 22 ++-- repos/domain/domain_name.py | 4 +- repos/domain/domain_uuid.py | 34 ++-- repos/domain/domblkinfo.py | 26 ++-- repos/domain/dump.py | 42 +++--- repos/domain/eventhandler.py | 60 ++++---- repos/domain/ifstats.py | 20 +- repos/domain/install_image.py | 56 +++--- repos/domain/install_linux_cdrom.py | 182 ++++++++++---------- repos/domain/install_linux_check.py | 78 ++++---- repos/domain/install_linux_net.py | 162 +++++++++--------- repos/domain/install_windows_cdrom.py | 160 +++++++++--------- repos/domain/migrate.py | 52 +++--- repos/domain/ownership_test.py | 26 ++-- repos/domain/reboot.py | 4 +- repos/domain/restore.py | 48 +++--- repos/domain/resume.py | 12 +- repos/domain/save.py | 52 +++--- repos/domain/sched_params.py | 20 +- repos/domain/screenshot.py | 4 +- repos/domain/shutdown.py | 14 +- repos/domain/start.py | 16 +- repos/domain/suspend.py | 12 +- repos/domain/undefine.py | 14 +- repos/domain/update_devflag.py | 52 +++--- repos/libvirtd/qemu_hang.py | 36 ++-- repos/libvirtd/restart.py | 58 +++--- .../multiple_thread_block_on_domain_create.py | 56 +++--- repos/sVirt/domain_nfs_start.py | 112 ++++++------ repos/snapshot/delete.py | 32 ++-- repos/snapshot/file_flag.py | 42 +++--- repos/snapshot/flag_check.py | 34 ++-- repos/snapshot/internal_create.py | 28 ++-- repos/snapshot/revert.py | 22 ++-- repos/snapshot/snapshot_list.py | 26 ++-- src/{dist/redhat => }/env_inspect.py | 14 +- src/generator.py | 13 +- src/{env_parser.py => global_parser.py} | 4 +- src/parser.py | 4 +- utils/dev_num.sh | 10 +- utils/disk_num.sh | 10 +- utils/utils.py | 18 +- utils/xml_builder.py | 12 +- utils/xml_generator.py | 6 +- 114 files changed, 2381 insertions(+), 2388 deletions(-) delete mode 100644 src/dist/__init__.py delete mode 100644 src/dist/redhat/__init__.py rename src/{dist/redhat => }/env_inspect.py (91%) rename src/{env_parser.py => global_parser.py} (97%) Regards, Osier -- 1.7.7.3

4 35

[libvirt] [PATCH] building: remove libvirt_dbus.syms from EXTRA_DIST
by Wen Congyang 22 Apr '12

22 Apr '12

commit 2223ea98 removes src/libvirt_dbus.syms, but it forgets to remove it from EXTRA_DIST. It will cause 'make dist' failed. --- src/Makefile.am | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index b8a19b4..e48dfa5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1230,7 +1230,6 @@ EXTRA_DIST += \ libvirt_driver_modules.syms \ libvirt_daemon.syms \ libvirt_linux.syms \ - libvirt_dbus.syms \ libvirt_network.syms \ libvirt_nwfilter.syms \ libvirt_sasl.syms \ -- 1.7.1

4 3

[libvirt] [PATCH] vbox: avoid provoking assertions in VBoxSVC
by Jean-Baptiste Rouault 22 Apr '12

22 Apr '12

Passing a NULL pointer to IMachine::delete virtualbox API causes VBoxSVC to raise an assertion. This patch passes an empty array instead. --- src/vbox/vbox_tmpl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 68e3b05..be25828 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -5294,7 +5294,8 @@ vboxDomainUndefineFlags(virDomainPtr dom, unsigned int flags) ((IMachine_Delete)machine->vtbl->Delete)(machine, &safeArray, &progress); # else - machine->vtbl->Delete(machine, 0, NULL, &progress); + vboxArray array = VBOX_ARRAY_INITIALIZER; + machine->vtbl->Delete(machine, 0, (IMedium**)&array, &progress); # endif if (progress != NULL) { progress->vtbl->WaitForCompletion(progress, -1); -- 1.7.9.1

3 7

[libvirt] [PATCH] win32: Properly handle TlsGetValue returning NULL
by Matthias Bolte 22 Apr '12

22 Apr '12

virThreadSelf tries to access the virThreadPtr stored in TLS for the current thread via TlsGetValue. When virThreadSelf is called on a thread that was not created via virThreadCreate (e.g. the main thread) then TlsGetValue returns NULL as TlsAlloc initializes TLS slots to NULL. virThreadSelf can be called on the main thread via this call chain from virsh vshDeinit virEventAddTimeout virEventPollAddTimeout virEventPollInterruptLocked virThreadIsSelf triggering a segfault as virThreadSelf unconditionally dereferences the return value of TlsGetValue. Fix this by making virThreadSelf check the TLS slot value for NULL and setting the given virThreadPtr accordingly. Reported by Marcel Müller. --- src/util/threads-win32.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/util/threads-win32.c b/src/util/threads-win32.c index 157439c..20756a1 100644 --- a/src/util/threads-win32.c +++ b/src/util/threads-win32.c @@ -316,8 +316,15 @@ int virThreadCreate(virThreadPtr thread, void virThreadSelf(virThreadPtr thread) { virThreadPtr self = TlsGetValue(selfkey); - thread->thread = self->thread; - thread->joinable = self->joinable; + + if (self == NULL) { + /* called on a thread not created by virThreadCreate, e.g. the main thread */ + thread->thread = 0; + thread->joinable = false; + } else { + thread->thread = self->thread; + thread->joinable = self->joinable; + } } bool virThreadIsSelf(virThreadPtr thread) -- 1.7.4.1

2 2

[libvirt] Python binding APIs strict or loose
by Guannan Ren 22 Apr '12

22 Apr '12

Hi There is a question. we need strict python binding API or loose one. For example: The setSchedulerParameters(), it accepts one of parameters: 'vcpu_quota' In C its type is of 'long long', then we need a conversion from PyInt/PyLong to 'long long' by using cpython function 'PyLong_AsLongLong'. The problem is when the user python pass in a value of type Pyfloat instead of PyInt/PyLong, the cpython function drops the fraction part of the value automatically, Is it what we want or we need to add a type checking to ensure that the type of value passed in is PyInt/PyLong, otherwise, we raise an exception. > >> dom.schedulerParameters() {'vcpu_quota': -1L, 'vcpu_period': 100000L, 'cpu_shares': 500L} > >> dom.setSchedulerParameters({'vcpu_quota': 10.88}) works as dom.setSchedulerParameters({'vcpu_quota': 10}) Any idea? Guannan Ren

2 1

[libvirt] [PATCH] Win32 compatibility for 0.9.11
by Marcel Müller 21 Apr '12

21 Apr '12

Hello everyone, I tried to build libvirt-0.9.11 for Windows using the MSYS Build Script provided by Matthias Bolte and noticed that there were two problems which made libvirt unusable. 1) Whenever a TCP Connection is opened, libvirt will fail with failed to set close-on-exec (Im using xen+tcp here). 2) The lib will crash most of the time, because it tries to access a null pointer. I fixed both issues with a little patch: 1) On Win32 platforms virSetInherit always returns -1, therefore failing any call which tries to set close-on-exec. I dont know if theres a Win32 equivalent of close-on-exec, so I just set this to return 0 instead. 2) Libvirt crashes, because TlsGetValue seems to return a NULL value sometimes. Not sure right now, if this is ok in a way or if it indicates another problem somewhere... (This might be the case, as Im experience crashes as soon as libvirt is used in a multithreading application, though I had this with an old version as well. Will discuss that in another mail). As this is my first mail to a mailing list, please dont hesitate to tell me, what I did wrong! By the way, should I attach the binaries for 0.9.11 in case anyone is looking for those without the need to compile them? Best Regards, Marcel

2 1

[libvirt] ESX driver connection private data fix
by ryan woodsmall 21 Apr '12

21 Apr '12

Hi, first time poster, my apologies if this is not the correct avenue. Since release 0.9.11, I've been getting a segfault in virsh attempting to access an ESXi 4.1 host. GDB reports it as such: ** Program received signal SIGSEGV, Segmentation fault. esxConnectToHost (vCenterIpAddress=0x7fffffffd640, auth=0x7ffff7fef5e0, conn=0x675780) at esx/esx_driver.c:726 726 if (virAsprintf(&url, "%s://%s:%d/sdk", priv->parsedUri->transport, (gdb) bt #0 esxConnectToHost (vCenterIpAddress=0x7fffffffd650, auth=0x7ffff7fef5e0, conn=0x675780) at esx/esx_driver.c:726 #1 esxOpen (conn=0x675780, auth=0x7ffff7fef5e0, flags=<optimized out>) at esx/esx_driver.c:1052 #2 0x00007ffff7bc243a in do_open (name=0x6745a0 "esx://XXX/?no_verify=1", auth=0x7ffff7fef5e0, flags=0) at libvirt.c:1227 #3 0x00007ffff7bc48e6 in virConnectOpenAuth (name=0x6745a0 "esx://XXX/?no_verify=1", auth=0x7ffff7fef5e0, flags=0) at libvirt.c:1456 #4 0x000000000040ac8f in vshInit (ctl=0x7fffffffe210) at virsh.c:19288 #5 main (argc=<optimized out>, argv=0x7fffffffe508) at virsh.c:20046 ** Digging through the code a bit, I found that in esxOpen(), the "conn" virConnectPtr var is passed to esxConnectToHost() with a nil pointer to a virConnect "privateData" pointer. The hypervisor transport type (among other things in "parsedUri") is stored here, and a crash/segfault occurs in esxConnectToHost() when attempting to access the transport for virAsprintf() at line 726 of src/esx/esx_driver.c. This patch just makes sure we're pointing to something before attempting to use anything in the struct. Cleanly applied to git from this afternoon, built and successfully tested on a Fedora 16/x86_64 VM accessing an ESXi 4.1 node. -- ryan woodsmall rwoodsmall(a)gmail.com

2 1

[libvirt] [PATCH v4 0/9] Add basic driver for Parallels Virtuozzo Server
by Dmitry Guryanov 20 Apr '12

20 Apr '12

Parallels Virtuozzo Server is a cloud-ready virtualization solution that allows users to simultaneously run multiple virtual machines and containers on the same physical server. Current name of this product is Parallels Server Bare Metal and more information about it can be found here - http://www.parallels.com/products/server/baremetal/sp/. This driver will work with PVS version 6.0 , beta version scheduled at 2012 Q2. changes in v4: * fix errors, found by 'make syntax-check' Dmitry Guryanov (9): pvs: add driver skeleton util: add functions for interating over json object pvs: add functions to list domains and get info pvs: implement functions for domain life cycle management pvs: get info about serial ports pvs: add support of VNC remote display pvs: implement virDomainDefineXML operation for existing domains pvs: add storage driver pvs: implement VM creation AUTHORS | 1 + cfg.mk | 1 + configure.ac | 23 + docs/drvpvs.html.in | 28 + include/libvirt/virterror.h | 1 + libvirt.spec.in | 7 + mingw32-libvirt.spec.in | 6 + po/POTFILES.in | 3 + src/Makefile.am | 23 + src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/driver.h | 1 + src/libvirt.c | 12 + src/pvs/pvs_driver.c | 1280 +++++++++++++++++++++++++++++++++++++ src/pvs/pvs_driver.h | 75 +++ src/pvs/pvs_storage.c | 1458 +++++++++++++++++++++++++++++++++++++++++++ src/pvs/pvs_utils.c | 143 +++++ src/util/json.c | 30 + src/util/json.h | 4 + src/util/virterror.c | 3 + 20 files changed, 3102 insertions(+), 1 deletions(-) create mode 100644 docs/drvpvs.html.in create mode 100644 src/pvs/pvs_driver.c create mode 100644 src/pvs/pvs_driver.h create mode 100644 src/pvs/pvs_storage.c create mode 100644 src/pvs/pvs_utils.c

1 10

[libvirt] [libvirt-glib 1/2] Update Libvirt-gconfig-docs.xml
by Christophe Fergeau 20 Apr '12

20 Apr '12

It was missing most classes in the GVirConfig namespace. --- docs/libvirt-gconfig/Libvirt-gconfig-docs.xml | 67 ++++++++++++++++++++++--- 1 file changed, 60 insertions(+), 7 deletions(-) diff --git a/docs/libvirt-gconfig/Libvirt-gconfig-docs.xml b/docs/libvirt-gconfig/Libvirt-gconfig-docs.xml index 9719734..a05c3f3 100644 --- a/docs/libvirt-gconfig/Libvirt-gconfig-docs.xml +++ b/docs/libvirt-gconfig/Libvirt-gconfig-docs.xml @@ -9,24 +9,77 @@ <title>Libvirt-gconfig Reference Manual</title> </bookinfo> - <chapter> + <part> <title>Libvirt-gconfig</title> <xi:include href="xml/libvirt-gconfig-object.xml"/> - <xi:include href="xml/libvirt-gconfig-domain.xml"/> + <chapter> + <title>Domain configuration</title> + <xi:include href="xml/libvirt-gconfig-domain-address-pci.xml"/> + <xi:include href="xml/libvirt-gconfig-domain-address-usb.xml"/> + <xi:include href="xml/libvirt-gconfig-domain-address.xml"/> + <xi:include href="xml/libvirt-gconfig-domain-channel.xml"/> + <xi:include href="xml/libvirt-gconfig-domain-chardev.xml"/> + <xi:include href="xml/libvirt-gconfig-domain-chardev-source.xml"/> + <xi:include href="xml/libvirt-gconfig-domain-chardev-source-pty.xml"/> + <xi:include href="xml/libvirt-gconfig-domain-chardev-source-spicevmc.xml"/> + <xi:include href="xml/libvirt-gconfig-domain-clock.xml"/> + <xi:include href="xml/libvirt-gconfig-domain-console.xml"/> + <xi:include href="xml/libvirt-gconfig-domain-controller.xml"/> + <xi:include href="xml/libvirt-gconfig-domain-controller-usb.xml"/> + <xi:include href="xml/libvirt-gconfig-domain-device.xml"/> + <xi:include href="xml/libvirt-gconfig-domain-disk.xml"/> + <xi:include href="xml/libvirt-gconfig-domain-filesys.xml"/> + <xi:include href="xml/libvirt-gconfig-domain-graphics.xml"/> + <xi:include href="xml/libvirt-gconfig-domain-graphics-sdl.xml"/> + <xi:include href="xml/libvirt-gconfig-domain-graphics-spice.xml"/> + <xi:include href="xml/libvirt-gconfig-domain-graphics-vnc.xml"/> + <xi:include href="xml/libvirt-gconfig-domain-input.xml"/> + <xi:include href="xml/libvirt-gconfig-domain-interface.xml"/> + <xi:include href="xml/libvirt-gconfig-domain-interface-bridge.xml"/> + <xi:include href="xml/libvirt-gconfig-domain-interface-network.xml"/> + <xi:include href="xml/libvirt-gconfig-domain-interface-user.xml"/> + <xi:include href="xml/libvirt-gconfig-domain-memballoon.xml"/> + <xi:include href="xml/libvirt-gconfig-domain-os.xml"/> + <xi:include href="xml/libvirt-gconfig-domain-parallel.xml"/> + <xi:include href="xml/libvirt-gconfig-domain-redirdev.xml"/> + <xi:include href="xml/libvirt-gconfig-domain-seclabel.xml"/> + <xi:include href="xml/libvirt-gconfig-domain-serial.xml"/> + <xi:include href="xml/libvirt-gconfig-domain-snapshot.xml"/> + <xi:include href="xml/libvirt-gconfig-domain-sound.xml"/> + <xi:include href="xml/libvirt-gconfig-domain-timer.xml"/> + <xi:include href="xml/libvirt-gconfig-domain-timer-pit.xml"/> + <xi:include href="xml/libvirt-gconfig-domain-timer-rtc.xml"/> + <xi:include href="xml/libvirt-gconfig-domain-video.xml"/> + <xi:include href="xml/libvirt-gconfig-domain.xml"/> + </chapter> <xi:include href="xml/libvirt-gconfig-domain-snapshot.xml"/> <xi:include href="xml/libvirt-gconfig-interface.xml"/> <xi:include href="xml/libvirt-gconfig-network-filter.xml"/> <xi:include href="xml/libvirt-gconfig-network.xml"/> <xi:include href="xml/libvirt-gconfig-node-device.xml"/> <xi:include href="xml/libvirt-gconfig-secret.xml"/> - <xi:include href="xml/libvirt-gconfig-storage-pool.xml"/> - <xi:include href="xml/libvirt-gconfig-storage-vol.xml"/> + <chapter> + <title>Storage Configuration</title> + <xi:include href="xml/libvirt-gconfig-storage-permissions.xml"/> + <section> + <title>Storage Pools Configuration</title> + <xi:include href="xml/libvirt-gconfig-storage-pool.xml"/> + <xi:include href="xml/libvirt-gconfig-storage-pool-source.xml"/> + <xi:include href="xml/libvirt-gconfig-storage-pool-target.xml"/> + </section> + <section> + <title>Storage Volumes Configuration</title> + <xi:include href="xml/libvirt-gconfig-storage-vol.xml"/> + <xi:include href="xml/libvirt-gconfig-storage-vol-backing-store.xml"/> + <xi:include href="xml/libvirt-gconfig-storage-vol-target.xml"/> + </section> + </chapter> <xi:include href="xml/libvirt-gconfig-capabilities.xml"/> - </chapter> - <chapter id="object-tree"> + </part> + <part id="object-tree"> <title>Object Hierarchy</title> <xi:include href="xml/tree_index.sgml"/> - </chapter> + </part> <index id="api-index-full"> <title>API Index</title> <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include> -- 1.7.10

2 3

Re: [libvirt] [RH-BZ #595428] 'virsh list' should output more information 'xm list'
by Maxim Sditanov 20 Apr '12

20 Apr '12

2012/4/2 Maxim Sditanov <feniksa(a)rambler.ru>: > Is this new feature request still > https://bugs.gentoo.org/show_bug.cgi?id=366561 actual? > > Because virsh still show not enough information: > > $./virsh -c qemu:///system list --all > > Id Name State > ---------------------------------------------------- > 1 " running > - winxp shut off > > And it will be good idea to show more detailed information or add > additional flag, something like --detail. > ./virsh -c qemu:///system list --all --detailed > > > Id Name State Memory VCPU Uptime CPU IOPS > ---------------------------------- > ------------------------------------------------------------- > 1 " running 768M 2 3hours 5% 12.1 > - winxp shut off 512M 1 > I implemented first part of this task - VCPU and CPU load. I ported from virt-manager CPU load algorithm (thanks Cole Robinson for help https://www.redhat.com/archives/virt-tools-list/2012-April/msg00051.html) virt manager update graphic in such way: It create thread, than it take host CPU ticks (how much cpu time take host) then every 1 sec it update value and calculate percentage. But this algorithm is bad in virsh, because virsh give information about domains imidiatly, without delays and thats why i can't caclulate cpu (also io and network usage). I think it will be good idea if libvirtd will hold information about resource usage and implement interface for this data via libvirt And virsh and virt-manager will use the same functions to get cpu, disk and network usage, host uptime How do you think? -- With best wishes, Feniks Gordon Freeman

2 2

[libvirt] [PATCH] openvz; wire up getHostname
by Guido Günther 20 Apr '12

20 Apr '12

--- Trivial thing missing in the openvz driver. Cheers, -- Guido src/openvz/openvz_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 0451c22..7ec327d 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -1679,6 +1679,7 @@ static virDriver openvzDriver = { .close = openvzClose, /* 0.3.1 */ .type = openvzGetType, /* 0.3.1 */ .version = openvzGetVersion, /* 0.5.0 */ + .getHostname = virGetHostname, /* 0.9.12 */ .getMaxVcpus = openvzGetMaxVCPUs, /* 0.4.6 */ .nodeGetInfo = nodeGetInfo, /* 0.3.2 */ .nodeGetCPUStats = nodeGetCPUStats, /* 0.9.12 */ -- 1.7.10

2 2

[libvirt] [test-API PATCH 0/4]testcases will use xml file directly
by Guannan Ren 20 Apr '12

20 Apr '12

Right now, for testcases that needs xml to define domain or storage, etc they call module *utils/xmlbuilder.py utils/xmlgenerator.py* to get back a string of xml. These two module create xml string by "xml.dom.minidom" This approach is hard to maintain and not easy to use. So we will depreciate it in near furture. The new way is to use xml file directly. There will be a new folder named 'xmls' in path repos/*/xmls, testcases will use the xmlfile in the foler directly. For example: domain:define required_params = ('guestname', 'diskpath',) optional_params = {'memory': 1048576, 'vcpu': 1, 'hddriver' : 'virtio', 'nicdriver': 'virtio', 'macaddr': '52:54:00:97:e4:28', 'uuid' : '05867c1a-afeb-300e-e55e-2673391ae080', 'username': None, 'password': None, 'guesttype': 'kvm', 'xml': 'xmls/kvm_guest_define.xml' } The define.py will get the xml string of "xmls/kvm_guest_define.xml" and define it directly. The framework takes the charge of getting the content of the file, replacing some TEXT in it and passing the string to define.py for use. The define.py supports any file in absolute path if the xml option is given in testcase file like domain:eventhandler guestname fedoraVM diskpath /var/lib/libvirt/images/fedoraVM xml /PATH/TO/FILE

1 4

[libvirt] [PATCH] build: fix fresh checkout on RHEL5
by Eric Blake 20 Apr '12

20 Apr '12

Building a fresh checkout on RHEL 5 has been broken since commit 29db7a00, due to a gnulib regression in the bootstrap script (incremental builds from a checkout earlier than that point were okay, though). * .gnulib: Update to latest, for bootstrap fixes. * bootstrap: Resync from gnulib. * gnulib/local/top/maint.mk.diff: Drop patch that was added upstream in the meantime. --- Lots of gnulib changes, and I'm not sure how many of them directly impact us. But the bootstrap ones definitely affect building a fresh checkout on RHEL 5, so I'm pushing this under the build-breaker rule; now's a decent time, since we still have a bit of time before feature freeze for the 0.9.12 release. * .gnulib d5612c7...f15a17d (240): > bootstrap: accommodate older libtool > autoupdate > announce-gen: avoid failure due to lack of Digest::SHA1 > bootstrap: don't let a user's CDPATH setting affect this script > maint: indent ChangeLog entries with TAB, not 8 spaces > maint.mk: expand syntax-check rule to catch @xref and @pxref abuse > bootstrap: really use gnulib's po/Makefile.in.in > configmake: correct minor inconsistency in Makefile rule > bootstrap: use gnulib's po/Makefile.in.in, not the one from gettext > Fix recursion of install-* into po directories. > maint: avoid spurious "make sc_maint" failure > lseek: Make configure test independent of environment. > autoupdate > stat: Bypass buggy override in mingw64. > pathmax: Fix compilation error on MSVC 9. > README: document pointer comparison assumption > Tests for module 'getrusage'. > New module 'getrusage'. > Tests for module 'sys_resource'. > New module 'sys_resource'. > ioctl: Fix compilation error on mingw. > autoupdate > update from texinfo > regex: correct #pragma guard expression > regex: remove unnecessary type punning > Tests for module 'ilogbl'. > New module 'ilogbl'. > Tests for module 'ilogbf'. > New module 'ilogbf'. > Tests for module 'ilogb'. > New module 'ilogb'. > math: Provide FP_ILOGB0 and FP_ILOGBNAN. > Tests for module 'logbl-ieee'. > New module 'logbl-ieee'. > Tests for module 'logb-ieee'. > New module 'logb-ieee'. > Tests for module 'logbf-ieee'. > New module 'logbf-ieee'. > Tests for module 'logbl'. > New module 'logbl'. > Tests for module 'logbf'. > New module 'logbf'. > logb tests: More tests. > logb: Provide replacement and workarounds. > log10* tests: Speed up. > logf-ieee: Fix test whether logf works. > log10l: Work around log10l-ieee test failure on IRIX 6.5. > log10f-ieee: Work around test failure on NetBSD 5.1. > log10f-ieee: Work around test failure on Solaris 9. > log10-ieee: Work around test failure on NetBSD 5.1 and Solaris 11. > Tests for module 'log10l-ieee'. > New module 'log10l-ieee'. > Tests for module 'log10-ieee'. > New module 'log10-ieee'. > Tests for module 'log10f-ieee'. > New module 'log10f-ieee'. > log10l: Work around AIX 5.1, IRIX 6.5, OSF/1 5.1 bug. > log10f: Work around OSF/1 5.1 bug. > log10: Work around OSF/1 5.1 bug. > log10l tests: More tests. > log10f tests: More tests. > log10 tests: More tests. > Fix typo in ChangeLog entry. > fflush: Fix syntax error. > regex: pacify GCC when compiling GRUB > update from texinfo > warnings.m4: fix errors. > stdio: don't assume gets any more > maint.mk: fix syntax checks without exclusions > strerror_r: avoid compiler warning > fflush: avoid compiler warning > warnings.m4: check the compiler, not the preprocessor > autoupdate > Tests for module 'localeconv'. > New module 'localeconv'. > locale: Provide a complete 'struct lconv'. > locale: Provide a complete 'struct lconv' on Solaris 10, 11. > locale: Provide a working 'struct lconv'. > Enable common subexpression optimization in GCC. > Enable common subexpression optimization in GCC. > gnulib-tool: Avoid unintended error output from 'cmp'. > gnulib-tool: fix imprecise comments w.r.t. an automake bug > autoupdate > announce-gen: use Digest::SHA when possible > tests: avoid gcc warnings about argv vs. const initializers > README-release: simplify slightly > git-merge-changelog: add specific example on how to use with hg. > git-merge-changelog: Report bugs to bug-gnulib(a)gnu.org. > git-version-gen: don't let "prefix" envvar cause trouble > regex: diagnose too-large repeat counts in EREs > doc: some glibc x32 integer width issues > autoupdate > fmal: Avoid test failure on OpenBSD 5.1/SPARC64. > hypotl: Bypass broken implementation in OpenBSD 5.1/SPARC. > remainderl: Bypass broken implementation in OpenBSD 5.1/SPARC. > Oops, fix regression on AIX through recent commit. > Oops, fix cross-compilation guess in recent commits. > sqrtl: Bypass broken implementation in OpenBSD 5.1/SPARC. > doc: update timer_* platform portability notes > cbrtl: Bypass broken implementation in OpenBSD 5.1/SPARC. > remainderl: Avoid compilation error on AIX >= 5.2. > Avoid compilation errors with MSVC option -fp:strict. > uninorm: Don't crash in out-of-memory conditions. > quote: fix syntax-check > Collapse list of copyright years to ranges. See <https://lists.gnu.org/archive/html/bug-gnulib/2012-03/msg00051.html>. > log2f-ieee: Work around test failure on NetBSD 5.1 and Solaris 10. > log2-ieee: Work around test failure on NetBSD 5.1 and Solaris 10. > Tests for module 'log2l-ieee'. > New module 'log2l-ieee'. > Tests for module 'log2-ieee'. > New module 'log2-ieee'. > Tests for module 'log2f-ieee'. > New module 'log2f-ieee'. > Tests for module 'log2l'. > New module 'log2l'. > Tests for module 'log2f'. > New module 'log2f'. > Tests for module 'log2'. > New module 'log2'. > exp2* tests: More tests. > update from texinfo > autoupdate > log1p* tests: Reduce running time of tests. > log1pl-ieee: Work around test failure on AIX 7.1. > log1pl-ieee: Work around test failure on IRIX 6.5. > log1pf-ieee: Work around test failure on OpenBSD 4.9 and AIX 7.1. > log1pf-ieee: Work around test failure on AIX 5.1 and HP-UX 11. > log1p-ieee: Work around test failure on AIX 7.1 and HP-UX 11. > Tests for module 'log1pl-ieee'. > New module 'log1pl-ieee'. > Tests for module 'log1p-ieee'. > New module 'log1p-ieee'. > Tests for module 'log1pf-ieee'. > New module 'log1pf-ieee'. > Tests for module 'log1pl'. > New module 'log1pl'. > Tests for module 'log1pf'. > New module 'log1pf'. > log1p tests: More tests. > log1p: Provide replacement for Minix and MSVC. > expm1: Tiny doc fix. > math tests: Small simplification. > log tests: Add a comment. > Fix some comments. > regex: allow inclusion of <regex.h> before <limits.h> > fts: depend on fdopendir > Remove unused variables. > isnanf-nolibm: Fix last commit. > isnanf-nolibm: Make it work on IRIX 6.5 with cc. > logf-ieee: Work around test failure on NetBSD 5.1. > logf-ieee: Work around test failure on Solaris 9. > log-ieee: Work around test failure on NetBSD 5.1 and Solaris 11. > Tests for module 'logl-ieee'. > New module 'logl-ieee'. > Tests for module 'log-ieee'. > New module 'log-ieee'. > Tests for module 'logf-ieee'. > New module 'logf-ieee'. > log: Fix bug introduced on 2012-03-09. > timer-time: link explicitly with pthreads on glibc > log* tests: More tests. > logl: Work around OSF/1 5.1 bug. > logf: Work around OSF/1 5.1 bug. > log: Work around OSF/1 5.1 bug. > readtokens.c: adjust wording in a comment > modechange: add notations +40, 00440, etc. > exp2l-ieee: Work around test failure on OpenBSD 4.9 and IRIX 6.5. > Tests for module 'exp2l-ieee'. > New module 'exp2l-ieee'. > Tests for module 'exp2-ieee'. > New module 'exp2-ieee'. > Tests for module 'exp2f-ieee'. > New module 'exp2f-ieee'. > Tests for module 'exp2l'. > New module 'exp2l'. > Tests for module 'exp2f'. > New module 'exp2f'. > Tests for module 'exp2'. > New module 'exp2'. > savedir: fix comment typo > test-readtokens.c: use const; remove unwarranted cast > autoupdate > fmal: Avoid compilation error on AIX. > fma, fmaf, fmal: Override undeclared system functions on IRIX 6.5. > remainderf: Override buggy system function on IRIX 6.5. > test-readtokens.c: avoid const-related compilation warnings > frexp-nolibm, frexpl-nolibm tests: Fix bug introduced on 2012-03-03. > expm1l: Avoid compilation error on AIX. > expm1l: Don't override undeclared system function on IRIX 6.5. > remainderl: Don't override undeclared system function on IRIX 6.5. > rintf: Don't override undeclared system function on IRIX 6.5. > roundl: Avoid compilation error on AIX. > roundl: Don't override undeclared system function on IRIX 6.5. > roundf: Don't override undeclared system function on IRIX 6.5. > round: Don't override undeclared system function on IRIX 6.5. > copysignf: Don't override undeclared system function on IRIX 6.5. > readtokens: add tests > quotearg: the module must now include quote.h > readtokens: avoid core dumps with unusual calling patterns > quote: Adhere to common module description layout. > quote: fuse into quotearg > Tests for module 'expm1l-ieee'. > New module 'expm1l-ieee'. > Tests for module 'expm1f-ieee'. > New module 'expm1f-ieee'. > Tests for module 'expm1-ieee'. > New module 'expm1-ieee'. > Work around expm1f bug on IRIX 6.5. > Tests for module 'expm1l'. > New module 'expm1l'. > Tests for module 'expm1f'. > New module 'expm1f'. > Tests for module 'expm1'. > New module 'expm1'. > math: Ensure declarations of math functions. > math: Update module names in warnings. > expl: Simplify computation. > exp* tests: More tests. > expl: Fix precision of computed result. > cbrt* tests: More tests. > hypot* tests: More tests. > fpucw: Doc about FreeBSD. > sqrt* tests: Rename local variable. > sqrt* tests: More tests. > sqrt* tests: More tests. > remainder* tests: More tests. > remainder, remainderf, remainderl: Fix computation for large quotients. > fmodl: Fix last commit. > fmod* tests: More tests. > fmod, fmodl: Fix computation for large quotients x / y. > fmod* tests: More tests. > rint* tests: More tests. > modf* tests: More tests. > fabs* tests: More tests. > ldexp* tests: More tests. > frexp* tests: More tests. > Support for pseudo-random numbers in tests. > frexp* tests: Refactor. > maint: don't specify XZ_OPT=-9ev in dist-related rule > autoupdate .gnulib | 2 +- bootstrap | 18 +++++++++++++++--- gnulib/local/top/maint.mk.diff | 32 -------------------------------- 3 files changed, 16 insertions(+), 36 deletions(-) delete mode 100644 gnulib/local/top/maint.mk.diff diff --git a/.gnulib b/.gnulib index d5612c7..f15a17d 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit d5612c714c87555f1059d71d347e20271dced322 +Subproject commit f15a17dc1f5d2b1fc8a423795c54b211552c0483 diff --git a/bootstrap b/bootstrap index 31eb651..5aa73cc 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2012-02-11.09; # UTC +scriptversion=2012-04-19.22; # UTC # Bootstrap this package from checked-out sources. @@ -36,6 +36,10 @@ nl=' LC_ALL=C export LC_ALL +# Ensure that CDPATH is not set. Otherwise, the output from cd +# would cause trouble in at least one use below. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + local_gl_dir=gl me=$0 @@ -758,9 +762,15 @@ fi # Autoreconf runs aclocal before libtoolize, which causes spurious # warnings if the initial aclocal is confused by the libtoolized # (or worse out-of-date) macro directory. +# libtoolize 1.9b added the --install option; but we support back +# to libtoolize 1.5.22, where the install action was default. if test $use_libtool = 1; then - echo "running: $LIBTOOLIZE --copy --install" - $LIBTOOLIZE --copy --install + install= + case $($LIBTOOLIZE --help) in + *--install*) install=--install ;; + esac + echo "running: $LIBTOOLIZE $install --copy" + $LIBTOOLIZE $install --copy fi version_controlled_file() { @@ -863,6 +873,8 @@ if test $with_gettext = yes; then } ' po/Makevars.template >po/Makevars || exit 1 + cat $GNULIB_SRCDIR/build-aux/po/Makefile.in.in > po/Makefile.in.in || exit 1 + if test -d runtime-po; then # Similarly for runtime-po/Makevars, but not quite the same. rm -f runtime-po/Makevars diff --git a/gnulib/local/top/maint.mk.diff b/gnulib/local/top/maint.mk.diff deleted file mode 100644 index 85e97ae..0000000 --- a/gnulib/local/top/maint.mk.diff +++ /dev/null @@ -1,32 +0,0 @@ -diff --git i/top/maint.mk w/top/maint.mk -index 4cbd5f4..2228a37 100644 ---- i/top/maint.mk -+++ w/top/maint.mk -@@ -279,7 +279,7 @@ define _sc_search_regexp - if test -n "$$files"; then \ - if test -n "$$prohibit"; then \ - grep $$with_grep_options $(_ignore_case) -nE "$$prohibit" $$files \ -- | grep -vE "$${exclude-^$$}" \ -+ | grep -vE "$${exclude:-^$$}" \ - && { msg="$$halt" $(_sc_say_and_exit) } || :; \ - else \ - grep $$with_grep_options $(_ignore_case) -LE "$$require" $$files \ -@@ -455,7 +455,8 @@ sc_prohibit_quotearg_without_use: - - # Don't include quote.h unless you use one of its functions. - sc_prohibit_quote_without_use: -- @h='quote.h' re='\<quote(_n)? *\(' $(_sc_header_without_use) -+ @h='quote.h' re='\<quote((_n)? *\(|_quoting_options\>)' \ -+ $(_sc_header_without_use) - - # Don't include this header unless you use one of its functions. - sc_prohibit_long_options_without_use: -@@ -1332,7 +1333,7 @@ alpha beta stable: $(local-check) writable-files $(submodule-checks) - $(MAKE) vc-diff-check - $(MAKE) news-check - $(MAKE) distcheck -- $(MAKE) dist XZ_OPT=-9ev -+ $(MAKE) dist - $(MAKE) $(release-prep-hook) RELEASE_TYPE=$@ - $(MAKE) -s emit_upload_commands RELEASE_TYPE=$@ - -- 1.7.7.6

2 1

[libvirt] [PATCHv2] virsh: avoid uninitialized memory usage
by Alex Jia 20 Apr '12

20 Apr '12

Detected by valgrind. * tools/virsh.c (cmdBlockPull): fix uninitialized memory usage. * How to reproduce? $ qemu-img create /var/lib/libvirt/images/test 1M $ cat > /tmp/test.xml <<EOF <domain type='qemu'> <name>test</name> <memory>219200</memory> <vcpu>1</vcpu> <os> <type arch='x86_64'>hvm</type> <boot dev='hd'/> </os> <devices> <disk type='file' device='disk'> <driver name='qemu' type='raw'/> <source file='/var/lib/libvirt/images/test'/> <target dev='vda' bus='virtio'/> </disk> <input type='mouse' bus='ps2'/> <graphics type='spice' autoport='yes' listen='0.0.0.0'/> </devices> </domain> EOF $ virsh define /tmp/test.xml $ valgrind -v virsh blockpull test /var/lib/libvirt/images/test --wait actual result: ==10906== 1 errors in context 1 of 1: ==10906== Syscall param rt_sigaction(act->sa_flags) points to uninitialised byte(s) ==10906== at 0x39CF80F5BE: __libc_sigaction (sigaction.c:67) ==10906== by 0x43016C: cmdBlockPull (virsh.c:7638) ==10906== by 0x4150D4: vshCommandRun (virsh.c:18574) ==10906== by 0x425E73: main (virsh.c:20178) ==10906== Address 0x7fefffae8 is on thread 1's stack Signed-off-by: Alex Jia <ajia(a)redhat.com> --- tools/virsh.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 95ed7bc..4e4ca57 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -7634,6 +7634,7 @@ cmdBlockPull(vshControl *ctl, const vshCmd *cmd) intCaught = 0; sig_action.sa_sigaction = vshCatchInt; + sig_action.sa_flags = 0; sigemptyset(&sig_action.sa_mask); sigaction(SIGINT, &sig_action, &old_sig_action); -- 1.7.1

3 11

[libvirt] [RFC][PATCH] Revision for message payload encoding error when adding a large mount of virtio disks
by Chen Hanxiao 20 Apr '12

20 Apr '12

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> When adding a large number of virtio storage devices to virtual machine by using 'virsh edit' command, there is a problem: When we added more than 190 virtio disks by 'virsh edit' command, we got a feedback as 'error: Unable to encode message payload'. In virt-mananger, the same defect occurs with about 180 virtio disks added. PCI devices are limited by the virtualized system architecture. Out of the 32 available PCI devices for a guest, 4 are not removable. This means there are up to 28 free PCI slots available for additional devices per guest. Each PCI device in a guest can have up to 8 functions. One slot kept for network interface, we could add at most 216 (27*8) virtio disks. The length of xml description with multifuction for one virtio disk is about 290 characters; In virt-manger, an extra tag 'alias name' will come to the xml description, which would add about 40 more characters. So for one xml description, 330 characters would be enough. A brand new virtual machine with one IDE bus disk needs about 1900 characters for xml description. In src/remote/remote_protocol.x, there is a limitation for XDR enoding length as REMOTE_STRING_MAX. According to the analysis above, at least 73180(1900+216*330) characters are needed for 216 virtio disks. In the view of variable length in tag 'source file', so I think it would be better to extend this limitation from 65536 to 80000. --- src/remote/remote_protocol.x | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 2d57247..2c8dcbb 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -65,7 +65,7 @@ * This is an arbitrary limit designed to stop the decoder from trying * to allocate unbounded amounts of memory when fed with a bad message. */ -const REMOTE_STRING_MAX = 65536; +const REMOTE_STRING_MAX = 80000; /* A long string, which may NOT be NULL. */ typedef string remote_nonnull_string<REMOTE_STRING_MAX>; -- 1.7.1

4 5

[libvirt] [test-API 00/14] Reorgnize/refactoring round 3
by Osier Yang 20 Apr '12

20 Apr '12

The TODO in round 2 is still not done, but let's get these cleanups reviewed first. Osier Yang (14): Change libvirt-test-api to be executable Remove NEWS and TODO Destroy utils/check.py and move the functions into utils/utils.py Move directory dist to src Move utils/env_parser.py into src Improve the comments telling what the scripts does for utils/*.py Improve more comments to tell what the program does Remove trainling blank lines for utils/*.sh Use bash as the interpreter explicitly Substitute 'guesttype' with 'virt_type' Update AUTHORS Rename utils/*.py with consistent naming style Rename src/logxmlparser.py as src/log_generator.py Rename 'env.cfg' as 'global.cfg' AUTHORS | 17 +- TODO | 4 - cases/consumption_cpu_topology.conf | 2 +- cases/consumption_domain_nfs_start.conf | 2 +- cases/consumption_eventhandler.conf | 2 +- cases/consumption_libvirtd.conf | 2 +- cases/consumption_ownership_test.conf | 2 +- cases/domain_linux_net_inst.conf | 4 +- cases/linux_domain.conf | 10 +- cases/migration/ssh_persistent_paused_no_dst.conf | 24 +- .../migration/ssh_persistent_paused_with_dst.conf | 48 ++-- cases/migration/ssh_persistent_running_no_dst.conf | 24 +- .../migration/ssh_persistent_running_with_dst.conf | 48 ++-- cases/migration/ssh_transient_paused_no_dst.conf | 22 +- cases/migration/ssh_transient_paused_with_dst.conf | 48 ++-- cases/migration/ssh_transient_running_no_dst.conf | 24 +- .../migration/ssh_transient_running_with_dst.conf | 48 ++-- cases/migration/tcp_persistent_paused_no_dst.conf | 24 +- .../migration/tcp_persistent_paused_with_dst.conf | 48 ++-- cases/migration/tcp_persistent_running_no_dst.conf | 24 +- .../migration/tcp_persistent_running_with_dst.conf | 48 ++-- .../tcp_sasl_persistent_paused_no_dst.conf | 8 +- .../tcp_sasl_persistent_paused_with_dst.conf | 16 +- .../tcp_sasl_persistent_running_no_dst.conf | 8 +- .../tcp_sasl_persistent_running_with_dst.conf | 16 +- .../tcp_sasl_transient_paused_no_dst.conf | 8 +- .../tcp_sasl_transient_paused_with_dst.conf | 16 +- .../tcp_sasl_transient_running_no_dst.conf | 8 +- .../tcp_sasl_transient_running_with_dst.conf | 16 +- cases/migration/tcp_transient_paused_no_dst.conf | 22 +- cases/migration/tcp_transient_paused_with_dst.conf | 48 ++-- cases/migration/tcp_transient_running_no_dst.conf | 24 +- .../migration/tcp_transient_running_with_dst.conf | 48 ++-- cases/migration/tls_persistent_paused_no_dst.conf | 24 +- .../migration/tls_persistent_paused_with_dst.conf | 48 ++-- cases/migration/tls_persistent_running_no_dst.conf | 24 +- .../migration/tls_persistent_running_with_dst.conf | 48 ++-- .../tls_sasl_persistent_paused_no_dst.conf | 8 +- .../tls_sasl_persistent_paused_with_dst.conf | 16 +- .../tls_sasl_persistent_running_no_dst.conf | 8 +- .../tls_sasl_persistent_running_with_dst.conf | 16 +- .../tls_sasl_transient_paused_no_dst.conf | 8 +- .../tls_sasl_transient_paused_with_dst.conf | 16 +- .../tls_sasl_transient_running_no_dst.conf | 8 +- .../tls_sasl_transient_running_with_dst.conf | 16 +- cases/migration/tls_transient_paused_no_dst.conf | 22 +- cases/migration/tls_transient_paused_with_dst.conf | 48 ++-- cases/migration/tls_transient_running_no_dst.conf | 24 +- .../migration/tls_transient_running_with_dst.conf | 48 ++-- cases/snapshot.conf | 2 +- cases/windows_domain.conf | 8 +- .../en-US/Understanding_libvirt-test-API.xml | 4 +- .../en-US/Writing_a_test_case.xml | 10 +- env.cfg => global.cfg | 0 libvirt-test-api | 24 +- repos/domain/attach_disk.py | 6 +- repos/domain/attach_interface.py | 4 +- repos/domain/balloon_memory.py | 2 +- repos/domain/create.py | 6 +- repos/domain/define.py | 18 +- repos/domain/detach_disk.py | 6 +- repos/domain/detach_interface.py | 4 +- repos/domain/dump.py | 2 +- repos/domain/install_image.py | 14 +- repos/domain/install_linux_cdrom.py | 28 +- repos/domain/install_linux_check.py | 27 +- repos/domain/install_linux_net.py | 32 +- repos/domain/install_windows_cdrom.py | 22 +- repos/domain/migrate.py | 2 +- repos/domain/update_devflag.py | 8 +- repos/interface/create.py | 2 +- repos/interface/define.py | 4 +- repos/interface/destroy.py | 2 +- repos/interface/undefine.py | 2 +- repos/network/create.py | 4 +- repos/network/define.py | 4 +- repos/npiv/create_virtual_hba.py | 4 +- .../multiple_thread_block_on_domain_create.py | 12 +- repos/snapshot/file_flag.py | 3 +- repos/snapshot/flag_check.py | 3 +- repos/snapshot/internal_create.py | 4 +- repos/storage/activate_pool.py | 2 +- repos/storage/create_dir_pool.py | 4 +- repos/storage/create_dir_volume.py | 4 +- repos/storage/create_fs_pool.py | 8 +- repos/storage/create_iscsi_pool.py | 4 +- repos/storage/create_logical_volume.py | 4 +- repos/storage/create_netfs_pool.py | 8 +- repos/storage/create_netfs_volume.py | 4 +- repos/storage/create_partition_volume.py | 4 +- repos/storage/define_dir_pool.py | 4 +- repos/storage/define_disk_pool.py | 4 +- repos/storage/define_iscsi_pool.py | 4 +- repos/storage/define_logical_pool.py | 4 +- repos/storage/define_mpath_pool.py | 4 +- repos/storage/define_netfs_pool.py | 4 +- repos/storage/define_scsi_pool.py | 4 +- repos/storage/delete_partition_volume.py | 2 +- repos/storage/destroy_pool.py | 2 +- {dist => src/dist}/__init__.py | 0 {dist => src/dist}/redhat/__init__.py | 0 {dist => src/dist}/redhat/env_inspect.py | 5 +- {utils => src}/env_parser.py | 6 +- src/exception.py | 9 +- src/generator.py | 8 +- src/{logxmlparser.py => log_generator.py} | 9 +- src/parser.py | 6 +- src/process.py | 7 +- utils/check.py | 392 -------------------- utils/dev_num.sh | 5 +- utils/disk_num.sh | 5 +- utils/format.py | 6 +- utils/ipget.sh | 2 +- utils/log.py | 6 +- utils/utils.py | 362 ++++++++++++++++++ utils/{xmlbuilder.py => xml_builder.py} | 62 ++-- utils/{xmlgenerator.py => xml_generator.py} | 70 ++-- utils/{XMLParser.py => xml_parser.py} | 13 +- 118 files changed, 1175 insertions(+), 1240 deletions(-) delete mode 100644 NEWS delete mode 100644 TODO rename env.cfg => global.cfg (100%) mode change 100644 => 100755 libvirt-test-api rename {dist => src/dist}/__init__.py (100%) rename {dist => src/dist}/redhat/__init__.py (100%) rename {dist => src/dist}/redhat/env_inspect.py (97%) rename {utils => src}/env_parser.py (96%) rename src/{logxmlparser.py => log_generator.py} (97%) delete mode 100644 utils/check.py rename utils/{xmlbuilder.py => xml_builder.py} (88%) rename utils/{xmlgenerator.py => xml_generator.py} (95%) rename utils/{XMLParser.py => xml_parser.py} (95%) Regards, Osier -- 1.7.7.3

3 30

[libvirt] [PATCH] conf: remove redundant ()
by Eric Blake 20 Apr '12

20 Apr '12

I almost copied-and-pasted some redundant () into my new code, and figured a general cleanup prereq patch would be better instead. * src/conf/domain_conf.c (virDomainLeaseDefParseXML) (virDomainDiskDefParseXML, virDomainFSDefParseXML) (virDomainActualNetDefParseXML, virDomainNetDefParseXML) (virDomainGraphicsDefParseXML, virDomainVideoAccelDefParseXML) (virDomainVideoDefParseXML, virDomainHostdevFind) (virDomainControllerInsertPreAlloced, virDomainDefParseXML) (virDomainObjParseXML, virDomainCpuSetFormat) (virDomainCpuSetParse, virDomainDiskDefFormat) (virDomainActualNetDefFormat, virDomainNetDefFormat) (virDomainTimerDefFormat, virDomainGraphicsListenDefFormat) (virDomainDefFormatInternal, virDomainNetGetActualHostdev) (virDomainNetGetActualBandwidth, virDomainGraphicsGetListen): Reduce extra (), per coding styles. --- This touches enough lines that I won't claim it to be trivial, but it should have no semantic impact. src/conf/domain_conf.c | 210 +++++++++++++++++++++++------------------------ 1 files changed, 103 insertions(+), 107 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 8f352ea..0d87970 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3233,14 +3233,13 @@ virDomainLeaseDefParseXML(xmlNodePtr node) cur = node->children; while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE) { - if ((key == NULL) && - (xmlStrEqual(cur->name, BAD_CAST "key"))) { + if (!key && xmlStrEqual(cur->name, BAD_CAST "key")) { key = (char *)xmlNodeGetContent(cur); - } else if ((lockspace == NULL) && - (xmlStrEqual(cur->name, BAD_CAST "lockspace"))) { + } else if (!lockspace && + xmlStrEqual(cur->name, BAD_CAST "lockspace")) { lockspace = (char *)xmlNodeGetContent(cur); - } else if ((path == NULL) && - (xmlStrEqual(cur->name, BAD_CAST "target"))) { + } else if (!path && + xmlStrEqual(cur->name, BAD_CAST "target")) { path = virXMLPropString(cur, "path"); offset = virXMLPropString(cur, "offset"); } @@ -3355,8 +3354,8 @@ virDomainDiskDefParseXML(virCapsPtr caps, cur = node->children; while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE) { - if ((source == NULL && hosts == NULL) && - (xmlStrEqual(cur->name, BAD_CAST "source"))) { + if (!source && !hosts && + xmlStrEqual(cur->name, BAD_CAST "source")) { sourceNode = cur; @@ -3433,8 +3432,8 @@ virDomainDiskDefParseXML(virCapsPtr caps, those broken apps */ if (source && STREQ(source, "")) VIR_FREE(source); - } else if ((target == NULL) && - (xmlStrEqual(cur->name, BAD_CAST "target"))) { + } else if (!target && + xmlStrEqual(cur->name, BAD_CAST "target")) { target = virXMLPropString(cur, "dev"); bus = virXMLPropString(cur, "bus"); tray = virXMLPropString(cur, "tray"); @@ -3444,8 +3443,8 @@ virDomainDiskDefParseXML(virCapsPtr caps, if (target && STRPREFIX(target, "ioemu:")) memmove(target, target+6, strlen(target)-5); - } else if ((driverName == NULL) && - (xmlStrEqual(cur->name, BAD_CAST "driver"))) { + } else if (!driverName && + xmlStrEqual(cur->name, BAD_CAST "driver")) { driverName = virXMLPropString(cur, "name"); driverType = virXMLPropString(cur, "type"); cachetag = virXMLPropString(cur, "cache"); @@ -3579,8 +3578,8 @@ virDomainDiskDefParseXML(virCapsPtr caps, cur); if (encryption == NULL) goto error; - } else if ((serial == NULL) && - (xmlStrEqual(cur->name, BAD_CAST "serial"))) { + } else if (!serial && + xmlStrEqual(cur->name, BAD_CAST "serial")) { serial = (char *)xmlNodeGetContent(cur); } else if (xmlStrEqual(cur->name, BAD_CAST "boot")) { /* boot is parsed as part of virDomainDeviceInfoParseXML */ @@ -4099,8 +4098,8 @@ virDomainFSDefParseXML(xmlNodePtr node, cur = node->children; while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE) { - if ((source == NULL) && - (xmlStrEqual(cur->name, BAD_CAST "source"))) { + if (!source && + xmlStrEqual(cur->name, BAD_CAST "source")) { if (def->type == VIR_DOMAIN_FS_TYPE_MOUNT) source = virXMLPropString(cur, "dir"); @@ -4110,12 +4109,12 @@ virDomainFSDefParseXML(xmlNodePtr node, source = virXMLPropString(cur, "dev"); else if (def->type == VIR_DOMAIN_FS_TYPE_TEMPLATE) source = virXMLPropString(cur, "name"); - } else if ((target == NULL) && - (xmlStrEqual(cur->name, BAD_CAST "target"))) { + } else if (!target && + xmlStrEqual(cur->name, BAD_CAST "target")) { target = virXMLPropString(cur, "dir"); } else if (xmlStrEqual(cur->name, BAD_CAST "readonly")) { def->readonly = 1; - } else if ((fsdriver == NULL) && (xmlStrEqual(cur->name, BAD_CAST "driver"))) { + } else if (!fsdriver && xmlStrEqual(cur->name, BAD_CAST "driver")) { fsdriver = virXMLPropString(cur, "type"); wrpolicy = virXMLPropString(cur, "wrpolicy"); } @@ -4261,8 +4260,8 @@ virDomainActualNetDefParseXML(xmlNodePtr node, */ addrtype = virXPathString("string(./source/address/@type)", ctxt); /* if not explicitly stated, source/vendor implies usb device */ - if ((!addrtype) && virXPathNode("./source/vendor", ctxt) && - ((addrtype = strdup("usb")) == NULL)) { + if (!addrtype && virXPathNode("./source/vendor", ctxt) && + (addrtype = strdup("usb")) == NULL) { virReportOOMError(); goto error; } @@ -4361,61 +4360,60 @@ virDomainNetDefParseXML(virCapsPtr caps, cur = node->children; while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE) { - if ((macaddr == NULL) && - (xmlStrEqual(cur->name, BAD_CAST "mac"))) { + if (!macaddr && xmlStrEqual(cur->name, BAD_CAST "mac")) { macaddr = virXMLPropString(cur, "address"); - } else if ((network == NULL) && - (def->type == VIR_DOMAIN_NET_TYPE_NETWORK) && - (xmlStrEqual(cur->name, BAD_CAST "source"))) { + } else if (!network && + def->type == VIR_DOMAIN_NET_TYPE_NETWORK && + xmlStrEqual(cur->name, BAD_CAST "source")) { network = virXMLPropString(cur, "network"); portgroup = virXMLPropString(cur, "portgroup"); - } else if ((internal == NULL) && - (def->type == VIR_DOMAIN_NET_TYPE_INTERNAL) && - (xmlStrEqual(cur->name, BAD_CAST "source"))) { + } else if (!internal && + def->type == VIR_DOMAIN_NET_TYPE_INTERNAL && + xmlStrEqual(cur->name, BAD_CAST "source")) { internal = virXMLPropString(cur, "name"); - } else if ((network == NULL) && - (def->type == VIR_DOMAIN_NET_TYPE_BRIDGE) && - (xmlStrEqual(cur->name, BAD_CAST "source"))) { + } else if (!network && + def->type == VIR_DOMAIN_NET_TYPE_BRIDGE && + xmlStrEqual(cur->name, BAD_CAST "source")) { bridge = virXMLPropString(cur, "bridge"); - } else if ((dev == NULL) && + } else if (!dev && (def->type == VIR_DOMAIN_NET_TYPE_ETHERNET || def->type == VIR_DOMAIN_NET_TYPE_DIRECT) && xmlStrEqual(cur->name, BAD_CAST "source")) { dev = virXMLPropString(cur, "dev"); mode = virXMLPropString(cur, "mode"); - } else if ((virtPort == NULL) && - ((def->type == VIR_DOMAIN_NET_TYPE_DIRECT) || - (def->type == VIR_DOMAIN_NET_TYPE_NETWORK) || - (def->type == VIR_DOMAIN_NET_TYPE_BRIDGE) || - (def->type == VIR_DOMAIN_NET_TYPE_HOSTDEV)) && + } else if (!virtPort && + (def->type == VIR_DOMAIN_NET_TYPE_DIRECT || + def->type == VIR_DOMAIN_NET_TYPE_NETWORK || + def->type == VIR_DOMAIN_NET_TYPE_BRIDGE || + def->type == VIR_DOMAIN_NET_TYPE_HOSTDEV) && xmlStrEqual(cur->name, BAD_CAST "virtualport")) { if (!(virtPort = virNetDevVPortProfileParse(cur))) goto error; - } else if ((network == NULL) && - ((def->type == VIR_DOMAIN_NET_TYPE_SERVER) || - (def->type == VIR_DOMAIN_NET_TYPE_CLIENT) || - (def->type == VIR_DOMAIN_NET_TYPE_MCAST)) && - (xmlStrEqual(cur->name, BAD_CAST "source"))) { + } else if (!network && + (def->type == VIR_DOMAIN_NET_TYPE_SERVER || + def->type == VIR_DOMAIN_NET_TYPE_CLIENT || + def->type == VIR_DOMAIN_NET_TYPE_MCAST) && + xmlStrEqual(cur->name, BAD_CAST "source")) { address = virXMLPropString(cur, "address"); port = virXMLPropString(cur, "port"); - } else if ((address == NULL) && + } else if (!address && (def->type == VIR_DOMAIN_NET_TYPE_ETHERNET || def->type == VIR_DOMAIN_NET_TYPE_BRIDGE) && - (xmlStrEqual(cur->name, BAD_CAST "ip"))) { + xmlStrEqual(cur->name, BAD_CAST "ip")) { address = virXMLPropString(cur, "address"); - } else if ((ifname == NULL) && + } else if (!ifname && xmlStrEqual(cur->name, BAD_CAST "target")) { ifname = virXMLPropString(cur, "dev"); - if ((ifname != NULL) && - ((flags & VIR_DOMAIN_XML_INACTIVE) && - (STRPREFIX(ifname, VIR_NET_GENERATED_PREFIX)))) { + if (ifname && + (flags & VIR_DOMAIN_XML_INACTIVE) && + STRPREFIX(ifname, VIR_NET_GENERATED_PREFIX)) { /* An auto-generated target name, blank it out */ VIR_FREE(ifname); } - } else if ((linkstate == NULL) && + } else if (!linkstate && xmlStrEqual(cur->name, BAD_CAST "link")) { linkstate = virXMLPropString(cur, "state"); - } else if ((script == NULL) && + } else if (!script && xmlStrEqual(cur->name, BAD_CAST "script")) { script = virXMLPropString(cur, "path"); } else if (xmlStrEqual (cur->name, BAD_CAST "model")) { @@ -4435,9 +4433,9 @@ virDomainNetDefParseXML(virCapsPtr caps, devaddr = virXMLPropString(cur, "devaddr"); } else if (xmlStrEqual(cur->name, BAD_CAST "boot")) { /* boot is parsed as part of virDomainDeviceInfoParseXML */ - } else if ((actual == NULL) && + } else if (!actual && (flags & VIR_DOMAIN_XML_INTERNAL_ACTUAL_NET) && - (def->type == VIR_DOMAIN_NET_TYPE_NETWORK) && + def->type == VIR_DOMAIN_NET_TYPE_NETWORK && xmlStrEqual(cur->name, BAD_CAST "actual")) { if (virDomainActualNetDefParseXML(cur, ctxt, def, &actual, flags) < 0) { @@ -4598,7 +4596,7 @@ virDomainNetDefParseXML(virCapsPtr caps, def->data.direct.linkdev = dev; dev = NULL; - if ((flags & VIR_DOMAIN_XML_INACTIVE)) + if (flags & VIR_DOMAIN_XML_INACTIVE) VIR_FREE(ifname); break; @@ -4614,7 +4612,7 @@ virDomainNetDefParseXML(virCapsPtr caps, */ addrtype = virXPathString("string(./source/address/@type)", ctxt); /* if not explicitly stated, source/vendor implies usb device */ - if ((!addrtype) && virXPathNode("./source/vendor", ctxt) && + if (!addrtype && virXPathNode("./source/vendor", ctxt) && ((addrtype = strdup("usb")) == NULL)) { virReportOOMError(); goto error; @@ -4660,8 +4658,8 @@ virDomainNetDefParseXML(virCapsPtr caps, if (def->model && STREQ(def->model, "virtio")) { if (backend != NULL) { int name; - if (((name = virDomainNetBackendTypeFromString(backend)) < 0) || - (name == VIR_DOMAIN_NET_BACKEND_TYPE_DEFAULT)) { + if ((name = virDomainNetBackendTypeFromString(backend)) < 0 || + name == VIR_DOMAIN_NET_BACKEND_TYPE_DEFAULT) { virDomainReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown interface <driver name='%s'> " "has been specified"), @@ -4672,8 +4670,8 @@ virDomainNetDefParseXML(virCapsPtr caps, } if (txmode != NULL) { int m; - if (((m = virDomainNetVirtioTxModeTypeFromString(txmode)) < 0) || - (m == VIR_DOMAIN_NET_VIRTIO_TX_MODE_DEFAULT)) { + if ((m = virDomainNetVirtioTxModeTypeFromString(txmode)) < 0 || + m == VIR_DOMAIN_NET_VIRTIO_TX_MODE_DEFAULT) { virDomainReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown interface <driver txmode='%s'> " "has been specified"), @@ -5772,8 +5770,8 @@ virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDefPtr def, * type='network' and we're looking at live XML (i.e. *not* * inactive). It is otherwise ignored. */ if (address && address[0] && - ((def->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS) || - ((def->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK) && + (def->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS || + (def->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK && !(flags & VIR_DOMAIN_XML_INACTIVE)))) { def->address = address; address = NULL; @@ -5836,9 +5834,9 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, goto error; } - if ((def->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) || - (def->type == VIR_DOMAIN_GRAPHICS_TYPE_RDP) || - (def->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE)) { + if (def->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC || + def->type == VIR_DOMAIN_GRAPHICS_TYPE_RDP || + def->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE) { /* parse the <listen> subelements for graphics types that support it */ nListens = virXPathNodeSet("./listen", ctxt, &listenNodes); @@ -6548,7 +6546,7 @@ virDomainVideoAccelDefParseXML(const xmlNodePtr node) { cur = node->children; while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE) { - if ((support3d == NULL) && (support2d == NULL) && + if (!support3d && !support2d && xmlStrEqual(cur->name, BAD_CAST "acceleration")) { support3d = virXMLPropString(cur, "accel3d"); support2d = virXMLPropString(cur, "accel2d"); @@ -6557,7 +6555,7 @@ virDomainVideoAccelDefParseXML(const xmlNodePtr node) { cur = cur->next; } - if ((support3d == NULL) && (support2d == NULL)) + if (!support3d && !support2d) return NULL; if (VIR_ALLOC(def) < 0) { @@ -6603,7 +6601,7 @@ virDomainVideoDefParseXML(const xmlNodePtr node, cur = node->children; while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE) { - if ((type == NULL) && (vram == NULL) && (heads == NULL) && + if (!type && !vram && !heads && xmlStrEqual(cur->name, BAD_CAST "model")) { type = virXMLPropString(cur, "type"); vram = virXMLPropString(cur, "vram"); @@ -6990,32 +6988,32 @@ virDomainHostdevFind(virDomainDefPtr def, virDomainHostdevDefPtr compare = def->hostdevs[i]; virDomainHostdevSubsysPtr c_subsys = &compare->source.subsys; - if ((compare->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) || - (c_subsys->type != m_subsys->type)) { + if (compare->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS || + c_subsys->type != m_subsys->type) { continue; } switch (m_subsys->type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: - if ((c_subsys->u.pci.domain == m_subsys->u.pci.domain) && - (c_subsys->u.pci.bus == m_subsys->u.pci.bus) && - (c_subsys->u.pci.slot == m_subsys->u.pci.slot) && - (c_subsys->u.pci.function == m_subsys->u.pci.function)) { + if (c_subsys->u.pci.domain == m_subsys->u.pci.domain && + c_subsys->u.pci.bus == m_subsys->u.pci.bus && + c_subsys->u.pci.slot == m_subsys->u.pci.slot && + c_subsys->u.pci.function == m_subsys->u.pci.function) { *found = compare; } break; case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: if (m_subsys->u.usb.bus && m_subsys->u.usb.device) { /* specified by bus location on host */ - if ((c_subsys->u.usb.bus == m_subsys->u.usb.bus) && - (c_subsys->u.usb.device == m_subsys->u.usb.device)) { + if (c_subsys->u.usb.bus == m_subsys->u.usb.bus && + c_subsys->u.usb.device == m_subsys->u.usb.device) { *found = compare; } } else { /* specified by product & vendor id */ - if ((c_subsys->u.usb.product == m_subsys->u.usb.product) && - (c_subsys->u.usb.vendor == m_subsys->u.usb.vendor)) { + if (c_subsys->u.usb.product == m_subsys->u.usb.product && + c_subsys->u.usb.vendor == m_subsys->u.usb.vendor) { *found = compare; } } @@ -7249,8 +7247,8 @@ void virDomainControllerInsertPreAlloced(virDomainDefPtr def, for (i = (def->ncontrollers - 1) ; i >= 0 ; i--) { /* If bus matches and current controller is after * new controller, then new controller should go here */ - if ((def->controllers[i]->type == controller->type) && - (def->controllers[i]->idx > controller->idx)) { + if (def->controllers[i]->type == controller->type && + def->controllers[i]->idx > controller->idx) { insertAt = i; } else if (def->controllers[i]->type == controller->type && insertAt == -1) { @@ -7673,7 +7671,7 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, } if (!(flags & VIR_DOMAIN_XML_INACTIVE)) - if ((virXPathLong("string(./@id)", ctxt, &id)) < 0) + if (virXPathLong("string(./@id)", ctxt, &id) < 0) id = -1; def->id = (int)id; @@ -7988,7 +7986,7 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, cur = nodes[0]->children; while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE) { - if ((xmlStrEqual(cur->name, BAD_CAST "memory"))) { + if (xmlStrEqual(cur->name, BAD_CAST "memory")) { tmp = virXMLPropString(cur, "nodeset"); if (tmp) { @@ -8397,9 +8395,9 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, def->nets[def->nnets++] = net; /* <interface type='hostdev'> must also be in the hostdevs array */ - if ((net->type == VIR_DOMAIN_NET_TYPE_HOSTDEV) && - (virDomainHostdevInsert(def, &net->data.hostdev.def) < 0)) { - goto no_memory; + if (net->type == VIR_DOMAIN_NET_TYPE_HOSTDEV && + virDomainHostdevInsert(def, &net->data.hostdev.def) < 0) { + goto no_memory; } } VIR_FREE(nodes); @@ -8985,7 +8983,7 @@ static virDomainObjPtr virDomainObjParseXML(virCapsPtr caps, virDomainObjSetState(obj, state, reason); - if ((virXPathLong("string(./@pid)", ctxt, &val)) < 0) { + if (virXPathLong("string(./@pid)", ctxt, &val) < 0) { virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("invalid pid")); goto error; @@ -10275,7 +10273,7 @@ virDomainCpuSetFormat(char *cpuset, int maxcpu) int start, cur; int first = 1; - if ((cpuset == NULL) || (maxcpu <= 0) || (maxcpu > 100000)) + if (!cpuset || maxcpu <= 0 || maxcpu > 100000) return NULL; cur = 0; @@ -10339,8 +10337,7 @@ virDomainCpuSetParse(const char *str, char sep, int i, start, last; int neg = 0; - if ((str == NULL) || (cpuset == NULL) || (maxcpu <= 0) || - (maxcpu > 100000)) + if (!str || !cpuset || maxcpu <= 0 || maxcpu > 100000) return -1; cur = str; @@ -10353,7 +10350,7 @@ virDomainCpuSetParse(const char *str, char sep, cpuset[i] = 0; ret = 0; - while ((*cur != 0) && (*cur != sep)) { + while (*cur != 0 && *cur != sep) { /* * 3 constructs are allowed: * - N : a single CPU number @@ -10371,7 +10368,7 @@ virDomainCpuSetParse(const char *str, char sep, if (start < 0) goto parse_error; virSkipSpaces(&cur); - if ((*cur == ',') || (*cur == 0) || (*cur == sep)) { + if (*cur == ',' || *cur == 0 || *cur == sep) { if (neg) { if (cpuset[start] == 1) { cpuset[start] = 0; @@ -10403,7 +10400,7 @@ virDomainCpuSetParse(const char *str, char sep, cur++; virSkipSpaces(&cur); neg = 0; - } else if ((*cur == 0) || (*cur == sep)) { + } else if (*cur == 0 || *cur == sep) { break; } else goto parse_error; @@ -10842,7 +10839,7 @@ virDomainDiskDefFormat(virBufferPtr buf, def->dst, bus); if ((def->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY || def->device == VIR_DOMAIN_DISK_DEVICE_CDROM) && - (def->tray_status != VIR_DOMAIN_DISK_TRAY_CLOSED)) + def->tray_status != VIR_DOMAIN_DISK_TRAY_CLOSED) virBufferAsprintf(buf, " tray='%s'/>\n", virDomainDiskTrayTypeToString(def->tray_status)); else @@ -11138,7 +11135,7 @@ virDomainActualNetDefFormat(virBufferPtr buf, } virBufferAsprintf(buf, " <actual type='%s'", type); - if ((def->type == VIR_DOMAIN_NET_TYPE_HOSTDEV) && + if (def->type == VIR_DOMAIN_NET_TYPE_HOSTDEV && def->data.hostdev.def.managed) { virBufferAddLit(buf, " managed='yes'"); } @@ -11223,7 +11220,7 @@ virDomainNetDefFormat(virBufferPtr buf, } virBufferAsprintf(buf, " <interface type='%s'", type); - if ((def->type == VIR_DOMAIN_NET_TYPE_HOSTDEV) && + if (def->type == VIR_DOMAIN_NET_TYPE_HOSTDEV && def->data.hostdev.def.managed) { virBufferAddLit(buf, " managed='yes'"); } @@ -11879,9 +11876,8 @@ virDomainTimerDefFormat(virBufferPtr buf, } } - if ((def->catchup.threshold == 0) - && (def->catchup.slew == 0) - && (def->catchup.limit == 0)) { + if (def->catchup.threshold == 0 && def->catchup.slew == 0 && + def->catchup.limit == 0) { virBufferAddLit(buf, "/>\n"); } else { virBufferAddLit(buf, ">\n"); @@ -11941,8 +11937,8 @@ virDomainGraphicsListenDefFormat(virBufferPtr buf, } if (def->address && - ((def->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS) || - ((def->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK) && + (def->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS || + (def->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK && !(flags & VIR_DOMAIN_XML_INACTIVE)))) { /* address may also be set to show current status when type='network', * but we don't want to print that if INACTIVE data is requested. */ @@ -12719,8 +12715,8 @@ virDomainDefFormatInternal(virDomainDefPtr def, * hostdev in a higher-level device (e.g. virDomainNetDef), * and will have already been formatted there. */ - if ((def->hostdevs[n]->parent.type == VIR_DOMAIN_DEVICE_NONE) && - (virDomainHostdevDefFormat(buf, def->hostdevs[n], flags) < 0)) { + if (def->hostdevs[n]->parent.type == VIR_DOMAIN_DEVICE_NONE && + virDomainHostdevDefFormat(buf, def->hostdevs[n], flags) < 0) { goto cleanup; } } @@ -14615,8 +14611,8 @@ virDomainNetGetActualHostdev(virDomainNetDefPtr iface) { if (iface->type == VIR_DOMAIN_NET_TYPE_HOSTDEV) return &iface->data.hostdev.def; - if ((iface->type == VIR_DOMAIN_NET_TYPE_NETWORK) && - (iface->data.network.actual->type == VIR_DOMAIN_NET_TYPE_HOSTDEV)) { + if (iface->type == VIR_DOMAIN_NET_TYPE_NETWORK && + iface->data.network.actual->type == VIR_DOMAIN_NET_TYPE_HOSTDEV) { return &iface->data.network.actual->data.hostdev.def; } return NULL; @@ -14653,7 +14649,7 @@ virDomainNetGetActualVirtPortProfile(virDomainNetDefPtr iface) virNetDevBandwidthPtr virDomainNetGetActualBandwidth(virDomainNetDefPtr iface) { - if ((iface->type == VIR_DOMAIN_NET_TYPE_NETWORK) && + if (iface->type == VIR_DOMAIN_NET_TYPE_NETWORK && iface->data.network.actual && iface->data.network.actual->bandwidth) { return iface->data.network.actual->bandwidth; } @@ -14668,9 +14664,9 @@ virDomainNetGetActualBandwidth(virDomainNetDefPtr iface) static virDomainGraphicsListenDefPtr virDomainGraphicsGetListen(virDomainGraphicsDefPtr def, size_t ii, bool force0) { - if ((def->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) || - (def->type == VIR_DOMAIN_GRAPHICS_TYPE_RDP) || - (def->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE)) { + if (def->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC || + def->type == VIR_DOMAIN_GRAPHICS_TYPE_RDP || + def->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE) { if (!def->listens && (ii == 0) && force0) { if (VIR_ALLOC(def->listens) < 0) -- 1.7.7.6

2 2

[libvirt] [PATCHv2 0/3] tighten up integer parsing
by Eric Blake 20 Apr '12

20 Apr '12

v1: https://www.redhat.com/archives/libvir-list/2012-April/msg00954.html changes in v2: fix regression in patch 1, incomplete change in patch 2 Eric Blake (3): virsh: avoid strtol conf: tighten up XML integer parsing build: avoid strtol and strtod cfg.mk | 14 ++++++++++ src/conf/domain_conf.c | 24 ++++++++++------- src/conf/storage_conf.c | 7 +++-- src/util/util.c | 14 +++++----- src/util/virmacaddr.c | 2 +- src/util/xml.c | 36 +++---------------------- tools/virsh.c | 67 ++++++++++++++--------------------------------- 7 files changed, 64 insertions(+), 100 deletions(-) -- 1.7.7.6

2 7

[libvirt] autogen.sh broken on RHEL5
by Daniel P. Berrange 19 Apr '12

19 Apr '12

$ ./autogen.sh --system Running ./configure with --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib64 running bootstrap... ./bootstrap: Bootstrapping from checked-out http://libvirt.org sources... ./bootstrap: consider installing git-merge-changelog from gnulib ./bootstrap: getting gnulib files... ./bootstrap: autopoint --force Copying file build-aux/config.rpath running: libtoolize --copy --install libtoolize: unrecognized option `--install' Try `libtoolize --help' for more information. There is no such '--install' option - is that even needed - AFAIK that is the default behaviour ? Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

2 2

[libvirt] [PATCH] Improve on virAtomic implementation
by Stefan Berger 19 Apr '12

19 Apr '12

This patch improves on the previously added virAtomicInt operations by testing for the compiler and if GCC >= 4.1 (not found in docs prior to that) is used on Linux and has the appropriate processor (that I have access to) then use the implementation based on the gcc-builtins. I also did not look at other systems (cygwin, win32) that do not need access to virAtomic right now. --- src/util/viratomic.h | 88 +++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 72 insertions(+), 16 deletions(-) Index: libvirt-acl/src/util/viratomic.h =================================================================== --- libvirt-acl.orig/src/util/viratomic.h +++ libvirt-acl/src/util/viratomic.h @@ -30,6 +30,22 @@ typedef struct _virAtomicInt virAtomicInt; typedef virAtomicInt *virAtomicIntPtr; +# define __VIR_ATOMIC_USES_LOCK + +# if defined(__GNUC__) +# if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 1)) || (__GNUC__ > 4) +# if defined(__linux__) +# if defined(__i386__) || defined(__x86_64__) || \ + defined(__powerpc64__) || defined(__powerpc__) +# undef __VIR_ATOMIC_USES_LOCK +# endif +# endif +# endif +# endif + + +# ifdef __VIR_ATOMIC_USES_LOCK + struct _virAtomicInt { virMutex lock; int value; @@ -42,22 +58,6 @@ virAtomicIntInit(virAtomicIntPtr vaip) return virMutexInit(&vaip->lock); } -static inline void -virAtomicIntSet(virAtomicIntPtr vaip, int value) -{ - virMutexLock(&vaip->lock); - - vaip->value = value; - - virMutexUnlock(&vaip->lock); -} - -static inline int -virAtomicIntRead(virAtomicIntPtr vaip) -{ - return vaip->value; -} - static inline int virAtomicIntAdd(virAtomicIntPtr vaip, int add) { @@ -88,4 +88,60 @@ virAtomicIntSub(virAtomicIntPtr vaip, in return ret; } +# else /* __VIR_ATOMIC_USES_LOCK */ + +struct _virAtomicInt { + int value; +}; + +static inline int +virAtomicIntInit(virAtomicIntPtr vaip) +{ + vaip->value = 0; + return 0; +} + +static inline int +virAtomicIntAdd(virAtomicIntPtr vaip, int add) +{ + return __sync_add_and_fetch(&vaip->value, add); +} + +static inline int +virAtomicIntSub(virAtomicIntPtr vaip, int sub) +{ + return __sync_sub_and_fetch(&vaip->value, sub); +} + +# endif /* __VIR_ATOMIC_USES_LOCK */ + + + +/* common operations that need no locking or build on others */ + + +static inline void +virAtomicIntSet(virAtomicIntPtr vaip, int value) +{ + vaip->value = value; +} + +static inline int +virAtomicIntRead(virAtomicIntPtr vaip) +{ + return *(volatile int *)&vaip->value; +} + +static inline int +virAtomicIntInc(virAtomicIntPtr vaip) +{ + return virAtomicIntAdd(vaip, 1); +} + +static inline int +virAtomicIntDec(virAtomicIntPtr vaip) +{ + return virAtomicIntSub(vaip, 1); +} + #endif /* __VIR_ATOMIC_H */

2 1

[libvirt] [PATCH 0/2 v3 use qemu's dump-guest-meory when vm uses host device
by Wen Congyang 19 Apr '12

19 Apr '12

Currently, we use migrate to dump guest's memory. There is one restriction in migrate command: the device's status should be stored in qemu because the device's status should be passed to target machine. If we passthrough a host device to guest, the device's status is stored in the real device. So migrate command will fail. We usually use dump when guest is panicked. So there is no need to store device's status in the vmcore. qemu will have a new monitor command dump-guest-memory to dump guest memory, but it doesn't support async now(it will support later when the common async API is implemented). So I use dump-guest-memory only when the guest uses host device in this patchset. Note: the patchset for qemu is still queued. Luiz has acked, but he waits an ACK from Jan and/or Anthony. They are too busy, and donot reply. Changes from v2 to v3: 1. qemu supports the fd that is associated with a pipe, socket, or FIFO. So pass a pipe fd to qemu and O_DIRECT can work now. Change from v1 to v2: 1. remove the implemention for text mode. Wen Congyang (2): qemu: implement qemu's dump-guest-memory qemu: try to use qemu's dump-guest-meory when vm uses host device src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 39 +++++++++++++++++++++++++++++++++++++-- src/qemu/qemu_monitor.c | 36 ++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.h | 13 +++++++++++++ src/qemu/qemu_monitor_json.c | 42 ++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 7 +++++++ 7 files changed, 137 insertions(+), 2 deletions(-)

3 5

[libvirt] [PATCH V11 0/7] Add DHCP snooping support to nwfilter
by Stefan Berger 19 Apr '12

19 Apr '12

This series of patches adds DHCP snooping support to libvirt's nwfilter subsystem. DHCP snooping detects DHCP leases obtained by a VM and automatically adjusts the network traffic filters to reflect the IP addresses with which a VM may send its traffic, thus for example preventing IP address spoofing. Once leases on IP addresses expire or if a VM gives up on a lease on an IP address, the filters are also adjusted. All leases are persisted and automatically applied upon a VM's restart. Leases are associated with the tuple of VM-UUID and interface MAC address. The following interface XML activates and uses the DHCP snooping: <interface type='bridge'> <source bridge='virbr0'/> <filterref filter='clean-traffic'> <parameter name='ip_learning' value='dhcp'/> </filterref> </interface> Once an IP address has been detected on an interface, 'virsh dumpxml <vm>' would show the IP address lease in the format <IP address>,<lease timeout in seconds>: <interface type='bridge'> <source bridge='virbr0'/> <filterref filter='clean-traffic'> <parameter name='ip_learning' value='dhcp'/> <parameter name='IP_LEASE' value='192.168.122.210,180'/> </filterref> </interface> Regards, David and Stefan

3 20

[libvirt] [PATCH v3 0/9] Add basic driver for Parallels Virtuozzo Server
by Dmitry Guryanov 19 Apr '12

19 Apr '12

Parallels Virtuozzo Server is a cloud-ready virtualization solution that allows users to simultaneously run multiple virtual machines and containers on the same physical server. Current name of this product is Parallels Server Bare Metal and more information about it can be found here - http://www.parallels.com/products/server/baremetal/sp/. This driver will work with PVS version 6.0 , beta version scheduled at 2012 Q2. Dmitry Guryanov (9): pvs: add driver skeleton util: add functions for interating over json object pvs: add functions to list domains and get info pvs: implement functions for domain life cycle management pvs: get info about serial ports pvs: add support of VNC remote display pvs: implement virDomainDefineXML operation for existing domains pvs: add storage driver pvs: implement VM creation cfg.mk | 1 + configure.ac | 23 + docs/drvpvs.html.in | 28 + include/libvirt/virterror.h | 1 + libvirt.spec.in | 7 + mingw32-libvirt.spec.in | 6 + po/POTFILES.in | 1 + src/Makefile.am | 23 + src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/driver.h | 1 + src/libvirt.c | 12 + src/pvs/pvs_driver.c | 1281 +++++++++++++++++++++++++++++++++++++ src/pvs/pvs_driver.h | 75 +++ src/pvs/pvs_storage.c | 1458 +++++++++++++++++++++++++++++++++++++++++++ src/pvs/pvs_utils.c | 143 +++++ src/util/json.c | 30 + src/util/json.h | 4 + src/util/virterror.c | 3 + 19 files changed, 3100 insertions(+), 1 deletions(-) create mode 100644 docs/drvpvs.html.in create mode 100644 src/pvs/pvs_driver.c create mode 100644 src/pvs/pvs_driver.h create mode 100644 src/pvs/pvs_storage.c create mode 100644 src/pvs/pvs_utils.c

3 12

[libvirt] [PATCH 0/3] tighten up integer parsing
by Eric Blake 19 Apr '12

19 Apr '12

I thought my recent improvements to <memory> parsing were complete, until I stumbled upon https://bugzilla.redhat.com/show_bug.cgi?id=617711, which shows a file that fails 'virt-xml-validate' but was silently accepted, and worse, misintepreted the user's intentions. I didn't have time to scrub the entire code base, but I can at least prevent the clean files from getting worse. Eric Blake (3): virsh: avoid strtol conf: tighten up XML integer parsing build: avoid strtol and strtod cfg.mk | 14 ++++++++++ src/conf/domain_conf.c | 12 +++----- src/conf/storage_conf.c | 6 ++-- src/util/util.c | 14 +++++----- src/util/virmacaddr.c | 2 +- src/util/xml.c | 36 +++---------------------- tools/virsh.c | 66 +++++++++++++--------------------------------- 7 files changed, 53 insertions(+), 97 deletions(-) -- 1.7.7.6

2 8

[libvirt] Problem with USB pass-through
by Carlos Rodrigues 19 Apr '12

19 Apr '12

Hello, I have a problem with USB pass-through. I can see the USB device in host machine, i see it in libvirt but when attach to VM i get an error: # lsusb ... Bus 002 Device 014: ID 0529:0001 Aladdin Knowledge Systems HASP v0.06 ... # virsh nodedev-list ... usb_device_529_1_noserial usb_device_529_1_noserial_if0 usb_device_529_1_noserial_usbraw ... # virsh dumpxml vm ... <hostdev mode='subsystem' type='usb' managed='no'> <source> <vendor id='0x0529'/> <product id='0x0001'/> </source> </hostdev> ... # cat /var/log/libvirt/qemu/vm.log ... LC_ALL=C PATH=/sbin:/usr/sbin:/bin:/usr/bin HOME=/ QEMU_AUDIO_DRV=none /usr/bin/qemu-kvm -S -M pc -m 3800 -smp 4 -name vm -uuid 056dad8b-22a4-4472-cb5e-8cf60215a41b -monitor unix:/var/lib/libvirt/qemu/v,.monitor,server,nowait -boot c -drive file=/dev/vg_sata2/vol_vm,if=virtio,boot=on,format=raw -net nic,macaddr=00:00:00:0b:5b:ec,vlan=0,model=virtio,name=net0 -net tap,fd=21,vlan=0,name=hostnet0 -serial none -parallel none -usb -usbdevice tablet -vnc 0.0.0.0:4 -k pt -vga cirrus -usbdevice host:002.014 -balloon virtio husb: open device 2.12 /proc/bus/usb/002/012: No such file or directory Warning: could not add USB device host:002.014 ... I'm using libvirt 0.8.3 with kvm 88. Anyone have see this problem? Regards, -- Carlos Rodrigues <cmar(a)eurotux.com> Investigação e Desenvolvimento Eurotux Informática, S.A. [http://eurotux.com]

2 2

[libvirt] [PATCH 0/2 v2] use qemu's dump-guest-meory when vm uses host device
by Wen Congyang 19 Apr '12

19 Apr '12

Currently, we use migrate to dump guest's memory. There is one restriction in migrate command: the device's status should be stored in qemu because the device's status should be passed to target machine. If we passthrough a host device to guest, the device's status is stored in the real device. So migrate command will fail. We usually use dump when guest is panicked. So there is no need to store device's status in the vmcore. qemu will have a new monitor command dump-guest-memory to dump guest memory, but it doesn't support async now(it will support later when the common async API is implemented). So I use dump-guest-memory only when the guest uses host device in this patchset. Note: the patchset for qemu is still queued. Luiz has acked, but he waits an ACK from Jan and/or Anthony. They are too busy, and donot reply. Change from v1 to v2: 1. remove the implemention for text mode. Wen Congyang (2): qemu: implement qemu's dump-guest-memory qemu: try to use qemu's dump-guest-meory when vm uses host device src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 42 ++++++++++++++++++++++++++++++++++++++++-- src/qemu/qemu_monitor.c | 36 ++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.h | 13 +++++++++++++ src/qemu/qemu_monitor_json.c | 42 ++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 7 +++++++ 7 files changed, 140 insertions(+), 2 deletions(-)

2 4

[libvirt] Making the Thread-safety issues with vbox driver ?
by Jean-Baptiste Rouault 19 Apr '12

19 Apr '12

On Wednesday 04 April 2012 17:56:12 Jean-Baptiste Rouault wrote: > On Monday 16 January 2012 11:34:53 Matthias Bolte wrote: > > Okay, without looking deeper into this here are some ideas: > > > > The XPCOM API libvirt uses might not be threadsafe, or needs to be > > initialized for every thread that wants to use it. Currently its only > > initialized for the thread that opens the driver. I know that this is > > the case on Windows were VirtualBox uses MSCOM for its API and you > > need to call CoInitialize on every thread. This is currently not done > > for the MSCOM glue in libvirt, so I know that on Windows the > > VirtualBox driver is not threadsafe currently. Also I didn't look into > > a solution for this yet. Maybe we need a thread local variable that > > holds whether (MS/XP)COM was already initialized for this thread and > > add a check to every driver function to initialize it when needed. > > > > Did you try to open a connection for each thread instead of trying to > > share one? If that works reliable it might indicate that there is an > > VirtualBox API initialization problem. > > I tried today with one connection for each thread and it works. > > I changed the vbox driver so that the pfnComInitialize function is called > only when the first connection is opened : it breaks the test, even with > one connection per thread. > > I guess we'll have to use a thread local variable as you suggested, unless > someone has a better idea to handle this problem. Hi, I looked deeper into these thread-safety issues, once a new connection is opened for each thread, everything works well. However, opening and closing connections isn't thread-safe at all for two reasons : - VirtualBox C bindings initialization and uninitialization functions aren't thread-safe. I talked about it with upstream on IRC and they are probably not going to fix it, but would accept a patch fixing the issue. I'm going to contact upstream again to get some advices so I can write a patch. - In the libvirt vbox driver, for each new connection, modification of the global variable g_pVBoxGlobalData isn't protected (see line 1040 of vbox_tmpl.c). First of all, is it really necessary to replace it on each new connection, or would it be ok to initialize it only when the first connection is opened ? A global mutex is needed in the vbox driver to protect access to g_pVBoxGlobalData, the vboxRegister() function seems to be the best place to initialize such a mutex unless there is another entry point to do this ? -- Jean-Baptiste ROUAULT Ingénieur R&D - diateam : Architectes de l'information Phone : +33 (0)2 98 050 050 Fax : +33 (0)2 98 050 051

3 3

[libvirt] [libvirt-glib] Add async variant of gvir_domain_get_info()
by Zeeshan Ali (Khattak) 19 Apr '12

19 Apr '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gobject/libvirt-gobject-domain.c | 80 ++++++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-domain.h | 7 +++ libvirt-gobject/libvirt-gobject.sym | 4 +- 3 files changed, 90 insertions(+), 1 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index 350a5b0..67ca257 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -572,6 +572,86 @@ GVirDomainInfo *gvir_domain_get_info(GVirDomain *dom, return ret; } +static void +gvir_domain_get_info_helper(GSimpleAsyncResult *res, + GObject *object, + GCancellable *cancellable G_GNUC_UNUSED) +{ + GVirDomain *dom = GVIR_DOMAIN(object); + GVirDomainInfo *info; + GError *err = NULL; + + info = gvir_domain_get_info(dom, &err); + if (err) + g_simple_async_result_take_error(res, err); + else + g_simple_async_result_set_op_res_gpointer + (res, + info, + (GDestroyNotify) gvir_domain_info_free); +} + +/** + * gvir_domain_get_info_async: + * @dom: the domain + * @cancellable: (allow-none)(transfer none): cancellation object + * @callback: (scope async): completion callback + * @user_data: (closure): opaque data for callback + * + * Asynchronous variant of #gvir_domain_get_info. + */ +void gvir_domain_get_info_async(GVirDomain *dom, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GSimpleAsyncResult *res; + + g_return_if_fail(GVIR_IS_DOMAIN(dom)); + + res = g_simple_async_result_new(G_OBJECT(dom), + callback, + user_data, + gvir_domain_get_info_async); + g_simple_async_result_run_in_thread(res, + gvir_domain_get_info_helper, + G_PRIORITY_DEFAULT, + cancellable); + g_object_unref(res); +} + +/** + * gvir_domain_get_info_finish: + * @dom: the domain + * @result: (transfer none): async method result + * @err: Place-holder for possible errors + * + * Finishes the operation started by #gvir_domain_get_info_async. + * + * Returns: (transfer full): the info + */ +GVirDomainInfo *gvir_domain_get_info_finish(GVirDomain *dom, + GAsyncResult *result, + GError **err) +{ + GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT(result); + GVirDomainInfo *ret; + + g_return_val_if_fail(GVIR_IS_DOMAIN(dom), NULL); + g_return_val_if_fail + (g_simple_async_result_is_valid(result, + G_OBJECT(dom), + gvir_domain_get_info_async), + NULL); + + if (g_simple_async_result_propagate_error(res, err)) + return NULL; + + ret = g_simple_async_result_get_op_res_gpointer(res); + + return gvir_domain_info_copy (ret); +} + /** * gvir_domain_screenshot: * @stream: stream to use as output diff --git a/libvirt-gobject/libvirt-gobject-domain.h b/libvirt-gobject/libvirt-gobject-domain.h index 8a4836e..677fbe6 100644 --- a/libvirt-gobject/libvirt-gobject-domain.h +++ b/libvirt-gobject/libvirt-gobject-domain.h @@ -141,6 +141,13 @@ gboolean gvir_domain_reboot(GVirDomain *dom, GVirDomainInfo *gvir_domain_get_info(GVirDomain *dom, GError **err); +void gvir_domain_get_info_async(GVirDomain *dom, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +GVirDomainInfo *gvir_domain_get_info_finish(GVirDomain *dom, + GAsyncResult *result, + GError **err); GVirConfigDomain *gvir_domain_get_config(GVirDomain *dom, guint flags, diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index 64c91cc..f43836f 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -1,4 +1,4 @@ -LIBVIRT_GOBJECT_0.0.7 { +LIBVIRT_GOBJECT_0.0.8 { global: gvir_init_object; gvir_init_object_check; @@ -70,6 +70,8 @@ LIBVIRT_GOBJECT_0.0.7 { gvir_domain_set_config; gvir_domain_get_devices; gvir_domain_get_info; + gvir_domain_get_info_async; + gvir_domain_get_info_finish; gvir_domain_get_persistent; gvir_domain_get_saved; gvir_domain_screenshot; -- 1.7.7.6

2 1

[libvirt] [PATCH V12 0/5] Add DHCP snooping support to nwfilter
by Stefan Berger 19 Apr '12

19 Apr '12

This series of patches adds DHCP snooping support to libvirt's nwfilter subsystem. DHCP snooping detects DHCP leases obtained by a VM and automatically adjusts the network traffic filters to reflect the IP addresses with which a VM may send its traffic, thus for example preventing IP address spoofing. Once leases on IP addresses expire or if a VM gives up on a lease on an IP address, the filters are also adjusted. All leases are persisted and automatically applied upon a VM's restart. Leases are associated with the tuple of VM-UUID and interface MAC address. The following interface XML activates and uses the DHCP snooping: <interface type='bridge'> <source bridge='virbr0'/> <filterref filter='clean-traffic'> <parameter name='CTRL_IP_LEARNING' value='dhcp'/> </filterref> </interface> Once an IP address has been detected on an interface, 'virsh dumpxml <vm>' would show the IP address lease in the format <IP address>,<lease timeout in seconds>: <interface type='bridge'> <source bridge='virbr0'/> <filterref filter='clean-traffic'> <parameter name='CTRL_IP_LEARNING' value='dhcp'/> <parameter name='IP_LEASE' value='192.168.122.210,180'/> </filterref> </interface> Regards, David and Stefan

1 5

[libvirt] Memory leak on list_domains
by Carlos Rodrigues 19 Apr '12

19 Apr '12

Hi, I have some problems on my application with memory leak when call list_domains method. I'm using libvirt 0.8.3 and Sys::Virt 0.2.4 Perl Module. Does anyone have any idea what's the problem? Regards, -- Carlos Rodrigues <cmar(a)eurotux.com> Eurotux Informática, S.A. [http://eurotux.com]

2 2

[libvirt] [libvirt-glib] Add async variant of gvir_domain_get_info()
by Zeeshan Ali (Khattak) 19 Apr '12

19 Apr '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gobject/libvirt-gobject-domain.c | 74 ++++++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-domain.h | 7 +++ libvirt-gobject/libvirt-gobject.sym | 4 +- 3 files changed, 84 insertions(+), 1 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index 0bafa7e..c1a2086 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -572,6 +572,80 @@ GVirDomainInfo *gvir_domain_get_info(GVirDomain *dom, return ret; } +static void +gvir_domain_get_info_helper(GSimpleAsyncResult *res, + GObject *object, + GCancellable *cancellable G_GNUC_UNUSED) +{ + GVirDomain *dom = GVIR_DOMAIN(object); + GVirDomainInfo *info; + GError *err = NULL; + + info = gvir_domain_get_info(dom, &err); + if (err) + g_simple_async_result_take_error(res, err); + else + g_simple_async_result_set_op_res_gpointer(res, info, NULL); +} + +/** + * gvir_domain_get_info_async: + * @dom: the domain + * @cancellable: (allow-none)(transfer none): cancellation object + * @callback: (scope async): completion callback + * @user_data: (closure): opaque data for callback + * + * Asynchronous variant of #gvir_domain_get_info. + */ +void gvir_domain_get_info_async(GVirDomain *dom, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GSimpleAsyncResult *res; + + g_return_if_fail(GVIR_IS_DOMAIN(dom)); + + res = g_simple_async_result_new(G_OBJECT(dom), + callback, + user_data, + gvir_domain_get_info_async); + g_simple_async_result_run_in_thread(res, + gvir_domain_get_info_helper, + G_PRIORITY_DEFAULT, + cancellable); + g_object_unref(res); +} + +/** + * gvir_domain_get_info_finish: + * @dom: the domain + * @result: (transfer none): async method result + * @err: Place-holder for possible errors + * + * Finishes the operation started by #gvir_domain_get_info_async. + * + * Returns: (transfer full): the info + */ +GVirDomainInfo *gvir_domain_get_info_finish(GVirDomain *dom, + GAsyncResult *result, + GError **err) +{ + GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT(result); + + g_return_val_if_fail(GVIR_IS_DOMAIN(dom), NULL); + g_return_val_if_fail + (g_simple_async_result_is_valid(result, + G_OBJECT(dom), + gvir_domain_get_info_async), + NULL); + + if (g_simple_async_result_propagate_error(res, err)) + return NULL; + + return g_simple_async_result_get_op_res_gpointer(res); +} + /** * gvir_domain_screenshot: * @stream: stream to use as output diff --git a/libvirt-gobject/libvirt-gobject-domain.h b/libvirt-gobject/libvirt-gobject-domain.h index 8a4836e..677fbe6 100644 --- a/libvirt-gobject/libvirt-gobject-domain.h +++ b/libvirt-gobject/libvirt-gobject-domain.h @@ -141,6 +141,13 @@ gboolean gvir_domain_reboot(GVirDomain *dom, GVirDomainInfo *gvir_domain_get_info(GVirDomain *dom, GError **err); +void gvir_domain_get_info_async(GVirDomain *dom, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +GVirDomainInfo *gvir_domain_get_info_finish(GVirDomain *dom, + GAsyncResult *result, + GError **err); GVirConfigDomain *gvir_domain_get_config(GVirDomain *dom, guint flags, diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index 64c91cc..f43836f 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -1,4 +1,4 @@ -LIBVIRT_GOBJECT_0.0.7 { +LIBVIRT_GOBJECT_0.0.8 { global: gvir_init_object; gvir_init_object_check; @@ -70,6 +70,8 @@ LIBVIRT_GOBJECT_0.0.7 { gvir_domain_set_config; gvir_domain_get_devices; gvir_domain_get_info; + gvir_domain_get_info_async; + gvir_domain_get_info_finish; gvir_domain_get_persistent; gvir_domain_get_saved; gvir_domain_screenshot; -- 1.7.7.6

2 1

[libvirt] [libvirt-glib] Add async variant of gvir_domain_get_info()
by Zeeshan Ali (Khattak) 19 Apr '12

19 Apr '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gobject/libvirt-gobject-domain.c | 74 ++++++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-domain.h | 7 +++ libvirt-gobject/libvirt-gobject.sym | 2 + 3 files changed, 83 insertions(+), 0 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index 0bafa7e..896aae1 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -572,6 +572,80 @@ GVirDomainInfo *gvir_domain_get_info(GVirDomain *dom, return ret; } +static void +gvir_domain_get_info_helper(GSimpleAsyncResult *res, + GObject *object, + GCancellable *cancellable G_GNUC_UNUSED) +{ + GVirDomain *dom = GVIR_DOMAIN(object); + GVirDomainInfo *info; + GError *err = NULL; + + info = gvir_domain_get_info(dom, &err); + if (err) + g_simple_async_result_take_error(res, err); + else + g_simple_async_result_set_op_res_gpointer(res, info, NULL); +} + +/** + * gir_domain_get_info_async: + * @dom: the domain + * @cancellable: (allow-none)(transfer none): cancellation object + * @callback: (scope async): completion callback + * @user_data: (closure): opaque data for callback + * + * Asynchronous variant of #gvir_domain_get_info. + */ +void gvir_domain_get_info_async(GVirDomain *dom, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GSimpleAsyncResult *res; + + g_return_if_fail(GVIR_IS_DOMAIN(dom)); + + res = g_simple_async_result_new(G_OBJECT(dom), + callback, + user_data, + gvir_domain_get_info_async); + g_simple_async_result_run_in_thread(res, + gvir_domain_get_info_helper, + G_PRIORITY_DEFAULT, + cancellable); + g_object_unref(res); +} + +/** + * gir_domain_get_info_finish: + * @dom: the domain + * @result: (transfer none): async method result + * @err: Place-holder for possible errors + * + * Finishes the operation started by #gvir_domain_get_info_async. + * + * Returns: (transfer full): the info + */ +GVirDomainInfo *gvir_domain_get_info_finish(GVirDomain *dom, + GAsyncResult *result, + GError **err) +{ + GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT(result); + + g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); + g_return_val_if_fail + (g_simple_async_result_is_valid(result, + G_OBJECT(dom), + gvir_domain_get_info_async), + FALSE); + + if (g_simple_async_result_propagate_error(res, err)) + return NULL; + + return g_simple_async_result_get_op_res_gpointer(res); +} + /** * gvir_domain_screenshot: * @stream: stream to use as output diff --git a/libvirt-gobject/libvirt-gobject-domain.h b/libvirt-gobject/libvirt-gobject-domain.h index 8a4836e..677fbe6 100644 --- a/libvirt-gobject/libvirt-gobject-domain.h +++ b/libvirt-gobject/libvirt-gobject-domain.h @@ -141,6 +141,13 @@ gboolean gvir_domain_reboot(GVirDomain *dom, GVirDomainInfo *gvir_domain_get_info(GVirDomain *dom, GError **err); +void gvir_domain_get_info_async(GVirDomain *dom, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +GVirDomainInfo *gvir_domain_get_info_finish(GVirDomain *dom, + GAsyncResult *result, + GError **err); GVirConfigDomain *gvir_domain_get_config(GVirDomain *dom, guint flags, diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index 64c91cc..00b32d4 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -70,6 +70,8 @@ LIBVIRT_GOBJECT_0.0.7 { gvir_domain_set_config; gvir_domain_get_devices; gvir_domain_get_info; + gvir_domain_get_info_async; + gvir_domain_get_info_finish; gvir_domain_get_persistent; gvir_domain_get_saved; gvir_domain_screenshot; -- 1.7.7.6

3 4

[libvirt] [libvirt-glib] Correct some minor typos in docs
by Zeeshan Ali (Khattak) 19 Apr '12

19 Apr '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gobject/libvirt-gobject-domain.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index c1a2086..7fcd733 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -775,7 +775,7 @@ cleanup: } /** - * gir_domain_suspend: + * gvir_domain_suspend: * @dom: the domain to suspend * @err: Place-holder for possible errors * @@ -857,7 +857,7 @@ gvir_domain_save_helper(GSimpleAsyncResult *res, } /** - * gir_domain_save_async: + * gvir_domain_save_async: * @dom: the domain to save * @flags: extra flags, currently unused * @cancellable: (allow-none)(transfer none): cancellation object @@ -893,7 +893,7 @@ void gvir_domain_save_async (GVirDomain *dom, } /** - * gir_domain_save_finish: + * gvir_domain_save_finish: * @dom: the domain to save * @result: (transfer none): async method result * @err: Place-holder for possible errors -- 1.7.7.6

2 1

[libvirt] [PATCH] virsh: Fix and clarify the --title flag for the list command in man page
by Peter Krempa 19 Apr '12

19 Apr '12

--- tools/virsh.pod | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 140d8e8..25751b6 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -398,13 +398,14 @@ may be combined. Default behavior is as though both were specified. (Note that if any of these flags is specified, the check for the persistence state is done and may fail. If none of these flags is specified, the check is skipped.) -If I<--title> is specified, then the domain note is printed. The output then -the output looks as follows. This flag is usable only with the default -I<--table> output. +If I<--title> is specified, then the short domain description - title - is +printed. This flag is usable only with the default I<--table> output. + +Example: B<virsh> list --title Id Name State Title ------------------------------------------------ + ----------------------------------------------- 0 Domain-0 running Mailserver 1 2 fedora paused -- 1.7.3.4

2 3

[libvirt] Call for Proposals: Linux Plumbers Conference (Aug 2012)
by Amit Shah 19 Apr '12

19 Apr '12

Hello, The Call for Proposals for the Linux Plumbers Conf 2012 is out. We're looking for speakers to talk at the Virtualization microconference as well as the main conference. The deadline for proposal submissions is 1st May. This year's edition of LPC is co-located with LinuxCon NA and will be held at San Diego from the 29th to the 31st of August. More details are at: http://www.linuxplumbersconf.org/2012/2012-lpc-call-for-proposals/ Please note: to submit a proposal for the virt microconf, use the 'lpc2012-virt-' prefix in the Name field. LPC is oriented towards solving problems, and good proposal topics are those which are unresolved problems or proposals that need interaction with multiple subsystems. Please see the CFP page linked above for more details. Thanks, Amit

1 0

[libvirt] PXE boot issue with macvtap
by Shradha Shah 19 Apr '12

19 Apr '12

Hello All, I currently have an issue with using macvtap interfaces on KVM. I was wondering if this is a known issue? Also may I request for any ideas on how I should go forward with this issue? Issue: When you try to PXE boot one KVM guest of another KVM guest over a macvtap interface the client does not receive the tftp packets sent by the server and the connection times out. Setup: Both the PXE client and the PXE server are VM's running on the same host, using macvtap on top of a LOM interface for connectivity Reproducible always. Findings of the testing: 1) The issue is seen between guests on the same on the same host and not between guests on different hosts. 2) PXE booting works fine if we're using a linux bridge for connectivity rather than macvtap 3) The initial DHCP stage works fine and the client acquires an IP address, but then the TFTP attempt stalls. 4) The client sends an RRQ to which the server replies with option acknowledgement, which is exactly what should happen. 5) However the client appears not to receive the acknowledgement. 6) Both client and server keep retransmitting their packets for a while, until the client times out and gives up. 7) Observing the ifconfig stats for the host macvtap interface for each guest, the packet counters seemed to show that the packets were being received - so they are dropped somewhere between macvtap on the host and the virtio device in the guest. 8) Tcpdump does not seem to work with macvtap so could not inspect further. -- Many Thanks, Regards, Shradha Shah

1 0

[libvirt] [PATCH] virsh: avoid uninitialized memory usage
by Alex Jia 19 Apr '12

19 Apr '12

Detected by valgrind. * tools/virsh.c (cmdBlockPull): fix uninitialized memory usage. * How to reproduce? $ qemu-img create /var/lib/libvirt/images/test 1M $ cat > /tmp/test.xml <<EOF <domain type='qemu'> <name>test</name> <memory>219200</memory> <vcpu>1</vcpu> <os> <type arch='x86_64'>hvm</type> <boot dev='hd'/> </os> <devices> <disk type='file' device='disk'> <driver name='qemu' type='raw'/> <source file='/var/lib/libvirt/images/test'/> <target dev='vda' bus='virtio'/> </disk> <input type='mouse' bus='ps2'/> <graphics type='spice' autoport='yes' listen='0.0.0.0'/> </devices> </domain> EOF $ virsh define /tmp/test.xml $ valgrind -v virsh blockpull test /var/lib/libvirt/images/test --wait actual result: ==10906== 1 errors in context 1 of 1: ==10906== Syscall param rt_sigaction(act->sa_flags) points to uninitialised byte(s) ==10906== at 0x39CF80F5BE: __libc_sigaction (sigaction.c:67) ==10906== by 0x43016C: cmdBlockPull (virsh.c:7638) ==10906== by 0x4150D4: vshCommandRun (virsh.c:18574) ==10906== by 0x425E73: main (virsh.c:20178) ==10906== Address 0x7fefffae8 is on thread 1's stack Signed-off-by: Alex Jia <ajia(a)redhat.com> --- tools/virsh.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 95ed7bc..4e4ca57 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -7634,6 +7634,7 @@ cmdBlockPull(vshControl *ctl, const vshCmd *cmd) intCaught = 0; sig_action.sa_sigaction = vshCatchInt; + sigemptyset((sigset_t *)&sig_action.sa_flags); sigemptyset(&sig_action.sa_mask); sigaction(SIGINT, &sig_action, &old_sig_action); -- 1.7.1

2 5

[libvirt] [PATCH] util: remove dead casts
by Eric Blake 18 Apr '12

18 Apr '12

The sequence: long long val; if ((long long) val != val) is dead code. * src/util/util.c (virStrToLong_ll, virStrToLong_ull): Remove useless cast. --- Pushing under the trivial rule. src/util/util.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index 6e041d6..1b39227 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -1571,13 +1571,13 @@ virStrToLong_ll(char const *s, char **end_ptr, int base, long long *result) long long val; char *p; int err; errno = 0; val = strtoll(s, &p, base); - err = (errno || (!end_ptr && *p) || p == s || (long long) val != val); + err = (errno || (!end_ptr && *p) || p == s); if (end_ptr) *end_ptr = p; if (err) return -1; *result = val; return 0; @@ -1590,13 +1590,13 @@ virStrToLong_ull(char const *s, char **end_ptr, int base, unsigned long long *re unsigned long long val; char *p; int err; errno = 0; val = strtoull(s, &p, base); - err = (errno || (!end_ptr && *p) || p == s || (unsigned long long) val != val); + err = (errno || (!end_ptr && *p) || p == s); if (end_ptr) *end_ptr = p; if (err) return -1; *result = val; return 0; -- 1.7.7.6

1 0

[libvirt] [PATCH V10 0/7] Add DHCP snooping support to nwfilter
by Stefan Berger 18 Apr '12

18 Apr '12

This series of patches adds DHCP snooping support to libvirt's nwfilter subsystem. DHCP snooping detects DHCP leases obtained by a VM and automatically adjusts the network traffic filters to reflect the IP addresses with which a VM may send its traffic, thus for example preventing IP address spoofing. Once leases on IP addresses expire or if a VM gives up on a lease on an IP address, the filters are also adjusted. All leases are persisted and automatically applied upon a VM's restart. Leases are associated with the tuple of VM-UUID and interface MAC address. The following interface XML activates and uses the DHCP snooping: <interface type='bridge'> <source bridge='virbr0'/> <filterref filter='clean-traffic'> <parameter name='ip_learning' value='dhcp'/> </filterref> </interface> Once an IP address has been detected on an interface, 'virsh dumpxml <vm>' would show the IP address lease in the format <IP address>,<lease timeout in seconds>: <interface type='bridge'> <source bridge='virbr0'/> <filterref filter='clean-traffic'> <parameter name='ip_learning' value='dhcp'/> <parameter name='IP_LEASE' value='192.168.122.210,180'/> </filterref> </interface> Regards, David and Stefan

2 15

[libvirt] [PATCH v2 0/9] Add basic driver for Parallels Virtuozzo Server
by Dmitry Guryanov 18 Apr '12

18 Apr '12

Parallels Virtuozzo Server is a cloud-ready virtualization solution that allows users to simultaneously run multiple virtual machines and containers on the same physical server. Current name of this product is Parallels Server Bare Metal and more information about it can be found here - http://www.parallels.com/products/server/baremetal/sp/. This driver will work with PVS version 6.0 , beta version scheduled at 2012 Q2. Dmitry Guryanov (9): pvs: add driver skeleton util: add functions for interating over json object pvs: add functions to list domains and get info pvs: implement functions for domain life cycle management pvs: get info about serial ports pvs: add support of VNC remote display pvs: implement virDomainDefineXML operation for existing domains pvs: add storage driver pvs: implement VM creation cfg.mk | 1 + configure.ac | 23 + docs/drvpvs.html.in | 28 + include/libvirt/virterror.h | 1 + libvirt.spec.in | 7 + mingw32-libvirt.spec.in | 6 + po/POTFILES.in | 1 + src/Makefile.am | 23 + src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/driver.h | 1 + src/libvirt.c | 12 + src/pvs/pvs_driver.c | 1268 +++++++++++++++++++++++++++++++++++++ src/pvs/pvs_driver.h | 75 +++ src/pvs/pvs_storage.c | 1460 +++++++++++++++++++++++++++++++++++++++++++ src/pvs/pvs_utils.c | 139 ++++ src/util/json.c | 30 + src/util/json.h | 4 + src/util/virterror.c | 3 + 19 files changed, 3085 insertions(+), 1 deletions(-) create mode 100644 docs/drvpvs.html.in create mode 100644 src/pvs/pvs_driver.c create mode 100644 src/pvs/pvs_driver.h create mode 100644 src/pvs/pvs_storage.c create mode 100644 src/pvs/pvs_utils.c

2 13

[libvirt] CfP 7th Workshop on Virtualization in High-Performance Cloud Computing (VHPC'12)
by VHPC 11 18 Apr '12

18 Apr '12

we apologize if you receive multiple copies of this CFP. =================================================================== CALL FOR PAPERS 7th Workshop on Virtualization in High-Performance Cloud Computing VHPC '12 as part of Euro-Par 2012, Rhodes Island, Greece =================================================================== Date: August 28, 2012 Workshop URL: http://vhpc.org SUBMISSION DEADLINE: Rolling abstract submission June 4, 2012 - Full paper submission SCOPE: Virtualization has become a common abstraction layer in modern data centers, enabling resource owners to manage complex infrastructure independently of their applications. Conjointly, virtualization is becoming a driving technology for a manifold of industry grade IT services. The cloud concept includes the notion of a separation between resource owners and users, adding services such as hosted application frameworks and queueing. Utilizing the same infrastructure, clouds carry significant potential for use in high-performance scientific computing. The ability of clouds to provide for requests and releases of vast computing resources dynamically and close to the marginal cost of providing the services is unprecedented in the history of scientific and commercial computing. Distributed computing concepts that leverage federated resource access are popular within the grid community, but have not seen previously desired deployed levels so far. Also, many of the scientific data centers have not adopted virtualization or cloud concepts yet. This workshop aims to bring together industrial providers with the scientific community in order to foster discussion, collaboration and mutual exchange of knowledge and experience. The workshop will be one day in length, composed of 20 min paper presentations, each followed by 10 min discussion sections. Presentations may be accompanied by interactive demonstrations. TOPICS Topics of interest include, but are not limited to: Higher-level cloud architectures, focusing on issues such as: - Languages for describing highly-distributed compute jobs - Workload characterization for VM-based environments - Optimized communication libraries/protocols in the cloud - Cross-layer optimization of numeric algorithms on VM infrastructure - System and process/bytecode VM convergence - Cloud frameworks and API sets - Checkpointing/migration of large compute jobs - Instrumentation interfaces and languages - VMM performance (auto-)tuning on various load types - Cloud reliability, fault-tolerance, and security - Software as a Service (SaaS) architectures - Research and education use cases - Virtualization in cloud, cluster and grid environments - Cross-layer VM optimizations - Cloud use cases including optimizations - VM-based cloud performance modelling - Performance and cost modelling Lower-level design challenges for Hypervisors, VM-aware I/O devices, hardware accelerators or filesystems in VM environments, especially: - Cloud, grid and distributed filesystems - Hardware for I/O virtualization (storage/network/accelerators) - Storage and network I/O subsystems in virtualized environments - Novel software approaches to I/O virtualization - Paravirtualized I/O subsystems for modified/unmodified guests - Virtualization-aware cluster interconnects - Direct device assignment - NUMA-aware subsystems in virtualized environments - Hardware Accelerators in virtualization (GPUs/FPGAs) - Hardware extensions for virtualization - VMMs/Hypervisors for embedded systems Data Center management methods, including: - QoS and and service levels - VM cloud and cluster distribution algorithms - VM load-balancing in Clouds - Hypervisor extensions and tools for cluster and grid computing - Fault tolerant VM environments - Virtual machine monitor platforms - Management, deployment and monitoring of VM-based environments - Cluster provisioning in the Cloud PAPER SUBMISSION Papers submitted to the workshop will be reviewed by at least two members of the program committee and external reviewers. Submissions should include abstract, key words, the e-mail address of the corresponding author, and must not exceed 10 pages, including tables and figures at a main font size no smaller than 11 point. Submission of a paper should be regarded as a commitment that, should the paper be accepted, at least one of the authors will register and attend the conference to present the work. Accepted papers will be published in the Springer LNCS series - the format must be according to the Springer LNCS Style. Initial submissions are in PDF; authors of accepted papers will be requested to provide source files. Format Guidelines: http://www.springer.de/comp/lncs/authors.html Style template: ftp://ftp.springer.de/pub/tex/latex/llncs/latex2e/llncs2e.zip Abstract Submission Link: http://edas.info/newPaper.php?c=11943 IMPORTANT DATES Rolling abstract submission June 4, 2012 - Full paper submission June 29, 2012 - Acceptance notification July 20, 2012 - Camera-ready version due August 28, 2012 - Workshop Date CHAIR Michael Alexander (chair), TU Wien, Austria Gianluigi Zanetti (co-chair), CRS4, Italy Anastassios Nanos (co-chair), NTUA, Greece PROGRAM COMMITTEE Paolo Anedda, CRS4, Italy Giovanni Busonera, CRS4, Italy Brad Calder, Microsoft, USA Roberto Canonico, University of Napoli Federico II, Italy Tommaso Cucinotta, Scuola Superiore Sant'Anna, Italy Werner Fischer, Thomas-Krenn AG, Germany William Gardner, University of Guelph, USA Marcus Hardt, Forschungszentrum Karlsruhe, Germany Sverre Jarp, CERN, Switzerland Shantenu Jha, Louisiana State University, USA Xuxian Jiang, NC State, USA Nectarios Koziris, National Technical University of Athens, Greece Simone Leo, CRS4, Italy Ignacio Llorente, Universidad Complutense de Madrid, Spain Naoya Maruyama, Tokyo Institute of Technology, Japan Jean-Marc Menaud, Ecole des Mines de Nantes, France Dimitrios Nikolopoulos, Foundation for Research&Technology Hellas, Greece Jose Renato Santos, HP Labs, USA Walter Schwaiger, TU Wien, Austria Yoshio Turner, HP Labs, USA Kurt Tutschku, University of Vienna, Austria Lizhe Wang, Indiana University, USA Chao-Tung Yang, Tunghai University, Taiwan DURATION: Workshop Duration is one day. GENERAL INFORMATION The workshop will be held as part of Euro-Par 2012. Euro-Par 2012: http://europar2012.cti.gr/

1 0

[libvirt] [PATCH] util: only register callbacks for CREATE operations in virnetdevmacvlan.c
by D. Herrendoerfer 18 Apr '12

18 Apr '12

From: "D. Herrendoerfer" <d.herrendoerfer(a)herrendoerfer.name> currently upon a migration a callback is created when a 802.1qbg link is set to PREASSOCIATE, this should not happen because this is a no-op on most switches, and does not lead to an ASSOCIATE state. This patch only creates callbacks when CREATE is requested. Migration and libvirtd restart scenarios are already handeled elsewhere. Signed-off-by: D. Herrendoerfer <d.herrendoerfer(a)herrendoerfer.name> --- src/util/virnetdevmacvlan.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 17ea883..73f41ff 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -945,9 +945,12 @@ create_name: goto disassociate_exit; } - if (virNetDevMacVLanVPortProfileRegisterCallback(cr_ifname, macaddress, - linkdev, vmuuid, virtPortProfile, vmOp) < 0 ) + if (vmOp == VIR_NETDEV_VPORT_PROFILE_OP_CREATE) { + /*Only directly register upon a create - migration and restart are handled elsewhere*/ + if (virNetDevMacVLanVPortProfileRegisterCallback(cr_ifname, macaddress, + linkdev, vmuuid, virtPortProfile, vmOp) < 0 ) goto disassociate_exit; + } return rc; -- 1.7.7.6

3 6

[libvirt] [test-API 00/10] Reorgnize/refactoring round 2
by Osier Yang 18 Apr '12

18 Apr '12

This should be the second round to reorgnize/refactor the codes. What this round does: * New directory "conf"; Move $root/*.cfg into it * New directory "src"; Move $root/*.{py,css,xls} into it (except the main program libvirt-test-api.py) * Rename libvirt-test-api.py to libvirt-test-api * Move install-autotest-server into "scripts" * Rename BUGSKIP to SKIP, and modify the skipping syntax so that it skips whole test case, but not test step(s). See the explaination in the patch to get why to do it. * Destroy the codes to skip test steps. * Other small fixes. TODO in next round: * Support run all cases in a bundle * Support to skip test case with the new skipping syntax * A new config property for the scratch directory, (now it always use $(pwd)/$guest_name to download the files, we should have something like '/var/cache/libvirt-test-API' instead). * Other cleaning up. Osier Yang (10): Create new dir 'conf' and move conf files into it Fix the typo in usage string Remove the suffix .py for libvirt-test-api.py New directory 'src' and move *.{py,css,xls} files into it Fix the typo which mispells 'shutil' as 'shutils' Move install-autotest-server into 'scripts' Update logging stuffs so that it works after source tree reorgnizing Add document to tell the default log output file Rename and modify the syntax of BUGSKIP Destroy the codes to skip case steps. BUGSKIP | 4 - SKIP | 26 ++++++++ env.cfg => conf/env.cfg | 0 kickstart.cfg => conf/kickstart.cfg | 0 dist/redhat/env_inspect.py | 2 +- libvirt-test-api.py => libvirt-test-api | 50 ++++++++-------- repos/domain/attach_disk.py | 2 +- repos/domain/attach_interface.py | 2 +- repos/domain/autostart.py | 2 +- repos/domain/balloon_memory.py | 2 +- repos/domain/blkstats.py | 2 +- repos/domain/console_io.py | 2 +- repos/domain/console_mutex.py | 2 +- repos/domain/cpu_affinity.py | 2 +- repos/domain/cpu_topology.py | 2 +- repos/domain/create.py | 2 +- repos/domain/define.py | 2 +- repos/domain/destroy.py | 2 +- repos/domain/detach_disk.py | 2 +- repos/domain/detach_interface.py | 2 +- repos/domain/domain_blkinfo.py | 2 +- repos/domain/domain_id.py | 2 +- repos/domain/domblkinfo.py | 2 +- repos/domain/dump.py | 2 +- repos/domain/eventhandler.py | 2 +- repos/domain/ifstats.py | 2 +- repos/domain/install_image.py | 4 +- repos/domain/install_linux_cdrom.py | 10 ++-- repos/domain/install_linux_check.py | 4 +- repos/domain/install_linux_net.py | 12 ++-- repos/domain/install_windows_cdrom.py | 12 ++-- repos/domain/migrate.py | 2 +- repos/domain/ownership_test.py | 2 +- repos/domain/reboot.py | 2 +- repos/domain/restore.py | 2 +- repos/domain/resume.py | 2 +- repos/domain/save.py | 2 +- repos/domain/sched_params.py | 2 +- repos/domain/shutdown.py | 2 +- repos/domain/start.py | 2 +- repos/domain/suspend.py | 2 +- repos/domain/undefine.py | 2 +- repos/domain/update_devflag.py | 2 +- repos/interface/create.py | 2 +- repos/interface/define.py | 2 +- repos/interface/destroy.py | 2 +- repos/interface/undefine.py | 2 +- repos/libvirtd/qemu_hang.py | 2 +- repos/libvirtd/restart.py | 2 +- repos/network/autostart.py | 2 +- repos/network/create.py | 2 +- repos/network/define.py | 2 +- repos/network/destroy.py | 2 +- repos/network/network_list.py | 2 +- repos/network/network_name.py | 2 +- repos/network/network_uuid.py | 2 +- repos/network/start.py | 2 +- repos/network/undefine.py | 2 +- repos/nodedevice/detach.py | 2 +- repos/nodedevice/reattach.py | 2 +- repos/nodedevice/reset.py | 2 +- repos/npiv/create_virtual_hba.py | 2 +- .../multiple_thread_block_on_domain_create.py | 4 +- repos/remoteAccess/tcp_setup.py | 2 +- repos/remoteAccess/tls_setup.py | 8 +- repos/sVirt/domain_nfs_start.py | 2 +- repos/snapshot/delete.py | 2 +- repos/snapshot/file_flag.py | 2 +- repos/snapshot/flag_check.py | 2 +- repos/snapshot/internal_create.py | 2 +- repos/snapshot/revert.py | 2 +- repos/storage/activate_pool.py | 2 +- repos/storage/build_dir_pool.py | 2 +- repos/storage/build_disk_pool.py | 2 +- repos/storage/build_logical_pool.py | 2 +- repos/storage/build_netfs_pool.py | 2 +- repos/storage/create_dir_pool.py | 2 +- repos/storage/create_dir_volume.py | 2 +- repos/storage/create_fs_pool.py | 2 +- repos/storage/create_iscsi_pool.py | 2 +- repos/storage/create_logical_volume.py | 2 +- repos/storage/create_netfs_pool.py | 2 +- repos/storage/create_netfs_volume.py | 2 +- repos/storage/create_partition_volume.py | 2 +- repos/storage/define_dir_pool.py | 2 +- repos/storage/define_disk_pool.py | 2 +- repos/storage/define_iscsi_pool.py | 2 +- repos/storage/define_logical_pool.py | 2 +- repos/storage/define_mpath_pool.py | 2 +- repos/storage/define_netfs_pool.py | 2 +- repos/storage/define_scsi_pool.py | 2 +- repos/storage/delete_dir_volume.py | 2 +- repos/storage/delete_logical_pool.py | 2 +- repos/storage/delete_logical_volume.py | 2 +- repos/storage/delete_netfs_volume.py | 2 +- repos/storage/delete_partition_volume.py | 2 +- repos/storage/destroy_pool.py | 2 +- repos/storage/pool_name.py | 2 +- repos/storage/pool_uuid.py | 2 +- repos/storage/undefine_pool.py | 2 +- .../install-autotest-server | 0 activityfilter.py => src/activityfilter.py | 0 casecfgcheck.py => src/casecfgcheck.py | 2 +- env_clear.py => src/env_clear.py | 2 +- exception.py => src/exception.py | 2 +- generator.py => src/generator.py | 61 ++++---------------- log.css => src/log.css | 0 log.xsl => src/log.xsl | 2 +- logxmlparser.py => src/logxmlparser.py | 4 +- mapper.py => src/mapper.py | 0 parser.py => src/parser.py | 6 +- process.py => src/process.py | 0 proxy.py => src/proxy.py | 2 +- sharedmod.py => src/sharedmod.py | 0 utils/env_parser.py | 2 +- 115 files changed, 188 insertions(+), 205 deletions(-) delete mode 100644 BUGSKIP create mode 100644 SKIP rename env.cfg => conf/env.cfg (100%) rename kickstart.cfg => conf/kickstart.cfg (100%) rename libvirt-test-api.py => libvirt-test-api (91%) rename install-autotest-server => scripts/install-autotest-server (100%) create mode 100644 src/__init__.py rename activityfilter.py => src/activityfilter.py (100%) rename casecfgcheck.py => src/casecfgcheck.py (99%) rename env_clear.py => src/env_clear.py (99%) rename exception.py => src/exception.py (97%) rename generator.py => src/generator.py (78%) rename log.css => src/log.css (100%) rename log.xsl => src/log.xsl (98%) rename logxmlparser.py => src/logxmlparser.py (99%) rename mapper.py => src/mapper.py (100%) rename parser.py => src/parser.py (99%) rename process.py => src/process.py (100%) rename proxy.py => src/proxy.py (99%) rename sharedmod.py => src/sharedmod.py (100%) Regards, Osier -- 1.7.7.3

2 22

[libvirt] VN-Link vNIC memory state copying on VM Migration
by Jagath Weerasinghe 18 Apr '12

18 Apr '12

Hi All, I am new to libvirt. And want to know how the VM migration occurs in VN-Link (IEEE802.1Qbh). As far as I know, the memory state of vNICs in M81KR VIC has to be copied and moved to the destination vNIC on VM migration. Is that correct? If so, could you please tell me how this has been implemented in libvirt? Thanks Jagath

2 8

[libvirt] Incomplete stdout returned by qemu -help cause kvm disabled
by 杨镭 18 Apr '12

18 Apr '12

Hi: In our setup(libvirt 0.9.9 with Arch Linux with kernel 3.2+), when libvirt are accessed simultaneously, say 8 createDomain requests, there is a large chance that `qemu -help` return incomplete stdout which cause kvm to be disabled. Another user have the same situation like us[1] and he suspected this being the result of some race conditions. 1: https://www.redhat.com/archives/libvir-list/2012-April/msg00380.html -- lei yang

2 1

[libvirt] [PATCH] Remove the useless scripts directory and script under it
by Osier Yang 18 Apr '12

18 Apr '12

The script is useful only if all the scripts have good document comments. Unfortunately, it's not true, and it's burden for developers to write those documents in specific format somehow, on the other hand, because we introduced required_opts, optional_opts for each cases to generate the usage strings, and new option "-t" to print template for cases, it's no need to write documents in specific format for scripts now. --- scripts/gen_case_doc.sh | 21 --------------------- 1 files changed, 0 insertions(+), 21 deletions(-) delete mode 100644 scripts/gen_case_doc.sh diff --git a/scripts/gen_case_doc.sh b/scripts/gen_case_doc.sh deleted file mode 100644 index e814532..0000000 --- a/scripts/gen_case_doc.sh +++ /dev/null @@ -1,21 +0,0 @@ -#! /bin/sh -# Create documentation of cases in Python - -FILES=`find $PWD/repos/Python -type f -name "*.py"` - -for i in ${FILES}; do - if [ $(basename $i) != '__init__.py' ]; then - DIRNAME=$(dirname $i) - DIRNAME=$(echo $DIRNAME | sed -e 's:repos:doc:g') - fi - - if ! [ -e $DIRNAME ]; then - mkdir -p $DIRNAME - fi - - cd $DIRNAME - pydoc -w $i - cd - -done - -exit $? -- 1.7.7.3

2 5

[libvirt] [test-API] Delete the script to generate the testing coverage statistics
by Osier Yang 18 Apr '12

18 Apr '12

lib/*.py were destroyed. And there is no way to count the API coverage now. --- I tried to write a rough patch to generate the statistics, but failed. There is no way to detect if the API is covered by the cases, because the different class can have same methods name, though I can filter out the APIs for each libvirt object by: libvirt_module="/usr/lib64/python2.7/site-packages/libvirt.py" declare -a arr=($(grep -E "class vir[A-Za-z]+:" $libvirt_module | \ cut -d' ' -f2)) for i in $(seq 0 $((${#arr[@]} - 1))); do j=$(($i + 1)) echo "[ == ${arr[$i]} == ]" if [ $j -lt ${#arr[@]} ]; then sed -n -e "/${arr[$i]}/,/${arr[$j]}/{/${arr[$j]}/!p}" \ $libvirt_module | grep '^ def ' | grep -E -v "__del|__init" | \ sed -e "s/\s*def //g" -e "s/(.*)://g" fi done --- utils/stats.sh | 72 -------------------------------------------------------- 1 files changed, 0 insertions(+), 72 deletions(-) delete mode 100755 utils/stats.sh diff --git a/utils/stats.sh b/utils/stats.sh deleted file mode 100755 index cf2765b..0000000 --- a/utils/stats.sh +++ /dev/null @@ -1,72 +0,0 @@ -#! /bin/bash - -if [ ! -d $(pwd)/coverage ]; then - mkdir -p $(pwd)/coverage -fi - -VIRT_STATS_FILE="$(pwd)/coverage/libvirt_API_statistics.txt" -PYTHON="python$(python -V 2>&1|cut -c 8-10)" -SUMMARY="coverage/coverage.txt" - -if [ $(uname -p) = "x86_64" ]; then - export LIB="lib64" -else - export LIB="lib" -fi - -function delimiter() -{ - local i=1 - local separator=$1 - local line='' - while [ $i -le $2 ] - do - line=${line}${separator} - i=$((i+1)) - done - echo "+$line+" | tee -a $SUMMARY -} - -echo -echo "Generate Libvirt API Statistics Report under the " -echo "$(pwd)/coverage" -echo -delimiter '=' 50 -echo -e "| Libvirt API statistics of coverage\t |" | tee -a $SUMMARY -echo -e "| $(date +'%F %T') ($(whoami))\t\t |" | tee -a $SUMMARY -delimiter '=' 50 - -VIRT_PATH="/usr/$LIB/$PYTHON/site-packages/libvirt.py" -grep 'def ' $VIRT_PATH|grep -v "#"|grep -v "__init__" |grep -v "__del__"|cut -d"(" -f 1 |awk '{print NR, $2}' > $VIRT_STATS_FILE - -TOTAL_API_NUM=$(grep 'def ' $VIRT_PATH|grep -v "#"|grep -v "__init__" |grep -v "__del__"|wc -l) -WRAPPER_API_PATH="$(pwd)/lib/Python" -WRAPPER_API_NUM=0 - -for wrapper in connect domain network storage nodedev interface secret nwfilter -do - export EVERY_API_NUM=$(grep 'def ' $WRAPPER_API_PATH/$wrapper'API.py'|grep -v '#'|grep -v '__init__' |grep -v '__del__r'|wc -l) - API_NUM=${EVERY_API_NUM} - let WRAPPER_API_NUM=$WRAPPER_API_NUM+$API_NUM - echo -e "| cover $wrapper API number\t|\t$API_NUM\t |" | tee -a $SUMMARY - if [ $wrapper != "nwfilter" ]; then - delimiter '-' 50 - else - continue - fi -done - -delimiter '=' 50 -echo -e "| cover libvirt API total number|\t$WRAPPER_API_NUM\t |" | tee -a $SUMMARY -delimiter '-' 50 - -echo -e "| libvirt API real total number\t|\t$TOTAL_API_NUM\t |" | tee -a $SUMMARY -delimiter '=' 50 - -RATE=$(printf "%.0f%%" `echo "scale=2;$WRAPPER_API_NUM/$TOTAL_API_NUM*100"|bc`) -echo -e "| libvirt API coverage rate\t|\t$RATE\t |" | tee -a $SUMMARY -delimiter '=' 50 - -echo | tee -a $SUMMARY - - -- 1.7.7.3

2 2

[libvirt] [test-API 0/3] Destroy class for utils/check.py
by Osier Yang 18 Apr '12

18 Apr '12

Just as what we did for utils/utils.py, we don't benifit from the class use at all. Osier Yang (3): remove importing of unused check module Destroy class of utils/check.py Destroy use of check class repos/domain/balloon_memory.py | 3 +- repos/domain/dump.py | 4 +- repos/domain/install_linux_check.py | 15 +- repos/snapshot/file_flag.py | 7 +- repos/snapshot/flag_check.py | 3 +- utils/check.py | 649 +++++++++++++++++------------------ utils/xmlgenerator.py | 1 - 7 files changed, 335 insertions(+), 347 deletions(-) -- 1.7.7.3

2 6

[libvirt] [test-API] Improve the comments telling what the scripts does for utils/*.py
by Osier Yang 18 Apr '12

18 Apr '12

It's a habit to comment on the top of program to tell what the program does, and actually it's what GNU suggests: <quote> <one line to give the program's name and a brief idea of what it does.> Copyright (C) <year> <name of author> </quote> --- utils/XMLParser.py | 4 ++-- utils/check.py | 7 ++----- utils/env_parser.py | 6 ++---- utils/format.py | 6 ++---- utils/log.py | 6 ++---- utils/xmlbuilder.py | 6 ++---- utils/xmlgenerator.py | 6 ++---- 7 files changed, 14 insertions(+), 27 deletions(-) diff --git a/utils/XMLParser.py b/utils/XMLParser.py index b254023..4d7fc72 100644 --- a/utils/XMLParser.py +++ b/utils/XMLParser.py @@ -1,5 +1,7 @@ #!/usr/bin/env python # +# XMLParser.py: Parse XML document, the result is a python dict. + # Copyright (C) 2010-2012 Red Hat, Inc. # # libvirt-test-API is free software; you can redistribute it and/or @@ -17,8 +19,6 @@ # # Filename: XMLParser.py # Summary: parse and xml document into a python dictionary -# Description: The module is a tool to parses -# and xml document into a python dictionary import os from xml.dom import minidom diff --git a/utils/check.py b/utils/check.py index 1db49e7..7f35418 100644 --- a/utils/check.py +++ b/utils/check.py @@ -1,5 +1,7 @@ #!/usr/bin/env python # +# check.py: Check methods for cases. +# # Copyright (C) 2010-2012 Red Hat, Inc. # # libvirt-test-API is free software; you can redistribute it and/or @@ -14,11 +16,6 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# -# Filename: check.py -# Summary: basic check operation needed by test -# Description: The module is a tool to help conduct basic -# check operation on specified host import os import re diff --git a/utils/env_parser.py b/utils/env_parser.py index 6e49e50..e756a38 100644 --- a/utils/env_parser.py +++ b/utils/env_parser.py @@ -1,5 +1,7 @@ #!/usr/bin/env python # +# env_parser.py: Parser for environment config (env.cfg). +# # Copyright (C) 2010-2012 Red Hat, Inc. # # libvirt-test-API is free software; you can redistribute it and/or @@ -14,10 +16,6 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# -# Filename: env_parser.py -# Summary: parse the env configuration file -# Description: The module is a tool to parse the env configuration file import ConfigParser import os diff --git a/utils/format.py b/utils/format.py index b72c987..2a35664 100644 --- a/utils/format.py +++ b/utils/format.py @@ -1,5 +1,7 @@ #!/usr/bin/env python # +# format.py: Print logging message in specific format. +# # Copyright (C) 2010-2012 Red Hat, Inc. # # libvirt-test-API is free software; you can redistribute it and/or @@ -14,10 +16,6 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# -# Filename: format.py -# Summary: generate specified kind of format string -# Description: The module is a tool to generate specified kind of format string import os from string import Template diff --git a/utils/log.py b/utils/log.py index 3ca8729..4111fd9 100644 --- a/utils/log.py +++ b/utils/log.py @@ -1,5 +1,7 @@ #!/usr/bin/env python # +# log.py: Classes for logging. +# # Copyright (C) 2010-2012 Red Hat, Inc. # # libvirt-test-API is free software; you can redistribute it and/or @@ -14,10 +16,6 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# -# Filename: log.py -# Summary: log file operation -# Description: The module is a tool to provide basic log file operation import time import os diff --git a/utils/xmlbuilder.py b/utils/xmlbuilder.py index a8a9871..d2ce6bb 100644 --- a/utils/xmlbuilder.py +++ b/utils/xmlbuilder.py @@ -1,5 +1,7 @@ #!/usr/bin/env python # +# xmlbuilder.py: Class for building XML for libvirt objects. +# # Copyright (C) 2010-2012 Red Hat, Inc. # # libvirt-test-API is free software; you can redistribute it and/or @@ -14,10 +16,6 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# -# Filename: xmlbuilder.py -# Summary: operation for building domain xml -# Description: The module is to provide operation for building domain xml __DEBUG__ = False diff --git a/utils/xmlgenerator.py b/utils/xmlgenerator.py index 7f5839b..ee019b7 100644 --- a/utils/xmlgenerator.py +++ b/utils/xmlgenerator.py @@ -1,5 +1,7 @@ #!/usr/bin/env python # +# xmlgenerator.py: Generate XML for libvirt objects. +# # Copyright (C) 2010-2012 Red Hat, Inc. # # libvirt-test-API is free software; you can redistribute it and/or @@ -14,10 +16,6 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# -# Filename: xmlgenerator.py -# Summary: generate domain xml -# Description: The module is a tool to generate domain xml import os import sys -- 1.7.7.3

2 1

[libvirt] [PATCH 1/2] python: cleanup vcpu related binding APIs
by Guannan Ren 18 Apr '12

18 Apr '12

*libvirt_virDomainGetVcpus: add error handling, return -1 instead of None *libvirt_virDomainPinVcpu and libvirt_virDomainPinVcpuFlags: make use of libvirt_boolUnwrap set vcpus which are list in tuple pycpumap, trun off the rest in cpumap. The original way ignored the error info from PyTuple_GetItem if pos is out of bounds. "IndexError: tuple index out of range" The error message will only be raised on next command in interactive mode. --- python/libvirt-override.c | 173 +++++++++++++++++++++++++++++--------------- 1 files changed, 114 insertions(+), 59 deletions(-) diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 56f96ba..2788546 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -1333,9 +1333,11 @@ cleanup: static PyObject * libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED, - PyObject *args) { + PyObject *args) +{ virDomainPtr domain; PyObject *pyobj_domain, *pyretval = NULL, *pycpuinfo = NULL, *pycpumap = NULL; + PyObject *error = NULL; virNodeInfo nodeinfo; virDomainInfo dominfo; virVcpuInfoPtr cpuinfo = NULL; @@ -1352,29 +1354,33 @@ libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED, i_retval = virNodeGetInfo(virDomainGetConnect(domain), &nodeinfo); LIBVIRT_END_ALLOW_THREADS; if (i_retval < 0) - return VIR_PY_NONE; + return VIR_PY_INT_FAIL; LIBVIRT_BEGIN_ALLOW_THREADS; i_retval = virDomainGetInfo(domain, &dominfo); LIBVIRT_END_ALLOW_THREADS; if (i_retval < 0) - return VIR_PY_NONE; + return VIR_PY_INT_FAIL; if (VIR_ALLOC_N(cpuinfo, dominfo.nrVirtCpu) < 0) - return VIR_PY_NONE; + return PyErr_NoMemory(); cpumaplen = VIR_CPU_MAPLEN(VIR_NODEINFO_MAXCPUS(nodeinfo)); if (xalloc_oversized(dominfo.nrVirtCpu, cpumaplen) || - VIR_ALLOC_N(cpumap, dominfo.nrVirtCpu * cpumaplen) < 0) + VIR_ALLOC_N(cpumap, dominfo.nrVirtCpu * cpumaplen) < 0) { + error = PyErr_NoMemory(); goto cleanup; + } LIBVIRT_BEGIN_ALLOW_THREADS; i_retval = virDomainGetVcpus(domain, cpuinfo, dominfo.nrVirtCpu, cpumap, cpumaplen); LIBVIRT_END_ALLOW_THREADS; - if (i_retval < 0) + if (i_retval < 0) { + error = VIR_PY_INT_FAIL; goto cleanup; + } /* convert to a Python tuple of long objects */ if ((pyretval = PyTuple_New(2)) == NULL) @@ -1388,54 +1394,80 @@ libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED, PyObject *info = PyTuple_New(4); if (info == NULL) goto cleanup; - PyTuple_SetItem(info, 0, PyInt_FromLong((long)cpuinfo[i].number)); - PyTuple_SetItem(info, 1, PyInt_FromLong((long)cpuinfo[i].state)); - PyTuple_SetItem(info, 2, PyLong_FromLongLong((long long)cpuinfo[i].cpuTime)); - PyTuple_SetItem(info, 3, PyInt_FromLong((long)cpuinfo[i].cpu)); - PyList_SetItem(pycpuinfo, i, info); + if (PyTuple_SetItem(info, 0, PyInt_FromLong((long)cpuinfo[i].number)) < 0) + { + Py_DECREF(info); + goto cleanup; + } + + if (PyTuple_SetItem(info, 1, PyInt_FromLong((long)cpuinfo[i].state)) < 0) + { + Py_DECREF(info); + goto cleanup; + } + + if (PyTuple_SetItem(info, 2, PyLong_FromLongLong((long long)cpuinfo[i].cpuTime)) < 0) + { + Py_DECREF(info); + goto cleanup; + } + + if (PyTuple_SetItem(info, 3, PyInt_FromLong((long)cpuinfo[i].cpu)) < 0) + { + Py_DECREF(info); + goto cleanup; + } + if (PyList_SetItem(pycpuinfo, i, info) < 0) + goto cleanup; } + for (i = 0 ; i < dominfo.nrVirtCpu ; i++) { PyObject *info = PyTuple_New(VIR_NODEINFO_MAXCPUS(nodeinfo)); - int j; if (info == NULL) goto cleanup; + + int j; for (j = 0 ; j < VIR_NODEINFO_MAXCPUS(nodeinfo) ; j++) { - PyTuple_SetItem(info, j, PyBool_FromLong(VIR_CPU_USABLE(cpumap, cpumaplen, i, j))); + if (PyTuple_SetItem(info, j, PyBool_FromLong(VIR_CPU_USABLE(cpumap, cpumaplen, i, j))) < 0) + { + Py_DECREF(info); + goto cleanup; + } } - PyList_SetItem(pycpumap, i, info); + if (PyList_SetItem(pycpumap, i, info) < 0) + goto cleanup; } - PyTuple_SetItem(pyretval, 0, pycpuinfo); - PyTuple_SetItem(pyretval, 1, pycpumap); + + if (PyTuple_SetItem(pyretval, 0, pycpuinfo) < 0) + goto cleanup; + + if (PyTuple_SetItem(pyretval, 1, pycpumap) < 0) + goto cleanup; VIR_FREE(cpuinfo); VIR_FREE(cpumap); return pyretval; - cleanup: +cleanup: VIR_FREE(cpuinfo); VIR_FREE(cpumap); - /* NB, Py_DECREF is a badly defined macro, so we require - * braces here to avoid 'ambiguous else' warnings from - * the compiler. - * NB. this comment is true at of time of writing wrt to - * at least python2.5. - */ - if (pyretval) { Py_DECREF(pyretval); } - if (pycpuinfo) { Py_DECREF(pycpuinfo); } - if (pycpumap) { Py_DECREF(pycpumap); } - return VIR_PY_NONE; + Py_XDECREF(pyretval); + Py_XDECREF(pycpuinfo); + Py_XDECREF(pycpumap); + return error; } - static PyObject * libvirt_virDomainPinVcpu(PyObject *self ATTRIBUTE_UNUSED, - PyObject *args) { + PyObject *args) +{ virDomainPtr domain; - PyObject *pyobj_domain, *pycpumap, *truth; + PyObject *pyobj_domain, *pycpumap; + PyObject *ret = NULL; virNodeInfo nodeinfo; unsigned char *cpumap; - int cpumaplen, i, vcpu; + int cpumaplen, i, j, vcpu, tuple_size; int i_retval; if (!PyArg_ParseTuple(args, (char *)"OiO:virDomainPinVcpu", @@ -1451,37 +1483,50 @@ libvirt_virDomainPinVcpu(PyObject *self ATTRIBUTE_UNUSED, cpumaplen = VIR_CPU_MAPLEN(VIR_NODEINFO_MAXCPUS(nodeinfo)); if (VIR_ALLOC_N(cpumap, cpumaplen) < 0) - return VIR_PY_INT_FAIL; + return PyErr_NoMemory(); - truth = PyBool_FromLong(1); - for (i = 0 ; i < VIR_NODEINFO_MAXCPUS(nodeinfo) ; i++) { + tuple_size = PyTuple_Size(pycpumap); + if (tuple_size == -1) + goto cleanup; + + for (i = 0; i < tuple_size; i++) { PyObject *flag = PyTuple_GetItem(pycpumap, i); - if (flag == truth) - VIR_USE_CPU(cpumap, i); - else - VIR_UNUSE_CPU(cpumap, i); + bool b; + + if ((!flag) || (libvirt_boolUnwrap(flag, &b) < 0)) + goto cleanup; + + (b) ? VIR_USE_CPU(cpumap, i) : VIR_UNUSE_CPU(cpumap, i); } + for (j = 0; j < VIR_NODEINFO_MAXCPUS(nodeinfo) - i; j++) + VIR_UNUSE_CPU(cpumap, i + j); + LIBVIRT_BEGIN_ALLOW_THREADS; i_retval = virDomainPinVcpu(domain, vcpu, cpumap, cpumaplen); LIBVIRT_END_ALLOW_THREADS; - Py_DECREF(truth); - VIR_FREE(cpumap); - if (i_retval < 0) - return VIR_PY_INT_FAIL; + if (i_retval < 0) { + ret = VIR_PY_INT_FAIL; + goto cleanup; + } + ret = VIR_PY_INT_SUCCESS; - return VIR_PY_INT_SUCCESS; +cleanup: + VIR_FREE(cpumap); + return ret; } static PyObject * libvirt_virDomainPinVcpuFlags(PyObject *self ATTRIBUTE_UNUSED, - PyObject *args) { + PyObject *args) +{ virDomainPtr domain; - PyObject *pyobj_domain, *pycpumap, *truth; + PyObject *pyobj_domain, *pycpumap; + PyObject *ret = NULL; virNodeInfo nodeinfo; unsigned char *cpumap; - int cpumaplen, i, vcpu; + int cpumaplen, i, j, vcpu, tuple_size; unsigned int flags; int i_retval; @@ -1498,27 +1543,37 @@ libvirt_virDomainPinVcpuFlags(PyObject *self ATTRIBUTE_UNUSED, cpumaplen = VIR_CPU_MAPLEN(VIR_NODEINFO_MAXCPUS(nodeinfo)); if (VIR_ALLOC_N(cpumap, cpumaplen) < 0) - return VIR_PY_INT_FAIL; + return PyErr_NoMemory(); + + tuple_size = PyTuple_Size(pycpumap); + if (tuple_size == -1) + goto cleanup; - truth = PyBool_FromLong(1); - for (i = 0 ; i < VIR_NODEINFO_MAXCPUS(nodeinfo) ; i++) { + for (i = 0; i < tuple_size; i++) { PyObject *flag = PyTuple_GetItem(pycpumap, i); - if (flag == truth) - VIR_USE_CPU(cpumap, i); - else - VIR_UNUSE_CPU(cpumap, i); + bool b; + + if ((!flag) || (libvirt_boolUnwrap(flag, &b) < 0)) + goto cleanup; + + (b) ? VIR_USE_CPU(cpumap, i) : VIR_UNUSE_CPU(cpumap, i); } + for (j = 0; j < VIR_NODEINFO_MAXCPUS(nodeinfo) - i; j++) + VIR_UNUSE_CPU(cpumap, i + j); + LIBVIRT_BEGIN_ALLOW_THREADS; i_retval = virDomainPinVcpuFlags(domain, vcpu, cpumap, cpumaplen, flags); LIBVIRT_END_ALLOW_THREADS; - Py_DECREF(truth); - VIR_FREE(cpumap); - - if (i_retval < 0) - return VIR_PY_INT_FAIL; + if (i_retval < 0) { + ret = VIR_PY_INT_FAIL; + goto cleanup; + } + ret = VIR_PY_INT_SUCCESS; - return VIR_PY_INT_SUCCESS; +cleanup: + VIR_FREE(cpumap); + return ret; } static PyObject * -- 1.7.7.5

2 5

[libvirt] [test-API 0/3] Improve the copyright statements in scripts
by Osier Yang 18 Apr '12

18 Apr '12

The new copyright statements is: Copyright (C) 2010-2012 Red Hat, Inc. libvirt-test-API is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranties of TITLE, NON-INFRINGEMENT, MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Osier Yang (3): Remove the unseemly copyright statements in scripts Add the better copyright statements in scripts Remove the redundant empty comment line activityfilter.py | 23 ++++++++++++----------- casecfgcheck.py | 22 ++++++++++++---------- dist/redhat/env_inspect.py | 24 +++++++++++++----------- env_clear.py | 24 +++++++++++++----------- exception.py | 23 +++++++++++++---------- generator.py | 24 +++++++++++++----------- libvirt-test-api.py | 22 ++++++++++++---------- logxmlparser.py | 23 +++++++++++++---------- mapper.py | 24 +++++++++++++----------- parser.py | 24 +++++++++++++----------- process.py | 23 +++++++++++++---------- proxy.py | 25 ++++++++++++++----------- utils/XMLParser.py | 23 +++++++++++++---------- utils/check.py | 23 +++++++++++++---------- utils/env_parser.py | 23 +++++++++++++---------- utils/format.py | 23 +++++++++++++---------- utils/log.py | 23 +++++++++++++---------- utils/utils.py | 22 ++++++++++++---------- utils/xmlbuilder.py | 23 +++++++++++++---------- utils/xmlgenerator.py | 23 +++++++++++++---------- 20 files changed, 257 insertions(+), 207 deletions(-) Regards, Osier -- 1.7.7.3

3 19

[libvirt] [test-API] Add one space between shebang and following interpreter
by Osier Yang 18 Apr '12

18 Apr '12

We want it looks better. Isn't it? :-) --- activityfilter.py | 2 +- casecfgcheck.py | 2 +- dist/redhat/env_inspect.py | 2 +- env_clear.py | 2 +- exception.py | 2 +- generator.py | 2 +- libvirt-test-api.py | 2 +- logxmlparser.py | 2 +- mapper.py | 2 +- parser.py | 2 +- process.py | 2 +- proxy.py | 2 +- repos/domain/attach_disk.py | 2 +- repos/domain/attach_interface.py | 2 +- repos/domain/balloon_memory.py | 2 +- repos/domain/console_io.py | 2 +- repos/domain/console_mutex.py | 2 +- repos/domain/cpu_affinity.py | 2 +- repos/domain/cpu_topology.py | 2 +- repos/domain/create.py | 2 +- repos/domain/destroy.py | 2 +- repos/domain/detach_disk.py | 2 +- repos/domain/detach_interface.py | 2 +- repos/domain/domain_blkinfo.py | 2 +- repos/domain/domain_id.py | 2 +- repos/domain/domain_list.py | 2 +- repos/domain/domain_name.py | 2 +- repos/domain/domain_uuid.py | 2 +- repos/domain/domblkinfo.py | 2 +- repos/domain/dump.py | 2 +- repos/domain/eventhandler.py | 2 +- repos/domain/hostname.py | 2 +- repos/domain/install_image.py | 2 +- repos/domain/install_linux_cdrom.py | 2 +- repos/domain/install_linux_check.py | 2 +- repos/domain/install_windows_cdrom.py | 2 +- repos/domain/migrate.py | 2 +- repos/domain/ownership_test.py | 2 +- repos/domain/reboot.py | 2 +- repos/domain/restore.py | 2 +- repos/domain/resume.py | 2 +- repos/domain/save.py | 2 +- repos/domain/screenshot.py | 2 +- repos/domain/shutdown.py | 2 +- repos/domain/start.py | 2 +- repos/domain/suspend.py | 2 +- repos/domain/update_devflag.py | 2 +- repos/interface/create.py | 2 +- repos/interface/define.py | 2 +- repos/interface/destroy.py | 2 +- repos/interface/iface_list.py | 2 +- repos/interface/iface_mac.py | 2 +- repos/interface/iface_name.py | 2 +- repos/interface/undefine.py | 2 +- repos/libvirtd/qemu_hang.py | 2 +- repos/libvirtd/upstart.py | 2 +- repos/network/network_list.py | 2 +- repos/network/network_name.py | 2 +- repos/network/network_uuid.py | 2 +- repos/nodedevice/detach.py | 2 +- repos/nodedevice/reattach.py | 2 +- repos/nodedevice/reset.py | 2 +- repos/npiv/create_virtual_hba.py | 2 +- .../multiple_thread_block_on_domain_create.py | 2 +- repos/remoteAccess/tcp_setup.py | 2 +- repos/remoteAccess/tls_setup.py | 2 +- repos/remoteAccess/unix_perm_sasl.py | 2 +- repos/sVirt/domain_nfs_start.py | 2 +- repos/snapshot/delete.py | 2 +- repos/snapshot/file_flag.py | 2 +- repos/snapshot/flag_check.py | 2 +- repos/snapshot/internal_create.py | 2 +- repos/snapshot/revert.py | 2 +- repos/snapshot/snapshot_list.py | 2 +- repos/storage/activate_pool.py | 2 +- repos/storage/build_dir_pool.py | 2 +- repos/storage/build_disk_pool.py | 2 +- repos/storage/build_logical_pool.py | 2 +- repos/storage/build_netfs_pool.py | 2 +- repos/storage/create_dir_pool.py | 2 +- repos/storage/create_dir_volume.py | 2 +- repos/storage/create_fs_pool.py | 2 +- repos/storage/create_iscsi_pool.py | 2 +- repos/storage/create_logical_volume.py | 2 +- repos/storage/create_netfs_pool.py | 2 +- repos/storage/create_netfs_volume.py | 2 +- repos/storage/create_partition_volume.py | 2 +- repos/storage/define_dir_pool.py | 2 +- repos/storage/define_disk_pool.py | 2 +- repos/storage/define_iscsi_pool.py | 2 +- repos/storage/define_logical_pool.py | 2 +- repos/storage/define_mpath_pool.py | 2 +- repos/storage/define_netfs_pool.py | 2 +- repos/storage/define_scsi_pool.py | 2 +- repos/storage/delete_dir_volume.py | 2 +- repos/storage/delete_logical_pool.py | 2 +- repos/storage/delete_logical_volume.py | 2 +- repos/storage/delete_netfs_volume.py | 2 +- repos/storage/delete_partition_volume.py | 2 +- repos/storage/destroy_pool.py | 2 +- repos/storage/pool_name.py | 2 +- repos/storage/pool_uuid.py | 2 +- repos/storage/undefine_pool.py | 2 +- utils/XMLParser.py | 2 +- utils/check.py | 2 +- utils/dev_num.sh | 2 +- utils/disk_num.sh | 2 +- utils/env_parser.py | 2 +- utils/format.py | 2 +- utils/ipget.sh | 2 +- utils/ksiso.sh | 2 +- utils/log.py | 2 +- utils/stats.sh | 2 +- utils/utils.py | 2 +- utils/xmlbuilder.py | 2 +- utils/xmlgenerator.py | 2 +- 116 files changed, 116 insertions(+), 116 deletions(-) diff --git a/activityfilter.py b/activityfilter.py index 1326948..4c26fbd 100644 --- a/activityfilter.py +++ b/activityfilter.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # # Copyright (C) 2010-2012 Red Hat, Inc. # diff --git a/casecfgcheck.py b/casecfgcheck.py index 5e513e1..125b4c9 100644 --- a/casecfgcheck.py +++ b/casecfgcheck.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # # Copyright (C) 2010-2012 Red Hat, Inc. # diff --git a/dist/redhat/env_inspect.py b/dist/redhat/env_inspect.py index b9b8ed0..6ec13b0 100644 --- a/dist/redhat/env_inspect.py +++ b/dist/redhat/env_inspect.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # # Copyright (C) 2010-2012 Red Hat, Inc. # diff --git a/env_clear.py b/env_clear.py index ed862db..cdc4930 100644 --- a/env_clear.py +++ b/env_clear.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # # Copyright (C) 2010-2012 Red Hat, Inc. # diff --git a/exception.py b/exception.py index 3625dab..6a3062f 100644 --- a/exception.py +++ b/exception.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # # Copyright (C) 2010-2012 Red Hat, Inc. # diff --git a/generator.py b/generator.py index 53febde..ac41aca 100644 --- a/generator.py +++ b/generator.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # # Copyright (C) 2010-2012 Red Hat, Inc. # diff --git a/libvirt-test-api.py b/libvirt-test-api.py index b7b2b74..c2db19c 100644 --- a/libvirt-test-api.py +++ b/libvirt-test-api.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # # Copyright (C) 2010-2012 Red Hat, Inc. # diff --git a/logxmlparser.py b/logxmlparser.py index ed45594..8521079 100644 --- a/logxmlparser.py +++ b/logxmlparser.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # # Copyright (C) 2010-2012 Red Hat, Inc. # diff --git a/mapper.py b/mapper.py index f09e569..af02f95 100644 --- a/mapper.py +++ b/mapper.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # # Copyright (C) 2010-2012 Red Hat, Inc. # diff --git a/parser.py b/parser.py index b0bad3b..b82cc49 100644 --- a/parser.py +++ b/parser.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # # Copyright (C) 2010-2012 Red Hat, Inc. # diff --git a/process.py b/process.py index 0edc9ae..34a7948 100644 --- a/process.py +++ b/process.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # # Copyright (C) 2010-2012 Red Hat, Inc. # diff --git a/proxy.py b/proxy.py index 7e81319..17ed180 100644 --- a/proxy.py +++ b/proxy.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # # Copyright (C) 2010-2012 Red Hat, Inc. # diff --git a/repos/domain/attach_disk.py b/repos/domain/attach_disk.py index 9d8426d..d920233 100644 --- a/repos/domain/attach_disk.py +++ b/repos/domain/attach_disk.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Attach a disk device to domain import os diff --git a/repos/domain/attach_interface.py b/repos/domain/attach_interface.py index 1d0cb3c..0e91939 100644 --- a/repos/domain/attach_interface.py +++ b/repos/domain/attach_interface.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Attach interface to domain import os diff --git a/repos/domain/balloon_memory.py b/repos/domain/balloon_memory.py index de18b87..48dbaa6 100644 --- a/repos/domain/balloon_memory.py +++ b/repos/domain/balloon_memory.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test domain memory ballooning import os diff --git a/repos/domain/console_io.py b/repos/domain/console_io.py index c44f5b4..0479532 100644 --- a/repos/domain/console_io.py +++ b/repos/domain/console_io.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # test console interactions # This test sends contents of file 'input' to the guest's console # and reads from the console the reply and compares it to 'expect' or diff --git a/repos/domain/console_mutex.py b/repos/domain/console_mutex.py index c67aec6..3bb50f5 100644 --- a/repos/domain/console_mutex.py +++ b/repos/domain/console_mutex.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test console mutual exclusivity import libvirt diff --git a/repos/domain/cpu_affinity.py b/repos/domain/cpu_affinity.py index 1332c7e..3e335af 100644 --- a/repos/domain/cpu_affinity.py +++ b/repos/domain/cpu_affinity.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test domain CPU affinity import os diff --git a/repos/domain/cpu_topology.py b/repos/domain/cpu_topology.py index af41f62..1862144 100644 --- a/repos/domain/cpu_topology.py +++ b/repos/domain/cpu_topology.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test domain cpu topology import os diff --git a/repos/domain/create.py b/repos/domain/create.py index 7b6a294..5129fec 100644 --- a/repos/domain/create.py +++ b/repos/domain/create.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Create domain from xml import os diff --git a/repos/domain/destroy.py b/repos/domain/destroy.py index c41f0f8..56eef95 100644 --- a/repos/domain/destroy.py +++ b/repos/domain/destroy.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import sys diff --git a/repos/domain/detach_disk.py b/repos/domain/detach_disk.py index 1b0b7f9..fa07171 100644 --- a/repos/domain/detach_disk.py +++ b/repos/domain/detach_disk.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Detach a disk from domain import os diff --git a/repos/domain/detach_interface.py b/repos/domain/detach_interface.py index 050c019..369c0f5 100644 --- a/repos/domain/detach_interface.py +++ b/repos/domain/detach_interface.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Detach interface from domain import os diff --git a/repos/domain/domain_blkinfo.py b/repos/domain/domain_blkinfo.py index aa52668..4302ad4 100644 --- a/repos/domain/domain_blkinfo.py +++ b/repos/domain/domain_blkinfo.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test "virsh domblkinfo" command import os diff --git a/repos/domain/domain_id.py b/repos/domain/domain_id.py index 844ce82..ce4aad7 100644 --- a/repos/domain/domain_id.py +++ b/repos/domain/domain_id.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test "virsh domid" command import os diff --git a/repos/domain/domain_list.py b/repos/domain/domain_list.py index 0250723..6b30150 100644 --- a/repos/domain/domain_list.py +++ b/repos/domain/domain_list.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test "virsh list" command import os diff --git a/repos/domain/domain_name.py b/repos/domain/domain_name.py index b9a8e43..0ec47fa 100644 --- a/repos/domain/domain_name.py +++ b/repos/domain/domain_name.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test "virsh domname" command import os diff --git a/repos/domain/domain_uuid.py b/repos/domain/domain_uuid.py index e66c3ee..7ba0c29 100644 --- a/repos/domain/domain_uuid.py +++ b/repos/domain/domain_uuid.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test "virsh domuuid" command import os diff --git a/repos/domain/domblkinfo.py b/repos/domain/domblkinfo.py index c543e41..b8a8cb0 100644 --- a/repos/domain/domblkinfo.py +++ b/repos/domain/domblkinfo.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test "virsh domblkinfo" command import os diff --git a/repos/domain/dump.py b/repos/domain/dump.py index 01bdc93..9e49592 100644 --- a/repos/domain/dump.py +++ b/repos/domain/dump.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test core dump of a domain import os diff --git a/repos/domain/eventhandler.py b/repos/domain/eventhandler.py index 4eec6e9..047c2ca 100644 --- a/repos/domain/eventhandler.py +++ b/repos/domain/eventhandler.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test domain events import os diff --git a/repos/domain/hostname.py b/repos/domain/hostname.py index ac809aa..ef250ee 100644 --- a/repos/domain/hostname.py +++ b/repos/domain/hostname.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test "virsh hostname" command import os diff --git a/repos/domain/install_image.py b/repos/domain/install_image.py index 32cc7af..70b89c4 100644 --- a/repos/domain/install_image.py +++ b/repos/domain/install_image.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import sys diff --git a/repos/domain/install_linux_cdrom.py b/repos/domain/install_linux_cdrom.py index 07a8307..e3dccc6 100644 --- a/repos/domain/install_linux_cdrom.py +++ b/repos/domain/install_linux_cdrom.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Install a linux domain from CDROM import os diff --git a/repos/domain/install_linux_check.py b/repos/domain/install_linux_check.py index 351bba5..133e24c 100644 --- a/repos/domain/install_linux_check.py +++ b/repos/domain/install_linux_check.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Checking method for linux domain installation. import os diff --git a/repos/domain/install_windows_cdrom.py b/repos/domain/install_windows_cdrom.py index aaff47d..8f49672 100644 --- a/repos/domain/install_windows_cdrom.py +++ b/repos/domain/install_windows_cdrom.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Install a Windows domain import os diff --git a/repos/domain/migrate.py b/repos/domain/migrate.py index 4c319e4..8b2ebda 100644 --- a/repos/domain/migrate.py +++ b/repos/domain/migrate.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import re diff --git a/repos/domain/ownership_test.py b/repos/domain/ownership_test.py index ed7c992..9522131 100644 --- a/repos/domain/ownership_test.py +++ b/repos/domain/ownership_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Set the dynamic_ownership in /etc/libvirt/qemu.conf, # check the ownership of saved domain file. Test could # be on local or root_squash nfs. The default owner of diff --git a/repos/domain/reboot.py b/repos/domain/reboot.py index a2bd75a..eecd66a 100644 --- a/repos/domain/reboot.py +++ b/repos/domain/reboot.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import sys diff --git a/repos/domain/restore.py b/repos/domain/restore.py index ab0900f..3589b45 100644 --- a/repos/domain/restore.py +++ b/repos/domain/restore.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Restore domain from a saved statefile import os diff --git a/repos/domain/resume.py b/repos/domain/resume.py index 85237f7..1a2c2c9 100644 --- a/repos/domain/resume.py +++ b/repos/domain/resume.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import sys diff --git a/repos/domain/save.py b/repos/domain/save.py index 37f1b97..9c81ad0 100644 --- a/repos/domain/save.py +++ b/repos/domain/save.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Save domain as a statefile import os diff --git a/repos/domain/screenshot.py b/repos/domain/screenshot.py index eb5d0e2..085261e 100644 --- a/repos/domain/screenshot.py +++ b/repos/domain/screenshot.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test domain screenshot, the screenshot format is # hypervisor specific. diff --git a/repos/domain/shutdown.py b/repos/domain/shutdown.py index 3b97abc..8b7dae6 100644 --- a/repos/domain/shutdown.py +++ b/repos/domain/shutdown.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import sys diff --git a/repos/domain/start.py b/repos/domain/start.py index f319c2e..521087b 100644 --- a/repos/domain/start.py +++ b/repos/domain/start.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import sys diff --git a/repos/domain/suspend.py b/repos/domain/suspend.py index 1941b1c..1d68330 100644 --- a/repos/domain/suspend.py +++ b/repos/domain/suspend.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import sys import re diff --git a/repos/domain/update_devflag.py b/repos/domain/update_devflag.py index 40961f4..83d400f 100644 --- a/repos/domain/update_devflag.py +++ b/repos/domain/update_devflag.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test domain device updating import os diff --git a/repos/interface/create.py b/repos/interface/create.py index b1cfe5e..15f7bf7 100644 --- a/repos/interface/create.py +++ b/repos/interface/create.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import re diff --git a/repos/interface/define.py b/repos/interface/define.py index 5d63989..be459ec 100644 --- a/repos/interface/define.py +++ b/repos/interface/define.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import re diff --git a/repos/interface/destroy.py b/repos/interface/destroy.py index 20ae0f1..f1c16c7 100644 --- a/repos/interface/destroy.py +++ b/repos/interface/destroy.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import re diff --git a/repos/interface/iface_list.py b/repos/interface/iface_list.py index c6bd365..973d93f 100644 --- a/repos/interface/iface_list.py +++ b/repos/interface/iface_list.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import sys diff --git a/repos/interface/iface_mac.py b/repos/interface/iface_mac.py index ce1828e..212bd14 100644 --- a/repos/interface/iface_mac.py +++ b/repos/interface/iface_mac.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import sys diff --git a/repos/interface/iface_name.py b/repos/interface/iface_name.py index e95db28..b83d19e 100644 --- a/repos/interface/iface_name.py +++ b/repos/interface/iface_name.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import sys diff --git a/repos/interface/undefine.py b/repos/interface/undefine.py index b123472..8cb4917 100644 --- a/repos/interface/undefine.py +++ b/repos/interface/undefine.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import re diff --git a/repos/libvirtd/qemu_hang.py b/repos/libvirtd/qemu_hang.py index b2d694b..1f99612 100644 --- a/repos/libvirtd/qemu_hang.py +++ b/repos/libvirtd/qemu_hang.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # QEMU get hang should not cause libvirtd hang or dead. This # test stop a qemu process and check whether libvird get hang. # For doing this test, a running domain is required. diff --git a/repos/libvirtd/upstart.py b/repos/libvirtd/upstart.py index 6cb31a4..3a9b550 100644 --- a/repos/libvirtd/upstart.py +++ b/repos/libvirtd/upstart.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Upstart libvirtd testing import os diff --git a/repos/network/network_list.py b/repos/network/network_list.py index 672ad79..0b3d9d2 100644 --- a/repos/network/network_list.py +++ b/repos/network/network_list.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test "virsh net-list" command import os diff --git a/repos/network/network_name.py b/repos/network/network_name.py index 8518de2..1daa957 100644 --- a/repos/network/network_name.py +++ b/repos/network/network_name.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test "virsh net-name" command import os diff --git a/repos/network/network_uuid.py b/repos/network/network_uuid.py index 4983056..8466403 100644 --- a/repos/network/network_uuid.py +++ b/repos/network/network_uuid.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test "virsh net-uuid" command import os diff --git a/repos/nodedevice/detach.py b/repos/nodedevice/detach.py index b94db5d..648b837 100644 --- a/repos/nodedevice/detach.py +++ b/repos/nodedevice/detach.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Detach a node device from host import os diff --git a/repos/nodedevice/reattach.py b/repos/nodedevice/reattach.py index adaf6c4..0e2eadf 100644 --- a/repos/nodedevice/reattach.py +++ b/repos/nodedevice/reattach.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Re-attach a node device to host import os diff --git a/repos/nodedevice/reset.py b/repos/nodedevice/reset.py index 11cfa63..f6f943a 100644 --- a/repos/nodedevice/reset.py +++ b/repos/nodedevice/reset.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Reset a node device import os diff --git a/repos/npiv/create_virtual_hba.py b/repos/npiv/create_virtual_hba.py index b21fcd0..36e0cd3 100644 --- a/repos/npiv/create_virtual_hba.py +++ b/repos/npiv/create_virtual_hba.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test vHBA creating with npiv. import os diff --git a/repos/regression/multiple_thread_block_on_domain_create.py b/repos/regression/multiple_thread_block_on_domain_create.py index 38030c2..5980b76 100644 --- a/repos/regression/multiple_thread_block_on_domain_create.py +++ b/repos/regression/multiple_thread_block_on_domain_create.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test RHBZ 672226 import os diff --git a/repos/remoteAccess/tcp_setup.py b/repos/remoteAccess/tcp_setup.py index a9d02cb..1b555f8 100644 --- a/repos/remoteAccess/tcp_setup.py +++ b/repos/remoteAccess/tcp_setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test connection via tcp protocol import os diff --git a/repos/remoteAccess/tls_setup.py b/repos/remoteAccess/tls_setup.py index 4661e03..fb5d4fc 100644 --- a/repos/remoteAccess/tls_setup.py +++ b/repos/remoteAccess/tls_setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import re diff --git a/repos/remoteAccess/unix_perm_sasl.py b/repos/remoteAccess/unix_perm_sasl.py index d5cd914..4ddb892 100644 --- a/repos/remoteAccess/unix_perm_sasl.py +++ b/repos/remoteAccess/unix_perm_sasl.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import re diff --git a/repos/sVirt/domain_nfs_start.py b/repos/sVirt/domain_nfs_start.py index e124800..d5a16cf 100644 --- a/repos/sVirt/domain_nfs_start.py +++ b/repos/sVirt/domain_nfs_start.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # This test is for start a guest with img file on nfs storage. # Under SElinux boolean virt_use_nfs on or off, combine with # setting the dynamic_ownership in /etc/libvirt/qemu.conf, diff --git a/repos/snapshot/delete.py b/repos/snapshot/delete.py index c018cdb..1dcab77 100644 --- a/repos/snapshot/delete.py +++ b/repos/snapshot/delete.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import sys diff --git a/repos/snapshot/file_flag.py b/repos/snapshot/file_flag.py index f2257f6..b2b3b5d 100644 --- a/repos/snapshot/file_flag.py +++ b/repos/snapshot/file_flag.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Create a flag file in the guest OS import os diff --git a/repos/snapshot/flag_check.py b/repos/snapshot/flag_check.py index 218d7e4..19a01cd 100644 --- a/repos/snapshot/flag_check.py +++ b/repos/snapshot/flag_check.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import sys diff --git a/repos/snapshot/internal_create.py b/repos/snapshot/internal_create.py index 20f9bbb..910e7af 100644 --- a/repos/snapshot/internal_create.py +++ b/repos/snapshot/internal_create.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import sys diff --git a/repos/snapshot/revert.py b/repos/snapshot/revert.py index d1820bf..6e6241e 100644 --- a/repos/snapshot/revert.py +++ b/repos/snapshot/revert.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import sys diff --git a/repos/snapshot/snapshot_list.py b/repos/snapshot/snapshot_list.py index cbd68a8..5bcb6cd 100644 --- a/repos/snapshot/snapshot_list.py +++ b/repos/snapshot/snapshot_list.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import sys diff --git a/repos/storage/activate_pool.py b/repos/storage/activate_pool.py index 1aa1f0d..c093f66 100644 --- a/repos/storage/activate_pool.py +++ b/repos/storage/activate_pool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import re diff --git a/repos/storage/build_dir_pool.py b/repos/storage/build_dir_pool.py index 79ae026..5a4d3e0 100644 --- a/repos/storage/build_dir_pool.py +++ b/repos/storage/build_dir_pool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Build a storage pool of 'dir' type import os diff --git a/repos/storage/build_disk_pool.py b/repos/storage/build_disk_pool.py index 49ee856..c7f8c27 100644 --- a/repos/storage/build_disk_pool.py +++ b/repos/storage/build_disk_pool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import re diff --git a/repos/storage/build_logical_pool.py b/repos/storage/build_logical_pool.py index c372db7..1068c7e 100644 --- a/repos/storage/build_logical_pool.py +++ b/repos/storage/build_logical_pool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import re diff --git a/repos/storage/build_netfs_pool.py b/repos/storage/build_netfs_pool.py index f0e06ca..9889919 100644 --- a/repos/storage/build_netfs_pool.py +++ b/repos/storage/build_netfs_pool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import re diff --git a/repos/storage/create_dir_pool.py b/repos/storage/create_dir_pool.py index f255a6e..f2a8800 100644 --- a/repos/storage/create_dir_pool.py +++ b/repos/storage/create_dir_pool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Create a storage pool of 'dir' type import os diff --git a/repos/storage/create_dir_volume.py b/repos/storage/create_dir_volume.py index 7084d20..f340207 100644 --- a/repos/storage/create_dir_volume.py +++ b/repos/storage/create_dir_volume.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Creat volume for storage pool of 'dir' type import os diff --git a/repos/storage/create_fs_pool.py b/repos/storage/create_fs_pool.py index e338428..be53a01 100644 --- a/repos/storage/create_fs_pool.py +++ b/repos/storage/create_fs_pool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Create a storage pool of 'fs' type. import os diff --git a/repos/storage/create_iscsi_pool.py b/repos/storage/create_iscsi_pool.py index 889d2de..a7d92fd 100644 --- a/repos/storage/create_iscsi_pool.py +++ b/repos/storage/create_iscsi_pool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import re diff --git a/repos/storage/create_logical_volume.py b/repos/storage/create_logical_volume.py index 8c20eb8..29b2a7d 100644 --- a/repos/storage/create_logical_volume.py +++ b/repos/storage/create_logical_volume.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Create a logical type storage volume import os diff --git a/repos/storage/create_netfs_pool.py b/repos/storage/create_netfs_pool.py index e37468c..fe25bc4 100644 --- a/repos/storage/create_netfs_pool.py +++ b/repos/storage/create_netfs_pool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Create a netfs storage pool import os diff --git a/repos/storage/create_netfs_volume.py b/repos/storage/create_netfs_volume.py index 374eba6..8e35f8d 100644 --- a/repos/storage/create_netfs_volume.py +++ b/repos/storage/create_netfs_volume.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Creat volume for storage pool of 'netfs' type import os diff --git a/repos/storage/create_partition_volume.py b/repos/storage/create_partition_volume.py index 02b91b6..91497b9 100644 --- a/repos/storage/create_partition_volume.py +++ b/repos/storage/create_partition_volume.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Create volume for storage pool of partition type import os diff --git a/repos/storage/define_dir_pool.py b/repos/storage/define_dir_pool.py index c48e8e4..8d4fc61 100644 --- a/repos/storage/define_dir_pool.py +++ b/repos/storage/define_dir_pool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Define storage pool of 'dir' type import os diff --git a/repos/storage/define_disk_pool.py b/repos/storage/define_disk_pool.py index dcf7219..1e33c27 100644 --- a/repos/storage/define_disk_pool.py +++ b/repos/storage/define_disk_pool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Define a storage pool of 'disk' type import os diff --git a/repos/storage/define_iscsi_pool.py b/repos/storage/define_iscsi_pool.py index df61a24..f1930a1 100644 --- a/repos/storage/define_iscsi_pool.py +++ b/repos/storage/define_iscsi_pool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Define a storage pool of 'iscsi' type import os diff --git a/repos/storage/define_logical_pool.py b/repos/storage/define_logical_pool.py index 6c06a43..2398127 100644 --- a/repos/storage/define_logical_pool.py +++ b/repos/storage/define_logical_pool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Define a storage pool of 'logical' type import os diff --git a/repos/storage/define_mpath_pool.py b/repos/storage/define_mpath_pool.py index 5bb972c..37b15d1 100644 --- a/repos/storage/define_mpath_pool.py +++ b/repos/storage/define_mpath_pool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import re diff --git a/repos/storage/define_netfs_pool.py b/repos/storage/define_netfs_pool.py index c522970..bc25c4c 100644 --- a/repos/storage/define_netfs_pool.py +++ b/repos/storage/define_netfs_pool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test netfs type storage pool defining import os diff --git a/repos/storage/define_scsi_pool.py b/repos/storage/define_scsi_pool.py index b163df8..2d8cdf4 100644 --- a/repos/storage/define_scsi_pool.py +++ b/repos/storage/define_scsi_pool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Define a storage pool of 'iscsi' type import os diff --git a/repos/storage/delete_dir_volume.py b/repos/storage/delete_dir_volume.py index 3a21d20..8e21f0e 100644 --- a/repos/storage/delete_dir_volume.py +++ b/repos/storage/delete_dir_volume.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Delete volume from storage pool of 'dir' type import os diff --git a/repos/storage/delete_logical_pool.py b/repos/storage/delete_logical_pool.py index f2904e6..4851e64 100644 --- a/repos/storage/delete_logical_pool.py +++ b/repos/storage/delete_logical_pool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Delete a storage pool of 'logical' type import os diff --git a/repos/storage/delete_logical_volume.py b/repos/storage/delete_logical_volume.py index 1650a85..639b113 100644 --- a/repos/storage/delete_logical_volume.py +++ b/repos/storage/delete_logical_volume.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Delete a logical type storage volume import os diff --git a/repos/storage/delete_netfs_volume.py b/repos/storage/delete_netfs_volume.py index b03889b..085cc51 100644 --- a/repos/storage/delete_netfs_volume.py +++ b/repos/storage/delete_netfs_volume.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Delete a volume from netfs type storage pool import os diff --git a/repos/storage/delete_partition_volume.py b/repos/storage/delete_partition_volume.py index 8a61a1d..b177743 100644 --- a/repos/storage/delete_partition_volume.py +++ b/repos/storage/delete_partition_volume.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import re diff --git a/repos/storage/destroy_pool.py b/repos/storage/destroy_pool.py index 01547a4..ebb8994 100644 --- a/repos/storage/destroy_pool.py +++ b/repos/storage/destroy_pool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import re diff --git a/repos/storage/pool_name.py b/repos/storage/pool_name.py index ce14da5..eed2111 100644 --- a/repos/storage/pool_name.py +++ b/repos/storage/pool_name.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import sys diff --git a/repos/storage/pool_uuid.py b/repos/storage/pool_uuid.py index 7fa03b9..6512a08 100644 --- a/repos/storage/pool_uuid.py +++ b/repos/storage/pool_uuid.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import sys diff --git a/repos/storage/undefine_pool.py b/repos/storage/undefine_pool.py index 8fe26c4..5fef225 100644 --- a/repos/storage/undefine_pool.py +++ b/repos/storage/undefine_pool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import re diff --git a/utils/XMLParser.py b/utils/XMLParser.py index 4d7fc72..6405656 100644 --- a/utils/XMLParser.py +++ b/utils/XMLParser.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # # XMLParser.py: Parse XML document, the result is a python dict. diff --git a/utils/check.py b/utils/check.py index 7f35418..5048587 100644 --- a/utils/check.py +++ b/utils/check.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # # check.py: Check methods for cases. # diff --git a/utils/dev_num.sh b/utils/dev_num.sh index 9f50398..bfe143f 100755 --- a/utils/dev_num.sh +++ b/utils/dev_num.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#! /bin/sh # counting disk and interface numbers guestname=$1 diff --git a/utils/disk_num.sh b/utils/disk_num.sh index 97a6248..43c09bc 100755 --- a/utils/disk_num.sh +++ b/utils/disk_num.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#! /bin/sh guestname=$1 if [[ -z $guestname ]]; then diff --git a/utils/env_parser.py b/utils/env_parser.py index e756a38..e59f283 100644 --- a/utils/env_parser.py +++ b/utils/env_parser.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # # env_parser.py: Parser for environment config (env.cfg). # diff --git a/utils/format.py b/utils/format.py index 2a35664..fab79d4 100644 --- a/utils/format.py +++ b/utils/format.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # # format.py: Print logging message in specific format. # diff --git a/utils/ipget.sh b/utils/ipget.sh index 8d44b14..677dd0b 100755 --- a/utils/ipget.sh +++ b/utils/ipget.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#! /bin/sh mac=$1 if [[ -z $mac ]]; then diff --git a/utils/ksiso.sh b/utils/ksiso.sh index b7f9fb8..606281c 100755 --- a/utils/ksiso.sh +++ b/utils/ksiso.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#! /bin/bash # - simple support to add kernel args diff --git a/utils/log.py b/utils/log.py index 4111fd9..58156d3 100644 --- a/utils/log.py +++ b/utils/log.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # # log.py: Classes for logging. # diff --git a/utils/stats.sh b/utils/stats.sh index 565dbac..cf2765b 100755 --- a/utils/stats.sh +++ b/utils/stats.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#! /bin/bash if [ ! -d $(pwd)/coverage ]; then mkdir -p $(pwd)/coverage diff --git a/utils/utils.py b/utils/utils.py index 124c986..b9c6878 100644 --- a/utils/utils.py +++ b/utils/utils.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # # Copyright (C) 2010-2012 Red Hat, Inc. # diff --git a/utils/xmlbuilder.py b/utils/xmlbuilder.py index d2ce6bb..d3854d1 100644 --- a/utils/xmlbuilder.py +++ b/utils/xmlbuilder.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # # xmlbuilder.py: Class for building XML for libvirt objects. # diff --git a/utils/xmlgenerator.py b/utils/xmlgenerator.py index ee019b7..167d61a 100644 --- a/utils/xmlgenerator.py +++ b/utils/xmlgenerator.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # # xmlgenerator.py: Generate XML for libvirt objects. # -- 1.7.7.3

3 4

[libvirt] [PATCH 0/9] Add basic driver for Parallels Virtuozzo Server
by Dmitry Guryanov 18 Apr '12

18 Apr '12

Parallels Virtuozzo Server is a cloud-ready virtualization solution that allows users to simultaneously run multiple virtual machines and containers on the same physical server. Current name of this product is Parallels Server Bare Metal and more information about it can be found here - http://www.parallels.com/products/server/baremetal/sp/. This driver will work with PVS version 6.0 , beta version scheduled at 2012 Q2. Dmitry Guryanov (9): pvs: add driver skeleton util: add functions for interating over json object pvs: add functions to list domains and get info pvs: implement functions for domain life cycle management pvs: get info about serial ports pvs: add support of VNC remote display pvs: implement virDomainDefineXML operation for existing domains pvs: add storage driver pvs: implement VM creation cfg.mk | 1 + configure.ac | 20 + docs/drvpvs.html.in | 28 + include/libvirt/virterror.h | 1 + libvirt.spec.in | 7 + mingw32-libvirt.spec.in | 6 + po/POTFILES.in | 1 + src/Makefile.am | 23 + src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/driver.h | 1 + src/libvirt.c | 12 + src/pvs/pvs_driver.c | 1259 +++++++++++++++++++++++++++++++++++++ src/pvs/pvs_driver.h | 76 +++ src/pvs/pvs_storage.c | 1460 +++++++++++++++++++++++++++++++++++++++++++ src/pvs/pvs_utils.c | 139 ++++ src/util/json.c | 30 + src/util/json.h | 4 + src/util/virterror.c | 3 + 19 files changed, 3074 insertions(+), 1 deletions(-) create mode 100644 docs/drvpvs.html.in create mode 100644 src/pvs/pvs_driver.c create mode 100644 src/pvs/pvs_driver.h create mode 100644 src/pvs/pvs_storage.c create mode 100644 src/pvs/pvs_utils.c

2 12

[libvirt] [PATCH] Fix a memory leak
by Stefan Berger 17 Apr '12

17 Apr '12

The below patch fixes the following memory leak. ==20624== 24 bytes in 2 blocks are definitely lost in loss record 532 of 1,867 ==20624== at 0x4A05E46: malloc (vg_replace_malloc.c:195) ==20624== by 0x38EC27FC01: strdup (strdup.c:43) ==20624== by 0x4EB6BA3: virDomainChrSourceDefCopy (domain_conf.c:1122) ==20624== by 0x495D76: qemuProcessFindCharDevicePTYs (qemu_process.c:1497) ==20624== by 0x498321: qemuProcessWaitForMonitor (qemu_process.c:1258) ==20624== by 0x49B5F9: qemuProcessStart (qemu_process.c:3652) ==20624== by 0x468B5C: qemuDomainObjStart (qemu_driver.c:4753) ==20624== by 0x469171: qemuDomainStartWithFlags (qemu_driver.c:4810) ==20624== by 0x4F21735: virDomainCreate (libvirt.c:8153) ==20624== by 0x4302BF: remoteDispatchDomainCreateHelper (remote_dispatch.h:852) ==20624== by 0x4F72C14: virNetServerProgramDispatch (virnetserverprogram.c:416) ==20624== by 0x4F6D690: virNetServerHandleJob (virnetserver.c:164) ==20624== by 0x4E8F43D: virThreadPoolWorker (threadpool.c:144) ==20624== by 0x4E8EAB5: virThreadHelper (threads-pthread.c:161) ==20624== by 0x38EC606CCA: start_thread (pthread_create.c:301) ==20624== by 0x38EC2E0C2C: clone (clone.S:115) --- I am wondering whether 'something' did not work properly before due to the missing assignment below? --- src/conf/domain_conf.c | 2 ++ 1 file changed, 2 insertions(+) Index: libvirt-acl/src/conf/domain_conf.c =================================================================== --- libvirt-acl.orig/src/conf/domain_conf.c +++ libvirt-acl/src/conf/domain_conf.c @@ -1174,6 +1174,8 @@ virDomainChrSourceDefCopy(virDomainChrSo break; } + dest->type = src->type; + return 0; }

2 2

[libvirt] [libvirt-glib 1/2] Parse GVirConfigDomainController nodes
by Christophe Fergeau 17 Apr '12

17 Apr '12

Update gvir_config_domain_device_new_from_tree to handle GVirConfigDomainController nodes --- .../libvirt-gconfig-domain-controller.c | 37 ++++++++++++++++++++ .../libvirt-gconfig-domain-device-private.h | 3 ++ libvirt-gconfig/libvirt-gconfig-domain-device.c | 2 +- 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-controller.c b/libvirt-gconfig/libvirt-gconfig-domain-controller.c index 813c934..2024b54 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-controller.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-controller.c @@ -49,6 +49,43 @@ static void gvir_config_domain_controller_init(GVirConfigDomainController *contr controller->priv = GVIR_CONFIG_DOMAIN_CONTROLLER_GET_PRIVATE(controller); } +G_GNUC_INTERNAL GVirConfigDomainDevice * +gvir_config_domain_controller_new_from_tree(GVirConfigXmlDoc *doc, + xmlNodePtr tree) +{ + const char *type; + GType gtype; + + type = gvir_config_xml_get_attribute_content(tree, "type"); + if (type == NULL) + return NULL; + + if (g_str_equal(type, "ide")) { + goto unimplemented; + } else if (g_str_equal(type, "fdc")) { + goto unimplemented; + } else if (g_str_equal(type, "scsi")) { + goto unimplemented; + } else if (g_str_equal(type, "sata")) { + goto unimplemented; + } else if (g_str_equal(type, "usb")) { + gtype = GVIR_CONFIG_TYPE_DOMAIN_CONTROLLER_USB;; + } else if (g_str_equal(type, "ccid")) { + goto unimplemented; + } else if (g_str_equal(type, "virtio-serial")) { + goto unimplemented; + } else { + g_debug("Unknown domain controller node: %s", type); + return NULL; + } + + return GVIR_CONFIG_DOMAIN_DEVICE(gvir_config_object_new_from_tree(gtype, doc, NULL, tree)); + +unimplemented: + g_debug("Parsing of '%s' domain controller nodes is unimplemented", type); + return NULL; +} + void gvir_config_domain_controller_set_index(GVirConfigDomainController *controller, guint index) { diff --git a/libvirt-gconfig/libvirt-gconfig-domain-device-private.h b/libvirt-gconfig/libvirt-gconfig-domain-device-private.h index 7ba7bc6..f50946a 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-device-private.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-device-private.h @@ -31,6 +31,9 @@ GVirConfigDomainDevice * gvir_config_domain_device_new_from_tree(GVirConfigXmlDoc *doc, xmlNodePtr tree); GVirConfigDomainDevice * +gvir_config_domain_controller_new_from_tree(GVirConfigXmlDoc *doc, + xmlNodePtr tree); +GVirConfigDomainDevice * gvir_config_domain_disk_new_from_tree(GVirConfigXmlDoc *doc, xmlNodePtr tree); GVirConfigDomainDevice * diff --git a/libvirt-gconfig/libvirt-gconfig-domain-device.c b/libvirt-gconfig/libvirt-gconfig-domain-device.c index 82e57e9..2f76c8b 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-device.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-device.c @@ -64,7 +64,7 @@ gvir_config_domain_device_new_from_tree(GVirConfigXmlDoc *doc, } else if (xmlStrEqual(tree->name, (xmlChar*)"filesystem")) { type = GVIR_CONFIG_TYPE_DOMAIN_FILESYS; } else if (xmlStrEqual(tree->name, (xmlChar*)"controller")) { - goto unimplemented; + return gvir_config_domain_controller_new_from_tree(doc, tree); } else if (xmlStrEqual(tree->name, (xmlChar*)"lease")) { goto unimplemented; } else if (xmlStrEqual(tree->name, (xmlChar*)"hostdev")) { -- 1.7.10

2 3

[libvirt] [PATCH v2] docs: Improve the schema for fs device
by Osier Yang 17 Apr '12

17 Apr '12

<filesystemtgt> is redundant, as every group uses it; <address> shouldn't be in <filesystemtgt> in case of the meaning could be "filesystemtarget"; The elements <address>, <alias>, <target>, ... should be interleaved. --- v1 ~ v2: No changes --- docs/schemas/domaincommon.rng | 58 ++++++++++++++++++---------------------- 1 files changed, 26 insertions(+), 32 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 0cc04af..f116710 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1210,7 +1210,6 @@ </attribute> <empty/> </element> - <ref name="filesystemtgt"/> </interleave> </group> <group> @@ -1224,7 +1223,6 @@ </attribute> <empty/> </element> - <ref name="filesystemtgt"/> </interleave> </group> <group> @@ -1257,7 +1255,6 @@ <empty/> </element> </optional> - <ref name="filesystemtgt"/> </interleave> </group> <group> @@ -1271,42 +1268,39 @@ </attribute> <empty/> </element> - <ref name="filesystemtgt"/> </interleave> </group> </choice> - <optional> - <attribute name="accessmode"> - <choice> - <value>passthrough</value> - <value>mapped</value> - <value>squash</value> - </choice> - </attribute> - </optional> - <optional> - <element name='readonly'> + <interleave> + <element name="target"> + <attribute name="dir"> + <ref name="absDirPath"/> + </attribute> <empty/> </element> - </optional> + <optional> + <attribute name="accessmode"> + <choice> + <value>passthrough</value> + <value>mapped</value> + <value>squash</value> + </choice> + </attribute> + </optional> + <optional> + <element name='readonly'> + <empty/> + </element> + </optional> + <optional> + <ref name="alias"/> + </optional> + <optional> + <ref name="address"/> + </optional> + </interleave> </element> </define> - <define name="filesystemtgt"> - <interleave> - <optional> - <ref name="alias"/> - </optional> - <optional> - <ref name="address"/> - </optional> - <element name="target"> - <attribute name="dir"> - <ref name="absDirPath"/> - </attribute> - <empty/> - </element> - </interleave> - </define> <!-- An interface description can either be of type bridge in which case it will use a bridging source, or of type ethernet which uses a device -- 1.7.7.3

2 2

[libvirt] [PATCH] libvirt: xen: do not use ioemu type for any emulated NIC
by Stefan Bader 17 Apr '12

17 Apr '12

This is a re-send as there was some positive feedback but the patch itself made it into the repo. -Stefan >From a3198c5c1ae8908818f6c0f0df4237dbe5ddeec7 Mon Sep 17 00:00:00 2001 From: Stefan Bader <stefan.bader(a)canonical.com> Date: Thu, 12 Apr 2012 15:32:41 +0200 Subject: [PATCH] libvirt: xen: do not use ioemu type for any emulated NIC When using the xm/xend stack to manage instances there is a bug that causes the emulated interfaces to be unusable when the vif config contains type=ioemu (MAC address all zero). The current code already has a special quirk to not use this keyword if no specific model is given for the emulated NIC (defaulting to rtl8139). Essentially it works because regardless of the type argument, the Xen stack always creates emulated and paravirt interfaces and lets the guest decide which one to use. So neither xl nor xm stack actually require the type keyword for emulated NICs. Signed-off-by: Stefan Bader <stefan.bader(a)canonical.com> --- src/xenxs/xen_sxpr.c | 4 +++- src/xenxs/xen_xm.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c index e1bbd76..71602fa 100644 --- a/src/xenxs/xen_sxpr.c +++ b/src/xenxs/xen_sxpr.c @@ -2012,7 +2012,9 @@ xenFormatSxprNet(virConnectPtr conn, } else { virBufferEscapeSexpr(buf, "(model '%s')", def->model); - virBufferAddLit(buf, "(type ioemu)"); + /* See above. Also needed when model is specified. */ + if (xendConfigVersion <= XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU) + virBufferAddLit(buf, "(type ioemu)"); } if (!isAttach) diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c index d65e97a..e072599 100644 --- a/src/xenxs/xen_xm.c +++ b/src/xenxs/xen_xm.c @@ -1394,7 +1394,9 @@ static int xenFormatXMNet(virConnectPtr conn, } else { virBufferAsprintf(&buf, ",model=%s", net->model); - virBufferAddLit(&buf, ",type=ioemu"); + /* See above. Also needed if model is specified. */ + if (xendConfigVersion <= XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU) + virBufferAddLit(&buf, ",type=ioemu"); } if (net->ifname) -- 1.7.9.5

4 19

[libvirt] "virsh list" hangs
by Qian Zhang 17 Apr '12

17 Apr '12

Hi, I am using RHEL 6.2 64bit, and the libvirt shipped in it is "libvirt-0.9.4-23.el6.x86_64". I found sometimes the command "virsh list" hangs forever, and same issue for virt-manager which is always in "Connecting" status. But after restarting the libvirtd service, this issue is gone. Is this a bug of libvirt? Any help will be appreciated. Thanks, Qian

4 6

Re: [libvirt] [PATCH 7/8] block: add witness argument to drive-reopen
by Eric Blake 17 Apr '12

17 Apr '12

[adding libvir-list for some interesting discussions on potential libvirt design issues] On 04/17/2012 12:47 AM, Paolo Bonzini wrote: > Il 16/04/2012 23:55, Eric Blake ha scritto: >>> Do transient guests have persistent storage for them in /var while they >>> are running? >> >> Yes - that's how libvirt tracks the pid of the qemu process that it >> should be re-attaching to on a libvirtd restart, as well as several >> other aspects (for example, the capabilities of the qemu binary running >> that pid, in case qemu has been upgraded in the meantime). It's just >> that right now, the files that libvirt stores in /var are intended to be >> internal to libvirt, so management apps shouldn't be poking around in >> there, so much as having an interface to ask libvirt what state things >> are in. > > Can libvirtd report the block-job-completed event to vdsm before the > transient-domain-died event? Yes, it should be possible to organize the code so that on libvirtd restart, libvirt is careful to emit all other events, such as block-job completed/failed, prior to the final domain died event as libvirt cleans out its records of the dead domain. But it probably involves quite a bit of code cleanup on libvirt's side to reach that state. There's also the question of whether vdsm will be listening to the events soon enough; after all, when libvirtd restarts, libvirt is doing quite a bit of bookkeeping before even accepting connections, and if vdsm isn't connected to the restarted libvirt at the time libvirt queues up an event to be sent, then the event is lost. Maybe that implies that libvirt needs to have a configurable-depth array of prior events that can be played back to the user on request. -- Eric Blake eblake(a)redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

2 1

[libvirt] [PATCHv4 00/18] live block migration via virDomainBlockCopy
by Eric Blake 17 Apr '12

17 Apr '12

v3 was here: https://www.redhat.com/archives/libvir-list/2012-April/msg00288.html changes from v3: - split v3 patch 8 into 1/18 and 9/18 - incorporate Laine's review comments on v3 patches 1 and 2 (here 2 and 3) - fix more bugs found during testing - upgrade to Paolo's latest build (which dropped 'mode':'no-backing-file' and replaced it with 'full':'true') - added a new patch 14/18 that lets blockcopy work with SELinux enforcing (it still leaks files rather than clean up context on job abort or pivot, but that's a harder problem to solve) repo.or.cz is acting up on me at the moment, so I won't have a repo to point to until I can investigate why tomorrow. I'll send an interdiff in reply to this message. Adam Litke (2): blockjob: add API for async virDomainBlockJobAbort blockjob: wire up qemu async virDomainBlockJobAbort Eric Blake (16): blockjob: add qemu capabilities related to block jobs blockjob: allow for fast-finishing job blockjob: add new API flags blockjob: add 'blockcopy' to virsh blockjob: enhance xml to track mirrors across libvirtd restart blockjob: react to active block copy blockjob: expose qemu commands for mirrored storage migration blockjob: return appropriate event and info blockjob: support pivot operation on cancel blockjob: implement block copy for qemu blockjob: allow for existing files blockjob: allow mirroring under SELinux blockjob: accommodate RHEL backport names blockjob: add virDomainBlockCopy blockjob: enhance virsh 'blockcopy' blockjob: wire up qemu and RPC for block copy docs/apibuild.py | 1 + docs/formatdomain.html.in | 11 + docs/schemas/domaincommon.rng | 19 ++- include/libvirt/libvirt.h.in | 50 +++++- include/libvirt/virterror.h | 1 + src/conf/domain_conf.c | 54 ++++++ src/conf/domain_conf.h | 6 + src/driver.h | 5 + src/libvirt.c | 223 +++++++++++++++++++++- src/libvirt_private.syms | 1 + src/libvirt_public.syms | 5 + src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_driver.c | 417 +++++++++++++++++++++++++++++++++++++++-- src/qemu/qemu_hotplug.c | 7 + src/qemu/qemu_monitor.c | 50 +++++ src/qemu/qemu_monitor.h | 18 ++- src/qemu/qemu_monitor_json.c | 167 ++++++++++++++--- src/qemu/qemu_monitor_json.h | 19 ++- src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 12 +- src/remote_protocol-structs | 9 + src/rpc/gendispatch.pl | 1 + src/util/virterror.c | 6 + tools/virsh.c | 141 +++++++++++--- tools/virsh.pod | 65 ++++++- 26 files changed, 1195 insertions(+), 99 deletions(-) -- 1.7.7.6

4 58

[libvirt] cgroup cpuset limited by default?
by Marc-André Lureau 17 Apr '12

17 Apr '12

Hi, I noticed recently that my system VMs feel much slower, and that seems to be because of cpuset cgroup which constrain the VM on the first cpu. This doesn't happen with session VMs, since they are not ruled by cgroup. I run f17 with libvirt git, the VMs are created with virt-manager, using mostly default settings <vcpu>4</vcpu> <os> <type arch='x86_64' machine='pc-0.15'>hvm</type> <boot dev='hd'/> </os> <features> <acpi/> <apic/> <pae/> </features> <clock offset='localtime'/> Is that intended or is it a bug? -- Marc-André Lureau

3 6

[libvirt] [PATCH v2] qemu: Split ide-drive into ide-cd and ide-hd
by Osier Yang 17 Apr '12

17 Apr '12

A "ide-drive" device can be either a hard disk or a CD-ROM, if there is ",media=cdrom" specified for the backend, it's a CD-ROM, otherwise it's a hard disk. Upstream qemu splitted "ide-drive" into "ide-hd" and "ide-cd" since commit 1f56e32, and ",media=cdrom" is not required for ide-cd anymore. "ide-drive" is still supported for backwards compatibility, but no doubt we should go foward. --- No changes between v1 and v2, just rebasing. --- src/qemu/qemu_capabilities.c | 3 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 25 ++++++++++++++- tests/qemuhelptest.c | 3 +- .../qemuxml2argv-disk-ide-drive-split.args | 8 +++++ .../qemuxml2argv-disk-ide-drive-split.xml | 32 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ 7 files changed, 72 insertions(+), 3 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.xml diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 4e22f3e8..3d1fb43 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -160,6 +160,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "block-job-sync", /* 90 */ "block-job-async", "scsi-cd", + "ide-cd", ); struct qemu_feature_flags { @@ -1454,6 +1455,8 @@ qemuCapsParseDeviceStr(const char *str, virBitmapPtr flags) qemuCapsSet(flags, QEMU_CAPS_SCSI_BLOCK); if (strstr(str, "scsi-cd")) qemuCapsSet(flags, QEMU_CAPS_SCSI_CD); + if (strstr(str, "ide-cd")) + qemuCapsSet(flags, QEMU_CAPS_IDE_CD); return 0; } diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 2aba502..7279cdb 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -127,6 +127,7 @@ enum qemuCapsFlags { QEMU_CAPS_BLOCKJOB_SYNC = 90, /* RHEL 6.2 block_job_cancel */ QEMU_CAPS_BLOCKJOB_ASYNC = 91, /* qemu 1.1 block-job-cancel */ QEMU_CAPS_SCSI_CD = 92, /* -device scsi-cd */ + QEMU_CAPS_IDE_CD = 93, /* -device ide-cd */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ff82b26..26f691f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1982,6 +1982,9 @@ qemuBuildDriveStr(virConnectPtr conn ATTRIBUTE_UNUSED, if ((disk->bus == VIR_DOMAIN_DISK_BUS_SCSI)) { if (!qemuCapsGet(qemuCaps, QEMU_CAPS_SCSI_CD)) virBufferAddLit(&opt, ",media=cdrom"); + } else if (disk->bus == VIR_DOMAIN_DISK_BUS_IDE) { + if (!qemuCapsGet(qemuCaps, QEMU_CAPS_IDE_CD)) + virBufferAddLit(&opt, ",media=cdrom"); } else { virBufferAddLit(&opt, ",media=cdrom"); } @@ -2205,7 +2208,16 @@ qemuBuildDriveDevStr(virDomainDefPtr def, _("target must be 0 for ide controller")); goto error; } - virBufferAddLit(&opt, "ide-drive"); + + if (qemuCapsGet(qemuCaps, QEMU_CAPS_IDE_CD)) { + if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) + virBufferAddLit(&opt, "ide-cd"); + else + virBufferAddLit(&opt, "ide-hd"); + } else { + virBufferAddLit(&opt, "ide-drive"); + } + virBufferAsprintf(&opt, ",bus=ide.%d,unit=%d", disk->info.addr.drive.bus, disk->info.addr.drive.unit); @@ -2301,7 +2313,16 @@ qemuBuildDriveDevStr(virDomainDefPtr def, _("target must be 0 for ide controller")); goto error; } - virBufferAddLit(&opt, "ide-drive"); + + if (qemuCapsGet(qemuCaps, QEMU_CAPS_IDE_CD)) { + if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) + virBufferAddLit(&opt, "ide-cd"); + else + virBufferAddLit(&opt, "ide-hd"); + } else { + virBufferAddLit(&opt, "ide-drive"); + } + virBufferAsprintf(&opt, ",bus=ahci%d.%d", disk->info.addr.drive.controller, disk->info.addr.drive.unit); diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index a01c389..d23b35a 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -676,7 +676,8 @@ mymain(void) QEMU_CAPS_CPU_HOST, QEMU_CAPS_FSDEV_WRITEOUT, QEMU_CAPS_SCSI_BLOCK, - QEMU_CAPS_SCSI_CD); + QEMU_CAPS_SCSI_CD, + QEMU_CAPS_IDE_CD); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args new file mode 100644 index 0000000..e24490d --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args @@ -0,0 +1,8 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ +/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-1 \ +-device ide-cd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ +-drive file=/tmp/idedisk.img,if=none,id=drive-ide0-0-2 \ +-device ide-hd,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2 \ +-usb -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.xml new file mode 100644 index 0000000..b965677 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.xml @@ -0,0 +1,32 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='cdrom'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='1'/> + </disk> + <disk type='file' device='disk'> + <source file='/tmp/idedisk.img'/> + <target dev='hdc' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='2'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='ide' index='1'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index cc1ac44..ee7a8e1 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -758,6 +758,9 @@ mymain(void) QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); DO_TEST("pseries-vio-address-clash", true, QEMU_CAPS_DRIVE, QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); + DO_TEST("disk-ide-drive-split", false, + QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_IDE_CD); VIR_FREE(driver.stateDir); virCapabilitiesFree(driver.caps); -- 1.7.7.3

2 2

[libvirt] [PATCH v2] qemu: Split scsi-disk into into scsi-hd and scsi-cd
by Osier Yang 17 Apr '12

17 Apr '12

A "scsi-disk" device can be either a hard disk or a CD-ROM, if there is ",media=cdrom" specified for the backend, it's a CD-ROM, otherwise it's a hard disk. But upstream qemu splitted "scsi-disk" into "scsi-hd" and "scsi-cd" since commit b443ae, and ",media=cdrom" is not required for scsi-cd anymore. "scsi-disk" is still supported for backwards compatibility, but no doubt we should go foward. --- No changes since v1 --- src/qemu/qemu_capabilities.c | 3 +++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 39 +++++++++++++++++++++++++++++++-------- tests/qemuhelptest.c | 6 ++++-- tests/qemuxml2argvtest.c | 3 +++ 5 files changed, 42 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index fd4ca4d..4e22f3e8 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -159,6 +159,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "block-job-sync", /* 90 */ "block-job-async", + "scsi-cd", ); struct qemu_feature_flags { @@ -1451,6 +1452,8 @@ qemuCapsParseDeviceStr(const char *str, virBitmapPtr flags) qemuCapsSet(flags, QEMU_CAPS_SCSI_DISK_CHANNEL); if (strstr(str, "scsi-block")) qemuCapsSet(flags, QEMU_CAPS_SCSI_BLOCK); + if (strstr(str, "scsi-cd")) + qemuCapsSet(flags, QEMU_CAPS_SCSI_CD); return 0; } diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 6550d59..2aba502 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -126,6 +126,7 @@ enum qemuCapsFlags { QEMU_CAPS_TRANSACTION = 89, /* transaction monitor command */ QEMU_CAPS_BLOCKJOB_SYNC = 90, /* RHEL 6.2 block_job_cancel */ QEMU_CAPS_BLOCKJOB_ASYNC = 91, /* qemu 1.1 block-job-cancel */ + QEMU_CAPS_SCSI_CD = 92, /* -device scsi-cd */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c82f5bc..ff82b26 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1978,8 +1978,14 @@ qemuBuildDriveStr(virConnectPtr conn ATTRIBUTE_UNUSED, else virBufferAsprintf(&opt, "if=%s", bus); - if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) - virBufferAddLit(&opt, ",media=cdrom"); + if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) { + if ((disk->bus == VIR_DOMAIN_DISK_BUS_SCSI)) { + if (!qemuCapsGet(qemuCaps, QEMU_CAPS_SCSI_CD)) + virBufferAddLit(&opt, ",media=cdrom"); + } else { + virBufferAddLit(&opt, ",media=cdrom"); + } + } if (qemuCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) { virBufferAsprintf(&opt, ",id=%s%s", QEMU_DRIVE_HOST_PREFIX, disk->info.alias); @@ -2229,10 +2235,19 @@ qemuBuildDriveDevStr(virDomainDefPtr def, goto error; } - if (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) + if (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) { virBufferAddLit(&opt, "scsi-block"); - else - virBufferAddLit(&opt, "scsi-disk"); + } else { + if (qemuCapsGet(qemuCaps, QEMU_CAPS_SCSI_CD)) { + if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) + virBufferAddLit(&opt, "scsi-cd"); + else + virBufferAddLit(&opt, "scsi-hd"); + } else { + virBufferAddLit(&opt, "scsi-disk"); + } + } + virBufferAsprintf(&opt, ",bus=scsi%d.%d,scsi-id=%d", disk->info.addr.drive.controller, disk->info.addr.drive.bus, @@ -2255,10 +2270,18 @@ qemuBuildDriveDevStr(virDomainDefPtr def, } } - if (disk->device != VIR_DOMAIN_DISK_DEVICE_LUN) - virBufferAddLit(&opt, "scsi-disk"); - else + if (disk->device != VIR_DOMAIN_DISK_DEVICE_LUN) { + if (qemuCapsGet(qemuCaps, QEMU_CAPS_SCSI_CD)) { + if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) + virBufferAddLit(&opt, "scsi-cd"); + else + virBufferAddLit(&opt, "scsi-hd"); + } else { + virBufferAddLit(&opt, "scsi-disk"); + } + } else { virBufferAddLit(&opt, "scsi-block"); + } virBufferAsprintf(&opt, ",bus=scsi%d.0,channel=%d,scsi-id=%d,lun=%d", disk->info.addr.drive.controller, diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 05fdc4d..a01c389 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -605,7 +605,8 @@ mymain(void) QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO, QEMU_CAPS_DRIVE_COPY_ON_READ, - QEMU_CAPS_CPU_HOST); + QEMU_CAPS_CPU_HOST, + QEMU_CAPS_SCSI_CD); DO_TEST("qemu-1.0", 1000000, 0, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -674,7 +675,8 @@ mymain(void) QEMU_CAPS_VIRTIO_BLK_SG_IO, QEMU_CAPS_CPU_HOST, QEMU_CAPS_FSDEV_WRITEOUT, - QEMU_CAPS_SCSI_BLOCK); + QEMU_CAPS_SCSI_BLOCK, + QEMU_CAPS_SCSI_CD); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index fdbe95a..cc1ac44 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -463,6 +463,9 @@ mymain(void) QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); DO_TEST("disk-scsi-device-auto", false, QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); + DO_TEST("disk-scsi-disk-split", false, + QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_SCSI_CD); DO_TEST("disk-scsi-vscsi", false, QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); DO_TEST("disk-scsi-virtio-scsi", false, -- 1.7.7.3

2 4

[libvirt] [PATCH] Do not enforce source type of console[0]
by Jan Kiszka 17 Apr '12

17 Apr '12

If console[0] is an alias for serial[0], do not enforce the former to have a PTY source type. This breaks serial consoles on stdio and makes no sense. Signed-off-by: Jan Kiszka <jan.kiszka(a)siemens.com> --- src/qemu/qemu_process.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index ef311d1..216b594 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1376,7 +1376,6 @@ qemuProcessFindCharDevicePTYs(virDomainObjPtr vm, if ((ret = virDomainChrSourceDefCopy(&chr->source, &((vm->def->serials[0])->source))) != 0) return ret; - chr->source.type = VIR_DOMAIN_CHR_TYPE_PTY; } else { if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY && chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_VIRTIO) { -- 1.7.3.4

3 3

[libvirt] [PATCH] openvz: wire up more node information functions
by Guido Günther 17 Apr '12

17 Apr '12

in detail nodeGetCPUStats, nodeGetMemoryStats, nodeGetCellsFreeMemory and nodeGetFreeMemory --- src/openvz/openvz_driver.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 3b2ffea..41fd8e4 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -1704,6 +1704,10 @@ static virDriver openvzDriver = { .version = openvzGetVersion, /* 0.5.0 */ .getMaxVcpus = openvzGetMaxVCPUs, /* 0.4.6 */ .nodeGetInfo = nodeGetInfo, /* 0.3.2 */ + .nodeGetCPUStats = nodeGetCPUStats, /* 0.9.11 */ + .nodeGetMemoryStats = nodeGetMemoryStats, /* 0.9.11 */ + .nodeGetCellsFreeMemory = nodeGetCellsFreeMemory, /* 0.9.11 */ + .nodeGetFreeMemory = nodeGetFreeMemory, /* 0.9.11 */ .getCapabilities = openvzGetCapabilities, /* 0.4.6 */ .listDomains = openvzListDomains, /* 0.3.1 */ .numOfDomains = openvzNumDomains, /* 0.3.1 */ -- 1.7.9.5

3 4

[libvirt] 2 trivial doc patches
by Christophe Fergeau 16 Apr '12

16 Apr '12

Hey, I've just pushed these 2 documentation patches under the trivial rule. Christophe

1 2

[libvirt] OpenSSH authentification in Java libvirt API
by Alexandre Garnier 16 Apr '12

16 Apr '12

Hello, It seems that today you can’t authenticate on a qemu+ssh connection via OpenSSH without having to manually type the password in CLI or a pop-up window, using the Java API for libvirt. Being able to push a String in OpenSSH user input would be an easier and faster solution, for the end-user. Sincerely, Alexandre

1 0

[libvirt] [PATCH v2] qemuProcessStart: Switch to flags instead of bunch booleans
by Michal Privoznik 16 Apr '12

16 Apr '12

Currently, we have 3 boolean arguments we have to pass to qemuProcessStart(). As libvirt grows it is harder and harder to remember them and their position. Therefore we should switch to flags instead. --- diff to v1: -fix a test for START_PAUSED flag src/qemu/qemu_driver.c | 45 +++++++++++++++++++++++++++++---------------- src/qemu/qemu_migration.c | 7 ++++--- src/qemu/qemu_process.c | 21 +++++++++++++-------- src/qemu/qemu_process.h | 12 ++++++++---- 4 files changed, 54 insertions(+), 31 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 65ed290..436ef37 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1351,10 +1351,16 @@ static virDomainPtr qemudDomainCreate(virConnectPtr conn, const char *xml, virDomainPtr dom = NULL; virDomainEventPtr event = NULL; virDomainEventPtr event2 = NULL; + unsigned int start_flags = VIR_QEMU_PROCESS_START_COLD; virCheckFlags(VIR_DOMAIN_START_PAUSED | VIR_DOMAIN_START_AUTODESTROY, NULL); + if (flags & VIR_DOMAIN_START_PAUSED) + start_flags |= VIR_QEMU_PROCESS_START_PAUSED; + if (flags & VIR_DOMAIN_START_AUTODESTROY) + start_flags |= VIR_QEMU_PROCESS_START_AUTODESROY; + qemuDriverLock(driver); if (!(def = virDomainDefParseString(driver->caps, xml, QEMU_EXPECTED_VIRT_TYPES, @@ -1383,10 +1389,9 @@ static virDomainPtr qemudDomainCreate(virConnectPtr conn, const char *xml, if (qemuDomainObjBeginJobWithDriver(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; /* XXXX free the 'vm' we created ? */ - if (qemuProcessStart(conn, driver, vm, NULL, true, - (flags & VIR_DOMAIN_START_PAUSED) != 0, - (flags & VIR_DOMAIN_START_AUTODESTROY) != 0, - -1, NULL, NULL, VIR_NETDEV_VPORT_PROFILE_OP_CREATE) < 0) { + if (qemuProcessStart(conn, driver, vm, NULL, -1, NULL, NULL, + VIR_NETDEV_VPORT_PROFILE_OP_CREATE, + start_flags) < 0) { virDomainAuditStart(vm, "booted", false); if (qemuDomainObjEndJob(driver, vm) > 0) qemuDomainRemoveInactive(driver, vm); @@ -4138,9 +4143,9 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, } /* Set the migration source and start it up. */ - ret = qemuProcessStart(conn, driver, vm, "stdio", false, true, - false, *fd, path, NULL, - VIR_NETDEV_VPORT_PROFILE_OP_RESTORE); + ret = qemuProcessStart(conn, driver, vm, "stdio", *fd, path, NULL, + VIR_NETDEV_VPORT_PROFILE_OP_RESTORE, + VIR_QEMU_PROCESS_START_PAUSED); if (intermediatefd != -1) { if (ret < 0) { @@ -4710,6 +4715,10 @@ qemuDomainObjStart(virConnectPtr conn, bool autodestroy = (flags & VIR_DOMAIN_START_AUTODESTROY) != 0; bool bypass_cache = (flags & VIR_DOMAIN_START_BYPASS_CACHE) != 0; bool force_boot = (flags & VIR_DOMAIN_START_FORCE_BOOT) != 0; + unsigned int start_flags = VIR_QEMU_PROCESS_START_COLD; + + start_flags |= start_paused ? VIR_QEMU_PROCESS_START_PAUSED : 0; + start_flags |= autodestroy ? VIR_QEMU_PROCESS_START_AUTODESROY : 0; /* * If there is a managed saved state restore it instead of starting @@ -4741,9 +4750,8 @@ qemuDomainObjStart(virConnectPtr conn, } } - ret = qemuProcessStart(conn, driver, vm, NULL, true, start_paused, - autodestroy, -1, NULL, NULL, - VIR_NETDEV_VPORT_PROFILE_OP_CREATE); + ret = qemuProcessStart(conn, driver, vm, NULL, -1, NULL, NULL, + VIR_NETDEV_VPORT_PROFILE_OP_CREATE, start_flags); virDomainAuditStart(vm, "booted", ret >= 0); if (ret >= 0) { virDomainEventPtr event = @@ -11027,9 +11035,10 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, if (config) virDomainObjAssignDef(vm, config, false); - rc = qemuProcessStart(snapshot->domain->conn, driver, vm, NULL, - false, true, false, -1, NULL, snap, - VIR_NETDEV_VPORT_PROFILE_OP_CREATE); + rc = qemuProcessStart(snapshot->domain->conn, + driver, vm, NULL, -1, NULL, snap, + VIR_NETDEV_VPORT_PROFILE_OP_CREATE, + VIR_QEMU_PROCESS_START_PAUSED); virDomainAuditStart(vm, "from-snapshot", rc >= 0); detail = VIR_DOMAIN_EVENT_STARTED_FROM_SNAPSHOT; event = virDomainEventNewFromObj(vm, @@ -11114,12 +11123,16 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, VIR_DOMAIN_SNAPSHOT_REVERT_PAUSED)) { /* Flush first event, now do transition 2 or 3 */ bool paused = (flags & VIR_DOMAIN_SNAPSHOT_REVERT_PAUSED) != 0; + unsigned int start_flags = 0; + + start_flags |= paused ? VIR_QEMU_PROCESS_START_PAUSED : 0; if (event) qemuDomainEventQueue(driver, event); - rc = qemuProcessStart(snapshot->domain->conn, driver, vm, NULL, - false, paused, false, -1, NULL, NULL, - VIR_NETDEV_VPORT_PROFILE_OP_CREATE); + rc = qemuProcessStart(snapshot->domain->conn, + driver, vm, NULL, -1, NULL, NULL, + VIR_NETDEV_VPORT_PROFILE_OP_CREATE, + start_flags); virDomainAuditStart(vm, "from-snapshot", rc >= 0); if (rc < 0) { if (!vm->persistent) { diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index dc4d616..fc83805 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1303,9 +1303,10 @@ qemuMigrationPrepareAny(struct qemud_driver *driver, /* Start the QEMU daemon, with the same command-line arguments plus * -incoming $migrateFrom */ - if (qemuProcessStart(dconn, driver, vm, migrateFrom, false, true, - true, dataFD[0], NULL, NULL, - VIR_NETDEV_VPORT_PROFILE_OP_MIGRATE_IN_START) < 0) { + if (qemuProcessStart(dconn, driver, vm, migrateFrom, dataFD[0], NULL, NULL, + VIR_NETDEV_VPORT_PROFILE_OP_MIGRATE_IN_START, + VIR_QEMU_PROCESS_START_PAUSED | + VIR_QEMU_PROCESS_START_AUTODESROY) < 0) { virDomainAuditStart(vm, "migrated", false); /* Note that we don't set an error here because qemuProcessStart * should have already done that. diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 692fc32..ecbf039 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3271,13 +3271,11 @@ int qemuProcessStart(virConnectPtr conn, struct qemud_driver *driver, virDomainObjPtr vm, const char *migrateFrom, - bool cold_boot, - bool start_paused, - bool autodestroy, int stdin_fd, const char *stdin_path, virDomainSnapshotObjPtr snapshot, - enum virNetDevVPortProfileOp vmop) + enum virNetDevVPortProfileOp vmop, + unsigned int flags) { int ret; off_t pos = -1; @@ -3290,6 +3288,12 @@ int qemuProcessStart(virConnectPtr conn, unsigned long cur_balloon; int i; + /* Okay, these are just internal flags, + * but doesn't hurt to check */ + virCheckFlags(VIR_QEMU_PROCESS_START_COLD | + VIR_QEMU_PROCESS_START_PAUSED | + VIR_QEMU_PROCESS_START_AUTODESROY, -1); + hookData.conn = conn; hookData.vm = vm; hookData.driver = driver; @@ -3434,7 +3438,8 @@ int qemuProcessStart(virConnectPtr conn, goto cleanup; VIR_DEBUG("Checking for CDROM and floppy presence"); - if (qemuDomainCheckDiskPresence(driver, vm, cold_boot) < 0) + if (qemuDomainCheckDiskPresence(driver, vm, + flags & VIR_QEMU_PROCESS_START_COLD) < 0) goto cleanup; VIR_DEBUG("Setting up domain cgroup (if required)"); @@ -3633,7 +3638,7 @@ int qemuProcessStart(virConnectPtr conn, VIR_DEBUG("Handshake complete, child running"); if (migrateFrom) - start_paused = true; + flags |= VIR_QEMU_PROCESS_START_PAUSED; if (ret == -1) /* The VM failed to start; tear filters before taps */ virDomainConfVMNWFilterTeardown(vm); @@ -3708,7 +3713,7 @@ int qemuProcessStart(virConnectPtr conn, } qemuDomainObjExitMonitorWithDriver(driver, vm); - if (!start_paused) { + if (!(flags & VIR_QEMU_PROCESS_START_PAUSED)) { VIR_DEBUG("Starting domain CPUs"); /* Allow the CPUS to start executing */ if (qemuProcessStartCPUs(driver, vm, conn, @@ -3726,7 +3731,7 @@ int qemuProcessStart(virConnectPtr conn, VIR_DOMAIN_PAUSED_USER); } - if (autodestroy && + if (flags & VIR_QEMU_PROCESS_START_AUTODESROY && qemuProcessAutoDestroyAdd(driver, vm, conn) < 0) goto cleanup; diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index 5cb5ffc..2d75b005 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -44,17 +44,21 @@ void qemuProcessReconnectAll(virConnectPtr conn, struct qemud_driver *driver); int qemuProcessAssignPCIAddresses(virDomainDefPtr def); +typedef enum { + VIR_QEMU_PROCESS_START_COLD = 1 << 0, + VIR_QEMU_PROCESS_START_PAUSED = 1 << 1, + VIR_QEMU_PROCESS_START_AUTODESROY = 1 << 2, +} qemuProcessStartFlags; + int qemuProcessStart(virConnectPtr conn, struct qemud_driver *driver, virDomainObjPtr vm, const char *migrateFrom, - bool cold_boot, - bool start_paused, - bool autodestroy, int stdin_fd, const char *stdin_path, virDomainSnapshotObjPtr snapshot, - enum virNetDevVPortProfileOp vmop); + enum virNetDevVPortProfileOp vmop, + unsigned int flags); void qemuProcessStop(struct qemud_driver *driver, virDomainObjPtr vm, -- 1.7.8.5

2 2

[libvirt] [libvirt-test-API PATCH 0/2] Documentation update
by Martin Kletzander 16 Apr '12

16 Apr '12

I updated part of the documentation that was changed in last few weeks. Screenshot test was updated again a little bit to suit the needs of a documentation and replaced the source codes of previous two tests mentioned in the documentation as it describe just what is needed and has no overhead on the reader. I'm not sure how the numbering goes in this case, but it can be updated later or I can send a v2 in case it needs to be fixed right away. Martin Kletzander (2): domain:screenshot: fixes and cleanup Documentation: Update to current information .../en-US/Understanding_libvirt-test-API.xml | 6 - .../en-US/Using_libvirt-test-API.xml | 26 +- .../en-US/Writing_a_test_case.xml | 325 ++++++++------------ .../libvirt-test-API_Guide/en-US/extras/log.txt | 53 ++-- repos/domain/screenshot.py | 45 ++- 5 files changed, 199 insertions(+), 256 deletions(-) -- 1.7.8.5

1 2

[libvirt] [ANNOUNCE] Perl binding Sys-Virt release 0.9.11
by Daniel P. Berrange 16 Apr '12

16 Apr '12

I am pleased to announce that release 0.9.11 of Sys-Virt, the libvirt Perl API binding is now available for download: http://search.cpan.org/CPAN/authors/id/D/DA/DANBERR/Sys-Virt-0.9.11.tar.gz Changed in this release: - Add all new APIs in libvirt 0.9.11 - Add test case to validate API coverage - Fix misc POD docs bugs - Fix reference handling in block stats - Add handling of VIR_TYPED_PARAM_STRING Further information, including online API documentation & previous release archives, is available from the CPAN home page http://search.cpan.org/dist/Sys-Virt/ Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [PATCH] docs: fix path to openvz network configuration file
by Guido Günther 16 Apr '12

16 Apr '12

It's vznet.conf not vznetctl.conf, see e.g.: http://git.openvz.org/?p=vzctl;a=blob;f=bin/vznetcfg.in;h=e91f5c4a0744c1ea1… --- docs/drvopenvz.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/drvopenvz.html.in b/docs/drvopenvz.html.in index bb437d3..a8f9f28 100644 --- a/docs/drvopenvz.html.in +++ b/docs/drvopenvz.html.in @@ -67,7 +67,7 @@ openvz+ssh://root@example.com/system (remote access, SSH tunnelled) script must be created manually by the host OS administrator. The simplest way is to just download the latest version of this script from a newer OpenVZ release, or upstream source repository. Then - a generic configuration file <code>/etc/vz/vznetctl.conf</code> + a generic configuration file <code>/etc/vz/vznet.conf</code> must be created containing </p> -- 1.7.10

3 3

[libvirt] [PATCH RESEND] qemuProcessStart: Switch to flags instead of bunch booleans
by Michal Privoznik 16 Apr '12

16 Apr '12

Currently, we have 3 boolean arguments we have to pass to qemuProcessStart(). As libvirt grows it is harder and harder to remember them and their position. Therefore we should switch to flags instead. --- This is just rebased version of: http://www.redhat.com/archives/libvir-list/2012-March/msg00331.html src/qemu/qemu_driver.c | 45 +++++++++++++++++++++++++++++---------------- src/qemu/qemu_migration.c | 7 ++++--- src/qemu/qemu_process.c | 21 +++++++++++++-------- src/qemu/qemu_process.h | 12 ++++++++---- 4 files changed, 54 insertions(+), 31 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 65ed290..436ef37 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1351,10 +1351,16 @@ static virDomainPtr qemudDomainCreate(virConnectPtr conn, const char *xml, virDomainPtr dom = NULL; virDomainEventPtr event = NULL; virDomainEventPtr event2 = NULL; + unsigned int start_flags = VIR_QEMU_PROCESS_START_COLD; virCheckFlags(VIR_DOMAIN_START_PAUSED | VIR_DOMAIN_START_AUTODESTROY, NULL); + if (flags & VIR_DOMAIN_START_PAUSED) + start_flags |= VIR_QEMU_PROCESS_START_PAUSED; + if (flags & VIR_DOMAIN_START_AUTODESTROY) + start_flags |= VIR_QEMU_PROCESS_START_AUTODESROY; + qemuDriverLock(driver); if (!(def = virDomainDefParseString(driver->caps, xml, QEMU_EXPECTED_VIRT_TYPES, @@ -1383,10 +1389,9 @@ static virDomainPtr qemudDomainCreate(virConnectPtr conn, const char *xml, if (qemuDomainObjBeginJobWithDriver(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; /* XXXX free the 'vm' we created ? */ - if (qemuProcessStart(conn, driver, vm, NULL, true, - (flags & VIR_DOMAIN_START_PAUSED) != 0, - (flags & VIR_DOMAIN_START_AUTODESTROY) != 0, - -1, NULL, NULL, VIR_NETDEV_VPORT_PROFILE_OP_CREATE) < 0) { + if (qemuProcessStart(conn, driver, vm, NULL, -1, NULL, NULL, + VIR_NETDEV_VPORT_PROFILE_OP_CREATE, + start_flags) < 0) { virDomainAuditStart(vm, "booted", false); if (qemuDomainObjEndJob(driver, vm) > 0) qemuDomainRemoveInactive(driver, vm); @@ -4138,9 +4143,9 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, } /* Set the migration source and start it up. */ - ret = qemuProcessStart(conn, driver, vm, "stdio", false, true, - false, *fd, path, NULL, - VIR_NETDEV_VPORT_PROFILE_OP_RESTORE); + ret = qemuProcessStart(conn, driver, vm, "stdio", *fd, path, NULL, + VIR_NETDEV_VPORT_PROFILE_OP_RESTORE, + VIR_QEMU_PROCESS_START_PAUSED); if (intermediatefd != -1) { if (ret < 0) { @@ -4710,6 +4715,10 @@ qemuDomainObjStart(virConnectPtr conn, bool autodestroy = (flags & VIR_DOMAIN_START_AUTODESTROY) != 0; bool bypass_cache = (flags & VIR_DOMAIN_START_BYPASS_CACHE) != 0; bool force_boot = (flags & VIR_DOMAIN_START_FORCE_BOOT) != 0; + unsigned int start_flags = VIR_QEMU_PROCESS_START_COLD; + + start_flags |= start_paused ? VIR_QEMU_PROCESS_START_PAUSED : 0; + start_flags |= autodestroy ? VIR_QEMU_PROCESS_START_AUTODESROY : 0; /* * If there is a managed saved state restore it instead of starting @@ -4741,9 +4750,8 @@ qemuDomainObjStart(virConnectPtr conn, } } - ret = qemuProcessStart(conn, driver, vm, NULL, true, start_paused, - autodestroy, -1, NULL, NULL, - VIR_NETDEV_VPORT_PROFILE_OP_CREATE); + ret = qemuProcessStart(conn, driver, vm, NULL, -1, NULL, NULL, + VIR_NETDEV_VPORT_PROFILE_OP_CREATE, start_flags); virDomainAuditStart(vm, "booted", ret >= 0); if (ret >= 0) { virDomainEventPtr event = @@ -11027,9 +11035,10 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, if (config) virDomainObjAssignDef(vm, config, false); - rc = qemuProcessStart(snapshot->domain->conn, driver, vm, NULL, - false, true, false, -1, NULL, snap, - VIR_NETDEV_VPORT_PROFILE_OP_CREATE); + rc = qemuProcessStart(snapshot->domain->conn, + driver, vm, NULL, -1, NULL, snap, + VIR_NETDEV_VPORT_PROFILE_OP_CREATE, + VIR_QEMU_PROCESS_START_PAUSED); virDomainAuditStart(vm, "from-snapshot", rc >= 0); detail = VIR_DOMAIN_EVENT_STARTED_FROM_SNAPSHOT; event = virDomainEventNewFromObj(vm, @@ -11114,12 +11123,16 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, VIR_DOMAIN_SNAPSHOT_REVERT_PAUSED)) { /* Flush first event, now do transition 2 or 3 */ bool paused = (flags & VIR_DOMAIN_SNAPSHOT_REVERT_PAUSED) != 0; + unsigned int start_flags = 0; + + start_flags |= paused ? VIR_QEMU_PROCESS_START_PAUSED : 0; if (event) qemuDomainEventQueue(driver, event); - rc = qemuProcessStart(snapshot->domain->conn, driver, vm, NULL, - false, paused, false, -1, NULL, NULL, - VIR_NETDEV_VPORT_PROFILE_OP_CREATE); + rc = qemuProcessStart(snapshot->domain->conn, + driver, vm, NULL, -1, NULL, NULL, + VIR_NETDEV_VPORT_PROFILE_OP_CREATE, + start_flags); virDomainAuditStart(vm, "from-snapshot", rc >= 0); if (rc < 0) { if (!vm->persistent) { diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index dc4d616..fc83805 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1303,9 +1303,10 @@ qemuMigrationPrepareAny(struct qemud_driver *driver, /* Start the QEMU daemon, with the same command-line arguments plus * -incoming $migrateFrom */ - if (qemuProcessStart(dconn, driver, vm, migrateFrom, false, true, - true, dataFD[0], NULL, NULL, - VIR_NETDEV_VPORT_PROFILE_OP_MIGRATE_IN_START) < 0) { + if (qemuProcessStart(dconn, driver, vm, migrateFrom, dataFD[0], NULL, NULL, + VIR_NETDEV_VPORT_PROFILE_OP_MIGRATE_IN_START, + VIR_QEMU_PROCESS_START_PAUSED | + VIR_QEMU_PROCESS_START_AUTODESROY) < 0) { virDomainAuditStart(vm, "migrated", false); /* Note that we don't set an error here because qemuProcessStart * should have already done that. diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 692fc32..d18d721 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3271,13 +3271,11 @@ int qemuProcessStart(virConnectPtr conn, struct qemud_driver *driver, virDomainObjPtr vm, const char *migrateFrom, - bool cold_boot, - bool start_paused, - bool autodestroy, int stdin_fd, const char *stdin_path, virDomainSnapshotObjPtr snapshot, - enum virNetDevVPortProfileOp vmop) + enum virNetDevVPortProfileOp vmop, + unsigned int flags) { int ret; off_t pos = -1; @@ -3290,6 +3288,12 @@ int qemuProcessStart(virConnectPtr conn, unsigned long cur_balloon; int i; + /* Okay, these are just internal flags, + * but doesn't hurt to check */ + virCheckFlags(VIR_QEMU_PROCESS_START_COLD | + VIR_QEMU_PROCESS_START_PAUSED | + VIR_QEMU_PROCESS_START_AUTODESROY, -1); + hookData.conn = conn; hookData.vm = vm; hookData.driver = driver; @@ -3434,7 +3438,8 @@ int qemuProcessStart(virConnectPtr conn, goto cleanup; VIR_DEBUG("Checking for CDROM and floppy presence"); - if (qemuDomainCheckDiskPresence(driver, vm, cold_boot) < 0) + if (qemuDomainCheckDiskPresence(driver, vm, + flags & VIR_QEMU_PROCESS_START_COLD) < 0) goto cleanup; VIR_DEBUG("Setting up domain cgroup (if required)"); @@ -3633,7 +3638,7 @@ int qemuProcessStart(virConnectPtr conn, VIR_DEBUG("Handshake complete, child running"); if (migrateFrom) - start_paused = true; + flags |= VIR_QEMU_PROCESS_START_PAUSED; if (ret == -1) /* The VM failed to start; tear filters before taps */ virDomainConfVMNWFilterTeardown(vm); @@ -3708,7 +3713,7 @@ int qemuProcessStart(virConnectPtr conn, } qemuDomainObjExitMonitorWithDriver(driver, vm); - if (!start_paused) { + if (flags & ~VIR_QEMU_PROCESS_START_PAUSED) { VIR_DEBUG("Starting domain CPUs"); /* Allow the CPUS to start executing */ if (qemuProcessStartCPUs(driver, vm, conn, @@ -3726,7 +3731,7 @@ int qemuProcessStart(virConnectPtr conn, VIR_DOMAIN_PAUSED_USER); } - if (autodestroy && + if (flags & VIR_QEMU_PROCESS_START_AUTODESROY && qemuProcessAutoDestroyAdd(driver, vm, conn) < 0) goto cleanup; diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index 5cb5ffc..2d75b005 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -44,17 +44,21 @@ void qemuProcessReconnectAll(virConnectPtr conn, struct qemud_driver *driver); int qemuProcessAssignPCIAddresses(virDomainDefPtr def); +typedef enum { + VIR_QEMU_PROCESS_START_COLD = 1 << 0, + VIR_QEMU_PROCESS_START_PAUSED = 1 << 1, + VIR_QEMU_PROCESS_START_AUTODESROY = 1 << 2, +} qemuProcessStartFlags; + int qemuProcessStart(virConnectPtr conn, struct qemud_driver *driver, virDomainObjPtr vm, const char *migrateFrom, - bool cold_boot, - bool start_paused, - bool autodestroy, int stdin_fd, const char *stdin_path, virDomainSnapshotObjPtr snapshot, - enum virNetDevVPortProfileOp vmop); + enum virNetDevVPortProfileOp vmop, + unsigned int flags); void qemuProcessStop(struct qemud_driver *driver, virDomainObjPtr vm, -- 1.7.8.5

2 1

[libvirt] [PATCH] storage: lvm: use correct lv* command parameters
by Cole Robinson 16 Apr '12

16 Apr '12

lvcreate want's the parent pool's name, not the pool path lvchange and lvremove want lv specified as $vgname/$lvname This largely worked before because these commands strip off a starting /dev. But https://bugzilla.redhat.com/show_bug.cgi?id=714986 is from a user using a 'nested VG' that was having problems. I couldn't find any info on nested LVM and the reporter never responded, but I reproduced with XML that specified a valid source name, and set target path to a symlink. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/storage/storage_backend_logical.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index 6a235f6..9a91dd9 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -672,7 +672,7 @@ virStorageBackendLogicalCreateVol(virConnectPtr conn, char size[100]; const char *cmdargvnew[] = { LVCREATE, "--name", vol->name, "-L", size, - pool->def->target.path, NULL + pool->def->source.name, NULL }; const char *cmdargvsnap[] = { LVCREATE, "--name", vol->name, "-L", size, @@ -778,23 +778,23 @@ virStorageBackendLogicalDeleteVol(virConnectPtr conn ATTRIBUTE_UNUSED, unsigned int flags) { int ret = -1; + char *volpath = NULL; virCommandPtr lvchange_cmd = NULL; virCommandPtr lvremove_cmd = NULL; virCheckFlags(0, -1); - virFileWaitForDevices(); + if (virAsprintf(&volpath, "%s/%s", + pool->def->source.name, vol->name) < 0) { + virReportOOMError(); + goto cleanup; + } - lvchange_cmd = virCommandNewArgList(LVCHANGE, - "-aln", - vol->target.path, - NULL); + virFileWaitForDevices(); - lvremove_cmd = virCommandNewArgList(LVREMOVE, - "-f", - vol->target.path, - NULL); + lvchange_cmd = virCommandNewArgList(LVCHANGE, "-aln", volpath, NULL); + lvremove_cmd = virCommandNewArgList(LVREMOVE, "-f", volpath, NULL); if (virCommandRun(lvremove_cmd, NULL) < 0) { if (virCommandRun(lvchange_cmd, NULL) < 0) { @@ -807,6 +807,7 @@ virStorageBackendLogicalDeleteVol(virConnectPtr conn ATTRIBUTE_UNUSED, ret = 0; cleanup: + VIR_FREE(volpath); virCommandFree(lvchange_cmd); virCommandFree(lvremove_cmd); return ret; -- 1.7.7.6

2 4

[libvirt] [PATCH] domain:screenshot: Added cleanup function
by Martin Kletzander 16 Apr '12

16 Apr '12

Added cleanup function to the screeshot testcase. This makes use of the new "sharedmod" module. --- WARNING: don't push this before the patch with sharedmod is pushed in the repo, otherwise this will not work. Thanks. repos/domain/screenshot.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/repos/domain/screenshot.py b/repos/domain/screenshot.py index 3e727a7..5a12c4b 100644 --- a/repos/domain/screenshot.py +++ b/repos/domain/screenshot.py @@ -6,6 +6,7 @@ import os import mimetypes import libvirt +import sharedmod required_params = ('guestname', 'filename',) optional_params = ('screen',) @@ -36,6 +37,7 @@ def screenshot(params): logger.debug('Mimetype of the file is %s' % mime) ret = st.finish() + sharedmod.dict['screenshot_filename'] = filename finally: # Some error occurred, cleanup @@ -43,3 +45,7 @@ def screenshot(params): conn.close() return ret + +def cleanup(params): + if sharedmod.has_key('screenshot_filename'): + os.remove(sharedmod['screenshot_filename']) -- 1.7.8.5

2 7

[libvirt] numad: Convert node list to cpumap before affinity setting
by Osier Yang 16 Apr '12

16 Apr '12

Previous patches on numad made mistake with thinking numad will return CPUs list (numad document says CPUs list one place, and node list another place. :( Please see the patches' commit message for the details. Osier Yang (3) numad: Convert node list to cpumap before setting affinity numad: Ignore cpuset if placement is auto qemu: Avoid the memory allocation and freeing docs/formatdomain.html.in | 10 ++++---- src/conf/domain_conf.c | 28 ++++++++++++++------------ src/qemu/qemu_process.c | 47 +++++++++++++++++++++++--------------------- 3 files changed, 45 insertions(+), 40 deletions(-) Regards, Osier

2 7

[libvirt] [test-API PATCH 1/2] add a new option -t to print template of testcase config file
by Guannan Ren 16 Apr '12

16 Apr '12

If a given testcase has clean function, the clean flag will be used automatically # python libvirt-test-api.py -t repos/domain/attach_disk.py \ repos/storage/create_netfs_pool.py \ repos/domain/save.py output: domain:attach_disk guestname GUESTNAME guesttype GUESTTYPE imagename IMAGENAME imagesize IMAGESIZE hdmodel HDMODEL storage:create_netfs_pool poolname POOLNAME sourcename SOURCENAME sourcepath SOURCEPATH pooltype POOLTYPE [targetpath] TARGETPATH domain:save guestname GUESTNAME filepath FILEPATH clean --- libvirt-test-api.py | 49 +++++++++++++++++++++++++++++++++++++++++++++++-- proxy.py | 17 +++++++++++++++++ 2 files changed, 64 insertions(+), 2 deletions(-) diff --git a/libvirt-test-api.py b/libvirt-test-api.py index c171276..385b52d 100644 --- a/libvirt-test-api.py +++ b/libvirt-test-api.py @@ -35,6 +35,7 @@ def usage(): print "Usage: libvirt_test_api.py <OPTIONS> <ARGUS>" print "\noptions: -h, --help : Display usage information \ \n -c, --casefile: Specify configuration file \ + \n -t, --template: Print testcase config file template \ \n -f, --logxml: Specify log file with type xml \ \n -l, --log-level: 0 or 1 currently \ \n -d, --delete-log: Delete log items \ @@ -45,6 +46,7 @@ def usage(): print "example: \ \n python libvirt-test-api.py -l 0|1 -c TEST.CONF \ \n python libvirt-test-api.py -c TEST.CONF -f TEST.XML \ + \n python libvirt-test-api.py -t repos/domain/start.py ... \ \n python libvirt-test-api.py -m TESTONE.XML TESTTWO.XML \ \n python libvirt-test-api.py -d TEST.XML TESTRUNID TESTID \ \n python libvirt-test-api.py -d TEST.XML TESTRUNID \ @@ -215,6 +217,41 @@ class Main(object): return 1 return 0 + def print_casefile(self, testcases): + """print testcase file template""" + modcasename = [] + for case in testcases: + if not os.path.isfile(case) or not case.endswith('.py'): + print "testcase %s couldn't be recognized" % case + return 1 + + paths = case.split('/') + modcasename.append(paths[1] + ':' + paths[2][:-3]) + + proxy_obj = proxy.Proxy(modcasename) + case_params = proxy_obj.get_params_variables() + + string = "# the file is generated automatically, please\n" \ + "# make some modifications before the use of it\n" \ + "# params in [] are optional to its testcase\n" + for key in modcasename: + string += "%s\n" % key + required_params, optional_params = case_params[key] + for p in required_params: + string += " " * 4 + p + "\n" + string += " " * 8 + p.upper() + "\n" + for p in optional_params: + string += " " * 4 + "[" + p + "]\n" + string += " " * 8 + p.upper() + "\n" + + if proxy_obj.has_clean_function(key): + string += "clean\n" + + string += "\n" + + print string + return 0 + def remove_log(self, testrunid, testid = None): """ to remove log item in the log xmlfile """ log_xml_parser = LogXMLParser(self.logxml) @@ -274,8 +311,8 @@ if __name__ == "__main__": loglevel = 0 try: - opts, args = getopt.getopt(sys.argv[1:], "hc:l:dmr", - ["help", "casefile=", "logxml=", + opts, args = getopt.getopt(sys.argv[1:], "hc:tl:dmr", + ["help", "casefile=", "template", "logxml=", "delete-log=", "merge=", "rerun="]) except getopt.GetoptError, err: print str(err) @@ -288,6 +325,14 @@ if __name__ == "__main__": sys.exit(0) if o == "-c" or o == "--casefile": casefile = v + if o == "-t" or o == "--template": + if len(args) <= 0: + usage() + sys.exit(1) + main = Main('', '', '', '') + if main.print_casefile(args): + sys.exit(1) + sys.exit(0) if o == "-f" or o == "--logxml": logxml = v if o == "-l" or o == "--log-level": diff --git a/proxy.py b/proxy.py index fdbffd9..bc82a84 100644 --- a/proxy.py +++ b/proxy.py @@ -120,6 +120,23 @@ class Proxy(object): ("required_params or optional_params not found in %s" % testcase_name) return case_params + def has_clean_function(self, testcase_name): + """ Return true if the testcase have clean function + """ + if testcase_name not in self.testcases_names: + return False + + elements = testcase_name.split(':') + casename = elements[1] + func = casename + '_clean' + + casemod_ref = self.testcase_ref_dict[testcase_name] + var_func_names = dir(casemod_ref) + + if func in var_func_names: + return True + return False + def get_call_dict(self, module, casename, func = None): """ Return testing function reference dictionary """ case_abs_path = '%s.%s.%s' % ('repos', module, casename) -- 1.7.7.5

2 3

[libvirt] [test-API PATCH 0/3] make clean function optional
by Guannan Ren 16 Apr '12

16 Apr '12

The set of patches is to make the writing of clean function optional. If a testcase which doesn't dirty the testing environment, then the TESTCASE_clean function could be optional or omitted. Because loggers in python are static objects managed by the module itself. When you create one, it won't be removed until the shell quit. In test-API there are two loggers which are configured with two handlers for each. we need to find a way to destruct these two loggers in order no to affect other application. The idea is to clear the handlers of each logger in destructor of CaseLog and EnvLog. def __del__(self): self.logger.handlers = [] rename some unclear function and variables. for example: repos/domain/start.py domain -> mod start.py -> case start() -> func

2 9

[libvirt] [test-API PATCH 0/5] add TESTCASE_check optional function support
by Guannan Ren 16 Apr '12

16 Apr '12

In some cases, we need to check if the testing environment is satisfied to run a certain testcase. The testcase only will be executed If some specific hardware is present on box. The patches add a optional check function support. For example: a testcase named testa.py with testa_check() defined in this file. The framework will run test_check(params) first, return 0 means pass, 1 means failure. If the check function failed. the testa(params) will not be run. "Skip" is marked in output. # testa.py required_params = () optional_params = ('options') def testa_check(params): logger = params['logger'] logger.info("I am from testa_check") return 1 def testa(params): logger = params['logger'] logger.info("I am from testa") return 1 The Output: Checking Testing Environment... Linux localhost.localdomain 3.2.5-3.fc16.x86_64 #1 SMP Thu Feb 9 01:24:38 UTC 2012 x86_64 x86_64 x86_64 GNU/Linux Virsh command line tool of libvirt: 0.9.10 libvirtd (libvirt) 0.9.10 Default URI: qemu:///system QEMU emulator version 0.15.0 (qemu-kvm-0.15.0), Copyright (c) 2003-2008 Fabrice Bellard Start Testing: Case Count: 1 Log File: log/20120416142755/libvirt_test001 test:testa 14:27:56|INFO |I am from testa_check 14:27:56|INFO |Failed to meet testing requirement Result: Skip Summary: Total:1 [Pass:0 Fail:0 Skip:1] The testcase.conf file: test:testa options value1

1 5

[libvirt] [PATCH] Web placeholder for pending patches on the web site
by Daniel Veillard 16 Apr '12

16 Apr '12

This is based on recent developments on patch checker and the goal is to keep a list of pending patches needing review on the project web site. The page template in git just hold a pointer to the web page. diff --git a/docs/pending.html.in b/docs/pending.html.in new file mode 100644 index 0000000..dfbe647 --- /dev/null +++ b/docs/pending.html.in @@ -0,0 +1,13 @@ +<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <title>Pending patches needing review</title> + </head> + <body> + <h1>Pending patches needing review</h1> + <p> A list of pending patches needing review upstream is available + on <a href="http://libvirt.org/pending.html">the project pending + patches page</a>.</p> + </body> +</html> + diff --git a/docs/sitemap.html.in b/docs/sitemap.html.in index 1de2b20..8f58d46 100644 --- a/docs/sitemap.html.in +++ b/docs/sitemap.html.in @@ -332,6 +332,10 @@ <a href="todo.html">Todo list</a> <span>Main feature request list</span> </li> + <li> + <a href="pending.html">Pending patches</a> + <span>Pending patches awaiting reviews and integration</span> + </li> </ul> </li> <li> -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

3 5

[libvirt] [PATCH] domain:screenshot: fixed screen parameter
by Martin Kletzander 16 Apr '12

16 Apr '12

The screen parameter must be an integer. I also chnaged it to variable parameter with the reasonable default. --- repos/domain/screenshot.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/repos/domain/screenshot.py b/repos/domain/screenshot.py index d73e980..3e727a7 100644 --- a/repos/domain/screenshot.py +++ b/repos/domain/screenshot.py @@ -7,8 +7,8 @@ import mimetypes import libvirt -required_params = ('guestname', 'screen', 'filename',) -optional_params = () +required_params = ('guestname', 'filename',) +optional_params = ('screen',) def saver(stream, data, file_): return file_.write(data) @@ -24,7 +24,8 @@ def screenshot(params): dom = conn.lookupByName(params['guestname']) st = conn.newStream(0) - mime = dom.screenshot(st, params['screen'], 0) + screen = params.get('screen', 0) + mime = dom.screenshot(st, int('screen'), 0) ext = mimetypes.guess_extension(mime) or '.ppm' filename = params['filename'] + ext -- 1.7.8.5

2 2

[libvirt] libvirt slow responding after restart of service
by Anton Gorlov 15 Apr '12

15 Apr '12

after service libvirtd restarted has go slow responding (virsh,virt-install and some other tools) lsof /var/run/libvirt/libvirt-sock-ro and attach strace to this $PID always show futex(0x7d1f84, FUTEX_WAIT_PRIVATE, 3, NULL) = -1 EAGAIN (Resource temporarily unavailable) futex(0x7d1f84, FUTEX_WAIT_PRIVATE, 5, NULL <detached ...> in starce of any threds (strace -p $PID -ff -o /opt/virtdebug.log) gdb show only (gdb) bt #0 0x00007f938c1e3703 in __poll (fds=<value optimized out>, nfds=<value optimized out>, timeout=<value optimized out>) at ../sysdeps/unix/sysv/linux/poll.c:87 #1 0x00000000004fadd0 in virEventPollRunOnce () at util/event_poll.c:620 #2 0x00000000004f99e5 in virEventRunDefaultImpl () at util/event.c:247 #3 0x00007f938c9e76dd in virNetServerRun (srv=0x7d1e30) at rpc/virnetserver.c:736 #4 0x0000000000423f2c in main (argc=<value optimized out>, argv=<value optimized out>) at libvirtd.c:1609 LIBVIRT_DEFAULT_URI=qemu:///system time virsh -r list ID Имя Статус ---------------------------------------------------- 1 debian6.0 работает 0.00user 0.00system 0:28.29elapsed 0%CPU (0avgtext+0avgdata 21520maxresident)k 0inputs+0outputs (0major+1809minor)pagefaults 0swaps and with LIBVIRT_DEBUG=1 LIBVIRT_DEBUG=1 LIBVIRT_DEFAULT_URI=qemu:///system time virsh -r list 2012-04-14 21:21:45.185+0000: 21338: info : libvirt version: 0.9.11, package: alt3M60P1 2012-04-14 21:21:45.185+0000: 21338: debug : virInitialize:414 : register drivers 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:775 : driver=0x7f16fb22e8e0 name=Test 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:799 : registering Test as driver 0 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterNetworkDriver:592 : registering Test as network driver 0 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterInterfaceDriver:625 : registering Test as interface driver 0 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterStorageDriver:658 : registering Test as storage driver 0 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDeviceMonitor:691 : registering Test as device driver 0 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterSecretDriver:724 : registering Test as secret driver 0 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterNWFilterDriver:757 : registering Test as network filter driver 0 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:775 : driver=0x7f16fb22fe20 name=Xen 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:799 : registering Xen as driver 1 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:775 : driver=0x7f16fb230de0 name=OPENVZ 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:799 : registering OPENVZ as driver 2 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:775 : driver=0x7f16fb231300 name=VMWARE 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:799 : registering VMWARE as driver 3 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:775 : driver=0x7f16fb2306c0 name=PHYP 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:799 : registering PHYP as driver 4 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterStorageDriver:658 : registering PHYP as storage driver 1 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterInterfaceDriver:625 : registering PHYP as interface driver 1 2012-04-14 21:21:45.185+0000: 21338: debug : vboxRegister:137 : VBoxCGlueInit failed, using dummy driver 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:775 : driver=0x7f16fb231820 name=VBOX 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:799 : registering VBOX as driver 5 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterNetworkDriver:592 : registering VBOX as network driver 1 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterStorageDriver:658 : registering VBOX as storage driver 2 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:775 : driver=0x7f16fb234800 name=ESX 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:799 : registering ESX as driver 6 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterInterfaceDriver:625 : registering ESX as interface driver 2 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterNetworkDriver:592 : registering ESX as network driver 2 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterStorageDriver:658 : registering ESX as storage driver 3 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDeviceMonitor:691 : registering ESX as device driver 1 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterSecretDriver:724 : registering ESX as secret driver 1 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterNWFilterDriver:757 : registering ESX as network filter driver 1 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:775 : driver=0x7f16fb22f1c0 name=remote 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:799 : registering remote as driver 7 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterNetworkDriver:592 : registering remote as network driver 3 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterInterfaceDriver:625 : registering remote as interface driver 3 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterStorageDriver:658 : registering remote as storage driver 4 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDeviceMonitor:691 : registering remote as device driver 2 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterSecretDriver:724 : registering remote as secret driver 2 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterNWFilterDriver:757 : registering remote as network filter driver 2 2012-04-14 21:21:45.185+0000: 21338: debug : virEventRegisterDefaultImpl:204 : registering default event implementation 2012-04-14 21:21:45.185+0000: 21338: debug : virEventPollAddHandle:116 : Used 0 handle slots, adding at least 10 more 2012-04-14 21:21:45.185+0000: 21338: debug : virEventPollInterruptLocked:702 : Skip interrupt, 0 0 2012-04-14 21:21:45.185+0000: 21338: debug : virEventPollAddHandle:141 : EVENT_POLL_ADD_HANDLE: watch=1 fd=4 events=1 cb=0x7f16fad71670 op 2012-04-14 21:21:45.185+0000: 21338: debug : virEventRegisterImpl:177 : addHandle=0x7f16fad72260 updateHandle=0x7f16fad72130 removeHandle=imeout=0x7f16fad71c50 updateTimeout=0x7f16fad71e20 removeTimeout=0x7f16fad71f50 2012-04-14 21:21:45.185+0000: 21338: debug : virConnectOpenAuth:1455 : name=(null), auth=0x7f16fb22e860, flags=1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventRunDefaultImpl:244 : running default event implementation 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupTimeouts:506 : Cleanup 0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupTimeouts:542 : Found 0 out of 0 timeout slots used, releasing 0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupHandles:554 : Cleanup 1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollMakePollFDs:383 : Prepare n=0 w=1, f=4 e=1 d=0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCalculateTimeout:325 : Calculate expiry of 0 timers 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCalculateTimeout:351 : Timeout at 0 due in -1 ms 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollRunOnce:619 : EVENT_POLL_RUN: nhandles=1 timeout=-1 2012-04-14 21:21:45.186+0000: 21338: debug : virConnectGetDefaultURI:1105 : Using LIBVIRT_DEFAULT_URI 'qemu:///system' 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1182 : name "qemu:///system" to URI components: scheme qemu server (null) user (null) port 0 path /system 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1226 : trying driver 0 (Test) ... 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1232 : driver 0 Test returned DECLINED 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1226 : trying driver 1 (Xen) ... 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1232 : driver 1 Xen returned DECLINED 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1226 : trying driver 2 (OPENVZ) ... 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1232 : driver 2 OPENVZ returned DECLINED 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1226 : trying driver 3 (VMWARE) ... 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1232 : driver 3 VMWARE returned DECLINED 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1226 : trying driver 4 (PHYP) ... 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1232 : driver 4 PHYP returned DECLINED 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1226 : trying driver 5 (VBOX) ... 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1232 : driver 5 VBOX returned DECLINED 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1226 : trying driver 6 (ESX) ... 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1232 : driver 6 ESX returned DECLINED 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1226 : trying driver 7 (remote) ... 2012-04-14 21:21:45.186+0000: 21338: debug : doRemoteOpen:542 : proceeding with name = qemu:///system 2012-04-14 21:21:45.186+0000: 21338: debug : doRemoteOpen:552 : Connecting with transport 1 2012-04-14 21:21:45.186+0000: 21338: debug : doRemoteOpen:599 : Proceeding with sockname /var/run/libvirt/libvirt-sock-ro 2012-04-14 21:21:45.186+0000: 21338: debug : virNetSocketNew:119 : localAddr=0x7fff75e552a0 remoteAddr=0x7fff75e55210 fd=6 errfd 2012-04-14 21:21:45.186+0000: 21338: debug : virNetSocketNew:179 : RPC_SOCKET_NEW: sock=0x680f90 refs=1 fd=6 errfd=-1 pid=0 localAddr=127.=127.0.0.1;0 2012-04-14 21:21:45.186+0000: 21338: debug : virNetSocketRef:709 : RPC_SOCKET_REF: sock=0x680f90 refs=2 2012-04-14 21:21:45.186+0000: 21338: debug : virEventPollInterruptLocked:706 : Interrupting 2012-04-14 21:21:45.186+0000: 21338: debug : virEventPollAddHandle:141 : EVENT_POLL_ADD_HANDLE: watch=2 fd=6 events=1 cb=0x7f16fae700b0 op7f16fae707f0 2012-04-14 21:21:45.186+0000: 21338: debug : virKeepAliveNew:244 : client=0x7f16fb283010, interval=-1, count=0 2012-04-14 21:21:45.186+0000: 21338: debug : virEventPollAddTimeout:225 : Used 0 timeout slots, adding at least 10 more 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollRunOnce:630 : Poll got 1 event(s) 2012-04-14 21:21:45.186+0000: 21338: debug : virEventPollInterruptLocked:706 : Interrupting 2012-04-14 21:21:45.186+0000: 21338: debug : virEventPollAddTimeout:248 : EVENT_POLL_ADD_TIMEOUT: timer=1 frequency=-1 cb=0x7f16fae6c180 ox7f16fae6c3a0 2012-04-14 21:21:45.186+0000: 21338: debug : virKeepAliveNew:277 : RPC_KEEPALIVE_NEW: ka=0x680870 client=0x7f16fb283010 refs=2 2012-04-14 21:21:45.186+0000: 21338: debug : virNetClientNew:324 : RPC_CLIENT_NEW: client=0x7f16fb283010 refs=3 sock=0x680f9 2012-04-14 21:21:45.186+0000: 21338: debug : doRemoteOpen:684 : Trying authentication 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchTimeouts:415 : Dispatch 1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchHandles:460 : Dispatch 1 2012-04-14 21:21:45.186+0000: 21338: debug : virNetMessageNew:48 : msg=0x7f16f43fb010 tracked=0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchHandles:474 : i=0 w=1 2012-04-14 21:21:45.186+0000: 21338: debug : virNetMessageEncodePayload:351 : Encode length as 28 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchHandles:488 : EVENT_POLL_DISPATCH_HANDLE: watch=1 events=1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupTimeouts:506 : Cleanup 1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupHandles:554 : Cleanup 2 2012-04-14 21:21:45.186+0000: 21339: debug : virEventRunDefaultImpl:244 : running default event implementation 2012-04-14 21:21:45.186+0000: 21338: debug : virNetClientSendInternal:1675 : RPC_CLIENT_MSG_TX_QUEUE: client=0x7f16fb283010 len=28 prog=53=66 type=0 status=0 serial=0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupTimeouts:506 : Cleanup 1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupHandles:554 : Cleanup 2 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollMakePollFDs:383 : Prepare n=0 w=1, f=4 e=1 d=0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollMakePollFDs:383 : Prepare n=1 w=2, f=6 e=1 d=0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCalculateTimeout:325 : Calculate expiry of 1 timers 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCalculateTimeout:351 : Timeout at 0 due in -1 ms 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollRunOnce:619 : EVENT_POLL_RUN: nhandles=2 timeout=-1 2012-04-14 21:21:45.186+0000: 21338: debug : virNetClientIO:1533 : Outgoing message prog=536903814 version=1 serial=0 proc=66 type=0 lengt 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollRunOnce:630 : Poll got 1 event(s) 2012-04-14 21:21:45.186+0000: 21338: debug : virNetClientIO:1591 : We have the buck 0x6822d0 0x6822d0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchTimeouts:415 : Dispatch 1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchHandles:460 : Dispatch 2 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchHandles:474 : i=0 w=1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchHandles:488 : EVENT_POLL_DISPATCH_HANDLE: watch=1 events=1 2012-04-14 21:21:45.186+0000: 21338: debug : virEventPollUpdateHandle:151 : EVENT_POLL_UPDATE_HANDLE: watch=2 events=0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchHandles:474 : i=1 w=2 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupTimeouts:506 : Cleanup 1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupHandles:554 : Cleanup 2 2012-04-14 21:21:45.186+0000: 21339: debug : virEventRunDefaultImpl:244 : running default event implementation 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupTimeouts:506 : Cleanup 1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupHandles:554 : Cleanup 2 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollMakePollFDs:383 : Prepare n=0 w=1, f=4 e=1 d=0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollMakePollFDs:383 : Prepare n=1 w=2, f=6 e=1 d=0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCalculateTimeout:325 : Calculate expiry of 1 timers 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCalculateTimeout:351 : Timeout at 0 due in -1 ms 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollRunOnce:619 : EVENT_POLL_RUN: nhandles=2 timeout=-1 2012-04-14 21:21:45.186+0000: 21338: debug : virEventPollInterruptLocked:706 : Interrupting 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollRunOnce:630 : Poll got 1 event(s) 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchTimeouts:415 : Dispatch 1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchHandles:460 : Dispatch 2 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchHandles:474 : i=0 w=1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchHandles:488 : EVENT_POLL_DISPATCH_HANDLE: watch=1 events=1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupTimeouts:506 : Cleanup 1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupHandles:554 : Cleanup 2 2012-04-14 21:21:45.186+0000: 21339: debug : virEventRunDefaultImpl:244 : running default event implementation 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupTimeouts:506 : Cleanup 1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupHandles:554 : Cleanup 2 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollMakePollFDs:383 : Prepare n=0 w=1, f=4 e=1 d=0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollMakePollFDs:383 : Prepare n=1 w=2, f=6 e=0 d=0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCalculateTimeout:325 : Calculate expiry of 1 timers 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCalculateTimeout:351 : Timeout at 0 due in -1 ms 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollRunOnce:619 : EVENT_POLL_RUN: nhandles=1 timeout=-1 uname -a Linux f37.local 3.3.1-std-def-alt1 #1 SMP Tue Apr 10 13:27:26 UTC 2012 x86_64 GNU/Linux libvirtd --version libvirtd (libvirt) 0.9.11

1 0

[libvirt] [PATCH] Fix macvtap detection by also checking for IFLA_VF_MAX
by Guido Günther 15 Apr '12

15 Apr '12

since this isn't available on older kernels such as Debian Squeeze's 2.6.32. This make --with-macvtap=check work as expected. --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) O.k. to apply? Cheers, -- Guido diff --git a/configure.ac b/configure.ac index 3f5b3ff..53c9b34 100644 --- a/configure.ac +++ b/configure.ac @@ -2534,7 +2534,8 @@ AC_MSG_CHECKING([whether to compile with macvtap support]) if test "$with_macvtap" != "no" ; then AC_TRY_COMPILE([ #include <sys/socket.h> #include <linux/rtnetlink.h> ], - [ int x = MACVLAN_MODE_BRIDGE; ], + [ int x = MACVLAN_MODE_BRIDGE; + int y = IFLA_VF_MAX; ], [ with_macvtap=yes ], [ if test "$with_macvtap" = "yes" ; then AC_MSG_ERROR([Installed linux headers don't show support for macvtap device.]) -- 1.7.9.5

2 2

[libvirt] libvirt slow responding after restart of service
by Anton Gorlov 14 Apr '12

14 Apr '12

after service libvirtd restarted has go slow responding (virsh,virt-install and some other tools) lsof /var/run/libvirt/libvirt-sock-ro and attach strace to this $PID always show futex(0x7d1f84, FUTEX_WAIT_PRIVATE, 3, NULL) = -1 EAGAIN (Resource temporarily unavailable) futex(0x7d1f84, FUTEX_WAIT_PRIVATE, 5, NULL <detached ...> in starce of any threds (strace -p $PID -ff -o /opt/virtdebug.log) gdb show only (gdb) bt #0 0x00007f938c1e3703 in __poll (fds=<value optimized out>, nfds=<value optimized out>, timeout=<value optimized out>) at ../sysdeps/unix/sysv/linux/poll.c:87 #1 0x00000000004fadd0 in virEventPollRunOnce () at util/event_poll.c:620 #2 0x00000000004f99e5 in virEventRunDefaultImpl () at util/event.c:247 #3 0x00007f938c9e76dd in virNetServerRun (srv=0x7d1e30) at rpc/virnetserver.c:736 #4 0x0000000000423f2c in main (argc=<value optimized out>, argv=<value optimized out>) at libvirtd.c:1609 LIBVIRT_DEFAULT_URI=qemu:///system time virsh -r list ID Имя Статус ---------------------------------------------------- 1 debian6.0 работает 0.00user 0.00system 0:28.29elapsed 0%CPU (0avgtext+0avgdata 21520maxresident)k 0inputs+0outputs (0major+1809minor)pagefaults 0swaps and with LIBVIRT_DEBUG=1 LIBVIRT_DEBUG=1 LIBVIRT_DEFAULT_URI=qemu:///system time virsh -r list 2012-04-14 21:21:45.185+0000: 21338: info : libvirt version: 0.9.11, package: alt3M60P1 2012-04-14 21:21:45.185+0000: 21338: debug : virInitialize:414 : register drivers 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:775 : driver=0x7f16fb22e8e0 name=Test 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:799 : registering Test as driver 0 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterNetworkDriver:592 : registering Test as network driver 0 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterInterfaceDriver:625 : registering Test as interface driver 0 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterStorageDriver:658 : registering Test as storage driver 0 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDeviceMonitor:691 : registering Test as device driver 0 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterSecretDriver:724 : registering Test as secret driver 0 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterNWFilterDriver:757 : registering Test as network filter driver 0 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:775 : driver=0x7f16fb22fe20 name=Xen 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:799 : registering Xen as driver 1 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:775 : driver=0x7f16fb230de0 name=OPENVZ 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:799 : registering OPENVZ as driver 2 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:775 : driver=0x7f16fb231300 name=VMWARE 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:799 : registering VMWARE as driver 3 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:775 : driver=0x7f16fb2306c0 name=PHYP 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:799 : registering PHYP as driver 4 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterStorageDriver:658 : registering PHYP as storage driver 1 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterInterfaceDriver:625 : registering PHYP as interface driver 1 2012-04-14 21:21:45.185+0000: 21338: debug : vboxRegister:137 : VBoxCGlueInit failed, using dummy driver 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:775 : driver=0x7f16fb231820 name=VBOX 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:799 : registering VBOX as driver 5 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterNetworkDriver:592 : registering VBOX as network driver 1 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterStorageDriver:658 : registering VBOX as storage driver 2 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:775 : driver=0x7f16fb234800 name=ESX 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:799 : registering ESX as driver 6 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterInterfaceDriver:625 : registering ESX as interface driver 2 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterNetworkDriver:592 : registering ESX as network driver 2 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterStorageDriver:658 : registering ESX as storage driver 3 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDeviceMonitor:691 : registering ESX as device driver 1 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterSecretDriver:724 : registering ESX as secret driver 1 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterNWFilterDriver:757 : registering ESX as network filter driver 1 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:775 : driver=0x7f16fb22f1c0 name=remote 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:799 : registering remote as driver 7 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterNetworkDriver:592 : registering remote as network driver 3 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterInterfaceDriver:625 : registering remote as interface driver 3 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterStorageDriver:658 : registering remote as storage driver 4 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDeviceMonitor:691 : registering remote as device driver 2 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterSecretDriver:724 : registering remote as secret driver 2 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterNWFilterDriver:757 : registering remote as network filter driver 2 2012-04-14 21:21:45.185+0000: 21338: debug : virEventRegisterDefaultImpl:204 : registering default event implementation 2012-04-14 21:21:45.185+0000: 21338: debug : virEventPollAddHandle:116 : Used 0 handle slots, adding at least 10 more 2012-04-14 21:21:45.185+0000: 21338: debug : virEventPollInterruptLocked:702 : Skip interrupt, 0 0 2012-04-14 21:21:45.185+0000: 21338: debug : virEventPollAddHandle:141 : EVENT_POLL_ADD_HANDLE: watch=1 fd=4 events=1 cb=0x7f16fad71670 op 2012-04-14 21:21:45.185+0000: 21338: debug : virEventRegisterImpl:177 : addHandle=0x7f16fad72260 updateHandle=0x7f16fad72130 removeHandle=imeout=0x7f16fad71c50 updateTimeout=0x7f16fad71e20 removeTimeout=0x7f16fad71f50 2012-04-14 21:21:45.185+0000: 21338: debug : virConnectOpenAuth:1455 : name=(null), auth=0x7f16fb22e860, flags=1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventRunDefaultImpl:244 : running default event implementation 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupTimeouts:506 : Cleanup 0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupTimeouts:542 : Found 0 out of 0 timeout slots used, releasing 0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupHandles:554 : Cleanup 1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollMakePollFDs:383 : Prepare n=0 w=1, f=4 e=1 d=0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCalculateTimeout:325 : Calculate expiry of 0 timers 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCalculateTimeout:351 : Timeout at 0 due in -1 ms 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollRunOnce:619 : EVENT_POLL_RUN: nhandles=1 timeout=-1 2012-04-14 21:21:45.186+0000: 21338: debug : virConnectGetDefaultURI:1105 : Using LIBVIRT_DEFAULT_URI 'qemu:///system' 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1182 : name "qemu:///system" to URI components: scheme qemu server (null) user (null) port 0 path /system 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1226 : trying driver 0 (Test) ... 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1232 : driver 0 Test returned DECLINED 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1226 : trying driver 1 (Xen) ... 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1232 : driver 1 Xen returned DECLINED 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1226 : trying driver 2 (OPENVZ) ... 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1232 : driver 2 OPENVZ returned DECLINED 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1226 : trying driver 3 (VMWARE) ... 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1232 : driver 3 VMWARE returned DECLINED 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1226 : trying driver 4 (PHYP) ... 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1232 : driver 4 PHYP returned DECLINED 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1226 : trying driver 5 (VBOX) ... 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1232 : driver 5 VBOX returned DECLINED 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1226 : trying driver 6 (ESX) ... 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1232 : driver 6 ESX returned DECLINED 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1226 : trying driver 7 (remote) ... 2012-04-14 21:21:45.186+0000: 21338: debug : doRemoteOpen:542 : proceeding with name = qemu:///system 2012-04-14 21:21:45.186+0000: 21338: debug : doRemoteOpen:552 : Connecting with transport 1 2012-04-14 21:21:45.186+0000: 21338: debug : doRemoteOpen:599 : Proceeding with sockname /var/run/libvirt/libvirt-sock-ro 2012-04-14 21:21:45.186+0000: 21338: debug : virNetSocketNew:119 : localAddr=0x7fff75e552a0 remoteAddr=0x7fff75e55210 fd=6 errfd 2012-04-14 21:21:45.186+0000: 21338: debug : virNetSocketNew:179 : RPC_SOCKET_NEW: sock=0x680f90 refs=1 fd=6 errfd=-1 pid=0 localAddr=127.=127.0.0.1;0 2012-04-14 21:21:45.186+0000: 21338: debug : virNetSocketRef:709 : RPC_SOCKET_REF: sock=0x680f90 refs=2 2012-04-14 21:21:45.186+0000: 21338: debug : virEventPollInterruptLocked:706 : Interrupting 2012-04-14 21:21:45.186+0000: 21338: debug : virEventPollAddHandle:141 : EVENT_POLL_ADD_HANDLE: watch=2 fd=6 events=1 cb=0x7f16fae700b0 op7f16fae707f0 2012-04-14 21:21:45.186+0000: 21338: debug : virKeepAliveNew:244 : client=0x7f16fb283010, interval=-1, count=0 2012-04-14 21:21:45.186+0000: 21338: debug : virEventPollAddTimeout:225 : Used 0 timeout slots, adding at least 10 more 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollRunOnce:630 : Poll got 1 event(s) 2012-04-14 21:21:45.186+0000: 21338: debug : virEventPollInterruptLocked:706 : Interrupting 2012-04-14 21:21:45.186+0000: 21338: debug : virEventPollAddTimeout:248 : EVENT_POLL_ADD_TIMEOUT: timer=1 frequency=-1 cb=0x7f16fae6c180 ox7f16fae6c3a0 2012-04-14 21:21:45.186+0000: 21338: debug : virKeepAliveNew:277 : RPC_KEEPALIVE_NEW: ka=0x680870 client=0x7f16fb283010 refs=2 2012-04-14 21:21:45.186+0000: 21338: debug : virNetClientNew:324 : RPC_CLIENT_NEW: client=0x7f16fb283010 refs=3 sock=0x680f9 2012-04-14 21:21:45.186+0000: 21338: debug : doRemoteOpen:684 : Trying authentication 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchTimeouts:415 : Dispatch 1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchHandles:460 : Dispatch 1 2012-04-14 21:21:45.186+0000: 21338: debug : virNetMessageNew:48 : msg=0x7f16f43fb010 tracked=0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchHandles:474 : i=0 w=1 2012-04-14 21:21:45.186+0000: 21338: debug : virNetMessageEncodePayload:351 : Encode length as 28 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchHandles:488 : EVENT_POLL_DISPATCH_HANDLE: watch=1 events=1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupTimeouts:506 : Cleanup 1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupHandles:554 : Cleanup 2 2012-04-14 21:21:45.186+0000: 21339: debug : virEventRunDefaultImpl:244 : running default event implementation 2012-04-14 21:21:45.186+0000: 21338: debug : virNetClientSendInternal:1675 : RPC_CLIENT_MSG_TX_QUEUE: client=0x7f16fb283010 len=28 prog=53=66 type=0 status=0 serial=0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupTimeouts:506 : Cleanup 1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupHandles:554 : Cleanup 2 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollMakePollFDs:383 : Prepare n=0 w=1, f=4 e=1 d=0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollMakePollFDs:383 : Prepare n=1 w=2, f=6 e=1 d=0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCalculateTimeout:325 : Calculate expiry of 1 timers 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCalculateTimeout:351 : Timeout at 0 due in -1 ms 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollRunOnce:619 : EVENT_POLL_RUN: nhandles=2 timeout=-1 2012-04-14 21:21:45.186+0000: 21338: debug : virNetClientIO:1533 : Outgoing message prog=536903814 version=1 serial=0 proc=66 type=0 lengt 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollRunOnce:630 : Poll got 1 event(s) 2012-04-14 21:21:45.186+0000: 21338: debug : virNetClientIO:1591 : We have the buck 0x6822d0 0x6822d0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchTimeouts:415 : Dispatch 1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchHandles:460 : Dispatch 2 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchHandles:474 : i=0 w=1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchHandles:488 : EVENT_POLL_DISPATCH_HANDLE: watch=1 events=1 2012-04-14 21:21:45.186+0000: 21338: debug : virEventPollUpdateHandle:151 : EVENT_POLL_UPDATE_HANDLE: watch=2 events=0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchHandles:474 : i=1 w=2 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupTimeouts:506 : Cleanup 1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupHandles:554 : Cleanup 2 2012-04-14 21:21:45.186+0000: 21339: debug : virEventRunDefaultImpl:244 : running default event implementation 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupTimeouts:506 : Cleanup 1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupHandles:554 : Cleanup 2 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollMakePollFDs:383 : Prepare n=0 w=1, f=4 e=1 d=0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollMakePollFDs:383 : Prepare n=1 w=2, f=6 e=1 d=0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCalculateTimeout:325 : Calculate expiry of 1 timers 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCalculateTimeout:351 : Timeout at 0 due in -1 ms 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollRunOnce:619 : EVENT_POLL_RUN: nhandles=2 timeout=-1 2012-04-14 21:21:45.186+0000: 21338: debug : virEventPollInterruptLocked:706 : Interrupting 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollRunOnce:630 : Poll got 1 event(s) 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchTimeouts:415 : Dispatch 1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchHandles:460 : Dispatch 2 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchHandles:474 : i=0 w=1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchHandles:488 : EVENT_POLL_DISPATCH_HANDLE: watch=1 events=1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupTimeouts:506 : Cleanup 1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupHandles:554 : Cleanup 2 2012-04-14 21:21:45.186+0000: 21339: debug : virEventRunDefaultImpl:244 : running default event implementation 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupTimeouts:506 : Cleanup 1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupHandles:554 : Cleanup 2 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollMakePollFDs:383 : Prepare n=0 w=1, f=4 e=1 d=0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollMakePollFDs:383 : Prepare n=1 w=2, f=6 e=0 d=0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCalculateTimeout:325 : Calculate expiry of 1 timers 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCalculateTimeout:351 : Timeout at 0 due in -1 ms 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollRunOnce:619 : EVENT_POLL_RUN: nhandles=1 timeout=-1 uname -a Linux f37.local 3.3.1-std-def-alt1 #1 SMP Tue Apr 10 13:27:26 UTC 2012 x86_64 GNU/Linux libvirtd --version libvirtd (libvirt) 0.9.11

1 0