- Devel - libvirt List Archives

[libvirt] [PATCH 0/1] NPIV support revised patch
by David Allan 02 Jun '09

02 Jun '09

Here is a new version of the NPIV support incorporating everybody's comments. I think it should be ready to go in at this point. Dave

3 3

[libvirt] PATCH: Remove all getuid==0 checks from code
by Daniel P. Berrange 02 Jun '09

02 Jun '09

This patch is preparing the way for future work on allowing the libvirtd daemon to run as a less-privileged user ID. The idea is that we will switch from 'root' to 'libvirtd', but use Linux capabilties to keep the handful of higher privileges we need for our work. Thus any code which does a check of 'getuid() == 0' is guarenteed to break [1]. The way this patch approaches this problem, is to change the driver initialization function virStateInitialize() to have it be passed in a 'int privileged' flag from the libvirtd daemon. Each driver is updated to record this flag, and use it for checks where needed. The only real exception is the Xen driver, where we simply check access(2) against the file we need to open. [1] Technically this is already broken on Solaris, since they already change user id qemud/qemud.c | 39 ++++++++++++++++++++++----------------- qemud/qemud.h | 2 ++ src/driver.h | 2 +- src/libvirt.c | 4 ++-- src/libvirt_internal.h | 2 +- src/lxc_driver.c | 25 +++---------------------- src/network_driver.c | 4 ++-- src/node_device_devkit.c | 2 +- src/node_device_hal.c | 2 +- src/qemu_conf.h | 2 ++ src/qemu_driver.c | 37 +++++++++++++++++++------------------ src/remote_internal.c | 2 +- src/storage_driver.c | 6 +++--- src/uml_conf.h | 2 ++ src/uml_driver.c | 18 +++++++++--------- src/xen_internal.c | 2 +- src/xen_unified.c | 2 +- 17 files changed, 73 insertions(+), 80 deletions(-) Daniel diff -r 5e3b5d1f91c2 qemud/qemud.c --- a/qemud/qemud.c Thu May 21 16:21:20 2009 +0100 +++ b/qemud/qemud.c Thu May 21 16:27:16 2009 +0100 @@ -112,8 +112,6 @@ static int unix_sock_ro_mask = 0666; #else -#define SYSTEM_UID 0 - static gid_t unix_sock_gid = 0; /* Only root by default */ static int unix_sock_rw_mask = 0700; /* Allow user only */ static int unix_sock_ro_mask = 0777; /* Allow world */ @@ -512,7 +510,7 @@ static int qemudListenUnix(struct qemud_ oldgrp = getgid(); oldmask = umask(readonly ? ~unix_sock_ro_mask : ~unix_sock_rw_mask); - if (getuid() == 0) + if (server->privileged) setgid(unix_sock_gid); if (bind(sock->fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { @@ -521,7 +519,7 @@ static int qemudListenUnix(struct qemud_ goto cleanup; } umask(oldmask); - if (getuid() == 0) + if (server->privileged) setgid(oldgrp); if (listen(sock->fd, 30) < 0) { @@ -696,7 +694,6 @@ static int qemudInitPaths(struct qemud_s char *roSockname, int maxlen) { - uid_t uid = geteuid(); char *sock_dir; char *dir_prefix = NULL; int ret = -1; @@ -706,7 +703,7 @@ static int qemudInitPaths(struct qemud_s sock_dir = unix_sock_dir; else { sock_dir = sockname; - if (uid == SYSTEM_UID) { + if (server->privileged) { dir_prefix = strdup (LOCAL_STATE_DIR); if (dir_prefix == NULL) { virReportOOMError(NULL); @@ -716,6 +713,7 @@ static int qemudInitPaths(struct qemud_s dir_prefix) >= maxlen) goto snprintf_error; } else { + uid_t uid = geteuid(); dir_prefix = virGetUserDirectory(NULL, uid); if (dir_prefix == NULL) { /* Do not diagnose here; virGetUserDirectory does that. */ @@ -733,7 +731,7 @@ static int qemudInitPaths(struct qemud_s goto cleanup; } - if (uid == SYSTEM_UID) { + if (server->privileged) { if (snprintf (sockname, maxlen, "%s/libvirt-sock", sock_dir_prefix) >= maxlen || (snprintf (roSockname, maxlen, "%s/libvirt-sock-ro", @@ -747,10 +745,10 @@ static int qemudInitPaths(struct qemud_s goto snprintf_error; } - if (uid == SYSTEM_UID) - server->logDir = strdup (LOCAL_STATE_DIR "/log/libvirt"); + if (server->privileged) + server->logDir = strdup (LOCAL_STATE_DIR "/log/libvirt"); else - virAsprintf(&server->logDir, "%s/.libvirt/log", dir_prefix); + virAsprintf(&server->logDir, "%s/.libvirt/log", dir_prefix); if (server->logDir == NULL) virReportOOMError(NULL); @@ -786,6 +784,7 @@ static struct qemud_server *qemudInitial VIR_FREE(server); } + server->privileged = getuid() == 0 ? 1 : 0; server->sigread = sigread; if (virEventInit() < 0) { @@ -844,7 +843,7 @@ static struct qemud_server *qemudInitial virEventUpdateTimeoutImpl, virEventRemoveTimeoutImpl); - virStateInitialize(); + virStateInitialize(server->privileged); return server; } @@ -915,7 +914,7 @@ static struct qemud_server *qemudNetwork } #ifdef HAVE_AVAHI - if (getuid() == 0 && mdns_adv) { + if (server->privileged && mdns_adv) { struct libvirtd_mdns_group *group; int port = 0; @@ -2507,9 +2506,9 @@ remoteReadConfigFile (struct qemud_serve #if HAVE_POLKIT /* Change the default back to no auth for non-root */ - if (getuid() != 0 && auth_unix_rw == REMOTE_AUTH_POLKIT) + if (!server->privileged && auth_unix_rw == REMOTE_AUTH_POLKIT) auth_unix_rw = REMOTE_AUTH_NONE; - if (getuid() != 0 && auth_unix_ro == REMOTE_AUTH_POLKIT) + if (!server->privileged && auth_unix_ro == REMOTE_AUTH_POLKIT) auth_unix_ro = REMOTE_AUTH_NONE; #endif @@ -2546,7 +2545,7 @@ remoteReadConfigFile (struct qemud_serve GET_CONF_STR (conf, filename, unix_sock_group); if (unix_sock_group) { - if (getuid() != 0) { + if (!server->privileged) { VIR_WARN0(_("Cannot set group when not running as root")); } else { int ret; @@ -2871,7 +2870,7 @@ int main(int argc, char **argv) { sigaction(SIGPIPE, &sig_action, NULL); /* Ensure the rundir exists (on tmpfs on some systems) */ - if (geteuid () == 0) { + if (getuid() == 0) { const char *rundir = LOCAL_STATE_DIR "/run/libvirt"; if (mkdir (rundir, 0755)) { @@ -2882,6 +2881,12 @@ int main(int argc, char **argv) { } } + /* Beyond this point, nothing should rely on using + * getuid/geteuid() == 0, for privilege level checks. + * It must all use the flag 'server->privileged' + * which is also passed into all libvirt stateful + * drivers + */ if (qemudSetupPrivs() < 0) goto error2; @@ -2895,7 +2900,7 @@ int main(int argc, char **argv) { goto error2; /* Change the group ownership of /var/run/libvirt to unix_sock_gid */ - if (unix_sock_dir && geteuid() == 0) { + if (unix_sock_dir && server->privileged) { if (chown(unix_sock_dir, -1, unix_sock_gid) < 0) VIR_ERROR(_("Failed to change group ownership of %s"), unix_sock_dir); diff -r 5e3b5d1f91c2 qemud/qemud.h --- a/qemud/qemud.h Thu May 21 16:21:20 2009 +0100 +++ b/qemud/qemud.h Thu May 21 16:27:16 2009 +0100 @@ -172,6 +172,8 @@ struct qemud_server { virMutex lock; virCond job; + int privileged; + int nworkers; int nactiveworkers; struct qemud_worker *workers; diff -r 5e3b5d1f91c2 src/driver.h --- a/src/driver.h Thu May 21 16:21:20 2009 +0100 +++ b/src/driver.h Thu May 21 16:27:16 2009 +0100 @@ -717,7 +717,7 @@ struct _virStorageDriver { }; #ifdef WITH_LIBVIRTD -typedef int (*virDrvStateInitialize) (void); +typedef int (*virDrvStateInitialize) (int privileged); typedef int (*virDrvStateCleanup) (void); typedef int (*virDrvStateReload) (void); typedef int (*virDrvStateActive) (void); diff -r 5e3b5d1f91c2 src/libvirt.c --- a/src/libvirt.c Thu May 21 16:21:20 2009 +0100 +++ b/src/libvirt.c Thu May 21 16:27:16 2009 +0100 @@ -765,7 +765,7 @@ virRegisterStateDriver(virStateDriverPtr * * Return 0 if all succeed, -1 upon any failure. */ -int virStateInitialize(void) { +int virStateInitialize(int privileged) { int i, ret = 0; if (virInitialize() < 0) @@ -773,7 +773,7 @@ int virStateInitialize(void) { for (i = 0 ; i < virStateDriverTabCount ; i++) { if (virStateDriverTab[i]->initialize && - virStateDriverTab[i]->initialize() < 0) + virStateDriverTab[i]->initialize(privileged) < 0) ret = -1; } return ret; diff -r 5e3b5d1f91c2 src/libvirt_internal.h --- a/src/libvirt_internal.h Thu May 21 16:21:20 2009 +0100 +++ b/src/libvirt_internal.h Thu May 21 16:27:16 2009 +0100 @@ -26,7 +26,7 @@ #ifdef WITH_LIBVIRTD -int virStateInitialize(void); +int virStateInitialize(int privileged); int virStateCleanup(void); int virStateReload(void); int virStateActive(void); diff -r 5e3b5d1f91c2 src/lxc_driver.c --- a/src/lxc_driver.c Thu May 21 16:21:20 2009 +0100 +++ b/src/lxc_driver.c Thu May 21 16:27:16 2009 +0100 @@ -51,7 +51,7 @@ #define VIR_FROM_THIS VIR_FROM_LXC -static int lxcStartup(void); +static int lxcStartup(int privileged); static int lxcShutdown(void); static lxc_driver_t *lxc_driver = NULL; @@ -67,15 +67,6 @@ static void lxcDriverUnlock(lxc_driver_t } -static int lxcProbe(void) -{ - if (getuid() != 0 || - lxcContainerAvailable(0) < 0) - return 0; - - return 1; -} - static virDrvOpenStatus lxcOpen(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED, int flags ATTRIBUTE_UNUSED) @@ -86,9 +77,6 @@ static virDrvOpenStatus lxcOpen(virConne if (lxc_driver == NULL) return VIR_DRV_OPEN_DECLINED; - if (!lxcProbe()) - return VIR_DRV_OPEN_DECLINED; - conn->uri = xmlParseURI("lxc:///"); if (!conn->uri) { virReportOOMError(conn); @@ -115,12 +103,6 @@ static virDrvOpenStatus lxcOpen(virConne _("lxc state driver is not active")); return VIR_DRV_OPEN_ERROR; } - - if (!lxcProbe()) { - lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, - _("kernel does not support LXC feature")); - return VIR_DRV_OPEN_ERROR; - } } conn->privateData = lxc_driver; @@ -1149,9 +1131,8 @@ static int lxcCheckNetNsSupport(void) return 1; } -static int lxcStartup(void) +static int lxcStartup(int privileged) { - uid_t uid = getuid(); unsigned int i; char *ld; @@ -1164,7 +1145,7 @@ static int lxcStartup(void) return -1; /* Check that the user is root */ - if (0 != uid) { + if (!privileged) { return -1; } diff -r 5e3b5d1f91c2 src/network_driver.c --- a/src/network_driver.c Thu May 21 16:21:20 2009 +0100 +++ b/src/network_driver.c Thu May 21 16:27:16 2009 +0100 @@ -182,7 +182,7 @@ networkAutostartConfigs(struct network_d * Initialization function for the QEmu daemon */ static int -networkStartup(void) { +networkStartup(int privileged) { uid_t uid = geteuid(); char *base = NULL; int err; @@ -196,7 +196,7 @@ networkStartup(void) { } networkDriverLock(driverState); - if (!uid) { + if (privileged) { if (virAsprintf(&driverState->logDir, "%s/log/libvirt/qemu", LOCAL_STATE_DIR) == -1) goto out_of_memory; diff -r 5e3b5d1f91c2 src/node_device_devkit.c --- a/src/node_device_devkit.c Thu May 21 16:21:20 2009 +0100 +++ b/src/node_device_devkit.c Thu May 21 16:27:16 2009 +0100 @@ -284,7 +284,7 @@ static void dev_create(void *_dkdev, voi } -static int devkitDeviceMonitorStartup(void) +static int devkitDeviceMonitorStartup(int privileged ATTRIBUTE_UNUSED) { size_t caps_tbl_len = sizeof(caps_tbl) / sizeof(caps_tbl[0]); DevkitClient *devkit_client = NULL; diff -r 5e3b5d1f91c2 src/node_device_hal.c --- a/src/node_device_hal.c Thu May 21 16:21:20 2009 +0100 +++ b/src/node_device_hal.c Thu May 21 16:27:16 2009 +0100 @@ -661,7 +661,7 @@ static void toggle_dbus_watch(DBusWatch } -static int halDeviceMonitorStartup(void) +static int halDeviceMonitorStartup(int privileged ATTRIBUTE_UNUSED) { LibHalContext *hal_ctx = NULL; DBusConnection *dbus_conn = NULL; diff -r 5e3b5d1f91c2 src/qemu_conf.h --- a/src/qemu_conf.h Thu May 21 16:21:20 2009 +0100 +++ b/src/qemu_conf.h Thu May 21 16:27:16 2009 +0100 @@ -62,6 +62,8 @@ enum qemud_cmd_flags { struct qemud_driver { virMutex lock; + int privileged; + unsigned int qemuVersion; int nextvmid; diff -r 5e3b5d1f91c2 src/qemu_driver.c --- a/src/qemu_driver.c Thu May 21 16:21:20 2009 +0100 +++ b/src/qemu_driver.c Thu May 21 16:27:16 2009 +0100 @@ -130,24 +130,26 @@ static struct qemud_driver *qemu_driver static int -qemudLogFD(virConnectPtr conn, const char* logDir, const char* name) +qemudLogFD(virConnectPtr conn, struct qemud_driver *driver, const char* name) { char logfile[PATH_MAX]; mode_t logmode; - uid_t uid = geteuid(); int ret, fd = -1; - if ((ret = snprintf(logfile, sizeof(logfile), "%s/%s.log", logDir, name)) + if ((ret = snprintf(logfile, sizeof(logfile), "%s/%s.log", + driver->logDir, name)) < 0 || ret >= sizeof(logfile)) { virReportOOMError(conn); return -1; } logmode = O_CREAT | O_WRONLY; - if (uid != 0) + /* Only logrotate files in /var/log, so only append if running privileged */ + if (driver->privileged) + logmode |= O_APPEND; + else logmode |= O_TRUNC; - else - logmode |= O_APPEND; + if ((fd = open(logfile, logmode, S_IRUSR | S_IWUSR)) < 0) { virReportSystemError(conn, errno, _("failed to create logfile %s"), @@ -210,9 +212,9 @@ qemudAutostartConfigs(struct qemud_drive * to lookup the bridge associated with a virtual * network */ - virConnectPtr conn = virConnectOpen(getuid() ? - "qemu:///session" : - "qemu:///system"); + virConnectPtr conn = virConnectOpen(driver->privileged ? + "qemu:///system" : + "qemu:///session"); /* Ignoring NULL conn which is mostly harmless here */ qemuDriverLock(driver); @@ -333,7 +335,7 @@ qemudReconnectVMs(struct qemud_driver *d goto next_error; } - if ((vm->logfile = qemudLogFD(NULL, driver->logDir, vm->def->name)) < 0) + if ((vm->logfile = qemudLogFD(NULL, driver, vm->def->name)) < 0) goto next_error; if (vm->def->id >= driver->nextvmid) @@ -420,8 +422,7 @@ qemudSecurityInit(struct qemud_driver *q * Initialization function for the QEmu daemon */ static int -qemudStartup(void) { - uid_t uid = geteuid(); +qemudStartup(int privileged) { char *base = NULL; char driverConf[PATH_MAX]; @@ -434,6 +435,7 @@ qemudStartup(void) { return -1; } qemuDriverLock(qemu_driver); + qemu_driver->privileged = privileged; /* Don't have a dom0 so start from 1 */ qemu_driver->nextvmid = 1; @@ -448,7 +450,7 @@ qemudStartup(void) { virEventAddTimeout(-1, qemuDomainEventFlush, qemu_driver, NULL)) < 0) goto error; - if (!uid) { + if (privileged) { if (virAsprintf(&qemu_driver->logDir, "%s/log/libvirt/qemu", LOCAL_STATE_DIR) == -1) goto out_of_memory; @@ -460,6 +462,7 @@ qemudStartup(void) { "%s/run/libvirt/qemu/", LOCAL_STATE_DIR) == -1) goto out_of_memory; } else { + uid_t uid = geteuid(); char *userdir = virGetUserDirectory(NULL, uid); if (!userdir) goto error; @@ -1372,7 +1375,7 @@ static int qemudStartVMDaemon(virConnect goto cleanup; } - if((vm->logfile = qemudLogFD(conn, driver->logDir, vm->def->name)) < 0) + if ((vm->logfile = qemudLogFD(conn, driver, vm->def->name)) < 0) goto cleanup; emulator = vm->def->emulator; @@ -1773,8 +1776,6 @@ static int qemudProbe(void) static virDrvOpenStatus qemudOpen(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED, int flags ATTRIBUTE_UNUSED) { - uid_t uid = getuid(); - if (conn->uri == NULL) { if (qemu_driver == NULL) return VIR_DRV_OPEN_DECLINED; @@ -1782,7 +1783,7 @@ static virDrvOpenStatus qemudOpen(virCon if (!qemudProbe()) return VIR_DRV_OPEN_DECLINED; - conn->uri = xmlParseURI(uid == 0 ? + conn->uri = xmlParseURI(qemu_driver->privileged ? "qemu:///system" : "qemu:///session"); if (!conn->uri) { @@ -1805,7 +1806,7 @@ static virDrvOpenStatus qemudOpen(virCon return VIR_DRV_OPEN_ERROR; } - if (!uid) { + if (qemu_driver->privileged) { if (STRNEQ (conn->uri->path, "/system") && STRNEQ (conn->uri->path, "/session")) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, diff -r 5e3b5d1f91c2 src/remote_internal.c --- a/src/remote_internal.c Thu May 21 16:21:20 2009 +0100 +++ b/src/remote_internal.c Thu May 21 16:27:16 2009 +0100 @@ -235,7 +235,7 @@ static gnutls_session_t negotiate_gnutls #ifdef WITH_LIBVIRTD static int -remoteStartup(void) +remoteStartup(int privileged ATTRIBUTE_UNUSED) { /* Mark that we're inside the daemon so we can avoid * re-entering ourselves diff -r 5e3b5d1f91c2 src/storage_driver.c --- a/src/storage_driver.c Thu May 21 16:21:20 2009 +0100 +++ b/src/storage_driver.c Thu May 21 16:27:16 2009 +0100 @@ -106,8 +106,7 @@ storageDriverAutostart(virStorageDriverS * Initialization function for the QEmu daemon */ static int -storageDriverStartup(void) { - uid_t uid = geteuid(); +storageDriverStartup(int privileged) { char *base = NULL; char driverConf[PATH_MAX]; @@ -120,10 +119,11 @@ storageDriverStartup(void) { } storageDriverLock(driverState); - if (!uid) { + if (privileged) { if ((base = strdup (SYSCONF_DIR "/libvirt")) == NULL) goto out_of_memory; } else { + uid_t uid = geteuid(); char *userdir = virGetUserDirectory(NULL, uid); if (!userdir) diff -r 5e3b5d1f91c2 src/uml_conf.h --- a/src/uml_conf.h Thu May 21 16:21:20 2009 +0100 +++ b/src/uml_conf.h Thu May 21 16:27:16 2009 +0100 @@ -42,6 +42,8 @@ struct uml_driver { virMutex lock; + int privileged; + unsigned int umlVersion; int nextvmid; diff -r 5e3b5d1f91c2 src/uml_driver.c --- a/src/uml_driver.c Thu May 21 16:21:20 2009 +0100 +++ b/src/uml_driver.c Thu May 21 16:27:16 2009 +0100 @@ -131,9 +131,9 @@ umlAutostartConfigs(struct uml_driver *d * to lookup the bridge associated with a virtual * network */ - virConnectPtr conn = virConnectOpen(getuid() ? - "uml:///session" : - "uml:///system"); + virConnectPtr conn = virConnectOpen(driver->privileged ? + "uml:///system" : + "uml:///session"); /* Ignoring NULL conn which is mostly harmless here */ for (i = 0 ; i < driver->domains.count ; i++) { @@ -308,7 +308,7 @@ cleanup: * Initialization function for the Uml daemon */ static int -umlStartup(void) { +umlStartup(int privileged) { uid_t uid = geteuid(); char *base = NULL; char driverConf[PATH_MAX]; @@ -317,6 +317,8 @@ umlStartup(void) { if (VIR_ALLOC(uml_driver) < 0) return -1; + uml_driver->privileged = privileged; + if (virMutexInit(&uml_driver->lock) < 0) { VIR_FREE(uml_driver); return -1; @@ -331,7 +333,7 @@ umlStartup(void) { if (!userdir) goto error; - if (!uid) { + if (privileged) { if (virAsprintf(&uml_driver->logDir, "%s/log/libvirt/uml", LOCAL_STATE_DIR) == -1) goto out_of_memory; @@ -887,13 +889,11 @@ static void umlShutdownVMDaemon(virConne static virDrvOpenStatus umlOpen(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED, int flags ATTRIBUTE_UNUSED) { - uid_t uid = getuid(); - if (conn->uri == NULL) { if (uml_driver == NULL) return VIR_DRV_OPEN_DECLINED; - conn->uri = xmlParseURI(uid == 0 ? + conn->uri = xmlParseURI(uml_driver->privileged ? "uml:///system" : "uml:///session"); if (!conn->uri) { @@ -915,7 +915,7 @@ static virDrvOpenStatus umlOpen(virConne return VIR_DRV_OPEN_ERROR; } - if (uid == 0) { + if (uml_driver->privileged) { if (STRNEQ (conn->uri->path, "/system") && STRNEQ (conn->uri->path, "/session")) { umlReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, diff -r 5e3b5d1f91c2 src/xen_internal.c --- a/src/xen_internal.c Thu May 21 16:21:20 2009 +0100 +++ b/src/xen_internal.c Thu May 21 16:27:16 2009 +0100 @@ -3434,6 +3434,6 @@ xenHavePrivilege() #ifdef __sun return priv_ineffect (PRIV_XVM_CONTROL); #else - return getuid () == 0; + return access(XEN_HYPERVISOR_SOCKET, R_OK) == 0; #endif } diff -r 5e3b5d1f91c2 src/xen_unified.c --- a/src/xen_unified.c Thu May 21 16:21:20 2009 +0100 +++ b/src/xen_unified.c Thu May 21 16:27:16 2009 +0100 @@ -175,7 +175,7 @@ done: #ifdef WITH_LIBVIRTD static int -xenInitialize (void) +xenInitialize (int privileged ATTRIBUTE_UNUSED) { inside_daemon = 1; return 0; -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 2

