- Devel - libvirt List Archives

[libvirt] [PATCH] 526769 change logrotate config default to weekly
by Daniel Veillard 06 Oct '09

06 Oct '09

https://bugzilla.redhat.com/show_bug.cgi?id=526769 Current setup is daily with 7 backups so one week worth of logs per domain in /var/log/libvirt/qemu/*.log First a week worth of backup is a bit short, second for most domains the logs are really small, and with 7 backup files this directory gets crowded quickly. This patches changes to weekly, with 4 backups, so always a month worth of logs, and will nearly cut in half the number of entries in that directory. Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

3 6

[libvirt] Regarding connecting to libvirt from windows
by anuj rampal 06 Oct '09

06 Oct '09

Hi, I can connect to libvirt over TCP/IP from windows and call all the functions. what i want is to do some kind of authentication like entering some kind of username/password. im using virConnectOpen(const char* name) function. i tried using virConnectOpenAuth().. but whatever parameter ii give it gets connected and there is no option to pass username/password. Thanks in advance. Regards Anuj

1 0

[libvirt] Creating Guest OS in Virtual Box
by santosh gandham 06 Oct '09

06 Oct '09

Hi, I am trying to create Guest OS (VM) in virtualBox throught libvirt. I installed libvirt 0.7.0 and created the template as <domain type='vbox'> <name>ubuntu</name> <os> <type>hvm</type> <boot dev='hd'/> </os> <memory>542720</memory> <vcpu>1</vcpu> <devices> <disk type='file' device='disk'> <source file='/home/santhosh/Desktop/ubuntu9.vdi'/> <target dev='hdd'/> </disk> <graphics type='rdp' port='3386'/> </devices> </domain> Then I issued this command $ virsh -c vbox:///session define /home/santhosh/Desktop/ubun.tmpl Domain ubuntu defined from /home/santhosh/Desktop/ubun.tmpl When I open VirtualBox, it has created a domain named "ubuntu". All the parameters specified in the template file are set except "Hard disks" . So, when I start the VM, I am left with boot errors 00:00:06.318 Guest Log: BIOS: int13_harddisk: function 02, unmapped device for ELDL=80 00:00:06.319 Guest Log: BIOS: Boot from Hard Disk 0 failed 00:00:06.321 Guest Log: Could not read from the boot medium! System halted. It is unable to boot from the disk image which I specified in the template and I am sure the path specified to disk image in the template is correct. I am unable to diagnize and find where is the error. Can any one help me here to know what might be the problem and what should I do. Thank you. Best Regards, Gandham Santhosh

2 3

[libvirt] USB node devices info
by Daniel Berteaud 05 Oct '09

05 Oct '09

Hi there. I have a problem with USB host device enumeration with libvirt. I'm running libvirt 0.7.0 on a fully updated CentOS 5.3 (libvirt was rebuilt unmodified from http://libvirt.org/sources/libvirt-0.7.0-1.fc11.src.rpm) I want to pas an USB key to one of my guest. lsusb see it just fine: (I want to pass the device 13fe:1d23) Bus 005 Device 001: ID 0000:0000 Bus 005 Device 002: ID 046b:ff10 American Megatrends, Inc. Bus 004 Device 001: ID 0000:0000 Bus 007 Device 001: ID 0000:0000 Bus 006 Device 001: ID 0000:0000 Bus 008 Device 001: ID 0000:0000 Bus 002 Device 006: ID 13fe:1d23 Kingston Technology Company Inc. Bus 002 Device 001: ID 0000:0000 Bus 001 Device 001: ID 0000:0000 Bus 003 Device 001: ID 0000:0000 Bus 003 Device 002: ID 413c:2003 Dell Computer Corp. Keyboard If I create a XML file for this device, I can attach it to my guest with virsh attach-device, no problem here. The problem is that libvirt cannot access the devices informations like pretty name, vendorID and productID, so for example, virt-manager only see devices with name "USB Raw Device Access" with 0000 as vendorID and productID. For example, for this particular USB key: virsh nodedev-dumpxml usb_device_13fe_1d23_07780BA646FD_0_usbraw <device> <name>usb_device_13fe_1d23_07780BA646FD_0_usbraw</name> <parent>usb_device_13fe_1d23_07780BA646FD_0</parent> <capability type='usb_device'> <bus>0</bus> <device>0</device> <product id='0x0000'>USB Raw Device Access</product> <vendor id='0x0000' /> </capability> </device> SELinux is in permissive mode. Anybody have an idea ? Where does libvirt get the info about host device ? (/sys ?) Regards, Daniel -- Daniel Berteaud FIREWALL-SERVICES SARL. Société de Services en Logiciels Libres Technopôle Montesquieu 33650 MARTILLAC Tel : 05 56 64 15 32 Fax : 05 56 64 15 32 Mail: daniel(a)firewall-services.com Web : http://www.firewall-services.com

1 0

[libvirt] regarding libvirtd start
by santosh gandham 05 Oct '09

05 Oct '09

Hi, I have installed libvirt 0.7.0. in fedora 11. When I start libvirt by using #libvirtd start , it is not showing any status message like libvirtd has started. The command line stuck up there itself. What is the problem? What should I do to run the libvirtd successfully? Thank you. -- Gandham Santhosh

2 1

[libvirt] [PATCH 0/5] test: Add node device driver
by Cole Robinson 05 Oct '09

05 Oct '09

The following patches implement a basic node device driver for the test hypervisor driver. This is useful for unit tests in libvirt users (particularly virtinst). Cole Robinson (5): nodedev: Add locking in nodeNumOfDevices nodedev: Break out virNodeDeviceHasCap to node_conf test: Implement node device driver. node conf: Make parsing routines consistent with other drivers test: Support loading node device info from file/XML examples/xml/test/testdev.xml | 16 ++ examples/xml/test/testnode.xml | 1 + examples/xml/test/testnodeinline.xml | 19 +++ src/conf/node_device_conf.c | 57 ++++++- src/conf/node_device_conf.h | 11 ++ src/libvirt_private.syms | 1 + src/node_device/node_device_driver.c | 22 +-- src/test/test_driver.c | 291 +++++++++++++++++++++++++++++++++- 8 files changed, 396 insertions(+), 22 deletions(-) create mode 100644 examples/xml/test/testdev.xml

2 11

[libvirt] [PATCH] test: Throw a proper error in GetBridgeName
by Cole Robinson 05 Oct '09

05 Oct '09

