- Devel - libvirt List Archives

Re: [libvirt] [PATCH v1 1/2] Backcompt for console devices in virDomainDeviceInfoIterate
by Li Zhang 22 Aug '12

22 Aug '12

Hi Daniel and Eric, Would you please help review this patch? This is one bug fix for pSeries. x86 doesn't have such a problem, because serial devices has no bus address on x86. I think this won't break x86. On 2012年08月08日 22:52, Li Zhang wrote: > Histrically, the first <console> element is treated as the > alias of a <serial> device. In the virDomainDeviceInfoIterate, > This situation is not considered. It still handles the first <console> > element as another devices, which means that for console[0] with > serial targetType, it calls callback function another time. > It will cause the problem of address conflicts when assigning > spapr-vio address for serial device on pSeries guest. > > The following describes the problem: > > For pSeries guest, the serial configuration in the xml file > is as the following: > <serial type='pty'> > <target port='0'/> > <address type='spapr-vio'/> > </serial> > > There is no console configuration in this file. The dumped xml file > is as the following: > <serial type='pty'> > <source path='/dev/pts/5'/> > <target port='0'/> > <alias name='serial0'/> > <address type='spapr-vio' reg='0x30000000'/> > </serial> > <console type='pty' tty='/dev/pts/5'> > <source path='/dev/pts/5'/> > <target type='serial' port='0'/> > <alias name='serial0'/> > <address type='spapr-vio' reg='0x30000000'/> > </console> > > It shows that the <console> device is the alias of serial device. > So its address is the same as the serial device. When dectecting > the conflicts in the qemuAssignSpaprVIOAddress the first console > and the serial device conflicts because virDomainDeviceInfoIterate() > still handle these are two different devices, and in the qemuAssignSpaprVIOAddress(), > it will compare these two devices' addressed. If they have same address, > it will report address error. Actually, they should have the same address, > and the error shouldn't be reported. > > So this patch is to handle the first console which targetType is serial > as the alias of serial device to avoid address conflicts error reported. > > Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> > --- > src/conf/domain_conf.c | 3 +++ > 1 files changed, 3 insertions(+), 0 deletions(-) > > diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c > index d8c0969..cddf6ce 100644 > --- a/src/conf/domain_conf.c > +++ b/src/conf/domain_conf.c > @@ -2035,6 +2035,9 @@ int virDomainDeviceInfoIterate(virDomainDefPtr def, > return -1; > } > for (i = 0; i < def->nconsoles ; i++) { > + if ((STREQ(def->os.type, "hvm")) && i == 0 && > + def->consoles[i]->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL) > + continue; > device.data.chr = def->consoles[i]; > if (cb(def, &device, &def->consoles[i]->info, opaque) < 0) > return -1; -- Li Zhang IBM China Linux Technology Centre

2 1

[libvirt] [PATCH 0/2 v3] Storage: Allow pool building while creating it
by Osier Yang 22 Aug '12

22 Aug '12

v2 - v3: * Just rebase on the top. We tries to start the pool while creating a transicient pool, if the pool target is not existed yet, we must fail on starting, and thus we see many users raise up the problem on either list or bugzilla. Patch 2/3 and 3/3 are to fix the problem by introducing flags to allow the pool building for APIs virStoragePoolCreate and virStoragePoolCreateXML, and expose the flags to commands pool-create/pool-create-as/pool-start. Osier Yang (2): storage: New flags to allow building the pool while creating it virsh: New options for the 3 pool commands to allow pool building include/libvirt/libvirt.h.in | 13 +++++ src/libvirt.c | 4 +- src/storage/storage_driver.c | 38 +++++++++++++++- tools/virsh-pool.c | 100 +++++++++++++++++++++++++++++++++++++++--- tools/virsh.pod | 27 ++++++++++- 5 files changed, 169 insertions(+), 13 deletions(-) -- 1.7.7.3

2 4

[libvirt] [PATCH v4] network: use firewalld instead of iptables, when available
by Laine Stump 22 Aug '12

22 Aug '12

From: Thomas Woerner <twoerner(a)redhat.com> (This is Thomas v3 version of 1/2 of the firewalld patches, modified to check for firewall-cmd and firewalld state only once, rather than every time an iptables rule is added or removed. It's not intended to be pushed, because I'm still having issues with it, at least on my machine. I'm mostly concerned with item (1) on the list below; the others could be solved later or tolerated.) * configure.ac, spec file: firewalld defaults to enabled if dbus is available, otherwise is disabled. If --with_firewalld is explicitly requested and dbus is not available, configure will fail. * bridge_driver: add dbus filters to get the FirewallD1.Reloaded signal and DBus.NameOwnerChanged on org.fedoraproject.FirewallD1. When these are encountered, reload all the iptables reuls of all libvirt's virtual networks (similar to what happens when libvirtd is restarted). * iptables, ebtables: use firewall-cmd's direct passthrough interface when available, otherwise use iptables and ebtables commands. This decision is made once the first time libvirt calls iptables/ebtables, and that decision is maintained for the life of libvirtd. * Note that the nwfilter part of this patch was separated out into another patch by Stefan in V2, so that needs to be revised and re-reviewed as well. ================ All the configure.ac and specfile changes are unchanged from Thomas' V3. V3 re-ran "firewall-cmd --state" every time a new rule was added, which was extremely inefficient. V4 uses VIR_ONCE_GLOBAL_INIT to set up a one-time initialization function. The VIR_ONCE_GLOBAL_INIT(x) macro references a static function called vir(Ip|Eb)OnceInit(), which will then be called the first time that the static function vir(Ip|Eb)TablesInitialize() is called (that function is defined for you by the macro). This is thread-safe, so there is no chance of any race. IMPORTANT NOTE: I've left the VIR_DEBUG messages in these two init functions (one for iptables, on for ebtables) as VIR_WARN so that I don't have to turn on all the other debug message just to see these. Even if this patch doesn't need any other modification, those messages need to be changed to VIR_DEBUG before pushing. This one-time initialization works well. However, I've encountered problems with testing: 1) Whenever I have enabled the firewalld service, *all* attempts to call firewall-cmd from within libvirtd end with firewall-cmd hanging internally somewhere. This is *not* the case if firewall-cmd returns non-0 in response to "firewall-cmd --state" (i.e. *that* command runs and returns to libvirt successfully.) 2) If I start libvirtd while firewalld is stopped, then start firewalld later, this triggers libvirtd to reload its iptables rules, however it also spits out a *ton* of complaints about deletion failing (I suppose because firewalld has nuked all of libvirt's rules). I guess we need to suppress those messages (which is a more annoying problem to fix than you might think, but that's another story). 3) I noticed a few times during this long line of errors that firewalld made a complaint about "Resource Temporarily unavailable. Having libvirtd access iptables commands directly at the same time as firewalld is doing so is apparently problematic. 4) In general, I'm concerned about the "set it once and never change it" method - if firewalld is disabled at libvirtd startup, causing libvirtd to always use iptables/ebtables directly, this won't cause *terrible* problems, but if libvirtd decides to use firewall-cmd and firewalld is later disabled, libvirtd will not be able to recover. --- AUTHORS | 2 +- configure.ac | 17 +++++++++++++++ libvirt.spec.in | 11 ++++++++++ src/Makefile.am | 4 ++-- src/network/bridge_driver.c | 49 ++++++++++++++++++++++++++++++++++++++++++ src/util/ebtables.c | 52 ++++++++++++++++++++++++++++++++++++++++++++- src/util/iptables.c | 49 +++++++++++++++++++++++++++++++++++++++--- 7 files changed, 177 insertions(+), 7 deletions(-) diff --git a/AUTHORS b/AUTHORS index 8581aea..5dec3a2 100644 --- a/AUTHORS +++ b/AUTHORS @@ -257,7 +257,7 @@ Patches have also been contributed by: Frido Roose <frido.roose(a)gmail.com> Asad Saeed <asad.saeed(a)acidseed.com> Sukadev Bhattiprolu <sukadev(a)linux.vnet.ibm.com> - + Thomas Woerner <twoerner(a)redhat.com> [....send patches to get your name here....] The libvirt Logo was designed by Diana Fong diff --git a/configure.ac b/configure.ac index ba5a3cd..0150f99 100644 --- a/configure.ac +++ b/configure.ac @@ -1321,6 +1321,22 @@ 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 @<:@default=check@:>@]), + [], + [with_firewalld=check]) +if test "x$with_firewalld" = "xcheck" ; then + with_firewalld=$with_dbus +fi +if test "x$with_firewalld" == "xyes" ; then + if test "x$with_dbus" != "xyes" ; then + AC_MSG_ERROR([You must have dbus enabled for firewalld support]) + fi + AC_DEFINE_UNQUOTED([HAVE_FIREWALLD], [1], [whether firewalld support is enabled]) +fi +AM_CONDITIONAL([HAVE_FIREWALLD], [test "x$with_firewalld" != "xno"]) + dnl Avahi library AC_ARG_WITH([avahi], AC_HELP_STRING([--with-avahi], [use avahi to advertise remote daemon @<:@default=check@:>@]), @@ -3028,6 +3044,7 @@ AC_MSG_NOTICE([ sanlock: $SANLOCK_CFLAGS $SANLOCK_LIBS]) else AC_MSG_NOTICE([ sanlock: no]) fi +AC_MSG_NOTICE([firewalld: $with_firewalld]) if test "$with_avahi" = "yes" ; then AC_MSG_NOTICE([ avahi: $AVAHI_CFLAGS $AVAHI_LIBS]) else diff --git a/libvirt.spec.in b/libvirt.spec.in index 67b955a..ea2fd88 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -106,6 +106,7 @@ %define with_sanlock 0%{!?_without_sanlock:0} %define with_systemd 0%{!?_without_systemd:0} %define with_numad 0%{!?_without_numad:0} +%define with_firewalld 0%{!?_without_firewalld:0} # Non-server/HV driver defaults which are always enabled %define with_python 0%{!?_without_python:1} @@ -146,6 +147,11 @@ %define with_systemd 1 %endif +# Fedora 18 / RHEL-7 are first where firewalld support is enabled +%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 +%define with_firewalld 1 +%endif + # RHEL-5 has restricted QEMU to x86_64 only and is too old for LXC %if 0%{?rhel} == 5 %define with_qemu_tcg 0 @@ -1182,6 +1188,10 @@ of recent versions of Linux (and other OSes). %define _without_driver_modules --without-driver-modules %endif +%if %{with_firewalld} +%define _with_firewalld --with-firewalld +%endif + %define when %(date +"%%F-%%T") %define where %(hostname) %define who %{?packager}%{!?packager:Unknown} @@ -1240,6 +1250,7 @@ autoreconf -if %{?_without_audit} \ %{?_without_dtrace} \ %{?_without_driver_modules} \ + %{?_with_firewalld} \ %{with_packager} \ %{with_packager_version} \ --with-qemu-user=%{qemu_user} \ diff --git a/src/Makefile.am b/src/Makefile.am index b5f8056..6a94ecc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -988,7 +988,7 @@ libvirt_driver_network_la_SOURCES = libvirt_driver_network_la_LIBADD = libvirt_driver_network_impl.la if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_network.la -libvirt_driver_network_la_LIBADD += ../gnulib/lib/libgnu.la $(LIBNL_LIBS) +libvirt_driver_network_la_LIBADD += ../gnulib/lib/libgnu.la $(LIBNL_LIBS) $(DBUS_LIBS) libvirt_driver_network_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) else noinst_LTLIBRARIES += libvirt_driver_network.la @@ -998,7 +998,7 @@ endif libvirt_driver_network_impl_la_CFLAGS = \ $(LIBNL_CFLAGS) \ - -I$(top_srcdir)/src/conf $(AM_CFLAGS) + -I$(top_srcdir)/src/conf $(AM_CFLAGS) $(DBUS_CFLAGS) libvirt_driver_network_impl_la_SOURCES = $(NETWORK_DRIVER_SOURCES) endif EXTRA_DIST += network/default.xml diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 474bbfa..e3f0c1c 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -62,6 +62,7 @@ #include "virnetdevbridge.h" #include "virnetdevtap.h" #include "virnetdevvportprofile.h" +#include "virdbus.h" #define NETWORK_PID_DIR LOCALSTATEDIR "/run/libvirt/network" #define NETWORK_STATE_DIR LOCALSTATEDIR "/lib/libvirt/network" @@ -249,6 +250,25 @@ 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 = 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: * @@ -257,6 +277,9 @@ networkAutostartConfigs(struct network_driver *driver) { static int networkStartup(int privileged) { char *base = NULL; +#ifdef HAVE_FIREWALLD + DBusConnection *sysbus = NULL; +#endif if (VIR_ALLOC(driverState) < 0) goto error; @@ -323,6 +346,32 @@ 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, + driverState, NULL); + } +#endif + return 0; out_of_memory: diff --git a/src/util/ebtables.c b/src/util/ebtables.c index ca056b1..1a78f89 100644 --- a/src/util/ebtables.c +++ b/src/util/ebtables.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2010 Red Hat, Inc. + * Copyright (C) 2007-2012 Red Hat, Inc. * Copyright (C) 2009 IBM Corp. * * This library is free software; you can redistribute it and/or @@ -45,6 +45,38 @@ #include "memory.h" #include "virterror_internal.h" #include "logging.h" +#include "threads.h" + +#if HAVE_FIREWALLD +static char *firewall_cmd_path = NULL; + +static int +virEbTablesOnceInit(void) +{ + firewall_cmd_path = virFindFileInPath("firewall-cmd"); + if (!firewall_cmd_path) { + VIR_WARN("firewall-cmd not found on system. " + "firewalld support disabled for ebtables."); + } else { + virCommandPtr cmd = virCommandNew(firewall_cmd_path); + int status; + + virCommandAddArgList(cmd, "--state", NULL); + if (virCommandRun(cmd, &status) < 0 || status != 0) { + VIR_WARN("firewall-cmd found but disabled for ebtables"); + VIR_FREE(firewall_cmd_path); + firewall_cmd_path = NULL; + } else { + VIR_WARN("using firewalld for ebtables commands"); + } + virCommandFree(cmd); + } + return 0; +} + +VIR_ONCE_GLOBAL_INIT(virEbTables) + +#endif struct _ebtablesContext { @@ -181,6 +213,12 @@ ebtablesAddRemoveRule(ebtRules *rules, int action, const char *arg, ...) 2 + /* --insert bar */ 1; /* arg */ +#if HAVE_FIREWALLD + virEbTablesInitialize(); + if (firewall_cmd_path) + n += 3; /* --direct --passthrough eb */ +#endif + va_start(args, arg); while (va_arg(args, const char *)) n++; @@ -192,6 +230,18 @@ 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; + if (!(argv[n++] = strdup("--direct"))) + goto error; + if (!(argv[n++] = strdup("--passthrough"))) + goto error; + if (!(argv[n++] = strdup("eb"))) + goto error; + } else +#endif if (!(argv[n++] = strdup(EBTABLES_PATH))) goto error; diff --git a/src/util/iptables.c b/src/util/iptables.c index b23aca9..d8fdd3b 100644 --- a/src/util/iptables.c +++ b/src/util/iptables.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 Red Hat, Inc. + * Copyright (C) 2007-2012 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -43,6 +43,38 @@ #include "memory.h" #include "virterror_internal.h" #include "logging.h" +#include "threads.h" + +#if HAVE_FIREWALLD +static char *firewall_cmd_path = NULL; + +static int +virIpTablesOnceInit(void) +{ + firewall_cmd_path = virFindFileInPath("firewall-cmd"); + if (!firewall_cmd_path) { + VIR_WARN("firewall-cmd not found on system. " + "firewalld support disabled for iptables."); + } else { + virCommandPtr cmd = virCommandNew(firewall_cmd_path); + int status; + + virCommandAddArgList(cmd, "--state", NULL); + if (virCommandRun(cmd, &status) < 0 || status != 0) { + VIR_WARN("firewall-cmd found but disabled for iptables"); + VIR_FREE(firewall_cmd_path); + firewall_cmd_path = NULL; + } else { + VIR_WARN("using firewalld for iptables commands"); + } + virCommandFree(cmd); + } + return 0; +} + +VIR_ONCE_GLOBAL_INIT(virIpTables) + +#endif #define VIR_FROM_THIS VIR_FROM_NONE @@ -101,11 +133,22 @@ 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) +#if HAVE_FIREWALLD + virIpTablesInitialize(); + if (firewall_cmd_path) { + cmd = virCommandNew(firewall_cmd_path); + virCommandAddArgList(cmd, "--direct", "--passthrough", + (family == AF_INET6) ? "ipv6" : "ipv4", NULL); + } +#endif + + if (cmd == NULL) { + cmd = virCommandNew((family == AF_INET6) ? IP6TABLES_PATH : IPTABLES_PATH); + } virCommandAddArgList(cmd, "--table", rules->table, action == ADD ? "--insert" : "--delete", -- 1.7.11.4

3 5

[libvirt] [PATCH V2 0/2] (Basic) FirewallD support
by Stefan Berger 22 Aug '12

22 Aug '12

The following two patches provide basic firewalld support for libvirt. I took Thomas Woerner's patches and modified them where needed. Stefan

5 9

[libvirt] [PATCH] command: avoid double close in virExecWithHook
by Ján Tomko 22 Aug '12

22 Aug '12

Fix possible double close in the child process after the fork in case infd and outfd are equal, just like they are after being called from virNetSocketNewConnectCommand. --- src/util/command.c | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/util/command.c b/src/util/command.c index 7755572..49ec178 100644 --- a/src/util/command.c +++ b/src/util/command.c @@ -547,17 +547,13 @@ virExecWithHook(const char *const*argv, goto fork_error; } - if (infd != STDIN_FILENO && infd != null) + if (infd != STDIN_FILENO && infd != null && infd != childerr && + infd != childout) VIR_FORCE_CLOSE(infd); - if (childout > STDERR_FILENO && childout != null) { - tmpfd = childout; /* preserve childout value */ - VIR_FORCE_CLOSE(tmpfd); - } - if (childerr > STDERR_FILENO && - childerr != childout && - childerr != null) { + if (childout > STDERR_FILENO && childout != null && childout != childerr) + VIR_FORCE_CLOSE(childout); + if (childerr > STDERR_FILENO && childerr != null) VIR_FORCE_CLOSE(childerr); - } VIR_FORCE_CLOSE(null); /* Initialize full logging for a while */ -- 1.7.8.6

3 2

[libvirt] [PATCH] sanlock: Provide better error if lockspace directory is missing
by Jiri Denemark 22 Aug '12

22 Aug '12

Generating "Unable to add lockspace /lock/space/dir/__LIBVIRT__DISKS__: No such file or directory" is correct but not exactly clear. This patch changes the error message to "Unable to create lockspace /lock/space/dir/__LIBVIRT__DISKS__: parent directory does not exist or is not a directory". --- src/locking/lock_driver_sanlock.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index f046102..7700b31 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -35,6 +35,7 @@ #include <sanlock_resource.h> #include <sanlock_admin.h> +#include "dirname.h" #include "lock_driver.h" #include "logging.h" #include "virterror_internal.h" @@ -150,6 +151,7 @@ static int virLockManagerSanlockSetupLockspace(void) int rv; struct sanlk_lockspace ls; char *path = NULL; + char *dir = NULL; if (virAsprintf(&path, "%s/%s", driver->autoDiskLeasePath, @@ -174,6 +176,19 @@ static int virLockManagerSanlockSetupLockspace(void) */ if (stat(path, &st) < 0) { VIR_DEBUG("Lockspace %s does not yet exist", path); + + if (!(dir = mdir_name(path))) { + virReportOOMError(); + goto error; + } + if (stat(dir, &st) < 0 || !S_ISDIR(st.st_mode)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to create lockspace %s: parent directory" + " does not exist or is not a directory"), + path); + goto error; + } + if ((fd = open(path, O_WRONLY|O_CREAT|O_EXCL, 0600)) < 0) { if (errno != EEXIST) { virReportSystemError(errno, @@ -257,6 +272,7 @@ error_unlink: error: VIR_FORCE_CLOSE(fd); VIR_FREE(path); + VIR_FREE(dir); return -1; } -- 1.7.11.1

2 2

[libvirt] [PATCH] daemon: Autodetect lock driver directory
by Jiri Denemark 22 Aug '12

22 Aug '12

When running libvirtd from a build directory, libvirtd would load lock drivers from system directory unless explicitly overridden by setting LIBVIRT_LOCK_MANAGER_PLUGIN_DIR environment variable. Since we already autodetect driver directory if libvirt is build with driver modules, we can use the same trick to automagically set lock driver directory. --- daemon/libvirtd.c | 6 ++++-- src/libvirt_private.syms | 1 + src/locking/lock_manager.c | 12 +++++++++++- src/locking/lock_manager.h | 1 + 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index f0b0a3c..5245740 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -55,6 +55,7 @@ #include "hooks.h" #include "uuid.h" #include "viraudit.h" +#include "locking/lock_manager.h" #ifdef WITH_DRIVER_MODULES # include "driver.h" @@ -971,7 +972,6 @@ int main(int argc, char **argv) { /* initialize early logging */ virLogSetFromEnv(); -#ifdef WITH_DRIVER_MODULES if (strstr(argv[0], "lt-libvirtd") || strstr(argv[0], "/daemon/.libs/libvirtd")) { char *tmp = strrchr(argv[0], '/'); @@ -990,11 +990,13 @@ int main(int argc, char **argv) { argv[0], driverdir); exit(EXIT_FAILURE); } + virLockManagerSetPluginDir(driverdir); +#ifdef WITH_DRIVER_MODULES virDriverModuleInitialize(driverdir); +#endif *tmp = '/'; /* Must not free 'driverdir' - it is still used */ } -#endif while (1) { int optidx = 0; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 4cfa95f..e2d6d27 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -757,6 +757,7 @@ virLockManagerPluginUnref; virLockManagerPluginUsesState; virLockManagerPluginGetName; virLockManagerRelease; +virLockManagerSetPluginDir; # logging.h diff --git a/src/locking/lock_manager.c b/src/locking/lock_manager.c index 1d9c1bf..068327f 100644 --- a/src/locking/lock_manager.c +++ b/src/locking/lock_manager.c @@ -64,6 +64,16 @@ struct _virLockManagerPlugin { #define DEFAULT_LOCK_MANAGER_PLUGIN_DIR LIBDIR "/libvirt/lock-driver" +static const char *virLockManagerPluginDir = DEFAULT_LOCK_MANAGER_PLUGIN_DIR; + +void +virLockManagerSetPluginDir(const char *dir) +{ + if (dir) + virLockManagerPluginDir = dir; +} + + static void virLockManagerLogParams(size_t nparams, virLockManagerParamPtr params) { @@ -128,7 +138,7 @@ virLockManagerPluginPtr virLockManagerPluginNew(const char *name, driver = &virLockDriverNop; } else { if (moddir == NULL) - moddir = DEFAULT_LOCK_MANAGER_PLUGIN_DIR; + moddir = virLockManagerPluginDir; VIR_DEBUG("Module load %s from %s", name, moddir); diff --git a/src/locking/lock_manager.h b/src/locking/lock_manager.h index 25c7f7f..6a779f0 100644 --- a/src/locking/lock_manager.h +++ b/src/locking/lock_manager.h @@ -28,6 +28,7 @@ typedef struct _virLockManagerPlugin virLockManagerPlugin; typedef virLockManagerPlugin *virLockManagerPluginPtr; +void virLockManagerSetPluginDir(const char *dir); virLockManagerPluginPtr virLockManagerPluginNew(const char *name, const char *configFile, unsigned int flags); -- 1.7.11.1

2 2

[libvirt] [PATCH 00/23] Introduce a virtlockd daemon for disk locking
by Daniel P. Berrange 22 Aug '12

22 Aug '12

This is a long overdue update to a patch series I posted about a year ago https://www.redhat.com/archives/libvir-list/2011-July/msg00337.html There have been some major changes since that series - A general purpose lockspace module has been created (virLockSpacePtr in src/util/virlockspace.[ch]) - The virtlockd daemon protocol has been re-written so it only operates at the level of virLockSpacePtr APIs, and knows nothing of the usage wrt to virDomainObjPtrs - The lock driver client now translates requests for disk locks on a virDomainObjPtr into requests for resources in a lockspace managed by virtlockd. - The virtlockd daemon now has the ability to re-exec() itself to upgrade software without loosing active locks or clients - By default the locks are held directly on the file paths, rather than in a parallel "locks" directory based on sha256 checksums of the filename Still todo - Add ability to quiesce all server/client I/O when doing re-exec() - Add ability to save/restore data in any virNetMessagePtr structs in the client rx or tx queues - Add ability to use custom lockspaces for LVM and SCSI/ISCSI block devices, instead of locking based on path, to gain cross-node safety, instead of node-local safety. NB, the current re-exec() support works, but is not race safe without those first 2 todo items being completed .gitignore | 5 cfg.mk | 9 daemon/libvirtd.c | 2 daemon/remote.c | 15 daemon/remote.h | 6 include/libvirt/virterror.h | 2 libvirt.spec.in | 16 po/POTFILES.in | 5 src/Makefile.am | 182 ++++- src/internal.h | 22 src/libvirt_private.syms | 32 src/locking/domain_lock.c | 26 src/locking/lock_daemon.c | 1336 +++++++++++++++++++++++++++++++++++++ src/locking/lock_daemon.h | 56 + src/locking/lock_daemon_dispatch.c | 370 ++++++++++ src/locking/lock_daemon_dispatch.h | 31 src/locking/lock_driver_lockd.c | 561 +++++++++++++++ src/locking/lock_manager.c | 31 src/locking/lock_manager.h | 3 src/locking/lock_protocol.x | 89 ++ src/locking/virtlockd.init.in | 93 ++ src/locking/virtlockd.service.in | 13 src/locking/virtlockd.socket.in | 8 src/locking/virtlockd.sysconf | 3 src/lxc/lxc_controller.c | 24 src/lxc/lxc_monitor.c | 2 src/qemu/qemu.conf | 17 src/qemu/qemu_agent.c | 10 src/qemu/qemu_conf.c | 2 src/qemu/qemu_monitor_json.c | 12 src/qemu/test_libvirtd_qemu.aug.in | 2 src/remote/remote_driver.c | 9 src/rpc/virnetclient.c | 81 +- src/rpc/virnetclient.h | 3 src/rpc/virnetserver.c | 308 ++++++++ src/rpc/virnetserver.h | 20 src/rpc/virnetserverclient.c | 198 ++++- src/rpc/virnetserverclient.h | 28 src/rpc/virnetserverservice.c | 211 +++++ src/rpc/virnetserverservice.h | 13 src/rpc/virnetsocket.c | 128 +++ src/rpc/virnetsocket.h | 9 src/util/json.c | 9 src/util/json.h | 3 src/util/threadpool.c | 19 src/util/threadpool.h | 4 src/util/virlockspace.c | 784 +++++++++++++++++++++ src/util/virlockspace.h | 62 + src/util/virterror.c | 9 tests/Makefile.am | 7 tests/virlockspacetest.c | 363 ++++++++++ 51 files changed, 5080 insertions(+), 173 deletions(-)

2 52

[libvirt] [PATCH 0/5] support guest agent general command
by MATSUDA, Daiki 21 Aug '12

21 Aug '12

Hi, All. I rewrote the patches as Eric suggested. virsh # help qemu-agent-command NAME qemu-agent-command - Qemu Guest Agent Command SYNOPSIS qemu-agent-command <domain> [--timeout <number>] {[--cmd] <string>}... DESCRIPTION Qemu Guest Agent Command OPTIONS [--domain] <string> domain name, id or uuid --timeout <number> timeout [--cmd] <string> command virsh # qemu-agent-command RHEL58_64 '{"execute":"guest-info"}' {"return":{"version":"1.1.50","supported_commands":[{"enabled":true,"name":"guest-network-get-interfaces"},{"enabled":true,"name":"guest-suspend-hybrid"},{"enabled":true,"name":"guest-suspend-ram"},{"enabled":true,"name":"guest-suspend-disk"},{"enabled":true,"name":"guest-fsfreeze-thaw"},{"enabled":true,"name":"guest-fsfreeze-freeze"},{"enabled":true,"name":"guest-fsfreeze-status"},{"enabled":true,"name":"guest-file-flush"},{"enabled":true,"name":"guest-file-seek"},{"enabled":true,"name":"guest-file-write"},{"enabled":true,"name":"guest-file-read"},{"enabled":true,"name":"guest-file-close"},{"enabled":true,"name":"guest-file-open"},{"enabled":true,"name":"guest-shutdown"},{"enabled":true,"name":"guest-info"},{"enabled":true,"name":"guest-ping"},{"enabled":true,"name":"guest-sync"},{"enabled":true,"name":"guest-sync-delimited"}]}} virsh # qemu-agent-command RHEL58_64 '{"execute":"guest-sync", "arguments":{"id":123}}' {"return":123}

3 3

[libvirt] [PATCH] build: split driver_storage into convenience library
by Eric Blake 21 Aug '12

21 Aug '12

Commit 1d22ba95 was complete at the time, but we have since reintroduced a warning that is fixed in the same manner: CCLD storagebackendsheepdogtest *** Warning: Linking the executable storagebackendsheepdogtest against the loadable module *** libvirt_driver_storage.so is not portable! * src/Makefile.am (libvirt_driver_storage.la): Factor into new convenience library. * tests/Makefile.am (storagebackendsheepdogtest_LDADD): Link to convenience library, not shared library. --- src/Makefile.am | 49 +++++++++++++++++++++++++------------------------ tests/Makefile.am | 3 ++- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index d35edd6..2827e86 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1050,66 +1050,67 @@ libvirt_driver_secret_la_SOURCES = $(SECRET_DRIVER_SOURCES) endif # Needed to keep automake quiet about conditionals -libvirt_driver_storage_la_SOURCES = -libvirt_driver_storage_la_CFLAGS = \ +libvirt_driver_storage_impl_la_SOURCES = +libvirt_driver_storage_impl_la_CFLAGS = \ -I$(top_srcdir)/src/conf $(AM_CFLAGS) -libvirt_driver_storage_la_LDFLAGS = $(AM_LDFLAGS) -libvirt_driver_storage_la_LIBADD = +libvirt_driver_storage_impl_la_LDFLAGS = $(AM_LDFLAGS) +libvirt_driver_storage_impl_la_LIBADD = if WITH_SECDRIVER_SELINUX -libvirt_driver_storage_la_LIBADD += $(SELINUX_LIBS) +libvirt_driver_storage_impl_la_LIBADD += $(SELINUX_LIBS) endif if WITH_SECDRIVER_APPARMOR -libvirt_driver_storage_la_LIBADD += $(APPARMOR_LIBS) +libvirt_driver_storage_impl_la_LIBADD += $(APPARMOR_LIBS) endif if HAVE_LIBBLKID -libvirt_driver_storage_la_CFLAGS += $(BLKID_CFLAGS) -libvirt_driver_storage_la_LIBADD += $(BLKID_LIBS) +libvirt_driver_storage_impl_la_CFLAGS += $(BLKID_CFLAGS) +libvirt_driver_storage_impl_la_LIBADD += $(BLKID_LIBS) endif if WITH_STORAGE +noinst_LTLIBRARIES += libvirt_driver_storage_impl.la +libvirt_driver_storage_la_SOURCES = +libvirt_driver_storage_la_LIBADD = libvirt_driver_storage_impl.la if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_storage.la +libvirt_driver_storage_la_LIBADD += ../gnulib/lib/libgnu.la +libvirt_driver_storage_la_LDFOAGS = -module -avoid-version else noinst_LTLIBRARIES += libvirt_driver_storage.la # Stateful, so linked to daemon instead #libvirt_la_BUILT_LIBADD += libvirt_driver_storage.la endif -if WITH_DRIVER_MODULES -libvirt_driver_storage_la_LIBADD += ../gnulib/lib/libgnu.la -libvirt_driver_storage_la_LDFLAGS += -module -avoid-version -endif -libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_SOURCES) -libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_FS_SOURCES) +libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_SOURCES) +libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_FS_SOURCES) endif if WITH_STORAGE_LVM -libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_LVM_SOURCES) +libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_LVM_SOURCES) endif if WITH_STORAGE_ISCSI -libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_ISCSI_SOURCES) +libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_ISCSI_SOURCES) endif if WITH_STORAGE_SCSI -libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_SCSI_SOURCES) +libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_SCSI_SOURCES) endif if WITH_STORAGE_MPATH -libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_MPATH_SOURCES) -libvirt_driver_storage_la_CFLAGS += $(DEVMAPPER_CFLAGS) -libvirt_driver_storage_la_LIBADD += $(DEVMAPPER_LIBS) +libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_MPATH_SOURCES) +libvirt_driver_storage_impl_la_CFLAGS += $(DEVMAPPER_CFLAGS) +libvirt_driver_storage_impl_la_LIBADD += $(DEVMAPPER_LIBS) endif if WITH_STORAGE_DISK -libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_DISK_SOURCES) +libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_DISK_SOURCES) endif if WITH_STORAGE_RBD -libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_RBD_SOURCES) -libvirt_driver_storage_la_LIBADD += $(LIBRBD_LIBS) +libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_RBD_SOURCES) +libvirt_driver_storage_impl_la_LIBADD += $(LIBRBD_LIBS) endif if WITH_STORAGE_SHEEPDOG -libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_SHEEPDOG_SOURCES) +libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_SHEEPDOG_SOURCES) endif if WITH_NODE_DEVICES diff --git a/tests/Makefile.am b/tests/Makefile.am index e97a487..8cf8015 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -412,7 +412,8 @@ if WITH_STORAGE_SHEEPDOG storagebackendsheepdogtest_SOURCES = \ storagebackendsheepdogtest.c \ testutils.c testutils.h -storagebackendsheepdogtest_LDADD = ../src/libvirt_driver_storage.la $(LDADDS) +storagebackendsheepdogtest_LDADD = \ + ../src/libvirt_driver_storage_impl.la $(LDADDS) else EXTRA_DIST += storagebackendsheepdogtest.c endif -- 1.7.11.4

2 2

[libvirt] [PATCH] build: silence stupid gcc warning on STREQ_NULLABLE
by Eric Blake 21 Aug '12

21 Aug '12

Our existing STRNEQ_NULLABLE() triggered a warning in gcc 4.7 when used with a literal NULL argument: qemumonitorjsontest.c: In function 'testQemuMonitorJSONGetMachines': qemumonitorjsontest.c:289:5: error: null argument where non-null required (argument 1) [-Werror=nonnull] even though the strcmp is provably dead when a null argument is present. Squelch the warning by refactoring things so that gcc never sees strcmp() called with NULL arguments (we still compare NULL as not equal to "", this rewrite merely aids gcc). Next, gcc has a valid warning about a literal NULLSTR(NULL): qemumonitorjsontest.c:289:5: error: invalid application of 'sizeof' to a void type [-Werror=pointer-arith] Of course, you'd never write NULLSTR(NULL) directly, but it is handy to use through macros. And since we only really need the code to be warning-free when developing with modern gcc, and merely compiled correctly elsewhere, we can rely on gcc extensions to avoid dereferencing NULL even inside a sizeof operation. * src/internal.h (STREQ_NULLABLE, STRNEQ_NULLABLE): Avoid gcc 4.7 stupidity. (NULLSTR): Allow passing compile-time constants via macros. --- src/internal.h | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/src/internal.h b/src/internal.h index 300de3a..c27ffc5 100644 --- a/src/internal.h +++ b/src/internal.h @@ -79,10 +79,9 @@ # define STRSKIP(a,b) (STRPREFIX(a,b) ? (a) + strlen(b) : NULL) # define STREQ_NULLABLE(a, b) \ - ((!(a) && !(b)) || ((a) && (b) && STREQ((a), (b)))) + ((a) ? (b) && STREQ((a) ? (a) : "", (b) ? (b) : "") : !(b)) # define STRNEQ_NULLABLE(a, b) \ - ((!(a) ^ !(b)) || ((a) && (b) && STRNEQ((a), (b)))) - + ((a) ? !(b) || STRNEQ((a) ? (a) : "", (b) ? (b) : "") : !!(b)) # define NUL_TERMINATE(buf) do { (buf)[sizeof(buf)-1] = '\0'; } while (0) # define ARRAY_CARDINALITY(Array) (sizeof(Array) / sizeof(*(Array))) @@ -206,9 +205,22 @@ /* * Use this when passing possibly-NULL strings to printf-a-likes. */ -# define NULLSTR(s) \ - ((void)verify_true(sizeof(*(s)) == sizeof(char)), \ - (s) ? (s) : "(null)") +# if __GNUC_PREREQ(4, 6) +char *link_error_due_to_bad_NULLSTR_type(void); +# define NULLSTR(s) \ + ({ \ + const char *_tmp; \ + if (__builtin_constant_p(s) || \ + __builtin_types_compatible_p(typeof(s), char *) || \ + __builtin_types_compatible_p(typeof(s), const char *)) \ + _tmp = (s) ? (s) : "(null)"; \ + else \ + _tmp = link_error_due_to_bad_NULLSTR_type(); \ + _tmp; \ + }) +# else +# define NULLSTR(s) ((s) ? (s) : "(null)") +# endif /** * TODO: -- 1.7.11.4

