- Devel - libvirt List Archives

[libvirt] [PATCHv4] Use XDG Base Directories instead of storing in home directory
by William Jon McCann 14 May '12

14 May '12

As defined in: http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html This offers a number of advantages: * Allows sharing a home directory between different machines, or sessions (eg. using NFS) * Cleanly separates cache, runtime (eg. sockets), or app data from user settings * Supports performing smart or selective migration of settings between different OS versions * Supports reseting settings without breaking things * Makes it possible to clear cache data to make room when the disk is filling up * Allows us to write a robust and efficient backup solution * Allows an admin flexibility to change where data and settings are stored * Dramatically reduces the complexity and incoherence of the system for administrators --- AUTHORS | 1 + daemon/libvirtd-config.c | 10 +-- daemon/libvirtd.c | 144 +++++++++++++++++++++++++++++++++------- daemon/libvirtd.pod.in | 2 +- docs/auth.html.in | 2 +- docs/uri.html.in | 2 +- src/libvirt.c | 4 +- src/libvirt_private.syms | 4 ++ src/network/bridge_driver.c | 8 ++- src/nwfilter/nwfilter_driver.c | 11 +-- src/qemu/qemu_driver.c | 32 ++++++--- src/remote/remote_driver.c | 4 +- src/remote/remote_driver.h | 2 +- src/secret/secret_driver.c | 11 +-- src/storage/storage_driver.c | 13 +--- src/uml/uml_driver.c | 10 +-- src/util/util.c | 62 +++++++++++++++++ src/util/util.h | 4 ++ src/util/virauth.c | 4 +- tools/virsh.c | 6 +- 20 files changed, 247 insertions(+), 89 deletions(-) diff --git a/AUTHORS b/AUTHORS index 31e3772..29b2c1d 100644 --- a/AUTHORS +++ b/AUTHORS @@ -236,6 +236,7 @@ Patches have also been contributed by: Wido den Hollander <wido(a)widodh.nl> Eugen Feller <eugen.feller(a)inria.fr> Dmitry Guryanov <dguryanov(a)parallels.com> + William Jon McCann <jmccann(a)redhat.com> [....send patches to get your name here....] diff --git a/daemon/libvirtd-config.c b/daemon/libvirtd-config.c index 471236c..8b95969 100644 --- a/daemon/libvirtd-config.c +++ b/daemon/libvirtd-config.c @@ -205,16 +205,16 @@ daemonConfigFilePath(bool privileged, char **configfile) if (!(*configfile = strdup(SYSCONFDIR "/libvirt/libvirtd.conf"))) goto no_memory; } else { - char *userdir = NULL; + char *configdir = NULL; - if (!(userdir = virGetUserDirectory(geteuid()))) + if (!(configdir = virGetUserConfigDirectory(geteuid()))) goto error; - if (virAsprintf(configfile, "%s/.libvirt/libvirtd.conf", userdir) < 0) { - VIR_FREE(userdir); + if (virAsprintf(configfile, "%s/libvirtd.conf", configdir) < 0) { + VIR_FREE(configdir); goto no_memory; } - VIR_FREE(userdir); + VIR_FREE(configdir); } return 0; diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index b098f6a..67248b3 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -239,17 +239,25 @@ daemonPidFilePath(bool privileged, if (!(*pidfile = strdup(LOCALSTATEDIR "/run/libvirtd.pid"))) goto no_memory; } else { - char *userdir = NULL; + char *rundir = NULL; + mode_t old_umask; - if (!(userdir = virGetUserDirectory(geteuid()))) + if (!(rundir = virGetUserRuntimeDirectory(geteuid()))) goto error; - if (virAsprintf(pidfile, "%s/.libvirt/libvirtd.pid", userdir) < 0) { - VIR_FREE(userdir); + old_umask = umask(077); + if (virFileMakePath(rundir) < 0) { + umask(old_umask); + goto error; + } + umask(old_umask); + + if (virAsprintf(pidfile, "%s/libvirtd.pid", rundir) < 0) { + VIR_FREE(rundir); goto no_memory; } - VIR_FREE(userdir); + VIR_FREE(rundir); } return 0; @@ -279,17 +287,25 @@ daemonUnixSocketPaths(struct daemonConfig *config, if (!(*rosockfile = strdup(LOCALSTATEDIR "/run/libvirt/libvirt-sock-ro"))) goto no_memory; } else { - char *userdir = NULL; + char *rundir = NULL; + mode_t old_umask; - if (!(userdir = virGetUserDirectory(geteuid()))) + if (!(rundir = virGetUserRuntimeDirectory(geteuid()))) goto error; - if (virAsprintf(sockfile, "@%s/.libvirt/libvirt-sock", userdir) < 0) { - VIR_FREE(userdir); + old_umask = umask(077); + if (virFileMakePath(rundir) < 0) { + umask(old_umask); + goto error; + } + umask(old_umask); + + if (virAsprintf(sockfile, "@%s/libvirt-sock", rundir) < 0) { + VIR_FREE(rundir); goto no_memory; } - VIR_FREE(userdir); + VIR_FREE(rundir); } } return 0; @@ -593,16 +609,25 @@ daemonSetupLogging(struct daemonConfig *config, LOCALSTATEDIR) == -1) goto no_memory; } else { - char *userdir = virGetUserDirectory(geteuid()); - if (!userdir) + char *logdir = virGetUserCacheDirectory(geteuid()); + mode_t old_umask; + + if (!logdir) + goto error; + + old_umask = umask(077); + if (virFileMakePath(logdir) < 0) { + umask(old_umask); goto error; + } + umask(old_umask); - if (virAsprintf(&tmp, "%d:file:%s/.libvirt/libvirtd.log", - virLogGetDefaultPriority(), userdir) == -1) { - VIR_FREE(userdir); + if (virAsprintf(&tmp, "%d:file:%s/libvirtd.log", + virLogGetDefaultPriority(), logdir) == -1) { + VIR_FREE(logdir); goto no_memory; } - VIR_FREE(userdir); + VIR_FREE(logdir); } } else { if (virAsprintf(&tmp, "%d:stderr", virLogGetDefaultPriority()) < 0) @@ -722,6 +747,76 @@ static int daemonStateInit(virNetServerPtr srv) return 0; } +static int migrateProfile(void) +{ + char *old_base = NULL; + char *updated = NULL; + char *home = NULL; + char *xdg_dir = NULL; + char *config_dir = NULL; + const char *config_home; + int ret = -1; + mode_t old_umask; + + if (!(home = virGetUserDirectory(geteuid()))) + goto cleanup; + + if (virAsprintf(&old_base, "%s/.libvirt", home) < 0) { + goto cleanup; + } + + /* if the new directory is there or the old one is not: do nothing */ + if (!(config_dir = virGetUserConfigDirectory(geteuid()))) + goto cleanup; + + if (!virFileIsDir(old_base) || virFileExists(config_dir)) { + ret = 0; + goto cleanup; + } + + /* test if we already attempted to migrate first */ + if (virAsprintf(&updated, "%s/DEPRECATED-DIRECTORY", old_base) < 0) { + goto cleanup; + } + if (virFileExists(updated)) { + goto cleanup; + } + + config_home = getenv("XDG_CONFIG_HOME"); + if (config_home && config_home[0] != '\0') { + xdg_dir = strdup(config_home); + } else { + if (virAsprintf(&xdg_dir, "%s/.config", home) < 0) { + goto cleanup; + } + } + + old_umask = umask(077); + if (virFileMakePath(xdg_dir) < 0) { + umask(old_umask); + goto cleanup; + } + umask(old_umask); + + if (rename(old_base, config_dir) < 0) { + int fd = creat(updated, 0600); + VIR_FORCE_CLOSE(fd); + VIR_ERROR(_("Unable to migrate %s to %s"), old_base, config_dir); + goto cleanup; + } + + ret = 0; + + cleanup: + VIR_FREE(home); + VIR_FREE(old_base); + VIR_FREE(xdg_dir); + VIR_FREE(config_dir); + VIR_FREE(updated); + + return ret; +} + /* Print command-line usage. */ static void daemonUsage(const char *argv0, bool privileged) @@ -775,10 +870,10 @@ libvirt management daemon:\n"), argv0); Default paths:\n\ \n\ Configuration file (unless overridden by -f):\n\ - $HOME/.libvirt/libvirtd.conf\n\ + $XDG_CONFIG_HOME/libvirt/libvirtd.conf\n\ \n\ Sockets:\n\ - $HOME/.libvirt/libvirt-sock (in UNIX abstract namespace)\n\ + $XDG_RUNTIME_HOME/libvirt/libvirt-sock (in UNIX abstract namespace)\n\ \n\ TLS:\n\ CA certificate: $HOME/.pki/libvirt/cacert.pem\n\ @@ -786,7 +881,7 @@ libvirt management daemon:\n"), argv0); Server private key: $HOME/.pki/libvirt/serverkey.pem\n\ \n\ PID file:\n\ - $HOME/.libvirt/libvirtd.pid\n\ + $XDG_RUNTIME_HOME/libvirt/libvirtd.pid\n\ \n")); } } @@ -931,6 +1026,9 @@ int main(int argc, char **argv) { exit(EXIT_FAILURE); } + if (migrateProfile() < 0) + exit(EXIT_FAILURE); + if (config->host_uuid && virSetHostUUIDStr(config->host_uuid) < 0) { VIR_ERROR(_("invalid host UUID: %s"), config->host_uuid); @@ -977,21 +1075,19 @@ int main(int argc, char **argv) { if (privileged) { run_dir = strdup(LOCALSTATEDIR "/run/libvirt"); } else { - char *user_dir = virGetUserDirectory(geteuid()); + run_dir = virGetUserRuntimeDirectory(geteuid()); - if (!user_dir) { + if (!run_dir) { VIR_ERROR(_("Can't determine user directory")); goto cleanup; } - ignore_value(virAsprintf(&run_dir, "%s/.libvirt/", user_dir)); - VIR_FREE(user_dir); } if (!run_dir) { virReportOOMError(); goto cleanup; } - old_umask = umask(022); + old_umask = umask(077); if (virFileMakePath(run_dir) < 0) { char ebuf[1024]; VIR_ERROR(_("unable to create rundir %s: %s"), run_dir, diff --git a/daemon/libvirtd.pod.in b/daemon/libvirtd.pod.in index 6e699b8..ea6c37d 100644 --- a/daemon/libvirtd.pod.in +++ b/daemon/libvirtd.pod.in @@ -85,7 +85,7 @@ command line using the B<-f>|B<--config> option. The sockets libvirtd will use when B<run as root>. -=item F<$HOME/.libvirt/libvirt-sock> +=item F<$XDG_RUNTIME_DIR/libvirt/libvirt-sock> The socket libvirtd will use when run as a B<non-root> user. diff --git a/docs/auth.html.in b/docs/auth.html.in index ecff0fc..60e4f11 100644 --- a/docs/auth.html.in +++ b/docs/auth.html.in @@ -25,7 +25,7 @@ for the authentication file using the following sequence: variable.</li> <li>The file path specified by the "authfile=/some/file" URI query parameter</li> - <li>The file $HOME/.libvirt/auth.conf</li> + <li>The file $XDG_CONFIG_DIR/libvirt/auth.conf</li> <li>The file /etc/libvirt/auth.conf</li> </ol> diff --git a/docs/uri.html.in b/docs/uri.html.in index 2f76e8f..5812ca9 100644 --- a/docs/uri.html.in +++ b/docs/uri.html.in @@ -30,7 +30,7 @@ virConnectPtr conn = virConnectOpenReadOnly (<b>"test:///default"</b>); <p> To simplify life for administrators, it is possible to setup URI aliases in a libvirt client configuration file. The configuration file is <code>/etc/libvirt/libvirt.conf</code> -for the root user, or <code>$HOME/.libvirt/libvirt.conf</code> for any unprivileged user. +for the root user, or <code>$XDG_CONFIG_DIR/libvirt/libvirt.conf</code> for any unprivileged user. In this file, the following syntax can be used to setup aliases </p> diff --git a/src/libvirt.c b/src/libvirt.c index cfd7711..22fc863 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -969,11 +969,11 @@ virConnectGetConfigFilePath(void) SYSCONFDIR) < 0) goto no_memory; } else { - char *userdir = virGetUserDirectory(geteuid()); + char *userdir = virGetUserConfigDirectory(geteuid()); if (!userdir) goto error; - if (virAsprintf(&path, "%s/.libvirt/libvirt.conf", + if (virAsprintf(&path, "%s/libvirt.conf", userdir) < 0) { VIR_FREE(userdir); goto no_memory; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 88f8a21..250c8e4 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1112,6 +1112,7 @@ virFileFindMountPoint; virFileHasSuffix; virFileIsExecutable; virFileIsLink; +virFileIsDir; virFileLinkPointsTo; virFileLock; virFileMakePath; @@ -1132,6 +1133,9 @@ virGetGroupID; virGetGroupName; virGetHostname; virGetUserDirectory; +virGetUserConfigDirectory; +virGetUserCacheDirectory; +virGetUserRuntimeDirectory; virGetUserID; virGetUserName; virHexToBin; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index d82212f..cea87c2 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -280,18 +280,20 @@ networkStartup(int privileged) { if ((base = strdup (SYSCONFDIR "/libvirt")) == NULL) goto out_of_memory; } else { - char *userdir = virGetUserDirectory(uid); + char *userdir = virGetUserCacheDirectory(uid); if (!userdir) goto error; if (virAsprintf(&driverState->logDir, - "%s/.libvirt/qemu/log", userdir) == -1) { + "%s/qemu/log", userdir) == -1) { VIR_FREE(userdir); goto out_of_memory; } + VIR_FREE(userdir); - if (virAsprintf(&base, "%s/.libvirt", userdir) == -1) { + userdir = virGetUserConfigDirectory(uid); + if (virAsprintf(&base, "%s", userdir) == -1) { VIR_FREE(userdir); goto out_of_memory; } diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index ffb4b5d..3d732ab 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -87,16 +87,9 @@ nwfilterDriverStartup(int privileged) { goto out_of_memory; } else { uid_t uid = geteuid(); - char *userdir = virGetUserDirectory(uid); - - if (!userdir) + base = virGetUserConfigDirectory(uid); + if (!base) goto error; - - if (virAsprintf(&base, "%s/.libvirt", userdir) == -1) { - VIR_FREE(userdir); - goto out_of_memory; - } - VIR_FREE(userdir); } if (virAsprintf(&driverState->configDir, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index bed8edb..954bb33 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -520,28 +520,38 @@ qemudStartup(int privileged) { goto out_of_memory; } else { uid_t uid = geteuid(); - char *userdir = virGetUserDirectory(uid); - if (!userdir) + char *rundir; + char *cachedir; + + cachedir = virGetUserCacheDirectory(uid); + if (!cachedir) goto error; if (virAsprintf(&qemu_driver->logDir, - "%s/.libvirt/qemu/log", userdir) == -1) { - VIR_FREE(userdir); + "%s/qemu/log", cachedir) == -1) { + VIR_FREE(cachedir); goto out_of_memory; } - - if (virAsprintf(&base, "%s/.libvirt", userdir) == -1) { - VIR_FREE(userdir); + if (virAsprintf(&qemu_driver->cacheDir, "%s/qemu/cache", cachedir) == -1) { + VIR_FREE(cachedir); goto out_of_memory; } - VIR_FREE(userdir); + VIR_FREE(cachedir); - if (virAsprintf(&qemu_driver->stateDir, "%s/qemu/run", base) == -1) + rundir = virGetUserRuntimeDirectory(uid); + if (!rundir) + goto error; + if (virAsprintf(&qemu_driver->stateDir, "%s/qemu/run", rundir) == -1) { + VIR_FREE(rundir); goto out_of_memory; + } + VIR_FREE(rundir); + + base = virGetUserConfigDirectory(uid); + if (!base) + goto error; if (virAsprintf(&qemu_driver->libDir, "%s/qemu/lib", base) == -1) goto out_of_memory; - if (virAsprintf(&qemu_driver->cacheDir, "%s/qemu/cache", base) == -1) - goto out_of_memory; if (virAsprintf(&qemu_driver->saveDir, "%s/qemu/save", base) == -1) goto out_of_memory; if (virAsprintf(&qemu_driver->snapshotDir, "%s/qemu/snapshot", base) == -1) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 7863b73..4a9299a 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -578,12 +578,12 @@ doRemoteOpen (virConnectPtr conn, case trans_unix: if (!sockname) { if (flags & VIR_DRV_OPEN_REMOTE_USER) { - char *userdir = virGetUserDirectory(getuid()); + char *userdir = virGetUserRuntimeDirectory(getuid()); if (!userdir) goto failed; - if (virAsprintf(&sockname, "@%s" LIBVIRTD_USER_UNIX_SOCKET, userdir) < 0) { + if (virAsprintf(&sockname, "@%s/" LIBVIRTD_USER_UNIX_SOCKET, userdir) < 0) { VIR_FREE(userdir); goto out_of_memory; } diff --git a/src/remote/remote_driver.h b/src/remote/remote_driver.h index 1504eec..aca9412 100644 --- a/src/remote/remote_driver.h +++ b/src/remote/remote_driver.h @@ -37,7 +37,7 @@ unsigned long remoteVersion(void); # define LIBVIRTD_TCP_PORT "16509" # define LIBVIRTD_PRIV_UNIX_SOCKET LOCALSTATEDIR "/run/libvirt/libvirt-sock" # define LIBVIRTD_PRIV_UNIX_SOCKET_RO LOCALSTATEDIR "/run/libvirt/libvirt-sock-ro" -# define LIBVIRTD_USER_UNIX_SOCKET "/.libvirt/libvirt-sock" +# define LIBVIRTD_USER_UNIX_SOCKET "libvirt-sock" # define LIBVIRTD_CONFIGURATION_FILE SYSCONFDIR "/libvirtd.conf" /* Defaults for PKI directory. */ diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 088a243..f3fcce2 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -1013,16 +1013,9 @@ secretDriverStartup(int privileged) goto out_of_memory; } else { uid_t uid = geteuid(); - char *userdir = virGetUserDirectory(uid); - - if (!userdir) + base = virGetUserConfigDirectory(uid); + if (!base) goto error; - - if (virAsprintf(&base, "%s/.libvirt", userdir) == -1) { - VIR_FREE(userdir); - goto out_of_memory; - } - VIR_FREE(userdir); } if (virAsprintf(&driverState->directory, "%s/secrets", base) == -1) goto out_of_memory; diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index f23ec7e..fd762c0 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -146,19 +146,12 @@ storageDriverStartup(int privileged) goto out_of_memory; } else { uid_t uid = geteuid(); - char *userdir = virGetUserDirectory(uid); - - if (!userdir) + base = virGetUserConfigDirectory(uid); + if (!base) goto error; - - if (virAsprintf(&base, "%s/.libvirt", userdir) == -1) { - VIR_FREE(userdir); - goto out_of_memory; - } - VIR_FREE(userdir); } - /* Configuration paths are either ~/.libvirt/storage/... (session) or + /* Configuration paths are either $USER_CONFIG_HOME/libvirt/storage/... (session) or * /etc/libvirt/storage/... (system). */ if (virAsprintf(&driverState->configDir, diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 4e640ff..8a39d73 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -434,12 +434,12 @@ umlStartup(int privileged) "%s/run/libvirt/uml-guest", LOCALSTATEDIR) == -1) goto out_of_memory; } else { + base = virGetUserConfigDirectory(uid); + if (!base) + goto error; if (virAsprintf(&uml_driver->logDir, - "%s/.libvirt/uml/log", userdir) == -1) - goto out_of_memory; - - if (virAsprintf(&base, "%s/.libvirt", userdir) == -1) + "%s/uml/log", base) == -1) goto out_of_memory; if (virAsprintf(&uml_driver->monitorDir, @@ -447,7 +447,7 @@ umlStartup(int privileged) goto out_of_memory; } - /* Configuration paths are either ~/.libvirt/uml/... (session) or + /* Configuration paths are either $XDG_CONFIG_HOME/libvirt/uml/... (session) or * /etc/libvirt/uml/... (system). */ if (virAsprintf(&uml_driver->configDir, "%s/uml", base) == -1) diff --git a/src/util/util.c b/src/util/util.c index 48358b2..ec55118 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -665,6 +665,12 @@ char *virFindFileInPath(const char *file) return fullpath; } +bool virFileIsDir(const char *path) +{ + struct stat s; + return (stat (path, &s) == 0) && S_ISDIR (s.st_mode); +} + bool virFileExists(const char *path) { return access(path, F_OK) == 0; @@ -2304,6 +2310,62 @@ char *virGetUserDirectory(uid_t uid) return virGetUserEnt(uid, VIR_USER_ENT_DIRECTORY); } +static char *virGetXDGDirectory(uid_t uid, const char *xdgenvname, const char *xdgdefdir) +{ + const char *path = NULL; + char *ret = NULL; + char *home = virGetUserEnt(uid, VIR_USER_ENT_DIRECTORY); + + if (uid == getuid()) + path = getenv(xdgenvname); + + if (path && path[0]) { + if (virAsprintf(&ret, "%s/libvirt/", path) < 0) + goto no_memory; + } else { + if (virAsprintf(&ret, "%s/%s/libvirt/", home, xdgdefdir) < 0) + goto no_memory; + } + + cleanup: + VIR_FREE(home); + return ret; + no_memory: + virReportOOMError(); + goto cleanup; +} + +char *virGetUserConfigDirectory(uid_t uid) +{ + return virGetXDGDirectory(uid, "XDG_CONFIG_HOME", ".config"); +} + +char *virGetUserCacheDirectory(uid_t uid) +{ + return virGetXDGDirectory(uid, "XDG_CACHE_HOME", ".cache"); +} + +char *virGetUserRuntimeDirectory(uid_t uid) +{ + const char *path = NULL; + + if (uid == getuid ()) + path = getenv("XDG_RUNTIME_DIR"); + + if (!path || !path[0]) { + return virGetUserCacheDirectory(uid); + } else { + char *ret; + + if (virAsprintf(&ret, "%s/libvirt/", path) < 0) { + virReportOOMError(); + return NULL; + } + + return ret; + } +} + char *virGetUserName(uid_t uid) { return virGetUserEnt(uid, VIR_USER_ENT_NAME); diff --git a/src/util/util.h b/src/util/util.h index 85e8bd6..f5fa876 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -85,6 +85,7 @@ int virFileIsLink(const char *linkpath) char *virFindFileInPath(const char *file); +bool virFileIsDir (const char *file) ATTRIBUTE_NONNULL(1); bool virFileExists(const char *file) ATTRIBUTE_NONNULL(1); bool virFileIsExecutable(const char *file) ATTRIBUTE_NONNULL(1); @@ -228,6 +229,9 @@ char *virGetHostname(virConnectPtr conn); int virKillProcess(pid_t pid, int sig); char *virGetUserDirectory(uid_t uid); +char *virGetUserConfigDirectory(uid_t uid); +char *virGetUserCacheDirectory(uid_t uid); +char *virGetUserRuntimeDirectory(uid_t uid); char *virGetUserName(uid_t uid); char *virGetGroupName(gid_t gid); int virGetUserID(const char *name, diff --git a/src/util/virauth.c b/src/util/virauth.c index c59c55a..92ecb7c 100644 --- a/src/util/virauth.c +++ b/src/util/virauth.c @@ -65,10 +65,10 @@ int virAuthGetConfigFilePath(virConnectPtr conn, } } - if (!(userdir = virGetUserDirectory(geteuid()))) + if (!(userdir = virGetUserConfigDirectory(geteuid()))) goto cleanup; - if (virAsprintf(path, "%s/.libvirt/auth.conf", userdir) < 0) + if (virAsprintf(path, "%s/auth.conf", userdir) < 0) goto no_memory; VIR_DEBUG("Checking for readability of '%s'", *path); diff --git a/tools/virsh.c b/tools/virsh.c index 1207ac9..2ae9b71 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -19864,15 +19864,15 @@ vshReadlineInit(vshControl *ctl) /* Limit the total size of the history buffer */ stifle_history(500); - /* Prepare to read/write history from/to the ~/.virsh/history file */ - userdir = virGetUserDirectory(getuid()); + /* Prepare to read/write history from/to the $XDG_CACHE_HOME/virsh/history file */ + userdir = virGetUserCacheDirectory(getuid()); if (userdir == NULL) { vshError(ctl, "%s", _("Could not determine home directory")); return -1; } - if (virAsprintf(&ctl->historydir, "%s/.virsh", userdir) < 0) { + if (virAsprintf(&ctl->historydir, "%s/virsh", userdir) < 0) { vshError(ctl, "%s", _("Out of memory")); VIR_FREE(userdir); return -1; -- 1.7.10