Throw error in GetBridgeName if net has no bridge. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/test/test_driver.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index f57c92a..30014fc 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -2546,8 +2546,14 @@ static char *testNetworkGetBridgeName(virNetworkPtr network) { goto cleanup; } - if (privnet->def->bridge && - !(bridge = strdup(privnet->def->bridge))) { + if (!(privnet->def->bridge)) { + testError(network->conn, VIR_ERR_INTERNAL_ERROR, + _("network '%s' does not have a bridge name."), + privnet->def->name); + goto cleanup; + } + + if (!(bridge = strdup(privnet->def->bridge))) { virReportOOMError(network->conn); goto cleanup; } -- 1.6.5.rc2

3 3

[libvirt] [PATCHv2 0/8] Python related fixes
by Cole Robinson 05 Oct '09

05 Oct '09

The following series fixes various issues related to the python bindings. Cole Robinson (8): configure: Add explict --with-python option. python: Remove FastParser from generator. python: Remove use of xmllib in generator.py python: Don't generate conflicting conn.createXML functions. python: Don't generate bindings for vir*Ref python: Use a pure python implementation of 'vir*GetConnect' python: Fix generated virInterface method names python: Add a newline after custom classes configure.in | 6 ++- python/generator.py | 117 ++++++++++++++++++++++----------------------------- 2 files changed, 55 insertions(+), 68 deletions(-)

3 20

[libvirt] A first look at the node device libudev backend
by Dave Allan 05 Oct '09

05 Oct '09

Hi all, Here is a first cut at the node device backend. The only devices implemented are part of storage and PCI devices, but it's conceptually finished. The remaining work is implementing the other device properties and types. Before I go do that, I'd like to get feedback on my approach. Since libudev doesn't have the concept of capabilities the way HAL does, Chris Lalancette and I thought it made more sense and rendered much more readable code to implement each device type in a single function and avoid the indirection created by the caps_tbl structure containing a function pointer. Monitoring of libudev for new devices is not implemented, but I'm not too concerned about that at this point. As Dan Berrange suggested on IRC, putting a call in the main loop to poll the monitor file descriptor will do the job. Dave >From 34fa8bf6ce1b72276dc73f292ae12a9dd1ab2433 Mon Sep 17 00:00:00 2001 From: David Allan <dallan(a)redhat.com> Date: Fri, 25 Sep 2009 10:59:28 -0400 Subject: [PATCH 1/1] A first look at the libudev node device backend. Thanks to Jiri for the build system changes and to Chris Lalancette for his code and suggestions on how this backend should be implemented. Storage device properties are partly populated and PCI devices are discovered, but all other devices are as yet unimplemented. --- configure.in | 47 ++- daemon/libvirtd.c | 3 +- src/Makefile.am | 16 +- src/node_device/node_device_driver.c | 3 + src/node_device/node_device_driver.h | 22 + src/node_device/node_device_hal.h | 19 - ...evice_hal_linux.c => node_device_linux_sysfs.c} | 0 src/node_device/node_device_udev.c | 627 ++++++++++++++++++++ src/node_device/node_device_udev.h | 27 + src/util/util.c | 46 ++ src/util/util.h | 4 + 11 files changed, 788 insertions(+), 26 deletions(-) rename src/node_device/{node_device_hal_linux.c => node_device_linux_sysfs.c} (100%) create mode 100644 src/node_device/node_device_udev.c create mode 100644 src/node_device/node_device_udev.h diff --git a/configure.in b/configure.in index cb5ce55..356abb7 100644 --- a/configure.in +++ b/configure.in @@ -1560,7 +1560,7 @@ test "$enable_shared" = no && lt_cv_objdir=. LV_LIBTOOL_OBJDIR=${lt_cv_objdir-.} AC_SUBST([LV_LIBTOOL_OBJDIR]) -dnl HAL or DeviceKit library for host device enumeration +dnl HAL, DeviceKit, or libudev library for host device enumeration HAL_REQUIRED=0.0 HAL_CFLAGS= HAL_LIBS= @@ -1654,8 +1654,46 @@ AM_CONDITIONAL([HAVE_DEVKIT], [test "x$with_devkit" = "xyes"]) AC_SUBST([DEVKIT_CFLAGS]) AC_SUBST([DEVKIT_LIBS]) +UDEV_REQUIRED=143 +UDEV_CFLAGS= +UDEV_LIBS= +AC_ARG_WITH([udev], + [ --with-udev use libudev for host device enumeration], + [], + [with_udev=check]) + +if test "$with_libvirtd" = "no" ; then + with_udev=no +fi +if test "x$with_udev" = "xyes" -o "x$with_udev" = "xcheck"; then + PKG_CHECK_MODULES(UDEV, libudev >= $UDEV_REQUIRED, + [with_udev=yes], [ + if test "x$with_udev" = "xcheck" ; then + with_udev=no + else + AC_MSG_ERROR( + [You must install udev-devel >= $UDEV_REQUIRED to compile libvirt]) + fi + ]) + if test "x$with_udev" = "xyes" ; then + AC_DEFINE_UNQUOTED([HAVE_UDEV], 1, + [use UDEV for host device enumeration]) + + old_CFLAGS=$CFLAGS + old_LDFLAGS=$LDFLAGS + CFLAGS="$CFLAGS $UDEV_CFLAGS" + LDFLAGS="$LDFLAGS $UDEV_LIBS" + AC_CHECK_FUNCS([udev_new],,[with_udev=no]) + CFLAGS="$old_CFLAGS" + LDFLAGS="$old_LDFLAGS" + fi +fi +AM_CONDITIONAL([HAVE_UDEV], [test "x$with_udev" = "xyes"]) +AC_SUBST([UDEV_CFLAGS]) +AC_SUBST([UDEV_LIBS]) + with_nodedev=no; -if test "$with_devkit" = "yes" -o "$with_hal" = "yes"; +if test "$with_devkit" = "yes" -o "$with_hal" = "yes" -o "$with_udev" = "yes"; then with_nodedev=yes AC_DEFINE_UNQUOTED([WITH_NODE_DEVICES], 1, [with node device driver]) @@ -1815,6 +1853,11 @@ AC_MSG_NOTICE([ devkit: $DEVKIT_CFLAGS $DEVKIT_LIBS]) else AC_MSG_NOTICE([ devkit: no]) fi +if test "$with_udev" = "yes" ; then +AC_MSG_NOTICE([ udev: $UDEV_CFLAGS $UDEV_LIBS]) +else +AC_MSG_NOTICE([ udev: no]) +fi if test "$with_netcf" = "yes" ; then AC_MSG_NOTICE([ netcf: $NETCF_CFLAGS $NETCF_LIBS]) else diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 2bae782..c60a09f 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -832,8 +832,7 @@ static struct qemud_server *qemudInitialize(int sigread) { #ifdef WITH_STORAGE_DIR storageRegister(); #endif -#if defined(WITH_NODE_DEVICES) && \ - (defined(HAVE_HAL) || defined(HAVE_DEVKIT)) +#if defined(WITH_NODE_DEVICES) nodedevRegister(); #endif secretRegister(); diff --git a/src/Makefile.am b/src/Makefile.am index 9cbec47..b4328d6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -237,16 +237,20 @@ SECURITY_DRIVER_SELINUX_SOURCES = \ NODE_DEVICE_DRIVER_SOURCES = \ - node_device/node_device_driver.c node_device/node_device_driver.h + node_device/node_device_driver.c \ + node_device/node_device_driver.h \ + node_device/node_device_linux_sysfs.c NODE_DEVICE_DRIVER_HAL_SOURCES = \ node_device/node_device_hal.c \ - node_device/node_device_hal.h \ - node_device/node_device_hal_linux.c + node_device/node_device_hal.h NODE_DEVICE_DRIVER_DEVKIT_SOURCES = \ node_device/node_device_devkit.c +NODE_DEVICE_DRIVER_UDEV_SOURCES = \ + node_device/node_device_udev.c + ######################### # @@ -626,6 +630,11 @@ libvirt_driver_nodedev_la_SOURCES += $(NODE_DEVICE_DRIVER_DEVKIT_SOURCES) libvirt_driver_nodedev_la_CFLAGS += $(DEVKIT_CFLAGS) libvirt_driver_nodedev_la_LDFLAGS += $(DEVKIT_LIBS) endif +if HAVE_UDEV +libvirt_driver_nodedev_la_SOURCES += $(NODE_DEVICE_DRIVER_UDEV_SOURCES) +libvirt_driver_nodedev_la_CFLAGS += $(UDEV_CFLAGS) +libvirt_driver_nodedev_la_LDFLAGS += $(UDEV_LIBS) +endif if WITH_DRIVER_MODULES libvirt_driver_nodedev_la_LDFLAGS += -module -avoid-version @@ -667,6 +676,7 @@ EXTRA_DIST += \ $(NODE_DEVICE_DRIVER_SOURCES) \ $(NODE_DEVICE_DRIVER_HAL_SOURCES) \ $(NODE_DEVICE_DRIVER_DEVKIT_SOURCES) \ + $(NODE_DEVICE_DRIVER_UDEV_SOURCES) \ $(SECURITY_DRIVER_SELINUX_SOURCES) \ $(SECRET_DRIVER_SOURCES) \ $(VBOX_DRIVER_EXTRA_DIST) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index 93ca28c..3d06ed1 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -760,5 +760,8 @@ int nodedevRegister(void) { #ifdef HAVE_DEVKIT return devkitNodeRegister(); #endif +#ifdef HAVE_UDEV + return udevNodeRegister(); +#endif #endif } diff --git a/src/node_device/node_device_driver.h b/src/node_device/node_device_driver.h index db01624..5be0781 100644 --- a/src/node_device/node_device_driver.h +++ b/src/node_device/node_device_driver.h @@ -45,6 +45,9 @@ int halNodeRegister(void); #ifdef HAVE_DEVKIT int devkitNodeRegister(void); #endif +#ifdef HAVE_UDEV +int udevNodeRegister(void); +#endif void nodeDeviceLock(virDeviceMonitorStatePtr driver); void nodeDeviceUnlock(virDeviceMonitorStatePtr driver); @@ -53,4 +56,23 @@ void registerCommonNodeFuncs(virDeviceMonitorPtr mon); int nodedevRegister(void); +#ifdef __linux__ + +#define check_fc_host(d) check_fc_host_linux(d) +int check_fc_host_linux(union _virNodeDevCapData *d); + +#define check_vport_capable(d) check_vport_capable_linux(d) +int check_vport_capable_linux(union _virNodeDevCapData *d); + +#define read_wwn(host, file, wwn) read_wwn_linux(host, file, wwn) +int read_wwn_linux(int host, const char *file, char **wwn); + +#else /* __linux__ */ + +#define check_fc_host(d) +#define check_vport_capable(d) +#define read_wwn(host, file, wwn) + +#endif /* __linux__ */ + #endif /* __VIR_NODE_DEVICE_H__ */ diff --git a/src/node_device/node_device_hal.h b/src/node_device/node_device_hal.h index c859fe3..8ac8a35 100644 --- a/src/node_device/node_device_hal.h +++ b/src/node_device/node_device_hal.h @@ -22,23 +22,4 @@ #ifndef __VIR_NODE_DEVICE_HAL_H__ #define __VIR_NODE_DEVICE_HAL_H__ -#ifdef __linux__ - -#define check_fc_host(d) check_fc_host_linux(d) -int check_fc_host_linux(union _virNodeDevCapData *d); - -#define check_vport_capable(d) check_vport_capable_linux(d) -int check_vport_capable_linux(union _virNodeDevCapData *d); - -#define read_wwn(host, file, wwn) read_wwn_linux(host, file, wwn) -int read_wwn_linux(int host, const char *file, char **wwn); - -#else /* __linux__ */ - -#define check_fc_host(d) -#define check_vport_capable(d) -#define read_wwn(host, file, wwn) - -#endif /* __linux__ */ - #endif /* __VIR_NODE_DEVICE_HAL_H__ */ diff --git a/src/node_device/node_device_hal_linux.c b/src/node_device/node_device_linux_sysfs.c similarity index 100% rename from src/node_device/node_device_hal_linux.c rename to src/node_device/node_device_linux_sysfs.c diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c new file mode 100644 index 0000000..22669ff --- /dev/null +++ b/src/node_device/node_device_udev.c @@ -0,0 +1,627 @@ +/* + * node_device_udev.c: node device enumeration - libudev implementation + * + * Copyright (C) 2009 Red Hat + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Dave Allan <dallan(a)redhat.com> + */ + +#include <config.h> +#include <libudev.h> +#include <regex.h> + +#include "node_device_udev.h" +#include "virterror_internal.h" +#include "node_device_conf.h" +#include "node_device_driver.h" +#include "driver.h" +#include "datatypes.h" +#include "uuid.h" +#include "logging.h" +#include "memory.h" +#include "util.h" + +#define VIR_FROM_THIS VIR_FROM_NODEDEV + +static virDeviceMonitorStatePtr driverState = NULL; + +static struct udev *udevGetUdev(void) +{ + return udev_monitor_get_udev(DRV_STATE_UDEV_MONITOR(driverState)); +} + + +static int udevGetSysfsData(char **data, const char *path) +{ + char *tmp = NULL; + FILE *fp = NULL; + int ret = -1; + + if (VIR_ALLOC_N(tmp, SYSFS_DATA_SIZE) != 0) { + goto out; + } + + memset(tmp, 0, SYSFS_DATA_SIZE); + + fp = fopen(path, "r"); + if (fp == NULL) { + goto out; + } + + if (fread(tmp, SYSFS_DATA_SIZE, 1, fp) == SYSFS_DATA_SIZE) { + goto out; + } + + /* strip off the trailing \n */ + tmp[strlen(tmp) - 1] = '\0'; + + /* return a block of memory containing only what was read; + * otherwise we will consume vast amounts of largely unused memory + * on systems with large numbers of devices. */ + *data = strdup(tmp); + if (*data == NULL) { + goto out; + } + + ret = 0; + +out: + VIR_FREE(tmp); + fclose(fp); + + return ret; +} + + +static int udevGetPCI(unsigned int *data, + const char *devpath, + const char *field) +{ + const char *syspath = NULL; + char *path = NULL, *tmp = NULL; + char *dummy; + int ret = 0; + + syspath = udev_get_sys_path(udevGetUdev()); + + if (virBuildPath(&path, syspath, devpath, field) != 0) { + goto out; + } + + if (udevGetSysfsData(&tmp, path) == 0) { + ret = virStrToLong_ui(tmp, &dummy, 16, data); + } + +out: + VIR_FREE(path); + return ret; +} + + +static int udevGetDMIData(char **data, + const char *field) +{ + const char *syspath = NULL; + char *path = NULL; + int ret = -1; + + syspath = udev_get_sys_path(udevGetUdev()); + + if (virBuildPath(&path, syspath, "class/dmi/id", field) == 0) { + ret = udevGetSysfsData(data, path); + VIR_FREE(path); + } + + return ret; +} + + +/* This function allocates memory from the heap for the property + * value. That memory must be later freed by some other code. */ +static int udevGetDeviceProperty(struct udev_device *udev_device, + const char *property_key, + char **property_value) +{ + const char *udev_value = NULL; + int ret = -1; + + udev_value = udev_device_get_property_value(udev_device, property_key); + if (udev_value == NULL) { + VIR_ERROR(_("udev reports property '%s' does not exist"), + property_key); + goto out; + } + + /* If this allocation is changed, the comment at the beginning + * of the function must also be changed. */ + *property_value = strdup(udev_value); + if (*property_value == NULL) { + VIR_ERROR(_("Failed to allocate memory for " + "property '%s' on device '%s'"), + property_key, udev_device_get_sysname(udev_device)); + goto out; + } + + ret = 0; + +out: + if (ret != 0) { + VIR_ERROR(_("Failed to get udev property '%s' for device '%s'"), + property_key, udev_device_get_sysname(udev_device)); + } + + return ret; +} + + +static int udevGetStringProperty(struct udev_device *udev_device, + const char *property_key, + char **value) +{ + return udevGetDeviceProperty(udev_device, property_key, value); +} + +/* +static int udevGetIntProperty(struct udev_device *udev_device, + const char *property_key, + int *value) +{ + char *udev_value = NULL; + int ret = 0; + + ret = udevGetDeviceProperty(udev_device, property_key, &udev_value); + + if (ret == 0) { + ret = virStrToLong_i(udev_value, NULL, 0, value); + } + + return ret; +} + + +static int udevGetUint64Property(struct udev_device *udev_device, + const char *property_key, + uint64_t *value) +{ + char *udev_value = NULL; + int ret = 0; + + ret = udevGetDeviceProperty(udev_device, property_key, &udev_value); + + if (ret == 0) { + ret = virStrToLong_ull(udev_value, NULL, 0, value); + } + + return ret; +} +*/ + +static void udevLogFunction(struct udev *udev ATTRIBUTE_UNUSED, + int priority ATTRIBUTE_UNUSED, + const char *file, + int line, + const char *fn, + const char *fmt, + va_list args) +{ + VIR_ERROR_INT(file, fn, line, fmt, args); +} + + +static void virUdevGetDeviceProperties(struct udev *udev, const char *name) +{ + struct udev_device *device = NULL; + struct udev_list_entry *list_entry = NULL; + + device = udev_device_new_from_syspath(udev, name); + + udev_list_entry_foreach(list_entry, + udev_device_get_properties_list_entry(device)) { + + VIR_ERROR(" name: '%s' value: '%s'\n", + udev_list_entry_get_name(list_entry), + udev_list_entry_get_value(list_entry)); + } + + udev_device_unref(device); + + return; +} + + +static int udevProcessPCI(struct udev_device *device, + virNodeDeviceDefPtr def) +{ + const char *devpath = NULL, *syspath = NULL; + int ret = -1; + + devpath = udev_device_get_devpath(device); + syspath = udev_device_get_syspath(device); + + if (VIR_ALLOC(def->caps) != 0) { + goto out; + } + + def->caps->type = VIR_NODE_DEV_CAP_PCI_DEV; + + char *p = strrchr(devpath, '/'); + if (p) { + virStrToLong_ui(p+1, &p, 16, &def->caps->data.pci_dev.domain); + virStrToLong_ui(p+1, &p, 16, &def->caps->data.pci_dev.bus); + virStrToLong_ui(p+1, &p, 16, &def->caps->data.pci_dev.slot); + virStrToLong_ui(p+1, &p, 16, &def->caps->data.pci_dev.function); + } + + if (udevGetPCI(&def->caps->data.pci_dev.vendor, devpath, "vendor") || + udevGetPCI(&def->caps->data.pci_dev.product, devpath, "device")) { + goto out; + } + + /* FIXME: to do the vendor name and product name, we have to + * parse /usr/share/hwdata/pci.ids. Look in hal/hald/ids.c + */ + + ret = 0; + +out: + return ret; +} + + +static int udevProcessStorage(struct udev_device *device, + virNodeDeviceDefPtr def) +{ + const char *devpath = NULL; + struct udev_list_entry *list_entry = NULL; + int ret = -1; + + devpath = udev_device_get_devpath(device); + + /* Can we get libudev to add device subtypes? */ + if (STRPREFIX(devpath, "/devices/virtual/block")) { + goto out; + } + + if (VIR_ALLOC(def->caps) != 0) { + goto out; + } + + def->caps->type = VIR_NODE_DEV_CAP_STORAGE; + + def->caps->data.storage.block = strdup(udev_device_get_devnode(device)); + /* Can we get libudev to add subtypes? */ + def->caps->data.storage.drive_type = strdup("disk"); + + udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(device)) { + if (STREQ(udev_list_entry_get_name(list_entry), "/dev/cdrom")) { + VIR_FREE(def->caps->data.storage.drive_type); + def->caps->data.storage.drive_type = strdup("cdrom"); + } + } + + /* These lines are somewhat more than 80 col, but I think the code + * is more readable if they aren't broken up. */ + if (udevGetStringProperty(device, "DEVNAME", &def->caps->data.storage.block)) { + /* None of these properties are available through libudev... + udevGetStringProperty(device, "ID_MODEL", &def->caps->data.storage.model) || + udevGetStringProperty(device, "ID_VENDOR", &def->caps->data.storage.vendor) || + udevGetStringProperty(device, "ID_SERIAL", &def->caps->data.storage.serial)) { + */ + goto out; + } + ret = 0; + +out: + return ret; +} + + +static int udevProcessOneDevice(struct udev_device *device, + virNodeDeviceDefPtr def) +{ + virNodeDeviceObjPtr dev = NULL; + const char *devtype = NULL, *devpath = NULL; + regex_t pci_rec; + int ret = -1; + + /* How to handle parent devices? Shall we change the meaning of + * the parent pointer for the udev backend? What does client code + * use the parent relationship for? We really want to preserve + * the behavior of the HAL backend, but that may be difficult in + * practice. */ + //parent = udev_device_get_parent(device); + + devtype = udev_device_get_devtype(device); + devpath = udev_device_get_devpath(device); + + regcomp(&pci_rec, + "^/devices/pci[0-9]{4}:[0-9]{2}/[0-9]{4}:[0-9]{2}:[0-9]{2}.[0-9]$", + REG_EXTENDED | REG_NOSUB); + + if (devtype != NULL && STREQ(devtype, "disk")) { + ret = udevProcessStorage(device, def); + } else if (regexec(&pci_rec, devpath, 0, NULL, 0) == 0) { + /* This is puzzling...why isn't there a devtype for pci in libudev? */ + ret = udevProcessPCI(device, def); + } + + if (ret == 0) { + dev = virNodeDeviceAssignDef(NULL, &driverState->devs, def); + virNodeDeviceObjUnlock(dev); + } + + return ret; +} + + +static int udevProcessDeviceListEntry(struct udev *udev, + struct udev_list_entry *list_entry) +{ + struct udev_device *device; + virNodeDeviceDefPtr def = NULL; + const char *name = NULL; + int ret = -1; + + name = udev_list_entry_get_name(list_entry); + + if (VIR_ALLOC(def) != 0) { + goto out; + } + + def->name = strdup(name); + if (def->name == NULL) { + goto out; + } + + device = udev_device_new_from_syspath(udev, name); + if (device != NULL) { + udevProcessOneDevice(device, def); + udev_device_unref(device); + ret = 0; + } + +out: + return ret; +} + + +static int udevEnumerateDevices(struct udev *udev) +{ + struct udev_enumerate *udev_enumerate = NULL; + struct udev_list_entry *list_entry = NULL; + const char *name = NULL; + int ret = 0; + + udev_enumerate = udev_enumerate_new(udev); + + ret = udev_enumerate_scan_devices(udev_enumerate); + if (0 != ret) { + VIR_ERROR("udev scan devices returned %d\n", ret); + goto out; + } + + udev_list_entry_foreach(list_entry, + udev_enumerate_get_list_entry(udev_enumerate)) { + + udevProcessDeviceListEntry(udev, list_entry); + name = udev_list_entry_get_name(list_entry); + virUdevGetDeviceProperties(udev, name); + } + +out: + udev_enumerate_unref(udev_enumerate); + return ret; +} + + +static int udevDeviceMonitorShutdown(void) +{ + int ret = 0; + + struct udev_monitor *udev_monitor = NULL; + struct udev *udev = NULL; + + if (driverState) { + + nodeDeviceLock(driverState); + udev_monitor = DRV_STATE_UDEV_MONITOR(driverState); + + if (udev_monitor != NULL) { + udev = udev_monitor_get_udev(udev_monitor); + udev_monitor_unref(udev_monitor); + } + + if (udev != NULL) { + udev_unref(udev); + } + + virNodeDeviceObjListFree(&driverState->devs); + nodeDeviceUnlock(driverState); + virMutexDestroy(&driverState->lock); + VIR_FREE(driverState); + + } else { + ret = -1; + } + + return ret; +} + + +static int udevSetupSystemDev(void) +{ + virNodeDeviceDefPtr def = NULL; + virNodeDeviceObjPtr dev = NULL; + char *tmp = NULL; + int ret = -1; + + if (VIR_ALLOC(def) != 0) { + goto out; + } + + def->name = strdup("system"); + if (def->name == NULL) { + goto out; + } + + if (VIR_ALLOC(def->caps) != 0) { + goto out; + } + + /* These lines are somewhat more than 80 col, but I think the code + * is more readable if they aren't broken up. */ + if (udevGetDMIData(&def->caps->data.system.product_name, "product_name") || + udevGetDMIData(&def->caps->data.system.hardware.vendor_name, "sys_vendor") || + udevGetDMIData(&def->caps->data.system.hardware.version, "product_version") || + udevGetDMIData(&def->caps->data.system.hardware.serial, "product_serial")) { + goto out; + } + + udevGetDMIData(&tmp, "product_uuid"); + virUUIDParse(tmp, def->caps->data.system.hardware.uuid); + VIR_FREE(tmp); + + if (udevGetDMIData(&def->caps->data.system.firmware.vendor_name, "bios_vendor") || + udevGetDMIData(&def->caps->data.system.firmware.version, "bios_version") || + udevGetDMIData(&def->caps->data.system.firmware.release_date, "bios_date")) { + goto out; + } + + dev = virNodeDeviceAssignDef(NULL, &driverState->devs, def); + virNodeDeviceObjUnlock(dev); + + ret = 0; + +out: + return ret; +} + + +static int udevDeviceMonitorStartup(int privileged ATTRIBUTE_UNUSED) +{ + struct udev *udev = NULL; + struct udev_monitor *udev_monitor = NULL; + int ret = 0; + + if (VIR_ALLOC(driverState) < 0) { + ret = -1; + goto out; + } + + if (virMutexInit(&driverState->lock) < 0) { + VIR_FREE(driverState); + ret = -1; + goto out; + } + + nodeDeviceLock(driverState); + + /* + * http://www.kernel.org/pub/linux/utils/kernel/hotplug/libudev/libudev-udev.h… + * + * indicates no return value other than success, so we don't check + * its return value. + */ + udev = udev_new(); + udev_set_log_fn(udev, udevLogFunction); + + udev_monitor = udev_monitor_new_from_netlink(udev, "udev"); + if (udev_monitor == NULL) { + ret = -1; + goto out; + } + + /* udev can be retrieved from udev_monitor */ + driverState->privateData = udev_monitor; + nodeDeviceUnlock(driverState); + + /* Populate with known devices */ + + if (udevSetupSystemDev() != 0) { + ret = -1; + goto out; + } + + if (udevEnumerateDevices(udev) != 0) { + ret = -1; + goto out; + } + +out: + if (ret == -1) { + udevDeviceMonitorShutdown(); + } + return ret; +} + + +static int udevDeviceMonitorReload(void) +{ + return 0; +} + + +static int udevDeviceMonitorActive(void) +{ + /* Always ready to deal with a shutdown */ + return 0; +} + + +static virDrvOpenStatus udevNodeDrvOpen(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + int flags ATTRIBUTE_UNUSED) +{ + if (driverState == NULL) { + return VIR_DRV_OPEN_DECLINED; + } + + conn->devMonPrivateData = driverState; + + return VIR_DRV_OPEN_SUCCESS; +} + +static int udevNodeDrvClose(virConnectPtr conn) +{ + conn->devMonPrivateData = NULL; + return 0; +} + +static virDeviceMonitor udevDeviceMonitor = { + .name = "udevDeviceMonitor", + .open = udevNodeDrvOpen, + .close = udevNodeDrvClose, +}; + +static virStateDriver udevStateDriver = { + .initialize = udevDeviceMonitorStartup, + .cleanup = udevDeviceMonitorShutdown, + .reload = udevDeviceMonitorReload, + .active = udevDeviceMonitorActive, +}; + +int udevNodeRegister(void) +{ + VIR_ERROR0("Registering udev node device backend\n"); + + registerCommonNodeFuncs(&udevDeviceMonitor); + if (virRegisterDeviceMonitor(&udevDeviceMonitor) < 0) { + return -1; + } + + return virRegisterStateDriver(&udevStateDriver); +} diff --git a/src/node_device/node_device_udev.h b/src/node_device/node_device_udev.h new file mode 100644 index 0000000..bac628d --- /dev/null +++ b/src/node_device/node_device_udev.h @@ -0,0 +1,27 @@ +/* + * node_device_udev.h: node device enumeration - libudev implementation + * + * Copyright (C) 2009 Red Hat + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Dave Allan <dallan(a)redhat.com> + */ + +#include <libudev.h> +#include <stdint.h> + +#define SYSFS_DATA_SIZE 4096 +#define DRV_STATE_UDEV_MONITOR(ds) ((struct udev_monitor *)((ds)->privateData)) diff --git a/src/util/util.c b/src/util/util.c index ef07a6a..a1fe0d5 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -2088,3 +2088,49 @@ void virFileWaitForDevices(virConnectPtr conn) void virFileWaitForDevices(virConnectPtr conn ATTRIBUTE_UNUSED) {} #endif #endif + +/* Don't call this function directly, call virBuildPath instead. */ +int virBuildPathInternal(char **path, ...) +{ + char *path_component = NULL; + va_list ap; + size_t used = 0; + int ret = 0; + + if (VIR_ALLOC_N(*path, PATH_MAX) != 0) { + ret = -1; + goto out; + } + + va_start(ap, *path); + + while ((path_component = va_arg(ap, char *)) != NULL) + { + used += snprintf(*path + used, PATH_MAX - used, "%s/", path_component); + + /* From the snprintf man page: + + The functions snprintf() and vsnprintf() do not write more + than size bytes (including the trailing '\0'). If the + output was truncated due to this limit then the return + value is the number of characters (not including the + trailing '\0') which would have been written to the final + string if enough space had been available. Thus, a return + value of size or more means that the output was truncated. + + We therefore set used to the size of the buffer to avoid + the size being passed to snprintf from becoming negative. + */ + + if (used > PATH_MAX) { + used = PATH_MAX; + } + } + + va_end(ap); + + *(*path + used - 1) = '\0'; /* kill trailing slash */ + +out: + return ret; +} diff --git a/src/util/util.h b/src/util/util.h index dbfdc45..aa466af 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -244,4 +244,8 @@ char *virFileFindMountPoint(const char *type); void virFileWaitForDevices(virConnectPtr conn); +#define virBuildPath(path, ...) virBuildPathInternal(path, __VA_ARGS__, NULL) +/* Don't call virBuildPathInternal directly, use virBuildPath */ +int virBuildPathInternal(char **path, ...); + #endif /* __VIR_UTIL_H__ */ -- 1.6.4.4

2 1

[libvirt] cann't connect kvm hypervisor
by Liu, Zhentao 05 Oct '09

05 Oct '09

Hello, I'm new of Opennebula. I have installed KVM im my remote node. But when I want to check the KVM in the node, I can't connect to the hypervisor. -------------------------------------------------------------------- root@forest:/var/run/libvirt# virsh -c qemu:///localhost/system list Connecting to uri: qemu:///system error: failed to connect to the hypervisor -------------------------------------------------------------------- Can somebody tell me why virsh doesn't work? And how I can fix it? I think that it's maybe the problem of libvirt. Any helps would be very appreciated? Thanks Zhentao -----Original Message----- From: tinova79(a)gmail.com on behalf of Tino Vazquez Sent: Mon 10/5/2009 4:33 PM To: Shi Jin Cc: Liu, Zhentao; users(a)lists.opennebula.org Subject: Re: [one-users] cann't connect kvm hypervisor Hi there, I would suggest forwarding this question to the libvirt mailing list, other people there may know the best procedure to deal with this. Regards, -Tino -- Constantino Vázquez, Grid Technology Engineer/Researcher: http://www.dsa-research.org/tinova DSA Research Group: http://dsa-research.org Globus GridWay Metascheduler: http://www.GridWay.org OpenNebula Virtual Infrastructure Engine: http://www.OpenNebula.org On Mon, Oct 5, 2009 at 4:30 PM, Shi Jin <jinzishuai(a)gmail.com> wrote: > I had similar problems earlier. > The only solution I found without rebooting the machine is to killall > kvm on the node. > I would also appreciate any suggestion to better handle this problem. > Thanks. > > Shi > > On Mon, Oct 5, 2009 at 5:56 AM, Liu, Zhentao > <Zhentao.Liu(a)fokus.fraunhofer.de> wrote: >> Hi Tino >> >> I have checked that libvirtd deaemon is running. I have also restarted >> libvirtd deaemon, but I can't still connect to kvm hypervisor. >> ----------------------------------------------------------- >> root@forest:/var/run/libvirt# /etc/init.d/libvirt-bin start >> * Starting libvirt management daemon libvirtd [ >> OK ] >> root@forest:/var/run/libvirt# virsh -c qemu:///system list >> >> Connecting to uri: qemu:///system >> error: failed to connect to the hypervisor >> ------------------------------------------------------------- >> >> other ideas? >> >> Thanks >> >> Zhentao >> >> -----Original Message----- >> From: tinova79(a)gmail.com on behalf of Tino Vazquez >> Sent: Mon 10/5/2009 1:43 PM >> To: Liu, Zhentao >> Cc: users(a)lists.opennebula.org >> Subject: Re: [one-users] cann't connect kvm hypervisor >> >> Hi Zhentao, >> >> Can you check that the libvirtd deaemon is running in the remote node? >> >> Regards, >> >> -Tino >> >> -- >> Constantino Vázquez, Grid Technology Engineer/Researcher: >> http://www.dsa-research.org/tinova >> DSA Research Group: http://dsa-research.org >> Globus GridWay Metascheduler: http://www.GridWay.org >> OpenNebula Virtual Infrastructure Engine: http://www.OpenNebula.org >> >> >> >> On Mon, Oct 5, 2009 at 1:30 PM, Liu, Zhentao >> <Zhentao.Liu(a)fokus.fraunhofer.de> wrote: >>> Hello, >>> >>> I'm new of Opennebula. I have installed KVM im my remote node. But when I >>> want to check the KVM in the node, I can't connect to the hypervisor. >>> >>> -------------------------------------------------------------------- >>> root@forest:/var/run/libvirt# virsh -c qemu:///localhost/system list >>> Connecting to uri: qemu:///system >>> error: failed to connect to the hypervisor >>> -------------------------------------------------------------------- >>> >>> Can somebody tell me why virsh doesn't work? And how I can fix it? >>> >>> Any helps would be very appreciated? >>> >>> Thanks >>> >>> Zhentao >>> >>> _______________________________________________ >>> Users mailing list >>> Users(a)lists.opennebula.org >>> http://lists.opennebula.org/listinfo.cgi/users-opennebula.org >>> >>> >> >> >> _______________________________________________ >> Users mailing list >> Users(a)lists.opennebula.org >> http://lists.opennebula.org/listinfo.cgi/users-opennebula.org >> >> > > > > -- > Shi Jin, Ph.D. >

2 1

Re: [libvirt] Creating Guest OS in Virtual Box
by Pritesh Kothari 05 Oct '09

05 Oct '09

> >> > >> <os> > >> <type>hvm</type> > >> <boot dev='hd'/> > >> </os> > >> > >> <memory>542720</memory> > >> <vcpu>1</vcpu> > >> > >> <devices> > >> <disk type='file' device='disk'> > >> <source file='/home/santhosh/Desktop/ubuntu9.vdi'/> > >> <target dev='hdd'/> ok the actual error is not in the code and the patch failed cause you are using the git HEAD which already has it. The error actually is that you forgot to specify the target type, i.e the target tag should be: <target dev='hdd' bus='ide'/> and not the one which you specified. the documents on the libvirt.org are pretty much old i guess and someone should update them someday ;). Regards, Pritesh