2 2

[libvirt] [PATCH 0/4] Support for limiting guest coredumps
by Martin Kletzander 21 Aug '12

21 Aug '12

This series applies on the disable_s3/s4 series [1] and works with qemu patch [2] (not applied yet), so it shouldn't be pushed before the qemu part is. Basically qemu supports marking guest memory as (not)dumpable using madvise(2) system call and in case the guest memory is not desired the option can reduce the coredump by a reasonable size. Martin [1] https://www.redhat.com/archives/libvir-list/2012-August/msg00572.html [2] http://lists.nongnu.org/archive/html/qemu-devel/2012-08/msg00554.html Martin Kletzander (4): Add support for limiting guest coredump qemu: add support for dump-guest-core option tests: Add tests for dump-core option docs: Document dump-core memory feature docs/formatdomain.html.in | 13 ++- docs/schemas/domaincommon.rng | 8 ++ src/conf/domain_conf.c | 19 ++++- src/conf/domain_conf.h | 10 ++ src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 89 ++++++++++++++++++-- tests/qemuargv2xmltest.c | 2 + .../qemuxml2argv-machine-core-off.args | 5 + .../qemuxml2argv-machine-core-off.xml | 26 ++++++ .../qemuxml2argv-machine-core-on.args | 5 + .../qemuxml2argv-machine-core-on.xml | 26 ++++++ tests/qemuxml2argvtest.c | 3 + tests/qemuxml2xmltest.c | 2 + 15 files changed, 202 insertions(+), 13 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.xml -- 1.7.8.6

2 8

[libvirt] [PATCHv2 0/4] Add LibSSH2 transport
by Peter Krempa 21 Aug '12

21 Aug '12

This is a second respin of the LibSSH2 transport patch series. The most notable changes: ------------------------- - Rebased on top of current upstream (virObject, new error codes) - ported to use virObject stuff - re-named all functions and other literals to contain the "2" - implemented suggestions from Eric's review - added symbol file and various other cleanups The easiest way to test the actual implementation is to apply the patchset and try connecting to a remote host using virsh and then trying some API's. The most complex part of the code are the various authentication options that can be selected in the connection URI. Peter Krempa (4): libssh2_transport: add main libssh2 transport implementation libssh2_transport: add ssh context support to virNetSocket libssh2_transport: Add libssh2 session support to net client code libssh2_transport: Use libssh2 driver code in remote driver configure.ac | 40 +- include/libvirt/virterror.h | 2 + po/POTFILES.in | 1 + src/Makefile.am | 16 +- src/libvirt_libssh2.syms | 18 + src/libvirt_private.syms | 2 + src/remote/remote_driver.c | 47 ++- src/rpc/virnetclient.c | 117 ++++ src/rpc/virnetclient.h | 14 +- src/rpc/virnetlibssh2session.c | 1464 ++++++++++++++++++++++++++++++++++++++++ src/rpc/virnetlibssh2session.h | 83 +++ src/rpc/virnetsocket.c | 178 +++++- src/rpc/virnetsocket.h | 13 + src/util/virterror.c | 8 +- 14 files changed, 1993 insertions(+), 10 deletions(-) create mode 100644 src/libvirt_libssh2.syms create mode 100644 src/rpc/virnetlibssh2session.c create mode 100644 src/rpc/virnetlibssh2session.h -- 1.7.8.6

4 15

[libvirt] [PATCH] Fix parsing of uid/gid on Mingw32
by Daniel P. Berrange 21 Aug '12

21 Aug '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> The DAC security driver uses the virStrToLong_ui function to parse the uid/gid out of the seclabel string. This works on Linux where 'uid_t' is an unsigned int, but on Mingw32 it is just an 'int'. This causes compiler warnings about signed/ unsigned int pointer mis-match. To avoid this, use explicit 'unsigned int ouruid' local vars to pass into virStrToLong_ui, and then simply assign to the 'uid_t' type after parsing Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/security/security_dac.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/security/security_dac.c b/src/security/security_dac.c index e37b09e..925498f 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -68,25 +68,25 @@ void virSecurityDACSetDynamicOwnership(virSecurityManagerPtr mgr, static int parseIds(const char *label, uid_t *uidPtr, gid_t *gidPtr) { - uid_t uid; - gid_t gid; + unsigned int theuid; + unsigned int thegid; char *endptr = NULL; if (label == NULL) return -1; - if (virStrToLong_ui(label, &endptr, 10, &uid) || + if (virStrToLong_ui(label, &endptr, 10, &theuid) || endptr == NULL || *endptr != ':') { return -1; } - if (virStrToLong_ui(endptr + 1, NULL, 10, &gid)) + if (virStrToLong_ui(endptr + 1, NULL, 10, &thegid)) return -1; if (uidPtr) - *uidPtr = uid; + *uidPtr = theuid; if (gidPtr) - *gidPtr = gid; + *gidPtr = thegid; return 0; } -- 1.7.11.2

2 1

[libvirt] [libguestfs] Options for hotplugging
by Richard W.M. Jones 21 Aug '12

21 Aug '12

