- Devel - libvirt List Archives

[libvirt] [PATCH] Make virsh reconnect when loosing connection
by Daniel Veillard 10 Mar '10

10 Mar '10

This is a usability issue for virsh in case of disconnections, for example if the remote libvirtd is restarted: https://bugzilla.redhat.com/show_bug.cgi?id=526656 the patch catch those and tries to automatically reconnect instead of virsh exitting. The typical interaction with this patch is that the command fails, but virsh automatically reconnects instead of exitting, but it won't try to restart the failed command (since this could have significant side effects). Example of such interraction: ------------------------------------------------------- virsh # list --all Id Name State ---------------------------------- - RHEL-5.4-64 shut off - WinXP shut off virsh # list --all error: Failed to list active domains error: cannot send data: Broken pipe error: Reconnected to the hypervisor virsh # list --all Id Name State ---------------------------------- - RHEL-5.4-64 shut off - WinXP shut off virsh # ------------------------------------------------------- The only thing I'm unsure is if the signal handler should be reset once it was received once. I don't in this patch and that seems to work fine, but I somehow remember the fact that in some circumstances a signal handler needs to be rearmed when received once. As is this seems to work fine with SIGPIPE and linux. Make virsh reconnect when loosing connection Right now when the connected libvirtd restarts virsh gets a SIGPIPE and dies, this change the behaviour to try to reconnect if the signal was received or command error indicated a connection or RPC failure. Note that the failing command is not restarted. * tools/virsh.c: catch SIGPIPE signals as well as connection related failures, add some automatic reconnection code and appropriate error messages. diff --git a/tools/virsh.c b/tools/virsh.c index 65487ed..2ec9cfc 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -30,6 +30,7 @@ #include <errno.h> #include <sys/stat.h> #include <inttypes.h> +#include <signal.h> #include <libxml/parser.h> #include <libxml/tree.h> @@ -397,6 +398,58 @@ out: last_error = NULL; } +/* + * Detection of disconnections and automatic reconnection support + */ +static int disconnected = 0; /* we may have been disconnected */ + +/* + * vshCatchDisconnect: + * + * We get here when a SIGPIPE is being raised, we can't do much in the + * handler, just save the fact it was raised + */ +static void vshCatchDisconnect(int sig, siginfo_t * siginfo, + void* context ATTRIBUTE_UNUSED) { + if ((sig == SIGPIPE) || (siginfo->si_signo == SIGPIPE)) + disconnected++; +} + +/* + * vshSetupSignals: + * + * Catch SIGPIPE signals which may arise when desconnection from libvirtd occurs */ +static int +vshSetupSignals(void) { + struct sigaction sig_action; + + sig_action.sa_sigaction = vshCatchDisconnect; + sig_action.sa_flags = SA_SIGINFO; + sigemptyset(&sig_action.sa_mask); + + sigaction(SIGPIPE, &sig_action, NULL); +} + +/* + * vshReconnect: + * + * Reconnect after an + * + */ +static int +vshReconnect(vshControl *ctl) { + if (ctl->conn != NULL) + virConnectClose(ctl->conn); + + ctl->conn = virConnectOpenAuth(ctl->name, + virConnectAuthPtrDefault, + ctl->readonly ? VIR_CONNECT_RO : 0); + if (!ctl->conn) + vshError(ctl, "%s", _("Failed to reconnect to the hypervisor")); + else + vshError(ctl, "%s", _("Reconnected to the hypervisor")); + disconnected = 0; +} /* --------------- * Commands @@ -8332,6 +8385,9 @@ vshCommandRun(vshControl *ctl, const vshCmd *cmd) while (cmd) { struct timeval before, after; + if ((ctl->conn == NULL) || (disconnected != 0)) + vshReconnect(ctl); + if (ctl->timing) GETTIMEOFDAY(&before); @@ -8343,6 +8399,17 @@ vshCommandRun(vshControl *ctl, const vshCmd *cmd) if (ret == FALSE) virshReportError(ctl); + /* try to catch automatically disconnections */ + if ((ret == FALSE) && + ((disconnected != 0) || + ((last_error != NULL) && + (((last_error->code == VIR_ERR_SYSTEM_ERROR) && + (last_error->domain == 13)) || + (last_error->code == VIR_ERR_RPC) || + (last_error->code == VIR_ERR_NO_CONNECT) || + (last_error->code == VIR_ERR_INVALID_CONN))))) + vshReconnect(ctl); + if (STREQ(cmd->def->name, "quit")) /* hack ... */ return ret; @@ -8673,9 +8740,11 @@ vshError(vshControl *ctl, const char *format, ...) { va_list ap; - va_start(ap, format); - vshOutputLogFile(ctl, VSH_ERR_ERROR, format, ap); - va_end(ap); + if (ctl != NULL) { + va_start(ap, format); + vshOutputLogFile(ctl, VSH_ERR_ERROR, format, ap); + va_end(ap); + } fputs(_("error: "), stderr); @@ -8751,6 +8820,9 @@ vshInit(vshControl *ctl) /* set up the library error handler */ virSetErrorFunc(NULL, virshErrorHandler); + /* set up the signals handlers to catch disconnections */ + vshSetupSignals(); + ctl->conn = virConnectOpenAuth(ctl->name, virConnectAuthPtrDefault, ctl->readonly ? VIR_CONNECT_RO : 0); -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 4

