- Devel - libvirt List Archives

[libvirt] [PATCH] gnulib added a new syntax-check test: use $(VAR), not @VAR@
by Jim Meyering 16 Jan '10

16 Jan '10

Updating to newer gnulib also pulled in a new sytnax-check test that evoked new warnings. No big deal, but I addressed them. The only trick was to see that the warnings about @SCHEMADIR@ and @SYSCONFDIR@ were false positives. To allow them, I defined the variable in cfg.mk. See below. >From 6e76cfe38ba0ccafa7c4e81dcc0af04e31f8f447 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 15 Jan 2010 11:09:01 +0100 Subject: [PATCH] gnulib added a new syntax-check test: use $(VAR), not @VAR@ The latter is not officially "wrong", but *is* terribly anachronistic. I think automake documentation or comments call that syntax obsolescent. * cfg.mk (_makefile_at_at_check_exceptions): Exempt @SCHEMADIR@ and @SYSCONFDIR@ uses -- there are no Makefile variables for those. * docs/Makefile.am: Use $(INSTALL), not @INSTALL@. * examples/dominfo/Makefile.am: Similar. * examples/domsuspend/Makefile.am: Similar. * proxy/Makefile.am: Similar. * python/Makefile.am: Similar. * python/tests/Makefile.am: Similar. * src/Makefile.am: Similar. * tests/Makefile.am: Similar. --- cfg.mk | 5 ++++- docs/Makefile.am | 4 ++-- examples/dominfo/Makefile.am | 2 +- examples/domsuspend/Makefile.am | 2 +- proxy/Makefile.am | 2 +- python/Makefile.am | 10 +++++----- python/tests/Makefile.am | 2 +- src/Makefile.am | 10 +++++----- tests/Makefile.am | 2 +- 9 files changed, 21 insertions(+), 18 deletions(-) diff --git a/cfg.mk b/cfg.mk index 45d6531..0f2d2a6 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1,5 +1,5 @@ # Customize Makefile.maint. -*- makefile -*- -# Copyright (C) 2003-2009 Free Software Foundation, Inc. +# Copyright (C) 2003-2010 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -265,3 +265,6 @@ ifeq (0,$(MAKELEVEL)) $(error gnulib update required; run ./autogen.sh first) endif endif + +# Exempt @...@ uses of these symbols. +_makefile_at_at_check_exceptions = ' && !/(SCHEMA|SYSCONF)DIR/' diff --git a/docs/Makefile.am b/docs/Makefile.am index c19e963..eaac627 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -143,7 +143,7 @@ rebuild: api all install-data-local: $(mkinstalldirs) $(DESTDIR)$(HTML_DIR) - -@INSTALL@ -m 0644 $(srcdir)/FAQ.html \ + -$(INSTALL) -m 0644 $(srcdir)/FAQ.html \ $(srcdir)/Libxml2-Logo-90x34.gif $(DESTDIR)$(HTML_DIR) $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/html for h in $(apihtml); do \ @@ -152,7 +152,7 @@ install-data-local: $(INSTALL) -m 0644 $(srcdir)/$$p $(DESTDIR)$(HTML_DIR)/html; done $(mkinstalldirs) $(DESTDIR)$(DEVHELP_DIR) for file in $(devhelphtml) $(devhelppng) $(devhelpcss); do \ - @INSTALL@ -m 0644 $(srcdir)/$${file} $(DESTDIR)$(DEVHELP_DIR) ; \ + $(INSTALL) -m 0644 $(srcdir)/$${file} $(DESTDIR)$(DEVHELP_DIR) ; \ done uninstall-local: diff --git a/examples/dominfo/Makefile.am b/examples/dominfo/Makefile.am index a1694b8..2913e5b 100644 --- a/examples/dominfo/Makefile.am +++ b/examples/dominfo/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I@srcdir@/include -LDADDS = @STATIC_BINARIES@ $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la $(COVERAGE_LDFLAGS) +LDADDS = $(STATIC_BINARIES) $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la $(COVERAGE_LDFLAGS) noinst_PROGRAMS=info1 diff --git a/examples/domsuspend/Makefile.am b/examples/domsuspend/Makefile.am index 41e9fdb..14b4205 100644 --- a/examples/domsuspend/Makefile.am +++ b/examples/domsuspend/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I@srcdir@/include -LDADDS = @STATIC_BINARIES@ $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la $(COVERAGE_LDFLAGS) +LDADDS = $(STATIC_BINARIES) $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la $(COVERAGE_LDFLAGS) noinst_PROGRAMS=suspend diff --git a/proxy/Makefile.am b/proxy/Makefile.am index 97d6e5a..aef11ca 100644 --- a/proxy/Makefile.am +++ b/proxy/Makefile.am @@ -7,7 +7,7 @@ INCLUDES = -I$(top_srcdir)/gnulib/lib -I../gnulib/lib \ -I@top_srcdir@/src/util \ -I@top_srcdir@/src/conf \ -I@top_srcdir@/src/xen \ - @LIBXML_CFLAGS@ \ + $(LIBXML_CFLAGS) \ -DPROXY -DLOCALEBASEDIR=\""$(datadir)/locale"\" \ -DGETTEXT_PACKAGE=\"$(PACKAGE)\" $(WARN_CFLAGS) $(XEN_CFLAGS) diff --git a/python/Makefile.am b/python/Makefile.am index 58c6729..6b67e38 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -37,12 +37,12 @@ pyexec_LTLIBRARIES = libvirtmod.la libvirtmod_la_SOURCES = libvirt-override.c typewrappers.c libvirt.c libvirt.h # Python <= 2.4 header files contain a redundant decl, hence we # need extra flags here -libvirtmod_la_CFLAGS = @WARN_PYTHON_CFLAGS@ +libvirtmod_la_CFLAGS = $(WARN_PYTHON_CFLAGS) libvirtmod_la_LDFLAGS = -module -avoid-version -shared -L$(top_builddir)/src/.libs \ - @CYGWIN_EXTRA_LDFLAGS@ + $(CYGWIN_EXTRA_LDFLAGS) libvirtmod_la_LIBADD = $(mylibs) \ - @CYGWIN_EXTRA_LIBADD@ @CYGWIN_EXTRA_PYTHON_LIBADD@ + $(CYGWIN_EXTRA_LIBADD) $(CYGWIN_EXTRA_PYTHON_LIBADD) GENERATE = generator.py API_DESC = $(top_srcdir)/docs/libvirt-api.xml $(srcdir)/libvirt-override-api.xml @@ -61,10 +61,10 @@ $(libvirtmod_la_OBJECTS): $(GENERATED) install-data-local: $(mkinstalldirs) $(DESTDIR)$(pyexecdir) - @INSTALL@ -m 0644 libvirt.py $(DESTDIR)$(pyexecdir) + $(INSTALL) -m 0644 libvirt.py $(DESTDIR)$(pyexecdir) $(mkinstalldirs) $(DESTDIR)$(DOCS_DIR) @(for doc in $(DOCS) ; \ - do @INSTALL@ -m 0644 $$doc $(DESTDIR)$(DOCS_DIR) ; done) + do $(INSTALL) -m 0644 $$doc $(DESTDIR)$(DOCS_DIR) ; done) uninstall-local: rm -f $(DESTDIR)$(pyexecdir)/libvirt.py diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am index 6011fef..28e24ba 100644 --- a/python/tests/Makefile.am +++ b/python/tests/Makefile.am @@ -30,7 +30,7 @@ clean: install-data-local: $(mkinstalldirs) $(DESTDIR)$(EXAMPLE_DIR) -(for test in $(PYTESTS); \ - do @INSTALL@ -m 0644 $(srcdir)/$$test $(DESTDIR)$(EXAMPLE_DIR) ; done) + do $(INSTALL) -m 0644 $(srcdir)/$$test $(DESTDIR)$(EXAMPLE_DIR) ; done) uninstall-local: for test in $(PYTESTS); do rm -f $(DESTDIR)$(EXAMPLE_DIR)/$$test; done diff --git a/src/Makefile.am b/src/Makefile.am index 324030b..af97938 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -800,13 +800,13 @@ libvirt.syms: libvirt_public.syms $(USED_SYM_FILES) # Empty source list - it merely links a bunch of convenience libs together libvirt_la_SOURCES = libvirt_la_LIBADD += \ - @CYGWIN_EXTRA_LIBADD@ ../gnulib/lib/libgnu.la + $(CYGWIN_EXTRA_LIBADD) ../gnulib/lib/libgnu.la libvirt_la_LDFLAGS = $(VERSION_SCRIPT_FLAGS)libvirt.syms \ - -version-info @LIBVIRT_VERSION_INFO@ \ + -version-info $(LIBVIRT_VERSION_INFO) \ $(COVERAGE_CFLAGS:-f%=-Wc,-f%) \ $(LIBXML_LIBS) \ $(DRIVER_MODULE_LIBS) \ - @CYGWIN_EXTRA_LDFLAGS@ @MINGW_EXTRA_LDFLAGS@ + $(CYGWIN_EXTRA_LDFLAGS) $(MINGW_EXTRA_LDFLAGS) libvirt_la_CFLAGS = $(COVERAGE_CFLAGS) -DIN_LIBVIRT libvirt_la_DEPENDENCIES = $(libvirt_la_LIBADD) libvirt.syms @@ -818,8 +818,8 @@ noinst_LTLIBRARIES += libvirt_test.la # Remove version script from convenience library test_LDFLAGS = \ $$(echo '$(libvirt_la_LDFLAGS)' \ - |sed 's!@VERSION_SCRIPT_FLAGS@libvirt.syms!!' \ - |sed 's!-version-info @LIBVIRT_VERSION_INFO@!!') + |sed 's!$(VERSION_SCRIPT_FLAGS)libvirt.syms!!' \ + |sed 's!-version-info $(LIBVIRT_VERSION_INFO)!!') # Just like the above, but with a slightly different set of public symbols. libvirt_test_la_SOURCES = $(libvirt_la_SOURCES) diff --git a/tests/Makefile.am b/tests/Makefile.am index a20d7ce..584bdb3 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -27,7 +27,7 @@ INCLUDES += \ endif LDADDS = \ - @STATIC_BINARIES@ \ + $(STATIC_BINARIES) \ $(LIBXML_LIBS) \ $(GNUTLS_LIBS) \ $(SASL_LIBS) \ -- 1.6.6.556.gd6679

2 1

[libvirt] Using ESX domain XML for V2V
by Matthew Booth 15 Jan '10

15 Jan '10

I'm trying to use the ESX driver to extract metadata from ESX in an easily digestible form for driving V2V. I've noticed the domain XML seems to be missing a few bits: <features/> <graphics/> <input/> <serial/> and <console/> are also missing, but that could well be because they aren't present. Is this intentional? Should I be assuming some of the above because it's ESX, or is this an omission? Thanks, Matt -- Matthew Booth, RHCA, RHCSS Red Hat Engineering, Virtualisation Team M: +44 (0)7977 267231 GPG ID: D33C3490 GPG FPR: 3733 612D 2D05 5458 8A8A 1600 3441 EA19 D33C 3490

3 6

[libvirt] [PATCH] Fix compilation of virt-aa-helper.c
by Matthias Bolte 15 Jan '10

15 Jan '10