libguestfs recently added support for virtio-scsi and libvirt, and when these are both available this lets us relatively easily add hotplugging of drives. This email is about how we would present that through the libguestfs API. (a) The current API Currently you have to add drive(s) via guestfs_add_drive* and then call guestfs_launch, ie. your program must look something like this: guestfs_h *g = guestfs_create (); guestfs_add_drive (g, "/tmp/disk1.img"); guestfs_add_drive (g, "/tmp/disk2.img"); guestfs_launch (g); After guestfs_launch [the qemu backend is running] you are not allowed to add more drives. The API specifies that you refer to drives in other commands in one of two ways. Either you're allowed to use names like "/dev/sda", "/dev/sdb" etc to refer to the first, second etc drive you added, in the same order that you added them. Or you can call guestfs_list_devices which returns a list of device names, opaque strings that you pass to other functions. In the first case (using "/dev/sdX" names), some magic already happens translating these to the real names underneath, but currently that magic is just "/dev/sdX" -> "/dev/vdX" for the virtio case. Note that we cannot change this API or break existing programs. (b) The hidden appliance drive The libguestfs appliance has to have its own root drive. Currently this is added after the user-added drives. For example, if the user adds two drives, then the appliance will appear as /dev/sdc (or /dev/vdc or whatever). Some magic in the bootloader causes the last drive to be used as the root filesystem. This hidden drive doesn't appear in the API -- for example it is suppressed when we generate the result of guestfs_list_devices. (c) /dev/null drives It's always been possible to add "/dev/null" as a drive via guestfs_add_drive*. This is mainly useful for testing, or if you want to access just those parts of the API which don't require a disk image (for various reasons we force you to add one drive, so if you don't have any drive to add, you can use "/dev/null"). Current libguestfs treats "/dev/null" as a magic string and (because of bugs in qemu) substitutes a non-zero sized temporary file. (d) Maximum number of drives With virtio-scsi, this maximum is pretty large -- currently 255 (256 targets less the hidden appliance), but if we used LUNs or even multiple controllers then it'd be almost unlimited. We actually test up to 255, and virt-df will use as many slots as it can. (e) For libguestfs you can assume the latest of everything, qemu, guest kernel, host kernel, libvirt, tools. Any suggestions based on very new features are fine, even proposed features provided there's a working implementation which is likely to go upstream. - - - - Here are some ideas about how we might add hotplugging without breaking existing clients. (1) The "raw libvirt" option In this one we'd simply provide thin wrappers around virDomainAttachDevice and virDomainDetactDevice, and leave it up to the user to know what they're doing. The problem with this is the hidden appliance disk. We certainly don't want the user to accidentally detach that(!) It's also undesirable for there to be a "hole" in the naming scheme so that you'd have: /dev/sda <- your normal drives /dev/sdb <- [/dev/sdc # sorry, you can't use this, we won't tell you why] /dev/sdd <- your first hotplugged device As far as I know, the kernel assigns /dev/sdX names on a first-free basis, so there's no way to permanently put the appliance at /dev/sdzzz (if there is, please let me know!) (2) The "slots" option In this option you'd have to use null devices to reserve the maximum number of drive slots that you're going to use in the libguestfs handle before launch. Then after launching you'd be allowed to hotplug only those slots. So for example: guestfs_add_drive (g, "/dev/null"); # reserves /dev/sda guestfs_add_drive (g, "/dev/null"); # reserves /dev/sdb guestfs_add_drive (g, "/dev/null"); # reserves /dev/sdc guestfs_launch (g); guestfs_hotplug (g, 1, "/tmp/foo"); # replaces index 1 == /dev/sdb guestfs_hotplug (g, 3, "/tmp/foo"); # error! Although ugly, in some ways this is quite attractive. It maps easily into guestfish scripts. You have contiguous device naming. You often know how many drives you'll need in advance, and if you don't then you can reserve up to max_disks-1. (3) The "serial numbers" option This was Dan's suggestion. Hotplugged drives are known only by their serial number. ie. We hotplug them via libvirt using the <serial/> field, and then they are accessed using /dev/disk/by-id/serial. This is tempting, but unfortunately it doesn't quite work in stock udev, because the actual name used is: /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_SERIAL We could add a custom udev rule to get the path we wanted. (4) The "rewriting device names" option Since we already have the infrastructure to rewrite device names, we could do some complicated and hairy device name rewriting to make names appear continguous, even though there's an hidden appliance drive. This is my least favourite option, mainly because of the complexity, and complexity is bound to lead to bugs. (5) Your idea here ... As usual, comments and suggestions welcome. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://et.redhat.com/~rjones/virt-top

3 4

[libvirt] [PATCH v3 0/4] qemu: configurable port boundaries for remote displays
by Martin Kletzander 21 Aug '12

21 Aug '12

This series introduces a possibility to change default minimal and maximal port numbers that are used to specify a remote display port for both VNC and SPICE. Because the code was a bit messy, PATCH 1/4 cleans up few things needed to make a clean run of PATCH 2/4, that does the main change in the code. I also noticed two things that could be changed and it made sense for me to do that, but these are nowhere near any importance, so feel free to reject them if your heart feels that way. PATCH 3/4 [optional] rewords three messages and applying it would mean that they are not translated. Even though I think it makes more sense this way, I'm not a good English speaker, so that's more like an RFC. PATCH 4/4 [optional] makes more flexible port searching available, but now it is used just on one place and it's not necessary to have it. -- v3: - rebase on current HEAD v2: - apply the change to both VNC and SPICE sessions Martin Kletzander (4): qemu: Unify port-wise SPICE and VNC behavior qemu: configurable remote display port boundaries qemu: modify 3 error messages qemu: allow searching for all open ports src/conf/domain_conf.c | 2 +- src/qemu/libvirtd_qemu.aug | 4 ++ src/qemu/qemu.conf | 14 ++++++ src/qemu/qemu_command.h | 11 ++++- src/qemu/qemu_conf.c | 48 +++++++++++++++++++++- src/qemu/qemu_conf.h | 4 +- src/qemu/qemu_driver.c | 19 ++++----- src/qemu/qemu_process.c | 80 +++++++++++++++++++++-------------- src/qemu/test_libvirtd_qemu.aug.in | 2 + 9 files changed, 136 insertions(+), 48 deletions(-) -- 1.7.8.6

2 12

[libvirt] [PATCH v2 00/17] Supports for emulator-pin and emulator-bandwidth
by Hu Tao 21 Aug '12

21 Aug '12

This series adds support of emulator-pin to pin emulator threads on specified physical CPUs, and emulator-bandwidth to control physical CPU bandwidth for emulator threads. changes: v2: - rename hypervisor to emulator all through the series - no Flags-suffix for new APIs - reduce code duplication - rollback to old vcpupin def if error Hu Tao (9): Introduce the function virCgroupMoveTask add function bitmapFromBytemap() to convert bytemap to bitmap refactor virDomainVcpuPinAdd() updates of some vcpupin related functions Enable cpuset cgroup and synchronous vcpupin info to cgroup. Change virDomainVcpuPinDefParseXML to support parsing emulatorpin qemu: support emulator pinning Add a new function vshPrintPinInfo. new command emulatorpin Tang Chen (6): Support simulatorpin xml parse. qemu: synchronize emulatorpin info to cgroup Add qemuProcessSetEmulatorAffinites and set emulator threads affinities Introduce virDomainPinEmulator and virDomainGetEmulatorPinInfo functions. Introduce virDomainEmulatorPinAdd and virDomainEmulatorPinDel functions remote: introduce emulator pinning RPCs Wen Congyang (2): Introduce the function virCgroupForEmulator create a new cgroup and move all emulator threads to the new cgroup daemon/remote.c | 91 +++++++ docs/formatdomain.html.in | 9 + docs/schemas/domaincommon.rng | 7 + include/libvirt/libvirt.h.in | 10 + src/conf/domain_conf.c | 279 ++++++++++++++----- src/conf/domain_conf.h | 15 +- src/driver.h | 12 + src/libvirt.c | 147 ++++++++++ src/libvirt_private.syms | 9 + src/libvirt_public.syms | 2 + src/libxl/libxl_driver.c | 13 +- src/qemu/qemu_cgroup.c | 131 ++++++++- src/qemu/qemu_cgroup.h | 7 + src/qemu/qemu_driver.c | 325 ++++++++++++++++++++++- src/qemu/qemu_process.c | 60 ++++- src/remote/remote_driver.c | 99 +++++++ src/remote/remote_protocol.x | 21 +- src/remote_protocol-structs | 22 ++ src/util/cgroup.c | 186 ++++++++++++- src/util/cgroup.h | 15 ++ src/xen/xend_internal.c | 13 +- tests/qemuxml2argvdata/qemuxml2argv-cputune.xml | 1 + tools/virsh-domain.c | 253 ++++++++++++++++-- tools/virsh.pod | 16 ++ 24 files changed, 1634 insertions(+), 109 deletions(-) -- 1.7.10.2

1 19

[libvirt] [PATCH 0/5] network: define new API virNetworkDefineXMLFlags
by Laine Stump 21 Aug '12

21 Aug '12

I would like to enhance libvirt's network API to allow enacting any changes in definition immediately, as an alternative to the current behavior of saving the changes right away, but not using them until the next time the network is destroyed and re-started. This could easily be handled by a flag passed to virNetworkDefineXML(). Unfortunately, virNetworkDefineXML() was added to libvirt before we came up with the idea of adding a flags arg to every new API (just for things like this). To remedy this, I've effectively duplicated that API with a new API, virNetworkDefineXMLFlags(), which currently behaves identically, but has an extra "flags" argument. At the end of this patch series, it's still not possible to call virNetworkDefineXMLFlags() with anything other than 0 in flags, butt this gets the API in place, and in use by virsh (although with no extra functionality). A later patchset will add a VIR_NETWORK_DEFINE_AFFECT_LIVE flag and the network driver support behind it. (It almost seems like overkill to split this into so many teeny tiny patches, but this is the currently popular/accepted format for API addition patches.)

3 14

[libvirt] [PATCH 0/4] start cleaning up virsh split
by Eric Blake 21 Aug '12

21 Aug '12

Not complete, but this is what I got done in a couple hours after complaining about Osier's series: https://www.redhat.com/archives/libvir-list/2012-August/msg01247.html There's more work to be done, but this should give an idea at the sort of cleanups made possible when we cleanly split into different .o files. Eric Blake (4): virsh: move vshWatchJob earlier virsh: split out virsh.h virsh: split out virsh-domain.c virsh: kill some double underscores tools/Makefile.am | 15 +- tools/virsh-domain-monitor.c | 2 +- tools/virsh-domain.c | 220 ++++++++++++--------- tools/virsh-domain.h | 33 ++++ tools/virsh.c | 460 ++++++------------------------------------- tools/virsh.h | 384 ++++++++++++++++++++++++++++++++++++ 6 files changed, 622 insertions(+), 492 deletions(-) create mode 100644 tools/virsh-domain.h create mode 100644 tools/virsh.h -- 1.7.11.2

3 40

[libvirt] virsh vol-upload purpose question
by Li, Chun Wen 21 Aug '12

21 Aug '12

I use virsh vol-upload to upload some data in a volume and use vol-download to download these data from the same volume, both these two commands work well. However, when I first use these two commands, I thought I can use vol-upload to upload some file, then attach this volume to a vm, and access the upload file in this vm. I did this experiment, bud it not success. Once I upload a file into a volume, attach it to a vm, then the vm can not recognize the file type of this vm, if I mkfs to the volume, the file I upload disappear. So, my question is the purpose of the vol-upload is just to save some data in the volume outside vm? I think it is more reasonable if we can access upload data from vm. Best Regards Kimi Li

1 0

[libvirt] [ANNOUNCE] libvirt-glib 0.1.2 release
by Daniel P. Berrange 21 Aug '12

21 Aug '12

I am pleased to announce that a new release of the libvirt-glib package, version 0.1.2, is now available from ftp://libvirt.org/libvirt/glib/ The packages are GPG signed with Key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF (4096R) New in this release: - Add async binding for virDomainResume - Fix deadlock in event loop handle/timer removal libvirt-glib comprises three distinct libraries: - libvirt-glib - Integrate with the GLib event loop and error handling - libvirt-gconfig - Representation of libvirt XML documents as GObjects - libvirt-gobject - Mapping of libvirt APIs into the GObject type system NB: While libvirt aims to be API/ABI stable forever, with libvirt-glib we are not yet guaranteeing that libvirt-glib libraries are API/ABI permanently stable. As of the 0.0.8 release, we have tentatively frozen the API/ABI with the intent of being longterm stable hereafter, but there is still a small chance we might find flaws requiring an API/ABI change. The likelihood of this is low, however, and we will strive to avoid it. Follow up comments about libvirt-glib should be directed to the regular libvir-list redhat com development list. Thanks to all the people involved in contributing to this release. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [PATCH] ESX:Refactor ESX storage driver and add iSCSI support
by Ata E Husain Bohra 21 Aug '12

21 Aug '12

The patch refactors the current ESX storage driver due to following reasons: 1. Given most of the public APIs exposed by the storage driver in Libvirt remains same, ESX storage driver should not implement logic specific for only one supported format (current implementation only supports VMFS). 2. Decoupling interface from specific storage implementation gives us an extensible design to hook implementation for other supported storage formats. This patch refactors the current driver to implement it as a facade pattern i.e. the driver exposes all the public libvirt APIs, but uses backend drivers to get the required task done. The backend drivers provide implementation specific to the type of storage device. File changes: ------------------ esx_storage_driver.c ----> esx_storage_driver.c (base storage driver) | |---> esx_storage_backend_vmfs.c (VMFS backend) | |---> esx_storage_backend_iscsi.c (iSCSI backend) The patch adds the backend driver to support iSCSI format storage pools and volumes for ESX host. The mapping of ESX iSCSI specifics to Libvirt is as follows: 1. ESX static iSCSI target <------> Libvirt Storage Pools 2. ESX iSCSI LUNs <------> Libvirt Storage Volumes. The above understanding is based on http://libvirt.org/storage.html. The operation supported on iSCSI pools includes: 1. List storage pools & volumes. 2. Get xml descriptor operaion on pools & volumes. 3. Lookup operation on pools & volumes by name, uuid and path (if applicable). iSCSI pools does not support operations such as: Create / remove pools and volumes --- src/Makefile.am | 2 + src/esx/esx_driver.c | 4 +- src/esx/esx_storage_backend_iscsi.c | 794 +++++++++++++++++++ src/esx/esx_storage_backend_iscsi.h | 31 + src/esx/esx_storage_backend_vmfs.c | 1471 +++++++++++++++++++++++++++++++++++ src/esx/esx_storage_backend_vmfs.h | 31 + src/esx/esx_storage_driver.c | 1303 +++++-------------------------- src/esx/esx_vi.c | 341 +++++++- src/esx/esx_vi.h | 21 +- src/esx/esx_vi_generator.input | 306 ++++++++ src/esx/esx_vi_generator.py | 20 + 11 files changed, 3212 insertions(+), 1112 deletions(-) create mode 100644 src/esx/esx_storage_backend_iscsi.c create mode 100644 src/esx/esx_storage_backend_iscsi.h create mode 100644 src/esx/esx_storage_backend_vmfs.c create mode 100644 src/esx/esx_storage_backend_vmfs.h diff --git a/src/Makefile.am b/src/Makefile.am index 49bcf50..050d6f9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -476,6 +476,8 @@ ESX_DRIVER_SOURCES = \ esx/esx_interface_driver.c esx/esx_interface_driver.h \ esx/esx_network_driver.c esx/esx_network_driver.h \ esx/esx_storage_driver.c esx/esx_storage_driver.h \ + esx/esx_storage_backend_vmfs.c esx/esx_storage_backend_vmfs.h \ + esx/esx_storage_backend_iscsi.c esx/esx_storage_backend_iscsi.h \ esx/esx_device_monitor.c esx/esx_device_monitor.h \ esx/esx_secret_driver.c esx/esx_secret_driver.h \ esx/esx_nwfilter_driver.c esx/esx_nwfilter_driver.h \ diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 47957cc..4cd9353 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -162,7 +162,7 @@ esxParseVMXFileName(const char *fileName, void *opaque) datastoreName = NULL; if (esxVI_LookupDatastoreHostMount(data->ctx, datastore->obj, - &hostMount) < 0 || + &hostMount, esxVI_Occurrence_RequiredItem) < 0 || esxVI_GetStringValue(datastore, "summary.name", &datastoreName, esxVI_Occurrence_RequiredItem) < 0) { goto cleanup; @@ -306,7 +306,7 @@ esxFormatVMXFileName(const char *fileName, void *opaque) if (esxVI_LookupDatastoreByName(data->ctx, datastoreName, NULL, &datastore, esxVI_Occurrence_RequiredItem) < 0 || esxVI_LookupDatastoreHostMount(data->ctx, datastore->obj, - &hostMount) < 0) { + &hostMount, esxVI_Occurrence_RequiredItem) < 0) { goto cleanup; } diff --git a/src/esx/esx_storage_backend_iscsi.c b/src/esx/esx_storage_backend_iscsi.c new file mode 100644 index 0000000..4f79a0f --- /dev/null +++ b/src/esx/esx_storage_backend_iscsi.c @@ -0,0 +1,794 @@ +/* + * esx_storage_backend_iscsi.c: ESX storage backend for iSCSI handling + * + * Copyright (C) 2007-2008, 2010-2012 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Ata E Husain Bohra (ata.husain(a)hotmail.com) + */ + +#include <config.h> + +#include <string.h> +#include <stdio.h> +#include <unistd.h> +#include <sys/stat.h> + +#include "internal.h" +#include "md5.h" +#include "util.h" +#include "memory.h" +#include "logging.h" +#include "uuid.h" + +#include "storage_conf.h" +#include "storage_file.h" +#include "esx_private.h" +#include "esx_vi.h" +#include "esx_vi_methods.h" +#include "esx_util.h" + +#define VIR_FROM_THIS VIR_FROM_STORAGE + +/* + * The UUID of a storage pool is the MD5 sum of it's mount path. Therefore, + * verify that UUID and MD5 sum match in size, because we rely on that. + */ +verify(MD5_DIGEST_SIZE == VIR_UUID_BUFLEN); + + + +static int +esxStorageBackendISCSINumberOfStoragePools(virConnectPtr conn) +{ + int count = 0; + esxPrivate *priv = conn->storagePrivateData; + esxVI_HostInternetScsiHba *hostInternetScsiHba = NULL; + bool success = false; + + if (esxVI_LookupHostInternetScsiHba( + priv->primary, &hostInternetScsiHba) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to obtain iSCSI adapter")); + goto cleanup; + } + + if (hostInternetScsiHba == NULL) { + /* iSCSI adapter may not be enabled for this host */ + return 0; + } + + /** + * ESX has two kind of targets: + * 1. staticIscsiTargets + * 2. dynamicIscsiTargets + * For each dynamic target if its reachable a static target is added. + * return iSCSI names for all static targets to avoid duplicate names. + */ + if (hostInternetScsiHba->configuredStaticTarget) { + const esxVI_HostInternetScsiHbaStaticTarget *target = NULL; + for (target = hostInternetScsiHba->configuredStaticTarget; + target != NULL; target = target->_next) { + ++count; + } + } + + success = true; + +cleanup: + + esxVI_HostInternetScsiHba_Free(&hostInternetScsiHba); + + return success ? count : -1; + +} + + + +static int +esxStorageBackendISCSIListStoragePools(virConnectPtr conn, + char **const names, + const int maxnames) +{ + int count = 0; + esxPrivate *priv = conn->storagePrivateData; + esxVI_HostInternetScsiHba *hostInternetScsiHba = NULL; + bool success = false; + int i = 0; + + if (maxnames ==0) { + return 0; + } + + if (esxVI_LookupHostInternetScsiHba( + priv->primary, &hostInternetScsiHba) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to obtain iSCSI adapter")); + goto cleanup; + } + + if (hostInternetScsiHba == NULL) { + /* iSCSI adapter may not be enabled for this host */ + return 0; + } + + /** + * ESX has two kind of targets: + * 1. staticIscsiTargets + * 2. dynamicIscsiTargets + * For each dynamic target if its reachable a static target is added. + * return iSCSI names for all static targets to avoid duplicate names. + */ + if (hostInternetScsiHba->configuredStaticTarget) { + const esxVI_HostInternetScsiHbaStaticTarget *target = NULL; + for (target = hostInternetScsiHba->configuredStaticTarget; + target != NULL && count < maxnames; + target = target->_next, ++count) { + names[count] = strdup(target->iScsiName); + + if (names[count] == NULL) { + virReportOOMError(); + goto cleanup; + } + } + } + + success = true; + +cleanup: + if (! success) { + for (i = 0; i < count; ++i) { + VIR_FREE(names[i]); + } + count = -1; + } + + esxVI_HostInternetScsiHba_Free(&hostInternetScsiHba); + + return success ? count : -1; +} + + + +static virStoragePoolPtr +esxStorageBackendISCSIPoolLookupByName(virConnectPtr conn, + const char *name) +{ + esxPrivate *priv = conn->storagePrivateData; + esxVI_HostInternetScsiHbaStaticTarget *target = NULL; + /* MD5_DIGEST_SIZE = VIR_UUID_BUFLEN = 16 */ + unsigned char md5[MD5_DIGEST_SIZE]; + virStoragePoolPtr pool = NULL; + + if (esxVI_LookupHostInternetScsiHbaStaticTargetByName( + priv->primary, name, &target, esxVI_Occurrence_OptionalItem) < 0) { + goto cleanup; + } + + /** + * HostInternetScsiHbaStaticTarget does not provide a uuid field, + * but iSsiName (or widely known as IQN) is unique across the multiple + * hosts, using it to compute key + */ + + md5_buffer(target->iScsiName, strlen(target->iScsiName), md5); + + pool = virGetStoragePool(conn, name, md5); + + cleanup: + + esxVI_HostInternetScsiHbaStaticTarget_Free(&target); + + return pool; + +} + + + +static virStoragePoolPtr +esxStorageBackendISCSIPoolLookupByUUID(virConnectPtr conn, + const unsigned char *uuid) +{ + virStoragePoolPtr pool = NULL; + esxPrivate *priv = conn->storagePrivateData; + esxVI_HostInternetScsiHba *hostInternetScsiHba = NULL; + const esxVI_HostInternetScsiHbaStaticTarget *target = NULL; + /* MD5_DIGEST_SIZE = VIR_UUID_BUFLEN = 16 */ + unsigned char md5[MD5_DIGEST_SIZE]; + + if (esxVI_LookupHostInternetScsiHba( + priv->primary, &hostInternetScsiHba) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to obtain iSCSI adapter")); + goto cleanup; + } + + if (hostInternetScsiHba == NULL) { + /* iSCSI adapter may not be enabled for this host */ + return NULL; + } + + if (hostInternetScsiHba->configuredStaticTarget) { + for (target = hostInternetScsiHba->configuredStaticTarget; + target != NULL; target = target->_next) { + md5_buffer(target->iScsiName, strlen(target->iScsiName), md5); + + if (memcmp(uuid, md5, VIR_UUID_STRING_BUFLEN) == 0) { + break; + } + } + } + + if (target == NULL) { + /* pool not found */ + goto cleanup; + } + + pool = virGetStoragePool(conn, target->iScsiName, md5); + + cleanup: + esxVI_HostInternetScsiHba_Free(&hostInternetScsiHba); + + return pool; + +} + + + +static int +esxStorageBackendISCSIPoolRefresh(virStoragePoolPtr pool, + unsigned int flags) +{ + int result = -1; + esxPrivate *priv = pool->conn->storagePrivateData; + esxVI_ManagedObjectReference *hostStorageSystem = NULL; + esxVI_HostInternetScsiHba *hostInternetScsiHba = NULL; + esxVI_ObjectContent *hostSystem = NULL; + esxVI_String *propertyNameList = NULL; + + virCheckFlags(0, -1); + + if (esxVI_String_AppendValueToList(&propertyNameList, + "configManager.storageSystem\0") < 0 || + esxVI_LookupHostSystemProperties(priv->primary, + propertyNameList, &hostSystem) < 0 || + esxVI_GetManagedObjectReference(hostSystem, + "configManager.storageSystem", &hostStorageSystem, + esxVI_Occurrence_RequiredItem) < 0 || + esxVI_LookupHostInternetScsiHba( + priv->primary, &hostInternetScsiHba) < 0) { + goto cleanup; + } + + /** + * ESX does not allow rescan on a particular target, + * rescan all the static targets + */ + if (esxVI_RescanHba(priv->primary, hostStorageSystem, + hostInternetScsiHba->device) < 0) { + goto cleanup; + } + + result = 0; + + cleanup: + esxVI_String_Free(&propertyNameList); + esxVI_ManagedObjectReference_Free(&hostStorageSystem); + esxVI_ObjectContent_Free(&hostSystem); + esxVI_HostInternetScsiHba_Free(&hostInternetScsiHba); + + return result; + +} + + + +static int +esxStorageBackendISCSIPoolGetInfo(virStoragePoolPtr pool ATTRIBUTE_UNUSED, + virStoragePoolInfoPtr info) +{ + /* these fields are not valid for iSCSI pool */ + info->allocation = info->capacity = info->available = 0; + info->state = esxVI_Boolean_True; + + return 0; +} + + + +static char * +esxStorageBackendISCSIPoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) +{ + char *xml = NULL; + esxPrivate *priv = pool->conn->storagePrivateData; + esxVI_HostInternetScsiHba *hostInternetScsiHba = NULL; + const esxVI_HostInternetScsiHbaStaticTarget *target = NULL; + virStoragePoolDef def; + + virCheckFlags(0, NULL); + + memset(&def, 0, sizeof(def)); + + if (esxVI_LookupHostInternetScsiHba(priv->primary, &hostInternetScsiHba)) { + goto cleanup; + } + + if (hostInternetScsiHba->configuredStaticTarget) { + for (target = hostInternetScsiHba->configuredStaticTarget; + target != NULL; target = target->_next) { + if (STREQ(target->iScsiName, pool->name)) { + break; + } + } + } + + if (target == NULL) { + goto cleanup; + } + + def.name = pool->name; + memcpy(def.uuid, pool->uuid, VIR_UUID_BUFLEN); + + def.type = VIR_STORAGE_POOL_ISCSI; + + def.source.initiator.iqn = target->iScsiName; + + def.source.nhost = 1; + if (VIR_ALLOC_N(def.source.hosts, def.source.nhost) < 0) { + virReportOOMError(); + goto cleanup; + } + + def.source.hosts[0].name = target->address; + if (target->port) { + def.source.hosts[0].port = target->port->value; + } + + /* TODO: add CHAP authentication params */ + + xml = virStoragePoolDefFormat(&def); + + cleanup: + + VIR_FREE(def.source.hosts); + esxVI_HostInternetScsiHba_Free(&hostInternetScsiHba); + + return xml; + +} + + + +static int +esxStorageBackendISCSIPoolNumberOfStorageVolumes(virStoragePoolPtr pool) +{ + int count = 0; + esxPrivate *priv = pool->conn->storagePrivateData; + esxVI_HostScsiTopologyLun *hostScsiTopologyLunList = NULL; + const esxVI_HostScsiTopologyLun *hostScsiTopologyLun = NULL; + bool success = false; + + if (esxVI_LookupHostScsiTopologyLunListByTargetName( + priv->primary, pool->name, &hostScsiTopologyLunList) < 0) { + goto cleanup; + } + + for (hostScsiTopologyLun = hostScsiTopologyLunList ; + hostScsiTopologyLun != NULL; + hostScsiTopologyLun = hostScsiTopologyLun->_next) { + ++count; + } + + success = true; + + cleanup: + + esxVI_HostScsiTopologyLun_Free(&hostScsiTopologyLunList); + + return success ? count : -1; + +} + + +static int +esxStorageBackendISCSIPoolListStorageVolumes(virStoragePoolPtr pool, + char **const names, + int maxnames) +{ + int count = 0; + esxPrivate *priv = pool->conn->storagePrivateData; + esxVI_HostScsiTopologyLun *hostScsiTopologyLunList = NULL; + const esxVI_HostScsiTopologyLun *hostScsiTopologyLun = NULL; + esxVI_ScsiLun *scsiLunList = NULL; + const esxVI_ScsiLun *scsiLun = NULL; + bool success = false; + int i = 0; + + if (esxVI_LookupHostScsiTopologyLunListByTargetName( + priv->primary, pool->name, &hostScsiTopologyLunList) < 0) { + goto cleanup; + } + + if (hostScsiTopologyLunList == NULL) { + /* iSCSI adapter may not be enabled on ESX host */ + return 0; + } + + if (esxVI_LookupScsiLunList(priv->primary, &scsiLunList) < 0) { + goto cleanup; + } + + /* O^2 but still faster than hash given N is not that large */ + for (scsiLun = scsiLunList; scsiLun != NULL && count < maxnames; + scsiLun = scsiLun->_next) { + for (hostScsiTopologyLun = hostScsiTopologyLunList; + hostScsiTopologyLun != NULL && count < maxnames; + hostScsiTopologyLun = hostScsiTopologyLun->_next) { + if (STREQ(hostScsiTopologyLun->scsiLun, scsiLun->key)) { + names[count] = strdup(scsiLun->deviceName); + + if (names[count] == NULL) { + virReportOOMError(); + goto cleanup; + } + ++count; + } + } + } + + success = true; + + cleanup: + if (! success) { + for (i = 0; i < count; ++i) { + VIR_FREE(names[i]); + } + count = -1; + } + + esxVI_HostScsiTopologyLun_Free(&hostScsiTopologyLunList); + esxVI_ScsiLun_Free(&scsiLunList); + + return count; +} + + +static virStorageVolPtr +esxStorageBackendISCSIVolumeLookupByName(virStoragePoolPtr pool, + const char *name) +{ + virStorageVolPtr volume = NULL; + esxPrivate *priv = pool->conn->storagePrivateData; + esxVI_ScsiLun *scsiLunList = NULL; + const esxVI_ScsiLun *scsiLun = NULL; + /* MD5_DIGEST_SIZE = VIR_UUID_BUFLEN = 16 */ + unsigned char md5[MD5_DIGEST_SIZE]; + char uuid_string[VIR_UUID_STRING_BUFLEN] = ""; + + if (esxVI_LookupScsiLunList(priv->primary, &scsiLunList) < 0) { + goto cleanup; + } + + for (scsiLun = scsiLunList; scsiLun != NULL; + scsiLun = scsiLun->_next) { + if (STREQ(scsiLun->deviceName, name)) { + /** + * ScsiLun provides an UUID field that is unique accross + * multiple servers. But this field length is ~55 characters + * compute MD5 hash to transform it to an acceptable + * libvirt format + */ + md5_buffer(scsiLun->uuid, strlen(scsiLun->uuid), md5); + + virUUIDFormat(md5, uuid_string); + + /** + * ScsiLun provides displayName and canonicalName but both are + * optional and its observed that they can be NULL, using + * deviceName to create volume. + */ + volume = virGetStorageVol(pool->conn, pool->name, name, uuid_string); + break; + } + } + + cleanup: + + esxVI_ScsiLun_Free(&scsiLunList); + + return volume; + +} + + +static virStorageVolPtr +esxStorageBackendISCSIVolumeLookupByPath(virConnectPtr conn, const char *path) +{ + virStorageVolPtr volume = NULL; + esxPrivate *priv = conn->storagePrivateData; + char *poolName = NULL; + esxVI_ScsiLun *scsiLunList = NULL; + const esxVI_ScsiLun *scsiLun = NULL; + const esxVI_HostScsiDisk *hostScsiDisk = NULL; + /* MD5_DIGEST_SIZE = VIR_UUID_BUFLEN = 16 */ + unsigned char md5[MD5_DIGEST_SIZE]; + char uuid_string[VIR_UUID_STRING_BUFLEN] = ""; + + if (esxVI_LookupScsiLunList(priv->primary, &scsiLunList) < 0) { + goto cleanup; + } + + for (scsiLun = scsiLunList ; scsiLun != NULL; + scsiLun = scsiLun->_next) { + hostScsiDisk = + esxVI_HostScsiDisk_DynamicCast((esxVI_ScsiLun *)scsiLun); + + if (hostScsiDisk != NULL && + STREQ(hostScsiDisk->devicePath, path)) { + /* Found matching device */ + if (esxVI_LookupStoragePoolNameByScsiLunKey( + priv->primary, hostScsiDisk->key, &poolName) < 0) { + goto cleanup; + } + + md5_buffer(scsiLun->uuid, strlen(scsiLun->uuid), md5); + + virUUIDFormat(md5, uuid_string); + + volume = virGetStorageVol(conn, poolName, path, uuid_string); + break; + } + } + + cleanup: + + esxVI_ScsiLun_Free(&scsiLunList); + VIR_FREE(poolName); + + return volume; + +} + + +static virStorageVolPtr +esxStorageBackendISCSIVolumeLookupByKey(virConnectPtr conn, const char *key) +{ + virStorageVolPtr volume = NULL; + esxPrivate *priv = conn->storagePrivateData; + char *poolName = NULL; + esxVI_ScsiLun *scsiLunList = NULL; + const esxVI_ScsiLun *scsiLun = NULL; + /* MD5_DIGEST_SIZE = VIR_UUID_BUFLEN = 16 */ + unsigned char md5[MD5_DIGEST_SIZE]; + char uuid_string[VIR_UUID_STRING_BUFLEN] = ""; + + + /* key may be LUN device path */ + if (STRPREFIX(key, "/")) { + return esxStorageBackendISCSIVolumeLookupByPath(conn, key); + } + + if (esxVI_LookupScsiLunList(priv->primary, &scsiLunList) < 0) { + goto cleanup; + } + + for (scsiLun = scsiLunList; scsiLun != NULL; + scsiLun = scsiLun->_next) { + + memset(uuid_string, '\0', sizeof(uuid_string)); + memset(md5, '\0', sizeof(md5)); + + md5_buffer(scsiLun->uuid, strlen(scsiLun->uuid), md5); + + virUUIDFormat(md5, uuid_string); + + if (STREQ(key, uuid_string)) { + /* Found matching UUID */ + if (esxVI_LookupStoragePoolNameByScsiLunKey( + priv->primary, scsiLun->key, &poolName) < 0) { + goto cleanup; + } + + volume = virGetStorageVol(conn, poolName, + scsiLun->deviceName, uuid_string); + break; + } + } + + cleanup: + + esxVI_ScsiLun_Free(&scsiLunList); + VIR_FREE(poolName); + + return volume; + +} + + + +static virStorageVolPtr +esxStorageBackendISCSIVolumeCreateXML(virStoragePoolPtr pool ATTRIBUTE_UNUSED, + const char *xmldesc ATTRIBUTE_UNUSED, + unsigned int flags) +{ + virCheckFlags(0, NULL); + + /* not supported operation for iSCSI pools */ + return NULL; +} + + + +static virStorageVolPtr +esxStorageBackendISCSIVolumeCreateXMLFrom( + virStoragePoolPtr pool ATTRIBUTE_UNUSED, + const char *xmldesc ATTRIBUTE_UNUSED, + virStorageVolPtr sourceVolume ATTRIBUTE_UNUSED, + unsigned int flags) +{ + virCheckFlags(0, NULL); + + /* not supported operation for iSCSI pools */ + return NULL; +} + + + +static char* +esxStorageBackendISCSIVolumeGetXMLDesc(virStorageVolPtr volume, + unsigned int flags) +{ + char *xml = NULL; + esxPrivate *priv = volume->conn->storagePrivateData; + virStoragePoolDef pool; + esxVI_ScsiLun *scsiLunList = NULL; + const esxVI_ScsiLun *scsiLun = NULL; + const esxVI_HostScsiDisk *hostScsiDisk = NULL; + virStorageVolDef def; + /* MD5_DIGEST_SIZE = VIR_UUID_BUFLEN = 16 */ + unsigned char md5[MD5_DIGEST_SIZE]; + char uuid_string[VIR_UUID_STRING_BUFLEN] = ""; + + virCheckFlags(0, NULL); + + memset(&pool, 0, sizeof(pool)); + memset(&def, 0, sizeof(def)); + + if (esxVI_LookupScsiLunList(priv->primary, &scsiLunList) < 0) { + goto cleanup; + } + + for (scsiLun = scsiLunList; scsiLun != NULL; + scsiLun = scsiLun->_next) { + hostScsiDisk = + esxVI_HostScsiDisk_DynamicCast((esxVI_ScsiLun *)scsiLun); + + if (hostScsiDisk != NULL && + STREQ(hostScsiDisk->deviceName, volume->name)) { + break; + } + } + + if (hostScsiDisk == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could find volume with name: %s"), volume->name); + goto cleanup; + } + + pool.type = VIR_STORAGE_POOL_ISCSI; + + def.name = volume->name; + + md5_buffer(scsiLun->uuid, strlen(hostScsiDisk->uuid), md5); + + virUUIDFormat(md5, uuid_string); + + if (esxVI_String_DeepCopyValue(&def.key, uuid_string) < 0) { + goto cleanup; + } + + /* iSCSI LUN exposes a block device */ + def.type = VIR_STORAGE_VOL_BLOCK; + + def.target.path = hostScsiDisk->devicePath; + + def.capacity = hostScsiDisk->capacity->block->value * + hostScsiDisk->capacity->blockSize->value; + + def.allocation = def.capacity; + + /* iSCSI LUN(s) hosting a datastore will be auto-mounted by + * ESX host + */ + def.target.format = VIR_STORAGE_FILE_RAW; + + xml = virStorageVolDefFormat(&pool, &def); + + cleanup: + + esxVI_ScsiLun_Free(&scsiLunList); + VIR_FREE(def.key); + + return xml; + +} + +static int +esxStorageBackendISCSIVolumeDelete(virStorageVolPtr volume ATTRIBUTE_UNUSED, + unsigned int flags) +{ + virCheckFlags(0, -1); + + /* unsupported operation for iSCSI volume */ + return 1; + +} + + + +static int +esxStorageBackendISCSIVolumeWipe(virStorageVolPtr volume ATTRIBUTE_UNUSED, + unsigned int flags) +{ + virCheckFlags(0, -1); + + /* unsupported operation for iSCSI volume */ + return 1; + +} + + + +static char* +esxStorageBackendISCSIVolumeGetPath(virStorageVolPtr volume) +{ + char *path; + + if (virAsprintf(&path, "%s", volume->name) < 0) { + virReportOOMError(); + return NULL; + } + + return path; + +} + + + +virStorageDriver esxStorageBackendISCSIDrv = { + .name = "ESX ISCSI backend", + .open = NULL, /* 0.10.0 */ + .close = NULL, /* 0.10.0 */ + .numOfPools = esxStorageBackendISCSINumberOfStoragePools, /* 0.10.0 */ + .listPools = esxStorageBackendISCSIListStoragePools, /* 0.10.0 */ + .poolLookupByName = esxStorageBackendISCSIPoolLookupByName, /* 0.10.0 */ + .poolLookupByUUID = esxStorageBackendISCSIPoolLookupByUUID, /* 0.10.0 */ + .poolRefresh = esxStorageBackendISCSIPoolRefresh, /* 0.10.0 */ + .poolGetInfo = esxStorageBackendISCSIPoolGetInfo, /* 0.10.0 */ + .poolGetXMLDesc = esxStorageBackendISCSIPoolGetXMLDesc, /* 0.10.0 */ + .poolNumOfVolumes = esxStorageBackendISCSIPoolNumberOfStorageVolumes, /* 0.10.0 */ + .poolListVolumes = esxStorageBackendISCSIPoolListStorageVolumes, /* 0.10.0 */ + .volLookupByName = esxStorageBackendISCSIVolumeLookupByName, /* 0.10.0 */ + .volLookupByKey = esxStorageBackendISCSIVolumeLookupByKey, /* 0.10.0 */ + .volLookupByPath = esxStorageBackendISCSIVolumeLookupByPath, /* 0.10.0 */ + .volCreateXML = esxStorageBackendISCSIVolumeCreateXML, /* 0.10.0 */ + .volCreateXMLFrom = esxStorageBackendISCSIVolumeCreateXMLFrom, /* 0.10.0 */ + .volGetXMLDesc = esxStorageBackendISCSIVolumeGetXMLDesc, /* 0.10.0 */ + .volDelete = esxStorageBackendISCSIVolumeDelete, /* 0.10.0 */ + .volWipe = esxStorageBackendISCSIVolumeWipe, /* 0.10.0 */ + .volGetPath = esxStorageBackendISCSIVolumeGetPath, /* 0.10.0 */ + +}; diff --git a/src/esx/esx_storage_backend_iscsi.h b/src/esx/esx_storage_backend_iscsi.h new file mode 100644 index 0000000..ca756ac --- /dev/null +++ b/src/esx/esx_storage_backend_iscsi.h @@ -0,0 +1,31 @@ +/* + * esx_storage_backend_iscsi.h: ESX storage backend for iSCSI handling + * + * Copyright (C) 2007-2008 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Ata E Husain Bohra (ata.husain(a)hotmail.com) + */ + +#ifndef __ESX_STORAGE_BACKEND_ISCSI_H__ +# define __ESX_STORAGE_BACKEND_ISCSI_H__ + +#include "driver.h" + +extern virStorageDriver esxStorageBackendISCSIDrv; + +#endif /* __ESX_STORAGE_BACKEND_ISCSI_H__ */ + diff --git a/src/esx/esx_storage_backend_vmfs.c b/src/esx/esx_storage_backend_vmfs.c new file mode 100644 index 0000000..6550196 --- /dev/null +++ b/src/esx/esx_storage_backend_vmfs.c @@ -0,0 +1,1471 @@ + +/* + * esx_storage_backend_vmfs.c: ESX storage backend for VMFS datastores + * + * Copyright (C) 2010-2011 Red Hat, Inc. + * Copyright (C) 2010 Matthias Bolte <matthias.bolte(a)googlemail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. + * + * Author: Ata E Husain Bohra (ata.husain(a)hotmail.com) + */ + +#include <config.h> + +#include <string.h> +#include <stdio.h> +#include <unistd.h> +#include <sys/stat.h> + +#include "internal.h" +#include "md5.h" +#include "util.h" +#include "memory.h" +#include "logging.h" +#include "uuid.h" + +#include "storage_conf.h" +#include "storage_file.h" +#include "esx_storage_backend_vmfs.h" +#include "esx_private.h" +#include "esx_vi.h" +#include "esx_vi_methods.h" +#include "esx_util.h" + +#define VIR_FROM_THIS VIR_FROM_STORAGE + +/* + * The UUID of a storage pool is the MD5 sum of it's mount path. Therefore, + * verify that UUID and MD5 sum match in size, because we rely on that. + */ +verify(MD5_DIGEST_SIZE == VIR_UUID_BUFLEN); + + + +static int +esxStorageBackendVMFSPoolLookupType(virConnectPtr conn, const char *poolName, + int *poolType) +{ + int result = -1; + esxPrivate *priv = conn->storagePrivateData; + esxVI_String *propertyNameList = NULL; + esxVI_ObjectContent *datastore = NULL; + esxVI_DynamicProperty *dynamicProperty = NULL; + esxVI_DatastoreInfo *datastoreInfo = NULL; + + if (esxVI_String_AppendValueToList(&propertyNameList, "info") < 0 || + esxVI_LookupDatastoreByName(priv->primary, poolName, + propertyNameList, &datastore, + esxVI_Occurrence_OptionalItem) < 0) { + goto cleanup; + } + + if (datastore == NULL) { + /* not found */ + goto cleanup; + } + + for (dynamicProperty = datastore->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "info")) { + if (esxVI_DatastoreInfo_CastFromAnyType(dynamicProperty->val, + &datastoreInfo) < 0) { + goto cleanup; + } + + break; + } + } + + if (esxVI_LocalDatastoreInfo_DynamicCast(datastoreInfo) != NULL) { + *poolType = VIR_STORAGE_POOL_DIR; + } else if (esxVI_NasDatastoreInfo_DynamicCast(datastoreInfo) != NULL) { + *poolType = VIR_STORAGE_POOL_NETFS; + } else if (esxVI_VmfsDatastoreInfo_DynamicCast(datastoreInfo) != NULL) { + *poolType = VIR_STORAGE_POOL_FS; + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("DatastoreInfo has unexpected type")); + goto cleanup; + } + + result = 0; + + cleanup: + esxVI_String_Free(&propertyNameList); + esxVI_ObjectContent_Free(&datastore); + esxVI_DatastoreInfo_Free(&datastoreInfo); + + return result; +} + + + + +static int +esxStorageBackendVMFSNumberOfStoragePools(virConnectPtr conn) +{ + esxPrivate *priv = conn->storagePrivateData; + esxVI_ObjectContent *datastoreList = NULL; + esxVI_ObjectContent *datastore = NULL; + int count = 0; + + if (esxVI_LookupDatastoreList(priv->primary, NULL, &datastoreList) < 0) { + goto cleanup; + } + + for (datastore = datastoreList; datastore != NULL; + datastore = datastore->_next) { + ++count; + } + + cleanup: + esxVI_ObjectContent_Free(&datastoreList); + + return count; +} + +static int +esxStorageBackendVMFSListStoragePools(virConnectPtr conn, + char **const names, + const int maxnames) +{ + esxPrivate *priv = conn->storagePrivateData; + esxVI_String *propertyNameList = NULL; + esxVI_DynamicProperty *dynamicProperty = NULL; + esxVI_ObjectContent *datastoreList = NULL; + esxVI_ObjectContent *datastore = NULL; + int count = 0; + int i = 0; + bool success = false; + + if (maxnames == 0) { + return 0; + } + + if (esxVI_String_AppendValueToList(&propertyNameList, + "summary.name") < 0 || + esxVI_LookupDatastoreList(priv->primary, propertyNameList, + &datastoreList) < 0) { + goto cleanup; + } + + for (datastore = datastoreList; datastore != NULL; + datastore = datastore->_next) { + for (dynamicProperty = datastore->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "summary.name")) { + if (esxVI_AnyType_ExpectType(dynamicProperty->val, + esxVI_Type_String) < 0) { + goto cleanup; + } + + names[count] = strdup(dynamicProperty->val->string); + + if (names[count] == NULL) { + virReportOOMError(); + goto cleanup; + } + + ++count; + break; + } else { + VIR_WARN("Unexpected '%s' property", dynamicProperty->name); + } + } + } + + success = true; + + cleanup: + if (! success) { + for (i = 0; i < count; ++i) { + VIR_FREE(names[i]); + } + + count = -1; + } + + esxVI_String_Free(&propertyNameList); + esxVI_ObjectContent_Free(&datastoreList); + + return count; +} + +static virStoragePoolPtr +esxStorageBackendVMFSPoolLookupByName(virConnectPtr conn, + const char *name) +{ + esxPrivate *priv = conn->storagePrivateData; + esxVI_ObjectContent *datastore = NULL; + esxVI_DatastoreHostMount *hostMount = NULL; + /* MD5_DIGEST_SIZE = VIR_UUID_BUFLEN = 16 */ + unsigned char md5[MD5_DIGEST_SIZE]; + virStoragePoolPtr pool = NULL; + + virCheckNonNullArgReturn(name, NULL); + + if (esxVI_LookupDatastoreByName(priv->primary, name, NULL, &datastore, + esxVI_Occurrence_OptionalItem) < 0) { + goto cleanup; + } + + if (datastore == NULL) { + /* not found */ + goto cleanup; + } + + /* + * Datastores don't have a UUID, but we can use the 'host.mountInfo.path' + * property as source for a UUID. The mount path is unique per host and + * cannot change during the lifetime of the datastore. + * + * The MD5 sum of the mount path can be used as UUID, assuming MD5 is + * considered to be collision-free enough for this use case. + */ + if (esxVI_LookupDatastoreHostMount(priv->primary, datastore->obj, + &hostMount, esxVI_Occurrence_RequiredItem) < 0) { + goto cleanup; + } + + md5_buffer(hostMount->mountInfo->path, + strlen(hostMount->mountInfo->path), md5); + + pool = virGetStoragePool(conn, name, md5); + + cleanup: + esxVI_ObjectContent_Free(&datastore); + esxVI_DatastoreHostMount_Free(&hostMount); + + return pool; +} + +static virStoragePoolPtr +esxStorageBackendVMFSPoolLookupByUUID(virConnectPtr conn, + const unsigned char *uuid) +{ + esxPrivate *priv = conn->storagePrivateData; + esxVI_String *propertyNameList = NULL; + esxVI_ObjectContent *datastoreList = NULL; + esxVI_ObjectContent *datastore = NULL; + esxVI_DatastoreHostMount *hostMount = NULL; + unsigned char md5[MD5_DIGEST_SIZE]; /* MD5_DIGEST_SIZE = VIR_UUID_BUFLEN = 16 */ + char *name = NULL; + virStoragePoolPtr pool = NULL; + + + if (esxVI_String_AppendValueToList(&propertyNameList, "summary.name") < 0 || + esxVI_LookupDatastoreList(priv->primary, propertyNameList, + &datastoreList) < 0) { + goto cleanup; + } + + for (datastore = datastoreList; datastore != NULL; + datastore = datastore->_next) { + esxVI_DatastoreHostMount_Free(&hostMount); + + if (esxVI_LookupDatastoreHostMount(priv->primary, datastore->obj, + &hostMount, esxVI_Occurrence_OptionalItem) < 0) { + goto cleanup; + } + + if (hostMount == NULL) { + /* not found */ + goto cleanup; + } + + md5_buffer(hostMount->mountInfo->path, + strlen(hostMount->mountInfo->path), md5); + + if (memcmp(uuid, md5, VIR_UUID_BUFLEN) == 0) { + break; + } + } + + if (datastore == NULL) { + goto cleanup; + } + + if (esxVI_GetStringValue(datastore, "summary.name", &name, + esxVI_Occurrence_RequiredItem) < 0) { + goto cleanup; + } + + pool = virGetStoragePool(conn, name, uuid); + + cleanup: + esxVI_String_Free(&propertyNameList); + esxVI_ObjectContent_Free(&datastoreList); + esxVI_DatastoreHostMount_Free(&hostMount); + + return pool; +} + +static int +esxStorageBackendVMFSPoolRefresh(virStoragePoolPtr pool, unsigned int flags) +{ + esxPrivate *priv = pool->conn->storagePrivateData; + esxVI_ObjectContent *datastore = NULL; + int result = -1; + + virCheckFlags(0, -1); + + if (esxVI_LookupDatastoreByName(priv->primary, pool->name, NULL, &datastore, + esxVI_Occurrence_RequiredItem) < 0 || + esxVI_RefreshDatastore(priv->primary, datastore->obj) < 0) { + goto cleanup; + } + + result = 0; + + cleanup: + esxVI_ObjectContent_Free(&datastore); + + return result; +} + + +static int +esxStorageBackendVMFSPoolGetInfo(virStoragePoolPtr pool, + virStoragePoolInfoPtr info) +{ + esxPrivate *priv = pool->conn->storagePrivateData; + esxVI_String *propertyNameList = NULL; + esxVI_ObjectContent *datastore = NULL; + esxVI_DynamicProperty *dynamicProperty = NULL; + esxVI_Boolean accessible = esxVI_Boolean_Undefined; + int result = -1; + + if (esxVI_String_AppendValueListToList(&propertyNameList, + "summary.accessible\0" + "summary.capacity\0" + "summary.freeSpace\0") < 0 || + esxVI_LookupDatastoreByName(priv->primary, pool->name, + propertyNameList, &datastore, + esxVI_Occurrence_RequiredItem) < 0 || + esxVI_GetBoolean(datastore, "summary.accessible", + &accessible, esxVI_Occurrence_RequiredItem) < 0) { + goto cleanup; + } + + if (accessible == esxVI_Boolean_True) { + info->state = VIR_STORAGE_POOL_RUNNING; + + for (dynamicProperty = datastore->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "summary.capacity")) { + if (esxVI_AnyType_ExpectType(dynamicProperty->val, + esxVI_Type_Long) < 0) { + goto cleanup; + } + + info->capacity = dynamicProperty->val->int64; + } else if (STREQ(dynamicProperty->name, "summary.freeSpace")) { + if (esxVI_AnyType_ExpectType(dynamicProperty->val, + esxVI_Type_Long) < 0) { + goto cleanup; + } + + info->available = dynamicProperty->val->int64; + } + } + + info->allocation = info->capacity - info->available; + } else { + info->state = VIR_STORAGE_POOL_INACCESSIBLE; + } + + result = 0; + + cleanup: + esxVI_String_Free(&propertyNameList); + esxVI_ObjectContent_Free(&datastore); + + return result; +} + +static char * +esxStorageBackendVMFSPoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) +{ + esxPrivate *priv = pool->conn->storagePrivateData; + esxVI_String *propertyNameList = NULL; + esxVI_ObjectContent *datastore = NULL; + esxVI_DatastoreHostMount *hostMount = NULL; + esxVI_DynamicProperty *dynamicProperty = NULL; + esxVI_Boolean accessible = esxVI_Boolean_Undefined; + virStoragePoolDef def; + esxVI_DatastoreInfo *info = NULL; + esxVI_NasDatastoreInfo *nasInfo = NULL; + char *xml = NULL; + + virCheckFlags(0, NULL); + + memset(&def, 0, sizeof(def)); + + if (esxVI_String_AppendValueListToList(&propertyNameList, + "summary.accessible\0" + "summary.capacity\0" + "summary.freeSpace\0" + "info\0") < 0 || + esxVI_LookupDatastoreByName(priv->primary, pool->name, + propertyNameList, &datastore, + esxVI_Occurrence_RequiredItem) < 0 || + esxVI_GetBoolean(datastore, "summary.accessible", + &accessible, esxVI_Occurrence_RequiredItem) < 0 || + esxVI_LookupDatastoreHostMount(priv->primary, datastore->obj, + &hostMount, esxVI_Occurrence_RequiredItem) < 0) { + goto cleanup; + } + + def.name = pool->name; + memcpy(def.uuid, pool->uuid, VIR_UUID_BUFLEN); + + def.target.path = hostMount->mountInfo->path; + + if (accessible == esxVI_Boolean_True) { + for (dynamicProperty = datastore->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "summary.capacity")) { + if (esxVI_AnyType_ExpectType(dynamicProperty->val, + esxVI_Type_Long) < 0) { + goto cleanup; + } + + def.capacity = dynamicProperty->val->int64; + } else if (STREQ(dynamicProperty->name, "summary.freeSpace")) { + if (esxVI_AnyType_ExpectType(dynamicProperty->val, + esxVI_Type_Long) < 0) { + goto cleanup; + } + + def.available = dynamicProperty->val->int64; + } + } + + def.allocation = def.capacity - def.available; + } + + for (dynamicProperty = datastore->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "info")) { + if (esxVI_DatastoreInfo_CastFromAnyType(dynamicProperty->val, + &info) < 0) { + goto cleanup; + } + + break; + } + } + + /* See vSphere API documentation about HostDatastoreSystem for details */ + if (esxVI_LocalDatastoreInfo_DynamicCast(info) != NULL) { + def.type = VIR_STORAGE_POOL_DIR; + } else if ((nasInfo = esxVI_NasDatastoreInfo_DynamicCast(info)) != NULL) { + if (VIR_ALLOC_N(def.source.hosts, 1) < 0) { + virReportOOMError(); + goto cleanup; + } + def.type = VIR_STORAGE_POOL_NETFS; + def.source.hosts[0].name = nasInfo->nas->remoteHost; + def.source.dir = nasInfo->nas->remotePath; + + if (STRCASEEQ(nasInfo->nas->type, "NFS")) { + def.source.format = VIR_STORAGE_POOL_NETFS_NFS; + } else if (STRCASEEQ(nasInfo->nas->type, "CIFS")) { + def.source.format = VIR_STORAGE_POOL_NETFS_CIFS; + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Datastore has unexpected type '%s'"), + nasInfo->nas->type); + goto cleanup; + } + } else if (esxVI_VmfsDatastoreInfo_DynamicCast(info) != NULL) { + def.type = VIR_STORAGE_POOL_FS; + /* + * FIXME: I'm not sure how to represent the source and target of a + * VMFS based datastore in libvirt terms + */ + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("DatastoreInfo has unexpected type")); + goto cleanup; + } + + xml = virStoragePoolDefFormat(&def); + + cleanup: + esxVI_String_Free(&propertyNameList); + esxVI_ObjectContent_Free(&datastore); + esxVI_DatastoreHostMount_Free(&hostMount); + esxVI_DatastoreInfo_Free(&info); + + return xml; +} + + +static int +esxStorageBackendVMFSPoolNumberOfStorageVolumes(virStoragePoolPtr pool) +{ + bool success = false; + esxPrivate *priv = pool->conn->storagePrivateData; + esxVI_HostDatastoreBrowserSearchResults *searchResultsList = NULL; + esxVI_HostDatastoreBrowserSearchResults *searchResults = NULL; + esxVI_FileInfo *fileInfo = NULL; + int count = 0; + + if (esxVI_LookupDatastoreContentByDatastoreName(priv->primary, pool->name, + &searchResultsList) < 0) { + goto cleanup; + } + + /* Interpret search result */ + for (searchResults = searchResultsList; searchResults != NULL; + searchResults = searchResults->_next) { + for (fileInfo = searchResults->file; fileInfo != NULL; + fileInfo = fileInfo->_next) { + ++count; + } + } + + success = true; + + cleanup: + esxVI_HostDatastoreBrowserSearchResults_Free(&searchResultsList); + + return success ? count : -1; +} + +static int +esxStorageBackendVMFSPoolListStorageVolumes(virStoragePoolPtr pool, char **const names, + int maxnames) + +{ + bool success = false; + esxPrivate *priv = pool->conn->storagePrivateData; + esxVI_HostDatastoreBrowserSearchResults *searchResultsList = NULL; + esxVI_HostDatastoreBrowserSearchResults *searchResults = NULL; + esxVI_FileInfo *fileInfo = NULL; + char *directoryAndFileName = NULL; + size_t length; + int count = 0; + int i; + + if (names == NULL || maxnames < 0) { + virReportError(VIR_ERR_INVALID_ARG, "%s", _("Invalid argument")); + return -1; + } + + if (maxnames == 0) { + return 0; + } + + if (esxVI_LookupDatastoreContentByDatastoreName(priv->primary, pool->name, + &searchResultsList) < 0) { + goto cleanup; + } + + /* Interpret search result */ + for (searchResults = searchResultsList; searchResults != NULL; + searchResults = searchResults->_next) { + VIR_FREE(directoryAndFileName); + + if (esxUtil_ParseDatastorePath(searchResults->folderPath, NULL, NULL, + &directoryAndFileName) < 0) { + goto cleanup; + } + + /* Strip trailing separators */ + length = strlen(directoryAndFileName); + + while (length > 0 && directoryAndFileName[length - 1] == '/') { + directoryAndFileName[length - 1] = '\0'; + --length; + } + + /* Build volume names */ + for (fileInfo = searchResults->file; fileInfo != NULL; + fileInfo = fileInfo->_next) { + if (length < 1) { + names[count] = strdup(fileInfo->path); + + if (names[count] == NULL) { + virReportOOMError(); + goto cleanup; + } + } else if (virAsprintf(&names[count], "%s/%s", directoryAndFileName, + fileInfo->path) < 0) { + virReportOOMError(); + goto cleanup; + } + + ++count; + } + } + + success = true; + + cleanup: + if (! success) { + for (i = 0; i < count; ++i) { + VIR_FREE(names[i]); + } + + count = -1; + } + + esxVI_HostDatastoreBrowserSearchResults_Free(&searchResultsList); + VIR_FREE(directoryAndFileName); + + return count; + +} + +static virStorageVolPtr +esxStorageBackendVMFSVolumeLookupByName(virStoragePoolPtr pool, + const char *name) +{ + virStorageVolPtr volume = NULL; + esxPrivate *priv = pool->conn->storagePrivateData; + char *datastorePath = NULL; + char *key = NULL; + + if (virAsprintf(&datastorePath, "[%s] %s", pool->name, name) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (esxVI_LookupStorageVolumeKeyByDatastorePath(priv->primary, + datastorePath, &key) < 0) { + goto cleanup; + } + + volume = virGetStorageVol(pool->conn, pool->name, name, key); + + cleanup: + VIR_FREE(datastorePath); + VIR_FREE(key); + + return volume; +} + +static virStorageVolPtr +esxStorageBackendVMFSVolumeLookupByPath(virConnectPtr conn, const char *path) +{ + virStorageVolPtr volume = NULL; + esxPrivate *priv = conn->storagePrivateData; + char *datastoreName = NULL; + char *directoryAndFileName = NULL; + char *key = NULL; + + if (esxUtil_ParseDatastorePath(path, &datastoreName, NULL, + &directoryAndFileName) < 0) { + goto cleanup; + } + + if (esxVI_LookupStorageVolumeKeyByDatastorePath(priv->primary, path, + &key) < 0) { + goto cleanup; + } + + volume = virGetStorageVol(conn, datastoreName, directoryAndFileName, key); + + cleanup: + VIR_FREE(datastoreName); + VIR_FREE(directoryAndFileName); + VIR_FREE(key); + + return volume; +} + + + +static virStorageVolPtr +esxStorageBackendVMFSVolumeLookupByKey(virConnectPtr conn, const char *key) +{ + virStorageVolPtr volume = NULL; + esxPrivate *priv = conn->storagePrivateData; + esxVI_String *propertyNameList = NULL; + esxVI_ObjectContent *datastoreList = NULL; + esxVI_ObjectContent *datastore = NULL; + char *datastoreName = NULL; + esxVI_HostDatastoreBrowserSearchResults *searchResultsList = NULL; + esxVI_HostDatastoreBrowserSearchResults *searchResults = NULL; + char *directoryAndFileName = NULL; + size_t length; + char *datastorePath = NULL; + char *volumeName = NULL; + esxVI_FileInfo *fileInfo = NULL; + char *uuid_string = NULL; + char key_candidate[VIR_UUID_STRING_BUFLEN] = ""; + + if (STRPREFIX(key, "[")) { + /* Key is probably a datastore path */ + return esxStorageBackendVMFSVolumeLookupByPath(conn, key); + } + + if (!priv->primary->hasQueryVirtualDiskUuid) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("QueryVirtualDiskUuid not available, cannot lookup storage " + "volume by UUID")); + return NULL; + } + + /* Lookup all datastores */ + if (esxVI_String_AppendValueToList(&propertyNameList, "summary.name") < 0 || + esxVI_LookupDatastoreList(priv->primary, propertyNameList, + &datastoreList) < 0) { + goto cleanup; + } + + for (datastore = datastoreList; datastore != NULL; + datastore = datastore->_next) { + datastoreName = NULL; + + if (esxVI_GetStringValue(datastore, "summary.name", &datastoreName, + esxVI_Occurrence_RequiredItem) < 0) { + goto cleanup; + } + + /* Lookup datastore content */ + esxVI_HostDatastoreBrowserSearchResults_Free(&searchResultsList); + + if (esxVI_LookupDatastoreContentByDatastoreName + (priv->primary, datastoreName, &searchResultsList) < 0) { + goto cleanup; + } + + /* Interpret search result */ + for (searchResults = searchResultsList; searchResults != NULL; + searchResults = searchResults->_next) { + VIR_FREE(directoryAndFileName); + + if (esxUtil_ParseDatastorePath(searchResults->folderPath, NULL, + NULL, &directoryAndFileName) < 0) { + goto cleanup; + } + + /* Strip trailing separators */ + length = strlen(directoryAndFileName); + + while (length > 0 && directoryAndFileName[length - 1] == '/') { + directoryAndFileName[length - 1] = '\0'; + --length; + } + + /* Build datastore path and query the UUID */ + for (fileInfo = searchResults->file; fileInfo != NULL; + fileInfo = fileInfo->_next) { + VIR_FREE(datastorePath); + + if (length < 1) { + if (virAsprintf(&volumeName, "%s", + fileInfo->path) < 0) { + virReportOOMError(); + goto cleanup; + } + } else if (virAsprintf(&volumeName, "%s/%s", + directoryAndFileName, + fileInfo->path) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (virAsprintf(&datastorePath, "[%s] %s", datastoreName, + volumeName) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (esxVI_VmDiskFileInfo_DynamicCast(fileInfo) == NULL) { + /* Only a VirtualDisk has a UUID */ + continue; + } + + VIR_FREE(uuid_string); + + if (esxVI_QueryVirtualDiskUuid + (priv->primary, datastorePath, + priv->primary->datacenter->_reference, + &uuid_string) < 0) { + goto cleanup; + } + + if (esxUtil_ReformatUuid(uuid_string, key_candidate) < 0) { + goto cleanup; + } + + if (STREQ(key, key_candidate)) { + /* Found matching UUID */ + volume = virGetStorageVol(conn, datastoreName, + volumeName, key); + goto cleanup; + } + } + } + } + + cleanup: + esxVI_String_Free(&propertyNameList); + esxVI_ObjectContent_Free(&datastoreList); + esxVI_HostDatastoreBrowserSearchResults_Free(&searchResultsList); + VIR_FREE(directoryAndFileName); + VIR_FREE(datastorePath); + VIR_FREE(volumeName); + VIR_FREE(uuid_string); + + return volume; +} + +static virStorageVolPtr +esxStorageBackendVMFSVolumeCreateXML(virStoragePoolPtr pool, const char *xmldesc, + unsigned int flags) +{ + virStorageVolPtr volume = NULL; + esxPrivate *priv = pool->conn->storagePrivateData; + virStoragePoolDef poolDef; + virStorageVolDefPtr def = NULL; + char *tmp; + char *unescapedDatastorePath = NULL; + char *unescapedDirectoryName = NULL; + char *unescapedDirectoryAndFileName = NULL; + char *directoryName = NULL; + char *fileName = NULL; + char *datastorePathWithoutFileName = NULL; + char *datastorePath = NULL; + esxVI_FileInfo *fileInfo = NULL; + esxVI_FileBackedVirtualDiskSpec *virtualDiskSpec = NULL; + esxVI_ManagedObjectReference *task = NULL; + esxVI_TaskInfoState taskInfoState; + char *taskInfoErrorMessage = NULL; + char *uuid_string = NULL; + char *key = NULL; + + virCheckFlags(0, NULL); + + memset(&poolDef, 0, sizeof(poolDef)); + + if (esxVI_EnsureSession(priv->primary) < 0) { + return NULL; + } + + if (esxStorageBackendVMFSPoolLookupType( + pool->conn, pool->name, &poolDef.type) < 0) { + return NULL; + } + + /* Parse config */ + def = virStorageVolDefParseString(&poolDef, xmldesc); + + if (def == NULL) { + goto cleanup; + } + + if (def->type != VIR_STORAGE_VOL_FILE) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Creating non-file volumes is not supported")); + goto cleanup; + } + + /* Validate config */ + tmp = strrchr(def->name, '/'); + + if (tmp == NULL || *def->name == '/' || tmp[1] == '\0') { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Volume name '%s' doesn't have expected format " + "'<directory>/<file>'"), def->name); + goto cleanup; + } + + if (! virFileHasSuffix(def->name, ".vmdk")) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Volume name '%s' has unsupported suffix, expecting '.vmdk'"), + def->name); + goto cleanup; + } + + if (virAsprintf(&unescapedDatastorePath, "[%s] %s", pool->name, + def->name) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (def->target.format == VIR_STORAGE_FILE_VMDK) { + /* Parse and escape datastore path */ + if (esxUtil_ParseDatastorePath(unescapedDatastorePath, NULL, + &unescapedDirectoryName, + &unescapedDirectoryAndFileName) < 0) { + goto cleanup; + } + + directoryName = esxUtil_EscapeDatastoreItem(unescapedDirectoryName); + + if (directoryName == NULL) { + goto cleanup; + } + + fileName = esxUtil_EscapeDatastoreItem(unescapedDirectoryAndFileName + + strlen(unescapedDirectoryName) + 1); + + if (fileName == NULL) { + goto cleanup; + } + + if (virAsprintf(&datastorePathWithoutFileName, "[%s] %s", pool->name, + directoryName) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (virAsprintf(&datastorePath, "[%s] %s/%s", pool->name, directoryName, + fileName) < 0) { + virReportOOMError(); + goto cleanup; + } + + /* Create directory, if it doesn't exist yet */ + if (esxVI_LookupFileInfoByDatastorePath + (priv->primary, datastorePathWithoutFileName, true, &fileInfo, + esxVI_Occurrence_OptionalItem) < 0) { + goto cleanup; + } + + if (fileInfo == NULL) { + if (esxVI_MakeDirectory(priv->primary, datastorePathWithoutFileName, + priv->primary->datacenter->_reference, + esxVI_Boolean_True) < 0) { + goto cleanup; + } + } + + /* Create VirtualDisk */ + if (esxVI_FileBackedVirtualDiskSpec_Alloc(&virtualDiskSpec) < 0 || + esxVI_Long_Alloc(&virtualDiskSpec->capacityKb) < 0) { + goto cleanup; + } + + /* From the vSphere API documentation about VirtualDiskType ... */ + if (def->allocation == def->capacity) { + /* + * "A preallocated disk has all space allocated at creation time + * and the space is zeroed on demand as the space is used." + */ + virtualDiskSpec->diskType = (char *)"preallocated"; + } else if (def->allocation == 0) { + /* + * "Space required for thin-provisioned virtual disk is allocated + * and zeroed on demand as the space is used." + */ + virtualDiskSpec->diskType = (char *)"thin"; + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Unsupported capacity-to-allocation relation")); + goto cleanup; + } + + /* + * FIXME: The adapter type is a required parameter, but there is no + * way to let the user specify it in the volume XML config. Therefore, + * default to 'busLogic' here. + */ + virtualDiskSpec->adapterType = (char *)"busLogic"; + + virtualDiskSpec->capacityKb->value = + VIR_DIV_UP(def->capacity, 1024); /* Scale from byte to kilobyte */ + + if (esxVI_CreateVirtualDisk_Task + (priv->primary, datastorePath, priv->primary->datacenter->_reference, + esxVI_VirtualDiskSpec_DynamicCast(virtualDiskSpec), &task) < 0 || + esxVI_WaitForTaskCompletion(priv->primary, task, NULL, + esxVI_Occurrence_None, + priv->parsedUri->autoAnswer, + &taskInfoState, + &taskInfoErrorMessage) < 0) { + goto cleanup; + } + + if (taskInfoState != esxVI_TaskInfoState_Success) { + virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not create volume: %s"), + taskInfoErrorMessage); + goto cleanup; + } + + if (priv->primary->hasQueryVirtualDiskUuid) { + if (VIR_ALLOC_N(key, VIR_UUID_STRING_BUFLEN) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (esxVI_QueryVirtualDiskUuid(priv->primary, datastorePath, + priv->primary->datacenter->_reference, + &uuid_string) < 0) { + goto cleanup; + } + + if (esxUtil_ReformatUuid(uuid_string, key) < 0) { + goto cleanup; + } + } else { + /* Fall back to the path as key */ + if (esxVI_String_DeepCopyValue(&key, datastorePath) < 0) { + goto cleanup; + } + } + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Creation of %s volumes is not supported"), + virStorageFileFormatTypeToString(def->target.format)); + goto cleanup; + } + + volume = virGetStorageVol(pool->conn, pool->name, def->name, key); + + cleanup: + if (virtualDiskSpec != NULL) { + virtualDiskSpec->diskType = NULL; + virtualDiskSpec->adapterType = NULL; + } + + virStorageVolDefFree(def); + VIR_FREE(unescapedDatastorePath); + VIR_FREE(unescapedDirectoryName); + VIR_FREE(unescapedDirectoryAndFileName); + VIR_FREE(directoryName); + VIR_FREE(fileName); + VIR_FREE(datastorePathWithoutFileName); + VIR_FREE(datastorePath); + esxVI_FileInfo_Free(&fileInfo); + esxVI_FileBackedVirtualDiskSpec_Free(&virtualDiskSpec); + esxVI_ManagedObjectReference_Free(&task); + VIR_FREE(taskInfoErrorMessage); + VIR_FREE(uuid_string); + VIR_FREE(key); + + return volume; +} + +static virStorageVolPtr +esxStorageBackendVMFSVolumeCreateXMLFrom(virStoragePoolPtr pool, + const char *xmldesc, + virStorageVolPtr sourceVolume, + unsigned int flags) +{ + virStorageVolPtr volume = NULL; + esxPrivate *priv = pool->conn->storagePrivateData; + virStoragePoolDef poolDef; + char *sourceDatastorePath = NULL; + virStorageVolDefPtr def = NULL; + char *tmp; + char *unescapedDatastorePath = NULL; + char *unescapedDirectoryName = NULL; + char *unescapedDirectoryAndFileName = NULL; + char *directoryName = NULL; + char *fileName = NULL; + char *datastorePathWithoutFileName = NULL; + char *datastorePath = NULL; + esxVI_FileInfo *fileInfo = NULL; + esxVI_ManagedObjectReference *task = NULL; + esxVI_TaskInfoState taskInfoState; + char *taskInfoErrorMessage = NULL; + char *uuid_string = NULL; + char *key = NULL; + + virCheckFlags(0, NULL); + + memset(&poolDef, 0, sizeof(poolDef)); + + if (esxVI_EnsureSession(priv->primary) < 0) { + return NULL; + } + + if (esxStorageBackendVMFSPoolLookupType( + pool->conn, pool->name, &poolDef.type) < 0) { + return NULL; + } + + if (virAsprintf(&sourceDatastorePath, "[%s] %s", sourceVolume->pool, + sourceVolume->name) < 0) { + virReportOOMError(); + goto cleanup; + } + + /* Parse config */ + def = virStorageVolDefParseString(&poolDef, xmldesc); + + if (def == NULL) { + goto cleanup; + } + + if (def->type != VIR_STORAGE_VOL_FILE) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Creating non-file volumes is not supported")); + goto cleanup; + } + + /* Validate config */ + tmp = strrchr(def->name, '/'); + + if (tmp == NULL || *def->name == '/' || tmp[1] == '\0') { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Volume name '%s' doesn't have expected format " + "'<directory>/<file>'"), def->name); + goto cleanup; + } + + if (! virFileHasSuffix(def->name, ".vmdk")) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Volume name '%s' has unsupported suffix, expecting '.vmdk'"), + def->name); + goto cleanup; + } + + if (virAsprintf(&unescapedDatastorePath, "[%s] %s", pool->name, + def->name) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (def->target.format == VIR_STORAGE_FILE_VMDK) { + /* Parse and escape datastore path */ + if (esxUtil_ParseDatastorePath(unescapedDatastorePath, NULL, + &unescapedDirectoryName, + &unescapedDirectoryAndFileName) < 0) { + goto cleanup; + } + + directoryName = esxUtil_EscapeDatastoreItem(unescapedDirectoryName); + + if (directoryName == NULL) { + goto cleanup; + } + + fileName = esxUtil_EscapeDatastoreItem(unescapedDirectoryAndFileName + + strlen(unescapedDirectoryName) + 1); + + if (fileName == NULL) { + goto cleanup; + } + + if (virAsprintf(&datastorePathWithoutFileName, "[%s] %s", pool->name, + directoryName) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (virAsprintf(&datastorePath, "[%s] %s/%s", pool->name, directoryName, + fileName) < 0) { + virReportOOMError(); + goto cleanup; + } + + /* Create directory, if it doesn't exist yet */ + if (esxVI_LookupFileInfoByDatastorePath + (priv->primary, datastorePathWithoutFileName, true, &fileInfo, + esxVI_Occurrence_OptionalItem) < 0) { + goto cleanup; + } + + if (fileInfo == NULL) { + if (esxVI_MakeDirectory(priv->primary, datastorePathWithoutFileName, + priv->primary->datacenter->_reference, + esxVI_Boolean_True) < 0) { + goto cleanup; + } + } + + /* Copy VirtualDisk */ + if (esxVI_CopyVirtualDisk_Task(priv->primary, sourceDatastorePath, + priv->primary->datacenter->_reference, + datastorePath, + priv->primary->datacenter->_reference, + NULL, esxVI_Boolean_False, &task) < 0 || + esxVI_WaitForTaskCompletion(priv->primary, task, NULL, + esxVI_Occurrence_None, + priv->parsedUri->autoAnswer, + &taskInfoState, + &taskInfoErrorMessage) < 0) { + goto cleanup; + } + + if (taskInfoState != esxVI_TaskInfoState_Success) { + virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not copy volume: %s"), + taskInfoErrorMessage); + goto cleanup; + } + + if (priv->primary->hasQueryVirtualDiskUuid) { + if (VIR_ALLOC_N(key, VIR_UUID_STRING_BUFLEN) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (esxVI_QueryVirtualDiskUuid(priv->primary, datastorePath, + priv->primary->datacenter->_reference, + &uuid_string) < 0) { + goto cleanup; + } + + if (esxUtil_ReformatUuid(uuid_string, key) < 0) { + goto cleanup; + } + } else { + /* Fall back to the path as key */ + if (esxVI_String_DeepCopyValue(&key, datastorePath) < 0) { + goto cleanup; + } + } + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Creation of %s volumes is not supported"), + virStorageFileFormatTypeToString(def->target.format)); + goto cleanup; + } + + volume = virGetStorageVol(pool->conn, pool->name, def->name, key); + + cleanup: + VIR_FREE(sourceDatastorePath); + virStorageVolDefFree(def); + VIR_FREE(unescapedDatastorePath); + VIR_FREE(unescapedDirectoryName); + VIR_FREE(unescapedDirectoryAndFileName); + VIR_FREE(directoryName); + VIR_FREE(fileName); + VIR_FREE(datastorePathWithoutFileName); + VIR_FREE(datastorePath); + esxVI_FileInfo_Free(&fileInfo); + esxVI_ManagedObjectReference_Free(&task); + VIR_FREE(taskInfoErrorMessage); + VIR_FREE(uuid_string); + VIR_FREE(key); + + return volume; +} + + + +static char * +esxStorageBackendVMFSVolumeGetXMLDesc(virStorageVolPtr volume, unsigned int flags) +{ + esxPrivate *priv = volume->conn->storagePrivateData; + virStoragePoolDef pool; + char *datastorePath = NULL; + esxVI_FileInfo *fileInfo = NULL; + esxVI_VmDiskFileInfo *vmDiskFileInfo = NULL; + esxVI_IsoImageFileInfo *isoImageFileInfo = NULL; + esxVI_FloppyImageFileInfo *floppyImageFileInfo = NULL; + virStorageVolDef def; + char *xml = NULL; + + virCheckFlags(0, NULL); + + memset(&pool, 0, sizeof(pool)); + memset(&def, 0, sizeof(def)); + + if (esxStorageBackendVMFSPoolLookupType( + volume->conn, volume->pool, &pool.type) < 0) { + return NULL; + } + + /* Lookup file info */ + if (virAsprintf(&datastorePath, "[%s] %s", volume->pool, volume->name) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (esxVI_LookupFileInfoByDatastorePath(priv->primary, datastorePath, + false, &fileInfo, + esxVI_Occurrence_RequiredItem) < 0) { + goto cleanup; + } + + vmDiskFileInfo = esxVI_VmDiskFileInfo_DynamicCast(fileInfo); + isoImageFileInfo = esxVI_IsoImageFileInfo_DynamicCast(fileInfo); + floppyImageFileInfo = esxVI_FloppyImageFileInfo_DynamicCast(fileInfo); + + def.name = volume->name; + + if (esxVI_LookupStorageVolumeKeyByDatastorePath(priv->primary, datastorePath, + &def.key) < 0) { + goto cleanup; + } + + def.type = VIR_STORAGE_VOL_FILE; + def.target.path = datastorePath; + + if (vmDiskFileInfo != NULL) { + def.capacity = vmDiskFileInfo->capacityKb->value * 1024; /* Scale from kilobyte to byte */ + def.allocation = vmDiskFileInfo->fileSize->value; + + def.target.format = VIR_STORAGE_FILE_VMDK; + } else if (isoImageFileInfo != NULL) { + def.capacity = fileInfo->fileSize->value; + def.allocation = fileInfo->fileSize->value; + + def.target.format = VIR_STORAGE_FILE_ISO; + } else if (floppyImageFileInfo != NULL) { + def.capacity = fileInfo->fileSize->value; + def.allocation = fileInfo->fileSize->value; + + def.target.format = VIR_STORAGE_FILE_RAW; + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("File '%s' has unknown type"), datastorePath); + goto cleanup; + } + + xml = virStorageVolDefFormat(&pool, &def); + + cleanup: + VIR_FREE(datastorePath); + esxVI_FileInfo_Free(&fileInfo); + VIR_FREE(def.key); + + return xml; +} + + + +static int +esxStorageBackendVMFSVolumeDelete(virStorageVolPtr volume, unsigned int flags) +{ + int result = -1; + esxPrivate *priv = volume->conn->storagePrivateData; + char *datastorePath = NULL; + esxVI_ManagedObjectReference *task = NULL; + esxVI_TaskInfoState taskInfoState; + char *taskInfoErrorMessage = NULL; + + virCheckFlags(0, -1); + + if (virAsprintf(&datastorePath, "[%s] %s", volume->pool, volume->name) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (esxVI_DeleteVirtualDisk_Task(priv->primary, datastorePath, + priv->primary->datacenter->_reference, + &task) < 0 || + esxVI_WaitForTaskCompletion(priv->primary, task, NULL, + esxVI_Occurrence_None, + priv->parsedUri->autoAnswer, + &taskInfoState, &taskInfoErrorMessage) < 0) { + goto cleanup; + } + + if (taskInfoState != esxVI_TaskInfoState_Success) { + virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not delete volume: %s"), + taskInfoErrorMessage); + goto cleanup; + } + + result = 0; + + cleanup: + VIR_FREE(datastorePath); + esxVI_ManagedObjectReference_Free(&task); + VIR_FREE(taskInfoErrorMessage); + + return result; + +} + + + +static int +esxStorageBackendVMFSVolumeWipe(virStorageVolPtr volume, unsigned int flags) +{ + int result = -1; + esxPrivate *priv = volume->conn->storagePrivateData; + char *datastorePath = NULL; + esxVI_ManagedObjectReference *task = NULL; + esxVI_TaskInfoState taskInfoState; + char *taskInfoErrorMessage = NULL; + + virCheckFlags(0, -1); + + if (virAsprintf(&datastorePath, "[%s] %s", volume->pool, volume->name) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (esxVI_ZeroFillVirtualDisk_Task(priv->primary, datastorePath, + priv->primary->datacenter->_reference, + &task) < 0 || + esxVI_WaitForTaskCompletion(priv->primary, task, NULL, + esxVI_Occurrence_None, + priv->parsedUri->autoAnswer, + &taskInfoState, &taskInfoErrorMessage) < 0) { + goto cleanup; + } + + if (taskInfoState != esxVI_TaskInfoState_Success) { + virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not wipe volume: %s"), + taskInfoErrorMessage); + goto cleanup; + } + + result = 0; + + cleanup: + VIR_FREE(datastorePath); + esxVI_ManagedObjectReference_Free(&task); + VIR_FREE(taskInfoErrorMessage); + + return result; + +} + + +static char* +esxStorageBackendVMFSVolumeGetPath(virStorageVolPtr volume) +{ + char *path; + + if (virAsprintf(&path, "[%s] %s", volume->pool, volume->name) < 0) { + virReportOOMError(); + return NULL; + } + + return path; + +} + + + + +virStorageDriver esxStorageBackendVMFSDrv = { + .name = "ESX VMFS backend", + .open = NULL, /* 0.7.6 */ + .close = NULL, /* 0.7.6 */ + .numOfPools = esxStorageBackendVMFSNumberOfStoragePools, /* 0.8.2 */ + .listPools = esxStorageBackendVMFSListStoragePools, /* 0.8.2 */ + .poolLookupByName = esxStorageBackendVMFSPoolLookupByName, /* 0.8.2 */ + .poolLookupByUUID = esxStorageBackendVMFSPoolLookupByUUID, /* 0.8.2 */ + .poolRefresh = esxStorageBackendVMFSPoolRefresh, /* 0.8.2 */ + .poolGetInfo = esxStorageBackendVMFSPoolGetInfo, /* 0.8.2 */ + .poolGetXMLDesc = esxStorageBackendVMFSPoolGetXMLDesc, /* 0.8.2 */ + .poolNumOfVolumes = esxStorageBackendVMFSPoolNumberOfStorageVolumes, /* 0.8.4 */ + .poolListVolumes = esxStorageBackendVMFSPoolListStorageVolumes, /* 0.8.4 */ + .volLookupByName = esxStorageBackendVMFSVolumeLookupByName, /* x.x.x */ + .volLookupByKey = esxStorageBackendVMFSVolumeLookupByKey, /* 0.8.4 */ + .volLookupByPath = esxStorageBackendVMFSVolumeLookupByPath, /* 0.8.4 */ + .volCreateXML = esxStorageBackendVMFSVolumeCreateXML, /* 0.8.4 */ + .volCreateXMLFrom = esxStorageBackendVMFSVolumeCreateXMLFrom, /* 0.8.7 */ + .volGetXMLDesc = esxStorageBackendVMFSVolumeGetXMLDesc, /* 0.8.4 */ + .volDelete = esxStorageBackendVMFSVolumeDelete, /* 0.8.7 */ + .volWipe = esxStorageBackendVMFSVolumeWipe, /* 0.8.7 */ + .volGetPath = esxStorageBackendVMFSVolumeGetPath, /* 0.10.0 */ + +}; diff --git a/src/esx/esx_storage_backend_vmfs.h b/src/esx/esx_storage_backend_vmfs.h new file mode 100644 index 0000000..d3adf73 --- /dev/null +++ b/src/esx/esx_storage_backend_vmfs.h @@ -0,0 +1,31 @@ +/* + * esx_storage_backend_vmfs.h: ESX storage backend for VMFS datastores + * + * Copyright (C) 2007-2008 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Ata E Husain Bohra (ata.husain(a)hotmail.com) + */ + +#ifndef __ESX_STORAGE_BACKEND_VMFS_H__ +# define __ESX_STORAGE_BACKEND_VMFS_H__ + +#include "driver.h" + +extern virStorageDriver esxStorageBackendVMFSDrv; + +#endif /* __ESX_STORAGE_BACKEND_VMFS_H__ */ + diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c index 348bd62..d4e81f3 100644 --- a/src/esx/esx_storage_driver.c +++ b/src/esx/esx_storage_driver.c @@ -24,82 +24,67 @@ #include <config.h> -#include "md5.h" -#include "verify.h" #include "internal.h" #include "util.h" #include "memory.h" #include "logging.h" -#include "uuid.h" #include "storage_conf.h" -#include "storage_file.h" #include "esx_private.h" #include "esx_storage_driver.h" +#include "esx_storage_backend_iscsi.h" +#include "esx_storage_backend_vmfs.h" #include "esx_vi.h" #include "esx_vi_methods.h" #include "esx_util.h" #define VIR_FROM_THIS VIR_FROM_ESX -/* - * The UUID of a storage pool is the MD5 sum of it's mount path. Therefore, - * verify that UUID and MD5 sum match in size, because we rely on that. +/** + * ESX storage driver implements a facade pattern; + * the driver exposes the routines supported by Libvirt + * public interface to manage ESX storage devices. Internally + * it uses backend drivers to perform the required task. */ -verify(MD5_DIGEST_SIZE == VIR_UUID_BUFLEN); +enum { + ISCSI = 0, + VMFS, + LAST_DRIVER +}; +static virStorageDriverPtr backendDrv[LAST_DRIVER] = {NULL}; static int -esxStoragePoolLookupType(esxVI_Context *ctx, const char *poolName, - int *poolType) +esxStorageGetBackendDriver(virConnectPtr conn, const char *name, + virStorageDriverPtr *backend) { int result = -1; - esxVI_String *propertyNameList = NULL; - esxVI_ObjectContent *datastore = NULL; - esxVI_DynamicProperty *dynamicProperty = NULL; - esxVI_DatastoreInfo *datastoreInfo = NULL; - - if (esxVI_String_AppendValueToList(&propertyNameList, "info") < 0 || - esxVI_LookupDatastoreByName(ctx, poolName, propertyNameList, &datastore, - esxVI_Occurrence_RequiredItem) < 0) { - goto cleanup; - } + int i = 0; - for (dynamicProperty = datastore->propSet; dynamicProperty != NULL; - dynamicProperty = dynamicProperty->_next) { - if (STREQ(dynamicProperty->name, "info")) { - if (esxVI_DatastoreInfo_CastFromAnyType(dynamicProperty->val, - &datastoreInfo) < 0) { - goto cleanup; - } + virCheckNonNullArgGoto(backend, cleanup); + for (i = 0; i < LAST_DRIVER; ++i) { + const virStoragePoolPtr tempPool = + backendDrv[i]->poolLookupByName(conn, name); + if (tempPool != NULL) { + *backend = backendDrv[i]; break; } } - if (esxVI_LocalDatastoreInfo_DynamicCast(datastoreInfo) != NULL) { - *poolType = VIR_STORAGE_POOL_DIR; - } else if (esxVI_NasDatastoreInfo_DynamicCast(datastoreInfo) != NULL) { - *poolType = VIR_STORAGE_POOL_NETFS; - } else if (esxVI_VmfsDatastoreInfo_DynamicCast(datastoreInfo) != NULL) { - *poolType = VIR_STORAGE_POOL_FS; - } else { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("DatastoreInfo has unexpected type")); + if (*backend == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not find storage pool with name '%s'"), name); goto cleanup; } result = 0; - cleanup: - esxVI_String_Free(&propertyNameList); - esxVI_ObjectContent_Free(&datastore); - esxVI_DatastoreInfo_Free(&datastoreInfo); +cleanup: return result; -} - +} static virDrvOpenStatus esxStorageOpen(virConnectPtr conn, @@ -114,6 +99,10 @@ esxStorageOpen(virConnectPtr conn, conn->storagePrivateData = conn->privateData; + /* set backend driver pointers */ + backendDrv[ISCSI] = &esxStorageBackendISCSIDrv; + backendDrv[VMFS] = &esxStorageBackendVMFSDrv; + return VIR_DRV_OPEN_SUCCESS; } @@ -122,6 +111,13 @@ esxStorageOpen(virConnectPtr conn, static int esxStorageClose(virConnectPtr conn) { + int i = 0; + + /* reset the backend driver pointers */ + for (i = 0; i < LAST_DRIVER; ++i) { + backendDrv[i] = NULL; + } + conn->storagePrivateData = NULL; return 0; @@ -132,27 +128,28 @@ esxStorageClose(virConnectPtr conn) static int esxNumberOfStoragePools(virConnectPtr conn) { - int count = 0; esxPrivate *priv = conn->storagePrivateData; - esxVI_ObjectContent *datastoreList = NULL; - esxVI_ObjectContent *datastore = NULL; + int count = 0; + int i = 0; + bool success = false; if (esxVI_EnsureSession(priv->primary) < 0) { - return -1; + goto cleanup; } - if (esxVI_LookupDatastoreList(priv->primary, NULL, &datastoreList) < 0) { - return -1; + for (i = 0; i < LAST_DRIVER; ++i) { + int tempCount = backendDrv[i]->numOfPools(conn); + if (tempCount < 0) { + goto cleanup; + } + count += tempCount; } - for (datastore = datastoreList; datastore != NULL; - datastore = datastore->_next) { - ++count; - } + success = true; - esxVI_ObjectContent_Free(&datastoreList); + cleanup: - return count; + return success ? count : -1; } @@ -162,56 +159,32 @@ esxListStoragePools(virConnectPtr conn, char **const names, int maxnames) { bool success = false; esxPrivate *priv = conn->storagePrivateData; - esxVI_String *propertyNameList = NULL; - esxVI_DynamicProperty *dynamicProperty = NULL; - esxVI_ObjectContent *datastoreList = NULL; - esxVI_ObjectContent *datastore = NULL; int count = 0; - int i; + int i = 0; if (maxnames == 0) { return 0; } if (esxVI_EnsureSession(priv->primary) < 0) { - return -1; - } - - if (esxVI_String_AppendValueToList(&propertyNameList, - "summary.name") < 0 || - esxVI_LookupDatastoreList(priv->primary, propertyNameList, - &datastoreList) < 0) { goto cleanup; } - for (datastore = datastoreList; datastore != NULL; - datastore = datastore->_next) { - for (dynamicProperty = datastore->propSet; dynamicProperty != NULL; - dynamicProperty = dynamicProperty->_next) { - if (STREQ(dynamicProperty->name, "summary.name")) { - if (esxVI_AnyType_ExpectType(dynamicProperty->val, - esxVI_Type_String) < 0) { - goto cleanup; - } - - names[count] = strdup(dynamicProperty->val->string); - - if (names[count] == NULL) { - virReportOOMError(); - goto cleanup; - } - - ++count; - break; - } else { - VIR_WARN("Unexpected '%s' property", dynamicProperty->name); - } + for (i = 0; i < LAST_DRIVER; ++i) { + int tempCount = + backendDrv[i]->listPools(conn, &names[count], maxnames-count); + + if (tempCount < 0) { + goto cleanup; } + + count += tempCount; } success = true; cleanup: + if (! success) { for (i = 0; i < count; ++i) { VIR_FREE(names[i]); @@ -220,10 +193,8 @@ esxListStoragePools(virConnectPtr conn, char **const names, int maxnames) count = -1; } - esxVI_String_Free(&propertyNameList); - esxVI_ObjectContent_Free(&datastoreList); - return count; + } @@ -252,43 +223,31 @@ static virStoragePoolPtr esxStoragePoolLookupByName(virConnectPtr conn, const char *name) { esxPrivate *priv = conn->storagePrivateData; - esxVI_ObjectContent *datastore = NULL; - esxVI_DatastoreHostMount *hostMount = NULL; - unsigned char md5[MD5_DIGEST_SIZE]; /* MD5_DIGEST_SIZE = VIR_UUID_BUFLEN = 16 */ virStoragePoolPtr pool = NULL; + int i = 0; - if (esxVI_EnsureSession(priv->primary) < 0) { - return NULL; - } + virCheckNonNullArgGoto(name, cleanup); - if (esxVI_LookupDatastoreByName(priv->primary, name, NULL, &datastore, - esxVI_Occurrence_RequiredItem) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { goto cleanup; } - /* - * Datastores don't have a UUID, but we can use the 'host.mountInfo.path' - * property as source for a UUID. The mount path is unique per host and - * cannot change during the lifetime of the datastore. - * - * The MD5 sum of the mount path can be used as UUID, assuming MD5 is - * considered to be collision-free enough for this use case. - */ - if (esxVI_LookupDatastoreHostMount(priv->primary, datastore->obj, - &hostMount) < 0) { - goto cleanup; + for (i = 0; i < LAST_DRIVER; ++i) { + pool = backendDrv[i]->poolLookupByName(conn, name); + if (pool != NULL) { + break; + } } - md5_buffer(hostMount->mountInfo->path, - strlen(hostMount->mountInfo->path), md5); - - pool = virGetStoragePool(conn, name, md5); + if (pool == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not find storage pool with name '%s'"), name); + } - cleanup: - esxVI_ObjectContent_Free(&datastore); - esxVI_DatastoreHostMount_Free(&hostMount); +cleanup: return pool; + } @@ -297,65 +256,31 @@ static virStoragePoolPtr esxStoragePoolLookupByUUID(virConnectPtr conn, const unsigned char *uuid) { esxPrivate *priv = conn->storagePrivateData; - esxVI_String *propertyNameList = NULL; - esxVI_ObjectContent *datastoreList = NULL; - esxVI_ObjectContent *datastore = NULL; - esxVI_DatastoreHostMount *hostMount = NULL; - unsigned char md5[MD5_DIGEST_SIZE]; /* MD5_DIGEST_SIZE = VIR_UUID_BUFLEN = 16 */ - char uuid_string[VIR_UUID_STRING_BUFLEN] = ""; - char *name = NULL; virStoragePoolPtr pool = NULL; + int i = 0; - if (esxVI_EnsureSession(priv->primary) < 0) { - return NULL; - } + virCheckNonNullArgGoto(uuid, cleanup); - if (esxVI_String_AppendValueToList(&propertyNameList, "summary.name") < 0 || - esxVI_LookupDatastoreList(priv->primary, propertyNameList, - &datastoreList) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { goto cleanup; } - for (datastore = datastoreList; datastore != NULL; - datastore = datastore->_next) { - esxVI_DatastoreHostMount_Free(&hostMount); - - if (esxVI_LookupDatastoreHostMount(priv->primary, datastore->obj, - &hostMount) < 0) { - goto cleanup; - } - - md5_buffer(hostMount->mountInfo->path, - strlen(hostMount->mountInfo->path), md5); - - if (memcmp(uuid, md5, VIR_UUID_BUFLEN) == 0) { + for (i = 0; i < LAST_DRIVER; ++i) { + pool = backendDrv[i]->poolLookupByUUID(conn, uuid); + if (pool != NULL) { break; } } - if (datastore == NULL) { - virUUIDFormat(uuid, uuid_string); - - virReportError(VIR_ERR_NO_STORAGE_POOL, - _("Could not find datastore with UUID '%s'"), - uuid_string); - - goto cleanup; - } - - if (esxVI_GetStringValue(datastore, "summary.name", &name, - esxVI_Occurrence_RequiredItem) < 0) { - goto cleanup; + if (pool == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not find storage pool with uuid '%s'"), uuid); } - pool = virGetStoragePool(conn, name, uuid); - - cleanup: - esxVI_String_Free(&propertyNameList); - esxVI_ObjectContent_Free(&datastoreList); - esxVI_DatastoreHostMount_Free(&hostMount); +cleanup: return pool; + } @@ -373,26 +298,23 @@ esxStoragePoolRefresh(virStoragePoolPtr pool, unsigned int flags) { int result = -1; esxPrivate *priv = pool->conn->storagePrivateData; - esxVI_ObjectContent *datastore = NULL; - - virCheckFlags(0, -1); + virStorageDriverPtr backend = NULL; if (esxVI_EnsureSession(priv->primary) < 0) { - return -1; + goto cleanup; } - if (esxVI_LookupDatastoreByName(priv->primary, pool->name, NULL, &datastore, - esxVI_Occurrence_RequiredItem) < 0 || - esxVI_RefreshDatastore(priv->primary, datastore->obj) < 0) { + if (esxStorageGetBackendDriver(pool->conn, pool->name, &backend) < 0 || + backend->poolRefresh(pool, flags) < 0) { goto cleanup; } result = 0; cleanup: - esxVI_ObjectContent_Free(&datastore); return result; + } @@ -402,63 +324,25 @@ esxStoragePoolGetInfo(virStoragePoolPtr pool, virStoragePoolInfoPtr info) { int result = -1; esxPrivate *priv = pool->conn->storagePrivateData; - esxVI_String *propertyNameList = NULL; - esxVI_ObjectContent *datastore = NULL; - esxVI_DynamicProperty *dynamicProperty = NULL; - esxVI_Boolean accessible = esxVI_Boolean_Undefined; + virStorageDriverPtr backend = NULL; memset(info, 0, sizeof(*info)); if (esxVI_EnsureSession(priv->primary) < 0) { - return -1; - } - - if (esxVI_String_AppendValueListToList(&propertyNameList, - "summary.accessible\0" - "summary.capacity\0" - "summary.freeSpace\0") < 0 || - esxVI_LookupDatastoreByName(priv->primary, pool->name, - propertyNameList, &datastore, - esxVI_Occurrence_RequiredItem) < 0 || - esxVI_GetBoolean(datastore, "summary.accessible", - &accessible, esxVI_Occurrence_RequiredItem) < 0) { goto cleanup; } - if (accessible == esxVI_Boolean_True) { - info->state = VIR_STORAGE_POOL_RUNNING; - - for (dynamicProperty = datastore->propSet; dynamicProperty != NULL; - dynamicProperty = dynamicProperty->_next) { - if (STREQ(dynamicProperty->name, "summary.capacity")) { - if (esxVI_AnyType_ExpectType(dynamicProperty->val, - esxVI_Type_Long) < 0) { - goto cleanup; - } - - info->capacity = dynamicProperty->val->int64; - } else if (STREQ(dynamicProperty->name, "summary.freeSpace")) { - if (esxVI_AnyType_ExpectType(dynamicProperty->val, - esxVI_Type_Long) < 0) { - goto cleanup; - } - - info->available = dynamicProperty->val->int64; - } - } - - info->allocation = info->capacity - info->available; - } else { - info->state = VIR_STORAGE_POOL_INACCESSIBLE; + if (esxStorageGetBackendDriver(pool->conn, pool->name, &backend) < 0 || + backend->poolGetInfo(pool, info) < 0) { + goto cleanup; } result = 0; cleanup: - esxVI_String_Free(&propertyNameList); - esxVI_ObjectContent_Free(&datastore); return result; + } @@ -466,123 +350,24 @@ esxStoragePoolGetInfo(virStoragePoolPtr pool, virStoragePoolInfoPtr info) static char * esxStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) { - esxPrivate *priv = pool->conn->storagePrivateData; - esxVI_String *propertyNameList = NULL; - esxVI_ObjectContent *datastore = NULL; - esxVI_DatastoreHostMount *hostMount = NULL; - esxVI_DynamicProperty *dynamicProperty = NULL; - esxVI_Boolean accessible = esxVI_Boolean_Undefined; - virStoragePoolDef def; - esxVI_DatastoreInfo *info = NULL; - esxVI_NasDatastoreInfo *nasInfo = NULL; char *xml = NULL; - - virCheckFlags(0, NULL); - - memset(&def, 0, sizeof(def)); + esxPrivate *priv = pool->conn->storagePrivateData; + virStorageDriverPtr backend = NULL; if (esxVI_EnsureSession(priv->primary) < 0) { - return NULL; - } - - if (esxVI_String_AppendValueListToList(&propertyNameList, - "summary.accessible\0" - "summary.capacity\0" - "summary.freeSpace\0" - "info\0") < 0 || - esxVI_LookupDatastoreByName(priv->primary, pool->name, - propertyNameList, &datastore, - esxVI_Occurrence_RequiredItem) < 0 || - esxVI_GetBoolean(datastore, "summary.accessible", - &accessible, esxVI_Occurrence_RequiredItem) < 0 || - esxVI_LookupDatastoreHostMount(priv->primary, datastore->obj, - &hostMount) < 0) { goto cleanup; } - def.name = pool->name; - memcpy(def.uuid, pool->uuid, VIR_UUID_BUFLEN); - - def.target.path = hostMount->mountInfo->path; - - if (accessible == esxVI_Boolean_True) { - for (dynamicProperty = datastore->propSet; dynamicProperty != NULL; - dynamicProperty = dynamicProperty->_next) { - if (STREQ(dynamicProperty->name, "summary.capacity")) { - if (esxVI_AnyType_ExpectType(dynamicProperty->val, - esxVI_Type_Long) < 0) { - goto cleanup; - } - - def.capacity = dynamicProperty->val->int64; - } else if (STREQ(dynamicProperty->name, "summary.freeSpace")) { - if (esxVI_AnyType_ExpectType(dynamicProperty->val, - esxVI_Type_Long) < 0) { - goto cleanup; - } - - def.available = dynamicProperty->val->int64; - } - } - - def.allocation = def.capacity - def.available; - } - - for (dynamicProperty = datastore->propSet; dynamicProperty != NULL; - dynamicProperty = dynamicProperty->_next) { - if (STREQ(dynamicProperty->name, "info")) { - if (esxVI_DatastoreInfo_CastFromAnyType(dynamicProperty->val, - &info) < 0) { - goto cleanup; - } - - break; - } - } - - /* See vSphere API documentation about HostDatastoreSystem for details */ - if (esxVI_LocalDatastoreInfo_DynamicCast(info) != NULL) { - def.type = VIR_STORAGE_POOL_DIR; - } else if ((nasInfo = esxVI_NasDatastoreInfo_DynamicCast(info)) != NULL) { - if (VIR_ALLOC_N(def.source.hosts, 1) < 0) { - virReportOOMError(); - goto cleanup; - } - def.type = VIR_STORAGE_POOL_NETFS; - def.source.hosts[0].name = nasInfo->nas->remoteHost; - def.source.dir = nasInfo->nas->remotePath; - - if (STRCASEEQ(nasInfo->nas->type, "NFS")) { - def.source.format = VIR_STORAGE_POOL_NETFS_NFS; - } else if (STRCASEEQ(nasInfo->nas->type, "CIFS")) { - def.source.format = VIR_STORAGE_POOL_NETFS_CIFS; - } else { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Datastore has unexpected type '%s'"), - nasInfo->nas->type); - goto cleanup; - } - } else if (esxVI_VmfsDatastoreInfo_DynamicCast(info) != NULL) { - def.type = VIR_STORAGE_POOL_FS; - /* - * FIXME: I'm not sure how to represent the source and target of a - * VMFS based datastore in libvirt terms - */ - } else { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("DatastoreInfo has unexpected type")); + if (esxStorageGetBackendDriver(pool->conn, pool->name, &backend) < 0) { goto cleanup; } - xml = virStoragePoolDefFormat(&def); + xml = backend->poolGetXMLDesc(pool, flags); cleanup: - esxVI_String_Free(&propertyNameList); - esxVI_ObjectContent_Free(&datastore); - esxVI_DatastoreHostMount_Free(&hostMount); - esxVI_DatastoreInfo_Free(&info); return xml; + } @@ -622,33 +407,25 @@ esxStoragePoolNumberOfStorageVolumes(virStoragePoolPtr pool) { bool success = false; esxPrivate *priv = pool->conn->storagePrivateData; - esxVI_HostDatastoreBrowserSearchResults *searchResultsList = NULL; - esxVI_HostDatastoreBrowserSearchResults *searchResults = NULL; - esxVI_FileInfo *fileInfo = NULL; + virStorageDriverPtr backend = NULL; int count = 0; if (esxVI_EnsureSession(priv->primary) < 0) { - return -1; + goto cleanup; } - if (esxVI_LookupDatastoreContentByDatastoreName(priv->primary, pool->name, - &searchResultsList) < 0) { + if (esxStorageGetBackendDriver(pool->conn, pool->name, &backend) < 0) { goto cleanup; } - /* Interpret search result */ - for (searchResults = searchResultsList; searchResults != NULL; - searchResults = searchResults->_next) { - for (fileInfo = searchResults->file; fileInfo != NULL; - fileInfo = fileInfo->_next) { - ++count; - } + count = backend->poolNumOfVolumes(pool); + if (count < 0) { + goto cleanup; } success = true; cleanup: - esxVI_HostDatastoreBrowserSearchResults_Free(&searchResultsList); return success ? count : -1; } @@ -659,87 +436,25 @@ static int esxStoragePoolListStorageVolumes(virStoragePoolPtr pool, char **const names, int maxnames) { - bool success = false; + int result = -1; esxPrivate *priv = pool->conn->storagePrivateData; - esxVI_HostDatastoreBrowserSearchResults *searchResultsList = NULL; - esxVI_HostDatastoreBrowserSearchResults *searchResults = NULL; - esxVI_FileInfo *fileInfo = NULL; - char *directoryAndFileName = NULL; - size_t length; - int count = 0; - int i; - - if (names == NULL || maxnames < 0) { - virReportError(VIR_ERR_INVALID_ARG, "%s", _("Invalid argument")); - return -1; - } - - if (maxnames == 0) { - return 0; - } + virStorageDriverPtr backend = NULL; if (esxVI_EnsureSession(priv->primary) < 0) { - return -1; - } - - if (esxVI_LookupDatastoreContentByDatastoreName(priv->primary, pool->name, - &searchResultsList) < 0) { goto cleanup; } - /* Interpret search result */ - for (searchResults = searchResultsList; searchResults != NULL; - searchResults = searchResults->_next) { - VIR_FREE(directoryAndFileName); - - if (esxUtil_ParseDatastorePath(searchResults->folderPath, NULL, NULL, - &directoryAndFileName) < 0) { - goto cleanup; - } - - /* Strip trailing separators */ - length = strlen(directoryAndFileName); - - while (length > 0 && directoryAndFileName[length - 1] == '/') { - directoryAndFileName[length - 1] = '\0'; - --length; - } - - /* Build volume names */ - for (fileInfo = searchResults->file; fileInfo != NULL; - fileInfo = fileInfo->_next) { - if (length < 1) { - names[count] = strdup(fileInfo->path); - - if (names[count] == NULL) { - virReportOOMError(); - goto cleanup; - } - } else if (virAsprintf(&names[count], "%s/%s", directoryAndFileName, - fileInfo->path) < 0) { - virReportOOMError(); - goto cleanup; - } - - ++count; - } + if (esxStorageGetBackendDriver(pool->conn, pool->name, &backend) < 0 || + backend->poolListVolumes(pool, names, maxnames) < 0) { + goto cleanup; } - success = true; + result = 0; cleanup: - if (! success) { - for (i = 0; i < count; ++i) { - VIR_FREE(names[i]); - } - count = -1; - } - - esxVI_HostDatastoreBrowserSearchResults_Free(&searchResultsList); - VIR_FREE(directoryAndFileName); + return result; - return count; } @@ -749,30 +464,24 @@ esxStorageVolumeLookupByName(virStoragePoolPtr pool, const char *name) { virStorageVolPtr volume = NULL; esxPrivate *priv = pool->conn->storagePrivateData; - char *datastorePath = NULL; - char *key = NULL; + virStorageDriverPtr backend = NULL; - if (esxVI_EnsureSession(priv->primary) < 0) { - return NULL; - } + virCheckNonNullArgGoto(name, cleanup); - if (virAsprintf(&datastorePath, "[%s] %s", pool->name, name) < 0) { - virReportOOMError(); + if (esxVI_EnsureSession(priv->primary) < 0) { goto cleanup; } - if (esxVI_LookupStorageVolumeKeyByDatastorePath(priv->primary, - datastorePath, &key) < 0) { + if (esxStorageGetBackendDriver(pool->conn, pool->name, &backend) < 0) { goto cleanup; } - volume = virGetStorageVol(pool->conn, pool->name, name, key); + volume = backend->volLookupByName(pool, name); cleanup: - VIR_FREE(datastorePath); - VIR_FREE(key); return volume; + } @@ -782,32 +491,33 @@ esxStorageVolumeLookupByPath(virConnectPtr conn, const char *path) { virStorageVolPtr volume = NULL; esxPrivate *priv = conn->storagePrivateData; - char *datastoreName = NULL; - char *directoryAndFileName = NULL; - char *key = NULL; - if (esxVI_EnsureSession(priv->primary) < 0) { - return NULL; - } + virCheckNonNullArgGoto(path, cleanup); - if (esxUtil_ParseDatastorePath(path, &datastoreName, NULL, - &directoryAndFileName) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { goto cleanup; } - if (esxVI_LookupStorageVolumeKeyByDatastorePath(priv->primary, path, - &key) < 0) { - goto cleanup; + /* FIXME: calling backend blindly may set unwanted error codes + * + * VMFS Datastore path follows cannonical format i.e.: + * [<datastore_name>] <file_path> + * WHEREAS + * iSCSI LUNs device path follows normal linux path convention + */ + if (STRPREFIX(path, "[")) { + volume = backendDrv[VMFS]->volLookupByPath(conn, path); + } else if (STRPREFIX(path, "/")) { + volume = backendDrv[ISCSI]->volLookupByPath(conn, path); + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected volume path format: %s"), path); } - volume = virGetStorageVol(conn, datastoreName, directoryAndFileName, key); - - cleanup: - VIR_FREE(datastoreName); - VIR_FREE(directoryAndFileName); - VIR_FREE(key); +cleanup: return volume; + } @@ -817,140 +527,29 @@ esxStorageVolumeLookupByKey(virConnectPtr conn, const char *key) { virStorageVolPtr volume = NULL; esxPrivate *priv = conn->storagePrivateData; - esxVI_String *propertyNameList = NULL; - esxVI_ObjectContent *datastoreList = NULL; - esxVI_ObjectContent *datastore = NULL; - char *datastoreName = NULL; - esxVI_HostDatastoreBrowserSearchResults *searchResultsList = NULL; - esxVI_HostDatastoreBrowserSearchResults *searchResults = NULL; - char *directoryAndFileName = NULL; - size_t length; - char *datastorePath = NULL; - char *volumeName = NULL; - esxVI_FileInfo *fileInfo = NULL; - char *uuid_string = NULL; - char key_candidate[VIR_UUID_STRING_BUFLEN] = ""; - - if (STRPREFIX(key, "[")) { - /* Key is probably a datastore path */ - return esxStorageVolumeLookupByPath(conn, key); - } + int i = 0; - if (!priv->primary->hasQueryVirtualDiskUuid) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("QueryVirtualDiskUuid not available, cannot lookup storage " - "volume by UUID")); - return NULL; - } + virCheckNonNullArgGoto(key, cleanup); if (esxVI_EnsureSession(priv->primary) < 0) { - return NULL; - } - - /* Lookup all datastores */ - if (esxVI_String_AppendValueToList(&propertyNameList, "summary.name") < 0 || - esxVI_LookupDatastoreList(priv->primary, propertyNameList, - &datastoreList) < 0) { goto cleanup; } - for (datastore = datastoreList; datastore != NULL; - datastore = datastore->_next) { - datastoreName = NULL; - - if (esxVI_GetStringValue(datastore, "summary.name", &datastoreName, - esxVI_Occurrence_RequiredItem) < 0) { - goto cleanup; - } - - /* Lookup datastore content */ - esxVI_HostDatastoreBrowserSearchResults_Free(&searchResultsList); - - if (esxVI_LookupDatastoreContentByDatastoreName - (priv->primary, datastoreName, &searchResultsList) < 0) { - goto cleanup; - } - - /* Interpret search result */ - for (searchResults = searchResultsList; searchResults != NULL; - searchResults = searchResults->_next) { - VIR_FREE(directoryAndFileName); - - if (esxUtil_ParseDatastorePath(searchResults->folderPath, NULL, - NULL, &directoryAndFileName) < 0) { - goto cleanup; - } - - /* Strip trailing separators */ - length = strlen(directoryAndFileName); - - while (length > 0 && directoryAndFileName[length - 1] == '/') { - directoryAndFileName[length - 1] = '\0'; - --length; - } - - /* Build datastore path and query the UUID */ - for (fileInfo = searchResults->file; fileInfo != NULL; - fileInfo = fileInfo->_next) { - VIR_FREE(datastorePath); - - if (length < 1) { - if (virAsprintf(&volumeName, "%s", - fileInfo->path) < 0) { - virReportOOMError(); - goto cleanup; - } - } else if (virAsprintf(&volumeName, "%s/%s", - directoryAndFileName, - fileInfo->path) < 0) { - virReportOOMError(); - goto cleanup; - } - - if (virAsprintf(&datastorePath, "[%s] %s", datastoreName, - volumeName) < 0) { - virReportOOMError(); - goto cleanup; - } - - if (esxVI_VmDiskFileInfo_DynamicCast(fileInfo) == NULL) { - /* Only a VirtualDisk has a UUID */ - continue; - } - - VIR_FREE(uuid_string); - - if (esxVI_QueryVirtualDiskUuid - (priv->primary, datastorePath, - priv->primary->datacenter->_reference, - &uuid_string) < 0) { - goto cleanup; - } - - if (esxUtil_ReformatUuid(uuid_string, key_candidate) < 0) { - goto cleanup; - } - - if (STREQ(key, key_candidate)) { - /* Found matching UUID */ - volume = virGetStorageVol(conn, datastoreName, - volumeName, key); - goto cleanup; - } - } + /* lookup by key operation is supported using connection + * pointer, so poke all supported backend drivers to perform + * the desired operation + */ + for (i = 0; i < LAST_DRIVER; ++i) { + volume = backendDrv[i]->volLookupByKey(conn, key); + if (volume != NULL) { + break; } } - cleanup: - esxVI_String_Free(&propertyNameList); - esxVI_ObjectContent_Free(&datastoreList); - esxVI_HostDatastoreBrowserSearchResults_Free(&searchResultsList); - VIR_FREE(directoryAndFileName); - VIR_FREE(datastorePath); - VIR_FREE(volumeName); - VIR_FREE(uuid_string); +cleanup: return volume; + } @@ -961,224 +560,24 @@ esxStorageVolumeCreateXML(virStoragePoolPtr pool, const char *xmldesc, { virStorageVolPtr volume = NULL; esxPrivate *priv = pool->conn->storagePrivateData; - virStoragePoolDef poolDef; - virStorageVolDefPtr def = NULL; - char *tmp; - char *unescapedDatastorePath = NULL; - char *unescapedDirectoryName = NULL; - char *unescapedDirectoryAndFileName = NULL; - char *directoryName = NULL; - char *fileName = NULL; - char *datastorePathWithoutFileName = NULL; - char *datastorePath = NULL; - esxVI_FileInfo *fileInfo = NULL; - esxVI_FileBackedVirtualDiskSpec *virtualDiskSpec = NULL; - esxVI_ManagedObjectReference *task = NULL; - esxVI_TaskInfoState taskInfoState; - char *taskInfoErrorMessage = NULL; - char *uuid_string = NULL; - char *key = NULL; - - virCheckFlags(0, NULL); - - memset(&poolDef, 0, sizeof(poolDef)); - - if (esxVI_EnsureSession(priv->primary) < 0) { - return NULL; - } - - if (esxStoragePoolLookupType(priv->primary, pool->name, &poolDef.type) < 0) { - return NULL; - } - - /* Parse config */ - def = virStorageVolDefParseString(&poolDef, xmldesc); + virStorageDriverPtr backend = NULL; - if (def == NULL) { - goto cleanup; - } - - if (def->type != VIR_STORAGE_VOL_FILE) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Creating non-file volumes is not supported")); - goto cleanup; - } - - /* Validate config */ - tmp = strrchr(def->name, '/'); - - if (tmp == NULL || *def->name == '/' || tmp[1] == '\0') { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Volume name '%s' doesn't have expected format " - "'<directory>/<file>'"), def->name); - goto cleanup; - } + virCheckNonNullArgGoto(xmldesc, cleanup); - if (! virFileHasSuffix(def->name, ".vmdk")) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Volume name '%s' has unsupported suffix, expecting '.vmdk'"), - def->name); + if (esxVI_EnsureSession(priv->primary) < 0) { goto cleanup; } - if (virAsprintf(&unescapedDatastorePath, "[%s] %s", pool->name, - def->name) < 0) { - virReportOOMError(); + if (esxStorageGetBackendDriver(pool->conn, pool->name, &backend) < 0) { goto cleanup; } - if (def->target.format == VIR_STORAGE_FILE_VMDK) { - /* Parse and escape datastore path */ - if (esxUtil_ParseDatastorePath(unescapedDatastorePath, NULL, - &unescapedDirectoryName, - &unescapedDirectoryAndFileName) < 0) { - goto cleanup; - } - - directoryName = esxUtil_EscapeDatastoreItem(unescapedDirectoryName); - - if (directoryName == NULL) { - goto cleanup; - } - - fileName = esxUtil_EscapeDatastoreItem(unescapedDirectoryAndFileName + - strlen(unescapedDirectoryName) + 1); - - if (fileName == NULL) { - goto cleanup; - } - - if (virAsprintf(&datastorePathWithoutFileName, "[%s] %s", pool->name, - directoryName) < 0) { - virReportOOMError(); - goto cleanup; - } - - if (virAsprintf(&datastorePath, "[%s] %s/%s", pool->name, directoryName, - fileName) < 0) { - virReportOOMError(); - goto cleanup; - } - - /* Create directory, if it doesn't exist yet */ - if (esxVI_LookupFileInfoByDatastorePath - (priv->primary, datastorePathWithoutFileName, true, &fileInfo, - esxVI_Occurrence_OptionalItem) < 0) { - goto cleanup; - } - - if (fileInfo == NULL) { - if (esxVI_MakeDirectory(priv->primary, datastorePathWithoutFileName, - priv->primary->datacenter->_reference, - esxVI_Boolean_True) < 0) { - goto cleanup; - } - } - - /* Create VirtualDisk */ - if (esxVI_FileBackedVirtualDiskSpec_Alloc(&virtualDiskSpec) < 0 || - esxVI_Long_Alloc(&virtualDiskSpec->capacityKb) < 0) { - goto cleanup; - } - - /* From the vSphere API documentation about VirtualDiskType ... */ - if (def->allocation == def->capacity) { - /* - * "A preallocated disk has all space allocated at creation time - * and the space is zeroed on demand as the space is used." - */ - virtualDiskSpec->diskType = (char *)"preallocated"; - } else if (def->allocation == 0) { - /* - * "Space required for thin-provisioned virtual disk is allocated - * and zeroed on demand as the space is used." - */ - virtualDiskSpec->diskType = (char *)"thin"; - } else { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unsupported capacity-to-allocation relation")); - goto cleanup; - } - - /* - * FIXME: The adapter type is a required parameter, but there is no - * way to let the user specify it in the volume XML config. Therefore, - * default to 'busLogic' here. - */ - virtualDiskSpec->adapterType = (char *)"busLogic"; - - virtualDiskSpec->capacityKb->value = - VIR_DIV_UP(def->capacity, 1024); /* Scale from byte to kilobyte */ - - if (esxVI_CreateVirtualDisk_Task - (priv->primary, datastorePath, priv->primary->datacenter->_reference, - esxVI_VirtualDiskSpec_DynamicCast(virtualDiskSpec), &task) < 0 || - esxVI_WaitForTaskCompletion(priv->primary, task, NULL, - esxVI_Occurrence_None, - priv->parsedUri->autoAnswer, - &taskInfoState, - &taskInfoErrorMessage) < 0) { - goto cleanup; - } - - if (taskInfoState != esxVI_TaskInfoState_Success) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not create volume: %s"), - taskInfoErrorMessage); - goto cleanup; - } - - if (priv->primary->hasQueryVirtualDiskUuid) { - if (VIR_ALLOC_N(key, VIR_UUID_STRING_BUFLEN) < 0) { - virReportOOMError(); - goto cleanup; - } - - if (esxVI_QueryVirtualDiskUuid(priv->primary, datastorePath, - priv->primary->datacenter->_reference, - &uuid_string) < 0) { - goto cleanup; - } - - if (esxUtil_ReformatUuid(uuid_string, key) < 0) { - goto cleanup; - } - } else { - /* Fall back to the path as key */ - if (esxVI_String_DeepCopyValue(&key, datastorePath) < 0) { - goto cleanup; - } - } - } else { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Creation of %s volumes is not supported"), - virStorageFileFormatTypeToString(def->target.format)); - goto cleanup; - } - - volume = virGetStorageVol(pool->conn, pool->name, def->name, key); + volume = backend->volCreateXML(pool, xmldesc, flags); cleanup: - if (virtualDiskSpec != NULL) { - virtualDiskSpec->diskType = NULL; - virtualDiskSpec->adapterType = NULL; - } - - virStorageVolDefFree(def); - VIR_FREE(unescapedDatastorePath); - VIR_FREE(unescapedDirectoryName); - VIR_FREE(unescapedDirectoryAndFileName); - VIR_FREE(directoryName); - VIR_FREE(fileName); - VIR_FREE(datastorePathWithoutFileName); - VIR_FREE(datastorePath); - esxVI_FileInfo_Free(&fileInfo); - esxVI_FileBackedVirtualDiskSpec_Free(&virtualDiskSpec); - esxVI_ManagedObjectReference_Free(&task); - VIR_FREE(taskInfoErrorMessage); - VIR_FREE(uuid_string); - VIR_FREE(key); return volume; + } @@ -1189,193 +588,24 @@ esxStorageVolumeCreateXMLFrom(virStoragePoolPtr pool, const char *xmldesc, { virStorageVolPtr volume = NULL; esxPrivate *priv = pool->conn->storagePrivateData; - virStoragePoolDef poolDef; - char *sourceDatastorePath = NULL; - virStorageVolDefPtr def = NULL; - char *tmp; - char *unescapedDatastorePath = NULL; - char *unescapedDirectoryName = NULL; - char *unescapedDirectoryAndFileName = NULL; - char *directoryName = NULL; - char *fileName = NULL; - char *datastorePathWithoutFileName = NULL; - char *datastorePath = NULL; - esxVI_FileInfo *fileInfo = NULL; - esxVI_ManagedObjectReference *task = NULL; - esxVI_TaskInfoState taskInfoState; - char *taskInfoErrorMessage = NULL; - char *uuid_string = NULL; - char *key = NULL; - - virCheckFlags(0, NULL); - - memset(&poolDef, 0, sizeof(poolDef)); - - if (esxVI_EnsureSession(priv->primary) < 0) { - return NULL; - } - - if (esxStoragePoolLookupType(priv->primary, pool->name, &poolDef.type) < 0) { - return NULL; - } - - if (virAsprintf(&sourceDatastorePath, "[%s] %s", sourceVolume->pool, - sourceVolume->name) < 0) { - virReportOOMError(); - goto cleanup; - } - - /* Parse config */ - def = virStorageVolDefParseString(&poolDef, xmldesc); - - if (def == NULL) { - goto cleanup; - } - - if (def->type != VIR_STORAGE_VOL_FILE) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Creating non-file volumes is not supported")); - goto cleanup; - } - - /* Validate config */ - tmp = strrchr(def->name, '/'); + virStorageDriverPtr backend = NULL; - if (tmp == NULL || *def->name == '/' || tmp[1] == '\0') { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Volume name '%s' doesn't have expected format " - "'<directory>/<file>'"), def->name); - goto cleanup; - } + virCheckNonNullArgGoto(xmldesc, cleanup); - if (! virFileHasSuffix(def->name, ".vmdk")) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Volume name '%s' has unsupported suffix, expecting '.vmdk'"), - def->name); + if (esxVI_EnsureSession(priv->primary) < 0) { goto cleanup; } - if (virAsprintf(&unescapedDatastorePath, "[%s] %s", pool->name, - def->name) < 0) { - virReportOOMError(); + if (esxStorageGetBackendDriver(pool->conn, pool->name, &backend) < 0) { goto cleanup; } - if (def->target.format == VIR_STORAGE_FILE_VMDK) { - /* Parse and escape datastore path */ - if (esxUtil_ParseDatastorePath(unescapedDatastorePath, NULL, - &unescapedDirectoryName, - &unescapedDirectoryAndFileName) < 0) { - goto cleanup; - } - - directoryName = esxUtil_EscapeDatastoreItem(unescapedDirectoryName); - - if (directoryName == NULL) { - goto cleanup; - } - - fileName = esxUtil_EscapeDatastoreItem(unescapedDirectoryAndFileName + - strlen(unescapedDirectoryName) + 1); - - if (fileName == NULL) { - goto cleanup; - } - - if (virAsprintf(&datastorePathWithoutFileName, "[%s] %s", pool->name, - directoryName) < 0) { - virReportOOMError(); - goto cleanup; - } - - if (virAsprintf(&datastorePath, "[%s] %s/%s", pool->name, directoryName, - fileName) < 0) { - virReportOOMError(); - goto cleanup; - } - - /* Create directory, if it doesn't exist yet */ - if (esxVI_LookupFileInfoByDatastorePath - (priv->primary, datastorePathWithoutFileName, true, &fileInfo, - esxVI_Occurrence_OptionalItem) < 0) { - goto cleanup; - } - - if (fileInfo == NULL) { - if (esxVI_MakeDirectory(priv->primary, datastorePathWithoutFileName, - priv->primary->datacenter->_reference, - esxVI_Boolean_True) < 0) { - goto cleanup; - } - } - - /* Copy VirtualDisk */ - if (esxVI_CopyVirtualDisk_Task(priv->primary, sourceDatastorePath, - priv->primary->datacenter->_reference, - datastorePath, - priv->primary->datacenter->_reference, - NULL, esxVI_Boolean_False, &task) < 0 || - esxVI_WaitForTaskCompletion(priv->primary, task, NULL, - esxVI_Occurrence_None, - priv->parsedUri->autoAnswer, - &taskInfoState, - &taskInfoErrorMessage) < 0) { - goto cleanup; - } - - if (taskInfoState != esxVI_TaskInfoState_Success) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not copy volume: %s"), - taskInfoErrorMessage); - goto cleanup; - } - - if (priv->primary->hasQueryVirtualDiskUuid) { - if (VIR_ALLOC_N(key, VIR_UUID_STRING_BUFLEN) < 0) { - virReportOOMError(); - goto cleanup; - } - - if (esxVI_QueryVirtualDiskUuid(priv->primary, datastorePath, - priv->primary->datacenter->_reference, - &uuid_string) < 0) { - goto cleanup; - } - - if (esxUtil_ReformatUuid(uuid_string, key) < 0) { - goto cleanup; - } - } else { - /* Fall back to the path as key */ - if (esxVI_String_DeepCopyValue(&key, datastorePath) < 0) { - goto cleanup; - } - } - } else { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Creation of %s volumes is not supported"), - virStorageFileFormatTypeToString(def->target.format)); - goto cleanup; - } - - volume = virGetStorageVol(pool->conn, pool->name, def->name, key); + volume = backend->volCreateXMLFrom(pool, xmldesc, sourceVolume, flags); cleanup: - VIR_FREE(sourceDatastorePath); - virStorageVolDefFree(def); - VIR_FREE(unescapedDatastorePath); - VIR_FREE(unescapedDirectoryName); - VIR_FREE(unescapedDirectoryAndFileName); - VIR_FREE(directoryName); - VIR_FREE(fileName); - VIR_FREE(datastorePathWithoutFileName); - VIR_FREE(datastorePath); - esxVI_FileInfo_Free(&fileInfo); - esxVI_ManagedObjectReference_Free(&task); - VIR_FREE(taskInfoErrorMessage); - VIR_FREE(uuid_string); - VIR_FREE(key); return volume; + } @@ -1383,48 +613,19 @@ esxStorageVolumeCreateXMLFrom(virStoragePoolPtr pool, const char *xmldesc, static int esxStorageVolumeDelete(virStorageVolPtr volume, unsigned int flags) { - int result = -1; esxPrivate *priv = volume->conn->storagePrivateData; - char *datastorePath = NULL; - esxVI_ManagedObjectReference *task = NULL; - esxVI_TaskInfoState taskInfoState; - char *taskInfoErrorMessage = NULL; - - virCheckFlags(0, -1); + virStorageDriverPtr backend = NULL; if (esxVI_EnsureSession(priv->primary) < 0) { return -1; } - if (virAsprintf(&datastorePath, "[%s] %s", volume->pool, volume->name) < 0) { - virReportOOMError(); - goto cleanup; - } - - if (esxVI_DeleteVirtualDisk_Task(priv->primary, datastorePath, - priv->primary->datacenter->_reference, - &task) < 0 || - esxVI_WaitForTaskCompletion(priv->primary, task, NULL, - esxVI_Occurrence_None, - priv->parsedUri->autoAnswer, - &taskInfoState, &taskInfoErrorMessage) < 0) { - goto cleanup; - } - - if (taskInfoState != esxVI_TaskInfoState_Success) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not delete volume: %s"), - taskInfoErrorMessage); - goto cleanup; + if (esxStorageGetBackendDriver(volume->conn, volume->pool, &backend) < 0 || + backend->volDelete(volume , flags) < 0) { + return -1; } - result = 0; - - cleanup: - VIR_FREE(datastorePath); - esxVI_ManagedObjectReference_Free(&task); - VIR_FREE(taskInfoErrorMessage); - - return result; + return 0; } @@ -1432,97 +633,39 @@ esxStorageVolumeDelete(virStorageVolPtr volume, unsigned int flags) static int esxStorageVolumeWipe(virStorageVolPtr volume, unsigned int flags) { - int result = -1; esxPrivate *priv = volume->conn->storagePrivateData; - char *datastorePath = NULL; - esxVI_ManagedObjectReference *task = NULL; - esxVI_TaskInfoState taskInfoState; - char *taskInfoErrorMessage = NULL; - - virCheckFlags(0, -1); + virStorageDriverPtr backend = NULL; if (esxVI_EnsureSession(priv->primary) < 0) { return -1; } - if (virAsprintf(&datastorePath, "[%s] %s", volume->pool, volume->name) < 0) { - virReportOOMError(); - goto cleanup; - } - - if (esxVI_ZeroFillVirtualDisk_Task(priv->primary, datastorePath, - priv->primary->datacenter->_reference, - &task) < 0 || - esxVI_WaitForTaskCompletion(priv->primary, task, NULL, - esxVI_Occurrence_None, - priv->parsedUri->autoAnswer, - &taskInfoState, &taskInfoErrorMessage) < 0) { - goto cleanup; - } - - if (taskInfoState != esxVI_TaskInfoState_Success) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not wipe volume: %s"), - taskInfoErrorMessage); - goto cleanup; + if (esxStorageGetBackendDriver(volume->conn, volume->pool, &backend) < 0 || + backend->volDelete(volume , flags) < 0) { + return -1; } - result = 0; - - cleanup: - VIR_FREE(datastorePath); - esxVI_ManagedObjectReference_Free(&task); - VIR_FREE(taskInfoErrorMessage); - - return result; + return 0; } - static int esxStorageVolumeGetInfo(virStorageVolPtr volume, virStorageVolInfoPtr info) { - int result = -1; esxPrivate *priv = volume->conn->storagePrivateData; - char *datastorePath = NULL; - esxVI_FileInfo *fileInfo = NULL; - esxVI_VmDiskFileInfo *vmDiskFileInfo = NULL; - - memset(info, 0, sizeof(*info)); + virStorageDriverPtr backend = NULL; if (esxVI_EnsureSession(priv->primary) < 0) { return -1; } - if (virAsprintf(&datastorePath, "[%s] %s", volume->pool, volume->name) < 0) { - virReportOOMError(); - goto cleanup; - } - - if (esxVI_LookupFileInfoByDatastorePath(priv->primary, datastorePath, - false, &fileInfo, - esxVI_Occurrence_RequiredItem) < 0) { - goto cleanup; - } - - vmDiskFileInfo = esxVI_VmDiskFileInfo_DynamicCast(fileInfo); - - info->type = VIR_STORAGE_VOL_FILE; - - if (vmDiskFileInfo != NULL) { - info->capacity = vmDiskFileInfo->capacityKb->value * 1024; /* Scale from kilobyte to byte */ - info->allocation = vmDiskFileInfo->fileSize->value; - } else { - info->capacity = fileInfo->fileSize->value; - info->allocation = fileInfo->fileSize->value; + if (esxStorageGetBackendDriver(volume->conn, volume->pool, &backend) < 0 || + backend->volGetInfo(volume , info) < 0) { + return -1; } - result = 0; - - cleanup: - VIR_FREE(datastorePath); - esxVI_FileInfo_Free(&fileInfo); + return 0; - return result; } @@ -1530,84 +673,24 @@ esxStorageVolumeGetInfo(virStorageVolPtr volume, virStorageVolInfoPtr info) static char * esxStorageVolumeGetXMLDesc(virStorageVolPtr volume, unsigned int flags) { - esxPrivate *priv = volume->conn->storagePrivateData; - virStoragePoolDef pool; - char *datastorePath = NULL; - esxVI_FileInfo *fileInfo = NULL; - esxVI_VmDiskFileInfo *vmDiskFileInfo = NULL; - esxVI_IsoImageFileInfo *isoImageFileInfo = NULL; - esxVI_FloppyImageFileInfo *floppyImageFileInfo = NULL; - virStorageVolDef def; char *xml = NULL; - - virCheckFlags(0, NULL); - - memset(&pool, 0, sizeof(pool)); - memset(&def, 0, sizeof(def)); + esxPrivate *priv = volume->conn->storagePrivateData; + virStorageDriverPtr backend = NULL; if (esxVI_EnsureSession(priv->primary) < 0) { - return NULL; - } - - if (esxStoragePoolLookupType(priv->primary, volume->pool, &pool.type) < 0) { - return NULL; - } - - /* Lookup file info */ - if (virAsprintf(&datastorePath, "[%s] %s", volume->pool, volume->name) < 0) { - virReportOOMError(); - goto cleanup; - } - - if (esxVI_LookupFileInfoByDatastorePath(priv->primary, datastorePath, - false, &fileInfo, - esxVI_Occurrence_RequiredItem) < 0) { goto cleanup; } - vmDiskFileInfo = esxVI_VmDiskFileInfo_DynamicCast(fileInfo); - isoImageFileInfo = esxVI_IsoImageFileInfo_DynamicCast(fileInfo); - floppyImageFileInfo = esxVI_FloppyImageFileInfo_DynamicCast(fileInfo); - - def.name = volume->name; - - if (esxVI_LookupStorageVolumeKeyByDatastorePath(priv->primary, datastorePath, - &def.key) < 0) { - goto cleanup; - } - - def.type = VIR_STORAGE_VOL_FILE; - def.target.path = datastorePath; - - if (vmDiskFileInfo != NULL) { - def.capacity = vmDiskFileInfo->capacityKb->value * 1024; /* Scale from kilobyte to byte */ - def.allocation = vmDiskFileInfo->fileSize->value; - - def.target.format = VIR_STORAGE_FILE_VMDK; - } else if (isoImageFileInfo != NULL) { - def.capacity = fileInfo->fileSize->value; - def.allocation = fileInfo->fileSize->value; - - def.target.format = VIR_STORAGE_FILE_ISO; - } else if (floppyImageFileInfo != NULL) { - def.capacity = fileInfo->fileSize->value; - def.allocation = fileInfo->fileSize->value; - - def.target.format = VIR_STORAGE_FILE_RAW; - } else { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("File '%s' has unknown type"), datastorePath); + if (esxStorageGetBackendDriver(volume->conn, volume->pool, &backend) < 0) { goto cleanup; } - xml = virStorageVolDefFormat(&pool, &def); + xml = backend->volGetXMLDesc(volume, flags); - cleanup: - VIR_FREE(datastorePath); - esxVI_FileInfo_Free(&fileInfo); - VIR_FREE(def.key); + cleanup: return xml; + } @@ -1615,14 +698,24 @@ esxStorageVolumeGetXMLDesc(virStorageVolPtr volume, unsigned int flags) static char * esxStorageVolumeGetPath(virStorageVolPtr volume) { - char *path; + char *path = NULL; + esxPrivate *priv = volume->conn->storagePrivateData; + virStorageDriverPtr backend = NULL; - if (virAsprintf(&path, "[%s] %s", volume->pool, volume->name) < 0) { - virReportOOMError(); - return NULL; + if (esxVI_EnsureSession(priv->primary) < 0) { + goto cleanup; } + if (esxStorageGetBackendDriver(volume->conn, volume->pool, &backend) < 0) { + goto cleanup; + } + + path = backend->volGetPath(volume); + + cleanup: + return path; + } diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 2c789e1..f45d563 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -2994,7 +2994,7 @@ esxVI_LookupDatastoreByName(esxVI_Context *ctx, const char *name, if (*datastore == NULL && occurrence != esxVI_Occurrence_OptionalItem) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not find datastore with name '%s'"), name); + _("Could not find datastore with name '%s'"), name); goto cleanup; } @@ -3101,7 +3101,8 @@ esxVI_LookupDatastoreByAbsolutePath(esxVI_Context *ctx, int esxVI_LookupDatastoreHostMount(esxVI_Context *ctx, esxVI_ManagedObjectReference *datastore, - esxVI_DatastoreHostMount **hostMount) + esxVI_DatastoreHostMount **hostMount, + esxVI_Occurrence occurrence) { int result = -1; esxVI_String *propertyNameList = NULL; @@ -3149,9 +3150,9 @@ esxVI_LookupDatastoreHostMount(esxVI_Context *ctx, break; } - if (*hostMount == NULL) { + if (*hostMount == NULL && occurrence != esxVI_Occurrence_OptionalItem) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not lookup datastore host mount")); + _("Could not lookup datastore host mount")); goto cleanup; } @@ -4570,5 +4571,337 @@ esxVI_LookupManagedObjectHelper(esxVI_Context *ctx, } +int +esxVI_LookupHostInternetScsiHbaStaticTargetByName( + esxVI_Context *ctx, + const char *name, + esxVI_HostInternetScsiHbaStaticTarget **ret, + esxVI_Occurrence occurrence) +{ + int result = -1; + esxVI_HostInternetScsiHba *hostInternetScsiHba = NULL; + const esxVI_HostInternetScsiHbaStaticTarget *target = NULL; + + if (esxVI_LookupHostInternetScsiHba(ctx, &hostInternetScsiHba) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Unable to obtain hostInternetScsiHba")); + goto cleanup; + } + + if (hostInternetScsiHba == NULL) { + /* iSCSI adapter may not be enabled for this host */ + return 0; + } + + if (hostInternetScsiHba->configuredStaticTarget) { + for (target = hostInternetScsiHba->configuredStaticTarget; + target != NULL; target = target->_next) { + if (STREQ(target->iScsiName, name)) { + break; + } + } + } + + if (target == NULL) { + if (occurrence == esxVI_Occurrence_RequiredItem) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not find storage pool with name: %s"), name); + } + goto cleanup; + } + + if (esxVI_HostInternetScsiHbaStaticTarget_DeepCopy( + ret, (esxVI_HostInternetScsiHbaStaticTarget *)target) < 0) { + goto cleanup; + } + + result = 0; + + cleanup: + + esxVI_HostInternetScsiHba_Free(&hostInternetScsiHba); + + return result; +} + + +int +esxVI_LookupHostInternetScsiHba( + esxVI_Context *ctx, + esxVI_HostInternetScsiHba **hostInternetScsiHba) +{ + int result = -1; + esxVI_DynamicProperty *dynamicProperty = NULL; + esxVI_ObjectContent *hostSystem = NULL; + esxVI_String *propertyNameList = NULL; + esxVI_HostHostBusAdapter *hostHostBusAdapterList = NULL; + esxVI_HostHostBusAdapter *hostHostBusAdapter = NULL; + + if (esxVI_String_AppendValueToList(&propertyNameList, + "config.storageDevice.hostBusAdapter\0") < 0 || + esxVI_LookupHostSystemProperties(ctx, propertyNameList, + &hostSystem) < 0) { + goto cleanup; + } + + for (dynamicProperty = hostSystem->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, + "config.storageDevice.hostBusAdapter")) { + if (esxVI_HostHostBusAdapter_CastListFromAnyType( + dynamicProperty->val, &hostHostBusAdapterList) < 0 || + hostHostBusAdapterList == NULL) { + goto cleanup; + } + } else { + VIR_WARN("Unexpected '%s' property", dynamicProperty->name); + } + } + + /* See vSphere API documentation about HostInternetScsiHba for details */ + for (hostHostBusAdapter = hostHostBusAdapterList; hostHostBusAdapter != NULL; + hostHostBusAdapter = hostHostBusAdapter->_next) { + esxVI_HostInternetScsiHba *candidate= + esxVI_HostInternetScsiHba_DynamicCast(hostHostBusAdapter); + + if (candidate) { + if (esxVI_HostInternetScsiHba_DeepCopy(hostInternetScsiHba, + candidate) < 0) { + goto cleanup; + } + break; + } + } + + result = 0; + +cleanup: + esxVI_String_Free(&propertyNameList); + esxVI_ObjectContent_Free(&hostSystem); + esxVI_HostHostBusAdapter_Free(&hostHostBusAdapterList); + + return result; +} + +int +esxVI_LookupScsiLunList(esxVI_Context *ctx, + esxVI_ScsiLun **ret) +{ + int result = -1; + esxVI_DynamicProperty *dynamicProperty = NULL; + esxVI_ObjectContent *hostSystem = NULL; + esxVI_String *propertyNameList = NULL; + esxVI_ScsiLun *scsiLunList = NULL; + + if (esxVI_String_AppendValueToList(&propertyNameList, + "config.storageDevice.scsiLun\0") < 0 || + esxVI_LookupHostSystemProperties( + ctx, propertyNameList, &hostSystem) < 0) { + goto cleanup; + } + + for (dynamicProperty = hostSystem->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, + "config.storageDevice.scsiLun")) { + if (esxVI_ScsiLun_CastListFromAnyType(dynamicProperty->val, + &scsiLunList) < 0) { + goto cleanup; + } + } else { + VIR_WARN("Unexpected '%s' property", dynamicProperty->name); + } + } + + if (scsiLunList == NULL) { + goto cleanup; + } + + /** + * FIXME: deep list copy operation fails with error: + * " libvir: ESX Driver error : + * internal error Call to esxVI_HostDevice_Free for + * unexpected type 'HostScsiDisk' " + * HostScsiDisk extends ScsiLun + */ + *ret = scsiLunList; + scsiLunList = NULL; /* prevent double free */ + + result = 0; + +cleanup: + + esxVI_ScsiLun_Free(&scsiLunList); + + return result; + +} + +int +esxVI_LookupHostScsiTopologyLunListByTargetName( + esxVI_Context *ctx, const char *name, esxVI_HostScsiTopologyLun **ret) +{ + int result = -1; + esxVI_DynamicProperty *dynamicProperty = NULL; + esxVI_ObjectContent *hostSystem = NULL; + esxVI_String *propertyNameList = NULL; + esxVI_HostScsiTopologyInterface *hostScsiInterfaceList = NULL; + const esxVI_HostScsiTopologyInterface *hostScsiInterface = NULL; + const esxVI_HostScsiTopologyTarget *hostScsiTopologyTarget = NULL; + bool found = false; + + if (esxVI_String_AppendValueToList(&propertyNameList, + "config.storageDevice.scsiTopology.adapter\0") < 0 || + esxVI_LookupHostSystemProperties( + ctx, propertyNameList, &hostSystem) < 0) { + goto cleanup; + } + + for (dynamicProperty = hostSystem->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, + "config.storageDevice.scsiTopology.adapter")) { + esxVI_HostScsiTopologyInterface_Free(&hostScsiInterfaceList); + + if ((esxVI_HostScsiTopologyInterface_CastListFromAnyType + (dynamicProperty->val, &hostScsiInterfaceList) < 0)) { + goto cleanup; + } + } else { + VIR_WARN("Unexpected '%s' property", dynamicProperty->name); + } + } + + if (hostScsiInterfaceList == NULL) { + /* iSCSI adapter may not be enabled */ + return 0; + } + + /* See vSphere API documentation about HostScsiTopologyInterface */ + for (hostScsiInterface = hostScsiInterfaceList; + hostScsiInterface != NULL && !found; + hostScsiInterface = hostScsiInterface->_next) { + for (hostScsiTopologyTarget = hostScsiInterface->target; + hostScsiTopologyTarget != NULL; + hostScsiTopologyTarget = hostScsiTopologyTarget->_next) { + const esxVI_HostInternetScsiTargetTransport *candidate = + esxVI_HostInternetScsiTargetTransport_DynamicCast( + hostScsiTopologyTarget->transport); + + if (candidate && STREQ(candidate->iScsiName, name)) { + found = true; + break; + } + } + } + + if (!found || hostScsiTopologyTarget == NULL) { + goto cleanup; + } + + if (esxVI_HostScsiTopologyLun_DeepCopyList( + ret, hostScsiTopologyTarget->lun) < 0) { + goto cleanup; + } + + if (*ret == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Target not found")); + goto cleanup; + } + + result = 0; + + cleanup: + + esxVI_String_Free(&propertyNameList); + esxVI_ObjectContent_Free(&hostSystem); + esxVI_HostScsiTopologyInterface_Free(&hostScsiInterfaceList); + + return result; +} + + +int +esxVI_LookupStoragePoolNameByScsiLunKey(esxVI_Context *ctx, + const char *key, + char **poolName) +{ + int result = -1; + esxVI_DynamicProperty *dynamicProperty = NULL; + esxVI_ObjectContent *hostSystem = NULL; + esxVI_String *propertyNameList = NULL; + esxVI_HostScsiTopologyInterface *hostScsiInterfaceList = NULL; + const esxVI_HostScsiTopologyInterface *hostScsiInterface = NULL; + const esxVI_HostScsiTopologyTarget *hostScsiTopologyTarget = NULL; + bool found = false; + + if (esxVI_String_AppendValueToList(&propertyNameList, + "config.storageDevice.scsiTopology.adapter\0") < 0 || + esxVI_LookupHostSystemProperties( + ctx, propertyNameList, &hostSystem) < 0) { + goto cleanup; + } + + for (dynamicProperty = hostSystem->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, + "config.storageDevice.scsiTopology.adapter")) { + esxVI_HostScsiTopologyInterface_Free(&hostScsiInterfaceList); + + if ((esxVI_HostScsiTopologyInterface_CastListFromAnyType + (dynamicProperty->val, &hostScsiInterfaceList) < 0)) { + goto cleanup; + } + } else { + VIR_WARN("Unexpected '%s' property", dynamicProperty->name); + } + } + + if (hostScsiInterfaceList == NULL) { + /* iSCSI adapter may not be enabled */ + return 0; + } + + /* See vSphere API documentation about HostScsiTopologyInterface */ + for (hostScsiInterface = hostScsiInterfaceList; + hostScsiInterface != NULL && !found; + hostScsiInterface = hostScsiInterface->_next) { + for (hostScsiTopologyTarget = hostScsiInterface->target; + hostScsiTopologyTarget != NULL; + hostScsiTopologyTarget = hostScsiTopologyTarget->_next) { + const esxVI_HostInternetScsiTargetTransport *candidate = + esxVI_HostInternetScsiTargetTransport_DynamicCast( + hostScsiTopologyTarget->transport); + + if (candidate) { + /* iterate hostScsiTopologyLun list to find matching key */ + const esxVI_HostScsiTopologyLun *hostScsiTopologyLun = + hostScsiTopologyTarget->lun; + for (; hostScsiTopologyLun != NULL; + hostScsiTopologyLun = hostScsiTopologyLun->_next) { + if (STREQ(hostScsiTopologyLun->scsiLun, key)) { + *poolName = strdup(candidate->iScsiName); + + if (*poolName == NULL) { + virReportOOMError(); + goto cleanup; + } + } + } + break; + } + } + } + + result = 0; + + cleanup: + esxVI_ObjectContent_Free(&hostSystem); + esxVI_String_Free(&propertyNameList); + esxVI_HostScsiTopologyInterface_Free(&hostScsiInterfaceList); + + return result; +} #include "esx_vi.generated.c" diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index 4b84be8..57dcbb4 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -437,7 +437,8 @@ int esxVI_LookupDatastoreByAbsolutePath(esxVI_Context *ctx, int esxVI_LookupDatastoreHostMount(esxVI_Context *ctx, esxVI_ManagedObjectReference *datastore, - esxVI_DatastoreHostMount **hostMount); + esxVI_DatastoreHostMount **hostMount, + esxVI_Occurrence occurrence); int esxVI_LookupTaskInfoByTask(esxVI_Context *ctx, esxVI_ManagedObjectReference *task, @@ -499,6 +500,24 @@ int esxVI_ParseHostCpuIdInfo(esxVI_ParsedHostCpuIdInfo *parsedHostCpuIdInfo, int esxVI_ProductVersionToDefaultVirtualHWVersion(esxVI_ProductVersion productVersion); +int esxVI_LookupHostInternetScsiHbaStaticTargetByName(esxVI_Context *ctx, + const char *name, esxVI_HostInternetScsiHbaStaticTarget **ret, + esxVI_Occurrence occurrence); + +int esxVI_LookupHostInternetScsiHba( + esxVI_Context *ctx, + esxVI_HostInternetScsiHba **hostInternetScsiHba); + +int esxVI_LookupScsiLunList(esxVI_Context *ctx, esxVI_ScsiLun **ret); + +int esxVI_LookupHostScsiTopologyLunListByTargetName( + esxVI_Context *ctx, const char *name, esxVI_HostScsiTopologyLun **ret); + +int +esxVI_LookupStoragePoolNameByScsiLunKey(esxVI_Context *ctx, + const char *key, + char **poolName); + # include "esx_vi.generated.h" #endif /* __ESX_VI_H__ */ diff --git a/src/esx/esx_vi_generator.input b/src/esx/esx_vi_generator.input index 1a67a8c..8a980c0 100644 --- a/src/esx/esx_vi_generator.input +++ b/src/esx/esx_vi_generator.input @@ -58,6 +58,14 @@ enum AutoStartWaitHeartbeatSetting end +enum FibreChannelPortType + fabric + loop + pointToPoint + unknown +end + + enum ManagedEntityStatus gray green @@ -128,6 +136,11 @@ enum VirtualMachinePowerState end +enum vStorageSupport + vStorageUnknown +end + + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # Objects # @@ -263,6 +276,13 @@ object HostAutoStartManagerConfig end +object HostBlockAdapterTargetTransport extends HostTargetTransport +end + +object HostBlockHba extends HostHostBusAdapter +end + + object HostConfigManager ManagedObjectReference cpuScheduler o ManagedObjectReference datastoreSystem o @@ -310,6 +330,32 @@ object HostDatastoreBrowserSearchSpec end +object HostDevice + String deviceName r + String deviceType r +end + + +object HostDiskDimensionsLba + Int blockSize r + Long block r +end + + +object HostFibreChannelHba extends HostHostBusAdapter + Long nodeWorldWideName r + FibreChannelPortType portType r + Long portWorldWideName r + Long speed r +end + + +object HostFibreChannelTargetTransport extends HostTargetTransport + Long nodeWorldWideName r + Long portWorldWideName r +end + + object HostFileSystemVolume String type r String name r @@ -317,6 +363,165 @@ object HostFileSystemVolume end +object HostHostBusAdapter + Int bus r + String device r + String driver o + String key o + String model r + String pci o + String status r +end + + +object HostInternetScsiTargetTransport extends HostTargetTransport + String iScsiName r + String iScsiAlias r + String address ol + +end + + +object HostInternetScsiHba extends HostHostBusAdapter + HostInternetScsiHbaAuthenticationCapabilities authenticationCapabilities r + HostInternetScsiHbaAuthenticationProperties authenticationProperties r + HostInternetScsiHbaDiscoveryCapabilities discoveryCapabilities r + HostInternetScsiHbaDiscoveryProperties discoveryProperties r + HostInternetScsiHbaIPCapabilities ipCapabilities r + HostInternetScsiHbaIPProperties ipProperties r + String iScsiName r + Boolean isSoftwareBased r + HostInternetScsiHbaParamValue advancedOptions ol + HostInternetScsiHbaSendTarget configuredSendTarget ol + HostInternetScsiHbaStaticTarget configuredStaticTarget ol + Int currentSpeedMb o + HostInternetScsiHbaDigestCapabilities digestCapabilities o + HostInternetScsiHbaDigestProperties digestProperties o + String iScsiAlias o + Int maxSpeedMb o + OptionDef supportedAdvancedOptions ol +end + + + +object HostInternetScsiHbaAuthenticationCapabilities + Boolean chapAuthSettable r + Boolean krb5AuthSettable r + Boolean spkmAuthSettable r + Boolean srpAuthSettable r + Boolean mutualChapSettable o + Boolean targetChapSettable o + Boolean targetMutualChapSettable o +end + + +object HostInternetScsiHbaAuthenticationProperties + Boolean chapAuthEnabled r + String chapAuthenticationType o + Boolean chapInherited o + String chapName o + String chapSecret o + String mutualChapAuthenticationType o + Boolean mutualChapInherited o + String mutualChapName o + String mutualChapSecret o +end + + +object HostInternetScsiHbaDigestCapabilities + Boolean dataDigestSettable o + Boolean headerDigestSettable o + Boolean targetDataDigestSettable o + Boolean targetHeaderDigestSettable o +end + + +object HostInternetScsiHbaDigestProperties + Boolean dataDigestInherited o + String dataDigestType o + Boolean headerDigestInherited o + String headerDigestType o +end + + +object HostInternetScsiHbaDiscoveryCapabilities + Boolean iSnsDiscoverySettable r + Boolean sendTargetsDiscoverySettable r + Boolean slpDiscoverySettable r + Boolean staticTargetDiscoverySettable r +end + + +object HostInternetScsiHbaDiscoveryProperties + Boolean iSnsDiscoveryEnabled r + Boolean sendTargetsDiscoveryEnabled r + Boolean slpDiscoveryEnabled r + Boolean staticTargetDiscoveryEnabled r + String iSnsDiscoveryMethod o + String iSnsHost o + String slpDiscoveryMethod o + String slpHost o +end + +object HostInternetScsiHbaIPCapabilities + Boolean addressSettable r + Boolean alternateDnsServerAddressSettable r + Boolean defaultGatewaySettable r + Boolean ipConfigurationMethodSettable r + Boolean primaryDnsServerAddressSettable r + Boolean subnetMaskSettable r + Boolean arpRedirectSettable o + Boolean hostNameAsTargetAddress o + Boolean ipv6Supported o + Boolean mtuSettable o + Boolean nameAliasSettable o +end + + +object HostInternetScsiHbaIPProperties + Boolean dhcpConfigurationEnabled r + String address o + String alternateDnsServerAddress o + Boolean arpRedirectEnabled o + String defaultGateway o + String ipv6Address o + String ipv6DefaultGateway o + Boolean jumboFramesEnabled o + String mac o + Int mtu o + String primaryDnsServerAddress o + String subnetMask o +end + + +object HostInternetScsiHbaParamValue extends OptionValue + Boolean isInherited o +end + + +object HostInternetScsiHbaSendTarget + String address r + HostInternetScsiHbaParamValue advancedOptions ol + HostInternetScsiHbaAuthenticationProperties authenticationProperties o + HostInternetScsiHbaDigestProperties digestProperties o + String parent o + Int port o + OptionDef supportedAdvancedOptions ol +end + + +object HostInternetScsiHbaStaticTarget + String address r + String iScsiName r + HostInternetScsiHbaParamValue advancedOptions ol + HostInternetScsiHbaAuthenticationProperties authenticationProperties o + HostInternetScsiHbaDigestProperties digestProperties o + String parent o + Int port o + OptionDef supportedAdvancedOptions ol +end + + object HostMountInfo String path o String accessMode r @@ -331,12 +536,57 @@ object HostNasVolume extends HostFileSystemVolume end +object HostParallelScsiHba extends HostHostBusAdapter +end + + +object HostParallelScsiTargetTransport extends HostTargetTransport +end + + +object HostScsiDisk extends ScsiLun + HostDiskDimensionsLba capacity r + String devicePath r +end + + object HostScsiDiskPartition String diskName r Int partition r end +object HostScsiTopology + HostScsiTopologyInterface adapater ol +end + + +object HostScsiTopologyInterface + String adapter r + String key r + HostScsiTopologyTarget target ol +end + + +object HostScsiTopologyLun + String key r + Int lun r + String scsiLun r +end + + +object HostScsiTopologyTarget + String key r + Int target r + HostScsiTopologyLun lun ol + HostTargetTransport transport o +end + + +object HostTargetTransport +end + + object HostVmfsVolume extends HostFileSystemVolume Int blockSizeMb r Int maxBlocks r @@ -394,11 +644,22 @@ object ObjectUpdate end +object OptionDef extends ElementDescription + OptionType optionType r +end + + object OptionType Boolean valueIsReadonly o end +object OptionValue + String key r + AnyType value r +end + + object PerfCounterInfo Int key r ElementDescription nameInfo r @@ -506,6 +767,45 @@ object SelectionSpec end +object ScsiLun extends HostDevice + String lunType r + String operationalState rl + String uuid r + ScsiLunDurableName alternateName ol + String canonicalName o + ScsiLunCapabilities capabilities o + ScsiLunDescriptor descriptor ol + String displayName o + ScsiLunDurableName durableName o + String key o + String model o + Int queueDepth o + String revision o + Int scsiLevel o + String serialNumber o + Byte standardInquiry ol + String vendor o +end + + +object ScsiLunCapabilities + Boolean updateDisplayNameSupported r +end + + +object ScsiLunDescriptor + String id r + String quality r +end + + +object ScsiLunDurableName + String namespace r + Byte namespaceId r + Byte data ol +end + + object ServiceContent ManagedObjectReference rootFolder r ManagedObjectReference propertyCollector r @@ -955,6 +1255,12 @@ method RemoveSnapshot_Task returns ManagedObjectReference r end +method RescanHba + ManagedObjectReference _this r + String hbaDevice r +end + + method RetrieveProperties returns ObjectContent ol ManagedObjectReference _this:propertyCollector r PropertyFilterSpec specSet rl diff --git a/src/esx/esx_vi_generator.py b/src/esx/esx_vi_generator.py index af2d57e..51668dd 100755 --- a/src/esx/esx_vi_generator.py +++ b/src/esx/esx_vi_generator.py @@ -1520,9 +1520,29 @@ additional_object_features = { "AutoStartDefaults" : Object.FEATURE__AN Object.FEATURE__ANY_TYPE, "HostDatastoreBrowserSearchResults" : Object.FEATURE__LIST | Object.FEATURE__ANY_TYPE, + "HostHostBusAdapter" : Object.FEATURE__LIST | + Object.FEATURE__ANY_TYPE, + "HostInternetScsiHba" : Object.FEATURE__DYNAMIC_CAST | + Object.FEATURE__DEEP_COPY, + "HostInternetScsiTargetTransport" : Object.FEATURE__DYNAMIC_CAST, + "HostScsiDisk" : Object.FEATURE__LIST | + Object.FEATURE__ANY_TYPE | + Object.FEATURE__DYNAMIC_CAST, + "HostScsiTopologyInterface" : Object.FEATURE__LIST | + Object.FEATURE__ANY_TYPE, + "HostScsiTopologyLun" : Object.FEATURE__ANY_TYPE | + Object.FEATURE__LIST | + Object.FEATURE__DEEP_COPY, + "HostScsiTopologyTarget" : Object.FEATURE__ANY_TYPE | + Object.FEATURE__LIST, + "ManagedObjectReference" : Object.FEATURE__ANY_TYPE, "ObjectContent" : Object.FEATURE__DEEP_COPY, "ResourcePoolResourceUsage" : Object.FEATURE__ANY_TYPE, + "ScsiLun" : Object.FEATURE__LIST | + Object.FEATURE__ANY_TYPE | + Object.FEATURE__DEEP_COPY, + "ScsiLunDurableName" : Object.FEATURE__LIST, "ServiceContent" : Object.FEATURE__DESERIALIZE, "SharesInfo" : Object.FEATURE__ANY_TYPE, "TaskInfo" : Object.FEATURE__LIST | -- 1.7.9.5

1 0

[libvirt] [PATCHv2] selinux: Fix incorrect object label generation.
by Viktor Mihajlovski 21 Aug '12

21 Aug '12

This is a fix for the object label generation. It uses a new flag for virSecuritySELinuxGenNewContext that specifies whether the context is for an object. If so the context role remains unchanged. Without this fix it is not possible to start domains with image file or block device backed storage when selinux is enabled. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/security/security_selinux.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 48fd78b..cf69040 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -141,7 +141,9 @@ cleanup: static char * -virSecuritySELinuxGenNewContext(const char *basecontext, const char *mcs) +virSecuritySELinuxGenNewContext(const char *basecontext, + const char *mcs, + bool isObjectContext) { context_t context = NULL; char *ret = NULL; @@ -176,10 +178,11 @@ virSecuritySELinuxGenNewContext(const char *basecontext, const char *mcs) goto cleanup; } - if (context_role_set(context, + if (!isObjectContext && + context_role_set(context, context_role_get(ourContext)) != 0) { virReportSystemError(errno, - _("Unable to set SELinux context user '%s'"), + _("Unable to set SELinux context role '%s'"), context_role_get(ourContext)); goto cleanup; } @@ -421,7 +424,8 @@ virSecuritySELinuxGenSecurityLabel(virSecurityManagerPtr mgr, if (!(def->seclabel.label = virSecuritySELinuxGenNewContext(def->seclabel.baselabel ? def->seclabel.baselabel : - data->domain_context, mcs))) + data->domain_context, + mcs, false))) goto cleanup; break; @@ -438,7 +442,7 @@ virSecuritySELinuxGenSecurityLabel(virSecurityManagerPtr mgr, if (!def->seclabel.norelabel) { if (!(def->seclabel.imagelabel = - virSecuritySELinuxGenNewContext(data->file_context, mcs))) + virSecuritySELinuxGenNewContext(data->file_context, mcs, true))) goto cleanup; } @@ -1639,7 +1643,8 @@ virSecuritySELinuxGenImageLabel(virSecurityManagerPtr mgr, virReportOOMError(); goto cleanup; } - if (!(label = virSecuritySELinuxGenNewContext(data->file_context, mcs))) + if (!(label = virSecuritySELinuxGenNewContext(data->file_context, + mcs, true))) goto cleanup; } } -- 1.7.0.4