[libvirt] [PATCH] Fix up nodeinfo parsing code.
by Chris Lalancette 10 Mar '10

10 Mar '10

As pointed out by eblake, I made a real hash of the nodeinfo code with commit aa2f6f96ddd7a57011c3d25586d588100651feb2. This patch cleans it up: 1) Do more work at compile time instead of runtime (minor) 2) Properly handle the hex digits that come from /sys/devices/system/cpu/cpu*/topology/thread_siblings 3) Fix up some error paths that could cause SEGV 4) Used unsigned's for the cpu numbers (cpu -1 doesn't make any sense) Along with the recent patch from jdenemar to zero out the nodeinfo structure, I've re-tested this on the machines having the problems, and it seems to be good. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/nodeinfo.c | 45 +++++++++++++++++++++++++++++++-------------- 1 files changed, 31 insertions(+), 14 deletions(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 1ee3709..3fabeec 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -63,15 +63,15 @@ int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, virNodeInfoPtr nodeinfo); -static unsigned long count_thread_siblings(int cpu) +static unsigned long count_thread_siblings(unsigned int cpu) { unsigned long ret = 0; - char *path = NULL; - FILE *pathfp = NULL; + char *path; + FILE *pathfp; char str[1024]; int i; - if (virAsprintf(&path, "%s/cpu%d/topology/thread_siblings", CPU_SYS_PATH, + if (virAsprintf(&path, CPU_SYS_PATH "/cpu%u/topology/thread_siblings", cpu) < 0) { virReportOOMError(); return 0; @@ -91,8 +91,12 @@ static unsigned long count_thread_siblings(int cpu) i = 0; while (str[i] != '\0') { - if (str[i] != '\n' && str[i] != ',') + if (c_isdigit(str[i])) ret += count_one_bits(str[i] - '0'); + else if (str[i] >= 'A' && str[i] <= 'F') + ret += count_one_bits(str[i] - 'A' + 10); + else if (str[i] >= 'a' && str[i] <= 'f') + ret += count_one_bits(str[i] - 'a' + 10); i++; } @@ -103,16 +107,16 @@ cleanup: return ret; } -static int parse_socket(int cpu) +static int parse_socket(unsigned int cpu) { - char *path = NULL; + char *path; FILE *pathfp; char socket_str[1024]; char *tmp; - int socket; + int socket = -1; - if (virAsprintf(&path, "%s/cpu%d/topology/physical_package_id", - CPU_SYS_PATH, cpu) < 0) { + if (virAsprintf(&path, CPU_SYS_PATH "/cpu%u/topology/physical_package_id", + cpu) < 0) { virReportOOMError(); return -1; } @@ -120,7 +124,8 @@ static int parse_socket(int cpu) pathfp = fopen(path, "r"); if (pathfp == NULL) { virReportSystemError(errno, _("cannot open %s"), path); - goto cleanup; + VIR_FREE(path); + return -1; } if (fgets(socket_str, sizeof(socket_str), pathfp) == NULL) { @@ -147,7 +152,7 @@ int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, char line[1024]; DIR *cpudir = NULL; struct dirent *cpudirent = NULL; - int cpu; + unsigned int cpu; unsigned long cur_threads; int socket; unsigned long long socket_mask = 0; @@ -157,7 +162,7 @@ int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, nodeinfo->nodes = nodeinfo->cores = 1; /* NB: It is impossible to fill our nodes, since cpuinfo - * has not knowledge of NUMA nodes */ + * has no knowledge of NUMA nodes */ /* NOTE: hyperthreads are ignored here; they are parsed out of /sys */ while (fgets(line, sizeof(line), cpuinfo) != NULL) { @@ -220,7 +225,7 @@ int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, return -1; } while ((cpudirent = readdir(cpudir))) { - if (sscanf(cpudirent->d_name, "cpu%d", &cpu) != 1) + if (sscanf(cpudirent->d_name, "cpu%u", &cpu) != 1) continue; socket = parse_socket(cpu); @@ -244,6 +249,18 @@ int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, closedir(cpudir); + /* there should always be at least one socket and one thread */ + if (nodeinfo->sockets == 0) { + nodeReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("no sockets found")); + return -1; + } + if (nodeinfo->threads == 0) { + nodeReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("no threads found")); + return -1; + } + return 0; } -- 1.6.6.1

2 2

[libvirt] [PATCHv2] util: ensure safe{read, write, zero} return is checked
by Eric Blake 09 Mar '10

09 Mar '10