3 2

[libvirt] [libvirt-php PATCH] Fix installation of libvirt-php.ini
by Ivo van den Abeelen 14 May '12

14 May '12

Building/installing libvirt-php seems to create an incomplete libvirt-php.ini file. This patch solves this issue, and replaces the '#' comments (deprecated in PHP 5.4). --- src/Makefile.am | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 4efd960..dd08d36 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,14 +18,14 @@ install-exec-local: $(INSTALL) -m 644 -D $(PACKAGE).so $(DESTDIR)$(PHPEDIR)/$(PACKAGE).so $(INSTALL) -m 755 -d $(DESTDIR)$(PHPCDIR) $(ECHO) "extension=$(PACKAGE).so" > $(DESTDIR)$(PHPCDIR)/libvirt-php.ini - $(ECHO) > $(DESTDIR)$(PHPCDIR)/libvirt-php.ini - $(ECHO) "[libvirt"] > $(DESTDIR)$(PHPCDIR)/libvirt-php.ini - $(ECHO) "# Path to ISO images for VM installations" > $(DESTDIR)$(PHPCDIR)/libvirt-php.ini - $(ECHO) "libvirt.iso_path=/var/lib/libvirt/images" > $(DESTDIR)$(PHPCDIR)/libvirt-php.ini - $(ECHO) "# Path where disk images for new VMs should be created" > $(DESTDIR)$(PHPCDIR)/libvirt-php.ini - $(ECHO) "libvirt.image_path=/var/lib/libvirt/images" > $(DESTDIR)$(PHPCDIR)/libvirt-php.ini - $(ECHO) "# Limit maximum number of libvirt connections" > $(DESTDIR)$(PHPCDIR)/libvirt-php.ini - $(ECHO) "libvirt.max_connections=5" > $(DESTDIR)$(PHPCDIR)/libvirt-php.ini + $(ECHO) >> $(DESTDIR)$(PHPCDIR)/libvirt-php.ini + $(ECHO) "[libvirt]" >> $(DESTDIR)$(PHPCDIR)/libvirt-php.ini + $(ECHO) "; Path to ISO images for VM installations" >> $(DESTDIR)$(PHPCDIR)/libvirt-php.ini + $(ECHO) "libvirt.iso_path=/var/lib/libvirt/images" >> $(DESTDIR)$(PHPCDIR)/libvirt-php.ini + $(ECHO) "; Path where disk images for new VMs should be created" >> $(DESTDIR)$(PHPCDIR)/libvirt-php.ini + $(ECHO) "libvirt.image_path=/var/lib/libvirt/images" >> $(DESTDIR)$(PHPCDIR)/libvirt-php.ini + $(ECHO) "; Limit maximum number of libvirt connections" >> $(DESTDIR)$(PHPCDIR)/libvirt-php.ini + $(ECHO) "libvirt.max_connections=5" >> $(DESTDIR)$(PHPCDIR)/libvirt-php.ini uninstall-local: $(RM) -f $(DESTDIR)$(PHPCDIR)/$(PACKAGE).ini -- 1.7.10.1

3 2

[libvirt] [libvirt-glib] Add missing domain OS type enums
by Zeeshan Ali (Khattak) 14 May '12

14 May '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gconfig/libvirt-gconfig-domain-os.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-os.h b/libvirt-gconfig/libvirt-gconfig-domain-os.h index 44b8bdd..832e275 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-os.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-os.h @@ -59,7 +59,9 @@ struct _GVirConfigDomainOsClass typedef enum { GVIR_CONFIG_DOMAIN_OS_TYPE_HVM, GVIR_CONFIG_DOMAIN_OS_TYPE_LINUX, - GVIR_CONFIG_DOMAIN_OS_TYPE_EXE + GVIR_CONFIG_DOMAIN_OS_TYPE_EXE, + GVIR_CONFIG_DOMAIN_OS_TYPE_XEN, + GVIR_CONFIG_DOMAIN_OS_TYPE_UML } GVirConfigDomainOsType; typedef enum { -- 1.7.7.6

2 2

[libvirt] [PATCH 0/6] Improve security driver support for LXC
by Daniel P. Berrange 14 May '12

14 May '12

This series aims to improve the SELinux security driver support for LXC. First it allows the SELinux driver to load different configuration for LXC, vs SELinux. Second it makes the LXC code use the security drivers for figuring out mount options. The code was originally written by Dan Walsh, but split into a 6 part patch series & made to follow coding standards by myself.

4 19

[libvirt] Re-2: [Patch] Libvirt - Fix locking for readonly devices
by David Weber 14 May '12

14 May '12

> On Tue, May 08, 2012 at 09:41:02AM +0000, David Weber wrote: > > Hi, > > > > I'm currently working on getting sanlock into Debian/Ubuntu. > > While testing, I noticed that I wasn't able to add a readonly > > or shared device: "internal error unsupported > > configuration: Readonly leases are not supported". > > > > After looking into the source, it seems to be the following > > situation: > > - Libvirt passes every device to the sanlock plugin, even if > > it is readonly > > - The sanlock plugin rejects to add a lease for the readonly > > device, returning an error so the machine starts to fail > > > > The attached patch rejects passing readonly and shared devices > > to the lock-plugin so they shouldn't be a problem anymore. > > This isn't good - the lock manager implementation must be the > one to decide what todo with readonly & shared disks. The sanlock > plugin, however, does not currently support readonly/shared leases > hence why it rejects them. We could probably add a config param > to allow readonly/shared leases to be skipped by the sanlock plugin. Thanks for clarification. I've attached an updated patch which adds such a config param. It works but I can't test live-migration at the moment. But as far as I understood it shouldn't be a problem. David ---------------------------------------------------------------- commit 5a1546f328b166871fbf0e0556b5a2aafba93d63 Author: David Weber <wb(a)munzinger.de> Date: Mon May 14 09:43:27 2012 +0200 Add ignore param for readonly and shared disk in sanlock diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index d344d6a..57b688a 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c struct _virLockManagerSanlockDriver { bool requireLeaseForDisks; int hostID; bool autoDiskLease; + bool ignoreReadonlyShared; char *autoDiskLeasePath; }; static int virLockManagerSanlockLoadConfig(const char *configFile) CHECK_TYPE("auto_disk_leases", VIR_CONF_LONG); if (p) driver->autoDiskLease = p->l; + p = virConfGetValue(conf, "ignore_readonly_and_shared_disks"); + CHECK_TYPE("ignore_readonly_and_shared_disks", VIR_CONF_LONG); + if (p) driver->ignoreReadonlyShared = p->l; + p = virConfGetValue(conf, "disk_lease_dir"); CHECK_TYPE("disk_lease_dir", VIR_CONF_STRING); if (p && p->str) { static int virLockManagerSanlockAddResource(virLockManagerPtr lock, SANLK_MAX_RESOURCES); return -1; } + + if (((flags & VIR_LOCK_MANAGER_RESOURCE_READONLY) || + (flags &VIR_LOCK_MANAGER_RESOURCE_SHARED)) && + (driver->ignoreReadonlyShared)) { + return 0; + } if (flags & VIR_LOCK_MANAGER_RESOURCE_READONLY) { virLockError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", diff --git a/src/locking/sanlock.conf b/src/locking/sanlock.conf index efc35ee..5429522 100644 --- a/src/locking/sanlock.conf +++ b/src/locking/sanlock.conf # to enabled, otherwise it defaults to disabled. # #require_lease_for_disks = 1 + +# +# Ignore readonly and shared disks as they aren't supportet yet +# +#ignore_readonly_and_shared_disks = 1 To: berrange(a)redhat.com Cc: libvir-list(a)redhat.com sanlock-devel(a)lists.fedorahosted.org