2 1

[libvirt] [PATCH] virsh: drop unused headers
by Eric Blake 20 Aug '12

20 Aug '12

The previous commit now trips up 'make syntax-check' due to a useless use of <signal.h>. * tools/virsh.c (includes): Drop useless includes. --- Pushing under the build-breaker rule. tools/virsh.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 72d35ff..904ff33 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -32,9 +32,7 @@ #include <unistd.h> #include <errno.h> #include <getopt.h> -#include <sys/types.h> #include <sys/time.h> -#include <sys/wait.h> #include "c-ctype.h" #include <fcntl.h> #include <locale.h> @@ -43,8 +41,6 @@ #include <assert.h> #include <sys/stat.h> #include <inttypes.h> -#include <signal.h> -#include <poll.h> #include <strings.h> #include <termios.h> -- 1.7.11.4

1 0

[libvirt] [PATCH] maint: prohibit translations in testsuite
by Eric Blake 20 Aug '12

20 Aug '12

Nothing in the testsuite or examples directory should be translated, as it is not part of the normally installed binary. We already meet this rule, but enforcing it will make it easier to remember. Suggested by Daniel P. Berrange. * cfg.mk (sc_prohibit_useless_translation): Enhance rule. --- cfg.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cfg.mk b/cfg.mk index 224f89f..4fd3165 100644 --- a/cfg.mk +++ b/cfg.mk @@ -587,10 +587,15 @@ sc_prohibit_diagnostic_without_format: exit 1; } || : # The strings "" and "%s" should never be marked for translation. +# Files under tests/ and examples/ should not be translated. sc_prohibit_useless_translation: @prohibit='_$"(%s)?"$' \ halt='$(ME): found useless translation' \ $(_sc_search_regexp) + @prohibit='\<N?_ *\(' \ + in_vc_files='^(tests|examples)/' \ + halt='$(ME): no translations in tests or examples' \ + $(_sc_search_regexp) # Enforce recommended preprocessor indentation style. sc_preprocessor_indentation: -- 1.7.11.4