Commit 5073aa994af460e775cb3e548528e28d7660fcc8 added an additional '}' to a case block that messed up the block structure of the get_files function. --- src/security/virt-aa-helper.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 3c8b49a..1b0b2cd 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -851,7 +851,6 @@ get_files(vahControl * ctl) if (rc != 0) goto clean; break; - } } /* TODO: update so files in /sys are readonly case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: { -- 1.6.3.3

2 2

[libvirt] newer gnulib: requires several header-include fixes
by Jim Meyering 15 Jan '10

15 Jan '10

A week or two ago, upstream gnulib was fixed to be more namespace friendly in how it creates replacement headers. For some of its replacements (e.g., <stdio.h>, used via gnulib/lib/stdio.h), it would unnecessarily include another header, e.g., <stdlib.h>. That would make it so that an application using gnulib's <stdio.h> could think it's fine *not* to include stdlib.h, even though it uses a function like exit whose declaration usually requires an explicit inclusion of <stdlib.h>. [the example above is made up -- in reality it was more subtle] Well, now, those excess inclusions have been removed, and when I upgraded libvirt to use the latest gnulib, I saw many compilation failures due to missing #include directives. This series fixes the problems, then adds a change-set to update to the latest gnulib. Here are the one-line summaries: util.c: include required header, no longer masked by gnulib cpu_x86_data.h: include required header vbox: include required headers esx_vi_types.c: include required headers storage_backend.h: include required headers build: update gnulib submodule to latest >From ed2e5140a5a5529ca19e730d061f6d5b3872bb7f Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 15 Jan 2010 10:31:23 +0100 Subject: [PATCH 1/6] util.c: include required header, no longer masked by gnulib Until recently, some gnulib-generated replacement headers included *other* headers that were not strictly necessary, thus masking the need in this file for an explicit <stdlib.h>. * src/util/util.c: Include <stdlib.h> for declarations of e.g., strtol, random_r, getenv, etc. --- src/util/util.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index 45ca657..67fae00 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -1,7 +1,7 @@ /* * utils.c: common, generic utility functions * - * Copyright (C) 2006, 2007, 2008, 2009 Red Hat, Inc. + * Copyright (C) 2006-2010 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * Copyright (C) 2006, 2007 Binary Karma * Copyright (C) 2006 Shuveb Hussain @@ -28,6 +28,7 @@ #include <stdio.h> #include <stdarg.h> +#include <stdlib.h> #include <unistd.h> #include <fcntl.h> #include <errno.h> -- 1.6.6.556.gd6679 >From c920cd6ae55e4b89aa32c7303ed206a83071f5c0 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 15 Jan 2010 10:33:32 +0100 Subject: [PATCH 2/6] cpu_x86_data.h: include required header * src/cpu/cpu_x86_data.h: Include <stdint.h>. --- src/cpu/cpu_x86_data.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/cpu/cpu_x86_data.h b/src/cpu/cpu_x86_data.h index 8b09d23..25ee2a5 100644 --- a/src/cpu/cpu_x86_data.h +++ b/src/cpu/cpu_x86_data.h @@ -1,7 +1,7 @@ /* * cpu_x86_data.h: x86 specific CPU data * - * Copyright (C) 2009 Red Hat, Inc. + * Copyright (C) 2009-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 @@ -24,6 +24,8 @@ #ifndef __VIR_CPU_X86_DATA_H__ #define __VIR_CPU_X86_DATA_H__ +#include <stdint.h> + struct cpuX86cpuid { uint32_t function; uint32_t eax; -- 1.6.6.556.gd6679 >From 5efa5755bd38f0e7fb0f802c21dbd798e49ba5a3 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 15 Jan 2010 10:35:41 +0100 Subject: [PATCH 3/6] vbox: include required headers * src/vbox/vbox_driver.c: Include <stdint.h> <unistd.h> <sys/types.h>. --- src/vbox/vbox_driver.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/vbox/vbox_driver.c b/src/vbox/vbox_driver.c index ad5f239..ef3eb4b 100644 --- a/src/vbox/vbox_driver.c +++ b/src/vbox/vbox_driver.c @@ -28,6 +28,10 @@ #include <config.h> +#include <stdint.h> +#include <unistd.h> +#include <sys/types.h> + #include "internal.h" #include "datatypes.h" -- 1.6.6.556.gd6679 >From b860fa5ed20cb54c56f50e25b40a9864b9ff4b60 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 15 Jan 2010 10:37:03 +0100 Subject: [PATCH 4/6] esx_vi_types.c: include required headers * src/esx/esx_vi_types.c: Include <stdint.h>. --- src/esx/esx_vi_types.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index 8c5b17b..c042e89 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -22,6 +22,7 @@ #include <config.h> +#include <stdint.h> #include <libxml/parser.h> #include <libxml/xpathInternals.h> -- 1.6.6.556.gd6679 >From b57e46d562501d449f5e56bdf780496899494bf4 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 15 Jan 2010 10:38:36 +0100 Subject: [PATCH 5/6] storage_backend.h: include required headers * src/storage/storage_backend.h: Include <stdint.h>. --- src/storage/storage_backend.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/storage/storage_backend.h b/src/storage/storage_backend.h index 88c6161..1c38eeb 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-2008 Red Hat, Inc. + * Copyright (C) 2007-2010 Red Hat, Inc. * Copyright (C) 2007-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -24,6 +24,7 @@ #ifndef __VIR_STORAGE_BACKEND_H__ #define __VIR_STORAGE_BACKEND_H__ +#include <stdint.h> #include "internal.h" #include "storage_conf.h" -- 1.6.6.556.gd6679 >From e2617c6132f1da930f3c52926e71ec79a80dde1f Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 15 Jan 2010 10:23:22 +0100 Subject: [PATCH 6/6] build: update gnulib submodule to latest --- .gnulib | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.gnulib b/.gnulib index 3fd9a2d..4c52807 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 3fd9a2df88c558b27be3a585ca2978dbf9b5da53 +Subproject commit 4c52807f41f238cf0e352317b2dc54f9ba0f0c4f -- 1.6.6.556.gd6679

2 1

[libvirt] [PATCH] xen: do not report a write-to-Xen-daemon failure as a read failure
by Jim Meyering 15 Jan '10

15 Jan '10

FYI, pushed as obvious... >From 02765872876ba8a820a5047f664da8a7b870b7b9 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 15 Jan 2010 10:22:08 +0100 Subject: [PATCH] xen: do not report a write-to-Xen-daemon failure as a read failure * src/xen/xend_internal.c (wr_sync): Correct the diagnostic. --- src/xen/xend_internal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index d9bfa15..9c5127f 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -196,11 +196,11 @@ wr_sync(virConnectPtr xend, int fd, void *buffer, size_t size, int do_read) if (do_read) virXendError(xend, VIR_ERR_INTERNAL_ERROR, "%s", _("failed to read from Xen Daemon")); else virXendError(xend, VIR_ERR_INTERNAL_ERROR, - "%s", _("failed to read from Xen Daemon")); + "%s", _("failed to write to Xen Daemon")); return (-1); } offset += len; -- 1.6.6.556.gd6679

2 1

[libvirt] ANNOUNCE: A new mailing list for users / admins / app developers
by Daniel P. Berrange 15 Jan '10

15 Jan '10

Hi Folks, We have now created the new mailing list libvirt-users(a)redhat.com If you are primarily an end user / admin / application developer of libvirt then this new list will offer a better signal-2-noise ratio for your questions & discussions relating to libvirt. ie you won't get patchbombed every day :-) The form to subscribe to the new list is here: http://www.redhat.com/mailman/listinfo/libvirt-users libvirt development discussions & patch submission should continue to take place on this list. I would encourage any developers who like helping out users to also join the new mailing list so we have knowledgable people to answer questions that arise there.... Regards, Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

1 0

[libvirt] [PATCH v2] Implement path lookup for USB by vendor:product
by Cole Robinson 15 Jan '10

15 Jan '10

Based off how QEMU does it, look through /sys/bus/usb/devices/* for matching vendor:product info, and if found, use info from the surrounding files to build the device's /dev/bus/usb path. This fixes USB device assignment by vendor:product when running qemu as non-root (well, it should, but for some reason I couldn't reproduce the failure people are seeing in [1], but it appears to work properly) [1] https://bugzilla.redhat.com/show_bug.cgi?id=542450 v2: Drop 'bus.addr only' checks in security drivers Use various util helpers Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- po/POTFILES.in | 1 + src/qemu/qemu_driver.c | 9 +-- src/security/security_selinux.c | 25 ++++----- src/security/virt-aa-helper.c | 32 +++++------ src/util/hostusb.c | 110 +++++++++++++++++++++++++++++++++++++- src/util/hostusb.h | 4 +- 6 files changed, 141 insertions(+), 40 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index c9c78b6..3b82a74 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -55,6 +55,7 @@ src/uml/uml_conf.c src/uml/uml_driver.c src/util/bridge.c src/util/conf.c +src/util/hostusb.c src/util/json.c src/util/logging.c src/util/pci.c diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index deb8adc..f03ce91 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2105,14 +2105,11 @@ static int qemuDomainSetHostdevUSBOwnership(virConnectPtr conn, struct qemuFileOwner owner = { uid, gid }; int ret = -1; - /* XXX what todo for USB devs assigned based on product/vendor ? Doom :-( */ - if (!def->source.subsys.u.usb.bus || - !def->source.subsys.u.usb.device) - return 0; - usbDevice *dev = usbGetDevice(conn, def->source.subsys.u.usb.bus, - def->source.subsys.u.usb.device); + def->source.subsys.u.usb.device, + def->source.subsys.u.usb.vendor, + def->source.subsys.u.usb.product); if (!dev) goto cleanup; diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 000bc8a..cb585ed 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -481,20 +481,17 @@ SELinuxSetSecurityHostdevLabel(virConnectPtr conn, switch (dev->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: { - if (dev->source.subsys.u.usb.bus && dev->source.subsys.u.usb.device) { - usbDevice *usb = usbGetDevice(conn, - dev->source.subsys.u.usb.bus, - dev->source.subsys.u.usb.device); + usbDevice *usb = usbGetDevice(conn, + dev->source.subsys.u.usb.bus, + dev->source.subsys.u.usb.device, + dev->source.subsys.u.usb.vendor, + dev->source.subsys.u.usb.product); - if (!usb) - goto done; + if (!usb) + goto done; - ret = usbDeviceFileIterate(conn, usb, SELinuxSetSecurityUSBLabel, vm); - usbFreeDevice(conn, usb); - } else { - /* XXX deal with product/vendor better */ - ret = 0; - } + ret = usbDeviceFileIterate(conn, usb, SELinuxSetSecurityUSBLabel, vm); + usbFreeDevice(conn, usb); break; } @@ -556,7 +553,9 @@ SELinuxRestoreSecurityHostdevLabel(virConnectPtr conn, case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: { usbDevice *usb = usbGetDevice(conn, dev->source.subsys.u.usb.bus, - dev->source.subsys.u.usb.device); + dev->source.subsys.u.usb.device, + dev->source.subsys.u.usb.vendor, + dev->source.subsys.u.usb.product); if (!usb) goto done; diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 35b29ad..3c8b49a 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -836,24 +836,22 @@ get_files(vahControl * ctl) virDomainHostdevDefPtr dev = ctl->def->hostdevs[i]; switch (dev->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: { - if (dev->source.subsys.u.usb.bus && - dev->source.subsys.u.usb.device) { - usbDevice *usb = usbGetDevice(NULL, - dev->source.subsys.u.usb.bus, - dev->source.subsys.u.usb.device); - if (usb == NULL) - continue; - rc = usbDeviceFileIterate(NULL, usb, - file_iterate_cb, &buf); - usbFreeDevice(NULL, usb); - if (rc != 0) - goto clean; - else { - /* TODO: deal with product/vendor better */ - rc = 0; - } - } + usbDevice *usb = usbGetDevice(NULL, + dev->source.subsys.u.usb.bus, + dev->source.subsys.u.usb.device, + dev->source.subsys.u.usb.vendor, + dev->source.subsys.u.usb.product); + + if (usb == NULL) + continue; + + rc = usbDeviceFileIterate(NULL, usb, + file_iterate_cb, &buf); + usbFreeDevice(NULL, usb); + if (rc != 0) + goto clean; break; + } } /* TODO: update so files in /sys are readonly case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: { diff --git a/src/util/hostusb.c b/src/util/hostusb.c index 07e10b1..8fbb486 100644 --- a/src/util/hostusb.c +++ b/src/util/hostusb.c @@ -37,9 +37,10 @@ #include "util.h" #include "virterror_internal.h" +#define USB_SYSFS "/sys/bus/usb" #define USB_DEVFS "/dev/bus/usb/" -#define USB_ID_LEN 10 /* "XXXX XXXX" */ -#define USB_ADDR_LEN 8 /* "XXX:XXX" */ +#define USB_ID_LEN 10 /* "1234 5678" */ +#define USB_ADDR_LEN 8 /* "123:456" */ struct _usbDevice { unsigned bus; @@ -57,11 +58,108 @@ struct _usbDevice { virReportErrorHelper(conn, VIR_FROM_NONE, code, __FILE__, \ __FUNCTION__, __LINE__, fmt) +static int usbSysReadFile(virConnectPtr conn, + const char *f_name, const char *d_name, + int base, unsigned *value) +{ + int ret = -1, tmp; + char *buf = NULL; + char *filename = NULL; + char *ignore = NULL; + + tmp = virAsprintf(&filename, USB_SYSFS "/devices/%s/%s", d_name, f_name); + if (tmp < 0) { + virReportOOMError(conn); + goto error; + } + + if (virFileReadAll(filename, 1024, &buf) < 0) + goto error; + + if (virStrToLong_ui(buf, &ignore, base, value) < 0) { + usbReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("Could not parse usb file %s"), filename); + goto error; + } + + ret = 0; +error: + VIR_FREE(filename); + VIR_FREE(buf); + return ret; +} + +static int usbFindBusByVendor(virConnectPtr conn, + unsigned vendor, unsigned product, + unsigned *bus, unsigned *devno) +{ + DIR *dir = NULL; + int ret = -1, found = 0; + char *ignore = NULL; + struct dirent *de; + + dir = opendir(USB_SYSFS "/devices"); + if (!dir) { + virReportSystemError(conn, errno, + _("Could not open directory %s"), + USB_SYSFS "/devices"); + goto error; + } + + while ((de = readdir(dir))) { + unsigned found_prod, found_vend; + if (de->d_name[0] == '.' || strchr(de->d_name, ':')) + continue; + + if (usbSysReadFile(conn, "idVendor", de->d_name, + 16, &found_vend) < 0) + goto error; + if (usbSysReadFile(conn, "idProduct", de->d_name, + 16, &found_prod) < 0) + goto error; + + if (found_prod == product && found_vend == vendor) { + /* Lookup bus.addr info */ + char *tmpstr = de->d_name; + unsigned found_bus, found_addr; + + if (STREQ(de->d_name, "usb")) + tmpstr += 3; + + if (virStrToLong_ui(tmpstr, &ignore, 10, &found_bus) < 0) { + usbReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("Failed to parse dir name '%s'"), + de->d_name); + goto error; + } + + if (usbSysReadFile(conn, "devnum", de->d_name, + 10, &found_addr) < 0) + goto error; + + *bus = found_bus; + *devno = found_addr; + found = 1; + break; + } + } + + if (!found) + usbReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("Did not find USB device %x:%x"), vendor, product); + else + ret = 0; + +error: + return ret; +} usbDevice * usbGetDevice(virConnectPtr conn, unsigned bus, - unsigned devno) + unsigned devno, + unsigned vendor, + unsigned product) { usbDevice *dev; @@ -70,6 +168,12 @@ usbGetDevice(virConnectPtr conn, return NULL; } + if (vendor) { + /* Look up bus.dev by vendor:product */ + if (usbFindBusByVendor(conn, vendor, product, &bus, &devno) < 0) + return NULL; + } + dev->bus = bus; dev->dev = devno; diff --git a/src/util/hostusb.h b/src/util/hostusb.h index 7f75c8b..739a4aa 100644 --- a/src/util/hostusb.h +++ b/src/util/hostusb.h @@ -28,7 +28,9 @@ typedef struct _usbDevice usbDevice; usbDevice *usbGetDevice (virConnectPtr conn, unsigned bus, - unsigned devno); + unsigned devno, + unsigned vendor, + unsigned product); void usbFreeDevice (virConnectPtr conn, usbDevice *dev); -- 1.6.5.2

2 2

[libvirt] attach_device incompatibility between libvirt and qemu 0.12
by Gerhard Stenzel 14 Jan '10

14 Jan '10

Hi, I have a small libvirt-tck test script, in which I create a domain without a NIC, then use attach_device to add a NIC. And then I do a ping test to the domain. This stopped working after updating to latest fedora and libvirt levels. After some hours, I now discovered that downgrading to qemu 0.11 fixes it. So there seems to be some incompatibility with qemu 0.12 and latest libvirt. The expected output with qemu-system-x86-0.11.0-12.fc12.x86_64: /usr/share/libvirt-tck/tests/scripts/network/100-ping-still-working.t .. 1..5 # Trying domain lookup by name ok 1 - the running domain object # Attaching the new interface d0:f:d0:f:2:1 ok 2 - interface has been attached # xml contains mac address element (should be 1) # 1 ok 3 - running domain has an ID > 0 # waiting for guests to boot # PING 192.168.1.101 (192.168.1.101) 56(84) bytes of data. # 64 bytes from 192.168.1.101: icmp_seq=1 ttl=64 time=2.17 ms # 64 bytes from 192.168.1.101: icmp_seq=2 ttl=64 time=0.554 ms # 64 bytes from 192.168.1.101: icmp_seq=3 ttl=64 time=0.510 ms # 64 bytes from 192.168.1.101: icmp_seq=4 ttl=64 time=0.508 ms # 64 bytes from 192.168.1.101: icmp_seq=5 ttl=64 time=0.505 ms # 64 bytes from 192.168.1.101: icmp_seq=6 ttl=64 time=0.673 ms # 64 bytes from 192.168.1.101: icmp_seq=7 ttl=64 time=0.528 ms # 64 bytes from 192.168.1.101: icmp_seq=8 ttl=64 time=0.522 ms # 64 bytes from 192.168.1.101: icmp_seq=9 ttl=64 time=0.506 ms # 64 bytes from 192.168.1.101: icmp_seq=10 ttl=64 time=0.546 ms # # --- 192.168.1.101 ping statistics --- # 10 packets transmitted, 10 received, 0% pacFor the working I see the following lines in the log: ket loss, time 9002ms # rtt min/avg/max/mdev = 0.505/0.703/2.178/0.493 ms ok 4 - ping 192.168.1.101 test # cleaning up # Detaching the 1st interface d0:f:d0:f:2:1 ok 5 - interface has been detached ok All tests successful. Files=1, Tests=5, 20 wallclock secs ( 0.02 usr 0.01 sys + 0.22 cusr 0.15 csys = 0.40 CPU) Result: PASS The failing output with qemu-system-x86-0.11.0-12.fc12.x86_64: /usr/share/libvirt-tck/tests/scripts/network/100-ping-still-working.t .. 1..5 # Trying domain lookup by name ok 1 - the running domain object # Attaching the new interface d0:f:d0:f:2:1 ok 2 - interface has been attached # xml contains mac address element (should be 1) # 1 ok 3 - running domain has an ID > 0 # waiting for guests to boot # PING 192.168.1.101 (192.168.1.101) 56(84) bytes of data. # From 192.168.1.1 icmp_seq=2 Destination Host Unreachable # From 192.168.1.1 icmp_seq=3 Destination Host Unreachable # From 192.168.1.1 icmp_seq=4 Destination Host Unreachable # From 192.168.1.1 icmp_seq=6 Destination Host Unreachable # From 192.168.1.1 icmp_seq=7 Destination Host Unreachable # From 192.168.1.1 icmp_seq=8 Destination Host Unreachable # From 192.168.1.1 icmp_seq=9 Destination Host Unreachable # From 192.168.1.1 icmp_seq=10 Destination Host Unreachable # # --- 192.168.1.101 ping statistics --- # 10 packets transmitted, 0 received, +8 errors, 100% packet loss, time 19000ms # pipe 3 not ok 4 - ping 192.168.1.101 test # Failed test 'ping 192.168.1.101 test' # at /usr/share/libvirt-tck/tests/scripts/network/100-ping-still-working.t line 82. # cleaning up # Detaching the 1st interface d0:f:d0:f:2:1 ok 5 - interface has been detached # Looks like you failed 1 test of 5. Dubious, test returned 1 (wstat 256, 0x100) Failed 1/5 subtests Test Summary Report ------------------- /usr/share/libvirt-tck/tests/scripts/network/100-ping-still-working.t (Wstat: 256 Tests: 5 Failed: 1) Failed test: 4 Non-zero exit status: 1 Files=1, Tests=5, 30 wallclock secs ( 0.02 usr 0.02 sys + 0.24 cusr 0.13 csys = 0.41 CPU) Result: FAIL I see the following in the debug log: ... qemuMonitorCommandWithHandler:216 : Send command 'getfd fd-tap.0' for write with FD 18 ... For the working qemu: qemuMonitorCommandWithHandler:221 : Receive command reply ret=0 errno=0 0 bytes '(null)' For the failing qemu: qemuMonitorCommandWithHandler:221 : Receive command reply ret=0 errno=0 44 bytes 'No file descriptor supplied via SCM_RIGHTS^M ' Any ideas? -- Best regards, Gerhard Stenzel, ----------------------------------------------------------------------------------------------------------------------------------- IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Martin Jetter Geschäftsführung: Dirk Wittkopp Sitz der Gesellschaft: Böblingen Registergericht: Amtsgericht Stuttgart, HRB 243294

1 0

[libvirt] [PATCH] events: Report errors on failure
by Cole Robinson 14 Jan '10

14 Jan '10

Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- po/POTFILES.in | 1 + src/conf/domain_event.c | 36 +++++++++++++++++++++++++++++------- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 1ab0859..c9c78b6 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -4,6 +4,7 @@ daemon/remote.c daemon/stream.c src/conf/cpu_conf.c src/conf/domain_conf.c +src/conf/domain_event.c src/conf/interface_conf.c src/conf/network_conf.c src/conf/node_device_conf.c diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index 0fa2822..72f499c 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -26,6 +26,13 @@ #include "logging.h" #include "datatypes.h" #include "memory.h" +#include "virterror_internal.h" + +#define VIR_FROM_THIS VIR_FROM_NONE + +#define eventReportError(conn, code, fmt...) \ + virReportErrorHelper(conn, VIR_FROM_THIS, code, __FILE__, \ + __FUNCTION__, __LINE__, fmt) /** @@ -87,6 +94,9 @@ virDomainEventCallbackListRemove(virConnectPtr conn, return 0; } } + + eventReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s", + _("could not find event callback for removal")); return -1; } @@ -140,6 +150,9 @@ int virDomainEventCallbackListMarkDelete(virConnectPtr conn, return 0; } } + + eventReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s", + _("could not find event callback for deletion")); return -1; } @@ -199,13 +212,14 @@ virDomainEventCallbackListAdd(virConnectPtr conn, for (n=0; n < cbList->count; n++) { if(cbList->callbacks[n]->cb == callback && conn == cbList->callbacks[n]->conn) { - DEBUG0("WARNING: Callback already tracked"); + eventReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s", + _("event callback already tracked")); return -1; } } /* Allocate new event */ if (VIR_ALLOC(event) < 0) { - DEBUG0("Error allocating event"); + virReportOOMError(conn); return -1; } event->conn = conn; @@ -216,7 +230,7 @@ virDomainEventCallbackListAdd(virConnectPtr conn, /* Make space on list */ n = cbList->count; if (VIR_REALLOC_N(cbList->callbacks, n + 1) < 0) { - DEBUG0("Error reallocating list"); + virReportOOMError(conn); VIR_FREE(event); return -1; } @@ -242,8 +256,10 @@ virDomainEventQueuePtr virDomainEventQueueNew(void) { virDomainEventQueuePtr ret; - if (VIR_ALLOC(ret) < 0) + if (VIR_ALLOC(ret) < 0) { + virReportOOMError(NULL); return NULL; + } return ret; } @@ -254,12 +270,15 @@ virDomainEventPtr virDomainEventNew(int id, const char *name, { virDomainEventPtr event; - if (VIR_ALLOC(event) < 0) + if (VIR_ALLOC(event) < 0) { + virReportOOMError(NULL); return NULL; + } event->type = type; event->detail = detail; if (!(event->name = strdup(name))) { + virReportOOMError(NULL); VIR_FREE(event); return NULL; } @@ -318,8 +337,11 @@ virDomainEventQueuePop(virDomainEventQueuePtr evtQueue) { virDomainEventPtr ret; - if(!evtQueue || evtQueue->count == 0 ) + if (!evtQueue || evtQueue->count == 0 ) { + eventReportError(NULL, VIR_ERR_INTERNAL_ERROR, "%s", + _("event queue is empty, nothing to pop")); return NULL; + } ret = evtQueue->events[0]; @@ -357,7 +379,7 @@ virDomainEventQueuePush(virDomainEventQueuePtr evtQueue, /* Make space on queue */ if (VIR_REALLOC_N(evtQueue->events, evtQueue->count + 1) < 0) { - DEBUG0("Error reallocating queue"); + virReportOOMError(NULL); return -1; } -- 1.6.5.2

2 1

[libvirt] [PATCH] daemon: Fix various error reporting issues
by Cole Robinson 14 Jan '10

14 Jan '10

Many node device calls weren't properly relaying error messages, and domain event registeration was not checking for error. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- daemon/remote.c | 38 +++++++++++++++++++++----------------- 1 files changed, 21 insertions(+), 17 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 0b30131..41b9974 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -231,7 +231,7 @@ remoteDispatchGetType (struct qemud_server *server ATTRIBUTE_UNUSED, */ ret->type = strdup (type); if (!ret->type) { - remoteDispatchFormatError (rerr, "%s", _("out of memory in strdup")); + remoteDispatchOOMError(rerr); return -1; } @@ -4489,7 +4489,7 @@ remoteDispatchNodeDeviceDumpXml (struct qemud_server *server ATTRIBUTE_UNUSED, dev = virNodeDeviceLookupByName(conn, args->name); if (dev == NULL) { - remoteDispatchFormatError(rerr, "%s", _("node_device not found")); + remoteDispatchConnError(rerr, conn); return -1; } @@ -4520,7 +4520,7 @@ remoteDispatchNodeDeviceGetParent (struct qemud_server *server ATTRIBUTE_UNUSED, dev = virNodeDeviceLookupByName(conn, args->name); if (dev == NULL) { - remoteDispatchFormatError(rerr, "%s", _("node_device not found")); + remoteDispatchConnError(rerr, conn); return -1; } @@ -4562,7 +4562,7 @@ remoteDispatchNodeDeviceNumOfCaps (struct qemud_server *server ATTRIBUTE_UNUSED, dev = virNodeDeviceLookupByName(conn, args->name); if (dev == NULL) { - remoteDispatchFormatError(rerr, "%s", _("node_device not found")); + remoteDispatchConnError(rerr, conn); return -1; } @@ -4591,7 +4591,7 @@ remoteDispatchNodeDeviceListCaps (struct qemud_server *server ATTRIBUTE_UNUSED, dev = virNodeDeviceLookupByName(conn, args->name); if (dev == NULL) { - remoteDispatchFormatError(rerr, "%s", _("node_device not found")); + remoteDispatchConnError(rerr, conn); return -1; } @@ -4634,7 +4634,7 @@ remoteDispatchNodeDeviceDettach (struct qemud_server *server ATTRIBUTE_UNUSED, dev = virNodeDeviceLookupByName(conn, args->name); if (dev == NULL) { - remoteDispatchFormatError(rerr, "%s", _("node_device not found")); + remoteDispatchConnError(rerr, conn); return -1; } @@ -4661,7 +4661,7 @@ remoteDispatchNodeDeviceReAttach (struct qemud_server *server ATTRIBUTE_UNUSED, dev = virNodeDeviceLookupByName(conn, args->name); if (dev == NULL) { - remoteDispatchFormatError(rerr, "%s", _("node_device not found")); + remoteDispatchConnError(rerr, conn); return -1; } @@ -4688,7 +4688,7 @@ remoteDispatchNodeDeviceReset (struct qemud_server *server ATTRIBUTE_UNUSED, dev = virNodeDeviceLookupByName(conn, args->name); if (dev == NULL) { - remoteDispatchFormatError(rerr, "%s", _("node_device not found")); + remoteDispatchConnError(rerr, conn); return -1; } @@ -4738,7 +4738,7 @@ remoteDispatchNodeDeviceDestroy(struct qemud_server *server ATTRIBUTE_UNUSED, dev = virNodeDeviceLookupByName(conn, args->name); if (dev == NULL) { - remoteDispatchFormatError(rerr, "%s", _("node_device not found")); + remoteDispatchConnError(rerr, conn); return -1; } @@ -4766,11 +4766,14 @@ remoteDispatchDomainEventsRegister (struct qemud_server *server ATTRIBUTE_UNUSED { CHECK_CONN(client); - /* Register event delivery callback */ - REMOTE_DEBUG("%s","Registering to relay remote events"); - virConnectDomainEventRegister(conn, remoteRelayDomainEvent, client, NULL); + if (virConnectDomainEventRegister(conn, + remoteRelayDomainEvent, + client, NULL) < 0) { + remoteDispatchConnError(rerr, conn); + return -1; + } - if(ret) + if (ret) ret->cb_registered = 1; return 0; } @@ -4786,11 +4789,12 @@ remoteDispatchDomainEventsDeregister (struct qemud_server *server ATTRIBUTE_UNUS { CHECK_CONN(client); - /* Deregister event delivery callback */ - REMOTE_DEBUG("%s","Deregistering to relay remote events"); - virConnectDomainEventDeregister(conn, remoteRelayDomainEvent); + if (virConnectDomainEventDeregister(conn, remoteRelayDomainEvent) < 0) { + remoteDispatchConnError(rerr, conn); + return -1; + } - if(ret) + if (ret) ret->cb_registered = 0; return 0; } -- 1.6.5.2

2 1

[libvirt] [PATCH] daemon: Don't blindly unregister domain events
by Cole Robinson 14 Jan '10

14 Jan '10

The daemon will attempt to unregister domain events on client disconnect, even if no events were ever registered. This raises an unneeded error. Track in the qemu_client structure if events have been registered, and check this when performing cleanup. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- daemon/libvirtd.c | 2 +- daemon/libvirtd.h | 1 + daemon/remote.c | 4 ++++ 3 files changed, 6 insertions(+), 1 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index c53ef0a..61a9728 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -1447,7 +1447,7 @@ void qemudDispatchClientFailure(struct qemud_client *client) { } /* Deregister event delivery callback */ - if(client->conn) { + if (client->conn && client->domain_events_registered) { DEBUG0("Deregistering to relay remote events"); virConnectDomainEventDeregister(client->conn, remoteRelayDomainEvent); } diff --git a/daemon/libvirtd.h b/daemon/libvirtd.h index e3624c6..2f647f3 100644 --- a/daemon/libvirtd.h +++ b/daemon/libvirtd.h @@ -177,6 +177,7 @@ struct qemud_client { int watch; int readonly:1; int closing:1; + int domain_events_registered:1; struct sockaddr_storage addr; socklen_t addrlen; diff --git a/daemon/remote.c b/daemon/remote.c index 41b9974..e39d6d1 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -4775,6 +4775,8 @@ remoteDispatchDomainEventsRegister (struct qemud_server *server ATTRIBUTE_UNUSED if (ret) ret->cb_registered = 1; + + client->domain_events_registered = 1; return 0; } @@ -4796,6 +4798,8 @@ remoteDispatchDomainEventsDeregister (struct qemud_server *server ATTRIBUTE_UNUS if (ret) ret->cb_registered = 0; + + client->domain_events_registered = 0; return 0; } -- 1.6.5.2

2 1

[libvirt] [PATCH] qemu: Check for ia64 kvm
by Cole Robinson 14 Jan '10

14 Jan '10

From: Dustin Xiong <x_k_123(a)hotmail.com> Ported to current code. Untested, but builds fine. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/qemu/qemu_conf.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index d3da776..0d970d6 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -373,12 +373,19 @@ static const struct qemu_feature_flags const arch_info_x86_64_flags [] = { { "apic", 1, 0 }, }; +static const struct qemu_feature_flags const arch_info_ia64_flags [] = { + { "acpi", 1, 1 }, + { "apic", 1, 0 }, +}; + /* The archicture tables for supported QEMU archs */ static const struct qemu_arch_info const arch_info_hvm[] = { { "i686", 32, NULL, "/usr/bin/qemu", "/usr/bin/qemu-system-x86_64", arch_info_i686_flags, 4 }, { "x86_64", 64, NULL, "/usr/bin/qemu-system-x86_64", NULL, arch_info_x86_64_flags, 2 }, + { "itanium", 64, NULL, "/usr/bin/qemu-system-ia64", + NULL, arch_info_ia64_flags, 2}, { "arm", 32, NULL, "/usr/bin/qemu-system-arm", NULL, NULL, 0 }, { "mips", 32, NULL, "/usr/bin/qemu-system-mips", NULL, NULL, 0 }, { "mipsel", 32, NULL, "/usr/bin/qemu-system-mipsel", NULL, NULL, 0 }, -- 1.6.5.2

3 3

[libvirt] [PATCH] util: Make sure virExec hook failures are raised
by Cole Robinson 14 Jan '10

14 Jan '10

With the introduction virDispatchError, hook function errors are never sent through the error callback, so users will never see these messages. Fix this by calling virDispatchError after hook failure. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/util/util.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index ba6b0db..45ca657 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -557,8 +557,11 @@ __virExec(virConnectPtr conn, } if (hook) - if ((hook)(data) != 0) + if ((hook)(data) != 0) { + VIR_DEBUG0("Hook function failed."); + virDispatchError(NULL); _exit(1); + } /* The steps above may need todo something privileged, so * we delay clearing capabilities until the last minute */ -- 1.6.5.2

3 3

[libvirt] [PATCH] Fix linkage of virt-aa-helper to libgnu.a
by Matthias Bolte 14 Jan '10

14 Jan '10

--- src/Makefile.am | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index dbf708b..324030b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -876,9 +876,9 @@ virt_aa_helper_LDFLAGS = $(WARN_CFLAGS) virt_aa_helper_LDADD = \ $(WARN_CFLAGS) \ $(LIBXML_LIBS) \ - @top_srcdir@/gnulib/lib/libgnu.la \ @top_srcdir@/src/libvirt_conf.la \ - @top_srcdir@/src/libvirt_util.la + @top_srcdir@/src/libvirt_util.la \ + @top_srcdir@/gnulib/lib/libgnu.la virt_aa_helper_CFLAGS = \ -I@top_srcdir@/src/conf \ -I@top_srcdir@/src/security -- 1.6.3.3

2 1

[libvirt] [PATCH] Fix event-test segfault for mixed remote/local driver usage
by Matthias Bolte 14 Jan '10

14 Jan '10

If examples/domain-events/events-c/event-test.c uses a local driver for the hyperviror and a remote driver for storage then the segfault occurs in remoteDomainEventDispatchFunc because conn->privateData is used. The problem is as follows. The doRemoteOpen function registers remoteDomainEventFired as event handle and remoteDomainEventQueueFlush as event timeout. The doRemoteOpen function is used in remoteOpen and remoteOpenSecondaryDriver. So both handlers are registered for all types of remote drivers, but remoteDomainEventQueueFlush always uses conn->privateData. That's wrong when remoteDomainEventQueueFlush is called for any other driver than the hypervisor driver, it should use conn->storagePrivateData for the storage driver for example. In the common case this doesn't result in a segfault because in the common case all drivers for a connection are either all remote or all local and conn->privateData and conn->storagePrivateData are the same. But in the local Xen case ('event-test xen:///' executed in Domain-0, with a libvirtd running in Domain-0) the hypervisor driver is local and the storage driver is remote. This results in a mismatch between conn->privateData and conn->storagePrivateData. Now the call to remoteDomainEventQueueFlush in the context of the storage driver results in a segfault, because it assumes that conn->privateData points to remote driver private data, but it points to Xen driver private data. To fix this, the pointer to the private driver data gets passed as opaque parameter instead of the connection pointer. Because some functions called by the event handler functions need the connection pointer for other purposes than error reporting the connection pointer is passed as member of the private remote driver data struct. Now remoteDomainEventFired and remoteDomainEventQueueFlush have the correct private data pointer for the respective calling context. --- src/remote/remote_driver.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index d6f5fce..582b85c 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -152,6 +152,7 @@ struct private_stream_data { struct private_data { virMutex lock; + virConnectPtr conn; int sock; /* Socket. */ int watch; /* File handle watch */ @@ -893,7 +894,7 @@ doRemoteOpen (virConnectPtr conn, if ((priv->watch = virEventAddHandle(priv->sock, VIR_EVENT_HANDLE_READABLE, remoteDomainEventFired, - conn, NULL)) < 0) { + priv, NULL)) < 0) { DEBUG0("virEventAddHandle failed: No addHandleImpl defined." " continuing without events."); } else { @@ -901,7 +902,7 @@ doRemoteOpen (virConnectPtr conn, DEBUG0("Adding Timeout for remote event queue flushing"); if ( (priv->eventFlushTimer = virEventAddTimeout(-1, remoteDomainEventQueueFlush, - conn, NULL)) < 0) { + priv, NULL)) < 0) { DEBUG0("virEventAddTimeout failed: No addTimeoutImpl defined. " "continuing without events."); virEventRemoveHandle(priv->watch); @@ -980,6 +981,7 @@ remoteAllocPrivateData(virConnectPtr conn) return NULL; } remoteDriverLock(priv); + priv->conn = conn; priv->localUses = 1; priv->watch = -1; priv->sock = -1; @@ -8659,8 +8661,7 @@ remoteDomainEventFired(int watch, int event, void *opaque) { - virConnectPtr conn = opaque; - struct private_data *priv = conn->privateData; + struct private_data *priv = opaque; remoteDriverLock(priv); @@ -8684,7 +8685,7 @@ remoteDomainEventFired(int watch, goto done; } - if (remoteIOHandleInput(conn, priv, 0) < 0) + if (remoteIOHandleInput(priv->conn, priv, 0) < 0) DEBUG0("Something went wrong during async message processing"); done: @@ -8708,8 +8709,7 @@ static void remoteDomainEventDispatchFunc(virConnectPtr conn, void remoteDomainEventQueueFlush(int timer ATTRIBUTE_UNUSED, void *opaque) { - virConnectPtr conn = opaque; - struct private_data *priv = conn->privateData; + struct private_data *priv = opaque; virDomainEventQueue tempQueue; remoteDriverLock(priv); @@ -8731,7 +8731,7 @@ remoteDomainEventQueueFlush(int timer ATTRIBUTE_UNUSED, void *opaque) if ( priv->callbackList->count == 0 ) { /* Tell the server when we are the last callback deregistering */ - if (call (conn, priv, 0, REMOTE_PROC_DOMAIN_EVENTS_DEREGISTER, + if (call (priv->conn, priv, 0, REMOTE_PROC_DOMAIN_EVENTS_DEREGISTER, (xdrproc_t) xdr_void, (char *) NULL, (xdrproc_t) xdr_void, (char *) NULL) == -1) VIR_WARN0("Failed to de-register events"); -- 1.6.3.3

2 1

[libvirt] Set MAC address for host virtual interface?
by Neil Aggarwal 14 Jan '10

14 Jan '10

Hello: Is there a way to set the MAC address for the virtual interface on the host? I have this in my guests's XML file: <interface type='bridge'> <mac address='54:52:00:7d:f8:fc'/> <source bridge='br0'/> <target dev='tkl-joomla'/> </interface> the mac address line controls the guest interface but the host interface seems to get a random MAC address. This is causing a problem for me since I use Cacti to monitor the bandwidth usage of the guest machines. Every time I stop and start a guest, Cacti creates a new interface and I have to reset the graphs to use the new interfaces. Thanks, Neil -- Neil Aggarwal, (281)846-8957, http://UnmeteredVPS.net Host Joomla!, Wordpress, phpBB, or vBulletin for $25/mo Unmetered bandwidth = no overage charges, 7 day free trial

2 1

[libvirt] Man page patch for BZ 548485
by David Jorm 14 Jan '10

14 Jan '10

See https://bugzilla.redhat.com/show_bug.cgi?id=548485 git diff for the patch: ---SNIP--- --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -342,7 +342,9 @@ severed upon restore, as TCP timeouts may have expired. =item B<schedinfo> optional I<--weight> B<number> optional I<--cap> B<number> I<domain-id> -Allows to show (and set) the domain scheduler parameters. +Allows you to show (and set) the domain scheduler parameters. + +B<Note>: The only parameter currently available for all schedulers is cpu_shares. It has a valid value range of 0-262144. B<Note>: The weight and cap parameters are defined only for the XEN_CREDIT scheduler and are now I<DEPRECATED>. ---SNIP--- I hope that's right, I found that BZ a bit confusing to comprehend. Learning curve. David

2 2

[libvirt] [BUG?] "no domain with matching uuid" error, when vm restarts
by su disheng 14 Jan '10

14 Jan '10

Hi, In the following libvirt API calling sequence, I always get an error "no domain with matching uuid" Connect _conn = new Connect("qemu:///system", false); _conn.domainDefineXML(kvm_guest_xml); Domain dm = _conn.domainLookupByName(kvm_guest_name); dm.create(); /* stop, undefine, and re-start the vm*/ dm.shutdown(); dm.undefine(); dm.domainDefineXML(kvm_guest_xml); /****A****/ Domain dm = _conn.domainLookupByName(kvm_guest_name); dm.create() /********Error!!!!**/ if I close the connection, and re-connect qemu at the end of /****A****/, then everything is OK. From the log, seems that uuid is not updated immediately, for this connection, the uuid is in the stale state? I am using libvirt 0.6.3, if it's a bug, does it fixed in the latest code? or Have I need to close the connection for each vm shutdown/re-define? I am a newbie in this API, any help are appreciated.

2 2

[libvirt] [PATCH] virterror: Don't invoke error callback for ERR_OK
by Cole Robinson 14 Jan '10

14 Jan '10

Since virDispatchError is now responsible for invoking the error callback, give it the same semantics as ReportError, which will skip VIR_ERR_OK (which is encountered when no error was raised). This fixes invoking the error callback after every non-erroring API call. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/util/virterror.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/util/virterror.c b/src/util/virterror.c index e2128b9..78974ee 100644 --- a/src/util/virterror.c +++ b/src/util/virterror.c @@ -603,8 +603,12 @@ virDispatchError(virConnectPtr conn) if (!err) return; - /* Set a generic error message if none is already set */ + /* We never used to raise ERR_OK, so maintain existing behavior */ if (err->code == VIR_ERR_OK) + return; + + /* Set a generic error message if none is already set */ + if (!err->message) virErrorGenericFailure(err); /* Copy the global error to per-connection error if needed */ -- 1.6.5.2

2 5

[libvirt] [PATCH 0/2] Some new utility functions
by Laine Stump 14 Jan '10

14 Jan '10

I'm planning to use these to fix the problems with creating storage volumes on root-squashing NFS servers, but since they may be of general utility I thought I'd throw them out for comments beforehand - it something different would make them more generally useful, better to change it now than after I've already finished code to use them. My plan is to use virRunWithHook() to call setuid (or possibly some sort of capng calisthenics) prior to execing qemu-img and qcow-create. virFileCreate and virDirCreate will be used when creating raw volumes. I have written test code to verify that virFileCreate works in several different scenarios. Haven't done so with virRun yet, but it's a fairly simple change, just exposing __virExec arguments that were already there. (I'd previously written test code (yes, it worked ;-)) that used a virRun with uid/gid args added on, but have decided against that approach, since this seems more flexible)

4 19

[libvirt] [PATCH] node_device: udev: Fix memory leak
by Cole Robinson 14 Jan '10

14 Jan '10

We are setting the same property two different ways without free'ing in between. Just drop the second assignment. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/node_device/node_device_udev.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index a9e196d..ff6bd46 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -997,11 +997,7 @@ static int udevProcessStorage(struct udev_device *device, goto out; } data->storage.block = strdup(devnode); - if (udevGetStringProperty(device, - "DEVNAME", - &data->storage.block) == PROPERTY_ERROR) { - goto out; - } + if (udevGetStringProperty(device, "ID_BUS", &data->storage.bus) == PROPERTY_ERROR) { -- 1.6.5.2

3 3

[libvirt] [PATCH] node_device: udev: Enumerate floppy devices
by Cole Robinson 14 Jan '10

14 Jan '10

There are quite a few differences between how udev exposes legacy and USB floppy devs, but this patch takes care of both variants. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/node_device/node_device_udev.c | 88 ++++++++++++++++++++++++++++------- 1 files changed, 70 insertions(+), 18 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 55cfee2..a9e196d 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -840,30 +840,19 @@ out: } -static int udevProcessCDROM(struct udev_device *device, - virNodeDeviceDefPtr def) +static int udevProcessRemoveableMedia(struct udev_device *device, + virNodeDeviceDefPtr def, + int has_media) { union _virNodeDevCapData *data = &def->caps->data; int tmp_int = 0, ret = 0; - /* NB: the drive_type string provided by udev is different from - * that provided by HAL; now it's "cd" instead of "cdrom" We - * change it to cdrom to preserve compatibility with earlier - * versions of libvirt. */ - VIR_FREE(def->caps->data.storage.drive_type); - def->caps->data.storage.drive_type = strdup("cdrom"); - if (def->caps->data.storage.drive_type == NULL) { - virReportOOMError(NULL); - goto out; - } - if ((udevGetIntSysfsAttr(device, "removable", &tmp_int, 0) == PROPERTY_FOUND) && (tmp_int == 1)) { def->caps->data.storage.flags |= VIR_NODE_DEV_CAP_STORAGE_REMOVABLE; } - if ((udevGetIntProperty(device, "ID_CDROM_MEDIA", &tmp_int, 0) - == PROPERTY_FOUND) && (tmp_int == 1)) { + if (has_media) { def->caps->data.storage.flags |= VIR_NODE_DEV_CAP_STORAGE_REMOVABLE_MEDIA_AVAILABLE; @@ -898,6 +887,53 @@ out: return ret; } +static int udevProcessCDROM(struct udev_device *device, + virNodeDeviceDefPtr def) +{ + int ret = -1; + int tmp_int = 0; + int has_media = 0; + + /* NB: the drive_type string provided by udev is different from + * that provided by HAL; now it's "cd" instead of "cdrom" We + * change it to cdrom to preserve compatibility with earlier + * versions of libvirt. */ + VIR_FREE(def->caps->data.storage.drive_type); + def->caps->data.storage.drive_type = strdup("cdrom"); + if (def->caps->data.storage.drive_type == NULL) { + virReportOOMError(NULL); + goto out; + } + + if ((udevGetIntProperty(device, "ID_CDROM_MEDIA", + &tmp_int, 0) == PROPERTY_FOUND)) + has_media = tmp_int; + + ret = udevProcessRemoveableMedia(device, def, has_media); +out: + return ret; +} + +static int udevProcessFloppy(struct udev_device *device, + virNodeDeviceDefPtr def) +{ + int tmp_int = 0; + int has_media = 0; + char *tmp_str = NULL; + + if ((udevGetIntProperty(device, "DKD_MEDIA_AVAILABLE", + &tmp_int, 0) == PROPERTY_FOUND)) + /* USB floppy */ + has_media = tmp_int; + else if (udevGetStringProperty(device, "ID_FS_LABEL", + &tmp_str) == PROPERTY_FOUND) { + /* Legacy floppy */ + has_media = 1; + VIR_FREE(tmp_str); + } + + return udevProcessRemoveableMedia(device, def, has_media); +} /* This function exists to deal with the case in which a driver does * not provide a device type in the usual place, but udev told us it's @@ -996,9 +1032,23 @@ static int udevProcessStorage(struct udev_device *device, if (udevGetStringProperty(device, "ID_TYPE", &data->storage.drive_type) != PROPERTY_FOUND) { - /* If udev doesn't have it, perhaps we can guess it. */ - if (udevKludgeStorageType(def) != 0) { - goto out; + int tmp_int = 0; + + /* All floppy drives have the ID_DRIVE_FLOPPY prop. This is + * needed since legacy floppies don't have a drive_type */ + if ((udevGetIntProperty(device, "ID_DRIVE_FLOPPY", + &tmp_int, 0) == PROPERTY_FOUND) && + (tmp_int == 1)) { + + data->storage.drive_type = strdup("floppy"); + if (!data->storage.drive_type) + goto out; + } else { + + /* If udev doesn't have it, perhaps we can guess it. */ + if (udevKludgeStorageType(def) != 0) { + goto out; + } } } @@ -1006,6 +1056,8 @@ static int udevProcessStorage(struct udev_device *device, ret = udevProcessCDROM(device, def); } else if (STREQ(def->caps->data.storage.drive_type, "disk")) { ret = udevProcessDisk(device, def); + } else if (STREQ(def->caps->data.storage.drive_type, "floppy")) { + ret = udevProcessFloppy(device, def); } else { VIR_INFO("Unsupported storage type '%s'\n", def->caps->data.storage.drive_type); -- 1.6.5.2

3 3

[libvirt] [PATCH] node_device: udev: Use base 16 for product/vendor
by Cole Robinson 14 Jan '10

14 Jan '10

udev doesn't prefix USB product/vendor info with '0x', so the strtol conversions were wrong for the product field (vendor already set the correct base). Make the change for PCI product/vendor as well to be safe. This fixes USB device assignment via virt-manager. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/node_device/node_device_udev.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 7a9c1e5..55cfee2 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -457,14 +457,14 @@ static int udevProcessPCI(struct udev_device *device, if (udevGetUintSysfsAttr(device, "vendor", &data->pci_dev.vendor, - 0) == PROPERTY_ERROR) { + 16) == PROPERTY_ERROR) { goto out; } if (udevGetUintSysfsAttr(device, "device", &data->pci_dev.product, - 0) == PROPERTY_ERROR) { + 16) == PROPERTY_ERROR) { goto out; } @@ -522,7 +522,7 @@ static int udevProcessUSBDevice(struct udev_device *device, if (udevGetUintProperty(device, "ID_MODEL_ID", &data->usb_dev.product, - 0) == PROPERTY_ERROR) { + 16) == PROPERTY_ERROR) { goto out; } -- 1.6.5.2

3 3

[libvirt] VMware vCenter support
by Fulop, Balazs 14 Jan '10

14 Jan '10

Dear List, I find the ESX driver in libvirt quite useful to perform powercycle operations on a VM. However, I need to connect to an ESX server even when the VM is managed on the VMware 4.0 platform. Reading this mail: http://www.mail-archive.com/libvir-list@redhat.com/msg18259.html makes me think that support to connect directly to a vCenter using the scheme vpx:// is not far from becoming a reality. Could you please provide an estimated timeline for this and notes on possible further enhancements in the ESX driver code? Thank you very much in advance. Regards, Balazs Fulop -------------------------------------------------------------------------- NOTICE: If received in error, please destroy, and notify sender. Sender does not intend to waive confidentiality or privilege. Use of this email is prohibited when received in error. We may monitor and store emails to the extent permitted by applicable law.

2 1

[libvirt] Problem with libvirt-0.7.5 windows port
by anuj rampal 13 Jan '10

13 Jan '10

Hi, I'm trying to cross compile the libvirt-0.7.5 for windows. This is the error I'm getting: # make make all-recursive make[1]: Entering directory `/root/libvirt-0.7.5' Making all in gnulib/lib make[2]: Entering directory `/root/libvirt-0.7.5/gnulib/lib' [...] Making all in tools make[2]: Entering directory `/root/libvirt-0.7.5/tools' make all-am make[3]: Entering directory `/root/libvirt-0.7.5/tools' CC virsh-console.o CC virsh-virsh.o CCLD virsh.exe ../src/.libs/libvirt.a: could not read symbols: Archive has no index; run ranlib to add one collect2: ld returned 1 exit status make[3]: *** [virsh.exe] Error 1 make[3]: Leaving directory `/root/libvirt-0.7.5/tools' make[2]: *** [all] Error 2 make[2]: Leaving directory `/root/libvirt-0.7.5/tools' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/root/libvirt-0.7.5' make: *** [all] Error 2 Does any1 has any idea. Thanks in advance. Regards Anuj

1 0

[libvirt] [PATCH] Implement path lookup for USB by vendor:product
by Cole Robinson 13 Jan '10

13 Jan '10

Based off how QEMU does it, look through /sys/bus/usb/devices/* for matching vendor:product info, and if found, use info from the surrounding files to build the device's /dev/bus/usb path. This fixes USB device assignment by vendor:product when running qemu as non-root (well, it should, but for some reason I couldn't reproduce the failure people are seeing in [1], but it appears to work properly) [1] https://bugzilla.redhat.com/show_bug.cgi?id=542450 Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- po/POTFILES.in | 1 + src/qemu/qemu_driver.c | 9 +-- src/security/security_selinux.c | 8 ++- src/security/virt-aa-helper.c | 7 ++- src/util/hostusb.c | 97 +++++++++++++++++++++++++++++++++++++- src/util/hostusb.h | 4 +- 6 files changed, 112 insertions(+), 14 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 1ab0859..22e9c3c 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -54,6 +54,7 @@ src/uml/uml_conf.c src/uml/uml_driver.c src/util/bridge.c src/util/conf.c +src/util/hostusb.c src/util/json.c src/util/logging.c src/util/pci.c diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index deb8adc..f03ce91 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2105,14 +2105,11 @@ static int qemuDomainSetHostdevUSBOwnership(virConnectPtr conn, struct qemuFileOwner owner = { uid, gid }; int ret = -1; - /* XXX what todo for USB devs assigned based on product/vendor ? Doom :-( */ - if (!def->source.subsys.u.usb.bus || - !def->source.subsys.u.usb.device) - return 0; - usbDevice *dev = usbGetDevice(conn, def->source.subsys.u.usb.bus, - def->source.subsys.u.usb.device); + def->source.subsys.u.usb.device, + def->source.subsys.u.usb.vendor, + def->source.subsys.u.usb.product); if (!dev) goto cleanup; diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 000bc8a..e015c06 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -484,7 +484,9 @@ SELinuxSetSecurityHostdevLabel(virConnectPtr conn, if (dev->source.subsys.u.usb.bus && dev->source.subsys.u.usb.device) { usbDevice *usb = usbGetDevice(conn, dev->source.subsys.u.usb.bus, - dev->source.subsys.u.usb.device); + dev->source.subsys.u.usb.device, + dev->source.subsys.u.usb.vendor, + dev->source.subsys.u.usb.product); if (!usb) goto done; @@ -556,7 +558,9 @@ SELinuxRestoreSecurityHostdevLabel(virConnectPtr conn, case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: { usbDevice *usb = usbGetDevice(conn, dev->source.subsys.u.usb.bus, - dev->source.subsys.u.usb.device); + dev->source.subsys.u.usb.device, + dev->source.subsys.u.usb.vendor, + dev->source.subsys.u.usb.product); if (!usb) goto done; diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 35b29ad..6a52d4c 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -839,8 +839,11 @@ get_files(vahControl * ctl) if (dev->source.subsys.u.usb.bus && dev->source.subsys.u.usb.device) { usbDevice *usb = usbGetDevice(NULL, - dev->source.subsys.u.usb.bus, - dev->source.subsys.u.usb.device); + dev->source.subsys.u.usb.bus, + dev->source.subsys.u.usb.device, + dev->source.subsys.u.usb.vendor, + dev->source.subsys.u.usb.product); + if (usb == NULL) continue; rc = usbDeviceFileIterate(NULL, usb, diff --git a/src/util/hostusb.c b/src/util/hostusb.c index 07e10b1..3e9ac83 100644 --- a/src/util/hostusb.c +++ b/src/util/hostusb.c @@ -37,9 +37,10 @@ #include "util.h" #include "virterror_internal.h" +#define USB_SYSFS "/sys/bus/usb" #define USB_DEVFS "/dev/bus/usb/" -#define USB_ID_LEN 10 /* "XXXX XXXX" */ -#define USB_ADDR_LEN 8 /* "XXX:XXX" */ +#define USB_ID_LEN 10 /* "1234 5678" */ +#define USB_ADDR_LEN 8 /* "123:456" */ struct _usbDevice { unsigned bus; @@ -57,11 +58,95 @@ struct _usbDevice { virReportErrorHelper(conn, VIR_FROM_NONE, code, __FILE__, \ __FUNCTION__, __LINE__, fmt) +static int usbSysReadFile(virConnectPtr conn, + const char *f_name, const char *d_name, + const char *fmt, unsigned *value) +{ + int ret = -1; + char *buf = NULL; + char filename[PATH_MAX]; + + snprintf(filename, PATH_MAX, USB_SYSFS "/devices/%s/%s", d_name, f_name); + + if (virFileReadAll(filename, 1024, &buf) < 0) + goto error; + + if (sscanf(buf, fmt, value) != 1) { + virReportSystemError(conn, errno, + _("Could not parse usb file %s"), filename); + goto error; + } + + ret = 0; +error: + VIR_FREE(buf); + return ret; +} + +static int usbFindBusByVendor(virConnectPtr conn, + unsigned vendor, unsigned product, + unsigned *bus, unsigned *devno) +{ + DIR *dir = NULL; + int ret = -1, found = 0; + struct dirent *de; + + dir = opendir(USB_SYSFS "/devices"); + if (!dir) { + virReportSystemError(conn, errno, + _("Could not open directory %s"), + USB_SYSFS "/devices"); + goto error; + } + + while ((de = readdir(dir))) { + unsigned found_prod, found_vend; + if (de->d_name[0] == '.' || strchr(de->d_name, ':')) + continue; + + if (usbSysReadFile(conn, "idVendor", de->d_name, + "%x", &found_vend) < 0) + goto error; + if (usbSysReadFile(conn, "idProduct", de->d_name, + "%x", &found_prod) < 0) + goto error; + + if (found_prod == product && found_vend == vendor) { + /* Lookup bus.addr info */ + char *tmpstr = de->d_name; + unsigned found_bus, found_addr; + + if (STREQ(de->d_name, "usb")) + tmpstr += 3; + found_bus = atoi(tmpstr); + + if (usbSysReadFile(conn, "devnum", de->d_name, + "%d", &found_addr) < 0) + goto error; + + *bus = found_bus; + *devno = found_addr; + found = 1; + break; + } + } + + if (!found) + usbReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("Did not find USB device %x:%x"), vendor, product); + else + ret = 0; + +error: + return ret; +} usbDevice * usbGetDevice(virConnectPtr conn, unsigned bus, - unsigned devno) + unsigned devno, + unsigned vendor, + unsigned product) { usbDevice *dev; @@ -70,6 +155,12 @@ usbGetDevice(virConnectPtr conn, return NULL; } + if (vendor) { + /* Look up bus.dev by vendor:product */ + if (usbFindBusByVendor(conn, vendor, product, &bus, &devno) < 0) + return NULL; + } + dev->bus = bus; dev->dev = devno; diff --git a/src/util/hostusb.h b/src/util/hostusb.h index 7f75c8b..739a4aa 100644 --- a/src/util/hostusb.h +++ b/src/util/hostusb.h @@ -28,7 +28,9 @@ typedef struct _usbDevice usbDevice; usbDevice *usbGetDevice (virConnectPtr conn, unsigned bus, - unsigned devno); + unsigned devno, + unsigned vendor, + unsigned product); void usbFreeDevice (virConnectPtr conn, usbDevice *dev); -- 1.6.5.2

2 1

[libvirt] [PATCH] Implement CPU topology support for QEMU driver
by Jiri Denemark 13 Jan '10

13 Jan '10

QEMU's command line equivalent for the following domain XML fragment <vcpus>2</vcpus> <cpu ...> ... <topology sockets='1' cores='2', threads='1'/> </cpu> is -smp 2,sockets=1,cores=2,threads=1 This syntax was introduced in QEMU-0.12. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_conf.c | 137 ++++++++++++++++++++++++++++++++++++++++++++------ src/qemu/qemu_conf.h | 3 +- 2 files changed, 123 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index d3da776..bc4736a 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1,7 +1,7 @@ /* * qemu_conf.c: QEMU configuration management * - * Copyright (C) 2006, 2007, 2008, 2009 Red Hat, Inc. + * Copyright (C) 2006, 2007, 2008, 2009, 2010 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -1115,6 +1115,10 @@ static unsigned int qemudComputeCmdFlags(const char *help, flags |= QEMUD_CMD_FLAG_CHARDEV; if (strstr(help, "-balloon")) flags |= QEMUD_CMD_FLAG_BALLOON; + if (strstr(help, "cores=") && + strstr(help, "threads=") && + strstr(help, "sockets=")) + flags |= QEMUD_CMD_FLAG_SMP_TOPOLOGY; if (version >= 9000) flags |= QEMUD_CMD_FLAG_VNC_COLON; @@ -1900,7 +1904,6 @@ int qemudBuildCommandLine(virConnectPtr conn, const char *migrateFrom) { int i; char memory[50]; - char vcpus[50]; char boot[VIR_DOMAIN_BOOT_LAST]; struct utsname ut; int disableKQEMU = 0; @@ -2049,7 +2052,6 @@ int qemudBuildCommandLine(virConnectPtr conn, * is not supported, then they're out of luck anyway */ snprintf(memory, sizeof(memory), "%lu", def->maxmem/1024); - snprintf(vcpus, sizeof(vcpus), "%lu", def->vcpus); snprintf(domid, sizeof(domid), "%d", def->id); ADD_ENV_LIT("LC_ALL=C"); @@ -2112,8 +2114,34 @@ int qemudBuildCommandLine(virConnectPtr conn, ADD_ARG_LIT("-mem-path"); ADD_ARG_LIT(driver->hugepage_path); } + ADD_ARG_LIT("-smp"); - ADD_ARG_LIT(vcpus); + if ((qemuCmdFlags & QEMUD_CMD_FLAG_SMP_TOPOLOGY) && def->cpu) { + virBuffer buf = VIR_BUFFER_INITIALIZER; + + virBufferVSprintf(&buf, "%lu", def->vcpus); + + if (def->cpu->sockets > 0) + virBufferVSprintf(&buf, ",sockets=%u", def->cpu->sockets); + + if (def->cpu->cores > 0) + virBufferVSprintf(&buf, ",cores=%u", def->cpu->cores); + + if (def->cpu->threads > 0) + virBufferVSprintf(&buf, ",threads=%u", def->cpu->threads); + + if (virBufferError(&buf)) { + virBufferFreeAndReset(&buf); + goto no_memory; + } + + ADD_ARG(virBufferContentAndReset(&buf)); + } + else { + char vcpus[50]; + snprintf(vcpus, sizeof(vcpus), "%lu", def->vcpus); + ADD_ARG_LIT(vcpus); + } if (qemuCmdFlags & QEMUD_CMD_FLAG_NAME) { ADD_ARG_LIT("-name"); @@ -3729,6 +3757,27 @@ error: } +static virCPUDefPtr +qemuInitGuestCPU(virConnectPtr conn, + virDomainDefPtr dom) +{ + if (!dom->cpu) { + virCPUDefPtr cpu; + + if (VIR_ALLOC(cpu) < 0) { + virReportOOMError(conn); + return NULL; + } + + cpu->type = VIR_CPU_TYPE_GUEST; + cpu->match = VIR_CPU_MATCH_EXACT; + dom->cpu = cpu; + } + + return dom->cpu; +} + + static int qemuParseCommandLineCPU(virConnectPtr conn, virDomainDefPtr dom, @@ -3738,10 +3787,8 @@ qemuParseCommandLineCPU(virConnectPtr conn, const char *p = val; const char *next; - if (VIR_ALLOC(cpu) < 0) - goto no_memory; - - cpu->type = VIR_CPU_TYPE_GUEST; + if (!(cpu = qemuInitGuestCPU(conn, dom))) + goto error; do { if (*p == '\0' || *p == ',') @@ -3785,7 +3832,6 @@ qemuParseCommandLineCPU(virConnectPtr conn, } } while ((p = next)); - dom->cpu = cpu; return 0; syntax: @@ -3796,7 +3842,71 @@ syntax: no_memory: virReportOOMError(conn); error: - virCPUDefFree(cpu); + return -1; +} + + +static int +qemuParseCommandLineSmp(virConnectPtr conn, + virDomainDefPtr dom, + const char *val) +{ + const char *p = val; + const char *next; + const char *const options[] = { "sockets=", "cores=", "threads=" }; + unsigned int topology[] = { 0, 0, 0 }; + char *end; + + do { + if (*p == '\0' || *p == ',') + goto syntax; + + if ((next = strchr(p, ','))) + next++; + + if (c_isdigit(*p)) { + int n; + if (virStrToLong_i(p, &end, 10, &n) < 0 || + !end || (*end != ',' && *end != '\0')) + goto syntax; + dom->vcpus = n; + } else { + int i; + int n = -1; + for (i = 0; i < ARRAY_CARDINALITY(options); i++) { + if (STRPREFIX(p, options[i])) { + p += strlen(options[i]); + if (virStrToLong_i(p, &end, 10, &n) < 0 || + !end || (*end != ',' && *end != '\0')) + goto syntax; + topology[i] = n; + break; + } + } + + if (n < 0) + goto syntax; + } + } while ((p = next)); + + if (topology[0] && topology[1] && topology[2]) { + virCPUDefPtr cpu; + + if (!(cpu = qemuInitGuestCPU(conn, dom))) + goto error; + + cpu->sockets = topology[0]; + cpu->cores = topology[1]; + cpu->threads = topology[2]; + } else if (topology[0] || topology[1] || topology[2]) + goto syntax; + + return 0; + +syntax: + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("cannot parse CPU topology '%s'"), val); +error: return -1; } @@ -3948,14 +4058,9 @@ virDomainDefPtr qemuParseCommandLine(virConnectPtr conn, } def->memory = def->maxmem = mem * 1024; } else if (STREQ(arg, "-smp")) { - int vcpus; WANT_VALUE(); - if (virStrToLong_i(val, NULL, 10, &vcpus) < 0) { - qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, \ - _("cannot parse CPU count '%s'"), val); + if (qemuParseCommandLineSmp(conn, def, val) < 0) goto error; - } - def->vcpus = vcpus; } else if (STREQ(arg, "-uuid")) { WANT_VALUE(); if (virUUIDParse(val, def->uuid) < 0) { diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 82254ca..3f74cc9 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -1,7 +1,7 @@ /* * qemu_conf.h: QEMU configuration management * - * Copyright (C) 2006, 2007, 2009 Red Hat, Inc. + * Copyright (C) 2006, 2007, 2009, 2010 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -78,6 +78,7 @@ enum qemud_cmd_flags { QEMUD_CMD_FLAG_ENABLE_KVM = (1 << 23), /* Is the -enable-kvm flag available to "enable KVM full virtualization support" */ QEMUD_CMD_FLAG_MONITOR_JSON = (1 << 24), /* JSON mode for monitor */ QEMUD_CMD_FLAG_BALLOON = (1 << 25), /* -balloon available */ + QEMUD_CMD_FLAG_SMP_TOPOLOGY = (1 << 26), /* Is sockets=s,cores=c,threads=t available for -smp? */ }; /* Main driver state */ -- 1.6.6

2 3

[libvirt] [PATCH] Fix migration in xend driver
by Jim Fehlig 13 Jan '10

13 Jan '10

Upstream xen has changed parameters to the migration operation several times over the past 18 months. Changeset 17553 removed the resouce parameter, Changesets 17709, 17753, and 20326 added ssl, node, and change_home_server parameters respectively. Fortunately, testing has revealed that xend will fail the operation if a parameter is missing but happily honor it if unknown parameters are provided. Thus all currently supported parameters can be provided, satisfying current xend but not regressing older versions. --- src/xen/xend_internal.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index be033f5..d9bfa15 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -4553,15 +4553,21 @@ xenDaemonDomainMigratePerform (virDomainPtr domain, DEBUG("hostname = %s, port = %s", hostname, port); - /* Make the call. */ + /* Make the call. + * NB: xend will fail the operation if any parameters are + * missing but happily accept unknown parameters. This works + * to our advantage since all parameters supported and required + * by current xend can be included without breaking older xend. + */ ret = xend_op (domain->conn, domain->name, "op", "migrate", "destination", hostname, "live", live, "port", port, - "node", "-1", - "ssl", "0", - "resource", "0", /* required, xend ignores it */ + "node", "-1", /* xen-unstable c/s 17753 */ + "ssl", "0", /* xen-unstable c/s 17709 */ + "change_home_server", "0", /* xen-unstable c/s 20326 */ + "resource", "0", /* removed by xen-unstable c/s 17553 */ NULL); VIR_FREE (hostname); -- 1.6.0.2

2 1

[libvirt] Start external programm on network-setup
by Dominik Bruhn 13 Jan '10

13 Jan '10

Hy, im using libvirt-bin on debian and configured the network of libvirt to be a standalone bridge. Is there a possibility to run a program after the bridge has successfully and completly set up by libvirtd? I would like to restart shorewall (a firewall) when the bridge is set up to activate MASQ and DNAT and other policies which I need. I would also like to start my own configured dnsmasq when the interface is up (can't start it realier because it has to bind to the interface). I hope thats the right place to ask such a question, if not, please direct me. Thanks for the help -- Dominik mailto: dominik(a)dbruhn.de

2 1

[libvirt] Problem: cannot make libvirtd listen to TCP sockets
by Motiejus Jakštys 13 Jan '10

13 Jan '10

Hello, I don't know if I am writing to the proper place, but I've been struggling quite a long time with connecting to libvirtd. Any information would help. My goal is to start remote tcp connection (afterwards - tls, but later) and connect to the libvirtd. http://libvirt.org/uri.html#URI_remote There are some nitoces when starting libvirtd: -~*~--~*~--~*~--~*~--~*~--~*~--~*~--~*~--~*~--~*~--~*~--~*~- xen:/usr/local/etc# libvirtd 17:53:42.153: error : virRun:847 : internal error '/sbin/iptables --table filter --insert FORWARD --destination 192.168.122.0/255.255.255.0 --out-interface virbr0 --match state --state ESTABLISHED,RELATED --jump ACCEPT' exited with non-zero status 1 and signal 0: iptables: No chain/target/match by that name 17:53:42.153: error : networkAddMasqueradingIptablesRules:615 : failed to add iptables rule to allow forwarding to 'virbr0': Invalid argument 17:53:42.354: warning : qemudStartup:1067 : Unable to create cgroup for driver: No such device or address 17:53:42.372: warning : lxcStartup:1755 : Unable to create cgroup for driver: No such device or address 17:53:43.259: warning : qemudDispatchSignalEvent:385 : Shutting down on signal 2 -~*~--~*~--~*~--~*~--~*~--~*~--~*~--~*~--~*~--~*~--~*~--~*~- libvirtd keeps running, however it does not open ANY new ports to listening state. Extract from /usr/local/etc/libvirt/libvirtd.conf : (full conf here: http://pastebin.com/f6e0f572) listen_tls = 1 listen_tcp = 1 /usr/local/var/log/libvirt has 3 empty directories: {lxc,qemu,uml}, so nothing logged. xen:/# virsh list shows my current running domains, so looks like libvirt is fine. I have compiled XEN and libvirt from source (0.7.4, then upgraded 0.7.5, got same errors on both versions). Additional information: I am running three guest domains, all bridged to eth0 (peth0 ethernet card -> eth0 bridge -> vifs), from xend-config.sxp: (network-script network-bridge) Debian lenny Linux xen 2.6.18.8-xen0 #1 SMP Fri Nov 27 18:17:01 EET 2009 x86_64 GNU/Linux (here is kernel config: http://pastebin.com/f393c78f0) Note: I compiled iptables as a module manually, however without IMQ support, since it failed to compile. I have installed Xen 3.4.2, however virsh thinks it's 3.4.0 -~*~--~*~--~*~--~*~--~*~--~*~--~*~--~*~--~*~--~*~--~*~--~*~- virsh # version Compiled against library: libvir 0.7.5 Using library: libvir 0.7.5 Using API: Xen 3.0.1 Running hypervisor: Xen 3.4.0 -~*~--~*~--~*~--~*~--~*~--~*~--~*~--~*~--~*~--~*~--~*~--~*~- Any suggestions how to properly start libvirtd, pointers to other related mailing-lists or forums are very welcome. Thank you! Motiejus Jakštys

2 2

[libvirt] [PATCH 0/5] Fix various error squashing issues
by Cole Robinson 13 Jan '10

13 Jan '10

The following series adds internal APIs that help prevent legitimate errors from being overwritten by other errors (for example in cleanup routines). The majority of this series is a patch from Dan[1] which makes error callbacks explictly triggered when exiting an API call, rather than when an error is raised (I've updated this to cover the current codebase) [1] http://gitorious.org/~berrange/libvirt/staging/commits/error-callbacks Cole Robinson (4): virterror: Add virSetError qemu: migrate: Save MigratePerform error in MigrateFinish. libvirt.c: Preserve MigratePerform failure qemu: Disable errors in qemudShutdownVMDaemon Daniel P. Berrange (1): Ensure error handling callback functions are called from safe context src/libvirt.c | 849 +++++++++++++++++++++++------------------ src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 18 + src/util/virterror.c | 102 +++--- src/util/virterror_internal.h | 4 +- 5 files changed, 548 insertions(+), 426 deletions(-)

3 12

[libvirt] Nice libvirt article on IBM developer works
by Hugh O. Brock 13 Jan '10

13 Jan '10

http://www.ibm.com/developerworks/linux/library/l-libvirt/index.html?ca=dgr… Maybe we can get more like this (despite the factual errors...) --H -- ======================================================== Hugh Brock, hbrock(a)redhat.com, +1-215-564-3232 Deltacloud API + Portal http://deltacloud.org Libvirt virtualization library http://libvirt.org ========================================================

1 0

Re: [libvirt] Segfault in event-test.c example
by pspreadborough＠comcast.net 12 Jan '10

12 Jan '10

----- pspreadborough(a)comcast.net wrote: > ----- "Matthias Bolte" <matthias.bolte(a)googlemail.com> wrote: > > > 2010/1/11 <pspreadborough(a)comcast.net>: > > > > > > ----- "Matthias Bolte" <matthias.bolte(a)googlemail.com> wrote: > > > > > >> 2010/1/10 <pspreadborough(a)comcast.net>: > > >> > > > >> > ----- "Matthias Bolte" <matthias.bolte(a)googlemail.com> wrote: > > >> > > > >> >> 2010/1/10 <pspreadborough(a)comcast.net>: > > >> >> > > > >> >> > Hello, > > >> >> > > > >> >> > I have been trying to use the domain event C code example > but > > >> >> > unfortunately it segfaults (signal 11) every time I run it: > > >> >> > > > >> >> > [root@Spring events-c]# ./event-test > > >> >> > myEventAddHandleFunc:221: Add handle 5 1 0xf081a0 0x8f727f8 > > >> >> > myEventAddHandleFunc:221: Add handle 7 1 0xf09990 0x8f727f8 > > >> >> > myEventAddHandleFunc:221: Add handle 8 1 0xed7940 0x8f727f8 > > >> >> > myEventAddTimeoutFunc:251: Adding Timeout -1 0xedefa0 > > 0x8f727f8 > > >> >> > myEventAddHandleFunc:221: Add handle 11 1 0xed7940 0x8f727f8 > > >> >> > myEventAddTimeoutFunc:251: Adding Timeout -1 0xedefa0 > > 0x8f727f8 > > >> >> > main:322 :: Registering domain event cbs > > >> >> > Segmentation fault (core dumped) > > >> >> > > > >> >> > Core was generated by > > >> >> > > > >> >> > > >> > > > `/root/libvirt-0.7.5/examples/domain-events/events-c/.libs/lt-event-test'. > > >> >> > Program terminated with signal 11, Segmentation fault. > > >> >> > [New process 21806] > > >> >> > [New process 21822] > > >> >> > #0 remoteDomainEventQueueFlush (timer=-1, opaque=0x8f727f8) > > at > > >> >> > remote/remote_driver.c:8720 > > >> >> > 8720 tempQueue.count = priv->domainEvents->count; > > >> >> > (gdb) bt > > >> >> > #0 remoteDomainEventQueueFlush (timer=-1, opaque=0x8f727f8) > > at > > >> >> > remote/remote_driver.c:8720 > > >> >> > #1 0x080490d3 in main (argc=Cannot access memory at address > > 0x1 > > >> >> > ) at event-test.c:347 > > >> >> > > > >> >> > The stack looks corrupted so I'm doubtful that this trace if > > of > > >> much > > >> >> value. > > >> >> > I have built > > >> >> > and installed libvirt-0.7.5 and it and it's tools seem to be > > >> >> operating > > >> >> > correctly. > > >> >> > > >> >> I tried the event-test with libvirt-0.7.5 and QEMU/Xen and > both > > >> are > > >> >> working as expected. No segfaults. > > >> >> > > >> >> Could you inspect the values of priv and priv->domainEvents in > > GDB > > >> >> using 'p priv' to see if they are NULL and try to dereference > > them > > >> in > > >> >> GDB using 'p *priv' to see if they point to valid memory > areas? > > >> >> > > >> >> Yes the backtrace looks corrupted. If there is stack/heap > > >> corruption > > >> >> involved valgrind may reveal it, so try to run the event-test > > in > > >> >> valgrind and see if that gives any hints. > > >> >> > > >> >> You can also try the GIT version of libvirt. There was a > > invalid > > >> free > > >> >> call (resulting in heap corruption) in the node device code > > fixed > > >> >> after the 0.7.5 release. But that should have no effect on the > > >> >> event-test. > > >> >> > > >> >> Matthias > > >> > > > >> > Matthias, > > >> > > > >> > priv->domainEvents is NULL, here's the gdb output: > > >> > > >> This explains the segfault. The next question is, why is it NULL? > > >> > > >> > (gdb) p *priv > > >> > $1 = {lock = {lock = {__data = {__lock = 1, __count = 0, > __owner > > = > > >> 21806, __kind = 0, __nusers = 1, {__spins = 0, __list = { > > >> > __next = 0x0}}}, __size = > > >> > > > "\001\000\000\000\000\000\000\000.U\000\000\000\000\000\000\001\000\000\000\000\000\000", > > >> > __align = 1}}, sock = 150469168, watch = 3, pid = 4, > > uses_tls = > > >> 1982791681, is_secure = 1815048801, session = 0x782f6269, > > >> > > >> Seeing uses_tls and is_secure being large numbers and knowing > that > > >> both are used as boolean values in the code and should have > values > > of > > >> 0 or 1 make me think that priv points to already freed memory > > here. > > >> > > >> > type = 0x2f646e65 <Address 0x2f646e65 out of bounds>, counter > = > > >> 1684956536, localUses = 1668248365, > > >> > hostname = 0x74656b <Address 0x74656b out of bounds>, debugLog > > = > > >> 0x0, saslconn = 0x0, saslDecoded = 0x0, saslDecodedLength = 0, > > >> > > >> type and hostname are char pointers, but the seem to point into > > >> nowhere, confirms that this is either freed memory or priv itself > > got > > >> overwritten due to heap corruption. > > >> > > >> > saslDecodedOffset = 0, saslEncoded = 0x0, saslEncodedLength = > > 0, > > >> saslEncodedOffset = 0, > > >> > buffer = '\0' <repeats 68 times>, > > >> > > > "n\000\000\000\001\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\001\000\000\000\001\000\000\000\000\000\000\000\001\000\000\000\bQ�\b��\030\034�\b\000\000\000\000�\033�\b\001\000\000\000\002\000\000\000�\033�\b\000\000\000\000\025|�\000\a", > > >> '\0' <repeats 11 times>, "X\000�\b", '\0' <repeats 12 times>, > > >> "\021\000\000\000\002\000\000\000P��\b\000\000\000\000\021", '\0' > > >> <repeats 15 times>, > > >> > > > "\021\000\000\0008\036�\b\f\000\000\000\020\000\000\000\021\000\000\000\a\000\000\000\b\000\000\000\t\000\000\000\021\000\000\000\002\000\000\000\230\034�\b\000\000\000\000A\000\000\000\003\000\000\000\001\000\000\000\001\000"..., > > >> bufferLength = 0, > > >> > bufferOffset = 0, callbackList = 0x0, domainEvents = 0x0, > > >> eventFlushTimer = 0, domainEventDispatching = 1, wakeupSendFD = > 0, > > >> > wakeupReadFD = 0, waitDispatch = 0x0, streams = 0x0} > > >> > > > >> > I'll try a run with valgrind and post the results. > > >> > > > >> > Pete > > >> > > > >> > > >> Could you test the Python version of this example found in > > >> examples/domain-events/events-python/event-test.py? Does this > > work? > > >> > > >> Otherwise lets see if valgrind gives any hints. > > >> > > >> Matthias > > > > > > > > > During initialization I notice that the myEventAddHandleFunc() > > method is > > > called multiple times, each time with a different fd value (5,7,8 > > and 11). > > > The way the code is written only the last fd value is recorded and > > then > > > used in the poll() call. Is this the intended? if so why are the > > preceding > > > fds ignored? > > > > > > myEventAddHandleFunc:223: Add handle 5 1 0xf13480 0x97b97d8 > > > myEventAddHandleFunc:223: Add handle 7 1 0xf14c70 0x97b97d8 > > > Allocating domainEvents:0x97c6b10 > > > myEventAddHandleFunc:223: Add handle 8 1 0xee2940 0x97b97d8 > > > myEventAddTimeoutFunc:260: Adding Timeout -1 0xee9fc0 0x97b97d8 > > > Allocating domainEvents:0x97c5780 > > > myEventAddHandleFunc:223: Add handle 11 1 0xee2940 0x97b97d8 > > > myEventAddTimeoutFunc:260: Adding Timeout -1 0xee9fc0 0x97b97d8 > > > main:333 :: Registering domain event cbs > > > > > > > > > Regards, > > > > > > Pete > > > > > > > That's strange. I can't reproduce this neither. I always get exactly > > one call to myEventAddHandleFunc: > > > > myEventAddHandleFunc:221: Add handle 3 1 0x7ff116f68b00 0x1d97f00 > > myEventAddTimeoutFunc:251: Adding Timeout -1 0x7ff116f68750 > 0x1d97f00 > > main:322 :: Registering domain event cbs > > myEventUpdateHandleFunc:232: Updated Handle 0 0 > > myEventUpdateHandleFunc:232: Updated Handle 0 1 > > > > You could try to run the event-test in GDB and set a breakpoint on > > myEventAddHandleFunc to see where 4 additional calls to > > myEventAddHandleFunc come from. > > > > In my case I get this backtrace when setting a breakpoint on > > myEventAddHandleFunc: > > > > (gdb) bt > > #0 myEventAddHandleFunc (fd=6, event=1, cb=0x7f1be6ec3b00 > > <remoteDomainEventFired>, opaque=0xc68f00, ff=0) at event-test.c:220 > > #1 0x00007f1be6ecbaaf in doRemoteOpen (conn=0xc68f00, > > priv=0x7f1be7350010, auth=0x0, flags=0) at > remote/remote_driver.c:893 > > #2 0x00007f1be6ece053 in remoteOpen (conn=0xc68f00, auth=0x0, > > flags=13007744) at remote/remote_driver.c:1076 > > #3 0x00007f1be6eb155d in do_open (name=0x7fff48400968 > > "qemu:///system", auth=0x0, flags=0) at libvirt.c:1117 > > #4 0x0000000000400eb3 in main (argc=<value optimized out>, > > argv=<value optimized out>) at event-test.c:313 > > > > Matthias > > > Matthias > > Here are the four stack traces, one for each time > myEventAddHandleFunc() was > called. > > #0 myEventAddHandleFunc (fd=8, event=1, cb=0x85b480 > <xenStoreWatchEvent>, opaque=0x824a7d8, ff=0) at event-test.c:223 > #1 0x007ccf55 in virEventAddHandle (fd=8, events=1, cb=0x85b480 > <xenStoreWatchEvent>, opaque=0x824a7d8, ff=0) > at util/event.c:45 > #2 0x0085b291 in xenStoreOpen (conn=0x824a7d8, auth=0x0, flags=<value > optimized out>) at xen/xs_internal.c:339 > #3 0x00844287 in xenUnifiedOpen (conn=0x824a7d8, auth=0x0, flags=0) > at xen/xen_driver.c:352 > #4 0x00811d05 in do_open (name=0xbf8c49d4 "xen:///", auth=0x0, > flags=0) at libvirt.c:1117 > #5 0x08048e92 in main (argc=Cannot access memory at address 0x2 > ) at event-test.c:325 > (gdb) c > Continuing. > (gdb) b > Note: breakpoint 1 also set at pc 0x8048bc9. > Breakpoint 2 at 0x8048bc9: file event-test.c, line 223. > (gdb) bt > #0 myEventAddHandleFunc (fd=10, event=1, cb=0x85cc70 > <xenInotifyEvent>, opaque=0x824a7d8, ff=0) at event-test.c:223 > #1 0x007ccf55 in virEventAddHandle (fd=10, events=1, cb=0x85cc70 > <xenInotifyEvent>, opaque=0x824a7d8, ff=0) at util/event.c:45 > #2 0x0085c827 in xenInotifyOpen (conn=0x824a7d8, auth=0x0, flags=0) > at xen/xen_inotify.c:460 > #3 0x008444f1 in xenUnifiedOpen (conn=0x824a7d8, auth=0x0, flags=0) > at xen/xen_driver.c:391 > #4 0x00811d05 in do_open (name=0xbf8c49d4 "xen:///", auth=0x0, > flags=0) at libvirt.c:1117 > #5 0x08048e92 in main (argc=Cannot access memory at address 0x1 > ) at event-test.c:325 > (gdb) c > Continuing. > (gdb) bt > #0 myEventAddHandleFunc (fd=11, event=1, cb=0x82a940 > <remoteDomainEventFired>, opaque=0x824a7d8, ff=0) at event-test.c:223 > #1 0x007ccf55 in virEventAddHandle (fd=11, events=1, cb=0x82a940 > <remoteDomainEventFired>, opaque=0x824a7d8, ff=0) > at util/event.c:45 > #2 0x0082c478 in doRemoteOpen (conn=0x824a7d8, priv=0xb7534008, > auth=0x0, flags=0) at remote/remote_driver.c:894 > #3 0x00830448 in remoteOpenSecondaryDriver (conn=0x824a7d8, auth=0x0, > flags=0, priv=0xbf8c2668) at remote/remote_driver.c:1006 > #4 0x0083082a in remoteNetworkOpen (conn=0x824a7d8, auth=0x0, > flags=0) at remote/remote_driver.c:3549 > #5 0x00811e2f in do_open (name=0xbf8c49d4 "xen:///", auth=0x0, > flags=0) at libvirt.c:1137 > #6 0x08048e92 in main (argc=1, argv=0xbf8c28b4) at event-test.c:325 > (gdb) c > Continuing. > (gdb) bt > #0 myEventAddHandleFunc (fd=14, event=1, cb=0x82a940 > <remoteDomainEventFired>, opaque=0x824a7d8, ff=0) at event-test.c:223 > #1 0x007ccf55 in virEventAddHandle (fd=14, events=1, cb=0x82a940 > <remoteDomainEventFired>, opaque=0x824a7d8, ff=0) > at util/event.c:45 > #2 0x0082c478 in doRemoteOpen (conn=0x824a7d8, priv=0x8258ab0, > auth=0x0, flags=0) at remote/remote_driver.c:894 > #3 0x00830448 in remoteOpenSecondaryDriver (conn=0x824a7d8, auth=0x0, > flags=0, priv=0xbf8c2668) at remote/remote_driver.c:1006 > #4 0x0083078a in remoteInterfaceOpen (conn=0x824a7d8, auth=0x0, > flags=0) at remote/remote_driver.c:4104 > #5 0x00811f4e in do_open (name=0xbf8c49d4 "xen:///", auth=0x0, > flags=0) at libvirt.c:1156 > #6 0x08048e92 in main (argc=1, argv=0xbf8c28b4) at event-test.c:325 > > Regards, > > Pete > > > -- > Libvir-list mailing list > Libvir-list(a)redhat.com > https://www.redhat.com/mailman/listinfo/libvir-list Matthias, Using the UIR xen+unix:/// works! I'm curious to know why when using the UIR xen:/// multiple myEventAddHandleFunc() calls occurred. Are there and fields I could use to identify and ignore the spurious calls? I'd like to use the event monitoring for several remote Xen hosts. I assume I'll have to modify the code to connect remotely to each host and hope for just one myEventAddHandleFunc() call per host. Thanks for your assistance it's much apprecied, Regards, Pete

2 2

[libvirt] [PATCH] remote_driver.c: fix a NULL dereference in remoteDomainEventQueueFlush().
by kakuma 12 Jan '10

12 Jan '10

Hi, all. There is a case of a NULL dereference in function remoteDomainEventQueueFlush() in remote_driver.c In the case of local connection conn->privateData->domainEvents isn't reserved. In this case it will occurs segment fault. (for example examples/domain-events/events-c/event-test.c) I think the following patch will be available. Thanks. --- src/remote/remote_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index d6f5fce..b112fd3 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -8709,7 +8709,7 @@ void remoteDomainEventQueueFlush(int timer ATTRIBUTE_UNUSED, void *opaque) { virConnectPtr conn = opaque; - struct private_data *priv = conn->privateData; + struct private_data *priv = conn->networkPrivateData; virDomainEventQueue tempQueue; remoteDriverLock(priv); -- 1.5.6.1 -- kakuma <f-kak(a)ksh.biglobe.ne.jp>

2 2

Re: [libvirt] Segfault in event-test.c example
by pspreadborough＠comcast.net 12 Jan '10

12 Jan '10

----- "Matthias Bolte" <matthias.bolte(a)googlemail.com> wrote: > 2010/1/10 <pspreadborough(a)comcast.net>: > > > > ----- "Matthias Bolte" <matthias.bolte(a)googlemail.com> wrote: > > > >> 2010/1/10 <pspreadborough(a)comcast.net>: > >> > > >> > Hello, > >> > > >> > I have been trying to use the domain event C code example but > >> > unfortunately it segfaults (signal 11) every time I run it: > >> > > >> > [root@Spring events-c]# ./event-test > >> > myEventAddHandleFunc:221: Add handle 5 1 0xf081a0 0x8f727f8 > >> > myEventAddHandleFunc:221: Add handle 7 1 0xf09990 0x8f727f8 > >> > myEventAddHandleFunc:221: Add handle 8 1 0xed7940 0x8f727f8 > >> > myEventAddTimeoutFunc:251: Adding Timeout -1 0xedefa0 0x8f727f8 > >> > myEventAddHandleFunc:221: Add handle 11 1 0xed7940 0x8f727f8 > >> > myEventAddTimeoutFunc:251: Adding Timeout -1 0xedefa0 0x8f727f8 > >> > main:322 :: Registering domain event cbs > >> > Segmentation fault (core dumped) > >> > > >> > Core was generated by > >> > > >> > `/root/libvirt-0.7.5/examples/domain-events/events-c/.libs/lt-event-test'. > >> > Program terminated with signal 11, Segmentation fault. > >> > [New process 21806] > >> > [New process 21822] > >> > #0 remoteDomainEventQueueFlush (timer=-1, opaque=0x8f727f8) at > >> > remote/remote_driver.c:8720 > >> > 8720 tempQueue.count = priv->domainEvents->count; > >> > (gdb) bt > >> > #0 remoteDomainEventQueueFlush (timer=-1, opaque=0x8f727f8) at > >> > remote/remote_driver.c:8720 > >> > #1 0x080490d3 in main (argc=Cannot access memory at address 0x1 > >> > ) at event-test.c:347 > >> > > >> > The stack looks corrupted so I'm doubtful that this trace if of > much > >> value. > >> > I have built > >> > and installed libvirt-0.7.5 and it and it's tools seem to be > >> operating > >> > correctly. > >> > >> I tried the event-test with libvirt-0.7.5 and QEMU/Xen and both > are > >> working as expected. No segfaults. > >> > >> Could you inspect the values of priv and priv->domainEvents in GDB > >> using 'p priv' to see if they are NULL and try to dereference them > in > >> GDB using 'p *priv' to see if they point to valid memory areas? > >> > >> Yes the backtrace looks corrupted. If there is stack/heap > corruption > >> involved valgrind may reveal it, so try to run the event-test in > >> valgrind and see if that gives any hints. > >> > >> You can also try the GIT version of libvirt. There was a invalid > free > >> call (resulting in heap corruption) in the node device code fixed > >> after the 0.7.5 release. But that should have no effect on the > >> event-test. > >> > >> Matthias > > > > Matthias, > > > > priv->domainEvents is NULL, here's the gdb output: > > This explains the segfault. The next question is, why is it NULL? > > > (gdb) p *priv > > $1 = {lock = {lock = {__data = {__lock = 1, __count = 0, __owner = > 21806, __kind = 0, __nusers = 1, {__spins = 0, __list = { > > __next = 0x0}}}, __size = > "\001\000\000\000\000\000\000\000.U\000\000\000\000\000\000\001\000\000\000\000\000\000", > > __align = 1}}, sock = 150469168, watch = 3, pid = 4, uses_tls = > 1982791681, is_secure = 1815048801, session = 0x782f6269, > > Seeing uses_tls and is_secure being large numbers and knowing that > both are used as boolean values in the code and should have values of > 0 or 1 make me think that priv points to already freed memory here. > > > type = 0x2f646e65 <Address 0x2f646e65 out of bounds>, counter = > 1684956536, localUses = 1668248365, > > hostname = 0x74656b <Address 0x74656b out of bounds>, debugLog = > 0x0, saslconn = 0x0, saslDecoded = 0x0, saslDecodedLength = 0, > > type and hostname are char pointers, but the seem to point into > nowhere, confirms that this is either freed memory or priv itself got > overwritten due to heap corruption. > > > saslDecodedOffset = 0, saslEncoded = 0x0, saslEncodedLength = 0, > saslEncodedOffset = 0, > > buffer = '\0' <repeats 68 times>, > "n\000\000\000\001\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\001\000\000\000\001\000\000\000\000\000\000\000\001\000\000\000\bQ�\b��\030\034�\b\000\000\000\000�\033�\b\001\000\000\000\002\000\000\000�\033�\b\000\000\000\000\025|�\000\a", > '\0' <repeats 11 times>, "X\000�\b", '\0' <repeats 12 times>, > "\021\000\000\000\002\000\000\000P��\b\000\000\000\000\021", '\0' > <repeats 15 times>, > "\021\000\000\0008\036�\b\f\000\000\000\020\000\000\000\021\000\000\000\a\000\000\000\b\000\000\000\t\000\000\000\021\000\000\000\002\000\000\000\230\034�\b\000\000\000\000A\000\000\000\003\000\000\000\001\000\000\000\001\000"..., > bufferLength = 0, > > bufferOffset = 0, callbackList = 0x0, domainEvents = 0x0, > eventFlushTimer = 0, domainEventDispatching = 1, wakeupSendFD = 0, > > wakeupReadFD = 0, waitDispatch = 0x0, streams = 0x0} > > > > I'll try a run with valgrind and post the results. > > > > Pete > > > > Could you test the Python version of this example found in > examples/domain-events/events-python/event-test.py? Does this work? > > Otherwise lets see if valgrind gives any hints. > > Matthias During initialization I notice that the myEventAddHandleFunc() method is called multiple times, each time with a different fd value (5,7,8 and 11). The way the code is written only the last fd value is recorded and then used in the poll() call. Is this the intended? if so why are the preceding fds ignored? myEventAddHandleFunc:223: Add handle 5 1 0xf13480 0x97b97d8 myEventAddHandleFunc:223: Add handle 7 1 0xf14c70 0x97b97d8 Allocating domainEvents:0x97c6b10 myEventAddHandleFunc:223: Add handle 8 1 0xee2940 0x97b97d8 myEventAddTimeoutFunc:260: Adding Timeout -1 0xee9fc0 0x97b97d8 Allocating domainEvents:0x97c5780 myEventAddHandleFunc:223: Add handle 11 1 0xee2940 0x97b97d8 myEventAddTimeoutFunc:260: Adding Timeout -1 0xee9fc0 0x97b97d8 main:333 :: Registering domain event cbs Regards, Pete

3 3

[libvirt] [PATCH] Document the domain XML cache attribute for disk devices
by Matthias Bolte 12 Jan '10

12 Jan '10

--- docs/formatdomain.html.in | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 46ab0ac..af31699 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -343,7 +343,7 @@ <pre> ... <disk type='file'> - <driver name="tap" type="aio"> + <driver name="tap" type="aio" cache="default"> <source file='/var/lib/xen/images/fv0'/> <target dev='hda' bus='ide'/> <encryption type='...'> @@ -383,7 +383,9 @@ <dd>If the hypervisor supports multiple backend drivers, then the optional <code>driver</code> element allows them to be selected. The <code>name</code> attribute is the primary backend driver name, while the optional <code>type</code> - attribute provides the sub-type. <span class="since">Since 0.1.8</span> + attribute provides the sub-type. The optional <code>cache</code> attribute + controls the cache mechanism, possible values are "default", "none", + "writethrough" and "writeback". <span class="since">Since 0.1.8</span> </dd> <dt><code>encryption</code></dt> <dd>If present, specifies how the volume is encrypted. See -- 1.6.0.4

2 2

[libvirt] [PATCH] qemu: Fix a memory leak in qemudExtractTTYPath
by Matthias Bolte 12 Jan '10

12 Jan '10

qemudWaitForMonitor calls qemudReadLogOutput with qemudFindCharDevicePTYs as callback. qemudFindCharDevicePTYs calls qemudExtractTTYPath to assign a string to chr->data.file.path. Afterwards qemudWaitForMonitor may call qemudFindCharDevicePTYsMonitor that overwrites chr->data.file.path without freeing the old value. This results in leaking the memory allocated by qemudExtractTTYPath. Report an OOM error if the strdup in qemudFindCharDevicePTYsMonitor fails. --- src/qemu/qemu_driver.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index daa6f94..8817565 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1433,7 +1433,13 @@ qemudFindCharDevicePTYsMonitor(virConnectPtr conn, return -1; \ } \ \ + VIR_FREE(chr->data.file.path); \ chr->data.file.path = strdup(path); \ + \ + if (chr->data.file.path == NULL) { \ + virReportOOMError(conn); \ + return -1; \ + } \ } \ } -- 1.6.0.4

2 2

[libvirt] Just to make sure I understand the API
by Bryan Kearney 12 Jan '10

12 Jan '10

To make sure I understand the API. If I have a domain defined, but not started.. it will show up in the list returned by: virConnectListDefinedDomains but not in the list virConnectListDomains Conversely, if it is started... it will only be in the list: virConnectListDomains not in the list virConnectListDefinedDomains Is that correct? -- bk

4 3

Re: [libvirt] Segfault in event-test.c example
by pspreadborough＠comcast.net 12 Jan '10

12 Jan '10

----- "Matthias Bolte" <matthias.bolte(a)googlemail.com> wrote: > 2010/1/10 <pspreadborough(a)comcast.net>: > > > > ----- "Matthias Bolte" <matthias.bolte(a)googlemail.com> wrote: > > > >> 2010/1/10 <pspreadborough(a)comcast.net>: > >> > > >> > Hello, > >> > > >> > I have been trying to use the domain event C code example but > >> > unfortunately it segfaults (signal 11) every time I run it: > >> > > >> > [root@Spring events-c]# ./event-test > >> > myEventAddHandleFunc:221: Add handle 5 1 0xf081a0 0x8f727f8 > >> > myEventAddHandleFunc:221: Add handle 7 1 0xf09990 0x8f727f8 > >> > myEventAddHandleFunc:221: Add handle 8 1 0xed7940 0x8f727f8 > >> > myEventAddTimeoutFunc:251: Adding Timeout -1 0xedefa0 0x8f727f8 > >> > myEventAddHandleFunc:221: Add handle 11 1 0xed7940 0x8f727f8 > >> > myEventAddTimeoutFunc:251: Adding Timeout -1 0xedefa0 0x8f727f8 > >> > main:322 :: Registering domain event cbs > >> > Segmentation fault (core dumped) > >> > > >> > Core was generated by > >> > > >> `/root/libvirt-0.7.5/examples/domain-events/events-c/.libs/lt-event-test'. > >> > Program terminated with signal 11, Segmentation fault. > >> > [New process 21806] > >> > [New process 21822] > >> > #0 remoteDomainEventQueueFlush (timer=-1, opaque=0x8f727f8) at > >> > remote/remote_driver.c:8720 > >> > 8720 tempQueue.count = priv->domainEvents->count; > >> > (gdb) bt > >> > #0 remoteDomainEventQueueFlush (timer=-1, opaque=0x8f727f8) at > >> > remote/remote_driver.c:8720 > >> > #1 0x080490d3 in main (argc=Cannot access memory at address 0x1 > >> > ) at event-test.c:347 > >> > > >> > The stack looks corrupted so I'm doubtful that this trace if of much > >> value. > >> > I have built > >> > and installed libvirt-0.7.5 and it and it's tools seem to be > >> operating > >> > correctly. > >> > >> I tried the event-test with libvirt-0.7.5 and QEMU/Xen and both are > >> working as expected. No segfaults. > >> > >> Could you inspect the values of priv and priv->domainEvents in GDB > >> using 'p priv' to see if they are NULL and try to dereference them in > >> GDB using 'p *priv' to see if they point to valid memory areas? > >> > >> Yes the backtrace looks corrupted. If there is stack/heap corruption > >> involved valgrind may reveal it, so try to run the event-test in > >> valgrind and see if that gives any hints. > >> > >> You can also try the GIT version of libvirt. There was a invalid free > >> call (resulting in heap corruption) in the node device code fixed > >> after the 0.7.5 release. But that should have no effect on the > >> event-test. > >> > >> Matthias > > > > Matthias, > > > > priv->domainEvents is NULL, here's the gdb output: > > This explains the segfault. The next question is, why is it NULL? > > > (gdb) p *priv > > $1 = {lock = {lock = {__data = {__lock = 1, __count = 0, __owner = 21806, __kind = 0, __nusers = 1, {__spins = 0, __list = { > > __next = 0x0}}}, __size = "\001\000\000\000\000\000\000\000.U\000\000\000\000\000\000\001\000\000\000\000\000\000", > > __align = 1}}, sock = 150469168, watch = 3, pid = 4, uses_tls = 1982791681, is_secure = 1815048801, session = 0x782f6269, > > Seeing uses_tls and is_secure being large numbers and knowing that > both are used as boolean values in the code and should have values of > 0 or 1 make me think that priv points to already freed memory here. > > > type = 0x2f646e65 <Address 0x2f646e65 out of bounds>, counter = 1684956536, localUses = 1668248365, > > hostname = 0x74656b <Address 0x74656b out of bounds>, debugLog = 0x0, saslconn = 0x0, saslDecoded = 0x0, saslDecodedLength = 0, > > type and hostname are char pointers, but the seem to point into > nowhere, confirms that this is either freed memory or priv itself got > overwritten due to heap corruption. > > > saslDecodedOffset = 0, saslEncoded = 0x0, saslEncodedLength = 0, saslEncodedOffset = 0, > > buffer = '\0' <repeats 68 times>, "n\000\000\000\001\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\001\000\000\000\001\000\000\000\000\000\000\000\001\000\000\000\bQ�\b��\030\034�\b\000\000\000\000�\033�\b\001\000\000\000\002\000\000\000�\033�\b\000\000\000\000\025|�\000\a", '\0' <repeats 11 times>, "X\000�\b", '\0' <repeats 12 times>, "\021\000\000\000\002\000\000\000P��\b\000\000\000\000\021", '\0' <repeats 15 times>, "\021\000\000\0008\036�\b\f\000\000\000\020\000\000\000\021\000\000\000\a\000\000\000\b\000\000\000\t\000\000\000\021\000\000\000\002\000\000\000\230\034�\b\000\000\000\000A\000\000\000\003\000\000\000\001\000\000\000\001\000"..., bufferLength = 0, > > bufferOffset = 0, callbackList = 0x0, domainEvents = 0x0, eventFlushTimer = 0, domainEventDispatching = 1, wakeupSendFD = 0, > > wakeupReadFD = 0, waitDispatch = 0x0, streams = 0x0} > > > > I'll try a run with valgrind and post the results. > > > > Pete > > > > Could you test the Python version of this example found in > examples/domain-events/events-python/event-test.py? Does this work? > > Otherwise lets see if valgrind gives any hints. > > Matthias > Matthias, I have built the latest git image and run it through valgrind, here's the valgrind output: [root@Spring .libs]# valgrind -v ./event-test xen:/// ==19881== Memcheck, a memory error detector. ==19881== Copyright (C) 2002-2006, and GNU GPL'd, by Julian Seward et al. ==19881== Using LibVEX rev 1658, a library for dynamic binary translation. ==19881== Copyright (C) 2004-2006, and GNU GPL'd, by OpenWorks LLP. ==19881== Using valgrind-3.2.1, a dynamic binary instrumentation framework. ==19881== Copyright (C) 2000-2006, and GNU GPL'd, by Julian Seward et al. ==19881== --19881-- Command line --19881-- ./event-test --19881-- xen:/// --19881-- Startup, with flags: --19881-- -v --19881-- Contents of /proc/version: --19881-- Linux version 2.6.18-164.10.1.el5xen (mockbuild(a)builder16.centos.org) (gcc version 4.1.2 20080704 (Red Hat 4.1.2-46)) #1 SMP Thu Jan 7 21:14:48 EST 2010 --19881-- Arch and hwcaps: X86, x86-sse1-sse2 --19881-- Valgrind library directory: /usr/lib/valgrind --19881-- Reading syms from /lib/ld-2.5.so (0x163000) --19881-- Reading syms from /root/libvirt/libvirt/examples/domain-events/events-c/.libs/event-test (0x8048000) --19881-- Reading syms from /usr/lib/valgrind/x86-linux/memcheck (0x38000000) --19881-- object doesn't have a dynamic symbol table --19881-- Reading suppressions file: /usr/lib/valgrind/default.supp --19881-- REDIR: 0x178790 (index) redirected to 0x38027D0F (vgPlain_x86_linux_REDIR_FOR_index) --19881-- Reading syms from /usr/lib/valgrind/x86-linux/vgpreload_core.so (0x4001000) --19881-- Reading syms from /usr/lib/valgrind/x86-linux/vgpreload_memcheck.so (0x4003000) ==19881== WARNING: new redirection conflicts with existing -- ignoring it --19881-- new: 0x00178790 (index ) R-> 0x04006080 index --19881-- REDIR: 0x178930 (strlen) redirected to 0x4006250 (strlen) --19881-- Reading syms from /usr/local/lib/libvirt.so.0.7.5 (0x4009000) --19881-- Reading syms from /usr/lib/libxml2.so.2.6.26 (0x6254000) --19881-- object doesn't have a symbol table --19881-- Reading syms from /usr/lib/libz.so.1.2.3 (0xCD2000) --19881-- object doesn't have a symbol table --19881-- Reading syms from /lib/libm-2.5.so (0x413B000) --19881-- Reading syms from /usr/lib/libgnutls.so.13.0.6 (0x670D000) --19881-- object doesn't have a symbol table --19881-- Reading syms from /usr/lib/libgcrypt.so.11.5.2 (0x6590000) --19881-- object doesn't have a symbol table --19881-- Reading syms from /usr/lib/libsasl2.so.2.0.22 (0x6536000) --19881-- object doesn't have a symbol table --19881-- Reading syms from /usr/lib/libxenstore.so.3.0.0 (0x4162000) --19881-- object doesn't have a symbol table --19881-- Reading syms from /lib/libpthread-2.5.so (0x416A000) --19881-- Reading syms from /lib/libc-2.5.so (0x4183000) --19881-- Reading syms from /lib/libdl-2.5.so (0xCA7000) --19881-- Reading syms from /usr/lib/libgpg-error.so.0.3.0 (0xB28000) --19881-- object doesn't have a symbol table --19881-- Reading syms from /lib/libresolv-2.5.so (0x26E000) --19881-- Reading syms from /lib/libcrypt-2.5.so (0x64CE000) --19881-- REDIR: 0x41F42D0 (memset) redirected to 0x4006540 (memset) --19881-- REDIR: 0x41F47C0 (memcpy) redirected to 0x4006C20 (memcpy) --19881-- REDIR: 0x41F3430 (rindex) redirected to 0x4005F60 (rindex) --19881-- REDIR: 0x41F3090 (strlen) redirected to 0x4006230 (strlen) --19881-- REDIR: 0x41EED20 (malloc) redirected to 0x400533B (malloc) --19881-- REDIR: 0x41F2B30 (strcmp) redirected to 0x4006300 (strcmp) --19881-- REDIR: 0x41EE9E0 (calloc) redirected to 0x4004668 (calloc) --19881-- REDIR: 0x41F3DD0 (memchr) redirected to 0x4006420 (memchr) --19881-- REDIR: 0x41EC980 (free) redirected to 0x4004F55 (free) --19881-- REDIR: 0x41EF190 (realloc) redirected to 0x40053EA (realloc) ==19881== Warning: noted but unhandled ioctl 0x305000 with no size/direction hints ==19881== This could cause spurious value errors to appear. ==19881== See README_MISSING_SYSCALL_OR_IOCTL for guidance on writing a proper wrapper. ==19881== Warning: noted but unhandled ioctl 0x305000 with no size/direction hints ==19881== This could cause spurious value errors to appear. ==19881== See README_MISSING_SYSCALL_OR_IOCTL for guidance on writing a proper wrapper. ==19881== Warning: noted but unhandled ioctl 0x305000 with no size/direction hints ==19881== This could cause spurious value errors to appear. ==19881== See README_MISSING_SYSCALL_OR_IOCTL for guidance on writing a proper wrapper. --19881-- REDIR: 0x41F29C0 (index) redirected to 0x4006050 (index) --19881-- REDIR: 0x41F3280 (strncmp) redirected to 0x4006290 (strncmp) --19881-- REDIR: 0x41F44C0 (stpcpy) redirected to 0x40068D0 (stpcpy) --19881-- REDIR: 0x41F3140 (strnlen) redirected to 0x4006200 (strnlen) --19881-- REDIR: 0x41F3380 (strncpy) redirected to 0x4006DA0 (strncpy) --19881-- REDIR: 0x41F2BA0 (strcpy) redirected to 0x40069B0 (strcpy) myEventAddHandleFunc:221: Add handle 5 1 0x40ad4a0 0x42d6188 myEventAddHandleFunc:221: Add handle 7 1 0x40aec90 0x42d6188 Allocating domainEvents:0x43bea68 myEventAddHandleFunc:221: Add handle 8 1 0x407c940 0x42d6188 myEventAddTimeoutFunc:251: Adding Timeout -1 0x4083fe0 0x42d6188 Allocating domainEvents:0x4e8c320 myEventAddHandleFunc:221: Add handle 11 1 0x407c940 0x42d6188 myEventAddTimeoutFunc:251: Adding Timeout -1 0x4083fe0 0x42d6188 main:322 :: Registering domain event cbs poll ==19881== Invalid read of size 4 ==19881== at 0x4084011: remoteDomainEventQueueFlush (remote_driver.c:8722) ==19881== by 0x80490C2: main (event-test.c:341) ==19881== Address 0x0 is not stack'd, malloc'd or (recently) free'd ==19881== ==19881== Process terminating with default action of signal 11 (SIGSEGV) ==19881== Access not within mapped region at address 0x0 ==19881== at 0x4084011: remoteDomainEventQueueFlush (remote_driver.c:8722) ==19881== by 0x80490C2: main (event-test.c:341) ==19881== ==19881== ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 30 from 1) ==19881== ==19881== 1 errors in context 1 of 1: ==19881== Invalid read of size 4 ==19881== at 0x4084011: remoteDomainEventQueueFlush (remote_driver.c:8722) ==19881== by 0x80490C2: main (event-test.c:341) ==19881== Address 0x0 is not stack'd, malloc'd or (recently) free'd --19881-- --19881-- supp: 30 Fedora-Core-6-hack3-ld25 ==19881== ==19881== IN SUMMARY: 1 errors from 1 contexts (suppressed: 30 from 1) ==19881== ==19881== malloc/free: in use at exit: 590,340 bytes in 686 blocks. ==19881== malloc/free: 1,695 allocs, 1,009 frees, 1,700,423 bytes allocated. ==19881== ==19881== searching for pointers to 686 not-freed blocks. ==19881== checked 11,495,892 bytes. ==19881== ==19881== LEAK SUMMARY: ==19881== definitely lost: 0 bytes in 0 blocks. ==19881== possibly lost: 136 bytes in 1 blocks. ==19881== still reachable: 590,204 bytes in 685 blocks. ==19881== suppressed: 0 bytes in 0 blocks. ==19881== Reachable blocks (those to which a pointer was found) are not shown. ==19881== To see them, rerun with: --show-reachable=yes --19881-- memcheck: sanity checks: 3 cheap, 1 expensive --19881-- memcheck: auxmaps: 0 auxmap entries (0k, 0M) in use --19881-- memcheck: auxmaps: 0 searches, 0 comparisons --19881-- memcheck: SMs: n_issued = 36 (576k, 0M) --19881-- memcheck: SMs: n_deissued = 0 (0k, 0M) --19881-- memcheck: SMs: max_noaccess = 65535 (1048560k, 1023M) --19881-- memcheck: SMs: max_undefined = 0 (0k, 0M) --19881-- memcheck: SMs: max_defined = 244 (3904k, 3M) --19881-- memcheck: SMs: max_non_DSM = 36 (576k, 0M) --19881-- memcheck: max sec V bit nodes: 115 (5k, 0M) --19881-- memcheck: set_sec_vbits8 calls: 679 (new: 115, updates: 564) --19881-- memcheck: max shadow mem size: 885k, 0M --19881-- translate: fast SP updates identified: 7,064 ( 89.2%) --19881-- translate: generic_known SP updates identified: 543 ( 6.8%) --19881-- translate: generic_unknown SP updates identified: 304 ( 3.8%) --19881-- tt/tc: 13,590 tt lookups requiring 14,331 probes --19881-- tt/tc: 13,590 fast-cache updates, 3 flushes --19881-- transtab: new 6,511 (139,232 -> 2,275,366; ratio 163:10) [0 scs] --19881-- transtab: dumped 0 (0 -> ??) --19881-- transtab: discarded 8 (187 -> ??) --19881-- scheduler: 374,982 jumps (bb entries). --19881-- scheduler: 3/10,454 major/minor sched events. --19881-- sanity: 4 cheap, 1 expensive checks. --19881-- exectx: 30,011 lists, 566 contexts (avg 0 per list) --19881-- exectx: 2,732 searches, 2,171 full compares (794 per 1000) --19881-- exectx: 0 cmp2, 67 cmp4, 0 cmpAll Killed [root@Spring .libs]# I tried the python version and did have some success, but not 100% since I didn't see events for pausing the VM: [root@Spring events-python]# python event-test.py xen:/// Using uri:xen:/// myDomainEventCallback2 EVENT: Domain vm-full-1(1) Started 0 myDomainEventCallback1 EVENT: Domain vm-full-1(1) Started 0 I noticed that the the C version looks in one place for the libvirt socket and the python version in a different place, I don't know if this is significant or not? I tweaked the /etc/libvirt/libvirtd.conf file to alter the location. C: /usr/local/var/run/libvirt python: /var/run/libvirt/ Regards, Pete

2 2

[libvirt] [PATCH] Only use pseudo-random generator for uuid if using /dev/random fails.
by Laine Stump 11 Jan '10

11 Jan '10

The original code. would only print the warning message if using /dev/random failed, but would still go ahead and call virUUIDGeneratePseudoRandomBytes in all cases anyway. --- src/util/uuid.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/uuid.c b/src/util/uuid.c index 002a64d..846581c 100644 --- a/src/util/uuid.c +++ b/src/util/uuid.c @@ -104,9 +104,9 @@ virUUIDGenerate(unsigned char *uuid) VIR_WARN(_("Falling back to pseudorandom UUID," " failed to generate random bytes: %s"), virStrerror(err, ebuf, sizeof ebuf)); + err = virUUIDGeneratePseudoRandomBytes(uuid, VIR_UUID_BUFLEN); } - - return virUUIDGeneratePseudoRandomBytes(uuid, VIR_UUID_BUFLEN); + return err; } /* Convert C from hexadecimal character to integer. */ -- 1.6.6

2 1

[libvirt] LXC: init problem
by Robin Green 11 Jan '10

11 Jan '10

I'm trying to install Exherbo Linux in an LXC container using libvirt. I've basically succeeded, in that I can "virsh console" in and start sshd, but I haven't managed to boot it starting from /sbin/init rather than /bin/bash. If I have the following (I probably should have modified the uuid and the mac address from the standard example, but that's not relevant): <domain type='lxc'> <name>exherbo</name> <uuid>a4047015-171c-ae56-bc1e-57102d4b86bf</uuid> <memory>1000000</memory> <currentMemory>1000000</currentMemory> <vcpu>2</vcpu> <os> <type arch='i686'>exe</type> <init>/sbin/init</init> </os> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> <emulator>/usr/libexec/libvirt_lxc</emulator> <filesystem type='mount'> <source dir='/home/greenrd/exherbo'/> <target dir='/'/> </filesystem> <interface type='network'> <mac address='52:54:00:56:64:42'/> <source network='default'/> <target dev='veth0'/> </interface> <console type='pty'> <target port='0'/> </console> </devices> </domain> and do virsh --connect lxc:/// start exherbo && virsh --connect lxc:/// console exherbo nothing appears - then if I press Enter, the container dies. In pstree all I see that's relevant is: ├─libvirt_lxc───libvirt_lxc so it looks like init dies. If I run init in gdb in the container I just get: Starting program: /sbin/init Usage: init 0123456SsQqAaBbCcUu Program exited with code 01. so I suppose it could be wanting a runlevel as argument. I'm guessing though that /sbin/init is running in a different mode - telinit mode - as its PID is not 1. Is there any way to get an instant console from the virsh start command, so I can see what's going on? -- Robin

1 0

[libvirt] Re: [virt-tools-list] Questions about virt-manager running on Arch of Itanium 64
by Cole Robinson 11 Jan '10

11 Jan '10

cc-ing libvirt-list On 11/19/2009 10:35 PM, Dustin Xiong wrote: > > >>> Hi everyone! >>> I am a newer to the virt-manager and maillist. I sent the mail just want >>> to ask some questions about virt-manager running on Arch of Itanium 64. >>> My itanium 64 cpu actualy support the VT. I compiled the kvm85 >>> successful. Then I can use the binary /usr/local/bin/qemu-system-ia64 to >>> create a vm and running. But in my /proc/cpuinfo , there doesn't have >>> flags such as vmx or svm. So when I use the virt-manager to install a >>> vm, the virt-manager will tell me my cpu doesn't support fully >>> virtualization, then I can't install vm. In fact I can't get understand >>> how the virt-manager find my cpu support the fully virtualization or >>> not.In src, which file implements this. >>> >> >> Just because qemu-kvm works doesn't mean virt is working on your box, since it >> can fall back to full emulation mode. If you are trying to use kvm, is the kvm >> module actually loaded? lsmod | grep kvm > > My kvm mod actually loaded. > > [root@kvm bin]# lsmod | grep kvm > > kvm_intel 306104 4294967281 > > kvm 327544 1 kvm_intel > > > > [root@kvm bin]# modinfo kvm > > filename: /lib/modules/2.6.28.9hzp/extra/kvm.ko > > license: GPL > > author: Qumranet > > version: kvm-85 > > srcversion: C399DD2D9B40BAAC05CD509 > > depends: > > vermagic: 2.6.28.9hzp SMP mod_unload modversions ia64gcc-4.1 > >> If so, libvirt may need to be fixed. What's the output of 'virsh --connect >> qemu:///system capabilities' > > [root@kvm bin]# virsh --connect qemu:///system capabilities > <capabilities> > > <host> > <cpu> > <arch>ia64</arch> > </cpu> > <topology> > <cells num='1'> > <cell id='0'> > <cpus num='16'> > <cpu id='0'/> > <cpu id='1'/> > <cpu id='2'/> > <cpu id='3'/> > <cpu id='4'/> > <cpu id='5'/> > <cpu id='6'/> > <cpu id='7'/> > <cpu id='8'/> > <cpu id='9'/> > <cpu id='10'/> > <cpu id='11'/> > <cpu id='12'/> > <cpu id='13'/> > <cpu id='14'/> > <cpu id='15'/> > </cpus> > </cell> > </cells> > </topology> > </host> > > >>> My cpu is itanium 64, the OS is RHEL.The libvirt is 0.6.3, virt-manager >>> is 0.6.1. Ah, are you using the version of libvirt that comes with RHEL 5.4? That version has been patched to only look for the qemu-kvm binary in one spot: /usr/libexec/qemu-kvm IIRC. You could try to work with that, but since you are already building upstream KVM, virt-manager, and virtinst, might not be a bad idea to pull upstream libvirt as well. >>> Once i tried to compile the virt-manager-0.8.0, but when i make check, >>> it returns: >>> >>> PYTHONPATH=./..:../graphWidgets/.libs python addhardware.py && touch >>> .tstamp.addhardware.py >>> Traceback (mos! t recent call last): >>> File "addhardware.py", line 32, in ? >>> from virtinst import VirtualCharDevice, VirtualDevice, >>> VirtualVideoDevice >>> >>> when i rpm -ivh virt-manager-0.6.1-8.el5.ia64.rpm, it could work. >>> >>> I don't know why this error occur. Can anyone be kind to tell me how? >>> thanks a lot. >>> >> >> You will also need to install the latest version of virtinst, found at: >> >> http://virt-manager.org/download.html > > I downloaded and compiled the latest version of virtinst: virtinst-0.500.0.tar.gz. > then compile the virt-manager-0.8.0, error changed as below: > > [root@kvm virt-manager-0.8.0]# make check > Making check in src > make[1]: Entering directory `/home/dustin/virt-manager/virt-manager-0.8.0/src' > Making check in virtManager > make[2]: Entering directory `/home/dustin/virt-manager/virt-manager-0.8.0/src/virtManager' > make check-local > make[3]: Entering directory `/home/dustin/virt-manager/virt-manager-0.8.0/src/virtManager' > PYTHONPATH=./..:../graphWidgets/.libs python about.py && touch .tstamp.about.py > PYTHONPATH=./..:../graphWidgets/.libs python addhardware.py && touch .tstamp.addhardware.py > Traceback (most recent call last): > File "addhardware.py", line 35, in ? > from virtManager.asyncjob import vmmAsyncJob > File "/home/dustin/virt-manager/virt-manager-0.8.0/src/virtManager/asyncjob.py", line 30, in ? > class vmmAsyncJob(gobject.GObject): > File "/home/dustin/virt-manager/virt-manager-0.8.0/src/virtManager/asyncjob.py", line 40, in vmmAsyncJob > def __init__(self, config, callback, args=None, > NameError: name '_' is not defined > > Thanks for help.If you need any further infos please dont't hesitate to tell me. > Ah, didn't notice the make check in the first mail. 'make check' doesn't work in the virt-manager code base, never taken the time to fix it. You should just be able to 'make && make install', or 'make' and python src/virt-manager.py to run from the source dir. If running virt-manager then throws an error, report here and Ill try to help. - Cole

3 15

Re: [libvirt] Segfault in event-test.c example
by pspreadborough＠comcast.net 11 Jan '10

11 Jan '10

----- "Matthias Bolte" <matthias.bolte(a)googlemail.com> wrote: > 2010/1/10 <pspreadborough(a)comcast.net>: > > > > Hello, > > > > I have been trying to use the domain event C code example but > > unfortunately it segfaults (signal 11) every time I run it: > > > > [root@Spring events-c]# ./event-test > > myEventAddHandleFunc:221: Add handle 5 1 0xf081a0 0x8f727f8 > > myEventAddHandleFunc:221: Add handle 7 1 0xf09990 0x8f727f8 > > myEventAddHandleFunc:221: Add handle 8 1 0xed7940 0x8f727f8 > > myEventAddTimeoutFunc:251: Adding Timeout -1 0xedefa0 0x8f727f8 > > myEventAddHandleFunc:221: Add handle 11 1 0xed7940 0x8f727f8 > > myEventAddTimeoutFunc:251: Adding Timeout -1 0xedefa0 0x8f727f8 > > main:322 :: Registering domain event cbs > > Segmentation fault (core dumped) > > > > Core was generated by > > > `/root/libvirt-0.7.5/examples/domain-events/events-c/.libs/lt-event-test'. > > Program terminated with signal 11, Segmentation fault. > > [New process 21806] > > [New process 21822] > > #0 remoteDomainEventQueueFlush (timer=-1, opaque=0x8f727f8) at > > remote/remote_driver.c:8720 > > 8720 tempQueue.count = priv->domainEvents->count; > > (gdb) bt > > #0 remoteDomainEventQueueFlush (timer=-1, opaque=0x8f727f8) at > > remote/remote_driver.c:8720 > > #1 0x080490d3 in main (argc=Cannot access memory at address 0x1 > > ) at event-test.c:347 > > > > The stack looks corrupted so I'm doubtful that this trace if of much > value. > > I have built > > and installed libvirt-0.7.5 and it and it's tools seem to be > operating > > correctly. > > I tried the event-test with libvirt-0.7.5 and QEMU/Xen and both are > working as expected. No segfaults. > > Could you inspect the values of priv and priv->domainEvents in GDB > using 'p priv' to see if they are NULL and try to dereference them in > GDB using 'p *priv' to see if they point to valid memory areas? > > Yes the backtrace looks corrupted. If there is stack/heap corruption > involved valgrind may reveal it, so try to run the event-test in > valgrind and see if that gives any hints. > > You can also try the GIT version of libvirt. There was a invalid free > call (resulting in heap corruption) in the node device code fixed > after the 0.7.5 release. But that should have no effect on the > event-test. > > Matthias Matthias, priv->domainEvents is NULL, here's the gdb output: (gdb) p *priv $1 = {lock = {lock = {__data = {__lock = 1, __count = 0, __owner = 21806, __kind = 0, __nusers = 1, {__spins = 0, __list = { __next = 0x0}}}, __size = "\001\000\000\000\000\000\000\000.U\000\000\000\000\000\000\001\000\000\000\000\000\000", __align = 1}}, sock = 150469168, watch = 3, pid = 4, uses_tls = 1982791681, is_secure = 1815048801, session = 0x782f6269, type = 0x2f646e65 <Address 0x2f646e65 out of bounds>, counter = 1684956536, localUses = 1668248365, hostname = 0x74656b <Address 0x74656b out of bounds>, debugLog = 0x0, saslconn = 0x0, saslDecoded = 0x0, saslDecodedLength = 0, saslDecodedOffset = 0, saslEncoded = 0x0, saslEncodedLength = 0, saslEncodedOffset = 0, buffer = '\0' <repeats 68 times>, "n\000\000\000\001\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\001\000\000\000\001\000\000\000\000\000\000\000\001\000\000\000\bQ�\b��\030\034�\b\000\000\000\000�\033�\b\001\000\000\000\002\000\000\000�\033�\b\000\000\000\000\025|�\000\a", '\0' <repeats 11 times>, "X\000�\b", '\0' <repeats 12 times>, "\021\000\000\000\002\000\000\000P��\b\000\000\000\000\021", '\0' <repeats 15 times>, "\021\000\000\0008\036�\b\f\000\000\000\020\000\000\000\021\000\000\000\a\000\000\000\b\000\000\000\t\000\000\000\021\000\000\000\002\000\000\000\230\034�\b\000\000\000\000A\000\000\000\003\000\000\000\001\000\000\000\001\000"..., bufferLength = 0, bufferOffset = 0, callbackList = 0x0, domainEvents = 0x0, eventFlushTimer = 0, domainEventDispatching = 1, wakeupSendFD = 0, wakeupReadFD = 0, waitDispatch = 0x0, streams = 0x0} I'll try a run with valgrind and post the results. Pete

2 1

[libvirt] Segfault in event-test.c example
by pspreadborough＠comcast.net 11 Jan '10

11 Jan '10

Hello, I have been trying to use the domain event C code example but unfortunately it segfaults (signal 11) every time I run it: [root@Spring events-c]# ./event-test myEventAddHandleFunc:221: Add handle 5 1 0xf081a0 0x8f727f8 myEventAddHandleFunc:221: Add handle 7 1 0xf09990 0x8f727f8 myEventAddHandleFunc:221: Add handle 8 1 0xed7940 0x8f727f8 myEventAddTimeoutFunc:251: Adding Timeout -1 0xedefa0 0x8f727f8 myEventAddHandleFunc:221: Add handle 11 1 0xed7940 0x8f727f8 myEventAddTimeoutFunc:251: Adding Timeout -1 0xedefa0 0x8f727f8 main:322 :: Registering domain event cbs Segmentation fault (core dumped) Core was generated by `/root/libvirt-0.7.5/examples/domain-events/events-c/.libs/lt-event-test'. Program terminated with signal 11, Segmentation fault. [New process 21806] [New process 21822] #0 remoteDomainEventQueueFlush (timer=-1, opaque=0x8f727f8) at remote/remote_driver.c:8720 8720 tempQueue.count = priv->domainEvents->count; (gdb) bt #0 remoteDomainEventQueueFlush (timer=-1, opaque=0x8f727f8) at remote/remote_driver.c:8720 #1 0x080490d3 in main (argc=Cannot access memory at address 0x1 ) at event-test.c:347 The stack looks corrupted so I'm doubtful that this trace if of much value. I have built and installed libvirt-0.7.5 and it and it's tools seem to be operating correctly. My setup is: Intel(R) Pentium(R) 4 CPU 3.00GHz Linux 2.6.18-164.10.1.el5xen #1 SMP Thu Jan 7 21:14:48 EST 2010 i686 i686 i386 GNU/Linux virsh # version Compiled against library: libvir 0.7.5 Using library: libvir 0.7.5 Using API: Xen 3.0.1 Running hypervisor: Xen 3.4.0 I have a project that requires Domain events so I'd very much like to use this code so any help would be appreciated. Regards, Pete

2 1

[libvirt] [PATCH] avoid another "make distcheck" failure
by Jim Meyering 09 Jan '10

09 Jan '10

"make uninstall" would fail rm: cannot remove `/home/j/w/co/libvirt/libvirt-0.7.5/_inst/share/gtk-doc/html\ /libvirtdevhelp/libvirt.devhelp': No such file or directory rm: cannot remove `/home/j/w/co/libvirt/libvirt-0.7.5/_inst/share/gtk-doc/html\ /libvirtdevhelp/index.html': No such file or directory There are two problems: first, "libvirtdevhelp" is not a valid dir name. Inserting a slash fixes that. Second, that "devhelp/" does not belong at all. It comes from each value of $$f. Using basename fixes that: With this, "make distcheck" passes once again. Pushed. >From 0418fa2e7265d6cf938f2172a0aeb9f9d7a93022 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Sat, 9 Jan 2010 09:56:20 +0100 Subject: [PATCH] avoid another "make distcheck" failure * docs/Makefile.am (uninstall-local): Separate $$f from preceding dir name with a "/" and use $$(basename $$f) rather than $$f, since some values of $$f are prefixed with devhelp/. --- docs/Makefile.am | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index d53f305..c19e963 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -159,4 +159,5 @@ uninstall-local: for h in $(apihtml); do rm $(DESTDIR)$(HTML_DIR)/$$h; done for p in $(apipng); do rm $(DESTDIR)$(HTML_DIR)/$$p; done for f in $(devhelphtml) $(devhelppng) $(devhelpcss); do \ - rm $(DESTDIR)$(DEVHELP_DIR)$$f ; done + rm $(DESTDIR)$(DEVHELP_DIR)/$$(basename $$f); \ + done -- 1.6.6.439.gaf68f

1 0

[libvirt] [PATCH] fix 7 "make check" test failures in non-srcdir build
by Jim Meyering 09 Jan '10

09 Jan '10

FYI, I've already pushed this. When I ran "make distcheck" (or just a non-srcdir "make check"), I'd get 7 failures. These were introduced by a change back in October. >From e6abf3d8f2a60249955c4d59e7b994a99faf8ace Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Sat, 9 Jan 2010 08:37:22 +0100 Subject: [PATCH] fix 7 "make check" test failures in non-srcdir build * tests/capabilityschematest: Define and use $srcdir. * tests/domainschematest: Likewise. * tests/interfaceschematest: Likewise. * tests/networkschematest: Likewise. * tests/nodedevschematest: Likewise. * tests/storagepoolschematest: Likewise. * tests/storagevolschematest: Likewise. --- tests/capabilityschematest | 3 ++- tests/domainschematest | 3 ++- tests/interfaceschematest | 3 ++- tests/networkschematest | 3 ++- tests/nodedevschematest | 3 ++- tests/storagepoolschematest | 3 ++- tests/storagevolschematest | 3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/tests/capabilityschematest b/tests/capabilityschematest index 3a1acc5..482dfe3 100755 --- a/tests/capabilityschematest +++ b/tests/capabilityschematest @@ -1,6 +1,7 @@ #!/bin/sh -. ./schematestutils.sh +: ${srcdir=.} +. $srcdir/schematestutils.sh DIRS="capabilityschemadata xencapsdata" SCHEMA="capability.rng" diff --git a/tests/domainschematest b/tests/domainschematest index 28ee69a..27a93cf 100755 --- a/tests/domainschematest +++ b/tests/domainschematest @@ -1,6 +1,7 @@ #!/bin/sh -. ./schematestutils.sh +: ${srcdir=.} +. $srcdir/schematestutils.sh DIRS="domainschemadata qemuxml2argvdata sexpr2xmldata xmconfigdata xml2sexprdata" SCHEMA="domain.rng" diff --git a/tests/interfaceschematest b/tests/interfaceschematest index e9ec2a4..8e9f6ee 100755 --- a/tests/interfaceschematest +++ b/tests/interfaceschematest @@ -1,6 +1,7 @@ #!/bin/sh -. ./schematestutils.sh +: ${srcdir=.} +. $srcdir/schematestutils.sh DIRS="interfaceschemadata" SCHEMA="interface.rng" diff --git a/tests/networkschematest b/tests/networkschematest index 01b2e6f..7210055 100755 --- a/tests/networkschematest +++ b/tests/networkschematest @@ -1,6 +1,7 @@ #!/bin/sh -. ./schematestutils.sh +: ${srcdir=.} +. $srcdir/schematestutils.sh DIRS="../src/network networkxml2xmlin networkxml2xmlout" SCHEMA="network.rng" diff --git a/tests/nodedevschematest b/tests/nodedevschematest index 2f0e2b9..3f0f03f 100755 --- a/tests/nodedevschematest +++ b/tests/nodedevschematest @@ -1,6 +1,7 @@ #!/bin/sh -. ./schematestutils.sh +: ${srcdir=.} +. $srcdir/schematestutils.sh DIRS="nodedevschemadata" SCHEMA="nodedev.rng" diff --git a/tests/storagepoolschematest b/tests/storagepoolschematest index 57b2f7b..9aef382 100755 --- a/tests/storagepoolschematest +++ b/tests/storagepoolschematest @@ -1,6 +1,7 @@ #!/bin/sh -. ./schematestutils.sh +: ${srcdir=.} +. $srcdir/schematestutils.sh DIRS="storagepoolxml2xmlin storagepoolxml2xmlout" SCHEMA="storagepool.rng" diff --git a/tests/storagevolschematest b/tests/storagevolschematest index 32a8657..74b6203 100755 --- a/tests/storagevolschematest +++ b/tests/storagevolschematest @@ -1,6 +1,7 @@ #!/bin/sh -. ./schematestutils.sh +: ${srcdir=.} +. $srcdir/schematestutils.sh DIRS="storagevolxml2xmlin storagevolxml2xmlout" SCHEMA="storagevol.rng" -- 1.6.6.439.gaf68f

1 0

[libvirt] [PATCH] avoid newly-introduced test failure
by Jim Meyering 09 Jan '10

09 Jan '10

I ran "make check" and was surprised to see a failure: 10) QEMU XML-2-ARGV hugepages ... FAILED ... FAIL: qemuxml2argvtest Introduced just a couple days ago. Here's the fix: >From a4e9edbd77f428782293b9672098b6d3c80b2879 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Sat, 9 Jan 2010 09:25:04 +0100 Subject: [PATCH] avoid newly-introduced test failure * tests/qemuxml2argvdata/qemuxml2argv-hugepages.args: Update expected output to match, now that we use -mem-prealloc. --- tests/qemuxml2argvdata/qemuxml2argv-hugepages.args | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args index f10a40e..1e2632a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args @@ -1 +1 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -mem-path /dev/hugepages/libvirt/qemu -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -mem-prealloc -mem-path /dev/hugepages/libvirt/qemu -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -- 1.6.6.439.gaf68f In case you can't read the above, note that all the change does is to insert "-mem-prealloc " before "-mem-path" I'm about to push this, now.

1 0

[libvirt] Some questions about the libvirt ESX driver
by Richard W.M. Jones 09 Jan '10

09 Jan '10

I'm playing with VMWare ESX 4.0 and I decided to try driving it from libvirt [git version]. Here are some random questions and issues I encountered, in no particular order. Listing domains works fine, but: (a) I have to specify ?no_verify=1 to get it to ignore the lack of valid https certificate. Is there some documentation on how to set up certificates correctly? [vSphere gives exactly the same error] (b) I have to type the root password (of the ESX server) each time. Can I avoid that? $ sudo ./tools/virsh -c 'esx://192.168.2.121/?no_verify=1' list --all Enter username for 192.168.2.121 [root]: Enter root password for 192.168.2.121: Id Name State ---------------------------------- - TestLinux shut off - TestWin shut off (c) Starting domains doesn't seem to work, and the error message is obscure: $ sudo ./tools/virsh -c 'esx://192.168.2.121/?no_verify=1' start TestLinux Enter username for 192.168.2.121 [root]: Enter root password for 192.168.2.121: error: Failed to start domain TestLinux error: internal error HTTP response code 500 for call to 'PowerOnVM_Task'. Fault: ServerFaultCode - The operation is not allowed in the current state. Is this to do with the "ask questions" API that was discussed on this list before? Specifying auto_answer=0 or auto_answer=1 didn't make any difference. (d) dumpxml XML output looks very good, and consistent with the other drivers. However it produces an odd <source file> attribute: <disk type='file' device='disk'> <driver name='lsilogic'/> <source file='[Storage1] TestLinux/TestLinux.vmdk'/> <target dev='sda' bus='scsi'/> </disk> <disk type='file' device='cdrom'> <source file='[Storage1] Fedora-12-x86_64-Live.iso'/> <target dev='hdc' bus='ide'/> </disk> (e) pool-list, net-list are not supported by the driver. That's a particular problem for me because I was really hoping to use the storage APIs from libvirt to access the VMDK files that contain domains (eg. [Storage1] TestLinux/TestLinux.vmdk in the example above). Is support for storage (particularly) and/or networks on the horizon for this driver? Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://et.redhat.com/~rjones/virt-top

4 5

[libvirt] [PATCH] esx: Warn if the ESX server is in maintenance mode
by Matthias Bolte 09 Jan '10

09 Jan '10

--- src/esx/esx_driver.c | 38 +++++++++++++++++++++++++++----------- 1 files changed, 27 insertions(+), 11 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index f86654a..ddda66e 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -401,6 +401,32 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) } } + /* Query the host for maintenance mode and vCenter IP address */ + if (esxVI_String_AppendValueListToList(conn, &propertyNameList, + "runtime.inMaintenanceMode\0" + "summary.managementServerIp\0") < 0 || + esxVI_LookupHostSystemByIp(conn, priv->host, hostIpAddress, + propertyNameList, &hostSystem) < 0) { + goto failure; + } + + /* Warn if host is in maintenance mode */ + for (dynamicProperty = hostSystem->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "runtime.inMaintenanceMode")) { + if (esxVI_AnyType_ExpectType(conn, dynamicProperty->val, + esxVI_Type_Boolean) < 0) { + goto failure; + } + + if (dynamicProperty->val->boolean == esxVI_Boolean_True) { + VIR_WARN0("The server is in maintenance mode"); + } + + break; + } + } + /* Login to vCenter */ if (vCenter != NULL) { VIR_FREE(url); @@ -415,17 +441,9 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) } /* Lookup the vCenter from the ESX host */ - if (esxVI_String_AppendValueToList - (conn, &propertyNameList, "summary.managementServerIp") < 0 || - esxVI_LookupHostSystemByIp(conn, priv->host, hostIpAddress, - propertyNameList, &hostSystem) < 0) { - goto failure; - } - for (dynamicProperty = hostSystem->propSet; dynamicProperty != NULL; dynamicProperty = dynamicProperty->_next) { - if (STREQ(dynamicProperty->name, - "summary.managementServerIp")) { + if (STREQ(dynamicProperty->name, "summary.managementServerIp")) { if (esxVI_AnyType_ExpectType(conn, dynamicProperty->val, esxVI_Type_String) < 0) { goto failure; @@ -461,8 +479,6 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) } break; - } else { - VIR_WARN("Unexpected '%s' property", dynamicProperty->name); } } -- 1.6.0.4

2 2

[libvirt] RFC: Create a separate libvirt users mailing list ?
by Daniel P. Berrange 09 Jan '10

09 Jan '10

Hi Folks, We've been brainstorming ways to improve/broaden the libvirt community and one (of many) ideas is to create a separate libvirt users mailing list. The rationale is that this list is 95% patch submission from developers, often very high traffic and thus it may not be appealing for ordinary users to subscribe just to ask a question about libvirt usage. Although there is the virt-tools mailing list, that is really focused on the virt-manager family of apps, not a general purpose libvirt users community. Thus we're considering creating a new list libvirt-users(a)redhat.com To serve as a home for discussions relating to - Administrators/users of libvirt / libvirtd / virsh - Developers building applications on top of libvirt - Anyone else wishing to ask/talk about libvirt architecture / concepts / etc in real world deployment While the current list libvir-list(a)redhat.com To serve as continued home for most current traffic, specifically - Development of libvirt itself (libvirtd, hypervisor drivers, etc) - Development of libvirt language bindings (perl, python, java, etc) - Patch submission for libvirt & language bindings Essentially all libvirt code patches would be on libvir-list, while libvirt-users would be for app developer / end user admin discussions. For this to work of course, a significant number developers of libvirt currently on this list would also have to join libvirt-users, so we have people on the new list who are able to answer questions :-) Before we create a new list we'd like to hear from people on this list as to wether they think this would be beneficial. In particular we'd like your opinion if you are someone who's likely to switch to be exclusively on the libvirt-users list. Regards, Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

5 4

Re: [libvirt] pci-stub error and MSI-X for KVM guest
by Chris Wright 09 Jan '10

09 Jan '10

* Fischer, Anna (anna.fischer(a)hp.com) wrote: > So, when setting a breakpoint for the exit() call I'm getting a bit closer to figuring where it kills my guest. Thanks, this helps clarify what is happening. > Breakpoint 1, exit (status=1) at exit.c:99 > 99 { > Current language: auto > The current source language is "auto; currently c". > (gdb) bt > #0 exit (status=1) at exit.c:99 > #1 0x0000000000470c6e in assigned_dev_pci_read_config (d=0x259c6f0, address=64, len=4) assigned_dev_pci_read_config(..., 64, 4) ^^ This is a libvirt issue. When you use virt-manager it has libvirtd fork/exec qemu-kvm. libvirtd will drop privileges and run qemu-kvm as user qemu (or perhaps root if you've edited qemu.conf). Regardless of the user, it clears capabilities. Reading PCI config space beyond just the header requires CAP_SYS_ADMIN. The above is reading the first 4 bytes of device dependent config space, and the kernel is returning 0 because qemu doesn't have CAP_SYS_ADMIN. Basically, this means that device assignment w/ libvirt will break MSI/MSI-X because qemu will never be able to see that the host device has those PCI capabilities. This, in turn, renders VF device assignment useless (since a VF is required to support MSI and/or MSI-X). Granting CAP_SYS_ADMIN for each qemu instance that does device assignment would render the privilege reduction useless (CAP_SYS_ADMIN is the kitchen sink catchall of the Linux capability system). Hmmph...

2 2

[libvirt] [PATCH] esx: Dump the raw response in case of an SOAP fault
by Matthias Bolte 09 Jan '10

09 Jan '10

Currently only the faultcode and faultstring are deserialized, the detail part is ignored. The implementation of many new SOAP types would be necessary to deserialize the detail part correctly. As an intermediate solution the raw response is dumped to the debug log. --- src/esx/esx_vi.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index bad987c..9cade3d 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -692,6 +692,12 @@ esxVI_Context_Execute(virConnectPtr conn, esxVI_Context *ctx, "HTTP response code %d for call to '%s'. " "Fault: %s - %s", (*response)->responseCode, methodName, fault->faultcode, fault->faultstring); + + /* FIXME: Dump raw response until detail part gets deserialized */ + VIR_DEBUG("HTTP response code %d for call to '%s' [[[[%s]]]]", + (*response)->responseCode, methodName, + (*response)->content); + goto failure; } else { if (virAsprintf(&xpathExpression, -- 1.6.0.4

2 1

[libvirt] [PATCH] Replace old CVS references with GIT
by Matthias Bolte 09 Jan '10

09 Jan '10

--- HACKING | 6 +++--- docs/FAQ.html.in | 2 +- docs/bugs.html.in | 6 +++--- docs/contact.html.in | 4 ++-- docs/deployment.html.in | 4 ++-- docs/hacking.html.in | 6 +++--- src/Makefile.am | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/HACKING b/HACKING index 3fb1113..0c65dad 100644 --- a/HACKING +++ b/HACKING @@ -15,14 +15,14 @@ should work: or: - cvs diff -up > libvirt-myfeature.patch + git diff > libvirt-myfeature.patch (3) Split large changes into a series of smaller patches, self-contained if possible, with an explanation of each patch and an explanation of how the sequence of patches fits together. -(4) Make sure your patches apply against libvirt CVS. Developers -only follow CVS and don't care much about released versions. +(4) Make sure your patches apply against libvirt GIT. Developers +only follow GIT and don't care much about released versions. (5) Run the automated tests on your code before submitting any changes. In particular, configure with compile warnings set to -Werror: diff --git a/docs/FAQ.html.in b/docs/FAQ.html.in index a436e78..50f798d 100644 --- a/docs/FAQ.html.in +++ b/docs/FAQ.html.in @@ -119,7 +119,7 @@ packages as well as the public headers to compile against libxenstore.</p> </li> <li> - <em>I use the CVS version and there is no configure script</em> + <em>I use the GIT version and there is no configure script</em> <p>The configure script (and other Makefiles) are generated. Use the autogen.sh script to regenerate the configure script and Makefiles, like:</p> diff --git a/docs/bugs.html.in b/docs/bugs.html.in index 380bcff..fa557a8 100644 --- a/docs/bugs.html.in +++ b/docs/bugs.html.in @@ -16,7 +16,7 @@ <p> If you are using official libvirt binaries from a Linux distribution check below for distribution specific bug reporting policies first. - For general libvirt bug reports, from self-built releases, CVS snapshots + For general libvirt bug reports, from self-built releases, GIT snapshots and any other non-distribution supported builds, enter tickets under the <code>Virtualization Tools</code> product and the <code>libvirt</code> component. @@ -64,8 +64,8 @@ </p> <ul> - <li>The version number of the libvirt build, or date of the CVS - checkout</li> + <li>The version number of the libvirt build, or SHA1 of the GIT + commit</li> <li>The hardware architecture being used</li> <li>The name of the hypervisor (Xen, QEMU, KVM)</li> <li>The XML config of the guest domain if relevant</li> diff --git a/docs/contact.html.in b/docs/contact.html.in index 4b9f532..5d055b1 100644 --- a/docs/contact.html.in +++ b/docs/contact.html.in @@ -12,8 +12,8 @@ <a href="https://www.redhat.com/mailman/listinfo/libvir-list">associated Web</a> page and follow the instructions. Patches with explanations and provided as attachments are really appreciated and will be discussed on the mailing list. - If possible generate the patches by using <code>cvs diff -up</code> in a CVS - checkout. + If possible generate the patches by using <code>git diff</code> in a GIT + clone. </p> <h2>IRC discussion</h2> diff --git a/docs/deployment.html.in b/docs/deployment.html.in index 47c4892..94c480f 100644 --- a/docs/deployment.html.in +++ b/docs/deployment.html.in @@ -25,10 +25,10 @@ # make install </pre> - <h2>Built from CVS / GIT</h2> + <h2>Built from GIT</h2> <p> - When building from CVS it is necessary to generate the autotools + When building from GIT it is necessary to generate the autotools support files. This requires having <code>autoconf</code>, <code>automake</code>, <code>libtool</code> and <code>intltool</code> installed. The process can be automated with the <code>autogen.sh</code> diff --git a/docs/hacking.html.in b/docs/hacking.html.in index af63411..43a79f7 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -19,13 +19,13 @@ or: </p> <pre> - cvs diff -up > libvirt-myfeature.patch + git diff > libvirt-myfeature.patch </pre></li> <li>Split large changes into a series of smaller patches, self-contained if possible, with an explanation of each patch and an explanation of how the sequence of patches fits together.</li> - <li>Make sure your patches apply against libvirt CVS. Developers - only follow CVS and don't care much about released versions.</li> + <li>Make sure your patches apply against libvirt GIT. Developers + only follow GIT and don't care much about released versions.</li> <li><p>Run the automated tests on your code before submitting any changes. In particular, configure with compile warnings set to -Werror:</p> <pre> diff --git a/src/Makefile.am b/src/Makefile.am index 8ef0e81..dbf708b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -367,7 +367,7 @@ if HAVE_RPCGEN # Maintainer-only target for re-generating the derived .c/.h source # files, which are actually derived from the .x file. # -# For committing protocol changes to CVS, the GLIBC rpcgen *must* +# For committing protocol changes to GIT, the GLIBC rpcgen *must* # be used. # # Support for non-GLIB rpcgen is here as a convenience for -- 1.6.0.4

2 2

[libvirt] [PATCH] don't test "res == NULL" after we've already dereferenced it
by Jim Meyering 08 Jan '10

08 Jan '10

As the log says, once we've dereferenced it, there's no point in comparing to NULL. >From 463eaf1027a154e71839a67eca85b3ada8b817ff Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Wed, 6 Jan 2010 12:45:07 +0100 Subject: [PATCH] don't test "res == NULL" after we've already dereferenced it * src/xen/proxy_internal.c (xenProxyCommand): It is known to be non-NULL at that point, so remove the "ret == NULL" guard, and instead add an assert(ret != NULL), in case future code changes cause the condition to becomes false. Include <assert.h>. --- src/xen/proxy_internal.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/xen/proxy_internal.c b/src/xen/proxy_internal.c index ec4522b..42b6e91 100644 --- a/src/xen/proxy_internal.c +++ b/src/xen/proxy_internal.c @@ -1,7 +1,7 @@ /* * proxy_client.c: client side of the communication with the libvirt proxy. * - * Copyright (C) 2006, 2008, 2009 Red Hat, Inc. + * Copyright (C) 2006, 2008, 2009, 2010 Red Hat, Inc. * * See COPYING.LIB for the License of this software * @@ -11,6 +11,7 @@ #include <config.h> #include <stdio.h> +#include <assert.h> #include <stdlib.h> #include <unistd.h> #include <errno.h> @@ -444,7 +445,8 @@ retry: /* * do more checks on the incoming packet. */ - if ((res == NULL) || (res->version != PROXY_PROTO_VERSION) || + assert (res != NULL); + if ((res->version != PROXY_PROTO_VERSION) || (res->len < sizeof(virProxyPacket))) { virProxyError(conn, VIR_ERR_INTERNAL_ERROR, "%s", _("Communication error with proxy: malformed packet\n")); -- 1.6.6.387.g2649b1

3 9

[libvirt] [PATCH] let "configure --disable-shared" work once again
by Jim Meyering 08 Jan '10

08 Jan '10

Per this thread: http://thread.gmane.org/gmane.comp.emulators.libvirt/19672 here's a patch that solves both problems: >From 1b330b3070f904dfc1c380151afa3aaf2a121cd3 Mon Sep 17 00:00:00 2001 From: Jim Meyering <jim(a)meyering.net> Date: Thu, 7 Jan 2010 21:07:42 +0100 Subject: [PATCH] let "configure --disable-shared" work once again Without this change, ./autogen.sh --disable-shared && make would evoke a "can not build a shared library" failure for libvirtmod.la. However, without the -shared link option in python/Makefile.am, it was possible to install non-functional python support. Instead, make --disable-shared also disable building python. * configure.ac: Make --disable-shared imply --without-python and silently override --with-python. * python/Makefile.am (libvirtmod_la_LDFLAGS): Do not use -shared. This reverts 8838ee39ab1c2bb7fffe93bfda220692664e8be6. --- configure.in | 4 ++++ python/Makefile.am | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/configure.in b/configure.in index 3f2f8ff..3e98035 100644 --- a/configure.in +++ b/configure.in @@ -1813,6 +1813,10 @@ AC_ARG_WITH([qemu-group], AC_DEFINE_UNQUOTED([QEMU_USER], ["$QEMU_USER"], [QEMU user account]) AC_DEFINE_UNQUOTED([QEMU_GROUP], ["$QEMU_GROUP"], [QEMU group account]) +if test "$enable_shared:$with_python" = no:yes; then + AC_MSG_WARN([you've used --disable-shared; so disabling python support]) + with_python=no +fi # Only COPYING.LIB is under version control, yet COPYING # is included as part of the distribution tarball. diff --git a/python/Makefile.am b/python/Makefile.am index 58c6729..04342b7 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -39,7 +39,7 @@ libvirtmod_la_SOURCES = libvirt-override.c typewrappers.c libvirt.c libvirt.h # need extra flags here libvirtmod_la_CFLAGS = @WARN_PYTHON_CFLAGS@ -libvirtmod_la_LDFLAGS = -module -avoid-version -shared -L$(top_builddir)/src/.libs \ +libvirtmod_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/.libs \ @CYGWIN_EXTRA_LDFLAGS@ libvirtmod_la_LIBADD = $(mylibs) \ @CYGWIN_EXTRA_LIBADD@ @CYGWIN_EXTRA_PYTHON_LIBADD@ -- 1.6.6.425.g4dc2d

3 9

[libvirt] [PATCH] Disallow building Python bindings if shared libraries are disabled.
by Diego Elio Pettenò 08 Jan '10

08 Jan '10

Patch concept by Jim Meyering <jim(a)meyering.net>, moved before the Python testing, and changed the message a bit to explain the problem. --- configure.in | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/configure.in b/configure.in index 3f2f8ff..5275412 100644 --- a/configure.in +++ b/configure.in @@ -1466,6 +1466,11 @@ dnl AC_ARG_WITH([python], [ --with-python Build python bindings (on)],[],[with_python=yes]) +if test "$enable_shared:$with_python" = no:yes; then + AC_MSG_WARN([Disabling shared libraries is incompatible with building Python extensions.]) + with_python=no +fi + PYTHON_VERSION= PYTHON_INCLUDES= if test "$with_python" != "no" ; then -- 1.6.6

2 1

[libvirt] fix build failure with --disable-shared
by Jim Meyering 08 Jan '10

08 Jan '10

Laine Stump noticed a failure to build with --disable-shared and found that removing the unconditional "-shared" option in python/Makefile.am would fix it. The change below reverts 8838ee39ab1c2bb7fffe93bfda220692664e8be6, so Diego, if your goal (with the reverted change) was more than to avoid seemingly-unnecessary work, please tell us what it was. >From 1de9c4a9a4175c9f1eb9302ad7fa9867e8a242a4 Mon Sep 17 00:00:00 2001 From: Laine Stump <laine(a)laine.org> Date: Thu, 7 Jan 2010 21:07:42 +0100 Subject: [PATCH] let "configure --disable-shared" work once again Without this change, ./autogen.sh --disable-shared && make would evoke a "can not build a shared library" failure for libvirtmod.la. * python/Makefile.am (libvirtmod_la_LDFLAGS): Do not use -shared. --- python/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/python/Makefile.am b/python/Makefile.am index 58c6729..04342b7 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -39,7 +39,7 @@ libvirtmod_la_SOURCES = libvirt-override.c typewrappers.c libvirt.c libvirt.h # need extra flags here libvirtmod_la_CFLAGS = @WARN_PYTHON_CFLAGS@ -libvirtmod_la_LDFLAGS = -module -avoid-version -shared -L$(top_builddir)/src/.libs \ +libvirtmod_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/.libs \ @CYGWIN_EXTRA_LDFLAGS@ libvirtmod_la_LIBADD = $(mylibs) \ @CYGWIN_EXTRA_LIBADD@ @CYGWIN_EXTRA_PYTHON_LIBADD@ -- 1.6.6.425.g4dc2d

4 12

[libvirt] [PATCH] Qemu: ask for memory preallocation with large pages
by Daniel Veillard 08 Jan '10

08 Jan '10

The -mem-prealloc flag should be used when using large pages This ensures qemu tries to allocate all required memory immediately, rather than when first used. The latter mode will crash qemu if hugepages aren't available when accessed, while the former should gracefully fallback to non-hugepages. * src/qemu/qemu_conf.c: add -mem-prealloc flag to qemu command line when using large pages Daniel diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 824055f..d3da776 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -2108,6 +2108,7 @@ int qemudBuildCommandLine(virConnectPtr conn, def->emulator); goto error; } + ADD_ARG_LIT("-mem-prealloc"); ADD_ARG_LIT("-mem-path"); ADD_ARG_LIT(driver->hugepage_path); } -- 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 2

[libvirt] DNAT, bridge, iptables and network
by Mihamina Rakotomandimby 08 Jan '10

08 Jan '10

Manao ahoana, Hello, Bonjour, My server has 3 public IPs: IP1, IP2, IP3. I intend to create 3 bridges: virbr1, virbr2, virbr3. Each bridge will NAT from 3 to 5 KVM guests. About IP1: I would like incoming connexion on IP1 to: - IP1:80 to be DNAT'd to one virbr1 VM, specialized on HTTP - IP1:3306 to be DNAT'd to another virbr1 VM, specialized on MySQL - IP1:53 to be DNAT'd to another virbr1 VM, specialized on DNS Same about IP2 and IP3. Should I assign a public IP address to each brdige? I think "no" because there will be a problem of network segment: --> What range will I give to the guests? I think my only solution is to give private IPs (192.168.X.X) to the brigdes (3 separate subnets), and use iptables with something like: iptables -t nat -A PREROUTING -p tcp -m tcp -d $IP1 --dport 80 \ -j DNAT --to-destination $VIRBR1_HTTP_GUEST iptables -t nat -A PREROUTING -p tcp -m tcp -d $IP1 --dport 3306 \ -j DNAT --to-destination $VIRBR1_MySQL_GUEST iptables -t nat -A PREROUTING -p udp -d $IP1 --dport 53 \ -j DNAT --to-destination $VIRBR1_DNS_GUEST Should be alright? More informations: I use Ubuntu 9.10 Misaotra, Thanks, Merci. -- Architecte Informatique chez Blueline/Gulfsat: Administration Systeme, Recherche & Developpement +261 34 29 155 34 / +261 33 11 207 36

1 0

[libvirt] [Patch v0.5] iSCSI Multi-IQN (Libvirt Support)
by Shyam Iyer 08 Jan '10

08 Jan '10

This patch set realizes the multi-IQN concept discussed in an earlier thread http://www.mail-archive.com/libvir-list@redhat.com/msg16706.html And here .. http://www.mail-archive.com/libvir-list@redhat.com/msg17499.html The patch realizes an XML schema like the one below and allows libvirt to read through it to create storage pools. These XMLs when created using a virtualization manager realize unique VM to storage LUN mappings through a single console and thus opening up possibilities for the following scenarios - * possibility of multiple IQNs for a single Guest * option for hypervisor's initiator to use these IQNs on behalf of the guest Change Log from v0.4: 1) Set default tab space to 4(Hopefully this is corrected this time ;) ) 2) Review comments from Dave Allan a) Use output of "iscsiadm -m iface" to search for existing iqn names in the iface files. 3) Create new unique iface file names for user provided iqn names if the iqns are not present in the existing iface files. Change Log from v0.3: 1) Set default tab space to 4 2) Use Case Description for Commit Log 3) Review comments from Dave Allan a) No initiator iqn in the xml would mean use of the default initiator iqn name b) Initiator iqn provided would mean a unique session to be created using the provided iqn name. c) Single iSCSI session per pool 4) Added syntax in doc/schemas/storagepool.rng There are no new errors introduced by this patch with "make check" and "make syntax-check" tests. Signed-off-by: Sudhir Bellad <sudhir_bellad(a)dell.com> Signed-off-by: Shyam Iyer <shyam_iyer(a)dell.com>

2 1

[libvirt] [PATCH] [RFC] xen domctl version 6
by Jim Fehlig 08 Jan '10

08 Jan '10

xen-unstable c/s 20685 changed the domctl interface, adding a field to xen_domctl_getdomaininfo structure. This additional field causes stack corruption in libvirt. xen-unstable c/s 20711 rightly bumped the domctl interface version so it is at least possible to handle the new field. The attached patch accounts for shr_pages field added to xen_domctl_getdomaininfo structure. I'm not thrilled about the changes to all the macros - suggestions for improvement welcomed. Tested with domctl version 5 and 6. Regards, Jim

2 3

[libvirt] [PATCH] network/bridge_driver.c: avoid potential NULL-dereference
by Jim Meyering 07 Jan '10

07 Jan '10

obvious typo: >From 6f0810192dc6d9b223f2f973812fd787f398576c Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 5 Jan 2010 15:48:42 +0100 Subject: [PATCH] network/bridge_driver.c: avoid potential NULL-dereference * src/network/bridge_driver.c (networkBuildDnsmasqArgv): Correct test for NULL *argv. --- src/network/bridge_driver.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index abee78c..69809b3 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1,7 +1,7 @@ /* * driver.c: core driver methods for managing qemu guests * - * Copyright (C) 2006-2009 Red Hat, Inc. + * Copyright (C) 2006-2010 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -513,7 +513,7 @@ networkBuildDnsmasqArgv(virConnectPtr conn, return 0; no_memory: - if (argv) { + if (*argv) { for (i = 0; (*argv)[i]; i++) VIR_FREE((*argv)[i]); VIR_FREE(*argv); -- 1.6.6.384.g14e6a

2 2

[libvirt] About VirtualBox and Libvirt
by Prashant Wakchaure 07 Jan '10

07 Jan '10

Is anybody know how to connect libvirt to VirtualBox remotely???? -- Thanks & Regards, Prashant Wakchaure

2 1

[libvirt] libvirt 0.7.5 vs qemu 0.12.1 imcompatability?
by Tom Hughes 07 Jan '10

07 Jan '10

The update from qemu 0.11.0 to qemu 0.12.1 in the virt-preview repository seems to have broken things. Starting a VM now just gives me a blank screen and a log which says: Option 'ipv4': Use 'on' or 'off' Failed to parse "yes" for "dummy.ipv4" I assume libvirt is sending a it a command on the monitor interface that it no longer understands... Tom -- Tom Hughes (tom(a)compton.nu) http://www.compton.nu/

4 7

[libvirt] [PATCH] Fix free of invalid pointer in node_device_driver
by Jim Fehlig 07 Jan '10

07 Jan '10

If device does not have a driver, an uninitialized pointer was being free()'d in node_device_driver. Here's a small patch to fix it. Regards, Jim

2 2

[libvirt] [PATCH] virsh: Use VIR_FREE instead of free
by Matthias Bolte 07 Jan '10

07 Jan '10

virsh uses other parts of the internal API already, so use VIR_FREE also. --- tools/virsh.c | 297 ++++++++++++++++++++++++++++----------------------------- 1 files changed, 146 insertions(+), 151 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index e2a32b4..2844927 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -46,6 +46,7 @@ #include "buf.h" #include "console.h" #include "util.h" +#include "memory.h" static char *progname; @@ -481,7 +482,7 @@ cmdConnect(vshControl *ctl, const vshCmd *cmd) ctl->conn = NULL; } - free(ctl->name); + VIR_FREE(ctl->name); ctl->name = vshStrdup(ctl, vshCommandOptString(cmd, "name", NULL)); if (!ro) { @@ -560,7 +561,7 @@ cmdRunConsole(vshControl *ctl, virDomainPtr dom) xml = xmlReadDoc((const xmlChar *) doc, "domain.xml", NULL, XML_PARSE_NOENT | XML_PARSE_NONET | XML_PARSE_NOWARNING); - free(doc); + VIR_FREE(doc); if (!xml) goto cleanup; ctxt = xmlXPathNewContext(xml); @@ -583,8 +584,8 @@ cmdRunConsole(vshControl *ctl, virDomainPtr dom) xmlXPathFreeContext(ctxt); if (xml) xmlFreeDoc(xml); - free(thisHost); - free(thatHost); + VIR_FREE(thisHost); + VIR_FREE(thatHost); return ret; } @@ -651,7 +652,7 @@ cmdList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) if ((maxid = virConnectListDomains(ctl->conn, &ids[0], maxid)) < 0) { vshError(ctl, "%s", _("Failed to list active domains")); - free(ids); + VIR_FREE(ids); return FALSE; } @@ -662,7 +663,7 @@ cmdList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) maxname = virConnectNumOfDefinedDomains(ctl->conn); if (maxname < 0) { vshError(ctl, "%s", _("Failed to list inactive domains")); - free(ids); + VIR_FREE(ids); return FALSE; } if (maxname) { @@ -670,8 +671,8 @@ cmdList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) if ((maxname = virConnectListDefinedDomains(ctl->conn, names, maxname)) < 0) { vshError(ctl, "%s", _("Failed to list inactive domains")); - free(ids); - free(names); + VIR_FREE(ids); + VIR_FREE(names); return FALSE; } @@ -708,7 +709,7 @@ cmdList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) /* this kind of work with domains is not atomic operation */ if (!dom) { - free(names[i]); + VIR_FREE(names[i]); continue; } @@ -720,10 +721,10 @@ cmdList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) vshPrint(ctl, "%3s %-20s %s\n", "-", names[i], state); virDomainFree(dom); - free(names[i]); + VIR_FREE(names[i]); } - free(ids); - free(names); + VIR_FREE(ids); + VIR_FREE(names); return TRUE; } @@ -1019,7 +1020,7 @@ cmdCreate(vshControl *ctl, const vshCmd *cmd) return FALSE; dom = virDomainCreateXML(ctl->conn, buffer, 0); - free (buffer); + VIR_FREE(buffer); if (dom != NULL) { vshPrint(ctl, _("Domain %s created from %s\n"), @@ -1070,7 +1071,7 @@ cmdDefine(vshControl *ctl, const vshCmd *cmd) return FALSE; dom = virDomainDefineXML(ctl->conn, buffer); - free (buffer); + VIR_FREE(buffer); if (dom != NULL) { vshPrint(ctl, _("Domain %s defined from %s\n"), @@ -1371,7 +1372,7 @@ cmdSchedinfo(vshControl *ctl, const vshCmd *cmd) if (schedulertype!= NULL){ vshPrint(ctl, "%-15s: %s\n", _("Scheduler"), schedulertype); - free(schedulertype); + VIR_FREE(schedulertype); } else { vshPrint(ctl, "%-15s: %s\n", _("Scheduler"), _("Unknown")); goto cleanup; @@ -1436,7 +1437,7 @@ cmdSchedinfo(vshControl *ctl, const vshCmd *cmd) } cleanup: - free(params); + VIR_FREE(params); virDomainFree(dom); return ret_val; } @@ -1724,7 +1725,7 @@ cmdDominfo(vshControl *ctl, const vshCmd *cmd) if ((str = virDomainGetOSType(dom))) { vshPrint(ctl, "%-15s %s\n", _("OS Type:"), str); - free(str); + VIR_FREE(str); } if (virDomainGetInfo(dom, &info) == 0) { @@ -1912,8 +1913,8 @@ cmdVcpuinfo(vshControl *ctl, const vshCmd *cmd) ret = FALSE; } - free(cpumap); - free(cpuinfo); + VIR_FREE(cpumap); + VIR_FREE(cpuinfo); virDomainFree(dom); return ret; } @@ -2037,7 +2038,7 @@ cmdVcpupin(vshControl *ctl, const vshCmd *cmd) VIR_USE_CPU(cpumap, cpu); } else { vshError(ctl, _("Physical CPU %d doesn't exist."), cpu); - free(cpumap); + VIR_FREE(cpumap); virDomainFree(dom); return FALSE; } @@ -2050,7 +2051,7 @@ cmdVcpupin(vshControl *ctl, const vshCmd *cmd) ret = FALSE; } - free(cpumap); + VIR_FREE(cpumap); virDomainFree(dom); return ret; } @@ -2281,7 +2282,7 @@ cmdCapabilities (vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) return FALSE; } vshPrint (ctl, "%s\n", caps); - free (caps); + VIR_FREE(caps); return TRUE; } @@ -2326,7 +2327,7 @@ cmdDumpXML(vshControl *ctl, const vshCmd *cmd) dump = virDomainGetXMLDesc(dom, flags); if (dump != NULL) { printf("%s", dump); - free(dump); + VIR_FREE(dump); } else { ret = FALSE; } @@ -2373,7 +2374,7 @@ cmdDomXMLFromNative(vshControl *ctl, const vshCmd *cmd) xmlData = virConnectDomainXMLFromNative(ctl->conn, format, configData, flags); if (xmlData != NULL) { printf("%s", xmlData); - free(xmlData); + VIR_FREE(xmlData); } else { ret = FALSE; } @@ -2419,7 +2420,7 @@ cmdDomXMLToNative(vshControl *ctl, const vshCmd *cmd) configData = virConnectDomainXMLToNative(ctl->conn, format, xmlData, flags); if (configData != NULL) { printf("%s", configData); - free(configData); + VIR_FREE(configData); } else { ret = FALSE; } @@ -2707,7 +2708,7 @@ cmdNetworkCreate(vshControl *ctl, const vshCmd *cmd) return FALSE; network = virNetworkCreateXML(ctl->conn, buffer); - free (buffer); + VIR_FREE(buffer); if (network != NULL) { vshPrint(ctl, _("Network %s created from %s\n"), @@ -2755,7 +2756,7 @@ cmdNetworkDefine(vshControl *ctl, const vshCmd *cmd) return FALSE; network = virNetworkDefineXML(ctl->conn, buffer); - free (buffer); + VIR_FREE(buffer); if (network != NULL) { vshPrint(ctl, _("Network %s defined from %s\n"), @@ -2838,7 +2839,7 @@ cmdNetworkDumpXML(vshControl *ctl, const vshCmd *cmd) dump = virNetworkGetXMLDesc(network, 0); if (dump != NULL) { printf("%s", dump); - free(dump); + VIR_FREE(dump); } else { ret = FALSE; } @@ -2936,13 +2937,13 @@ cleanup: if (iface) virInterfaceFree (iface); - free (doc); - free (doc_edited); - free (doc_reread); + VIR_FREE(doc); + VIR_FREE(doc_edited); + VIR_FREE(doc_reread); if (tmp) { unlink (tmp); - free (tmp); + VIR_FREE(tmp); } return ret; @@ -2988,7 +2989,7 @@ cmdNetworkList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) if ((maxactive = virConnectListNetworks(ctl->conn, activeNames, maxactive)) < 0) { vshError(ctl, "%s", _("Failed to list active networks")); - free(activeNames); + VIR_FREE(activeNames); return FALSE; } @@ -2999,7 +3000,7 @@ cmdNetworkList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) maxinactive = virConnectNumOfDefinedNetworks(ctl->conn); if (maxinactive < 0) { vshError(ctl, "%s", _("Failed to list inactive networks")); - free(activeNames); + VIR_FREE(activeNames); return FALSE; } if (maxinactive) { @@ -3009,8 +3010,8 @@ cmdNetworkList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) virConnectListDefinedNetworks(ctl->conn, inactiveNames, maxinactive)) < 0) { vshError(ctl, "%s", _("Failed to list inactive networks")); - free(activeNames); - free(inactiveNames); + VIR_FREE(activeNames); + VIR_FREE(inactiveNames); return FALSE; } @@ -3029,7 +3030,7 @@ cmdNetworkList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) /* this kind of work with networks is not atomic operation */ if (!network) { - free(activeNames[i]); + VIR_FREE(activeNames[i]); continue; } @@ -3043,7 +3044,7 @@ cmdNetworkList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) _("active"), autostartStr); virNetworkFree(network); - free(activeNames[i]); + VIR_FREE(activeNames[i]); } for (i = 0; i < maxinactive; i++) { virNetworkPtr network = virNetworkLookupByName(ctl->conn, inactiveNames[i]); @@ -3052,7 +3053,7 @@ cmdNetworkList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) /* this kind of work with networks is not atomic operation */ if (!network) { - free(inactiveNames[i]); + VIR_FREE(inactiveNames[i]); continue; } @@ -3067,10 +3068,10 @@ cmdNetworkList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) autostartStr); virNetworkFree(network); - free(inactiveNames[i]); + VIR_FREE(inactiveNames[i]); } - free(activeNames); - free(inactiveNames); + VIR_FREE(activeNames); + VIR_FREE(inactiveNames); return TRUE; } @@ -3261,7 +3262,7 @@ cmdInterfaceList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) if ((maxactive = virConnectListInterfaces(ctl->conn, activeNames, maxactive)) < 0) { vshError(ctl, "%s", _("Failed to list active interfaces")); - free(activeNames); + VIR_FREE(activeNames); return FALSE; } @@ -3272,7 +3273,7 @@ cmdInterfaceList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) maxinactive = virConnectNumOfDefinedInterfaces(ctl->conn); if (maxinactive < 0) { vshError(ctl, "%s", _("Failed to list inactive interfaces")); - free(activeNames); + VIR_FREE(activeNames); return FALSE; } if (maxinactive) { @@ -3282,8 +3283,8 @@ cmdInterfaceList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) virConnectListDefinedInterfaces(ctl->conn, inactiveNames, maxinactive)) < 0) { vshError(ctl, "%s", _("Failed to list inactive interfaces")); - free(activeNames); - free(inactiveNames); + VIR_FREE(activeNames); + VIR_FREE(inactiveNames); return FALSE; } @@ -3300,7 +3301,7 @@ cmdInterfaceList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) /* this kind of work with interfaces is not atomic */ if (!iface) { - free(activeNames[i]); + VIR_FREE(activeNames[i]); continue; } @@ -3309,7 +3310,7 @@ cmdInterfaceList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) _("active"), virInterfaceGetMACString(iface)); virInterfaceFree(iface); - free(activeNames[i]); + VIR_FREE(activeNames[i]); } for (i = 0; i < maxinactive; i++) { virInterfacePtr iface = @@ -3317,7 +3318,7 @@ cmdInterfaceList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) /* this kind of work with interfaces is not atomic */ if (!iface) { - free(inactiveNames[i]); + VIR_FREE(inactiveNames[i]); continue; } @@ -3326,10 +3327,10 @@ cmdInterfaceList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) _("inactive"), virInterfaceGetMACString(iface)); virInterfaceFree(iface); - free(inactiveNames[i]); + VIR_FREE(inactiveNames[i]); } - free(activeNames); - free(inactiveNames); + VIR_FREE(activeNames); + VIR_FREE(inactiveNames); return TRUE; } @@ -3430,7 +3431,7 @@ cmdInterfaceDumpXML(vshControl *ctl, const vshCmd *cmd) dump = virInterfaceGetXMLDesc(iface, flags); if (dump != NULL) { printf("%s", dump); - free(dump); + VIR_FREE(dump); } else { ret = FALSE; } @@ -3473,7 +3474,7 @@ cmdInterfaceDefine(vshControl *ctl, const vshCmd *cmd) return FALSE; iface = virInterfaceDefineXML(ctl->conn, buffer, 0); - free (buffer); + VIR_FREE(buffer); if (iface != NULL) { vshPrint(ctl, _("Interface %s defined from %s\n"), @@ -3685,7 +3686,7 @@ cmdPoolCreate(vshControl *ctl, const vshCmd *cmd) return FALSE; pool = virStoragePoolCreateXML(ctl->conn, buffer, 0); - free (buffer); + VIR_FREE(buffer); if (pool != NULL) { vshPrint(ctl, _("Pool %s created from %s\n"), @@ -3739,7 +3740,7 @@ cmdNodeDeviceCreate(vshControl *ctl, const vshCmd *cmd) } dev = virNodeDeviceCreateXML(ctl->conn, buffer, 0); - free (buffer); + VIR_FREE(buffer); if (dev != NULL) { vshPrint(ctl, _("Node device %s created from %s\n"), @@ -3896,10 +3897,10 @@ cmdPoolCreateAs(vshControl *ctl, const vshCmd *cmd) if (printXML) { printf("%s", xml); - free (xml); + VIR_FREE(xml); } else { pool = virStoragePoolCreateXML(ctl->conn, xml, 0); - free (xml); + VIR_FREE(xml); if (pool != NULL) { vshPrint(ctl, _("Pool %s created\n"), name); @@ -3947,7 +3948,7 @@ cmdPoolDefine(vshControl *ctl, const vshCmd *cmd) return FALSE; pool = virStoragePoolDefineXML(ctl->conn, buffer, 0); - free (buffer); + VIR_FREE(buffer); if (pool != NULL) { vshPrint(ctl, _("Pool %s defined from %s\n"), @@ -3985,10 +3986,10 @@ cmdPoolDefineAs(vshControl *ctl, const vshCmd *cmd) if (printXML) { printf("%s", xml); - free (xml); + VIR_FREE(xml); } else { pool = virStoragePoolDefineXML(ctl->conn, xml, 0); - free (xml); + VIR_FREE(xml); if (pool != NULL) { vshPrint(ctl, _("Pool %s defined\n"), name); @@ -4188,7 +4189,7 @@ cmdPoolDumpXML(vshControl *ctl, const vshCmd *cmd) dump = virStoragePoolGetXMLDesc(pool, 0); if (dump != NULL) { printf("%s", dump); - free(dump); + VIR_FREE(dump); } else { ret = FALSE; } @@ -4238,7 +4239,7 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) if ((maxactive = virConnectListStoragePools(ctl->conn, activeNames, maxactive)) < 0) { vshError(ctl, "%s", _("Failed to list active pools")); - free(activeNames); + VIR_FREE(activeNames); return FALSE; } @@ -4249,7 +4250,7 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) maxinactive = virConnectNumOfDefinedStoragePools(ctl->conn); if (maxinactive < 0) { vshError(ctl, "%s", _("Failed to list inactive pools")); - free(activeNames); + VIR_FREE(activeNames); return FALSE; } if (maxinactive) { @@ -4257,8 +4258,8 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) if ((maxinactive = virConnectListDefinedStoragePools(ctl->conn, inactiveNames, maxinactive)) < 0) { vshError(ctl, "%s", _("Failed to list inactive pools")); - free(activeNames); - free(inactiveNames); + VIR_FREE(activeNames); + VIR_FREE(inactiveNames); return FALSE; } @@ -4275,7 +4276,7 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) /* this kind of work with pools is not atomic operation */ if (!pool) { - free(activeNames[i]); + VIR_FREE(activeNames[i]); continue; } @@ -4289,7 +4290,7 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) _("active"), autostartStr); virStoragePoolFree(pool); - free(activeNames[i]); + VIR_FREE(activeNames[i]); } for (i = 0; i < maxinactive; i++) { virStoragePoolPtr pool = virStoragePoolLookupByName(ctl->conn, inactiveNames[i]); @@ -4298,7 +4299,7 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) /* this kind of work with pools is not atomic operation */ if (!pool) { - free(inactiveNames[i]); + VIR_FREE(inactiveNames[i]); continue; } @@ -4313,10 +4314,10 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) autostartStr); virStoragePoolFree(pool); - free(inactiveNames[i]); + VIR_FREE(inactiveNames[i]); } - free(activeNames); - free(inactiveNames); + VIR_FREE(activeNames); + VIR_FREE(inactiveNames); return TRUE; } @@ -4388,13 +4389,13 @@ cmdPoolDiscoverSourcesAs(vshControl * ctl, const vshCmd * cmd ATTRIBUTE_UNUSED) } srcList = virConnectFindStoragePoolSources(ctl->conn, type, srcSpec, 0); - free(srcSpec); + VIR_FREE(srcSpec); if (srcList == NULL) { vshError(ctl, _("Failed to find any %s pool sources"), type); return FALSE; } vshPrint(ctl, "%s", srcList); - free(srcList); + VIR_FREE(srcList); return TRUE; } @@ -4439,13 +4440,13 @@ cmdPoolDiscoverSources(vshControl * ctl, const vshCmd * cmd ATTRIBUTE_UNUSED) return FALSE; srcList = virConnectFindStoragePoolSources(ctl->conn, type, srcSpec, 0); - free(srcSpec); + VIR_FREE(srcSpec); if (srcList == NULL) { vshError(ctl, _("Failed to find any %s pool sources"), type); return FALSE; } vshPrint(ctl, "%s", srcList); - free(srcList); + VIR_FREE(srcList); return TRUE; } @@ -4718,7 +4719,7 @@ cmdVolCreateAs(vshControl *ctl, const vshCmd *cmd) } xml = virBufferContentAndReset(&buf); vol = virStorageVolCreateXML(pool, xml, 0); - free (xml); + VIR_FREE(xml); virStoragePoolFree(pool); if (vol != NULL) { @@ -4857,7 +4858,7 @@ cmdVolCreate(vshControl *ctl, const vshCmd *cmd) } vol = virStorageVolCreateXML(pool, buffer, 0); - free (buffer); + VIR_FREE(buffer); virStoragePoolFree(pool); if (vol != NULL) { @@ -4928,7 +4929,7 @@ cmdVolCreateFrom(vshControl *ctl, const vshCmd *cmd) ret = TRUE; cleanup: - free (buffer); + VIR_FREE(buffer); if (pool) virStoragePoolFree(pool); if (inputvol) @@ -5036,7 +5037,7 @@ cmdVolClone(vshControl *ctl, const vshCmd *cmd) ret = TRUE; cleanup: - free(origxml); + VIR_FREE(origxml); xmlFree(newxml); if (origvol) virStorageVolFree(origvol); @@ -5170,7 +5171,7 @@ cmdVolDumpXML(vshControl *ctl, const vshCmd *cmd) dump = virStorageVolGetXMLDesc(vol, 0); if (dump != NULL) { printf("%s", dump); - free(dump); + VIR_FREE(dump); } else { ret = FALSE; } @@ -5219,7 +5220,7 @@ cmdVolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) if ((maxactive = virStoragePoolListVolumes(pool, activeNames, maxactive)) < 0) { vshError(ctl, "%s", _("Failed to list active vols")); - free(activeNames); + VIR_FREE(activeNames); virStoragePoolFree(pool); return FALSE; } @@ -5235,7 +5236,7 @@ cmdVolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) /* this kind of work with vols is not atomic operation */ if (!vol) { - free(activeNames[i]); + VIR_FREE(activeNames[i]); continue; } @@ -5248,11 +5249,11 @@ cmdVolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) vshPrint(ctl, "%-20s %-40s\n", virStorageVolGetName(vol), path); - free(path); + VIR_FREE(path); virStorageVolFree(vol); - free(activeNames[i]); + VIR_FREE(activeNames[i]); } - free(activeNames); + VIR_FREE(activeNames); virStoragePoolFree(pool); return TRUE; } @@ -5390,7 +5391,7 @@ cmdSecretDefine(vshControl *ctl, const vshCmd *cmd) return FALSE; res = virSecretDefineXML(ctl->conn, buffer, 0); - free (buffer); + VIR_FREE(buffer); if (res == NULL) { vshError(ctl, _("Failed to set attributes from %s"), from); @@ -5438,7 +5439,7 @@ cmdSecretDumpXML(vshControl *ctl, const vshCmd *cmd) if (xml == NULL) goto cleanup; printf("%s", xml); - free(xml); + VIR_FREE(xml); ret = TRUE; cleanup: @@ -5491,7 +5492,7 @@ cmdSecretSetValue(vshControl *ctl, const vshCmd *cmd) res = virSecretSetValue(secret, (unsigned char *)value, value_size, 0); memset(value, 0, value_size); - free (value); + VIR_FREE(value); if (res != 0) { vshError(ctl, "%s", _("Failed to set secret value")); @@ -5541,7 +5542,7 @@ cmdSecretGetValue(vshControl *ctl, const vshCmd *cmd) base64_encode_alloc((char *)value, value_size, &base64); memset(value, 0, value_size); - free(value); + VIR_FREE(value); if (base64 == NULL) { vshError(ctl, "%s", _("Failed to allocate memory")); @@ -5549,7 +5550,7 @@ cmdSecretGetValue(vshControl *ctl, const vshCmd *cmd) } printf("%s", base64); memset(base64, 0, strlen(base64)); - free(base64); + VIR_FREE(base64); ret = TRUE; cleanup: @@ -5625,7 +5626,7 @@ cmdSecretList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) maxuuids = virConnectListSecrets(ctl->conn, uuids, maxuuids); if (maxuuids < 0) { vshError(ctl, "%s", _("Failed to list secrets")); - free(uuids); + VIR_FREE(uuids); return FALSE; } @@ -5639,7 +5640,7 @@ cmdSecretList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) const char *usageType = NULL; if (!sec) { - free(uuids[i]); + VIR_FREE(uuids[i]); continue; } @@ -5658,9 +5659,9 @@ cmdSecretList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) uuids[i], _("Unused")); } virSecretFree(sec); - free(uuids[i]); + VIR_FREE(uuids[i]); } - free(uuids); + VIR_FREE(uuids); return TRUE; } @@ -5867,7 +5868,7 @@ cmdNodeListDevices (vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) virNodeListDevices(ctl->conn, cap, devices, num_devices, 0); if (num_devices < 0) { vshError(ctl, "%s", _("Failed to list node devices")); - free(devices); + VIR_FREE(devices); return FALSE; } qsort(&devices[0], num_devices, sizeof(char*), namesorter); @@ -5898,17 +5899,17 @@ cmdNodeListDevices (vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) indentBuf); } for (i = 0 ; i < num_devices ; i++) { - free(devices[i]); - free(parents[i]); + VIR_FREE(devices[i]); + VIR_FREE(parents[i]); } - free(parents); + VIR_FREE(parents); } else { for (i = 0; i < num_devices; i++) { vshPrint(ctl, "%s\n", devices[i]); - free(devices[i]); + VIR_FREE(devices[i]); } } - free(devices); + VIR_FREE(devices); return TRUE; } @@ -5950,7 +5951,7 @@ cmdNodeDeviceDumpXML (vshControl *ctl, const vshCmd *cmd) } vshPrint(ctl, "%s\n", xml); - free(xml); + VIR_FREE(xml); virNodeDeviceFree(device); return TRUE; } @@ -6102,7 +6103,7 @@ cmdHostname (vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) } vshPrint (ctl, "%s\n", hostname); - free (hostname); + VIR_FREE(hostname); return TRUE; } @@ -6131,7 +6132,7 @@ cmdURI (vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) } vshPrint (ctl, "%s\n", uri); - free (uri); + VIR_FREE(uri); return TRUE; } @@ -6174,7 +6175,7 @@ cmdVNCDisplay(vshControl *ctl, const vshCmd *cmd) xml = xmlReadDoc((const xmlChar *) doc, "domain.xml", NULL, XML_PARSE_NOENT | XML_PARSE_NONET | XML_PARSE_NOWARNING); - free(doc); + VIR_FREE(doc); if (!xml) goto cleanup; ctxt = xmlXPathNewContext(xml); @@ -6248,7 +6249,7 @@ cmdTTYConsole(vshControl *ctl, const vshCmd *cmd) xml = xmlReadDoc((const xmlChar *) doc, "domain.xml", NULL, XML_PARSE_NOENT | XML_PARSE_NONET | XML_PARSE_NOWARNING); - free(doc); + VIR_FREE(doc); if (!xml) goto cleanup; ctxt = xmlXPathNewContext(xml); @@ -6315,7 +6316,7 @@ cmdAttachDevice(vshControl *ctl, const vshCmd *cmd) } ret = virDomainAttachDevice(dom, buffer); - free (buffer); + VIR_FREE(buffer); if (ret < 0) { vshError(ctl, _("Failed to attach device from %s"), from); @@ -6373,7 +6374,7 @@ cmdDetachDevice(vshControl *ctl, const vshCmd *cmd) } ret = virDomainDetachDevice(dom, buffer); - free (buffer); + VIR_FREE(buffer); if (ret < 0) { vshError(ctl, _("Failed to detach device from %s"), from); @@ -6499,8 +6500,8 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) cleanup: if (dom) virDomainFree(dom); - free(buf); - free(tmp); + VIR_FREE(buf); + VIR_FREE(tmp); return ret; } @@ -6552,7 +6553,7 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) xml = xmlReadDoc((const xmlChar *) doc, "domain.xml", NULL, XML_PARSE_NOENT | XML_PARSE_NONET | XML_PARSE_NOWARNING); - free(doc); + VIR_FREE(doc); if (!xml) { vshError(ctl, "%s", _("Failed to get interface information")); goto cleanup; @@ -6776,8 +6777,8 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) cleanup: if (dom) virDomainFree(dom); - free(buf); - free(tmp); + VIR_FREE(buf); + VIR_FREE(tmp); return ret; } @@ -6825,7 +6826,7 @@ cmdDetachDisk(vshControl *ctl, const vshCmd *cmd) xml = xmlReadDoc((const xmlChar *) doc, "domain.xml", NULL, XML_PARSE_NOENT | XML_PARSE_NONET | XML_PARSE_NOWARNING); - free(doc); + VIR_FREE(doc); if (!xml) { vshError(ctl, "%s", _("Failed to get disk information")); goto cleanup; @@ -6927,7 +6928,7 @@ cmdCPUCompare(vshControl *ctl, const vshCmd *cmd) return FALSE; result = virConnectCompareCPU(ctl->conn, buffer, 0); - free (buffer); + VIR_FREE(buffer); switch (result) { case VIR_CPU_COMPARE_INCOMPATIBLE: @@ -6979,7 +6980,7 @@ editWriteToTempFile (vshControl *ctl, const char *doc) if (fd == -1) { vshError(ctl, _("mkstemp: failed to create temporary file: %s"), strerror(errno)); - free (ret); + VIR_FREE(ret); return NULL; } @@ -6988,14 +6989,14 @@ editWriteToTempFile (vshControl *ctl, const char *doc) ret, strerror(errno)); close (fd); unlink (ret); - free (ret); + VIR_FREE(ret); return NULL; } if (close (fd) == -1) { vshError(ctl, _("close: %s: failed to write or close temporary file: %s"), ret, strerror(errno)); unlink (ret); - free (ret); + VIR_FREE(ret); return NULL; } @@ -7047,16 +7048,16 @@ editFile (vshControl *ctl, const char *filename) if (command_ret == -1) { vshError(ctl, _("%s: edit command failed: %s"), command, strerror(errno)); - free (command); + VIR_FREE(command); return -1; } if (command_ret != WEXITSTATUS (0)) { vshError(ctl, _("%s: command exited with non-zero status"), command); - free (command); + VIR_FREE(command); return -1; } - free (command); + VIR_FREE(command); return 0; } @@ -7153,7 +7154,7 @@ cmdPwd(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) else vshPrint (ctl, _("%s\n"), cwd); - free (cwd); + VIR_FREE(cwd); return !err; } #endif @@ -7249,13 +7250,13 @@ cmdEdit (vshControl *ctl, const vshCmd *cmd) if (dom) virDomainFree (dom); - free (doc); - free (doc_edited); - free (doc_reread); + VIR_FREE(doc); + VIR_FREE(doc_edited); + VIR_FREE(doc_reread); if (tmp) { unlink (tmp); - free (tmp); + VIR_FREE(tmp); } return ret; @@ -7620,8 +7621,8 @@ vshCommandOptFree(vshCmdOpt * arg) a = a->next; - free(tmp->data); - free(tmp); + VIR_FREE(tmp->data); + VIR_FREE(tmp); } } @@ -7637,7 +7638,7 @@ vshCommandFree(vshCmd *cmd) if (tmp->opts) vshCommandOptFree(tmp->opts); - free(tmp); + VIR_FREE(tmp); } } @@ -7705,7 +7706,7 @@ vshCommandOptStringList(const vshCmd *cmd, const char *name, char ***data) if (arg->def && STREQ(arg->def->name, name)) { char **tmp = realloc(val, sizeof(*tmp) * (nval+1)); if (!tmp) { - free(val); + VIR_FREE(val); return -1; } val = tmp; @@ -8171,8 +8172,7 @@ vshCommandParse(vshControl *ctl, char *cmdstr) vshError(ctl, _("unknown command: '%s'"), tkdata); goto syntaxError; /* ... or ignore this command only? */ } - free(tkdata); - tkdata = NULL; + VIR_FREE(tkdata); } else if (tk == VSH_TK_OPTION) { if (!(opt = vshCmddefGetOption(cmd, tkdata))) { vshError(ctl, @@ -8180,8 +8180,7 @@ vshCommandParse(vshControl *ctl, char *cmdstr) cmd->name, tkdata); goto syntaxError; } - free(tkdata); /* option name */ - tkdata = NULL; + VIR_FREE(tkdata); /* option name */ if (opt->type != VSH_OT_BOOL) { /* option data */ @@ -8238,7 +8237,7 @@ vshCommandParse(vshControl *ctl, char *cmdstr) c->next = NULL; if (!vshCommandCheckOpts(ctl, c)) { - free(c); + VIR_FREE(c); goto syntaxError; } @@ -8257,7 +8256,7 @@ vshCommandParse(vshControl *ctl, char *cmdstr) vshCommandFree(ctl->cmd); if (first) vshCommandOptFree(first); - free(tkdata); + VIR_FREE(tkdata); return FALSE; } @@ -8398,7 +8397,7 @@ _vshRealloc(vshControl *ctl, void *ptr, size_t size, const char *filename, int l if ((x = realloc(ptr, size))) return x; - free(ptr); + VIR_FREE(ptr); vshError(ctl, _("%s: %d: failed to allocate %d bytes"), filename, line, (int) size); exit(EXIT_FAILURE); @@ -8578,7 +8577,7 @@ vshCloseLogFile(vshControl *ctl) } if (ctl->logfile) { - free(ctl->logfile); + VIR_FREE(ctl->logfile); ctl->logfile = NULL; } } @@ -8644,7 +8643,7 @@ vshReadlineOptionsGenerator(const char *text, int state) cmd = vshCmddefSearch(cmdname); list_index = 0; len = strlen(text); - free(cmdname); + VIR_FREE(cmdname); } if (!cmd) @@ -8714,17 +8713,17 @@ vshReadlineInit(vshControl *ctl) if (virAsprintf(&ctl->historydir, "%s/.virsh", userdir) < 0) { vshError(ctl, "%s", _("Out of memory")); - free(userdir); + VIR_FREE(userdir); return -1; } if (virAsprintf(&ctl->historyfile, "%s/histroy", ctl->historydir) < 0) { vshError(ctl, "%s", _("Out of memory")); - free(userdir); + VIR_FREE(userdir); return -1; } - free(userdir); + VIR_FREE(userdir); read_history(ctl->historyfile); @@ -8743,11 +8742,8 @@ vshReadlineDeinit (vshControl *ctl) write_history(ctl->historyfile); } - free(ctl->historydir); - free(ctl->historyfile); - - ctl->historydir = NULL; - ctl->historyfile = NULL; + VIR_FREE(ctl->historydir); + VIR_FREE(ctl->historyfile); } static char * @@ -8800,7 +8796,7 @@ vshDeinit(vshControl *ctl) { vshReadlineDeinit(ctl); vshCloseLogFile(ctl); - free(ctl->name); + VIR_FREE(ctl->name); if (ctl->conn) { if (virConnectClose(ctl->conn) != 0) { vshError(ctl, "%s", _("failed to disconnect from the hypervisor")); @@ -8964,7 +8960,7 @@ vshParseArgv(vshControl *ctl, int argc, char **argv) vshDebug(ctl, 2, "command: \"%s\"\n", cmdstr); ret = vshCommandParse(ctl, cmdstr); - free(cmdstr); + VIR_FREE(cmdstr); return ret; } return TRUE; @@ -9044,8 +9040,7 @@ main(int argc, char **argv) if (vshCommandParse(ctl, ctl->cmdstr)) vshCommandRun(ctl, ctl->cmd); } - free(ctl->cmdstr); - ctl->cmdstr = NULL; + VIR_FREE(ctl->cmdstr); } while (ctl->imode); if (ctl->cmdstr == NULL) -- 1.6.0.4