1 0

[libvirt] getting notified of events
by Dan Kenigsberg 05 Oct '09

05 Oct '09

I am trying to understand how to use the virEvent* API. I've built latest libvirt (with "Fix emission of domain events messages" commit) and run the domain-events example. events-c gives me mostly silence. nothing is printed when a domain changes state. events-python is more bizarre: it prints a line on every event - except for the first one, where "Updating Timeout 0 0 Poll sleep 1" is printed. Only when the second event occurs, does the callback for the first event gets executed. What am I missing? Could someone more familiar take a look? Regards, Dan.

2 1

[libvirt] Safe? /etc/libvirt/qemu on shared storage?
by James Brackinshaw 05 Oct '09

05 Oct '09

Hello, I have a directory /mnt/shared-storage where the disk files for kvm live. Live migration works well, but I have a problem: after a migration I see two guests, one on the original host "shutoff" and one on the new host "running". I'd like to see the guest only on the host it is running on. Would it be safe/recommended to put the /etc/libvirt/qemu directory on shared storage? What would the best way of doing this be? Is this lock safe? Thanks JB

5 7

[libvirt] Update libvirt API and refs XML files
by Matthias Bolte 02 Oct '09

02 Oct '09

Commit 47c8709564ac3f2ec5b4a3830ac213e69b4a44d5 "Fix up a few typos in the tree" triggered changes in docs/libvirt-api.xml and docs/libvirt-refs.xml. The attached patch contains this changes. The files docs/libvirt-api.xml and docs/libvirt-refs.xml are generated by apibuild.py, why are this generated files under version control? Matthias

6 8

[libvirt] Performance statistics
by James Brackinshaw 02 Oct '09

02 Oct '09

Hello, Is it possible to get at the (historical) performance data provided by libvirtd? Is it stored for a period of time, or only available to clients polling it? Thanks JB

3 3

[libvirt] [PATCH 00/11] Generic data stream handling
by Daniel P. Berrange 02 Oct '09

02 Oct '09