2 2

[libvirt] [PATCH] selinux: Fix incorrect object label generation.
by Viktor Mihajlovski 20 Aug '12

20 Aug '12

This is a fix for the object label generation. It uses a new flag for virSecuritySELinuxGenNewContext that specifies whether the context is for an object. If so the context role remains unchanged. Without this fix it is not possible to start domains with image file or block device backed storage when selinux is enabled. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/security/security_selinux.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 48fd78b..8cf23b7 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -141,7 +141,9 @@ cleanup: static char * -virSecuritySELinuxGenNewContext(const char *basecontext, const char *mcs) +virSecuritySELinuxGenNewContext(const char *basecontext, + const char *mcs, + bool isObjectContext) { context_t context = NULL; char *ret = NULL; @@ -176,10 +178,11 @@ virSecuritySELinuxGenNewContext(const char *basecontext, const char *mcs) goto cleanup; } - if (context_role_set(context, + if (!isObjectContext && + context_role_set(context, context_role_get(ourContext)) != 0) { virReportSystemError(errno, - _("Unable to set SELinux context user '%s'"), + _("Unable to set SELinux context role '%s'"), context_role_get(ourContext)); goto cleanup; } @@ -421,7 +424,8 @@ virSecuritySELinuxGenSecurityLabel(virSecurityManagerPtr mgr, if (!(def->seclabel.label = virSecuritySELinuxGenNewContext(def->seclabel.baselabel ? def->seclabel.baselabel : - data->domain_context, mcs))) + data->domain_context, + mcs, false))) goto cleanup; break; @@ -438,7 +442,7 @@ virSecuritySELinuxGenSecurityLabel(virSecurityManagerPtr mgr, if (!def->seclabel.norelabel) { if (!(def->seclabel.imagelabel = - virSecuritySELinuxGenNewContext(data->file_context, mcs))) + virSecuritySELinuxGenNewContext(data->file_context, mcs, true))) goto cleanup; } @@ -1639,7 +1643,8 @@ virSecuritySELinuxGenImageLabel(virSecurityManagerPtr mgr, virReportOOMError(); goto cleanup; } - if (!(label = virSecuritySELinuxGenNewContext(data->file_context, mcs))) + if (!(label = virSecuritySELinuxGenNewContext(data->file_context, + mcs, true))) goto cleanup; } } -- 1.7.0.4

