- Devel - libvirt List Archives

[libvirt] [PATCH 0/2] Filesystem limits for containers
by Guido Günther 24 Apr '12

24 Apr '12

Hi, the following two patches are a first stab at filesystem limits for containers. They're not ment for detailed review just to start the discussion. With these two patches space and inode limits in openvz containers are printed in the domain config as: <filesystem type='template' accessmode='passthrough'> <source name='debian'/> <target dir='/'/> <hardlimit>1153024</hardlimit> <softlimit>1048576</softlimit> <inodes_hardlimit>220000</inodes_hardlimit> <inodes_softlimit>200000</inodes_softlimit> </filesystem> Does this look o.k.? If so I'd cook up the schema updates and more parsing code. Other container solutions like lxc might have similar needs. Cheers, -- Guido Guido Günther (2): domain_conf: add filesystem limits to virDomainFSDef openvz; support file system quota reporting src/conf/domain_conf.c | 15 ++++++ src/conf/domain_conf.h | 4 ++ src/openvz/openvz_conf.c | 114 +++++++++++++++++++++++++++++----------------- 3 files changed, 92 insertions(+), 41 deletions(-) -- 1.7.10

2 1

[libvirt] [PATCH 1/2] domain_conf: add filesystem limits to virDomainFSDef
by Guido Günther 24 Apr '12

24 Apr '12

--- src/conf/domain_conf.c | 15 +++++++++++++++ src/conf/domain_conf.h | 4 ++++ 2 files changed, 19 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 184ff23..2b2a1d9 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11101,6 +11101,21 @@ virDomainFSDefFormat(virBufferPtr buf, if (virDomainDeviceInfoFormat(buf, &def->info, flags) < 0) return -1; + if (def->hard_limit) + virBufferAsprintf(buf, " <hardlimit>%llu</hardlimit>\n", + def->hard_limit); + if (def->soft_limit) + virBufferAsprintf(buf, " <softlimit>%llu</softlimit>\n", + def->soft_limit); + if (def->inodes_hard_limit) + virBufferAsprintf(buf, + " <inodes_hardlimit>%llu</inodes_hardlimit>\n", + def->inodes_hard_limit); + if (def->inodes_soft_limit) + virBufferAsprintf(buf, + " <inodes_softlimit>%llu</inodes_softlimit>\n", + def->inodes_soft_limit); + virBufferAddLit(buf, " </filesystem>\n"); return 0; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 5aa8fc1..149607e 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -692,6 +692,10 @@ struct _virDomainFSDef { char *dst; unsigned int readonly : 1; virDomainDeviceInfo info; + unsigned long long hard_limit; /* in kibibytes */ + unsigned long long soft_limit; /* in kibibytes */ + unsigned long long inodes_hard_limit; + unsigned long long inodes_soft_limit; }; -- 1.7.10

2 1

[libvirt] [PATCH 2/2] openvz; support file system quota reporting
by Guido Günther 24 Apr '12

24 Apr '12

--- src/openvz/openvz_conf.c | 114 +++++++++++++++++++++++++++++----------------- 1 file changed, 73 insertions(+), 41 deletions(-) diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index 579fcfc..7ea5e25 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -129,6 +129,51 @@ int openvzExtractVersion(struct openvz_driver *driver) } +/* Parse config values of the form barrier:limit into barrier and limit */ +static int +openvzParseBarrierAndLimit(const char *value, + unsigned long long *barrier, + unsigned long long *limit) +{ + char *token; + char *saveptr = NULL; + char *str = strdup(value); + + if (strcmp(value, "unlimited") == 0) { + barrier = limit = 0; + return 0; + } + + if (str == NULL) { + virReportOOMError(); + goto error; + } + + token = strtok_r(str, ":", &saveptr); + if (token == NULL) { + goto error; + } else { + if (barrier != NULL) { + if (virStrToLong_ull(token, NULL, 10, barrier)) + goto error; + } + } + token = strtok_r(NULL, ":", &saveptr); + if (token == NULL) { + goto error; + } else { + if (limit != NULL) { + if (virStrToLong_ull(token, NULL, 10, limit)) + goto error; + } + } + return 0; +error: + VIR_FREE(str); + return -1; +} + + static int openvzDefaultConsoleType(const char *ostype ATTRIBUTE_UNUSED) { return VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_OPENVZ; @@ -366,6 +411,7 @@ openvzReadFSConf(virDomainDefPtr def, virDomainFSDefPtr fs = NULL; char *veid_str = NULL; char *temp = NULL; + const char *param; ret = openvzReadVPSConfigParam(veid, "OSTEMPLATE", &temp); if (ret < 0) { @@ -403,6 +449,32 @@ openvzReadFSConf(virDomainDefPtr def, fs->dst = strdup("/"); + param = "DISKSPACE"; + ret = openvzReadVPSConfigParam(veid, param, &temp); + if (ret > 0) { + if (openvzParseBarrierAndLimit(temp, + &fs->soft_limit, + &fs->hard_limit)) { + openvzError(VIR_ERR_INTERNAL_ERROR, + _("Could not read '%s' from config for container %d"), + param, veid); + goto error; + } + } + + param = "DISKINODES"; + ret = openvzReadVPSConfigParam(veid, param, &temp); + if (ret > 0) { + if (openvzParseBarrierAndLimit(temp, + &fs->inodes_soft_limit, + &fs->inodes_hard_limit)) { + openvzError(VIR_ERR_INTERNAL_ERROR, + _("Could not read '%s' from config for container %d"), + param, veid); + goto error; + } + } + if (fs->src == NULL || fs->dst == NULL) goto no_memory; @@ -423,52 +495,12 @@ 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; + unsigned long long barrier, limit; const char *param; unsigned long kb_per_pages; -- 1.7.10

1 0

[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 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 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