2 2

[libvirt] [PATCH] xend_internal: don't let invalid input provoke NULL dereference
by Jim Meyering 07 Jan '10

07 Jan '10

If there's a good reason to test for NULL "conn", then we certainly must not dereference "conn" before that point. This assumes we do want to retain the NULL test. Note that many other functions perform this same test. >From 2c7b628728efcb5a59c1e7aa1cba763f5ef0045a Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Wed, 6 Jan 2010 12:59:21 +0100 Subject: [PATCH] xend_internal: don't let invalid input provoke NULL dereference * src/xen/xend_internal.c (xenDaemonOpen_unix): Do not dereference a NULL "conn". Move first deref to follow the "conn == NULL" test. --- src/xen/xend_internal.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index 827aac4..be033f5 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -748,11 +748,12 @@ int xenDaemonOpen_unix(virConnectPtr conn, const char *path) { struct sockaddr_un *addr; - xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) conn->privateData; + xenUnifiedPrivatePtr priv; if ((conn == NULL) || (path == NULL)) return (-1); + priv = (xenUnifiedPrivatePtr) conn->privateData; memset(&priv->addr, 0, sizeof(priv->addr)); priv->addrfamily = AF_UNIX; /* -- 1.6.6.387.g2649b1

2 2

[libvirt] [PATCH] virsh: Add persistent history using libreadline
by Matthias Bolte 07 Jan '10

07 Jan '10

--- tools/virsh.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 65 insertions(+), 4 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 21f9710..e2a32b4 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -41,6 +41,7 @@ #endif #include "internal.h" +#include "virterror_internal.h" #include "base64.h" #include "buf.h" #include "console.h" @@ -197,6 +198,8 @@ typedef struct __vshControl { */ char *logfile; /* log file name */ int log_fd; /* log file descriptor */ + char *historydir; /* readline history directory name */ + char *historyfile; /* readline history file name */ } __vshControl; @@ -8689,9 +8692,11 @@ vshReadlineCompletion(const char *text, int start, } -static void -vshReadlineInit(void) +static int +vshReadlineInit(vshControl *ctl) { + char *userdir = NULL; + /* Allow conditional parsing of the ~/.inputrc file. */ rl_readline_name = "virsh"; @@ -8700,6 +8705,49 @@ vshReadlineInit(void) /* Limit the total size of the history buffer */ stifle_history(500); + + /* Prepare to read/write history from/to the ~/.virsh/history file */ + userdir = virGetUserDirectory(NULL, getuid()); + + if (userdir == NULL) + return -1; + + if (virAsprintf(&ctl->historydir, "%s/.virsh", userdir) < 0) { + vshError(ctl, "%s", _("Out of memory")); + free(userdir); + return -1; + } + + if (virAsprintf(&ctl->historyfile, "%s/histroy", ctl->historydir) < 0) { + vshError(ctl, "%s", _("Out of memory")); + free(userdir); + return -1; + } + + free(userdir); + + read_history(ctl->historyfile); + + return 0; +} + +static void +vshReadlineDeinit (vshControl *ctl) +{ + if (ctl->historyfile != NULL) { + if (mkdir(ctl->historydir, 0755) < 0 && errno != EEXIST) { + char ebuf[1024]; + vshError(ctl, _("Failed to create '%s': %s"), + ctl->historydir, virStrerror(errno, ebuf, sizeof ebuf)); + } else + write_history(ctl->historyfile); + } + + free(ctl->historydir); + free(ctl->historyfile); + + ctl->historydir = NULL; + ctl->historyfile = NULL; } static char * @@ -8710,8 +8758,15 @@ vshReadline (vshControl *ctl ATTRIBUTE_UNUSED, const char *prompt) #else /* !USE_READLINE */ +static int +vshReadlineInit (vshControl *ctl ATTRIBUTE_UNUSED) +{ + /* empty */ + return 0; +} + static void -vshReadlineInit (void) +vshReadlineDeinit (vshControl *ctl ATTRIBUTE_UNUSED) { /* empty */ } @@ -8743,6 +8798,7 @@ vshReadline (vshControl *ctl, const char *prompt) static int vshDeinit(vshControl *ctl) { + vshReadlineDeinit(ctl); vshCloseLogFile(ctl); free(ctl->name); if (ctl->conn) { @@ -8969,7 +9025,12 @@ main(int argc, char **argv) _("Type: 'help' for help with commands\n" " 'quit' to quit\n\n")); } - vshReadlineInit(); + + if (vshReadlineInit(ctl) < 0) { + vshDeinit(ctl); + exit(EXIT_FAILURE); + } + do { const char *prompt = ctl->readonly ? VSH_PROMPT_RO : VSH_PROMPT_RW; ctl->cmdstr = -- 1.6.0.4