Based on a warning from coverity. The safe* functions guarantee complete transactions on success, but don't guarantee freedom from failure. * src/util/util.h (saferead, safewrite, safezero): Add ATTRIBUTE_RETURN_CHECK. * src/remote/remote_driver.c (remoteIO, remoteIOEventLoop): Ignore some failures. (remoteIOReadBuffer): Adjust error messages on read failure. * daemon/event.c (virEventHandleWakeup): Ignore read failure. --- Changes from previous attempt: rework remote_driver to no longer trigger 'make syntax-check' failures. This can wait until after 0.7.7. daemon/event.c | 5 +++-- src/remote/remote_driver.c | 18 ++++++++++++++---- src/util/util.h | 9 ++++++--- 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/daemon/event.c b/daemon/event.c index 2218a3e..36e9dd3 100644 --- a/daemon/event.c +++ b/daemon/event.c @@ -1,13 +1,13 @@ /* * event.c: event loop for monitoring file handles * + * Copyright (C) 2007, 2010 Red Hat, Inc. * Copyright (C) 2007 Daniel P. Berrange - * Copyright (C) 2007 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -30,16 +30,17 @@ #include <errno.h> #include <unistd.h> #include "threads.h" #include "logging.h" #include "event.h" #include "memory.h" #include "util.h" +#include "ignore-value.h" #define EVENT_DEBUG(fmt, ...) DEBUG(fmt, __VA_ARGS__) static int virEventInterruptLocked(void); /* State for a single file handle being monitored */ struct virEventHandle { int watch; @@ -625,17 +626,17 @@ error_unlocked: static void virEventHandleWakeup(int watch ATTRIBUTE_UNUSED, int fd, int events ATTRIBUTE_UNUSED, void *opaque ATTRIBUTE_UNUSED) { char c; virEventLock(); - saferead(fd, &c, sizeof(c)); + ignore_value (saferead(fd, &c, sizeof(c))); virEventUnlock(); } int virEventInit(void) { if (pthread_mutex_init(&eventLoop.lock, NULL) != 0) return -1; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index b7b2e09..d9cae8b 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -7868,26 +7868,35 @@ remoteIOReadBuffer(virConnectPtr conn, if (ret == -1) { if (errno == EINTR) goto resend; if (errno == EWOULDBLOCK) return 0; char errout[1024] = "\0"; if (priv->errfd != -1) { - saferead(priv->errfd, errout, sizeof(errout)); + if (saferead(priv->errfd, errout, sizeof(errout)) < 0) { + virReportSystemError(errno, "%s", + _("cannot recv data: unknown reason")); + return -1; + } } virReportSystemError(errno, _("cannot recv data: %s"), errout); } else { char errout[1024] = "\0"; if (priv->errfd != -1) { - saferead(priv->errfd, errout, sizeof(errout)); + if (saferead(priv->errfd, errout, sizeof(errout)) < 0) { + errorf (in_open ? NULL : conn, + VIR_ERR_SYSTEM_ERROR, + _("server closed connection: unknown reason")); + return -1; + } } errorf (in_open ? NULL : conn, VIR_ERR_SYSTEM_ERROR, _("server closed connection: %s"), errout); } return -1; } @@ -8490,17 +8499,18 @@ remoteIOEventLoop(virConnectPtr conn, goto repoll; ignore_value (pthread_sigmask(SIG_SETMASK, &oldmask, NULL)); remoteDriverLock(priv); if (fds[1].revents) { DEBUG0("Woken up from poll by other thread"); - saferead(priv->wakeupReadFD, &ignore, sizeof(ignore)); + ignore_value (saferead(priv->wakeupReadFD, &ignore, + sizeof(ignore))); } if (ret < 0) { if (errno == EWOULDBLOCK) continue; virReportSystemError(errno, "%s", _("poll on socket failed")); goto error; @@ -8634,17 +8644,17 @@ remoteIO(virConnectPtr conn, while (tmp && tmp->next) tmp = tmp->next; if (tmp) tmp->next = thiscall; else priv->waitDispatch = thiscall; /* Force other thread to wakup from poll */ - safewrite(priv->wakeupSendFD, &ignore, sizeof(ignore)); + ignore_value (safewrite(priv->wakeupSendFD, &ignore, sizeof(ignore))); DEBUG("Going to sleep %d %p %p", thiscall->proc_nr, priv->waitDispatch, thiscall); /* Go to sleep while other thread is working... */ if (virCondWait(&thiscall->cond, &priv->lock) < 0) { if (priv->waitDispatch == thiscall) { priv->waitDispatch = thiscall->next; } else { tmp = priv->waitDispatch; diff --git a/src/util/util.h b/src/util/util.h index cc05abe..34b77fa 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -1,12 +1,13 @@ /* * utils.h: common, generic utility functions * + * Copyright (C) 2010 Red Hat, Inc. * Copyright (C) 2006, 2007 Binary Karma * Copyright (C) 2006 Shuveb Hussain * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * @@ -26,19 +27,21 @@ #define __VIR_UTIL_H__ #include "verify.h" #include "internal.h" #include <unistd.h> #include <sys/select.h> #include <sys/types.h> -int saferead(int fd, void *buf, size_t count); -ssize_t safewrite(int fd, const void *buf, size_t count); -int safezero(int fd, int flags, off_t offset, off_t len); +int saferead(int fd, void *buf, size_t count) ATTRIBUTE_RETURN_CHECK; +ssize_t safewrite(int fd, const void *buf, size_t count) + ATTRIBUTE_RETURN_CHECK; +int safezero(int fd, int flags, off_t offset, off_t len) + ATTRIBUTE_RETURN_CHECK; enum { VIR_EXEC_NONE = 0, VIR_EXEC_NONBLOCK = (1 << 0), VIR_EXEC_DAEMON = (1 << 1), VIR_EXEC_CLEAR_CAPS = (1 << 2), }; -- 1.6.6.1

2 8

[libvirt] [PATCHv2] uml: sanity check external data before using it
by Eric Blake 09 Mar '10

09 Mar '10

