- Devel - libvirt List Archives

[libvirt] [PATCH] build: avoid warnings on older gcc
by Eric Blake 15 Aug '12

15 Aug '12

The previous patch pulled in a newer version of stat-time.h from gnulib, which tries to suppress some stupid gcc warnings (see <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113>) by exploiting a feature of newer gcc. But we still aim to compile on RHEL 6.3, with gcc 4.4.6 (not to mention even older devel platforms like RHEL 5), which fails to build thanks to our development -Werror. It took me a while to figure out how to make our set of warnings smaller on older gcc without losing the benefit of the warnings when using newer gcc (such as the one on Fedora 17), but this should do the trick. * m4/virt-compile-warnings.m4 (LIBVIRT_COMPILE_WARNINGS): Avoid warnings that gnulib can't silence on older gcc. --- If I don't get a review by tomorrow, I will go ahead and push this under the build-breaker rule. m4/virt-compile-warnings.m4 | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index 9dee000..702506d 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -58,6 +58,23 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ # Gnulib's stat-time.h violates this dontwarn="$dontwarn -Waggregate-return" + # Gnulib uses '#pragma GCC diagnostic push' to silence some + # warnings, but older gcc doesn't support this. + AC_CACHE_VAL([lv_cv_gcc_pragma_push_works], [ + save_CFLAGS=$CFLAGS + CFLAGS=-Wunknown-pragmas + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #pragma GCC diagnostic push + #pragma GCC diagnostic pop + ]])], + [lv_cv_gcc_pragma_push_works=yes], + [lv_cv_gcc_pragma_push_works=no]) + CFLAGS=$save_CFLAGS]) + if test $lv_cv_gcc_pragma_push_works = no; then + dontwarn="$dontwarn -Wmissing-prototypes" + dontwarn="$dontwarn -Wmissing-declarations" + fi + # We might fundamentally need some of these disabled forever, but # ideally we'd turn many of them on dontwarn="$dontwarn -Wfloat-equal" -- 1.7.11.2

4 5

[libvirt] [firewalld PATCHv3] firewalld PATCH v3
by Thomas Woerner 15 Aug '12

15 Aug '12

* configura.ac, spec file: firewalld now defaults to enabled, depends on dbus * fixed comment for with_firewalld define * bridge_driver, nwfilter_driver: new dbus filters to get FirewallD1.Reloaded signal and DBus.NameOwnerChanged on org.fedoraproject.FirewallD1 * iptables, ebtables, nwfilter_ebiptables_driver: use firewall-cmd direct passthrough interface * spec file changed as requested --- configure.ac | 17 ++++++++++++++++ libvirt.spec.in | 11 +++++++++++ src/Makefile.am | 4 ++-- src/network/bridge_driver.c | 47 +++++++++++++++++++++++++++++++++++++++++++++ src/util/ebtables.c | 35 +++++++++++++++++++++++++++++++++ src/util/iptables.c | 21 ++++++++++++++++++-- 6 files changed, 131 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 8a04d91..c742d2f 100644 --- a/configure.ac +++ b/configure.ac @@ -1282,6 +1282,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@:>@]), @@ -2989,6 +3005,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 79b4e59..76570db 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -989,7 +989,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 @@ -999,7 +999,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 a5046f1..39c0449 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -61,6 +61,7 @@ #include "virnetdev.h" #include "virnetdevbridge.h" #include "virnetdevtap.h" +#include "virdbus.h" #define NETWORK_PID_DIR LOCALSTATEDIR "/run/libvirt/network" #define NETWORK_STATE_DIR LOCALSTATEDIR "/lib/libvirt/network" @@ -248,6 +249,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: * @@ -256,6 +276,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; @@ -322,6 +345,30 @@ networkStartup(int privileged) { networkDriverUnlock(driverState); +#ifdef HAVE_FIREWALLD + if (!(sysbus = virDBusGetSystemBus())) { + virErrorPtr err = virGetLastError(); + VIR_WARN("DBus not available, disabling firewalld support in bridge_driver: %s", err->message); + } else { + /* add matches for + * NameOwnerChanged on org.freedesktop.DBus for firewalld start/stop + * Reloaded on org.fedoraproject.FirewallD1 for firewalld reload + */ + dbus_bus_add_match(sysbus, + "type='signal'" + ",interface='"DBUS_INTERFACE_DBUS"'" + ",member='NameOwnerChanged'" + ",arg0='org.fedoraproject.FirewallD1'", + NULL); + dbus_bus_add_match(sysbus, + "type='signal'" + ",interface='org.fedoraproject.FirewallD1'" + ",member='Reloaded'", + NULL); + dbus_connection_add_filter(sysbus, firewalld_dbus_filter_bridge, driverState, NULL); + } +#endif + return 0; out_of_memory: diff --git a/src/util/ebtables.c b/src/util/ebtables.c index ca056b1..6f4d151 100644 --- a/src/util/ebtables.c +++ b/src/util/ebtables.c @@ -176,11 +176,34 @@ ebtablesAddRemoveRule(ebtRules *rules, int action, const char *arg, ...) const char *s; int n, command_idx; +#if HAVE_FIREWALLD + int ret; + char *firewall_cmd_path = NULL; + virCommandPtr cmd = NULL; + + firewall_cmd_path = virFindFileInPath("firewall-cmd"); + if (firewall_cmd_path) { + cmd = virCommandNew(firewall_cmd_path); + virCommandAddArgList(cmd, "--state", NULL); + ret = virCommandRun(cmd, NULL); + if (ret != 0) { + VIR_FREE(firewall_cmd_path); + firewall_cmd_path = NULL; + } + virCommandFree(cmd); + } +#endif + n = 1 + /* /sbin/ebtables */ 2 + /* --table foo */ 2 + /* --insert bar */ 1; /* arg */ +#if HAVE_FIREWALLD + if (firewall_cmd_path) + n += 3; /* --direct --passthrough eb */ +#endif + va_start(args, arg); while (va_arg(args, const char *)) n++; @@ -192,6 +215,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..1378575 100644 --- a/src/util/iptables.c +++ b/src/util/iptables.c @@ -101,9 +101,26 @@ iptablesAddRemoveRule(iptRules *rules, int family, int action, { va_list args; int ret; - virCommandPtr cmd; + virCommandPtr cmd = NULL; const char *s; - +#if HAVE_FIREWALLD + char *firewall_cmd_path = NULL; + + firewall_cmd_path = virFindFileInPath("firewall-cmd"); + if (firewall_cmd_path) { + cmd = virCommandNew(firewall_cmd_path); + virCommandAddArgList(cmd, "--state", NULL); + ret = virCommandRun(cmd, NULL); + if (ret == 0) { + cmd = virCommandNew(firewall_cmd_path); + virCommandAddArgList(cmd, "--direct", "--passthrough", + (family == AF_INET6) ? "ipv6" : "ipv4", NULL); + } else + cmd = NULL; + VIR_FREE(firewall_cmd_path); + } + if (!cmd) +#endif cmd = virCommandNew((family == AF_INET6) ? IP6TABLES_PATH : IPTABLES_PATH); -- 1.7.11.2

4 4

[libvirt] [PATCH 1/4] Fix man page file paths to real paths
by Doug Goldstein 15 Aug '12

15 Aug '12

Currently the man page has paths that start with @sysconfdir@, @localstatedir@ and @remote_pid_file@. The sed command attempts to replace these during the build but unfortunately pod2man gets to the files first and escapes the @ character resulting in the sed not working. This removes the @ character and makes the paths correct. --- daemon/Makefile.am | 6 +++--- daemon/libvirtd.pod.in | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 928aeaf..c15c785 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -85,9 +85,9 @@ CLEANFILES += test_libvirtd.aug libvirtd.8: $(srcdir)/libvirtd.8.in sed \ - -e 's![@]sysconfdir[@]!$(sysconfdir)!g' \ - -e 's![@]localstatedir[@]!$(localstatedir)!g' \ - -e 's![@]remote_pid_file[@]!$(REMOTE_PID_FILE)!g' \ + -e 's!SYSCONFDIR!$(sysconfdir)!g' \ + -e 's!LOCALSTATEDIR!$(localstatedir)!g' \ + -e 's!REMOTE_PID_FILE!$(REMOTE_PID_FILE)!g' \ < $< > $@-t mv $@-t $@ diff --git a/daemon/libvirtd.pod.in b/daemon/libvirtd.pod.in index 57a3b27..7dc8d83 100644 --- a/daemon/libvirtd.pod.in +++ b/daemon/libvirtd.pod.in @@ -77,14 +77,14 @@ On receipt of B<SIGHUP> libvirtd will reload its configuration. =over -=item F<@sysconfdir@/libvirtd.conf> +=item F<SYSCONFDIR/libvirtd.conf> The default configuration file used by libvirtd, unless overridden on the command line using the B<-f>|B<--config> option. -=item F<@localstatedir@/run/libvirt/libvirt-sock> +=item F<LOCALSTATEDIR/run/libvirt/libvirt-sock> -=item F<@localstatedir@/run/libvirt/libvirt-sock-ro> +=item F<LOCALSTATEDIR/run/libvirt/libvirt-sock-ro> The sockets libvirtd will use when B<run as root>. @@ -92,19 +92,19 @@ The sockets libvirtd will use when B<run as root>. The socket libvirtd will use when run as a B<non-root> user. -=item F<@sysconfdir@/pki/CA/cacert.pem> +=item F<SYSCONFDIR/pki/CA/cacert.pem> The TLS B<Certificate Authority> certificate libvirtd will use. -=item F<@sysconfdir@/pki/libvirt/servercert.pem> +=item F<SYSCONFDIR/pki/libvirt/servercert.pem> The TLS B<Server> certificate libvirtd will use. -=item F<@sysconfdir@/pki/libvirt/private/serverkey.pem> +=item F<SYSCONFDIR/pki/libvirt/private/serverkey.pem> The TLS B<Server> private key libvirtd will use. -=item F<@remote_pid_file@> +=item F<REMOTE_PID_FILE> The PID file to use, unless overridden by the B<-p>|B<--pid-file> option. @@ -121,8 +121,8 @@ To retrieve the version of libvirtd: To start libvirtd, instructing it to daemonize and create a PID file: # libvirtd -d - # ls -la @remote_pid_file@ - -rw-r--r-- 1 root root 6 Jul 9 02:40 @remote_pid_file@ + # ls -la REMOTE_PID_FILE + -rw-r--r-- 1 root root 6 Jul 9 02:40 REMOTE_PID_FILE # =head1 BUGS -- 1.7.8.6

2 4

[libvirt] the arguments of qemudDispatchServerEvent
by mzawdx wang 15 Aug '12

15 Aug '12

Hi all: I am now reading the source codes of libvirt with version 0.9.2 , and be stuck by the function "qemudDispatchServerEvent". as you can see: static void qemudDispatchServerEvent(int watch, int fd, int events, void *opaque) { ... } My question is : except for the argument "void *opaque"， when and how the other three arguments (int watch, int fd, int events) being incoming ? For it is a static function, I look through the source file "libvirt.c" and find no answer . Could someone give me a help ? Thanks a lot. Yours. mzawdx

2 2

[libvirt] Schedule for next release: entering freeze in a week
by Daniel Veillard 15 Aug '12

15 Aug '12

I would rather have the release a bit earlier than expected, I was initially hoping to get a new set of localization for Sep 4 but it is clear at this point that we won't have them in time. Since we have been working on 0.10.0 for 6 weeks now, I think pushing it 2 weeks from now is reasonnable, so I suggest to enter the freeze next week on Wed 22 for a release on the 29 Aug (or a bit earlier if things go well). Considering the amount of changes done for 0.10.0, (we are already at 370 patches in) my guess is that an extra release at the end of September not too long after 0.10.0 but with enough testing feedack will make maintainance easier. So I'm shooting for a 0.10.1 release aproximately 4 weeks after 0.10.0 itself, If such a schedule is raising problem, please tell :-) And if you have patches you want in 0.10.0 which didn't got reviews or isn't pushed, please git rebase them and send them again so they get the attention needed and get pushed within a week ! thanks, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 1

[libvirt] stateless drivers and stored lists of virDomainObjs
by Dmitry Guryanov 15 Aug '12

15 Aug '12

Hello, vmware, openvz and parallels driver, which was written with first two ones as an example, get list of domains in virConnectOpen and then use it for lookups and even for listing sometimes. This is not correct, because you can make several connections to the same driver and changes, made in one connection will not be visible to other. And you can also create or destroy domains using native tools. So I think keeping list of domains in a stateless driver is a bad idea - you should update this list each time when user requests some info. It's better to retrieve needed data only when it requested, like in xenapi driver. I asked this because I want to continue developing parallels driver and it'= s not so hard to change it now, so it should be fixed before adding any new code there. Maybe vmware and openvz drivers should be also fixed. -- Dmitry Guryanov

2 2

[libvirt] [PATCH 1/3] parallels: change URI to parallels:///system
by Dmitry Guryanov 15 Aug '12

15 Aug '12

Let's change URI to parallels:///system. Parallels Server supports creating VMs from non-privileged accounts, but it's not main usage scenario and it may be forbidden in the future. Also containers, which will be supported by the driver, can be managed only by root, so /system path is more suitable for this driver. Signed-off-by: Dmitry Guryanov <dguryanov(a)parallels.com> --- docs/drvparallels.html.in | 10 +++++----- src/parallels/parallels_driver.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/drvparallels.html.in b/docs/drvparallels.html.in index 40a0fe5..8e1430b 100644 --- a/docs/drvparallels.html.in +++ b/docs/drvparallels.html.in @@ -19,10 +19,10 @@ The libvirt Parallels driver is a single-instance privileged driver, with a driver name of 'parallels'. Some example connection URIs for the libvirt driver are: <pre> -parallels:///default (local access) -parallels+unix:///default (local access) -parallels://example.com/default (remote access, TLS/x509) -parallels+tcp://example.com/default (remote access, SASl/Kerberos) -parallels+ssh://root@example.com/default (remote access, SSH tunnelled) +parallels:///system (local access) +parallels+unix:///system (local access) +parallels://example.com/system (remote access, TLS/x509) +parallels+tcp://example.com/system (remote access, SASl/Kerberos) +parallels+ssh://root@example.com/system (remote access, SSH tunnelled) </pre> </body></html> diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c index 05db54f..53b5a50 100644 --- a/src/parallels/parallels_driver.c +++ b/src/parallels/parallels_driver.c @@ -670,11 +670,11 @@ parallelsOpen(virConnectPtr conn, (conn->uri->path[0] == '/' && conn->uri->path[1] == '\0')) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("parallelsOpen: supply a path or use " - "parallels:///session")); + "parallels:///system")); return VIR_DRV_OPEN_ERROR; } - if (STREQ(conn->uri->path, "/session")) + if (STREQ(conn->uri->path, "/system")) ret = parallelsOpenDefault(conn); else return VIR_DRV_OPEN_DECLINED; -- 1.7.1

2 5

[libvirt] [PATCH] Update documentation for CPU quota/period support for LXC
by Sukadev Bhattiprolu 15 Aug '12

15 Aug '12

From: Sukadev Bhattiprolu <sukadev(a)linux.vnet.ibm.com> Date: Tue, 14 Aug 2012 17:09:11 -0700 Subject: [PATCH] Update documentation for CPU quota/period support for LXC Following commit added suport the CPU quota/period to the LXC driver. Update the documentation to reflect that. commit d9724a81b3c53a40f45bf76067a976cce73ed278 Author: Daniel P. Berrange <berrange(a)redhat.com> Date: Thu Nov 10 12:16:26 2011 +0000 Add support for CPU quota/period to LXC driver Signed-off-by: Sukadev Bhattiprolu <sukadev(a)linux.vnet.ibm.com> --- docs/formatdomain.html.in | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index ec160bd..fb25cb8 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -426,8 +426,9 @@ interval(unit: microseconds). Within <code>period</code>, each vcpu of the domain will not be allowed to consume more than <code>quota</code> worth of runtime. The value should be in range [1000, 1000000]. A period - with value 0 means no value. (NB: Only qemu driver support) - Since 0.9.4 + with value 0 means no value. + Only QEMU driver support since 0.9.4, LXC since + 0.9.10 </dd> <dt><code>quota</code></dt> <dd> @@ -437,8 +438,9 @@ means that it is not bandwidth controlled. The value should be in range [1000, 18446744073709551] or less than 0. A quota with value 0 means no value. You can use this feature to ensure that all vcpus run at the same - speed. (NB: Only qemu driver support) - Since 0.9.4 + speed. + Only QEMU driver support since 0.9.4, LXC since + 0.9.10 </dd> </dl> -- 1.7.1

2 1

[libvirt] [PATCH 00/48 v3] Atomic APIs to list objects
by Osier Yang 15 Aug '12

15 Aug '12

v2 - v3: * Various document fixes/improvements (Suggested by Laine and Eric) * Destroy virdomainlist.[ch], and folder all list helper funcs into its own *_conf.[ch] * Improve the helpers to get the object list. See https://www.redhat.com/archives/libvir-list/2012-July/msg01267.html * Rebased on top of commit 3df9626 by Peter and the virReportError series by Daniel. * Rebased on top of virsh split series. (I'm luck there is no change on those commands since v2). Except the already supported APIs for domain and domain snapshot, this series add the APIs for the left objects, including storage pool, storage vol, network, interface, node device, nwfilter, and secret. * Storage pool: - Support filtering the returned pool objects by active|inactive, persistent|transient, autostart|no-autostart, and pool types. - New options for virsh, --type to accept multiple pool types. * Storage vol: - Simply returns all the vol objects of a pool. * Network: - Support filtering the results using flags active|inactive, persistent|transient, autostart|no-autostart - New options for virsh. * Interface: - Support filtering the results using flags active|inactive. It's still O(n) underlying, as interface driver doesn't manage the objects itself, but using netcf lib instead. And netcf APIs don't support returning the struct yet. * Node Device: - Support filtering the results using capabilities type of the devices. - Extend --cap to accept multiple capability type. * Network Filter: - Simply returns all the objects. * Secret: - Simply returns all the objects. Osier Yang (48): Avoid strcase check for virsh-*.c Destroy virdomainlist.[ch] list: Define new API virStorageListALlStoragePools list: Add helpers for listing storage pool objects list: Implement the RPC calls for virConnectListAllStoragePools list: Implement listAllStoragePools for storage driver list: Implement listAllStoragePools for test driver list: Add helper to convert strings separated by ', ' to array virsh: Fix the wrong doc for pool-list list: Change MATCH for common use in virsh list: Use virConnectListAllStoragePools in virsh virsh: Use vshPrint instead of printf python: Expose virStorageListAllStoragePools to python binding list: Define new API virStoragePoolListAllVolumes list: Implemente RPC calls for virStoragePoolListAllVolumes list: Implement virStoragePoolListAllVolumes for storage driver list: Implement virStoragePoolListAllVolumes for test driver list: Use virStoragePoolListAllVolumes in virsh list: Expose virStoragePoolListAllVolumes to Python binding list: Define new API virConnectListAllNetworks list: Implement RPC calls for virConnectListAllNetworks list: Add helpers to list network objects list: Implement listAllNetworks for network driver list: Implement listAllNetworks for test driver list: Use virConnectListAllNetworks in virsh list: Expose virConnectListAllNetworks to Python binding list: Define new API virConnectListAllInterfaces list: Implemente RPC calls for virConnectListAllInterfaces list: Implement listAllInterfaces list: Use virConnectListAllInterfaces in virsh list: Expose virConnectListAllInterfaces to Python binding list: Define new API virConnectListAllNodeDevices list: Implemente RPC calls for virConnectListAllNodeDevices list: Add helpers for listing node devices list: Implement listAllNodeDevices list: Expose virConnectListAllNodeDevices to Python binding virsh: Fix a bug of nodedev-list list: Use virConnectListAllNodeDevices in virsh list: Define new API virConnectListAllNWFilters list: Implement RPC calls for virConnectListAllNWFilters list: Implement listAllNWFilters list: Use virConnectListAllNWFilters in virsh list: Expose virConnectListAllNWFilters to Python binding list: Define new API virConnectListAllSecrets list: Implement RPC calls for virConnectListAllSecrets list: Implement listAllSecrets list: Use virConnectListAllSecrets in virsh list: Expose virConnectListAllSecrets to Python binding cfg.mk | 5 +- daemon/remote.c | 382 ++++++++++++++++++++++ include/libvirt/libvirt.h.in | 101 ++++++- python/generator.py | 11 +- python/libvirt-override-api.xml | 44 +++- python/libvirt-override-virConnect.py | 72 +++++ python/libvirt-override-virStoragePool.py | 11 + python/libvirt-override.c | 337 ++++++++++++++++++++ src/Makefile.am | 125 ++++---- src/conf/domain_conf.c | 189 +++++++++++- src/conf/domain_conf.h | 56 ++++ src/conf/network_conf.c | 91 ++++++ src/conf/network_conf.h | 22 ++ src/conf/node_device_conf.c | 103 ++++++ src/conf/node_device_conf.h | 16 + src/conf/storage_conf.c | 116 +++++++ src/conf/storage_conf.h | 35 ++ src/conf/virdomainlist.c | 222 ------------- src/conf/virdomainlist.h | 84 ----- src/driver.h | 35 ++- src/interface/netcf_driver.c | 135 ++++++++ src/libvirt.c | 487 ++++++++++++++++++++++++++++- src/libvirt_private.syms | 4 + src/libvirt_public.syms | 7 + src/libxl/libxl_driver.c | 3 +- src/lxc/lxc_driver.c | 3 +- src/network/bridge_driver.c | 17 + src/node_device/node_device_driver.c | 15 + src/node_device/node_device_driver.h | 3 + src/node_device/node_device_hal.c | 1 + src/node_device/node_device_udev.c | 1 + src/nwfilter/nwfilter_driver.c | 56 ++++ src/openvz/openvz_driver.c | 3 +- src/parallels/parallels_driver.c | 3 +- src/qemu/qemu_driver.c | 3 +- src/remote/remote_driver.c | 449 ++++++++++++++++++++++++++ src/remote/remote_protocol.x | 80 +++++- src/remote_protocol-structs | 85 +++++ src/secret/secret_driver.c | 59 ++++- src/storage/storage_driver.c | 85 +++++ src/test/test_driver.c | 104 ++++++- src/uml/uml_driver.c | 3 +- src/vbox/vbox_tmpl.c | 9 +- src/vmware/vmware_driver.c | 3 +- tools/virsh-domain-monitor.c | 16 +- tools/virsh-domain.c | 19 +- tools/virsh-host.c | 2 +- tools/virsh-interface.c | 259 +++++++++++----- tools/virsh-network.c | 351 ++++++++++++++++----- tools/virsh-nodedev.c | 302 ++++++++++++++++--- tools/virsh-nwfilter.c | 163 ++++++++-- tools/virsh-pool.c | 441 ++++++++++++++++++++------ tools/virsh-secret.c | 182 +++++++++-- tools/virsh-volume.c | 197 +++++++++--- tools/virsh.c | 58 +++- tools/virsh.pod | 51 +++- 56 files changed, 4849 insertions(+), 867 deletions(-) create mode 100644 python/libvirt-override-virStoragePool.py delete mode 100644 src/conf/virdomainlist.c delete mode 100644 src/conf/virdomainlist.h -- 1.7.7.3

4 60

[libvirt] Seamless spice-migration on hosts with multiple interfaces
by Tiziano Müller 15 Aug '12

15 Aug '12

Hi everyone I have a setup in which the VM-nodes have different interfaces for migration (internal network) and public/spice access (public network). Now, when I try to migrate a VM with a connected spice client, the client always gets disconnected instead of seamlessly migrated. The problem is that libvirt passes the spice client the hostname according to the IP of the target interface of the migration instead of the public interface (this has been confirmed using the spicy client which displays an error during migration saying that it can't find the new host "<internal hostname>"). What I tried: * setting spice_listen in /etc/libvirt/qemu.conf * defining a network in libvirt for the public network and using a network in the listen-option for spice in the VMs XML But the problem persists and the client still gets the internal (migration) address instead of the public where spice is listening on. This is with libvirt 0.9.13. Has anyone seen this behaviour before? I tried to track down this problem and I'm not sure whether I find one bug already, but the following code didn't look right. So I tried to fix it (but the problem was still present): --- src/qemu/qemu_migration.c.orig 2012-07-20 16:46:59.669855341 +0200 +++ src/qemu/qemu_migration.c 2012-07-20 16:47:58.637546032 +0200 @@ -1036,7 +1036,7 @@ if (ret == 0) { ret = qemuMonitorGraphicsRelocate(priv->mon, cookie->graphics->type, - cookie->remoteHostname, + cookie->graphics->listen, cookie->graphics->port, cookie->graphics->tlsPort, cookie->graphics->tlsSubject); Thanks in advance, Tiziano

1 0

[libvirt] [PATCHv2 0/5] network: report #connections in network xml
by Laine Stump 15 Aug '12

15 Aug '12

This repost of an unreviewed patchset from last week is purely to rebase - the "openvswitch in <network> 9 patch series is a prerequisite of this, and this is a prerequisite of the vlan patch series resend coming up. These are all fairly short and simple, so shouldn't require too much hair pulling to review :-) ===== The forward devices in direct mode (aka macvtap) networks already have a counter to keep track of how many guest interfaces are using each physical device. This series renames that counter to "connections", then adds another connects counter to the toplevel of each network, and outputs both of these counters (when non-0) with the live XML for the network (i.e. it isn't output if you ask for the --inactive xml). Someone working on a management application had requested this info, and it already existed, so I thought I may as well expose it.

3 22

[libvirt] [PATCH] conf: log error when encountering multiple filterrefs in interface
by Laine Stump 15 Aug '12

15 Aug '12

Each interface has a single pointer to a filterref object. That filterref can itself point to multiple other filterrefs, but at the toplevel there is only one. The parser had previously just silently overwritten earlier filterrefs when a new one was encountered, so the interface was left with whichever was the last filterref in the xml, ignoring all the others. This patch logs an error when it sees more than one filterref. --- src/conf/domain_conf.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ae95d81..58c424f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4627,6 +4627,12 @@ virDomainNetDefParseXML(virCapsPtr caps, ioeventfd = virXMLPropString(cur, "ioeventfd"); event_idx = virXMLPropString(cur, "event_idx"); } else if (xmlStrEqual (cur->name, BAD_CAST "filterref")) { + if (filter) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("Invalid specification of multiple <filterref>s " + "in a single <interface>")); + goto error; + } filter = virXMLPropString(cur, "filter"); virNWFilterHashTableFree(filterparams); filterparams = virNWFilterParseParamAttributes(cur); -- 1.7.11.2

2 2

[libvirt] [PATCH] Allow sticky bit to be read and set.
by Ján Tomko 15 Aug '12

15 Aug '12

--- src/conf/storage_conf.c | 8 +++++--- src/storage/storage_backend.c | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 3132aae..017648d 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -667,7 +667,8 @@ virStorageDefParsePerms(xmlXPathContextPtr ctxt, } else { int tmp; - if (virStrToLong_i(mode, NULL, 8, &tmp) < 0 || (tmp & ~0777)) { + if (virStrToLong_i(mode, NULL, 8, &tmp) < 0 || + (tmp & ~(S_ISVTX | S_IRWXUGO))) { VIR_FREE(mode); virReportError(VIR_ERR_XML_ERROR, "%s", _("malformed octal mode")); @@ -1037,7 +1038,7 @@ virStoragePoolDefFormat(virStoragePoolDefPtr def) { virBufferAddLit(&buf," <permissions>\n"); virBufferAsprintf(&buf," <mode>0%o</mode>\n", - def->target.perms.mode); + def->target.perms.mode & (S_ISVTX | S_IRWXUGO)); virBufferAsprintf(&buf," <owner>%d</owner>\n", (int) def->target.perms.uid); virBufferAsprintf(&buf," <group>%d</group>\n", @@ -1290,7 +1291,8 @@ virStorageVolTargetDefFormat(virStorageVolOptionsPtr options, virBufferAddLit(buf," <permissions>\n"); virBufferAsprintf(buf," <mode>0%o</mode>\n", - def->perms.mode); + def->perms.mode & + (S_ISVTX | S_IRWXUGO)); virBufferAsprintf(buf," <owner>%u</owner>\n", (unsigned int) def->perms.uid); virBufferAsprintf(buf," <group>%u</group>\n", diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index df3833a..5fd14ed 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -1210,7 +1210,7 @@ virStorageBackendUpdateVolTargetInfoFD(virStorageVolTargetPtr target, } } - target->perms.mode = sb.st_mode & S_IRWXUGO; + target->perms.mode = sb.st_mode & (S_ISVTX | S_IRWXUGO); target->perms.uid = sb.st_uid; target->perms.gid = sb.st_gid; -- 1.7.8.6

2 2

[libvirt] [PATCH] storage: support all file permissions
by Ján Tomko 15 Aug '12

15 Aug '12

sticky, setuid and setgid are no longer ignored. --- src/conf/storage_conf.c | 6 ++++-- src/storage/storage_backend.c | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 7944555..c492106 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1035,7 +1035,8 @@ virStoragePoolDefFormat(virStoragePoolDefPtr def) { virBufferAddLit(&buf," <permissions>\n"); virBufferAsprintf(&buf," <mode>0%o</mode>\n", - def->target.perms.mode); + def->target.perms.mode & + (S_ISUID | S_ISGID | S_ISVTX | S_IRWXUGO)); virBufferAsprintf(&buf," <owner>%u</owner>\n", (unsigned int) def->target.perms.uid); virBufferAsprintf(&buf," <group>%u</group>\n", @@ -1275,7 +1276,8 @@ virStorageVolTargetDefFormat(virStorageVolOptionsPtr options, virBufferAddLit(buf," <permissions>\n"); virBufferAsprintf(buf," <mode>0%o</mode>\n", - def->perms.mode); + def->perms.mode & + (S_ISUID | S_ISGID | S_ISVTX | S_IRWXUGO)); virBufferAsprintf(buf," <owner>%u</owner>\n", (unsigned int) def->perms.uid); virBufferAsprintf(buf," <group>%u</group>\n", diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index e677cda..e9ec7a5 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -1210,7 +1210,8 @@ virStorageBackendUpdateVolTargetInfoFD(virStorageVolTargetPtr target, } } - target->perms.mode = sb.st_mode & S_IRWXUGO; + target->perms.mode = sb.st_mode & + (S_ISUID | S_ISGID | S_ISVTX | S_IRWXUGO); target->perms.uid = sb.st_uid; target->perms.gid = sb.st_gid; -- 1.7.8.6

4 7

[libvirt] [PATCH v11 0/7] file descriptor passing using fd sets
by Corey Bryant 14 Aug '12

14 Aug '12

libvirt's sVirt security driver provides SELinux MAC isolation for Qemu guest processes and their corresponding image files. In other words, sVirt uses SELinux to prevent a QEMU process from opening files that do not belong to it. sVirt provides this support by labeling guests and resources with security labels that are stored in file system extended attributes. Some file systems, such as NFS, do not support the extended attribute security namespace, and therefore cannot support sVirt isolation. A solution to this problem is to provide fd passing support, where libvirt opens files and passes file descriptors to QEMU. This, along with SELinux policy to prevent QEMU from opening files, can provide image file isolation for NFS files stored on the same NFS mount. This patch series adds the add-fd, remove-fd, and query-fdsets QMP monitor commands, which allow file descriptors to be passed via SCM_RIGHTS, and assigned to specified fd sets. This allows fd sets to be created per file with fds having, for example, different access rights. When QEMU needs to reopen a file with different access rights, it can search for a matching fd in the fd set. Fd sets also allow for easy tracking of fds per file, helping to prevent fd leaks. Support is also added to the block layer to allow QEMU to dup an fd from an fdset when the filename is of the /dev/fdset/nnn format, where nnn is the fd set ID. No new SELinux policy is required to prevent open of NFS files (files with type nfs_t). The virt_use_nfs boolean type simply needs to be set to false, and open will be prevented (and dup will be allowed). For example: # setsebool virt_use_nfs 0 # getsebool virt_use_nfs virt_use_nfs --> off Corey Bryant (7): qemu-char: Add MSG_CMSG_CLOEXEC flag to recvmsg qapi: Introduce add-fd, remove-fd, query-fdsets block: Prevent detection of /dev/fdset/ as floppy block: Convert open calls to qemu_open block: Convert close calls to qemu_close block: Enable qemu_open/close to work with fd sets monitor: Clean up fd sets on monitor disconnect Makefile | 2 +- block/raw-posix.c | 46 +++++---- block/raw-win32.c | 6 +- block/vdi.c | 5 +- block/vmdk.c | 25 ++--- block/vpc.c | 4 +- block/vvfat.c | 16 +-- cutils.c | 5 + monitor.c | 291 +++++++++++++++++++++++++++++++++++++++++++++++++++++ monitor.h | 5 + osdep.c | 114 +++++++++++++++++++++ qapi-schema.json | 98 ++++++++++++++++++ qemu-char.c | 12 ++- qemu-common.h | 2 + qemu-tool.c | 20 ++++ qemu-user.c | 20 ++++ qmp-commands.hx | 122 ++++++++++++++++++++++ savevm.c | 4 +- tests/Makefile | 2 +- 19 files changed, 742 insertions(+), 57 deletions(-) -- 1.7.10.4

1 7

[libvirt] [PATCH] random: link with -lm when needed
by Eric Blake 14 Aug '12

14 Aug '12

Use of ldexp() requires -lm on some platforms; use gnulib to determine this for our makefile. Also, optimize virRandomInt() for the case of a power-of-two limit (actually rather common, given that Daniel has a pending patch to replace virRandomBis(10) with code that will default to virRandomInt(1024) on default SELinux settings). * .gnulib: Update to latest, for ldexp. * bootstrap.conf (gnulib_modules): Import ldexp. * src/Makefile.am (libvirt_util_la_CFLAGS): Link with -lm when needed. * src/util/virrandom.c (virRandomInt): Optimize powers of 2. --- Gnulib changes: * .gnulib dbd9144...271dd74 (37): > ldexp: relax license > update from texinfo > gnulib-tool: Fix persistence of --witness-c-macro option. > count-leading-zeros: use a lookup table on non-gcc compilers > count-leading-zeros: new module > maintainer-makefile: Fix syntax error with dash. > extern-inline: also ignore -Wmissing-declarations > autoupdate > maint.mk: sc_prohibit_magic_number_exit: avoid new false positives > gnumakefile: better interaction with Automake-NG > base64: Use extern C scope in header file, for C++. > stat-time, timespec, u64: support naive out-of-dir builds > Fix typo: 'linline' -> 'inline' (thanks to Eric Blake). > Keep the extern-inline macros closer together. > Fix indenting. > utimens: use extern-inline > u64: use extern-inline > timespec: use extern-inline > stat-time: use extern-inline > extern-inline: new module > maint.mk: a "release-commit" wrapper to do-release-commit-and-tag > autoupdate > autoupdate > maint.mk: use silent-rules support from Automake > maint.mk: provide a web-manual-update target > README-release: shorten the circuit to post a news > gnu-web-doc-update: fix --help > passfd: fix comment on recvfd > maint.mk: avoid a sub-shell > maint.mk: absolute VPATH issue > update from texinfo > gitlog-to-changelog: fix previous change > gitlog-to-changelog: don't expect .git to be in $srcdir > maint.mk: absolute VPATH build fix > clean-temp: Fix memory leak. > maint: fix grammar in a ChangeLog entry > maint.mk: new rule: refresh-gnulib-patches .gnulib | 2 +- bootstrap.conf | 1 + src/Makefile.am | 2 +- src/util/virrandom.c | 4 ++++ 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gnulib b/.gnulib index dbd9144..271dd74 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit dbd914496c99c52220e5f5ba4121d6cb55fb3beb +Subproject commit 271dd74fdf54ec2a03e73a5173b0b5697f6088f1 diff --git a/bootstrap.conf b/bootstrap.conf index a4e1c2f..a6cfe24 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -61,6 +61,7 @@ intprops ioctl isatty largefile +ldexp listen localeconv maintainer-makefile diff --git a/src/Makefile.am b/src/Makefile.am index e94f977..cec4789 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -654,7 +654,7 @@ libvirt_util_la_SOURCES = \ $(UTIL_SOURCES) libvirt_util_la_CFLAGS = $(CAPNG_CFLAGS) $(YAJL_CFLAGS) $(LIBNL_CFLAGS) \ $(AM_CFLAGS) $(AUDIT_CFLAGS) $(DEVMAPPER_CFLAGS) \ - $(DBUS_CFLAGS) + $(DBUS_CFLAGS) $(LDEXP_LIBM) libvirt_util_la_LIBADD = $(CAPNG_LIBS) $(YAJL_LIBS) $(LIBNL_LIBS) \ $(THREAD_LIBS) $(AUDIT_LIBS) $(DEVMAPPER_LIBS) \ $(RT_LIBS) $(DBUS_LIBS) $(MSCOM_LIBS) $(LIBXML_LIBS) diff --git a/src/util/virrandom.c b/src/util/virrandom.c index 363fcab..8870865 100644 --- a/src/util/virrandom.c +++ b/src/util/virrandom.c @@ -24,6 +24,7 @@ #include <stdlib.h> #include <inttypes.h> #include <math.h> +#include <strings.h> #include "virrandom.h" #include "threads.h" @@ -135,6 +136,9 @@ double virRandom(void) */ uint32_t virRandomInt(uint32_t max) { + if ((max & (max - 1)) == 0) + return virRandomBits(ffs(max)); + double val = virRandom(); return val * max; } -- 1.7.11.2

2 3

[libvirt] [PATCH 0/9] network: properly support openvswitch in <network>
by Laine Stump 14 Aug '12

14 Aug '12

Although it's been possible (ever since openvswitch was added to libvirt in 0.9.11) for a libvirt network to use an openvswitch bridge (by adding <virtualport type='openvswitch'>), the virtualport in the network would always have a default random interfaceid included, which would be re-used for all interfaces using that network, which doesn't really work at all. The alternative was to not specify openvswitch in the <network> definition, but to do it in the guest's <interface> definition instead - this of course goes against the principle of not having host-specific config embedded in guest config. This patch series enhances the functionality of <virtualport> elements, to allow omitting some attributes (and even the type), and to merge the interface, network, and portgroup virtualports rather than simply picking one. This not only makes openvswitch <network>s more practical (because the network can specify type='openvswitch' without also specifying an interfaceid), but also makes <virtualport> in networks and portgroups more useful in general - for example, an interface can specify an interfaceid (used only by openvswitch) *and* an instanceid (used only by 802.1Qbh), while the network's virtualport specifies only the type, and the portgroups specify the managerid, typeid, profileid, or whatever is appropriate for the type of switch used by the network. The result is that the guest config can be completely devoid of knowledge about the type of switch being used on the hardware, but can still enjoy full configurability for whatever switch ends up being used.

5 23

[libvirt] [PATCH] build: fix link error with appArmor
by Eric Blake 14 Aug '12

14 Aug '12

Commit bb705e25 missed that the appArmor helper file also needs to resolve the new symbols dragged in by domain_conf.c. * src/Makefile.am (SECURITY_DRIVER_APPARMOR_HELPER_SOURCES): Pull in datatypes.c. --- Pushing under the build-breaker rule. src/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Makefile.am b/src/Makefile.am index 8d54145..e94f977 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -405,6 +405,7 @@ LXC_CONTROLLER_SOURCES = \ lxc/lxc_controller.c SECURITY_DRIVER_APPARMOR_HELPER_SOURCES = \ + $(DATATYPES_SOURCES) \ security/virt-aa-helper.c PHYP_DRIVER_SOURCES = \ -- 1.7.11.2

1 0

[libvirt] [PATCH] maint: drop a leftover comment line
by Eric Blake 14 Aug '12

14 Aug '12

* tests/viratomictest.c: Fix copy-and-paste bug. --- Pushing under the trivial rule. tests/viratomictest.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/viratomictest.c b/tests/viratomictest.c index 772fbfe..4250329 100644 --- a/tests/viratomictest.c +++ b/tests/viratomictest.c @@ -12,7 +12,6 @@ * 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 * License along with this library; If not, see * <http://www.gnu.org/licenses/>. * -- 1.7.11.2

1 0

[libvirt] [PATCH v2 1/2] Honour current sensitivity and category ranges in SELinux label generation
by Daniel P. Berrange 14 Aug '12

14 Aug '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Currently the dynamic label generation code will create labels with a sensitivity of s0, and a category pair in the range 0-1023. This is fine when running a standard MCS policy because libvirtd will run with a label system_u:system_r:virtd_t:s0-s0:c0.c1023 With custom policies though, it is possible for libvirtd to have a different sensitivity, or category range. For example system_u:system_r:virtd_t:s2-s3:c512.c1023 In this case we must assign the VM a sensitivity matching the current lower sensitivity value, and categories in the range 512-1023 Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/security/security_selinux.c | 106 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 102 insertions(+), 4 deletions(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 48fd78b..bc24dca 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -106,13 +106,108 @@ virSecuritySELinuxMCSFind(virSecurityManagerPtr mgr) int c1 = 0; int c2 = 0; char *mcs = NULL; + security_context_t ourSecContext = NULL; + context_t ourContext = NULL; + char *sens, *cat, *tmp; + int catMin, catMax, catRange; + + if (getcon(&ourSecContext) < 0) { + virReportSystemError(errno, "%s", + _("Unable to get current process SELinux context")); + goto cleanup; + } + if (!(ourContext = context_new(ourSecContext))) { + virReportSystemError(errno, + _("Unable to parse current SELinux context '%s'"), + ourSecContext); + goto cleanup; + } + + if (!(sens = strdup(context_range_get(ourContext)))) { + virReportOOMError(); + goto cleanup; + } + + /* Find and blank out the category part */ + if (!(tmp = strchr(sens, ':'))) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Cannot parse sensitivity level in %s"), + sens); + goto cleanup; + } + *tmp = '\0'; + cat = tmp + 1; + /* Find and blank out the sensitivity upper bound */ + if ((tmp = strchr(sens, '-'))) + *tmp = '\0'; + /* sens now just contains the sensitivity lower bound */ + + /* Find & extract category min */ + tmp = cat; + if (tmp[0] != 'c') { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Cannot parse category in %s"), + cat); + goto cleanup; + } + tmp++; + if (virStrToLong_i(tmp, &tmp, 10, &catMin) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Cannot parse category in %s"), + cat); + goto cleanup; + } + + /* We *must* have a pair of categories otherwise + * there's no range to allocate VM categories from */ + if (!tmp[0]) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("No category range available")); + goto cleanup; + } + + /* Find & extract category max (if any) */ + if (tmp[0] != '.') { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Cannot parse category in %s"), + cat); + goto cleanup; + } + tmp++; + if (tmp[0] != 'c') { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Cannot parse category in %s"), + cat); + goto cleanup; + } + tmp++; + if (virStrToLong_i(tmp, &tmp, 10, &catMax) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Cannot parse category in %s"), + cat); + goto cleanup; + } + + /* +1 since virRandomInt range is exclusive of the upper bound */ + catRange = (catMax - catMin) + 1; + + if (catRange < 8) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Category range c%d-c%d too small"), + catMin, catMax); + goto cleanup; + } + + VIR_DEBUG("Using sensitivity level '%s' cat min %d max %d range %d", + sens, catMin, catMax, catRange); for (;;) { - c1 = virRandomBits(10); - c2 = virRandomBits(10); + c1 = virRandomInt(catRange); + c2 = virRandomInt(catRange); + VIR_DEBUG("Try cat %s:c%d,c%d", sens, c1+catMin, c2+catMin); if (c1 == c2) { - if (virAsprintf(&mcs, "s0:c%d", c1) < 0) { + if (virAsprintf(&mcs, "%s:c%d", sens, catMin + c1) < 0) { virReportOOMError(); return NULL; } @@ -122,7 +217,7 @@ virSecuritySELinuxMCSFind(virSecurityManagerPtr mgr) c1 = c2; c2 = t; } - if (virAsprintf(&mcs, "s0:c%d,c%d", c1, c2) < 0) { + if (virAsprintf(&mcs, "%s:c%d,c%d", sens, catMin + c1, catMin + c2) < 0) { virReportOOMError(); return NULL; } @@ -136,6 +231,9 @@ virSecuritySELinuxMCSFind(virSecurityManagerPtr mgr) cleanup: VIR_DEBUG("Found context '%s'", NULLSTR(mcs)); + VIR_FREE(sens); + freecon(ourSecContext); + context_free(ourContext); return mcs; } -- 1.7.11.2

2 3

[libvirt] [PATCH] openvz: unlock virDomainObj objects in openvzOpen
by Dmitry Guryanov 14 Aug '12

14 Aug '12

openvzOpen fucntion must leave unlocked virDomainObj objects in driver->domains. Now even simple commands like list or domain lookup hang, for example virsh -c openvz:///system list --all. Signed-off-by: Dmitry Guryanov <dguryanov(a)parallels.com> --- src/openvz/openvz_conf.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index e62bf8c..802a9f8 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -673,6 +673,7 @@ int openvzLoadDomains(struct openvz_driver *driver) { goto cleanup; } + virDomainObjUnlock(dom); dom = NULL; } -- 1.7.1

2 1

[libvirt] [PATCH v2] Add virRandom() API to generate numbers with non-power-of-2 limit
by Daniel P. Berrange 14 Aug '12

14 Aug '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> The current virRandomBits() API is only usable if the caller wants a random number in the range [0, (n-1)] where n is a power of two. This adds a virRandom() API which generates a double in the range [0.0,1.0] with 48 bits of entropy. It then also adds a virRandomInt(uint32_t max) API which generates an unsigned in the range [0,@max] Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/libvirt_private.syms | 2 ++ src/util/virrandom.c | 32 ++++++++++++++++++++++++++++++++ src/util/virrandom.h | 2 ++ 3 files changed, 36 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 018d3a9..1905d6f 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1641,8 +1641,10 @@ virPidFileDeletePath; # virrandom.h +virRandom; virRandomBits; virRandomGenerateWWN; +virRandomInt; # virsocketaddr.h diff --git a/src/util/virrandom.c b/src/util/virrandom.c index 50bed46..2092afc 100644 --- a/src/util/virrandom.c +++ b/src/util/virrandom.c @@ -23,6 +23,7 @@ #include <stdlib.h> #include <inttypes.h> +#include <math.h> #include "virrandom.h" #include "threads.h" @@ -108,6 +109,37 @@ uint64_t virRandomBits(int nbits) return ret; } + +/** + * virRandom: + * + * Generate an evenly distributed random number between [0.0,1.0] + * + * Return: a random number with 48 bits of entropy + */ +double virRandom(void) +{ + uint64_t val = virRandomBits(48); + + return ldexp(val, -48); +} + + +/** + * virRandomInt32: + * @max: upper limit + * + * Generate an evenly distributed random integer between [0,@max] + * + * Return: a random number between [0,@max] + */ +uint32_t virRandomInt(uint32_t max) +{ + double val = virRandom(); + return val * max; +} + + #define QUMRANET_OUI "001a4a" #define VMWARE_OUI "000569" #define MICROSOFT_OUI "0050f2" diff --git a/src/util/virrandom.h b/src/util/virrandom.h index 29a055d..bd34c94 100644 --- a/src/util/virrandom.h +++ b/src/util/virrandom.h @@ -25,6 +25,8 @@ # include "internal.h" uint64_t virRandomBits(int nbits); +double virRandom(void); +uint32_t virRandomInt(uint32_t max); int virRandomGenerateWWN(char **wwn, const char *virt_type); #endif /* __VIR_RANDOM_H__ */ -- 1.7.11.2

2 2

[libvirt] [PATCH v10 0/7] file descriptor passing using fd sets
by Corey Bryant 14 Aug '12

14 Aug '12

libvirt's sVirt security driver provides SELinux MAC isolation for Qemu guest processes and their corresponding image files. In other words, sVirt uses SELinux to prevent a QEMU process from opening files that do not belong to it. sVirt provides this support by labeling guests and resources with security labels that are stored in file system extended attributes. Some file systems, such as NFS, do not support the extended attribute security namespace, and therefore cannot support sVirt isolation. A solution to this problem is to provide fd passing support, where libvirt opens files and passes file descriptors to QEMU. This, along with SELinux policy to prevent QEMU from opening files, can provide image file isolation for NFS files stored on the same NFS mount. This patch series adds the add-fd, remove-fd, and query-fdsets QMP monitor commands, which allow file descriptors to be passed via SCM_RIGHTS, and assigned to specified fd sets. This allows fd sets to be created per file with fds having, for example, different access rights. When QEMU needs to reopen a file with different access rights, it can search for a matching fd in the fd set. Fd sets also allow for easy tracking of fds per file, helping to prevent fd leaks. Support is also added to the block layer to allow QEMU to dup an fd from an fdset when the filename is of the /dev/fdset/nnn format, where nnn is the fd set ID. No new SELinux policy is required to prevent open of NFS files (files with type nfs_t). The virt_use_nfs boolean type simply needs to be set to false, and open will be prevented (and dup will be allowed). For example: # setsebool virt_use_nfs 0 # getsebool virt_use_nfs virt_use_nfs --> off Corey Bryant (7): qemu-char: Add MSG_CMSG_CLOEXEC flag to recvmsg qapi: Introduce add-fd, remove-fd, query-fdsets block: Prevent detection of /dev/fdset/ as floppy block: Convert open calls to qemu_open block: Convert close calls to qemu_close block: Enable qemu_open/close to work with fd sets monitor: Clean up fd sets on monitor disconnect block/raw-posix.c | 46 +++++---- block/raw-win32.c | 6 +- block/vdi.c | 5 +- block/vmdk.c | 25 ++--- block/vpc.c | 4 +- block/vvfat.c | 16 +-- cutils.c | 5 + monitor.c | 291 +++++++++++++++++++++++++++++++++++++++++++++++++++++ monitor.h | 5 + osdep.c | 114 +++++++++++++++++++++ qapi-schema.json | 98 ++++++++++++++++++ qemu-char.c | 12 ++- qemu-common.h | 2 + qemu-tool.c | 20 ++++ qmp-commands.hx | 122 ++++++++++++++++++++++ savevm.c | 4 +- 16 files changed, 720 insertions(+), 55 deletions(-) -- 1.7.10.4

3 12

[libvirt] [PATCH] util: typos in fallback code fo virDoubleToStr
by Martin Kletzander 14 Aug '12

14 Aug '12

Fixes for some typos that somehow didn't get to the final push of the commit 43bfa23e6f968be9a8c134a4b5c3cfb6da3816d9. --- Pushing as a build-breaker. src/util/util.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index 4a720d8..9068e0f 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -2106,7 +2106,7 @@ virDoubleToStr(char **strp, double number) char *radix, *tmp; struct lconv *lc; - if ((ret = virVasprintf(strp, "%lf", number) < 0) + if ((ret = virAsprintf(strp, "%lf", number) < 0)) goto error; lc = localeconv(); @@ -2115,7 +2115,7 @@ virDoubleToStr(char **strp, double number) if (tmp) { *tmp = '.'; if (strlen(radix) > 1) - memmove(tmp + 1, tmp + strlen(radix), strlen(*strp) - (tmp - str)); + memmove(tmp + 1, tmp + strlen(radix), strlen(*strp) - (tmp - *strp)); } #endif /* HAVE_NEWLOCALE */ -- 1.7.8.6

1 0

[libvirt] [PATCH 0/4] support <vlan> element for interfaces and networks
by Laine Stump 14 Aug '12

14 Aug '12

The purpose of these patches is to define a data type that can properly describe an interface's vlan configuration (including multiple vlans for trunking), provide XML parser and formatter to translate to and from the new data type, add the new <vlan> element to both domain <interface> and to <network> in appropriate places, and to provide the new vlan data to the hypervisor driver. Once these 4 patches are applied, all that will be left to support vlan configuration for any network connection that supports it, is to request the vlan data for the interface with virDomainNetGetActualVlan(netdef). If that function returns NULL, there is no vlan config for this interface; if it's non-zero, it is a pointer to virNetDevVlan, and you can grab the data from there. Since I currently know of only two types of network connection we will be able to easily support this for (sr-iov VFs using PCI passthrough, and openvswitch), any type other than those will refuse to start if a vlan has been requested (see PATCH 4/4). This covers validation for the qemu and lxc drivers (since they use common code), but I'm not sure about xen, esx, or any other driver - they will likely require extra code to either implement transparent vlan configuration, or log an error if it's requested (my guess is that, in spite of our best efforts, *many* people will misunderstand the limitations of this functionality, and try to put all sorts of interfaces on vlans; it will be much friendlier to inform them of the problem rather than simply ignore the vlan config. == This patchset was developed on top of the 9 part patchset here: https://www.redhat.com/archives/libvir-list/2012-August/msg00293.html and the 5 part set here: https://www.redhat.com/archives/libvir-list/2012-August/msg00293.html It doesn't depend on any of the functionality, but not having those patchset will probably lead to some merge conflicts.

2 6

[libvirt] [PATCH 0/5] network: report #connections in network xml
by Laine Stump 14 Aug '12

14 Aug '12

The forward devices in direct mode (aka macvtap) networks already have a counter to keep track of how many guest interfaces are using each physical device. This series renames that counter to "connections", then adds another connects counter to the toplevel of each network, and outputs both of these counters (when non-0) with the live XML for the network (i.e. it isn't output if you ask for the --inactive xml). Someone working on a management application had requested this info, and it already existed, so I thought I may as well expose it. In-Reply-To:

1 6

[libvirt] [PATCH v4] json: fix interface locale dependency
by Martin Kletzander 14 Aug '12

14 Aug '12

libvirt creates invalid commands if wrong locale is selected. For example with locale that uses comma as a decimal point, JSON commands created with decimal numbers are invalid because comma separates the entries in JSON. Fortunately even when decimal point is affected, thousands grouping is not, because for grouping to be enabled with *printf, there has to be an apostrophe flag specified (and supported). This patch adds specific internal function for converting doubles to strings with C locale. -- v4: - changed according to Eric's suggestions --- bootstrap.conf | 1 + configure.ac | 4 +- src/libvirt_private.syms | 1 + src/util/json.c | 2 +- src/util/util.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++ src/util/util.h | 3 ++ 6 files changed, 71 insertions(+), 3 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index c112ccd..a4e1c2f 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -62,6 +62,7 @@ ioctl isatty largefile listen +localeconv maintainer-makefile manywarnings mkstemp diff --git a/configure.ac b/configure.ac index 8a04d91..3951012 100644 --- a/configure.ac +++ b/configure.ac @@ -132,8 +132,8 @@ AC_CHECK_SIZEOF([long]) dnl Availability of various common functions (non-fatal if missing), dnl and various less common threadsafe functions AC_CHECK_FUNCS_ONCE([cfmakeraw geteuid getgid getgrnam_r getmntent_r \ - getpwuid_r getuid initgroups kill mmap posix_fallocate posix_memalign \ - regexec sched_getaffinity]) + getpwuid_r getuid initgroups kill mmap newlocale posix_fallocate \ + posix_memalign regexec sched_getaffinity]) dnl Availability of pthread functions (if missing, win32 threading is dnl assumed). Because of $LIB_PTHREAD, we cannot use AC_CHECK_FUNCS_ONCE. diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index c023dbf..018d3a9 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1140,6 +1140,7 @@ virArgvToString; virAsprintf; virBuildPathInternal; virDirCreate; +virDoubleToStr; virEnumFromString; virEnumToString; virEventAddHandle; diff --git a/src/util/json.c b/src/util/json.c index 5132989..40d50a1 100644 --- a/src/util/json.c +++ b/src/util/json.c @@ -201,7 +201,7 @@ virJSONValuePtr virJSONValueNewNumberDouble(double data) { virJSONValuePtr val = NULL; char *str; - if (virAsprintf(&str, "%lf", data) < 0) + if (virDoubleToStr(&str, data) < 0) return NULL; val = virJSONValueNewNumber(str); VIR_FREE(str); diff --git a/src/util/util.c b/src/util/util.c index e5bb27b..4a720d8 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -44,6 +44,7 @@ #include <signal.h> #include <termios.h> #include <pty.h> +#include <locale.h> #if HAVE_LIBDEVMAPPER_H # include <libdevmapper.h> @@ -2060,6 +2061,68 @@ int virEnumFromString(const char *const*types, return -1; } +/* In case thread-safe locales are available */ +#if HAVE_NEWLOCALE + +static locale_t virLocale; + +static int +virLocaleOnceInit(void) +{ + virLocale = newlocale(LC_ALL_MASK, "C", (locale_t)0); + if (!virLocale) + return -1; + return 0; +} + +VIR_ONCE_GLOBAL_INIT(virLocale) +#endif + +/** + * virDoubleToStr + * + * converts double to string with C locale (thread-safe). + * + * Returns -1 on error, size of the string otherwise. + */ +int +virDoubleToStr(char **strp, double number) +{ + int ret = -1; + +#if HAVE_NEWLOCALE + + locale_t old_loc; + + if (virLocaleInitialize() < 0) + goto error; + + old_loc = uselocale(virLocale); + ret = virAsprintf(strp, "%lf", number); + uselocale(old_loc); + +#else + + char *radix, *tmp; + struct lconv *lc; + + if ((ret = virVasprintf(strp, "%lf", number) < 0) + goto error; + + lc = localeconv(); + radix = lc->decimal_point; + tmp = strstr(*strp, radix); + if (tmp) { + *tmp = '.'; + if (strlen(radix) > 1) + memmove(tmp + 1, tmp + strlen(radix), strlen(*strp) - (tmp - str)); + } + +#endif /* HAVE_NEWLOCALE */ + error: + return ret; +} + const char *virEnumToString(const char *const*types, unsigned int ntypes, int type) diff --git a/src/util/util.h b/src/util/util.h index d151c27..a5d892d 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -209,6 +209,9 @@ char *virStrcpy(char *dest, const char *src, size_t destbytes) ATTRIBUTE_RETURN_CHECK; # define virStrcpyStatic(dest, src) virStrcpy((dest), (src), sizeof(dest)) +int virDoubleToStr(char **strp, double number) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + int virDiskNameToIndex(const char* str); char *virIndexToDiskName(int idx, const char *prefix); -- 1.7.8.6

2 2

[libvirt] [PATCH] virsh: say save-image-edit failed only when it does
by Ján Tomko 14 Aug '12

14 Aug '12

The common code for editing files in virsh-edit.c expects EDIT_DEFINE to return 0 on failure. virDomainSaveImageDefineXML returns 0 on success. --- tools/virsh-domain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 33b1727..69e0133 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -2973,7 +2973,7 @@ cmdSaveImageEdit(vshControl *ctl, const vshCmd *cmd) "not changed.\n"), file); \ ret = true; goto edit_cleanup; #define EDIT_DEFINE \ - virDomainSaveImageDefineXML(ctl->conn, file, doc_edited, define_flags) + (virDomainSaveImageDefineXML(ctl->conn, file, doc_edited, define_flags) == 0) #define EDIT_FREE /* */ #include "virsh-edit.c" -- 1.7.8.6

2 1

[libvirt] [PATCH] Do not unlink sanlock lockspace if registering with sanlock daemon returns error
by Asad Saeed 14 Aug '12

14 Aug '12

This is a patch for bug 847848 If registering an existing lockspace with the sanlock daemon returns an error, libvirt should not proceed to unlink the lockspace. Signed-off-by: Asad Saeed <asad.saeed(a)acidseed.com> --- src/locking/lock_driver_sanlock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 9ec99dd..f046102 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -242,7 +242,7 @@ static int virLockManagerSanlockSetupLockspace(void) virReportSystemError(-rv, _("Unable to add lockspace %s"), path); - goto error_unlink; + goto error; } else { VIR_DEBUG("Lockspace %s is already registered", path); } -- 1.7.1

2 1

[libvirt] ANNOUNCE: libvirt 0.9.6.2 maintenance release
by Cole Robinson 14 Aug '12

14 Aug '12

libvirt 0.9.6.2 maintenance release is now available. This is libvirt 0.9.6 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-0.9.6.2.tar.gz Changes in this version: * Prep for release 0.9.6.2 * build: drop check for ANSI compiler * tests: avoid seclabeltest crash * Remove unused <dirent.h> imports to appease syntax-check * Appease gnulib sc_makefile_at_at_check * test: fix segfault in networkxml2argvtest * tests: dynamically replace dnsmasq path * daemon: Fix crash in virTypedParameterArrayClear * build: update to latest gnulib, for secure tarball * build: update to latest gnulib * build: update to latest gnulib For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Thanks, Cole

1 0

[libvirt] [PATCH] qemu: snapshot: Wire up revert for disk only snapshots
by Cole Robinson 13 Aug '12

13 Aug '12

This just uses the existing plumping to update the guest XML to point at the chosen snapshot disk images. It requires the VM to be inactive. --- Reverting to a snapshot with children and then running the guest is probably unsafe, since the backing image will change state on the child snapshots. How do internal snapshots work around this? src/qemu/qemu_driver.c | 72 ++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 64 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 9bf89bb..53f5340 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11205,6 +11205,65 @@ qemuDomainSnapshotRevertInactive(struct qemud_driver *driver, return ret > 0 ? -1 : ret; } +/* The domain is expected to be locked */ +static int qemuDomainRevertToSnapshotDisk(virDomainSnapshotObjPtr snap, + virDomainObjPtr vm, + virDomainDefPtr config, + unsigned int flags) +{ + int ret = -1; + int i; + + if (virDomainObjIsActive(vm)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("domain must be stopped to revert to a " + "disk only snapshot")); + goto cleanup; + } + + if (flags & (VIR_DOMAIN_SNAPSHOT_REVERT_RUNNING | + VIR_DOMAIN_SNAPSHOT_REVERT_PAUSED)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("domain can only be shutoff after reverting to a" + "disk only snapshot")); + goto cleanup; + } + + if (!config) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("domain XML must be present in the snapshot metadata")); + goto cleanup; + } + + for (i = 0; i < snap->def->ndisks; i++) { + virDomainDiskDefPtr vmdisk = config->disks[i]; + virDomainSnapshotDiskDefPtr snapdisk = &(snap->def->disks[i]); + char *src = NULL; + char *type = NULL; + + if (snapdisk->snapshot == VIR_DOMAIN_DISK_SNAPSHOT_NO) + continue; + + if (!(src = strdup(snapdisk->file)) || + !(type = strdup(snapdisk->driverType))) { + virReportOOMError(); + VIR_FREE(src); + VIR_FREE(type); + goto cleanup; + } + + VIR_FREE(vmdisk->src); + vmdisk->src = src; + VIR_FREE(vmdisk->driverType); + vmdisk->driverType = type; + } + + virDomainObjAssignDef(vm, config, false); + ret = 0; +cleanup: + return ret; +} + static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, unsigned int flags) { @@ -11265,12 +11324,6 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, "to revert to inactive snapshot")); goto cleanup; } - if (snap->def->state == VIR_DOMAIN_DISK_SNAPSHOT) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("revert to external disk snapshot not supported " - "yet")); - goto cleanup; - } if (!(flags & VIR_DOMAIN_SNAPSHOT_REVERT_FORCE)) { if (!snap->def->dom) { virReportError(VIR_ERR_SNAPSHOT_REVERT_RISKY, @@ -11289,7 +11342,6 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, } } - if (vm->current_snapshot) { vm->current_snapshot->def->current = false; if (qemuDomainSnapshotWriteMetadata(vm, vm->current_snapshot, @@ -11325,6 +11377,11 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, if (qemuDomainObjBeginJobWithDriver(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; + if (snap->def->state == VIR_DOMAIN_DISK_SNAPSHOT) { + ret = qemuDomainRevertToSnapshotDisk(snap, vm, config, flags); + goto endjob; + } + if (snap->def->state == VIR_DOMAIN_RUNNING || snap->def->state == VIR_DOMAIN_PAUSED) { /* Transitions 2, 3, 5, 6, 8, 9 */ @@ -11522,7 +11579,6 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, } ret = 0; - endjob: if (vm && qemuDomainObjEndJob(driver, vm) == 0) vm = NULL; -- 1.7.11.2

2 1

[libvirt] [PATCH 1/3] virsh.c: Fix compiler warning
by Cole Robinson 13 Aug '12

13 Aug '12

For some reason I only get this after applying subsequent upcoming patches that touch virsh, but don't seem to actually cause the warning. virsh.c: In function ‘vshCommandParse’: virsh.c:2014:46: error: ‘opt_index’ may be used uninitialized in this function [-Werror=maybe-uninitialized] cc1: all warnings being treated as errors --- tools/virsh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh.c b/tools/virsh.c index b95a008..64e2e18 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1975,7 +1975,7 @@ vshCommandParse(vshControl *ctl, vshCommandParser *parser) } else if (tkdata[0] == '-' && tkdata[1] == '-' && c_isalnum(tkdata[2])) { char *optstr = strchr(tkdata + 2, '='); - int opt_index; + int opt_index = 0; if (optstr) { *optstr = '\0'; /* convert the '=' to '\0' */ -- 1.7.11.2

3 8

[libvirt] [PATCH] build: Distribute check-symfile.pl
by Cole Robinson 13 Aug '12

13 Aug '12

Otherwise distcheck can fail with: GEN check-symfile Can't open perl script "../../src/check-symfile.pl": No such file or directory make[4]: *** [check-symfile] Error 2 --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 79b4e59..8a93a32 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) -- 1.7.11.2

2 2

[libvirt] [PATCH v9 0/7] file descriptor passing using fd sets
by Corey Bryant 13 Aug '12

13 Aug '12

libvirt's sVirt security driver provides SELinux MAC isolation for Qemu guest processes and their corresponding image files. In other words, sVirt uses SELinux to prevent a QEMU process from opening files that do not belong to it. sVirt provides this support by labeling guests and resources with security labels that are stored in file system extended attributes. Some file systems, such as NFS, do not support the extended attribute security namespace, and therefore cannot support sVirt isolation. A solution to this problem is to provide fd passing support, where libvirt opens files and passes file descriptors to QEMU. This, along with SELinux policy to prevent QEMU from opening files, can provide image file isolation for NFS files stored on the same NFS mount. This patch series adds the add-fd, remove-fd, and query-fdsets QMP monitor commands, which allow file descriptors to be passed via SCM_RIGHTS, and assigned to specified fd sets. This allows fd sets to be created per file with fds having, for example, different access rights. When QEMU needs to reopen a file with different access rights, it can search for a matching fd in the fd set. Fd sets also allow for easy tracking of fds per file, helping to prevent fd leaks. Support is also added to the block layer to allow QEMU to dup an fd from an fdset when the filename is of the /dev/fdset/nnn format, where nnn is the fd set ID. No new SELinux policy is required to prevent open of NFS files (files with type nfs_t). The virt_use_nfs boolean type simply needs to be set to false, and open will be prevented (and dup will be allowed). For example: # setsebool virt_use_nfs 0 # getsebool virt_use_nfs virt_use_nfs --> off Corey Bryant (7): qemu-char: Add MSG_CMSG_CLOEXEC flag to recvmsg qapi: Introduce add-fd, remove-fd, query-fdsets block: Prevent detection of /dev/fdset/ as floppy block: Convert open calls to qemu_open block: Convert close calls to qemu_close block: Enable qemu_open/close to work with fd sets monitor: Clean up fd sets on monitor disconnect block/raw-posix.c | 46 +++++---- block/raw-win32.c | 6 +- block/vdi.c | 5 +- block/vmdk.c | 25 ++--- block/vpc.c | 4 +- block/vvfat.c | 16 +-- cutils.c | 5 + monitor.c | 287 +++++++++++++++++++++++++++++++++++++++++++++++++++++ monitor.h | 5 + osdep.c | 113 +++++++++++++++++++++ qapi-schema.json | 98 ++++++++++++++++++ qemu-char.c | 12 ++- qemu-common.h | 2 + qemu-tool.c | 20 ++++ qmp-commands.hx | 122 +++++++++++++++++++++++ savevm.c | 4 +- 16 files changed, 715 insertions(+), 55 deletions(-) -- 1.7.10.4

3 18

[libvirt] ANNOUNCE: Release of libvirt-sandbox version 0.1.0
by Daniel P. Berrange 13 Aug '12

13 Aug '12

I pleased to announce the a new public release of libvirt-sandbox, version 0.1.0, is now available for download ftp://libvirt.org/libvirt/sandbox/ The packages are GPG signed with Key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF (4096R) The libvirt-sandbox package provides an API layer on top of libvirt-gobject which facilitates the cration of application sandboxes using virtualization technology. An application sandbox is a virtual machine or container that runs a single application binary, directly from the host OS filesystem. In other words there is no separate guest operating system install to build or manager. At this point in time libvirt-sandbox can create sandboxes using either LXC or KVM, and should in theory be extendable to any libvirt driver. The first release is able to run simple command line based programs. This release has focused on improving the virt-sandbox-service tool, to facilitate creation and management of system services within sandboxes. For example, to allow a single host to easily run 100's of isolated apache instances. Changed in this release: - ABI+API incompatible with previous library, so new soname - Some changes to CLI args for virt-sandbox command - Many fixes to virt-sandbox-service - Use /run/libvirt-sandbox instead of /root/.cache/libvirt when run as root - Fix typo setting RUNDIR - Re-add /kernel suffix to kmod search dir - Add APIs to select kernel version - Fix SEGV when attaching consoles to NULL stdin - Add logrotate script for virt-sandbox-service - Turn GVirSandboxConsole into an abstract class - Configurable keysequence for breaking out of console (defaults to Ctrl+]) - Fix handling of strace debugging - Add APIs to select kmod directory prefix - Require glib >= 2.32 - Refactor APIs for configuring sandbox mounts - Maintain a single sorted list of mounts - Add support for RAM filesystems - Setup tmpfs for /run and /tmp in sandbox services - Remove need to provide executable for sandbox services, just rely on systemd unit filename - Enable admin customization of systemd services in sandbox services - Rewrite part of virt-sandbox-service in C to reduce long term memory overhead - Create custom systemd startup sequence Thanks to everyone who has contributed towards 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] Release only specific sanlock resource
by Frido Roose 13 Aug '12

13 Aug '12

This is a patch for bug 826704 All sanlock resources get released when hot-dettaching a disk from the domain because virLockManagerSanlockRelease uses the wrong function parameters/flags. With the patch only the resources that should be released are cleaned up. Signed-off-by: Frido Roose <frido.roose(a)gmail.com> --- src/locking/lock_driver_sanlock.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 7c71af3..0625d09 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -814,7 +814,7 @@ static int virLockManagerSanlockRelease(virLockManagerPtr lock, unsigned int flags) { virLockManagerSanlockPrivatePtr priv = lock->privateData; - int res_count; + int res_count=priv->res_count; int rv; virCheckFlags(0, -1); @@ -834,7 +834,7 @@ static int virLockManagerSanlockRelease(virLockManagerPtr lock, VIR_FREE(*state); } - if ((rv = sanlock_release(-1, priv->vm_pid, SANLK_REL_ALL, 0, NULL)) < 0) { + if ((rv = sanlock_release(-1, priv->vm_pid, 0, res_count, priv->res_args)) < 0) { if (rv <= -200) virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to release lock: error %d"), rv); -- 1.7.1

3 4

[libvirt] Memory leak in virInitialize -> vboxRegister -> VBoxCGlueInit
by Richard W.M. Jones 13 Aug '12

13 Aug '12

https://bugzilla.redhat.com/show_bug.cgi?id=847429 Spotted by valgrind: ==2390== 45 bytes in 1 blocks are definitely lost in loss record 68 of 123 ==2390== at 0x4A086DC: malloc (vg_replace_malloc.c:270) ==2390== by 0x30D060EBA0: _dl_signal_error (in /usr/lib64/ld-2.16.so) ==2390== by 0x30D0612CF2: _dl_open (in /usr/lib64/ld-2.16.so) ==2390== by 0x30D1601025: dlopen_doit (in /usr/lib64/libdl-2.16.so) ==2390== by 0x30D060EDC5: _dl_catch_error (in /usr/lib64/ld-2.16.so) ==2390== by 0x30D160163B: _dlerror_run (in /usr/lib64/libdl-2.16.so) ==2390== by 0x30D16010C0: dlopen@@GLIBC_2.2.5 (in /usr/lib64/libdl-2.16.so) ==2390== by 0x5893994: tryLoadOne (vbox_XPCOMCGlue.c:127) ==2390== by 0x5893BE2: VBoxCGlueInit (vbox_XPCOMCGlue.c:230) ==2390== by 0x589407F: vboxRegister (vbox_driver.c:88) ==2390== by 0x5817568: virInitialize (libvirt.c:450) ==2390== by 0x5492C02: init_libguestfs (guestfs.c:108) libvirt-0.10.0-0rc0.fc18.x86_64 libguestfs calls virInitialize, but (since there is no cleanup function) doesn't do any corresponding cleanup. Is that correct? Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming blog: http://rwmj.wordpress.com Fedora now supports 80 OCaml packages (the OPEN alternative to F#) http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora

3 3

[libvirt] [libvirt-snmp] [PATCH] Fix build rules to use LDADD to add libraries
by Doug Goldstein 13 Aug '12

13 Aug '12

Fix build rules to use LDADD to add libraries to support --as-needed. Also refactored some of the other automake variables in the same fashion of the libvirt's automake rules. Signed-off-by: Doug Goldstein <cardoe(a)cardoe.com> --- configure.ac | 4 ++++ src/Makefile.am | 31 ++++++++++++++++--------------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index a2bb1ac..9d7d03c 100644 --- a/configure.ac +++ b/configure.ac @@ -3,6 +3,10 @@ AM_INIT_AUTOMAKE([-Wall -Werror]) AC_CONFIG_HEADERS([config.h]) AC_PREREQ([2.50]) + +AC_PROG_CC +AM_PROG_CC_C_O + AC_CHECK_FUNCS([memset]) AC_CHECK_FUNCS([strdup]) AC_CHECK_HEADERS([stdlib.h]) diff --git a/src/Makefile.am b/src/Makefile.am index 6d27bf5..622a280 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,19 +1,5 @@ bin_PROGRAMS=libvirtMib_subagent -AM_CFLAGS = \ - $(COVERAGE_CFLAGS) \ - $(DRIVER_MODULE_CFLAGS) \ - $(SNMP_CFLAGS) \ - $(LIBVIRT_CFLAGS) \ - $(WARN_CFLAGS) \ - $(LOCK_CHECKING_CFLAGS) - -AM_LDFLAGS = \ - $(COVERAGE_LDFLAGS) \ - $(PTHREAD_LIBS) \ - $(LIBVIRT_LIBS) \ - $(SNMP_LIBS) - LIBVIRT_OLD_SRCS = \ threads.c \ event_poll.c \ @@ -58,7 +44,22 @@ HDRS = \ libvirtGuestTable.h libvirtMib_subagent_SOURCES=${SRCS} ${HDRS} -libvirtMib_subagent_LDFLAGS=${AM_LDFLAGS} + +libvirtMib_subagent_CFLAGS= \ + $(DRIVER_MODULE_CFLAGS) \ + $(SNMP_CFLAGS) \ + $(LIBVIRT_CFLAGS) \ + $(COVERAGE_CFLAGS) \ + $(WARN_CFLAGS) \ + $(LOCK_CHECKING_CFLAGS) + +libvirtMib_subagent_LDFLAGS= \ + $(COVERAGE_LDFLAGS) + +libvirtMib_subagent_LDADD= \ + $(PTHREAD_LIBS) \ + $(LIBVIRT_LIBS) \ + $(SNMP_LIBS) if LIBVIRT_OLD libvirtMib_subagent_SOURCES+=${LIBVIRT_OLD_SRCS} ${LIBVIRT_OLD_HDRS} -- 1.7.8.6

3 2

[libvirt] [PATCH v3] json: fix interface locale dependency
by Martin Kletzander 13 Aug '12

13 Aug '12

I'm trying to get a optimized and reusable version of the code fixing libvirt's locale dependency. This time I'm sending two versions of the patch: v1) adds static function virNumberToStr() that converts one number to string base on a parameter defining the format. For float, double and long double there are functions that should be used in the code. v2) adds function for converting only double to string. This version has also a little bit differently separated the conditional code. I personally like the second version better. for two reasons. 1) it looks better, 2) there is no need for special-formatting with C locale unless the result is being parsed by machine in which case the '%lf' is always sufficient. Martin Kletzander (1): json: fix interface locale dependency bootstrap.conf | 1 + configure.ac | 2 +- src/libvirt_private.syms | 3 + src/util/json.c | 2 +- src/util/util.c | 137 ++++++++++++++++++++++++++++++++++++++++++++++ src/util/util.h | 7 ++ 6 files changed, 150 insertions(+), 2 deletions(-) -- 1.7.8.6

2 4

[libvirt] [PATCH 0/1] Add VLAN capability to openvswitch virtualport types
by Kyle Mestery 13 Aug '12

13 Aug '12

With this change, it is now possible to support VLANs (both access and trunks) for openvswitch ports in libvirt. This also takes into account the profileid parameter, as the vlantag parameter is also optional. Examples of this configuration are below. Setup the port as an access port: <interface type='bridge'> <mac address='52:54:00:30:23:a6'/> <source bridge='data-br'/> <virtualport type='openvswitch'> <parameters interfaceid='cdbbbc31-b7fe-16ca-a715-cc7cc76e18b2' vlantag='70'/> </virtualport> <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> Setup the port as an trunk port: <interface type='bridge'> <mac address='52:54:00:30:23:a6'/> <source bridge='data-br'/> <virtualport type='openvswitch'> <parameters interfaceid='cdbbbc31-b7fe-16ca-a715-cc7cc76e18b2' vlantag='70,71,72'/> </virtualport> <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> src/conf/netdev_vport_profile_conf.c | 34 ++++++++++++++++++++++++++++++---- src/util/virnetdevopenvswitch.c | 23 +++++++++++++++++++++-- src/util/virnetdevvportprofile.h | 2 ++ 3 files changed, 53 insertions(+), 6 deletions(-) -- 1.7.11.2

5 10

[libvirt] [PATCH] Release only specific sanlock resource
by Frido Roose 13 Aug '12

13 Aug '12

This is a patch for bug 826704 All sanlock resources get released when hot-dettaching a disk from the domain because virLockManagerSanlockRelease uses the wrong function parameters/flags. With the patch only the resources that should be released are cleaned up. --- src/locking/lock_driver_sanlock.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 7c71af3..0625d09 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -814,7 +814,7 @@ static int virLockManagerSanlockRelease(virLockManagerPtr lock, unsigned int flags) { virLockManagerSanlockPrivatePtr priv = lock->privateData; - int res_count; + int res_count=priv->res_count; int rv; virCheckFlags(0, -1); @@ -834,7 +834,7 @@ static int virLockManagerSanlockRelease(virLockManagerPtr lock, VIR_FREE(*state); } - if ((rv = sanlock_release(-1, priv->vm_pid, SANLK_REL_ALL, 0, NULL)) < 0) { + if ((rv = sanlock_release(-1, priv->vm_pid, 0, res_count, priv->res_args)) < 0) { if (rv <= -200) virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to release lock: error %d"), rv); -- 1.7.1

1 0

[libvirt] [PATCH] build: fix binary location in stap files --with-driver-modules
by Laine Stump 13 Aug '12

13 Aug '12

libvirt_qemu_probes.stp stopped working after switching to a build that used --with-driver-modules. This was because the symbols listed int libvirt_qemu_probes.stp are no longer in $(bindir)/libvirtd, but are now in $(libdir)/connection-driver/libvirt_driver_qemu.so. This patch enhances dtrace2systemtap.pl (which generates the .stp files from .d files) to look for a new "module" setting in the comments of the .d file (similar to the existing "binary" setting), and to look for a --with-modules option. If the --with-modules option is set *and* a "module" setting is present in the .d file, the process name for the stap line is set to $libdir/$module If either of these isn't true, it reverts to the old behavior. src/Makefile.am was also modified to add the --with-modules option when the build calls for it, and src/libvirt_qemu_probes.d has added a "module" line pointing to the correct .so file for the qemu driver. --- src/Makefile.am | 7 +++++-- src/dtrace2systemtap.pl | 12 ++++++++++++ src/libvirt_qemu_probes.d | 1 + 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 6ed4a41..79b4e59 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1393,6 +1393,9 @@ nodist_libvirt_la_SOURCES = libvirt_probes.h if WITH_REMOTE nodist_libvirt_driver_remote_la_SOURCES = libvirt_probes.h endif WITH_REMOTE +if WITH_DRIVER_MODULES +DTRACE2SYSTEMTAP_FLAGS = --with-modules +endif BUILT_SOURCES += libvirt_probes.h libvirt_probes.stp libvirt_functions.stp @@ -1429,9 +1432,9 @@ RPC_PROBE_FILES = $(srcdir)/rpc/virnetprotocol.x \ libvirt_functions.stp: $(RPC_PROBE_FILES) $(srcdir)/rpc/gensystemtap.pl $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gensystemtap.pl $(RPC_PROBE_FILES) > $@ -%_probes.stp: %_probes.d $(srcdir)/dtrace2systemtap.pl +%_probes.stp: %_probes.d $(srcdir)/dtrace2systemtap.pl $(top_builddir)/config.status $(AM_V_GEN)$(PERL) -w $(srcdir)/dtrace2systemtap.pl \ - $(bindir) $(sbindir) $(libdir) $< > $@ + $(DTRACE2SYSTEMTAP_FLAGS) $(bindir) $(sbindir) $(libdir) $< > $@ CLEANFILES += libvirt_probes.h libvirt_probes.o libvirt_probes.lo \ libvirt_qemu_probes.h libvirt_qemu_probes.o \ diff --git a/src/dtrace2systemtap.pl b/src/dtrace2systemtap.pl index c8d42d7..d57de68 100755 --- a/src/dtrace2systemtap.pl +++ b/src/dtrace2systemtap.pl @@ -31,6 +31,13 @@ my $file; my @files; my %files; +my $with_modules = 0; +if ($ARGV[0] eq "--with-modules") { + # set if we want to honor the "module" setting in the .d file + $with_modules = 1; + shift @ARGV; +} + my $bindir = shift @ARGV; my $sbindir = shift @ARGV; my $libdir = shift @ARGV; @@ -54,6 +61,8 @@ while (<>) { $files{$file}->{prefix} = $1; } elsif (m,^\s*\#\s*binary:\s*(\S+)\s*$,) { $files{$file}->{binary} = $1; + } elsif (m,^\s*\#\s*module:\s*(\S+)\s*$,) { + $files{$file}->{module} = $1; } else { # ignore unknown comments } @@ -98,6 +107,9 @@ foreach my $file (@files) { if (exists $files{$file}->{binary}) { $binary = $sbindir . "/" . $files{$file}->{binary}; } + if ($with_modules && exists $files{$file}->{module}) { + $binary = $libdir . "/" . $files{$file}->{module}; + } print "probe $pname = process(\"$binary\").mark(\"$name\") {\n"; diff --git a/src/libvirt_qemu_probes.d b/src/libvirt_qemu_probes.d index 6916778..e4449a9 100644 --- a/src/libvirt_qemu_probes.d +++ b/src/libvirt_qemu_probes.d @@ -2,6 +2,7 @@ provider libvirt { # file: src/qemu/qemu_monitor.c # prefix: qemu # binary: libvirtd + # module: libvirt/connection-driver/libvirt_driver_qemu.so # Monitor lifecycle probe qemu_monitor_new(void *mon, int refs, int fd); probe qemu_monitor_ref(void *mon, int refs); -- 1.7.11.2

3 3

[libvirt] Proposal to add iSCSI support to esx storage driver
by Ata Bohra 12 Aug '12

12 Aug '12

Hi All, I just want to go over the design that I am working on to incorporate iSCSI support to libvirt ESX storage driver. The highlights are: Current Implementation At present esx_storage_driver supports only VMFS type datastore and does not provide much leeway to enhance or add other supported storage pools such as iSCSI. Proposal My proposal is: 1. Split the current code such as esx_storage_driver becomes more like a facade; this driver will use "backend" drivers to perform the request task (such as: esx_storage_backend_iscsi and esx_storage_backend_vmfs) 2. Based on the pool type (lookup can determine storage pool type), the base driver then invoke the appropriate backend driver routine to get the job done. 3. Backend driver shall implement same routines exposed by esx_storage_driver if needed, but the implementation will be pertinent to its specific type. The main intention is get early feedback w.r.t the above proposed design. This allows me to make changes quickly before I present the code for review and am sure will help expedite the overall review process as well. Thanks for your suggestions/comments. Thanks & Regards, Ata E Husain Bohra Appendex: Sample code to implement .lookupByName for esx storage driver static virStoragePoolPtr esxStoragePoolLookupByName(virConnectPtr conn, const char *name) { esxPrivate *priv = conn->storagePrivateData; virStoragePoolPtr pool = NULL; int i = 0; if (esxVI_EnsureSession(priv->primary) < 0) { return NULL; } for (i = 0; i < MAX_BACKEND_DRIVER; ++i) { pool = backendDrv[i]->poolLookupByName(conn, name); // backendDrv are pointer to backend storage drivers. if (pool != NULL) { break; } } return pool; }

2 4

[libvirt] [PATCH v2] json: fix interface locale dependency
by Martin Kletzander 11 Aug '12

11 Aug '12

libvirt creates invalid commands if wrong locale is selected. For example with locale that uses comma as a decimal point, JSON commands created with decimal numbers are invalid because comma separates the entries in JSON. Fortunately even when decimal point is affected, thousands grouping is not, because for grouping to be enabled with *printf, there has to be an apostrophe flag specified (and supported). This patch adds specific internal function for printing with C locale and a fallback for the particular case with double formatting in case these functions are not supported. --- v2: - added support for xlocale - fallback option kept, but main function moved to util.c src/libvirt_private.syms | 1 + src/util/json.c | 23 ++++++++++++++++++++++- src/util/util.c | 42 ++++++++++++++++++++++++++++++++++++++++++ src/util/util.h | 2 ++ 4 files changed, 67 insertions(+), 1 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 79b4a18..6ce87bf 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1138,6 +1138,7 @@ safezero; virArgvToString; virAsprintf; virBuildPathInternal; +virCasprintf; virDirCreate; virEnumFromString; virEnumToString; diff --git a/src/util/json.c b/src/util/json.c index 5132989..3dfa039 100644 --- a/src/util/json.c +++ b/src/util/json.c @@ -22,6 +22,7 @@ #include <config.h> +#include <locale.h> #include "json.h" #include "memory.h" @@ -201,8 +202,28 @@ virJSONValuePtr virJSONValueNewNumberDouble(double data) { virJSONValuePtr val = NULL; char *str; - if (virAsprintf(&str, "%lf", data) < 0) + + int ret = virCasprintf(&str, "%lf", data) + + if (ret == -1) { return NULL; + } else if (ret == -2) { + char *radix, *tmp; + struct lconv *lc; + + if ((ret = virAsprintf(&str, "%lf", data)) < 0) + return NULL; + + lc = localeconv(); + radix = lc->decimal_point; + tmp = strstr(str, radix); + if (tmp) { + *tmp = '.'; + if (strlen(radix) > 1) + memmove(tmp + 1, tmp + strlen(radix), strlen(str) - (tmp - str)); + } + } + val = virJSONValueNewNumber(str); VIR_FREE(str); return val; diff --git a/src/util/util.c b/src/util/util.c index e5bb27b..de090a6 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -44,6 +44,7 @@ #include <signal.h> #include <termios.h> #include <pty.h> +#include <locale.h> #if HAVE_LIBDEVMAPPER_H # include <libdevmapper.h> @@ -2003,6 +2004,47 @@ virAsprintf(char **strp, const char *fmt, ...) } /** + * virCasprintf + * + * the same as virAsprintf, but with C locale (thread-safe) + * + * If thread-safe locales aren't supported, then the return value is -2, + * no memory (or other vasnprintf errors) results in -1. + * When successful, the value returned by virAsprintf is passed. + */ +#if HAVE_XLOCALE_H +int +virCasprintf(char **strp, const char *fmt, ...) +{ + va_list ap; + int ret = -1; + locale_t c_loc, old_loc; + c_loc = newlocale(LC_ALL, "C", NULL); + if (!c_loc) + goto no_memory; + + old_loc = uselocale(c_loc); + + va_start(ap, fmt); + ret = virVasprintf(strp, fmt, ap); + va_end(ap); + + uselocale(old_loc); + + no_memory: + freelocale(c_loc); + return ret; +} +#else +int +virCasprintf(char **strp ATTRIBUTE_UNUSED, + const char *fmt ATTRIBUTE_UNUSED, ...) +{ + return -2; +} +#endif + +/** * virStrncpy * * A safe version of strncpy. The last parameter is the number of bytes diff --git a/src/util/util.h b/src/util/util.h index d151c27..4b7f286 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -201,6 +201,8 @@ int virParseVersionString(const char *str, unsigned long *version, bool allowMissing); int virAsprintf(char **strp, const char *fmt, ...) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_FMT_PRINTF(2, 3); +int virCasprintf(char **strp, const char *fmt, ...) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_FMT_PRINTF(2, 3); int virVasprintf(char **strp, const char *fmt, va_list list) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_FMT_PRINTF(2, 0); char *virStrncpy(char *dest, const char *src, size_t n, size_t destbytes) -- 1.7.8.6

2 4

[libvirt] [PATCH] virterror: Add error message for unsupported operations.
by Peter Krempa 11 Aug '12

11 Aug '12

This patch introduces a new error code VIR_ERR_OPERATION_UNSUPPORTED to mark error messages regarding operations that failed due to lack of support on the hypervisor or other than libvirt issues. The code is first used in reporting error if qemu does not support block IO tuning variables yielding error message: error: Unable to get block I/O throttle parameters error: Operation not supported: block_io_throttle field 'total_bytes_sec' missing in qemu's output instead of: error: Unable to get block I/O throttle parameters error: internal error cannot read total_bytes_sec --- include/libvirt/virterror.h | 2 ++ src/qemu/qemu_monitor_json.c | 4 ++-- src/util/virterror.c | 6 ++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h index ad8e101..913fc5d 100644 --- a/include/libvirt/virterror.h +++ b/include/libvirt/virterror.h @@ -277,6 +277,8 @@ typedef enum { VIR_ERR_MIGRATE_UNSAFE = 81, /* Migration is not safe */ VIR_ERR_OVERFLOW = 82, /* integer overflow */ VIR_ERR_BLOCK_COPY_ACTIVE = 83, /* action prevented by block copy job */ + VIR_ERR_OPERATION_UNSUPPORTED = 84, /* The requested operation is not + supported */ } virErrorNumber; /** diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 3ede88d..7e482d1 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -3652,11 +3652,11 @@ int qemuMonitorJSONOpenGraphics(qemuMonitorPtr mon, if (virJSONValueObjectGetNumberUlong(inserted, \ FIELD, \ &reply->STORE) < 0) { \ - virReportError(VIR_ERR_INTERNAL_ERROR, \ + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, \ _("block_io_throttle field '%s' missing " \ "in qemu's output"), \ #STORE); \ - goto cleanup; \ + goto cleanup; \ } static int qemuMonitorJSONBlockIoThrottleInfo(virJSONValuePtr result, diff --git a/src/util/virterror.c b/src/util/virterror.c index a40cfe0..c438de8 100644 --- a/src/util/virterror.c +++ b/src/util/virterror.c @@ -1185,6 +1185,12 @@ virErrorMsg(virErrorNumber error, const char *info) else errmsg = _("block copy still active: %s"); break; + case VIR_ERR_OPERATION_UNSUPPORTED: + if (!info) + errmsg = _("Operation not supported"); + else + errmsg = _("Operation not supported: %s"); + break; } return errmsg; } -- 1.7.8.6

3 5

[libvirt] [PATCH] Fix timebomb in LIBVIRT_VERSION_INFO calculation
by Daniel P. Berrange 10 Aug '12

10 Aug '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> The way LIBVIRT_VERSION_INFO is calculated has a timebomb that will cause us to accidentally break soname when we change the major version number to a non-zero value ! Given CURRENT:REVISION:AGE, libtool will generate libvirt.so.($CURRENT-$AGE).$AGE.$REVISION We set CURRENT to be MAJOR+MINOR and AGE to $MINOR, so as soon as MAJOR changes to non-zero, we get libvirt.so.1 as the soname, eg 1.3.9 would create libvirt.so.1.3.9 Looks natural but is not ABI compatible with libvirt.so.0.x.y The fix is to set CURRENT to always be exactly the same as AGE. We want to have the major version reflected in the so symlinks though. So then we set AGE to MAJOR*1000+MINOR eg, so 1.3.9 would create libvirt.so.0.1003.9 and libvirt 2.51.3 would create libvirt.so.0.2051.3 --- configure.ac | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 8a04d91..8de2c6c 100644 --- a/configure.ac +++ b/configure.ac @@ -23,16 +23,55 @@ AM_SILENT_RULES([yes]) AC_CANONICAL_HOST +# First extract pieces from the version number string LIBVIRT_MAJOR_VERSION=`echo $VERSION | awk -F. '{print $1}'` LIBVIRT_MINOR_VERSION=`echo $VERSION | awk -F. '{print $2}'` LIBVIRT_MICRO_VERSION=`echo $VERSION | awk -F. '{print $3}'` LIBVIRT_VERSION=$LIBVIRT_MAJOR_VERSION.$LIBVIRT_MINOR_VERSION.$LIBVIRT_MICRO_VERSION$LIBVIRT_MICRO_VERSION_SUFFIX -LIBVIRT_VERSION_INFO=`expr $LIBVIRT_MAJOR_VERSION + $LIBVIRT_MINOR_VERSION`:$LIBVIRT_MICRO_VERSION:$LIBVIRT_MINOR_VERSION LIBVIRT_VERSION_NUMBER=`expr $LIBVIRT_MAJOR_VERSION \* 1000000 + $LIBVIRT_MINOR_VERSION \* 1000 + $LIBVIRT_MICRO_VERSION` +# In libtool terminology we need to figure out: +# +# CURRENT +# The most recent interface number that this library implements. +# +# REVISION +# The implementation number of the CURRENT interface. +# +# AGE +# The difference between the newest and oldest interfaces that this +# library implements. +# +# In other words, the library implements all the interface numbers +# in the range from number `CURRENT - AGE' to `CURRENT'. +# +# Libtool assigns the soname version from `CURRENT - AGE', and we +# don't want that to ever change in libvirt. ie it must always be +# zero, to produce libvirt.so.0. +# +# We would, however, like the libvirt version number reflected +# in the so version'd symlinks, and this is based on AGE.REVISION +# eg libvirt.so.0.AGE.REVISION +# +# Assuming we do ever want to break soname version, this can +# toggled. But seriously, don't ever touch this. +LIBVIRT_SONUM=0 + +# The following examples show what libtool will do +# +# Input: 0.9.14 -> libvirt.so.0.9.14 +# Input: 1.0.0 -> libvirt.so.0.1000.0 +# Input: 2.5.8 -> libvirt.so.0.2005.8 +# +AGE=`expr $LIBVIRT_MAJOR_VERSION '*' 1000 + $LIBVIRT_MINOR_VERSION` +REVISION=$LIBVIRT_MICRO_VERSION +CURRENT=`expr $LIBVIRT_SONUM + $AGE` +LIBVIRT_VERSION_INFO=$CURRENT:$REVISION:$AGE + AC_SUBST([LIBVIRT_MAJOR_VERSION]) AC_SUBST([LIBVIRT_MINOR_VERSION]) AC_SUBST([LIBVIRT_MICRO_VERSION]) +AC_SUBST([LIBVIRT_SONUM]) AC_SUBST([LIBVIRT_VERSION]) AC_SUBST([LIBVIRT_VERSION_INFO]) AC_SUBST([LIBVIRT_VERSION_NUMBER]) -- 1.7.11.2

2 1

[libvirt] [PATCH 0/7] qapi: add commands to remove the need to parse -help output
by Anthony Liguori 10 Aug '12

10 Aug '12

This series implements the necessary commands to implements danpb's idea to remove -help parsing in libvirt. We would introduce all of these commands in 1.2 and then change the -help output starting in 1.3. Here is Dan's plan from a previous thread: <danpb> Basically I'd sum up my new idea as "just use QMP". * No new command line arguments like -capabilities * libvirt invokes something like $QEMUBINARY -qmp CHARDEV -nodefault -nodefconfig -nographics * libvirt then runs a number of QMP commands to find out what it needs to know. I'd expect the following existing commands would be used - query-version - already supported - query-commands - already supported - query-events - already supported - query-kvm - already supported - qom-{list,list-types,get} - already supported - query-spice/vnc - already supported And add the following new commands - query-devices - new, -device ?, and/or -device NAME,? data in QMP - query-machines - new, -M ? in QMP - query-cpu-types - new, -cpu ? in QMP The above would take care of probably 50% of the current libvirt capabilities probing, including a portion of the -help stuff. Then there is all the rest of the crap we detect from the -help. We could just take the view, that "as of 1.2", we assume everything we previously detected is just available by default, and thus don't need to probe it. For stuff that is QOM based, I expect we'll be able to detect new features in the future using the qom-XXX monitor commands. For stuff that is non-qdev, and non-qom, libvirt can just do a plain version number check, unless we decide there is specific info worth exposing via other new 'query-XXX' monitor commands. Basically I'd sum up my new idea as "just use QMP". * No new command line arguments like -capabilities * libvirt invokes something like $QEMUBINARY -qmp CHARDEV -nodefault -nodefconfig -nographics * libvirt then runs a number of QMP commands to find out what it needs to know. I'd expect the following existing commands would be used - query-version - already supported - query-commands - already supported - query-events - already supported - query-kvm - already supported - qom-{list,list-types,get} - already supported - query-spice/vnc - already supported And add the following new commands - query-devices - new, -device ?, and/or -device NAME,? data in QMP - query-machines - new, -M ? in QMP - query-cpu-types - new, -cpu ? in QMP The above would take care of probably 50% of the current libvirt capabilities probing, including a portion of the -help stuff. Then there is all the rest of the crap we detect from the -help. We could just take the view, that "as of 1.2", we assume everything we previously detected is just available by default, and thus don't need to probe it. For stuff that is QOM based, I expect we'll be able to detect new features in the future using the qom-XXX monitor commands. For stuff that is non-qdev, and non-qom, libvirt can just do a plain version number check, unless we decide there is specific info worth exposing via other new 'query-XXX' monitor commands. </danpb> The one thing to note is that I didn't add a query-devices command because you can already do: qmp query-devices --implements=device --abstract=False To get the equivalent output of -device ?. Instead, I added a command to list specific properties of a device which is the equivalent of -device FOO,?

7 42

[libvirt] [PATCH v8 0/7] file descriptor passing using fd sets
by Corey Bryant 10 Aug '12

10 Aug '12

libvirt's sVirt security driver provides SELinux MAC isolation for Qemu guest processes and their corresponding image files. In other words, sVirt uses SELinux to prevent a QEMU process from opening files that do not belong to it. sVirt provides this support by labeling guests and resources with security labels that are stored in file system extended attributes. Some file systems, such as NFS, do not support the extended attribute security namespace, and therefore cannot support sVirt isolation. A solution to this problem is to provide fd passing support, where libvirt opens files and passes file descriptors to QEMU. This, along with SELinux policy to prevent QEMU from opening files, can provide image file isolation for NFS files stored on the same NFS mount. This patch series adds the add-fd, remove-fd, and query-fdsets QMP monitor commands, which allow file descriptors to be passed via SCM_RIGHTS, and assigned to specified fd sets. This allows fd sets to be created per file with fds having, for example, different access rights. When QEMU needs to reopen a file with different access rights, it can search for a matching fd in the fd set. Fd sets also allow for easy tracking of fds per file, helping to prevent fd leaks. Support is also added to the block layer to allow QEMU to dup an fd from an fdset when the filename is of the /dev/fdset/nnn format, where nnn is the fd set ID. No new SELinux policy is required to prevent open of NFS files (files with type nfs_t). The virt_use_nfs boolean type simply needs to be set to false, and open will be prevented (and dup will be allowed). For example: # setsebool virt_use_nfs 0 # getsebool virt_use_nfs virt_use_nfs --> off Corey Bryant (7): qemu-char: Add MSG_CMSG_CLOEXEC flag to recvmsg qapi: Introduce add-fd, remove-fd, query-fdsets monitor: Clean up fd sets on monitor disconnect block: Prevent detection of /dev/fdset/ as floppy block: Convert open calls to qemu_open block: Convert close calls to qemu_close block: Enable qemu_open/close to work with fd sets block/raw-posix.c | 46 +++++---- block/raw-win32.c | 6 +- block/vdi.c | 5 +- block/vmdk.c | 25 ++--- block/vpc.c | 4 +- block/vvfat.c | 16 +-- cutils.c | 5 + monitor.c | 294 +++++++++++++++++++++++++++++++++++++++++++++++++++++ monitor.h | 5 + osdep.c | 117 +++++++++++++++++++++ qapi-schema.json | 98 ++++++++++++++++++ qemu-char.c | 12 ++- qemu-common.h | 2 + qemu-tool.c | 20 ++++ qmp-commands.hx | 117 +++++++++++++++++++++ savevm.c | 4 +- 16 files changed, 721 insertions(+), 55 deletions(-) -- 1.7.10.4

4 22

[libvirt] [PATCH 0/3] Minor docs fixes
by Martin Kletzander 10 Aug '12

10 Aug '12

Here are some fixes I was still having in my local branch. I finally found a way to generate search.php automatically (even though it is not the way I wanted it) and since the others are fixing docs as well, I'm sending them in a series. Last patch of the series is more like a question if we can change it or not. Martin Kletzander (3): docs: fix 404 page when fetched from different location docs: autogenerate search.php docs/virsh: various minor fixes .gitignore | 1 + docs/404.html.in | 2 +- docs/Makefile.am | 24 +++++++- docs/api_extension.html.in | 4 -- docs/pending.html.in | 4 -- docs/{search.php => search.php.code.in} | 90 ++----------------------------- docs/search.php.in | 17 ++++++ docs/site.xsl | 11 ++++- tools/virsh-host.c | 4 +- 9 files changed, 57 insertions(+), 100 deletions(-) rename docs/{search.php => search.php.code.in} (66%) create mode 100644 docs/search.php.in -- 1.7.8.6

2 9

[libvirt] Maven2 packages for libvirt-java
by Wido den Hollander 10 Aug '12

10 Aug '12

Hi, Is de /maven2 [0] directory at libvirt.org still maintained? It currently contains up to libvirt-java 0.4.7, while 0.4.8 is out. If it is still maintained, could 0.4.8 be added? Thanks! Wido [0]: http://www.libvirt.org/maven2/org/libvirt/libvirt/

2 4

[libvirt] Question about networkNotifyActualDevice
by Shradha Shah 10 Aug '12

10 Aug '12

Hello All, I have recently found a bug in my patches to support forward mode="hostdev". The bug is that libvirtd restart forgets about the netdef->forwardIfs. Steps to reproduce: 1) virsh net-define hostdev.xml <network> <name>hostdev</name> <uuid>81ff0d90-c91e-6742-64da-4a736edb9a8f</uuid> <forward mode='hostdev' managed='yes'> <pf dev='eth4'/> </forward> </network> 2) virsh define guest.xml 3) virsh start guest [root@c6100m libvirt]# virsh net-dumpxml hostdev <network> <name>hostdev</name> <uuid>81ff0d90-c91e-6742-64da-4a736edb9a8f</uuid> <forward managed='yes' mode='hostdev'> <pf dev='eth4'/> <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x2'/> <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x4'/> <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x6'/> <address type='pci' domain='0x0000' bus='0x04' slot='0x01' function='0x0'/> <address type='pci' domain='0x0000' bus='0x04' slot='0x01' function='0x2'/> <address type='pci' domain='0x0000' bus='0x04' slot='0x01' function='0x4'/> <address type='pci' domain='0x0000' bus='0x04' slot='0x01' function='0x6'/> <address type='pci' domain='0x0000' bus='0x04' slot='0x02' function='0x0'/> </forward> </network> 4) service libvirtd restart After libvirtd is restarted I observe that the guest is shutdown. /var/log/libvirt/libvirtd.log complains with the following error message: networkNotifyActualDevice:3299 : internal error network 'hostdev' doesn't have dev in use by domain. Using gdb when I breakpoint on networkNotifyActualDevice on libvirtd start I observe that netdef->nForwardIfs has been reset to 0, but netdef->nForwardPfs is correctly assigned to 1. So my question is does libvirtd restart cause the network to remember only the inactive XML and not the active XML? Does anyone have any ideas on how I should proceed on this bug? -- Many Thanks, Regards, Shradha Shah

2 1

[libvirt] Segfault problem with nwfilter-define in Libvirt
by [Vo2Labs] Jean-Charles Passard 10 Aug '12

10 Aug '12

Hello, At first a big thanks to Laine, who kindly tried to help me ! My problem is the following : I use a linux from scratch distro ( home made) pure X86_64 glibc 2.10.1 gcc 4.4.1 uname -a SMP Sat Aug 4 20:07:49 CEST 2012 x86_64 x86_64 x86_64 GNU/Linux Each time I use nwfilter-define, libvirtd crash with a segfault. I tried nearly all version from 0.9.8 to 0.9.13 and even 0.10 with the same problem Here is a sample of newfilter.xml : <filter name='nova-base'> <filterref filter='no-ip-spoofing'/> </filter> and here the bt unde gdb with v0.9.13 #0 __pthread_mutex_lock (mutex=0x0) at pthread_mutex_lock.c:50 #1 0x00007ffff77ba07e in virNWFilterCallbackDriversLock () at conf/nwfilter_conf.c:2846 #2 0x00007fffe8ed9d24 in nwfilterDefine (conn=0x67d8e0, xml=0x67e000 "<filter name='nova-base'>\n\t<filterref filter='no-ip-spoofing'/>\n</filter>\n\n") at nwfilter/nwfilter_driver.c:348 #3 0x00007ffff77eb753 in virNWFilterDefineXML (conn=0x67d8e0, xmlDesc=0x67e000 "<filter name='nova-base'>\n\t<filterref filter='no-ip-spoofing'/>\n</filter>\n\n") at libvirt.c:15925 #4 0x000000000041969c in remoteDispatchNWFilterDefineXML (ret=<optimized out>, args=<optimized out>, rerr=<optimized out>, msg=<optimized out>, client=<optimized out>, server=<optimized out>) at remote_dispatch.h:10442 #5 remoteDispatchNWFilterDefineXMLHelper (server=<optimized out>, client=0x67d210, msg=<optimized out>, rerr=0x7fffec57cf60, args=0x67dea0, ret=0x67ba20) at remote_dispatch.h:10422 #6 0x00007ffff784d48d in virNetServerProgramDispatchCall (msg=<optimized out>, client=<optimized out>, server=<optimized out>, prog=<optimized out>) at rpc/virnetserverprogram.c:416 #7 virNetServerProgramDispatch (prog=0x675090, server=0x670370, client=0x67d210, msg=0x67e3d0) at rpc/virnetserverprogram.c:289 #8 0x00007ffff784a0d1 in virNetServerHandleJob (jobOpaque=<optimized out>, opaque=0x670370) at rpc/virnetserver.c:161 #9 0x00007ffff776d282 in virThreadPoolWorker (opaque=<optimized out>) at util/threadpool.c:143 #10 0x00007ffff776c926 in virThreadHelper (data=<optimized out>) at util/threads-pthread.c:161 #11 0x00007ffff457257a in start_thread (arg=<optimized out>) at pthread_create.c:297 #12 0x00007ffff3edd14d in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:115 Thank for help JC

5 6

[libvirt] [PATCH] build: fix PROBE() usage of intptr_t
by Eric Blake 09 Aug '12

09 Aug '12

Otherwise, in locations like virobject.c where PROBE is used, for certain configure options, the compiler warns: util/virobject.c:110:1: error: 'intptr_t' undeclared (first use in this function) As long as we are making this header always available, we can clean up several other files. * src/internal.h (includes): Pull in <stdint.h>. * src/conf/nwfilter_conf.h: Rely on internal.h. * src/storage/storage_backend.c: Likewise. * src/storage/storage_backend.h: Likewise. * src/util/cgroup.c: Likewise. * src/util/sexpr.h: Likewise. * src/util/virhashcode.h: Likewise. * src/util/virnetdevvportprofile.h: Likewise. * src/util/virnetlink.h: Likewise. * src/util/virrandom.h: Likewise. * src/vbox/vbox_driver.c: Likewise. * src/xenapi/xenapi_driver.c: Likewise. * src/xenapi/xenapi_utils.c: Likewise. * src/xenapi/xenapi_utils.h: Likewise. * src/xenxs/xenxs_private.h: Likewise. * tests/storagebackendsheepdogtest.c: Likewise. Reported by Matthias Bolte. --- Almost qualifies for the build-breaker rule, except that I didn't reproduce the particular configure settings that Matthias was experiencing on IRC. src/conf/nwfilter_conf.h | 5 +---- src/internal.h | 1 + src/storage/storage_backend.c | 1 - src/storage/storage_backend.h | 3 +-- src/util/cgroup.c | 1 - src/util/sexpr.h | 8 ++------ src/util/virhashcode.h | 1 - src/util/virnetdevvportprofile.h | 4 +--- src/util/virnetlink.h | 2 -- src/util/virrandom.h | 1 - src/vbox/vbox_driver.c | 4 +--- src/xenapi/xenapi_driver.c | 1 - src/xenapi/xenapi_utils.c | 1 - src/xenapi/xenapi_utils.h | 2 +- src/xenxs/xenxs_private.h | 3 +-- tests/storagebackendsheepdogtest.c | 2 -- 16 files changed, 9 insertions(+), 31 deletions(-) diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h index 8b05d04..ca6bd16 100644 --- a/src/conf/nwfilter_conf.h +++ b/src/conf/nwfilter_conf.h @@ -2,7 +2,7 @@ * nwfilter_conf.h: network filter XML processing * (derived from storage_conf.h) * - * Copyright (C) 2006-2010 Red Hat, Inc. + * Copyright (C) 2006-2010, 2012 Red Hat, Inc. * Copyright (C) 2006-2008 Daniel P. Berrange * * Copyright (C) 2010 IBM Corporation @@ -26,9 +26,6 @@ #ifndef NWFILTER_CONF_H # define NWFILTER_CONF_H -# include <stdint.h> -# include <stddef.h> - # include "internal.h" # include "util.h" diff --git a/src/internal.h b/src/internal.h index fd8d190..300de3a 100644 --- a/src/internal.h +++ b/src/internal.h @@ -9,6 +9,7 @@ # include <limits.h> # include <verify.h> # include <stdbool.h> +# include <stdint.h> # if STATIC_ANALYSIS # undef NDEBUG /* Don't let a prior NDEBUG definition cause trouble. */ diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 4a2109e..df3833a 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -32,7 +32,6 @@ #include <sys/wait.h> #include <unistd.h> #include <fcntl.h> -#include <stdint.h> #include <sys/stat.h> #include <sys/param.h> #include <dirent.h> diff --git a/src/storage/storage_backend.h b/src/storage/storage_backend.h index bafd6b6..5352f5d 100644 --- a/src/storage/storage_backend.h +++ b/src/storage/storage_backend.h @@ -1,7 +1,7 @@ /* * storage_backend.h: internal storage driver backend contract * - * Copyright (C) 2007-2010 Red Hat, Inc. + * Copyright (C) 2007-2010, 2012 Red Hat, Inc. * Copyright (C) 2007-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -24,7 +24,6 @@ #ifndef __VIR_STORAGE_BACKEND_H__ # define __VIR_STORAGE_BACKEND_H__ -# include <stdint.h> # include "internal.h" # include "storage_conf.h" # include "command.h" diff --git a/src/util/cgroup.c b/src/util/cgroup.c index 6c29c87..2256c23 100644 --- a/src/util/cgroup.c +++ b/src/util/cgroup.c @@ -24,7 +24,6 @@ #include <config.h> #include <stdio.h> -#include <stdint.h> #if defined HAVE_MNTENT_H && defined HAVE_GETMNTENT_R # include <mntent.h> #endif diff --git a/src/util/sexpr.h b/src/util/sexpr.h index 8dfd89a..b4b41ed 100644 --- a/src/util/sexpr.h +++ b/src/util/sexpr.h @@ -1,9 +1,8 @@ /* * sexpr.h : S-Expression interfaces needed to communicate with the Xen Daemon * - * Copyright (C) 2005 - * - * Anthony Liguori <aliguori(a)us.ibm.com> + * Copyright (C) 2012 Red Hat, Inc. + * Copyright (C) 2005 Anthony Liguori <aliguori(a)us.ibm.com> * * This file is subject to the terms and conditions of the GNU Lesser General * Public License. See the file COPYING.LIB in the main directory of this @@ -16,9 +15,6 @@ # include "internal.h" # include "buf.h" -# include <sys/types.h> -# include <stdint.h> - enum sexpr_type { SEXPR_NIL, SEXPR_CONS, diff --git a/src/util/virhashcode.h b/src/util/virhashcode.h index 2fb7a95..34254b6 100644 --- a/src/util/virhashcode.h +++ b/src/util/virhashcode.h @@ -29,7 +29,6 @@ # define __VIR_HASH_CODE_H__ # include "internal.h" -# include <stdint.h> extern uint32_t virHashCodeGen(const void *key, size_t len, uint32_t seed); diff --git a/src/util/virnetdevvportprofile.h b/src/util/virnetdevvportprofile.h index 6cce1bb..f33da18 100644 --- a/src/util/virnetdevvportprofile.h +++ b/src/util/virnetdevvportprofile.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2011 Red Hat, Inc. + * Copyright (C) 2009-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 @@ -23,8 +23,6 @@ #ifndef __VIR_NETDEV_VPORT_PROFILE_H__ # define __VIR_NETDEV_VPORT_PROFILE_H__ -# include <stdint.h> - # include "internal.h" # include "uuid.h" # include "util.h" diff --git a/src/util/virnetlink.h b/src/util/virnetlink.h index 1997c8d..5d8337d 100644 --- a/src/util/virnetlink.h +++ b/src/util/virnetlink.h @@ -24,8 +24,6 @@ # include "internal.h" # include "virmacaddr.h" -# include <stdint.h> - # if defined(__linux__) && defined(HAVE_LIBNL) # include <netlink/msg.h> diff --git a/src/util/virrandom.h b/src/util/virrandom.h index 8d3cad7..29a055d 100644 --- a/src/util/virrandom.h +++ b/src/util/virrandom.h @@ -23,7 +23,6 @@ # define __VIR_RANDOM_H__ # include "internal.h" -# include <stdint.h> uint64_t virRandomBits(int nbits); int virRandomGenerateWWN(char **wwn, const char *virt_type); diff --git a/src/vbox/vbox_driver.c b/src/vbox/vbox_driver.c index b340b7c..c4037f8 100644 --- a/src/vbox/vbox_driver.c +++ b/src/vbox/vbox_driver.c @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2010-2011 Red Hat, Inc. + * Copyright (C) 2010-2012 Red Hat, Inc. * Copyright (C) 2008-2009 Sun Microsystems, Inc. * * This file is part of a free software library; you can redistribute @@ -29,9 +29,7 @@ #include <config.h> -#include <stdint.h> #include <unistd.h> -#include <sys/types.h> #include "internal.h" diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index 5608de8..f57449e 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -23,7 +23,6 @@ #include <config.h> #include <limits.h> -#include <stdint.h> #include <string.h> #include <curl/curl.h> #include <xen/api/xen_all.h> diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c index 3031a17..d62192a 100644 --- a/src/xenapi/xenapi_utils.c +++ b/src/xenapi/xenapi_utils.c @@ -24,7 +24,6 @@ #include <stdio.h> #include <string.h> -#include <stdint.h> #include <xen/api/xen_all.h> #include "internal.h" #include "domain_conf.h" diff --git a/src/xenapi/xenapi_utils.h b/src/xenapi/xenapi_utils.h index 5912446..86af07c 100644 --- a/src/xenapi/xenapi_utils.h +++ b/src/xenapi/xenapi_utils.h @@ -1,5 +1,6 @@ /* * xenapi_utils.h: Xen API driver -- utils header + * Copyright (C) 2012, Red Hat, Inc. * Copyright (C) 2009, 2010 Citrix Ltd. * * This library is free software; you can redistribute it and/or @@ -22,7 +23,6 @@ #ifndef __VIR_XENAPI_UTILS__ # define __VIR_XENAPI_UTILS__ -# include <stdint.h> # include <xen/api/xen_all.h> # include "internal.h" # include "viruri.h" diff --git a/src/xenxs/xenxs_private.h b/src/xenxs/xenxs_private.h index d0ba59a..17b481b 100644 --- a/src/xenxs/xenxs_private.h +++ b/src/xenxs/xenxs_private.h @@ -1,8 +1,8 @@ /* * xenxs_private.h: Private definitions for Xen parsing * + * Copyright (C) 2007, 2010, 2012 Red Hat, Inc. * Copyright (C) 2011 Univention GmbH - * Copyright (C) 2007, 2010 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 @@ -27,7 +27,6 @@ # include "internal.h" -# include <stdint.h> # include <xen/xen.h> # include "xen_sxpr.h" diff --git a/tests/storagebackendsheepdogtest.c b/tests/storagebackendsheepdogtest.c index b7b3b35..ba5bc36 100644 --- a/tests/storagebackendsheepdogtest.c +++ b/tests/storagebackendsheepdogtest.c @@ -25,10 +25,8 @@ #include <stdio.h> #include <stdlib.h> #include <unistd.h> -#include <stdint.h> #include <string.h> -#include <sys/types.h> #include <fcntl.h> #include "internal.h" -- 1.7.11.2

2 1

[libvirt] [PATCH] esx: Implement network driver
by Matthias Bolte 09 Aug '12

09 Aug '12

An ESX server has one or more PhysicalNics that represent the actual hardware NICs. Those can be listed via the interface driver. A libvirt virtual network is mapped to a HostVirtualSwitch. On the physical side a HostVirtualSwitch can be connected to PhysicalNics. On the virtual side a HostVirtualSwitch has HostPortGroups that are mapped to libvirt virtual network's portgroups. Typically there is HostPortGroups named 'VM Network' that is used to connect virtual machines to a HostVirtualSwitch. A second HostPortGroup typically named 'Management Network' is used to connect the hypervisor itself to the HostVirtualSwitch. This one is not mapped to a libvirt virtual network's portgroup. There can be more HostPortGroups than those typical two on a HostVirtualSwitch. +---------------+-------------------+ ...---| | | +-------------+ | HostPortGroup | |---| PhysicalNic | | VM Network | | | vmnic0 | ...---| | | +-------------+ +---------------+ HostVirtualSwitch | | vSwitch0 | +---------------+ | | HostPortGroup | | ...---| Management | | | Network | | +---------------+-------------------+ The virtual counterparts of the PhysicalNic is the HostVirtualNic for the hypervisor and the VirtualEthernetCard for the virtual machines that are grouped into HostPortGroups. +---------------------+ +---------------+---... | VirtualEthernetCard |---| | +---------------------+ | HostPortGroup | +---------------------+ | VM Network | | VirtualEthernetCard |---| | +---------------------+ +---------------+ | +---------------+ +---------------------+ | HostPortGroup | | HostVirtualNic |---| Management | +---------------------+ | Network | +---------------+---... The currently implemented network driver can list, define and undefine HostVirtualSwitches including HostPortGroups for virtual machines. Existing HostVirtualSwitches cannot be edited yet. This will be added in a followup patch. --- po/POTFILES.in | 1 + src/conf/network_conf.c | 3 +- src/conf/network_conf.h | 3 + src/esx/esx_network_driver.c | 867 +++++++++++++++++++++++++++++++++++++++- src/esx/esx_vi.c | 171 ++++++++ src/esx/esx_vi.h | 14 + src/esx/esx_vi_generator.input | 151 +++++++ src/esx/esx_vi_generator.py | 5 + 8 files changed, 1212 insertions(+), 3 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 37a00ee..e617952 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -27,6 +27,7 @@ src/cpu/cpu_x86.c src/datatypes.c src/driver.c src/esx/esx_driver.c +src/esx/esx_network_driver.c src/esx/esx_storage_driver.c src/esx/esx_util.c src/esx/esx_vi.c diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index eb92d93..a3714d9 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -47,8 +47,6 @@ #define MAX_BRIDGE_ID 256 #define VIR_FROM_THIS VIR_FROM_NETWORK -VIR_ENUM_DECL(virNetworkForward) - VIR_ENUM_IMPL(virNetworkForward, VIR_NETWORK_FORWARD_LAST, "none", "nat", "route", "bridge", "private", "vepa", "passthrough" ) @@ -967,6 +965,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) goto error; } VIR_FREE(tmp); + def->uuid_specified = true; } /* Parse network domain information */ diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index 1c640a9..a95b382 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -148,6 +148,7 @@ typedef struct _virNetworkDef virNetworkDef; typedef virNetworkDef *virNetworkDefPtr; struct _virNetworkDef { unsigned char uuid[VIR_UUID_BUFLEN]; + bool uuid_specified; char *name; char *bridge; /* Name of bridge device */ @@ -289,4 +290,6 @@ int virNetworkObjIsDuplicate(virNetworkObjListPtr doms, void virNetworkObjLock(virNetworkObjPtr obj); void virNetworkObjUnlock(virNetworkObjPtr obj); +VIR_ENUM_DECL(virNetworkForward) + #endif /* __NETWORK_CONF_H__ */ diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index 2e0e40b..b42f1d8 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -4,7 +4,7 @@ * host networks * * Copyright (C) 2010-2011 Red Hat, Inc. - * Copyright (C) 2010 Matthias Bolte <matthias.bolte(a)googlemail.com> + * Copyright (C) 2010-2012 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 @@ -24,11 +24,13 @@ #include <config.h> +#include "md5.h" #include "internal.h" #include "util.h" #include "memory.h" #include "logging.h" #include "uuid.h" +#include "network_conf.h" #include "esx_private.h" #include "esx_network_driver.h" #include "esx_vi.h" @@ -37,6 +39,12 @@ #define VIR_FROM_THIS VIR_FROM_ESX +/* + * The UUID of a network is the MD5 sum of it's key. Therefore, verify that + * UUID and MD5 sum match in size, because we rely on that. + */ +verify(MD5_DIGEST_SIZE == VIR_UUID_BUFLEN); + static virDrvOpenStatus @@ -67,10 +75,867 @@ esxNetworkClose(virConnectPtr conn) +static int +esxNumberOfNetworks(virConnectPtr conn) +{ + esxPrivate *priv = conn->networkPrivateData; + esxVI_HostVirtualSwitch *hostVirtualSwitchList = NULL; + esxVI_HostVirtualSwitch *hostVirtualSwitch = NULL; + int count = 0; + + if (esxVI_EnsureSession(priv->primary) < 0 || + esxVI_LookupHostVirtualSwitchList(priv->primary, + &hostVirtualSwitchList) < 0) { + return -1; + } + + for (hostVirtualSwitch = hostVirtualSwitchList; hostVirtualSwitch != NULL; + hostVirtualSwitch = hostVirtualSwitch->_next) { + ++count; + } + + esxVI_HostVirtualSwitch_Free(&hostVirtualSwitchList); + + return count; +} + + + +static int +esxListNetworks(virConnectPtr conn, char **const names, int maxnames) +{ + bool success = false; + esxPrivate *priv = conn->networkPrivateData; + esxVI_HostVirtualSwitch *hostVirtualSwitchList = NULL; + esxVI_HostVirtualSwitch *hostVirtualSwitch = NULL; + int count = 0; + int i; + + if (maxnames == 0) { + return 0; + } + + if (esxVI_EnsureSession(priv->primary) < 0 || + esxVI_LookupHostVirtualSwitchList(priv->primary, + &hostVirtualSwitchList) < 0) { + return -1; + } + + for (hostVirtualSwitch = hostVirtualSwitchList; hostVirtualSwitch != NULL; + hostVirtualSwitch = hostVirtualSwitch->_next) { + names[count] = strdup(hostVirtualSwitch->name); + + 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_HostVirtualSwitch_Free(&hostVirtualSwitchList); + + return count; +} + + + +static int +esxNumberOfDefinedNetworks(virConnectPtr conn ATTRIBUTE_UNUSED) +{ + /* ESX networks are always active */ + return 0; +} + + + +static int +esxListDefinedNetworks(virConnectPtr conn ATTRIBUTE_UNUSED, + char **const names ATTRIBUTE_UNUSED, + int maxnames ATTRIBUTE_UNUSED) +{ + /* ESX networks are always active */ + return 0; +} + + + +static virNetworkPtr +esxNetworkLookupByUUID(virConnectPtr conn, const unsigned char *uuid) +{ + virNetworkPtr network = NULL; + esxPrivate *priv = conn->networkPrivateData; + esxVI_HostVirtualSwitch *hostVirtualSwitchList = NULL; + esxVI_HostVirtualSwitch *hostVirtualSwitch = NULL; + unsigned char md5[MD5_DIGEST_SIZE]; /* MD5_DIGEST_SIZE = VIR_UUID_BUFLEN = 16 */ + char uuid_string[VIR_UUID_STRING_BUFLEN] = ""; + + if (esxVI_EnsureSession(priv->primary) < 0 || + esxVI_LookupHostVirtualSwitchList(priv->primary, + &hostVirtualSwitchList) < 0) { + return NULL; + } + + for (hostVirtualSwitch = hostVirtualSwitchList; hostVirtualSwitch != NULL; + hostVirtualSwitch = hostVirtualSwitch->_next) { + md5_buffer(hostVirtualSwitch->key, strlen(hostVirtualSwitch->key), md5); + + if (memcmp(uuid, md5, VIR_UUID_BUFLEN) == 0) { + break; + } + } + + if (hostVirtualSwitch == NULL) { + virUUIDFormat(uuid, uuid_string); + + virReportError(VIR_ERR_NO_NETWORK, + _("Could not find HostVirtualSwitch with UUID '%s'"), + uuid_string); + + goto cleanup; + } + + network = virGetNetwork(conn, hostVirtualSwitch->name, uuid); + + cleanup: + esxVI_HostVirtualSwitch_Free(&hostVirtualSwitchList); + + return network; +} + + + +static virNetworkPtr +esxNetworkLookupByName(virConnectPtr conn, const char *name) +{ + virNetworkPtr network = NULL; + esxPrivate *priv = conn->networkPrivateData; + esxVI_HostVirtualSwitch *hostVirtualSwitch = NULL; + unsigned char md5[MD5_DIGEST_SIZE]; /* MD5_DIGEST_SIZE = VIR_UUID_BUFLEN = 16 */ + + if (esxVI_EnsureSession(priv->primary) < 0 || + esxVI_LookupHostVirtualSwitchByName(priv->primary, name, + &hostVirtualSwitch, + esxVI_Occurrence_RequiredItem) < 0) { + return NULL; + } + + /* + * HostVirtualSwitch doesn't have a UUID, but we can use the key property + * as source for a UUID. The key is unique per host and cannot change + * during the lifetime of the HostVirtualSwitch. + * + * The MD5 sum of the key can be used as UUID, assuming MD5 is considered + * to be collision-free enough for this use case. + */ + md5_buffer(hostVirtualSwitch->key, strlen(hostVirtualSwitch->key), md5); + + network = virGetNetwork(conn, hostVirtualSwitch->name, md5); + + esxVI_HostVirtualSwitch_Free(&hostVirtualSwitch); + + return network; +} + + + +static int +esxBandwidthToShapingPolicy(virNetDevBandwidthPtr bandwidth, + esxVI_HostNetworkTrafficShapingPolicy **shapingPolicy) +{ + int result = -1; + + if (shapingPolicy == NULL || *shapingPolicy != NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); + return -1; + } + + if (bandwidth->in == NULL || bandwidth->out == NULL || + bandwidth->in->average != bandwidth->out->average || + bandwidth->in->peak != bandwidth->out->peak || + bandwidth->in->burst != bandwidth->out->burst) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Different inbound and outbound bandwidth is unsupported")); + return -1; + } + + if (bandwidth->in->average == 0 && bandwidth->in->peak == 0 && + bandwidth->in->burst == 0) { + return 0; + } + + if (esxVI_HostNetworkTrafficShapingPolicy_Alloc(shapingPolicy) < 0) { + goto cleanup; + } + + (*shapingPolicy)->enabled = esxVI_Boolean_True; + + if (bandwidth->in->average > 0) { + if (esxVI_Long_Alloc(&(*shapingPolicy)->averageBandwidth) < 0) { + goto cleanup; + } + + /* Scale kilobytes per second to bits per second */ + (*shapingPolicy)->averageBandwidth->value = bandwidth->in->average * 8 * 1000; + } + + if (bandwidth->in->peak > 0) { + if (esxVI_Long_Alloc(&(*shapingPolicy)->peakBandwidth) < 0) { + goto cleanup; + } + + /* Scale kilobytes per second to bits per second */ + (*shapingPolicy)->peakBandwidth->value = bandwidth->in->peak * 8 * 1000; + } + + if (bandwidth->in->burst > 0) { + if (esxVI_Long_Alloc(&(*shapingPolicy)->burstSize) < 0) { + goto cleanup; + } + + /* Scale kilobytes to bytes */ + (*shapingPolicy)->burstSize->value = bandwidth->in->burst * 1024; + } + + result = 0; + + cleanup: + if (result < 0) { + esxVI_HostNetworkTrafficShapingPolicy_Free(shapingPolicy); + } + + return result; +} + + + +static virNetworkPtr +esxNetworkDefineXML(virConnectPtr conn, const char *xml) +{ + virNetworkPtr network = NULL; + esxPrivate *priv = conn->networkPrivateData; + virNetworkDefPtr def = NULL; + esxVI_HostVirtualSwitch *hostVirtualSwitch = NULL; + esxVI_HostPortGroup *hostPortGroupList = NULL; + esxVI_HostPortGroup *hostPortGroup = NULL; + esxVI_HostVirtualSwitchSpec *hostVirtualSwitchSpec = NULL; + esxVI_HostVirtualSwitchBondBridge *hostVirtualSwitchBondBridge = NULL; + esxVI_PhysicalNic *physicalNicList = NULL; + esxVI_PhysicalNic *physicalNic = NULL; + esxVI_HostPortGroupSpec *hostPortGroupSpec = NULL; + int i; + + unsigned char md5[MD5_DIGEST_SIZE]; /* MD5_DIGEST_SIZE = VIR_UUID_BUFLEN = 16 */ + + if (esxVI_EnsureSession(priv->primary) < 0) { + return NULL; + } + + /* Parse network XML */ + def = virNetworkDefParseString(xml); + + if (def == NULL) { + return NULL; + } + + /* Check if an existing HostVirtualSwitch should be edited */ + if (esxVI_LookupHostVirtualSwitchByName(priv->primary, def->name, + &hostVirtualSwitch, + esxVI_Occurrence_OptionalItem) < 0) { + goto cleanup; + } + + if (hostVirtualSwitch != NULL) { + /* FIXME */ + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("HostVirtualSwitch already exists, editing existing " + "ones is not supported yet")); + goto cleanup; + } + + /* UUID is derived from the HostVirtualSwitch's key and cannot be specified */ + if (def->uuid_specified) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Cannot use predefined UUID")); + goto cleanup; + } + + /* FIXME: Add support for NAT */ + if (def->forwardType != VIR_NETWORK_FORWARD_NONE && + def->forwardType != VIR_NETWORK_FORWARD_BRIDGE) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Unsupported forward mode '%s'"), + virNetworkForwardTypeToString(def->forwardType)); + goto cleanup; + } + + /* Verify that specified HostPortGroups don't exist already */ + if (def->nPortGroups > 0) { + if (esxVI_LookupHostPortGroupList(priv->primary, &hostPortGroupList) < 0) { + goto cleanup; + } + + for (i = 0; i < def->nPortGroups; ++i) { + for (hostPortGroup = hostPortGroupList; hostPortGroup != NULL; + hostPortGroup = hostPortGroup->_next) { + if (STREQ(def->portGroups[i].name, hostPortGroup->spec->name)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("HostPortGroup with name '%s' exists already"), + def->portGroups[i].name); + goto cleanup; + } + } + } + } + + /* Create HostVirtualSwitch */ + if (esxVI_HostVirtualSwitchSpec_Alloc(&hostVirtualSwitchSpec) < 0 || + esxVI_Int_Alloc(&hostVirtualSwitchSpec->numPorts) < 0) { + goto cleanup; + } + + if (def->forwardType != VIR_NETWORK_FORWARD_NONE && def->nForwardIfs > 0) { + if (esxVI_HostVirtualSwitchBondBridge_Alloc + (&hostVirtualSwitchBondBridge) < 0) { + goto cleanup; + } + + hostVirtualSwitchSpec->bridge = + (esxVI_HostVirtualSwitchBridge *)hostVirtualSwitchBondBridge; + + /* Lookup PhysicalNic list and match by name to get key */ + if (esxVI_LookupPhysicalNicList(priv->primary, &physicalNicList) < 0) { + goto cleanup; + } + + for (i = 0; i < def->nForwardIfs; ++i) { + bool found = false; + + for (physicalNic = physicalNicList; physicalNic != NULL; + physicalNic = physicalNic->_next) { + if (STREQ(def->forwardIfs[i].dev, physicalNic->device)) { + if (esxVI_String_AppendValueToList + (&hostVirtualSwitchBondBridge->nicDevice, + physicalNic->key) < 0) { + goto cleanup; + } + + found = true; + break; + } + } + + if (! found) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not find PhysicalNic with name '%s'"), + def->forwardIfs[i].dev); + goto cleanup; + } + } + } + + hostVirtualSwitchSpec->numPorts->value = 128; + + if (def->bandwidth != NULL) { + if (esxVI_HostNetworkPolicy_Alloc(&hostVirtualSwitchSpec->policy) < 0) { + goto cleanup; + } + + if (esxBandwidthToShapingPolicy + (def->bandwidth, + &hostVirtualSwitchSpec->policy->shapingPolicy) < 0) { + goto cleanup; + } + } + + if (esxVI_AddVirtualSwitch + (priv->primary, + priv->primary->hostSystem->configManager->networkSystem, + def->name, hostVirtualSwitchSpec) < 0) { + goto cleanup; + } + + /* Create HostPortGroup(s) */ + for (i = 0; i < def->nPortGroups; ++i) { + esxVI_HostPortGroupSpec_Free(&hostPortGroupSpec); + + if (esxVI_HostPortGroupSpec_Alloc(&hostPortGroupSpec) < 0 || + esxVI_HostNetworkPolicy_Alloc(&hostPortGroupSpec->policy) < 0 || + esxVI_Int_Alloc(&hostPortGroupSpec->vlanId) < 0 || + esxVI_String_DeepCopyValue(&hostPortGroupSpec->name, + def->portGroups[i].name) < 0 || + esxVI_String_DeepCopyValue(&hostPortGroupSpec->vswitchName, + def->name) < 0) { + goto cleanup; + } + + hostPortGroupSpec->vlanId->value = 0; + + if (def->portGroups[i].bandwidth != NULL) { + if (esxBandwidthToShapingPolicy + (def->portGroups[i].bandwidth, + &hostPortGroupSpec->policy->shapingPolicy) < 0) { + goto cleanup; + } + } + + if (esxVI_AddPortGroup + (priv->primary, + priv->primary->hostSystem->configManager->networkSystem, + hostPortGroupSpec) < 0) { + goto cleanup; + } + } + + /* Lookup created HostVirtualSwitch to get the UUID */ + if (esxVI_LookupHostVirtualSwitchByName(priv->primary, def->name, + &hostVirtualSwitch, + esxVI_Occurrence_RequiredItem) < 0) { + goto cleanup; + } + + md5_buffer(hostVirtualSwitch->key, strlen(hostVirtualSwitch->key), md5); + + network = virGetNetwork(conn, hostVirtualSwitch->name, md5); + + cleanup: + virNetworkDefFree(def); + esxVI_HostVirtualSwitch_Free(&hostVirtualSwitch); + esxVI_HostPortGroup_Free(&hostPortGroupList); + esxVI_HostVirtualSwitchSpec_Free(&hostVirtualSwitchSpec); + esxVI_PhysicalNic_Free(&physicalNicList); + esxVI_HostPortGroupSpec_Free(&hostPortGroupSpec); + + return network; +} + + + +static int +esxNetworkUndefine(virNetworkPtr network) +{ + int result = -1; + esxPrivate *priv = network->conn->networkPrivateData; + esxVI_HostVirtualSwitch *hostVirtualSwitch = NULL; + esxVI_HostPortGroup *hostPortGroupList = NULL; + esxVI_String *hostPortGroupKey = NULL; + esxVI_HostPortGroup *hostPortGroup = NULL; + esxVI_HostPortGroupPort *hostPortGroupPort = NULL; + + if (esxVI_EnsureSession(priv->primary) < 0) { + return -1; + } + + /* Lookup HostVirtualSwitch and HostPortGroup list*/ + if (esxVI_LookupHostVirtualSwitchByName(priv->primary, network->name, + &hostVirtualSwitch, + esxVI_Occurrence_RequiredItem) < 0 || + esxVI_LookupHostPortGroupList(priv->primary, &hostPortGroupList) < 0) { + goto cleanup; + } + + /* Verify that the HostVirtualSwitch is connected to virtual machines only */ + for (hostPortGroupKey = hostVirtualSwitch->portgroup; + hostPortGroupKey != NULL; hostPortGroupKey = hostPortGroupKey->_next) { + bool found = false; + + for (hostPortGroup = hostPortGroupList; hostPortGroup != NULL; + hostPortGroup = hostPortGroup->_next) { + if (STREQ(hostPortGroupKey->value, hostPortGroup->key)) { + for (hostPortGroupPort = hostPortGroup->port; + hostPortGroupPort != NULL; + hostPortGroupPort = hostPortGroupPort->_next) { + if (STRNEQ(hostPortGroupPort->type, "virtualMachine")) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("Cannot undefine HostVirtualSwitch that has a '%s' port"), + hostPortGroupPort->type); + goto cleanup; + } + } + + found = true; + break; + } + } + + if (! found) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not find HostPortGroup for key '%s'"), + hostPortGroupKey->value); + goto cleanup; + } + } + + /* Remove all HostPortGroups from the HostVirtualSwitch */ + for (hostPortGroupKey = hostVirtualSwitch->portgroup; + hostPortGroupKey != NULL; hostPortGroupKey = hostPortGroupKey->_next) { + bool found = false; + + for (hostPortGroup = hostPortGroupList; hostPortGroup != NULL; + hostPortGroup = hostPortGroup->_next) { + if (STREQ(hostPortGroupKey->value, hostPortGroup->key)) { + if (esxVI_RemovePortGroup + (priv->primary, + priv->primary->hostSystem->configManager->networkSystem, + hostPortGroup->spec->name) < 0) { + goto cleanup; + } + + found = true; + break; + } + } + + if (! found) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not find HostPortGroup for key '%s'"), + hostPortGroupKey->value); + goto cleanup; + } + } + + /* Finally, remove HostVirtualSwitch itself */ + if (esxVI_RemoveVirtualSwitch + (priv->primary, + priv->primary->hostSystem->configManager->networkSystem, + network->name) < 0) { + goto cleanup; + } + + result = 0; + + cleanup: + esxVI_HostVirtualSwitch_Free(&hostVirtualSwitch); + esxVI_HostPortGroup_Free(&hostPortGroupList); + + return result; +} + + + +static int +esxShapingPolicyToBandwidth(esxVI_HostNetworkTrafficShapingPolicy *shapingPolicy, + virNetDevBandwidthPtr *bandwidth) +{ + if (bandwidth == NULL || *bandwidth != NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); + return -1; + } + + if (shapingPolicy == NULL || shapingPolicy->enabled != esxVI_Boolean_True) { + return 0; + } + + if (VIR_ALLOC(*bandwidth) < 0 || + VIR_ALLOC((*bandwidth)->in) < 0 || + VIR_ALLOC((*bandwidth)->out) < 0) { + virReportOOMError(); + return -1; + } + + if (shapingPolicy->averageBandwidth != NULL) { + /* Scale bits per second to kilobytes per second */ + (*bandwidth)->in->average = shapingPolicy->averageBandwidth->value / 8 / 1000; + (*bandwidth)->out->average = shapingPolicy->averageBandwidth->value / 8 / 1000; + } + + if (shapingPolicy->peakBandwidth != NULL) { + /* Scale bits per second to kilobytes per second */ + (*bandwidth)->in->peak = shapingPolicy->peakBandwidth->value / 8 / 1000; + (*bandwidth)->out->peak = shapingPolicy->peakBandwidth->value / 8 / 1000; + } + + if (shapingPolicy->burstSize != NULL) { + /* Scale bytes to kilobytes */ + (*bandwidth)->in->burst = shapingPolicy->burstSize->value / 1024; + (*bandwidth)->out->burst = shapingPolicy->burstSize->value / 1024; + } + + return 0; +} + + + +static char * +esxNetworkGetXMLDesc(virNetworkPtr network_, unsigned int flags) +{ + char *xml = NULL; + esxPrivate *priv = network_->conn->networkPrivateData; + esxVI_HostVirtualSwitch *hostVirtualSwitch = NULL; + int count = 0; + esxVI_PhysicalNic *physicalNicList = NULL; + esxVI_PhysicalNic *physicalNic = NULL; + esxVI_String *physicalNicKey = NULL; + esxVI_HostPortGroup *hostPortGroupList = NULL; + esxVI_HostPortGroup *hostPortGroup = NULL; + esxVI_String *propertyNameList = NULL; + esxVI_ObjectContent *networkList = NULL; + esxVI_ObjectContent *network = NULL; + esxVI_String *networkNameList = NULL; + esxVI_String *hostPortGroupKey = NULL; + esxVI_String *networkName = NULL; + virNetworkDefPtr def; + + if (esxVI_EnsureSession(priv->primary) < 0) { + return NULL; + } + + if (VIR_ALLOC(def) < 0) { + virReportOOMError(); + goto cleanup; + } + + /* Lookup HostVirtualSwitch */ + if (esxVI_LookupHostVirtualSwitchByName(priv->primary, network_->name, + &hostVirtualSwitch, + esxVI_Occurrence_RequiredItem) < 0) { + goto cleanup; + } + + md5_buffer(hostVirtualSwitch->key, strlen(hostVirtualSwitch->key), def->uuid); + + def->name = strdup(hostVirtualSwitch->name); + + if (def->name == NULL) { + virReportOOMError(); + goto cleanup; + } + + def->forwardType = VIR_NETWORK_FORWARD_NONE; + + /* Count PhysicalNics on HostVirtualSwitch */ + count = 0; + + for (physicalNicKey = hostVirtualSwitch->pnic; + physicalNicKey != NULL; physicalNicKey = physicalNicKey->_next) { + ++count; + } + + if (count > 0) { + def->forwardType = VIR_NETWORK_FORWARD_BRIDGE; + + if (VIR_ALLOC_N(def->forwardIfs, count) < 0) { + virReportOOMError(); + goto cleanup; + } + + /* Find PhysicalNic by key */ + if (esxVI_LookupPhysicalNicList(priv->primary, &physicalNicList) < 0) { + goto cleanup; + } + + for (physicalNicKey = hostVirtualSwitch->pnic; + physicalNicKey != NULL; physicalNicKey = physicalNicKey->_next) { + bool found = false; + + for (physicalNic = physicalNicList; physicalNic != NULL; + physicalNic = physicalNic->_next) { + if (STREQ(physicalNicKey->value, physicalNic->key)) { + def->forwardIfs[def->nForwardIfs].dev = strdup(physicalNic->device); + + if (def->forwardIfs[def->nForwardIfs].dev == NULL) { + virReportOOMError(); + goto cleanup; + } + + ++def->nForwardIfs; + + found = true; + break; + } + } + + if (! found) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not find PhysicalNic with key '%s'"), + physicalNicKey->value); + goto cleanup; + } + } + } + + /* Count HostPortGroups on HostVirtualSwitch */ + count = 0; + + for (hostPortGroupKey = hostVirtualSwitch->portgroup; + hostPortGroupKey != NULL; hostPortGroupKey = hostPortGroupKey->_next) { + ++count; + } + + if (count > 0) { + if (VIR_ALLOC_N(def->portGroups, count) < 0) { + virReportOOMError(); + goto cleanup; + } + + /* Lookup Network list and create name list */ + if (esxVI_String_AppendValueToList(&propertyNameList, "name") < 0 || + esxVI_LookupNetworkList(priv->primary, propertyNameList, + &networkList) < 0) { + goto cleanup; + } + + for (network = networkList; network != NULL; network = network->_next) { + char *tmp = NULL; + + if (esxVI_GetStringValue(network, "name", &tmp, + esxVI_Occurrence_RequiredItem) < 0 || + esxVI_String_AppendValueToList(&networkNameList, tmp) < 0) { + goto cleanup; + } + } + + /* Find HostPortGroup by key */ + if (esxVI_LookupHostPortGroupList(priv->primary, &hostPortGroupList) < 0) { + goto cleanup; + } + + for (hostPortGroupKey = hostVirtualSwitch->portgroup; + hostPortGroupKey != NULL; hostPortGroupKey = hostPortGroupKey->_next) { + bool found = false; + + for (hostPortGroup = hostPortGroupList; hostPortGroup != NULL; + hostPortGroup = hostPortGroup->_next) { + if (STREQ(hostPortGroupKey->value, hostPortGroup->key)) { + /* Find Network for HostPortGroup, there might be none */ + for (networkName = networkNameList; networkName != NULL; + networkName = networkName->_next) { + if (STREQ(networkName->value, hostPortGroup->spec->name)) { + def->portGroups[def->nPortGroups].name = strdup(networkName->value); + + if (def->portGroups[def->nPortGroups].name == NULL) { + virReportOOMError(); + goto cleanup; + } + + if (hostPortGroup->spec->policy != NULL) { + if (esxShapingPolicyToBandwidth + (hostPortGroup->spec->policy->shapingPolicy, + &def->portGroups[def->nPortGroups].bandwidth) < 0) { + ++def->nPortGroups; + goto cleanup; + } + } + + ++def->nPortGroups; + break; + } + } + + found = true; + break; + } + } + + if (! found) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not find HostPortGroup with key '%s'"), + hostPortGroupKey->value); + goto cleanup; + } + } + } + + if (hostVirtualSwitch->spec->policy != NULL) { + if (esxShapingPolicyToBandwidth + (hostVirtualSwitch->spec->policy->shapingPolicy, + &def->bandwidth) < 0) { + goto cleanup; + } + } + + xml = virNetworkDefFormat(def, flags); + + cleanup: + esxVI_HostVirtualSwitch_Free(&hostVirtualSwitch); + esxVI_PhysicalNic_Free(&physicalNicList); + esxVI_HostPortGroup_Free(&hostPortGroupList); + esxVI_String_Free(&propertyNameList); + esxVI_ObjectContent_Free(&networkList); + esxVI_String_Free(&networkNameList); + virNetworkDefFree(def); + + return xml; +} + + + +static int +esxNetworkGetAutostart(virNetworkPtr network ATTRIBUTE_UNUSED, + int *autostart) +{ + /* ESX networks are always active */ + *autostart = 1; + + return 0; +} + + + +static int +esxNetworkSetAutostart(virNetworkPtr network ATTRIBUTE_UNUSED, + int autostart) +{ + /* Just accept autostart activation, but fail on autostart deactivation */ + autostart = (autostart != 0); + + if (! autostart) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Cannot deactivate network autostart")); + return -1; + } + + return 0; +} + + + +static int +esxNetworkIsActive(virNetworkPtr network ATTRIBUTE_UNUSED) +{ + /* ESX networks are always active */ + return 1; +} + + + +static int +esxNetworkIsPersistent(virNetworkPtr network ATTRIBUTE_UNUSED) +{ + /* ESX has no concept of transient networks, so all of them are persistent */ + return 1; +} + + + static virNetworkDriver esxNetworkDriver = { .name = "ESX", .open = esxNetworkOpen, /* 0.7.6 */ .close = esxNetworkClose, /* 0.7.6 */ + .numOfNetworks = esxNumberOfNetworks, /* 0.10.0 */ + .listNetworks = esxListNetworks, /* 0.10.0 */ + .numOfDefinedNetworks = esxNumberOfDefinedNetworks, /* 0.10.0 */ + .listDefinedNetworks = esxListDefinedNetworks, /* 0.10.0 */ + .networkLookupByUUID = esxNetworkLookupByUUID, /* 0.10.0 */ + .networkLookupByName = esxNetworkLookupByName, /* 0.10.0 */ + .networkDefineXML = esxNetworkDefineXML, /* 0.10.0 */ + .networkUndefine = esxNetworkUndefine, /* 0.10.0 */ + .networkGetXMLDesc = esxNetworkGetXMLDesc, /* 0.10.0 */ + .networkGetAutostart = esxNetworkGetAutostart, /* 0.10.0 */ + .networkSetAutostart = esxNetworkSetAutostart, /* 0.10.0 */ + .networkIsActive = esxNetworkIsActive, /* 0.10.0 */ + .networkIsPersistent = esxNetworkIsPersistent, /* 0.10.0 */ }; diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index f3a9e91..65e1d9a 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -783,6 +783,7 @@ ESX_VI__TEMPLATE__FREE(Context, esxVI_SelectionSpec_Free(&item->selectSet_hostSystemToDatastore); esxVI_SelectionSpec_Free(&item->selectSet_computeResourceToHost); esxVI_SelectionSpec_Free(&item->selectSet_computeResourceToParentToParent); + esxVI_SelectionSpec_Free(&item->selectSet_datacenterToNetwork); }) int @@ -1927,6 +1928,13 @@ esxVI_BuildSelectSetCollection(esxVI_Context *ctx) return -1; } + /* Datacenter -> network (Network) */ + if (esxVI_BuildSelectSet(&ctx->selectSet_datacenterToNetwork, + "datacenterToNetwork", + "Datacenter", "network", NULL) < 0) { + return -1; + } + return 0; } @@ -2094,6 +2102,15 @@ esxVI_LookupObjectContentByType(esxVI_Context *ctx, type, root->type); goto cleanup; } + } else if (STREQ(root->type, "Datacenter")) { + if (STREQ(type, "Network")) { + objectSpec->selectSet = ctx->selectSet_datacenterToNetwork; + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Invalid lookup of '%s' from '%s'"), + type, root->type); + goto cleanup; + } } else { virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid lookup from '%s'"), root->type); @@ -4091,6 +4108,160 @@ esxVI_LookupPhysicalNicByMACAddress(esxVI_Context *ctx, const char *mac, int +esxVI_LookupHostVirtualSwitchList(esxVI_Context *ctx, + esxVI_HostVirtualSwitch **hostVirtualSwitchList) +{ + int result = -1; + esxVI_String *propertyNameList = NULL; + esxVI_ObjectContent *hostSystem = NULL; + esxVI_DynamicProperty *dynamicProperty = NULL; + + if (hostVirtualSwitchList == NULL || *hostVirtualSwitchList != NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); + return -1; + } + + if (esxVI_String_AppendValueToList(&propertyNameList, + "config.network.vswitch") < 0 || + esxVI_LookupHostSystemProperties(ctx, propertyNameList, + &hostSystem) < 0) { + goto cleanup; + } + + for (dynamicProperty = hostSystem->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "config.network.vswitch")) { + if (esxVI_HostVirtualSwitch_CastListFromAnyType + (dynamicProperty->val, hostVirtualSwitchList) < 0) { + goto cleanup; + } + } else { + VIR_WARN("Unexpected '%s' property", dynamicProperty->name); + } + } + + result = 0; + + cleanup: + esxVI_String_Free(&propertyNameList); + esxVI_ObjectContent_Free(&hostSystem); + + return result; +} + + + +int +esxVI_LookupHostVirtualSwitchByName(esxVI_Context *ctx, const char *name, + esxVI_HostVirtualSwitch **hostVirtualSwitch, + esxVI_Occurrence occurrence) +{ + int result = -1; + esxVI_HostVirtualSwitch *hostVirtualSwitchList = NULL; + esxVI_HostVirtualSwitch *candidate = NULL; + + if (hostVirtualSwitch == NULL || *hostVirtualSwitch != NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); + return -1; + } + + if (esxVI_LookupHostVirtualSwitchList(ctx, &hostVirtualSwitchList) < 0) { + goto cleanup; + } + + /* Search for a matching HostVirtualSwitch */ + for (candidate = hostVirtualSwitchList; candidate != NULL; + candidate = candidate->_next) { + if (STREQ(candidate->name, name)) { + if (esxVI_HostVirtualSwitch_DeepCopy(hostVirtualSwitch, + candidate) < 0) { + goto cleanup; + } + + /* Found HostVirtualSwitch with matching name */ + result = 0; + + goto cleanup; + } + } + + if (*hostVirtualSwitch == NULL && + occurrence != esxVI_Occurrence_OptionalItem) { + virReportError(VIR_ERR_NO_NETWORK, + _("Could not find HostVirtualSwitch with name '%s'"), + name); + goto cleanup; + } + + result = 0; + + cleanup: + esxVI_HostVirtualSwitch_Free(&hostVirtualSwitchList); + + return result; +} + + + +int +esxVI_LookupHostPortGroupList(esxVI_Context *ctx, + esxVI_HostPortGroup **hostPortGroupList) +{ + int result = -1; + esxVI_String *propertyNameList = NULL; + esxVI_ObjectContent *hostSystem = NULL; + esxVI_DynamicProperty *dynamicProperty = NULL; + + if (hostPortGroupList == NULL || *hostPortGroupList != NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); + return -1; + } + + if (esxVI_String_AppendValueToList(&propertyNameList, + "config.network.portgroup") < 0 || + esxVI_LookupHostSystemProperties(ctx, propertyNameList, + &hostSystem) < 0) { + goto cleanup; + } + + for (dynamicProperty = hostSystem->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "config.network.portgroup")) { + if (esxVI_HostPortGroup_CastListFromAnyType + (dynamicProperty->val, hostPortGroupList) < 0) { + goto cleanup; + } + + break; + } else { + VIR_WARN("Unexpected '%s' property", dynamicProperty->name); + } + } + + result = 0; + + cleanup: + esxVI_String_Free(&propertyNameList); + esxVI_ObjectContent_Free(&hostSystem); + + return result; +} + + + +int +esxVI_LookupNetworkList(esxVI_Context *ctx, esxVI_String *propertyNameList, + esxVI_ObjectContent **networkList) +{ + return esxVI_LookupObjectContentByType(ctx, ctx->datacenter->_reference, + "Network", propertyNameList, + networkList, + esxVI_Occurrence_OptionalList); +} + + + +int esxVI_HandleVirtualMachineQuestion (esxVI_Context *ctx, esxVI_ManagedObjectReference *virtualMachine, esxVI_VirtualMachineQuestionInfo *questionInfo, bool autoAnswer, diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index 597013c..12394e7 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -227,6 +227,7 @@ struct _esxVI_Context { esxVI_SelectionSpec *selectSet_hostSystemToDatastore; esxVI_SelectionSpec *selectSet_computeResourceToHost; esxVI_SelectionSpec *selectSet_computeResourceToParentToParent; + esxVI_SelectionSpec *selectSet_datacenterToNetwork; bool hasQueryVirtualDiskUuid; bool hasSessionIsActive; }; @@ -492,6 +493,19 @@ int esxVI_LookupPhysicalNicByMACAddress(esxVI_Context *ctx, const char *mac, esxVI_PhysicalNic **physicalNic, esxVI_Occurrence occurrence); +int esxVI_LookupHostVirtualSwitchList + (esxVI_Context *ctx, esxVI_HostVirtualSwitch **hostVirtualSwitchList); + +int esxVI_LookupHostVirtualSwitchByName(esxVI_Context *ctx, const char *name, + esxVI_HostVirtualSwitch **hostVirtualSwitch, + esxVI_Occurrence occurrence); + +int esxVI_LookupHostPortGroupList(esxVI_Context *ctx, + esxVI_HostPortGroup **hostPortGroupList); + +int esxVI_LookupNetworkList(esxVI_Context *ctx, esxVI_String *propertyNameList, + esxVI_ObjectContent **networkList); + int esxVI_HandleVirtualMachineQuestion (esxVI_Context *ctx, esxVI_ManagedObjectReference *virtualMachine, esxVI_VirtualMachineQuestionInfo *questionInfo, bool autoAnswer, diff --git a/src/esx/esx_vi_generator.input b/src/esx/esx_vi_generator.input index 5572b36..c4a3e56 100644 --- a/src/esx/esx_vi_generator.input +++ b/src/esx/esx_vi_generator.input @@ -338,12 +338,138 @@ object HostNasVolume extends HostFileSystemVolume end +object HostNetOffloadCapabilities + Boolean csumOffload o + Boolean tcpSegmentation o + Boolean zeroCopyXmit o +end + + +object HostNetworkPolicy + HostNetworkSecurityPolicy security o + HostNicTeamingPolicy nicTeaming o + HostNetOffloadCapabilities offloadPolicy o + HostNetworkTrafficShapingPolicy shapingPolicy o +end + + +object HostNetworkSecurityPolicy + Boolean allowPromiscuous o + Boolean macChanges o + Boolean forgedTransmits o +end + + +object HostNetworkTrafficShapingPolicy + Boolean enabled o + Long averageBandwidth o + Long peakBandwidth o + Long burstSize o +end + + +object HostNicFailureCriteria + String checkSpeed o + Int speed o + Boolean checkDuplex o + Boolean fullDuplex o + Boolean checkErrorPercent o + Int percentage o + Boolean checkBeacon o +end + + +object HostNicOrderPolicy + String activeNic ol + String standbyNic ol +end + + +object HostNicTeamingPolicy + String policy o + Boolean reversePolicy o + Boolean notifySwitches o + Boolean rollingOrder o + HostNicFailureCriteria failureCriteria o + HostNicOrderPolicy nicOrder o +end + + +object HostPortGroup + String key o + HostPortGroupPort port ol + String vswitch o + HostNetworkPolicy computedPolicy r + HostPortGroupSpec spec r +end + + +object HostPortGroupPort + String key o + String mac ol + String type r +end + + +object HostPortGroupSpec + String name r + Int vlanId r + String vswitchName r + HostNetworkPolicy policy r +end + + object HostScsiDiskPartition String diskName r Int partition r end +object HostVirtualSwitch + String name r + String key r + Int numPorts r + Int numPortsAvailable r + Int mtu o + String portgroup ol + String pnic ol + HostVirtualSwitchSpec spec r +end + + +object HostVirtualSwitchAutoBridge extends HostVirtualSwitchBridge + String excludedNicDevice ol +end + + +object HostVirtualSwitchBeaconConfig + Int interval r +end + + +object HostVirtualSwitchBondBridge extends HostVirtualSwitchBridge + String nicDevice rl + HostVirtualSwitchBeaconConfig beacon o +end + + +object HostVirtualSwitchBridge +end + + +object HostVirtualSwitchSimpleBridge extends HostVirtualSwitchBridge + String nicDevice r +end + + +object HostVirtualSwitchSpec + Int numPorts r + HostVirtualSwitchBridge bridge o + HostNetworkPolicy policy o + Int mtu o +end + + object HostVmfsVolume extends HostFileSystemVolume Int blockSizeMb r Int maxBlocks r @@ -805,6 +931,19 @@ end # Methods # +method AddPortGroup + ManagedObjectReference _this r + HostPortGroupSpec portgrp r +end + + +method AddVirtualSwitch + ManagedObjectReference _this r + String vswitchName r + HostVirtualSwitchSpec spec o +end + + method AnswerVM ManagedObjectReference _this r String questionId r @@ -981,12 +1120,24 @@ method RegisterVM_Task returns ManagedObjectReference r end +method RemovePortGroup + ManagedObjectReference _this r + String pgName r +end + + method RemoveSnapshot_Task returns ManagedObjectReference r ManagedObjectReference _this r Boolean removeChildren r end +method RemoveVirtualSwitch + ManagedObjectReference _this r + String vswitchName 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 596bd16..b49db70 100755 --- a/src/esx/esx_vi_generator.py +++ b/src/esx/esx_vi_generator.py @@ -1520,6 +1520,11 @@ additional_object_features = { "AutoStartDefaults" : Object.FEATURE__AN Object.FEATURE__ANY_TYPE, "HostDatastoreBrowserSearchResults" : Object.FEATURE__LIST | Object.FEATURE__ANY_TYPE, + "HostPortGroup" : Object.FEATURE__LIST | + Object.FEATURE__ANY_TYPE, + "HostVirtualSwitch" : Object.FEATURE__DEEP_COPY | + Object.FEATURE__LIST | + Object.FEATURE__ANY_TYPE, "ManagedObjectReference" : Object.FEATURE__ANY_TYPE, "ObjectContent" : Object.FEATURE__DEEP_COPY, "PhysicalNic" : Object.FEATURE__DEEP_COPY | -- 1.7.4.1

2 2

[libvirt] [PATCH] esx: Implement interface driver
by Matthias Bolte 09 Aug '12

09 Aug '12

Lists available PhysicalNic devices. A PhysicalNic is always active and can neither be defined nor undefined. A PhysicalNic is used to bridge a HostVirtualSwitch to the physical network. --- This implementation differs from Ata's. It just lists PhysicalNics instead of listing HostVirtualNics as bridges. src/esx/esx_interface_driver.c | 239 +++++++++++++++++++++++++++++++++++++++- src/esx/esx_vi.c | 144 ++++++++++++++++++++++++- src/esx/esx_vi.h | 13 ++- src/esx/esx_vi_generator.input | 34 ++++++- src/esx/esx_vi_generator.py | 5 +- 5 files changed, 430 insertions(+), 5 deletions(-) diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c index 501409a..a78a744 100644 --- a/src/esx/esx_interface_driver.c +++ b/src/esx/esx_interface_driver.c @@ -4,7 +4,7 @@ * host interfaces * * Copyright (C) 2010-2011 Red Hat, Inc. - * Copyright (C) 2010 Matthias Bolte <matthias.bolte(a)googlemail.com> + * Copyright (C) 2010-2012 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 @@ -29,6 +29,8 @@ #include "memory.h" #include "logging.h" #include "uuid.h" +#include "interface_conf.h" +#include "virsocketaddr.h" #include "esx_private.h" #include "esx_interface_driver.h" #include "esx_vi.h" @@ -67,10 +69,245 @@ esxInterfaceClose(virConnectPtr conn) +static int +esxNumberOfInterfaces(virConnectPtr conn) +{ + esxPrivate *priv = conn->interfacePrivateData; + esxVI_PhysicalNic *physicalNicList = NULL; + esxVI_PhysicalNic *physicalNic = NULL; + int count = 0; + + if (esxVI_EnsureSession(priv->primary) < 0 || + esxVI_LookupPhysicalNicList(priv->primary, &physicalNicList) < 0) { + return -1; + } + + for (physicalNic = physicalNicList; physicalNic != NULL; + physicalNic = physicalNic->_next) { + ++count; + } + + esxVI_PhysicalNic_Free(&physicalNicList); + + return count; +} + + + +static int +esxListInterfaces(virConnectPtr conn, char **const names, int maxnames) +{ + bool success = false; + esxPrivate *priv = conn->interfacePrivateData; + esxVI_PhysicalNic *physicalNicList = NULL; + esxVI_PhysicalNic *physicalNic = NULL; + int count = 0; + int i; + + if (maxnames == 0) { + return 0; + } + + if (esxVI_EnsureSession(priv->primary) < 0 || + esxVI_LookupPhysicalNicList(priv->primary, &physicalNicList) < 0) { + return -1; + } + + for (physicalNic = physicalNicList; physicalNic != NULL; + physicalNic = physicalNic->_next) { + names[count] = strdup(physicalNic->device); + + 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_PhysicalNic_Free(&physicalNicList); + + return count; +} + + + +static int +esxNumberOfDefinedInterfaces(virConnectPtr conn ATTRIBUTE_UNUSED) +{ + /* ESX interfaces are always active */ + return 0; +} + + + +static int +esxListDefinedInterfaces(virConnectPtr conn ATTRIBUTE_UNUSED, + char **const names ATTRIBUTE_UNUSED, + int maxnames ATTRIBUTE_UNUSED) +{ + /* ESX interfaces are always active */ + return 0; +} + + + +static virInterfacePtr +esxInterfaceLookupByName(virConnectPtr conn, const char *name) +{ + virInterfacePtr iface = NULL; + esxPrivate *priv = conn->interfacePrivateData; + esxVI_PhysicalNic *physicalNic = NULL; + + if (esxVI_EnsureSession(priv->primary) < 0 || + esxVI_LookupPhysicalNicByMACAddress(priv->primary, name, &physicalNic, + esxVI_Occurrence_RequiredItem) < 0) { + return NULL; + } + + iface = virGetInterface(conn, physicalNic->device, physicalNic->mac); + + esxVI_PhysicalNic_Free(&physicalNic); + + return iface; +} + + + +static virInterfacePtr +esxInterfaceLookupByMACString(virConnectPtr conn, const char *mac) +{ + virInterfacePtr iface = NULL; + esxPrivate *priv = conn->interfacePrivateData; + esxVI_PhysicalNic *physicalNic = NULL; + + if (esxVI_EnsureSession(priv->primary) < 0 || + esxVI_LookupPhysicalNicByMACAddress(priv->primary, mac, &physicalNic, + esxVI_Occurrence_RequiredItem) < 0) { + return NULL; + } + + iface = virGetInterface(conn, physicalNic->device, physicalNic->mac); + + esxVI_PhysicalNic_Free(&physicalNic); + + return iface; +} + + + +static char * +esxInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) +{ + char *xml = NULL; + esxPrivate *priv = iface->conn->interfacePrivateData; + esxVI_PhysicalNic *physicalNic = NULL; + virInterfaceDef def; + bool hasAddress = false; + virInterfaceProtocolDefPtr protocols; + virInterfaceProtocolDef protocol; + virSocketAddr socketAddress; + virInterfaceIpDefPtr ips; + virInterfaceIpDef ip; + + virCheckFlags(VIR_INTERFACE_XML_INACTIVE, NULL); + + memset(&def, 0, sizeof(def)); + memset(&protocol, 0, sizeof(protocol)); + memset(&socketAddress, 0, sizeof(socketAddress)); + memset(&ip, 0, sizeof(ip)); + + if (esxVI_EnsureSession(priv->primary) < 0 || + esxVI_LookupPhysicalNicByMACAddress(priv->primary, iface->mac, + &physicalNic, + esxVI_Occurrence_RequiredItem) < 0) { + return NULL; + } + + def.type = VIR_INTERFACE_TYPE_ETHERNET; + def.name = physicalNic->device; + def.mac = physicalNic->mac; + def.startmode = VIR_INTERFACE_START_ONBOOT; + + /* FIXME: Add support for IPv6, requires to use vSphere API 4.0 */ + if (physicalNic->spec->ip != NULL) { + protocol.family = (char *)"ipv4"; + + if (physicalNic->spec->ip->dhcp == esxVI_Boolean_True) { + protocol.dhcp = 1; + } + + if (physicalNic->spec->ip->ipAddress != NULL && + physicalNic->spec->ip->subnetMask != NULL && + strlen(physicalNic->spec->ip->ipAddress) > 0 && + strlen(physicalNic->spec->ip->subnetMask) > 0) { + hasAddress = true; + } + + if (protocol.dhcp || hasAddress) { + protocols = &protocol; + def.nprotos = 1; + def.protos = &protocols; + } + + if (hasAddress && + !(protocol.dhcp && (flags & VIR_INTERFACE_XML_INACTIVE))) { + ips = &ip; + protocol.nips = 1; + protocol.ips = &ips; + + if (virSocketAddrParseIPv4(&socketAddress, + physicalNic->spec->ip->subnetMask) < 0) { + goto cleanup; + } + + ip.address = physicalNic->spec->ip->ipAddress; + ip.prefix = virSocketAddrGetNumNetmaskBits(&socketAddress); + } + } + + xml = virInterfaceDefFormat(&def); + + cleanup: + esxVI_PhysicalNic_Free(&physicalNic); + + return xml; +} + + + +static int +esxInterfaceIsActive(virInterfacePtr iface ATTRIBUTE_UNUSED) +{ + /* ESX interfaces are always active */ + return 1; +} + + + static virInterfaceDriver esxInterfaceDriver = { .name = "ESX", .open = esxInterfaceOpen, /* 0.7.6 */ .close = esxInterfaceClose, /* 0.7.6 */ + .numOfInterfaces = esxNumberOfInterfaces, /* 0.10.0 */ + .listInterfaces = esxListInterfaces, /* 0.10.0 */ + .numOfDefinedInterfaces = esxNumberOfDefinedInterfaces, /* 0.10.0 */ + .listDefinedInterfaces = esxListDefinedInterfaces, /* 0.10.0 */ + .interfaceLookupByName = esxInterfaceLookupByName, /* 0.10.0 */ + .interfaceLookupByMACString = esxInterfaceLookupByMACString, /* 0.10.0 */ + .interfaceGetXMLDesc = esxInterfaceGetXMLDesc, /* 0.10.0 */ + .interfaceIsActive = esxInterfaceIsActive, /* 0.10.0 */ }; diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 2c789e1..c4217c9 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -3,7 +3,7 @@ * esx_vi.c: client for the VMware VI API 2.5 to manage ESX hosts * * Copyright (C) 2010-2011 Red Hat, Inc. - * Copyright (C) 2009-2011 Matthias Bolte <matthias.bolte(a)googlemail.com> + * Copyright (C) 2009-2012 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 @@ -3949,6 +3949,148 @@ esxVI_LookupAutoStartPowerInfoList(esxVI_Context *ctx, int +esxVI_LookupPhysicalNicList(esxVI_Context *ctx, + esxVI_PhysicalNic **physicalNicList) +{ + int result = -1; + esxVI_String *propertyNameList = NULL; + esxVI_ObjectContent *hostSystem = NULL; + esxVI_DynamicProperty *dynamicProperty = NULL; + + if (physicalNicList == NULL || *physicalNicList != NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); + return -1; + } + + if (esxVI_String_AppendValueToList(&propertyNameList, + "config.network.pnic") < 0 || + esxVI_LookupHostSystemProperties(ctx, propertyNameList, + &hostSystem) < 0) { + goto cleanup; + } + + for (dynamicProperty = hostSystem->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "config.network.pnic")) { + if (esxVI_PhysicalNic_CastListFromAnyType(dynamicProperty->val, + physicalNicList) < 0) { + goto cleanup; + } + } else { + VIR_WARN("Unexpected '%s' property", dynamicProperty->name); + } + } + + result = 0; + + cleanup: + esxVI_String_Free(&propertyNameList); + esxVI_ObjectContent_Free(&hostSystem); + + return result; +} + + + +int +esxVI_LookupPhysicalNicByName(esxVI_Context *ctx, const char *name, + esxVI_PhysicalNic **physicalNic, + esxVI_Occurrence occurrence) +{ + int result = -1; + esxVI_PhysicalNic *physicalNicList = NULL; + esxVI_PhysicalNic *candidate = NULL; + + if (physicalNic == NULL || *physicalNic != NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); + return -1; + } + + if (esxVI_LookupPhysicalNicList(ctx, &physicalNicList) < 0) { + goto cleanup; + } + + /* Search for a matching physical NIC */ + for (candidate = physicalNicList; candidate != NULL; + candidate = candidate->_next) { + if (STRCASEEQ(candidate->device, name)) { + if (esxVI_PhysicalNic_DeepCopy(physicalNic, candidate) < 0) { + goto cleanup; + } + + /* Found physical NIC with matching name */ + result = 0; + + goto cleanup; + } + } + + if (*physicalNic == NULL && occurrence != esxVI_Occurrence_OptionalItem) { + virReportError(VIR_ERR_NO_INTERFACE, + _("Could not find physical NIC with name '%s'"), name); + goto cleanup; + } + + result = 0; + + cleanup: + esxVI_PhysicalNic_Free(&physicalNicList); + + return result; +} + + + +int +esxVI_LookupPhysicalNicByMACAddress(esxVI_Context *ctx, const char *mac, + esxVI_PhysicalNic **physicalNic, + esxVI_Occurrence occurrence) +{ + int result = -1; + esxVI_PhysicalNic *physicalNicList = NULL; + esxVI_PhysicalNic *candidate = NULL; + + if (physicalNic == NULL || *physicalNic != NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); + return -1; + } + + if (esxVI_LookupPhysicalNicList(ctx, &physicalNicList) < 0) { + goto cleanup; + } + + /* Search for a matching physical NIC */ + for (candidate = physicalNicList; candidate != NULL; + candidate = candidate->_next) { + if (STRCASEEQ(candidate->mac, mac)) { + if (esxVI_PhysicalNic_DeepCopy(physicalNic, candidate) < 0) { + goto cleanup; + } + + /* Found physical NIC with matching MAC address */ + result = 0; + + goto cleanup; + } + } + + if (*physicalNic == NULL && occurrence != esxVI_Occurrence_OptionalItem) { + virReportError(VIR_ERR_NO_INTERFACE, + _("Could not find physical NIC with MAC address '%s'"), mac); + goto cleanup; + } + + result = 0; + + cleanup: + esxVI_PhysicalNic_Free(&physicalNicList); + + return result; +} + + + +int esxVI_HandleVirtualMachineQuestion (esxVI_Context *ctx, esxVI_ManagedObjectReference *virtualMachine, esxVI_VirtualMachineQuestionInfo *questionInfo, bool autoAnswer, diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index 4b84be8..597013c 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -3,7 +3,7 @@ * esx_vi.h: client for the VMware VI API 2.5 to manage ESX hosts * * Copyright (C) 2011 Red Hat, Inc. - * Copyright (C) 2009-2010 Matthias Bolte <matthias.bolte(a)googlemail.com> + * Copyright (C) 2009-2012 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 @@ -481,6 +481,17 @@ int esxVI_LookupAutoStartDefaults(esxVI_Context *ctx, int esxVI_LookupAutoStartPowerInfoList(esxVI_Context *ctx, esxVI_AutoStartPowerInfo **powerInfoList); +int esxVI_LookupPhysicalNicList(esxVI_Context *ctx, + esxVI_PhysicalNic **physicalNicList); + +int esxVI_LookupPhysicalNicByName(esxVI_Context *ctx, const char *name, + esxVI_PhysicalNic **physicalNic, + esxVI_Occurrence occurrence); + +int esxVI_LookupPhysicalNicByMACAddress(esxVI_Context *ctx, const char *mac, + esxVI_PhysicalNic **physicalNic, + esxVI_Occurrence occurrence); + int esxVI_HandleVirtualMachineQuestion (esxVI_Context *ctx, esxVI_ManagedObjectReference *virtualMachine, esxVI_VirtualMachineQuestionInfo *questionInfo, bool autoAnswer, diff --git a/src/esx/esx_vi_generator.input b/src/esx/esx_vi_generator.input index 1a67a8c..5572b36 100644 --- a/src/esx/esx_vi_generator.input +++ b/src/esx/esx_vi_generator.input @@ -317,6 +317,13 @@ object HostFileSystemVolume end +object HostIpConfig + Boolean dhcp r + String ipAddress o + String subnetMask o +end + + object HostMountInfo String path o String accessMode r @@ -455,6 +462,31 @@ object PerfSampleInfo end +object PhysicalNic + String key o + String device r + String pci r + String driver o + PhysicalNicLinkInfo linkSpeed o + PhysicalNicLinkInfo validLinkSpecification ol + PhysicalNicSpec spec r + Boolean wakeOnLanSupported r + String mac r +end + + +object PhysicalNicLinkInfo + Int speedMb r + Boolean duplex r +end + + +object PhysicalNicSpec + HostIpConfig ip o + PhysicalNicLinkInfo linkSpeed o +end + + object PropertyChange String name r PropertyChangeOp op r @@ -569,7 +601,7 @@ object TemplateConfigFileQuery extends VmConfigFileQuery end -object TraversalSpec extends SelectionSpec +object TraversalSpec extends SelectionSpec String type r String path r Boolean skip o diff --git a/src/esx/esx_vi_generator.py b/src/esx/esx_vi_generator.py index af2d57e..596bd16 100755 --- a/src/esx/esx_vi_generator.py +++ b/src/esx/esx_vi_generator.py @@ -3,7 +3,7 @@ # # esx_vi_generator.py: generates most of the SOAP type mapping code # -# Copyright (C) 2010-2011 Matthias Bolte <matthias.bolte(a)googlemail.com> +# Copyright (C) 2010-2012 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 @@ -1522,6 +1522,9 @@ additional_object_features = { "AutoStartDefaults" : Object.FEATURE__AN Object.FEATURE__ANY_TYPE, "ManagedObjectReference" : Object.FEATURE__ANY_TYPE, "ObjectContent" : Object.FEATURE__DEEP_COPY, + "PhysicalNic" : Object.FEATURE__DEEP_COPY | + Object.FEATURE__LIST | + Object.FEATURE__ANY_TYPE, "ResourcePoolResourceUsage" : Object.FEATURE__ANY_TYPE, "ServiceContent" : Object.FEATURE__DESERIALIZE, "SharesInfo" : Object.FEATURE__ANY_TYPE, -- 1.7.4.1

2 2

[libvirt] [PATCH] esx: Remove redundant checks for esxVI_LookupHostSystemProperties result
by Matthias Bolte 09 Aug '12

09 Aug '12

esxVI_LookupHostSystemProperties guarantees that hostSystem is non-NULL. Remove redundant NULL checks from callers. Also prefer esxVI_GetStringValue over open-coding the logic. --- src/esx/esx_driver.c | 82 +++++++++--------------------------------------- src/esx/esx_vi.c | 4 +- src/esx/esx_vi_types.c | 3 +- 3 files changed, 19 insertions(+), 70 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 47957cc..72a7acc 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -3,7 +3,7 @@ * esx_driver.c: core driver functions for managing VMware ESX hosts * * Copyright (C) 2010-2012 Red Hat, Inc. - * Copyright (C) 2009-2011 Matthias Bolte <matthias.bolte(a)googlemail.com> + * Copyright (C) 2009-2012 Matthias Bolte <matthias.bolte(a)googlemail.com> * Copyright (C) 2009 Maximilian Wilhelm <max(a)rfc2324.org> * * This library is free software; you can redistribute it and/or @@ -467,12 +467,6 @@ esxSupportsLongMode(esxPrivate *priv) goto cleanup; } - if (hostSystem == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not retrieve the HostSystem object")); - goto cleanup; - } - for (dynamicProperty = hostSystem->propSet; dynamicProperty != NULL; dynamicProperty = dynamicProperty->_next) { if (STREQ(dynamicProperty->name, "hardware.cpuFeature")) { @@ -534,7 +528,7 @@ esxLookupHostSystemBiosUuid(esxPrivate *priv, unsigned char *uuid) int result = -1; esxVI_String *propertyNameList = NULL; esxVI_ObjectContent *hostSystem = NULL; - esxVI_DynamicProperty *dynamicProperty = NULL; + char *uuid_string = NULL; if (esxVI_EnsureSession(priv->primary) < 0) { return -1; @@ -543,41 +537,22 @@ esxLookupHostSystemBiosUuid(esxPrivate *priv, unsigned char *uuid) if (esxVI_String_AppendValueToList(&propertyNameList, "hardware.systemInfo.uuid") < 0 || esxVI_LookupHostSystemProperties(priv->primary, propertyNameList, - &hostSystem) < 0) { - goto cleanup; - } - - if (hostSystem == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not retrieve the HostSystem object")); + &hostSystem) < 0 || + esxVI_GetStringValue(hostSystem, "hardware.systemInfo.uuid", + &uuid_string, esxVI_Occurrence_RequiredItem) < 0) { goto cleanup; } - for (dynamicProperty = hostSystem->propSet; dynamicProperty != NULL; - dynamicProperty = dynamicProperty->_next) { - if (STREQ(dynamicProperty->name, "hardware.systemInfo.uuid")) { - if (esxVI_AnyType_ExpectType(dynamicProperty->val, - esxVI_Type_String) < 0) { - goto cleanup; - } - - if (strlen(dynamicProperty->val->string) > 0) { - if (virUUIDParse(dynamicProperty->val->string, uuid) < 0) { - VIR_WARN("Could not parse host UUID from string '%s'", - dynamicProperty->val->string); + if (strlen(uuid_string) > 0) { + if (virUUIDParse(uuid_string, uuid) < 0) { + VIR_WARN("Could not parse host UUID from string '%s'", uuid_string); - /* HostSystem has an invalid UUID, ignore it */ - memset(uuid, 0, VIR_UUID_BUFLEN); - } - } else { - /* HostSystem has an empty UUID */ - memset(uuid, 0, VIR_UUID_BUFLEN); - } - - break; - } else { - VIR_WARN("Unexpected '%s' property", dynamicProperty->name); + /* HostSystem has an invalid UUID, ignore it */ + memset(uuid, 0, VIR_UUID_BUFLEN); } + } else { + /* HostSystem has an empty UUID */ + memset(uuid, 0, VIR_UUID_BUFLEN); } result = 0; @@ -1176,17 +1151,8 @@ esxSupportsVMotion(esxPrivate *priv) if (esxVI_String_AppendValueToList(&propertyNameList, "capability.vmotionSupported") < 0 || esxVI_LookupHostSystemProperties(priv->primary, propertyNameList, - &hostSystem) < 0) { - goto cleanup; - } - - if (hostSystem == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not retrieve the HostSystem object")); - goto cleanup; - } - - if (esxVI_GetBoolean(hostSystem, "capability.vmotionSupported", + &hostSystem) < 0 || + esxVI_GetBoolean(hostSystem, "capability.vmotionSupported", &priv->supportsVMotion, esxVI_Occurrence_RequiredItem) < 0) { goto cleanup; @@ -1281,12 +1247,6 @@ esxGetHostname(virConnectPtr conn) goto cleanup; } - if (hostSystem == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not retrieve the HostSystem object")); - goto cleanup; - } - for (dynamicProperty = hostSystem->propSet; dynamicProperty != NULL; dynamicProperty = dynamicProperty->_next) { if (STREQ(dynamicProperty->name, @@ -1379,12 +1339,6 @@ esxNodeGetInfo(virConnectPtr conn, virNodeInfoPtr nodeinfo) goto cleanup; } - if (hostSystem == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not retrieve the HostSystem object")); - goto cleanup; - } - for (dynamicProperty = hostSystem->propSet; dynamicProperty != NULL; dynamicProperty = dynamicProperty->_next) { if (STREQ(dynamicProperty->name, "hardware.cpuInfo.hz")) { @@ -2702,12 +2656,6 @@ esxDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags) goto cleanup; } - if (hostSystem == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not retrieve the HostSystem object")); - goto cleanup; - } - for (dynamicProperty = hostSystem->propSet; dynamicProperty != NULL; dynamicProperty = dynamicProperty->_next) { if (STREQ(dynamicProperty->name, "capability.maxSupportedVcpus")) { diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index c4217c9..f3a9e91 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -4570,8 +4570,8 @@ esxVI_ProductVersionToDefaultVirtualHWVersion(esxVI_ProductVersion productVersio esxVI_DynamicProperty *dynamicProperty = NULL; \ \ if (ptrptr == NULL || *ptrptr != NULL) { \ - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", \ - _("Invalid argument")); \ + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", \ + _("Invalid argument")); \ return -1; \ } \ \ diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index 36f3196..2236751 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -296,7 +296,8 @@ childNode = childNode->next) { \ if (childNode->type != XML_ELEMENT_NODE) { \ virReportError(VIR_ERR_INTERNAL_ERROR, \ - _("Wrong XML element type %d"), childNode->type); \ + _("Wrong XML element type %d"), \ + childNode->type); \ goto failure; \ } \ \ -- 1.7.4.1

3 3

[libvirt] [PATCH] esx: Fix dynamic deep copy
by Matthias Bolte 09 Aug '12

09 Aug '12

The static deep copy allocates storage for the copy. The dynamic version injected the dynamic dispatch after the allocation. This triggered the invalid argument check in the dynamically dispatched deep copy call. The deep copy function expects its dest parameter to be a pointer to a NULL-pointer. This expectation wasn't met due to the dispatching deep copy doing the allocation before the call. Fix this by dynamically dispatching to the correct type before the allocation. --- src/esx/esx_vi_types.c | 35 ++++++++++++++++++++++++++++++----- 1 files changed, 30 insertions(+), 5 deletions(-) diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index 8750554..36f3196 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -621,11 +621,36 @@ #define ESX_VI__TEMPLATE__DYNAMIC_DEEP_COPY(__type, _dispatch, _deep_copy) \ - ESX_VI__TEMPLATE__DEEP_COPY(__type, \ - ESX_VI__TEMPLATE__DISPATCH(src->_type, \ - esxVI_Type_ToString(src->_type), \ - __type, _dispatch, -1) \ - _deep_copy) + int \ + esxVI_##__type##_DeepCopy(esxVI_##__type **dest, esxVI_##__type *src) \ + { \ + if (dest == NULL || *dest != NULL) { \ + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", \ + _("Invalid argument")); \ + return -1; \ + } \ + \ + if (src == NULL) { \ + return 0; \ + } \ + \ + ESX_VI__TEMPLATE__DISPATCH(src->_type, \ + esxVI_Type_ToString(src->_type), \ + __type, _dispatch, -1) \ + \ + if (esxVI_##__type##_Alloc(dest) < 0) { \ + goto failure; \ + } \ + \ + _deep_copy \ + \ + return 0; \ + \ + failure: \ + esxVI_##__type##_Free(dest); \ + \ + return -1; \ + } -- 1.7.4.1

2 2

[libvirt] [PATCH] nwfilter: remove target table before renaming it
by Stefan Berger 09 Aug '12

09 Aug '12

Remove the target table before renaming a table to it, i.e., remove table B before renaming A to B. This makes the renaming more robust against unconnected left-over tables. --- src/nwfilter/nwfilter_ebiptables_driver.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) Index: libvirt-firewalld/src/nwfilter/nwfilter_ebiptables_driver.c =================================================================== --- libvirt-firewalld.orig/src/nwfilter/nwfilter_ebiptables_driver.c +++ libvirt-firewalld/src/nwfilter/nwfilter_ebiptables_driver.c @@ -125,12 +125,18 @@ static const char ebiptables_script_func "}\n"; static const char ebiptables_script_func_rename_chains[] = + "rename_chain()\n" + "{\n" + " $EBT -t nat -F $2\n" + " $EBT -t nat -X $2\n" + " $EBT -t nat -E $1 $2\n" + "}\n" "rename_chains()\n" "{\n" " for tmp in $*; do\n" " case $tmp in\n" - " %c*) $EBT -t nat -E $tmp %c${tmp#?} ;;\n" - " %c*) $EBT -t nat -E $tmp %c${tmp#?} ;;\n" + " %c*) rename_chain $tmp %c${tmp#?} ;;\n" + " %c*) rename_chain $tmp %c${tmp#?} ;;\n" " esac\n" " done\n" "}\n";

2 2

[libvirt] PF interface brought down if guest using a VF in hostdev mode under 802.1Qbh
by Nishank Trivedi (nistrive) 09 Aug '12

09 Aug '12

Hi, In 802.1Qbh case where exists a SR-IOV capable network device, if any of the virtual functions of this device is used in hostdev mode for the guest, port-profile disassociate will also cause physical function interface to go down. This appears to be a bug, but wanted to find if this was done intentionally for some reasons. To be more specific, if a network device supports SRIOV and its VF is being used in pci passthrough mode, when the guest is shutdown or destroyed following happens - qemuProcessStop \_ qemuDomainReAttachHostdevDevices(hostdevs) \_ qemuDomainHostdevNetConfigRestore(hostdev) \_ virNetDevPortProfileDisassociate(linkdev) \_ virNetDevSetOnline(linkdev, false) In above, qemuDomainHostdevNetConfigRestore() finds out the PF for provided hostdev (which is VF) and passes it to virNetDevPortProfileDisassociate() as linkdev. Later, linkdev gets passed to virNetDevSetOnline() where the interface is brought down by clearing IFF_UP flag. However, in macvtap emulation mode, virNetDevMacVLanDeleteWithVPortProfile() passes VF as linkdev (and -1 as vf) to virNetDevPortProfileDisassociate(), hence, not affecting PF at all. Bringing down a PF, when only VF is being brought down is not expected behavior (unless, I'm missing something here). A way to get around it would be to check if there exists vf (>=0) in virNetDevPortProfileDisassociate(), and if so, it should only pass the interface name of this VF rather than PF itself to virNetDevSetOnline(). If it sounds reasonable, I'll send out a fix. Thanks, Nishank

3 4

[libvirt] virDomainMemoryStats call
by Parakkal, Navin S 09 Aug '12

09 Aug '12

Hi, Is the array mstats returned by virDomainMemoryStats call cummulative or snapshot of the counter at that particular time ? I was of the opinion that is cummulative like the /proc counters but this counter seems to go backwards ie next snapshot value is less than the current one which makes me think these are snapshot values . I'm using RHEL 6.3 libvirt version 0.9.10. Regards, Navin

2 1

[libvirt] [PATCH 5/5] Add qemu-agent-command command to virsh
by MATSUDA, Daiki 09 Aug '12

09 Aug '12

Add qemu-agent-command command to virsh to support virDomainQemuAgentCommand(). virsh-host.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/tools/virsh-host.c b/tools/virsh-host.c index d9d09b4..b9180f3 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -633,6 +633,74 @@ cleanup: } /* + * "qemu-agent-command" command + */ +static const vshCmdInfo info_qemu_agent_command[] = { + {"help", N_("Qemu Guest Agent Command")}, + {"desc", N_("Qemu Guest Agent Command")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_qemu_agent_command[] = { + {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, + {"timeout", VSH_OT_INT, VSH_OFLAG_REQ_OPT, N_("timeout")}, + {"cmd", VSH_OT_ARGV, VSH_OFLAG_REQ, N_("command")}, + {NULL, 0, 0, NULL} +}; + +static bool +cmdQemuAgentCommand(vshControl *ctl, const vshCmd *cmd) +{ + virDomainPtr dom = NULL; + bool ret = false; + char *guest_agent_cmd = NULL; + char *result = NULL; + int timeout = 0; + unsigned int flags = 0; + const vshCmdOpt *opt = NULL; + virBuffer buf = VIR_BUFFER_INITIALIZER; + bool pad = false; + + if (!vshConnectionUsability(ctl, ctl->conn)) + goto cleanup; + + dom = vshCommandOptDomain(ctl, cmd, NULL); + if (dom == NULL) + goto cleanup; + + while ((opt = vshCommandOptArgv(cmd, opt))) { + if (pad) + virBufferAddChar(&buf, ' '); + pad = true; + virBufferAdd(&buf, opt->data, -1); + } + if (virBufferError(&buf)) { + vshPrint(ctl, "%s", _("Failed to collect command")); + goto cleanup; + } + guest_agent_cmd = virBufferContentAndReset(&buf); + + if (vshCommandOptInt(cmd, "timeout", &timeout) < 0) { + timeout = 0; + } + + if (virDomainQemuAgentCommand(dom, guest_agent_cmd, &result, + timeout, flags) < 0) + goto cleanup; + + printf("%s\n", result); + + ret = true; + +cleanup: + VIR_FREE(result); + VIR_FREE(guest_agent_cmd); + if (dom) + virDomainFree(dom); + + return ret; +} +/* * "sysinfo" command */ static const vshCmdInfo info_sysinfo[] = { @@ -832,6 +900,8 @@ static const vshCmdDef hostAndHypervisorCmds[] = { {"qemu-attach", cmdQemuAttach, opts_qemu_attach, info_qemu_attach, 0}, {"qemu-monitor-command", cmdQemuMonitorCommand, opts_qemu_monitor_command, info_qemu_monitor_command, 0}, + {"qemu-agent-command", cmdQemuAgentCommand, opts_qemu_agent_command, + info_qemu_agent_command, 0}, {"sysinfo", cmdSysinfo, NULL, info_sysinfo, 0}, {"uri", cmdURI, NULL, info_uri, 0}, {"version", cmdVersion, opts_version, info_version, 0},

2 1

[libvirt] [PATCH 4/5] Add virDomainQemuAgentCommand() support function to python module
by MATSUDA, Daiki 09 Aug '12

09 Aug '12

Add virDomainQemuAgentCommand() support function to python module. generator.py | 1 + libvirt-qemu-override-api.xml | 8 ++++++++ libvirt-qemu-override.c | 31 +++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+) diff --git a/python/generator.py b/python/generator.py index 6559ece..3cec12b 100755 --- a/python/generator.py +++ b/python/generator.py @@ -431,6 +431,7 @@ skip_impl = ( qemu_skip_impl = ( 'virDomainQemuMonitorCommand', + 'virDomainQemuAgentCommand', ) diff --git a/python/libvirt-qemu-override-api.xml b/python/libvirt-qemu-override-api.xml index d69acea..37759d0 100644 --- a/python/libvirt-qemu-override-api.xml +++ b/python/libvirt-qemu-override-api.xml @@ -8,5 +8,13 @@ <arg name='cmd' type='const char *' info='the command which will be passed to QEMU monitor'/> <arg name='flags' type='unsigned int' info='an OR'ed set of virDomainQemuMonitorCommandFlags'/> </function> + <function name='virDomainQemuAgentCommand' file='python-qemu'> + <info>Send a Guest Agent command to domain</info> + <return type='str *' info='the command output or None in case of error'/> + <arg name='domain' type='virDomainPtr' info='pointer to the domain'/> + <arg name='cmd' type='const char *' info='guest agent command on domain'/> + <arg name='timeout' type='int' info='timeout seconds'/> + <arg name='flags' type='unsigned int' info='execution flags'/> + </function> </symbols> </api> diff --git a/python/libvirt-qemu-override.c b/python/libvirt-qemu-override.c index e532416..195aadc 100644 --- a/python/libvirt-qemu-override.c +++ b/python/libvirt-qemu-override.c @@ -82,6 +82,36 @@ libvirt_qemu_virDomainQemuMonitorCommand(PyObject *self ATTRIBUTE_UNUSED, return py_retval; } +static PyObject * +libvirt_qemu_virDomainQemuAgentCommand(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + PyObject *py_retval; + char *result = NULL; + virDomainPtr domain; + PyObject *pyobj_domain; + int timeout; + unsigned int flags; + char *cmd; + int c_retval; + + if (!PyArg_ParseTuple(args, (char *)"Ozii:virDomainQemuAgentCommand", + &pyobj_domain, &cmd, &timeout, &flags)) + return NULL; + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + if (domain == NULL) + return VIR_PY_NONE; + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virDomainQemuAgentCommand(domain, cmd, &result, timeout, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (c_retval < 0) + return VIR_PY_NONE; + + py_retval = PyString_FromString(result); + return py_retval; +} /************************************************************************ * * * The registration stuff * @@ -90,6 +120,7 @@ libvirt_qemu_virDomainQemuMonitorCommand(PyObject *self ATTRIBUTE_UNUSED, static PyMethodDef libvirtQemuMethods[] = { #include "libvirt-qemu-export.c" {(char *) "virDomainQemuMonitorCommand", libvirt_qemu_virDomainQemuMonitorCommand, METH_VARARGS, NULL}, + {(char *) "virDomainQemuAgentCommand", libvirt_qemu_virDomainQemuAgentCommand, METH_VARARGS, NULL}, {NULL, NULL, 0, NULL} };

2 1

[libvirt] [PATCH 3/5] add virDomainQemuAgentCommand() to qemu driver and remote driver
by MATSUDA, Daiki 09 Aug '12

09 Aug '12

Add virDomainQemuAgentCommand() to qemu driver and remote driver to support qemuAgentCommand(). daemon/remote.c | 35 ++++++++++++++++++++ include/libvirt/libvirt-qemu.h | 3 + src/driver.h | 6 +++ src/libvirt-qemu.c | 58 +++++++++++++++++++++++++++++++++ src/libvirt_qemu.syms | 5 ++ src/qemu/qemu_driver.c | 71 +++++++++++++++++++++++++++++++++++++++++ src/qemu_protocol-structs | 10 +++++ src/remote/qemu_protocol.x | 14 +++++++- src/remote/remote_driver.c | 41 +++++++++++++++++++++++ 9 files changed, 242 insertions(+), 1 deletion(-) diff --git a/daemon/remote.c b/daemon/remote.c index 832307e..4fd5c9b 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -3948,6 +3948,41 @@ cleanup: return rv; } +static int +qemuDispatchAgentCommand(virNetServerPtr server ATTRIBUTE_UNUSED, + virNetServerClientPtr client ATTRIBUTE_UNUSED, + virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessageErrorPtr rerr, + qemu_agent_command_args *args, + qemu_agent_command_ret *ret) +{ + virDomainPtr dom = NULL; + int rv = -1; + struct daemonClientPrivate *priv = + virNetServerClientGetPrivateData(client); + + if (!priv->conn) { + virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not open")); + goto cleanup; + } + + if (!(dom = get_nonnull_domain(priv->conn, args->dom))) + goto cleanup; + + if (virDomainQemuAgentCommand(dom, args->cmd, &ret->result, + args->timeout, args->flags) < 0) { + goto cleanup; + } + + rv = 0; +cleanup: + if (rv < 0) + virNetMessageSaveError(rerr); + if (dom) + virDomainFree(dom); + return rv; +} + /*----- Helpers. -----*/ /* get_nonnull_domain and get_nonnull_network turn an on-wire diff --git a/include/libvirt/libvirt-qemu.h b/include/libvirt/libvirt-qemu.h index ffc5ae5..aed1259 100644 --- a/include/libvirt/libvirt-qemu.h +++ b/include/libvirt/libvirt-qemu.h @@ -49,6 +49,9 @@ typedef enum { VIR_DOMAIN_QEMU_AGENT_COMMAND_NOWAIT = 0, } virDomainQemuAgentCommandTimeoutFlags; +int virDomainQemuAgentCommand(virDomainPtr domain, const char *cmd, + char **result, int timeout, unsigned int flags); + # ifdef __cplusplus } # endif diff --git a/src/driver.h b/src/driver.h index aab9766..c368273 100644 --- a/src/driver.h +++ b/src/driver.h @@ -689,6 +689,11 @@ typedef int (*virDrvDomainQemuMonitorCommand)(virDomainPtr domain, const char *cmd, char **result, unsigned int flags); +typedef int + (*virDrvDomainQemuAgentCommand)(virDomainPtr domain, const char *cmd, + char **result, int timeout, + unsigned int flags); + /* Choice of unsigned int rather than pid_t is intentional. */ typedef virDomainPtr (*virDrvDomainQemuAttach)(virConnectPtr conn, @@ -1048,6 +1053,7 @@ struct _virDriver { virDrvDomainGetDiskErrors domainGetDiskErrors; virDrvDomainSetMetadata domainSetMetadata; virDrvDomainGetMetadata domainGetMetadata; + virDrvDomainQemuAgentCommand qemuDomainQemuAgentCommand; }; typedef int diff --git a/src/libvirt-qemu.c b/src/libvirt-qemu.c index 78480bb..0e12425 100644 --- a/src/libvirt-qemu.c +++ b/src/libvirt-qemu.c @@ -185,3 +185,61 @@ error: virDispatchError(conn); return NULL; } + +/** + * virDomainQemuAgentCommand: + * @domain: a domain object + * @cmd: the guest agent command string + * @result: a string returned by @cmd + * @timeout: timeout seconds + * @flags: execution flags + * + * Execution Guest Agent Command + * + * Issue @cmd to the guest agent running in @domain. + * If @result is NULL, then don't wait for a result (and @timeout + * must be 0). Otherwise, wait for @timeout seconds for a + * successful result to be populated into *@result, with + * VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK (-1) meaning to block + * forever waiting for a result. + * + * Returns 0 if succeeded, -1 in failing. + */ +int +virDomainQemuAgentCommand(virDomainPtr domain, + const char *cmd, + char **result, + int timeout, + unsigned int flags) +{ + virConnectPtr conn; + + VIR_DEBUG("domain=%p, cmd=%s, result=%p, timeout=%d, flags=%x", + domain, cmd, result, timeout, flags); + + if (!VIR_IS_CONNECTED_DOMAIN(domain)) { + virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virDispatchError(NULL); + return -1; + } + + conn = domain->conn; + + virCheckNonNullArgGoto(result, error); + + if (conn->driver->qemuDomainQemuAgentCommand) { + int ret; + ret = conn->driver->qemuDomainQemuAgentCommand(domain, cmd, result, + timeout, flags); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError(conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virDispatchError(domain->conn); + return -1; +} diff --git a/src/libvirt_qemu.syms b/src/libvirt_qemu.syms index 8447730..f968d91 100644 --- a/src/libvirt_qemu.syms +++ b/src/libvirt_qemu.syms @@ -19,3 +19,8 @@ LIBVIRT_QEMU_0.9.4 { global: virDomainQemuAttach; } LIBVIRT_QEMU_0.8.3; + +LIBVIRT_QEMU_0.10.0 { + global: + virDomainQemuAgentCommand; +} LIBVIRT_QEMU_0.9.4; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index dee1268..750577e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -13204,6 +13204,76 @@ qemuListAllDomains(virConnectPtr conn, return ret; } +static int +qemuDomainQemuAgentCommand(virDomainPtr domain, + const char *cmd, + char **result, + int timeout, + unsigned int flags) +{ + struct qemud_driver *driver = domain->conn->privateData; + virDomainObjPtr vm; + int ret = -1; + qemuDomainObjPrivatePtr priv; + + virCheckFlags(0, -1); + + qemuDriverLock(driver); + vm = virDomainFindByUUID(&driver->domains, domain->uuid); + qemuDriverUnlock(driver); + + if (!vm) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(domain->uuid, uuidstr); + qemuReportError(VIR_ERR_NO_DOMAIN, + _("no domain with matching uuid '%s'"), uuidstr); + goto cleanup; + } + + priv = vm->privateData; + + if (!virDomainObjIsActive(vm)) { + qemuReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + goto cleanup; + } + + if (priv->agentError) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("QEMU guest agent is not available due to an error")); + goto cleanup; + } + + if (!priv->agent) { + qemuReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", + _("QEMU guest agent is not configured")); + goto cleanup; + } + + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) + goto cleanup; + + if (!virDomainObjIsActive(vm)) { + qemuReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + goto endjob; + } + + qemuDomainObjEnterAgent(driver, vm); + ret = qemuAgentQemuAgentCommand(priv->agent, cmd, result, timeout); + qemuDomainObjExitAgent(driver, vm); + +endjob: + if (qemuDomainObjEndJob(driver, vm) == 0) { + vm = NULL; + } + +cleanup: + if (vm) + virDomainObjUnlock(vm); + return ret; +} + static virDriver qemuDriver = { .no = VIR_DRV_QEMU, .name = QEMU_DRIVER_NAME, @@ -13369,6 +13439,7 @@ static virDriver qemuDriver = { .domainPMSuspendForDuration = qemuDomainPMSuspendForDuration, /* 0.9.11 */ .domainPMWakeup = qemuDomainPMWakeup, /* 0.9.11 */ .domainGetCPUStats = qemuDomainGetCPUStats, /* 0.9.11 */ + .qemuDomainQemuAgentCommand = qemuDomainQemuAgentCommand, /* 0.10.0 */ }; diff --git a/src/qemu_protocol-structs b/src/qemu_protocol-structs index 67968eb..624fa7b 100644 --- a/src/qemu_protocol-structs +++ b/src/qemu_protocol-structs @@ -19,7 +19,17 @@ struct qemu_domain_attach_args { struct qemu_domain_attach_ret { remote_nonnull_domain dom; }; +struct qemu_agent_command_args { + remote_nonnull_domain dom; + remote_nonnull_string cmd; + int timeout; + u_int flags; +}; +struct qemu_agent_command_ret { + remote_nonnull_string result; +}; enum qemu_procedure { QEMU_PROC_MONITOR_COMMAND = 1, QEMU_PROC_DOMAIN_ATTACH = 2, + QEMU_PROC_AGENT_COMMAND = 3, }; diff --git a/src/remote/qemu_protocol.x b/src/remote/qemu_protocol.x index c06339c..67c6493 100644 --- a/src/remote/qemu_protocol.x +++ b/src/remote/qemu_protocol.x @@ -47,6 +47,17 @@ struct qemu_domain_attach_ret { remote_nonnull_domain dom; }; +struct qemu_agent_command_args { + remote_nonnull_domain dom; + remote_nonnull_string cmd; + int timeout; + unsigned int flags; +}; + +struct qemu_agent_command_ret { + remote_nonnull_string result; +}; + /* Define the program number, protocol version and procedure numbers here. */ const QEMU_PROGRAM = 0x20008087; const QEMU_PROTOCOL_VERSION = 1; @@ -61,5 +72,6 @@ enum qemu_procedure { * are some exceptions to this rule, e.g. domainDestroy. Other APIs MAY * be marked as high priority. If in doubt, it's safe to choose low. */ QEMU_PROC_MONITOR_COMMAND = 1, /* skipgen skipgen priority:low */ - QEMU_PROC_DOMAIN_ATTACH = 2 /* autogen autogen priority:low */ + QEMU_PROC_DOMAIN_ATTACH = 2, /* autogen autogen priority:low */ + QEMU_PROC_AGENT_COMMAND = 3 /* skipgen skipgen priority:low */ }; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 353a153..6f27f59 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -5191,6 +5191,46 @@ make_nonnull_domain_snapshot (remote_nonnull_domain_snapshot *snapshot_dst, virD make_nonnull_domain(&snapshot_dst->dom, snapshot_src->domain); } +static int +remoteQemuDomainQemuAgentCommand (virDomainPtr domain, const char *cmd, + char **result, int timeout, + unsigned int flags) +{ + int rv = -1; + qemu_agent_command_args args; + qemu_agent_command_ret ret; + struct private_data *priv = domain->conn->privateData; + + remoteDriverLock(priv); + + make_nonnull_domain(&args.dom, domain); + args.cmd = (char *)cmd; + args.timeout = timeout; + args.flags = flags; + + memset (&ret, 0, sizeof(ret)); + + if (call (domain->conn, priv, REMOTE_CALL_QEMU, QEMU_PROC_AGENT_COMMAND, + (xdrproc_t) xdr_qemu_agent_command_args, (char *) &args, + (xdrproc_t) xdr_qemu_agent_command_ret, (char *) &ret) == -1) + goto done; + + *result = strdup(ret.result); + if (*result == NULL) { + virReportOOMError(); + goto cleanup; + } + + rv = 0; + +cleanup: + xdr_free ((xdrproc_t) xdr_qemu_agent_command_ret, (char *) &ret); + +done: + remoteDriverUnlock(priv); + return rv; +} + /*----------------------------------------------------------------------*/ unsigned long remoteVersion(void) @@ -5368,6 +5408,7 @@ static virDriver remote_driver = { .domainSetMetadata = remoteDomainSetMetadata, /* 0.9.10 */ .domainGetMetadata = remoteDomainGetMetadata, /* 0.9.10 */ .domainGetHostname = remoteDomainGetHostname, /* 0.10.0 */ + .qemuDomainQemuAgentCommand = remoteQemuDomainQemuAgentCommand, /* 0.10.0 */ }; static virNetworkDriver network_driver = {

2 1

[libvirt] error: authentication failed: TRANSPORT_FAULT
by Arun Sharma 09 Aug '12

09 Aug '12

Hello Getting below error while connecting with XenServer using virsh. I have builded libvirt version 0.9.3 (--with-xenapi) from tar file and installed on Xen 5.6 FP1. # virsh -c xenapi://xxx.xxx.xxx.xxx/ list Enter username for xxx.xxx.xxx.xxx: root Enter root's password for xxx.xxx.xxx.xxx: error: authentication failed: TRANSPORT_FAULT error: failed to connect to the hypervisor Any idea about the cause of this issue? Last threads which i can see as below and i can see these patch already present in 0.9.3. https://www.redhat.com/archives/libvirt-users/2011-July/msg00064.html http://permalink.gmane.org/gmane.comp.emulators.libvirt/39900 Thanks Arun

2 2

[libvirt] sending openvswitch "port db" info during libvirt migration
by Laine Stump 09 Aug '12

09 Aug '12

Someone asked on IRC the other day about sending openvswitch per-port data (normally stored in the switch) to the destination host during a migration. I suggested maybe this could be handled by encoding the information into the interface's <virtualport> prior to migration, and then writing it back out to openvswitch on the destination when the interface was reconnected there. I think there's a problem with that, though - they don't want to save the port data on the source until the instant that the interface is disconnected (since it is constantly changing), but by then the domain XML has already long ago been formatted and sent to the destination. So is there some other way within the confines of the current migration protocol that this information can be sent from migration source to destination?

3 5

[libvirt] [PATCH] [libvirt-java] Fix Array IndexOutOfBoundsException for unknown error codes
by Claudio Bley 09 Aug '12

09 Aug '12

Hi. I sent a few mails on friday, 6th July, via gmane.org but they haven't made it to the list yet. As I'm a subscriber now, I'm resending them directly. Sorry for any duplicates in advance. I'm using libvirt-java 0.4.7 and libvirt 0.9.8. When libvirt returns an error code which is not mapped in enum ErrorNumber, an IndexOutOfBoundsException is thrown. I realize that the freshly released libvirt-java 0.4.8 supports all error codes up to libvirt 0.9.12. But that doesn't fix the problem. Would it be feasible to add a special UNKNOWN enum value? --- diff --git a/src/main/java/org/libvirt/Error.java b/src/main/java/org/libvirt/Error.java index 0946030..72bc698 100644 --- a/src/main/java/org/libvirt/Error.java +++ b/src/main/java/org/libvirt/Error.java @@ -151,9 +151,12 @@ public class Error implements Serializable { } public Error(virError vError) { - code = ErrorNumber.values()[vError.code]; - domain = ErrorDomain.values()[vError.domain]; - level = ErrorLevel.values()[vError.level]; + if (ErrorNumber.values().length > vError.code) + code = ErrorNumber.values()[vError.code]; + if (ErrorDomain.values().length > vError.domain) + domain = ErrorDomain.values()[vError.domain]; + if (ErrorLevel.values().length > vError.level) + level = ErrorLevel.values()[vError.level]; message = vError.message; str1 = vError.str1; str2 = vError.str2; --- Best regards, Claudio. -- AV-Test GmbH, Henricistraße 20, 04155 Leipzig, Germany Phone: +49 341 265 310 19 Web:<http://www.av-test.org> Eingetragen am / Registered at: Amtsgericht Stendal (HRB 114076) Geschaeftsfuehrer (CEO): Andreas Marx, Guido Habicht, Maik Morgenstern

2 7

[libvirt] [PATCH] qemu: Migrate at unlimited speed by default
by Jiri Denemark 09 Aug '12

09 Aug '12

Previously, qemu did not respond to monitor commands during migration if the limit was too high. This prevented us from raising the limit earlier. The qemu issue seems to be fixed (according to my testing) and we may remove the 32Mb/s limit. --- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_domain.h | 5 ++--- src/qemu/qemu_migration.c | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 86f0265..a54df2f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -217,7 +217,7 @@ static void *qemuDomainObjPrivateAlloc(void) if (!(priv->cons = virConsoleAlloc())) goto error; - priv->migMaxBandwidth = QEMU_DOMAIN_DEFAULT_MIG_BANDWIDTH_MAX; + priv->migMaxBandwidth = QEMU_DOMAIN_MIG_BANDWIDTH_MAX; return priv; diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 9f9467d..23a5111 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -38,13 +38,12 @@ (1 << VIR_DOMAIN_VIRT_KVM) | \ (1 << VIR_DOMAIN_VIRT_XEN)) -# define QEMU_DOMAIN_DEFAULT_MIG_BANDWIDTH_MAX 32 # if ULONG_MAX == 4294967295 /* Qemu has a 64-bit limit, but we are limited by our historical choice of * representing bandwidth in a long instead of a 64-bit int. */ -# define QEMU_DOMAIN_FILE_MIG_BANDWIDTH_MAX ULONG_MAX +# define QEMU_DOMAIN_MIG_BANDWIDTH_MAX ULONG_MAX # else -# define QEMU_DOMAIN_FILE_MIG_BANDWIDTH_MAX (INT64_MAX / (1024 * 1024)) +# define QEMU_DOMAIN_MIG_BANDWIDTH_MAX (INT64_MAX / (1024 * 1024)) # endif # define JOB_MASK(job) (1 << (job - 1)) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index b792456..6eddce6 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -3189,8 +3189,8 @@ qemuMigrationToFile(struct qemud_driver *driver, virDomainObjPtr vm, * Failure to change migration speed is not fatal. */ if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) == 0) { qemuMonitorSetMigrationSpeed(priv->mon, - QEMU_DOMAIN_FILE_MIG_BANDWIDTH_MAX); - priv->migMaxBandwidth = QEMU_DOMAIN_FILE_MIG_BANDWIDTH_MAX; + QEMU_DOMAIN_MIG_BANDWIDTH_MAX); + priv->migMaxBandwidth = QEMU_DOMAIN_MIG_BANDWIDTH_MAX; qemuDomainObjExitMonitorWithDriver(driver, vm); } -- 1.7.11.1

3 7

[libvirt] [PATCH] examples: Update strings for event details
by Jiri Denemark 09 Aug '12

09 Aug '12

--- examples/domain-events/events-c/event-test.c | 2 +- examples/domain-events/events-python/event-test.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/domain-events/events-c/event-test.c b/examples/domain-events/events-c/event-test.c index f11c7a3..347ee5a 100644 --- a/examples/domain-events/events-c/event-test.c +++ b/examples/domain-events/events-c/event-test.c @@ -176,7 +176,7 @@ static const char *eventDetailToString(int event, int detail) { ret = "Migrated"; break; case VIR_DOMAIN_EVENT_STOPPED_SAVED: - ret = "Failed"; + ret = "Saved"; break; case VIR_DOMAIN_EVENT_STOPPED_FAILED: ret = "Failed"; diff --git a/examples/domain-events/events-python/event-test.py b/examples/domain-events/events-python/event-test.py index 736c225..e3b6ed2 100644 --- a/examples/domain-events/events-python/event-test.py +++ b/examples/domain-events/events-python/event-test.py @@ -443,9 +443,9 @@ def detailToString(event, detail): eventStrings = ( ( "Added", "Updated" ), ( "Removed" ), - ( "Booted", "Migrated", "Restored", "Snapshot" ), - ( "Paused", "Migrated", "IOError", "Watchdog" ), - ( "Unpaused", "Migrated"), + ( "Booted", "Migrated", "Restored", "Snapshot", "Wakeup" ), + ( "Paused", "Migrated", "IOError", "Watchdog", "Restored", "Snapshot" ), + ( "Unpaused", "Migrated", "Snapshot" ), ( "Shutdown", "Destroyed", "Crashed", "Migrated", "Saved", "Failed", "Snapshot"), ( "Finished" ) ) -- 1.7.11.1

2 2

[libvirt] [PATCH] qemu: Fixe debug message in p2p migration
by Jiri Denemark 09 Aug '12

09 Aug '12

When entering "confirm" phase, we are interested in the value of cancelled rather then ret variable which was interesting before "finish" phase and didn't change since then. --- src/qemu/qemu_migration.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 74b70c7..f65c81a 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2459,7 +2459,7 @@ finish: * If cancelled, then src VM will be restarted, else * it will be killed */ - VIR_DEBUG("Confirm3 %p ret=%d vm=%p", sconn, ret, vm); + VIR_DEBUG("Confirm3 %p cancelled=%d vm=%p", sconn, cancelled, vm); VIR_FREE(cookiein); cookiein = cookieout; cookieinlen = cookieoutlen; -- 1.7.11.1

2 2

[libvirt] [PATCH v7 0/6] file descriptor passing using fd sets
by Corey Bryant 09 Aug '12

09 Aug '12

libvirt's sVirt security driver provides SELinux MAC isolation for Qemu guest processes and their corresponding image files. In other words, sVirt uses SELinux to prevent a QEMU process from opening files that do not belong to it. sVirt provides this support by labeling guests and resources with security labels that are stored in file system extended attributes. Some file systems, such as NFS, do not support the extended attribute security namespace, and therefore cannot support sVirt isolation. A solution to this problem is to provide fd passing support, where libvirt opens files and passes file descriptors to QEMU. This, along with SELinux policy to prevent QEMU from opening files, can provide image file isolation for NFS files stored on the same NFS mount. This patch series adds the add-fd, remove-fd, and query-fdsets QMP monitor commands, which allow file descriptors to be passed via SCM_RIGHTS, and assigned to specified fd sets. This allows fd sets to be created per file with fds having, for example, different access rights. When QEMU needs to reopen a file with different access rights, it can search for a matching fd in the fd set. Fd sets also allow for easy tracking of fds per file, helping to prevent fd leaks. Support is also added to the block layer to allow QEMU to dup an fd from an fdset when the filename is of the /dev/fdset/nnn format, where nnn is the fd set ID. No new SELinux policy is required to prevent open of NFS files (files with type nfs_t). The virt_use_nfs boolean type simply needs to be set to false, and open will be prevented (and dup will be allowed). For example: # setsebool virt_use_nfs 0 # getsebool virt_use_nfs virt_use_nfs --> off Corey Bryant (6): qemu-char: Add MSG_CMSG_CLOEXEC flag to recvmsg qapi: Introduce add-fd, remove-fd, query-fdsets monitor: Clean up fd sets on monitor disconnect block: Convert open calls to qemu_open block: Convert close calls to qemu_close block: Enable qemu_open/close to work with fd sets block/raw-posix.c | 42 ++++----- block/raw-win32.c | 6 +- block/vdi.c | 5 +- block/vmdk.c | 25 +++-- block/vpc.c | 4 +- block/vvfat.c | 16 ++-- cutils.c | 5 + monitor.c | 273 +++++++++++++++++++++++++++++++++++++++++++++++++++++ monitor.h | 5 + osdep.c | 117 +++++++++++++++++++++++ qapi-schema.json | 110 +++++++++++++++++++++ qemu-char.c | 12 ++- qemu-common.h | 2 + qemu-tool.c | 20 ++++ qerror.c | 4 + qerror.h | 3 + qmp-commands.hx | 131 +++++++++++++++++++++++++ savevm.c | 4 +- 18 files changed, 730 insertions(+), 54 deletions(-) -- 1.7.10.4

6 28

[libvirt] [libvirt-glib] Fix small typo in error message ('downlaod')
by Christophe Fergeau 09 Aug '12

09 Aug '12

--- Pushed under the trivial rule. libvirt-gobject/libvirt-gobject-storage-vol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.c b/libvirt-gobject/libvirt-gobject-storage-vol.c index 99ccbab..9256445 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.c +++ b/libvirt-gobject/libvirt-gobject-storage-vol.c @@ -384,7 +384,7 @@ gboolean gvir_storage_vol_download(GVirStorageVol *vol, gvir_set_error_literal(err, GVIR_STORAGE_VOL_ERROR, 0, - "Unable to downlaod volume storage"); + "Unable to download volume storage"); goto cleanup; } -- 1.7.11.2

1 0

[libvirt] [PATCH] qemu: Refactor parsing of block device IO tuning parameters.
by Peter Krempa 09 Aug '12

09 Aug '12

This patch refactors the JSON parsing function that extracts the block IO tuning parameters from qemu's output. The most impacting change concerns the error message that is returned if the reply from qemu does not contain the needed data. The data for IO parameter tuning were added in qemu 1.1 and the previous error message was confusing. This patch also breaks long lines and extracts a multiple time used code pattern to a macro. --- Old error message looks like: # virsh blkdeviotune asdf hda error: Unable to get block I/O throttle parameters error: internal error cannot read total_bytes_sec and the new: # virsh blkdeviotune asdf hda error: Unable to get block I/O throttle parameters error: internal error block_io_throttle field 'total_bytes_sec' missing in qemu's output src/qemu/qemu_monitor_json.c | 66 ++++++++++++++++------------------------- 1 files changed, 26 insertions(+), 40 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index dd6536f..3ede88d 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -3648,6 +3648,16 @@ int qemuMonitorJSONOpenGraphics(qemuMonitorPtr mon, } +#define GET_THROTTLE_STATS(FIELD, STORE) \ + if (virJSONValueObjectGetNumberUlong(inserted, \ + FIELD, \ + &reply->STORE) < 0) { \ + virReportError(VIR_ERR_INTERNAL_ERROR, \ + _("block_io_throttle field '%s' missing " \ + "in qemu's output"), \ + #STORE); \ + goto cleanup; \ + } static int qemuMonitorJSONBlockIoThrottleInfo(virJSONValuePtr result, const char *device, @@ -3656,7 +3666,7 @@ qemuMonitorJSONBlockIoThrottleInfo(virJSONValuePtr result, virJSONValuePtr io_throttle; int ret = -1; int i; - int found = 0; + bool found = false; io_throttle = virJSONValueObjectGet(result, "return"); @@ -3673,13 +3683,15 @@ qemuMonitorJSONBlockIoThrottleInfo(virJSONValuePtr result, if (!temp_dev || temp_dev->type != VIR_JSON_TYPE_OBJECT) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("block_io_throttle device entry was not in expected format")); + _("block_io_throttle device entry " + "was not in expected format")); goto cleanup; } - if ((current_dev = virJSONValueObjectGetString(temp_dev, "device")) == NULL) { + if (!(current_dev = virJSONValueObjectGetString(temp_dev, "device"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("block_io_throttle device entry was not in expected format")); + _("block_io_throttle device entry " + "was not in expected format")); goto cleanup; } @@ -3689,49 +3701,22 @@ qemuMonitorJSONBlockIoThrottleInfo(virJSONValuePtr result, if (STREQ(current_dev, device)) continue; - found = 1; + found = true; if ((inserted = virJSONValueObjectGet(temp_dev, "inserted")) == NULL || inserted->type != VIR_JSON_TYPE_OBJECT) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("block_io_throttle inserted entry was not in expected format")); + _("block_io_throttle inserted entry " + "was not in expected format")); goto cleanup; } - if (virJSONValueObjectGetNumberUlong(inserted, "bps", &reply->total_bytes_sec) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("cannot read total_bytes_sec")); - goto cleanup; - } + GET_THROTTLE_STATS("bps", total_bytes_sec); + GET_THROTTLE_STATS("bps_rd", read_bytes_sec); + GET_THROTTLE_STATS("bps_wr", write_bytes_sec); + GET_THROTTLE_STATS("iops", total_iops_sec); + GET_THROTTLE_STATS("iops_rd", read_iops_sec); + GET_THROTTLE_STATS("iops_wr", write_iops_sec); - if (virJSONValueObjectGetNumberUlong(inserted, "bps_rd", &reply->read_bytes_sec) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("cannot read read_bytes_sec")); - goto cleanup; - } - - if (virJSONValueObjectGetNumberUlong(inserted, "bps_wr", &reply->write_bytes_sec) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("cannot read write_bytes_sec")); - goto cleanup; - } - - if (virJSONValueObjectGetNumberUlong(inserted, "iops", &reply->total_iops_sec) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("cannot read total_iops_sec")); - goto cleanup; - } - - if (virJSONValueObjectGetNumberUlong(inserted, "iops_rd", &reply->read_iops_sec) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("cannot read read_iops_sec")); - goto cleanup; - } - - if (virJSONValueObjectGetNumberUlong(inserted, "iops_wr", &reply->write_iops_sec) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("cannot read write_iops_sec")); - goto cleanup; - } break; } @@ -3746,6 +3731,7 @@ qemuMonitorJSONBlockIoThrottleInfo(virJSONValuePtr result, cleanup: return ret; } +#undef GET_THROTTLE_STATS int qemuMonitorJSONSetBlockIoThrottle(qemuMonitorPtr mon, const char *device, -- 1.7.8.6

3 5

[libvirt] [PATCH][TCK] Add new case for domain suspend/resume
by Kyla Zhang 09 Aug '12

09 Aug '12

This case tests the domain suspend and resume, and domain info checking include state, control and os type. --- scripts/domain/140-transient-suspend-resume.t | 91 +++++++++++++++++++++++++ 1 files changed, 91 insertions(+), 0 deletions(-) create mode 100644 scripts/domain/140-transient-suspend-resume.t diff --git a/scripts/domain/140-transient-suspend-resume.t b/scripts/domain/140-transient-suspend-resume.t new file mode 100644 index 0000000..a1c6f91 --- /dev/null +++ b/scripts/domain/140-transient-suspend-resume.t @@ -0,0 +1,91 @@ +# -*- perl -*- +# +# Copyright (C) 2012 Red Hat, Inc. +# Copyright (C) 2012 Kyla Zhang <weizhan(a)redhat.com> +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# + +=pod + +=head1 NAME + +domain/130-transient-suspend-resume.t - Transient domain suspend/resume + +=head1 DESCRIPTION + +The test case validates that it is possible to pause and resume transient +domain without error. + +=cut + +use strict; +use warnings; + +use Test::More tests => 14; + +use Sys::Virt::TCK; +use Test::Exception; + +my $tck = Sys::Virt::TCK->new(); +my $conn = eval { $tck->setup(); }; +BAIL_OUT "failed to setup test harness: $@" if $@; +END { $tck->cleanup if $tck; } + +# Create a new transient domain and check status +my $xml = $tck->generic_domain("tck")->as_xml; + +diag "Creating a new transient domain"; +my $dom; +ok_domain(sub { $dom = $conn->create_domain($xml) }, "created transient domain object"); + +diag "Get domain os type"; +my $os_type = xpath($dom, "string(/domain/os/type)"); +is($dom->get_os_type(), $os_type, "domain os type is $os_type"); + +diag "Check domain state and reason"; +my($state, $reason)=$dom->get_state(); +is($state, Sys::Virt::Domain::STATE_RUNNING, "domain state is running"); +is($reason, Sys::Virt::Domain::STATE_RUNNING_BOOTED, "domain is running after being booted"); + +diag "Get domain control info"; +is($dom->get_control_info->{state}, Sys::Virt::Domain::CONTROL_OK, "domain control info is ok"); + +# Do suspend/resume and check status +diag "Suspend domain"; +lives_ok(sub { $dom->suspend() }, "domain has been suspended"); + +diag "Get domain state and reason"; +($state, $reason)=$dom->get_state(); +is($state, Sys::Virt::Domain::STATE_PAUSED, "domain state is paused"); +is($reason, Sys::Virt::Domain::STATE_PAUSED_USER, "domain is paused at admin request"); + +diag "Get domain control info"; +is($dom->get_control_info->{state}, Sys::Virt::Domain::CONTROL_OK, "domain control info is ok"); + +diag "Resume domain"; +lives_ok( sub { $dom->resume() }, "domain has been resumed"); + +diag "Get domain state and reason"; +($state, $reason)=$dom->get_state(); +is($state, Sys::Virt::Domain::STATE_RUNNING, "domain state is running"); +is($reason, Sys::Virt::Domain::STATE_RUNNING_UNPAUSED, "domain is running after a resume"); + +diag "Get domain control info"; +is($dom->get_control_info->{state}, Sys::Virt::Domain::CONTROL_OK, "domain control info is ok"); + +# Destroy domain +diag "Destroying the transient domain"; +$dom->destroy; + +diag "Checking that transient domain has gone away"; +ok_error(sub { $conn->get_domain_by_name("tck") }, "NO_DOMAIN error raised from missing domain", + Sys::Virt::Error::ERR_NO_DOMAIN); + +# end -- 1.7.1

1 0

[libvirt] [PATCH 0/5] Add LibSSH2 transport
by Peter Krempa 09 Aug '12

09 Aug '12

This patchset adds LibSSH2 transport implementation for libvirt's virNetSocket object and other needed places to enable connections using the native library instead of spawning the ssh client and communicating using pipes. This patchset lacks addition of documentation (I'll do that later, but I'd like to get the code sorted out) but otherwise should be fully functional. The commit message to the last patch describes the configuration variables used to set parameters of the transport. The setting is done using uri arguments. Thanks in advance for reviews and comments :) Peter Peter Krempa (5): remote: Clean up coding style and refactor remote connection opening 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 | 9 + src/libvirt_private.syms | 1 + src/remote/remote_driver.c | 339 ++++++----- src/rpc/virnetclient.c | 120 ++++- src/rpc/virnetclient.h | 14 +- src/rpc/virnetlibsshcontext.c | 1444 +++++++++++++++++++++++++++++++++++++++++ src/rpc/virnetlibsshcontext.h | 83 +++ src/rpc/virnetsocket.c | 178 +++++- src/rpc/virnetsocket.h | 13 + src/util/virterror.c | 8 +- 13 files changed, 2092 insertions(+), 160 deletions(-) create mode 100644 src/rpc/virnetlibsshcontext.c create mode 100644 src/rpc/virnetlibsshcontext.h -- 1.7.8.6

2 9

[libvirt] libvirt sgefaults upon ctrl-c
by Stefan Berger 09 Aug '12

09 Aug '12

Hi, libvirt segfaults for me when run in the foreground and pressing ctrl-c. A bisect of the code lead me to this commit commit 7c1119e3bbd483c52ae4cdfebe23dd179ad28124 Author: Daniel P. Berrange <berrange(a)redhat.com> Date: Tue Aug 7 12:02:06 2012 +0100 Stefan

3 5

[libvirt] [PATCH 2/5] add qemuAgentCommand()
by MATSUDA, Daiki 09 Aug '12

09 Aug '12

Add qemuAgentCommand() for general qemu agent command. include/libvirt/libvirt-qemu.h | 5 +++++ src/qemu/qemu_agent.c | 38 ++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_agent.h | 5 +++++ 3 files changed, 48 insertions(+) diff --git a/include/libvirt/libvirt-qemu.h b/include/libvirt/libvirt-qemu.h index a37f897..ffc5ae5 100644 --- a/include/libvirt/libvirt-qemu.h +++ b/include/libvirt/libvirt-qemu.h @@ -44,6 +44,11 @@ virDomainPtr virDomainQemuAttach(virConnectPtr domain, unsigned int pid_value, unsigned int flags); +typedef enum { + VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK = -1, + VIR_DOMAIN_QEMU_AGENT_COMMAND_NOWAIT = 0, +} virDomainQemuAgentCommandTimeoutFlags; + # ifdef __cplusplus } # endif diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 7699042..1cfcafc 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -1401,3 +1401,41 @@ qemuAgentSuspend(qemuAgentPtr mon, virJSONValueFree(reply); return ret; } + +int qemuAgentQemuAgentCommand(qemuAgentPtr mon, + const char *cmd_str, + char **result, + int timeout) +{ + int ret = -1; + int seconds; + virJSONValuePtr cmd; + virJSONValuePtr reply = NULL; + + cmd = virJSONValueFromString(cmd_str); + if (!cmd) + return ret; + + if (result == NULL) { + seconds = 0; + } else if (timeout == VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) { + seconds = 5; + } else { + seconds = timeout; + } + +repeat: + ret = qemuAgentCommand(mon, cmd, &reply, timeout); + + if (ret == 0) { + ret = qemuAgentCheckError(cmd, reply); + *result = virJSONValueToString(reply); + } else { + if (timeout == VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) goto repeat; + *result = NULL; + } + + virJSONValueFree(cmd); + virJSONValueFree(reply); + return ret; +} diff --git a/src/qemu/qemu_agent.h b/src/qemu/qemu_agent.h index 2fdebb2..fc19c2f 100644 --- a/src/qemu/qemu_agent.h +++ b/src/qemu/qemu_agent.h @@ -77,4 +77,9 @@ int qemuAgentFSThaw(qemuAgentPtr mon); int qemuAgentSuspend(qemuAgentPtr mon, unsigned int target); + +int qemuAgentQemuAgentCommand(qemuAgentPtr mon, + const char *cmd, + char **result, + int timeout); #endif /* __QEMU_AGENT_H__ */

2 2

[libvirt] Channel with virtio problem
by norazah aziz 09 Aug '12

09 Aug '12

I have configured the kvm and edit the xml as below, however there are an error when I want to run the guest. The error as follows: virsh create libvirt.xml error: Failed to create domain from libvirt-test.xml error: XML description for unknown target type for character device: virtio is not well formed or invalid Please help me to solve this problem. ############################################################ <domain type='kvm'> <name>i-5E36098H</name> <os> <type>hvm</type> <kernel>/opt/eucalyptus-data/suria/i-5E36098H/kernel</kernel> <initrd>/opt/eucalyptus-data/suria/i-5E36098H/ramdisk</initrd> <cmdline>root=LABEL=root console=ttyS0</cmdline> </os> <features> <acpi/> </features> <memory>13107200</memory> <vcpu>1</vcpu> <devices> <emulator>/usr/bin/kvm</emulator> <disk type='file'> <source file='/opt/eucalyptus-data/suria/i-5E36098H/disk'/> <target dev='vda' bus='virtio'/> </disk> <interface type='network'> <source network='default'/> <mac address='d0:0d:45:D2:08:01'/> <model type='virtio'/> </interface> <controller type='ide' index='0'/> <controller type='virtio-serial' index='0' ports='16' vectors='4'/> <controller type='virtio-serial' index='1'> <address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/> </controller> <parallel type='pty'> <source path='/dev/pts/2'/> <target port='0'/> </parallel> <serial type='pty'> <source path='/dev/pts/3'/>  <target type='virtio' port='0'/> </serial> <console type='pty'> <source path='/dev/pts/4'/> <target type='virtio' port='0'/> </console> <channel type='pty'> <source mode='bind' path='/var/lib/libvirt/qemu/va-i5E36098H-virtio.sock'/> <target type='virtio' name='org.qemu.guest_agent.0'/> <address type='virtio-serial' controller='0' bus='0' port='0'/> </channel> <graphics type='vnc' port='-1' autoport='yes' keymap='en-us'/> </devices> ########################################################################

2 2

[libvirt] [PATCH] Allow rbd backing stores
by Peter Feiner 08 Aug '12

08 Aug '12

Prevents libvirt from treating RBD backing stores as files. Without this patch, creating a domain with a qcow2 overlay on an RBD would fail. This patch essentially extends 9c7c4a4fc533598e59e9a0038ec783e61a38e664, which allows nbd backing stores, to allow rbd backing stores. diff --git a/src/util/storage_file.c b/src/util/storage_file.c index f38aa8e..101518a 100644 --- a/src/util/storage_file.c +++ b/src/util/storage_file.c @@ -589,8 +589,8 @@ virStorageFileMatchesVersion(int format, static bool virBackingStoreIsFile(const char *backing) { - /* Backing store is a network block device */ - if (STRPREFIX(backing, "nbd:")) + /* Backing store is a network block device or Rados block device */ + if (STRPREFIX(backing, "nbd:") || STRPREFIX(backing, "rbd:")) return false; return true; }

2 1

[libvirt] [PATCH] Fix errno check, prevent spurious errors under heavy load
by Peter Feiner 08 Aug '12

08 Aug '12

>From man poll(2), poll does not set errno=EAGAIN, however it does set errno=EINTR. Have libvirt retry on the appropriate errno. Under heavy load, a program of mine kept getting libvirt errors 'poll on socket failed: Interrupted system call'. The signals were SIGCHLD from processes forked by threads unrelated to those using libvirt. diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 2530ffa..f2a6922 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -1374,7 +1374,7 @@ static int virNetClientIOEventLoop(virNetClientPtr client, repoll: ret = poll(fds, ARRAY_CARDINALITY(fds), timeout); - if (ret < 0 && errno == EAGAIN) + if (ret < 0 && errno == EINTR) goto repoll; ignore_value(pthread_sigmask(SIG_SETMASK, &oldmask, NULL));

2 1

[libvirt] [PATCH V3][TCK] Add test for memory set and get
by Kyla Zhang 08 Aug '12

08 Aug '12

Add test for memory/maxmem setting and getting on domain active/inactive --- scripts/domain/110-memory-balloon.t | 113 +++++++++++++++++++++++++++++++++++ 1 files changed, 113 insertions(+), 0 deletions(-) create mode 100644 scripts/domain/110-memory-balloon.t diff --git a/scripts/domain/110-memory-balloon.t b/scripts/domain/110-memory-balloon.t new file mode 100644 index 0000000..a3e463c --- /dev/null +++ b/scripts/domain/110-memory-balloon.t @@ -0,0 +1,113 @@ +# -*- perl -*- +# +# Copyright (C) 2012-2013 Red Hat, Inc. +# Copyright (C) 2012-2013 Kyla Zhang <weizhan(a)redhat.com> +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# + +=pod + +=head1 NAME + +domain/110-memory-balloon.t: test setting and getting memory/max memory + +=head1 DESCRIPTION + +The testcase validates the basic function of domain memory balloon via setting +its value of current memory, max memory. + +=cut + +use strict; +use warnings; + +use Test::More tests => 15; + +use Sys::Virt::TCK; +use Sys::Virt::TCK::NetworkHelpers; +use Test::Exception; +use File::Spec::Functions qw(catfile catdir rootdir); + +my $tck = Sys::Virt::TCK->new(); +my $conn = eval { $tck->setup(); }; +BAIL_OUT "failed to setup test harness: $@" if $@; +END { $tck->cleanup if $tck; } + +diag "Define a new real domain, default memory is 1048576"; +my $dom_name ="tckmemballoon"; +my $default_mem = 1048576; +my $max_mem1 = 1572864; +my $max_mem2 = 1148576; +my $config_mem = 924288; +my $live_mem = 824288; +my $current_mem = 724288; + +# Install a guest with default memory size +my $dom = prepare_test_disk_and_vm($tck, $conn, $dom_name); + + +diag "Set max memory for inactive domain"; +lives_ok(sub { $dom->set_max_memory("$max_mem1") }, "Set max memory $max_mem1"); +diag "Get max memory from inactive domain"; +is($dom->get_max_memory(), $max_mem1, "Get max memory $max_mem1"); + + +diag "Start domain"; +$dom->create; +ok($dom->get_id() > 0, "running domain has an ID > 0"); +sleep(30); + +diag "Get max memory for domain when domain is active"; +is($dom->get_max_memory(), $max_mem1, "Get max memory is $max_mem1"); + + +diag "Set memory with flag MEM_CONFIG"; +lives_ok(sub { $dom->set_memory("$config_mem", Sys::Virt::Domain::MEM_CONFIG) }, + "Set persistent memory value $config_mem"); +diag "Get current memory"; +is($dom->get_info()->{memory}, $default_mem, "Get current memory is $default_mem"); + + +diag "Set memory with flag MEM_CURRENT"; +lives_ok(sub { $dom->set_memory("$current_mem", Sys::Virt::Domain::MEM_CURRENT) }, + "Set current memory value $current_mem"); +sleep(3); +diag "Get current memory"; +is($dom->get_info()->{memory}, $current_mem, "Get current memory is $current_mem"); + + +diag "Set memory with flag MEM_LIVE"; +lives_ok(sub { $dom->set_memory("$live_mem", Sys::Virt::Domain::MEM_LIVE) }, + "Set live memory value $live_mem"); +sleep(3); +diag "Get current memory"; +is($dom->get_info()->{memory}, $live_mem, "Get current memory is $live_mem"); + + +diag "Set max memory for running domain"; +ok_error(sub { $dom->set_max_memory("$default_mem") }, "Not allowed to set max memory for running domain"); + +diag "Destroy domain"; +$dom->destroy; + +diag "Get current memory"; +is($dom->get_info()->{memory}, $config_mem, "Get current memory is $config_mem"); + + +diag "Set max memory with set_memory"; +lives_ok(sub { $dom->set_memory("$max_mem2", Sys::Virt::Domain::MEM_MAXIMUM) }, + "Set max memory $max_mem2"); +diag "Get max memory"; +is($dom->get_info()->{maxMem}, $max_mem2, "Get max memory is $max_mem2"); + + +diag "Setting memory with flag MEM_LIVE for inactive domain"; +ok_error(sub { $dom->set_memory("$live_mem", Sys::Virt::Domain::MEM_LIVE) }, + "Not allowed to set memory with flag MEM_LIVE for inactive domain"); -- 1.7.1

3 2

[libvirt] [PATCH V3] Add proxy FS support to libvirt
by M. Mohan Kumar 08 Aug '12

08 Aug '12

From: "M. Mohan Kumar" <mohan(a)in.ibm.com> A new FS driver type 'proxy' is added to QEMU 9p server. This patch adds support for using proxy FS driver from libvirt. QEMU proxy FS driver uses socket for communicating between helper and qemu proxy FS driver. Proxy helper (a stand alone binary part of qemu) is invoked with one of the descriptors created using socketpair call and the share path. Similarly QEMU is invoked with another descriptor created using the same socketpair system call and with other required FS driver parameters. Need for proxy FS driver ======================== Pass through security model in QEMU 9p server has following issues: 1) TOCTTOU vulnerability: Following symbolic links in the server could provide access to files beyond 9p export path. 2) Running QEMU with root privilege could be a security issue (pass through security model needs root privilege). Proxy FS driver is implemented to solve these issues. Proxy FS uses chroot + socket combination for securing the vulnerability known with following symbolic links. Intention of adding a new filesystem type is to allow qemu to run in non-root mode, but doing privileged operations in a chroot environment using socket IO. Proxy helper is invoked with root privileges and chroots into 9p export path. QEMU proxy fs driver sends filesystem request to proxy helper and receives the response from it. Proxy helper is designed such a way that it needs only few capabilities related to filesystem operations (such as CAP_DAC_OVERRIDE, CAP_FOWNER, etc) and all other capabilities are dropped (CAP_SYS_CHROOT, etc) Proxy patches http://permalink.gmane.org/gmane.comp.emulators.qemu/128735 Signed-off-by: M. Mohan Kumar <mohan(a)in.ibm.com> --- Changes from V2 * Rebased on top of current libvirt git level Changes from previous version * Remove the xml node for specifying the virtfs-proxy-helper path, now it is determined from qemu binary path. docs/formatdomain.html.in | 2 + src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 2 +- src/qemu/qemu_capabilities.c | 5 ++- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 71 ++++++++++++++++++++++++++++++++++++++++-- src/qemu/qemu_command.h | 3 +- tests/qemuhelptest.c | 6 ++- 8 files changed, 83 insertions(+), 10 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index f97c630..7242455 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1619,6 +1619,8 @@ while the value <code>immediate</code> means that a host writeback is immediately triggered for all pages touched during a guest file write operation (since 0.9.10). + or <code>type='proxy'</code> (since + 1.0). </dd> <dt><code>type='template'</code></dt> <dd> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 58603a3..70b145d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -273,7 +273,8 @@ VIR_ENUM_IMPL(virDomainFS, VIR_DOMAIN_FS_TYPE_LAST, VIR_ENUM_IMPL(virDomainFSDriverType, VIR_DOMAIN_FS_DRIVER_TYPE_LAST, "default", "path", - "handle") + "handle", + "proxy") VIR_ENUM_IMPL(virDomainFSAccessMode, VIR_DOMAIN_FS_ACCESSMODE_LAST, "passthrough", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index f4c43c6..6ea62a3 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -675,6 +675,7 @@ enum virDomainFSDriverType { VIR_DOMAIN_FS_DRIVER_TYPE_DEFAULT = 0, VIR_DOMAIN_FS_DRIVER_TYPE_PATH, VIR_DOMAIN_FS_DRIVER_TYPE_HANDLE, + VIR_DOMAIN_FS_DRIVER_TYPE_PROXY, VIR_DOMAIN_FS_DRIVER_TYPE_LAST }; @@ -713,7 +714,6 @@ struct _virDomainFSDef { unsigned long long space_soft_limit; /* in bytes */ }; - /* 5 different types of networking config */ enum virDomainNetType { VIR_DOMAIN_NET_TYPE_USER, diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 85c49a2..d582549 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -144,7 +144,6 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "ich9-ahci", "no-acpi", "fsdev-readonly", - "virtio-blk-pci.scsi", /* 80 */ "blk-sg-io", "drive-copy-on-read", @@ -168,7 +167,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "nec-usb-xhci", "virtio-s390", "balloon-event", - + "fsdev-proxy", /* 100 */ ); struct qemu_feature_flags { @@ -1129,6 +1128,8 @@ qemuCapsComputeCmdFlags(const char *help, qemuCapsSet(flags, QEMU_CAPS_FSDEV_READONLY); if (strstr(fsdev, "writeout")) qemuCapsSet(flags, QEMU_CAPS_FSDEV_WRITEOUT); + if (strstr(fsdev, "sock_fd")) + qemuCapsSet(flags, QEMU_CAPS_FSDEV_PROXY); } if (strstr(help, "-smbios type")) qemuCapsSet(flags, QEMU_CAPS_SMBIOS_TYPE); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index e8251dc..e48d623 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -135,6 +135,7 @@ enum qemuCapsFlags { QEMU_CAPS_NEC_USB_XHCI = 97, /* -device nec-usb-xhci */ QEMU_CAPS_VIRTIO_S390 = 98, /* -device virtio-*-s390 */ QEMU_CAPS_BALLOON_EVENT = 99, /* Async event for balloon changes */ + QEMU_CAPS_FSDEV_PROXY = 100, /* -fsdev proxy supported */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6ad65a6..af689f8 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -44,6 +44,7 @@ #include <sys/utsname.h> #include <sys/stat.h> #include <fcntl.h> +#include <libgen.h> #define VIR_FROM_THIS VIR_FROM_QEMU @@ -114,7 +115,8 @@ VIR_ENUM_DECL(qemuDomainFSDriver) VIR_ENUM_IMPL(qemuDomainFSDriver, VIR_DOMAIN_FS_DRIVER_TYPE_LAST, "local", "local", - "handle"); + "handle", + "proxy"); static void @@ -2575,9 +2577,43 @@ error: return NULL; } +/* + * Invokes the Proxy Helper with one of the socketpair as its parameter + * + */ +static int qemuInvokeProxyHelper(const char *emulator, int sock, const char *path) +{ +#define HELPER "virtfs-proxy-helper" + int ret_val, status; + virCommandPtr cmd; + char *helper, *dname; + + dname = dirname(strdup(emulator)); + if (virAsprintf(&helper, "%s/%s", dname, HELPER) < 0) { + VIR_FREE(dname); + virReportOOMError(); + return -1; + } + + cmd = virCommandNewArgList(helper, NULL); + virCommandAddArg(cmd, "-f"); + virCommandAddArgFormat(cmd, "%d", sock); + virCommandAddArg(cmd, "-p"); + virCommandAddArgFormat(cmd, "%s", path); + virCommandTransferFD(cmd, sock); + virCommandDaemonize(cmd); + ret_val = virCommandRun(cmd, &status); + if (ret_val < 0) + virReportError(VIR_ERR_INTERNAL_ERROR, + _("%s can't execute"), helper); + virCommandFree(cmd); + VIR_FREE(helper); + VIR_FREE(dname); + return ret_val; +} char *qemuBuildFSStr(virDomainFSDefPtr fs, - virBitmapPtr qemuCaps ATTRIBUTE_UNUSED) + virBitmapPtr qemuCaps ATTRIBUTE_UNUSED, int qemuSocket) { virBuffer opt = VIR_BUFFER_INITIALIZER; const char *driver = qemuDomainFSDriverTypeToString(fs->fsdriver); @@ -2626,6 +2662,10 @@ char *qemuBuildFSStr(virDomainFSDefPtr fs, } virBufferAsprintf(&opt, ",id=%s%s", QEMU_FSDEV_HOST_PREFIX, fs->info.alias); + + if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_PROXY) + virBufferAsprintf(&opt, ",sock_fd=%d", qemuSocket); + virBufferAsprintf(&opt, ",path=%s", fs->src); if (fs->readonly) { @@ -5081,10 +5121,35 @@ qemuBuildCommandLine(virConnectPtr conn, if (qemuCapsGet(qemuCaps, QEMU_CAPS_FSDEV)) { for (i = 0 ; i < def->nfss ; i++) { char *optstr; + int sockets[2] = {-1, -1}; virDomainFSDefPtr fs = def->fss[i]; + /* + * If its a proxy FS, we need to create a socket pair + * and invoke proxy_helper + */ + if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_PROXY) { + if (qemuCapsGet(qemuCaps, QEMU_CAPS_FSDEV_PROXY) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("proxy helper not supported")); + goto error; + } + /* create a socket pair */ + if (socketpair(PF_UNIX, SOCK_STREAM, 0, sockets) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("socketpair failed")); + goto error; + } + virCommandTransferFD(cmd, sockets[1]); + if (qemuInvokeProxyHelper(def->emulator, sockets[0], + fs->src) < 0) { + VIR_FORCE_CLOSE(sockets[0]); + VIR_FORCE_CLOSE(sockets[1]); + goto error; + } + } virCommandAddArg(cmd, "-fsdev"); - if (!(optstr = qemuBuildFSStr(fs, qemuCaps))) + if (!(optstr = qemuBuildFSStr(fs, qemuCaps, sockets[1]))) goto error; virCommandAddArg(cmd, optstr); VIR_FREE(optstr); diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 3ccf4d7..5de7751 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -87,7 +87,8 @@ char *qemuBuildDriveStr(virConnectPtr conn, bool bootable, virBitmapPtr qemuCaps); char *qemuBuildFSStr(virDomainFSDefPtr fs, - virBitmapPtr qemuCaps); + virBitmapPtr qemuCaps, + int qemuSocket); /* Current, best practice */ char * qemuBuildDriveDevStr(virDomainDefPtr def, diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 012ba26..6485c5f 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -677,7 +677,8 @@ mymain(void) QEMU_CAPS_FSDEV_WRITEOUT, QEMU_CAPS_SCSI_BLOCK, QEMU_CAPS_SCSI_CD, - QEMU_CAPS_IDE_CD); + QEMU_CAPS_IDE_CD, + QEMU_CAPS_FSDEV_PROXY); DO_TEST("qemu-1.1.0", 1001000, 0, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -754,7 +755,8 @@ mymain(void) QEMU_CAPS_IDE_CD, QEMU_CAPS_NO_USER_CONFIG, QEMU_CAPS_HDA_MICRO, - QEMU_CAPS_NEC_USB_XHCI); + QEMU_CAPS_NEC_USB_XHCI, + QEMU_CAPS_FSDEV_PROXY); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 1.7.7.6

2 2

[libvirt] [PATCH 0/3 v2] Add lsi and virtio-scsi qemu caps
by Guannan Ren 08 Aug '12

08 Aug '12

Add two capabilities flags for the model of scsi controller LSI and virtio-scsi. Use the lsilogic model by default, if current QEMU supports doesn't it, raise an error. When scsi model is given in XML explicitly, we try to check if the underlying QEMU supports it or not, raise an error on checking failure. Guannan Ren(3) qemu: add capabilities flags related to scsi controller qemu: add two qemu caps for lsi and virtio-scsi SCSI add lsi and virtio-scsi qemu caps in testcases. src/qemu/qemu_capabilities.c | 7 +++ src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 106 +++++++++++++++++++++++++++++++---------- src/qemu/qemu_command.h | 3 +- src/qemu/qemu_process.c | 9 ++- tests/qemuhelptest.c | 10 +++- tests/qemuxml2argvtest.c | 16 ++++-- 7 files changed, 114 insertions(+), 39 deletions(-)

3 14

[libvirt] [PATCH 1/5] add timeout seconds to qemuAgentSend()
by MATSUDA, Daiki 08 Aug '12

08 Aug '12

Add @seconds valuable to qemuAgentSend(). It points timeout seconds on @timeout true. If @seconds is 0 on @timeout true, use default timeout value (QEMU_AGENT_WAIT_TIME). If @timeout is false, @seconds is meanless. qemu_agent.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 15af758..7699042 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -837,6 +837,7 @@ void qemuAgentClose(qemuAgentPtr mon) * @mon: Monitor * @msg: Message * @timeout: use timeout? + * @seconds: timeout seconds. if 0 on @timeout true, use default value * * Send @msg to agent @mon. * Wait max QEMU_AGENT_WAIT_TIME for agent @@ -848,7 +849,8 @@ void qemuAgentClose(qemuAgentPtr mon) */ static int qemuAgentSend(qemuAgentPtr mon, qemuAgentMessagePtr msg, - bool timeout) + bool timeout, + int seconds) { int ret = -1; unsigned long long now, then = 0; @@ -864,7 +866,7 @@ static int qemuAgentSend(qemuAgentPtr mon, if (timeout) { if (virTimeMillisNow(&now) < 0) return -1; - then = now + QEMU_AGENT_WAIT_TIME; + then = now + (seconds == 0 ? QEMU_AGENT_WAIT_TIME : seconds * 1000); } mon->msg = msg; @@ -937,7 +939,7 @@ qemuAgentGuestSync(qemuAgentPtr mon) VIR_DEBUG("Sending guest-sync command with ID: %llu", id); - send_ret = qemuAgentSend(mon, &sync_msg, true); + send_ret = qemuAgentSend(mon, &sync_msg, true, 0); VIR_DEBUG("qemuAgentSend returned: %d", send_ret); @@ -977,7 +979,8 @@ cleanup: static int qemuAgentCommand(qemuAgentPtr mon, virJSONValuePtr cmd, - virJSONValuePtr *reply) + virJSONValuePtr *reply, + int timeout) { int ret = -1; qemuAgentMessage msg; @@ -1005,7 +1008,7 @@ qemuAgentCommand(qemuAgentPtr mon, VIR_DEBUG("Send command '%s' for write", cmdstr); - ret = qemuAgentSend(mon, &msg, false); + ret = qemuAgentSend(mon, &msg, (timeout > 0 ? true : false), timeout); VIR_DEBUG("Receive command reply ret=%d rxObject=%p", ret, msg.rxObject); @@ -1283,7 +1286,7 @@ int qemuAgentShutdown(qemuAgentPtr mon, return -1; mon->await_event = QEMU_AGENT_EVENT_SHUTDOWN; - ret = qemuAgentCommand(mon, cmd, &reply); + ret = qemuAgentCommand(mon, cmd, &reply, 0); if (reply && ret == 0) ret = qemuAgentCheckError(cmd, reply); @@ -1315,7 +1318,7 @@ int qemuAgentFSFreeze(qemuAgentPtr mon) if (!cmd) return -1; - if (qemuAgentCommand(mon, cmd, &reply) < 0 || + if (qemuAgentCommand(mon, cmd, &reply, 0) < 0 || qemuAgentCheckError(cmd, reply) < 0) goto cleanup; @@ -1352,7 +1355,7 @@ int qemuAgentFSThaw(qemuAgentPtr mon) if (!cmd) return -1; - if (qemuAgentCommand(mon, cmd, &reply) < 0 || + if (qemuAgentCommand(mon, cmd, &reply, 0) < 0 || qemuAgentCheckError(cmd, reply) < 0) goto cleanup; @@ -1389,7 +1392,7 @@ qemuAgentSuspend(qemuAgentPtr mon, return -1; mon->await_event = QEMU_AGENT_EVENT_SUSPEND; - ret = qemuAgentCommand(mon, cmd, &reply); + ret = qemuAgentCommand(mon, cmd, &reply, 0); if (reply && ret == 0) ret = qemuAgentCheckError(cmd, reply);

2 1

[libvirt] [PATCH] rpc: fix a virObject typo error in struct _virNetServer
by Guannan Ren 08 Aug '12

08 Aug '12

This typo will crash libvirtd when it recevies signal SIGINT --- src/rpc/virnetserver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index a1ea038..15abb56 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -64,7 +64,7 @@ struct _virNetServerJob { }; struct _virNetServer { - virObjectPtr object; + virObject object; virMutex lock; -- 1.7.7.6

2 2

[libvirt] [PATCH v6 0/6] file descriptor passing using fd sets
by Corey Bryant 08 Aug '12

08 Aug '12

libvirt's sVirt security driver provides SELinux MAC isolation for Qemu guest processes and their corresponding image files. In other words, sVirt uses SELinux to prevent a QEMU process from opening files that do not belong to it. sVirt provides this support by labeling guests and resources with security labels that are stored in file system extended attributes. Some file systems, such as NFS, do not support the extended attribute security namespace, and therefore cannot support sVirt isolation. A solution to this problem is to provide fd passing support, where libvirt opens files and passes file descriptors to QEMU. This, along with SELinux policy to prevent QEMU from opening files, can provide image file isolation for NFS files stored on the same NFS mount. This patch series adds the add-fd, remove-fd, and query-fdsets QMP monitor commands, which allow file descriptors to be passed via SCM_RIGHTS, and assigned to specified fd sets. This allows fd sets to be created per file with fds having, for example, different access rights. When QEMU needs to reopen a file with different access rights, it can search for a matching fd in the fd set. Fd sets also allow for easy tracking of fds per file, helping to prevent fd leaks. Support is also added to the block layer to allow QEMU to dup an fd from an fdset when the filename is of the /dev/fdset/nnn format, where nnn is the fd set ID. No new SELinux policy is required to prevent open of NFS files (files with type nfs_t). The virt_use_nfs boolean type simply needs to be set to false, and open will be prevented (and dup will be allowed). For example: # setsebool virt_use_nfs 0 # getsebool virt_use_nfs virt_use_nfs --> off Corey Bryant (6): qemu-char: Add MSG_CMSG_CLOEXEC flag to recvmsg qapi: Introduce add-fd, remove-fd, query-fdsets monitor: Clean up fd sets on monitor disconnect block: Convert open calls to qemu_open block: Convert close calls to qemu_close block: Enable qemu_open/close to work with fd sets block/raw-posix.c | 42 ++++---- block/raw-win32.c | 6 +- block/vdi.c | 5 +- block/vmdk.c | 25 ++--- block/vpc.c | 4 +- block/vvfat.c | 16 +-- cutils.c | 5 + monitor.c | 287 ++++++++++++++++++++++++++++++++++++++++++++++++++++- monitor.h | 5 + osdep.c | 117 ++++++++++++++++++++++ qapi-schema.json | 103 +++++++++++++++++++ qemu-char.c | 12 ++- qemu-common.h | 2 + qemu-tool.c | 21 ++++ qerror.c | 4 + qerror.h | 3 + qmp-commands.hx | 126 +++++++++++++++++++++++ savevm.c | 4 +- 18 files changed, 732 insertions(+), 55 deletions(-) -- 1.7.10.4

2 13

[libvirt] [PATCH] qemu: Avoid libvirtd crash in qemuDomainObjExitAgentInternal
by Alex Jia 08 Aug '12

08 Aug '12

* src/qemu/qemu_domain.c (qemuDomainObjExitAgentInternal): fix crashing libvirtd due to derefing a NULL pointer. For details, please see bug: RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=845966 Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/qemu/qemu_domain.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 86f0265..8667b6c 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1136,12 +1136,14 @@ qemuDomainObjExitAgentInternal(struct qemud_driver *driver, virDomainObjPtr obj) { qemuDomainObjPrivatePtr priv = obj->privateData; - int refs; + int refs = -1; - refs = qemuAgentUnref(priv->agent); + if (priv->agent) { + refs = qemuAgentUnref(priv->agent); - if (refs > 0) - qemuAgentUnlock(priv->agent); + if (refs > 0) + qemuAgentUnlock(priv->agent); + } if (driver_locked) qemuDriverLock(driver); -- 1.7.1

2 3

[libvirt] [test-API][PATCH v2] Reconnct libvirt after libvirtd restart
by Wayne Sun 08 Aug '12

08 Aug '12

In domain_nfs_start case, libvirtd will be restarted during test, which broke existing connection. User need re-init connection in test case, for this: * New get_conn function in utils for get libvirt connection * sharemod_init in env_inspect use get_conn to get libvirt connection * In case domain_nfs_start, use get_conn to get new connectin after libvirtd restarted. Signed-off-by: Wayne Sun <gsun(a)redhat.com> --- repos/sVirt/domain_nfs_start.py | 9 +++++++-- src/env_inspect.py | 22 ++-------------------- utils/utils.py | 29 ++++++++++++++++++++++++++++- 3 files changed, 37 insertions(+), 23 deletions(-) diff --git a/repos/sVirt/domain_nfs_start.py b/repos/sVirt/domain_nfs_start.py index 88d349c..5475945 100644 --- a/repos/sVirt/domain_nfs_start.py +++ b/repos/sVirt/domain_nfs_start.py @@ -12,7 +12,6 @@ import sys import libvirt from libvirt import libvirtError - from src import sharedmod from utils import utils from shutil import copy @@ -163,6 +162,8 @@ def domain_nfs_start(params): logger.error("Error: fail to get domain %s xml" % guestname) return 1 + conn.close() + # set env logger.info("prepare the environment") ret = prepare_env(dynamic_ownership, virt_use_nfs, guestname, \ @@ -171,6 +172,10 @@ def domain_nfs_start(params): logger.error("failed to prepare the environment") return 1 + # reconnect libvirt + conn = utils.get_conn() + sharedmod.libvirtobj['conn'] = conn + domobj = conn.lookupByName(guestname) logger.info("begin to test start domain from nfs storage") @@ -283,7 +288,7 @@ def domain_nfs_start(params): logger.error("Error: fail to get domain %s state" % guestname) return 1 - if state != "shutoff": + if state != libvirt.VIR_DOMAIN_SHUTOFF: logger.info("shut down the domain %s" % guestname) try: domobj.destroy() diff --git a/src/env_inspect.py b/src/env_inspect.py index b260ff8..2c1a701 100644 --- a/src/env_inspect.py +++ b/src/env_inspect.py @@ -20,6 +20,7 @@ import commands import libvirt import sharedmod +from utils import utils def check_libvirt(logger): virsh = 'virsh -v' @@ -68,20 +69,6 @@ def hostinfo(logger): return 1 return 0 -def request_credentials(credentials, user_data): - for credential in credentials: - if credential[0] == libvirt.VIR_CRED_AUTHNAME: - credential[4] = user_data[0] - - if len(credential[4]) == 0: - credential[4] = credential[3] - elif credential[0] == libvirt.VIR_CRED_PASSPHRASE: - credential[4] = user_data[1] - else: - return -1 - - return 0 - def sharemod_init(env_parser, logger): """ get connection object from libvirt module initialize sharemod for use by testcases @@ -89,12 +76,7 @@ def sharemod_init(env_parser, logger): uri = env_parser.get_value('variables', 'defaulturi') username = env_parser.get_value('variables', 'username') password = env_parser.get_value('variables', 'password') - user_data = [username, password] - auth = [[libvirt.VIR_CRED_AUTHNAME, libvirt.VIR_CRED_PASSPHRASE], request_credentials, user_data] - conn = libvirt.openAuth(uri, auth, 0) - if not conn: - logger.error("Failed to setup libvirt connection"); - return 1 + conn = utils.get_conn(uri, username, password) # initialize conn object in sharedmod sharedmod.libvirtobj.clear() diff --git a/utils/utils.py b/utils/utils.py index be87cdc..9167c29 100644 --- a/utils/utils.py +++ b/utils/utils.py @@ -29,6 +29,7 @@ import struct import pexpect import string import subprocess +import libvirt from xml.dom import minidom from urlparse import urlparse @@ -57,6 +58,32 @@ def get_uri(ip): uri = "qemu+ssh://%s/system" % ip return uri +def request_credentials(credentials, user_data): + for credential in credentials: + if credential[0] == libvirt.VIR_CRED_AUTHNAME: + credential[4] = user_data[0] + + if len(credential[4]) == 0: + credential[4] = credential[3] + elif credential[0] == libvirt.VIR_CRED_PASSPHRASE: + credential[4] = user_data[1] + else: + return -1 + + return 0 + +def get_conn(uri=None, username='', password=''): + """ get connection object from libvirt module + """ + user_data = [username, password] + auth = [[libvirt.VIR_CRED_AUTHNAME, libvirt.VIR_CRED_PASSPHRASE], request_credentials, user_data] + conn = libvirt.openAuth(uri, auth, 0) + if not conn: + logger.error("Failed to setup libvirt connection"); + sys.exit(1) + else: + return conn + def parse_uri(uri): # This is a simple parser for uri return urlparse(uri) @@ -501,7 +528,7 @@ def remote_exec_pexpect(hostname, username, password, cmd): elif index == 1: child.sendline(password) elif index == 2: - return string.strip(child.before) + return 0, string.strip(child.before) elif index == 3: return "TIMEOUT!!!" -- 1.7.1

1 0

[libvirt] [test-API][PATCH 1/2] Reconnct libvirt after libvirtd restart
by Wayne Sun 08 Aug '12

08 Aug '12

In domain_nfs_start case, libvirtd will be restarted during test, which broke existing connection. User need re-init connection in test case, for this: * Using sharedmod data dictionary to store Envparser class in generator. * Do not clear data dictionary in env_inspect, user can update it or framework release it at last. * Using sharemod_init in env_inspect to re-init conn in domain_nfs_start. Signed-off-by: Wayne Sun <gsun(a)redhat.com> --- repos/sVirt/domain_nfs_start.py | 11 +++++++++-- src/env_inspect.py | 1 - src/generator.py | 2 ++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/repos/sVirt/domain_nfs_start.py b/repos/sVirt/domain_nfs_start.py index 88d349c..4d48d97 100644 --- a/repos/sVirt/domain_nfs_start.py +++ b/repos/sVirt/domain_nfs_start.py @@ -12,7 +12,7 @@ import sys import libvirt from libvirt import libvirtError - +from src import env_inspect from src import sharedmod from utils import utils from shutil import copy @@ -163,6 +163,8 @@ def domain_nfs_start(params): logger.error("Error: fail to get domain %s xml" % guestname) return 1 + conn.close() + # set env logger.info("prepare the environment") ret = prepare_env(dynamic_ownership, virt_use_nfs, guestname, \ @@ -171,6 +173,11 @@ def domain_nfs_start(params): logger.error("failed to prepare the environment") return 1 + # reconnect libvirt + env = sharedmod.data['env'] + env_inspect.sharemod_init(env, logger) + conn = sharedmod.libvirtobj['conn'] + domobj = conn.lookupByName(guestname) logger.info("begin to test start domain from nfs storage") @@ -283,7 +290,7 @@ def domain_nfs_start(params): logger.error("Error: fail to get domain %s state" % guestname) return 1 - if state != "shutoff": + if state != libvirt.VIR_DOMAIN_SHUTOFF: logger.info("shut down the domain %s" % guestname) try: domobj.destroy() diff --git a/src/env_inspect.py b/src/env_inspect.py index b260ff8..a6dc4b1 100644 --- a/src/env_inspect.py +++ b/src/env_inspect.py @@ -98,7 +98,6 @@ def sharemod_init(env_parser, logger): # initialize conn object in sharedmod sharedmod.libvirtobj.clear() - sharedmod.data.clear() sharedmod.libvirtobj['conn'] = conn return 0 diff --git a/src/generator.py b/src/generator.py index 0cdc9de..f01f2fb 100644 --- a/src/generator.py +++ b/src/generator.py @@ -30,6 +30,7 @@ from testcasexml import xml_file_to_str import env_parser import env_inspect import format +import sharedmod class FuncGen(object): """ To generate a callable testcase""" @@ -56,6 +57,7 @@ class FuncGen(object): self.__case_info_save(activity, testrunid) self.env = env_parser.Envparser("global.cfg") + sharedmod.data['env'] = self.env mapper_obj = mapper.Mapper(activity) case_list = mapper_obj.module_casename_func_map() -- 1.7.1

2 4

[libvirt] [PATCH 00/17] Supports for hypervisor-pin and hypervisor-bandwidth
by Hu Tao 08 Aug '12

08 Aug '12

This series is a merge of 1) "Support hypervisor-threads-pin in vcpupin" (https://www.redhat.com/archives/libvir-list/2012-July/msg01361.html) 2) "support to set cpu bandwidth for hypervisor threads" (https://www.redhat.com/archives/libvir-list/2012-June/msg01161.html) to make life easier because of the two share some patches. Patches 1-12 are from 1), patches 13-17 are from 2). Changes: 1. rebase to the latest git tree(removal of qemuReportError, split of virsh.c) 2. some typo fixes 3. make it pass syntax-check Hu Tao (2): limit cpu bandwidth only for vcpus update doc about hypervisor_period/hypervisor_quota Tang Chen (9): Enable cpuset cgroup and synchronous vcpupin info to cgroup. Support hypervisorpin xml parse. Introduce qemuSetupCgroupHypervisorPin and synchronize hypervisorpin info to cgroup. Add qemuProcessSetHypervisorAffinites and set hypervisor threads affinities Introduce virDomainHypervisorPinAdd and virDomainHypervisorPinDel functions Introduce virDomainPinHypervisorFlags and virDomainGetHypervisorPinInfo functions. Introduce qemudDomainPinHypervisorFlags and qemudDomainGetHypervisorPinInfo in qemu driver. Introduce remoteDomainPinHypervisorFlags and remoteDomainGetHypervisorPinInfo functions in remote driver. Improve vcpupin to support hypervisorpin dynamically. Wen Congyang (6): Introduce the function virCgroupForHypervisor Introduce the function virCgroupMoveTask create a new cgroup and move all hypervisor threads to the new cgroup Update XML Schema for new entries qemu: Implement hypervisor's period and quota tunable XML configuration and parsing qemu: Implement hypervisor_period and hypervisor_quota's modification daemon/remote.c | 103 +++++ docs/schemas/domaincommon.rng | 17 + include/libvirt/libvirt.h.in | 26 ++ src/conf/domain_conf.c | 189 ++++++++- src/conf/domain_conf.h | 9 + src/driver.h | 13 +- src/libvirt.c | 147 +++++++ src/libvirt_private.syms | 7 + src/libvirt_public.syms | 2 + src/qemu/qemu_cgroup.c | 193 ++++++++-- src/qemu/qemu_cgroup.h | 5 + src/qemu/qemu_driver.c | 465 +++++++++++++++++++---- src/qemu/qemu_process.c | 60 ++- src/remote/remote_driver.c | 102 +++++ src/remote/remote_protocol.x | 23 +- src/remote_protocol-structs | 24 ++ src/util/cgroup.c | 188 ++++++++- src/util/cgroup.h | 15 + tests/qemuxml2argvdata/qemuxml2argv-cputune.xml | 1 + tests/vcpupin | 6 +- tools/virsh-domain.c | 147 ++++--- tools/virsh.pod | 23 +- 22 files changed, 1594 insertions(+), 171 deletions(-) -- 1.7.10.2

3 45

[libvirt] [PATCH v5] ESX: Add routines to interface driver
by Ata E Husain Bohra 07 Aug '12

07 Aug '12

Add following routines to esx_interface_driver: esxNumOfInterfaces, esxNumOfDefinedInterfaces, esxListInterfaces, esxListDefinedInterfaces, esxInterfaceLookupByMACString, esxInterfaceGetXMLDesc, esxInterfaceUndefine, esxInterfaceCreate, esxInterfaceDestroy Signed-off-by: Ata E Husain Bohra <ata.husain(a)hotmail.com> --- src/esx/esx_interface_driver.c | 551 +++++++++++++++++++++++++++++++++++++++- src/esx/esx_vi.c | 125 +++++++++ src/esx/esx_vi.h | 10 + src/esx/esx_vi_generator.input | 227 +++++++++++++++++ src/esx/esx_vi_generator.py | 23 ++ src/esx/esx_vi_types.c | 2 - 6 files changed, 934 insertions(+), 4 deletions(-) diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c index 501409a..e9f0d4a 100644 --- a/src/esx/esx_interface_driver.c +++ b/src/esx/esx_interface_driver.c @@ -23,6 +23,9 @@ */ #include <config.h> +#include <sys/socket.h> +#include <netinet/in.h> +#include <arpa/inet.h> #include "internal.h" #include "util.h" @@ -34,6 +37,7 @@ #include "esx_vi.h" #include "esx_vi_methods.h" #include "esx_util.h" +#include "interface_conf.h" #define VIR_FROM_THIS VIR_FROM_ESX @@ -67,10 +71,553 @@ esxInterfaceClose(virConnectPtr conn) +static int +esxNumOfInterfaces(virConnectPtr conn) +{ + bool success = false; + esxPrivate *priv = conn->interfacePrivateData; + esxVI_HostVirtualNic *hostVirtualNicList = NULL; + const esxVI_HostVirtualNic *hostVirtualNic = NULL; + int count = 0; + + if (esxVI_EnsureSession(priv->primary) < 0 || + esxVI_LookupHostVirtualNicList(priv->primary, + &hostVirtualNicList) < 0) { + goto cleanup; + } + + if (hostVirtualNicList == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve HostVirtualNic List")); + + goto cleanup; + } + + for (hostVirtualNic = hostVirtualNicList; + hostVirtualNic != NULL; + hostVirtualNic = hostVirtualNic->_next) { + count++; + } + + success = true; + +cleanup: + + esxVI_HostVirtualNic_Free(&hostVirtualNicList); + + return success ? count : -1; + +} + + + +static int +esxNumOfDefinedInterfaces(virConnectPtr conn ATTRIBUTE_UNUSED) +{ + // ESX interfaces are always active + return 0; + +} + + + +static int +esxListInterfaces(virConnectPtr conn, char **names, int maxnames) +{ + int result = -1; + esxPrivate *priv = conn->interfacePrivateData; + esxVI_HostVirtualNic *hostVirtualNicList = NULL; + const esxVI_HostVirtualNic *hostVirtualNic = NULL; + int i = 0; + + if (esxVI_EnsureSession(priv->primary) < 0 || + esxVI_LookupHostVirtualNicList(priv->primary, + &hostVirtualNicList) < 0) { + goto cleanup; + } + + if (hostVirtualNicList == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve vNIC List")); + goto cleanup; + } + + for (i= 0, hostVirtualNic = hostVirtualNicList; + hostVirtualNic != NULL && i < maxnames; + ++i, hostVirtualNic = hostVirtualNic->_next) { + names[i] = strdup(hostVirtualNic->device); + + if (names[i] == NULL) { + for(;i >=0;--i) { + VIR_FREE(names[i]); + } + virReportOOMError(); + goto cleanup; + } + } + + result = i; + + cleanup: + + esxVI_HostVirtualNic_Free(&hostVirtualNicList); + + return result; + +} + + + +static int +esxListDefinedInterfaces(virConnectPtr conn ATTRIBUTE_UNUSED, + char **names ATTRIBUTE_UNUSED, + int maxnames ATTRIBUTE_UNUSED) +{ + // ESX interfaces are always active + return 0; + +} + + + +static virInterfacePtr +esxInterfaceLookupByName(virConnectPtr conn, const char *name) +{ + virInterfacePtr ret = NULL; + esxPrivate *priv = conn->interfacePrivateData; + esxVI_HostVirtualNic *hostVirtualNicList = NULL; + const esxVI_HostVirtualNic *hostVirtualNic = NULL; + + if (esxVI_EnsureSession(priv->primary) < 0 || + esxVI_LookupHostVirtualNicList(priv->primary, + &hostVirtualNicList) < 0) { + goto cleanup; + } + + if (hostVirtualNicList == 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve HostVirtualNic List")); + goto cleanup; + } + + + for(hostVirtualNic = hostVirtualNicList; + hostVirtualNic != NULL; + hostVirtualNic = hostVirtualNic->_next) { + if (STREQ(hostVirtualNic->device, name)) { + if (hostVirtualNic->spec == NULL || + hostVirtualNic->spec->mac == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Malformed HostVirtualNicSpec")); + goto cleanup; + } + + ret = virGetInterface(conn, hostVirtualNic->device, + hostVirtualNic->spec->mac); + break; + } + } + + cleanup: + + esxVI_HostVirtualNic_Free(&hostVirtualNicList); + + return ret; + +} + + + +static virInterfacePtr +esxInterfaceLookupByMACString(virConnectPtr conn, const char *mac) +{ + virInterfacePtr ret = NULL; + esxPrivate *priv = conn->interfacePrivateData; + esxVI_HostVirtualNic *hostVirtualNicList = NULL; + const esxVI_HostVirtualNic *hostVirtualNic = NULL; + + if (esxVI_EnsureSession(priv->primary) < 0 || + esxVI_LookupHostVirtualNicList(priv->primary, + &hostVirtualNicList) < 0) { + goto cleanup; + } + + if (hostVirtualNicList == 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve HostVirtualNic List")); + goto cleanup; + } + + + for(hostVirtualNic = hostVirtualNicList; + hostVirtualNic != NULL; + hostVirtualNic = hostVirtualNic->_next) { + if (hostVirtualNic->spec == NULL || + hostVirtualNic->spec->mac == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Malformed HostVirtualNicSpec")); + goto cleanup; + } + + if (STREQ(hostVirtualNic->spec->mac, mac)) { + ret = virGetInterface(conn, hostVirtualNic->device, + hostVirtualNic->spec->mac); + break; + } + } + + cleanup: + + esxVI_HostVirtualNic_Free(&hostVirtualNicList); + + return ret; + +} + + + +static char* +esxInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) +{ + char *ret = NULL; + esxPrivate *priv = iface->conn->interfacePrivateData; + esxVI_HostVirtualNic *hostVirtualNicList = NULL; + const esxVI_HostVirtualNic *hostVirtualNic = NULL; + esxVI_PhysicalNic *physicalNicList = NULL; + const esxVI_PhysicalNic *physicalNic = NULL; + esxVI_PhysicalNic *matchingPhysicalNicList = NULL; + esxVI_HostIpRouteConfig *ipRouteConfig = NULL; + esxVI_HostPortGroup *hostPortGroupList = NULL; + esxVI_HostVirtualSwitch *hostVirtualSwitchList = NULL; + esxVI_String *propertyNameList = NULL; + esxVI_ObjectContent *hostSystem = NULL; + esxVI_DynamicProperty *dynamicProperty = NULL; + virInterfaceDefPtr def = NULL; + virInterfaceDefPtr itf = NULL; + int use_static = 0; + struct in_addr addr; + uint32_t host_addr = 0; + int zero_count = 0; + int masklen = 0; + int i = 0; + + if (VIR_INTERFACE_XML_INACTIVE & flags) { + use_static = 1; + } + + if (esxVI_EnsureSession(priv->primary) < 0 || + esxVI_String_AppendValueListToList(&propertyNameList, + "config.network.vnic\0" + "config.network.ipRouteConfig\0" + "config.network.vswitch\0" + "config.network.pnic\0" + "config.network.portgroup\0") < 0 || + esxVI_LookupHostSystemProperties(priv->primary, propertyNameList, + &hostSystem) < 0) { + goto cleanup; + } + + for (dynamicProperty = hostSystem->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "config.network.vnic")) { + if (esxVI_HostVirtualNic_CastListFromAnyType( + dynamicProperty->val, &hostVirtualNicList) < 0) { + goto cleanup; + } + } else if (STREQ(dynamicProperty->name, + "config.network.ipRouteConfig")) { + if (esxVI_HostIpRouteConfig_CastFromAnyType( + dynamicProperty->val, &ipRouteConfig)) { + goto cleanup; + } + } else if (STREQ(dynamicProperty->name, "config.network.vswitch")) { + if (esxVI_HostVirtualSwitch_CastListFromAnyType + (dynamicProperty->val, &hostVirtualSwitchList) < 0) { + goto cleanup; + } + } else if (STREQ(dynamicProperty->name, "config.network.pnic")) { + if (esxVI_PhysicalNic_CastListFromAnyType( + dynamicProperty->val, &physicalNicList) < 0) { + goto cleanup; + } + } else if (STREQ(dynamicProperty->name, "config.network.portgroup")) { + if (esxVI_HostPortGroup_CastListFromAnyType( + dynamicProperty->val, &hostPortGroupList) < 0) { + goto cleanup; + } + } else { + VIR_WARN("Unexpected '%s' property", dynamicProperty->name); + } + } + + if (!hostVirtualNicList || + !ipRouteConfig || + !hostVirtualSwitchList || + !hostPortGroupList) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Unable to retrieve network parameters")); + + goto cleanup; + } + + for (hostVirtualNic = hostVirtualNicList; + hostVirtualNic != NULL; + hostVirtualNic = hostVirtualNic->_next) { + if (STREQ(hostVirtualNic->device, iface->name)) { + break; + } + } + + if (hostVirtualNic == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not find HostVirtual Nic")); + goto cleanup; + } + + if (esxVI_LookupPhysicalNicFromHostPortGroup( + hostVirtualNic->portgroup, hostPortGroupList, + hostVirtualSwitchList, physicalNicList, + &matchingPhysicalNicList) < 0) { + goto cleanup; + } + + /* + * populate virInterfaceDef object to obtain + * libvirt interface domain xml. + */ + if (VIR_ALLOC(def) < 0) { + virReportOOMError(); + goto cleanup; + } + + def->type = VIR_INTERFACE_TYPE_BRIDGE; + def->name = strdup(hostVirtualNic->device); + if (def->name == NULL) { + virReportOOMError(); + goto cleanup; + } + + if (hostVirtualNic->spec->mtu && hostVirtualNic->spec->mtu->value) { + def->mtu = hostVirtualNic->spec->mtu->value; + } else { + def->mtu = 1500; + } + + def->startmode = VIR_INTERFACE_START_ONBOOT; + + if (!use_static && hostVirtualNic->spec->mac) { + def->mac = strdup(hostVirtualNic->spec->mac); + if (def->mac == NULL) { + virReportOOMError(); + goto cleanup; + } + } + + /* TODO - Handle VLAN (via portgroup?) */ + if (hostVirtualNic->spec->ip->subnetMask && + *hostVirtualNic->spec->ip->subnetMask && + inet_aton(hostVirtualNic->spec->ip->subnetMask, &addr) == 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Error parsing netmask")); + goto cleanup; + } + + host_addr = ntohl(addr.s_addr); + /* Calculate masklen */ + for (i = 0; i < 32; ++i) { + if (host_addr & 0x01) { + break; + } + zero_count++; + host_addr >>= 1; + } + masklen = 32 - zero_count; + + /* append protocol field */ + def->nprotos = 1; + if (VIR_ALLOC_N(def->protos, def->nprotos) < 0) { + virReportOOMError(); + goto cleanup; + } + + /* TODO - Add IPv6 Support */ + for (i = 0; i < def->nprotos; ++i) { + if (VIR_ALLOC(def->protos[i]) < 0) { + goto cleanup; + } + + def->protos[i]->family = strdup("ipv4"); + if (def->protos[i]->family == NULL) { + virReportOOMError(); + goto cleanup; + } + + if (hostVirtualNic->spec->ip->dhcp == 1) { + def->protos[i]->dhcp = 1; + } + + def->protos[i]->nips = 1; + if (hostVirtualNic->spec->ip->dhcp != 1 || !use_static) { + if (hostVirtualNic->spec->ip->ipAddress && + *hostVirtualNic->spec->ip->ipAddress) { + int j =0; + if (VIR_ALLOC_N(def->protos[i]->ips, + def->protos[i]->nips) < 0) { + virReportOOMError(); + goto cleanup; + } + + for (j=0; j < def->protos[i]->nips; ++j) { + if (VIR_ALLOC(def->protos[i]->ips[j]) < 0) { + virReportOOMError(); + goto cleanup; + } + + def->protos[i]->ips[0]->address = + strdup(hostVirtualNic->spec->ip->ipAddress); + if (def->protos[i]->ips[0] == NULL) { + virReportOOMError(); + goto cleanup; + } + + def->protos[i]->ips[0]->prefix = masklen; + + def->protos[i]->gateway = + strdup(ipRouteConfig->defaultGateway); + if (def->protos[i]->gateway == NULL) { + virReportOOMError(); + goto cleanup; + } + } + } + } + } + + /* Add bridge information */ + def->data.bridge.stp = 0; /* off */ + + /** + * traversing physical nic list twice, first to get total + * interfaces and second to populate interface items. + * Total Complexity ~= O(N); N should not be a large number. + */ + for (physicalNic = matchingPhysicalNicList, i = 0; physicalNic != NULL; + physicalNic = physicalNic->_next, ++i) { + } + + if ( i > 0) { + if (VIR_ALLOC_N(def->data.bridge.itf, i) < 0) { + virReportOOMError(); + goto cleanup; + } + + def->data.bridge.nbItf = i; + for (physicalNic = matchingPhysicalNicList, i = 0; + physicalNic != NULL; + physicalNic = physicalNic->_next, ++i) { + virInterfaceDefFree(itf); + if (VIR_ALLOC(itf) < 0) { + virReportOOMError(); + goto cleanup; + } + + itf->type = VIR_INTERFACE_TYPE_ETHERNET; + itf->name = strdup(physicalNic->device); + if (itf->name == NULL) { + virReportOOMError(); + goto cleanup; + } + + itf->mac = strdup(physicalNic->mac); + if (itf->mac == NULL) { + virReportOOMError(); + goto cleanup; + } + + def->data.bridge.itf[i] = itf; + itf = NULL; /* avoid double free */ + } + } + + ret = virInterfaceDefFormat(def); + + cleanup: + + esxVI_HostVirtualNic_Free(&hostVirtualNicList); + esxVI_PhysicalNic_Free(&physicalNicList); + esxVI_PhysicalNic_Free(&matchingPhysicalNicList); + esxVI_HostPortGroup_Free(&hostPortGroupList); + esxVI_HostVirtualSwitch_Free(&hostVirtualSwitchList); + esxVI_HostIpRouteConfig_Free(&ipRouteConfig); + esxVI_ObjectContent_Free(&hostSystem); + esxVI_String_Free(&propertyNameList); + virInterfaceDefFree(def); + virInterfaceDefFree(itf); + + return ret; + +} + + + +static int +esxInterfaceUndefine(virInterfacePtr iface) +{ + esxPrivate *priv = iface->conn->interfacePrivateData; + + if (esxVI_RemoveVirtualNic( + priv->primary, + priv->primary->hostSystem->configManager->networkSystem, + iface->name) < 0) { + return -1; + } + + return 0; + +} + + + +static int +esxInterfaceCreate(virInterfacePtr iface ATTRIBUTE_UNUSED, + unsigned int flags) +{ + virCheckFlags(0, -1); + + /* ESX interfaces are always active */ + return 0; + +} + + + +static int +esxInterfaceDestroy(virInterfacePtr iface ATTRIBUTE_UNUSED, + unsigned int flags) +{ + virCheckFlags(0, -1); + + /* ESX interfaces can not be deactivated */ + return 1; + +} + + + static virInterfaceDriver esxInterfaceDriver = { .name = "ESX", - .open = esxInterfaceOpen, /* 0.7.6 */ - .close = esxInterfaceClose, /* 0.7.6 */ + .open = esxInterfaceOpen, /* 0.7.6 */ + .close = esxInterfaceClose, /* 0.7.6 */ + .numOfInterfaces = esxNumOfInterfaces, /* 0.9.x */ + .numOfDefinedInterfaces = esxNumOfDefinedInterfaces, /* 0.9.x */ + .listInterfaces = esxListInterfaces, /* 0.9.x */ + .listDefinedInterfaces = esxListDefinedInterfaces, /* 0.9.x */ + .interfaceLookupByName = esxInterfaceLookupByName, /* 0.9.x */ + .interfaceLookupByMACString = esxInterfaceLookupByMACString, /* 0.9.x */ + .interfaceGetXMLDesc = esxInterfaceGetXMLDesc, /* 0.9.x */ + .interfaceUndefine = esxInterfaceUndefine, /* 0.9.x */ + .interfaceCreate = esxInterfaceCreate, /* 0.9.x */ + .interfaceDestroy = esxInterfaceDestroy, /* 0.9.x */ }; diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 2c789e1..962c9c2 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -4569,6 +4569,131 @@ esxVI_LookupManagedObjectHelper(esxVI_Context *ctx, return result; } +int +esxVI_LookupHostVirtualNicList(esxVI_Context* ctx, + esxVI_HostVirtualNic** virtualNicList) +{ + int result = -1; + esxVI_String *propertyNameList = NULL; + esxVI_DynamicProperty *dynamicProperty = NULL; + esxVI_ObjectContent* hostSystem = NULL; + + if (esxVI_String_AppendValueListToList( + &propertyNameList, "config.network.vnic\0") < 0 || + esxVI_LookupHostSystemProperties(ctx, propertyNameList, + &hostSystem) < 0) { + goto cleanup; + } + + if (hostSystem == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve the HostSystem object")); + + goto cleanup; + } + + for (dynamicProperty = hostSystem->propSet; + dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "config.network.vnic")) { + if (esxVI_HostVirtualNic_CastListFromAnyType( + dynamicProperty->val, virtualNicList) < 0) { + goto cleanup; + } + break; + } else { + VIR_WARN("Unexpected '%s' property", dynamicProperty->name); + } + } + + result = 0; + +cleanup: + esxVI_String_Free(&propertyNameList); + esxVI_ObjectContent_Free(&hostSystem); + + return result; +} + +int +esxVI_LookupPhysicalNicFromHostPortGroup( + const char *portgroup, + const esxVI_HostPortGroup *hostPortGroupList, + const esxVI_HostVirtualSwitch *hostVirtualSwitchList, + const esxVI_PhysicalNic *physicalNicList, + esxVI_PhysicalNic **ret_physicalNicList) +{ + int result = -1; + const esxVI_HostPortGroup *hostPortGroup = NULL; + const esxVI_HostVirtualSwitch *hostVirtualSwitch = NULL; + const esxVI_PhysicalNic *physicalNic = NULL; + esxVI_PhysicalNic *tempPhysicalNic = NULL; + const esxVI_String *pnicKey = NULL; + if (portgroup == NULL) { + goto cleanup; + } + + /* Go through all the port groups to find the one that matches. */ + for (hostPortGroup = hostPortGroupList; + hostPortGroup != NULL; + hostPortGroup = hostPortGroup->_next) { + if (STREQ(hostPortGroup->spec->name, portgroup)) { + break; + } + } + + if (hostPortGroup == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not find Host port group")); + goto cleanup; + } + + /* Go through all the virtual switches to find the one that matches */ + for (hostVirtualSwitch = hostVirtualSwitchList; + hostVirtualSwitch != NULL; + hostVirtualSwitch = hostVirtualSwitch->_next) { + if (STREQ(hostPortGroup->spec->vswitchName, hostVirtualSwitch->name)) { + break; + } + } + + if (hostVirtualSwitch == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not find Virtual Switch")); + goto cleanup; + } + + /* Go through all physical nics */ + for (pnicKey = hostVirtualSwitch->pnic; + pnicKey != NULL; + pnicKey = pnicKey->_next) { + /* O(n^2), but probably faster than a hash due to small N */ + for (physicalNic = physicalNicList; + physicalNic != NULL; + physicalNic = physicalNic->_next) { + + esxVI_PhysicalNic_Free(&tempPhysicalNic); + + if (STREQ(pnicKey->value, physicalNic->key)) { + if (esxVI_PhysicalNic_DeepCopy( + &tempPhysicalNic, (esxVI_PhysicalNic *)physicalNic) < 0 || + esxVI_PhysicalNic_AppendToList( + ret_physicalNicList, tempPhysicalNic) < 0) { + goto cleanup; + } + tempPhysicalNic = NULL; + } + } + } + + result = 0; + + cleanup: + + esxVI_PhysicalNic_Free(&tempPhysicalNic); + + return result; +} #include "esx_vi.generated.c" diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index 4b84be8..0eb9a99 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -499,6 +499,16 @@ int esxVI_ParseHostCpuIdInfo(esxVI_ParsedHostCpuIdInfo *parsedHostCpuIdInfo, int esxVI_ProductVersionToDefaultVirtualHWVersion(esxVI_ProductVersion productVersion); +int esxVI_LookupHostVirtualNicList(esxVI_Context* ctx, + esxVI_HostVirtualNic** virtualNicList); + +int esxVI_LookupPhysicalNicFromHostPortGroup( + const char *portgroup, + const esxVI_HostPortGroup *portGroupList, + const esxVI_HostVirtualSwitch *virtualSwitchList, + const esxVI_PhysicalNic *physicalNicList, + esxVI_PhysicalNic **ret_physicalNicList); + # 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..64f8389 100644 --- a/src/esx/esx_vi_generator.input +++ b/src/esx/esx_vi_generator.input @@ -57,6 +57,29 @@ enum AutoStartWaitHeartbeatSetting systemDefault end +enum HostConfigChangeOperation + add + edit + remove +end + +enum HostIpConfigIpV6AdressStatus + deprecated + duplicate + inaccessible + invalid + preferred + tentative + unknown +end + +enum HostIpConfigV6AdressConfigType + dhcp + linklayer + manual + other + random +end enum ManagedEntityStatus gray @@ -197,6 +220,12 @@ object DeviceBackedVirtualDiskSpec extends VirtualDiskSpec String device r end +object DistributedVirtualSwitchPortConnection + Int connectionCookie o + String portgroupKey o + String portKey o + String switchUuid r +end object DynamicProperty String name r @@ -316,6 +345,34 @@ object HostFileSystemVolume Long capacity r end +object HostIpConfig + Boolean dhcp r + String ipAddress o + HostIpConfigIpV6AddressConfiguration ipV6Config o + String subnetMask o +end + +object HostIpConfigIpV6Address + String dadState o + String ipAddress r + DateTime lifetime o + String operation o + String origin o + Int prefixLength r +end + +object HostIpConfigIpV6AddressConfiguration + Boolean autoConfigurationEnabled o + Boolean dhcpV6Enabled o + HostIpConfigIpV6Address ipV6Address ol +end + +object HostIpRouteConfig + String defaultGateway o + String gatewayDevice o + String ipV6DefaultGateway o + String ipV6GatewayDevice o +end object HostMountInfo String path o @@ -331,11 +388,131 @@ object HostNasVolume extends HostFileSystemVolume end +object HostNicTeamingPolicy + String policy o + Boolean reversePolicy o + Boolean notifySwitches o + Boolean rollingOrder o + HostNicFailureCriteria failureCriteria o + HostNicOrderPolicy nicOrder o +end + +object HostNetOffloadCapabilities + Boolean csumOffload o + Boolean tcpSegmentation o + Boolean zeroCopyXmit o +end + +object HostNetworkSecurityPolicy + Boolean allowPromiscuous o + Boolean macChanges o + Boolean forgedTransmits o +end + +object HostNetworkPolicy + HostNetworkSecurityPolicy security o + HostNicTeamingPolicy nicTeaming o + HostNetOffloadCapabilities offloadPolicy o + HostNetworkTrafficShapingPolicy shapingPolicy o +end + +object HostNetworkTrafficShapingPolicy + Boolean enabled o +end + +object HostNicFailureCriteria + String checkSpeed o + Int speed o + Boolean checkDuplex o + Boolean fullDuplex o + Boolean checkErrorPercent o + Int percentage o + Boolean checkBeacon o +end + +object HostNicOrderPolicy + String activeNic ol + String standbyNic ol +end + +object HostPortGroup + String key r + HostPortGroupPort port ol + String vswitch r + HostNetworkPolicy computedPolicy r + HostPortGroupSpec spec r +end + +object HostPortGroupPort + String key o + String mac ol + String type r +end + +object HostPortGroupSpec + String name r + Int vlanId r + String vswitchName r + HostNetworkPolicy policy r +end + object HostScsiDiskPartition String diskName r Int partition r end +object HostVirtualNic + String device r + String key r + String port o + String portgroup r + HostVirtualNicSpec spec r +end + +object HostVirtualNicSpec + DistributedVirtualSwitchPortConnection distributedVirtualPort o + HostIpConfig ip o + String mac o + Int mtu o + String portgroup o + Boolean tsoEnabled o +end + + +object HostVirtualSwitch + String key r + Int mtu o + String name r + Int numPorts r + Int numPortsAvailable r + String pnic ol + String portgroup ol + HostVirtualSwitchSpec spec r +end + +object HostVirtualSwitchBridge +end + +object HostVirtualSwitchAutoBridge extends HostVirtualSwitchBridge + String excludedNicDevice ol +end + +object HostVirtualSwitchBeaconBridge extends HostVirtualSwitchBridge + Int interval r +end + +object HostVirtualSwitchBondBridge extends HostVirtualSwitchBridge + HostVirtualSwitchBeaconBridge beacon o + LinkDiscoveryProtocolConfig linkDiscoveryProtocolConfig o + String nicDevice rl +end + +object HostVirtualSwitchSpec + HostVirtualSwitchBridge bridge o + Int mtu o + Int numPorts r + HostNetworkPolicy policy o +end object HostVmfsVolume extends HostFileSystemVolume Int blockSizeMb r @@ -355,6 +532,10 @@ end object IsoImageFileQuery extends FileQuery end +object LinkDiscoveryProtocolConfig + String operation r + String protocol r +end object LocalDatastoreInfo extends DatastoreInfo String path o @@ -398,6 +579,10 @@ object OptionType Boolean valueIsReadonly o end +object OptionValue + String key r + AnyType value r +end object PerfCounterInfo Int key r @@ -454,6 +639,27 @@ object PerfSampleInfo Int interval r end +object PhysicalNic + String device r + String driver o + String key o + PhysicalNicInfo linkSpeed o + String mac r + String pci r + PhysicalNicSpec spec r + PhysicalNicInfo validLinkSpecification ol + Boolean wakeOnLanSupported r +end + +object PhysicalNicInfo + Boolean duplex r + Int speedMb r +end + +object PhysicalNicSpec + HostIpConfig ip o + PhysicalNicInfo linkSpeed o +end object PropertyChange String name r @@ -773,6 +979,13 @@ end # Methods # +method AddVirtualNic returns String r + ManagedObjectReference _this r + String portgroup r + HostVirtualNicSpec nic r +end + + method AnswerVM ManagedObjectReference _this r String questionId r @@ -954,6 +1167,10 @@ method RemoveSnapshot_Task returns ManagedObjectReference r Boolean removeChildren r end +method RemoveVirtualNic + ManagedObjectReference _this r + String device r +end method RetrieveProperties returns ObjectContent ol ManagedObjectReference _this:propertyCollector r @@ -1002,6 +1219,16 @@ method UnregisterVM ManagedObjectReference _this r end +method UpdateIpRouteConfig + ManagedObjectReference _this r + HostIpRouteConfig config r +end + +method UpdateVirtualNic + ManagedObjectReference _this r + String device r + HostVirtualNicSpec nic r +end method WaitForUpdates returns UpdateSet r ManagedObjectReference _this:propertyCollector r diff --git a/src/esx/esx_vi_generator.py b/src/esx/esx_vi_generator.py index 910478c..26ae62e 100755 --- a/src/esx/esx_vi_generator.py +++ b/src/esx/esx_vi_generator.py @@ -1519,8 +1519,31 @@ additional_object_features = { "AutoStartDefaults" : Object.FEATURE__AN Object.FEATURE__ANY_TYPE, "HostDatastoreBrowserSearchResults" : Object.FEATURE__LIST | Object.FEATURE__ANY_TYPE, + "HostIpConfig" : Object.FEATURE__DEEP_COPY, + "HostIpRouteConfig" : Object.FEATURE__ANY_TYPE, + "HostIpConfigIpV6Address" : Object.FEATURE__LIST | + Object.FEATURE__ANY_TYPE | + Object.FEATURE__DEEP_COPY, + "HostIpConfigIpV6AddressConfiguration" : Object.FEATURE__DEEP_COPY, + "HostPortGroup" : Object.FEATURE__LIST | + Object.FEATURE__ANY_TYPE, + "HostVirtualNic" : Object.FEATURE__ANY_TYPE | + Object.FEATURE__LIST, + "HostVirtualSwitch" : Object.FEATURE__ANY_TYPE | + Object.FEATURE__LIST, + "KeyValue" : Object.FEATURE__ANY_TYPE, "ManagedObjectReference" : Object.FEATURE__ANY_TYPE, + "PhysicalNic" : Object.FEATURE__LIST | + Object.FEATURE__ANY_TYPE | + Object.FEATURE__DEEP_COPY, "ObjectContent" : Object.FEATURE__DEEP_COPY, + "OptionValue" : Object.FEATURE__ANY_TYPE | + Object.FEATURE__LIST, + "PhysicalNic" : Object.FEATURE__LIST | + Object.FEATURE__ANY_TYPE | + Object.FEATURE__DEEP_COPY, + "PhysicalNicSpec" : Object.FEATURE__DEEP_COPY, + "PhysicalNicLinkInfo" : Object.FEATURE__LIST, "ResourcePoolResourceUsage" : Object.FEATURE__ANY_TYPE, "ServiceContent" : Object.FEATURE__DESERIALIZE, "SharesInfo" : Object.FEATURE__ANY_TYPE, diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index 708aeda..d074e69 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -475,8 +475,6 @@ continue; \ } - - /* * A required property must be != 0 (NULL for pointers, "undefined" == 0 for * enumeration values). -- 1.7.9.5

4 7

[libvirt] [PATCH] util: include stderr in log message when an external command fails
by Laine Stump 07 Aug '12

07 Aug '12

This patch is in response to: https://bugzilla.redhat.com/show_bug.cgi?id=818467 If a caller to virCommandRun doesn't ask for the exitstatus of the program it's running, the virCommand functions assume that they should log an error message and return failure if the exit code isn't 0. However, only the commandline and exit status are logged, while potentially useful information sent by the program to stderr is discarded. Fortunately, virCommandRun is already checking if the caller had asked for stderr to be saved and, if not, sets things up to save it in *cmd->errbuf. This makes it fairly simple for virCommandWait to include *cmd->errbuf in the error log (there are still other callers that don't setup errbuf, and even virCommandRun won't set it up if the command is being daemonized, so we have to check that it's non-zero). --- Note that the minor change to the first virReportError string was made because I noticed that virCommandTranslateStatus already puts the word "status" in its string. The new message is less awkward. src/util/command.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/util/command.c b/src/util/command.c index 334ca89..7755572 100644 --- a/src/util/command.c +++ b/src/util/command.c @@ -2269,7 +2269,7 @@ virPidWait(pid_t pid, int *exitstatus) if (status != 0) { char *st = virCommandTranslateStatus(status); virReportError(VIR_ERR_INTERNAL_ERROR, - _("Child process (%lld) status unexpected: %s"), + _("Child process (%lld) unexpected %s"), (long long) pid, NULLSTR(st)); VIR_FREE(st); return -1; @@ -2327,9 +2327,13 @@ virCommandWait(virCommandPtr cmd, int *exitstatus) if (status) { char *str = virCommandToString(cmd); char *st = virCommandTranslateStatus(status); + bool haveErrMsg = cmd->errbuf && *cmd->errbuf && (*cmd->errbuf)[0]; + virReportError(VIR_ERR_INTERNAL_ERROR, - _("Child process (%s) status unexpected: %s"), - str ? str : cmd->args[0], NULLSTR(st)); + _("Child process (%s) unexpected %s%s%s"), + str ? str : cmd->args[0], NULLSTR(st), + haveErrMsg ? ": " : "", + haveErrMsg ? *cmd->errbuf : ""); VIR_FREE(str); VIR_FREE(st); return -1; -- 1.7.11.2

2 2

[libvirt] [ANNOUNCE] libvirt-glib 0.1.1 release
by Zeeshan Ali (Khattak) 07 Aug '12

07 Aug '12

I am pleased to announce that a new release of the libvirt-glib package, version 0.1.1 is now available from ftp://libvirt.org/libvirt/glib/ The packages are GPG signed with Key fingerprint: DE11 B48B FDC1 6349 4312 0860 FCAC ABEE 62D1 1E4C (2048R) New in this release: - Add bindings for virDomainSnapshotCreate*(). - Add bindings for virDomainRestore*(). - Add GVir.DomainShutdownFlags() binding. - Add GVir.DomainXMLFlags binding. 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, Zeeshan Ali (Khattak) FSF member#5124

1 0

[libvirt] [PATCH v5 0/6] file descriptor passing using fd sets
by Corey Bryant 07 Aug '12

07 Aug '12

libvirt's sVirt security driver provides SELinux MAC isolation for Qemu guest processes and their corresponding image files. In other words, sVirt uses SELinux to prevent a QEMU process from opening files that do not belong to it. sVirt provides this support by labeling guests and resources with security labels that are stored in file system extended attributes. Some file systems, such as NFS, do not support the extended attribute security namespace, and therefore cannot support sVirt isolation. A solution to this problem is to provide fd passing support, where libvirt opens files and passes file descriptors to QEMU. This, along with SELinux policy to prevent QEMU from opening files, can provide image file isolation for NFS files stored on the same NFS mount. This patch series adds the add-fd, remove-fd, and query-fdsets QMP monitor commands, which allow file descriptors to be passed via SCM_RIGHTS, and assigned to specified fd sets. This allows fd sets to be created per file with fds having, for example, different access rights. When QEMU needs to reopen a file with different access rights, it can search for a matching fd in the fd set. Fd sets also allow for easy tracking of fds per file, helping to prevent fd leaks. Support is also added to the block layer to allow QEMU to dup an fd from an fdset when the filename is of the /dev/fdset/nnn format, where nnn is the fd set ID. No new SELinux policy is required to prevent open of NFS files (files with type nfs_t). The virt_use_nfs boolean type simply needs to be set to false, and open will be prevented (and dup will be allowed). For example: # setsebool virt_use_nfs 0 # getsebool virt_use_nfs virt_use_nfs --> off Corey Bryant (6): qemu-char: Add MSG_CMSG_CLOEXEC flag to recvmsg qapi: Introduce add-fd, remove-fd, query-fdsets monitor: Clean up fd sets on monitor disconnect block: Convert open calls to qemu_open block: Convert close calls to qemu_close block: Enable qemu_open/close to work with fd sets block/raw-posix.c | 42 ++++----- block/raw-win32.c | 6 +- block/vdi.c | 5 +- block/vmdk.c | 25 +++--- block/vpc.c | 4 +- block/vvfat.c | 16 ++-- cutils.c | 5 ++ monitor.c | 244 ++++++++++++++++++++++++++++++++++++++++++++++++++++- monitor.h | 4 + osdep.c | 141 +++++++++++++++++++++++++++++++ qapi-schema.json | 97 +++++++++++++++++++++ qemu-char.c | 10 ++- qemu-common.h | 2 + qemu-tool.c | 12 +++ qmp-commands.hx | 121 ++++++++++++++++++++++++++ savevm.c | 4 +- 16 files changed, 684 insertions(+), 54 deletions(-) -- 1.7.10.4

3 35

[libvirt] [PATCH] Add support for firewalld (new version)
by Thomas Woerner 07 Aug '12

07 Aug '12

* bridge_driver, nwfilter_driver: new dbus filters to get FirewallD1.Reloaded signal and DBus.NameOwnerChanged on org.fedoraproject.FirewallD1 * iptables, ebtables, nwfilter_ebiptables_driver: use firewall-cmd direct passthrough interface * spec file changed as requested --- configure.ac | 8 ++++++ libvirt.spec.in | 11 ++++++++ src/Makefile.am | 8 +++--- src/network/bridge_driver.c | 46 +++++++++++++++++++++++++++++++ src/nwfilter/nwfilter_driver.c | 46 +++++++++++++++++++++++++++++++ src/nwfilter/nwfilter_ebiptables_driver.c | 32 +++++++++++++++++++++ src/util/ebtables.c | 35 +++++++++++++++++++++++ src/util/iptables.c | 21 ++++++++++++-- 8 files changed, 201 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 8a04d91..7142450 100644 --- a/configure.ac +++ b/configure.ac @@ -1282,6 +1282,14 @@ AM_CONDITIONAL([HAVE_POLKIT1], [test "x$with_polkit1" = "xyes"]) AC_SUBST([POLKIT_CFLAGS]) AC_SUBST([POLKIT_LIBS]) +dnl firewalld +AC_ARG_WITH([firewalld], + AC_HELP_STRING([--with-firewalld], [enable firewalld support])) +if test "x$with_firewalld" = "xyes" ; then + AC_DEFINE_UNQUOTED([HAVE_FIREWALLD], [1], [whether firewalld support is enabled]) +fi +AM_CONDITIONAL([HAVE_FIREWALLD], [test "x$with_firewalld" = "xyes"]) + dnl Avahi library AC_ARG_WITH([avahi], AC_HELP_STRING([--with-avahi], [use avahi to advertise remote daemon @<:@default=check@:>@]), diff --git a/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 6ed4a41..f3f4731 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -989,7 +989,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 @@ -999,7 +999,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 @@ -1149,9 +1149,9 @@ noinst_LTLIBRARIES += libvirt_driver_nwfilter.la #libvirt_la_BUILT_LIBADD += libvirt_driver_nwfilter.la endif libvirt_driver_nwfilter_la_CFLAGS = $(LIBPCAP_CFLAGS) \ - -I$(top_srcdir)/src/conf $(LIBNL_CFLAGS) $(AM_CFLAGS) + -I$(top_srcdir)/src/conf $(LIBNL_CFLAGS) $(AM_CFLAGS) $(DBUS_CFLAGS) libvirt_driver_nwfilter_la_LDFLAGS = $(LD_AMFLAGS) -libvirt_driver_nwfilter_la_LIBADD = $(LIBPCAP_LIBS) $(LIBNL_LIBS) +libvirt_driver_nwfilter_la_LIBADD = $(LIBPCAP_LIBS) $(LIBNL_LIBS) $(DBUS_LIBS) if WITH_DRIVER_MODULES libvirt_driver_nwfilter_la_LIBADD += ../gnulib/lib/libgnu.la libvirt_driver_nwfilter_la_LDFLAGS += -module -avoid-version diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index a5046f1..86b178e 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -61,6 +61,7 @@ #include "virnetdev.h" #include "virnetdevbridge.h" #include "virnetdevtap.h" +#include "virdbus.h" #define NETWORK_PID_DIR LOCALSTATEDIR "/run/libvirt/network" #define NETWORK_STATE_DIR LOCALSTATEDIR "/lib/libvirt/network" @@ -248,6 +249,24 @@ networkAutostartConfigs(struct network_driver *driver) { } } +#if HAVE_FIREWALLD +static DBusHandlerResult +firewalld_dbus_filter_bridge(DBusConnection *connection ATTRIBUTE_UNUSED, DBusMessage *message, void *user_data) { + struct network_driver *_driverState = 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: * @@ -256,6 +275,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; @@ -322,6 +344,30 @@ networkStartup(int privileged) { networkDriverUnlock(driverState); +#ifdef HAVE_FIREWALLD + if (!(sysbus = virDBusGetSystemBus())) { + virErrorPtr err = virGetLastError(); + VIR_WARN("DBus not available, disabling firewalld support in bridge_driver: %s", err->message); + } else { + /* add matches for + * NameOwnerChanged on org.freedesktop.DBus for firewalld start/stop + * Reloaded on org.fedoraproject.FirewallD1 for firewalld reload + */ + dbus_bus_add_match(sysbus, + "type='signal'" + ",interface='"DBUS_INTERFACE_DBUS"'" + ",member='NameOwnerChanged'" + ",arg0='org.fedoraproject.FirewallD1'", + NULL); + dbus_bus_add_match(sysbus, + "type='signal'" + ",interface='org.fedoraproject.FirewallD1'" + ",member='Reloaded'", + NULL); + dbus_connection_add_filter(sysbus, firewalld_dbus_filter_bridge, driverState, NULL); + } +#endif + return 0; out_of_memory: diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 4fa73f8..09db599 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -27,6 +27,9 @@ #include <config.h> +#include "virdbus.h" +#include "logging.h" + #include "internal.h" #include "virterror_internal.h" @@ -49,6 +52,8 @@ static virNWFilterDriverStatePtr driverState; static int nwfilterDriverShutdown(void); +static int nwfilterDriverReload(void); + static void nwfilterDriverLock(virNWFilterDriverStatePtr driver) { virMutexLock(&driver->lock); @@ -58,6 +63,21 @@ static void nwfilterDriverUnlock(virNWFilterDriverStatePtr driver) virMutexUnlock(&driver->lock); } +#if HAVE_FIREWALLD +static DBusHandlerResult +firewalld_dbus_filter_nwfilter(DBusConnection *connection ATTRIBUTE_UNUSED, DBusMessage *message, void *user_data ATTRIBUTE_UNUSED) { + if (dbus_message_is_signal(message, DBUS_INTERFACE_DBUS, + "NameOwnerChanged") || + dbus_message_is_signal(message, "org.fedoraproject.FirewallD1", + "Reloaded")) + { + VIR_DEBUG("Reload in nwfilter_driver because of firewalld."); + nwfilterDriverReload(); + } + + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; +} +#endif /** * virNWFilterStartup: @@ -68,6 +88,32 @@ static int nwfilterDriverStartup(int privileged) { char *base = NULL; +#ifdef HAVE_FIREWALLD + DBusConnection *sysbus = NULL; + + if (!(sysbus = virDBusGetSystemBus())) { + virErrorPtr err = virGetLastError(); + VIR_WARN("DBus not available, disabling firewalld support in nwfilter_driver: %s", err->message); + } else { + /* add matches for + * NameOwnerChanged on org.freedesktop.DBus for firewalld start/stop + * Reloaded on org.fedoraproject.FirewallD1 for firewalld reload + */ + dbus_bus_add_match(sysbus, + "type='signal'" + ",interface='"DBUS_INTERFACE_DBUS"'" + ",member='NameOwnerChanged'" + ",arg0='org.fedoraproject.FirewallD1'", + NULL); + dbus_bus_add_match(sysbus, + "type='signal'" + ",interface='org.fedoraproject.FirewallD1'" + ",member='Reloaded'", + NULL); + dbus_connection_add_filter(sysbus, firewalld_dbus_filter_nwfilter, NULL, NULL); + } +#endif + if (!privileged) return 0; diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index 6d6bc3b..6f3133f 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -4127,6 +4127,7 @@ ebiptablesDriverInit(bool privileged) { virBuffer buf = VIR_BUFFER_INITIALIZER; char *errmsg = NULL; + char *firewall_cmd_path = NULL; if (!privileged) return 0; @@ -4137,6 +4138,35 @@ ebiptablesDriverInit(bool privileged) gawk_cmd_path = virFindFileInPath("gawk"); grep_cmd_path = virFindFileInPath("grep"); + firewall_cmd_path = virFindFileInPath("firewall-cmd"); + if (firewall_cmd_path) { + virBufferAsprintf(&buf, "IPT=%s\n", firewall_cmd_path); + /* basic probing */ + virBufferAsprintf(&buf, + CMD_DEF("$IPT --state") CMD_SEPARATOR + CMD_EXEC + "%s", + CMD_STOPONERR(1)); + + if (ebiptablesExecCLI(&buf, NULL, NULL) >= 0) { + VIR_DEBUG("Using firewall-cmd in nwfilter_ebiptables_driver."); + ebtables_cmd_path = NULL; + iptables_cmd_path = NULL; + ip6tables_cmd_path = NULL; + ignore_value(virAsprintf(&ebtables_cmd_path, "%s --direct --passthrough eb", firewall_cmd_path)); + ignore_value(virAsprintf(&iptables_cmd_path, "%s --direct --passthrough ipv4", firewall_cmd_path)); + ignore_value(virAsprintf(&ip6tables_cmd_path, "%s --direct --passthrough ipv6", firewall_cmd_path)); + if (!ebtables_cmd_path || !iptables_cmd_path || !ip6tables_cmd_path) { + virReportOOMError(); + return -1; + } + + } + VIR_FREE(firewall_cmd_path); + } + if (ebtables_cmd_path == NULL || iptables_cmd_path == NULL || + ip6tables_cmd_path == NULL) { + ebtables_cmd_path = virFindFileInPath("ebtables"); if (ebtables_cmd_path) { NWFILTER_SET_EBTABLES_SHELLVAR(&buf); @@ -4194,6 +4224,8 @@ ebiptablesDriverInit(bool privileged) VIR_WARN("Could not find 'ip6tables' executable"); } + } + /* ip(6)tables support needs gawk & grep, ebtables doesn't */ if ((iptables_cmd_path != NULL || ip6tables_cmd_path != NULL) && (!grep_cmd_path || !gawk_cmd_path)) { diff --git a/src/util/ebtables.c b/src/util/ebtables.c index ca056b1..6f4d151 100644 --- a/src/util/ebtables.c +++ b/src/util/ebtables.c @@ -176,11 +176,34 @@ ebtablesAddRemoveRule(ebtRules *rules, int action, const char *arg, ...) const char *s; int n, command_idx; +#if HAVE_FIREWALLD + int ret; + char *firewall_cmd_path = NULL; + virCommandPtr cmd = NULL; + + firewall_cmd_path = virFindFileInPath("firewall-cmd"); + if (firewall_cmd_path) { + cmd = virCommandNew(firewall_cmd_path); + virCommandAddArgList(cmd, "--state", NULL); + ret = virCommandRun(cmd, NULL); + if (ret != 0) { + VIR_FREE(firewall_cmd_path); + firewall_cmd_path = NULL; + } + virCommandFree(cmd); + } +#endif + n = 1 + /* /sbin/ebtables */ 2 + /* --table foo */ 2 + /* --insert bar */ 1; /* arg */ +#if HAVE_FIREWALLD + if (firewall_cmd_path) + n += 3; /* --direct --passthrough eb */ +#endif + va_start(args, arg); while (va_arg(args, const char *)) n++; @@ -192,6 +215,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..7bad39d 100644 --- a/src/util/iptables.c +++ b/src/util/iptables.c @@ -101,9 +101,26 @@ iptablesAddRemoveRule(iptRules *rules, int family, int action, { va_list args; int ret; - virCommandPtr cmd; + virCommandPtr cmd = NULL; const char *s; - + char *firewall_cmd_path = NULL; + +#if HAVE_FIREWALLD + firewall_cmd_path = virFindFileInPath("firewall-cmd"); + if (firewall_cmd_path) { + cmd = virCommandNew(firewall_cmd_path); + virCommandAddArgList(cmd, "--state", NULL); + ret = virCommandRun(cmd, NULL); + if (ret == 0) { + cmd = virCommandNew(firewall_cmd_path); + virCommandAddArgList(cmd, "--direct", "--passthrough", + (family == AF_INET6) ? "ipv6" : "ipv4", NULL); + } else + cmd = NULL; + VIR_FREE(firewall_cmd_path); + } + if (!cmd) +#endif cmd = virCommandNew((family == AF_INET6) ? IP6TABLES_PATH : IPTABLES_PATH); -- 1.7.11.2

1 0

[libvirt] [PATCH] Set LIBVIRT_AUTOSTART=0 when running test suites
by Daniel P. Berrange 07 Aug '12

07 Aug '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Occassionally some test cases will (accidentally) try to spawn libvirtd. Set the LIBVIRT_AUTOSTART=0 environment variable to ensure the remote driver never tries autostart. --- tests/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/Makefile.am b/tests/Makefile.am index 2fdaace..60d322d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -244,6 +244,7 @@ TESTS_ENVIRONMENT = \ PATH="$(path_add)$(PATH_SEPARATOR)$$PATH" \ SHELL="$(SHELL)" \ LIBVIRT_DRIVER_DIR="$(abs_top_builddir)/src/.libs" \ + LIBVIRT_AUTOSTART=0 \ LC_ALL=C \ $(VG) -- 1.7.10.4

2 1

[libvirt] [PATCH] Don't check the 'connect' command in virsh-all test
by Daniel P. Berrange 07 Aug '12

07 Aug '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> The 'virsh-all' test case will invoke each virsh command with no args. With the 'connect' command this causes virsh to try to connect to the default URI, which in turn tries to spawn libvirtd. This is not something we want todo in the test suite, so skip the 'connect' command. --- tests/virsh-all | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/virsh-all b/tests/virsh-all index 2650b86..d4e2633 100755 --- a/tests/virsh-all +++ b/tests/virsh-all @@ -25,7 +25,7 @@ fail=0 test_url=test:///default -$abs_top_builddir/tools/virsh -c $test_url help > cmds || framework_failure +$abs_top_builddir/tools/virsh -c $test_url help | grep -v connect > cmds || framework_failure cmds=$(sed -n 's/^ $[^ ][^ ]*$ .*/\1/p' cmds) || framework_failure test -n "$cmds" || framework_failure -- 1.7.10.4

2 1

[libvirt] on special migration(domain defined, not started yet)
by liguang 07 Aug '12

07 Aug '12

Hi, All If a VM domain defined, but not started yet, and I want to migrate it to another server, so that It can be started at there, what's should i do? or is it rational? seems libvirt migration process haven't consider this condition, e.g. virsh migrate --p2p --tunnelled dom1 qemu+ssh://1.1.1.1/system will fail @ qemuMigrationPerformJob where it call virDomainObjIsActive to see if domain is active, but now domain is inactive, so fail. Thanks!

2 4

[libvirt] [test-API][PATCH] Delete the unused util param
by Wayne Sun 07 Aug '12

07 Aug '12

The util is undefined and cause case run fail, it's with no use and should be deleted. Signed-off-by: Wayne Sun <gsun(a)redhat.com> --- repos/interface/create.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/repos/interface/create.py b/repos/interface/create.py index 50d92d2..f5ef308 100644 --- a/repos/interface/create.py +++ b/repos/interface/create.py @@ -25,7 +25,7 @@ def display_current_interface(conn): logger.debug("current defined host interface list: %s " \ % conn.listDefinedInterfaces()) -def check_create_interface(ifacename, util): +def check_create_interface(ifacename): """Check creating interface result, it will can ping itself if create interface is successful. """ @@ -67,7 +67,7 @@ def create(params): ifaceobj.create(0) logger.info("create host interface %s" % ifacename) display_current_interface(conn) - if check_create_interface(ifacename, util): + if check_create_interface(ifacename): logger.info("create host interface %s is successful" % ifacename) else: logger.error("fail to check create interface") -- 1.7.1

2 1

[libvirt] [PATCH 0/2] Add lsi and virtio-scsi qemu caps
by Guannan Ren 07 Aug '12

07 Aug '12

On qemu-kvm-0.15.1, it supports only lsi scsi controller model. On qemu-kvm-0.12.1.2, it supports only virtio-scsi-pci scsi model On qemu 1.1.50, it supports both. So, instead of using the lsilogic model by default, the patch tries to check which model the current QEMU supports, then choose it, lsi has the priority. If a scsi model is given in XML explicitly, we try to check if the underlying QEMU supports it or not, raise an error on checking failure. Guannan Ren(2) (1/2)qemu: add two qemu caps for lsi and virtio-scsi SCSI controllers (2/2)test: add lsi and virtio-scsi qemu caps in testcases. src/qemu/qemu_capabilities.c | 7 --- src/qemu/qemu_capabilities.h | 2 - src/qemu/qemu_command.c | 88 +++++++++++------------------------------ src/qemu/qemu_command.h | 3 +- tests/qemuhelptest.c | 10 +--- tests/qemuxml2argvtest.c | 16 +++----- 6 files changed, 34 insertions(+), 92 deletions(-)

2 4

[libvirt] [PATCH v3 00/10] Introduce a virObject module for reference counting
by Daniel P. Berrange 07 Aug '12

07 Aug '12

A followup to: https://www.redhat.com/archives/libvir-list/2012-July/msg01733.html New in v3: - Introduce virObjectFreeCallback - Remove bogus ATTRIBUTE_NONNULL annotations - Add virObjectUnref/FreeCallback to useless-if-before-free checks - Other misc issues pointed out - Merged patches already ACKd

2 26