3 3

[libvirt] [PATCH] esx: Fix 'vpx' MAC address range and allow arbitrary MAC addresses
by Matthias Bolte 07 Jan '10

07 Jan '10

The MAC addresses with 00:50:56 prefix are split into several ranges: 00:50:56:00:00:00 - 00:50:56:3f:ff:ff 'static' range (manually assigned) 00:50:56:80:00:00 - 00:50:56:bf:ff:ff 'vpx' range (assigned by a VI Client) Erroneously the 'vpx' range was assumed to be larger and to occupy the remaining addresses of the 00:50:56 prefix that are not part of the 'static' range. 00:50:56 was used as prefix for generated MAC addresses, this is not possible anymore, because there are gaps in the allowed ranges. Therefore, change the prefix to 00:0c:29 which is the prefix for auto generated MAC addresses anyway. Allow arbitrary MAC addresses to be used and set the checkMACAddress VMX option to false in case the MAC address doesn't fall into any predefined range. * docs/drvesx.html.in: update website accordingly * src/esx/esx_driver.c: set the auto generation prefix to 00:0c:29 * src/esx/esx_vmx.c: fix MAC address range handling and allow arbitrary MAC addresses * tests/vmx2xml*, tests/xml2vmx*: add some basic MAC address range tests --- docs/drvesx.html.in | 74 ++++++++++++++++++++-- src/esx/esx_driver.c | 2 +- src/esx/esx_vmx.c | 49 +++++++++------ tests/vmx2xmldata/vmx2xml-ethernet-generated.vmx | 8 +++ tests/vmx2xmldata/vmx2xml-ethernet-generated.xml | 19 ++++++ tests/vmx2xmldata/vmx2xml-ethernet-other.vmx | 8 +++ tests/vmx2xmldata/vmx2xml-ethernet-other.xml | 19 ++++++ tests/vmx2xmldata/vmx2xml-ethernet-static.vmx | 7 ++ tests/vmx2xmldata/vmx2xml-ethernet-static.xml | 19 ++++++ tests/vmx2xmldata/vmx2xml-ethernet-vpx.vmx | 7 ++ tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml | 19 ++++++ tests/vmx2xmltest.c | 5 ++ tests/xml2vmxdata/xml2vmx-ethernet-generated.vmx | 13 ++++ tests/xml2vmxdata/xml2vmx-ethernet-generated.xml | 14 ++++ tests/xml2vmxdata/xml2vmx-ethernet-other.vmx | 13 ++++ tests/xml2vmxdata/xml2vmx-ethernet-other.xml | 14 ++++ tests/xml2vmxdata/xml2vmx-ethernet-static.vmx | 12 ++++ tests/xml2vmxdata/xml2vmx-ethernet-static.xml | 14 ++++ tests/xml2vmxdata/xml2vmx-ethernet-vpx.vmx | 12 ++++ tests/xml2vmxdata/xml2vmx-ethernet-vpx.xml | 14 ++++ tests/xml2vmxtest.c | 5 ++ 21 files changed, 320 insertions(+), 27 deletions(-) create mode 100644 tests/vmx2xmldata/vmx2xml-ethernet-generated.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-ethernet-generated.xml create mode 100644 tests/vmx2xmldata/vmx2xml-ethernet-other.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-ethernet-other.xml create mode 100644 tests/vmx2xmldata/vmx2xml-ethernet-static.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-ethernet-static.xml create mode 100644 tests/vmx2xmldata/vmx2xml-ethernet-vpx.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml create mode 100644 tests/xml2vmxdata/xml2vmx-ethernet-generated.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-ethernet-generated.xml create mode 100644 tests/xml2vmxdata/xml2vmx-ethernet-other.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-ethernet-other.xml create mode 100644 tests/xml2vmxdata/xml2vmx-ethernet-static.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-ethernet-static.xml create mode 100644 tests/xml2vmxdata/xml2vmx-ethernet-vpx.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-ethernet-vpx.xml diff --git a/docs/drvesx.html.in b/docs/drvesx.html.in index b7909ff..44a144f 100644 --- a/docs/drvesx.html.in +++ b/docs/drvesx.html.in @@ -16,8 +16,8 @@ SOAP based <a href="http://www.vmware.com/support/developer/vc-sdk/visdk25pubs/ReferenceGuide/"> VMware Virtual Infrastructure API</a> (VI API) to communicate with the - ESX server, like the VMware Virtual Infrastructure Client does. Since - version 4.0 this API is called + ESX server, like the VMware Virtual Infrastructure Client (VI client) + does. Since version 4.0 this API is called <a href="http://www.vmware.com/support/developer/vc-sdk/visdk400pubs/ReferenceGuide/"> VMware vSphere API</a>. </p> @@ -159,7 +159,7 @@ type://[username@]hostname[:port]/[?extraparameters] There are several specialties in the domain XML config for ESX domains. </p> - <h3>Restrictions</h3> + <h3><a name="restrictions">Restrictions</h3> <p> There are some restrictions for some values of the domain XML config. The driver will complain if this restrictions are violated. @@ -173,12 +173,13 @@ type://[username@]hostname[:port]/[?extraparameters] </li> <li> Valid MAC address prefixes are <code>00:0c:29</code> and - <code>00:50:56</code> + <code>00:50:56</code>. <span class="since">Since 0.7.6</span> + arbitrary <a href="#macaddresses">MAC addresses</a> are supported. </li> </ul> - <h3>Datastore references</h3> + <h3><a name="datastore">Datastore references</h3> <p> Storage is managed in datastores. VMware uses a special path format to reference files in a datastore. Basically, the datastore name is put @@ -197,7 +198,68 @@ type://[username@]hostname[:port]/[?extraparameters] </p> - <h3>Available hardware</h3> + <h3><a name="macaddresses">MAC addresses</h3> + <p> + VMware has registered two MAC address prefixes for domains: + <code>00:0c:29</code> and <code>00:50:56</code>. These prefixes are + split into ranges for different purposes. + </p> + <table class="top_table"> + <tr> + <th>Range</th> + <th>Purpose</th> + </tr> + <tr> + <td> + <code>00:0c:29:00:00:00</code> - <code>00:0c:29:ff:ff:ff</code> + </td> + <td> + An ESX server autogenerates MAC addresses from this range if + the VMX file doesn't contain a MAC address when trying to start + a domain. + </td> + </tr> + <tr> + <td> + <code>00:50:56:00:00:00</code> - <code>00:50:56:3f:ff:ff</code> + </td> + <td> + MAC addresses from this range can by manually assigned by the + user in the VI client. + </td> + </tr> + <tr> + <td> + <code>00:50:56:80:00:00</code> - <code>00:50:56:bf:ff:ff</code> + </td> + <td> + A VI client autogenerates MAC addresses from this range for + newly defined domains. + </td> + </tr> + </table> + <p> + The VMX files generated by the ESX driver always contain a MAC address, + because libvirt generates a random one if an interface element in the + domain XML file lacks a MAC address. + <span class="since">Since 0.7.6</span> the ESX driver sets the prefix + for generated MAC addresses to <code>00:0c:29</code>. Before 0.7.6 + the <code>00:50:56</code> prefix was used. Sometimes this resulted in + the generation of out-of-range MAC address that were rejected by the + ESX server. + </p> + <p> + Also <span class="since">since 0.7.6</span> every MAC address outside + this ranges can be used. For such MAC addresses the ESX server-side + check is disabled in the VMX file to stop the ESX server from rejecting + out-of-predefined-range MAC addresses. + </p> +<pre> +ethernet0.checkMACAddress = "false" +</pre> + + + <h3><a name="hardware">Available hardware</h3> <p> VMware ESX supports different models of SCSI controllers and network cards. diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 30e21e0..f86654a 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -184,7 +184,7 @@ esxCapsInit(virConnectPtr conn) return NULL; } - virCapabilitiesSetMacPrefix(caps, (unsigned char[]){ 0x00, 0x50, 0x56 }); + virCapabilitiesSetMacPrefix(caps, (unsigned char[]){ 0x00, 0x0c, 0x29 }); virCapabilitiesAddHostMigrateTransport(caps, "esx"); /* i686 */ diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index d3cad1d..4b334b6 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -266,8 +266,8 @@ def->nets[0]... ethernet0.addressType = "generated" # default to "generated" - ethernet0.generatedAddressOffset = "0" # ? ->mac = <value> <=> ethernet0.generatedAddress = "<value>" + ethernet0.generatedAddressOffset = "0" # ? ethernet0.addressType = "static" # default to "generated" @@ -277,10 +277,15 @@ def->nets[0]... ethernet0.addressType = "vpx" # default to "generated" ->mac = <value> <=> ethernet0.generatedAddress = "<value>" + + ethernet0.addressType = "static" # default to "generated" +->mac = <value> <=> ethernet0.address = "<value>" + ethernet0.checkMACAddress = "false" # mac address outside the VMware prefixes + # 00:0c:29 prefix for autogenerated mac's -> ethernet0.addressType = "generated" # 00:50:56 prefix for manual configured mac's # 00:50:56:00:00:00 - 00:50:56:3f:ff:ff -> ethernet0.addressType = "static" - # 00:50:56:40:00:00 - 00:50:56:ff:ff:ff -> ethernet0.addressType = "vpx" + # 00:50:56:80:00:00 - 00:50:56:bf:ff:ff -> ethernet0.addressType = "vpx" # 00:05:69 old prefix from esx 1.5 @@ -2602,6 +2607,7 @@ esxVMX_FormatEthernet(virConnectPtr conn, virDomainNetDefPtr def, int controller, virBufferPtr buffer) { char mac_string[VIR_MAC_STRING_BUFLEN]; + unsigned int prefix, suffix; if (controller < 0 || controller > 3) { ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR, @@ -2654,33 +2660,36 @@ esxVMX_FormatEthernet(virConnectPtr conn, virDomainNetDefPtr def, return -1; } + /* def:mac -> vmx:addressType, vmx:(generated)Address, vmx:checkMACAddress */ virFormatMacAddr(def->mac, mac_string); - if (def->mac[0] == 0x00 && def->mac[1] == 0x0c && def->mac[2] == 0x29) { + prefix = (def->mac[0] << 16) | (def->mac[1] << 8) | def->mac[2]; + suffix = (def->mac[3] << 16) | (def->mac[4] << 8) | def->mac[5]; + + if (prefix == 0x000c29) { virBufferVSprintf(buffer, "ethernet%d.addressType = \"generated\"\n", controller); virBufferVSprintf(buffer, "ethernet%d.generatedAddress = \"%s\"\n", controller, mac_string); virBufferVSprintf(buffer, "ethernet%d.generatedAddressOffset = \"0\"\n", controller); - } else if (def->mac[0] == 0x00 && def->mac[1] == 0x50 && def->mac[2] == 0x56) { - if (def->mac[3] <= 0x3f) { - virBufferVSprintf(buffer, "ethernet%d.addressType = \"static\"\n", - controller); - virBufferVSprintf(buffer, "ethernet%d.address = \"%s\"\n", - controller, mac_string); - } else { - virBufferVSprintf(buffer, "ethernet%d.addressType = \"vpx\"\n", - controller); - virBufferVSprintf(buffer, "ethernet%d.generatedAddress = \"%s\"\n", - controller, mac_string); - } + } else if (prefix == 0x005056 && suffix <= 0x3fffff) { + virBufferVSprintf(buffer, "ethernet%d.addressType = \"static\"\n", + controller); + virBufferVSprintf(buffer, "ethernet%d.address = \"%s\"\n", + controller, mac_string); + } else if (prefix == 0x005056 && suffix >= 0x800000 && suffix <= 0xbfffff) { + virBufferVSprintf(buffer, "ethernet%d.addressType = \"vpx\"\n", + controller); + virBufferVSprintf(buffer, "ethernet%d.generatedAddress = \"%s\"\n", + controller, mac_string); } else { - ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - "Unsupported MAC address prefix '%02X:%02X:%02X', expecting " - "'00:0c:29' or '00:50:56'", - def->mac[0], def->mac[1], def->mac[2]); - return -1; + virBufferVSprintf(buffer, "ethernet%d.addressType = \"static\"\n", + controller); + virBufferVSprintf(buffer, "ethernet%d.address = \"%s\"\n", + controller, mac_string); + virBufferVSprintf(buffer, "ethernet%d.checkMACAddress = \"false\"\n", + controller); } return 0; diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-generated.vmx b/tests/vmx2xmldata/vmx2xml-ethernet-generated.vmx new file mode 100644 index 0000000..f27e0a0 --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-ethernet-generated.vmx @@ -0,0 +1,8 @@ +config.version = "8" +virtualHW.version = "4" +ethernet0.present = "true" +ethernet0.networkName = "VM Network" +ethernet0.connectionType = "bridged" +ethernet0.addressType = "generated" +ethernet0.generatedAddress = "00:0C:29:11:22:33" +ethernet0.generatedAddressOffset = "0" diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-generated.xml b/tests/vmx2xmldata/vmx2xml-ethernet-generated.xml new file mode 100644 index 0000000..ffb203b --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-ethernet-generated.xml @@ -0,0 +1,19 @@ +<domain type='vmware'> + <uuid>00000000-0000-0000-0000-000000000000</uuid> + <memory>32768</memory> + <currentMemory>32768</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686'>hvm</type> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <interface type='bridge'> + <mac address='00:0c:29:11:22:33'/> + <source bridge='VM Network'/> + </interface> + </devices> +</domain> diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-other.vmx b/tests/vmx2xmldata/vmx2xml-ethernet-other.vmx new file mode 100644 index 0000000..da46a70 --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-ethernet-other.vmx @@ -0,0 +1,8 @@ +config.version = "8" +virtualHW.version = "4" +ethernet0.present = "true" +ethernet0.networkName = "VM Network" +ethernet0.connectionType = "bridged" +ethernet0.checkMACAddress = "false" +ethernet0.addressType = "static" +ethernet0.address = "00:12:34:56:78:90" diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-other.xml b/tests/vmx2xmldata/vmx2xml-ethernet-other.xml new file mode 100644 index 0000000..4c44fbc --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-ethernet-other.xml @@ -0,0 +1,19 @@ +<domain type='vmware'> + <uuid>00000000-0000-0000-0000-000000000000</uuid> + <memory>32768</memory> + <currentMemory>32768</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686'>hvm</type> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <interface type='bridge'> + <mac address='00:12:34:56:78:90'/> + <source bridge='VM Network'/> + </interface> + </devices> +</domain> diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-static.vmx b/tests/vmx2xmldata/vmx2xml-ethernet-static.vmx new file mode 100644 index 0000000..8b7a5b3 --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-ethernet-static.vmx @@ -0,0 +1,7 @@ +config.version = "8" +virtualHW.version = "4" +ethernet0.present = "true" +ethernet0.networkName = "VM Network" +ethernet0.connectionType = "bridged" +ethernet0.addressType = "static" +ethernet0.address = "00:50:56:11:22:33" diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-static.xml b/tests/vmx2xmldata/vmx2xml-ethernet-static.xml new file mode 100644 index 0000000..7ef2d3d --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-ethernet-static.xml @@ -0,0 +1,19 @@ +<domain type='vmware'> + <uuid>00000000-0000-0000-0000-000000000000</uuid> + <memory>32768</memory> + <currentMemory>32768</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686'>hvm</type> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <interface type='bridge'> + <mac address='00:50:56:11:22:33'/> + <source bridge='VM Network'/> + </interface> + </devices> +</domain> diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-vpx.vmx b/tests/vmx2xmldata/vmx2xml-ethernet-vpx.vmx new file mode 100644 index 0000000..b4d9172 --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-ethernet-vpx.vmx @@ -0,0 +1,7 @@ +config.version = "8" +virtualHW.version = "4" +ethernet0.present = "true" +ethernet0.networkName = "VM Network" +ethernet0.connectionType = "bridged" +ethernet0.addressType = "vpx" +ethernet0.generatedAddress = "00:50:56:87:65:43" diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml b/tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml new file mode 100644 index 0000000..1d90f31 --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml @@ -0,0 +1,19 @@ +<domain type='vmware'> + <uuid>00000000-0000-0000-0000-000000000000</uuid> + <memory>32768</memory> + <currentMemory>32768</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686'>hvm</type> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <interface type='bridge'> + <mac address='00:50:56:87:65:43'/> + <source bridge='VM Network'/> + </interface> + </devices> +</domain> diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index 150a58d..0cb387b 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -139,6 +139,11 @@ mymain(int argc, char **argv) DO_TEST("ethernet-custom", "ethernet-custom", esxVI_APIVersion_25); DO_TEST("ethernet-bridged", "ethernet-bridged", esxVI_APIVersion_25); + DO_TEST("ethernet-generated", "ethernet-generated", esxVI_APIVersion_25); + DO_TEST("ethernet-static", "ethernet-static", esxVI_APIVersion_25); + DO_TEST("ethernet-vpx", "ethernet-vpx", esxVI_APIVersion_25); + DO_TEST("ethernet-other", "ethernet-other", esxVI_APIVersion_25); + DO_TEST("serial-file", "serial-file", esxVI_APIVersion_25); DO_TEST("serial-device", "serial-device", esxVI_APIVersion_25); DO_TEST("serial-pipe-client-app", "serial-pipe", esxVI_APIVersion_25); diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-generated.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-generated.vmx new file mode 100644 index 0000000..ae825a5 --- /dev/null +++ b/tests/xml2vmxdata/xml2vmx-ethernet-generated.vmx @@ -0,0 +1,13 @@ +config.version = "8" +virtualHW.version = "4" +guestOS = "other" +uuid.bios = "56 4d 9b ef ac d9 b4 e0-c8 f0 ae a8 b9 10 35 15" +displayName = "ethernet-generated" +memsize = "4" +numvcpus = "1" +ethernet0.present = "true" +ethernet0.networkName = "VM Network" +ethernet0.connectionType = "bridged" +ethernet0.addressType = "generated" +ethernet0.generatedAddress = "00:0C:29:11:22:33" +ethernet0.generatedAddressOffset = "0" diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-generated.xml b/tests/xml2vmxdata/xml2vmx-ethernet-generated.xml new file mode 100644 index 0000000..aac8a74 --- /dev/null +++ b/tests/xml2vmxdata/xml2vmx-ethernet-generated.xml @@ -0,0 +1,14 @@ +<domain type='vmware'> + <name>ethernet-generated</name> + <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> + <memory>4096</memory> + <os> + <type>hvm</type> + </os> + <devices> + <interface type='bridge'> + <mac address='00:0c:29:11:22:33'/> + <source bridge='VM Network'/> + </interface> + </devices> +</domain> diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-other.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-other.vmx new file mode 100644 index 0000000..452076a --- /dev/null +++ b/tests/xml2vmxdata/xml2vmx-ethernet-other.vmx @@ -0,0 +1,13 @@ +config.version = "8" +virtualHW.version = "4" +guestOS = "other" +uuid.bios = "56 4d 9b ef ac d9 b4 e0-c8 f0 ae a8 b9 10 35 15" +displayName = "ethernet-static" +memsize = "4" +numvcpus = "1" +ethernet0.present = "true" +ethernet0.networkName = "VM Network" +ethernet0.connectionType = "bridged" +ethernet0.addressType = "static" +ethernet0.address = "00:12:34:56:78:90" +ethernet0.checkMACAddress = "false" diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-other.xml b/tests/xml2vmxdata/xml2vmx-ethernet-other.xml new file mode 100644 index 0000000..cf1ce7c --- /dev/null +++ b/tests/xml2vmxdata/xml2vmx-ethernet-other.xml @@ -0,0 +1,14 @@ +<domain type='vmware'> + <name>ethernet-static</name> + <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> + <memory>4096</memory> + <os> + <type>hvm</type> + </os> + <devices> + <interface type='bridge'> + <mac address='00:12:34:56:78:90'/> + <source bridge='VM Network'/> + </interface> + </devices> +</domain> diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-static.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-static.vmx new file mode 100644 index 0000000..154a28b --- /dev/null +++ b/tests/xml2vmxdata/xml2vmx-ethernet-static.vmx @@ -0,0 +1,12 @@ +config.version = "8" +virtualHW.version = "4" +guestOS = "other" +uuid.bios = "56 4d 9b ef ac d9 b4 e0-c8 f0 ae a8 b9 10 35 15" +displayName = "ethernet-static" +memsize = "4" +numvcpus = "1" +ethernet0.present = "true" +ethernet0.networkName = "VM Network" +ethernet0.connectionType = "bridged" +ethernet0.addressType = "static" +ethernet0.address = "00:50:56:11:22:33" diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-static.xml b/tests/xml2vmxdata/xml2vmx-ethernet-static.xml new file mode 100644 index 0000000..b803de4 --- /dev/null +++ b/tests/xml2vmxdata/xml2vmx-ethernet-static.xml @@ -0,0 +1,14 @@ +<domain type='vmware'> + <name>ethernet-static</name> + <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> + <memory>4096</memory> + <os> + <type>hvm</type> + </os> + <devices> + <interface type='bridge'> + <mac address='00:50:56:11:22:33'/> + <source bridge='VM Network'/> + </interface> + </devices> +</domain> diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-vpx.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-vpx.vmx new file mode 100644 index 0000000..31283f6 --- /dev/null +++ b/tests/xml2vmxdata/xml2vmx-ethernet-vpx.vmx @@ -0,0 +1,12 @@ +config.version = "8" +virtualHW.version = "4" +guestOS = "other" +uuid.bios = "56 4d 9b ef ac d9 b4 e0-c8 f0 ae a8 b9 10 35 15" +displayName = "ethernet-vpx" +memsize = "4" +numvcpus = "1" +ethernet0.present = "true" +ethernet0.networkName = "VM Network" +ethernet0.connectionType = "bridged" +ethernet0.addressType = "vpx" +ethernet0.generatedAddress = "00:50:56:87:65:43" diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-vpx.xml b/tests/xml2vmxdata/xml2vmx-ethernet-vpx.xml new file mode 100644 index 0000000..1490238 --- /dev/null +++ b/tests/xml2vmxdata/xml2vmx-ethernet-vpx.xml @@ -0,0 +1,14 @@ +<domain type='vmware'> + <name>ethernet-vpx</name> + <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> + <memory>4096</memory> + <os> + <type>hvm</type> + </os> + <devices> + <interface type='bridge'> + <mac address='00:50:56:87:65:43'/> + <source bridge='VM Network'/> + </interface> + </devices> +</domain> diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c index abf1f32..b5b7cc8 100644 --- a/tests/xml2vmxtest.c +++ b/tests/xml2vmxtest.c @@ -192,6 +192,11 @@ mymain(int argc, char **argv) DO_TEST("ethernet-custom", "ethernet-custom", esxVI_APIVersion_25); DO_TEST("ethernet-bridged", "ethernet-bridged", esxVI_APIVersion_25); + DO_TEST("ethernet-generated", "ethernet-generated", esxVI_APIVersion_25); + DO_TEST("ethernet-static", "ethernet-static", esxVI_APIVersion_25); + DO_TEST("ethernet-vpx", "ethernet-vpx", esxVI_APIVersion_25); + DO_TEST("ethernet-other", "ethernet-other", esxVI_APIVersion_25); + DO_TEST("serial-file", "serial-file", esxVI_APIVersion_25); DO_TEST("serial-device", "serial-device", esxVI_APIVersion_25); DO_TEST("serial-pipe", "serial-pipe", esxVI_APIVersion_25); -- 1.6.0.4