Otherwise, a malicious packet could cause a DoS via spurious out-of-memory failure. * src/uml/uml_driver.c (umlMonitorCommand): Validate that incoming data is reliable before using it to allocate/dereference memory. Don't report bogus errno on short read. Reported by Jim Meyering. --- src/uml/uml_driver.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index eec239f..4a5db9d 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -740,15 +740,15 @@ static int umlMonitorCommand(virConnectPtr conn, if (nbytes < 0) { if (errno == EAGAIN || errno == EINTR) continue; - virReportSystemError(errno, - _("cannot read reply %s"), - cmd); + virReportSystemError(errno, _("cannot read reply %s"), cmd); goto error; } if (nbytes < sizeof res) { - virReportSystemError(errno, - _("incomplete reply %s"), - cmd); + virReportSystemError(0, _("incomplete reply %s"), cmd); + goto error; + } + if (sizeof res.data < res.length) { + virReportSystemError(0, _("invalid length in reply %s"), cmd); goto error; } -- 1.6.6.1

2 3

[libvirt] [RFC][PATCH v2 2/2] Automatically recreate macvtap interface and reconnect to qemu
by Ed Swierk 09 Mar '10

09 Mar '10

(See the PATCH 0 email for further discussion.) --- The libvirt qemu driver creates a macvtap interface for each defined "direct" network interface, but unlike a tap interface that is owned by the process that creates it, a macvtap interface vanishes when the underlying network device goes away. When this happens, qemu is left holding a file descriptor for a nonexistent tap interface. This patch implements dynamically recreating a macvtap interface when the underlying network device reappears, and reconnecting it to the still-running qemu process. It's a total hack job: after starting qemu, it spawns a thread that wakes up once per second and attempts to create a new macvtap interface for each defined direct interface. If the macvtap interface already exists (because it never disappeared) or can't be created (because the underlying network device doesn't exist), this is a no-op. Only when the underlying network device reappears does the reconnection complete. At minimum, this should be done without the once-per-second polling. Index: libvirt-0.7.7/src/qemu/qemu_driver.c =================================================================== --- libvirt-0.7.7.orig/src/qemu/qemu_driver.c +++ libvirt-0.7.7/src/qemu/qemu_driver.c @@ -83,6 +83,7 @@ #include "xml.h" #include "cpu/cpu.h" #include "macvtap.h" +#include "threads.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -107,6 +108,8 @@ struct _qemuDomainObjPrivate { qemuDomainPCIAddressSetPtr pciaddrs; int persistentAddrs; + + pthread_t reconnectNetBackendsThread; }; static int qemudShutdown(void); @@ -151,6 +154,8 @@ static int qemudDomainDisconnectNetBacke virDomainObjPtr vm, virDomainNetDefPtr net); +static void *qemudDomainReconnectNetBackends(void *opaque); + static struct qemud_driver *qemu_driver = NULL; @@ -2697,6 +2702,7 @@ static int qemudStartVMDaemon(virConnect char *pidfile = NULL; int logfile; qemuDomainObjPrivatePtr priv = vm->privateData; + pthread_attr_t threadAttr; struct qemudHookData hookData; hookData.conn = conn; @@ -2950,6 +2956,15 @@ static int qemudStartVMDaemon(virConnect if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) goto abort; + pthread_attr_init(&threadAttr); + pthread_attr_setdetachstate(&threadAttr, PTHREAD_CREATE_DETACHED); + if (pthread_create(&priv->reconnectNetBackendsThread, &threadAttr, + qemudDomainReconnectNetBackends, vm->def->uuid)) { + pthread_attr_destroy(&threadAttr); + goto abort; + } + pthread_attr_destroy(&threadAttr); + return 0; cleanup: @@ -6248,7 +6263,7 @@ static int qemudDomainConnectNetBackend( unsigned long long qemuCmdFlags) { qemuDomainObjPrivatePtr priv = vm->privateData; - char *tapfd_name = NULL; + char *hostnet_name = NULL; int tapfd = -1; char *netstr = NULL; int ret = -1; @@ -6286,27 +6301,30 @@ static int qemudDomainConnectNetBackend( if (tapfd < 0) return -1; - if (virAsprintf(&tapfd_name, "fd-%s", net->info.alias) < 0) { + if (virAsprintf(&hostnet_name, "host%s", net->info.alias) < 0) { virReportOOMError(); close(tapfd); return -1; } if (!(netstr = qemuBuildHostNetStr(net, ' ', - vlan, tapfd_name))) { - VIR_FREE(tapfd_name); + vlan, hostnet_name))) { + VIR_FREE(hostnet_name); close(tapfd); return -1; } qemuDomainObjEnterMonitorWithDriver(driver, vm); - if (qemuMonitorSendFileHandle(priv->mon, tapfd_name, tapfd) < 0) + if (qemuMonitorRemoveHostNetwork(priv->mon, vlan, hostnet_name) < 0) + VIR_INFO0("Did not remove existing host network"); + + if (qemuMonitorSendFileHandle(priv->mon, hostnet_name, tapfd) < 0) goto out; if (qemuMonitorAddHostNetwork(priv->mon, netstr) < 0) { - if (qemuMonitorCloseFileHandle(priv->mon, tapfd_name) < 0) - VIR_WARN(_("Failed to close tapfd with '%s'"), tapfd_name); + if (qemuMonitorCloseFileHandle(priv->mon, hostnet_name) < 0) + VIR_WARN(_("Failed to close tapfd with '%s'"), hostnet_name); goto out; } @@ -6315,7 +6333,7 @@ static int qemudDomainConnectNetBackend( out: qemuDomainObjExitMonitorWithDriver(driver, vm); VIR_FREE(netstr); - VIR_FREE(tapfd_name); + VIR_FREE(hostnet_name); close(tapfd); return ret; } @@ -9339,6 +9357,73 @@ out: return ret; } +static void *qemudDomainReconnectNetBackends(void *opaque) +{ + virConnectPtr conn = virConnectOpen("qemu:///system"); + struct qemud_driver *driver = conn->privateData; + const unsigned char *uuid = opaque; + + while (1) { + virDomainObjPtr vm; + unsigned long long qemuCmdFlags; + int i; + + usleep(1000000); + + VIR_DEBUG(_("qemuDomainReconnectNetBackends (%p %p)"), + conn, driver); + + qemuDriverLock(driver); + vm = virDomainFindByUUID(&driver->domains, uuid); + if (!vm) { + VIR_DEBUG0("qemuDomainReconnectNetBackends done"); + qemuDriverUnlock(driver); + break; + } + + VIR_DEBUG(_("qemuDomainReconnectNetBackends (%s)"), + vm->def->name); + + if (qemudExtractVersionInfo(vm->def->emulator, + NULL, + &qemuCmdFlags) < 0) + goto cleanup; + + if (qemuDomainObjBeginJobWithDriver(driver, vm) < 0) + goto cleanup; + + if (!virDomainObjIsActive(vm)) + goto endjob; + + for (i = 0 ; i < vm->def->nnets ; i++) { + virDomainNetDefPtr net = vm->def->nets[i]; + + if (net->type != VIR_DOMAIN_NET_TYPE_DIRECT) + continue; + + if (qemudDomainConnectNetBackend(conn, driver, vm, + net, qemuCmdFlags) == 0) { + VIR_WARN(_("Reconnected interface %s (%s) for domain %s"), + net->data.direct.linkdev, net->ifname, vm->def->name); + } else { + VIR_DEBUG(_("Unable to reconnect interface %s for domain %s"), + net->data.direct.linkdev, vm->def->name); + } + } + + endjob: + if (qemuDomainObjEndJob(vm) == 0) + vm = NULL; + + cleanup: + if (vm) + virDomainObjUnlock(vm); + qemuDriverUnlock(driver); + } + + return NULL; +} + static int qemuCPUCompare(virConnectPtr conn, const char *xmlDesc, Index: libvirt-0.7.7/src/util/macvtap.c =================================================================== --- libvirt-0.7.7.orig/src/util/macvtap.c +++ libvirt-0.7.7/src/util/macvtap.c @@ -215,10 +215,12 @@ getIfIndex(virConnectPtr conn, if (ioctl(fd, SIOCGIFINDEX, &ifreq) >= 0) *idx = ifreq.ifr_ifindex; else { +#if 0 if (conn) ReportError(conn, VIR_ERR_INTERNAL_ERROR, _("interface %s does not exist"), ifname); +#endif rc = ENODEV; } @@ -747,11 +749,13 @@ create_name: rc = ifUp(cr_ifname, 1); if (rc != 0) { +#if 0 virReportSystemError(errno, _("cannot 'up' interface %s -- another " "macvtap device may be 'up' and have the same " "MAC address"), cr_ifname); +#endif rc = -1; goto link_del_exit; } Index: libvirt-0.7.7/src/qemu/qemu_conf.c =================================================================== --- libvirt-0.7.7.orig/src/qemu/qemu_conf.c +++ libvirt-0.7.7/src/qemu/qemu_conf.c @@ -3854,18 +3854,21 @@ int qemudBuildCommandLine(virConnectPtr net->data.direct.linkdev, net->data.direct.mode, qemuCmdFlags); - if (tapfd < 0) - goto error; - - if (VIR_REALLOC_N(*tapfds, (*ntapfds)+1) < 0) { - close(tapfd); - goto no_memory; - } + if (tapfd < 0) { + VIR_WARN(_("Unable to connect interface %s for domain %s"), + net->data.direct.linkdev, def->name); + tapfd_name[0] = 0; + } else { + if (VIR_REALLOC_N(*tapfds, (*ntapfds)+1) < 0) { + close(tapfd); + goto no_memory; + } - (*tapfds)[(*ntapfds)++] = tapfd; + (*tapfds)[(*ntapfds)++] = 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; + } } /* Possible combinations: @@ -3876,8 +3879,9 @@ int qemudBuildCommandLine(virConnectPtr * * NB, no support for -netdev without use of -device */ - if ((qemuCmdFlags & QEMUD_CMD_FLAG_NETDEV) && - (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE)) { + if ((tapfd_name[0] != 0) && + ((qemuCmdFlags & QEMUD_CMD_FLAG_NETDEV) && + (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE))) { ADD_ARG_LIT("-netdev"); if (!(host = qemuBuildHostNetStr(net, ',', vlan, tapfd_name))) @@ -3895,8 +3899,9 @@ int qemudBuildCommandLine(virConnectPtr goto error; ADD_ARG(nic); } - if (!((qemuCmdFlags & QEMUD_CMD_FLAG_NETDEV) && - (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE))) { + if ((tapfd_name[0] != 0) && + (!((qemuCmdFlags & QEMUD_CMD_FLAG_NETDEV) && + (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE)))) { ADD_ARG_LIT("-net"); if (!(host = qemuBuildHostNetStr(net, ',', vlan, tapfd_name)))

2 1

[libvirt] [PATCH] Fix the initialization of the number of sockets
by Stefan Berger 09 Mar '10

09 Mar '10

When starting a VM 3 times, on the 3rd time the number of sockets is completely out of control. Initialize the socket numbers to zero so the cpu affinity does not occur due to max cpus being completely out of range and the VM can start. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com>

3 2

[libvirt] [rebased PATCH 1/2] virsh: fix existing N_ uses
by Eric Blake 09 Mar '10

09 Mar '10

It is a bad idea to call gettext on an already-translated string. In cases where a string must be translated separately from where it is exposed to xgettext, the gettext manual recommends the idiom of N_() wrapping gettext_noop for marking the string. * src/internal.h (N_): Fix definition to match gettext manual. * tools/virsh.c: (cmdHelp, cmdList, cmdDomstate, cmdDominfo) (cmdVcpuinfo, vshUsage): Replace incorrect use of N_ with _. (vshCmddefHelp): Likewise. Mark C format strings appropriately. --- src/internal.h | 2 +- tools/virsh.c | 29 +++++++++++++++-------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/internal.h b/src/internal.h index ec8a49f..6e06f66 100644 --- a/src/internal.h +++ b/src/internal.h @@ -45,7 +45,7 @@ #endif #define _(str) dgettext(GETTEXT_PACKAGE, (str)) -#define N_(str) dgettext(GETTEXT_PACKAGE, (str)) +#define N_(str) str /* String equality tests, suggested by Jim Meyering. */ #define STREQ(a,b) (strcmp(a,b) == 0) diff --git a/tools/virsh.c b/tools/virsh.c index 65487ed..183f228 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -429,7 +429,7 @@ cmdHelp(vshControl *ctl, const vshCmd *cmd) vshPrint(ctl, "%s", _("Commands:\n\n")); for (def = commands; def->name; def++) vshPrint(ctl, " %-15s %s\n", def->name, - N_(vshCmddefGetInfo(def, "help"))); + _(vshCmddefGetInfo(def, "help"))); return TRUE; } return vshCmddefHelp(ctl, cmdname); @@ -725,7 +725,7 @@ cmdList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) if (virDomainGetInfo(dom, &info) < 0) state = _("no state"); else - state = N_(vshDomainStateToString(info.state)); + state = _(vshDomainStateToString(info.state)); vshPrint(ctl, "%3d %-20s %s\n", virDomainGetID(dom), @@ -747,7 +747,7 @@ cmdList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) if (virDomainGetInfo(dom, &info) < 0) state = _("no state"); else - state = N_(vshDomainStateToString(info.state)); + state = _(vshDomainStateToString(info.state)); vshPrint(ctl, "%3s %-20s %s\n", "-", names[i], state); @@ -788,7 +788,7 @@ cmdDomstate(vshControl *ctl, const vshCmd *cmd) if (virDomainGetInfo(dom, &info) == 0) vshPrint(ctl, "%s\n", - N_(vshDomainStateToString(info.state))); + _(vshDomainStateToString(info.state))); else ret = FALSE; @@ -1761,7 +1761,7 @@ cmdDominfo(vshControl *ctl, const vshCmd *cmd) if (virDomainGetInfo(dom, &info) == 0) { vshPrint(ctl, "%-15s %s\n", _("State:"), - N_(vshDomainStateToString(info.state))); + _(vshDomainStateToString(info.state))); vshPrint(ctl, "%-15s %d\n", _("CPU(s):"), info.nrVirtCpu); @@ -2040,7 +2040,7 @@ cmdVcpuinfo(vshControl *ctl, const vshCmd *cmd) vshPrint(ctl, "%-15s %d\n", _("VCPU:"), n); vshPrint(ctl, "%-15s %d\n", _("CPU:"), cpuinfo[n].cpu); vshPrint(ctl, "%-15s %s\n", _("State:"), - N_(vshDomainVcpuStateToString(cpuinfo[n].state))); + _(vshDomainVcpuStateToString(cpuinfo[n].state))); if (cpuinfo[n].cpuTime != 0) { double cpuUsed = cpuinfo[n].cpuTime; @@ -7869,8 +7869,8 @@ vshCmddefHelp(vshControl *ctl, const char *cmdname) vshError(ctl, _("command '%s' doesn't exist"), cmdname); return FALSE; } else { - const char *desc = N_(vshCmddefGetInfo(def, "desc")); - const char *help = N_(vshCmddefGetInfo(def, "help")); + const char *desc = _(vshCmddefGetInfo(def, "desc")); + const char *help = _(vshCmddefGetInfo(def, "help")); char buf[256]; fputs(_(" NAME\n"), stdout); @@ -7885,15 +7885,17 @@ vshCmddefHelp(vshControl *ctl, const char *cmdname) if (opt->type == VSH_OT_BOOL) fmt = "[--%s]"; else if (opt->type == VSH_OT_INT) - fmt = N_("[--%s <number>]"); + /* xgettext:c-format */ + fmt = _("[--%s <number>]"); else if (opt->type == VSH_OT_STRING) - fmt = N_("[--%s <string>]"); + /* xgettext:c-format */ + fmt = _("[--%s <string>]"); else if (opt->type == VSH_OT_DATA) fmt = ((opt->flag & VSH_OFLAG_REQ) ? "<%s>" : "[<%s>]"); else assert(0); fputc(' ', stdout); - fprintf(stdout, _(fmt), opt->name); + fprintf(stdout, fmt, opt->name); } } fputc('\n', stdout); @@ -7917,7 +7919,7 @@ vshCmddefHelp(vshControl *ctl, const char *cmdname) else if (opt->type == VSH_OT_DATA) snprintf(buf, sizeof(buf), "<%s>", opt->name); - fprintf(stdout, " %-15s %s\n", buf, N_(opt->help)); + fprintf(stdout, " %-15s %s\n", buf, _(opt->help)); } } fputc('\n', stdout); @@ -9148,8 +9150,7 @@ vshUsage(void) for (cmd = commands; cmd->name; cmd++) fprintf(stdout, - " %-15s %s\n", cmd->name, N_(vshCmddefGetInfo(cmd, - "help"))); + " %-15s %s\n", cmd->name, _(vshCmddefGetInfo(cmd, "help"))); fprintf(stdout, "%s", _("\n (specify help <command> for details about the command)\n\n")); -- 1.6.6.1

2 2

[libvirt] [PATCH 0/1] Documenting the uses of goto
by David Allan 09 Mar '10

09 Mar '10

I added a section on good and bad uses of goto to the hacking document and website. Also, should we dispense with the HACKING file's content altogether and replace it with a link to hacking.html on the website? It seems like unnecessary work to maintain identical content in both places. Dave David Allan (1): The use of goto HACKING | 32 ++++++++++++++++++++++++++++++++ docs/hacking.html.in | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 0 deletions(-)

6 16

[libvirt] [PATCH] Fix copy&paste typos in virProcessInfoGetAffinity
by Jiri Denemark 09 Mar '10

09 Mar '10

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/util/processinfo.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/processinfo.c b/src/util/processinfo.c index 5ae19f8..97ee779 100644 --- a/src/util/processinfo.c +++ b/src/util/processinfo.c @@ -130,31 +130,31 @@ realloc: if (sched_getaffinity(pid, masklen, mask) < 0) { CPU_FREE(mask); if (errno == EINVAL && numcpus < (1024 << 8)) { /* 262144 cpus ought to be enough for anyone */ numcpus = numcpus << 2; goto realloc; } virReportSystemError(errno, - _("cannot set CPU affinity on process %d"), pid); + _("cannot get CPU affinity of process %d"), pid); return -1; } for (i = 0 ; i < maxcpu ; i++) if (CPU_ISSET_S(i, masklen, mask)) VIR_USE_CPU(map, i); #else /* Legacy method uses a fixed size cpu mask, only allows upto 1024 cpus */ cpu_set_t mask; CPU_ZERO(&mask); if (sched_getaffinity(pid, sizeof(mask), &mask) < 0) { virReportSystemError(errno, - _("cannot set CPU affinity on process %d"), pid); + _("cannot get CPU affinity of process %d"), pid); return -1; } for (i = 0 ; i < maxcpu ; i++) if (CPU_ISSET(i, &mask)) VIR_USE_CPU(map, i); #endif -- 1.7.0.2