2 2

[libvirt] [PATCHv5 0/2] Rework of Disk Geometry Support
by Viktor Mihajlovski 20 Aug '12

20 Aug '12

With qemu it is possible to override the geometry (cylinders, heads, sectors) of disks. This series adds a new XML tag for geometry and the related support in the qemu driver. V2 Changes: Refactor into the generic domain configuration/XML support for disk geometry and a qemu specific part with the testcase V3 Changes: 1. Use virReportError instead of custom xxxReportError. 2. Moved the geometry element to diskspec, so it applies to all kind of disks. V4 Changes: Rebase for libvirt 0.10.0 freeze. V5 Changes: Corrected qemuxml2argvtest invocation. Oversight after rebase. J.B. Joret (2): Support for Disk Geometry Override qemu: Disk Geometry Override Support docs/formatdomain.html.in | 25 +++++++ docs/schemas/domaincommon.rng | 25 +++++++ src/conf/domain_conf.c | 71 ++++++++++++++++++++ src/conf/domain_conf.h | 17 +++++ src/libvirt_private.syms | 2 + src/qemu/qemu_command.c | 59 ++++++++++++++++ .../qemuxml2argv-disk-geometry.args | 4 + .../qemuxml2argv-disk-geometry.xml | 26 +++++++ tests/qemuxml2argvtest.c | 2 + 9 files changed, 231 insertions(+), 0 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.xml

2 5

[libvirt] [PATCH] fix make syntak error
by Wen Congyang 20 Aug '12

20 Aug '12

We move the macro vshStrcasecmp from tools/virsh.c to tools/virsh.h after commit c2e494cc, so we should not check strcase* in the file tools/virsh.h. Some macros are not properly indented in the file tools/virsh.h and tools/virsh-domain.h. This patch also fixes this problem. --- cfg.mk | 2 +- tools/virsh-domain.h | 2 +- tools/virsh.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cfg.mk b/cfg.mk index e9138a8..d2e54e3 100644 --- a/cfg.mk +++ b/cfg.mk @@ -727,7 +727,7 @@ $(srcdir)/src/remote/remote_client_bodies.h: $(srcdir)/src/remote/remote_protoco $(MAKE) -C src remote/remote_client_bodies.h # List all syntax-check exemptions: -exclude_file_name_regexp--sc_avoid_strcase = ^tools/virsh\.c$$ +exclude_file_name_regexp--sc_avoid_strcase = ^tools/virsh\.h$$ _src1=libvirt|fdstream|qemu/qemu_monitor|util/(command|util)|xen/xend_internal|rpc/virnetsocket|lxc/lxc_controller exclude_file_name_regexp--sc_avoid_write = \ diff --git a/tools/virsh-domain.h b/tools/virsh-domain.h index 797462f..b1b7930 100644 --- a/tools/virsh-domain.h +++ b/tools/virsh-domain.h @@ -24,7 +24,7 @@ */ #ifndef VIRSH_DOMAIN_H -#define VIRSH_DOMAIN_H +# define VIRSH_DOMAIN_H # include "virsh.h" diff --git a/tools/virsh.h b/tools/virsh.h index 69f37cc..0b1f123 100644 --- a/tools/virsh.h +++ b/tools/virsh.h @@ -23,7 +23,7 @@ */ #ifndef VIRSH_H -#define VIRSH_H +# define VIRSH_H # include <stdio.h> # include <stdlib.h> -- 1.7.1

4 3

[libvirt] [PATCHv5 0/2] Rework of Disk Geometry Support
by Viktor Mihajlovski 20 Aug '12

20 Aug '12

With qemu it is possible to override the geometry (cylinders, heads, sectors) of disks. This series adds a new XML tag for geometry and the related support in the qemu driver. V2 Changes: Refactor into the generic domain configuration/XML support for disk geometry and a qemu specific part with the testcase V3 Changes: 1. Use virReportError instead of custom xxxReportError. 2. Moved the geometry element to diskspec, so it applies to all kind of disks. V4 Changes: Rebase for libvirt 0.10.0 freeze. V5 Changes: Corrected qemuxml2argvtest invocation. Oversight after rebase. J.B. Joret (2): Support for Disk Geometry Override qemu: Disk Geometry Override Support docs/formatdomain.html.in | 25 +++++++ docs/schemas/domaincommon.rng | 25 +++++++ src/conf/domain_conf.c | 71 ++++++++++++++++++++ src/conf/domain_conf.h | 17 +++++ src/libvirt_private.syms | 2 + src/qemu/qemu_command.c | 59 ++++++++++++++++ .../qemuxml2argv-disk-geometry.args | 4 + .../qemuxml2argv-disk-geometry.xml | 26 +++++++ tests/qemuxml2argvtest.c | 2 + 9 files changed, 231 insertions(+), 0 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.xml

1 3

[libvirt] [test-API][PATCH] utils: Update remote_exec_pexpect function and sync cases
by Wayne Sun 20 Aug '12

20 Aug '12