The following series of patches introduce support for generic data streams in the libvirt API, the remote protocol, client & daemon. The public API takes the form of a new object virStreamPtr and methods to read/write/close it The remote protocol was the main hard bit. Since the protocol allows multiple concurrent API calls on a single connection, this needed to also allow concurrent data streams. It is also not acceptable for a large data stream to block other traffic while it is transferring. Thus, we introduce a new protocol message type 'REMOTE_STREAM' to handle transfer for the stream data. A method involving a data streams starts off in the normal way with a REMOTE_CALL to the server, and a REMOTE_REPLY response message. If this was successful, there now follows the data stream traffic. For outgoing streams (data from client to server), the client will send zero or more REMOTE_STREAM packets containing the data with status == REMOTE_CONTINUE. These are asynchronous and not acknowledged by the server. At any time the server may send an async message with a type of REMOTE_STREAM and status of REMOTE_ERROR. This indicates to the client that the transfer is aborting at server request. If the client wishes to abort, it can send the server a REMOTE_STREAM+REMOTE_ERROR message. If the client finishes its data transfer, it will send a final REMOTE_STREAM+REMOTE_OK message, and the server will respond with the same. This full roundtrip handshake ensures any async error messages are guarenteed to be flushed For incoming data streams (data from server to client), the server sends zero or more REMOTE_STREAM packets containing the data with status == REMOTE_CONTINUE. These are asynchronous and not acknowledged by the client. At any time the client may send an async message with a type of REMOTE_STREAM and status of REMOTE_ERROR. This indicates to the server that the transfer is aborting at client request. If the server wishes to abort, it can send the server a REMOTE_STREAM+REMOTE_ERROR message. When the server finishes its data transfer, it will send a final REMOTE_STREAM+REMOTE_CONTINUE message ewith a data length of zero (ie EOF). The client will then send a REMOTE_STREAM+REMOTE_OK packet and the server will respond with the same. This full roundtrip handshake ensures any async error messages are guarenteed to be flushed This all ensures that multiple data streams can be active in parallel, and with a maximum data packet size of 256 KB, no single stream can cause too much latency on the connection for other API calls/streams. The only thing it does not allow for is one API method to use two or more streams. These may be famous last words, but I don't think that use case will be neccessary for any of our APIs... The last 5 patches with a subject of [DEMO] are *NOT* intended to be committed to the repository. They merely demonstrate the use of data streams for a couple of hypothetical file upload and download APIs. Actually they were mostly to allow me to test the code streams code without messing around with the QEMU migration code. The immediate use case for this data stream code is Chris' QEMU migration patchset. The next use case is to allow serial console access to be tunnelled over libvirtd, eg to make 'virsh console GUEST' work remotely. This use case is why I included the support for non-blocking data streams and event loop integration (not required for Chris' migration use case) Anyway, assuming Chris confirms that I've not broken his code, then patches 1-6 are targetted for this next release. .x-sc_avoid_write | 3 include/libvirt/libvirt.h | 101 ++++ include/libvirt/libvirt.h.in | 101 ++++ po/POTFILES.in | 1 qemud/Makefile.am | 1 qemud/dispatch.c | 131 ++++++ qemud/dispatch.h | 17 qemud/event.c | 54 +- qemud/qemud.c | 56 +- qemud/qemud.h | 33 + qemud/remote.c | 237 ++++++++++- qemud/remote.h | 1 qemud/remote_dispatch_args.h | 2 qemud/remote_dispatch_prototypes.h | 153 +++++++ qemud/remote_dispatch_table.h | 10 qemud/remote_generate_stubs.pl | 1 qemud/remote_protocol.c | 18 qemud/remote_protocol.h | 20 qemud/remote_protocol.x | 57 ++ qemud/stream.c | 605 +++++++++++++++++++++++++++++ qemud/stream.h | 53 ++ src/datatypes.c | 59 ++ src/datatypes.h | 33 + src/driver.h | 40 + src/esx/esx_driver.c | 2 src/libvirt.c | 769 +++++++++++++++++++++++++++++++++++++ src/libvirt_private.syms | 2 src/libvirt_public.syms | 18 src/lxc_driver.c | 2 src/opennebula/one_driver.c | 2 src/openvz_driver.c | 2 src/qemu_driver.c | 2 src/remote_internal.c | 601 ++++++++++++++++++++++++++++ src/test.c | 477 ++++++++++++++++++++++ src/uml_driver.c | 2 src/vbox/vbox_tmpl.c | 3 src/virsh.c | 164 +++++++ src/xen_unified.c | 2 tests/eventtest.c | 19 39 files changed, 3783 insertions(+), 71 deletions(-) Regards, Daniel

5 43

[libvirt] [PATCH 1/2] Fix ordering of <exports> in API description file
by Daniel P. Berrange 02 Oct '09

02 Oct '09

* docs/apibuild.py: Make uniq() function sort keys before returning them to ensure consitent ordering of <exports> in XML file --- docs/apibuild.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/docs/apibuild.py b/docs/apibuild.py index b00619f..c5257f3 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -55,7 +55,9 @@ def uniq(items): d = {} for item in items: d[item]=1 - return d.keys() + k = d.keys() + k.sort() + return k class identifier: def __init__(self, name, header=None, module=None, type=None, lineno = 0, -- 1.6.2.5

2 3

[libvirt] Tunnelled migration
by Chris Lalancette 02 Oct '09

02 Oct '09

At long last, now that the stream stuff is committed to the tree, I can repost the tunnelled migration patches. Note that these patches will conflict in some places with danpb's previously posted "PEER2PEER" patches, but it should be easy to resolve the differences. V2: Rework the monitor patch to be an API Use the new monitor API Remove silly use of qemuEscapeMonitorArgs()

2 6

[libvirt] Silently ignored virDomainRestore failures
by Charles Duffy 02 Oct '09

02 Oct '09

Howdy, all. I maintain a test infrastructure which makes heavy use of virDomainSave and virDomainRestore, and have been seeing occasional cases where my saved images are for some reason not restored correctly -- and, indeed, the incoming migration streams are not even read in their entirety. While this generally appears to be caused by issues outside of libvirt's purview, one unfortunate issue is that libvirt can report success performing a restore even when the operation is effectively an abject failure. Consider the following snippet, taken from one of my /var/log/libvirt/qemu/<domain>.log files: LC_ALL=C PATH=/sbin:/usr/sbin:/bin:/usr/bin USER=root LOGNAME=root /usr/bin/qemu-kvm -S -M pc-0.11 -m 512 -smp 1 <...lots of arguments here...> -incoming exec:cat cat: write error: Broken pipe This leaves a running qemu hosting a catatonic guest -- but the libvirt client (connecting through the Python bindings) received a status of success for the operation given here. libvirt's mechanism for validating a successful restore consists of running a "cont" command on the guest, and then checking virGetLastError(); AIUI, it is expected that the "cont" will not be able to run until the restore is completed, as the monitor should not be responsive until that time. Browsing through qemudMonitorSendCont (and qemudMonitorCommandWithHandler, which it calls), I don't see anything which looks at the log file with the stderr output from qemu to determine whether an error actually occurred. (As an aside, "info history" on the guest's monitor socket indicates that it was indeed issued this "cont"). Should the existing cont+virGetLastError() approach be sufficient to handle this class of error? If not, is there any guidance on what would comprise a better system? (I suppose we could add something to the exec: to affirmatively indicate on stderr that the decompressor [or cat, if not using one] exited successfully, and check for that marker in the log file... but that seems quite a dirty hack). Thanks!

2 7

[libvirt] [PATCH 00/27] Refactor QEMU monitor command handling
by Daniel P. Berrange 01 Oct '09

01 Oct '09

In the QEMU driver source code the methods which talk to the QEMU monitor currently all just call qemudMonitorCommand() directly with the raw command string, and then parse the raw reply. In the not too distant future QEMU is introducing a new machine parsable monitor syntax. With the current way the code is structured supporting this new mode will be seriously unpleasant. This large series of patches, moves all the monitor command formatting and parsing code out into a separate source file src/qemu/qemu_monitor_text.c. There is one API in that file for each logical monitor command we wish to issue, accepting (mostly) strongly typed arguments. The exception is the NIC hotplug method which still takes the raw NIC string for now. The main qemu_driver.c file now directly calls the appropriate monitor command APIs, making logic there much cleaner. When we add support for the new QEMU monitor syntax we'll gain another file src/qemu/qemu_monitor_json.c which implements all the same APIs as src/qemu/qemu_monitor_text.c, but using the new JSON syntax instead of raw text strings This patch series is soooooo large, because I did it in many small steps, one command at a time. It is also now much easier to debug the monitor by just setting the env variables LIBVIRT_LOG_OUTPUTS="1:stderr" LIBVIRT_LOG_FILTERS="1:qemu_monitor" And you'll get the command & reply of each monitor interaction printed I've tested basic handling of every new method with the exception of the migration ones, since I don't have a convenient target host when on my laptop. Overall we get a small increase in code size, but huge increase in readability ! Makefile.am | 1 libvirt_private.syms | 1 qemu/qemu_conf.c | 20 qemu/qemu_conf.h | 2 qemu/qemu_driver.c | 1669 +++++--------------------------------------- qemu/qemu_monitor_text.c | 1777 +++++++++++++++++++++++++++++++++++++++++++++++ qemu/qemu_monitor_text.h | 173 ++++ 7 files changed, 2171 insertions(+), 1472 deletions(-) Daniel

4 63

[libvirt] Re: [virt-tools-list] Some VMs not starting at host boot
by Cole Robinson 01 Oct '09

01 Oct '09

On 10/01/2009 11:07 AM, Daniel Huhardeaux wrote: > Hi, > > 3 VMs on a host, all in autostart: the both where > > <disk type='block' device='disk'> > <source dev='/dev/vg0/DomU1'/> > <target dev='vda' bus='virtio'/> > </disk> > > are not started automagically on host startup. They start without > problem from virsh. The one having > > <disk type='file' device='disk'> > <source file='/media/vm2/vdisk.qcow2'/> > <target dev='hda' bus='ide'/> > </disk> > > has no problem. Any idea why? FYI, libvirt/virsh specific questions should go to libvirt-list(a)redhat.com. CCing Try 'virsh dominfo <vmname>' for each VM to ensure autostart is actually enabled. To see why autostart is failing, you want to launch libvirtd by hand. Stop all your VMs, do a service libvirtd stop, then (as root) run 'libvirtd'. Any VM startup error messages should be printed on the console. - Cole

2 1

[libvirt] [PATCH] Fix build in separate build directory
by Jiri Denemark 01 Oct '09

01 Oct '09

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- cfg.mk | 2 +- examples/domain-events/events-c/Makefile.am | 2 +- examples/hellolibvirt/Makefile.am | 2 +- tools/Makefile.am | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cfg.mk b/cfg.mk index c217332..44cfd17 100644 --- a/cfg.mk +++ b/cfg.mk @@ -101,7 +101,7 @@ sc_prohibit_VIR_ERR_NO_MEMORY: msg='use virReportOOMError, not V'IR_ERR_NO_MEMORY \ $(_prohibit_regexp) -include Makefile.nonreentrant +include $(srcdir)/Makefile.nonreentrant sc_prohibit_nonreentrant: @fail=0 ; \ for i in $(NON_REENTRANT) ; \ diff --git a/examples/domain-events/events-c/Makefile.am b/examples/domain-events/events-c/Makefile.am index 60b1589..64457c2 100644 --- a/examples/domain-events/events-c/Makefile.am +++ b/examples/domain-events/events-c/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I@top_srcdir@/include +INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include noinst_PROGRAMS = event-test event_test_CFLAGS = $(WARN_CFLAGS) event_test_SOURCES = event-test.c diff --git a/examples/hellolibvirt/Makefile.am b/examples/hellolibvirt/Makefile.am index 6ef2cc8..8d108a7 100644 --- a/examples/hellolibvirt/Makefile.am +++ b/examples/hellolibvirt/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I@top_srcdir@/include +INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include noinst_PROGRAMS = hellolibvirt hellolibvirt_CFLAGS = $(WARN_CFLAGS) hellolibvirt_SOURCES = hellolibvirt.c diff --git a/tools/Makefile.am b/tools/Makefile.am index c48b203..941e93e 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -43,7 +43,7 @@ virsh_LDADD = \ $(VIRSH_LIBS) virsh_CFLAGS = \ -I$(top_srcdir)/gnulib/lib -I../gnulib/lib \ - -I../include \ + -I../include -I$(top_srcdir)/include \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/util \ -DGETTEXT_PACKAGE=\"$(PACKAGE)\" \ -- 1.6.5.rc2

2 1

[libvirt] [PATCH] Fix documentation and comment typos
by Paolo Bonzini 01 Oct '09

01 Oct '09

Fix a few mispellings :-) of "successfully" and regenerate docs/libvirt-*.xml. The regeneration also includes the changes in 47c8709. * src/libvirt.c: Fix typos. * src/secret/secret_driver.c: Fix typos. * docs/libvirt-api.xml: Regenerate. * docs/libvirt-refs.xml: Regenerate. --- docs/libvirt-api.xml | 6 +++--- docs/libvirt-refs.xml | 10 +++------- src/libvirt.c | 4 ++-- src/secret/secret_driver.c | 4 ++-- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/docs/libvirt-api.xml b/docs/libvirt-api.xml index 795701c..88dc246 100644 --- a/docs/libvirt-api.xml +++ b/docs/libvirt-api.xml @@ -2847,7 +2847,7 @@ API looks like ...report an error... virStreamFree(st); close(fd);]]></info> - <return type='int' info='0 if all the data was succesfully received. The caller should invoke virStreamFinish(st) to flush the stream upon success and then virStreamFree Returns -1 upon any error, with virStreamAbort() already having been called, so the caller need only call virStreamFree()'/> + <return type='int' info='0 if all the data was successfully received. The caller should invoke virStreamFinish(st) to flush the stream upon success and then virStreamFree Returns -1 upon any error, with virStreamAbort() already having been called, so the caller need only call virStreamFree()'/> <arg name='stream' type='virStreamPtr' info='pointer to the stream object'/> <arg name='handler' type='virStreamSinkFunc' info='sink callback for writing data to application'/> <arg name='opaque' type='void *' info='application defined data'/> @@ -2864,7 +2864,7 @@ the caller no longer needs the reference to this object.]]></info> <info><![CDATA[Write a series of bytes to the stream. This method may block the calling application for an arbitrary amount of time. Once an application has finished sending data -it should call virStreamFinish to wait for succesful +it should call virStreamFinish to wait for successful confirmation from the driver, or detect any error This method may not be used if a stream source has been @@ -2939,7 +2939,7 @@ API looks like ...report an error... virStreamFree(st); close(fd);]]></info> - <return type='int' info='0 if all the data was succesfully sent. The caller should invoke virStreamFinish(st) to flush the stream upon success and then virStreamFree Returns -1 upon any error, with virStreamAbort() already having been called, so the caller need only call virStreamFree()'/> + <return type='int' info='0 if all the data was successfully sent. The caller should invoke virStreamFinish(st) to flush the stream upon success and then virStreamFree Returns -1 upon any error, with virStreamAbort() already having been called, so the caller need only call virStreamFree()'/> <arg name='stream' type='virStreamPtr' info='pointer to the stream object'/> <arg name='handler' type='virStreamSourceFunc' info='source callback for reading data from application'/> <arg name='opaque' type='void *' info='application defined data'/> diff --git a/docs/libvirt-refs.xml b/docs/libvirt-refs.xml index 428f847..08034e4 100644 --- a/docs/libvirt-refs.xml +++ b/docs/libvirt-refs.xml @@ -7176,21 +7176,17 @@ <ref name='virNetworkCreate'/> <ref name='virStreamEventUpdateCallback'/> </word> - <word name='succesful'> - <ref name='virStreamSend'/> - </word> - <word name='succesfully'> - <ref name='virStreamRecvAll'/> - <ref name='virStreamSendAll'/> - </word> <word name='successful'> <ref name='virDomainMigrate'/> <ref name='virDomainSave'/> <ref name='virNodeDeviceCreateXML'/> + <ref name='virStreamSend'/> </word> <word name='successfully'> <ref name='virConnectOpen'/> <ref name='virStreamFinish'/> + <ref name='virStreamRecvAll'/> + <ref name='virStreamSendAll'/> </word> <word name='such'> <ref name='virConnCopyLastError'/> diff --git a/src/libvirt.c b/src/libvirt.c index 4cc19ec..dacf8c4 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -9638,7 +9638,7 @@ error: * virStreamFree(st); * close(fd); * - * Returns 0 if all the data was succesfully sent. The caller + * Returns 0 if all the data was successfully sent. The caller * should invoke virStreamFinish(st) to flush the stream upon * success and then virStreamFree * @@ -9735,7 +9735,7 @@ cleanup: * virStreamFree(st); * close(fd); * - * Returns 0 if all the data was succesfully received. The caller + * Returns 0 if all the data was successfully received. The caller * should invoke virStreamFinish(st) to flush the stream upon * success and then virStreamFree * diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 9c4102e..d61c24a 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -751,7 +751,7 @@ secretDefineXML(virConnectPtr conn, const char *xml, if (secretDeleteSaved(conn, driver, secret) < 0) goto restore_backup; } - /* Saved succesfully - drop old values */ + /* Saved successfully - drop old values */ new_attrs = NULL; virSecretDefFree(backup); @@ -843,7 +843,7 @@ secretSetValue(virSecretPtr obj, const unsigned char *value, if (secretSaveValue(obj->conn, driver, secret) < 0) goto restore_backup; } - /* Saved succesfully - drop old value */ + /* Saved successfully - drop old value */ if (old_value != NULL) { memset(old_value, 0, old_value_size); VIR_FREE(old_value); -- 1.6.2.5

2 1

[libvirt] [PATCH] Allows for a <description> tag for domains
by Daniel Veillard 01 Oct '09

01 Oct '09

https://bugzilla.redhat.com/show_bug.cgi?id=523639 feature request which makes sense to me, the simple patch attached seems to be sufficient, one can define and have the description back in the dump. Doesn't try to keep the location of the tag, it always get serialized after <uuid>. The only drawbacks I can think of are: - others XML formats may require the same, but honnestly it's trivial - machine generated description (for example if the history log of a domain gets stored there) could grow a lot and I wonder if we have a hard limit on the size when transmitting xml descriptions Oh and I didn't found a good place to test the feature, i.e. no test seems to parse and reserialize XML it's always about conversions. 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/

4 8

[libvirt] [PATCH] Avoid a libvirtd crash on broken input 523418
by Daniel Veillard 01 Oct '09

01 Oct '09

A simple typo in an XML domain file could lead to a crash, because we called STRPREFIX() on the looked up value without checking it was non-null. Patch is trivial, and should go in but I wonder if we shouldn't make those STR macros safer too like turning #define STRPREFIX(a,b) (strncmp((a),(b),strlen((b))) == 0) into #define STRPREFIX(a,b) ((a) && (b) && (strncmp((a),(b),strlen((b))) == 0)) anyway I think we should apply the patch independently, without it libvirtd crash, with it we get the proper error report: [root@paphio ~]# virsh define RHEL-5.4-64.xml 18:32:21.982: warning : processCallDispatchReply:7570 : Method call error error: Failed to define domain from RHEL-5.4-64.xml error: internal error No <source> 'dev' attribute specified with <interface type='bridge'/> Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 2

[libvirt] [PATCH] Fix USB device re-labelling
by Mark McLoughlin 01 Oct '09

01 Oct '09

A simple misplaced break out of a switch results in: libvir: error : Failed to open file '/sys/bus/pci/devices/0000:00:54c./vendor': No such file or directory libvir: error : Failed to open file '/sys/bus/pci/devices/0000:00:54c./device': No such file or directory libvir: error : this function is not supported by the hypervisor: Failed to read product/vendor ID for 0000:00:54c. when trying to passthrough a USB host device to qemu. * src/security_selinux.c: fix a switch/break thinko --- src/security/security_selinux.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index bdd9eb2..d08d502 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -492,12 +492,11 @@ SELinuxSetSecurityHostdevLabel(virConnectPtr conn, ret = usbDeviceFileIterate(conn, usb, SELinuxSetSecurityUSBLabel, vm); usbFreeDevice(conn, usb); - - break; } else { /* XXX deal with product/vendor better */ ret = 0; } + break; } case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: { -- 1.6.2.5

2 1

[libvirt] [OT] Relocation lookup
by Rakotomandimby Mihamina 01 Oct '09

01 Oct '09

Hi all, Given the Social and Political reality in my country (Madagascar), I am obliged to look for a relocation. This is my public profile: http://www.linkedin.com/in/mihaminarakotomandimby Would you be aware of a position I could fit in? Thank you. -- Architecte Informatique chez Blueline/Gulfsat: Administration Systeme, Recherche & Developpement +261 34 29 155 34

1 0

[libvirt] [PATCH] incorrect error message in virDomainNetDefParseXML
by Florian Vichot 01 Oct '09

01 Oct '09

When declaring a <interface type="bridge"> tag, <source> needs a "bridge" attribute, but the parser complains about a missing "dev" attribute. Florian

3 4

[libvirt] "virsh destroy" deletes extra VMs
by Shi Jin 30 Sep '09

30 Sep '09

Hi there, I am running Ubuntu 9.04 X64 server with KVM/libvirt. I recently found that the "virsh destroy" command actually delete VMs it should not delete. For example, please see the following screen copy: root@node1:/srv/cloud/ImgRep/WinXP# virsh list Connecting to uri: qemu:///system Id Name State ---------------------------------- 27 one-80 running 28 one-81 running 29 one-83 running 30 one-82 running 31 one-79 running root@node1:/srv/cloud/ImgRep/WinXP# virsh destroy 29 Connecting to uri: qemu:///system Domain 29 destroyed root@node1:/srv/cloud/ImgRep/WinXP# virsh list Connecting to uri: qemu:///system Id Name State ---------------------------------- 27 one-80 running 28 one-81 running 31 one-79 running Please note that VM 30 was deleted when we tried to delete VM 29. The /var/log/messages showed the following information: ep 30 08:58:59 node1 kernel: [238101.304619] br1: port 5(vnet4) entering disabled state Sep 30 08:58:59 node1 kernel: [238101.342851] device vnet4 left promiscuous mode Sep 30 08:58:59 node1 kernel: [238101.342854] br1: port 5(vnet4) entering disabled state Sep 30 08:58:59 node1 kernel: [238101.424851] br1: port 4(vnet3) entering disabled state Sep 30 08:59:00 node1 kernel: [238101.463031] device vnet3 left promiscuous mode Sep 30 08:59:00 node1 kernel: [238101.463035] br1: port 4(vnet3) entering disabled state Sep 30 09:10:53 node1 -- MARK -- Sep 30 09:30:53 node1 -- MARK -- Sep 30 09:50:53 node1 -- MARK -- Sep 30 09:51:31 node1 kernel: [241253.266955] device vnet3 entered promiscuous mode Sep 30 09:51:31 node1 kernel: [241253.268857] br1: port 4(vnet3) entering learning state Sep 30 09:51:40 node1 kernel: [241262.260147] br1: topology change detected, propagating Sep 30 09:51:40 node1 kernel: [241262.260152] br1: port 4(vnet3) entering forwarding state Sep 30 09:53:59 node1 kernel: [241401.204570] br1: port 4(vnet3) entering disabled state Sep 30 09:53:59 node1 kernel: [241401.232395] device vnet3 left promiscuous mode Sep 30 09:53:59 node1 kernel: [241401.232399] br1: port 4(vnet3) entering disabled state Sep 30 09:54:20 node1 kernel: [241421.694803] br1: port 2(vnet0) entering disabled state Sep 30 09:54:20 node1 kernel: [241421.733095] device vnet0 left promiscuous mode Sep 30 09:54:20 node1 kernel: [241421.733099] br1: port 2(vnet0) entering disabled state Sep 30 09:54:20 node1 kernel: [241421.815209] br2: port 2(vnet1) entering disabled state Sep 30 09:54:20 node1 kernel: [241421.853728] device vnet1 left promiscuous mode Sep 30 09:54:20 node1 kernel: [241421.853732] br2: port 2(vnet1) entering disabled state Sep 30 09:54:20 node1 kernel: [241421.935254] br1: port 3(vnet2) entering disabled state Sep 30 09:54:20 node1 kernel: [241421.963527] device vnet2 left promiscuous mode Sep 30 09:54:20 node1 kernel: [241421.963531] br1: port 3(vnet2) entering disabled state Sep 30 09:55:29 node1 kernel: [241490.644204] br1: port 6(vnet5) entering disabled state Sep 30 09:55:29 node1 kernel: [241490.673195] device vnet5 left promiscuous mode Sep 30 09:55:29 node1 kernel: [241490.673199] br1: port 6(vnet5) entering disabled state Sep 30 10:10:53 node1 -- MARK -- Sep 30 10:11:49 node1 kernel: [242470.955142] device vnet0 entered promiscuous mode Sep 30 10:11:49 node1 kernel: [242470.957051] br1: port 2(vnet0) entering learning state Sep 30 10:11:52 node1 kernel: [242474.180036] device vnet1 entered promiscuous mode Sep 30 10:11:52 node1 kernel: [242474.181943] br1: port 3(vnet1) entering learning state Sep 30 10:11:55 node1 kernel: [242477.431693] device vnet2 entered promiscuous mode Sep 30 10:11:55 node1 kernel: [242477.433558] br1: port 4(vnet2) entering learning state Sep 30 10:11:58 node1 kernel: [242479.950082] br1: topology change detected, propagating Sep 30 10:11:58 node1 kernel: [242479.950086] br1: port 2(vnet0) entering forwarding state Sep 30 10:12:00 node1 kernel: [242482.059146] device vnet3 entered promiscuous mode Sep 30 10:12:00 node1 kernel: [242482.060330] br1: port 5(vnet3) entering learning state Sep 30 10:12:01 node1 kernel: [242483.180170] br1: topology change detected, propagating Sep 30 10:12:01 node1 kernel: [242483.180173] br1: port 3(vnet1) entering forwarding state Sep 30 10:12:04 node1 kernel: [242485.710948] device vnet4 entered promiscuous mode Sep 30 10:12:04 node1 kernel: [242485.712109] br1: port 6(vnet4) entering learning state Sep 30 10:12:04 node1 kernel: [242486.430098] br1: topology change detected, propagating Sep 30 10:12:04 node1 kernel: [242486.430104] br1: port 4(vnet2) entering forwarding state Sep 30 10:12:09 node1 kernel: [242491.051857] br1: topology change detected, propagating Sep 30 10:12:09 node1 kernel: [242491.051862] br1: port 5(vnet3) entering forwarding state Sep 30 10:12:13 node1 kernel: [242494.711792] br1: topology change detected, propagating Sep 30 10:12:13 node1 kernel: [242494.711797] br1: port 6(vnet4) entering forwarding state Sep 30 10:22:00 node1 kernel: [243082.274008] br1: port 4(vnet2) entering disabled state Sep 30 10:22:00 node1 kernel: [243082.312108] device vnet2 left promiscuous mode Sep 30 10:22:00 node1 kernel: [243082.312112] br1: port 4(vnet2) entering disabled state Sep 30 10:22:00 node1 kernel: [243082.365331] br1: port 5(vnet3) entering disabled state Sep 30 10:22:00 node1 kernel: [243082.393430] device vnet3 left promiscuous mode Sep 30 10:22:00 node1 kernel: [243082.393433] br1: port 5(vnet3) entering disabled state I have 4 NICs and the ifconfig shows root@node1:/srv/cloud/ImgRep/WinXP# ifconfig bond0 Link encap:Ethernet HWaddr 00:24:e8:6b:0d:57 inet6 addr: fe80::224:e8ff:fe6b:d57/64 Scope:Link UP BROADCAST RUNNING MASTER MULTICAST MTU:1500 Metric:1 RX packets:7799931 errors:0 dropped:0 overruns:0 frame:0 TX packets:6879357 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:0 RX bytes:4360166425 (4.3 GB) TX bytes:4350243659 (4.3 GB) br0 Link encap:Ethernet HWaddr 00:24:e8:6b:0d:57 inet addr:192.168.1.128 Bcast:192.168.1.255 Mask:255.255.255.0 inet6 addr: fe80::224:e8ff:fe6b:d57/64 Scope:Link UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 RX packets:7641913 errors:0 dropped:0 overruns:0 frame:0 TX packets:6412260 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:0 RX bytes:4169876739 (4.1 GB) TX bytes:4291182908 (4.2 GB) br1 Link encap:Ethernet HWaddr 00:24:e8:6b:0d:5b inet6 addr: fe80::224:e8ff:fe6b:d5b/64 Scope:Link UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 RX packets:152606 errors:0 dropped:0 overruns:0 frame:0 TX packets:6 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:0 RX bytes:11276026 (11.2 MB) TX bytes:468 (468.0 B) br2 Link encap:Ethernet HWaddr 00:24:e8:6b:0d:5d inet6 addr: fe80::224:e8ff:fe6b:d5d/64 Scope:Link UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 RX packets:152596 errors:0 dropped:0 overruns:0 frame:0 TX packets:6 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:0 RX bytes:11286132 (11.2 MB) TX bytes:468 (468.0 B) eth0 Link encap:Ethernet HWaddr 00:24:e8:6b:0d:57 UP BROADCAST RUNNING SLAVE MULTICAST MTU:1500 Metric:1 RX packets:3622205 errors:0 dropped:0 overruns:0 frame:0 TX packets:3443103 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:1000 RX bytes:1758147112 (1.7 GB) TX bytes:2174389369 (2.1 GB) Interrupt:36 Memory:d6000000-d6012700 eth1 Link encap:Ethernet HWaddr 00:24:e8:6b:0d:57 UP BROADCAST RUNNING SLAVE MULTICAST MTU:1500 Metric:1 RX packets:4177726 errors:0 dropped:0 overruns:0 frame:0 TX packets:3436254 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:1000 RX bytes:2602019313 (2.6 GB) TX bytes:2175854290 (2.1 GB) Interrupt:48 Memory:d8000000-d8012700 eth2 Link encap:Ethernet HWaddr 00:24:e8:6b:0d:5b inet6 addr: fe80::224:e8ff:fe6b:d5b/64 Scope:Link UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 RX packets:256014 errors:0 dropped:0 overruns:0 frame:0 TX packets:91549 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:1000 RX bytes:20680139 (20.6 MB) TX bytes:17317087 (17.3 MB) Interrupt:32 Memory:da000000-da012700 eth3 Link encap:Ethernet HWaddr 00:24:e8:6b:0d:5d inet6 addr: fe80::224:e8ff:fe6b:d5d/64 Scope:Link UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 RX packets:245189 errors:0 dropped:0 overruns:0 frame:0 TX packets:32669 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:1000 RX bytes:20866257 (20.8 MB) TX bytes:8265329 (8.2 MB) Interrupt:42 Memory:dc000000-dc012700 lo Link encap:Local Loopback inet addr:127.0.0.1 Mask:255.0.0.0 inet6 addr: ::1/128 Scope:Host UP LOOPBACK RUNNING MTU:16436 Metric:1 RX packets:324787 errors:0 dropped:0 overruns:0 frame:0 TX packets:324787 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:0 RX bytes:571707504 (571.7 MB) TX bytes:571707504 (571.7 MB) vnet0 Link encap:Ethernet HWaddr 52:c3:a3:d0:09:84 inet6 addr: fe80::50c3:a3ff:fed0:984/64 Scope:Link UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 RX packets:72 errors:0 dropped:0 overruns:0 frame:0 TX packets:533 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:500 RX bytes:10410 (10.4 KB) TX bytes:49306 (49.3 KB) vnet1 Link encap:Ethernet HWaddr 02:0d:4c:1e:5c:82 inet6 addr: fe80::d:4cff:fe1e:5c82/64 Scope:Link UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 RX packets:36 errors:0 dropped:0 overruns:0 frame:0 TX packets:563 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:500 RX bytes:6023 (6.0 KB) TX bytes:53245 (53.2 KB) vnet4 Link encap:Ethernet HWaddr a6:58:67:2b:37:8a inet6 addr: fe80::a458:67ff:fe2b:378a/64 Scope:Link UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 RX packets:42 errors:0 dropped:0 overruns:0 frame:0 TX packets:552 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:500 RX bytes:6733 (6.7 KB) TX bytes:52189 (52.1 KB) Note that there is no IP address assigned to the br1 device which is used here. I don't think that should be a problem. Also the first 2 NICs are bonded first and then created as a bridge br0 and I don't think it is a problem either. root@node1:/srv/cloud/ImgRep/WinXP# virsh --version Connecting to uri: qemu:///system 0.6.1 root@node1:/srv/cloud/ImgRep/WinXP# kvm -h QEMU PC emulator version 0.9.1 (kvm-84), Copyright (c) 2003-2008 Fabrice Bellard Has anyone had similar problem before? How can I fix it? Thanks a lot. Shi -- Shi Jin, PhD

2 2

[libvirt] [PATCH] fixes to allow 'make rpm' to work again
by Daniel Veillard 30 Sep '09

30 Sep '09

Just a few oversights: - examples/domain-events has no makefile, but domain-events/events-c does - we should still add examples/domain-events/events-python to the tarballs in make dist - python/libvirtclass.txt seems to have vanished from dist and builds not a big deal but don't assume it's there in the spec file. Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 3

[libvirt] [PATCH] Fix emission of domain events messages
by Daniel P. Berrange 30 Sep '09

30 Sep '09

The code which updated the message length after writing the payload wrote the updated length word in the wrong place since the XDR object was given a buffer pointing to the start of the header payload, rather than message start. * daemon/remote.c: Fix updating of event message length so that we actually send the payload, not just the header --- daemon/remote.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 6d4cc1c..2b58045 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -4559,17 +4559,19 @@ remoteDispatchDomainEventSend (struct qemud_client *client, /* Serialise the return header and event. */ xdrmem_create (&xdr, - msg->buffer + msg->bufferOffset, - msg->bufferLength - msg->bufferOffset, + msg->buffer, + msg->bufferLength, XDR_ENCODE); - if (!xdr_remote_domain_event_msg(&xdr, data)) + /* Skip over the header we just wrote */ + if (xdr_setpos (&xdr, msg->bufferOffset) == 0) goto xdr_error; + if (!xdr_remote_domain_event_msg(&xdr, data)) + goto xdr_error; - /* Update length word */ - msg->bufferOffset += xdr_getpos (&xdr); - len = msg->bufferOffset; + /* Update length word to include payload*/ + len = msg->bufferOffset = xdr_getpos (&xdr); if (xdr_setpos (&xdr, 0) == 0) goto xdr_error; -- 1.6.2.5

2 3

[libvirt] Tunnelled migration
by Chris Lalancette 30 Sep '09

30 Sep '09

At long last, now that the stream stuff is committed to the tree, I can repost the tunnelled migration patches. Note that these patches will conflict in some places with danpb's previously posted "PEER2PEER" patches, but it should be easy to resolve the differences.

2 15

[libvirt] Fix apibuild.py warnings
by Matthias Bolte 30 Sep '09

30 Sep '09

apibuild.py warns about misformatted function comment for virStreamEventAddCallback, virStreamEventUpdateCallback and virStreamEventRemoveCallback. The attached patch adds the missing ':' and contains the resulting changes in docs/libvirt-api.xml and docs/libvirt-refs.xml Matthias

3 2

[libvirt] [PATCH] minor fix's
by Pritesh Kothari 30 Sep '09

30 Sep '09

Hi All, Just minor fix's. Regards, Pritesh

3 2

[libvirt] [PATCH 0/7] Add support for qcow2 backing files to sVirt
by Mark McLoughlin 30 Sep '09

30 Sep '09

Hey, https://bugzilla.redhat.com/497131 shows that sVirt cannot currently handle qcow2 files with a backing store. Because we do not re-label the backing store, qemu cannot read it. The fix is fairly straightforward - when we go to re-label a file, check its header and if it has a backing store, re-label that too. Most of this series involves moving the header probing code from the storage driver into libvirt_util so that the security driver can use it. Cheers, Mark.

3 28

[libvirt] Fix memleaks in libvirtd's message processing
by Matthias Bolte 30 Sep '09

30 Sep '09

I tracked down a memleak in libvirtd's message processing. The leak was introduced in commit 47cab734995fa9521b1df05d37e9978eedd8d3a2 "Split out code for handling incoming method call messages". This commit changed the way qemud_client_message objects were reused. Before this commit: - qemudWorker() removes a message from dispatch queue and passes it to remoteDispatchClientRequest() - remoteDispatchClientRequest() handles the message and reuses the same message for the response. If an error occurs the same message is used to report it (rpc_error label). If another error occurs while trying to report the first error remoteDispatchClientRequest() would return -1 and the message will be freed in qemudWorker() After this commit: - qemudWorker() removes a message from dispatch queue and passes it to remoteDispatchClientRequest() - remoteDispatchClientRequest() calls remoteDispatchClientCall() if the message it is an remote call or otherwise respond with a new error message by calling remoteSerializeReplyError() and the original message leaks - remoteDispatchClientCall() handles the message and reuses the same message for the response. If an error occurs it calls remoteSerializeReplyError() and the original message leaks. If a fatal error occurs remoteDispatchClientCall() returns -1 and the original message will be freed in qemudWorker() To fix this leak the original message has to be freed if remoteSerializeReplyError() succeeds. If remoteSerializeReplyError() fails the original message will be freed in qemudWorker(). In addition I came across another leak in remoteSerializeError(). If an error occurs while serializing the initial error the message leaks. To fix this leak the message has to be freed in case of an XDR error. Matthias

2 2

[libvirt] virtio network problems with kvm guests with 2.6.26 kernel
by Jim Paris 29 Sep '09

29 Sep '09

Hi, After upgrading libvirt on one system, my kvm guests running a 2.6.26 kernel with virtio networking could no longer communicate with the network. It seems that the problem is caused by newer libvirt versions unconditionally enabling GSO support by setting IFF_VNET_HDR [1]. However, support for this feature is apparently broken in 2.6.26. Ubuntu seems to have also discovered this problem [2] and they currently work around it by removing GSO support from kvm [3]. Currently, I'm running with a patched libvirt that never sets IFF_VNET_HDR, and it's working fine once again. While this is not a libvirt problem per se, it certainly violated the principle of least surprise given that libvirt was the only thing that changed! But I don't know if there's much that libvirt can do to avoid this problem, as it's really something that needs to get fixed in kvm, or the guest needs to be upgraded, or switched away from virtio. At the very least, maybe this info helps someone else who runs across the same problem. -jim [1] http://www.redhat.com/archives/libvir-list/2009-January/msg00642.html [2] https://bugs.launchpad.net/kvm/+bug/331128 [3] http://patches.ubuntu.com/k/kvm/extracted/virtio-net_disable_gso.patch

3 4

[libvirt] [PATCH] Minor comment changes.
by Laine Stump 29 Sep '09

29 Sep '09

Fix some minor grammer (and one other) nits in comments that end up in generated API reference documentation. No functional/binary differences. --- src/libvirt.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index ca8e003..ce3d6ba 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -592,9 +592,9 @@ virRegisterNetworkDriver(virNetworkDriverPtr driver) /** * virRegisterInterfaceDriver: - * @driver: pointer to a interface driver block + * @driver: pointer to an interface driver block * - * Register a interface virtualization driver + * Register an interface virtualization driver * * Returns the driver priority or -1 in case of error. */ @@ -5365,7 +5365,7 @@ error: /** * virNetworkGetXMLDesc: * @network: a network object - * @flags: and OR'ed set of extraction flags, not used yet + * @flags: an OR'ed set of extraction flags, not used yet * * Provide an XML description of the network. The description may be reused * later to relaunch the network with virNetworkCreateXML(). @@ -5545,7 +5545,7 @@ error: /** * virInterfaceGetConnect: - * @iface: pointer to a interface + * @iface: pointer to an interface * * Provides the connection pointer associated with an interface. The * reference counter on the connection is not increased by this @@ -5819,7 +5819,7 @@ error: /** * virInterfaceGetName: - * @iface: a interface object + * @iface: an interface object * * Get the public name for that interface * @@ -5842,9 +5842,9 @@ virInterfaceGetName(virInterfacePtr iface) /** * virInterfaceGetMACString: - * @iface: a interface object + * @iface: an interface object * - * Get the MAC for a interface as string. For more information about + * Get the MAC for an interface as string. For more information about * MAC see RFC4122. * * Returns a pointer to the MAC address (in null-terminated ASCII @@ -5867,11 +5867,11 @@ virInterfaceGetMACString(virInterfacePtr iface) /** * virInterfaceGetXMLDesc: - * @iface: a interface object - * @flags: and OR'ed set of extraction flags, not used yet + * @iface: an interface object + * @flags: an OR'ed set of extraction flags, not used yet * * Provide an XML description of the interface. The description may be reused - * later to recreate the interface with virInterfaceCreateXML(). + * later to redefine the interface with virInterfaceDefineXML(). * * Returns a 0 terminated UTF-8 encoded XML instance, or NULL in case of error. * the caller must free() the returned value. @@ -6100,7 +6100,7 @@ error: * This method is typically useful for applications where multiple * threads are using a connection, and it is required that the * connection remain open until all threads have finished using - * it. ie, each new thread using a interface would increment + * it. ie, each new thread using an interface would increment * the reference count. * * Returns 0 in case of success, -1 in case of failure. @@ -6121,7 +6121,7 @@ virInterfaceRef(virInterfacePtr iface) /** * virInterfaceFree: - * @iface: a interface object + * @iface: an interface object * * Free the interface object. The interface itself is unaltered. * The data structure is freed and should not be used thereafter. -- 1.6.2.5

1 1

[libvirt] [PATCH] bug in vboxDomainDestroy in vbox driver
by Pritesh Kothari 29 Sep '09

29 Sep '09

Hi All, There is bug in vboxDomainDestroy() where in the while powerdown the method doesn't wait till its completion. Fix in the attached patch. Regards, Pritesh

2 1

[libvirt] Libvirtd on Non Linux?
by Yushu Yao 29 Sep '09

29 Sep '09

Hi Experts, Just wondering is it possible now to run libvirt deamon on non-linux platforms (mainly windows and mac)? If yes, are there instructions on how to build it. If no, what was the roadblock? I'm trying to find a tool that can control the VMM for desktop/laptop users under win/mac/linux. Mainly for automation of deployment of some appliances. The best tool I've heard is libvirt, but couldn't find any doc on using it for other platforms. Any help is greatly appreciated. -Yushu

2 1

[libvirt] [PATCH] in Vbox driver, OpenHardDisk is called with NULL instead of ""
by Florian Vichot 29 Sep '09

29 Sep '09

This patch replaces the use of NULL with empty strings ("") in a call to OpenHardDisk, which otherwise fails with E_INVALIDARG. Florian

3 2

[libvirt] PATCH] Stop double free
by Mark Hamzy 29 Sep '09

29 Sep '09

This prevents a the following trap. Program received signal SIGABRT, Aborted. 0x00000035ad830265 in raise () from /lib64/libc.so.6 (gdb) bt #0 0x00000035ad830265 in raise () from /lib64/libc.so.6 #1 0x00000035ad831d10 in abort () from /lib64/libc.so.6 #2 0x00000035ad86a84b in __libc_message () from /lib64/libc.so.6 #3 0x00000035ad8722ef in _int_free () from /lib64/libc.so.6. #4 0x00000035ad87273b in free () from /lib64/libc.so.6. #5 0x00000000004066f1 in vshDeinit () #6 0x0000000000406925 in vshError ()) #7 0x0000000000406744 in vshDeinit () #8 0x00000000004130be in main () --- src/virsh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/virsh.c b/src/virsh.c index 4825f1c..5fc6c8f 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -8201,7 +8201,7 @@ vshError(vshControl *ctl, int doexit, const char *format, ...) fputc('\n', stderr); if (doexit) { - if (ctl) + if (ctl && ctl->conn) vshDeinit(ctl); exit(EXIT_FAILURE); } -- 1.6.4.1 -- Mark You must be the change you wish to see in the world. -- Mahatma Gandhi Worrying is praying for that you do not wish to happen.

4 5

[libvirt] Error messages with --debug
by Fred Leeflang 29 Sep '09

29 Sep '09

Oh, regarding my previous post, I ran virt-manager --debug so see what's going on (I'm missing much more than just the vm names). I'm thinking I either missed installing some bits or my gtk/glade setup is already obsolete (Debian Lenny). Any hints? (virt-manager.py:27842): libglade-WARNING **: unknown property `orientation' for class `GtkVBox' (virt-manager.py:27842): libglade-WARNING **: could not look up stock id 'Restore saved machine...' (virt-manager.py:27842): libglade-WARNING **: could not look up stock id 'Add Connection...' (virt-manager.py:27842): libglade-WARNING **: could not look up stock id 'Virtual Machine Details' (virt-manager.py:27842): libglade-WARNING **: could not look up stock id 'Delete' (virt-manager.py:27842): libglade-WARNING **: could not look up stock id '_Contents' (virt-manager.py:27842): libglade-WARNING **: unknown property `orientation' for class `GtkVBox' /usr/local/share/virt-manager/virtManager/manager.py:150: GtkWarning: gtk_toolbar_set_icon_size: assertion `icon_size != GTK_ICON_SIZE_INVALID' failed self.window = gtk.glade.XML(config.get_glade_dir() + "/vmm-manager.glade", "vmm-manager", domain="virt-manager") /usr/local/share/virt-manager/virtManager/manager.py:394: GtkWarning: Failed to set text from markup due to error parsing markup: Attribute 'font' is not allowed on the <span> tag on line 1 char 40 win.show_all() /usr/local/share/virt-manager/virt-manager.py:371: GtkWarning: Failed to set text from markup due to error parsing markup: Attribute 'font' is not allowed on the <span> tag on line 1 char 24 gtk.main() /usr/local/share/virt-manager/virt-manager.py:371: GtkWarning: Failed to set text from markup due to error parsing markup: Attribute 'font' is not allowed on the <span> tag on line 1 char 25 gtk.main()

2 1

[libvirt] Screenshot
by Fred Leeflang 29 Sep '09

29 Sep '09

Hi, Got my git/hg builds of libvirtd/virt-manager running together with kvm. Took some time but finally think I'm getting the hang of it. I noticed two things going from my pre-packaged Debian packages. The older xml files I had seemed to generate a faulty kvm cmdline: <disk type='file' device='cdrom'> <target dev='hdc' bus='ide'/> <readonly/> </disk> This seems to translate into a -drive file=,... The file argument for kvm may be empty but should then not be defined: "If you don’t specify the "file=" argument, you define an empty drive". As a result the first vm I tried to start came back with a message saying it could not open the diskfile. Additionally, check below screenshot; the vm names appear to be missing. Here's the complete XML of one vm, did anything change coming from this one? <domain type='kvm'> <name>vm1</name> <uuid>ea14abdc-12a4-48cb-1424-46cdf15405f4</uuid> <memory>524288</memory> <currentMemory>524288</currentMemory> <vcpu>1</vcpu> <os> <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <features> <acpi/> <apic/> <pae/> </features> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> <emulator>/usr/bin/kvm</emulator> <disk type='file' device='disk'> <source file='/kvmimages/vm1.qcow2'/> <target dev='vda' bus='virtio'/> </disk> <interface type='bridge'> <mac address='54:52:00:0a:dc:10'/> <source bridge='br0'/> <model type='virtio'/> </interface> <serial type='pty'> <source path='/dev/pts/1'/> <target port='0'/> </serial> <console type='pty' tty='/dev/pts/1'> <source path='/dev/pts/1'/> <target port='0'/> </console> <input type='mouse' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes' keymap='en-us'/> </devices> </domain>

1 0

[libvirt] [PATCH] Maintain value of ctxt->node in virInterfaceDefParseDhcp.
by Laine Stump 29 Sep '09

29 Sep '09

This was causing subsequent calls to virXPathxxx() to fail, since ctxt->node was left pointing at the dhcp node, rather than the protocol node. Previously this had gone unnoticed, as the dhcp node was the only thing parsed under ip, if it was there. --- src/conf/interface_conf.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index 632f28f..818cff2 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -229,10 +229,12 @@ virInterfaceDefParseBondArpValid(virConnectPtr conn, xmlXPathContextPtr ctxt) { static int virInterfaceDefParseDhcp(virConnectPtr conn, virInterfaceDefPtr def, xmlNodePtr dhcp, xmlXPathContextPtr ctxt) { + xmlNodePtr save; char *tmp; int ret = 0; def->proto.dhcp = 1; + save = ctxt->node; ctxt->node = dhcp; /* Not much to do in the current version */ tmp = virXPathString(conn, "string(./@peerdns)", ctxt); @@ -250,6 +252,7 @@ virInterfaceDefParseDhcp(virConnectPtr conn, virInterfaceDefPtr def, } else def->proto.peerdns = -1; + ctxt->node = save; return(ret); } -- 1.6.2.5

2 1

[libvirt] [PATCH] fix some XPath relative node resets
by Daniel Veillard 29 Sep '09

29 Sep '09

The virXPath... function take extra care to preserve the XPath context node (ctxt->node) but in the case of virXPathString and virXPathBoolean they forgot to do this on the error path. This patch fixes this and move all ctxt->node = relnode instuctions just after the xmlXPathEval() to make sure this doesn't happen if this code is modified. Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 5

[libvirt] [PATCH] Fix API doc extractor to stop munging comment formatting
by Daniel P. Berrange 28 Sep '09

28 Sep '09

The python method help docs are copied across from the C funtion comments, but in the process all line breaks and indentation was being lost. This made the resulting text and code examples completely unreadable. Both the API doc extractor and the python generator were destroying whitespace & this fixes them to preserve it exactly. * docs/apibuild.py: Preserve all whitespace when extracting function comments. Print function comment inside a <![CDATA[ section to fully preserve all whitespace. Look for the word 'returns' to describe return values, instead of 'return' to avoid getting confused with code examples including the C 'return' statement. * python/generator.py: Preserve all whitespace when printing function help docs * src/libvirt.c: Change any return parameter indicated by 'return' to be 'returns', to avoid confusing the API extractor --- docs/apibuild.py | 31 +++++++++++++++++++--------- python/generator.py | 25 ++++++++++++----------- src/libvirt.c | 54 +++++++++++++++++++++++++------------------------- 3 files changed, 61 insertions(+), 49 deletions(-) diff --git a/docs/apibuild.py b/docs/apibuild.py index 855569b..70a7efc 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -838,14 +838,20 @@ class CParser: arg, name)) while len(lines) > 0 and lines[0] == '*': del lines[0] - desc = "" + desc = None while len(lines) > 0: l = lines[0] - while len(l) > 0 and l[0] == '*': - l = l[1:] - l = string.strip(l) - if len(l) >= 6 and l[0:6] == "return" or l[0:6] == "Return": - try: + i = 0 + # Remove all leading '*', followed by at most one ' ' character + # since we need to preserve correct identation of code examples + while i < len(l) and l[i] == '*': + i = i + 1 + if i > 0: + if i < len(l) and l[i] == ' ': + i = i + 1 + l = l[i:] + if len(l) >= 6 and l[0:7] == "returns" or l[0:7] == "Returns": + try: l = string.split(l, ' ', 1)[1] except: l = "" @@ -859,9 +865,14 @@ class CParser: retdesc = retdesc + " " + l del lines[0] else: - desc = desc + " " + l + if desc is not None: + desc = desc + "\n" + l + else: + desc = l del lines[0] + if desc is None: + desc = "" retdesc = string.strip(retdesc) desc = string.strip(desc) @@ -1716,7 +1727,7 @@ class docBuilder: try: (args, desc) = id.info if desc != None and desc != "": - output.write(" <info>%s</info>\n" % (escape(desc))) + output.write(" <info><![CDATA[%s]]></info>\n" % (desc)) self.indexString(name, desc) for arg in args: (name, desc) = arg @@ -1760,7 +1771,7 @@ class docBuilder: try: desc = id.extra if desc != None and desc != "": - output.write(">\n <info>%s</info>\n" % (escape(desc))) + output.write(">\n <info><![CDATA[%s]]></info>\n" % (desc)) output.write(" </typedef>\n") else: output.write("/>\n") @@ -1796,7 +1807,7 @@ class docBuilder: output.write(" <cond>%s</cond>\n"% (apstr)); try: (ret, params, desc) = id.info - output.write(" <info>%s</info>\n" % (escape(desc))) + output.write(" <info><![CDATA[%s]]></info>\n" % (desc)) self.indexString(name, desc) if ret[0] != None: if ret[0] == "void": diff --git a/python/generator.py b/python/generator.py index c34cb34..178a415 100755 --- a/python/generator.py +++ b/python/generator.py @@ -44,6 +44,7 @@ if sgmlop: self.finish_starttag = target.start self.finish_endtag = target.end self.handle_data = target.data + self.handle_cdata = target.cdata # activate parser self.parser = sgmlop.XMLParser() @@ -78,6 +79,7 @@ class SlowParser(xmllib.XMLParser): def __init__(self, target): self.unknown_starttag = target.start self.handle_data = target.data + self.handle_cdata = target.cdata self.unknown_endtag = target.end xmllib.XMLParser.__init__(self) @@ -108,6 +110,11 @@ class docParser: print "data %s" % text self._data.append(text) + def cdata(self, text): + if debug: + print "data %s" % text + self._data.append(text) + def start(self, tag, attrs): if debug: print "start %s, %s" % (tag, attrs) @@ -843,20 +850,14 @@ def writeDoc(name, args, indent, output): val = string.replace(val, "NULL", "None"); output.write(indent) output.write('"""') - while len(val) > 60: - if val[0] == " ": - val = val[1:] - continue - str = val[0:60] - i = string.rfind(str, " "); - if i < 0: - i = 60 - str = val[0:i] - val = val[i:] + i = string.find(val, "\n") + while i >= 0: + str = val[0:i+1] + val = val[i+1:] output.write(str) - output.write('\n '); + i = string.find(val, "\n") output.write(indent) - output.write(val); + output.write(val) output.write(' """\n') def buildWrappers(): diff --git a/src/libvirt.c b/src/libvirt.c index 441f308..9d4d94b 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -818,7 +818,7 @@ virRegisterStateDriver(virStateDriverPtr driver) * * Initialize all virtualization drivers. * - * Return 0 if all succeed, -1 upon any failure. + * Returns 0 if all succeed, -1 upon any failure. */ int virStateInitialize(int privileged) { int i, ret = 0; @@ -839,7 +839,7 @@ int virStateInitialize(int privileged) { * * Run each virtualization driver's cleanup method. * - * Return 0 if all succeed, -1 upon any failure. + * Returns 0 if all succeed, -1 upon any failure. */ int virStateCleanup(void) { int i, ret = 0; @@ -857,7 +857,7 @@ int virStateCleanup(void) { * * Run each virtualization driver's reload method. * - * Return 0 if all succeed, -1 upon any failure. + * Returns 0 if all succeed, -1 upon any failure. */ int virStateReload(void) { int i, ret = 0; @@ -875,7 +875,7 @@ int virStateReload(void) { * * Run each virtualization driver's "active" method. * - * Return 0 if none are active, 1 if at least one is. + * Returns 0 if none are active, 1 if at least one is. */ int virStateActive(void) { int i, ret = 0; @@ -7044,7 +7044,7 @@ virStoragePoolRef(virStoragePoolPtr pool) * involve communicating with a remote server, and/or initializing * new devices at the OS layer * - * Return 0 if the volume list was refreshed, -1 on failure + * Returns 0 if the volume list was refreshed, -1 on failure */ int virStoragePoolRefresh(virStoragePoolPtr pool, @@ -7089,7 +7089,7 @@ error: * * Fetch the locally unique name of the storage pool * - * Return the name of the pool, or NULL on error + * Returns the name of the pool, or NULL on error */ const char* virStoragePoolGetName(virStoragePoolPtr pool) @@ -7113,7 +7113,7 @@ virStoragePoolGetName(virStoragePoolPtr pool) * * Fetch the globally unique ID of the storage pool * - * Return 0 on success, or -1 on error; + * Returns 0 on success, or -1 on error; */ int virStoragePoolGetUUID(virStoragePoolPtr pool, @@ -7149,7 +7149,7 @@ error: * * Fetch the globally unique ID of the storage pool as a string * - * Return 0 on success, or -1 on error; + * Returns 0 on success, or -1 on error; */ int virStoragePoolGetUUIDString(virStoragePoolPtr pool, @@ -7190,7 +7190,7 @@ error: * Get volatile information about the storage pool * such as free space / usage summary * - * returns 0 on success, or -1 on failure. + * Returns 0 on success, or -1 on failure. */ int virStoragePoolGetInfo(virStoragePoolPtr pool, @@ -7240,7 +7240,7 @@ error: * storage pool. This is suitable for later feeding back * into the virStoragePoolCreateXML method. * - * returns a XML document, or NULL on error + * Returns a XML document, or NULL on error */ char * virStoragePoolGetXMLDesc(virStoragePoolPtr pool, @@ -7287,7 +7287,7 @@ error: * Fetches the value of the autostart flag, which determines * whether the pool is automatically started at boot time * - * return 0 on success, -1 on failure + * Returns 0 on success, -1 on failure */ int virStoragePoolGetAutostart(virStoragePoolPtr pool, @@ -7333,7 +7333,7 @@ error: * * Sets the autostart flag * - * returns 0 on success, -1 on failure + * Returns 0 on success, -1 on failure */ int virStoragePoolSetAutostart(virStoragePoolPtr pool, @@ -7494,7 +7494,7 @@ virStorageVolGetConnect (virStorageVolPtr vol) * Fetch a pointer to a storage volume based on its name * within a pool * - * return a storage volume, or NULL if not found / error + * Returns a storage volume, or NULL if not found / error */ virStorageVolPtr virStorageVolLookupByName(virStoragePoolPtr pool, @@ -7539,7 +7539,7 @@ error: * Fetch a pointer to a storage volume based on its * globally unique key * - * return a storage volume, or NULL if not found / error + * Returns a storage volume, or NULL if not found / error */ virStorageVolPtr virStorageVolLookupByKey(virConnectPtr conn, @@ -7582,7 +7582,7 @@ error: * Fetch a pointer to a storage volume based on its * locally (host) unique path * - * return a storage volume, or NULL if not found / error + * Returns a storage volume, or NULL if not found / error */ virStorageVolPtr virStorageVolLookupByPath(virConnectPtr conn, @@ -7625,7 +7625,7 @@ error: * Fetch the storage volume name. This is unique * within the scope of a pool * - * return the volume name, or NULL on error + * Returns the volume name, or NULL on error */ const char* virStorageVolGetName(virStorageVolPtr vol) @@ -7650,7 +7650,7 @@ virStorageVolGetName(virStorageVolPtr vol) * unique, so the same volume will have the same * key no matter what host it is accessed from * - * return the volume key, or NULL on error + * Returns the volume key, or NULL on error */ const char* virStorageVolGetKey(virStorageVolPtr vol) @@ -7677,7 +7677,7 @@ virStorageVolGetKey(virStorageVolPtr vol) * on an XML description. Not all pools support * creation of volumes * - * return the storage volume, or NULL on error + * Returns the storage volume, or NULL on error */ virStorageVolPtr virStorageVolCreateXML(virStoragePoolPtr pool, @@ -7727,7 +7727,7 @@ error: * volume (name, perms) are passed via a typical volume * XML description. * - * return the storage volume, or NULL on error + * Returns the storage volume, or NULL on error */ virStorageVolPtr virStorageVolCreateXMLFrom(virStoragePoolPtr pool, @@ -7781,7 +7781,7 @@ error: * * Delete the storage volume from the pool * - * Return 0 on success, or -1 on error + * Returns 0 on success, or -1 on error */ int virStorageVolDelete(virStorageVolPtr vol, @@ -7827,7 +7827,7 @@ error: * Release the storage volume handle. The underlying * storage volume continues to exist. * - * Return 0 on success, or -1 on error + * Returns 0 on success, or -1 on error */ int virStorageVolFree(virStorageVolPtr vol) @@ -7885,7 +7885,7 @@ virStorageVolRef(virStorageVolPtr vol) * Fetches volatile information about the storage * volume such as its current allocation * - * Return 0 on success, or -1 on failure + * Returns 0 on success, or -1 on failure */ int virStorageVolGetInfo(virStorageVolPtr vol, @@ -7934,7 +7934,7 @@ error: * Fetch an XML document describing all aspects of * the storage volume * - * Return the XML document, or NULL on error + * Returns the XML document, or NULL on error */ char * virStorageVolGetXMLDesc(virStorageVolPtr vol, @@ -8165,7 +8165,7 @@ error: * Fetch an XML document describing all aspects of * the device. * - * Return the XML document, or NULL on error + * Returns the XML document, or NULL on error */ char *virNodeDeviceGetXMLDesc(virNodeDevicePtr dev, unsigned int flags) { @@ -9381,7 +9381,7 @@ virSecretRef(virSecretPtr secret) * * Release the secret handle. The underlying secret continues to exist. * - * Return 0 on success, or -1 on error + * Returns 0 on success, or -1 on error */ int virSecretFree(virSecretPtr secret) @@ -9852,7 +9852,7 @@ cleanup: * used in conjunction with non-blocking data streams * to integrate into an event loop * - * Return 0 on success, -1 upon error + * Returns 0 on success, -1 upon error */ int virStreamEventAddCallback(virStreamPtr stream, int events, @@ -9934,7 +9934,7 @@ error: * * Remove a event callback from the stream * - * Return 0 on success, -1 on error + * Returns 0 on success, -1 on error */ int virStreamEventRemoveCallback(virStreamPtr stream) { -- 1.6.2.5

2 6

[libvirt] Refactor libvirt spec file
by Daniel P. Berrange 28 Sep '09

28 Sep '09

The following patch refactors the libvirt spec file conditional logic to make it a little easier to manage all the different Fedora/RHEL OS build variations, and also allow for easy creation of a client-only build The patch follows, but I'm including the full specfile below too, since its easier to understand than the diff # -*- rpm-spec -*- # A client only build will create a libvirt.so only containing # the generic RPC driver, and test driver and no libvirtd # Default to a full server + client build %define client_only 0 # Now turn off server build in certain cases # RHEL-5 builds are client-only for s390, ppc %if 0%{?rhel} == 5 %ifnarch i386 i586 i686 x86_64 ia64 %define client_only 1 %endif %endif # Disable all server side drivers if client only build requested %if %{client_only} %define server_drivers 0 %else %define server_drivers 1 %endif # Now set the defaults for all the important features, independant # of any particular OS # First the daemon itself %define with_libvirtd 0%{!?_without_libvirtd:%{server_drivers}} %define with_avahi 0%{!?_without_avahi:%{server_drivers}} # Then the hypervisor drivers %define with_xen 0%{!?_without_xen:%{server_drivers}} %define with_xen_proxy 0%{!?_without_xen_proxy:%{server_drivers}} %define with_qemu 0%{!?_without_qemu:%{server_drivers}} %define with_openvz 0%{!?_without_openvz:%{server_drivers}} %define with_lxc 0%{!?_without_lxc:%{server_drivers}} %define with_vbox 0%{!?_without_vbox:%{server_drivers}} %define with_uml 0%{!?_without_uml:%{server_drivers}} %define with_one 0%{!?_without_one:%{server_drivers}} %define with_phyp 0%{!?_without_phyp:%{server_drivers}} %define with_esx 0%{!?_without_esx:%{server_drivers}} # Then the secondary host drivers %define with_network 0%{!?_without_network:%{server_drivers}} %define with_storage_fs 0%{!?_without_storage_fs:%{server_drivers}} %define with_storage_lvm 0%{!?_without_storage_lvm:%{server_drivers}} %define with_storage_iscsi 0%{!?_without_storage_iscsi:%{server_drivers}} %define with_storage_disk 0%{!?_without_storage_disk:%{server_drivers}} %define with_storage_mpath 0%{!?_without_storage_mpath:%{server_drivers}} %define with_numactl 0%{!?_without_numactl:%{server_drivers}} %define with_selinux 0%{!?_without_selinux:%{server_drivers}} %define with_hal 0%{!?_without_hal:%{server_drivers}} # A few optional bits off by default, we enable later %define with_polkit 0%{!?_without_polkit:0} %define with_capng 0%{!?_without_capng:0} %define with_netcf 0%{!?_without_netcf:0} # Non-server/HV driver defaults which are always enabled %define with_python 0%{!?_without_python:1} %define with_sasl 0%{!?_without_sasl:1} # Finally set the OS / architecture specific special cases # Xen is available only on i386 x86_64 ia64 %ifnarch i386 i586 i686 x86_64 ia64 %define with_xen 0 %endif # RHEL doesn't ship OpenVZ, VBox, UML, OpenNebula, PowerHypervisor or ESX %if 0%{?rhel} %define with_openvz 0 %define with_vbox 0 %define with_uml 0 %define with_one 0 %define with_phyp 0 %define with_esx 0 %endif # RHEL-5 has restricted QEMU to x86_64 only and is too old for LXC %if 0%{?rhel} == 5 %ifnarch x86_64 %define with_qemu 0 %endif %define with_lxc 0 %endif # RHEL-6 has restricted QEMU to x86_64 only, stopped including Xen # on all archs. Other archs all have LXC available though %if 0%{?rhel} >= 6 %ifnarch x86_64 %define with_qemu 0 %endif %define with_xen 0 %endif # If Xen isn't turned on, we shouldn't build the xen proxy either %if ! %{with_xen} %define with_xen_proxy 0 %endif # Fedora doesn't have any QEMU on ppc64 - only ppc %if 0%{?fedora} %ifarch ppc64 %define with_qemu 0 %endif %endif # PolicyKit was introduced in Fedora 8 / RHEL-6 or newer, allowing # the setuid Xen proxy to be killed off %if 0%{?fedora} >= 8 || 0%{?rhel} >= 6 %define with_polkit 0%{!?_without_polkit:1} %define with_xen_proxy 0 %endif # libcapng is used to manage capabilities in Fedora 12 / RHEL-6 or newer %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 %define with_capng 0%{!?_without_capng:1} %endif # netcf is used to manage network interfaces in Fedora 12 / RHEL-6 or newer %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 %define with_netcf 0%{!?_without_netcf:%{server_drivers}} %endif # Force QEMU to run as non-root %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 %define qemu_user qemu %define qemu_group qemu %else %define qemu_user root %define qemu_group root %endif # The RHEL-5 Xen package has some feature backports. This # flag is set to enable use of those special bits on RHEL-5 %if 0%{?rhel} == 5 %define with_rhel5 1 %else %define with_rhel5 0 %endif Summary: Library providing a simple API virtualization Name: libvirt Version: 0.7.1 Release: 1%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://libvirt.org/ BuildRequires: python-devel # The client side, i.e. shared libs and virsh are in a subpackage Requires: libvirt-client = %{version}-%{release} # Used by many of the drivers, so turn it on whenever the # daemon is present %if %{with_libvirtd} Requires: bridge-utils %endif %if %{with_network} Requires: dnsmasq Requires: iptables %endif # needed for device enumeration %if %{with_hal} Requires: hal %endif %if %{with_polkit} %if 0%{?fedora} >= 12 || 0%{?rhel} >=6 Requires: polkit >= 0.93 %else Requires: PolicyKit >= 0.6 %endif %endif %if %{with_storage_fs} # For mount/umount in FS driver BuildRequires: util-linux # For showmount in FS driver (netfs discovery) BuildRequires: nfs-utils Requires: nfs-utils # For glusterfs %if 0%{?fedora} >= 11 Requires: glusterfs-client >= 2.0.1 %endif %endif %if %{with_qemu} # From QEMU RPMs Requires: /usr/bin/qemu-img # For image compression Requires: gzip Requires: bzip2 Requires: lzop Requires: xz %else %if %{with_xen} # From Xen RPMs Requires: /usr/sbin/qcow-create %endif %endif %if %{with_storage_lvm} # For LVM drivers Requires: lvm2 %endif %if %{with_storage_iscsi} # For ISCSI driver Requires: iscsi-initiator-utils %endif %if %{with_storage_disk} # For disk driver Requires: parted %endif %if %{with_storage_mpath} # For multipath support Requires: device-mapper %endif %if %{with_xen} BuildRequires: xen-devel %endif %if %{with_one} BuildRequires: xmlrpc-c-devel >= 1.14.0 %endif BuildRequires: libxml2-devel BuildRequires: xhtml1-dtds BuildRequires: readline-devel BuildRequires: ncurses-devel BuildRequires: gettext BuildRequires: gnutls-devel %if %{with_hal} BuildRequires: hal-devel %endif %if %{with_avahi} BuildRequires: avahi-devel %endif %if %{with_selinux} BuildRequires: libselinux-devel %endif %if %{with_network} BuildRequires: dnsmasq %endif BuildRequires: bridge-utils %if %{with_sasl} BuildRequires: cyrus-sasl-devel %endif %if %{with_polkit} %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 # Only need the binary, not -devel BuildRequires: polkit >= 0.93 %else BuildRequires: PolicyKit-devel >= 0.6 %endif %endif %if %{with_storage_fs} # For mount/umount in FS driver BuildRequires: util-linux %endif %if %{with_qemu} # From QEMU RPMs BuildRequires: /usr/bin/qemu-img %else %if %{with_xen} # From Xen RPMs BuildRequires: /usr/sbin/qcow-create %endif %endif %if %{with_storage_lvm} # For LVM drivers BuildRequires: lvm2 %endif %if %{with_storage_iscsi} # For ISCSI driver BuildRequires: iscsi-initiator-utils %endif %if %{with_storage_disk} # For disk driver BuildRequires: parted-devel %if 0%{?rhel} == 5 # Broken RHEL-5 parted RPM is missing a dep BuildRequires: e2fsprogs-devel %endif %endif %if %{with_storage_mpath} # For Multipath support %if 0%{?rhel} == 5 # Broken RHEL-5 packaging has header files in main RPM :-( BuildRequires: device-mapper %else BuildRequires: device-mapper-devel %endif %endif %if %{with_numactl} # For QEMU/LXC numa info BuildRequires: numactl-devel %endif %if %{with_capng} BuildRequires: libcap-ng-devel >= 0.5.0 %endif %if %{with_phyp} BuildRequires: libssh2-devel %endif %if %{with_netcf} BuildRequires: netcf-devel %endif # Fedora build root suckage BuildRequires: gawk %description Libvirt is a C toolkit to interact with the virtualization capabilities of recent versions of Linux (and other OSes). The main package includes the libvirtd server exporting the virtualization support. %package client Summary: Client side library and utilities of the libvirt library Group: Development/Libraries Requires: readline Requires: ncurses # So remote clients can access libvirt over SSH tunnel # (client invokes 'nc' against the UNIX socket on the server) Requires: nc %if %{with_sasl} Requires: cyrus-sasl # Not technically required, but makes 'out-of-box' config # work correctly & doesn't have onerous dependencies Requires: cyrus-sasl-md5 %endif %description client Shared libraries and client binaries needed to access to the virtualization capabilities of recent versions of Linux (and other OSes). %package devel Summary: Libraries, includes, etc. to compile with the libvirt library Group: Development/Libraries Requires: libvirt = %{version}-%{release} Requires: pkgconfig %if %{with_xen} Requires: xen-devel %endif %description devel Includes and documentations for the C library providing an API to use the virtualization capabilities of recent versions of Linux (and other OSes). %if %{with_python} %package python Summary: Python bindings for the libvirt library Group: Development/Libraries Requires: libvirt = %{version}-%{release} %description python The libvirt-python package contains a module that permits applications written in the Python programming language to use the interface supplied by the libvirt library to use the virtualization capabilities of recent versions of Linux (and other OSes). %endif %prep %setup -q %build %if ! %{with_xen} %define _without_xen --without-xen %endif %if ! %{with_qemu} %define _without_qemu --without-qemu %endif %if ! %{with_openvz} %define _without_openvz --without-openvz %endif %if ! %{with_lxc} %define _without_lxc --without-lxc %endif %if ! %{with_vbox} %define _without_vbox --without-vbox %endif %if ! %{with_sasl} %define _without_sasl --without-sasl %endif %if ! %{with_avahi} %define _without_avahi --without-avahi %endif %if ! %{with_phyp} %define _without_phyp --without-phyp %endif %if ! %{with_esx} %define _without_esx --without-esx %endif %if ! %{with_polkit} %define _without_polkit --without-polkit %endif %if ! %{with_python} %define _without_python --without-python %endif %if ! %{with_libvirtd} %define _without_libvirtd --without-libvirtd %endif %if ! %{with_uml} %define _without_uml --without-uml %endif %if ! %{with_one} %define _without_one --without-one %endif %if %{with_rhel5} %define _with_rhel5_api --with-rhel5-api %endif %if ! %{with_network} %define _without_network --without-network %endif %if ! %{with_storage_fs} %define _without_storage_fs --without-storage-fs %endif %if ! %{with_storage_lvm} %define _without_storage_lvm --without-storage-lvm %endif %if ! %{with_storage_iscsi} %define _without_storage_iscsi --without-storage-iscsi %endif %if ! %{with_storage_disk} %define _without_storage_disk --without-storage-disk %endif %if ! %{with_storage_mpath} %define _without_storage_mpath --without-storage-mpath %endif %if ! %{with_numactl} %define _without_numactl --without-numactl %endif %if ! %{with_capng} %define _without_capng --without-capng %endif %if ! %{with_netcf} %define _without_netcf --without-netcf %endif %if ! %{with_selinux} %define _without_selinux --without-selinux %endif %if ! %{with_hal} %define _without_hal --without-hal %endif %configure %{?_without_xen} \ %{?_without_qemu} \ %{?_without_openvz} \ %{?_without_lxc} \ %{?_without_vbox} \ %{?_without_sasl} \ %{?_without_avahi} \ %{?_without_polkit} \ %{?_without_python} \ %{?_without_libvirtd} \ %{?_without_uml} \ %{?_without_one} \ %{?_without_phyp} \ %{?_without_esx} \ %{?_without_network} \ %{?_with_rhel5_api} \ %{?_without_storage_fs} \ %{?_without_storage_lvm} \ %{?_without_storage_iscsi} \ %{?_without_storage_disk} \ %{?_without_storage_mpath} \ %{?_without_numactl} \ %{?_without_capng} \ %{?_without_netcf} \ %{?_without_selinux} \ %{?_without_hal} \ --with-qemu-user=%{qemu_user} \ --with-qemu-group=%{qemu_group} \ --with-init-script=redhat \ --with-remote-pid-file=%{_localstatedir}/run/libvirtd.pid make %{?_smp_mflags} gzip -9 ChangeLog %install rm -fr %{buildroot} %makeinstall (cd docs/examples ; make clean ; rm -rf .deps Makefile Makefile.in) (cd docs/examples/python ; rm -rf .deps Makefile Makefile.in) (cd examples/hellolibvirt ; make clean ; rm -rf .deps .libs Makefile Makefile.in) (cd examples/domain-events/events-c ; make clean ;rm -rf .deps .libs Makefile Makefile.in) rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.a %if %{with_network} # We don't want to install /etc/libvirt/qemu/networks in the main %files list # because if the admin wants to delete the default network completely, we don't # want to end up re-incarnating it on every RPM upgrade. install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/ cp $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml \ $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/default.xml rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml # Strip auto-generated UUID - we need it generated per-install sed -i -e "/<uuid>/d" $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/default.xml %else rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml %endif %if ! %{with_qemu} rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_qemu.aug rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug %endif %find_lang %{name} %if ! %{with_python} rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-python-%{version} %endif %if %{client_only} rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version} %endif %if ! %{with_qemu} rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu.conf %endif %if %{with_libvirtd} chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/libvirtd %endif %clean rm -fr %{buildroot} %pre %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 # Normally 'setup' adds this in /etc/passwd, but this is # here for case of upgrades from earlier Fedora/RHEL. This # UID/GID pair is reserved for qemu:qemu getent group kvm >/dev/null || groupadd -g 36 -r kvm getent group qemu >/dev/null || groupadd -g 107 -r qemu getent passwd qemu >/dev/null || \ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ -c "qemu user" qemu %endif %post %if %{with_libvirtd} %if %{with_network} # We want to install the default network for initial RPM installs # or on the first upgrade from a non-network aware libvirt only. # We check this by looking to see if the daemon is already installed /sbin/chkconfig --list libvirtd 1>/dev/null 2>&1 if [ $? != 0 -a ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ] then UUID=`/usr/bin/uuidgen` sed -e "s,</name>,</name>\n <uuid>$UUID</uuid>," \ < %{_datadir}/libvirt/networks/default.xml \ > %{_sysconfdir}/libvirt/qemu/networks/default.xml ln -s ../default.xml %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml fi %endif /sbin/chkconfig --add libvirtd if [ "$1" -ge "1" ]; then /sbin/service libvirtd condrestart > /dev/null 2>&1 fi %endif %preun %if %{with_libvirtd} if [ $1 = 0 ]; then /sbin/service libvirtd stop 1>/dev/null 2>&1 /sbin/chkconfig --del libvirtd fi %endif %post client -p /sbin/ldconfig %postun client -p /sbin/ldconfig %if %{with_libvirtd} %files %defattr(-, root, root) %doc AUTHORS ChangeLog.gz NEWS README COPYING.LIB TODO %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/ %if %{with_network} %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart %endif %{_sysconfdir}/rc.d/init.d/libvirtd %config(noreplace) %{_sysconfdir}/sysconfig/libvirtd %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd %if %{with_qemu} %config(noreplace) %{_sysconfdir}/libvirt/qemu.conf %endif %dir %{_datadir}/libvirt/ %if %{with_network} %dir %{_datadir}/libvirt/networks/ %{_datadir}/libvirt/networks/default.xml %endif %dir %{_localstatedir}/run/libvirt/ %dir %{_localstatedir}/lib/libvirt/ %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/images/ %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/boot/ %dir %attr(0700, root, root) %{_localstatedir}/cache/libvirt/ %if %{with_qemu} %dir %attr(0700, root, root) %{_localstatedir}/run/libvirt/qemu/ %dir %attr(0700, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/ %dir %attr(0700, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/libvirt/qemu/ %endif %if %{with_lxc} %dir %{_localstatedir}/run/libvirt/lxc/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/lxc/ %endif %if %{with_uml} %dir %{_localstatedir}/run/libvirt/uml/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/uml/ %endif %if %{with_network} %dir %{_localstatedir}/run/libvirt/network/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/filter/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/nat/ %endif %if %{with_qemu} %{_datadir}/augeas/lenses/libvirtd_qemu.aug %{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug %endif %{_datadir}/augeas/lenses/libvirtd.aug %{_datadir}/augeas/lenses/tests/test_libvirtd.aug %if %{with_polkit} %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 %{_datadir}/polkit-1/actions/org.libvirt.unix.policy %else %{_datadir}/PolicyKit/policy/org.libvirt.unix.policy %endif %endif %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/ %if %{with_qemu} %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/ %endif %if %{with_xen_proxy} %attr(4755, root, root) %{_libexecdir}/libvirt_proxy %endif %if %{with_lxc} %attr(0755, root, root) %{_libexecdir}/libvirt_lxc %endif %attr(0755, root, root) %{_libexecdir}/libvirt_parthelper %attr(0755, root, root) %{_sbindir}/libvirtd %doc docs/*.xml %endif %files client -f %{name}.lang %defattr(-, root, root) %doc AUTHORS ChangeLog.gz NEWS README COPYING.LIB TODO %{_mandir}/man1/virsh.1* %{_mandir}/man1/virt-xml-validate.1* %{_bindir}/virsh %{_bindir}/virt-xml-validate %{_libdir}/lib*.so.* %dir %{_datadir}/libvirt/ %dir %{_datadir}/libvirt/schemas/ %{_datadir}/libvirt/schemas/domain.rng %{_datadir}/libvirt/schemas/network.rng %{_datadir}/libvirt/schemas/storagepool.rng %{_datadir}/libvirt/schemas/storagevol.rng %{_datadir}/libvirt/schemas/nodedev.rng %{_datadir}/libvirt/schemas/capability.rng %{_datadir}/libvirt/schemas/interface.rng %{_datadir}/libvirt/schemas/secret.rng %{_datadir}/libvirt/schemas/storageencryption.rng %if %{with_sasl} %config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf %endif %files devel %defattr(-, root, root) %{_libdir}/lib*.so %dir %{_includedir}/libvirt %{_includedir}/libvirt/*.h %{_libdir}/pkgconfig/libvirt.pc %dir %{_datadir}/gtk-doc/html/libvirt/ %doc %{_datadir}/gtk-doc/html/libvirt/*.devhelp %doc %{_datadir}/gtk-doc/html/libvirt/*.html %doc %{_datadir}/gtk-doc/html/libvirt/*.png %doc %{_datadir}/gtk-doc/html/libvirt/*.css %doc docs/*.html docs/html docs/*.gif %doc docs/examples %doc docs/libvirt-api.xml %doc examples %if %{with_python} %files python %defattr(-, root, root) %doc AUTHORS NEWS README COPYING.LIB %{_libdir}/python*/site-packages/libvirt.py* %{_libdir}/python*/site-packages/libvirtmod* %doc python/tests/*.py %doc python/TODO %doc python/libvirtclass.txt %doc docs/examples/python %endif

4 9

[libvirt] Uknown OS typehvm
by Fred Leeflang 28 Sep '09

28 Sep '09

Hello, I've had an older version of libvirtd/qemu running on Debian Lenny and had defined 4 virtual servers. I have the kvm and kvm_intel modules loaded (also compiled from source). I copied over my 4 config files from /etc/libvirt/qemu to /usr/local/etc/libvirt/qemu Now when I start up libvirtd -v: omega:~# libvirtd -v 20:17:38.877: warning : qemudStartup:566 : Unable to create cgroup for driver: No such device or address libvir: Domain Config error : unknown OS type hvm libvir: Domain Config error : unknown OS type hvm libvir: Domain Config error : unknown OS type hvm libvir: Domain Config error : unknown OS type hvm I'm trying to make sense out of the config files at this point but not very successful at it. I googled around a bit to see if others had this error message but most of the ones I found relate to not having the kernel modules loaded, which is visible in the 'virsh capabilities' output. Mine shows: fredl@omega:~$ which virsh /usr/local/bin/virsh fredl@omega:~$ virsh capabilities <capabilities> <host> <cpu> <arch>x86_64</arch> </cpu> <migration_features> <live/> <uri_transports> <uri_transport>tcp</uri_transport> </uri_transports> </migration_features> </host> </capabilities> This seems odd, this is from my /proc/cpuinfo: flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx rdtscp lm constant_tsc arch_perfmon pebs bts rep_good xtopology tsc_reliable nonstop_tsc aperfmperf pni dtes64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 popcnt lahf_lm ida tpr_shadow vnmi flexpriority ept vpid So the processor is capable of it, however: fredl@omega:~$ virsh version Compiled against library: libvir 0.7.1 Using library: libvir 0.7.1 Using API: QEMU 0.7.1 *error: failed to get the hypervisor version error: Unknown failure * I'm guessing that's the problem and I realized that in the Debian package the qemu binary is named 'kvm' (may be a symlink) while mine's in -rwxr-xr-x 1 root staff 2286848 2009-09-26 19:31 /usr/local/bin/qemu-system-x86_64 So how does libvirtd try to find out the hypervisor version? how does it even know to use either Xen, qemu etc. ?

2 1

[libvirt] Re: OpenVZ : The restriction of domain name should be addressed
by Yuji NISHIDA 28 Sep '09

28 Sep '09

Hi Daniel, I didn't realize that I even did not follow the manner of XML. I have worked with this problem and got a small patch to handle "ID" in OpenVZ functionality. I found it is working well with the XML script included "ID" in domain tag. I am concerned that I had to edit the common file domain_conf.c. I still believe I should keep it away from this problem for compatibility with the others. How do you think can I avoid this? diff --git a/src/domain_conf.c b/src/domain_conf.c index 5ae0775..f74961f 100644 --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -2492,7 +2492,7 @@ static virDomainDefPtr virDomainDefParseXML (virConnectPtr conn, return NULL; } - if (!(flags & VIR_DOMAIN_XML_INACTIVE)) + // if (!(flags & VIR_DOMAIN_XML_INACTIVE)) if((virXPathLong(conn, "string(./@id)", ctxt, &id)) < 0) id = -1; def->id = (int)id; diff --git a/src/openvz_conf.c b/src/openvz_conf.c index be94b9e..d23f173 100644 --- a/src/openvz_conf.c +++ b/src/openvz_conf.c @@ -425,17 +425,18 @@ int openvzLoadDomains(struct openvz_driver *driver) { char uuidstr[VIR_UUID_STRING_BUFLEN]; virDomainObjPtr dom = NULL; char temp[50]; + char name[64]; if (openvzAssignUUIDs() < 0) return -1; - if ((fp = popen(VZLIST " -a -ovpsid,status -H 2>/dev/null", "r")) == NULL) { + if ((fp = popen(VZLIST " -a -ovpsid,name,status -H 2>/dev/null", "r")) == NULL) { openvzError(NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("popen failed")); return -1; } while(!feof(fp)) { - if (fscanf(fp, "%d %s¥n", &veid, status) != 2) { + if (fscanf(fp, "%d %s¥n", &veid, name, status) != 3) { if (feof(fp)) break; @@ -465,7 +466,7 @@ int openvzLoadDomains(struct openvz_driver *driver) { dom->pid = veid; dom->def->id = dom->state == VIR_DOMAIN_SHUTOFF ? -1 : veid; - if (virAsprintf(&dom->def->name, "%i", veid) < 0) + if (virAsprintf(&dom->def->name, "%s", name) < 0) goto no_memory; openvzGetVPSUUID(veid, uuidstr, sizeof(uuidstr)); diff --git a/src/openvz_driver.c b/src/openvz_driver.c index a8c24ba..c0c1e0f 100644 --- a/src/openvz_driver.c +++ b/src/openvz_driver.c @@ -101,6 +101,7 @@ static int openvzDomainDefineCmd(virConnectPtr conn, virDomainDefPtr vmdef) { int narg; + char str_id[10]; for (narg = 0; narg < maxarg; narg++) args[narg] = NULL; @@ -130,6 +131,11 @@ static int openvzDomainDefineCmd(virConnectPtr conn, ADD_ARG_LIT(VZCTL); ADD_ARG_LIT("--quiet"); ADD_ARG_LIT("create"); + + sprintf( str_id, "%d", vmdef->id ); + ADD_ARG_LIT(str_id); + + ADD_ARG_LIT("--name"); ADD_ARG_LIT(vmdef->name); if (vmdef->nfss == 1 && @@ -1229,7 +1235,11 @@ static int openvzListDefinedDomains (virConnectPtr conn, char vpsname[32]; char buf[32]; char *endptr; - const char *cmd[] = {VZLIST, "-ovpsid", "-H", "-S", NULL}; + const char *cmd[] = {VZLIST, "-oname", "-H", "-S", NULL}; + int cnt = 0; + char name_buf[32]; + + /* the -S options lists only stopped domains */ ret = virExec(conn, cmd, NULL, NULL, @@ -1241,14 +1251,14 @@ static int openvzListDefinedDomains (virConnectPtr conn, } while(got < nnames){ - ret = openvz_readline(outfd, buf, 32); + ret = openvz_readline(outfd, buf, 64); if(!ret) break; - if (virStrToLong_i(buf, &endptr, 10, &veid) < 0) { - openvzError(conn, VIR_ERR_INTERNAL_ERROR, - _("Could not parse VPS ID %s"), buf); - continue; + cnt = 0; + while( buf[cnt] != ' ' ){ + name_buf[cnt] = buf[cnt]; + cnt++; } - snprintf(vpsname, sizeof(vpsname), "%d", veid); + snprintf(vpsname, sizeof(vpsname), "%d", name_buf); if (!(names[got] = strdup(vpsname))) goto no_memory; got ++; -- 1.5.2.2 ----- Yuji Nishida nishidy(a)nict.go.jp

4 6