2 1

[libvirt] [PATCHv2 1/1] Assign spapr-vio address type to ibmvscsi controller
by Li Zhang 14 May '12

14 May '12

For pseries guest, the default controller model is ibmvscsi controller, this controller only can work on spapr-vio address. This patch is to assign spapr-vio address type to ibmvscsi controller. Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- src/qemu/qemu_command.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 117542f..2c6495a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -779,6 +779,7 @@ qemuAssignSpaprVIOAddress(virDomainDefPtr def, virDomainDeviceInfoPtr info, int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def) { int i, rc; + int model; /* Default values match QEMU. See spapr_(llan|vscsi|vty).c */ @@ -790,10 +791,17 @@ int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def) } for (i = 0 ; i < def->ncontrollers; i++) { - rc = qemuAssignSpaprVIOAddress(def, &def->controllers[i]->info, + model = def->controllers[i]->model; + if (model == -1 && + def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI) + model = qemuDefaultScsiControllerModel(def); + if (model == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI) { + def->controllers[i]->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO; + rc = qemuAssignSpaprVIOAddress(def, &def->controllers[i]->info, 0x2000ul); - if (rc) - return rc; + if (rc) + return rc; + } } for (i = 0 ; i < def->nserials; i++) { -- 1.7.9.5

3 4

[libvirt] [PATCH] esx: Fix memory leaks in error paths related to transferred ownership
by Matthias Bolte 13 May '12

13 May '12

Appending an item to a list transfers ownership of that item to the list owner. But an error can occur in between item allocation and appending it to the list. In this case the item has to be freed explicitly. This was not done in some special cases resulting in possible memory leaks. Reported by Coverity. --- This is actually a v2 for this patch https://www.redhat.com/archives/libvir-list/2012-May/msg00115.html src/esx/esx_driver.c | 16 ++++++++++-- src/esx/esx_vi.c | 63 ++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 66 insertions(+), 13 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index d9f53f7..b3f1948 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -3489,6 +3489,7 @@ esxDomainSetAutostart(virDomainPtr domain, int autostart) esxVI_AutoStartPowerInfo *powerInfoList = NULL; esxVI_AutoStartPowerInfo *powerInfo = NULL; esxVI_AutoStartPowerInfo *newPowerInfo = NULL; + bool newPowerInfo_isAppended = false; if (esxVI_EnsureSession(priv->primary) < 0) { return -1; @@ -3546,9 +3547,7 @@ esxDomainSetAutostart(virDomainPtr domain, int autostart) if (esxVI_AutoStartPowerInfo_Alloc(&newPowerInfo) < 0 || esxVI_Int_Alloc(&newPowerInfo->startOrder) < 0 || esxVI_Int_Alloc(&newPowerInfo->startDelay) < 0 || - esxVI_Int_Alloc(&newPowerInfo->stopDelay) < 0 || - esxVI_AutoStartPowerInfo_AppendToList(&spec->powerInfo, - newPowerInfo) < 0) { + esxVI_Int_Alloc(&newPowerInfo->stopDelay) < 0) { goto cleanup; } @@ -3560,6 +3559,13 @@ esxDomainSetAutostart(virDomainPtr domain, int autostart) newPowerInfo->stopDelay->value = -1; /* use system default */ newPowerInfo->stopAction = (char *)"none"; + if (esxVI_AutoStartPowerInfo_AppendToList(&spec->powerInfo, + newPowerInfo) < 0) { + goto cleanup; + } + + newPowerInfo_isAppended = true; + if (esxVI_ReconfigureAutostart (priv->primary, priv->primary->hostSystem->configManager->autoStartManager, @@ -3581,6 +3587,10 @@ esxDomainSetAutostart(virDomainPtr domain, int autostart) esxVI_AutoStartDefaults_Free(&defaults); esxVI_AutoStartPowerInfo_Free(&powerInfoList); + if (!newPowerInfo_isAppended) { + esxVI_AutoStartPowerInfo_Free(&newPowerInfo); + } + return result; } diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 42e0976..5b5ab69 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -1882,7 +1882,9 @@ esxVI_LookupObjectContentByType(esxVI_Context *ctx, { int result = -1; esxVI_ObjectSpec *objectSpec = NULL; + bool objectSpec_isAppended = false; esxVI_PropertySpec *propertySpec = NULL; + bool propertySpec_isAppended = false; esxVI_PropertyFilterSpec *propertyFilterSpec = NULL; if (objectContentList == NULL || *objectContentList != NULL) { @@ -1951,10 +1953,20 @@ esxVI_LookupObjectContentByType(esxVI_Context *ctx, if (esxVI_PropertyFilterSpec_Alloc(&propertyFilterSpec) < 0 || esxVI_PropertySpec_AppendToList(&propertyFilterSpec->propSet, - propertySpec) < 0 || - esxVI_ObjectSpec_AppendToList(&propertyFilterSpec->objectSet, - objectSpec) < 0 || - esxVI_RetrieveProperties(ctx, propertyFilterSpec, + propertySpec) < 0) { + goto cleanup; + } + + propertySpec_isAppended = true; + + if (esxVI_ObjectSpec_AppendToList(&propertyFilterSpec->objectSet, + objectSpec) < 0) { + goto cleanup; + } + + objectSpec_isAppended = true; + + if (esxVI_RetrieveProperties(ctx, propertyFilterSpec, objectContentList) < 0) { goto cleanup; } @@ -1994,13 +2006,24 @@ esxVI_LookupObjectContentByType(esxVI_Context *ctx, * Remove values given by the caller from the data structures to prevent * them from being freed by the call to esxVI_PropertyFilterSpec_Free(). */ - objectSpec->obj = NULL; - objectSpec->selectSet = NULL; + if (objectSpec != NULL) { + objectSpec->obj = NULL; + objectSpec->selectSet = NULL; + } + if (propertySpec != NULL) { propertySpec->type = NULL; propertySpec->pathSet = NULL; } + if (!objectSpec_isAppended) { + esxVI_ObjectSpec_Free(&objectSpec); + } + + if (!propertySpec_isAppended) { + esxVI_PropertySpec_Free(&propertySpec); + } + esxVI_PropertyFilterSpec_Free(&propertyFilterSpec); return result; @@ -3885,7 +3908,9 @@ esxVI_WaitForTaskCompletion(esxVI_Context *ctx, { int result = -1; esxVI_ObjectSpec *objectSpec = NULL; + bool objectSpec_isAppended = false; esxVI_PropertySpec *propertySpec = NULL; + bool propertySpec_isAppended = false; esxVI_PropertyFilterSpec *propertyFilterSpec = NULL; esxVI_ManagedObjectReference *propertyFilter = NULL; char *version = NULL; @@ -3927,10 +3952,20 @@ esxVI_WaitForTaskCompletion(esxVI_Context *ctx, "info.state") < 0 || esxVI_PropertyFilterSpec_Alloc(&propertyFilterSpec) < 0 || esxVI_PropertySpec_AppendToList(&propertyFilterSpec->propSet, - propertySpec) < 0 || - esxVI_ObjectSpec_AppendToList(&propertyFilterSpec->objectSet, - objectSpec) < 0 || - esxVI_CreateFilter(ctx, propertyFilterSpec, esxVI_Boolean_True, + propertySpec) < 0) { + goto cleanup; + } + + propertySpec_isAppended = true; + + if (esxVI_ObjectSpec_AppendToList(&propertyFilterSpec->objectSet, + objectSpec) < 0) { + goto cleanup; + } + + objectSpec_isAppended = true; + + if (esxVI_CreateFilter(ctx, propertyFilterSpec, esxVI_Boolean_True, &propertyFilter) < 0) { goto cleanup; } @@ -4066,6 +4101,14 @@ esxVI_WaitForTaskCompletion(esxVI_Context *ctx, propertySpec->type = NULL; } + if (!objectSpec_isAppended) { + esxVI_ObjectSpec_Free(&objectSpec); + } + + if (!propertySpec_isAppended) { + esxVI_PropertySpec_Free(&propertySpec); + } + esxVI_PropertyFilterSpec_Free(&propertyFilterSpec); esxVI_ManagedObjectReference_Free(&propertyFilter); VIR_FREE(version); -- 1.7.4.1

2 2

[libvirt] [RFC PATCH] Add Qemu Network Helper
by rmarwah＠linux.vnet.ibm.com 11 May '12

11 May '12

From: Richa Marwaha <rmarwah(a)linux.vnet.ibm.com> QEMU has a new feature which allows QEMU to execute under an unprivileged user ID and still be able to add a tap device to a Linux network bridge. Below is the link to the QEMU patches for the bridge helper feature: http://lists.gnu.org/archive/html/qemu-devel/2012-01/msg03562.html The existing libvirt tap network device support for adding a tap device to a bridge (-netdev tap) works only when connected to a libvirtd instance running as the privileged system account 'root'. When connected to a libvirtd instance running as an unprivileged user (ie. using the session URI) creation of the tap device fails as follows: error: Failed to start domain F14_64 error: Unable to create tap device vnet%d: Operation not permitted With this support, creating a tap device in the above scenario will be possible. Additionally, hot attaching a tap device to a bridge while running when connected to a libvirtd instance running as an unprivileged user will be possible. Signed-off-by: Richa Marwaha <rmarwah(a)linux.vnet.ibm.com> Signed-off-by: Corey Bryant<coreyb(a)linux.vnet.ibm.com> --- src/qemu/qemu_command.c | 38 +++++++++++++++++++++++++------------- src/qemu/qemu_command.h | 1 + src/qemu/qemu_hotplug.c | 19 +++++++++++-------- 3 files changed, 37 insertions(+), 21 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 117542f..daa5381 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2745,6 +2745,7 @@ error: char * qemuBuildHostNetStr(virDomainNetDefPtr net, + struct qemud_driver *driver, char type_sep, int vlan, const char *tapfd, @@ -2753,6 +2754,7 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, bool is_tap = false; virBuffer buf = VIR_BUFFER_INITIALIZER; enum virDomainNetType netType = virDomainNetGetActualType(net); + const char *brname = NULL; if (net->script && netType != VIR_DOMAIN_NET_TYPE_ETHERNET) { qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -2762,8 +2764,15 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, } switch (netType) { - case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_BRIDGE: + if (!driver->privileged) { + brname = virDomainNetGetActualBridgeName(net); + virBufferAsprintf(&buf, "bridge%cbr=%s", type_sep, brname); + type_sep = ','; + is_tap = true; + break; + } + case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_DIRECT: virBufferAsprintf(&buf, "tap%cfd=%s", type_sep, tapfd); type_sep = ','; @@ -4865,7 +4874,7 @@ qemuBuildCommandLine(virConnectPtr conn, for (i = 0 ; i < def->nnets ; i++) { virDomainNetDefPtr net = def->nets[i]; char *nic, *host; - char tapfd_name[50]; + char tapfd_name[50] = ""; char vhostfd_name[50] = ""; int vlan; int bootindex = bootNet; @@ -4902,17 +4911,20 @@ qemuBuildCommandLine(virConnectPtr conn, if (actualType == VIR_DOMAIN_NET_TYPE_NETWORK || actualType == VIR_DOMAIN_NET_TYPE_BRIDGE) { - int tapfd = qemuNetworkIfaceConnect(def, conn, driver, net, - qemuCaps); - if (tapfd < 0) - goto error; + if (actualType == VIR_DOMAIN_NET_TYPE_NETWORK || + driver->privileged) { + int tapfd = qemuNetworkIfaceConnect(def, conn, driver, net, + qemuCaps); + if (tapfd < 0) + goto error; - last_good_net = i; - virCommandTransferFD(cmd, tapfd); + last_good_net = i; + virCommandTransferFD(cmd, tapfd); - if (snprintf(tapfd_name, sizeof(tapfd_name), "%d", - tapfd) >= sizeof(tapfd_name)) - goto no_memory; + if (snprintf(tapfd_name, sizeof(tapfd_name), "%d", + tapfd) >= sizeof(tapfd_name)) + goto no_memory; + } } else if (actualType == VIR_DOMAIN_NET_TYPE_DIRECT) { int tapfd = qemuPhysIfaceConnect(def, driver, net, qemuCaps, vmop); @@ -4955,7 +4967,7 @@ qemuBuildCommandLine(virConnectPtr conn, if (qemuCapsGet(qemuCaps, QEMU_CAPS_NETDEV) && qemuCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) { virCommandAddArg(cmd, "-netdev"); - if (!(host = qemuBuildHostNetStr(net, ',', vlan, + if (!(host = qemuBuildHostNetStr(net, driver, ',', vlan, tapfd_name, vhostfd_name))) goto error; virCommandAddArg(cmd, host); @@ -4978,7 +4990,7 @@ qemuBuildCommandLine(virConnectPtr conn, if (!(qemuCapsGet(qemuCaps, QEMU_CAPS_NETDEV) && qemuCapsGet(qemuCaps, QEMU_CAPS_DEVICE))) { virCommandAddArg(cmd, "-net"); - if (!(host = qemuBuildHostNetStr(net, ',', vlan, + if (!(host = qemuBuildHostNetStr(net, driver, ',', vlan, tapfd_name, vhostfd_name))) goto error; virCommandAddArg(cmd, host); diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 1eafeb3..04240bc 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -62,6 +62,7 @@ qemuBuildChrDeviceStr (virDomainChrDefPtr serial, /* With vlan == -1, use netdev syntax, else old hostnet */ char * qemuBuildHostNetStr(virDomainNetDefPtr net, + struct qemud_driver *driver, char type_sep, int vlan, const char *tapfd, diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index ad31eba..7f8b1e4 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -699,12 +699,15 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, if (actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || actualType == VIR_DOMAIN_NET_TYPE_NETWORK) { - if ((tapfd = qemuNetworkIfaceConnect(vm->def, conn, driver, net, - priv->qemuCaps)) < 0) - goto cleanup; - iface_connected = true; - if (qemuOpenVhostNet(vm->def, net, priv->qemuCaps, &vhostfd) < 0) - goto cleanup; + if (actualType == VIR_DOMAIN_NET_TYPE_NETWORK || + driver->privileged) { + if ((tapfd = qemuNetworkIfaceConnect(vm->def, conn, driver, net, + priv->qemuCaps)) < 0) + goto cleanup; + iface_connected = true; + if (qemuOpenVhostNet(vm->def, net, priv->qemuCaps, &vhostfd) < 0) + goto cleanup; + } } else if (actualType == VIR_DOMAIN_NET_TYPE_DIRECT) { if ((tapfd = qemuPhysIfaceConnect(vm->def, driver, net, priv->qemuCaps, @@ -752,11 +755,11 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_NETDEV) && qemuCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { - if (!(netstr = qemuBuildHostNetStr(net, ',', + if (!(netstr = qemuBuildHostNetStr(net, driver, ',', -1, tapfd_name, vhostfd_name))) goto cleanup; } else { - if (!(netstr = qemuBuildHostNetStr(net, ' ', + if (!(netstr = qemuBuildHostNetStr(net, driver, ' ', vlan, tapfd_name, vhostfd_name))) goto cleanup; } -- 1.7.1

2 2

[libvirt] [PATCH] Mount fresh instance of sysfs in LXC
by Daniel P. Berrange 11 May '12

11 May '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Currently to make sysfs readonly, we remount the existing instance and then bind it readonly. Unfortunately this means sysfs is still showing device objects wrt the host OS namespace. We need it to reflect the container namespace, so we must mount a completely new instance of it. * src/lxc/lxc_container.c: Mount fresh sysfs instance --- src/lxc/lxc_container.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index b953646..77d33e1 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -441,8 +441,7 @@ static int lxcContainerMountBasicFS(lxc_child_argv_t *argv, const char *srcprefi { false, "proc", "/proc", "proc", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV }, { false, "/proc/sys", "/proc/sys", NULL, NULL, MS_BIND }, { false, "/proc/sys", "/proc/sys", NULL, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY }, - { true, "/sys", "/sys", NULL, NULL, MS_BIND }, - { true, "/sys", "/sys", NULL, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY }, + { false, "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY }, #if HAVE_SELINUX { true, SELINUX_MOUNT, SELINUX_MOUNT, NULL, NULL, MS_BIND }, { true, SELINUX_MOUNT, SELINUX_MOUNT, NULL, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY }, -- 1.7.10.1

3 3

[libvirt] [libvirt-glib] Make memory-handling more explicit in API doc
by Christophe Fergeau 11 May '12

11 May '12

Explain how the return value of the (transfer full) methods should be freed. I also made some cosmetic changes in the API doc of some of the files as I was modifying them. --- libvirt-gconfig/libvirt-gconfig-domain-os.c | 11 ++- libvirt-gconfig/libvirt-gconfig-domain.c | 28 ++++-- libvirt-gobject/libvirt-gobject-connection.c | 94 +++++++++++++------- libvirt-gobject/libvirt-gobject-domain-device.c | 8 +- libvirt-gobject/libvirt-gobject-domain-disk.c | 4 +- libvirt-gobject/libvirt-gobject-domain-interface.c | 4 +- libvirt-gobject/libvirt-gobject-domain-snapshot.c | 4 +- libvirt-gobject/libvirt-gobject-domain.c | 16 ++-- libvirt-gobject/libvirt-gobject-interface.c | 3 +- libvirt-gobject/libvirt-gobject-manager.c | 8 +- libvirt-gobject/libvirt-gobject-network-filter.c | 4 +- libvirt-gobject/libvirt-gobject-network.c | 3 +- libvirt-gobject/libvirt-gobject-node-device.c | 4 +- libvirt-gobject/libvirt-gobject-secret.c | 4 +- libvirt-gobject/libvirt-gobject-storage-pool.c | 19 ++-- libvirt-gobject/libvirt-gobject-storage-vol.c | 6 +- 16 files changed, 157 insertions(+), 63 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-os.c b/libvirt-gconfig/libvirt-gconfig-domain-os.c index 6e3cabd..9a1648a 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-os.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-os.c @@ -83,6 +83,7 @@ void gvir_config_domain_os_set_os_type(GVirConfigDomainOs *os, /** * gvir_config_domain_os_set_kernel: + * @os: a #GVirConfigDomainOs * @kernel: (allow-none): The kernel path */ void gvir_config_domain_os_set_kernel(GVirConfigDomainOs *os, @@ -94,6 +95,7 @@ void gvir_config_domain_os_set_kernel(GVirConfigDomainOs *os, /** * gvir_config_domain_os_set_ramdisk: + * @os: a #GVirConfigDomainOs * @ramdisk: (allow-none): The ramdisk path */ void gvir_config_domain_os_set_ramdisk(GVirConfigDomainOs *os, @@ -105,6 +107,7 @@ void gvir_config_domain_os_set_ramdisk(GVirConfigDomainOs *os, /** * gvir_config_domain_os_set_cmdline: + * @os: a #GVirConfigDomainOs * @cmdline: (allow-none): The direct boot commandline */ void gvir_config_domain_os_set_cmdline(GVirConfigDomainOs *os, @@ -116,6 +119,7 @@ void gvir_config_domain_os_set_cmdline(GVirConfigDomainOs *os, /** * gvir_config_domain_os_set_init: + * @os: a #GVirConfigDomainOs * @init: (allow-none): */ void gvir_config_domain_os_set_init(GVirConfigDomainOs *os, @@ -127,6 +131,7 @@ void gvir_config_domain_os_set_init(GVirConfigDomainOs *os, /** * gvir_config_domain_os_set_loader: + * @os: a #GVirConfigDomainOs * @loader: (allow-none): */ void gvir_config_domain_os_set_loader(GVirConfigDomainOs *os, @@ -183,6 +188,7 @@ void gvir_config_domain_os_set_smbios_mode(GVirConfigDomainOs *os, /** * gvir_config_domain_os_set_boot_devices: + * @os: a #GVirConfigDomainOs * @boot_devices: (in) (element-type LibvirtGConfig.DomainOsBootDevice): */ void gvir_config_domain_os_set_boot_devices(GVirConfigDomainOs *os, GList *boot_devices) @@ -246,8 +252,11 @@ static gboolean add_boot_device(xmlNodePtr node, gpointer opaque) /** * gvir_config_domain_os_get_boot_devices: + * @os: a #GVirConfigDomainOs * - * Gets the list of devices attached to @os + * Gets the list of devices attached to @os. The returned list should be + * freed with g_list_free(), after its elements have been unreffed with + * g_object_unref(). * * Returns: (element-type LibvirtGConfig.DomainOsBootDevice) (transfer full): * a newly allocated #GList of #GVirConfigDomainOsBootDevice. diff --git a/libvirt-gconfig/libvirt-gconfig-domain.c b/libvirt-gconfig/libvirt-gconfig-domain.c index 9076a76..b6b43f0 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.c +++ b/libvirt-gconfig/libvirt-gconfig-domain.c @@ -206,6 +206,7 @@ const char *gvir_config_domain_get_name(GVirConfigDomain *domain) /** * gvir_config_domain_set_name: + * @domain: a #GVirConfigDomain * @name: (allow-none): */ void gvir_config_domain_set_name(GVirConfigDomain *domain, const char *name) @@ -223,6 +224,7 @@ const char *gvir_config_domain_get_description(GVirConfigDomain *domain) /** * gvir_config_domain_set_description: + * @domain: a #GVirConfigDomain * @description: (allow-none): */ void gvir_config_domain_set_description(GVirConfigDomain *domain, const char *description) @@ -234,7 +236,7 @@ void gvir_config_domain_set_description(GVirConfigDomain *domain, const char *de /** * gvir_config_domain_get_memory: - * @domain: A domain configuration object. + * @domain: a #GVirConfigDomain * * Returns: amount of RAM in kilobytes (i.e. blocks of 1024 bytes). */ @@ -246,7 +248,7 @@ guint64 gvir_config_domain_get_memory(GVirConfigDomain *domain) /** * gvir_config_domain_set_memory: - * @domain: A domain configuration object. + * @domain: a #GVirConfigDomain * @memory: The amount of RAM in kilobytes. * * Sets the amount of RAM allocated to @domain in kilobytes (i.e. blocks of 1024 bytes). @@ -285,8 +287,11 @@ static gboolean add_feature(xmlNodePtr node, gpointer opaque) /** * gvir_config_domain_get_features: + * @domain: a #GVirConfigDomain * - * Returns: (transfer full): + * Returns: (transfer full): The returned list should be freed with + * g_strfreev() when no longer needed. + */ GStrv gvir_config_domain_get_features(GVirConfigDomain *domain) { @@ -323,6 +328,7 @@ void gvir_config_domain_set_features(GVirConfigDomain *domain, /** * gvir_config_domain_set_clock: + * @domain: a #GVirConfigDomain * @klock: (allow-none): */ void gvir_config_domain_set_clock(GVirConfigDomain *domain, @@ -338,10 +344,12 @@ void gvir_config_domain_set_clock(GVirConfigDomain *domain, /** * gvir_config_domain_get_os: + * @domain: a #GVirConfigDomain * * Gets the operating system configuration of @domain * - * Returns: (transfer full): + * Returns: (transfer full): A #GVirConfigDomainOs. The returned + * object should be unreffed with g_object_unref() when no longer needed. */ GVirConfigDomainOs *gvir_config_domain_get_os(GVirConfigDomain *domain) { @@ -358,7 +366,8 @@ GVirConfigDomainOs *gvir_config_domain_get_os(GVirConfigDomain *domain) /** * gvir_config_domain_set_os: - * @os: (allow-none): + * @domain: a #GVirConfigDomain + * @os: (allow-none): the os configuration to set */ void gvir_config_domain_set_os(GVirConfigDomain *domain, GVirConfigDomainOs *os) @@ -373,7 +382,8 @@ void gvir_config_domain_set_os(GVirConfigDomain *domain, /** * gvir_config_domain_set_seclabel: - * @seclabel: (allow-none): + * @domain: a #GVirConfigDomain + * @seclabel: (allow-none): the security label configuration to set */ void gvir_config_domain_set_seclabel(GVirConfigDomain *domain, GVirConfigDomainSeclabel *seclabel) @@ -410,6 +420,7 @@ void gvir_config_domain_set_lifecycle(GVirConfigDomain *domain, /** * gvir_config_domain_set_devices: + * @domain: a #GVirConfigDomain * @devices: (in) (element-type LibvirtGConfig.DomainDevice): */ void gvir_config_domain_set_devices(GVirConfigDomain *domain, @@ -480,8 +491,11 @@ static gboolean add_device(xmlNodePtr node, gpointer opaque) /** * gvir_config_domain_get_devices: + * @domain: a #GVirConfigDomain * - * Gets the list of devices attached to @domain + * Gets the list of devices attached to @domain. The returned list should + * be freed with g_list_free(), after its elements have been unreffed with + * g_object_unref(). * * Returns: (element-type LibvirtGConfig.DomainDevice) (transfer full): * a newly allocated #GList of #GVirConfigDomainDevice. diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index 6469ebc..b12669d 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -400,7 +400,7 @@ static int domain_event_cb(virConnectPtr conn G_GNUC_UNUSED, /** * gvir_connection_open: - * @conn: the connection + * @conn: a #GVirConnection * @cancellable: (allow-none)(transfer none): cancellation object */ gboolean gvir_connection_open(GVirConnection *conn, @@ -474,7 +474,7 @@ gvir_connection_open_helper(GSimpleAsyncResult *res, /** * gvir_connection_open_async: - * @conn: the connection + * @conn: a #GVirConnection * @cancellable: (allow-none)(transfer none): cancellation object * @callback: (scope async): completion callback * @user_data: (closure): opaque data for callback @@ -500,7 +500,7 @@ void gvir_connection_open_async(GVirConnection *conn, /** * gvir_connection_open_finish: - * @conn: the connection + * @conn: a #GVirConnection * @result: (transfer none): async method result */ gboolean gvir_connection_open_finish(GVirConnection *conn, @@ -606,7 +606,7 @@ error: /** * gvir_connection_fetch_domains: - * @conn: the connection + * @conn: a #GVirConnection * @cancellable: (allow-none)(transfer none): cancellation object */ gboolean gvir_connection_fetch_domains(GVirConnection *conn, @@ -735,7 +735,7 @@ cleanup: /** * gvir_connection_fetch_storage_pools: - * @conn: the connection + * @conn: a #GVirConnection * @cancellable: (allow-none)(transfer none): cancellation object */ gboolean gvir_connection_fetch_storage_pools(GVirConnection *conn, @@ -879,7 +879,7 @@ gvir_connection_fetch_domains_helper(GSimpleAsyncResult *res, /** * gvir_connection_fetch_domains_async: - * @conn: the connection + * @conn: a #GVirConnection * @cancellable: (allow-none)(transfer none): cancellation object * @callback: (scope async): completion callback * @user_data: (closure): opaque data for callback @@ -904,7 +904,7 @@ void gvir_connection_fetch_domains_async(GVirConnection *conn, /** * gvir_connection_fetch_domains_finish: - * @conn: the connection + * @conn: a #GVirConnection * @result: (transfer none): async method result */ gboolean gvir_connection_fetch_domains_finish(GVirConnection *conn, @@ -938,7 +938,7 @@ gvir_connection_fetch_pools_helper(GSimpleAsyncResult *res, /** * gvir_connection_fetch_storage_pools_async: - * @conn: the connection + * @conn: a #GVirConnection * @cancellable: (allow-none)(transfer none): cancellation object * @callback: (scope async): completion callback * @user_data: (closure): opaque data for callback @@ -963,7 +963,7 @@ void gvir_connection_fetch_storage_pools_async(GVirConnection *conn, /** * gvir_connection_fetch_storage_pools_finish: - * @conn: the connection + * @conn: a #GVirConnection * @result: (transfer none): async method result */ gboolean gvir_connection_fetch_storage_pools_finish(GVirConnection *conn, @@ -994,8 +994,13 @@ static void gvir_domain_ref(gpointer obj, gpointer ignore G_GNUC_UNUSED) /** * gvir_connection_get_domains: + * @conn: a #GVirConnection * - * Return value: (element-type LibvirtGObject.Domain) (transfer full): List of #GVirDomain + * Gets a list of the domains available through @conn. + * + * Return value: (element-type LibvirtGObject.Domain) (transfer full): List + * of #GVirDomain. The returned list should be freed with g_list_free(), + * after its elements have been unreffed with g_object_unref(). */ GList *gvir_connection_get_domains(GVirConnection *conn) { @@ -1014,9 +1019,14 @@ GList *gvir_connection_get_domains(GVirConnection *conn) /** * gvir_connection_get_storage_pools: + * @conn: a #GVirConnection + * + * Gets a list of the storage pools available through @conn. * * Return value: (element-type LibvirtGObject.StoragePool) (transfer full): List - * of #GVirStoragePool + * of #GVirStoragePool. The returned list should be freed with + * g_list_free(), after its elements have been unreffed with + * g_object_unref(). */ GList *gvir_connection_get_storage_pools(GVirConnection *conn) { @@ -1035,9 +1045,11 @@ GList *gvir_connection_get_storage_pools(GVirConnection *conn) /** * gvir_connection_get_domain: + * @conn: a #GVirConnection * @uuid: uuid string of the requested domain * - * Return value: (transfer full): the #GVirDomain, or NULL + * Return value: (transfer full): the #GVirDomain, or NULL. The returned + * object should be unreffed with g_object_unref() when no longer needed. */ GVirDomain *gvir_connection_get_domain(GVirConnection *conn, const gchar *uuid) @@ -1054,9 +1066,11 @@ GVirDomain *gvir_connection_get_domain(GVirConnection *conn, /** * gvir_connection_get_storage_pool: + * @conn: a #GVirConnection * @uuid: uuid string of the requested storage pool * - * Return value: (transfer full): the #GVirStoragePool, or NULL + * Return value: (transfer full): the #GVirStoragePool, or NULL. The returned + * object should be unreffed with g_object_unref() when no longer needed. */ GVirStoragePool *gvir_connection_get_storage_pool(GVirConnection *conn, const gchar *uuid) @@ -1075,9 +1089,11 @@ GVirStoragePool *gvir_connection_get_storage_pool(GVirConnection *conn, /** * gvir_connection_find_domain_by_id: + * @conn: a #GVirConnection * @id: id of the requested domain * - * Return value: (transfer full): the #GVirDomain, or NULL + * Return value: (transfer full): the #GVirDomain, or NULL. The returned + * object should be unreffed with g_object_unref() when no longer needed. */ GVirDomain *gvir_connection_find_domain_by_id(GVirConnection *conn, gint id) @@ -1107,9 +1123,11 @@ GVirDomain *gvir_connection_find_domain_by_id(GVirConnection *conn, /** * gvir_connection_find_domain_by_name: + * @conn: a #GVirConnection * @name: name of the requested domain * - * Return value: (transfer full): the #GVirDomain, or NULL + * Return value: (transfer full): the #GVirDomain, or NULL. The returned + * object should be unreffed with g_object_unref() when no longer needed. */ GVirDomain *gvir_connection_find_domain_by_name(GVirConnection *conn, const gchar *name) @@ -1141,9 +1159,11 @@ GVirDomain *gvir_connection_find_domain_by_name(GVirConnection *conn, /** * gvir_connection_find_storage_pool_by_name: + * @conn: a #GVirConnection * @name: name of the requested storage pool * - * Return value: (transfer full): the #GVirStoragePool, or NULL + * Return value: (transfer full): the #GVirStoragePool, or NULL. The returned + * object should be unreffed with g_object_unref() when no longer needed. */ GVirStoragePool *gvir_connection_find_storage_pool_by_name(GVirConnection *conn, const gchar *name) @@ -1193,9 +1213,11 @@ G_DEFINE_BOXED_TYPE(GVirConnectionHandle, gvir_connection_handle, /** * gvir_connection_get_stream: + * @conn: a #GVirConnection * @flags: flags to use for the stream * - * Return value: (transfer full): a #GVirStream stream, or NULL + * Return value: (transfer full): a #GVirStream stream, or NULL.The returned + * object should be unreffed with g_object_unref() when no longer needed. */ GVirStream *gvir_connection_get_stream(GVirConnection *self, guint flags) @@ -1215,13 +1237,15 @@ GVirStream *gvir_connection_get_stream(GVirConnection *self, /** * gvir_connection_create_domain: - * @conn: the connection on which to create the domain + * @conn: a #GVirConnection on which to create the domain * @conf: the configuration for the new domain * * Create the configuration file for a new persistent domain. * The returned domain will initially be in the shutoff state. * - * Returns: (transfer full): the newly created domain + * Returns: (transfer full): the newly created domain, or NULL if an error + * occurred. The returned object should be unreffed with g_object_unref() + * when no longer needed. */ GVirDomain *gvir_connection_create_domain(GVirConnection *conn, GVirConfigDomain *conf, @@ -1261,13 +1285,15 @@ GVirDomain *gvir_connection_create_domain(GVirConnection *conn, /** * gvir_connection_start_domain: - * @conn: the connection on which to create the domain + * @conn: a #GVirConnection on which to create the domain * @conf: the configuration for the new domain * * Start a new transient domain without persistent configuration. * The returned domain will initially be running. * - * Returns: (transfer full): the newly created domain + * Returns: (transfer full): the newly created domain, or NULL if an error + * occurred. The returned object should be unreffed with g_object_unref() + * when no longer needed. */ GVirDomain *gvir_connection_start_domain(GVirConnection *conn, GVirConfigDomain *conf, @@ -1308,12 +1334,14 @@ GVirDomain *gvir_connection_start_domain(GVirConnection *conn, /** * gvir_connection_create_storage_pool: - * @conn: the connection on which to create the pool + * @conn: a #GVirConnection on which to create the pool * @conf: the configuration for the new storage pool * @flags: the flags * @err: return location for any #GError * - * Returns: (transfer full): the newly created storage pool + * Returns: (transfer full): the newly created storage pool, or NULL if an + * error occurred. The returned list should be freed with g_list_free(), + * after its elements have been unreffed with g_object_unref(). */ GVirStoragePool *gvir_connection_create_storage_pool (GVirConnection *conn, @@ -1352,10 +1380,12 @@ GVirStoragePool *gvir_connection_create_storage_pool /** * gvir_connection_get_node_info: - * @conn: the connection + * @conn: a #GVirConnection * @err: return location for any #GError * - * Returns: (transfer full): the info + * Returns: (transfer full): the info, or NULL if an error occurred. The + * returned object should be unreffed with g_object_unref() when no longer + * needed. */ GVirNodeInfo *gvir_connection_get_node_info(GVirConnection *conn, GError **err) @@ -1386,10 +1416,12 @@ GVirNodeInfo *gvir_connection_get_node_info(GVirConnection *conn, /** * gvir_connection_get_capabilities: - * @conn: the connection + * @conn: a #GVirConnection * @err: return location for any #GError * - * Return value: (transfer full): a #GVirConfigCapabilities or NULL + * Return value: (transfer full): a #GVirConfigCapabilities or NULL. The + * returned object should be unreffed with g_object_unref() when no longer + * needed. */ GVirConfigCapabilities *gvir_connection_get_capabilities(GVirConnection *conn, GError **err) @@ -1436,7 +1468,7 @@ gvir_connection_get_capabilities_helper(GSimpleAsyncResult *res, /** * gvir_connection_get_capabilities_async: - * @conn: the connection + * @conn: a #GVirConnection * @cancellable: (allow-none)(transfer none): cancellation object * @callback: (scope async): completion callback * @user_data: (closure): opaque data for callback @@ -1461,10 +1493,12 @@ void gvir_connection_get_capabilities_async(GVirConnection *conn, /** * gvir_connection_get_capabilities_finish: - * @conn: the connection + * @conn: a #GVirConnection * @result: (transfer none): async method result * - * Return value: (transfer full): a #GVirConfigCapabilities or NULL. + * Return value: (transfer full): a #GVirConfigCapabilities or NULL. The + * returned object should be unreffed with g_object_unref() when no longer + * needed. */ GVirConfigCapabilities * gvir_connection_get_capabilities_finish(GVirConnection *conn, diff --git a/libvirt-gobject/libvirt-gobject-domain-device.c b/libvirt-gobject/libvirt-gobject-domain-device.c index db50c09..9a65468 100644 --- a/libvirt-gobject/libvirt-gobject-domain-device.c +++ b/libvirt-gobject/libvirt-gobject-domain-device.c @@ -161,7 +161,9 @@ virDomainPtr gvir_domain_device_get_domain_handle(GVirDomainDevice *self) * gvir_domain_device_get_domain: * @device: the domain device * - * Returns: (transfer full): the associated domain + * Returns: (transfer full): the associated domain. The returned object + * should be unreffed with g_object_unref() when no longer needed. + */ GVirDomain *gvir_domain_device_get_domain(GVirDomainDevice *device) { @@ -172,7 +174,9 @@ GVirDomain *gvir_domain_device_get_domain(GVirDomainDevice *device) * gvir_domain_device_get_config: * @device: the domain device * - * Returns: (transfer full): the config + * Returns: (transfer full): the config. The returned object should be + * unreffed with g_object_unref() when no longer needed. + */ GVirConfigDomainDevice *gvir_domain_device_get_config(GVirDomainDevice *device) { diff --git a/libvirt-gobject/libvirt-gobject-domain-disk.c b/libvirt-gobject/libvirt-gobject-domain-disk.c index fb85328..607e26c 100644 --- a/libvirt-gobject/libvirt-gobject-domain-disk.c +++ b/libvirt-gobject/libvirt-gobject-domain-disk.c @@ -112,7 +112,9 @@ static const gchar *gvir_domain_disk_get_path(GVirDomainDisk *self) * within the stats structure may be returned as -1, which indicates * that the hypervisor does not support that particular statistic. * - * Returns: (transfer full): the stats or %NULL in case of error + * Returns: (transfer full): the stats or %NULL in case of error.The + * returned object should be unreffed with g_object_unref() when no longer + * needed. **/ GVirDomainDiskStats *gvir_domain_disk_get_stats(GVirDomainDisk *self, GError **err) { diff --git a/libvirt-gobject/libvirt-gobject-domain-interface.c b/libvirt-gobject/libvirt-gobject-domain-interface.c index 9f4b30d..7087cbc 100644 --- a/libvirt-gobject/libvirt-gobject-domain-interface.c +++ b/libvirt-gobject/libvirt-gobject-domain-interface.c @@ -114,7 +114,9 @@ static const gchar *gvir_domain_interface_get_path(GVirDomainInterface *self) * within the stats structure may be returned as -1, which indicates * that the hypervisor does not support that particular statistic. * - * Returns: (transfer full): the stats or %NULL in case of error + * Returns: (transfer full): the stats or %NULL in case of error. The + * returned object should be unreffed with g_object_unref() when no longer + * needed. **/ GVirDomainInterfaceStats *gvir_domain_interface_get_stats(GVirDomainInterface *self, GError **err) { diff --git a/libvirt-gobject/libvirt-gobject-domain-snapshot.c b/libvirt-gobject/libvirt-gobject-domain-snapshot.c index dbf0c51..d06d4d5 100644 --- a/libvirt-gobject/libvirt-gobject-domain-snapshot.c +++ b/libvirt-gobject/libvirt-gobject-domain-snapshot.c @@ -185,7 +185,9 @@ const gchar *gvir_domain_snapshot_get_name(GVirDomainSnapshot *snapshot) * @snapshot: the domain_snapshot * @flags: the flags * - * Returns: (transfer full): the config + * Returns: (transfer full): the config. The returned object should be + * unreffed with g_object_unref() when no longer needed. + */ GVirConfigDomainSnapshot *gvir_domain_snapshot_get_config (GVirDomainSnapshot *snapshot, diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index e5113d4..9be568a 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -455,7 +455,8 @@ gboolean gvir_domain_reboot(GVirDomain *dom, * @dom: the domain * @flags: the flags * - * Returns: (transfer full): the config + * Returns: (transfer full): the config. The returned object should be + * unreffed with g_object_unref() when no longer needed. */ GVirConfigDomain *gvir_domain_get_config(GVirDomain *dom, guint flags, @@ -549,7 +550,8 @@ gboolean gvir_domain_set_config(GVirDomain *domain, * gvir_domain_get_info: * @dom: the domain * - * Returns: (transfer full): the info + * Returns: (transfer full): the info. The returned object should be + * unreffed with g_object_unref() when no longer needed. */ GVirDomainInfo *gvir_domain_get_info(GVirDomain *dom, GError **err) @@ -631,7 +633,8 @@ void gvir_domain_get_info_async(GVirDomain *dom, * * Finishes the operation started by #gvir_domain_get_info_async. * - * Returns: (transfer full): the info + * Returns: (transfer full): the info. The returned object should be + * unreffed with g_object_unref() when no longer needed. */ GVirDomainInfo *gvir_domain_get_info_finish(GVirDomain *dom, GAsyncResult *result, @@ -661,7 +664,8 @@ GVirDomainInfo *gvir_domain_get_info_finish(GVirDomain *dom, * @monitor_id: monitor ID to take screenshot from * @flags: extra flags, currently unused * - * Returns: (transfer full): mime-type of the image format, or NULL upon error. + * Returns: (transfer full): a newly allocated string containing the + * mime-type of the image format, or NULL upon error. */ gchar *gvir_domain_screenshot(GVirDomain *dom, GVirStream *stream, @@ -958,7 +962,9 @@ gboolean gvir_domain_get_saved(GVirDomain *dom) * @domain: the domain * @err: place-holder for possible errors, or NULL * - * Gets the list of devices attached to @domain + * Gets the list of devices attached to @domain. The returned list should + * be freed with g_list_free(), after its elements have been unreffed with + * g_object_unref(). * * Returns: (element-type LibvirtGObject.DomainDevice) (transfer full): a newly * allocated #GList of #GVirDomainDevice. diff --git a/libvirt-gobject/libvirt-gobject-interface.c b/libvirt-gobject/libvirt-gobject-interface.c index a8e299c..883cf92 100644 --- a/libvirt-gobject/libvirt-gobject-interface.c +++ b/libvirt-gobject/libvirt-gobject-interface.c @@ -177,7 +177,8 @@ const gchar *gvir_interface_get_name(GVirInterface *iface) * @flags: the flags * @err: Place-holder for possible errors * - * Returns: (transfer full): the config + * Returns: (transfer full): the config. The returned object should be + * unreffed with g_object_unref() when no longer needed. */ GVirConfigInterface *gvir_interface_get_config(GVirInterface *iface, guint flags, diff --git a/libvirt-gobject/libvirt-gobject-manager.c b/libvirt-gobject/libvirt-gobject-manager.c index 010e8da..c44e711 100644 --- a/libvirt-gobject/libvirt-gobject-manager.c +++ b/libvirt-gobject/libvirt-gobject-manager.c @@ -161,7 +161,9 @@ void gvir_manager_remove_connection(GVirManager *man, /** * gvir_manager_get_connections: * - * Returns: (transfer full)(element-type GVirConnection): the connections + * Returns: (transfer full)(element-type GVirConnection): the connections. + * The returned list should be freed with g_list_free(), after its elements + * have been unreffed with g_object_unref(). */ GList *gvir_manager_get_connections(GVirManager *man) { @@ -181,7 +183,9 @@ GList *gvir_manager_get_connections(GVirManager *man) /** * gvir_manager_find_connection_by_uri: * - * Returns: (transfer full)(allow-none): the connection,or NULL + * Returns: (transfer full)(allow-none): the connection,or NULL. The + * returned object should be unreffed with g_object_unref() when no longer + * needed. */ GVirConnection *gvir_manager_find_connection_by_uri(GVirManager *man, const gchar *uri) diff --git a/libvirt-gobject/libvirt-gobject-network-filter.c b/libvirt-gobject/libvirt-gobject-network-filter.c index 103174b..b3db236 100644 --- a/libvirt-gobject/libvirt-gobject-network-filter.c +++ b/libvirt-gobject/libvirt-gobject-network-filter.c @@ -208,7 +208,9 @@ const gchar *gvir_network_filter_get_uuid(GVirNetworkFilter *filter) * @flags: the flags * @err: Place-holder for possible errors * - * Returns: (transfer full): the config + * Returns: (transfer full): the config. The returned object should be + * unreffed with g_object_unref() when no longer needed. + */ GVirConfigNetworkFilter *gvir_network_filter_get_config (GVirNetworkFilter *filter, diff --git a/libvirt-gobject/libvirt-gobject-network.c b/libvirt-gobject/libvirt-gobject-network.c index 2d195d9..17378ec 100644 --- a/libvirt-gobject/libvirt-gobject-network.c +++ b/libvirt-gobject/libvirt-gobject-network.c @@ -205,7 +205,8 @@ const gchar *gvir_network_get_uuid(GVirNetwork *network) * @flags: the flags * @err: Place-holder for possible errors * - * Returns: (transfer full): the config + * Returns: (transfer full): the config. The returned object should be + * unreffed with g_object_unref() when no longer needed. */ GVirConfigNetwork *gvir_network_get_config(GVirNetwork *network, guint flags, diff --git a/libvirt-gobject/libvirt-gobject-node-device.c b/libvirt-gobject/libvirt-gobject-node-device.c index 6f81f1a..0a4b6a6 100644 --- a/libvirt-gobject/libvirt-gobject-node-device.c +++ b/libvirt-gobject/libvirt-gobject-node-device.c @@ -177,7 +177,9 @@ const gchar *gvir_node_device_get_name(GVirNodeDevice *device) * @flags: the flags * @err: Place-holder for possible errors * - * Returns: (transfer full): the config + * Returns: (transfer full): the config. The returned object should be + * unreffed with g_object_unref() when no longer needed. + */ GVirConfigNodeDevice *gvir_node_device_get_config(GVirNodeDevice *device, guint flags, diff --git a/libvirt-gobject/libvirt-gobject-secret.c b/libvirt-gobject/libvirt-gobject-secret.c index 299fdca..b0aff13 100644 --- a/libvirt-gobject/libvirt-gobject-secret.c +++ b/libvirt-gobject/libvirt-gobject-secret.c @@ -193,7 +193,9 @@ const gchar *gvir_secret_get_uuid(GVirSecret *secret) * @flags: the flags * @err: Place-holder for possible errors * - * Returns: (transfer full): the config + * Returns: (transfer full): the config. The returned object should be + * unreffed with g_object_unref() when no longer needed. + */ GVirConfigSecret *gvir_secret_get_config(GVirSecret *secret, guint flags, diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.c b/libvirt-gobject/libvirt-gobject-storage-pool.c index f09f122..e79c8e5 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.c +++ b/libvirt-gobject/libvirt-gobject-storage-pool.c @@ -237,7 +237,8 @@ const gchar *gvir_storage_pool_get_uuid(GVirStoragePool *pool) * @flags: the flags * @err: Place-holder for possible errors * - * Returns: (transfer full): the config + * Returns: (transfer full): the config. The returned object should be + * unreffed with g_object_unref() when no longer needed. */ GVirConfigStoragePool *gvir_storage_pool_get_config(GVirStoragePool *pool, guint flags, @@ -264,7 +265,8 @@ GVirConfigStoragePool *gvir_storage_pool_get_config(GVirStoragePool *pool, * @pool: the storage_pool * @err: Place-holder for possible errors * - * Returns: (transfer full): the info + * Returns: (transfer full): the info. The returned object should be + * unreffed with g_object_unref() when no longer needed. */ GVirStoragePoolInfo *gvir_storage_pool_get_info(GVirStoragePool *pool, GError **err) @@ -486,8 +488,10 @@ static void gvir_storage_vol_ref(gpointer obj, gpointer ignore G_GNUC_UNUSED) * gvir_storage_pool_get_volumes: * @pool: the storage pool * - * Return value: (element-type LibvirtGObject.StorageVol) (transfer full): List - * of #GVirStorageVol + * Return value: (element-type LibvirtGObject.StorageVol) (transfer full): + * List of #GVirStorageVol. The returned list should be freed with + * g_list_free(), after its elements have been unreffed with + * g_object_unref(). */ GList *gvir_storage_pool_get_volumes(GVirStoragePool *pool) { @@ -509,7 +513,9 @@ GList *gvir_storage_pool_get_volumes(GVirStoragePool *pool) * @pool: the storage pool * @name: Name of the requested storage volume * - * Return value: (transfer full): the #GVirStorageVol, or NULL + * Return value: (transfer full): the #GVirStorageVol, or NULL. The + * returned object should be unreffed with g_object_unref() when no longer + * needed. */ GVirStorageVol *gvir_storage_pool_get_volume(GVirStoragePool *pool, const gchar *name) @@ -532,7 +538,8 @@ GVirStorageVol *gvir_storage_pool_get_volume(GVirStoragePool *pool, * @conf: the configuration for the new volume * @err: Place-holder for possible errors * - * Returns: (transfer full): the newly created volume + * Returns: (transfer full): the newly created volume. The returned object + * should be unreffed with g_object_unref() when no longer needed. */ GVirStorageVol *gvir_storage_pool_create_volume (GVirStoragePool *pool, diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.c b/libvirt-gobject/libvirt-gobject-storage-vol.c index cd02b38..9e59576 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.c +++ b/libvirt-gobject/libvirt-gobject-storage-vol.c @@ -227,7 +227,8 @@ const gchar *gvir_storage_vol_get_path(GVirStorageVol *vol, GError **error) * @flags: the flags * @err: Place-holder for possible errors * - * Returns: (transfer full): the config + * Returns: (transfer full): the config. The returned object should be + * unreffed with g_object_unref() when no longer needed. */ GVirConfigStorageVol *gvir_storage_vol_get_config(GVirStorageVol *vol, guint flags, @@ -254,7 +255,8 @@ GVirConfigStorageVol *gvir_storage_vol_get_config(GVirStorageVol *vol, * @vol: the storage_vol * @err: Place-holder for possible errors * - * Returns: (transfer full): the info + * Returns: (transfer full): the info. The returned object should be + * unreffed with g_object_unref() when no longer needed. */ GVirStorageVolInfo *gvir_storage_vol_get_info(GVirStorageVol *vol, GError **err) -- 1.7.10.1

2 1

[libvirt] [PATCH] virsh: Allow users to reedit rejected XML
by Michal Privoznik 11 May '12

11 May '12

If users {net-,pool-,}edit but make a mistake in XML all changes are permanently lost. However, if virsh is running in interactive mode we can as user if he wants to re-edit the file and correct the mistakes. --- tools/console.c | 40 +++++++++++++++++++++++++--------------- tools/console.h | 1 + tools/virsh.c | 41 +++++++++++++++++++++++++++++++++++------ 3 files changed, 61 insertions(+), 21 deletions(-) diff --git a/tools/console.c b/tools/console.c index 34fde05..90e54e3 100644 --- a/tools/console.c +++ b/tools/console.c @@ -298,13 +298,36 @@ vshGetEscapeChar(const char *s) return *s; } +int vshMakeStdinRaw(struct termios *ttyattr, bool report_errors) { + struct termios rawattr; + + if (tcgetattr(STDIN_FILENO, ttyattr) < 0) { + if (report_errors) + VIR_ERROR(_("unable to get tty attributes: %s"), + strerror(errno)); + return -1; + } + + rawattr = *ttyattr; + cfmakeraw(&rawattr); + + if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &rawattr) < 0) { + if (report_errors) + VIR_ERROR(_("unable to set tty attributes: %s"), + strerror(errno)); + return -1; + } + + return 0; +} + int vshRunConsole(virDomainPtr dom, const char *dev_name, const char *escape_seq, unsigned int flags) { int ret = -1; - struct termios ttyattr, rawattr; + struct termios ttyattr; void (*old_sigquit)(int); void (*old_sigterm)(int); void (*old_sigint)(int); @@ -317,21 +340,8 @@ int vshRunConsole(virDomainPtr dom, result in it being echoed back already), and also ensure Ctrl-C, etc is blocked, and misc other bits */ - if (tcgetattr(STDIN_FILENO, &ttyattr) < 0) { - VIR_ERROR(_("unable to get tty attributes: %s"), - strerror(errno)); - return -1; - } - - rawattr = ttyattr; - cfmakeraw(&rawattr); - - if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &rawattr) < 0) { - VIR_ERROR(_("unable to set tty attributes: %s"), - strerror(errno)); + if (vshMakeStdinRaw(&ttyattr, true) < 0) goto resettty; - } - /* Trap all common signals so that we can safely restore the original terminal settings on STDIN before the diff --git a/tools/console.h b/tools/console.h index 2b5440c..97c97cd 100644 --- a/tools/console.h +++ b/tools/console.h @@ -30,6 +30,7 @@ int vshRunConsole(virDomainPtr dom, const char *escape_seq, unsigned int flags); +int vshMakeStdinRaw(struct termios *ttyattr, bool report_errors); # endif /* !WIN32 */ #endif /* __VIR_CONSOLE_H__ */ diff --git a/tools/virsh.c b/tools/virsh.c index dd9292a..3537e2e 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -33,6 +33,7 @@ #include <signal.h> #include <poll.h> #include <strings.h> +#include <termios.h> #include <libxml/parser.h> #include <libxml/tree.h> @@ -15806,11 +15807,14 @@ cmdEdit (vshControl *ctl, const vshCmd *cmd) { bool ret = false; virDomainPtr dom = NULL; + virDomainPtr dom_edited = NULL; char *tmp = NULL; char *doc = NULL; char *doc_edited = NULL; char *doc_reread = NULL; unsigned int flags = VIR_DOMAIN_XML_SECURE | VIR_DOMAIN_XML_INACTIVE; + int c = 0; + struct termios ttyattr; if (!vshConnectionUsability(ctl, ctl->conn)) goto cleanup; @@ -15828,6 +15832,7 @@ cmdEdit (vshControl *ctl, const vshCmd *cmd) tmp = editWriteToTempFile (ctl, doc); if (!tmp) goto cleanup; +reedit: /* Start the editor. */ if (editFile (ctl, tmp) == -1) goto cleanup; @@ -15858,19 +15863,43 @@ cmdEdit (vshControl *ctl, const vshCmd *cmd) } /* Everything checks out, so redefine the domain. */ - virDomainFree (dom); - dom = virDomainDefineXML(ctl->conn, doc_edited); - if (!dom) - goto cleanup; + dom_edited = virDomainDefineXML(ctl->conn, doc_edited); + if (!dom_edited) { + /* Redefine failed. If we are in interactive mode ask user + * if he wants to re-edit the XML. */ + if (!ctl->imode || + vshMakeStdinRaw(&ttyattr, false) < 0) + goto cleanup; + + virshReportError(ctl); + + while (true) { + vshPrint(ctl, "\rFailed. Try again? (y/Y/n/N) [Y]:"); + c = getchar(); + c = c_toupper(c); + if (c == '\n' || c == '\r' || c == 'Y' || c == 'N') + break; + } + + tcsetattr(STDIN_FILENO, TCSAFLUSH, &ttyattr); + + if (c == 'N') + goto cleanup; + + vshPrint(ctl, "\r\n"); + goto reedit; + } vshPrint (ctl, _("Domain %s XML configuration edited.\n"), virDomainGetName(dom)); ret = true; - cleanup: +cleanup: if (dom) - virDomainFree (dom); + virDomainFree(dom); + if (dom_edited) + virDomainFree(dom_edited); VIR_FREE(doc); VIR_FREE(doc_edited); -- 1.7.8.5

5 9

[libvirt] [PATCHv2 0/3] Fix output of virsh vcpuinfo after cpu hotplug
by Peter Krempa 11 May '12

11 May '12

A respin of the series fixing guest rollback, a memory leak and making the vCPU thread re-detection safe to use with older qemu versions. Peter Krempa (3): qemu: Refactor qemuDomainSetVcpusFlags qemu: Re-detect virtual cpu threads after cpu hot (un)plug. qemu: Don't skip detection of virtual cpu's on non KVM targets src/qemu/qemu_driver.c | 55 ++++++++++++++++++++++++++++++++-------------- src/qemu/qemu_process.c | 21 ++++++----------- 2 files changed, 46 insertions(+), 30 deletions(-) -- 1.7.3.4

2 7

[libvirt] [PATCH] nodeinfo: Get the correct CPU number on AMD Magny Cours platform
by Osier Yang 11 May '12

11 May '12

"Instead of developing one CPU with 12 cores, the Magny Cours is actually two 6 core “Bulldozer” CPUs combined in to one package" I.e, each package has two NUMA nodes, and the two numa nodes share the same core ID set (0-6), which means parsing the cores number from sysfs doesn't work in this case. And the wrong CPU number could cause three problems for libvirt: 1) performance lost A domain without "cpuset" or "placement='auto'" (to drive numad) specified will be only pinned to part of the CPUs. 2) domain can be started If a domain uses numad, and the advisory nodeset returned from numad contains node which exceeds the range of wrong total CPU number. The domain will fail to start, as the bitmask passed to sched_setaffinity could be fully filled with zero. 3) wrong CPU number affects lots of stuffs. E.g. for command "virsh vcpuinfo", "virsh vcpupin", it will always output with the truncated CPU list. For more details: https://www.redhat.com/archives/libvir-list/2012-May/msg00607.html This patch is to fix the problem by parsing /proc/cpuinfo to get the value of field "cpu cores", and use it as nodeinfo->cores if it's greater than the cores number from sysfs. --- src/nodeinfo.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 56b9f54..87a6ad6 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -211,6 +211,7 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, cpu_set_t core_mask; cpu_set_t socket_mask; int online; + unsigned int cpu_cores = 0; nodeinfo->cpus = 0; nodeinfo->mhz = 0; @@ -251,6 +252,23 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, && (*p == '\0' || *p == '.' || c_isspace(*p))) nodeinfo->mhz = ui; } + + if (STRPREFIX(buf, "cpu cores")) { + char *p; + unsigned int ui; + buf += 9; + while (*buf && c_isspace(*buf)) + buf++; + if (*buf != ':' || !buf[1]) { + nodeReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("parsing cpuinfo cpu MHz")); + return -1; + } + if (virStrToLong_ui(buf+1, &p, 10, &ui) == 0 + /* Accept trailing fractional part. */ + && (*p == '\0' || *p == '.' || c_isspace(*p))) + cpu_cores = ui; + } # elif defined(__powerpc__) || \ defined(__powerpc64__) char *buf = line; @@ -353,6 +371,16 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, return -1; } + /* Platform like AMD Magny Cours has two NUMA nodes each package, and + * the two nodes share the same core ID set, it results in the cores + * number calculated from sysfs is not the actual cores number. Use + * "cpu cores" in /proc/cpuinfo as the cores number instead in this case. + * More details about the problem: + * https://www.redhat.com/archives/libvir-list/2012-May/msg00607.html + */ + if (cpu_cores && (cpu_cores > nodeinfo->cores)) + nodeinfo->cores = cpu_cores; + /* nodeinfo->sockets is supposed to be a number of sockets per NUMA node, * however if NUMA nodes are not composed of whole sockets, we just lie * about the number of NUMA nodes and force apps to check capabilities XML -- 1.7.7.3

2 1

[libvirt] [PATCH] docs: Serialize running apibuild.py
by Cole Robinson 11 May '12

11 May '12

Use a witness file approach like we do for python/generator.py, as suggested by Eric. Fixes the build issue reported here: https://www.redhat.com/archives/libvir-list/2012-April/msg01435.html Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- .gitignore | 1 + docs/Makefile.am | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 14a21d0..3cc30e8 100644 --- a/.gitignore +++ b/.gitignore @@ -54,6 +54,7 @@ /daemon/libvirtd.init /daemon/libvirtd.pod /daemon/libvirtd.service +/docs/apibuild.py.stamp /docs/devhelp/libvirt.devhelp /docs/hvsupport.html.in /docs/libvirt-api.xml diff --git a/docs/Makefile.am b/docs/Makefile.am index 53328f7..9bcc866 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -200,12 +200,19 @@ python_generated_files = \ $(srcdir)/libvirt-qemu-api.xml \ $(srcdir)/libvirt-qemu-refs.xml -$(python_generated_files): $(srcdir)/apibuild.py \ +APIBUILD="$(srcdir)/apibuild.py" +APIBUILD_STAMP="$(APIBUILD).stamp" + +$(python_generated_files): $(APIBUILD_STAMP) + +$(APIBUILD_STAMP): $(srcdir)/apibuild.py \ $(srcdir)/../include/libvirt/*.h \ $(srcdir)/../src/libvirt.c \ $(srcdir)/../src/libvirt-qemu.c \ $(srcdir)/../src/util/virterror.c - $(AM_V_GEN)srcdir=$(srcdir) $(PYTHON) $(srcdir)/apibuild.py + $(AM_V_GEN)srcdir=$(srcdir) $(PYTHON) $(APIBUILD) + touch $@ + check-local: all @@ -215,6 +222,7 @@ clean-local: maintainer-clean-local: clean-local rm -rf $(srcdir)/libvirt-api.xml $(srcdir)/libvirt-refs.xml todo.html.in hvsupport.html.in rm -rf $(srcdir)/libvirt-qemu-api.xml $(srcdir)/libvirt-qemu-refs.xml + rm -rf $(APIBUILD_STAMP) rebuild: api qemu_api all -- 1.7.7.6

4 5

[libvirt] [libvirt-glib 1/4] More generic gvir_config_object_add_child()
by Zeeshan Ali (Khattak) 11 May '12

11 May '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gconfig/libvirt-gconfig-domain-channel.c | 6 ++++-- libvirt-gconfig/libvirt-gconfig-domain-console.c | 3 ++- libvirt-gconfig/libvirt-gconfig-domain-disk.c | 18 ++++++++++++------ libvirt-gconfig/libvirt-gconfig-domain-filesys.c | 6 ++++-- libvirt-gconfig/libvirt-gconfig-domain.c | 6 ++++-- libvirt-gconfig/libvirt-gconfig-object-private.h | 5 ++++- libvirt-gconfig/libvirt-gconfig-object.c | 13 ++++++++----- .../libvirt-gconfig-storage-pool-source.c | 3 ++- 8 files changed, 40 insertions(+), 20 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-channel.c b/libvirt-gconfig/libvirt-gconfig-domain-channel.c index a4f9527..f81cea2 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-channel.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-channel.c @@ -77,7 +77,8 @@ void gvir_config_domain_channel_set_target_type(GVirConfigDomainChannel *channel g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_CHANNEL(channel)); gvir_config_object_add_child_with_attribute_enum(GVIR_CONFIG_OBJECT(channel), - "target", "type", + "target", GVIR_CONFIG_TYPE_OBJECT, + "type", GVIR_CONFIG_TYPE_DOMAIN_CHANNEL_TARGET_TYPE, type); } @@ -89,5 +90,6 @@ void gvir_config_domain_channel_set_target_name(GVirConfigDomainChannel *channel g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_CHANNEL(channel)); gvir_config_object_add_child_with_attribute(GVIR_CONFIG_OBJECT(channel), - "target", "name", name); + "target", GVIR_CONFIG_TYPE_OBJECT, + "name", name); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-console.c b/libvirt-gconfig/libvirt-gconfig-domain-console.c index db97322..954f9d2 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-console.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-console.c @@ -76,7 +76,8 @@ void gvir_config_domain_console_set_target_type(GVirConfigDomainConsole *console g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_CONSOLE(console)); gvir_config_object_add_child_with_attribute_enum(GVIR_CONFIG_OBJECT(console), - "target", "type", + "target", GVIR_CONFIG_TYPE_OBJECT, + "type", GVIR_CONFIG_TYPE_DOMAIN_CONSOLE_TARGET_TYPE, type); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-disk.c b/libvirt-gconfig/libvirt-gconfig-domain-disk.c index a29ea47..d5a5b70 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-disk.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-disk.c @@ -136,7 +136,8 @@ void gvir_config_domain_disk_set_startup_policy(GVirConfigDomainDisk *disk, str = gvir_config_genum_get_nick(GVIR_CONFIG_TYPE_DOMAIN_DISK_STARTUP_POLICY, policy); g_return_if_fail(str != NULL); gvir_config_object_add_child_with_attribute(GVIR_CONFIG_OBJECT(disk), - "source", "startupPolicy", str); + "source", GVIR_CONFIG_TYPE_OBJECT, + "startupPolicy", str); } void gvir_config_domain_disk_set_source(GVirConfigDomainDisk *disk, @@ -172,7 +173,8 @@ void gvir_config_domain_disk_set_driver_name(GVirConfigDomainDisk *disk, { g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_DISK(disk)); gvir_config_object_add_child_with_attribute(GVIR_CONFIG_OBJECT(disk), - "driver", "name", driver_name); + "driver", GVIR_CONFIG_TYPE_OBJECT, + "name", driver_name); } void gvir_config_domain_disk_set_driver_type(GVirConfigDomainDisk *disk, @@ -180,7 +182,8 @@ void gvir_config_domain_disk_set_driver_type(GVirConfigDomainDisk *disk, { g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_DISK(disk)); gvir_config_object_add_child_with_attribute(GVIR_CONFIG_OBJECT(disk), - "driver", "type", driver_type); + "driver", GVIR_CONFIG_TYPE_OBJECT, + "type", driver_type); } void gvir_config_domain_disk_set_driver_cache(GVirConfigDomainDisk *disk, @@ -192,7 +195,8 @@ void gvir_config_domain_disk_set_driver_cache(GVirConfigDomainDisk *disk, cache_str = gvir_config_genum_get_nick(GVIR_CONFIG_TYPE_DOMAIN_DISK_CACHE_TYPE, cache_type); g_return_if_fail(cache_str != NULL); gvir_config_object_add_child_with_attribute(GVIR_CONFIG_OBJECT(disk), - "driver", "cache", cache_str); + "driver", GVIR_CONFIG_TYPE_OBJECT, + "cache", cache_str); } void gvir_config_domain_disk_set_target_bus(GVirConfigDomainDisk *disk, @@ -204,7 +208,8 @@ void gvir_config_domain_disk_set_target_bus(GVirConfigDomainDisk *disk, bus_str = gvir_config_genum_get_nick(GVIR_CONFIG_TYPE_DOMAIN_DISK_BUS, bus); g_return_if_fail(bus_str != NULL); gvir_config_object_add_child_with_attribute(GVIR_CONFIG_OBJECT(disk), - "target", "bus", bus_str); + "target", GVIR_CONFIG_TYPE_OBJECT, + "bus", bus_str); } void gvir_config_domain_disk_set_target_dev(GVirConfigDomainDisk *disk, @@ -212,7 +217,8 @@ void gvir_config_domain_disk_set_target_dev(GVirConfigDomainDisk *disk, { g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_DISK(disk)); gvir_config_object_add_child_with_attribute(GVIR_CONFIG_OBJECT(disk), - "target", "dev", dev); + "target", GVIR_CONFIG_TYPE_OBJECT, + "dev", dev); } GVirConfigDomainDiskType diff --git a/libvirt-gconfig/libvirt-gconfig-domain-filesys.c b/libvirt-gconfig/libvirt-gconfig-domain-filesys.c index 904a7a3..8dcdff2 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-filesys.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-filesys.c @@ -99,7 +99,8 @@ void gvir_config_domain_filesys_set_driver_type(GVirConfigDomainFilesys *filesys GVirConfigObject *node; g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_FILESYS(filesys)); - node = gvir_config_object_add_child(GVIR_CONFIG_OBJECT(filesys), "driver"); + node = gvir_config_object_add_child(GVIR_CONFIG_OBJECT(filesys), + "driver", GVIR_CONFIG_TYPE_OBJECT); g_return_if_fail(GVIR_CONFIG_IS_OBJECT(node)); if (type != GVIR_CONFIG_DOMAIN_FILESYS_DRIVER_DEFAULT) gvir_config_object_set_attribute_with_type( @@ -146,7 +147,8 @@ void gvir_config_domain_filesys_set_target(GVirConfigDomainFilesys *filesys, { g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_FILESYS(filesys)); gvir_config_object_add_child_with_attribute(GVIR_CONFIG_OBJECT(filesys), - "target", "dir", path); + "target", GVIR_CONFIG_TYPE_OBJECT, + "dir", path); } void gvir_config_domain_filesys_set_readonly(GVirConfigDomainFilesys *filesys, diff --git a/libvirt-gconfig/libvirt-gconfig-domain.c b/libvirt-gconfig/libvirt-gconfig-domain.c index c8cd1c5..04915ab 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.c +++ b/libvirt-gconfig/libvirt-gconfig-domain.c @@ -401,7 +401,8 @@ void gvir_config_domain_add_device(GVirConfigDomain *domain, g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_DEVICE(device)); devices_node = gvir_config_object_add_child(GVIR_CONFIG_OBJECT(domain), - "devices"); + "devices", + GVIR_CONFIG_TYPE_OBJECT); gvir_config_object_attach_add(devices_node, GVIR_CONFIG_OBJECT(device)); g_object_unref(G_OBJECT(devices_node)); @@ -465,7 +466,8 @@ gboolean gvir_config_domain_set_custom_xml(GVirConfigDomain *domain, g_return_val_if_fail(error == NULL || *error == NULL, FALSE); metadata = gvir_config_object_add_child(GVIR_CONFIG_OBJECT(domain), - "metadata"); + "metadata", + GVIR_CONFIG_TYPE_OBJECT); custom_xml = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_OBJECT, NULL, NULL, xml, error); diff --git a/libvirt-gconfig/libvirt-gconfig-object-private.h b/libvirt-gconfig/libvirt-gconfig-object-private.h index a6b7395..ba9c676 100644 --- a/libvirt-gconfig/libvirt-gconfig-object-private.h +++ b/libvirt-gconfig/libvirt-gconfig-object-private.h @@ -54,13 +54,16 @@ void gvir_config_object_set_node_content_uint64(GVirConfigObject *object, const char *node_name, guint64 value); GVirConfigObject *gvir_config_object_add_child(GVirConfigObject *object, - const char *child_name); + const char *child_name, + GType child_type); void gvir_config_object_add_child_with_attribute(GVirConfigObject *object, const char *child_name, + GType child_type, const char *attr_name, const char *attr_value); void gvir_config_object_add_child_with_attribute_enum(GVirConfigObject *object, const char *child_name, + GType child_type, const char *attr_name, GType attr_type, unsigned int attr_value); diff --git a/libvirt-gconfig/libvirt-gconfig-object.c b/libvirt-gconfig/libvirt-gconfig-object.c index ee3584a..df4836d 100644 --- a/libvirt-gconfig/libvirt-gconfig-object.c +++ b/libvirt-gconfig/libvirt-gconfig-object.c @@ -367,7 +367,8 @@ gvir_config_object_foreach_child(GVirConfigObject *object, G_GNUC_INTERNAL GVirConfigObject * gvir_config_object_add_child(GVirConfigObject *object, - const char *child_name) + const char *child_name, + GType child_type) { xmlNodePtr new_node; xmlNodePtr old_node; @@ -380,13 +381,13 @@ gvir_config_object_add_child(GVirConfigObject *object, FALSE); if (old_node != NULL) { xmlFreeNode(new_node); - return GVIR_CONFIG_OBJECT(g_object_new(GVIR_CONFIG_TYPE_OBJECT, + return GVIR_CONFIG_OBJECT(g_object_new(child_type, "doc", object->priv->doc, "node", old_node, NULL)); } - return GVIR_CONFIG_OBJECT(g_object_new(GVIR_CONFIG_TYPE_OBJECT, + return GVIR_CONFIG_OBJECT(g_object_new(child_type, "doc", object->priv->doc, "node", new_node, NULL)); @@ -395,12 +396,13 @@ gvir_config_object_add_child(GVirConfigObject *object, G_GNUC_INTERNAL void gvir_config_object_add_child_with_attribute(GVirConfigObject *object, const char *child_name, + GType child_type, const char *attr_name, const char *attr_value) { GVirConfigObject *child; - child = gvir_config_object_add_child(object, child_name); + child = gvir_config_object_add_child(object, child_name, child_type); gvir_config_object_set_attribute(child, attr_name, attr_value, NULL); g_object_unref(G_OBJECT(child)); } @@ -408,13 +410,14 @@ gvir_config_object_add_child_with_attribute(GVirConfigObject *object, void gvir_config_object_add_child_with_attribute_enum(GVirConfigObject *object, const char *child_name, + GType child_type, const char *attr_name, GType attr_type, unsigned int attr_value) { GVirConfigObject *child; - child = gvir_config_object_add_child(object, child_name); + child = gvir_config_object_add_child(object, child_name, child_type); gvir_config_object_set_attribute_with_type(child, attr_name, attr_type, attr_value, NULL); g_object_unref(G_OBJECT(child)); } diff --git a/libvirt-gconfig/libvirt-gconfig-storage-pool-source.c b/libvirt-gconfig/libvirt-gconfig-storage-pool-source.c index d92c692..e78989c 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-pool-source.c +++ b/libvirt-gconfig/libvirt-gconfig-storage-pool-source.c @@ -91,7 +91,8 @@ void gvir_config_storage_pool_source_set_device_path(GVirConfigStoragePoolSource g_return_if_fail(GVIR_CONFIG_IS_STORAGE_POOL_SOURCE(source)); - node = gvir_config_object_add_child(GVIR_CONFIG_OBJECT(source), "device"); + node = gvir_config_object_add_child(GVIR_CONFIG_OBJECT(source), + "device", GVIR_CONFIG_TYPE_OBJECT); g_return_if_fail(GVIR_CONFIG_IS_OBJECT(node)); gvir_config_object_set_attribute(node, "path", device_path, NULL); g_object_unref(G_OBJECT(node)); -- 1.7.7.6

3 33

Re: [libvirt] [Libguestfs] get virtual machine`s ip address
by Richard W.M. Jones 11 May '12

11 May '12

On Thu, May 10, 2012 at 08:24:31AM -0700, THO HUYNH wrote: > I`m writing 2 simple socket programs: Client program runs on guest, > server program runs on host machine. > > The server need the dom xml name of the guest which is running the > client program and the only information the server program has is > the guest`s ip address. [...] Is there another way to get the dom > xml name of a guest from an ip address (if the ip address belongs to > that guest). CC'd to libvir-list, since this is really a libvirt question. The trouble with the architecture you've described is that it relies on the IP source address for authentication, one of those things you should never do if you care about security: https://en.wikipedia.org/wiki/IP_address_spoofing Maybe because it's TCP, and it's a closed system with a firewall, you can get away with it. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into Xen guests. http://et.redhat.com/~rjones/virt-p2v

4 3

[libvirt] [PATCH 0/3] Fix output of virsh vcpuinfo after cpu hotplug
by Peter Krempa 11 May '12

11 May '12

The informations about virtual processors stored by libvirt were not updated after a cpu hotplug. Peter Krempa (3): qemu: Refactor qemuDomainSetVcpusFlags qemu: Re-detect virtual cpu threads after cpu hot (un)plug. qemu: Don't skip detection of virtual cpu's on non KVM targets src/qemu/qemu_driver.c | 48 +++++++++++++++++++++++++++++++--------------- src/qemu/qemu_process.c | 12 ----------- 2 files changed, 32 insertions(+), 28 deletions(-) -- 1.7.3.4

2 8

Re: [libvirt] [Qemu-devel] [PATCH v12 0/4] support to migrate with IPv6 address
by Eric Blake 11 May '12

11 May '12

[adding libvirt] On 05/11/2012 12:46 AM, Amos Kong wrote: > On 05/11/2012 02:12 AM, Michael Roth wrote: >> On Thu, May 10, 2012 at 11:29:48AM -0600, Eric Blake wrote: >>> On 05/10/2012 10:27 AM, Amos Kong wrote: >>>> Those patches updated help functions in qemu-socket.c, >>>> and used them in migrate-tcp.c to supporting IPv6 migration. >> addr parsing now relies on qemu-sockets.c:inet_parse(), which has supported >> [ip6addr]:port for a while, as opposed to net.c:parse_host_port(), which >> didn't. > > yeah. > > I didn't change qemu monitor cmd interface in this patchset, > and the transport of data is done by qemu, not libvirt. > > I guess libvirt only needs to update addr string parse, > for example: > > ---- GOOD > start a VM: > # qemu-kvm --enable-kvm -boot n -incoming tcp:ipv6alias:16514 -vnc :1 > -monitor stdio -name qemu-vm1 > > try to migrate vm by virsh with addr alias > # virsh migrate libivrt-vm2 tcp:ipv6alias > (connection can establish) > > --- FAIL > start a VM: > # qemu-kvm-apply-my-patches --enable-kvm -boot n -incoming > tcp:[2002::3:4]:16514 -vnc :1 -monitor stdio -name qemu-vm1 > > try to migrate vm by virsh with ipv6 addr: > # virsh migrate libvirt-vm2 tcp:[2002::3:4] > error: invalid argument: could not parse connection URI tcp:[2002::3:4] Thanks for researching that. Looks like it should be fixed in libvirt to match, then. -- Eric Blake eblake(a)redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

1 0

[libvirt] Problem of host CPU topology parsing
by Osier Yang 11 May '12

11 May '12

Hi, We have problem of host CPU topology parsing on special platforms (general platforms are fine). E.g. On a AMD machine with 48 CPUs [1] (4 sockets, 6 cores indeed [2]), VIR_NODEINFO_MAXCPUS [3] will always return 24 as the total CPU number. As a result, a domain without "cpuset" or "placement='auto'" (which drives numad) will only be pinned to part of the host CPUs (in the case of the 48 CPUS AMD machine, domain process will be pinned to only the first 24 CPUs), which cause the performance lost. And actually it's also functional bug, as the "cpuset" specified by user could be truncated. If a domain uses "placement='auto'", and the advisory nodeset returned from numad has node(s) exceeds the wrong max CPU number, the domain will fail to start, as the bitmask passed to sched_setaffinity is fully filled with zero. "nodeinfo.cpus" has the right number though, but I'm not sure if it should be used as the max CPU number. VIR_NODEINFO_MAXCPUS is used in many places, and I'd never want to fix something here, but break other things there. Anyone has thought on how to sort the fucky topology out? [1] http://fpaste.org/MTtz/ [2] http://fpaste.org/mtoA/, http://fpaste.org/EPLd/ [3] #define VIR_NODEINFO_MAXCPUS(nodeinfo) ((nodeinfo).nodes*(nodeinfo).sockets*(nodeinfo).cores*(nodeinfo).threads) Regards, Osier

4 13

[libvirt] Fwd: Supporting native USB in oVirt
by Oved Ourfalli 11 May '12

11 May '12

Hey, We are now working on adding the support for native USB devices on oVirt, and we have some difficulties. Please see the details/discussion below. Thank you for your help, Oved ----- Forwarded Message ----- From: "Itamar Heim" <iheim(a)redhat.com> To: "Michal Privoznik" <mprivozn(a)redhat.com> Cc: "Oved Ourfalli" <ovedo(a)redhat.com>, "Dave Allan" <dallan(a)redhat.com>, "Jiri Denemark" <jdenemar(a)redhat.com>, "Igor Lvovsky" <ilvovsky(a)redhat.com>, "Eli Mesika" <emesika(a)redhat.com>, "Hans de Goede" <hdegoede(a)redhat.com>, "Dan Kenigsberg" <danken(a)redhat.com>, "Andrew Cathrow" <acathrow(a)redhat.com> Sent: Wednesday, May 9, 2012 1:18:40 PM Subject: Re: Supporting native USB in oVirt On 05/09/2012 01:12 PM, Michal Privoznik wrote: > On 08.05.2012 09:19, Oved Ourfalli wrote: >> Hi, >> >> We are now working on adding the support for native USB devices on oVirt. >> As far as we understand, in order to use it we need to pass the following devices with the following restrictions (according to the EHCI spec): >> 1. EHCI USB controller - with the highest function number, #7. >> >> devices='{type:controller,device:usb,model:ich9-ehci1,address:{type:pci,domain:0x0000,bus:0x00,slot:0x04,function:0x7}}' >> >> 2. 3 UHCI USB controllers, on the same bus and PCI slot as the EHCI controller. Set the multifunction bit to on, on the controller with function #0. >> >> devices='{type:controller,device:usb,model:ich9-uhci1,master:{startport:0},address:{type:pci,domain:0x0000,bus:0x00,slot:0x04,function:0x0,multifunction:on}}' >> devices='{type:controller,device:usb,model:ich9-uhci2,master:{startport:2},address:{type:pci,domain:0x0000,bus:0x00,slot:0x04,function:0x1}}' >> devices='{type:controller,device:usb,model:ich9-uhci3,master:{startport:4},address:{type:pci,domain:0x0000,bus:0x00,slot:0x04,function:0x2}}' >> >> 3. USB redirect devices (according to the needed number of USB slots, maximum 6) on the same bus, each one having a different port. >> >> devices='{type:redir,device:spicevmc,bus:usb,address:{type:usb,bus:0,port:1}}' >> devices='{type:redir,device:spicevmc,bus:usb,address:{type:usb,bus:0,port:2}}' >> devices='{type:redir,device:spicevmc,bus:usb,address:{type:usb,bus:0,port:3}}' >> devices='{type:redir,device:spicevmc,bus:usb,address:{type:usb,bus:0,port:4}}' >> devices='{type:redir,device:spicevmc,bus:usb,address:{type:usb,bus:0,port:5}}' >> devices='{type:redir,device:spicevmc,bus:usb,address:{type:usb,bus:0,port:6}}' >> >> 4. If we want more than 6 USB slots, we need to have 2 EHCI controllers, and 6 UHCI controllers, that are consistent with the restrictions above, on different bus. >> (we need them to be on different bus, since the connection between the redirect devices and the controllers is the bus). >> >> According to Hans (cc-ed), if we let libvirt pick its own addresses, it will put each controller of the composite USB controller device on its own pci slot, which is a violation of the EHCI spec. > >> >> The problem is that the oVirt engine is not aware of addresses. They aren't managed by it. >> They are chosen automatically by libvirt, returned to the engine, and they saved in the engine database in order to provide the ability to retain the same PCI addresses after VM restart. >> >> So, in order to support the EHCI spec, oVirt will have to be aware of addresses, manage them (allocate them, check for collisions, update on every libvirt change regarding that, etc...). Obviously, it doesn't feel right, and in fact it is also not feasible, to manage these addresses in the oVirt domain. >> >> Is all the above correct, or are we missing something? >> If so, can you address the issues above, and provide the ability to manage these devices in libvirt? > > Let's have this conversation upstream (libvirt-list(a)redhat.com) Many > developers are there so if there's anything libvirt can do, we should > agree on concept there.

5 9

[libvirt] [PATCH] usb: fix crash when failing to attach a second usb device
by Guannan Ren 11 May '12

11 May '12

when failing to attach another usb device to a domain for some reason which has one use device attached before, the libvirtd crashed. The crash is caused by null-pointer dereference error in invoking usbDeviceListSteal passed in NULL value usb variable. commit 05abd1507d66aabb6cad12eeafeb4c4d1911c585 introduces the bug. --- src/qemu/qemu_hotplug.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index ad31eba..9b60816 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1213,7 +1213,8 @@ error: cleanup: usbDeviceListFree(list); - usbDeviceListSteal(driver->activeUsbHostdevs, usb); + if (usb) + usbDeviceListSteal(driver->activeUsbHostdevs, usb); return -1; } -- 1.7.7.5

2 2

[libvirt] [Patch] Libvirt - Fix locking for readonly devices
by David Weber 11 May '12

11 May '12

Hi, I'm currently working on getting sanlock into Debian/Ubuntu. While testing, I noticed that I wasn't able to add a readonly or shared device: "internal error unsupported configuration: Readonly leases are not supported". After looking into the source, it seems to be the following situation: - Libvirt passes every device to the sanlock plugin, even if it is readonly - The sanlock plugin rejects to add a lease for the readonly device, returning an error so the machine starts to fail The attached patch rejects passing readonly and shared devices to the lock-plugin so they shouldn't be a problem anymore. Would this be an appropriated way to fix this problem? (I'm neither experienced in libvirt nor C) What seems odd to me is that Fedora either doesn't hit this or nobody has ever reported it. I'm not member of this list so please CC me. Thanks! Cheers, David

3 2

[libvirt] In libxl_driver, how to lock/unlock objects while doing an operation that runs for a long time?
by Oscar Ben 10 May '12

10 May '12

In the discussion : http://thread.gmane.org/gmane.comp.emulators.libvirt/53534 People mentioned about long-term operations' LOCKs there. It seems that, in libxl_driver, certain opeations may hold a lock for too long, thus other operations, even those just do query jobs, would be blocked. In qemu_driver, there seems to be a more complexy way to solve this problem, by employing a condition variable. My question is : Is "Fixing such problem in libxl_driver" in our todo-list? If yes, what's the detailed solution? Will that be similar to qemu's CONDITION VARIABLE method?

3 2

[libvirt] Libvirt java binding crash Tomcat
by Hubert Zhang 10 May '12

10 May '12

Running on linux and libvirt 0.9.11. Using libvirt java 0.4.7. Notice that the Tomcat server crashes and shows the dump like this: *** glibc detected *** jsvc.exec: double free or corruption (out): 0x086f14a8 *** ======= Backtrace: ========= /lib/libc.so.6[0xc03745] /lib/libc.so.6(cfree+0x59)[0xc03b89] /tmp/jna/jna486823639517928939.tmp(Java_com_sun_jna_Native_free+0x1d)[0x430c4c] [0xb46de240] [0xb46d218d] [0xb46d218d] [0xb46d218d] [0xb46cf3e6] /usr/lib/jvm/sun-java-6u24/jre/lib/i386/server/libjvm.so[0x13bdb21] /usr/lib/jvm/sun-java-6u24/jre/lib/i386/server/libjvm.so[0x15b3478] /usr/lib/jvm/sun-java-6u24/jre/lib/i386/server/libjvm.so[0x13bd94f] /usr/lib/jvm/sun-java-6u24/jre/lib/i386/server/libjvm.so[0x13f0ef7] /usr/lib/jvm/sun-java-6u24/jre/lib/i386/server/libjvm.so[0x13d4aee] /usr/lib/jvm/sun-java-6u24/jre/lib/i386/libjava.so(Java_java_lang_ref_Finalizer_invokeFinalizeMethod+0x6e)[0x11cb3e] [0xb46de240] [0xb46d218d] [0xb46d218d] [0xb46d218d] [0xb46cf3e6] /usr/lib/jvm/sun-java-6u24/jre/lib/i386/server/libjvm.so[0x13bdb21] /usr/lib/jvm/sun-java-6u24/jre/lib/i386/server/libjvm.so[0x15b3478] /usr/lib/jvm/sun-java-6u24/jre/lib/i386/server/libjvm.so[0x13bd395] /usr/lib/jvm/sun-java-6u24/jre/lib/i386/server/libjvm.so[0x13bd458] /usr/lib/jvm/sun-java-6u24/jre/lib/i386/server/libjvm.so[0x143fbe7] /usr/lib/jvm/sun-java-6u24/jre/lib/i386/server/libjvm.so[0x16b404f] /usr/lib/jvm/sun-java-6u24/jre/lib/i386/server/libjvm.so[0x15b4a6e] /lib/libpthread.so.0[0x8fa842] /lib/libc.so.6(clone+0x5e)[0xc6c4ce] ======= Memory map: ======== 00110000-00133000 r-xp 00000000 08:01 106948 /usr/lib/jvm/sun-java-6u24/jre/lib/i386/libjava.so 00133000-00135000 rw-p 00023000 08:01 106948 /usr/lib/jvm/sun-java-6u24/jre/lib/i386/libjava.so 00135000-00148000 r-xp 00000000 08:01 74629 /lib/libnsl-2.5.so 00148000-00149000 r--p 00012000 08:01 74629 /lib/libnsl-2.5.so 00149000-0014a000 rw-p 00013000 08:01 74629 /lib/libnsl-2.5.so 0014a000-0014c000 rw-p 00000000 00:00 0 0014c000-0014f000 ---p 00000000 00:00 0 0014f000-0019d000 rwxp 00000000 00:00 0 0019d000-001d7000 r-xp 00000000 08:01 106944 /usr/lib/jvm/sun-java-6u24/jre/lib/i386/libjdwp.so 001d7000-001d8000 rw-p 00039000 08:01 106944 /usr/lib/jvm/sun-java-6u24/jre/lib/i386/libjdwp.so 001d8000-001d9000 ---p 00000000 00:00 0 001d9000-00259000 rwxp 00000000 00:00 0 00259000-0026d000 r-xp 00000000 08:01 106885 /usr/lib/jvm/sun-java-6u24/jre/lib/i386/libnet.so 0026d000-0026e000 rw-p 00013000 08:01 106885 /usr/lib/jvm/sun-java-6u24/jre/lib/i386/libnet.so 0026e000-00273000 r-xp 00000000 08:01 106769 /usr/lib/jvm/sun-java-6u24/jre/lib/i386/headless/libmawt.so 00273000-00274000 rw-p 00004000 08:01 106769 /usr/lib/jvm/sun-java-6u24/jre/lib/i386/headless/libmawt.so 00276000-00290000 r-xp 00000000 08:01 74651 /lib/ld-2.5.so 00290000-00291000 r--p 00019000 08:01 74651 /lib/ld-2.5.so 00291000-00292000 rw-p 0001a000 08:01 74651 /lib/ld-2.5.so 00292000-00295000 ---p 00000000 00:00 0 00295000-002e3000 rwxp 00000000 00:00 0 002e3000-002e8000 r-xp 00000000 08:01 212038 /usr/lib/libwsman_curl_client_transport.so.1.0.0 002e8000-002e9000 rw-p 00004000 08:01 212038 /usr/lib/libwsman_curl_client_transport.so.1.0.0 ...................................... Sometimes I see "invalid pointer" as well. It seems a bug to the libvirt java API. Has anyone seen this error before? Thanks.

2 3

[libvirt] oVirt workshop at LinuxCon Japan
by Dave Allan 10 May '12

10 May '12

I got this notice today about an oVirt workshop coming up June 8 at LinuxCon Japan, and I thought it might be of interest. Details below... Hello everyone, As part of our efforts to raise awareness of and educate more developers about the oVirt project, we will be holding an oVirt workshop at LinuxCon Japan, taking place on June 8, 2012. You can find full details of the workshop agenda on the LinuxCon Japan site. [0] Registration for the workshop is now open and is free of charge for the first 50 participants. We will also look at adding additional participant slots to the workshop based on demand. Attendees who register for LinuxCon Japan via the workshop registration link [1] will also be eligible for a discount on their LinuxCon Japan registration. Please spread the word to folks you think would find the workshop useful. If they have already registered for LinuxCon Japan, they can simply edit their existing registration to include the workshop. [0] https://events.linuxfoundation.org/events/linuxcon-japan/ovirt-gluster-work… [1] http://www.regonline.com/Register/Checkin.aspx?EventID=1099949 Cheers, LH -- Leslie Hawthorn Community Action and Impact Open Source and Standards @ Red Hat identi.ca/lh twitter.com/lhawthorn

1 0