2 1

[libvirt] [PATCH] esx: Fix deserialization for VI API calls CancelTask and UnregisterVM
by Matthias Bolte 07 Jan '10

07 Jan '10

--- src/esx/esx_vi_methods.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/esx/esx_vi_methods.c b/src/esx/esx_vi_methods.c index be21112..7925f26 100644 --- a/src/esx/esx_vi_methods.c +++ b/src/esx/esx_vi_methods.c @@ -601,7 +601,7 @@ esxVI_CancelTask(virConnectPtr conn, esxVI_Context *ctx, request = virBufferContentAndReset(&buffer); - if (esxVI_Context_Execute(conn, ctx, "UnregisterVM", request, &response, + if (esxVI_Context_Execute(conn, ctx, "CancelTask", request, &response, esxVI_Occurrence_None) < 0) { goto failure; } @@ -652,7 +652,7 @@ esxVI_UnregisterVM(virConnectPtr conn, esxVI_Context *ctx, request = virBufferContentAndReset(&buffer); - if (esxVI_Context_Execute(conn, ctx, "AnswerVM", request, &response, + if (esxVI_Context_Execute(conn, ctx, "UnregisterVM", request, &response, esxVI_Occurrence_None) < 0) { goto failure; } -- 1.6.0.4

2 1

[libvirt] [PATCH] esx: Fix and improve the libcurl debug callback
by Matthias Bolte 07 Jan '10

07 Jan '10

The data passed to the callback is not guaranteed to be zero terminated, take care of that by coping the data and adding a zero terminator. Also dump the data for other types than CURLINFO_TEXT. Set CURLOPT_VERBOSE to 1 so the debug callback is called when enabled. --- src/esx/esx_vi.c | 43 ++++++++++++++++++++++++++++++++++--------- 1 files changed, 34 insertions(+), 9 deletions(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index a7498f0..bad987c 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -181,27 +181,50 @@ static int esxVI_CURL_Debug(CURL *curl ATTRIBUTE_UNUSED, curl_infotype type, char *info, size_t size, void *data ATTRIBUTE_UNUSED) { + char *buffer = NULL; + + /* + * The libcurl documentation says: + * + * The data pointed to by the char * passed to this function WILL NOT + * be zero terminated, but will be exactly of the size as told by the + * size_t argument. + * + * To handle this properly in order to pass the info string to VIR_DEBUG + * a zero terminated copy of the info string has to be allocated. + */ + if (VIR_ALLOC_N(buffer, size + 1) < 0) { + return 0; + } + + if (virStrncpy(buffer, info, size, size + 1) == NULL) { + VIR_FREE(buffer); + return 0; + } + switch (type) { case CURLINFO_TEXT: - VIR_DEBUG0("CURLINFO_TEXT"); - fwrite(info, 1, size, stderr); - printf("\n\n"); + if (size > 0 && buffer[size - 1] == '\n') { + buffer[size - 1] = '\0'; + } + + VIR_DEBUG("CURLINFO_TEXT [[[[%s]]]]", buffer); break; case CURLINFO_HEADER_IN: - VIR_DEBUG0("CURLINFO_HEADER_IN"); + VIR_DEBUG("CURLINFO_HEADER_IN [[[[%s]]]]", buffer); break; case CURLINFO_HEADER_OUT: - VIR_DEBUG0("CURLINFO_HEADER_OUT"); + VIR_DEBUG("CURLINFO_HEADER_OUT [[[[%s]]]]", buffer); break; case CURLINFO_DATA_IN: - VIR_DEBUG0("CURLINFO_DATA_IN"); + VIR_DEBUG("CURLINFO_DATA_IN [[[[%s]]]]", buffer); break; case CURLINFO_DATA_OUT: - VIR_DEBUG0("CURLINFO_DATA_OUT"); + VIR_DEBUG("CURLINFO_DATA_OUT [[[[%s]]]]", buffer); break; default: @@ -209,6 +232,8 @@ esxVI_CURL_Debug(CURL *curl ATTRIBUTE_UNUSED, curl_infotype type, break; } + VIR_FREE(buffer); + return 0; } #endif @@ -338,8 +363,8 @@ esxVI_Context_Connect(virConnectPtr conn, esxVI_Context *ctx, const char *url, curl_easy_setopt(ctx->curl_handle, CURLOPT_WRITEFUNCTION, esxVI_CURL_WriteBuffer); #if ESX_VI__CURL__ENABLE_DEBUG_OUTPUT - curl_easy_setopt(ctx->curl_handle, CURLOPT_DEBUGFUNCTION, - esxVI_CURL_Debug); + curl_easy_setopt(ctx->curl_handle, CURLOPT_DEBUGFUNCTION, esxVI_CURL_Debug); + curl_easy_setopt(ctx->curl_handle, CURLOPT_VERBOSE, 1); #endif if (virMutexInit(&ctx->curl_lock) < 0) { -- 1.6.0.4

2 1

[libvirt] [PATCH] esx: Don't warn about an empty URI path
by Matthias Bolte 07 Jan '10

07 Jan '10

--- src/esx/esx_driver.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 5cdadfd..30e21e0 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -293,7 +293,8 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) return VIR_DRV_OPEN_DECLINED; } - if (conn->uri->path != NULL && STRNEQ(conn->uri->path, "/")) { + if (conn->uri->path != NULL && STRNEQ(conn->uri->path, "") && + STRNEQ(conn->uri->path, "/")) { VIR_WARN("Ignoring unexpected path '%s' in URI", conn->uri->path); } -- 1.6.0.4

2 1

[libvirt] [PATCH] esx: Also allow virtualHW version 4 for ESX 4.0
by Matthias Bolte 07 Jan '10

07 Jan '10

A domain with virtualHW version 4 is allowed on an ESX 4.0 server. If a domain is migrated from an ESX 3.5 server to an ESX 4.0 server then the virtualHW version stays the same. So a ESX 4.0 server can host domains with virtualHW version 4. --- src/esx/esx_vmx.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index 9aad592..d3cad1d 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -780,9 +780,9 @@ esxVMX_ParseConfig(virConnectPtr conn, esxVI_Context *ctx, const char *vmx, break; case esxVI_APIVersion_40: - if (virtualHW_version != 7) { + if (virtualHW_version != 4 && virtualHW_version != 7) { ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - "Expecting VMX entry 'virtualHW.version' to be 7 for " + "Expecting VMX entry 'virtualHW.version' to be 4 or 7 for " "VI API version 4.0 but found %lld", virtualHW_version); goto failure; } -- 1.6.0.4

2 1

[libvirt] [PATCH] Don't free an uninitalized pointer in update_driver_name()
by Matthias Bolte 07 Jan '10

07 Jan '10

This invalid free results in heap corruption. Some symptoms I saw because of this were libvirtd crashing and virt-manager hanging while trying to enumerate devices. --- src/node_device/node_device_driver.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index ecbac0f..fbadfca 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -78,7 +78,7 @@ static int update_driver_name(virConnectPtr conn, virNodeDeviceObjPtr dev) { char *driver_link = NULL; - char *devpath; + char *devpath = NULL; char *p; int ret = -1; @@ -114,7 +114,7 @@ static int update_driver_name(virConnectPtr conn, cleanup: VIR_FREE(driver_link); - free(devpath); + VIR_FREE(devpath); return ret; } #else -- 1.6.0.4

2 1

[libvirt] Fwd: Re: [Qemu-devel] Re: qemu-kvm-0.12 bug?
by Thomas Treutner 07 Jan '10

07 Jan '10

Hi, there is a new parameter in qemu-0.12 required for virtio_balloon support. Is there an appropriate XML-entry in libvirt's domain config yet or any plans to introduce one? A quick googling for "libvirt balloon" didn't reveal any hints. Adam, how did you test the memstat reporting feature? kr, tom ---------- Forwarded Message ---------- Subject: Re: [Qemu-devel] Re: qemu-kvm-0.12 bug? Date: Tuesday 29 December 2009 From: Luiz Capitulino <lcapitulino(a)redhat.com> To: Thomas Treutner <thomas(a)scripty.at> On Tue, 29 Dec 2009 13:08:26 +0100 Thomas Treutner <thomas(a)scripty.at> wrote: > On Tuesday 29 December 2009 12:48:39 Luiz Capitulino wrote: > > On Tue, 29 Dec 2009 13:10:36 +0200 Avi Kivity <avi(a)redhat.com> wrote: > > > Hm, I get "The balloon device has not been activated by the guest" in > > > the qemu monitor. > > > > Is the "-balloon virtio" parameter passed on the command-line? > > # grep balloon /usr/local/var/log/libvirt/qemu/* | wc -l > 0 > > These logs include some history - so the parameter isn't used by libvirt even > when ballooning works? This parameter is new in qemu-0.12.

5 8

[libvirt] [PATCH 0/1] Don't update vol details after build
by David Allan 07 Jan '10

07 Jan '10

This patch fixes the bug reported at: https://bugzilla.redhat.com/show_bug.cgi?id=510450 See the patch for details. Dave

3 3

[libvirt] [PATCH] Disable building of static Python module.
by Diego Elio Pettenò 07 Jan '10

07 Jan '10

Python modules are loaded at runtime so the static version of it is not really needed, this avoids duplicating the build for the PIC and non-PIC cases. --- python/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/python/Makefile.am b/python/Makefile.am index 04342b7..58c6729 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -39,7 +39,7 @@ libvirtmod_la_SOURCES = libvirt-override.c typewrappers.c libvirt.c libvirt.h # need extra flags here libvirtmod_la_CFLAGS = @WARN_PYTHON_CFLAGS@ -libvirtmod_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/.libs \ +libvirtmod_la_LDFLAGS = -module -avoid-version -shared -L$(top_builddir)/src/.libs \ @CYGWIN_EXTRA_LDFLAGS@ libvirtmod_la_LIBADD = $(mylibs) \ @CYGWIN_EXTRA_LIBADD@ @CYGWIN_EXTRA_PYTHON_LIBADD@ -- 1.6.6.rc4

2 1

[libvirt] [PATCH] Fix parsing of 'info chardev' line endings
by Matthew Booth 07 Jan '10

07 Jan '10

This change makes the 'info chardev' parser ignore any trailing whitespace on a line. This fixes a specific problem handling a '\r\n' line ending. * src/qemu/qemu_monitor_text.c: Ignore trailing whitespace in 'info chardev' output. --- src/qemu/qemu_monitor_text.c | 26 +++++++++++++++++--------- 1 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 0cb9ea6..4fd8c4a 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -1622,15 +1622,26 @@ int qemuMonitorTextGetPtyPaths(qemuMonitorPtr mon, goto cleanup; } - char *pos = reply; /* The current start of searching */ - char *end = pos + strlen(reply); /* The end of the reply string */ + char *pos; /* The current start of searching */ + char *next = reply; /* The start of the next line */ char *eol; /* The character which ends the current line */ + char *end = reply + strlen(reply); /* The end of the reply string */ + + while (next) { + pos = next; - while (pos < end) { /* Split the output into lines */ eol = memchr(pos, '\n', end - pos); - if (eol == NULL) + if (eol == NULL) { eol = end; + next = NULL; + } else { + next = eol + 1; + } + + /* Ignore all whitespace immediately before eol */ + while (eol > pos && c_isspace(*(eol-1))) + eol -= 1; /* Look for 'filename=pty:' */ #define NEEDLE "filename=pty:" @@ -1638,13 +1649,13 @@ int qemuMonitorTextGetPtyPaths(qemuMonitorPtr mon, /* If it's not there we can ignore this line */ if (!needle) - goto next; + continue; /* id is everthing from the beginning of the line to the ':' * find ':' and turn it into a terminator */ char *colon = memchr(pos, ':', needle - pos); if (colon == NULL) - goto next; + continue; *colon = '\0'; char *id = pos; @@ -1664,9 +1675,6 @@ int qemuMonitorTextGetPtyPaths(qemuMonitorPtr mon, goto cleanup; } #undef NEEDLE - - next: - pos = eol + 1; } ret = 0; -- 1.6.5.2

3 2

[libvirt] iptables rules location
by Mihamina Rakotomandimby 06 Jan '10

06 Jan '10

Manao ahoana, Hello, Bonjour, When starting libvirt there are some iptables rules setup. I would like to know where are they stored (and the filename, I use ubuntu package, need to 'find' or 'locate'). Misaotra, Thanks, Merci. -- Architecte Informatique chez Blueline/Gulfsat: Administration Systeme, Recherche & Developpement +261 34 29 155 34 / +261 33 11 207 36

2 1

[libvirt] [PATCH] vbox_tmpl.c: avoid NULL deref upon vboxDomainCreateXML failure
by Jim Meyering 06 Jan '10

06 Jan '10

Similar to others, >From 5dcb4d95a351cb6fa32ebaafb96756275e1079e2 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Wed, 16 Dec 2009 13:56:57 +0100 Subject: [PATCH] vbox_tmpl.c: avoid NULL deref upon vboxDomainCreateXML failure * src/vbox/vbox_tmpl.c (vboxDomainCreateXML): Don't call vboxDomainUndefine on a NULL "dom". --- src/vbox/vbox_tmpl.c | 16 +++++----------- 1 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index d6b681c..ba70053 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -990,8 +990,6 @@ cleanup: static virDomainPtr vboxDomainCreateXML(virConnectPtr conn, const char *xml, unsigned int flags ATTRIBUTE_UNUSED) { - virDomainPtr dom = NULL; - /* VirtualBox currently doesn't have support for running * virtual machines without actually defining them and thus * for time being just define new machine and start it. @@ -1000,17 +998,13 @@ static virDomainPtr vboxDomainCreateXML(virConnectPtr conn, const char *xml, * change this behaviour to the expected one. */ - dom = vboxDomainDefineXML(conn, xml); - if (dom) { - if (vboxDomainCreate(dom) < 0) - goto cleanup; - } else { - goto cleanup; - } + virDomainPtr dom = vboxDomainDefineXML(conn, xml); + if (dom == NULL) + return NULL; - return dom; + if (0 < vboxDomainCreate(dom)) + return dom; -cleanup: vboxDomainUndefine(dom); return NULL; } -- 1.6.6.rc2.275.g51e2d

2 7

[libvirt] [PATCH] qemu_driver.c: remove useless, warning-provoking test
by Jim Meyering 06 Jan '10

06 Jan '10

Tools like coverity and maybe clang notice that we dereference uri_out, and then (later) test whether uri_out is NULL. Obviously one or the other must go. Presuming that we will always pass a non-NULL uri_out arg to this function, I chose to mark that parameter as ATTRIBUTE_NONNULL. I removed the unnecessary test, too. If anyone is concerned that a non-NULL (non-literal) value will be passed, I can also add an assertion. >From 6ce3a9656d978b37d866f55606bc5031ad8e6b2f Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 5 Jan 2010 16:32:11 +0100 Subject: [PATCH] qemu_driver.c: remove useless, warning-provoking test * src/qemu/qemu_driver.c (qemudDomainMigratePrepare2): Remove useless test of always-non-NULL uri_out parameter. Use ATTRIBUTE_NONNULL to inform tools. --- src/qemu/qemu_driver.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 4639478..daa6f94 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1,7 +1,7 @@ /* * driver.c: core driver methods for managing qemu guests * - * Copyright (C) 2006, 2007, 2008, 2009 Red Hat, Inc. + * Copyright (C) 2006, 2007, 2008, 2009, 2010 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -6961,7 +6961,7 @@ cleanup: * * This starts an empty VM listening on a TCP port. */ -static int +static int ATTRIBUTE_NONNULL (5) qemudDomainMigratePrepare2 (virConnectPtr dconn, char **cookie ATTRIBUTE_UNUSED, int *cookielen ATTRIBUTE_UNUSED, @@ -7068,7 +7068,7 @@ qemudDomainMigratePrepare2 (virConnectPtr dconn, } } - if (uri_out && *uri_out) + if (*uri_out) VIR_DEBUG("Generated uri_out=%s", *uri_out); /* Parse the domain XML. */ -- 1.6.6.387.g2649b1

2 2

[libvirt] [PATCH] qemu_driver.c: avoid NULL dereference upon disk-op failure
by Jim Meyering 06 Jan '10

06 Jan '10

The local, "cgroup" is initialized to NULL, and may still have that value when the code below is reached. That would provoke a NULL-dereference in virCgroupDenyDevicePath. >From c1caed370a7b2eae2e964a6059b014530143075c Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Wed, 16 Dec 2009 14:15:50 +0100 Subject: [PATCH] qemu_driver.c: avoid NULL dereference upon disk-op failure * src/qemu/qemu_driver.c (qemudDomainAttachDevice): Call virCgroupDenyDevicePath only if cgroup is non-NULL. --- src/qemu/qemu_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 9ef6c35..81afecf 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5485,7 +5485,7 @@ static int qemudDomainAttachDevice(virDomainPtr dom, virDomainDiskDeviceTypeToString(dev->data.disk->device)); /* Fallthrough */ } - if (ret != 0) { + if (ret != 0 && cgroup) { virCgroupDenyDevicePath(cgroup, dev->data.disk->src); } -- 1.6.6.rc2.275.g51e2d

2 2

[libvirt] Migration with non-shared storage
by Kenneth Nagin 06 Jan '10

06 Jan '10

Support for live migration between hosts that do not share storage was added to qemu-kvm release 0.12.1. It supports two flags: -b migration without shared storage with full disk copy -i migration without shared storage with incremental copy (same base image shared between source and destination). I suggest adding these flags to virDomainMigrate. If I'm not mistaken qemuMonitorTextMigrate is the function that actually invokes the kvm monitor. Thus, it would be necessary to pass the flags to qemuMonitorTextMigrate.. But qemuMonitorTextMigrate does not have a flag input parameter. I think the least disruptive way to support the new flags is use the existing "background" parameter to pass the flags. Of course this would require some changes to the upstream functions that are invoked for migration. What do you think? Kenneth Nagin

1 0

[libvirt] [PATCH] openvz_conf.c: don't dereference NULL upon failure
by Jim Meyering 06 Jan '10

06 Jan '10

"dom" is set to NULL within the while loop: virDomainObjUnlock(dom); dom = NULL; If on a subsequent iteration something fails, we goto "cleanup" or "no_memory", both of which have us run this code: fclose(fp); virDomainObjUnref(dom); return -1; And the virDomainObjUnref function would dereference "dom". >From 3971ff17c7e9f1ddbc443d48b86fe6ba60a2d4a0 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 15 Dec 2009 16:16:57 +0100 Subject: [PATCH] openvz_conf.c: don't dereference NULL upon failure * src/openvz/openvz_conf.c (openvzLoadDomains): Avoid NULL deref of "dom". --- src/openvz/openvz_conf.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index 7e9abbf..43bbaf2 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -535,7 +535,8 @@ int openvzLoadDomains(struct openvz_driver *driver) { cleanup: fclose(fp); - virDomainObjUnref(dom); + if (dom) + virDomainObjUnref(dom); return -1; } -- 1.6.6.rc2.275.g51e2d

2 2

[libvirt] [PATCH 0/3] Block assignment of PCI devices below non-ACS capable switch
by Jiri Denemark 05 Jan '10

05 Jan '10

Hi. This is a patchset for blocking assignment of PCI devices below non-ACS capable switch. In case user still wants to assign such device even though it might not be safe, she can specify permissive='yes' attribute for <hostdev>. Special thanks to Chris L. who created a standalone program the PCI check. This code is a port of that check to libvirt. Jiri Denemark (3): Tests for ACS in PCIe switches New 'permissive' attribute for hostdev Use pciDeviceIsAssignable in qemu driver docs/schemas/domain.rng | 8 +++ src/conf/domain_conf.c | 14 ++++- src/conf/domain_conf.h | 1 + src/libvirt_private.syms | 3 + src/qemu/qemu_driver.c | 9 +++- src/util/pci.c | 147 ++++++++++++++++++++++++++++++++++++++++++++++ src/util/pci.h | 7 ++ 7 files changed, 186 insertions(+), 3 deletions(-)

5 12

Re: [libvirt] New libvirt API for domain memory statistics reporting (V3)
by Thomas Treutner 05 Jan '10

05 Jan '10

On Wednesday 23 December 2009 19:42:20 Adam Litke wrote: > Attached to this email are two patches: > > memstats-kernel-2.6.32-rc5.patch: > Applies to 2.6.32-rc5 which should be a capable-enough kernel for > testing and development. > > memstats-qemu-0.12.1.patch: > Applies to qemu-0.12.1 which can be found here: > http://mirrors.igsobe.com/nongnu/qemu/qemu-0.12.1.tar.gz > Unfortunately, it is not trivial for me to port this work to 0.11.0 so > you will have to find a resolution to your BIOS woes first and then use > this version. Who knows, it might already be fixed in 0.12.1. I tried with qemu-*kvm*-0.12.1.1, no memstats yet, but dynamically setting the amount of memory now doesn't work at all. I'll try to isolate the problem, I suspect it comes from qemu-kvm-0.12.1.1. I can't use qemu-0.12.1: $ ./configure --enable-kvm --disable-xen #error Missing KVM capability KVM_CAP_DESTROY_MEMORY_REGION_WORKS NOTE: To enable KVM support, update your kernel to 2.6.29+ or install recent kvm-kmod from http://sourceforge.net/projects/kvm. ERROR ERROR: User requested feature kvm ERROR: configure was not able to find it ERROR $ uname -r 2.6.32.2 $ modinfo kvm_amd ... vermagic: 2.6.32.2 SMP mod_unload modversions .... kr,tom

2 1

[libvirt] [PATCH 0/12] Standardized device addressing & SCSI controller/disk hotplug
by Daniel P. Berrange 04 Jan '10

04 Jan '10

This patch series is a combination of series done by Wolfgang Mauerer to support proper SCSI drive hotplug and new work by myself to introduce generic addressing for all devices. Wolfgang's most recent posting was http://www.redhat.com/archives/libvir-list/2009-November/msg00574.html http://www.redhat.com/archives/libvir-list/2009-November/msg00701.html When testing that series I came across a few minor issues, but more importantly it made me realize how important it is that we introduce explicit device addressing in our XML format. Wolfgang's series had added new element for SCSI controllers, with PCI address info about the controller <controller type='ide' index='0'> <address domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> </controller> And had also extended the <disk> element to include a SCSI controller name, and bus/unit ID. eg <disk> ... <controller name="<identifier>" pci_addr="<addr>" bus="<number>" unit="<number>"/> </disk> I then remembered that for support NIC/VirtIO/hostdev disk unplug Mark M had previously added PCI address information to the internal XML state files for <interface>, <disk> and <hostdev> elements. All of these places using PCI addresses suffered from the fact that we only knew the addresses of devices we'd hotplug and had no idea of addresses of devices present at boot time. A further issue with the addition of <controller> to the <disk> element, is that not all disk types have a concept of a controller. For example, every VirtIO disk is in fact a full PCI device, so having a <controller> element in <disk> is not meaningful for VirtIO. The solution that I believe solves all our problems, is to add a generic <address> element to every single device. This address element contains info about how the device is associated with the logical parent device. There will be three types of address in this series of patches, though we could imagine adding more later. - PCI address - domain, bus, slot, function - USB address - bus, device - Drive address - controller, bus, unit Anything that is a PCI device will obviously use PCI addresses. - PCI: sound, audio, video, all virtio, watchdog, disk controllers - USB: all usb devices - Drive: SCSI, IDE & Floppy disks, but *not* VirtIO/Xen disks Xen paravirt devices aren't really covered in this scheme. I could imagine adding a fourth address type for Xen. This would in fact let us handle driver domains - ie a backend outside dom0. I won't deal with Xen in this series though. The XML for each address type looks like <address type='pci' mode='static' domain='0x0000' bus='0x1e' slot='0x07' function='0x0'/> <address type='usb' mode='dynamic' bus='007' dev='003'/> <address type='drive' mode='dynamic' controller='1' bus='0' unit='5'/> The 'mode' attribute for any of them is allowed to be either 'static' or 'dynamic'. A static address is one specified by the end user when defining the XML, while a dynamic address is one automatically chosen by libvirt/QEMU every time a guest boots. The idea of static addresses is to allow management apps to guarentee that PCI device & drive numbering never changes. This series does not actually implement static addressing for PCI yet, because it requires that we change the way we generate QEMU command line arguments. It does do static addressing for disks. libvirt itself will auto-assign all drive addresses, and QEMU will auto-assign PCI adresses in dynamic mode. When starting a guest VM we run 'info pci' to get a list of PCI vendor/product IDs and matching PCI addresses. We then attempt to match those up with the devices we specified to QEMU. It sounds nasty, but it actually works fairly well. This means we also now make it possible to hotunplug any device, even those the VM was initially booted with There are two ways I can envisage mgmt apps using this address functionality - Boot a guest with no addresses specified, grab the XML and change all 'dynamic' attrs to 'static' and then define the persistent config with this. The addresses will then be unchanged forever more - Explicitly give a full list of addresses the very first time a guest is created. There is one small issue with all this, we need to know every PCI device in the guest. It turns out there are a handful of devices in QEMU we don't represent in XML yet - Virtio balloon device - Virtio console (this is easy to address with matt's patches) - ISA bridge - USB controller - Some kind of PCI bridge (not clear what this is, it has PCI ID 8086:7113 If an management application is to be able to fully control static PCI addressing, we need to represent these somehow, so apps can give them addresses. Technically we could get away with not representing the ISA/PCI bridge since QEMU always gives them the first PCI slot no matter what. Still need the VirtIO & USB devices dealt with. Finally, here is an example of a guest running with a huge number of devices. Notice how we've auto-detected the PCI address of every device, and every disk. In particular notice how VirtiO disks got the PCI address, while SCSI disks got the drive address. <domain type='kvm' id='2'> <name>plain</name> <uuid>c7a1edbd-edaf-9455-926a-d65c16db1809</uuid> <memory>219200</memory> <currentMemory>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc-0.11'>hvm</type> <kernel>/home/berrange/vmlinuz-PAE</kernel> <initrd>/home/berrange/initrd-PAE.img</initrd> <boot dev='hd'/> </os> <features> <acpi/> </features> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/home/berrange/VirtualMachines/plain.qcow'/> <target dev='vda' bus='virtio'/> <address type='pci' mode='dynamic' domain='0x0000' bus='0x00' slot='0x0b' function='0x0'/> </disk> <disk type='file' device='cdrom'> <source file='/home/berrange/gpxe.iso'/> <target dev='hdc' bus='ide'/> <readonly/> <address type='drive' mode='dynamic' controller='0' bus='1' unit='0'/> </disk> <disk type='file' device='disk'> <source file='/home/berrange/output.img'/> <target dev='sda' bus='scsi'/> <address type='drive' mode='dynamic' controller='0' bus='0' unit='0'/> </disk> <disk type='file' device='disk'> <source file='/home/berrange/output.img'/> <target dev='sdd' bus='scsi'/> <address type='drive' mode='dynamic' controller='0' bus='0' unit='3'/> </disk> <disk type='file' device='disk'> <source file='/home/berrange/output.img'/> <target dev='sdf' bus='scsi'/> <address type='drive' mode='dynamic' controller='0' bus='0' unit='5'/> </disk> <controller type='scsi' index='0'> <address type='pci' mode='dynamic' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/> </controller> <controller type='ide' index='0'> <address type='pci' mode='dynamic' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> </controller> <controller type='fdc' index='0'/> <interface type='user'> <mac address='52:54:00:5b:ef:21'/> <model type='ne2k_pci'/> <address type='pci' mode='dynamic' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> <interface type='user'> <mac address='52:54:00:1c:dc:98'/> <model type='virtio'/> <address type='pci' mode='dynamic' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </interface> <interface type='user'> <mac address='52:54:00:f7:c5:0e'/> <model type='e1000'/> <address type='pci' mode='dynamic' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </interface> <interface type='user'> <mac address='52:54:00:56:6c:55'/> <model type='pcnet'/> <address type='pci' mode='dynamic' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> </interface> <interface type='user'> <mac address='52:54:00:ca:0d:58'/> <model type='rtl8139'/> <address type='pci' mode='dynamic' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> </interface> <serial type='pty'> <source path='/dev/pts/5'/> <target port='0'/> </serial> <console type='pty' tty='/dev/pts/5'> <source path='/dev/pts/5'/> <target port='0'/> </console> <input type='mouse' bus='ps2'/> <graphics type='vnc' port='5900' autoport='yes'/> <sound model='ac97'> <address type='pci' mode='dynamic' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/> </sound> <sound model='es1370'> <address type='pci' mode='dynamic' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/> </sound> <video> <model type='cirrus' vram='9216' heads='1'/> <address type='pci' mode='dynamic' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </video> <watchdog model='i6300esb' action='reset'> <address type='pci' mode='dynamic' domain='0x0000' bus='0x00' slot='0x0c' function='0x0'/> </watchdog> </devices> <seclabel type='dynamic' model='selinux'> <label>system_u:system_r:svirt_t:s0:c181,c286</label> <imagelabel>system_u:object_r:svirt_image_t:s0:c181,c286</imagelabel> </seclabel> </domain> Daniel

4 34

[libvirt] FIrst approximation of creating volumes directly with desired uid
by Laine Stump 04 Jan '10

04 Jan '10

|I've made an attempt to create storage volumes directly with the desired uid/gid (by forking a new process, calling setuid/setgid in that process, and then creating the file). Since it's sure to get ripped apart, I've put it up on gitorious rather than sending patches to the list. The repository is: git://gitorious.org/~laine/libvirt/laine-staging.git <git://gitorious.org/%7Elaine/libvirt/laine-staging.git> and the branch is (in a quite non-sequiter fashion) "xml2xmltest" Only the last 3 commits on the branch are related to this topic. The first adds uid and gid args to virRun (and all related functions) so that new processes can be run as a different user. This is necessary for the cases where we call an external program to create the image (qemu-img, for example). The second commit adds two new functions to util.c: virFileCreate and virDirCreate. In the case that the current process is running as root, and the caller has requested a different uid or gid for the new file/directory, these functions do the proper fork dance to get this done and return proper status to the caller. The third commit uses the enhanced virRun, and the two new functions to change the way that storage volumes are created. I've noted some of my concerns about doing things this way in a bugzilla report about the problem I'm trying to fix: https://bugzilla.redhat.com/show_bug.cgi?id=547543 |

1 0

[libvirt] virsh -c xen:/// list: = Connection refused
by Gerry Reno 02 Jan '10

02 Jan '10

I'm running the 2.6.31.6 pv_ops dom0 kernel, libvirt 0.7.0 and Xen 3.4.1. When I try connecting to the Xen hypervisor using virsh it gives me a "Connection refused": root@grp-01-23-02:~# xm list Name ID Mem VCPUs State Time(s) Domain-0 0 1020 4 r----- 858.3 root@grp-01-23-02:~# virsh -c xen:/// list Connecting to uri: xen:/// error: unable to connect to 'localhost:8000': Connection refused error: failed to connect to the hypervisor How can I get virsh to connect with Xen? -Gerry

1 1

[libvirt] define tap-only networking
by richard lucassen 30 Dec '09

30 Dec '09

Hello list, I'm pretty new to libvirt and I'd like to try to set up simple networking as described here: http://www.xaq.nl/kvm-tap-howto.txt Is it possible to set up networking through simple tap devices using the xml format? And if yes, can someone give me a hint how to set this up? R. -- ___________________________________________________________________ It is better to remain silent and be thought a fool, than to speak aloud and remove all doubt. +------------------------------------------------------------------+ | Richard Lucassen, Utrecht | | Public key and email address: | | http://www.lucassen.org/mail-pubkey.html | +------------------------------------------------------------------+

2 2

[libvirt] kvm-shell
by Michael Kress 25 Dec '09

25 Dec '09

Hi, I don't know if that already exists somewhere ... I've written it for me and wanted to share it with you. It's a minimal kvm shell for end users - it allows them to start/stop/reboot their own kvm guests. http://www.michael-kress.de/2009/12/kvm-shell/ kvm-shell should run on all platforms. Have fun. Regards Michael -- Michael Kress, kress(a)hal.saar.de

1 0

[libvirt] LXC support?
by Diego Elio “Flameeyes” Pettenò 24 Dec '09

24 Dec '09

I've been wanting to give a try to libvirt to handle containers from LXC as well, but seems like if I follow the default configuration example, I get this: virsh # create /etc/libvirt/lxc/axant.xml errore: Impossibile creare il dominio da /etc/libvirt/lxc/axant.xml errore: unknown OS type exe [sorry for the Italian message, but it doesn't really matter] The configuration is this: <domain type='lxc'> <name>axant</name> <memory>14680064</memory> <os> <type>exe</type> <init>/init</init> </os> <vcpu>8</vcpu> <clock offset="utc" /> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> <emulator>/usr/libexec/libvirt_lxc</emulator> <filesystem type='mount'> <source dir='/media/chroots/axant'/> <target dir='/'/> </filesystem> <interface type='bridge'> <mac address="8e:8b:e5:aa:28:b6" /> <source bridge="br0" /> </interface> <console type='pty' /> </devices> </domain> am I doing something wrong or the doc at [1] is outdated somehow? [1] http://libvirt.org/drvlxc.html -- Diego Elio Pettenò — “Flameeyes” http://blog.flameeyes.eu/ If you found a .asc file in this mail and know not what it is, it's a GnuPG digital signature: http://www.gnupg.org/

2 3

[libvirt] Test failures on current git master
by Diego Elio “Flameeyes” Pettenò 24 Dec '09

24 Dec '09

I'm sincerely not sure what's going on here since the first validity errors (for bond.xml) don't seem right to me, so I'll leave it to whoever has an idea what the problem might be. -- Diego Elio Pettenò — “Flameeyes” http://blog.flameeyes.eu/ If you found a .asc file in this mail and know not what it is, it's a GnuPG digital signature: http://www.gnupg.org/

3 4

[libvirt] Release of libvirt-0.7.5
by Daniel Veillard 24 Dec '09

24 Dec '09

As scheduled, the release hist the server, it's available on the ftp ftp://libvirt.org/libvirt/ It really includes a lot of bug fixes, as well as some new API and features. I would expect the next release to be around end of January 2010 something like a feature freeze around Jan 22 and a push on 29. That way we will be back on the "end of month release" scheme :-) Features: - Add new API virDomainMemoryStats to header and drivers (Adam Litke) - Public API and domain extension for CPU flags (Jiri Denemark) - expose SR IOV physical/virtual function relationships (Dave Allan) - Support for JSON mode monitor [deactivated] (Daniel P. Berrange) - Support for interface model='netfront' (Jiri Denemark) - vbox: Add support for version 3.1 (Pritesh Kothari) - Support QEMU's virtual FAT block device driver (Daniel P. Berrange) Documentation: - Document the dommemstat command in the virsh man page (Adam Litke) - esx: Add more links to external documentation (Matthias Bolte) - esx: Extend documentation about 'vcenter' and add some about 'auto_answer' (Matthias Bolte) - Fix and improve domain xml video element description (Matthias Bolte) - Fix owner and group in example volume XML (Matthew Booth) - add missing doc for device <shareable/> option (Daniel Veillard) - add AppArmor test and examples to dist (Jamie Strandboge) - Update location of C# bindings. (Richard Jones) - Fix typo in QEMU driver webpage (Daniel P. Berrange) - Clarify documentation for private symbols (Wolfgang Mauerer) - Fix news.html validation (Dan Kenigsberg) Portability: - Define ATTRIBUTE_SENTINEL for GCC < 4.0 too (Matthias Bolte) - Fix compilation with configure --disable-nls (Matthias Bolte) - Fix configure check for SASL (Matthias Bolte) - Fix GnuTLS pkg-config check (Matthias Bolte) - Report an error if no XDR library can be found (Matthias Bolte) - Fix compilation with gcrypt < 1.4.2 (Matthias Bolte) - Don't mix LDFLAGS and LIBS in the configure script (Diego Elio Pettenò) - Don't make it possible to define HAVE_HAL but not enable it in automake (Diego Elio Pettenò) - Fix install location for Python bindings (Matthias Bolte) - Use AM_PATH_PYTHON and python-config to detect Python configuration (Matthias Bolte) - Fix a compilation failure if yajl not avail (Daniel Veillard) - Fix compilation for configure --disable-nls (Matthias Bolte) Bug fixes: - cpu: Fix memory leaks in x86FeatureLoad and x86ModelLoad (Matthias Bolte) - Make Xen VT-d PCI attach/detach work (Chris Lalancette) - Fix detection of JSON when restarting libvirtd (Daniel P. Berrange) - Fix reporting of TLS connection errors (Daniel P. Berrange) - Fix typo in qemudDomainAttachHostPciDevice() (Daniel Veillard) - esx: Destroy virtual machine on a vCenter if available (Matthias Bolte) - esx: Undefine virtual machine on a vCenter if available (Matthias Bolte) - Initialize gcrypt threading (Daniel P. Berrange) - Fix bug in storage driver accessing wrong private data (Daniel P. Berrange) - esx_vi.c: do not call through NULL function pointer (Jim Meyering) - esx_util.c: avoid NULL deref for invalid inputs (Jim Meyering) - esx: Don't goto failure for invalid arguments in VMX code (Matthias Bolte) - Fix memory leak in qemudBuildCommandLine (Matthias Bolte) - avoid malfunction when virFileResolveLink is applied to non-POSIX FS (Jim Meyering) - libvirt.c: don't let a NULL "cpumaps" argument provoke a NULL-deref (Jim Meyering) - qemu migration: avoid NULL-deref given an invalid input (Jim Meyering) - qemu_driver.c: don't unlink(NULL) on OOM error path (Jim Meyering) - remote_driver.c: also zero out ->saslDecodedOffset member (Jim Meyering) - qemu_driver.c: avoid double free on error path (Jim Meyering) - libvirtd: avoid a NULL dereference on error path (Jim Meyering) - virsh: avoid double-free (Jim Meyering) - node_device_driver.c: don't write beyond EOB for 4K-byte symlink (Jim Meyering) - Eliminate failure to delete empty storage pools (Laine Stump) - Fix use of virEventAddHandleImpl() (Jiri Denemark) - Fix possible NULL pointer dereference (Paolo Bonzini) - fix various breakages in qemu Dump command (Paolo Bonzini) - Fix reference leak in remoteDispatchStorageVolCreateXmlFrom (Matthias Bolte) - Fix memory leak in virStorageBackendCopyToFD (Matthias Bolte) - retrieve paused/running state at migration start (Paolo Bonzini) - fix migration of paused vms upon failure (Paolo Bonzini) - qemu driver: Fix segfault in libvirt/libvirtd when uri->path is NULL. (Richard Jones) - Fix a wellformedness problem in secret.rng (Diego Elio Pettenò) - Fix virDomainObj ref handling in QEMU driver (Daniel P. Berrange) - Pull code to start CPUs executing out of qemudInitCpuAffinity() (Daniel P. Berrange) - Fix migration cancellation for QEMU (Daniel P. Berrange) - Fix crash when deleting monitor while a command is in progress (Daniel P. Berrange) - udev_device_get_devpath might return NULL (Guido Günther) - Fix some locking issues (Matthias Bolte) - Fix event test timer checks on kernels with HZ=100 (Daniel P. Berrange) - Fix threading problems in python bindings (Daniel P. Berrange) - Supress annoying libcap-ng errors from valgrind (Daniel P. Berrange) - Fix two leaks in test driver (Daniel P. Berrange) - Free cgroup device ACL list on driver shutdown (Daniel P. Berrange) - xen: Fix unconditional freeing in xenDaemonListDefinedDomains() (Matthias Bolte) - Fix default disk type when parsing QEMU argv (Daniel P. Berrange) - remove port filter when network device is detached (Gerhard Stenzel) Improvements: - convert missing server entry points into unsupported errors (Daniel Veillard) - fix some error report when on remote access (Olivier Fourdan) - Disable JSON mode monitor until QEMU is more mature (Daniel P. Berrange) - Only probe for CPU models if required (Jiri Denemark) - Add cpu_map.xml to libvirt.spec (Jiri Denemark) - Install cpu_map.xml (Jiri Denemark) - esx: Don't warn about '/' paths (Matthias Bolte) - esx: Extend vCenter query parameter (Matthias Bolte) - esx: Improve domain lookup by UUID (Matthias Bolte) - build: update gnulib submodule to latest (Jim Meyering) - Relax the allowed values for machine type in schema (Daniel Veillard) - Implement --pool option for virsh vol-path (Dave Allan) - nodedev: Add removable storage 'media_label' prop (Cole Robinson) - add --live support to "virsh dump" (Paolo Bonzini) - add --crash support to "virsh dump" (Paolo Bonzini) - Get QEMU pty paths from the monitor (Matthew Booth) - Extract the assigned pty device for QEmu channels (Matthew Booth) - Make QEMU driver use -chardev everywhere if available (Matthew Booth) - add virsh --suspend arg to migrate command (Paolo Bonzini) - reload iptables rules on libvirtd restart (Mark McLoughlin) - reload iptables rules simply by re-adding them (Mark McLoughlin) - Plumb domain description tag in xend backend (Jim Fehlig) - Make QEMU text monitor parsing more robust (Daniel P. Berrange) - Hook up JSON monitor to emit basic lifecycle events (Daniel P. Berrange) - Add QEMU monitor callbacks for basic lifecycle events (Daniel P. Berrange) - Switch over to passing a callback table to QEMU monitor (Daniel P. Berrange) - Introduce callbacks for serializing domain object private data to XML (Daniel P. Berrange) - Switch LXC driver to use a private data blob for virDomainObj state (Daniel P. Berrange) - Switch UML driver to use a private data blob for virDomainObj state (Daniel P. Berrange) - Add a 'format' arg to qemuMonitorChangeMedia() since JSON will support it (Daniel P. Berrange) - Introduce a simple API for handling JSON data (Daniel P. Berrange) - Add --system flag to autogen.sh to make it easy to build with right prefix (Daniel P. Berrange) - Export all symbols from xml.h for internal use (Jiri Denemark) - vbox: Use virIndexToDiskName() in vboxGenerateMediumName() (Matthias Bolte) - Tests for interface type/model configuration (Jiri Denemark) - Add virIndexToDiskName and fix mapping gap (Matthias Bolte) - Add another SENTINEL attribute (Paolo Bonzini) - Fix help message (Wolfgang Mauerer) - Alternate CPU affinity impl to cope with NR_CPUS > 1024 (Daniel P. Berrange) Cleanups: - The secret driver is stateful, link it directly to libvirtd (Matthias Bolte) - Remove undefined symbols from libvirt_private.syms (Matthias Bolte) - boolean shadows a typedef in rpcndr.h when compiled with MinGW (Matthias Bolte) - Rename DATADIR to PKGDATADIR to fix win32 build (Jiri Denemark) - Move cpu_map.xml to -client RPM (Jiri Denemark) - Fix undefined reference to 'close_used_without_including_unistd_h' (Matthias Bolte) - Fix argument type of virProcessInfoSetAffinity dummy function (Matthias Bolte) - esx: Use occurrence enum to specify expected result of a SOAP call (Matthias Bolte) - esx: Fix occurence typo (Matthias Bolte) - esx: Removed unused inttypes.h include (Matthias Bolte) - esx: Replace libxml1 'xmlChildrenNode' with libxml2 'children' (Matthias Bolte) - esx: Use more suitable error code in esxVI_LookupVirtualMachineByUuid() (Matthias Bolte) - esx: Add automatic question handling (Matthias Bolte) - avoid calling exit with a constant; use EXIT_* instead (Jim Meyering) - maint: remove from VC two gnulib-provided files (Jim Meyering) - xm_internal.c: remove misleading dead code (Jim Meyering) - Cleanup temporary #define after use (Matthew Booth) - Suppress cgroup error message on sucess startup (Ryota Ozaki) - Small change of RNG syntax for domain (Diego Elio Pettenò) - remove iptablesReloadRules() and related code (Mark McLoughlin) - remove all traces of lokkit support (Mark McLoughlin) - Add virBufferFreeAndReset() and replace free() (Matthias Bolte) - Fix the news file non-ascii characters (Daniel Veillard) - Add missing commas to the 0.7.4 news section (Matthias Bolte) - Change generated HTML to UTF-8 encoding (Daniel Veillard) - Avoid an type-punned pointer aliasing pbm (Daniel Veillard) - Move qemuMonitorEscape + migrate status enum into shared monitor code (Daniel P. Berrange) - vbox: Update IIDs from version 3.1-beta2 to 3.1-final (Matthias Bolte) - Fix ReprotError vs ReportError typo in JSON code (Daniel P. Berrange) - Fix inverted conditional test in configure.ac check for yajl (Daniel P. Berrange) - Pull schedular affinity code out into a separate module (Daniel P. Berrange) - Ignore docs/ directory for strcmp() syntax check (Daniel P. Berrange) Again a lot of work in this release, thanks everybody for your contributions, enjoy and I wish you a good end of year ! 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/

1 0

[libvirt] New libvirt API for domain memory statistics reporting (V3)
by Adam Litke 24 Dec '09

24 Dec '09

Daniel, Daniel, and Matthias: Thanks for your review. This series addresses almost all of your most recent comments. I am still working on writing a decent implementation for the test driver but I wanted to get these updates out right away. Changes since V2: * Ported to GIT HEAD for easier merging :) * Amounts of memory are now reported in kilobytes * Added flags parameter to API (currently unused) * Moved to less awkward xdr wire format for remote driver * Stats 'Free' and 'Total' renamed to 'Unused' and 'Available' * Various small fixups: constant names, data types, etc Changes since V1: * New system for maintaining ABI compatibility and API extensibility: Rather than passing around a fixed-size stats structure, work with arrays of stats. An enum of known statistic tags (SWAP_IN, SWAP_OUT, TOTAL_MEM, etc) is defined. A stat is defined as a tag/value pair. When making a call to the API, the caller provides an array of stats and the size of the array. That array is filled with up to the requested number of stats (depending on hypervisor and guest support). The number of stats provided is returned. * Miscellaneous changes: Changed the API function from virDomainMemStats to virDomainMemoryStats Added documentation for each memory stat -- When using ballooning to manage overcommitted memory on a host, a system for guests to communicate their memory usage to the host can provide information that will minimize the impact of ballooning on the guests while maximizing efficient use of host memory. The design of such a communication channel was recently added to version 0.8.2 of the VirtIO Spec (See Appendix G): - http://ozlabs.org/~rusty/virtio-spec/virtio-spec-0.8.2.pdf Host-side and guest-side implementations have been accepted for inclusion in their respective projects: - Guest: http://lkml.org/lkml/2009/11/30/274 - Host: http://lists.gnu.org/archive/html/qemu-devel/2009-12/msg00380.html The following patch series implements a new libvirt interface to expose these memory statistics. Thank you for your review and comments. [PATCH 1/6] domMemoryStats: Add domainMemoryStats method to struct _virDriver [PATCH 2/6] domMemoryStats: Add public symbol to libvirt API [PATCH 3/6] qemu-driver: Enable domainMemStats in the qemu driver [PATCH 4/6] remote-driver: Add domainMemoryStats support [PATCH 5/6] virsh: Enable virDomainMemoryStats as a new command [PATCH 6/6] python: Add python bindings for virDomainMemoryStats

4 15

[libvirt] [PATCH] The secret driver is stateful, link it directly to libvirtd
by Matthias Bolte 24 Dec '09

24 Dec '09

All other stateful drivers are linked directly to libvirtd instead of libvirt.so. Link the secret driver to libvirtd too. * daemon/Makefile.am: link the secret driver to libvirtd * src/Makefile.am: don't link the secret driver to libvirt.so * src/libvirt_private.syms: remove the secretRegister symbol --- daemon/Makefile.am | 2 ++ src/Makefile.am | 3 ++- src/libvirt_private.syms | 2 -- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index ab3f238..f6b6a3a 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -110,6 +110,8 @@ endif if WITH_NODE_DEVICES libvirtd_LDADD += ../src/libvirt_driver_nodedev.la endif + + libvirtd_LDADD += ../src/libvirt_driver_secret.la endif libvirtd_LDADD += ../src/libvirt.la diff --git a/src/Makefile.am b/src/Makefile.am index 42108c0..526d985 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -598,7 +598,8 @@ if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_secret.la else noinst_LTLIBRARIES += libvirt_driver_secret.la -libvirt_la_LIBADD += libvirt_driver_secret.la +# Stateful, so linked to daemon instead +#libvirt_la_LIBADD += libvirt_driver_secret.la endif libvirt_driver_secret_la_CFLAGS = \ -I@top_srcdir@/src/conf diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index f90f269..31c944c 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -456,8 +456,6 @@ virSecretDefParseString; virSecretDefParseFile; virSecretDefFormat; -# secret_driver.h -secretRegister; # security.h virSecurityDriverVerify; -- 1.6.0.4

2 3

[libvirt] [PATCH] Move cpu_map.xml to -client RPM
by Jiri Denemark 23 Dec '09

23 Dec '09

All the cpu code is part of libvirt library and it might be used by drivers which do not require libvirtd to be running. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- libvirt.spec.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index e1d4e53..9b4f2c6 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -687,8 +687,6 @@ fi %{_datadir}/libvirt/networks/default.xml %endif -%{_datadir}/libvirt/cpu_map.xml - %dir %{_localstatedir}/run/libvirt/ %dir %{_localstatedir}/lib/libvirt/ @@ -776,6 +774,8 @@ fi %{_datadir}/libvirt/schemas/secret.rng %{_datadir}/libvirt/schemas/storageencryption.rng +%{_datadir}/libvirt/cpu_map.xml + %if %{with_sasl} %config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf %endif -- 1.6.6.rc4

2 2

[libvirt] [PATCH] Remove undefined symbols from libvirt_private.syms
by Matthias Bolte 23 Dec '09

23 Dec '09

MinGW's ld gives an error when trying to export undefined symbols. --- src/libvirt_private.syms | 4 ---- src/util/network.h | 4 ---- 2 files changed, 0 insertions(+), 8 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 31c944c..10940eb 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -362,7 +362,6 @@ virFree; # network.h -virSocketAddrInNetwork; virSocketAddrIsNetmask; virSocketCheckNetmask; virSocketFormatAddr; @@ -435,8 +434,6 @@ pciDeviceListDel; pciDeviceFileIterate; pciDeviceListCount; pciDeviceListGet; -pciDeviceListLock; -pciDeviceListUnlock; pciDeviceListSteal; @@ -503,7 +500,6 @@ virStoragePoolObjUnlock; # storage_encryption_conf.h virStorageEncryptionFree; -virStorageEncryptionDropSecrets; virStorageEncryptionParseNode; virStorageEncryptionFormat; virStorageGenerateQcowPassphrase; diff --git a/src/util/network.h b/src/util/network.h index 3762ef2..d5c2c9b 100644 --- a/src/util/network.h +++ b/src/util/network.h @@ -40,10 +40,6 @@ int virSocketSetPort(virSocketAddrPtr addr, int port); int virSocketGetPort(virSocketAddrPtr addr); -int virSocketAddrInNetwork(virSocketAddrPtr addr1, - virSocketAddrPtr addr2, - virSocketAddrPtr netmask); - int virSocketGetRange (virSocketAddrPtr start, virSocketAddrPtr end); -- 1.6.0.4

2 1

[libvirt] [PATCH] boolean shadows a typedef in rpcndr.h when compiled with MinGW
by Matthias Bolte 23 Dec '09

23 Dec '09

Alter the offending variable names to fix this. --- src/esx/esx_vi.h | 2 +- src/esx/esx_vi_types.h | 4 ++-- src/util/json.c | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index 840a3c3..f76689c 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -138,7 +138,7 @@ struct _esxVI_Enumeration { int esxVI_Enumeration_CastFromAnyType(virConnectPtr conn, const esxVI_Enumeration *enumeration, - esxVI_AnyType *anyType, int *boolean); + esxVI_AnyType *anyType, int *value); int esxVI_Enumeration_Serialize(virConnectPtr conn, const esxVI_Enumeration *enumeration, int value, const char *element, diff --git a/src/esx/esx_vi_types.h b/src/esx/esx_vi_types.h index 4183324..77f712e 100644 --- a/src/esx/esx_vi_types.h +++ b/src/esx/esx_vi_types.h @@ -131,11 +131,11 @@ enum _esxVI_Boolean { esxVI_Boolean_False, }; -int esxVI_Boolean_Serialize(virConnectPtr conn, esxVI_Boolean boolean, +int esxVI_Boolean_Serialize(virConnectPtr conn, esxVI_Boolean boolean_, const char *element, virBufferPtr output, esxVI_Boolean required); int esxVI_Boolean_Deserialize(virConnectPtr conn, xmlNodePtr node, - esxVI_Boolean *boolean); + esxVI_Boolean *boolean_); diff --git a/src/util/json.c b/src/util/json.c index 35f6e52..4b3e629 100644 --- a/src/util/json.c +++ b/src/util/json.c @@ -201,7 +201,7 @@ virJSONValuePtr virJSONValueNewNumberDouble(double data) } -virJSONValuePtr virJSONValueNewBoolean(int boolean) +virJSONValuePtr virJSONValueNewBoolean(int boolean_) { virJSONValuePtr val; @@ -209,7 +209,7 @@ virJSONValuePtr virJSONValueNewBoolean(int boolean) return NULL; val->type = VIR_JSON_TYPE_BOOLEAN; - val->data.boolean = boolean; + val->data.boolean = boolean_; return val; } @@ -350,9 +350,9 @@ int virJSONValueObjectAppendNumberDouble(virJSONValuePtr object, const char *key return 0; } -int virJSONValueObjectAppendBoolean(virJSONValuePtr object, const char *key, int boolean) +int virJSONValueObjectAppendBoolean(virJSONValuePtr object, const char *key, int boolean_) { - virJSONValuePtr jvalue = virJSONValueNewBoolean(boolean); + virJSONValuePtr jvalue = virJSONValueNewBoolean(boolean_); if (!jvalue) return -1; if (virJSONValueObjectAppend(object, key, jvalue) < 0) { @@ -688,12 +688,12 @@ static int virJSONParserHandleNull(void * ctx) return 1; } -static int virJSONParserHandleBoolean(void * ctx, int boolean) +static int virJSONParserHandleBoolean(void * ctx, int boolean_) { virJSONParserPtr parser = ctx; - virJSONValuePtr value = virJSONValueNewBoolean(boolean); + virJSONValuePtr value = virJSONValueNewBoolean(boolean_); - VIR_DEBUG("parser=%p boolean=%d", parser, boolean); + VIR_DEBUG("parser=%p boolean=%d", parser, boolean_); if (!value) return 0; -- 1.6.0.4

2 1

[libvirt] Problem about Libvirt and Virtualbox....
by Prashant Wakchaure 23 Dec '09

23 Dec '09

Hello, Currently I am working on libvirt API and I am trying to connect virtualbox with libvirt. I using ubuntu 9.10 and libvirt 0.7.0 but I am unable to connect to virtualbox (3.1.2) to the libvirt. Please guide me..... Waiting for your replay.....

2 1