[libvirt] PATCH Fix BuildRequires in spec file
by Trent Johnson 01 Jun '09

01 Jun '09

Fixes error from rpmbuild RPM build errors: File not found: /var/tmp/libvirt-0.6.3-1.el5-root/usr/libexec/libvirt_parthelper diff -u -r libvirt.spec.orig libvirt.spec --- libvirt.spec.orig 2009-04-24 08:58:29.000000000 -0500 +++ libvirt.spec 2009-05-29 09:57:56.000000000 -0500 @@ -59,7 +59,7 @@ Source: libvirt-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://libvirt.org/ -BuildRequires: python python-devel +BuildRequires: python python-devel e2fsprogs-devel Requires: libxml2 Requires: readline Requires: ncurses

2 4

[libvirt] PATCH: Fix mingw32 build
by Daniel P. Berrange 29 May '09

29 May '09

On Win32/mingw32 the name 'interface' is #defined to the COM_interface struct. Needless to say, libvirt thus fails to build in spectacular ways. This patch does s/interface/iface/ on all variables. It also fixes bugs in the qemud/Makefile.am and tests/testutils.h files include/libvirt/libvirt.h | 18 +++--- include/libvirt/libvirt.h.in | 18 +++--- qemud/Makefile.am | 6 +- qemud/remote.c | 82 ++++++++++++++--------------- qemud/remote_protocol.c | 14 ++--- qemud/remote_protocol.h | 14 ++--- qemud/remote_protocol.x | 14 ++--- src/datatypes.c | 36 ++++++------ src/datatypes.h | 2 src/driver.h | 8 +- src/libvirt.c | 120 +++++++++++++++++++++---------------------- src/remote_internal.c | 56 ++++++++++---------- tests/testutils.c | 10 +++ 13 files changed, 206 insertions(+), 192 deletions(-) Daniel Index: include/libvirt/libvirt.h =================================================================== RCS file: /data/cvs/libvirt/include/libvirt/libvirt.h,v retrieving revision 1.105 diff -u -p -r1.105 libvirt.h --- include/libvirt/libvirt.h 21 May 2009 13:46:36 -0000 1.105 +++ include/libvirt/libvirt.h 28 May 2009 16:32:53 -0000 @@ -883,7 +883,7 @@ typedef struct _virInterface virInterfac */ typedef virInterface *virInterfacePtr; -virConnectPtr virInterfaceGetConnect (virInterfacePtr interface); +virConnectPtr virInterfaceGetConnect (virInterfacePtr iface); int virConnectNumOfInterfaces (virConnectPtr conn); int virConnectListInterfaces (virConnectPtr conn, @@ -895,25 +895,25 @@ virInterfacePtr virInterfaceLook virInterfacePtr virInterfaceLookupByMACString (virConnectPtr conn, const char *mac); -const char* virInterfaceGetName (virInterfacePtr interface); -const char* virInterfaceGetMACString (virInterfacePtr interface); +const char* virInterfaceGetName (virInterfacePtr iface); +const char* virInterfaceGetMACString (virInterfacePtr iface); -char * virInterfaceGetXMLDesc (virInterfacePtr interface, +char * virInterfaceGetXMLDesc (virInterfacePtr iface, unsigned int flags); virInterfacePtr virInterfaceDefineXML (virConnectPtr conn, const char *xmlDesc, unsigned int flags); -int virInterfaceUndefine (virInterfacePtr interface); +int virInterfaceUndefine (virInterfacePtr iface); -int virInterfaceCreate (virInterfacePtr interface, +int virInterfaceCreate (virInterfacePtr iface, unsigned int flags); -int virInterfaceDestroy (virInterfacePtr interface, +int virInterfaceDestroy (virInterfacePtr iface, unsigned int flags); -int virInterfaceRef (virInterfacePtr interface); -int virInterfaceFree (virInterfacePtr interface); +int virInterfaceRef (virInterfacePtr iface); +int virInterfaceFree (virInterfacePtr iface); /** * virStoragePool: Index: include/libvirt/libvirt.h.in =================================================================== RCS file: /data/cvs/libvirt/include/libvirt/libvirt.h.in,v retrieving revision 1.70 diff -u -p -r1.70 libvirt.h.in --- include/libvirt/libvirt.h.in 21 May 2009 13:46:36 -0000 1.70 +++ include/libvirt/libvirt.h.in 28 May 2009 16:32:53 -0000 @@ -883,7 +883,7 @@ typedef struct _virInterface virInterfac */ typedef virInterface *virInterfacePtr; -virConnectPtr virInterfaceGetConnect (virInterfacePtr interface); +virConnectPtr virInterfaceGetConnect (virInterfacePtr iface); int virConnectNumOfInterfaces (virConnectPtr conn); int virConnectListInterfaces (virConnectPtr conn, @@ -895,25 +895,25 @@ virInterfacePtr virInterfaceLook virInterfacePtr virInterfaceLookupByMACString (virConnectPtr conn, const char *mac); -const char* virInterfaceGetName (virInterfacePtr interface); -const char* virInterfaceGetMACString (virInterfacePtr interface); +const char* virInterfaceGetName (virInterfacePtr iface); +const char* virInterfaceGetMACString (virInterfacePtr iface); -char * virInterfaceGetXMLDesc (virInterfacePtr interface, +char * virInterfaceGetXMLDesc (virInterfacePtr iface, unsigned int flags); virInterfacePtr virInterfaceDefineXML (virConnectPtr conn, const char *xmlDesc, unsigned int flags); -int virInterfaceUndefine (virInterfacePtr interface); +int virInterfaceUndefine (virInterfacePtr iface); -int virInterfaceCreate (virInterfacePtr interface, +int virInterfaceCreate (virInterfacePtr iface, unsigned int flags); -int virInterfaceDestroy (virInterfacePtr interface, +int virInterfaceDestroy (virInterfacePtr iface, unsigned int flags); -int virInterfaceRef (virInterfacePtr interface); -int virInterfaceFree (virInterfacePtr interface); +int virInterfaceRef (virInterfacePtr iface); +int virInterfaceFree (virInterfacePtr iface); /** * virStoragePool: Index: qemud/Makefile.am =================================================================== RCS file: /data/cvs/libvirt/qemud/Makefile.am,v retrieving revision 1.78 diff -u -p -r1.78 Makefile.am --- qemud/Makefile.am 25 May 2009 11:56:00 -0000 1.78 +++ qemud/Makefile.am 28 May 2009 16:32:53 -0000 @@ -31,7 +31,7 @@ EXTRA_DIST = \ $(AVAHI_SOURCES) \ $(DAEMON_SOURCES) -BUILT_SOURCES = libvirtd.init libvirtd.logrotate +BUILT_SOURCES = if HAVE_RPCGEN # @@ -218,6 +218,8 @@ remote_dispatch_args.h: $(srcdir)/remote remote_dispatch_ret.h: $(srcdir)/remote_generate_stubs.pl remote_protocol.x perl -w $(srcdir)/remote_generate_stubs.pl -r $(srcdir)/remote_protocol.x > $@ +BUILT_SOURCES += libvirtd.logrotate + libvirtd.logrotate: libvirtd.logrotate.in sed \ -e s!\@localstatedir\@!@localstatedir@!g \ @@ -242,6 +244,8 @@ uninstall-init: rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd \ $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd +BUILT_SOURCES += libvirtd.init + libvirtd.init: libvirtd.init.in sed \ -e s!\@localstatedir\@!@localstatedir@!g \ Index: qemud/remote.c =================================================================== RCS file: /data/cvs/libvirt/qemud/remote.c,v retrieving revision 1.71 diff -u -p -r1.71 remote.c --- qemud/remote.c 21 May 2009 13:50:56 -0000 1.71 +++ qemud/remote.c 28 May 2009 16:32:54 -0000 @@ -2664,16 +2664,16 @@ remoteDispatchInterfaceLookupByName (str remote_interface_lookup_by_name_args *args, remote_interface_lookup_by_name_ret *ret) { - virInterfacePtr interface; + virInterfacePtr iface; - interface = virInterfaceLookupByName (conn, args->name); - if (interface == NULL) { + iface = virInterfaceLookupByName (conn, args->name); + if (iface == NULL) { remoteDispatchConnError(rerr, conn); return -1; } - make_nonnull_interface (&ret->interface, interface); - virInterfaceFree(interface); + make_nonnull_interface (&ret->iface, iface); + virInterfaceFree(iface); return 0; } @@ -2685,16 +2685,16 @@ remoteDispatchInterfaceLookupByMacString remote_interface_lookup_by_mac_string_args *args, remote_interface_lookup_by_mac_string_ret *ret) { - virInterfacePtr interface; + virInterfacePtr iface; - interface = virInterfaceLookupByMACString (conn, args->mac); - if (interface == NULL) { + iface = virInterfaceLookupByMACString (conn, args->mac); + if (iface == NULL) { remoteDispatchConnError(rerr, conn); return -1; } - make_nonnull_interface (&ret->interface, interface); - virInterfaceFree(interface); + make_nonnull_interface (&ret->iface, iface); + virInterfaceFree(iface); return 0; } @@ -2706,22 +2706,22 @@ remoteDispatchInterfaceGetXmlDesc (struc remote_interface_get_xml_desc_args *args, remote_interface_get_xml_desc_ret *ret) { - virInterfacePtr interface; + virInterfacePtr iface; - interface = get_nonnull_interface (conn, args->interface); - if (interface == NULL) { + iface = get_nonnull_interface (conn, args->iface); + if (iface == NULL) { remoteDispatchConnError(rerr, conn); return -1; } /* remoteDispatchClientRequest will free this. */ - ret->xml = virInterfaceGetXMLDesc (interface, args->flags); + ret->xml = virInterfaceGetXMLDesc (iface, args->flags); if (!ret->xml) { - virInterfaceFree(interface); + virInterfaceFree(iface); remoteDispatchConnError(rerr, conn); return -1; } - virInterfaceFree(interface); + virInterfaceFree(iface); return 0; } @@ -2733,16 +2733,16 @@ remoteDispatchInterfaceDefineXml (struct remote_interface_define_xml_args *args, remote_interface_define_xml_ret *ret) { - virInterfacePtr interface; + virInterfacePtr iface; - interface = virInterfaceDefineXML (conn, args->xml, args->flags); - if (interface == NULL) { + iface = virInterfaceDefineXML (conn, args->xml, args->flags); + if (iface == NULL) { remoteDispatchConnError(rerr, conn); return -1; } - make_nonnull_interface (&ret->interface, interface); - virInterfaceFree(interface); + make_nonnull_interface (&ret->iface, iface); + virInterfaceFree(iface); return 0; } @@ -2754,20 +2754,20 @@ remoteDispatchInterfaceUndefine (struct remote_interface_undefine_args *args, void *ret ATTRIBUTE_UNUSED) { - virInterfacePtr interface; + virInterfacePtr iface; - interface = get_nonnull_interface (conn, args->interface); - if (interface == NULL) { + iface = get_nonnull_interface (conn, args->iface); + if (iface == NULL) { remoteDispatchConnError(rerr, conn); return -1; } - if (virInterfaceUndefine (interface) == -1) { - virInterfaceFree(interface); + if (virInterfaceUndefine (iface) == -1) { + virInterfaceFree(iface); remoteDispatchConnError(rerr, conn); return -1; } - virInterfaceFree(interface); + virInterfaceFree(iface); return 0; } @@ -2779,20 +2779,20 @@ remoteDispatchInterfaceCreate (struct qe remote_interface_create_args *args, void *ret ATTRIBUTE_UNUSED) { - virInterfacePtr interface; + virInterfacePtr iface; - interface = get_nonnull_interface (conn, args->interface); - if (interface == NULL) { + iface = get_nonnull_interface (conn, args->iface); + if (iface == NULL) { remoteDispatchConnError(rerr, conn); return -1; } - if (virInterfaceCreate (interface, args->flags) == -1) { - virInterfaceFree(interface); + if (virInterfaceCreate (iface, args->flags) == -1) { + virInterfaceFree(iface); remoteDispatchConnError(rerr, conn); return -1; } - virInterfaceFree(interface); + virInterfaceFree(iface); return 0; } @@ -2804,20 +2804,20 @@ remoteDispatchInterfaceDestroy (struct q remote_interface_destroy_args *args, void *ret ATTRIBUTE_UNUSED) { - virInterfacePtr interface; + virInterfacePtr iface; - interface = get_nonnull_interface (conn, args->interface); - if (interface == NULL) { + iface = get_nonnull_interface (conn, args->iface); + if (iface == NULL) { remoteDispatchConnError(rerr, conn); return -1; } - if (virInterfaceDestroy (interface, args->flags) == -1) { - virInterfaceFree(interface); + if (virInterfaceDestroy (iface, args->flags) == -1) { + virInterfaceFree(iface); remoteDispatchConnError(rerr, conn); return -1; } - virInterfaceFree(interface); + virInterfaceFree(iface); return 0; } @@ -4823,9 +4823,9 @@ get_nonnull_network (virConnectPtr conn, } static virInterfacePtr -get_nonnull_interface (virConnectPtr conn, remote_nonnull_interface interface) +get_nonnull_interface (virConnectPtr conn, remote_nonnull_interface iface) { - return virGetInterface (conn, interface.name, interface.mac); + return virGetInterface (conn, iface.name, iface.mac); } static virStoragePoolPtr Index: qemud/remote_protocol.c =================================================================== RCS file: /data/cvs/libvirt/qemud/remote_protocol.c,v retrieving revision 1.34 diff -u -p -r1.34 remote_protocol.c --- qemud/remote_protocol.c 21 May 2009 13:50:56 -0000 1.34 +++ qemud/remote_protocol.c 28 May 2009 16:32:54 -0000 @@ -1530,7 +1530,7 @@ bool_t xdr_remote_interface_lookup_by_name_ret (XDR *xdrs, remote_interface_lookup_by_name_ret *objp) { - if (!xdr_remote_nonnull_interface (xdrs, &objp->interface)) + if (!xdr_remote_nonnull_interface (xdrs, &objp->iface)) return FALSE; return TRUE; } @@ -1548,7 +1548,7 @@ bool_t xdr_remote_interface_lookup_by_mac_string_ret (XDR *xdrs, remote_interface_lookup_by_mac_string_ret *objp) { - if (!xdr_remote_nonnull_interface (xdrs, &objp->interface)) + if (!xdr_remote_nonnull_interface (xdrs, &objp->iface)) return FALSE; return TRUE; } @@ -1557,7 +1557,7 @@ bool_t xdr_remote_interface_get_xml_desc_args (XDR *xdrs, remote_interface_get_xml_desc_args *objp) { - if (!xdr_remote_nonnull_interface (xdrs, &objp->interface)) + if (!xdr_remote_nonnull_interface (xdrs, &objp->iface)) return FALSE; if (!xdr_u_int (xdrs, &objp->flags)) return FALSE; @@ -1588,7 +1588,7 @@ bool_t xdr_remote_interface_define_xml_ret (XDR *xdrs, remote_interface_define_xml_ret *objp) { - if (!xdr_remote_nonnull_interface (xdrs, &objp->interface)) + if (!xdr_remote_nonnull_interface (xdrs, &objp->iface)) return FALSE; return TRUE; } @@ -1597,7 +1597,7 @@ bool_t xdr_remote_interface_undefine_args (XDR *xdrs, remote_interface_undefine_args *objp) { - if (!xdr_remote_nonnull_interface (xdrs, &objp->interface)) + if (!xdr_remote_nonnull_interface (xdrs, &objp->iface)) return FALSE; return TRUE; } @@ -1606,7 +1606,7 @@ bool_t xdr_remote_interface_create_args (XDR *xdrs, remote_interface_create_args *objp) { - if (!xdr_remote_nonnull_interface (xdrs, &objp->interface)) + if (!xdr_remote_nonnull_interface (xdrs, &objp->iface)) return FALSE; if (!xdr_u_int (xdrs, &objp->flags)) return FALSE; @@ -1617,7 +1617,7 @@ bool_t xdr_remote_interface_destroy_args (XDR *xdrs, remote_interface_destroy_args *objp) { - if (!xdr_remote_nonnull_interface (xdrs, &objp->interface)) + if (!xdr_remote_nonnull_interface (xdrs, &objp->iface)) return FALSE; if (!xdr_u_int (xdrs, &objp->flags)) return FALSE; Index: qemud/remote_protocol.h =================================================================== RCS file: /data/cvs/libvirt/qemud/remote_protocol.h,v retrieving revision 1.33 diff -u -p -r1.33 remote_protocol.h --- qemud/remote_protocol.h 21 May 2009 13:50:56 -0000 1.33 +++ qemud/remote_protocol.h 28 May 2009 16:32:54 -0000 @@ -853,7 +853,7 @@ struct remote_interface_lookup_by_name_a typedef struct remote_interface_lookup_by_name_args remote_interface_lookup_by_name_args; struct remote_interface_lookup_by_name_ret { - remote_nonnull_interface interface; + remote_nonnull_interface iface; }; typedef struct remote_interface_lookup_by_name_ret remote_interface_lookup_by_name_ret; @@ -863,12 +863,12 @@ struct remote_interface_lookup_by_mac_st typedef struct remote_interface_lookup_by_mac_string_args remote_interface_lookup_by_mac_string_args; struct remote_interface_lookup_by_mac_string_ret { - remote_nonnull_interface interface; + remote_nonnull_interface iface; }; typedef struct remote_interface_lookup_by_mac_string_ret remote_interface_lookup_by_mac_string_ret; struct remote_interface_get_xml_desc_args { - remote_nonnull_interface interface; + remote_nonnull_interface iface; u_int flags; }; typedef struct remote_interface_get_xml_desc_args remote_interface_get_xml_desc_args; @@ -885,23 +885,23 @@ struct remote_interface_define_xml_args typedef struct remote_interface_define_xml_args remote_interface_define_xml_args; struct remote_interface_define_xml_ret { - remote_nonnull_interface interface; + remote_nonnull_interface iface; }; typedef struct remote_interface_define_xml_ret remote_interface_define_xml_ret; struct remote_interface_undefine_args { - remote_nonnull_interface interface; + remote_nonnull_interface iface; }; typedef struct remote_interface_undefine_args remote_interface_undefine_args; struct remote_interface_create_args { - remote_nonnull_interface interface; + remote_nonnull_interface iface; u_int flags; }; typedef struct remote_interface_create_args remote_interface_create_args; struct remote_interface_destroy_args { - remote_nonnull_interface interface; + remote_nonnull_interface iface; u_int flags; }; typedef struct remote_interface_destroy_args remote_interface_destroy_args; Index: qemud/remote_protocol.x =================================================================== RCS file: /data/cvs/libvirt/qemud/remote_protocol.x,v retrieving revision 1.32 diff -u -p -r1.32 remote_protocol.x --- qemud/remote_protocol.x 21 May 2009 13:50:56 -0000 1.32 +++ qemud/remote_protocol.x 28 May 2009 16:32:54 -0000 @@ -798,7 +798,7 @@ struct remote_interface_lookup_by_name_a }; struct remote_interface_lookup_by_name_ret { - remote_nonnull_interface interface; + remote_nonnull_interface iface; }; struct remote_interface_lookup_by_mac_string_args { @@ -806,11 +806,11 @@ struct remote_interface_lookup_by_mac_st }; struct remote_interface_lookup_by_mac_string_ret { - remote_nonnull_interface interface; + remote_nonnull_interface iface; }; struct remote_interface_get_xml_desc_args { - remote_nonnull_interface interface; + remote_nonnull_interface iface; unsigned int flags; }; @@ -824,20 +824,20 @@ struct remote_interface_define_xml_args }; struct remote_interface_define_xml_ret { - remote_nonnull_interface interface; + remote_nonnull_interface iface; }; struct remote_interface_undefine_args { - remote_nonnull_interface interface; + remote_nonnull_interface iface; }; struct remote_interface_create_args { - remote_nonnull_interface interface; + remote_nonnull_interface iface; unsigned int flags; }; struct remote_interface_destroy_args { - remote_nonnull_interface interface; + remote_nonnull_interface iface; unsigned int flags; }; Index: src/datatypes.c =================================================================== RCS file: /data/cvs/libvirt/src/datatypes.c,v retrieving revision 1.12 diff -u -p -r1.12 datatypes.c --- src/datatypes.c 20 May 2009 14:26:50 -0000 1.12 +++ src/datatypes.c 28 May 2009 16:32:54 -0000 @@ -75,9 +75,9 @@ virNetworkFreeName(virNetworkPtr network * Returns 0 in case of success and -1 in case of failure. */ static int -virInterfaceFreeName(virInterfacePtr interface, const char *name ATTRIBUTE_UNUSED) +virInterfaceFreeName(virInterfacePtr iface, const char *name ATTRIBUTE_UNUSED) { - return (virUnrefInterface(interface)); + return (virUnrefInterface(iface)); } /** @@ -589,19 +589,19 @@ virGetInterface(virConnectPtr conn, cons * which may also be released if its ref count hits zero. */ static void -virReleaseInterface(virInterfacePtr interface) { - virConnectPtr conn = interface->conn; - DEBUG("release interface %p %s", interface, interface->name); +virReleaseInterface(virInterfacePtr iface) { + virConnectPtr conn = iface->conn; + DEBUG("release interface %p %s", iface, iface->name); /* TODO search by MAC first as they are better differenciators */ - if (virHashRemoveEntry(conn->interfaces, interface->name, NULL) < 0) + if (virHashRemoveEntry(conn->interfaces, iface->name, NULL) < 0) virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, _("interface missing from connection hash table")); - interface->magic = -1; - VIR_FREE(interface->name); - VIR_FREE(interface->mac); - VIR_FREE(interface); + iface->magic = -1; + VIR_FREE(iface->name); + VIR_FREE(iface->mac); + VIR_FREE(iface); DEBUG("unref connection %p %d", conn, conn->refs); conn->refs--; @@ -625,24 +625,24 @@ virReleaseInterface(virInterfacePtr inte * Returns the reference count or -1 in case of failure. */ int -virUnrefInterface(virInterfacePtr interface) { +virUnrefInterface(virInterfacePtr iface) { int refs; - if (!VIR_IS_CONNECTED_INTERFACE(interface)) { + if (!VIR_IS_CONNECTED_INTERFACE(iface)) { virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); return(-1); } - virMutexLock(&interface->conn->lock); - DEBUG("unref interface %p %s %d", interface, interface->name, interface->refs); - interface->refs--; - refs = interface->refs; + virMutexLock(&iface->conn->lock); + DEBUG("unref interface %p %s %d", iface, iface->name, iface->refs); + iface->refs--; + refs = iface->refs; if (refs == 0) { - virReleaseInterface(interface); + virReleaseInterface(iface); /* Already unlocked mutex */ return (0); } - virMutexUnlock(&interface->conn->lock); + virMutexUnlock(&iface->conn->lock); return (refs); } Index: src/datatypes.h =================================================================== RCS file: /data/cvs/libvirt/src/datatypes.h,v retrieving revision 1.8 diff -u -p -r1.8 datatypes.h --- src/datatypes.h 20 May 2009 14:26:50 -0000 1.8 +++ src/datatypes.h 28 May 2009 16:32:54 -0000 @@ -254,7 +254,7 @@ int virUnrefNetwork(virNetworkPtr networ virInterfacePtr virGetInterface(virConnectPtr conn, const char *name, const char *mac); -int virUnrefInterface(virInterfacePtr interface); +int virUnrefInterface(virInterfacePtr iface); virStoragePoolPtr virGetStoragePool(virConnectPtr conn, const char *name, Index: src/driver.h =================================================================== RCS file: /data/cvs/libvirt/src/driver.h,v retrieving revision 1.75 diff -u -p -r1.75 driver.h --- src/driver.h 25 May 2009 11:56:00 -0000 1.75 +++ src/driver.h 28 May 2009 16:32:54 -0000 @@ -516,7 +516,7 @@ typedef virInterfacePtr const char *mac); typedef char * - (*virDrvInterfaceGetXMLDesc) (virInterfacePtr interface, + (*virDrvInterfaceGetXMLDesc) (virInterfacePtr iface, unsigned int flags); typedef virInterfacePtr @@ -524,12 +524,12 @@ typedef virInterfacePtr const char *xmlDesc, unsigned int flags); typedef int - (*virDrvInterfaceUndefine) (virInterfacePtr interface); + (*virDrvInterfaceUndefine) (virInterfacePtr iface); typedef int - (*virDrvInterfaceCreate) (virInterfacePtr interface, + (*virDrvInterfaceCreate) (virInterfacePtr iface, unsigned int flags); typedef int - (*virDrvInterfaceDestroy) (virInterfacePtr interface, + (*virDrvInterfaceDestroy) (virInterfacePtr iface, unsigned int flags); typedef struct _virInterfaceDriver virInterfaceDriver; Index: src/libvirt.c =================================================================== RCS file: /data/cvs/libvirt/src/libvirt.c,v retrieving revision 1.211 diff -u -p -r1.211 libvirt.c --- src/libvirt.c 25 May 2009 11:56:00 -0000 1.211 +++ src/libvirt.c 28 May 2009 16:32:54 -0000 @@ -472,7 +472,7 @@ virLibNetworkError(virNetworkPtr network * Handle an error at the connection level */ static void -virLibInterfaceError(virInterfacePtr interface, virErrorNumber error, +virLibInterfaceError(virInterfacePtr iface, virErrorNumber error, const char *info) { virConnectPtr conn = NULL; @@ -483,7 +483,7 @@ virLibInterfaceError(virInterfacePtr int errmsg = virErrorMsg(error, info); if (error != VIR_ERR_INVALID_INTERFACE) { - conn = interface->conn; + conn = iface->conn; } virRaiseError(conn, NULL, NULL, VIR_FROM_INTERFACE, error, VIR_ERR_ERROR, errmsg, info, NULL, 0, 0, errmsg, info); @@ -5485,17 +5485,17 @@ error: * Returns the virConnectPtr or NULL in case of failure. */ virConnectPtr -virInterfaceGetConnect (virInterfacePtr interface) +virInterfaceGetConnect (virInterfacePtr iface) { - DEBUG("interface=%p", interface); + DEBUG("iface=%p", iface); virResetLastError(); - if (!VIR_IS_CONNECTED_INTERFACE (interface)) { + if (!VIR_IS_CONNECTED_INTERFACE (iface)) { virLibInterfaceError (NULL, VIR_ERR_INVALID_INTERFACE, __FUNCTION__); return NULL; } - return interface->conn; + return iface->conn; } /** @@ -5663,7 +5663,7 @@ error: /** * virInterfaceGetName: - * @interface: a interface object + * @iface: a interface object * * Get the public name for that interface * @@ -5671,22 +5671,22 @@ error: * its lifetime will be the same as the interface object. */ const char * -virInterfaceGetName(virInterfacePtr interface) +virInterfaceGetName(virInterfacePtr iface) { - DEBUG("interface=%p", interface); + DEBUG("iface=%p", iface); virResetLastError(); - if (!VIR_IS_INTERFACE(interface)) { + if (!VIR_IS_INTERFACE(iface)) { virLibInterfaceError(NULL, VIR_ERR_INVALID_INTERFACE, __FUNCTION__); return (NULL); } - return (interface->name); + return (iface->name); } /** * virInterfaceGetMACString: - * @interface: a interface object + * @iface: a interface object * * Get the MAC for a interface as string. For more information about * MAC see RFC4122. @@ -5696,22 +5696,22 @@ virInterfaceGetName(virInterfacePtr inte * will be the same as the interface object. */ const char * -virInterfaceGetMACString(virInterfacePtr interface) +virInterfaceGetMACString(virInterfacePtr iface) { - DEBUG("interface=%p", interface); + DEBUG("iface=%p", iface); virResetLastError(); - if (!VIR_IS_INTERFACE(interface)) { + if (!VIR_IS_INTERFACE(iface)) { virLibInterfaceError(NULL, VIR_ERR_INVALID_INTERFACE, __FUNCTION__); return (NULL); } - return (interface->mac); + return (iface->mac); } /** * virInterfaceGetXMLDesc: - * @interface: a interface object + * @iface: a interface object * @flags: and OR'ed set of extraction flags, not used yet * * Provide an XML description of the interface. The description may be reused @@ -5721,27 +5721,27 @@ virInterfaceGetMACString(virInterfacePtr * the caller must free() the returned value. */ char * -virInterfaceGetXMLDesc(virInterfacePtr interface, unsigned int flags) +virInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) { virConnectPtr conn; - DEBUG("interface=%p, flags=%d", interface, flags); + DEBUG("iface=%p, flags=%d", iface, flags); virResetLastError(); - if (!VIR_IS_CONNECTED_INTERFACE(interface)) { + if (!VIR_IS_CONNECTED_INTERFACE(iface)) { virLibInterfaceError(NULL, VIR_ERR_INVALID_INTERFACE, __FUNCTION__); return (NULL); } if (flags != 0) { - virLibInterfaceError(interface, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibInterfaceError(iface, VIR_ERR_INVALID_ARG, __FUNCTION__); goto error; } - conn = interface->conn; + conn = iface->conn; if (conn->interfaceDriver && conn->interfaceDriver->interfaceGetXMLDesc) { char *ret; - ret = conn->interfaceDriver->interfaceGetXMLDesc (interface, flags); + ret = conn->interfaceDriver->interfaceGetXMLDesc (iface, flags); if (!ret) goto error; return ret; @@ -5751,7 +5751,7 @@ virInterfaceGetXMLDesc(virInterfacePtr i error: /* Copy to connection error object for back compatability */ - virSetConnError(interface->conn); + virSetConnError(iface->conn); return NULL; } @@ -5803,7 +5803,7 @@ error: /** * virInterfaceUndefine: - * @interface: pointer to a defined interface + * @iface: pointer to a defined interface * * Undefine an interface, ie remove it from the config. * This does not free the associated virInterfacePtr object. @@ -5811,25 +5811,25 @@ error: * Returns 0 in case of success, -1 in case of error */ int -virInterfaceUndefine(virInterfacePtr interface) { +virInterfaceUndefine(virInterfacePtr iface) { virConnectPtr conn; - DEBUG("interface=%p", interface); + DEBUG("iface=%p", iface); virResetLastError(); - if (!VIR_IS_CONNECTED_INTERFACE(interface)) { + if (!VIR_IS_CONNECTED_INTERFACE(iface)) { virLibInterfaceError(NULL, VIR_ERR_INVALID_INTERFACE, __FUNCTION__); return (-1); } - conn = interface->conn; + conn = iface->conn; if (conn->flags & VIR_CONNECT_RO) { - virLibInterfaceError(interface, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibInterfaceError(iface, VIR_ERR_OPERATION_DENIED, __FUNCTION__); goto error; } if (conn->interfaceDriver && conn->interfaceDriver->interfaceUndefine) { int ret; - ret = conn->interfaceDriver->interfaceUndefine (interface); + ret = conn->interfaceDriver->interfaceUndefine (iface); if (ret < 0) goto error; return ret; @@ -5839,13 +5839,13 @@ virInterfaceUndefine(virInterfacePtr int error: /* Copy to connection error object for back compatability */ - virSetConnError(interface->conn); + virSetConnError(iface->conn); return -1; } /** * virInterfaceCreate: - * @interface: pointer to a defined interface + * @iface: pointer to a defined interface * @flags: and OR'ed set of extraction flags, not used yet * * Activate an interface (ie call "ifup") @@ -5853,26 +5853,26 @@ error: * Returns 0 in case of success, -1 in case of error */ int -virInterfaceCreate(virInterfacePtr interface, unsigned int flags) +virInterfaceCreate(virInterfacePtr iface, unsigned int flags) { virConnectPtr conn; - DEBUG("interface=%p, flags=%d", interface, flags); + DEBUG("iface=%p, flags=%d", iface, flags); virResetLastError(); - if (!VIR_IS_CONNECTED_INTERFACE(interface)) { + if (!VIR_IS_CONNECTED_INTERFACE(iface)) { virLibInterfaceError(NULL, VIR_ERR_INVALID_INTERFACE, __FUNCTION__); return (-1); } - conn = interface->conn; + conn = iface->conn; if (conn->flags & VIR_CONNECT_RO) { - virLibInterfaceError(interface, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibInterfaceError(iface, VIR_ERR_OPERATION_DENIED, __FUNCTION__); goto error; } if (conn->interfaceDriver && conn->interfaceDriver->interfaceCreate) { int ret; - ret = conn->interfaceDriver->interfaceCreate (interface, flags); + ret = conn->interfaceDriver->interfaceCreate (iface, flags); if (ret < 0) goto error; return ret; @@ -5882,13 +5882,13 @@ virInterfaceCreate(virInterfacePtr inter error: /* Copy to connection error object for back compatability */ - virSetConnError(interface->conn); + virSetConnError(iface->conn); return -1; } /** * virInterfaceDestroy: - * @interface: an interface object + * @iface: an interface object * @flags: and OR'ed set of extraction flags, not used yet * * deactivate an interface (ie call "ifdown") @@ -5898,27 +5898,27 @@ error: * Returns 0 in case of success and -1 in case of failure. */ int -virInterfaceDestroy(virInterfacePtr interface, unsigned int flags) +virInterfaceDestroy(virInterfacePtr iface, unsigned int flags) { virConnectPtr conn; - DEBUG("interface=%p, flags=%d", interface, flags); + DEBUG("iface=%p, flags=%d", iface, flags); virResetLastError(); - if (!VIR_IS_CONNECTED_INTERFACE(interface)) { + if (!VIR_IS_CONNECTED_INTERFACE(iface)) { virLibInterfaceError(NULL, VIR_ERR_INVALID_INTERFACE, __FUNCTION__); return (-1); } - conn = interface->conn; + conn = iface->conn; if (conn->flags & VIR_CONNECT_RO) { - virLibInterfaceError(interface, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibInterfaceError(iface, VIR_ERR_OPERATION_DENIED, __FUNCTION__); goto error; } if (conn->interfaceDriver && conn->interfaceDriver->interfaceDestroy) { int ret; - ret = conn->interfaceDriver->interfaceDestroy (interface, flags); + ret = conn->interfaceDriver->interfaceDestroy (iface, flags); if (ret < 0) goto error; return ret; @@ -5928,13 +5928,13 @@ virInterfaceDestroy(virInterfacePtr inte error: /* Copy to connection error object for back compatability */ - virSetConnError(interface->conn); + virSetConnError(iface->conn); return -1; } /** * virInterfaceRef: - * @interface: the interface to hold a reference on + * @iface: the interface to hold a reference on * * Increment the reference count on the interface. For each * additional call to this method, there shall be a corresponding @@ -5950,22 +5950,22 @@ error: * Returns 0 in case of success, -1 in case of failure. */ int -virInterfaceRef(virInterfacePtr interface) +virInterfaceRef(virInterfacePtr iface) { - if ((!VIR_IS_CONNECTED_INTERFACE(interface))) { + if ((!VIR_IS_CONNECTED_INTERFACE(iface))) { virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); return(-1); } - virMutexLock(&interface->conn->lock); - DEBUG("interface=%p refs=%d", interface, interface->refs); - interface->refs++; - virMutexUnlock(&interface->conn->lock); + virMutexLock(&iface->conn->lock); + DEBUG("iface=%p refs=%d", iface, iface->refs); + iface->refs++; + virMutexUnlock(&iface->conn->lock); return 0; } /** * virInterfaceFree: - * @interface: a interface object + * @iface: a interface object * * Free the interface object. The interface itself is unaltered. * The data structure is freed and should not be used thereafter. @@ -5973,17 +5973,17 @@ virInterfaceRef(virInterfacePtr interfac * Returns 0 in case of success and -1 in case of failure. */ int -virInterfaceFree(virInterfacePtr interface) +virInterfaceFree(virInterfacePtr iface) { - DEBUG("interface=%p", interface); + DEBUG("iface=%p", iface); virResetLastError(); - if (!VIR_IS_CONNECTED_INTERFACE(interface)) { + if (!VIR_IS_CONNECTED_INTERFACE(iface)) { virLibInterfaceError(NULL, VIR_ERR_INVALID_INTERFACE, __FUNCTION__); return (-1); } - if (virUnrefInterface(interface) < 0) + if (virUnrefInterface(iface) < 0) return (-1); return(0); } Index: src/remote_internal.c =================================================================== RCS file: /data/cvs/libvirt/src/remote_internal.c,v retrieving revision 1.153 diff -u -p -r1.153 remote_internal.c --- src/remote_internal.c 21 May 2009 13:50:56 -0000 1.153 +++ src/remote_internal.c 28 May 2009 16:32:54 -0000 @@ -212,7 +212,7 @@ static void errorf (virConnectPtr conn, static void server_error (virConnectPtr conn, remote_error *err); static virDomainPtr get_nonnull_domain (virConnectPtr conn, remote_nonnull_domain domain); static virNetworkPtr get_nonnull_network (virConnectPtr conn, remote_nonnull_network network); -static virInterfacePtr get_nonnull_interface (virConnectPtr conn, remote_nonnull_interface interface); +static virInterfacePtr get_nonnull_interface (virConnectPtr conn, remote_nonnull_interface iface); static virStoragePoolPtr get_nonnull_storage_pool (virConnectPtr conn, remote_nonnull_storage_pool pool); static virStorageVolPtr get_nonnull_storage_vol (virConnectPtr conn, remote_nonnull_storage_vol vol); static virNodeDevicePtr get_nonnull_node_device (virConnectPtr conn, remote_nonnull_node_device dev); @@ -3876,7 +3876,7 @@ static virInterfacePtr remoteInterfaceLookupByName (virConnectPtr conn, const char *name) { - virInterfacePtr interface = NULL; + virInterfacePtr iface = NULL; remote_interface_lookup_by_name_args args; remote_interface_lookup_by_name_ret ret; struct private_data *priv = conn->interfacePrivateData; @@ -3891,19 +3891,19 @@ remoteInterfaceLookupByName (virConnectP (xdrproc_t) xdr_remote_interface_lookup_by_name_ret, (char *) &ret) == -1) goto done; - interface = get_nonnull_interface (conn, ret.interface); + iface = get_nonnull_interface (conn, ret.iface); xdr_free ((xdrproc_t) &xdr_remote_interface_lookup_by_name_ret, (char *) &ret); done: remoteDriverUnlock(priv); - return interface; + return iface; } static virInterfacePtr remoteInterfaceLookupByMACString (virConnectPtr conn, const char *mac) { - virInterfacePtr interface = NULL; + virInterfacePtr iface = NULL; remote_interface_lookup_by_mac_string_args args; remote_interface_lookup_by_mac_string_ret ret; struct private_data *priv = conn->interfacePrivateData; @@ -3918,30 +3918,30 @@ remoteInterfaceLookupByMACString (virCon (xdrproc_t) xdr_remote_interface_lookup_by_mac_string_ret, (char *) &ret) == -1) goto done; - interface = get_nonnull_interface (conn, ret.interface); + iface = get_nonnull_interface (conn, ret.iface); xdr_free ((xdrproc_t) &xdr_remote_interface_lookup_by_mac_string_ret, (char *) &ret); done: remoteDriverUnlock(priv); - return interface; + return iface; } static char * -remoteInterfaceGetXMLDesc (virInterfacePtr interface, +remoteInterfaceGetXMLDesc (virInterfacePtr iface, unsigned int flags) { char *rv = NULL; remote_interface_get_xml_desc_args args; remote_interface_get_xml_desc_ret ret; - struct private_data *priv = interface->conn->interfacePrivateData; + struct private_data *priv = iface->conn->interfacePrivateData; remoteDriverLock(priv); - make_nonnull_interface (&args.interface, interface); + make_nonnull_interface (&args.iface, iface); args.flags = flags; memset (&ret, 0, sizeof ret); - if (call (interface->conn, priv, 0, REMOTE_PROC_INTERFACE_GET_XML_DESC, + if (call (iface->conn, priv, 0, REMOTE_PROC_INTERFACE_GET_XML_DESC, (xdrproc_t) xdr_remote_interface_get_xml_desc_args, (char *) &args, (xdrproc_t) xdr_remote_interface_get_xml_desc_ret, (char *) &ret) == -1) goto done; @@ -3959,7 +3959,7 @@ remoteInterfaceDefineXML (virConnectPtr const char *xmlDesc, unsigned int flags) { - virInterfacePtr interface = NULL; + virInterfacePtr iface = NULL; remote_interface_define_xml_args args; remote_interface_define_xml_ret ret; struct private_data *priv = conn->interfacePrivateData; @@ -3975,26 +3975,26 @@ remoteInterfaceDefineXML (virConnectPtr (xdrproc_t) xdr_remote_interface_define_xml_ret, (char *) &ret) == -1) goto done; - interface = get_nonnull_interface (conn, ret.interface); + iface = get_nonnull_interface (conn, ret.iface); xdr_free ((xdrproc_t) &xdr_remote_interface_define_xml_ret, (char *) &ret); done: remoteDriverUnlock(priv); - return interface; + return iface; } static int -remoteInterfaceUndefine (virInterfacePtr interface) +remoteInterfaceUndefine (virInterfacePtr iface) { int rv = -1; remote_interface_undefine_args args; - struct private_data *priv = interface->conn->interfacePrivateData; + struct private_data *priv = iface->conn->interfacePrivateData; remoteDriverLock(priv); - make_nonnull_interface (&args.interface, interface); + make_nonnull_interface (&args.iface, iface); - if (call (interface->conn, priv, 0, REMOTE_PROC_INTERFACE_UNDEFINE, + if (call (iface->conn, priv, 0, REMOTE_PROC_INTERFACE_UNDEFINE, (xdrproc_t) xdr_remote_interface_undefine_args, (char *) &args, (xdrproc_t) xdr_void, (char *) NULL) == -1) goto done; @@ -4007,19 +4007,19 @@ done: } static int -remoteInterfaceCreate (virInterfacePtr interface, +remoteInterfaceCreate (virInterfacePtr iface, unsigned int flags) { int rv = -1; remote_interface_create_args args; - struct private_data *priv = interface->conn->interfacePrivateData; + struct private_data *priv = iface->conn->interfacePrivateData; remoteDriverLock(priv); - make_nonnull_interface (&args.interface, interface); + make_nonnull_interface (&args.iface, iface); args.flags = flags; - if (call (interface->conn, priv, 0, REMOTE_PROC_INTERFACE_CREATE, + if (call (iface->conn, priv, 0, REMOTE_PROC_INTERFACE_CREATE, (xdrproc_t) xdr_remote_interface_create_args, (char *) &args, (xdrproc_t) xdr_void, (char *) NULL) == -1) goto done; @@ -4032,19 +4032,19 @@ done: } static int -remoteInterfaceDestroy (virInterfacePtr interface, +remoteInterfaceDestroy (virInterfacePtr iface, unsigned int flags) { int rv = -1; remote_interface_destroy_args args; - struct private_data *priv = interface->conn->interfacePrivateData; + struct private_data *priv = iface->conn->interfacePrivateData; remoteDriverLock(priv); - make_nonnull_interface (&args.interface, interface); + make_nonnull_interface (&args.iface, iface); args.flags = flags; - if (call (interface->conn, priv, 0, REMOTE_PROC_INTERFACE_DESTROY, + if (call (iface->conn, priv, 0, REMOTE_PROC_INTERFACE_DESTROY, (xdrproc_t) xdr_remote_interface_destroy_args, (char *) &args, (xdrproc_t) xdr_void, (char *) NULL) == -1) goto done; @@ -7256,9 +7256,9 @@ get_nonnull_network (virConnectPtr conn, } static virInterfacePtr -get_nonnull_interface (virConnectPtr conn, remote_nonnull_interface interface) +get_nonnull_interface (virConnectPtr conn, remote_nonnull_interface iface) { - return virGetInterface (conn, interface.name, interface.mac); + return virGetInterface (conn, iface.name, iface.mac); } static virStoragePoolPtr Index: tests/testutils.c =================================================================== RCS file: /data/cvs/libvirt/tests/testutils.c,v retrieving revision 1.28 diff -u -p -r1.28 testutils.c --- tests/testutils.c 21 May 2009 14:22:51 -0000 1.28 +++ tests/testutils.c 28 May 2009 16:32:54 -0000 @@ -18,7 +18,9 @@ #ifndef WIN32 #include <sys/wait.h> #endif +#ifdef HAVE_REGEX_H #include <regex.h> +#endif #include <unistd.h> #include <string.h> #include <fcntl.h> @@ -460,6 +462,7 @@ cleanup: } +#ifdef HAVE_REGEX_H int virtTestClearLineRegex(const char *pattern, char *str) { @@ -503,3 +506,10 @@ int virtTestClearLineRegex(const char *p return 0; } +#else +int virtTestClearLineRegex(const char *pattern ATTRIBUTE_UNUSED, + char *str ATTRIBUTE_UNUSED) +{ + return 0; +} +#endif -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