After delete duplicate remote_exec_pexect function, the left function with same name causes some problem with cases, so update the function and sync all cases using it. Signed-off-by: Wayne Sun <gsun(a)redhat.com> --- repos/domain/cpu_topology.py | 8 +++--- repos/domain/define.py | 7 +++-- repos/remoteAccess/tcp_setup.py | 36 +++++++++++++++++----------------- repos/remoteAccess/tls_setup.py | 41 ++++++++++++++++++++------------------- utils/utils.py | 19 ++++++++--------- 5 files changed, 56 insertions(+), 55 deletions(-) diff --git a/repos/domain/cpu_topology.py b/repos/domain/cpu_topology.py index 5f4ef52..14fe67d 100644 --- a/repos/domain/cpu_topology.py +++ b/repos/domain/cpu_topology.py @@ -126,17 +126,17 @@ def cpu_topology_chk(ip, username, password, lscpu = "lscpu" # sleep for 5 seconds time.sleep(40) - ret, output = utils.remote_exec_pexpect(ip, username, password, lscpu) + ret = utils.remote_exec_pexpect(ip, username, password, lscpu) logger.debug("lscpu:") - logger.debug(output) - if ret: + logger.debug(ret) + if ret == "TIMEOUT!!!": logger.error("failed to run lscpu on guest OS") return 1 int = 0 actual_thread = actual_core = actual_socket = '' - for item in output.strip().split('\r'): + for item in ret.split('\r'): if int == 5: actual_thread = item.split()[-1] logger.info("the actual thread in the guest is %s" % actual_thread) diff --git a/repos/domain/define.py b/repos/domain/define.py index a70ddad..2b127a7 100644 --- a/repos/domain/define.py +++ b/repos/domain/define.py @@ -44,9 +44,10 @@ def check_define_domain(guestname, virt_type, hostname, username, \ if hostname: cmd = "ls %s" % path - ret, output = utils.remote_exec_pexpect(hostname, username, \ - password, cmd) - if ret: + ret = utils.remote_exec_pexpect(hostname, username, password, cmd) + cmd = "grep 'No such file' %s" % ret + ret = utils.exec_cmd(cmd) + if ret == 0: logger.error("guest %s xml file doesn't exsits" % guestname) return False else: diff --git a/repos/remoteAccess/tcp_setup.py b/repos/remoteAccess/tcp_setup.py index ddbe333..7a963e7 100644 --- a/repos/remoteAccess/tcp_setup.py +++ b/repos/remoteAccess/tcp_setup.py @@ -26,9 +26,9 @@ 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) - ret, output = utils.remote_exec_pexpect(target_machine, username, + ret = utils.remote_exec_pexpect(target_machine, username, password, saslpasswd2_add) - if ret: + if ret == "TIMEOUT!!!": logger.error("failed to add sasl user") return 1 @@ -40,18 +40,18 @@ def tcp_libvirtd_set(target_machine, username, password, logger.info("setting libvirtd.conf on libvirt server") # open libvirtd --listen option listen_open_cmd = "echo 'LIBVIRTD_ARGS=\"--listen\"' >> %s" % SYSCONFIG_LIBVIRTD - ret, output = utils.remote_exec_pexpect(target_machine, username, + ret = utils.remote_exec_pexpect(target_machine, username, password, listen_open_cmd) - if ret: + if ret == "TIMEOUT!!!": logger.error("failed to uncomment --listen in %s" % SYSCONFIG_LIBVIRTD) return 1 # set listen_tls logger.info("set listen_tls to 0 in %s" % LIBVIRTD_CONF) listen_tls_disable = "echo \"listen_tls = 0\" >> %s" % LIBVIRTD_CONF - ret, output = utils.remote_exec_pexpect(target_machine, username, + ret = utils.remote_exec_pexpect(target_machine, username, password, listen_tls_disable) - if ret: + if ret == "TIMEOUT!!!": logger.error("failed to set listen_tls to 0 in %s" % LIBVIRTD_CONF) return 1 @@ -59,27 +59,27 @@ def tcp_libvirtd_set(target_machine, username, password, if listen_tcp == 'enable': logger.info("enable listen_tcp = 1 in %s" % LIBVIRTD_CONF) listen_tcp_set = "echo 'listen_tcp = 1' >> %s" % LIBVIRTD_CONF - ret, output = utils.remote_exec_pexpect(target_machine, username, + ret = utils.remote_exec_pexpect(target_machine, username, password, listen_tcp_set) - if ret: + if ret == "TIMEOUT!!!": logger.error("failed to set listen_tcp in %s" % LIBVIRTD_CONF) return 1 # set auth_tcp logger.info("set auth_tcp to \"%s\" in %s" % (auth_tcp, LIBVIRTD_CONF)) auth_tcp_set = "echo 'auth_tcp = \"%s\"' >> %s" % (auth_tcp, LIBVIRTD_CONF) - ret, output = utils.remote_exec_pexpect(target_machine, username, + ret = utils.remote_exec_pexpect(target_machine, username, password, auth_tcp_set) - if ret: + if ret == "TIMEOUT!!!": logger.error("failed to set auth_tcp in %s" % LIBVIRTD_CONF) return 1 # restart remote libvirtd service libvirtd_restart_cmd = "service libvirtd restart" logger.info("libvirtd restart") - ret, output = utils.remote_exec_pexpect(target_machine, username, + ret = utils.remote_exec_pexpect(target_machine, username, password, libvirtd_restart_cmd) - if ret: + if ret == "TIMEOUT!!!": logger.error("failed to restart libvirtd service") return 1 @@ -187,18 +187,18 @@ def tcp_setup_clean(params): if auth_tcp == 'sasl': saslpasswd2_delete = "%s -a libvirt -d %s" % (SASLPASSWD2, username) - ret, output = utils.remote_exec_pexpect(target_machine, username, + ret = utils.remote_exec_pexpect(target_machine, username, password, saslpasswd2_delete) - if ret: + if ret == "TIMEOUT!!!": logger.error("failed to delete sasl user") libvirtd_conf_retore = "sed -i -n '/^[ #]/p' %s" % LIBVIRTD_CONF - ret, output = utils.remote_exec_pexpect(target_machine, username, + ret = utils.remote_exec_pexpect(target_machine, username, password, libvirtd_conf_retore) - if ret: + if ret == "TIMEOUT!!!": logger.error("failed to restore %s" % LIBVIRTD_CONF) sysconfig_libvirtd_restore = "sed -i -n '/^[ #]/p' %s" % SYSCONFIG_LIBVIRTD - ret, output = utils.remote_exec_pexpect(target_machine, username, + ret = utils.remote_exec_pexpect(target_machine, username, password, sysconfig_libvirtd_restore) - if ret: + if ret == "TIMEOUT!!!": logger.error("failed to restore %s" % SYSCONFIG_LIBVIRTD) diff --git a/repos/remoteAccess/tls_setup.py b/repos/remoteAccess/tls_setup.py index f8b3cea..3e614f5 100644 --- a/repos/remoteAccess/tls_setup.py +++ b/repos/remoteAccess/tls_setup.py @@ -178,8 +178,9 @@ def deliver_cert(target_machine, username, password, pkipath, logger): # mkdir /etc/pki/libvirt/private on remote host libvirt_priv_cmd = "mkdir -p %s" % PRIVATE_KEY_FOLDER - ret, output = utils.remote_exec_pexpect(target_machine, username, password, libvirt_priv_cmd) - if ret: + ret = utils.remote_exec_pexpect(target_machine, username, password, + libvirt_priv_cmd) + if ret == "TIMEOUT!!!": logger.error("failed to make /etc/pki/libvirt/private on %s" % target_machine) return 1 @@ -222,9 +223,9 @@ 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) - ret, output = utils.remote_exec_pexpect(target_machine, username, + ret = utils.remote_exec_pexpect(target_machine, username, password, saslpasswd2_add) - if ret: + if ret == "TIMEOUT!!!": logger.error("failed to add sasl user") return 1 @@ -236,36 +237,36 @@ def tls_libvirtd_set(target_machine, username, password, logger.info("setting libvirtd.conf on tls server") # open libvirtd --listen option listen_open_cmd = "echo 'LIBVIRTD_ARGS=\"--listen\"' >> /etc/sysconfig/libvirtd" - ret, output = utils.remote_exec_pexpect(target_machine, username, + ret = utils.remote_exec_pexpect(target_machine, username, password, listen_open_cmd) - if ret: + if ret == "TIMEOUT!!!": logger.error("failed to uncomment --listen in /etc/sysconfig/libvirtd") return 1 if listen_tls == 'disable': logger.info("set listen_tls to 0 in %s" % LIBVIRTD_CONF) listen_tls_disable = "echo \"listen_tls = 0\" >> %s" % LIBVIRTD_CONF - ret, output = utils.remote_exec_pexpect(target_machine, username, + ret = utils.remote_exec_pexpect(target_machine, username, password, listen_tls_disable) - if ret: + if ret == "TIMEOUT!!!": logger.error("failed to set listen_tls to 0 in %s" % LIBVIRTD_CONF) return 1 if auth_tls == 'sasl': logger.info("enable auth_tls = sasl in %s" % LIBVIRTD_CONF) auth_tls_set = "echo 'auth_tls = \"sasl\"' >> %s" % LIBVIRTD_CONF - ret, output = utils.remote_exec_pexpect(target_machine, username, + ret = utils.remote_exec_pexpect(target_machine, username, password, auth_tls_set) - if ret: + if ret == "TIMEOUT!!!": logger.error("failed to set auth_tls to sasl in %s" % LIBVIRTD_CONF) return 1 # restart remote libvirtd service libvirtd_restart_cmd = "service libvirtd restart" logger.info("libvirtd restart") - ret, output = utils.remote_exec_pexpect(target_machine, username, + ret = utils.remote_exec_pexpect(target_machine, username, password, libvirtd_restart_cmd) - if ret: + if ret == "TIMEOUT!!!": logger.error("failed to restart libvirtd service") return 1 @@ -276,9 +277,9 @@ 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" - ret, output = utils.remote_exec_pexpect(target_machine, username, + ret = utils.remote_exec_pexpect(target_machine, username, password, iptables_stop_cmd) - if ret: + if ret == "TIMEOUT!!!": logger.error("failed to stop remote iptables service") return 1 @@ -423,15 +424,15 @@ def tls_setup_clean(params): auth_tls = params['auth_tls'] cacert_rm = "rm -f %s/cacert.pem" % CA_FOLDER - ret, output = utils.remote_exec_pexpect(target_machine, username, + ret = utils.remote_exec_pexpect(target_machine, username, password, cacert_rm) - if ret: + if ret == "TIMEOUT!!!": logger.error("failed to remove cacert.pem on remote machine") ca_libvirt_rm = "rm -rf %s" % CERTIFICATE_FOLDER - ret, output = utils.remote_exec_pexpect(target_machine, username, + ret = utils.remote_exec_pexpect(target_machine, username, password, ca_libvirt_rm) - if ret: + if ret == "TIMEOUT!!!": logger.error("failed to remove libvirt folder") os.remove("%s/cacert.pem" % CA_FOLDER) @@ -439,8 +440,8 @@ def tls_setup_clean(params): if auth_tls == 'sasl': saslpasswd2_delete = "%s -a libvirt -d %s" % (SASLPASSWD2, username) - ret, output = utils.remote_exec_pexpect(target_machine, username, + ret = utils.remote_exec_pexpect(target_machine, username, password, saslpasswd2_delete) - if ret: + if ret == "TIMEOUT!!!": logger.error("failed to delete sasl user") diff --git a/utils/utils.py b/utils/utils.py index b174a58..40b3724 100644 --- a/utils/utils.py +++ b/utils/utils.py @@ -431,12 +431,10 @@ def remote_exec_pexpect(hostname, username, password, cmd): child.sendline(password) elif index == 2: child.close() - return 0, child.before + return string.strip(child.before) elif index == 3: child.close() - return 1, "" - - return 0 + return "TIMEOUT!!!" def scp_file(hostname, username, password, target_path, file): """ Scp file to remote host """ @@ -535,12 +533,13 @@ def get_remote_memory(hostname, username, password): i = 0 while i < 3: i += 1 - memsize = \ - int(remote_exec_pexpect(hostname, username, password, cmd)) * 1024 - if memsize == -1: - continue - else: - break + ret = remote_exec_pexpect(hostname, username, password, cmd) + if ret != "TIMEOUT!!!": + memsize = int(ret) * 1024 + if memsize == -1: + continue + else: + break return memsize def get_remote_kernel(hostname, username, password): -- 1.7.1

1 0

[libvirt] [PATCH] selinux: Fix incorrect file label generation.
by Viktor Mihajlovski 20 Aug '12

20 Aug '12

This is an ad-hoc fix for the file label generation. It uses the base context role to determine whether to use the libvirt process context role. If this is object_r we don't touch it. It might be better to add a new flag to virSecuritySELinuxGenNewContext that specifies the context type (process or file) in the future. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/security/security_selinux.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 48fd78b..34b9aad 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -176,7 +176,9 @@ virSecuritySELinuxGenNewContext(const char *basecontext, const char *mcs) goto cleanup; } - if (context_role_set(context, + /* don't exchange role context if object_r as this is a file context */ + if (strcmp("object_r", context_role_get(context)) && + context_role_set(context, context_role_get(ourContext)) != 0) { virReportSystemError(errno, _("Unable to set SELinux context user '%s'"), -- 1.7.0.4

4 4

[libvirt] [PATCHv5 2/2] qemu: Disk Geometry Override Support
by Viktor Mihajlovski 20 Aug '12

20 Aug '12

From: J.B. Joret <jb(a)linux.vnet.ibm.com> Qemu command line generation for geometry override and testcases. V2 Changes: squashed qemu code and testcases. V3 Changes: use virReportError. V4 Changes: rebase V5 Changes: Fixed test invocation for geometry. Signed-off-by: J.B. Joret <jb(a)linux.vnet.ibm.com> Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/qemu/qemu_command.c | 59 ++++++++++++++++++++ .../qemuxml2argv-disk-geometry.args | 4 + .../qemuxml2argv-disk-geometry.xml | 26 +++++++++ tests/qemuxml2argvtest.c | 2 + 4 files changed, 91 insertions(+), 0 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.xml diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9383530..cc44015 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2073,6 +2073,8 @@ qemuBuildDriveStr(virConnectPtr conn ATTRIBUTE_UNUSED, { virBuffer opt = VIR_BUFFER_INITIALIZER; const char *bus = virDomainDiskQEMUBusTypeToString(disk->bus); + const char *trans = + virDomainDiskGeometryTransTypeToString(disk->geometry.trans); int idx = virDiskNameToIndex(disk->dst); int busid = -1, unitid = -1; @@ -2275,6 +2277,24 @@ qemuBuildDriveStr(virConnectPtr conn ATTRIBUTE_UNUSED, disk->type != VIR_DOMAIN_DISK_TYPE_DIR && qemuCapsGet(qemuCaps, QEMU_CAPS_DRIVE_FORMAT)) virBufferAsprintf(&opt, ",format=%s", disk->driverType); + + /* generate geometry command string*/ + if (disk->type == VIR_DOMAIN_DISK_TYPE_BLOCK || + disk->type == VIR_DOMAIN_DISK_TYPE_FILE) { + if (disk->geometry.cylinders > 0 && + disk->geometry.heads > 0 && + disk->geometry.sectors > 0) { + + virBufferAsprintf(&opt, ",cyls=%u,heads=%u,secs=%u", + disk->geometry.cylinders, + disk->geometry.heads, + disk->geometry.sectors); + + if (disk->geometry.trans != VIR_DOMAIN_DISK_TRANS_DEFAULT) + virBufferEscapeString(&opt, ",trans=%s", trans); + } + } + if (disk->serial && qemuCapsGet(qemuCaps, QEMU_CAPS_DRIVE_SERIAL)) { if (qemuSafeSerialParamValue(disk->serial) < 0) @@ -6691,6 +6711,7 @@ qemuParseCommandLineDisk(virCapsPtr caps, int idx = -1; int busid = -1; int unitid = -1; + int trans = VIR_DOMAIN_DISK_TRANS_DEFAULT; if ((nkeywords = qemuParseKeywords(val, &keywords, @@ -6895,6 +6916,44 @@ qemuParseCommandLineDisk(virCapsPtr caps, virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot parse io mode '%s'"), values[i]); } + } else if (STREQ(keywords[i], "cyls")) { + if (virStrToLong_ui(values[i], NULL, 10, + &(def->geometry.cylinders)) < 0) { + virDomainDiskDefFree(def); + def = NULL; + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse cylinders value'%s'"), + values[i]); + } + } else if (STREQ(keywords[i], "heads")) { + if (virStrToLong_ui(values[i], NULL, 10, + &(def->geometry.heads)) < 0) { + virDomainDiskDefFree(def); + def = NULL; + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse heads value'%s'"), + values[i]); + } + } else if (STREQ(keywords[i], "secs")) { + if (virStrToLong_ui(values[i], NULL, 10, + &(def->geometry.sectors)) < 0) { + virDomainDiskDefFree(def); + def = NULL; + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse sectors value'%s'"), + values[i]); + } + } else if (STREQ(keywords[i], "trans")) { + def->geometry.trans = + virDomainDiskGeometryTransTypeFromString(values[i]); + if ((trans < VIR_DOMAIN_DISK_TRANS_DEFAULT) || + (trans >= VIR_DOMAIN_DISK_TRANS_LAST)) { + virDomainDiskDefFree(def); + def = NULL; + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse translation value'%s'"), + values[i]); + } } } diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args new file mode 100644 index 0000000..7cd6650 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args @@ -0,0 +1,4 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ +pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi -boot c -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,cyls=16383,heads=16,secs=63,trans=lba \ +-net none -serial none -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.xml new file mode 100644 index 0000000..f0cf4ae --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.xml @@ -0,0 +1,26 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219136</memory> + <currentMemory>219136</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <geometry cyls='16383' heads='16' secs='63' trans='lba'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index f8d8db5..71513fb 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -788,6 +788,8 @@ mymain(void) QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_IDE_CD); + DO_TEST("disk-geometry", QEMU_CAPS_DRIVE); + VIR_FREE(driver.stateDir); virCapabilitiesFree(driver.caps); VIR_FREE(map); -- 1.7.0.4

1 0

[libvirt] [PATCHv4 0/2] Rework of Disk Geometry Support
by Viktor Mihajlovski 20 Aug '12

20 Aug '12

With qemu it is possible to override the geometry (cylinders, heads, sectors) of disks. This series adds a new XML tag for geometry and the related support in the qemu driver. V2 Changes: Refactor into the generic domain configuration/XML support for disk geometry and a qemu specific part with the testcase V3 Changes: 1. Use virReportError instead of custom xxxReportError. 2. Moved the geometry element to diskspec, so it applies to all kind of disks. V4 Changes: Rebase for libvirt 0.10.0 freeze. J.B. Joret (2): Support for Disk Geometry Override qemu: Disk Geometry Override Support docs/formatdomain.html.in | 25 +++++++ docs/schemas/domaincommon.rng | 25 +++++++ src/conf/domain_conf.c | 71 ++++++++++++++++++++ src/conf/domain_conf.h | 17 +++++ src/libvirt_private.syms | 2 + src/qemu/qemu_command.c | 59 ++++++++++++++++ .../qemuxml2argv-disk-geometry.args | 4 + .../qemuxml2argv-disk-geometry.xml | 26 +++++++ tests/qemuxml2argvtest.c | 2 + 9 files changed, 231 insertions(+), 0 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.xml

1 3

[libvirt] [PATCH 0/7] support guest agent general command v3
by MATSUDA, Daiki 20 Aug '12

20 Aug '12

Hi. All. I rewrote the patched. But I modified the feature for the situation @result pointer is NULL. Though before it does not forcely wait, I think it is not meanless because @result pointer is always NULL. And @timeout must be following VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK(-2) : does not block and wait forever. VIR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT(-1) : use default time for waiting VIR_DOMAIN_QEMU_AGENT_COMMAND_NOWIAT(0) : does not wait and out soon positive value : wait for pointed seconds. In addition, I added the some options for virsh command qemu-agent-command --block : it means taht @timeout is VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK. --async : it means taht @timeout is VIR_DOMAIN_QEMU_AGENT_COMMAND_NOWIAT. --timeout @seconds : @seconds must be positive value and it means that @timeout is positive value case. These upper options are exclusive. If no options are given, it means taht @timeout is IR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT. virsh # help qemu-agent-command NAME qemu-agent-command - QEMU Guest Agent Command SYNOPSIS qemu-agent-command <domain> [--timeout <number>] [--async] [--block] {[--cmd] <string>}... DESCRIPTION Run an arbitrary qemu guest agent command; use at your own risk OPTIONS [--domain] <string> domain name, id or uuid --timeout <number> timeout seconds. must be positive. --async execute command without waiting for timeout --block execute command without timeout [--cmd] <string> command virsh # qemu-agent-command RHEL58_64 '{"execute":"guest-info"}' {"return":{"version":"1.1.50","supported_commands":[{"enabled":true,"name":"guest-network-get-interfaces"},{"enabled":true,"name":"guest-suspend-hybrid"},{"enabled":true,"name":"guest-suspend-ram"},{"enabled":true,"name":"guest-suspend-disk"},{"enabled":true,"name":"guest-fsfreeze-thaw"},{"enabled":true,"name":"guest-fsfreeze-freeze"},{"enabled":true,"name":"guest-fsfreeze-status"},{"enabled":true,"name":"guest-file-flush"},{"enabled":true,"name":"guest-file-seek"},{"enabled":true,"name":"guest-file-write"},{"enabled":true,"name":"guest-file-read"},{"enabled":true,"name":"guest-file-close"},{"enabled":true,"name":"guest-file-open"},{"enabled":true,"name":"guest-shutdown"},{"enabled":true,"name":"guest-info"},{"enabled":true,"name":"guest-ping"},{"enabled":true,"name":"guest-sync"},{"enabled":true,"name":"guest-sync-delimited"}]}} virsh # qemu-agent-command --block RHEL58_64 '{"execute":"guest-sync","arguments":{"id":123}}' {"return":123}

3 17

[libvirt] [PATCH 0/7] Forward mode='hostdev' patch series
by Shradha Shah 20 Aug '12

20 Aug '12

This patch series supports the forward mode='hostdev'. The functionality of this mode is the same as interface type='hostdev' but with the added benefit of using interface pools. The patch series also contains a patch to support use of interface names and PCI device addresses interchangeably in a network xml, and return the appropriate one in actualDevice when networkAllocateActualDevice is called. At the top level managed attribute can be specified with identical results as when it's specified for a hostdev. Currently forward mode='hostdev' does not support USB devices. Shradha Shah (7): conf: move DevicePCIAddress functions to separate file network: helper function to create interface pool from PF RNG updates, new xml parser/formatter code to support forward mode=hostdev Code to return interface name or pci_addr of the VF in actualDevice Add function virDevicePCIAddressEqual Forward Mode Hostdev network driver Implementation Forward Mode 'Hostdev' qemu driver implementation docs/formatnetwork.html.in | 62 +++++ docs/schemas/basictypes.rng | 46 ++++ docs/schemas/domaincommon.rng | 44 ---- docs/schemas/network.rng | 53 ++++- include/libvirt/virterror.h | 1 + src/Makefile.am | 7 +- src/conf/device_conf.c | 147 +++++++++++ src/conf/device_conf.h | 68 ++++++ src/conf/domain_conf.c | 114 +-------- src/conf/domain_conf.h | 25 +-- src/conf/network_conf.c | 130 +++++++++-- src/conf/network_conf.h | 26 ++- src/libvirt_private.syms | 11 +- src/network/bridge_driver.c | 414 +++++++++++++++++++++++--------- src/qemu/qemu_command.c | 52 +++- src/qemu/qemu_hotplug.c | 7 +- src/qemu/qemu_monitor.c | 14 +- src/qemu/qemu_monitor.h | 17 +- src/qemu/qemu_monitor_json.c | 14 +- src/qemu/qemu_monitor_json.h | 14 +- src/qemu/qemu_monitor_text.c | 16 +- src/qemu/qemu_monitor_text.h | 14 +- src/util/virnetdev.c | 25 +- src/util/virnetdev.h | 4 +- src/util/virterror.c | 3 +- src/xen/xend_internal.c | 3 +- tests/networkxml2xmlin/hostdev-pf.xml | 7 + tests/networkxml2xmlin/hostdev.xml | 10 + tests/networkxml2xmlout/hostdev-pf.xml | 7 + tests/networkxml2xmlout/hostdev.xml | 10 + tests/networkxml2xmltest.c | 2 + 31 files changed, 976 insertions(+), 391 deletions(-) create mode 100644 src/conf/device_conf.c create mode 100644 src/conf/device_conf.h create mode 100644 tests/networkxml2xmlin/hostdev-pf.xml create mode 100644 tests/networkxml2xmlin/hostdev.xml create mode 100644 tests/networkxml2xmlout/hostdev-pf.xml create mode 100644 tests/networkxml2xmlout/hostdev.xml -- 1.7.4.4

3 21

[libvirt] [RFC] Support cpu hotplug in libvirt.
by tangchen 20 Aug '12

20 Aug '12

Hi~ It seems that libvirt is not cpu hotplug aware. Please refer to the following problem. 1. At first, we have 2 cpus. # cat /cgroup/cpuset/cpuset.cpus 0-1 # cat /cgroup/cpuset/libvirt/qemu/cpuset.cpus 0-1 2. And we have a vm1 with following configuration. <cputune> <vcpupin vcpu='0' cpuset='1'/> <hypervisorpin cpuset='1'/> </cputune> 3. Offline cpu1. # echo 0 > /sys/devices/system/cpu/cpu1/online # cat /sys/devices/system/cpu/cpu1/online 0 # cat /cgroup/cpuset/cpuset.cpus 0 # cat /cgroup/cpuset/libvirt/qemu/cpuset.cpus 0 4. Online cpu1. # echo 1 > /sys/devices/system/cpu/cpu1/online # cat /sys/devices/system/cpu/cpu1/online 1 # cat /cgroup/cpuset/cpuset.cpus 0-1 # cat /cgroup/cpuset/libvirt/cpuset.cpus 0 # cat /cgroup/cpuset/libvirt/qemu/cpuset.cpus 0 # cat /cgroup/cpuset/libvirt/lxc/cpuset.cpus 0 Here，cgroup updated cpuset.cpus，but not for libvirt directory，and also qemu and lxc directory. vm1 cannot be started again. # virsh start vm1 error: Failed to start domain vm1 error: Unable to set cpuset.cpus: Permission denied And libvird gave the following errors. 2012-07-17 07:30:22.478+0000: 3118: error : qemuSetupCgroupVcpuPin:498 : Unable to set cpuset.cpus: Permission denied I am trying to use netlink socket with NETLINK_KOBJECT_UEVENT protocol to listen to cpu hotplug events. But I met a little problem here. virNetlinkEventServiceStart() only create a global variable server, and create a NETLINK_ROUTE netlink socket for it. So if I want to create another different netlink socket, such as NETLINK_KOBJECT_UEVENT, what should I do ? Shall we make the server global variable a global array ? (It seems there are a lot of work to do.) Thanks. :) -- Best Regards, Tang chen

4 6

[libvirt] [PATCH] Add support for setting VLANs on Open vSwitch ports
by Kyle Mestery 19 Aug '12

19 Aug '12

Add the ability to support VLAN tags for Open vSwitch virtual port types. To accomplish this, modify virNetDevOpenvswitchAddPort and virNetDevTapCreateInBridgePort to take a virNetDevVlanPtr argument. When adding the port to the OVS bridge, setup either a single VLAN or a trunk port based on the configuration from the virNetDevVlanPtr. Signed-off-by: Kyle Mestery <kmestery(a)cisco.com> --- .gnulib | 2 +- src/lxc/lxc_process.c | 2 +- src/network/bridge_driver.c | 2 +- src/qemu/qemu_command.c | 1 + src/uml/uml_conf.c | 1 + src/util/virnetdevopenvswitch.c | 34 +++++++++++++++++++++++++++++++--- src/util/virnetdevopenvswitch.h | 4 +++- src/util/virnetdevtap.c | 3 ++- src/util/virnetdevtap.h | 2 ++ 9 files changed, 43 insertions(+), 8 deletions(-) diff --git a/.gnulib b/.gnulib index 271dd74..dbd9144 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 271dd74fdf54ec2a03e73a5173b0b5697f6088f1 +Subproject commit dbd914496c99c52220e5f5ba4121d6cb55fb3beb diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 046ed86..dc34bef 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -325,7 +325,7 @@ static int virLXCProcessSetupInterfaceBridged(virConnectPtr conn, if (vport && vport->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) ret = virNetDevOpenvswitchAddPort(brname, parentVeth, &net->mac, - vm->uuid, vport); + vm->uuid, vport, &net->vlan); else ret = virNetDevBridgeAddPort(brname, parentVeth); if (ret < 0) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 474bbfa..a78e3b6 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1763,7 +1763,7 @@ networkStartNetworkVirtual(struct network_driver *driver, } if (virNetDevTapCreateInBridgePort(network->def->bridge, &macTapIfName, &network->def->mac, - NULL, NULL, NULL, + NULL, NULL, NULL, NULL, VIR_NETDEV_TAP_CREATE_USE_MAC_FOR_BRIDGE) < 0) { VIR_FREE(macTapIfName); goto err0; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9383530..e0062a1 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -255,6 +255,7 @@ qemuNetworkIfaceConnect(virDomainDefPtr def, err = virNetDevTapCreateInBridgePort(brname, &net->ifname, &net->mac, def->uuid, &tapfd, virDomainNetGetActualVirtPortProfile(net), + &net->vlan, tap_create_flags); virDomainAuditNetDevice(def, net, "/dev/net/tun", tapfd >= 0); if (err < 0) { diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c index 4c299d8..5461b42 100644 --- a/src/uml/uml_conf.c +++ b/src/uml/uml_conf.c @@ -141,6 +141,7 @@ umlConnectTapDevice(virConnectPtr conn, if (virNetDevTapCreateInBridgePort(bridge, &net->ifname, &net->mac, vm->uuid, NULL, virDomainNetGetActualVirtPortProfile(net), + &net->vlan, VIR_NETDEV_TAP_CREATE_IFUP) < 0) { if (template_ifname) VIR_FREE(net->ifname); diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index b57532b..8a31e77 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -46,9 +46,11 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname, const virMacAddrPtr macaddr, const unsigned char *vmuuid, - virNetDevVPortProfilePtr ovsport) + virNetDevVPortProfilePtr ovsport, + virNetDevVlanPtr virtVlan) { int ret = -1; + int i = 0; virCommandPtr cmd = NULL; char macaddrstr[VIR_MAC_STRING_BUFLEN]; char ifuuidstr[VIR_UUID_STRING_BUFLEN]; @@ -57,6 +59,7 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname, char *ifaceid_ex_id = NULL; char *profile_ex_id = NULL; char *vmid_ex_id = NULL; + virBufferPtr buf; virMacAddrFormat(macaddr, macaddrstr); virUUIDFormat(ovsport->interfaceID, ifuuidstr); @@ -76,11 +79,35 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname, ovsport->profileID) < 0) goto out_of_memory; } + if (virtVlan) { + if (VIR_ALLOC(buf) < 0) + goto out_of_memory; + + /* Trunk port first */ + if (virtVlan->trunk) { + virBufferAdd(buf, "trunk=", -1); + + /* + * Trunk ports have at least one VLAN. Do the first one + * outside the "for" loop so we can put a "," at the + * start of the for loop if there are more than one VLANs + * on this trunk port. + */ + virBufferAsprintf(buf, "%d", virtVlan->tag[i]); + + for (i = 1; i < virtVlan->nTags; i++) { + virBufferAdd(buf, ",", -1); + virBufferAsprintf(buf, "%d", virtVlan->tag[i]); + } + } else { + virBufferAsprintf(buf, "tag=%d", virtVlan->tag[0]); + } + } cmd = virCommandNew(OVSVSCTL); if (ovsport->profileID[0] == '\0') { virCommandAddArgList(cmd, "--", "--may-exist", "add-port", - brname, ifname, + brname, ifname, virBufferCurrentContent(buf), "--", "set", "Interface", ifname, attachedmac_ex_id, "--", "set", "Interface", ifname, ifaceid_ex_id, "--", "set", "Interface", ifname, vmid_ex_id, @@ -89,7 +116,7 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname, NULL); } else { virCommandAddArgList(cmd, "--", "--may-exist", "add-port", - brname, ifname, + brname, ifname, virBufferCurrentContent(buf), "--", "set", "Interface", ifname, attachedmac_ex_id, "--", "set", "Interface", ifname, ifaceid_ex_id, "--", "set", "Interface", ifname, vmid_ex_id, @@ -108,6 +135,7 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname, ret = 0; cleanup: + VIR_FREE(buf); VIR_FREE(attachedmac_ex_id); VIR_FREE(ifaceid_ex_id); VIR_FREE(vmid_ex_id); diff --git a/src/util/virnetdevopenvswitch.h b/src/util/virnetdevopenvswitch.h index fbf9168..58b4dda 100644 --- a/src/util/virnetdevopenvswitch.h +++ b/src/util/virnetdevopenvswitch.h @@ -27,13 +27,15 @@ # include "internal.h" # include "util.h" # include "virnetdevvportprofile.h" +# include "virnetdevvlan.h" int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname, const virMacAddrPtr macaddr, const unsigned char *vmuuid, - virNetDevVPortProfilePtr ovsport) + virNetDevVPortProfilePtr ovsport, + virNetDevVlanPtr virtVlan) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index 192d180..24f30b5 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -280,6 +280,7 @@ int virNetDevTapCreateInBridgePort(const char *brname, const unsigned char *vmuuid, int *tapfd, virNetDevVPortProfilePtr virtPortProfile, + virNetDevVlanPtr virtVlan, unsigned int flags) { virMacAddr tapmac; @@ -324,7 +325,7 @@ int virNetDevTapCreateInBridgePort(const char *brname, if (virtPortProfile) { if (virNetDevOpenvswitchAddPort(brname, *ifname, macaddr, vmuuid, - virtPortProfile) < 0) { + virtPortProfile, virtVlan) < 0) { goto error; } } else { diff --git a/src/util/virnetdevtap.h b/src/util/virnetdevtap.h index ce3365e..45d0c08 100644 --- a/src/util/virnetdevtap.h +++ b/src/util/virnetdevtap.h @@ -25,6 +25,7 @@ # include "internal.h" # include "virnetdevvportprofile.h" +# include "virnetdevvlan.h" int virNetDevTapCreate(char **ifname, int *tapfd, @@ -50,6 +51,7 @@ int virNetDevTapCreateInBridgePort(const char *brname, const unsigned char *vmuuid, int *tapfd, virNetDevVPortProfilePtr virtPortProfile, + virNetDevVlanPtr virtVlan, unsigned int flags) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; -- 1.7.11.2

3 5

[libvirt] libvirtd crash when attach-disk to VM
by Wangpan 19 Aug '12

19 Aug '12

Hi all, I got a depressed problem(libvirtd crash with SIGABRT or SIGSEGV sometimes) when attach a nbd disk to a VM by using cmd as follow: virsh attach-disk 228 --source /dev/nbd0 --target vdd --sourcetype block --driver qemu --subdriver raw or just using virsh attach-disk 228 /dev/nbd0 vdd. and this problem occurs everytime when I attach a nbd disk to VM. the device nbd0 is create by qemu-nbd cmd: qemu-nbd -c /dev/nbd0 /home/hzwangpan/zero root@114-113-199-15:/home/hzwangpan# qemu-nbd -V qemu-nbd version 0.0.1 the 'zero' file was created by qemu-img cmd: qemu-img create -f raw zero 512M qemu-img version 1.1.0, Copyright (c) 2004-2008 Fabrice Bellard Some info of packages' version is listed below: root@114-113-199-15:/home/hzwangpan# dpkg -l | grep libvi ii libvirt-bin 0.9.12-4 programs for the libvirt library ii libvirt-dev 0.9.12-4 development files for the libvirt library ii libvirt0 0.9.12-4 library for interfacing with different virtualization systems ii libvirt0-dbg 0.9.12-4 library for interfacing with different virtualization systems root@114-113-199-15:/home/hzwangpan# virsh version Compiled against library: libvir 0.9.12 Using library: libvir 0.9.12 Using API: QEMU 0.9.12 Running hypervisor: QEMU 1.1.0 root@114-113-199-15:/home/hzwangpan# kvm -version QEMU emulator version 1.1.0 (qemu-kvm-1.1.0+dfsg-3, Debian), Copyright (c) 2003-2008 Fabrice Bellard root@114-113-199-15:/home/hzwangpan# uname -a Linux 114-113-199-15 3.2.0-3-amd64 #1 SMP Thu Jun 28 09:07:26 UTC 2012 x86_64 GNU/Linux root@114-113-199-15:/home/hzwangpan# cat /etc/issue Debian GNU/Linux wheezy/sid \n \l the backtrace info when libvirtd crash is list here: 1) one situation: *** glibc detected *** /usr/sbin/libvirtd: malloc(): memory corruption (fast): 0x000000000087bc10 *** ======= Backtrace: ========= /lib/x86_64-linux-gnu/libc.so.6(+0x75b46)[0x7ffff4608b46] /lib/x86_64-linux-gnu/libc.so.6(+0x79428)[0x7ffff460c428] /lib/x86_64-linux-gnu/libc.so.6(__libc_malloc+0x70)[0x7ffff460d960] /lib/x86_64-linux-gnu/libc.so.6(__strdup+0x22)[0x7ffff4612912] /usr/lib/libvirt.so.0(virJSONValueObjectAppend+0x39)[0x7ffff77b75c9] /usr/lib/libvirt.so.0(virJSONValueObjectAppendString+0x37)[0x7ffff77b7e87] /usr/sbin/libvirtd[0x4aa884] /usr/sbin/libvirtd[0x4ac3a7] /usr/sbin/libvirtd[0x49d303] /usr/sbin/libvirtd[0x4a8bfe] /usr/sbin/libvirtd[0x4b0814] /usr/sbin/libvirtd[0x484a5d] /usr/sbin/libvirtd[0x461d9e] /usr/lib/libvirt.so.0(virDomainAttachDevice+0xdd)[0x7ffff7846f5d] /usr/sbin/libvirtd[0x43ccfe] /usr/lib/libvirt.so.0(+0x129866)[0x7ffff788a866] /usr/lib/libvirt.so.0(+0x1254d1)[0x7ffff78864d1] /usr/lib/libvirt.so.0(+0x6273e)[0x7ffff77c373e] /usr/lib/libvirt.so.0(+0x621c9)[0x7ffff77c31c9] /lib/x86_64-linux-gnu/libpthread.so.0(+0x6b50)[0x7ffff4d27b50] /lib/x86_64-linux-gnu/libc.so.6(clone+0x6d)[0x7ffff466b6dd] ======= Memory map: ======== 00400000-0053d000 r-xp 00000000 08:01 69457 /usr/sbin/libvirtd 0073c000-0073e000 r--p 0013c000 08:01 69457 /usr/sbin/libvirtd 0073e000-00746000 rw-p 0013e000 08:01 69457 /usr/sbin/libvirtd 00746000-00aa1000 rw-p 00000000 00:00 0 [heap] 7fffe0000000-7fffe021f000 rw-p 00000000 00:00 0 7fffe021f000-7fffe4000000 ---p 00000000 00:00 0 7fffe77ff000-7fffe7800000 ---p 00000000 00:00 0 7fffe7800000-7fffe8000000 rw-p 00000000 00:00 0 7fffe8000000-7fffe8175000 rw-p 00000000 00:00 0 7fffe8175000-7fffec000000 ---p 00000000 00:00 0 7fffec138000-7fffec139000 ---p 00000000 00:00 0 7fffec139000-7fffec939000 rw-p 00000000 00:00 0 7fffec939000-7fffec96e000 r--s 00000000 08:06 286722 /var/cache/nscd/passwd 7fffec96e000-7fffec99a000 rw-p 00000000 00:00 0 7fffec99a000-7fffec99b000 ---p 00000000 00:00 0 7fffec99b000-7fffed19b000 rw-p 00000000 00:00 0 7fffed19b000-7fffed315000 r-xp 00000000 08:01 124989 /usr/lib/x86_64-linux-gnu/libdb-5.1.so 7fffed315000-7fffed515000 ---p 0017a000 08:01 124989 /usr/lib/x86_64-linux-gnu/libdb-5.1.so 7fffed515000-7fffed51b000 r--p 0017a000 08:01 124989 /usr/lib/x86_64-linux-gnu/libdb-5.1.so 7fffed51b000-7fffed51e000 rw-p 00180000 08:01 124989 /usr/lib/x86_64-linux-gnu/libdb-5.1.so 7fffed51e000-7fffed524000 r-xp 00000000 08:01 133549 /usr/lib/x86_64-linux-gnu/sasl2/libsasldb.so.2.0.25 7fffed524000-7fffed723000 ---p 00006000 08:01 133549 /usr/lib/x86_64-linux-gnu/sasl2/libsasldb.so.2.0.25 7fffed723000-7fffed724000 r--p 00005000 08:01 133549 /usr/lib/x86_64-linux-gnu/sasl2/libsasldb.so.2.0.25 7fffed724000-7fffed725000 rw-p 00006000 08:01 133549 /usr/lib/x86_64-linux-gnu/sasl2/libsasldb.so.2.0.25 7fffed725000-7fffed75a000 r--s 00000000 08:06 286723 /var/cache/nscd/group 7fffed75a000-7fffed75b000 ---p 00000000 00:00 0 7fffed75b000-7fffedf5b000 rw-p 00000000 00:00 0 7fffedf5b000-7fffedf5c000 ---p 00000000 00:00 0 7fffedf5c000-7fffee75c000 rw-p 00000000 00:00 0 7fffee75c000-7fffee75d000 ---p 00000000 00:00 0 7fffee75d000-7fffeef5d000 rw-p 00000000 00:00 0 7fffeef5d000-7fffeef5e000 ---p 00000000 00:00 0 7fffeef5e000-7fffef75e000 rw-p 00000000 00:00 0 7fffef75e000-7fffef75f000 ---p 00000000 00:00 0 7fffef75f000-7fffeff5f000 rw-p 00000000 00:00 0 7fffeff5f000-7fffeff60000 ---p 00000000 00:00 0 7fffeff60000-7ffff0760000 rw-p 00000000 00:00 0 7ffff0760000-7ffff0761000 ---p 00000000 00:00 0 7ffff0761000-7ffff0f61000 rw-p 00000000 00:00 0 7ffff0f61000-7ffff0f62000 ---p 00000000 00:00 0 7ffff0f62000-7ffff1762000 rw-p 00000000 00:00 0 7ffff1762000-7ffff1763000 ---p 00000000 00:00 0 7ffff1763000-7ffff1f63000 rw-p 00000000 00:00 0 7ffff1f63000-7ffff1f64000 ---p 00000000 00:00 0 7ffff1f64000-7ffff2764000 rw-p 00000000 00:00 0 7ffff2764000-7ffff2799000 r--s 00000000 08:06 303114 /var/cache/nscd/hosts 7ffff2799000-7ffff27ae000 r-xp 00000000 08:01 57404 /lib/x86_64-linux-gnu/libgcc_s.so.1 7ffff27ae000-7ffff29ae000 ---p 00015000 08:01 57404 /lib/x86_64-linux-gnu/libgcc_s.so.1 7ffff29ae000-7ffff29af000 rw-p 00015000 08:01 57404 /lib/x86_64-linux-gnu/libgcc_s.so.1 7ffff29af000-7ffff29c7000 r-xp 00000000 08:01 110124 /usr/lib/libfa.so.1.3.5 7ffff29c7000-7ffff2bc7000 ---p 00018000 08:01 110124 /usr/lib/libfa.so.1.3.5 7ffff2bc7000-7ffff2bc8000 rw-p 00018000 08:01 110124 /usr/lib/libfa.so.1.3.5 7ffff2bc8000-7ffff2be9000 r-xp 00000000 08:01 57814 /lib/x86_64-linux-gnu/liblzma.so.5.0.0 7ffff2be9000-7ffff2de9000 ---p 00021000 08:01 57814 /lib/x86_64-linux-gnu/liblzma.so.5.0.0 7ffff2de9000-7ffff2dea000 r--p 00021000 08:01 57814 /lib/x86_64-linux-gnu/liblzma.so.5.0.0 7ffff2dea000-7ffff2deb000 rw-p 00022000 08:01 57814 /lib/x86_64-linux-gnu/liblzma.so.5.0.0 7ffff2deb000-7ffff2e6c000 r-xp 00000000 08:01 57526 /lib/x86_64-linux-gnu/libm-2.13.so 7ffff2e6c000-7ffff306b000 ---p 00081000 08:01 57526 /lib/x86_64-linux-gnu/libm-2.13.so 7ffff306b000-7ffff306c000 r--p 00080000 08:01 57526 /lib/x86_64-linux-gnu/libm-2.13.so 7ffff306c000-7ffff306d000 rw-p 00081000 08:01 57526 /lib/x86_64-linux-gnu/libm-2.13.so 7ffff306d000-7ffff30a9000 r-xp 00000000 08:01 76972 /usr/lib/x86_64-linux-gnu/libxslt.so.1.1.26 7ffff30a9000-7ffff32a8000 ---p 0003c000 08:01 76972 /usr/lib/x86_64-linux-gnu/libxslt.so.1.1.26 7ffff32a8000-7ffff32aa000 r--p 0003b000 08:01 76972 /usr/lib/x86_64-linux-gnu/libxslt.so.1.1.26 7ffff32aa000-7ffff32ab000 rw-p 0003d000 08:01 76972 /usr/lib/x86_64-linux-gnu/libxslt.so.1.1.26 7ffff32ab000-7ffff32bf000 r-xp 00000000 08:01 76971 /usr/lib/x86_64-linux-gnu/libexslt.so.0.8.15 7ffff32bf000-7ffff34be000 ---p 00014000 08:01 76971 /usr/lib/x86_64-linux-gnu/libexslt.so.0.8.15 7ffff34be000-7ffff34bf000 r--p 00013000 08:01 76971 /usr/lib/x86_64-linux-gnu/libexslt.so.0.8.15 7ffff34bf000-7ffff34c0000 rw-p 00014000 08:01 76971 /usr/lib/x86_64-linux-gnu/libexslt.so.0.8.15 7ffff34c0000-7ffff3519000 r-xp 00000000 08:01 93870 /usr/lib/libaugeas.so.0.15.0 7ffff3519000-7ffff3718000 ---p 00059000 08:01 93870 /usr/lib/libaugeas.so.0.15.0 7ffff3718000-7ffff371b000 rw-p 00058000 08:01 93870 /usr/lib/libaugeas.so.0.15.0 7ffff371b000-7ffff372e000 r-xp 00000000 08:01 57421 /lib/x86_64-linux-gnu/libresolv-2.13.so Program received signal SIGABRT, Aborted. [Switching to Thread 0x7ffff1761700 (LWP 8216)] 0x00007ffff45c5475 in raise () from /lib/x86_64-linux-gnu/libc.so.6 (gdb) bt #0 0x00007ffff45c5475 in raise () from /lib/x86_64-linux-gnu/libc.so.6 #1 0x00007ffff45c86f0 in abort () from /lib/x86_64-linux-gnu/libc.so.6 #2 0x00007ffff45ff2fb in ?? () from /lib/x86_64-linux-gnu/libc.so.6 #3 0x00007ffff4608b46 in ?? () from /lib/x86_64-linux-gnu/libc.so.6 #4 0x00007ffff460c428 in ?? () from /lib/x86_64-linux-gnu/libc.so.6 #5 0x00007ffff460d960 in malloc () from /lib/x86_64-linux-gnu/libc.so.6 #6 0x00007ffff4612912 in strdup () from /lib/x86_64-linux-gnu/libc.so.6 #7 0x00007ffff77b75c9 in virJSONValueObjectAppend (object=object@entry=0x91d810, key=key@entry=0x4fef81 "execute", value=value@entry=0x85de90) at /build/buildd-libvirt_0.9.12-4-amd64-KyxbcZ/libvirt-0.9.12/./src/util/json.c:274 #8 0x00007ffff77b7e87 in virJSONValueObjectAppendString (object=object@entry=0x91d810, key=key@entry=0x4fef81 "execute", value=value@entry=0x51196f "human-monitor-command") at /build/buildd-libvirt_0.9.12-4-amd64-KyxbcZ/libvirt-0.9.12/./src/util/json.c:296 #9 0x00000000004aa884 in qemuMonitorJSONMakeCommandRaw (wrap=wrap@entry=false, cmdname=cmdname@entry=0x51196f "human-monitor-command") at /build/buildd-libvirt_0.9.12-4-amd64-KyxbcZ/libvirt-0.9.12/./src/qemu/qemu_monitor_json.c:404 #10 0x00000000004ac3a7 in qemuMonitorJSONHumanCommandWithFd (mon=mon@entry=0x7fffe80010b0, cmd_str=<optimized out>, scm_fd=-1, reply_str=0x7ffff1760920) at /build/buildd-libvirt_0.9.12-4-amd64-KyxbcZ/libvirt-0.9.12/./src/qemu/qemu_monitor_json.c:886 #11 0x000000000049d303 in qemuMonitorHMPCommandWithFd (mon=mon@entry=0x7fffe80010b0, cmd=<optimized out>, scm_fd=scm_fd@entry=-1, reply=reply@entry=0x7ffff1760920) at /build/buildd-libvirt_0.9.12-4-amd64-KyxbcZ/libvirt-0.9.12/./src/qemu/qemu_monitor.c:910 #12 0x00000000004a8bfe in qemuMonitorTextAddDrive (mon=mon@entry=0x7fffe80010b0, drivestr=drivestr@entry=0x7fffe0202020 "file=/dev/nbd0,if=none,id=drive-virtio-disk3,format=raw") at /build/buildd-libvirt_0.9.12-4-amd64-KyxbcZ/libvirt-0.9.12/./src/qemu/qemu_monitor_text.c:2836 #13 0x00000000004b0814 in qemuMonitorJSONAddDrive (mon=0x7fffe80010b0, drivestr=0x7fffe0202020 "file=/dev/nbd0,if=none,id=drive-virtio-disk3,format=raw") at /build/buildd-libvirt_0.9.12-4-amd64-KyxbcZ/libvirt-0.9.12/./src/qemu/qemu_monitor_json.c:2979 #14 0x00000000004a1bad in qemuMonitorAddDrive (mon=<optimized out>, drivestr=<optimized out>) at /build/buildd-libvirt_0.9.12-4-amd64-KyxbcZ/libvirt-0.9.12/./src/qemu/qemu_monitor.c:2571 #15 0x0000000000484a5d in qemuDomainAttachPciDiskDevice (conn=conn@entry=0x7fffe00111f0, driver=driver@entry=0x81fec0, vm=vm@entry=0x82f6b0, disk=disk@entry=0x7fffe02024d0) at /build/buildd-libvirt_0.9.12-4-amd64-KyxbcZ/libvirt-0.9.12/./src/qemu/qemu_hotplug.c:250 #16 0x0000000000461d9e in qemuDomainAttachDeviceDiskLive (vm=0x82f6b0, driver=0x81fec0, conn=0x7fffe00111f0, dev=<optimized out>) at /build/buildd-libvirt_0.9.12-4-amd64-KyxbcZ/libvirt-0.9.12/./src/qemu/qemu_driver.c:5179 #17 qemuDomainAttachDeviceLive (dev=0x7fffe001d5b0, vm=0x82f6b0, dom=<optimized out>) at /build/buildd-libvirt_0.9.12-4-amd64-KyxbcZ/libvirt-0.9.12/./src/qemu/qemu_driver.c:5238 #18 qemuDomainModifyDeviceFlags (dom=<optimized out>, xml=0x7fffe001d5b0 "\001", flags=<optimized out>, action=<optimized out>) at /build/buildd-libvirt_0.9.12-4-amd64-KyxbcZ/libvirt-0.9.12/./src/qemu/qemu_driver.c:5779 #19 0x00007ffff7846f5d in virDomainAttachDevice (domain=domain@entry=0x7fffe0201fb0, xml=0x7fffe0201e50 "<disk type='block'>\n <driver name='qemu' type='raw'/>\n <source dev='/dev/nbd0'/>\n <target dev='vdd'/>\n</disk>\n") at /build/buildd-libvirt_0.9.12-4-amd64-KyxbcZ/libvirt-0.9.12/./src/libvirt.c:9288 #20 0x000000000043ccfe in remoteDispatchDomainAttachDevice (args=0x7fffe0201ff0, rerr=0x7ffff1760c90, client=<optimized out>, server=<optimized out>, msg=<optimized out>) at /build/buildd-libvirt_0.9.12-4-amd64-KyxbcZ/libvirt-0.9.12/./daemon/remote_dispatch.h:320 #21 remoteDispatchDomainAttachDeviceHelper (server=<optimized out>, client=<optimized out>, msg=<optimized out>, rerr=0x7ffff1760c90, args=0x7fffe0201ff0, ret=<optimized out>) at /build/buildd-libvirt_0.9.12-4-amd64-KyxbcZ/libvirt-0.9.12/./daemon/remote_dispatch.h:298 #22 0x00007ffff788a866 in virNetServerProgramDispatchCall (msg=0x7fffe8093d20, client=0x7fffe8053050, server=0x76e920, prog=0x778880) at /build/buildd-libvirt_0.9.12-4-amd64-KyxbcZ/libvirt-0.9.12/./src/rpc/virnetserverprogram.c:416 #23 virNetServerProgramDispatch (prog=0x778880, server=server@entry=0x76e920, client=0x7fffe8053050, msg=0x7fffe8093d20) at /build/buildd-libvirt_0.9.12-4-amd64-KyxbcZ/libvirt-0.9.12/./src/rpc/virnetserverprogram.c:289 #24 0x00007ffff78864d1 in virNetServerHandleJob (jobOpaque=<optimized out>, opaque=0x76e920) at /build/buildd-libvirt_0.9.12-4-amd64-KyxbcZ/libvirt-0.9.12/./src/rpc/virnetserver.c:161 #25 0x00007ffff77c373e in virThreadPoolWorker (opaque=opaque@entry=0x7789a0) at /build/buildd-libvirt_0.9.12-4-amd64-KyxbcZ/libvirt-0.9.12/./src/util/threadpool.c:144 #26 0x00007ffff77c31c9 in virThreadHelper (data=<optimized out>) at /build/buildd-libvirt_0.9.12-4-amd64-KyxbcZ/libvirt-0.9.12/./src/util/threads-pthread.c:161 #27 0x00007ffff4d27b50 in start_thread () from /lib/x86_64-linux-gnu/libpthread.so.0 #28 0x00007ffff466b6dd in clone () from /lib/x86_64-linux-gnu/libc.so.6 #29 0x0000000000000000 in ?? () (gdb) f 7 #7 0x00007ffff77b75c9 in virJSONValueObjectAppend (object=object@entry=0x91d810, key=key@entry=0x4fef81 "execute", value=value@entry=0x85de90) at /build/buildd-libvirt_0.9.12-4-amd64-KyxbcZ/libvirt-0.9.12/./src/util/json.c:274 warning: Source file is more recent than executable. 274 if (!(newkey = strdup(key))) (gdb) l 269 return -1; 270 271 if (virJSONValueObjectHasKey(object, key)) 272 return -1; 273 274 if (!(newkey = strdup(key))) 275 return -1; 276 277 if (VIR_REALLOC_N(object->data.object.pairs, 278 object->data.object.npairs + 1) < 0) { (gdb) 2) another situation: Program received signal SIGABRT, Aborted. [Switching to Thread 0x7ffff075f700 (LWP 11697)] 0x00007ffff45c5475 in raise () from /lib/x86_64-linux-gnu/libc.so.6 (gdb) bt #0 0x00007ffff45c5475 in raise () from /lib/x86_64-linux-gnu/libc.so.6 #1 0x00007ffff45c86f0 in abort () from /lib/x86_64-linux-gnu/libc.so.6 #2 0x00007ffff45ff2fb in ?? () from /lib/x86_64-linux-gnu/libc.so.6 #3 0x00007ffff4608b46 in ?? () from /lib/x86_64-linux-gnu/libc.so.6 #4 0x00007ffff460d87c in free () from /lib/x86_64-linux-gnu/libc.so.6 #5 0x00007ffff77ba4c9 in virFree (ptrptr=ptrptr@entry=0x7ffff075e8e8) at /build/buildd-libvirt_0.9.12-4-amd64-KyxbcZ/libvirt-0.9.12/./src/util/memory.c:310 #6 0x000000000049d321 in qemuMonitorHMPCommandWithFd (mon=mon@entry=0x9214e0, cmd=<optimized out>, scm_fd=scm_fd@entry=-1, reply=reply@entry=0x7ffff075e920) at /build/buildd-libvirt_0.9.12-4-amd64-KyxbcZ/libvirt-0.9.12/./src/qemu/qemu_monitor.c:916 #7 0x00000000004a8bfe in qemuMonitorTextAddDrive (mon=mon@entry=0x9214e0, drivestr=drivestr@entry=0x8f7090 "file=/dev/nbd0,if=none,id=drive-virtio-disk3,format=raw") at /build/buildd-libvirt_0.9.12-4-amd64-KyxbcZ/libvirt-0.9.12/./src/qemu/qemu_monitor_text.c:2836 #8 0x00000000004b0814 in qemuMonitorJSONAddDrive (mon=0x9214e0, drivestr=0x8f7090 "file=/dev/nbd0,if=none,id=drive-virtio-disk3,format=raw") at /build/buildd-libvirt_0.9.12-4-amd64-KyxbcZ/libvirt-0.9.12/./src/qemu/qemu_monitor_json.c:2979 #9 0x00000000004a1bad in qemuMonitorAddDrive (mon=<optimized out>, drivestr=<optimized out>) at /build/buildd-libvirt_0.9.12-4-amd64-KyxbcZ/libvirt-0.9.12/./src/qemu/qemu_monitor.c:2571 #10 0x0000000000484a5d in qemuDomainAttachPciDiskDevice (conn=conn@entry=0x9213c0, driver=driver@entry=0x8162c0, vm=vm@entry=0x820530, disk=disk@entry=0x8f5290) at /build/buildd-libvirt_0.9.12-4-amd64-KyxbcZ/libvirt-0.9.12/./src/qemu/qemu_hotplug.c:250 #11 0x0000000000461d9e in qemuDomainAttachDeviceDiskLive (vm=0x820530, driver=0x8162c0, conn=0x9213c0, dev=<optimized out>) at /build/buildd-libvirt_0.9.12-4-amd64-KyxbcZ/libvirt-0.9.12/./src/qemu/qemu_driver.c:5179 #12 qemuDomainAttachDeviceLive (dev=0x8465b0, vm=0x820530, dom=<optimized out>) at /build/buildd-libvirt_0.9.12-4-amd64-KyxbcZ/libvirt-0.9.12/./src/qemu/qemu_driver.c:5238 #13 qemuDomainModifyDeviceFlags (dom=<optimized out>, xml=0x8465b0 "\001", flags=<optimized out>, action=<optimized out>) at /build/buildd-libvirt_0.9.12-4-amd64-KyxbcZ/libvirt-0.9.12/./src/qemu/qemu_driver.c:5779 #14 0x00007ffff7846f5d in virDomainAttachDevice (domain=domain@entry=0x8f6080, xml=0x8f5610 "<disk type='block'>\n <driver name='qemu' type='raw'/>\n <source dev='/dev/nbd0'/>\n <target dev='vdd'/>\n</disk>\n") at /build/buildd-libvirt_0.9.12-4-amd64-KyxbcZ/libvirt-0.9.12/./src/libvirt.c:9288 #15 0x000000000043ccfe in remoteDispatchDomainAttachDevice (args=0x8f60c0, rerr=0x7ffff075ec90, client=<optimized out>, server=<optimized out>, msg=<optimized out>) at /build/buildd-libvirt_0.9.12-4-amd64-KyxbcZ/libvirt-0.9.12/./daemon/remote_dispatch.h:320 #16 remoteDispatchDomainAttachDeviceHelper (server=<optimized out>, client=<optimized out>, msg=<optimized out>, rerr=0x7ffff075ec90, args=0x8f60c0, ret=<optimized out>) at /build/buildd-libvirt_0.9.12-4-amd64-KyxbcZ/libvirt-0.9.12/./daemon/remote_dispatch.h:298 #17 0x00007ffff788a866 in virNetServerProgramDispatchCall (msg=0x7fffe00929d0, client=0x7fffe0052880, server=0x76e920, prog=0x778880) at /build/buildd-libvirt_0.9.12-4-amd64-KyxbcZ/libvirt-0.9.12/./src/rpc/virnetserverprogram.c:416 #18 virNetServerProgramDispatch (prog=0x778880, server=server@entry=0x76e920, client=0x7fffe0052880, msg=0x7fffe00929d0) at /build/buildd-libvirt_0.9.12-4-amd64-KyxbcZ/libvirt-0.9.12/./src/rpc/virnetserverprogram.c:289 #19 0x00007ffff78864d1 in virNetServerHandleJob (jobOpaque=<optimized out>, opaque=0x76e920) at /build/buildd-libvirt_0.9.12-4-amd64-KyxbcZ/libvirt-0.9.12/./src/rpc/virnetserver.c:161 #20 0x00007ffff77c373e in virThreadPoolWorker (opaque=opaque@entry=0x7789a0) at /build/buildd-libvirt_0.9.12-4-amd64-KyxbcZ/libvirt-0.9.12/./src/util/threadpool.c:144 #21 0x00007ffff77c31c9 in virThreadHelper (data=<optimized out>) at /build/buildd-libvirt_0.9.12-4-amd64-KyxbcZ/libvirt-0.9.12/./src/util/threads-pthread.c:161 #22 0x00007ffff4d27b50 in start_thread () from /lib/x86_64-linux-gnu/libpthread.so.0 #23 0x00007ffff466b6dd in clone () from /lib/x86_64-linux-gnu/libc.so.6 #24 0x0000000000000000 in ?? () (gdb) f 6 #6 0x000000000049d321 in qemuMonitorHMPCommandWithFd (mon=mon@entry=0x9214e0, cmd=<optimized out>, scm_fd=scm_fd@entry=-1, reply=reply@entry=0x7ffff075e920) at /build/buildd-libvirt_0.9.12-4-amd64-KyxbcZ/libvirt-0.9.12/./src/qemu/qemu_monitor.c:916 916 VIR_FREE(json_cmd); (gdb) l 911 } else { 912 ret = qemuMonitorTextCommandWithFd(mon, cmd, scm_fd, reply); 913 } 914 915 cleanup: 916 VIR_FREE(json_cmd); 917 return ret; 918 } 919 920 /* Ensure proper locking around callbacks. */ (gdb) p json_cmd $3 = 0x933c20 "drive_add dummy file=/dev/nbd0,if=none,id=drive-virtio-disk3,format=raw" (gdb) anybody can give me any clue? Thanks in advance! 2012-08-16 Wangpan

2 2

[libvirt] [PATCH] conf: Fix ABI stability check for spicevmc channel
by Jiri Denemark 18 Aug '12

18 Aug '12

Change device type of a virtio channel from/to spicevmc is not a user visible change. However, spicevmc channels use different default target name than other virtio channels. To maintain ABI stability during this change target name must be explicitly specified (and equal) in both configurations. --- src/conf/domain_conf.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a2e73c6..a330b0e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10075,6 +10075,15 @@ static bool virDomainChannelDefCheckABIStability(virDomainChrDefPtr src, NULLSTR(dst->target.name), NULLSTR(src->target.name)); goto cleanup; } + if (src->source.type != dst->source.type && + (src->source.type == VIR_DOMAIN_CHR_TYPE_SPICEVMC || + dst->source.type == VIR_DOMAIN_CHR_TYPE_SPICEVMC) && + !src->target.name) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Changing device type to/from spicevmc would" + " change default target channel name")); + goto cleanup; + } break; case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD: if (memcmp(src->target.addr, dst->target.addr, -- 1.7.11.1

2 3

[libvirt] [PATCH] docs: Enhance documentation of log_filters
by Jiri Denemark 18 Aug '12

18 Aug '12

Also make sure documentation in libvirtd.conf matches the one from logging.html. --- daemon/libvirtd.conf | 9 ++++++--- docs/logging.html.in | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf index 56e880b..3d296cd 100644 --- a/daemon/libvirtd.conf +++ b/daemon/libvirtd.conf @@ -291,10 +291,13 @@ # Logging filters: # A filter allows to select a different logging level for a given category # of logs -# The format for a filter is: +# The format for a filter is one of: # x:name -# where name is a match string e.g. remote or qemu -# the x prefix is the minimal level where matching messages should be logged +# x:+name +# where name is a string which is matched against source file name, +# e.g., "remote", "qemu", or "util/json", the optional "+" prefix +# tells libvirt to log stack trace for each message matching name, +# and x is the minimal level where matching messages should be logged: # 1: DEBUG # 2: INFO # 3: WARNING diff --git a/docs/logging.html.in b/docs/logging.html.in index 87e2292..a95f7bc 100644 --- a/docs/logging.html.in +++ b/docs/logging.html.in @@ -118,9 +118,12 @@ <pre> x:name (log message only) x:+name (log message + stack trace)</pre> - <p>where <code>name</code> is a match string e.g. <code>remote</code> or - <code>qemu</code> and the x is the minimal level where matching messages - should be logged:</p> + <p>where <code>name</code> is a string which is matched against source + file name, e.g., <code>remote</code>, <code>qemu</code>, or + <code>util/json</code>, the optional <code>+</code> prefix tells libvirt + to log stack trace for each message matching <code>name</code>, and + <code>x</code> is the minimal level where matching messages should + be logged:</p> <ul> <li>1: DEBUG</li> <li>2: INFO</li> -- 1.7.11.1

2 2

[libvirt] [PATCH 0/3] Storage: Allow pool building while creating it
by Osier Yang 17 Aug '12

17 Aug '12

Patch 1/3 is just about the indention fix. We tries to start the pool while creating a transicient pool, if the pool target is not existed yet, we must fail on starting, and thus we see many users raise up the problem on either list or bugzilla. Patch 2/3 and 3/3 are to fix the problem by introducing flags to allow the pool building for APIs virStoragePoolCreate and virStoragePoolCreateXML, and expose the flags to commands pool-create/pool-create-as/pool-start. Osier Yang (3): Fix the indentions of libvirt.h.in storage: New flags to allow building the pool while creating it virsh: New options for the 3 pool commands to allow pool building include/libvirt/libvirt.h.in | 109 +++++++++++++++++++++++------------------ src/libvirt.c | 4 +- src/storage/storage_driver.c | 38 ++++++++++++++- tools/virsh.c | 100 ++++++++++++++++++++++++++++++++++++-- tools/virsh.pod | 27 +++++++++- 5 files changed, 217 insertions(+), 61 deletions(-) Regards, Osier -- 1.7.7.3

2 11

[libvirt] [PATCHv2] selinux: Fix incorrect file label generation.
by Viktor Mihajlovski 17 Aug '12

17 Aug '12

This is an ad-hoc fix for the file label generation. It uses the base context role to determine whether to use the libvirt process context role. If this is object_r we don't touch it. It might be better to add a new flag to virSecuritySELinuxGenNewContext that specifies the context type (process or file) in the future. V2 Change: Use STRNEQ instead of strlen. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/security/security_selinux.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 48fd78b..4bc44ef 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -176,7 +176,9 @@ virSecuritySELinuxGenNewContext(const char *basecontext, const char *mcs) goto cleanup; } - if (context_role_set(context, + /* don't exchange role context if object_r as this is a file context */ + if (STRNEQ("object_r", context_role_get(context)) && + context_role_set(context, context_role_get(ourContext)) != 0) { virReportSystemError(errno, _("Unable to set SELinux context user '%s'"), -- 1.7.0.4

1 0

[libvirt] [test-API][PATCH 3/3] Target path should not with lines in pool xml
by Wayne Sun 17 Aug '12

17 Aug '12

The xml for define and create pool is with line switch in target path. For aa.xml: <pool type="netfs"> <name>netfs_pool</name> <source> <host name="192.168.0.121"/> <dir path="/dir"/> <format type="nfs"/> </source> <target> <path> /tmp/netfs </path> </target> </pool> virsh pool-create aa.xml error: Failed to create pool from aa.xml error: cannot open path ' /tmp/netfs ': No such file or directory Signed-off-by: Wayne Sun <gsun(a)redhat.com> --- repos/storage/xmls/netfs_pool.xml | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/repos/storage/xmls/netfs_pool.xml b/repos/storage/xmls/netfs_pool.xml index 309a652..d8b88c2 100644 --- a/repos/storage/xmls/netfs_pool.xml +++ b/repos/storage/xmls/netfs_pool.xml @@ -6,8 +6,6 @@ <format type="nfs"/> </source> <target> - <path> - TARGETPATH - </path> + <path>TARGETPATH</path> </target> </pool> -- 1.7.1

3 6

[libvirt] [PATCH v3] qemu: Set swap_hard_limit before hard_limit
by Osier Yang 17 Aug '12

17 Aug '12

Setting hard_limit larger than previous swap_hard_limit must fail, it's not that good if one wants to change the swap_hard_limit and hard_limit together. E.g. % virsh memtune rhel6 hard_limit : 1000000 soft_limit : 1000000 swap_hard_limit: 1000000 % virsh memtune rhel6 --hard-limit 1000020 --soft-limit 1000020 \ --swap-hard-limit 1000020 --live This patch reorder the limits setting to set the swap_hard_limit first, hard_limit then, and soft_limit last if it's greater than current swap_hard_limit. And soft_limit first, hard_limit then, swap_hard_limit last, if not. --- src/qemu/qemu_driver.c | 67 +++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 61 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 80cfa84..bd97008 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6651,11 +6651,18 @@ qemuDomainSetMemoryParameters(virDomainPtr dom, virDomainDefPtr persistentDef = NULL; virCgroupPtr group = NULL; virDomainObjPtr vm = NULL; + virTypedParameterPtr hard_limit = NULL; + virTypedParameterPtr swap_hard_limit = NULL; + int hard_limit_index = 0; + int swap_hard_limit_index = 0; + unsigned long long val = 0; + int ret = -1; int rc; virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); + if (virTypedParameterArrayValidate(params, nparams, VIR_DOMAIN_MEMORY_HARD_LIMIT, VIR_TYPED_PARAM_ULLONG, @@ -6694,13 +6701,61 @@ qemuDomainSetMemoryParameters(virDomainPtr dom, } } + for (i = 0; i < nparams; i++) { + if (STREQ(params[i].field, VIR_DOMAIN_MEMORY_HARD_LIMIT)) { + hard_limit = &params[i]; + hard_limit_index = i; + } else if (STREQ(params[i].field, VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT)) { + swap_hard_limit = &params[i]; + swap_hard_limit_index = i; + } + } + + /* It will fail if hard limit greater than swap hard limit anyway */ + if (swap_hard_limit && + hard_limit && + (hard_limit->value.ul > swap_hard_limit->value.ul)) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("hard limit must be lower than swap hard limit")); + goto cleanup; + } + + /* Get current swap hard limit */ + rc = virCgroupGetMemSwapHardLimit(group, &val); + if (rc != 0) { + virReportSystemError(-rc, "%s", + _("unable to get swap hard limit")); + goto cleanup; + } + + /* Swap hard_limit and swap_hard_limit to ensure the setting + * could succeed if both of them are provided. + */ + if (swap_hard_limit && hard_limit) { + virTypedParameter param; + + if (swap_hard_limit->value.ul > val) { + if (hard_limit_index < swap_hard_limit_index) { + param = params[hard_limit_index]; + params[hard_limit_index] = params[swap_hard_limit_index]; + params[swap_hard_limit_index] = param; + } + } else { + if (hard_limit_index > swap_hard_limit_index) { + param = params[hard_limit_index]; + params[hard_limit_index] = params[swap_hard_limit_index]; + params[swap_hard_limit_index] = param; + } + } + } + ret = 0; for (i = 0; i < nparams; i++) { virTypedParameterPtr param = &params[i]; if (STREQ(param->field, VIR_DOMAIN_MEMORY_HARD_LIMIT)) { if (flags & VIR_DOMAIN_AFFECT_LIVE) { - rc = virCgroupSetMemoryHardLimit(group, params[i].value.ul); + rc = virCgroupSetMemoryHardLimit(group, param->value.ul); if (rc != 0) { virReportSystemError(-rc, "%s", _("unable to set memory hard_limit tunable")); @@ -6709,11 +6764,11 @@ qemuDomainSetMemoryParameters(virDomainPtr dom, } if (flags & VIR_DOMAIN_AFFECT_CONFIG) { - persistentDef->mem.hard_limit = params[i].value.ul; + persistentDef->mem.hard_limit = param->value.ul; } } else if (STREQ(param->field, VIR_DOMAIN_MEMORY_SOFT_LIMIT)) { if (flags & VIR_DOMAIN_AFFECT_LIVE) { - rc = virCgroupSetMemorySoftLimit(group, params[i].value.ul); + rc = virCgroupSetMemorySoftLimit(group, param->value.ul); if (rc != 0) { virReportSystemError(-rc, "%s", _("unable to set memory soft_limit tunable")); @@ -6722,11 +6777,11 @@ qemuDomainSetMemoryParameters(virDomainPtr dom, } if (flags & VIR_DOMAIN_AFFECT_CONFIG) { - persistentDef->mem.soft_limit = params[i].value.ul; + persistentDef->mem.soft_limit = param->value.ul; } } else if (STREQ(param->field, VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT)) { if (flags & VIR_DOMAIN_AFFECT_LIVE) { - rc = virCgroupSetMemSwapHardLimit(group, params[i].value.ul); + rc = virCgroupSetMemSwapHardLimit(group, param->value.ul); if (rc != 0) { virReportSystemError(-rc, "%s", _("unable to set swap_hard_limit tunable")); @@ -6734,7 +6789,7 @@ qemuDomainSetMemoryParameters(virDomainPtr dom, } } if (flags & VIR_DOMAIN_AFFECT_CONFIG) { - persistentDef->mem.swap_hard_limit = params[i].value.ul; + persistentDef->mem.swap_hard_limit = param->value.ul; } } } -- 1.7.7.3

2 2

[libvirt] [PATCH 0/3] Allow to override disk geometry.
by Viktor Mihajlovski 17 Aug '12

17 Aug '12

With qemu it is possible to override the geometry (cylinders, heads, sectors) of disks. This series adds a new XML tag for geometry and the related support in the qemu driver. J.B. Joret (3): qemu: Support for Disk Geometry Override qemu: Documentation for Disk Geometry Override qemu: Testcase for Disk Geometry Override docs/formatdomain.html.in | 25 +++++++ docs/schemas/domaincommon.rng | 28 ++++++++ src/conf/domain_conf.c | 71 ++++++++++++++++++++ src/conf/domain_conf.h | 17 +++++ src/libvirt_private.syms | 2 + src/qemu/qemu_command.c | 59 ++++++++++++++++ .../qemuxml2argv-disk-geometry.args | 4 + .../qemuxml2argv-disk-geometry.xml | 26 +++++++ tests/qemuxml2argvtest.c | 2 + 9 files changed, 234 insertions(+), 0 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.xml

2 13

[libvirt] [PATCH 0/8] Honour current process label when generating SELinux labels
by Daniel P. Berrange 17 Aug '12

17 Aug '12

This patch series makes a number of changes to the SELinux label generation code. This is intended to make it fully honour the current process label when generating VM labels, so that dynamic label generation works better with custom policies, or confined user accounts.

4 27

[libvirt] QEMU 1.2 Test Day - August 16 2012
by Stefan Hajnoczi 17 Aug '12

17 Aug '12

I have set up the QEMU 1.2 Testing wiki page and suggest August 16 as the Test Day: http://wiki.qemu.org/Planning/1.2/Testing Test Day is an event for QEMU contributors and users to try out the release candidate. QEMU has a large feature matrix that is hard to test by a single entity. On Test Day everyone is encouraged to test their favorite features, host OSes, and guest OSes to make sure that the release candidate is stable. Please add yourself to the http://wiki.qemu.org/Planning/1.2/Testing wiki page! The Test Day is August 16 2012, one day after the planned -rc0 release. On the day, use #qemu IRC on irc.oftc.net to chat about bugs and update the wiki page with your pass/fail results. There are usually -rc1, -rc2, ... follow-up release candidates. Please retest those if you have time, especially if bugs you found are supposed to be resolved. Stefan

1 3

[libvirt] [PATCH] build: fix syntax check during 'make distcheck'
by Eric Blake 17 Aug '12

17 Aug '12

'make distcheck' was failing because a syntax check file, .sc-start-sc_vulnerable_makefile_CVE-2012-3386, got left behind. I traced it to the 'distdir' rule depending on a shortcut syntax-check name rather than the full rule name normally used during 'local-check' from maint.mk. * cfg.mk (distdir): Depend on full rule, not shorthand name. --- Pushing under the build-breaker rule. cfg.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cfg.mk b/cfg.mk index 1318593..e9138a8 100644 --- a/cfg.mk +++ b/cfg.mk @@ -85,7 +85,7 @@ local-checks-to-skip = \ ifeq ($(filter dist%, $(MAKECMDGOALS)), ) local-checks-to-skip += sc_vulnerable_makefile_CVE-2012-3386 else -distdir: sc_vulnerable_makefile_CVE-2012-3386 +distdir: sc_vulnerable_makefile_CVE-2012-3386.z endif # Files that should never cause syntax check failures. -- 1.7.11.2

1 0

[libvirt] distcheck issues on maint and master
by Cole Robinson 17 Aug '12

17 Aug '12

I just pushed a bunch of patches to -maint branches, but both are giving me distcheck errors that seem related to a gnulib update: ERROR: files left in build directory after distclean: ./.sc-start-sc_vulnerable_makefile_CVE-2012-3386 Any hints? I tried to reproduce on master, but it has its own set of issues: IOError: [Errno 13] Permission denied: '../../src/hyperv/hyperv_wmi.generated.h' types_typedef = open_and_print(os.path.join(output_dirname, "esx_vi_types.generated.typedef")) File "../../src/esx/esx_vi_generator.py", line 1492, in open_and_print return open(filename, "wb") IOError: [Errno 13] Permission denied: '../../src/esx/esx_vi_types.generated.typedef' make[3]: *** [.hyperv_wmi_generator.stamp] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: *** [.esx_vi_generator.stamp] Error 1 I can get past that with: $ git revert 1bfb47dfe61c3cf9a716db072cbe22f26e980081 [master f5a9a90] Revert "Make ESX & Hyper-V code generator safe with parallel builds" Then I get: GEN check-symfile Can't open perl script "../../src/check-symfile.pl": No such file or directory make[4]: *** [check-symfile] Error 2 Which I fixed with: $ git diff diff --git a/src/Makefile.am b/src/Makefile.am index 5ae84b1..a5223f2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -331,7 +331,7 @@ else !WITH_REMOTE # re-generated when configured --without-remote. check-protocol: endif -EXTRA_DIST += $(PROTOCOL_STRUCTS) +EXTRA_DIST += $(PROTOCOL_STRUCTS) check-symfile.pl check-local: check-protocol check-symfile .PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=struct) But since this is all black magic to me I have no idea if that's correct. Thanks, Cole

3 6

[libvirt] [PATCH] build: ship stamp files
by Eric Blake 17 Aug '12

17 Aug '12

'make distcheck' fails because the generated ESX and HyperV files are (intentionally) marked read-only, but since the stamp file was missing, make assumes they need to be rebuilt. Shipping the stamp file solves the problem. * src/Makefile.am (EXTRA_DIST): Ship stamp files. --- Pushing under the build-breaker rule. src/Makefile.am | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Makefile.am b/src/Makefile.am index ac5a27f..213bd83 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -930,6 +930,8 @@ BUILT_SOURCES += $(ESX_DRIVER_GENERATED) ESX_GENERATED_STAMP = .esx_vi_generator.stamp +EXTRA_DIST += $(ESX_GENERATED_STAMP) + $(ESX_DRIVER_GENERATED): $(ESX_GENERATED_STAMP) $(ESX_GENERATED_STAMP): $(srcdir)/esx/esx_vi_generator.input \ @@ -956,6 +958,8 @@ BUILT_SOURCES += $(HYPERV_DRIVER_GENERATED) HYPERV_GENERATED_STAMP = .hyperv_wmi_generator.stamp +EXTRA_DIST += $(HYPERV_GENERATED_STAMP) + $(HYPERV_DRIVER_GENERATED): $(HYPERV_GENERATED_STAMP) $(HYPERV_GENERATED_STAMP): $(srcdir)/hyperv/hyperv_wmi_generator.input \ -- 1.7.11.2

1 0