3 3

[libvirt] [PATCH 1/4] Addition of XenAPI support to libvirt
by Sharadha Prabhakar (3P) 09 Mar '10

09 Mar '10

Resending patches in plain text. ~/Libvirt/Src/Makefile.am contains some changes suggested by Daniel Veillard. This is a patch to add XenAPI driver support for libvirt version 0.7.6. XenAPI can be used against XenCloud platform and managed through virsh and virt-manger. This patch supports domain related APIs in libvirt. It is possible to get domain information, list active and inactive domains, get Domain XML configuration and Start/stop/pause/shutdown/destroy VMs. There will be more patches after this review to support more libvirt APIs and add remote storage support to XenAPI. In order to run this patch you would require libxenserver library. Libxenserver library can be downloaded from http://community.citrix.com/download/attachments/38633496/libxenserver-5.5.… Copy the libxenserver folder in the same directory level as libvirt. The XenCloud platform can be downloaded from http://xen.org/products/cloudxen.html diff -ur ./libvirt_org/configure.ac ./libvirt/configure.ac --- ./libvirt_org/configure.ac 2010-02-17 17:39:21.000000000 +0000 +++ ./libvirt/configure.ac 2010-02-18 11:51:29.000000000 +0000 @@ -219,6 +219,8 @@ AC_HELP_STRING([--with-libssh2=@<:@PFX@:>@], [libssh2 location @<:@default=/usr/local/lib@:>@]),[],[with_libssh2=yes]) AC_ARG_WITH([phyp], AC_HELP_STRING([--with-phyp], [add PHYP support @<:@default=check@:>@]),[],[with_phyp=check]) +AC_ARG_WITH([xenapi], + AC_HELP_STRING([--with-xenapi], [add XenAPI support @<:@default=yes@:>@]),[],[with_xenapi=check]) AC_ARG_WITH([vbox], AC_HELP_STRING([--with-vbox], [add VirtualBox support @<:@default=yes@:>@]),[],[with_vbox=yes]) AC_ARG_WITH([lxc], @@ -307,6 +309,11 @@ fi AM_CONDITIONAL([WITH_VBOX], [test "$with_vbox" = "yes"]) +if test "$with_xenapi" = "yes"; then + AC_DEFINE_UNQUOTED([WITH_XENAPI], 1, [whether XenAPI driver is enabled]) +fi +AM_CONDITIONAL([WITH_XENAPI], [test "$with_xenapi" = "yes"]) + if test "$with_libvirtd" = "no" ; then with_qemu=no fi @@ -1894,6 +1901,7 @@ AC_MSG_NOTICE([ UML: $with_uml]) AC_MSG_NOTICE([ OpenVZ: $with_openvz]) AC_MSG_NOTICE([ VBox: $with_vbox]) +AC_MSG_NOTICE([ XenAPI: $with_xenapi]) AC_MSG_NOTICE([ LXC: $with_lxc]) AC_MSG_NOTICE([ PHYP: $with_phyp]) AC_MSG_NOTICE([ ONE: $with_one]) Binary files ./libvirt_org/daemon/.libs/libvirtd and ./libvirt/daemon/.libs/libvirtd differ Only in ./libvirt_org/daemon/.libs: lt-libvirtd --- ./libvirt_org/src/Makefile.am 2010-02-17 17:38:13.000000000 +0000 +++ ./libvirt/src/Makefile.am 2010-02-19 10:55:51.000000000 +0000 @@ -3,12 +3,19 @@ # No libraries with the exception of LIBXML should be listed # here. List them against the individual XXX_la_CFLAGS targets # that actually use them + +XENAPI_CFLAGS = -I@top_srcdir@/../libxenserver/include + INCLUDES = \ -I$(top_srcdir)/gnulib/lib \ -I../gnulib/lib \ -I../include \ + -I/usr/include \ -I@top_srcdir@/src/util \ + -I@top_srcdir@/src \ + -I@top_srcdir@/src/xenapi \ -I@top_srcdir@/include \ + $(XENAPI_CFLAGS) \ $(DRIVER_MODULE_CFLAGS) \ $(LIBXML_CFLAGS) \ -DLIBDIR=\""$(libdir)"\" \ @@ -42,6 +49,9 @@ augeastestdir = $(datadir)/augeas/lenses/tests augeastest_DATA = +XENAPI_LIBS = @top_srcdir@/../libxenserver/libxenserver.so +XENAPI_LDFLAGS = -L@top_srcdir@/../libxenserver/ -lxenserver + # These files are not related to driver APIs. Simply generic # helper APIs for various purposes UTIL_SOURCES = \ @@ -205,6 +215,10 @@ qemu/qemu_security_dac.h \ qemu/qemu_security_dac.c +XENAPI_DRIVER_SOURCES = \ + xenapi/xenapi_driver.c xenapi/xenapi_driver.h \ + xenapi/xenapi_utils.c xenapi/xenapi_utils.h + UML_DRIVER_SOURCES = \ uml/uml_conf.c uml/uml_conf.h \ uml/uml_driver.c uml/uml_driver.h @@ -466,6 +480,28 @@ libvirt_driver_vbox_la_SOURCES = $(VBOX_DRIVER_SOURCES) endif +if WITH_XENAPI +if WITH_DRIVER_MODULES +mod_LTLIBRARIES += libvirt_driver_xenapi.la +else +noinst_LTLIBRARIES += libvirt_driver_xenapi.la + +libvirt_la_LIBADD += libvirt_driver_xenapi.la \ + $(XENAPI_LIBS) +endif +#libvirt_driver_xenapi_la_LIBADD = $(XENAPI_LIBS) +libvirt_driver_xenapi_la_CFLAGS = $(XEN_CFLAGS) \ + $(LIBXML_CFLAGS) \ + $(shell curl-config --cflags) +libvirt_driver_xenapi_la_LDFLAGS = $(XENAPI_LDFLAGS) -g $(LIBXML_LIBS) \ + $(shell curl-config --libs) + +if WITH_DRIVER_MODULES +libvirt_driver_xenapi_la_LDFLAGS += -module -avoid-version +endif +libvirt_driver_xenapi_la_SOURCES = $(XENAPI_DRIVER_SOURCES) +endif + if WITH_QEMU if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_qemu.la @@ -722,6 +758,7 @@ $(OPENVZ_DRIVER_SOURCES) \ $(PHYP_DRIVER_SOURCES) \ $(VBOX_DRIVER_SOURCES) \ + $(XENAPI_DRIVER_SOURCES) \ $(ESX_DRIVER_SOURCES) \ $(NETWORK_DRIVER_SOURCES) \ $(INTERFACE_DRIVER_SOURCES) \ diff -ur ./libvirt_org/tools/Makefile.am ./libvirt/tools/Makefile.am --- ./libvirt_org/tools/Makefile.am 2010-02-17 17:36:13.000000000 +0000 +++ ./libvirt/tools/Makefile.am 2010-02-18 11:56:30.000000000 +0000 @@ -40,7 +40,8 @@ $(WARN_CFLAGS) \ ../src/libvirt.la \ ../gnulib/lib/libgnu.la \ - $(VIRSH_LIBS) + $(VIRSH_LIBS) \ + ../../libxenserver/libxenserver.so virsh_CFLAGS = \ -I$(top_srcdir)/gnulib/lib -I../gnulib/lib \ -I../include -I$(top_srcdir)/include \

5 24