3 3

[libvirt] [PATCH] virsh: Use consistent spacing for net-list
by Cole Robinson 29 May '09

29 May '09

There is different spacing when listing active vs. inactive networks. Ex: Name State Autostart ----------------------------------------- default active yes xxxxxx inactive no Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/virsh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/virsh.c b/src/virsh.c index fe4e8e6..e6241e6 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -2798,7 +2798,7 @@ cmdNetworkList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) else autostartStr = autostart ? "yes" : "no"; - vshPrint(ctl, "%-20s %s %s\n", + vshPrint(ctl, "%-20s %-10s %-10s\n", inactiveNames[i], _("inactive"), autostartStr); -- 1.6.0.6

3 12

[libvirt] libvirt needs to dynamically support kvm-img and/or qemu-img
by Doug Goldstein 29 May '09

29 May '09

Several distros out there install "kvm-img" when they install KVM and do not install "qemu-img". The following patch checks for kvm-img and qemu-img and does the right thing. I've taken it a step further and made the check a run-time check instead of a build-time check since people are able to remove and install KVM, QEMU and Xen components as they please and as such may invalidate the build-time check. The patch prefers "kvm-img" over "qemu-img" over "qcow-create" since there was a comment that libvirt wanted to support a feature of qemu-img that wasn't present in upstream qemu releases, however the feature is present in kvm-img. The patch adds a new util function called "virFindFileInPath()" which merely searches PATH for the actual location of the binary. It might be worth-while to make some of the other build-time tool checks run-time with that function since it would allow users to get more features just by installing new tools and wouldn't require distros to disable features because they don't want libvirt to be too dependency heavy. -- Doug Goldstein

3 4

[libvirt] PATCH: Fix thread safety with HAL driver restart
by Daniel P. Berrange 29 May '09

29 May '09

The restart method of the HAL implementation of node device is not currently threadsafe, because it destroys and creates the entire driver, including its mutexes. This patch changes it to simply throw away all existing devices, and re-load them from dbus. Daniel diff -r 625ffe1918a4 src/node_device_hal.c --- a/src/node_device_hal.c Thu May 21 15:56:27 2009 +0100 +++ b/src/node_device_hal.c Thu May 21 15:56:33 2009 +0100 @@ -785,10 +785,28 @@ static int halDeviceMonitorShutdown(void static int halDeviceMonitorReload(void) { - /* XXX This isn't thread safe because its free'ing the thing - * we're locking */ - (void)halDeviceMonitorShutdown(); - return halDeviceMonitorStartup(); + DBusError err; + char **udi = NULL; + int num_devs, i; + LibHalContext *hal_ctx; + + nodeDeviceLock(driverState); + virNodeDeviceObjListFree(&driverState->devs); + nodeDeviceUnlock(driverState); + + hal_ctx = DRV_STATE_HAL_CTX(driverState); + udi = libhal_get_all_devices(hal_ctx, &num_devs, &err); + if (udi == NULL) { + fprintf(stderr, "%s: libhal_get_all_devices failed\n", __FUNCTION__); + return -1; + } + for (i = 0; i < num_devs; i++) { + dev_create(udi[i]); + VIR_FREE(udi[i]); + } + VIR_FREE(udi); + + return 0; } -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 1

[libvirt] PATCH: Fix double-free in daemon after client connection drop
by Daniel P. Berrange 29 May '09

29 May '09

If a client drops a connection unexpectedly there is a possiblity of a double free in the daemon if using SASL or TLS. This is because there is possibility for poll() on the socket, returns POLLIN and POLLHUP/ERR at the same time. Both the POLLIN and POLLHUP handling code will attempt to use qemudDispatchClientFailure to mark the client as dieing, doing a double free. It is hard to avoid this potential double-invocation of the cleanup function, so it is preferrable to make it safe Daniel diff -rup libvirt-0.6.2.orig/qemud/qemud.c libvirt-0.6.2.new/qemud/qemud.c --- libvirt-0.6.2.orig/qemud/qemud.c 2009-03-13 17:06:16.000000000 +0000 +++ libvirt-0.6.2.new/qemud/qemud.c 2009-05-28 17:58:44.000000000 +0100 @@ -1397,7 +1397,10 @@ static int qemudDispatchServer(struct qe * jobs have finished, then clean it up elsehwere */ void qemudDispatchClientFailure(struct qemud_client *client) { - virEventRemoveHandleImpl(client->watch); + if (client->watch != -1) { + virEventRemoveHandleImpl(client->watch); + client->watch = -1; + } /* Deregister event delivery callback */ if(client->conn) { @@ -1406,12 +1409,21 @@ void qemudDispatchClientFailure(struct q } #if HAVE_SASL - if (client->saslconn) sasl_dispose(&client->saslconn); + if (client->saslconn) { + sasl_dispose(&client->saslconn); + client->saslconn = NULL; + } free(client->saslUsername); + client->saslUsername = NULL; #endif - if (client->tlssession) gnutls_deinit (client->tlssession); - close(client->fd); - client->fd = -1; + if (client->tlssession) { + gnutls_deinit (client->tlssession); + client->tlssession = NULL; + } + if (client->fd != -1) { + close(client->fd); + client->fd = -1; + } } -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 1

[libvirt] PPC Qemu Machine Type Patch
by Thomas J. Baker 29 May '09

29 May '09

Here's a patch I was asked to post here that attempts to fix libvirt incorrectly specifying g3bw as the machine type when it calls qemu-system-ppc. The renamed machine type is g3beige. I searched for all occurrences of g3bw and replaced it with g3beige. Thanks, tjb -- ======================================================================= | Thomas Baker email: tjb(a)unh.edu | | Systems Programmer | | Research Computing Center voice: (603) 862-4490 | | University of New Hampshire fax: (603) 862-1761 | | 332 Morse Hall | | Durham, NH 03824 USA http://wintermute.sr.unh.edu/~tjb | =======================================================================

3 2

[libvirt] [PATCH] fix storage volume inconsistencies in schema and document
by Ryota Ozaki 29 May '09

29 May '09

Signed-off-by: Ryota Ozaki <ozaki.ryota(a)gmail.com> >From 23b096394eb15183a12c3277ac7a61e1eb73deb2 Mon Sep 17 00:00:00 2001 From: Ryota Ozaki <ozaki.ryota(a)gmail.com> Date: Sat, 23 May 2009 20:52:51 +0900 Subject: [PATCH] fix storage volume inconsistencies in schema and document This patch fixes the following inconsistencies: - The volume element does not take a type attribute, but the document says it can. - The capacity element can take a unit attribute optionally, but the schema does not reflect that. This patch also modifies a testcase to check the unit attribute. --- docs/formatstorage.html | 4 ++-- docs/formatstorage.html.in | 4 ++-- docs/schemas/storagevol.rng | 11 +++++++++++ tests/storagevolschemadata/vol-qcow2.xml | 2 +- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/docs/formatstorage.html b/docs/formatstorage.html index fc47991..e96712d 100644 --- a/docs/formatstorage.html +++ b/docs/formatstorage.html @@ -294,7 +294,7 @@ <a name="StorageVolFirst" id="StorageVolFirst">General metadata</a> </h3> <pre> - <volume type="file"> + <volume> <name>sparse.img</name> <key>/var/lib/xen/images/sparse.img</key> <allocation>0</allocation> @@ -432,7 +432,7 @@ <a name="exampleVol" id="exampleVol">Storage volume</a> </h3> <pre> - <volume type="file"> + <volume> <name>sparse.img</name> <allocation>0</allocation> <capacity unit="T">1</capacity> diff --git a/docs/formatstorage.html.in b/docs/formatstorage.html.in index 60e2ebc..4878d72 100644 --- a/docs/formatstorage.html.in +++ b/docs/formatstorage.html.in @@ -183,7 +183,7 @@ <h3><a name="StorageVolFirst">General metadata</a></h3> <pre> - <volume type="file"> + <volume> <name>sparse.img</name> <key>/var/lib/xen/images/sparse.img</key> <allocation>0</allocation> @@ -353,7 +353,7 @@ <h3><a name="exampleVol">Storage volume</a></h3> <pre> - <volume type="file"> + <volume> <name>sparse.img</name> <allocation>0</allocation> <capacity unit="T">1</capacity> diff --git a/docs/schemas/storagevol.rng b/docs/schemas/storagevol.rng index c7bd3a7..7dc7876 100644 --- a/docs/schemas/storagevol.rng +++ b/docs/schemas/storagevol.rng @@ -29,6 +29,11 @@ <define name='sizing'> <optional> <element name='capacity'> + <optional> + <attribute name='unit'> + <ref name='unit'/> + </attribute> + </optional> <ref name='uint'/> </element> </optional> @@ -183,5 +188,11 @@ </data> </define> + <define name='unit'> + <data type='string'> + <param name="pattern">[kKmMgGtTpPyYzZ]</param> + </data> + </define> + </grammar> diff --git a/tests/storagevolschemadata/vol-qcow2.xml b/tests/storagevolschemadata/vol-qcow2.xml index a3f5cca..c1cf02f 100644 --- a/tests/storagevolschemadata/vol-qcow2.xml +++ b/tests/storagevolschemadata/vol-qcow2.xml @@ -3,7 +3,7 @@ <key>/var/lib/libvirt/images/OtherDemo.img</key> <source> </source> - <capacity>5242880000</capacity> + <capacity unit="G">5</capacity> <allocation>294912</allocation> <target> <path>/var/lib/libvirt/images/OtherDemo.img</path> -- 1.6.0.6

2 1