- Devel - libvirt List Archives

Re: [libvirt] [PATCH]: pass flags to all virDomain*DefParse* functions
by Guido Günther 08 Jan '09

08 Jan '09

On Thu, Jan 08, 2009 at 05:02:14PM +0100, Jim Meyering wrote: [..snip..] > Hi Guido, > > libvirt doesn't build right now, because of this: > > xm_internal.c:2288: error: too few arguments to function 'virDomainDefParseString' > xm_internal.c:2530: error: too few arguments to function 'virDomainDeviceDefParse' > xm_internal.c:2619: error: too few arguments to function 'virDomainDeviceDefParse' > xend_internal.c:3860: error: too few arguments to function 'virDomainDeviceDefParse' > xend_internal.c:3950: error: too few arguments to function 'virDomainDeviceDefParse' Thought I had tested this with the Xen driver enabled, but seems I didn't. Sorry! Attached patch fixes the build and passes "make check". Thanks for pointing this out! -- Guido

1 1

[libvirt] [PATCH]: pass flags to all virDomain*DefParse* functions
by Guido Günther 08 Jan '09

08 Jan '09

On Thu, Dec 04, 2008 at 02:16:06PM +0100, Daniel Veillard wrote: > On Thu, Dec 04, 2008 at 01:15:23PM +0100, Guido Günther wrote: > > On Thu, Dec 04, 2008 at 10:56:25AM +0000, Daniel P. Berrange wrote: > > > On Wed, Dec 03, 2008 at 06:20:12PM +0100, Guido G?nther wrote: > > > > On Sun, Nov 30, 2008 at 12:43:48PM +0100, Guido Günther wrote: > > > > > >From 87db4a698ed9b49294c0f94137fc6beef13bd4e8 Mon Sep 17 00:00:00 2001 > > > > > From: =?utf-8?q?Guido=20G=C3=BCnther?= <agx(a)sigxcpu.org> > > > > > Date: Tue, 25 Nov 2008 13:02:43 +0100 > > > > > Subject: [PATCH] differentiate between active and inactive configs > > > > > > > > > > by honoring the VIR_DOMAIN_XML_INACTIVE flag. > > > > O.k. to commit this part as a start so you can readily use it vor lxc? > > > > > > ACK, assuming 'make check' still passes. > > It does here, sure. Patch Applied now. I've added the flag to the > > functions currently needed for qemu but if nobody objects I'd like to > > add them to: > > > > virDomainDeviceDefParse > > virDomainDefParseString > > virDomainHostdevSubsysUsbDefParseXML > > virDomainDiskDefParseXML > > virDomainFSDefParseXML > > virDomainNetDefParseXML > > virDomainInputDefParseXML > > virDomainSoundDefParseXML > > virDomainHostdevDefParseXML > > virDomainChrDefParseXML > > I'm about to release an intermediate 0.5.1 release with the bug and > small improvement fixes since 0.5.0, I assume the more generic patch > can wait after that, but that sounds right to me in principle. Attached patch adds a flag parameter to the above functions and passes VIR_DOMAIN_XML_INACTIVE from the upper levels. I see two advantages in this: * symmetric interfaces to the XML parsing functions (why has virDomainDefParseFile a flags argument while virDomainDefParseString hasn't) * other drivers can use this very easily (IIRC lxc has some use for it) otherwise there's not too much gain so I'm a bit undecided if this is actually necessary. -- Guido

3 3

[libvirt] [PATCH] poll: don't return uninitialized
by Jim Meyering 08 Jan '09

08 Jan '09

Daniel Berrange fixed this yesterday. http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff;h=74e2d5b2fd5 It's in gnulib now, along with a change to make the cpp nesting a little more readable. This pulls the update poll.c into libvirt: Thu Jan 8 09:48:04 CET 2009 Daniel P. Berrange <berrange(a)redhat.com> poll: don't return uninitialized * gnulib/lib/poll.c (poll) [WIN32_NATIVE]: Initialize "rc". [sync from gnulib also adjusts cpp indentation to reflect nesting.] >From 212721560f3f2bcf7329c48417e0ba24243fc554 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 8 Jan 2009 09:49:53 +0100 Subject: [PATCH] poll: don't return uninitialized * gnulib/lib/poll.c (poll) [WIN32_NATIVE]: Initialize "rc". [sync from gnulib also adjusts cpp indentation to reflect nesting.] --- gnulib/lib/poll.c | 54 ++++++++++++++++++++++++++-------------------------- 1 files changed, 27 insertions(+), 27 deletions(-) diff --git a/gnulib/lib/poll.c b/gnulib/lib/poll.c index 87ddf3c..da9c9f2 100644 --- a/gnulib/lib/poll.c +++ b/gnulib/lib/poll.c @@ -1,7 +1,7 @@ /* Emulation for poll(2) Contributed by Paolo Bonzini. - Copyright 2001, 2002, 2003, 2006, 2007, 2008 Free Software Foundation, Inc. + Copyright 2001-2003, 2006-2009 Free Software Foundation, Inc. This file is part of gnulib. @@ -29,35 +29,35 @@ #include <assert.h> #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ -#define WIN32_NATIVE -#include <winsock2.h> -#include <windows.h> -#include <io.h> -#include <stdio.h> -#include <conio.h> +# define WIN32_NATIVE +# include <winsock2.h> +# include <windows.h> +# include <io.h> +# include <stdio.h> +# include <conio.h> #else -#include <sys/time.h> -#include <sys/socket.h> -#include <sys/select.h> -#include <unistd.h> +# include <sys/time.h> +# include <sys/socket.h> +# include <sys/select.h> +# include <unistd.h> #endif #ifdef HAVE_SYS_IOCTL_H -#include <sys/ioctl.h> +# include <sys/ioctl.h> #endif #ifdef HAVE_SYS_FILIO_H -#include <sys/filio.h> +# include <sys/filio.h> #endif #include <time.h> #ifndef INFTIM -#define INFTIM (-1) +# define INFTIM (-1) #endif /* BeOS does not have MSG_PEEK. */ #ifndef MSG_PEEK -#define MSG_PEEK 0 +# define MSG_PEEK 0 #endif #ifdef WIN32_NATIVE @@ -92,9 +92,9 @@ typedef enum _FILE_INFORMATION_CLASS { typedef DWORD (WINAPI *PNtQueryInformationFile) (HANDLE, IO_STATUS_BLOCK *, VOID *, ULONG, FILE_INFORMATION_CLASS); -#ifndef PIPE_BUF -#define PIPE_BUF 512 -#endif +# ifndef PIPE_BUF +# define PIPE_BUF 512 +# endif /* Compute revents values for file handle H. */ @@ -234,7 +234,7 @@ compute_revents (int fd, int sought, fd_set *rfds, fd_set *wfds, fd_set *efds) int r; int socket_errno; -#if defined __MACH__ && defined __APPLE__ +# if defined __MACH__ && defined __APPLE__ /* There is a bug in Mac OS X that causes it to ignore MSG_PEEK for some kinds of descriptors. Detect if this descriptor is a connected socket, a server socket, or something else using a @@ -243,11 +243,11 @@ compute_revents (int fd, int sought, fd_set *rfds, fd_set *wfds, fd_set *efds) socket_errno = (r < 0) ? errno : 0; if (r == 0 || socket_errno == ENOTSOCK) ioctl (fd, FIONREAD, &r); -#else +# else char data[64]; r = recv (fd, data, sizeof (data), MSG_PEEK); socket_errno = (r < 0) ? errno : 0; -#endif +# endif if (r == 0) happened |= POLLHUP; @@ -288,7 +288,7 @@ poll (pfd, nfd, timeout) int maxfd, rc; nfds_t i; -#ifdef _SC_OPEN_MAX +# ifdef _SC_OPEN_MAX static int sc_open_max = -1; if (nfd < 0 @@ -299,15 +299,15 @@ poll (pfd, nfd, timeout) errno = EINVAL; return -1; } -#else /* !_SC_OPEN_MAX */ -#ifdef OPEN_MAX +# else /* !_SC_OPEN_MAX */ +# ifdef OPEN_MAX if (nfd < 0 || nfd > OPEN_MAX) { errno = EINVAL; return -1; } -#endif /* OPEN_MAX -- else, no check is needed */ -#endif /* !_SC_OPEN_MAX */ +# endif /* OPEN_MAX -- else, no check is needed */ +# endif /* !_SC_OPEN_MAX */ /* EFAULT is not necessary to implement, but let's do it in the simplest case. */ @@ -405,7 +405,7 @@ poll (pfd, nfd, timeout) BOOL poll_again; MSG msg; char sockbuf[256]; - int rc; + int rc = 0; nfds_t i; if (nfd < 0 || timeout < -1) -- 1.6.1.121.g866a4a

1 0

[libvirt] PATCH: Thread-safe error reporting public API
by Daniel P. Berrange 07 Jan '09

07 Jan '09

The current public API for error reporting consists of - A global error object - A per-connection error object Some functions always set errors on the global object. Other functions always set errors on the per-connection object, except when they set errors on the global object. Both have built-in race conditions if they are accessed from multiple threads because of the time between the API call raising the error, and the caller querying it. The solution to this is to do away with all of the existing error objects and replace them with a per-thread error object. Well, except we can't do away with existing objects because of ABI compatability. This turns out to not be such a bad problem after all.... So with this patch... virterror.c gets ability to track a per-thread virErrorPtr instance. This object is stored in a thread local variable via pthread_{get,set}specific. It is allocated when first required, and deleted when the thread exits Every single API will *always* set the virErrorPtr object associated with its current thread. In the public virterror.h we add virErrorPtr virThreadGetLastError (void); int virThreadCopyLastError (virErrorPtr to); void virThreadResetLastError (void); This provides a guarenteed thread-safe public API for fetching error information. All the other existing APIs have docs updated to recommend against their use. In libvirt.c, in any exit paths which result in an error code, we copy the per-thread virErrorPtr object into either the global error object or per-connection object as applicable for the scenario. This gives us 100% backwards compatability. NB, we hold a lock when doing this so that these are race-free when setting them. At the start of every API call, we call virThreadResetLastError() and at any exit path with an error, if the error object is not set, then we set a generic error message. This means that if the internal driver code is broken and forgets to raise an error, the caller will still at least see a generic error report. Finally, virCopyLastError and virConnCopyLastError were not correctly strdup'ing the char * fields. This meant that if the original error was cleared, you'd get a use-after-free error, shortly followed by a double-free error if the first didn't kill you. This patch also fixes those two methods to correctly strdup the char *. As for language bindings, they should *all* be updated to use the virThreadGetLastError() method, and *never* call virGetLastError() or the virConnGetLastError() calls. With this patch applied, assuming all the per-hypervisor drivers are thread-safe (they are except for Xen which is still TODO), then the public API for virConectPtr is also (almost[1]) guarenteed to be thread- safe. include/libvirt/virterror.h | 7 src/datatypes.c | 11 src/datatypes.h | 15 src/libvirt.c | 3729 ++++++++++++++++++++++++++++++-------------- src/libvirt_sym.version.in | 8 src/virterror.c | 281 +++ src/virterror_internal.h | 4 7 files changed, 2902 insertions(+), 1153 deletions(-) Daniel [1] We need to fix lots of stupid internal mistakes like strerror() vs strerror_r() - these were already a problem even with libvirt being single-threaded on virConnectPtr, because the app using libvirt could be threaded. More on this later... diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h --- a/include/libvirt/virterror.h +++ b/include/libvirt/virterror.h @@ -187,6 +187,13 @@ void virConnSetErrorFunc (virConnectPt virErrorFunc handler); int virConnCopyLastError (virConnectPtr conn, virErrorPtr to); + + +virErrorPtr virThreadGetLastError (void); +int virThreadCopyLastError (virErrorPtr to); +void virThreadResetLastError (void); + + #ifdef __cplusplus } #endif diff --git a/src/datatypes.c b/src/datatypes.c --- a/src/datatypes.c +++ b/src/datatypes.c @@ -192,8 +192,6 @@ virReleaseConnect(virConnectPtr conn) { virHashFree(conn->nodeDevices, (virHashDeallocator) virNodeDeviceFree); virResetError(&conn->err); - if (virLastErr.conn == conn) - virLastErr.conn = NULL; xmlFreeURI(conn->uri); @@ -320,10 +318,6 @@ virReleaseDomain(virDomainPtr domain) { virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, _("domain missing from connection hash table")); - if (conn->err.dom == domain) - conn->err.dom = NULL; - if (virLastErr.dom == domain) - virLastErr.dom = NULL; domain->magic = -1; domain->id = -1; VIR_FREE(domain->name); @@ -456,11 +450,6 @@ virReleaseNetwork(virNetworkPtr network) virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, _("network missing from connection hash table")); - if (conn->err.net == network) - conn->err.net = NULL; - if (virLastErr.net == network) - virLastErr.net = NULL; - network->magic = -1; VIR_FREE(network->name); VIR_FREE(network); diff --git a/src/datatypes.h b/src/datatypes.h --- a/src/datatypes.h +++ b/src/datatypes.h @@ -95,6 +95,10 @@ * Internal structure associated to a connection */ struct _virConnect { + /* All the variables from here, until the 'lock' declaration + * are setup at time of connection open, and never changed + * since. Thus no need to lock when accessing them + */ unsigned int magic; /* specific value to check */ int flags; /* a set of connection flags */ xmlURIPtr uri; /* connection URI */ @@ -114,11 +118,6 @@ struct _virConnect { void * storagePrivateData; void * devMonPrivateData; - /* Per-connection error. */ - virError err; /* the last error */ - virErrorFunc handler; /* associated handlet */ - void *userData; /* the user data */ - /* * The lock mutex must be acquired before accessing/changing * any of members following this point, or changing the ref @@ -126,6 +125,12 @@ struct _virConnect { * this connection */ PTHREAD_MUTEX_T (lock); + + /* Per-connection error. */ + virError err; /* the last error */ + virErrorFunc handler; /* associated handlet */ + void *userData; /* the user data */ + virHashTablePtr domains; /* hash table for known domains */ virHashTablePtr networks; /* hash table for known domains */ virHashTablePtr storagePools;/* hash table for known storage pools */ diff --git a/src/libvirt.c b/src/libvirt.c --- a/src/libvirt.c +++ b/src/libvirt.c @@ -778,6 +778,8 @@ virGetVersion(unsigned long *libVer, con #endif if (*typeVer == 0) { virLibConnError(NULL, VIR_ERR_NO_SUPPORT, type); + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); return (-1); } } @@ -791,6 +793,8 @@ do_open (const char *name, { int i, res; virConnectPtr ret; + + virThreadResetLastError(); ret = virGetConnect(); if (ret == NULL) @@ -945,17 +949,8 @@ failed: failed: if (ret->driver) ret->driver->close (ret); - /* If no global error was set, copy any error set - in the connection object we're about to dispose of */ - if (virLastErr.code == VIR_ERR_OK) { - memcpy(&virLastErr, &ret->err, sizeof(ret->err)); - memset(&ret->err, 0, sizeof(ret->err)); - } - - /* Still no error set, then raise a generic error */ - if (virLastErr.code == VIR_ERR_OK) - virLibConnError (NULL, VIR_ERR_INTERNAL_ERROR, - _("unable to open connection")); + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); virUnrefConnect(ret); @@ -1050,8 +1045,16 @@ virConnectClose(virConnectPtr conn) { DEBUG("conn=%p", conn); - if (!VIR_IS_CONNECT(conn)) - return (-1); + virThreadResetLastError(); + + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); + return (-1); + } if (conn->networkDriver) conn->networkDriver->close (conn); @@ -1061,8 +1064,11 @@ virConnectClose(virConnectPtr conn) conn->deviceMonitor->close (conn); conn->driver->close (conn); - if (virUnrefConnect(conn) < 0) - return (-1); + if (virUnrefConnect(conn) < 0) { + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); + return (-1); + } return (0); } @@ -1073,12 +1079,22 @@ int int virDrvSupportsFeature (virConnectPtr conn, int feature) { + int ret; DEBUG("conn=%p, feature=%d", conn, feature); - if (!VIR_IS_CONNECT(conn)) - return (-1); - - return VIR_DRV_SUPPORTS_FEATURE (conn->driver, conn, feature); + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); + return (-1); + } + + ret = VIR_DRV_SUPPORTS_FEATURE (conn->driver, conn, feature); + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); + return ret; } /** @@ -1098,8 +1114,12 @@ virConnectGetType(virConnectPtr conn) const char *ret; DEBUG("conn=%p", conn); - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (NULL); } @@ -1128,20 +1148,32 @@ virConnectGetVersion(virConnectPtr conn, { DEBUG("conn=%p, hvVer=%p", conn, hvVer); - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); - return (-1); + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); + return -1; } if (hvVer == NULL) { virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (-1); - } - - if (conn->driver->version) - return conn->driver->version (conn, hvVer); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + goto error; + } + + if (conn->driver->version) { + int ret = conn->driver->version (conn, hvVer); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); return -1; } @@ -1162,15 +1194,27 @@ virConnectGetHostname (virConnectPtr con { DEBUG("conn=%p", conn); - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); - return NULL; - } - - if (conn->driver->getHostname) - return conn->driver->getHostname (conn); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); + return NULL; + } + + if (conn->driver->getHostname) { + char *ret = conn->driver->getHostname (conn); + if (!ret) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); return NULL; } @@ -1193,26 +1237,37 @@ virConnectGetURI (virConnectPtr conn) virConnectGetURI (virConnectPtr conn) { char *name; - - DEBUG("conn=%p", conn); - - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + DEBUG("conn=%p", conn); + + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return NULL; } /* Drivers may override getURI, but if they don't then * we provide a default implementation. */ - if (conn->driver->getURI) - return conn->driver->getURI (conn); + if (conn->driver->getURI) { + name = conn->driver->getURI (conn); + if (!name) + goto error; + } name = (char *)xmlSaveUri(conn->uri); if (!name) { virLibConnError (conn, VIR_ERR_NO_MEMORY, __FUNCTION__); - return NULL; + goto error; } return name; + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); + return NULL; } /** @@ -1232,15 +1287,26 @@ virConnectGetMaxVcpus(virConnectPtr conn { DEBUG("conn=%p, type=%s", conn, type); - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); - return (-1); - } - - if (conn->driver->getMaxVcpus) - return conn->driver->getMaxVcpus (conn, type); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); + return -1; + } + + if (conn->driver->getMaxVcpus) { + int ret = conn->driver->getMaxVcpus (conn, type); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); return -1; } @@ -1259,20 +1325,31 @@ virConnectListDomains(virConnectPtr conn { DEBUG("conn=%p, ids=%p, maxids=%d", conn, ids, maxids); - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); - return (-1); + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); + return -1; } if ((ids == NULL) || (maxids < 0)) { virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (-1); - } - - if (conn->driver->listDomains) - return conn->driver->listDomains (conn, ids, maxids); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + goto error; + } + + if (conn->driver->listDomains) { + int ret = conn->driver->listDomains (conn, ids, maxids); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); return -1; } @@ -1289,15 +1366,26 @@ virConnectNumOfDomains(virConnectPtr con { DEBUG("conn=%p", conn); - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); - return (-1); - } - - if (conn->driver->numOfDomains) - return conn->driver->numOfDomains (conn); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); + goto error; + } + + if (conn->driver->numOfDomains) { + int ret = conn->driver->numOfDomains (conn); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); return -1; } @@ -1320,8 +1408,12 @@ virDomainGetConnect (virDomainPtr dom) { DEBUG("dom=%p", dom); + virThreadResetLastError(); + if (!VIR_IS_DOMAIN (dom)) { virLibDomainError (NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return NULL; } return dom->conn; @@ -1348,23 +1440,35 @@ virDomainCreateXML(virConnectPtr conn, c { DEBUG("conn=%p, xmlDesc=%s, flags=%d", conn, xmlDesc, flags); - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (NULL); } if (xmlDesc == NULL) { virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (NULL); + goto error; } if (conn->flags & VIR_CONNECT_RO) { virLibConnError(conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); - return (NULL); - } - - if (conn->driver->domainCreateXML) - return conn->driver->domainCreateXML (conn, xmlDesc, flags); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + goto error; + } + + if (conn->driver->domainCreateXML) { + virDomainPtr ret; + ret = conn->driver->domainCreateXML (conn, xmlDesc, flags); + if (!ret) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); return NULL; } @@ -1404,19 +1508,32 @@ virDomainLookupByID(virConnectPtr conn, { DEBUG("conn=%p, id=%d", conn, id); - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (NULL); } if (id < 0) { virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (NULL); - } - - if (conn->driver->domainLookupByID) - return conn->driver->domainLookupByID (conn, id); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + goto error; + } + + if (conn->driver->domainLookupByID) { + virDomainPtr ret; + ret = conn->driver->domainLookupByID (conn, id); + if (!ret) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); return NULL; } @@ -1435,19 +1552,32 @@ virDomainLookupByUUID(virConnectPtr conn { DEBUG("conn=%p, uuid=%s", conn, uuid); - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (NULL); } if (uuid == NULL) { virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (NULL); - } - - if (conn->driver->domainLookupByUUID) - return conn->driver->domainLookupByUUID (conn, uuid); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + goto error; + } + + if (conn->driver->domainLookupByUUID) { + virDomainPtr ret; + ret = conn->driver->domainLookupByUUID (conn, uuid); + if (!ret) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); return NULL; } @@ -1470,14 +1600,17 @@ virDomainLookupByUUIDString(virConnectPt DEBUG("conn=%p, uuidstr=%s", conn, uuidstr); - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (NULL); } if (uuidstr == NULL) { virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (NULL); - + goto error; } /* XXX: sexpr_uuid() also supports 'xxxx-xxxx-xxxx-xxxx' format. * We needn't it here. Right? @@ -1495,12 +1628,17 @@ virDomainLookupByUUIDString(virConnectPt if (ret!=VIR_UUID_BUFLEN) { virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (NULL); + goto error; } for (i = 0; i < VIR_UUID_BUFLEN; i++) uuid[i] = raw[i] & 0xFF; return virDomainLookupByUUID(conn, &uuid[0]); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); + return NULL; } /** @@ -1518,19 +1656,32 @@ virDomainLookupByName(virConnectPtr conn { DEBUG("conn=%p, name=%s", conn, name); - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (NULL); } if (name == NULL) { virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (NULL); - } - - if (conn->driver->domainLookupByName) - return conn->driver->domainLookupByName (conn, name); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + goto error; + } + + if (conn->driver->domainLookupByName) { + virDomainPtr dom; + dom = conn->driver->domainLookupByName (conn, name); + if (!dom) + goto error; + return dom; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); return NULL; } @@ -1552,21 +1703,34 @@ virDomainDestroy(virDomainPtr domain) DEBUG("domain=%p", domain); - if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); - return (-1); - } - - conn = domain->conn; - if (conn->flags & VIR_CONNECT_RO) { - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); - return (-1); - } - - if (conn->driver->domainDestroy) - return conn->driver->domainDestroy (domain); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECTED_DOMAIN(domain)) { + virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); + return (-1); + } + + conn = domain->conn; + if (conn->flags & VIR_CONNECT_RO) { + virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + goto error; + } + + if (conn->driver->domainDestroy) { + int ret; + ret = conn->driver->domainDestroy (domain); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); return -1; } @@ -1584,12 +1748,18 @@ virDomainFree(virDomainPtr domain) { DEBUG("domain=%p", domain); - if (!VIR_IS_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); - return (-1); - } - if (virUnrefDomain(domain) < 0) - return (-1); + virThreadResetLastError(); + + if (!VIR_IS_DOMAIN(domain)) { + virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); + return (-1); + } + if (virUnrefDomain(domain) < 0) { + virThreadSetGlobalError(); + return -1; + } return(0); } @@ -1611,21 +1781,34 @@ virDomainSuspend(virDomainPtr domain) virConnectPtr conn; DEBUG("domain=%p", domain); - if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); - return (-1); - } - if (domain->conn->flags & VIR_CONNECT_RO) { - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); - return (-1); - } - - conn = domain->conn; - - if (conn->driver->domainSuspend) - return conn->driver->domainSuspend (domain); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECTED_DOMAIN(domain)) { + virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); + return (-1); + } + if (domain->conn->flags & VIR_CONNECT_RO) { + virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + goto error; + } + + conn = domain->conn; + + if (conn->driver->domainSuspend) { + int ret; + ret = conn->driver->domainSuspend (domain); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(domain->conn); return -1; } @@ -1645,21 +1828,34 @@ virDomainResume(virDomainPtr domain) virConnectPtr conn; DEBUG("domain=%p", domain); - if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); - return (-1); - } - if (domain->conn->flags & VIR_CONNECT_RO) { - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); - return (-1); - } - - conn = domain->conn; - - if (conn->driver->domainResume) - return conn->driver->domainResume (domain); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECTED_DOMAIN(domain)) { + virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); + return (-1); + } + if (domain->conn->flags & VIR_CONNECT_RO) { + virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + goto error; + } + + conn = domain->conn; + + if (conn->driver->domainResume) { + int ret; + ret = conn->driver->domainResume (domain); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(domain->conn); return -1; } @@ -1682,18 +1878,22 @@ virDomainSave(virDomainPtr domain, const virConnectPtr conn; DEBUG("domain=%p, to=%s", domain, to); - if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); - return (-1); - } - if (domain->conn->flags & VIR_CONNECT_RO) { - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); - return (-1); + virThreadResetLastError(); + + if (!VIR_IS_CONNECTED_DOMAIN(domain)) { + virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); + return (-1); + } + if (domain->conn->flags & VIR_CONNECT_RO) { + virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + goto error; } conn = domain->conn; if (to == NULL) { virLibDomainError(domain, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (-1); + goto error; } /* @@ -1716,10 +1916,19 @@ virDomainSave(virDomainPtr domain, const } - if (conn->driver->domainSave) - return conn->driver->domainSave (domain, to); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + if (conn->driver->domainSave) { + int ret; + ret = conn->driver->domainSave (domain, to); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(domain->conn); return -1; } @@ -1738,17 +1947,21 @@ virDomainRestore(virConnectPtr conn, con char filepath[4096]; DEBUG("conn=%p, from=%s", conn, from); - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (-1); } if (conn->flags & VIR_CONNECT_RO) { virLibConnError(conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); - return (-1); + goto error; } if (from == NULL) { virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (-1); + goto error; } /* @@ -1759,21 +1972,36 @@ virDomainRestore(virConnectPtr conn, con unsigned int len, t; t = strlen(from); - if (getcwd(filepath, sizeof(filepath) - (t + 3)) == NULL) - return (-1); + if (getcwd(filepath, sizeof(filepath) - (t + 3)) == NULL) { + virLibConnError(conn, VIR_ERR_SYSTEM_ERROR, + _("cannot get working directory")); + goto error; + } len = strlen(filepath); /* that should be covered by getcwd() semantic, but be 100% sure */ - if (len > sizeof(filepath) - (t + 3)) - return (-1); + if (len > sizeof(filepath) - (t + 3)) { + virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, + _("path too long")); + goto error; + } filepath[len] = '/'; strcpy(&filepath[len + 1], from); from = &filepath[0]; } - if (conn->driver->domainRestore) - return conn->driver->domainRestore (conn, from); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + if (conn->driver->domainRestore) { + int ret; + ret = conn->driver->domainRestore (conn, from); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); return -1; } @@ -1796,18 +2024,22 @@ virDomainCoreDump(virDomainPtr domain, c virConnectPtr conn; DEBUG("domain=%p, to=%s, flags=%d", domain, to, flags); - if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); - return (-1); - } - if (domain->conn->flags & VIR_CONNECT_RO) { - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); - return (-1); + virThreadResetLastError(); + + if (!VIR_IS_CONNECTED_DOMAIN(domain)) { + virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); + return (-1); + } + if (domain->conn->flags & VIR_CONNECT_RO) { + virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + goto error; } conn = domain->conn; if (to == NULL) { virLibDomainError(domain, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (-1); + goto error; } /* @@ -1818,22 +2050,37 @@ virDomainCoreDump(virDomainPtr domain, c unsigned int len, t; t = strlen(to); - if (getcwd(filepath, sizeof(filepath) - (t + 3)) == NULL) - return (-1); + if (getcwd(filepath, sizeof(filepath) - (t + 3)) == NULL) { + virLibDomainError(domain, VIR_ERR_SYSTEM_ERROR, + _("cannot get current directory")); + goto error; + } len = strlen(filepath); /* that should be covered by getcwd() semantic, but be 100% sure */ - if (len > sizeof(filepath) - (t + 3)) - return (-1); + if (len > sizeof(filepath) - (t + 3)) { + virLibDomainError(domain, VIR_ERR_INTERNAL_ERROR, + _("path too long")); + goto error; + } filepath[len] = '/'; strcpy(&filepath[len + 1], to); to = &filepath[0]; } - if (conn->driver->domainCoreDump) - return conn->driver->domainCoreDump (domain, to, flags); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + if (conn->driver->domainCoreDump) { + int ret; + ret = conn->driver->domainCoreDump (domain, to, flags); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(domain->conn); return -1; } @@ -1856,21 +2103,34 @@ virDomainShutdown(virDomainPtr domain) virConnectPtr conn; DEBUG("domain=%p", domain); - if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); - return (-1); - } - if (domain->conn->flags & VIR_CONNECT_RO) { - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); - return (-1); - } - - conn = domain->conn; - - if (conn->driver->domainShutdown) - return conn->driver->domainShutdown (domain); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECTED_DOMAIN(domain)) { + virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); + return (-1); + } + if (domain->conn->flags & VIR_CONNECT_RO) { + virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + goto error; + } + + conn = domain->conn; + + if (conn->driver->domainShutdown) { + int ret; + ret = conn->driver->domainShutdown (domain); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(domain->conn); return -1; } @@ -1891,21 +2151,34 @@ virDomainReboot(virDomainPtr domain, uns virConnectPtr conn; DEBUG("domain=%p, flags=%u", domain, flags); - if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); - return (-1); - } - if (domain->conn->flags & VIR_CONNECT_RO) { - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); - return (-1); - } - - conn = domain->conn; - - if (conn->driver->domainReboot) - return conn->driver->domainReboot (domain, flags); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECTED_DOMAIN(domain)) { + virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); + return (-1); + } + if (domain->conn->flags & VIR_CONNECT_RO) { + virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + goto error; + } + + conn = domain->conn; + + if (conn->driver->domainReboot) { + int ret; + ret = conn->driver->domainReboot (domain, flags); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(domain->conn); return -1; } @@ -1923,8 +2196,12 @@ virDomainGetName(virDomainPtr domain) { DEBUG("domain=%p", domain); - if (!VIR_IS_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_DOMAIN(domain)) { + virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); return (NULL); } return (domain->name); @@ -1944,12 +2221,18 @@ virDomainGetUUID(virDomainPtr domain, un { DEBUG("domain=%p, uuid=%p", domain, uuid); - if (!VIR_IS_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_DOMAIN(domain)) { + virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); return (-1); } if (uuid == NULL) { virLibDomainError(domain, VIR_ERR_INVALID_ARG, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetConnError(domain->conn); return (-1); } @@ -1974,20 +2257,29 @@ virDomainGetUUIDString(virDomainPtr doma unsigned char uuid[VIR_UUID_BUFLEN]; DEBUG("domain=%p, buf=%p", domain, buf); - if (!VIR_IS_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_DOMAIN(domain)) { + virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); return (-1); } if (buf == NULL) { virLibDomainError(domain, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (-1); + goto error; } if (virDomainGetUUID(domain, &uuid[0])) - return (-1); + goto error; virUUIDFormat(uuid, buf); return (0); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(domain->conn); + return -1; } /** @@ -2003,8 +2295,12 @@ virDomainGetID(virDomainPtr domain) { DEBUG("domain=%p", domain); - if (!VIR_IS_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_DOMAIN(domain)) { + virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); return ((unsigned int) -1); } return (domain->id); @@ -2025,17 +2321,30 @@ virDomainGetOSType(virDomainPtr domain) virConnectPtr conn; DEBUG("domain=%p", domain); - if (!VIR_IS_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); - return (NULL); - } - - conn = domain->conn; - - if (conn->driver->domainGetOSType) - return conn->driver->domainGetOSType (domain); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_DOMAIN(domain)) { + virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); + return (NULL); + } + + conn = domain->conn; + + if (conn->driver->domainGetOSType) { + char *ret; + ret = conn->driver->domainGetOSType (domain); + if (!ret) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(domain->conn); return NULL; } @@ -2055,17 +2364,30 @@ virDomainGetMaxMemory(virDomainPtr domai virConnectPtr conn; DEBUG("domain=%p", domain); - if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECTED_DOMAIN(domain)) { + virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (0); } conn = domain->conn; - if (conn->driver->domainGetMaxMemory) - return conn->driver->domainGetMaxMemory (domain); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + if (conn->driver->domainGetMaxMemory) { + unsigned long ret; + ret = conn->driver->domainGetMaxMemory (domain); + if (ret == 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(domain->conn); return 0; } @@ -2087,28 +2409,37 @@ virDomainSetMaxMemory(virDomainPtr domai virConnectPtr conn; DEBUG("domain=%p, memory=%lu", domain, memory); - if (domain == NULL) { - TODO - return (-1); - } - if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); - return (-1); - } - if (domain->conn->flags & VIR_CONNECT_RO) { - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); - return (-1); + virThreadResetLastError(); + + if (!VIR_IS_CONNECTED_DOMAIN(domain)) { + virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); + return (-1); + } + if (domain->conn->flags & VIR_CONNECT_RO) { + virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + goto error; } if (memory < 4096) { virLibDomainError(domain, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (-1); - } - conn = domain->conn; - - if (conn->driver->domainSetMaxMemory) - return conn->driver->domainSetMaxMemory (domain, memory); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + goto error; + } + conn = domain->conn; + + if (conn->driver->domainSetMaxMemory) { + int ret; + ret = conn->driver->domainSetMaxMemory (domain, memory); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(domain->conn); return -1; } @@ -2130,29 +2461,38 @@ virDomainSetMemory(virDomainPtr domain, virConnectPtr conn; DEBUG("domain=%p, memory=%lu", domain, memory); - if (domain == NULL) { - TODO - return (-1); - } - if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); - return (-1); - } - if (domain->conn->flags & VIR_CONNECT_RO) { - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); - return (-1); + virThreadResetLastError(); + + if (!VIR_IS_CONNECTED_DOMAIN(domain)) { + virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); + return (-1); + } + if (domain->conn->flags & VIR_CONNECT_RO) { + virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + goto error; } if (memory < 4096) { virLibDomainError(domain, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (-1); - } - - conn = domain->conn; - - if (conn->driver->domainSetMemory) - return conn->driver->domainSetMemory (domain, memory); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + goto error; + } + + conn = domain->conn; + + if (conn->driver->domainSetMemory) { + int ret; + ret = conn->driver->domainSetMemory (domain, memory); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(domain->conn); return -1; } @@ -2173,23 +2513,36 @@ virDomainGetInfo(virDomainPtr domain, vi virConnectPtr conn; DEBUG("domain=%p, info=%p", domain, info); - if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECTED_DOMAIN(domain)) { + virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (-1); } if (info == NULL) { virLibDomainError(domain, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (-1); + goto error; } memset(info, 0, sizeof(virDomainInfo)); conn = domain->conn; - if (conn->driver->domainGetInfo) - return conn->driver->domainGetInfo (domain, info); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + if (conn->driver->domainGetInfo) { + int ret; + ret = conn->driver->domainGetInfo (domain, info); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(domain->conn); return -1; } @@ -2210,17 +2563,30 @@ virDomainGetXMLDesc(virDomainPtr domain, virConnectPtr conn; DEBUG("domain=%p, flags=%d", domain, flags); - if (!VIR_IS_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); - return (NULL); - } - - conn = domain->conn; - - if (conn->driver->domainDumpXML) - return conn->driver->domainDumpXML (domain, flags); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_DOMAIN(domain)) { + virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); + return (NULL); + } + + conn = domain->conn; + + if (conn->driver->domainDumpXML) { + char *ret; + ret = conn->driver->domainDumpXML (domain, flags); + if (!ret) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(domain->conn); return NULL; } @@ -2289,14 +2655,18 @@ virDomainMigrate (virDomainPtr domain, DEBUG("domain=%p, dconn=%p, flags=%lu, dname=%s, uri=%s, bandwidth=%lu", domain, dconn, flags, dname, uri, bandwidth); + virThreadResetLastError(); + if (!VIR_IS_DOMAIN (domain)) { virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); return NULL; } conn = domain->conn; /* Source connection. */ if (!VIR_IS_CONNECT (dconn)) { virLibConnError (conn, VIR_ERR_INVALID_CONN, __FUNCTION__); - return NULL; + goto error; } /* Check that migration is supported by both drivers. */ @@ -2312,7 +2682,7 @@ virDomainMigrate (virDomainPtr domain, version = 2; else { virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); - return NULL; + goto error; } /* Prepare the migration. @@ -2347,13 +2717,13 @@ virDomainMigrate (virDomainPtr domain, */ if (!conn->driver->domainDumpXML) { virLibConnError (conn, VIR_ERR_INTERNAL_ERROR, __FUNCTION__); - return NULL; + goto error; } dom_xml = conn->driver->domainDumpXML (domain, VIR_DOMAIN_XML_SECURE); if (!dom_xml) - return NULL; + goto error; ret = dconn->driver->domainMigratePrepare2 (dconn, &cookie, &cookielen, uri, &uri_out, flags, dname, @@ -2403,6 +2773,11 @@ virDomainMigrate (virDomainPtr domain, free (uri_out); free (cookie); return ddomain; + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(domain->conn); + return NULL; } /* @@ -2421,17 +2796,30 @@ virDomainMigratePrepare (virConnectPtr d { DEBUG("dconn=%p, cookie=%p, cookielen=%p, uri_in=%s, uri_out=%p, flags=%lu, dname=%s, bandwidth=%lu", dconn, cookie, cookielen, uri_in, uri_out, flags, dname, bandwidth); + virThreadResetLastError(); + if (!VIR_IS_CONNECT (dconn)) { virLibConnError (NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); - return -1; - } - - if (dconn->driver->domainMigratePrepare) - return dconn->driver->domainMigratePrepare (dconn, cookie, cookielen, - uri_in, uri_out, - flags, dname, bandwidth); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); + return -1; + } + + if (dconn->driver->domainMigratePrepare) { + int ret; + ret = dconn->driver->domainMigratePrepare (dconn, cookie, cookielen, + uri_in, uri_out, + flags, dname, bandwidth); + if (ret < 0) + goto error; + return ret; + } virLibConnError (dconn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(dconn); return -1; } @@ -2451,18 +2839,31 @@ virDomainMigratePerform (virDomainPtr do virConnectPtr conn; DEBUG("domain=%p, cookie=%p, cookielen=%d, uri=%s, flags=%lu, dname=%s, bandwidth=%lu", domain, cookie, cookielen, uri, flags, dname, bandwidth); + virThreadResetLastError(); + if (!VIR_IS_DOMAIN (domain)) { virLibDomainError (NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); - return -1; - } - conn = domain->conn; - - if (conn->driver->domainMigratePerform) - return conn->driver->domainMigratePerform (domain, cookie, cookielen, - uri, - flags, dname, bandwidth); + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); + return -1; + } + conn = domain->conn; + + if (conn->driver->domainMigratePerform) { + int ret; + ret = conn->driver->domainMigratePerform (domain, cookie, cookielen, + uri, + flags, dname, bandwidth); + if (ret < 0) + goto error; + return ret; + } virLibDomainError (domain, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(domain->conn); return -1; } @@ -2480,17 +2881,30 @@ virDomainMigrateFinish (virConnectPtr dc { DEBUG("dconn=%p, dname=%s, cookie=%p, cookielen=%d, uri=%s, flags=%lu", dconn, dname, cookie, cookielen, uri, flags); + virThreadResetLastError(); + if (!VIR_IS_CONNECT (dconn)) { virLibConnError (NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); - return NULL; - } - - if (dconn->driver->domainMigrateFinish) - return dconn->driver->domainMigrateFinish (dconn, dname, - cookie, cookielen, - uri, flags); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); + return NULL; + } + + if (dconn->driver->domainMigrateFinish) { + virDomainPtr ret; + ret = dconn->driver->domainMigrateFinish (dconn, dname, + cookie, cookielen, + uri, flags); + if (!ret) + goto error; + return ret; + } virLibConnError (dconn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(dconn); return NULL; } @@ -2512,18 +2926,31 @@ virDomainMigratePrepare2 (virConnectPtr { DEBUG("dconn=%p, cookie=%p, cookielen=%p, uri_in=%s, uri_out=%p, flags=%lu, dname=%s, bandwidth=%lu, dom_xml=%s", dconn, cookie, cookielen, uri_in, uri_out, flags, dname, bandwidth, dom_xml); + virThreadResetLastError(); + if (!VIR_IS_CONNECT (dconn)) { virLibConnError (NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); - return -1; - } - - if (dconn->driver->domainMigratePrepare2) - return dconn->driver->domainMigratePrepare2 (dconn, cookie, cookielen, - uri_in, uri_out, - flags, dname, bandwidth, - dom_xml); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); + return -1; + } + + if (dconn->driver->domainMigratePrepare2) { + int ret; + ret = dconn->driver->domainMigratePrepare2 (dconn, cookie, cookielen, + uri_in, uri_out, + flags, dname, bandwidth, + dom_xml); + if (ret < 0) + goto error; + return ret; + } virLibConnError (dconn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(dconn); return -1; } @@ -2542,18 +2969,31 @@ virDomainMigrateFinish2 (virConnectPtr d { DEBUG("dconn=%p, dname=%s, cookie=%p, cookielen=%d, uri=%s, flags=%lu, retcode=%d", dconn, dname, cookie, cookielen, uri, flags, retcode); + virThreadResetLastError(); + if (!VIR_IS_CONNECT (dconn)) { virLibConnError (NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); - return NULL; - } - - if (dconn->driver->domainMigrateFinish2) - return dconn->driver->domainMigrateFinish2 (dconn, dname, - cookie, cookielen, - uri, flags, - retcode); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); + return NULL; + } + + if (dconn->driver->domainMigrateFinish2) { + virDomainPtr ret; + ret = dconn->driver->domainMigrateFinish2 (dconn, dname, + cookie, cookielen, + uri, flags, + retcode); + if (!ret) + goto error; + return ret; + } virLibConnError (dconn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(dconn); return NULL; } @@ -2572,19 +3012,32 @@ virNodeGetInfo(virConnectPtr conn, virNo { DEBUG("conn=%p, info=%p", conn, info); - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (-1); } if (info == NULL) { virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (-1); - } - - if (conn->driver->nodeGetInfo) - return conn->driver->nodeGetInfo (conn, info); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + goto error; + } + + if (conn->driver->nodeGetInfo) { + int ret; + ret = conn->driver->nodeGetInfo (conn, info); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); return -1; } @@ -2603,15 +3056,28 @@ virConnectGetCapabilities (virConnectPtr { DEBUG("conn=%p", conn); + virThreadResetLastError(); + if (!VIR_IS_CONNECT (conn)) { virLibConnError (NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); - return NULL; - } - - if (conn->driver->getCapabilities) - return conn->driver->getCapabilities (conn); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); + return NULL; + } + + if (conn->driver->getCapabilities) { + char *ret; + ret = conn->driver->getCapabilities (conn); + if (!ret) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); return NULL; } @@ -2628,15 +3094,28 @@ virNodeGetFreeMemory(virConnectPtr conn) { DEBUG("conn=%p", conn); + virThreadResetLastError(); + if (!VIR_IS_CONNECT (conn)) { virLibConnError (NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return 0; } - if (conn->driver->getFreeMemory) - return conn->driver->getFreeMemory (conn); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + if (conn->driver->getFreeMemory) { + unsigned long long ret; + ret = conn->driver->getFreeMemory (conn); + if (ret == 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); return 0; } @@ -2656,18 +3135,28 @@ virDomainGetSchedulerType(virDomainPtr d char *schedtype; DEBUG("domain=%p, nparams=%p", domain, nparams); - if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECTED_DOMAIN(domain)) { + virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return NULL; } conn = domain->conn; if (conn->driver->domainGetSchedulerType){ schedtype = conn->driver->domainGetSchedulerType (domain, nparams); + if (!schedtype) + goto error; return schedtype; } virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(domain->conn); return NULL; } @@ -2693,16 +3182,29 @@ virDomainGetSchedulerParameters(virDomai virConnectPtr conn; DEBUG("domain=%p, params=%p, nparams=%p", domain, params, nparams); - if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); - return -1; - } - conn = domain->conn; - - if (conn->driver->domainGetSchedulerParameters) - return conn->driver->domainGetSchedulerParameters (domain, params, nparams); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECTED_DOMAIN(domain)) { + virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); + return -1; + } + conn = domain->conn; + + if (conn->driver->domainGetSchedulerParameters) { + int ret; + ret = conn->driver->domainGetSchedulerParameters (domain, params, nparams); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(domain->conn); return -1; } @@ -2725,20 +3227,33 @@ virDomainSetSchedulerParameters(virDomai virConnectPtr conn; DEBUG("domain=%p, params=%p, nparams=%d", domain, params, nparams); - if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); - return -1; - } - if (domain->conn->flags & VIR_CONNECT_RO) { - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); - return -1; - } - conn = domain->conn; - - if (conn->driver->domainSetSchedulerParameters) - return conn->driver->domainSetSchedulerParameters (domain, params, nparams); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECTED_DOMAIN(domain)) { + virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); + return -1; + } + if (domain->conn->flags & VIR_CONNECT_RO) { + virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + goto error; + } + conn = domain->conn; + + if (conn->driver->domainSetSchedulerParameters) { + int ret; + ret = conn->driver->domainSetSchedulerParameters (domain, params, nparams); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(domain->conn); return -1; } @@ -2774,25 +3289,33 @@ virDomainBlockStats (virDomainPtr dom, c struct _virDomainBlockStats stats2 = { -1, -1, -1, -1, -1 }; DEBUG("domain=%p, path=%s, stats=%p, size=%zi", dom, path, stats, size); + virThreadResetLastError(); + + if (!VIR_IS_CONNECTED_DOMAIN (dom)) { + virLibDomainError (NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); + return -1; + } if (!stats || size > sizeof stats2) { virLibDomainError (dom, VIR_ERR_INVALID_ARG, __FUNCTION__); - return -1; - } - if (!VIR_IS_CONNECTED_DOMAIN (dom)) { - virLibDomainError (NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); - return -1; + goto error; } conn = dom->conn; if (conn->driver->domainBlockStats) { if (conn->driver->domainBlockStats (dom, path, &stats2) == -1) - return -1; + goto error; memcpy (stats, &stats2, size); return 0; } virLibDomainError (dom, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(dom->conn); return -1; } @@ -2826,25 +3349,33 @@ virDomainInterfaceStats (virDomainPtr do -1, -1, -1, -1 }; DEBUG("domain=%p, path=%s, stats=%p, size=%zi", dom, path, stats, size); + virThreadResetLastError(); + + if (!VIR_IS_CONNECTED_DOMAIN (dom)) { + virLibDomainError (NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); + return -1; + } if (!stats || size > sizeof stats2) { virLibDomainError (dom, VIR_ERR_INVALID_ARG, __FUNCTION__); - return -1; - } - if (!VIR_IS_CONNECTED_DOMAIN (dom)) { - virLibDomainError (NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); - return -1; + goto error; } conn = dom->conn; if (conn->driver->domainInterfaceStats) { if (conn->driver->domainInterfaceStats (dom, path, &stats2) == -1) - return -1; + goto error; memcpy (stats, &stats2, size); return 0; } virLibDomainError (dom, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(dom->conn); return -1; } @@ -2899,8 +3430,12 @@ virDomainBlockPeek (virDomainPtr dom, DEBUG("domain=%p, path=%s, offset=%lld, size=%zi, buffer=%p", dom, path, offset, size, buffer); + virThreadResetLastError(); + if (!VIR_IS_CONNECTED_DOMAIN (dom)) { virLibDomainError (NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return -1; } conn = dom->conn; @@ -2908,27 +3443,36 @@ virDomainBlockPeek (virDomainPtr dom, if (!path) { virLibDomainError (dom, VIR_ERR_INVALID_ARG, _("path is NULL")); - return -1; + goto error; } if (flags != 0) { virLibDomainError (dom, VIR_ERR_INVALID_ARG, _("flags must be zero")); - return -1; + goto error; } /* Allow size == 0 as an access test. */ if (size > 0 && !buffer) { virLibDomainError (dom, VIR_ERR_INVALID_ARG, _("buffer is NULL")); - return -1; - } - - if (conn->driver->domainBlockPeek) - return conn->driver->domainBlockPeek (dom, path, offset, size, - buffer, flags); + goto error; + } + + if (conn->driver->domainBlockPeek) { + int ret; + ret =conn->driver->domainBlockPeek (dom, path, offset, size, + buffer, flags); + if (ret < 0) + goto error; + return ret; + } virLibDomainError (dom, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(dom->conn); return -1; } @@ -2974,8 +3518,12 @@ virDomainMemoryPeek (virDomainPtr dom, DEBUG ("domain=%p, start=%lld, size=%zi, buffer=%p, flags=%d", dom, start, size, buffer, flags); + virThreadResetLastError(); + if (!VIR_IS_CONNECTED_DOMAIN (dom)) { virLibDomainError (NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return -1; } conn = dom->conn; @@ -3004,21 +3552,30 @@ virDomainMemoryPeek (virDomainPtr dom, if (flags != VIR_MEMORY_VIRTUAL) { virLibDomainError (dom, VIR_ERR_INVALID_ARG, _("flags parameter must be VIR_MEMORY_VIRTUAL")); - return -1; + goto error; } /* Allow size == 0 as an access test. */ if (size > 0 && !buffer) { virLibDomainError (dom, VIR_ERR_INVALID_ARG, _("buffer is NULL but size is non-zero")); - return -1; - } - - if (conn->driver->domainMemoryPeek) - return conn->driver->domainMemoryPeek (dom, start, size, - buffer, flags); + goto error; + } + + if (conn->driver->domainMemoryPeek) { + int ret; + ret = conn->driver->domainMemoryPeek (dom, start, size, + buffer, flags); + if (ret < 0) + goto error; + return ret; + } virLibDomainError (dom, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(dom->conn); return -1; } @@ -3044,23 +3601,36 @@ virDomainDefineXML(virConnectPtr conn, c virDomainDefineXML(virConnectPtr conn, const char *xml) { DEBUG("conn=%p, xml=%s", conn, xml); - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (NULL); } if (conn->flags & VIR_CONNECT_RO) { virLibConnError(conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); - return (NULL); + goto error; } if (xml == NULL) { virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (NULL); - } - - if (conn->driver->domainDefineXML) - return conn->driver->domainDefineXML (conn, xml); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + goto error; + } + + if (conn->driver->domainDefineXML) { + virDomainPtr ret; + ret = conn->driver->domainDefineXML (conn, xml); + if (!ret) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); return NULL; } @@ -3077,20 +3647,33 @@ virDomainUndefine(virDomainPtr domain) { virConnectPtr conn; DEBUG("domain=%p", domain); - if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); - return (-1); - } - conn = domain->conn; - if (conn->flags & VIR_CONNECT_RO) { - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); - return (-1); - } - - if (conn->driver->domainUndefine) - return conn->driver->domainUndefine (domain); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECTED_DOMAIN(domain)) { + virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); + return (-1); + } + conn = domain->conn; + if (conn->flags & VIR_CONNECT_RO) { + virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + goto error; + } + + if (conn->driver->domainUndefine) { + int ret; + ret = conn->driver->domainUndefine (domain); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(domain->conn); return -1; } @@ -3107,15 +3690,28 @@ virConnectNumOfDefinedDomains(virConnect { DEBUG("conn=%p", conn); - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); - return (-1); - } - - if (conn->driver->numOfDefinedDomains) - return conn->driver->numOfDefinedDomains (conn); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); + return (-1); + } + + if (conn->driver->numOfDefinedDomains) { + int ret; + ret = conn->driver->numOfDefinedDomains (conn); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); return -1; } @@ -3135,20 +3731,33 @@ virConnectListDefinedDomains(virConnectP int maxnames) { DEBUG("conn=%p, names=%p, maxnames=%d", conn, names, maxnames); - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (-1); } if ((names == NULL) || (maxnames < 0)) { virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (-1); - } - - if (conn->driver->listDefinedDomains) - return conn->driver->listDefinedDomains (conn, names, maxnames); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + goto error; + } + + if (conn->driver->listDefinedDomains) { + int ret; + ret = conn->driver->listDefinedDomains (conn, names, maxnames); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); return -1; } @@ -3166,24 +3775,33 @@ virDomainCreate(virDomainPtr domain) { virConnectPtr conn; DEBUG("domain=%p", domain); - if (domain == NULL) { - TODO - return (-1); - } - if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); - return (-1); - } - conn = domain->conn; - if (conn->flags & VIR_CONNECT_RO) { - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); - return (-1); - } - - if (conn->driver->domainCreate) - return conn->driver->domainCreate (domain); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECTED_DOMAIN(domain)) { + virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); + return (-1); + } + conn = domain->conn; + if (conn->flags & VIR_CONNECT_RO) { + virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + goto error; + } + + if (conn->driver->domainCreate) { + int ret; + ret = conn->driver->domainCreate (domain); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(domain->conn); return -1; } @@ -3205,21 +3823,34 @@ virDomainGetAutostart(virDomainPtr domai virConnectPtr conn; DEBUG("domain=%p, autostart=%p", domain, autostart); - if (!VIR_IS_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_DOMAIN(domain)) { + virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); return (-1); } if (!autostart) { virLibDomainError(domain, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (-1); - } - - conn = domain->conn; - - if (conn->driver->domainGetAutostart) - return conn->driver->domainGetAutostart (domain, autostart); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + goto error; + } + + conn = domain->conn; + + if (conn->driver->domainGetAutostart) { + int ret; + ret = conn->driver->domainGetAutostart (domain, autostart); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(domain->conn); return -1; } @@ -3240,17 +3871,30 @@ virDomainSetAutostart(virDomainPtr domai virConnectPtr conn; DEBUG("domain=%p, autostart=%d", domain, autostart); - if (!VIR_IS_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); - return (-1); - } - - conn = domain->conn; - - if (conn->driver->domainSetAutostart) - return conn->driver->domainSetAutostart (domain, autostart); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_DOMAIN(domain)) { + virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); + return (-1); + } + + conn = domain->conn; + + if (conn->driver->domainSetAutostart) { + int ret; + ret = conn->driver->domainSetAutostart (domain, autostart); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(domain->conn); return -1; } @@ -3273,29 +3917,38 @@ virDomainSetVcpus(virDomainPtr domain, u virConnectPtr conn; DEBUG("domain=%p, nvcpus=%u", domain, nvcpus); - if (domain == NULL) { - TODO - return (-1); - } - if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); - return (-1); - } - if (domain->conn->flags & VIR_CONNECT_RO) { - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); - return (-1); + virThreadResetLastError(); + + if (!VIR_IS_CONNECTED_DOMAIN(domain)) { + virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); + return (-1); + } + if (domain->conn->flags & VIR_CONNECT_RO) { + virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + goto error; } if (nvcpus < 1) { virLibDomainError(domain, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (-1); - } - conn = domain->conn; - - if (conn->driver->domainSetVcpus) - return conn->driver->domainSetVcpus (domain, nvcpus); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + goto error; + } + conn = domain->conn; + + if (conn->driver->domainSetVcpus) { + int ret; + ret = conn->driver->domainSetVcpus (domain, nvcpus); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(domain->conn); return -1; } @@ -3324,30 +3977,39 @@ virDomainPinVcpu(virDomainPtr domain, un virConnectPtr conn; DEBUG("domain=%p, vcpu=%u, cpumap=%p, maplen=%d", domain, vcpu, cpumap, maplen); - if (domain == NULL) { - TODO - return (-1); - } - if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); - return (-1); - } - if (domain->conn->flags & VIR_CONNECT_RO) { - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); - return (-1); + virThreadResetLastError(); + + if (!VIR_IS_CONNECTED_DOMAIN(domain)) { + virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); + return (-1); + } + if (domain->conn->flags & VIR_CONNECT_RO) { + virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + goto error; } if ((vcpu > 32000) || (cpumap == NULL) || (maplen < 1)) { virLibDomainError(domain, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (-1); - } - - conn = domain->conn; - - if (conn->driver->domainPinVcpu) - return conn->driver->domainPinVcpu (domain, vcpu, cpumap, maplen); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + goto error; + } + + conn = domain->conn; + + if (conn->driver->domainPinVcpu) { + int ret; + ret = conn->driver->domainPinVcpu (domain, vcpu, cpumap, maplen); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(domain->conn); return -1; } @@ -3379,30 +4041,39 @@ virDomainGetVcpus(virDomainPtr domain, v virConnectPtr conn; DEBUG("domain=%p, info=%p, maxinfo=%d, cpumaps=%p, maplen=%d", domain, info, maxinfo, cpumaps, maplen); - if (domain == NULL) { - TODO - return (-1); - } - if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECTED_DOMAIN(domain)) { + virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (-1); } if ((info == NULL) || (maxinfo < 1)) { virLibDomainError(domain, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (-1); + goto error; } if (cpumaps != NULL && maplen < 1) { virLibDomainError(domain, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (-1); - } - - conn = domain->conn; - - if (conn->driver->domainGetVcpus) - return conn->driver->domainGetVcpus (domain, info, maxinfo, - cpumaps, maplen); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + goto error; + } + + conn = domain->conn; + + if (conn->driver->domainGetVcpus) { + int ret; + ret = conn->driver->domainGetVcpus (domain, info, maxinfo, + cpumaps, maplen); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(domain->conn); return -1; } @@ -3424,17 +4095,30 @@ virDomainGetMaxVcpus(virDomainPtr domain virConnectPtr conn; DEBUG("domain=%p", domain); - if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); - return (-1); - } - - conn = domain->conn; - - if (conn->driver->domainGetMaxVcpus) - return conn->driver->domainGetMaxVcpus (domain); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECTED_DOMAIN(domain)) { + virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); + return (-1); + } + + conn = domain->conn; + + if (conn->driver->domainGetMaxVcpus) { + int ret; + ret = conn->driver->domainGetMaxVcpus (domain); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(domain->conn); return -1; } @@ -3454,20 +4138,33 @@ virDomainAttachDevice(virDomainPtr domai virConnectPtr conn; DEBUG("domain=%p, xml=%s", domain, xml); - if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); - return (-1); - } - if (domain->conn->flags & VIR_CONNECT_RO) { - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); - return (-1); - } - conn = domain->conn; - - if (conn->driver->domainAttachDevice) - return conn->driver->domainAttachDevice (domain, xml); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECTED_DOMAIN(domain)) { + virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); + return (-1); + } + if (domain->conn->flags & VIR_CONNECT_RO) { + virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + goto error; + } + conn = domain->conn; + + if (conn->driver->domainAttachDevice) { + int ret; + ret = conn->driver->domainAttachDevice (domain, xml); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(domain->conn); return -1; } @@ -3486,20 +4183,33 @@ virDomainDetachDevice(virDomainPtr domai virConnectPtr conn; DEBUG("domain=%p, xml=%s", domain, xml); - if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); - return (-1); - } - if (domain->conn->flags & VIR_CONNECT_RO) { - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); - return (-1); - } - conn = domain->conn; - - if (conn->driver->domainDetachDevice) - return conn->driver->domainDetachDevice (domain, xml); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECTED_DOMAIN(domain)) { + virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); + return (-1); + } + if (domain->conn->flags & VIR_CONNECT_RO) { + virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + goto error; + } + conn = domain->conn; + + if (conn->driver->domainDetachDevice) { + int ret; + ret = conn->driver->domainDetachDevice (domain, xml); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(domain->conn); return -1; } @@ -3528,20 +4238,33 @@ virNodeGetCellsFreeMemory(virConnectPtr DEBUG("conn=%p, freeMems=%p, startCell=%d, maxCells=%d", conn, freeMems, startCell, maxCells); + virThreadResetLastError(); + if (!VIR_IS_CONNECT(conn)) { virLibConnError(conn, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (-1); } if ((freeMems == NULL) || (maxCells <= 0) || (startCell < 0)) { virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (-1); - } - - if (conn->driver->nodeGetCellsFreeMemory) - return conn->driver->nodeGetCellsFreeMemory (conn, freeMems, startCell, maxCells); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + goto error; + } + + if (conn->driver->nodeGetCellsFreeMemory) { + int ret; + ret = conn->driver->nodeGetCellsFreeMemory (conn, freeMems, startCell, maxCells); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); return -1; } @@ -3564,8 +4287,12 @@ virNetworkGetConnect (virNetworkPtr net) { DEBUG("net=%p", net); + virThreadResetLastError(); + if (!VIR_IS_NETWORK (net)) { virLibNetworkError (NULL, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); return NULL; } return net->conn; @@ -3584,15 +4311,28 @@ virConnectNumOfNetworks(virConnectPtr co { DEBUG("conn=%p", conn); - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); - return (-1); - } - - if (conn->networkDriver && conn->networkDriver->numOfNetworks) - return conn->networkDriver->numOfNetworks (conn); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); + return (-1); + } + + if (conn->networkDriver && conn->networkDriver->numOfNetworks) { + int ret; + ret = conn->networkDriver->numOfNetworks (conn); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); return -1; } @@ -3611,20 +4351,33 @@ virConnectListNetworks(virConnectPtr con { DEBUG("conn=%p, names=%p, maxnames=%d", conn, names, maxnames); - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (-1); } if ((names == NULL) || (maxnames < 0)) { virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (-1); - } - - if (conn->networkDriver && conn->networkDriver->listNetworks) - return conn->networkDriver->listNetworks (conn, names, maxnames); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + goto error; + } + + if (conn->networkDriver && conn->networkDriver->listNetworks) { + int ret; + ret = conn->networkDriver->listNetworks (conn, names, maxnames); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); return -1; } @@ -3641,15 +4394,28 @@ virConnectNumOfDefinedNetworks(virConnec { DEBUG("conn=%p", conn); - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); - return (-1); - } - - if (conn->networkDriver && conn->networkDriver->numOfDefinedNetworks) - return conn->networkDriver->numOfDefinedNetworks (conn); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); + return (-1); + } + + if (conn->networkDriver && conn->networkDriver->numOfDefinedNetworks) { + int ret; + ret = conn->networkDriver->numOfDefinedNetworks (conn); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); return -1; } @@ -3669,21 +4435,34 @@ virConnectListDefinedNetworks(virConnect { DEBUG("conn=%p, names=%p, maxnames=%d", conn, names, maxnames); - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (-1); } if ((names == NULL) || (maxnames < 0)) { virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (-1); - } - - if (conn->networkDriver && conn->networkDriver->listDefinedNetworks) - return conn->networkDriver->listDefinedNetworks (conn, - names, maxnames); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + goto error; + } + + if (conn->networkDriver && conn->networkDriver->listDefinedNetworks) { + int ret; + ret = conn->networkDriver->listDefinedNetworks (conn, + names, maxnames); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); return -1; } @@ -3702,19 +4481,32 @@ virNetworkLookupByName(virConnectPtr con { DEBUG("conn=%p, name=%s", conn, name); - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (NULL); } if (name == NULL) { virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (NULL); - } - - if (conn->networkDriver && conn->networkDriver->networkLookupByName) - return conn->networkDriver->networkLookupByName (conn, name); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + goto error; + } + + if (conn->networkDriver && conn->networkDriver->networkLookupByName) { + virNetworkPtr ret; + ret = conn->networkDriver->networkLookupByName (conn, name); + if (!ret) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); return NULL; } @@ -3733,19 +4525,32 @@ virNetworkLookupByUUID(virConnectPtr con { DEBUG("conn=%p, uuid=%s", conn, uuid); - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (NULL); } if (uuid == NULL) { virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (NULL); - } - - if (conn->networkDriver && conn->networkDriver->networkLookupByUUID) - return conn->networkDriver->networkLookupByUUID (conn, uuid); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + goto error; + } + + if (conn->networkDriver && conn->networkDriver->networkLookupByUUID){ + virNetworkPtr ret; + ret = conn->networkDriver->networkLookupByUUID (conn, uuid); + if (!ret) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); return NULL; } @@ -3767,13 +4572,17 @@ virNetworkLookupByUUIDString(virConnectP int ret; DEBUG("conn=%p, uuidstr=%s", conn, uuidstr); - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (NULL); } if (uuidstr == NULL) { virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (NULL); + goto error; } /* XXX: sexpr_uuid() also supports 'xxxx-xxxx-xxxx-xxxx' format. @@ -3792,12 +4601,17 @@ virNetworkLookupByUUIDString(virConnectP if (ret!=VIR_UUID_BUFLEN) { virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (NULL); + goto error; } for (i = 0; i < VIR_UUID_BUFLEN; i++) uuid[i] = raw[i] & 0xFF; return virNetworkLookupByUUID(conn, &uuid[0]); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); + return NULL; } /** @@ -3815,23 +4629,36 @@ virNetworkCreateXML(virConnectPtr conn, { DEBUG("conn=%p, xmlDesc=%s", conn, xmlDesc); - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (NULL); } if (xmlDesc == NULL) { virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (NULL); + goto error; } if (conn->flags & VIR_CONNECT_RO) { virLibConnError(conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); - return (NULL); - } - - if (conn->networkDriver && conn->networkDriver->networkCreateXML) - return conn->networkDriver->networkCreateXML (conn, xmlDesc); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + goto error; + } + + if (conn->networkDriver && conn->networkDriver->networkCreateXML) { + virNetworkPtr ret; + ret = conn->networkDriver->networkCreateXML (conn, xmlDesc); + if (!ret) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); return NULL; } @@ -3849,23 +4676,36 @@ virNetworkDefineXML(virConnectPtr conn, { DEBUG("conn=%p, xml=%s", conn, xml); - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (NULL); } if (conn->flags & VIR_CONNECT_RO) { virLibConnError(conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); - return (NULL); + goto error; } if (xml == NULL) { virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (NULL); - } - - if (conn->networkDriver && conn->networkDriver->networkDefineXML) - return conn->networkDriver->networkDefineXML (conn, xml); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + goto error; + } + + if (conn->networkDriver && conn->networkDriver->networkDefineXML) { + virNetworkPtr ret; + ret = conn->networkDriver->networkDefineXML (conn, xml); + if (!ret) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); return NULL; } @@ -3882,20 +4722,33 @@ virNetworkUndefine(virNetworkPtr network virConnectPtr conn; DEBUG("network=%p", network); + virThreadResetLastError(); + if (!VIR_IS_CONNECTED_NETWORK(network)) { virLibNetworkError(NULL, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (-1); } conn = network->conn; if (conn->flags & VIR_CONNECT_RO) { virLibNetworkError(network, VIR_ERR_OPERATION_DENIED, __FUNCTION__); - return (-1); - } - - if (conn->networkDriver && conn->networkDriver->networkUndefine) - return conn->networkDriver->networkUndefine (network); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + goto error; + } + + if (conn->networkDriver && conn->networkDriver->networkUndefine) { + int ret; + ret = conn->networkDriver->networkUndefine (network); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(network->conn); return -1; } @@ -3914,24 +4767,33 @@ virNetworkCreate(virNetworkPtr network) virConnectPtr conn; DEBUG("network=%p", network); - if (network == NULL) { - TODO - return (-1); - } + virThreadResetLastError(); + if (!VIR_IS_CONNECTED_NETWORK(network)) { virLibNetworkError(NULL, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (-1); } conn = network->conn; if (conn->flags & VIR_CONNECT_RO) { virLibNetworkError(network, VIR_ERR_OPERATION_DENIED, __FUNCTION__); - return (-1); - } - - if (conn->networkDriver && conn->networkDriver->networkCreate) - return conn->networkDriver->networkCreate (network); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + goto error; + } + + if (conn->networkDriver && conn->networkDriver->networkCreate) { + int ret; + ret = conn->networkDriver->networkCreate (network); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(network->conn); return -1; } @@ -3952,21 +4814,34 @@ virNetworkDestroy(virNetworkPtr network) virConnectPtr conn; DEBUG("network=%p", network); + virThreadResetLastError(); + if (!VIR_IS_CONNECTED_NETWORK(network)) { virLibNetworkError(NULL, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (-1); } conn = network->conn; if (conn->flags & VIR_CONNECT_RO) { virLibNetworkError(network, VIR_ERR_OPERATION_DENIED, __FUNCTION__); - return (-1); - } - - if (conn->networkDriver && conn->networkDriver->networkDestroy) - return conn->networkDriver->networkDestroy (network); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + goto error; + } + + if (conn->networkDriver && conn->networkDriver->networkDestroy) { + int ret; + ret = conn->networkDriver->networkDestroy (network); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(network->conn); return -1; } @@ -3984,12 +4859,19 @@ virNetworkFree(virNetworkPtr network) { DEBUG("network=%p", network); - if (!VIR_IS_NETWORK(network)) { - virLibNetworkError(NULL, VIR_ERR_INVALID_NETWORK, __FUNCTION__); - return (-1); - } - if (virUnrefNetwork(network) < 0) - return (-1); + virThreadResetLastError(); + + if (!VIR_IS_NETWORK(network)) { + virLibNetworkError(NULL, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); + return (-1); + } + if (virUnrefNetwork(network) < 0) { + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); + return (-1); + } return(0); } @@ -4007,8 +4889,12 @@ virNetworkGetName(virNetworkPtr network) { DEBUG("network=%p", network); - if (!VIR_IS_NETWORK(network)) { - virLibNetworkError(NULL, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_NETWORK(network)) { + virLibNetworkError(NULL, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); return (NULL); } return (network->name); @@ -4028,18 +4914,27 @@ virNetworkGetUUID(virNetworkPtr network, { DEBUG("network=%p, uuid=%p", network, uuid); - if (!VIR_IS_NETWORK(network)) { - virLibNetworkError(NULL, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_NETWORK(network)) { + virLibNetworkError(NULL, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); return (-1); } if (uuid == NULL) { virLibNetworkError(network, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (-1); + goto error; } memcpy(uuid, &network->uuid[0], VIR_UUID_BUFLEN); return (0); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(network->conn); + return -1; } /** @@ -4058,13 +4953,17 @@ virNetworkGetUUIDString(virNetworkPtr ne unsigned char uuid[VIR_UUID_BUFLEN]; DEBUG("network=%p, buf=%p", network, buf); - if (!VIR_IS_NETWORK(network)) { - virLibNetworkError(NULL, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_NETWORK(network)) { + virLibNetworkError(NULL, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); return (-1); } if (buf == NULL) { virLibNetworkError(network, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (-1); + goto error; } if (virNetworkGetUUID(network, &uuid[0])) @@ -4072,6 +4971,11 @@ virNetworkGetUUIDString(virNetworkPtr ne virUUIDFormat(uuid, buf); return (0); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(network->conn); + return -1; } /** @@ -4091,21 +4995,34 @@ virNetworkGetXMLDesc(virNetworkPtr netwo virConnectPtr conn; DEBUG("network=%p, flags=%d", network, flags); - if (!VIR_IS_NETWORK(network)) { - virLibNetworkError(NULL, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_NETWORK(network)) { + virLibNetworkError(NULL, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); return (NULL); } if (flags != 0) { virLibNetworkError(network, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (NULL); + goto error; } conn = network->conn; - if (conn->networkDriver && conn->networkDriver->networkDumpXML) - return conn->networkDriver->networkDumpXML (network, flags); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + if (conn->networkDriver && conn->networkDriver->networkDumpXML) { + char *ret; + ret = conn->networkDriver->networkDumpXML (network, flags); + if (!ret) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(network->conn); return NULL; } @@ -4125,17 +5042,30 @@ virNetworkGetBridgeName(virNetworkPtr ne virConnectPtr conn; DEBUG("network=%p", network); - if (!VIR_IS_NETWORK(network)) { - virLibNetworkError(NULL, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_NETWORK(network)) { + virLibNetworkError(NULL, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); return (NULL); } conn = network->conn; - if (conn->networkDriver && conn->networkDriver->networkGetBridgeName) - return conn->networkDriver->networkGetBridgeName (network); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + if (conn->networkDriver && conn->networkDriver->networkGetBridgeName) { + char *ret; + ret = conn->networkDriver->networkGetBridgeName (network); + if (!ret) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(network->conn); return NULL; } @@ -4157,21 +5087,34 @@ virNetworkGetAutostart(virNetworkPtr net virConnectPtr conn; DEBUG("network=%p, autostart=%p", network, autostart); - if (!VIR_IS_NETWORK(network)) { - virLibNetworkError(NULL, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_NETWORK(network)) { + virLibNetworkError(NULL, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); return (-1); } if (!autostart) { virLibNetworkError(network, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (-1); + goto error; } conn = network->conn; - if (conn->networkDriver && conn->networkDriver->networkGetAutostart) - return conn->networkDriver->networkGetAutostart (network, autostart); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + if (conn->networkDriver && conn->networkDriver->networkGetAutostart) { + int ret; + ret = conn->networkDriver->networkGetAutostart (network, autostart); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(network->conn); return -1; } @@ -4192,17 +5135,30 @@ virNetworkSetAutostart(virNetworkPtr net virConnectPtr conn; DEBUG("network=%p, autostart=%d", network, autostart); - if (!VIR_IS_NETWORK(network)) { - virLibNetworkError(NULL, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_NETWORK(network)) { + virLibNetworkError(NULL, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); return (-1); } conn = network->conn; - if (conn->networkDriver && conn->networkDriver->networkSetAutostart) - return conn->networkDriver->networkSetAutostart (network, autostart); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + if (conn->networkDriver && conn->networkDriver->networkSetAutostart) { + int ret; + ret = conn->networkDriver->networkSetAutostart (network, autostart); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(network->conn); return -1; } @@ -4226,8 +5182,12 @@ virStoragePoolGetConnect (virStoragePool { DEBUG("pool=%p", pool); + virThreadResetLastError(); + if (!VIR_IS_STORAGE_POOL (pool)) { virLibStoragePoolError (NULL, VIR_ERR_INVALID_STORAGE_POOL, __FUNCTION__); + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); return NULL; } return pool->conn; @@ -4246,15 +5206,28 @@ virConnectNumOfStoragePools (virConnectP { DEBUG("conn=%p", conn); - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); - return (-1); - } - - if (conn->storageDriver && conn->storageDriver->numOfPools) - return conn->storageDriver->numOfPools (conn); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); + return (-1); + } + + if (conn->storageDriver && conn->storageDriver->numOfPools) { + int ret; + ret = conn->storageDriver->numOfPools (conn); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); return -1; } @@ -4277,22 +5250,34 @@ virConnectListStoragePools (virConnectPt { DEBUG("conn=%p, names=%p, maxnames=%d", conn, names, maxnames); - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (-1); } if ((names == NULL) || (maxnames < 0)) { virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (-1); - } - - if (conn->storageDriver && conn->storageDriver->listPools) - return conn->storageDriver->listPools (conn, names, maxnames); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); - return -1; - + goto error; + } + + if (conn->storageDriver && conn->storageDriver->listPools) { + int ret; + ret = conn->storageDriver->listPools (conn, names, maxnames); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); + return -1; } @@ -4309,15 +5294,28 @@ virConnectNumOfDefinedStoragePools(virCo { DEBUG("conn=%p", conn); - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); - return (-1); - } - - if (conn->storageDriver && conn->storageDriver->numOfDefinedPools) - return conn->storageDriver->numOfDefinedPools (conn); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); + return (-1); + } + + if (conn->storageDriver && conn->storageDriver->numOfDefinedPools) { + int ret; + ret = conn->storageDriver->numOfDefinedPools (conn); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); return -1; } @@ -4341,20 +5339,33 @@ virConnectListDefinedStoragePools(virCon { DEBUG("conn=%p, names=%p, maxnames=%d", conn, names, maxnames); - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (-1); } if ((names == NULL) || (maxnames < 0)) { virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (-1); - } - - if (conn->storageDriver && conn->storageDriver->listDefinedPools) - return conn->storageDriver->listDefinedPools (conn, names, maxnames); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + goto error; + } + + if (conn->storageDriver && conn->storageDriver->listDefinedPools) { + int ret; + ret = conn->storageDriver->listDefinedPools (conn, names, maxnames); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); return -1; } @@ -4386,19 +5397,34 @@ virConnectFindStoragePoolSources(virConn const char *srcSpec, unsigned int flags) { - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + DEBUG("conn=%p, type=%s, src=%s, flags=%u", conn, type ? type : "", srcSpec ? srcSpec : "", flags); + + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return NULL; } if (type == NULL) { virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); - return NULL; - } - - if (conn->storageDriver && conn->storageDriver->findPoolSources) - return conn->storageDriver->findPoolSources(conn, type, srcSpec, flags); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + goto error; + } + + if (conn->storageDriver && conn->storageDriver->findPoolSources) { + char *ret; + ret = conn->storageDriver->findPoolSources(conn, type, srcSpec, flags); + if (!ret) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); return NULL; } @@ -4418,19 +5444,32 @@ virStoragePoolLookupByName(virConnectPtr { DEBUG("conn=%p, name=%s", conn, name); - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (NULL); } if (name == NULL) { virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (NULL); - } - - if (conn->storageDriver && conn->storageDriver->poolLookupByName) - return conn->storageDriver->poolLookupByName (conn, name); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + goto error; + } + + if (conn->storageDriver && conn->storageDriver->poolLookupByName) { + virStoragePoolPtr ret; + ret = conn->storageDriver->poolLookupByName (conn, name); + if (!ret) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); return NULL; } @@ -4450,21 +5489,33 @@ virStoragePoolLookupByUUID(virConnectPtr { DEBUG("conn=%p, uuid=%s", conn, uuid); - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (NULL); } if (uuid == NULL) { virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (NULL); - } - - if (conn->storageDriver && conn->storageDriver->poolLookupByUUID) - return conn->storageDriver->poolLookupByUUID (conn, uuid); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); - return NULL; - + goto error; + } + + if (conn->storageDriver && conn->storageDriver->poolLookupByUUID) { + virStoragePoolPtr ret; + ret = conn->storageDriver->poolLookupByUUID (conn, uuid); + if (!ret) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); + return NULL; } @@ -4479,26 +5530,35 @@ virStoragePoolLookupByUUID(virConnectPtr */ virStoragePoolPtr virStoragePoolLookupByUUIDString(virConnectPtr conn, - const char *uuidstr) + const char *uuidstr) { unsigned char uuid[VIR_UUID_BUFLEN]; DEBUG("conn=%p, uuidstr=%s", conn, uuidstr); - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (NULL); } if (uuidstr == NULL) { virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (NULL); + goto error; } if (virUUIDParse(uuidstr, uuid) < 0) { virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (NULL); + goto error; } return virStoragePoolLookupByUUID(conn, uuid); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); + return NULL; } @@ -4515,17 +5575,29 @@ virStoragePoolLookupByVolume(virStorageV { DEBUG("vol=%p", vol); + virThreadResetLastError(); + if (!VIR_IS_STORAGE_VOL(vol)) { virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); - return (NULL); - } - - if (vol->conn->storageDriver && vol->conn->storageDriver->poolLookupByVolume) - return vol->conn->storageDriver->poolLookupByVolume (vol); + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); + return (NULL); + } + + if (vol->conn->storageDriver && vol->conn->storageDriver->poolLookupByVolume) { + virStoragePoolPtr ret; + ret = vol->conn->storageDriver->poolLookupByVolume (vol); + if (!ret) + goto error; + return ret; + } virLibConnError (vol->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); - return NULL; - + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(vol->conn); + return NULL; } /** @@ -4547,23 +5619,36 @@ virStoragePoolCreateXML(virConnectPtr co { DEBUG("conn=%p, xmlDesc=%s", conn, xmlDesc); - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (NULL); } if (xmlDesc == NULL) { virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (NULL); + goto error; } if (conn->flags & VIR_CONNECT_RO) { virLibConnError(conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); - return (NULL); - } - - if (conn->storageDriver && conn->storageDriver->poolCreateXML) - return conn->storageDriver->poolCreateXML (conn, xmlDesc, flags); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + goto error; + } + + if (conn->storageDriver && conn->storageDriver->poolCreateXML) { + virStoragePoolPtr ret; + ret = conn->storageDriver->poolCreateXML (conn, xmlDesc, flags); + if (!ret) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); return NULL; } @@ -4585,25 +5670,37 @@ virStoragePoolDefineXML(virConnectPtr co { DEBUG("conn=%p, xml=%s", conn, xml); - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (NULL); } if (conn->flags & VIR_CONNECT_RO) { virLibConnError(conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); - return (NULL); + goto error; } if (xml == NULL) { virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (NULL); - } - - if (conn->storageDriver && conn->storageDriver->poolDefineXML) - return conn->storageDriver->poolDefineXML (conn, xml, flags); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); - return NULL; - + goto error; + } + + if (conn->storageDriver && conn->storageDriver->poolDefineXML) { + virStoragePoolPtr ret; + ret = conn->storageDriver->poolDefineXML (conn, xml, flags); + if (!ret) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); + return NULL; } /** @@ -4622,22 +5719,34 @@ virStoragePoolBuild(virStoragePoolPtr po virConnectPtr conn; DEBUG("pool=%p, flags=%u", pool, flags); + virThreadResetLastError(); + if (!VIR_IS_CONNECTED_STORAGE_POOL(pool)) { virLibStoragePoolError(NULL, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (-1); } conn = pool->conn; if (conn->flags & VIR_CONNECT_RO) { virLibStoragePoolError(pool, VIR_ERR_OPERATION_DENIED, __FUNCTION__); - return (-1); - } - - if (conn->storageDriver && conn->storageDriver->poolBuild) - return conn->storageDriver->poolBuild (pool, flags); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); - return -1; - + goto error; + } + + if (conn->storageDriver && conn->storageDriver->poolBuild) { + int ret; + ret = conn->storageDriver->poolBuild (pool, flags); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(pool->conn); + return -1; } @@ -4654,23 +5763,35 @@ virStoragePoolUndefine(virStoragePoolPtr { virConnectPtr conn; DEBUG("pool=%p", pool); + + virThreadResetLastError(); if (!VIR_IS_CONNECTED_STORAGE_POOL(pool)) { virLibStoragePoolError(NULL, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (-1); } conn = pool->conn; if (conn->flags & VIR_CONNECT_RO) { virLibStoragePoolError(pool, VIR_ERR_OPERATION_DENIED, __FUNCTION__); - return (-1); - } - - if (conn->storageDriver && conn->storageDriver->poolUndefine) - return conn->storageDriver->poolUndefine (pool); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); - return -1; - + goto error; + } + + if (conn->storageDriver && conn->storageDriver->poolUndefine) { + int ret; + ret = conn->storageDriver->poolUndefine (pool); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(pool->conn); + return -1; } @@ -4690,26 +5811,34 @@ virStoragePoolCreate(virStoragePoolPtr p virConnectPtr conn; DEBUG("pool=%p", pool); - if (pool == NULL) { - TODO; - return (-1); - } + virThreadResetLastError(); + if (!VIR_IS_CONNECTED_STORAGE_POOL(pool)) { virLibStoragePoolError(NULL, VIR_ERR_INVALID_STORAGE_POOL, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (-1); } conn = pool->conn; if (conn->flags & VIR_CONNECT_RO) { virLibStoragePoolError(pool, VIR_ERR_OPERATION_DENIED, __FUNCTION__); - return (-1); - } - - if (conn->storageDriver && conn->storageDriver->poolCreate) - return conn->storageDriver->poolCreate (pool, flags); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); - return -1; - + goto error; + } + + if (conn->storageDriver && conn->storageDriver->poolCreate) { + int ret; + ret = conn->storageDriver->poolCreate (pool, flags); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(pool->conn); + return -1; } @@ -4731,21 +5860,34 @@ virStoragePoolDestroy(virStoragePoolPtr virConnectPtr conn; DEBUG("pool=%p", pool); + virThreadResetLastError(); + if (!VIR_IS_CONNECTED_STORAGE_POOL(pool)) { virLibStoragePoolError(NULL, VIR_ERR_INVALID_STORAGE_POOL, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (-1); } conn = pool->conn; if (conn->flags & VIR_CONNECT_RO) { virLibStoragePoolError(pool, VIR_ERR_OPERATION_DENIED, __FUNCTION__); - return (-1); - } - - if (conn->storageDriver && conn->storageDriver->poolDestroy) - return conn->storageDriver->poolDestroy (pool); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + goto error; + } + + if (conn->storageDriver && conn->storageDriver->poolDestroy) { + int ret; + ret = conn->storageDriver->poolDestroy (pool); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(pool->conn); return -1; } @@ -4767,21 +5909,34 @@ virStoragePoolDelete(virStoragePoolPtr p virConnectPtr conn; DEBUG("pool=%p, flags=%u", pool, flags); + virThreadResetLastError(); + if (!VIR_IS_CONNECTED_STORAGE_POOL(pool)) { virLibStoragePoolError(NULL, VIR_ERR_INVALID_STORAGE_POOL, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (-1); } conn = pool->conn; if (conn->flags & VIR_CONNECT_RO) { virLibStoragePoolError(pool, VIR_ERR_OPERATION_DENIED, __FUNCTION__); - return (-1); - } - - if (conn->storageDriver && conn->storageDriver->poolDelete) - return conn->storageDriver->poolDelete (pool, flags); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + goto error; + } + + if (conn->storageDriver && conn->storageDriver->poolDelete) { + int ret; + ret = conn->storageDriver->poolDelete (pool, flags); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(pool->conn); return -1; } @@ -4800,12 +5955,19 @@ virStoragePoolFree(virStoragePoolPtr poo { DEBUG("pool=%p", pool); - if (!VIR_IS_STORAGE_POOL(pool)) { - virLibStoragePoolError(NULL, VIR_ERR_INVALID_STORAGE_POOL, __FUNCTION__); - return (-1); - } - if (virUnrefStoragePool(pool) < 0) - return (-1); + virThreadResetLastError(); + + if (!VIR_IS_STORAGE_POOL(pool)) { + virLibStoragePoolError(NULL, VIR_ERR_INVALID_STORAGE_POOL, __FUNCTION__); + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); + return (-1); + } + if (virUnrefStoragePool(pool) < 0) { + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); + return (-1); + } return(0); } @@ -4829,21 +5991,34 @@ virStoragePoolRefresh(virStoragePoolPtr virConnectPtr conn; DEBUG("pool=%p flags=%u", pool, flags); + virThreadResetLastError(); + if (!VIR_IS_CONNECTED_STORAGE_POOL(pool)) { virLibStoragePoolError(NULL, VIR_ERR_INVALID_STORAGE_POOL, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (-1); } conn = pool->conn; if (conn->flags & VIR_CONNECT_RO) { virLibStoragePoolError(pool, VIR_ERR_OPERATION_DENIED, __FUNCTION__); - return (-1); - } - - if (conn->storageDriver && conn->storageDriver->poolRefresh) - return conn->storageDriver->poolRefresh (pool, flags); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + goto error; + } + + if (conn->storageDriver && conn->storageDriver->poolRefresh) { + int ret; + ret = conn->storageDriver->poolRefresh (pool, flags); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(pool->conn); return -1; } @@ -4861,12 +6036,15 @@ virStoragePoolGetName(virStoragePoolPtr { DEBUG("pool=%p", pool); - if (!VIR_IS_STORAGE_POOL(pool)) { - virLibStoragePoolError(NULL, VIR_ERR_INVALID_STORAGE_POOL, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_STORAGE_POOL(pool)) { + virLibStoragePoolError(NULL, VIR_ERR_INVALID_STORAGE_POOL, __FUNCTION__); + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); return (NULL); } return (pool->name); - } @@ -4885,19 +6063,27 @@ virStoragePoolGetUUID(virStoragePoolPtr { DEBUG("pool=%p, uuid=%p", pool, uuid); - if (!VIR_IS_STORAGE_POOL(pool)) { - virLibStoragePoolError(NULL, VIR_ERR_INVALID_STORAGE_POOL, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_STORAGE_POOL(pool)) { + virLibStoragePoolError(NULL, VIR_ERR_INVALID_STORAGE_POOL, __FUNCTION__); + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); return (-1); } if (uuid == NULL) { virLibStoragePoolError(pool, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (-1); + goto error; } memcpy(uuid, &pool->uuid[0], VIR_UUID_BUFLEN); return (0); +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(pool->conn); + return -1; } /** @@ -4916,21 +6102,29 @@ virStoragePoolGetUUIDString(virStoragePo unsigned char uuid[VIR_UUID_BUFLEN]; DEBUG("pool=%p, buf=%p", pool, buf); - if (!VIR_IS_STORAGE_POOL(pool)) { - virLibStoragePoolError(NULL, VIR_ERR_INVALID_STORAGE_POOL, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_STORAGE_POOL(pool)) { + virLibStoragePoolError(NULL, VIR_ERR_INVALID_STORAGE_POOL, __FUNCTION__); + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); return (-1); } if (buf == NULL) { virLibStoragePoolError(pool, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (-1); + goto error; } if (virStoragePoolGetUUID(pool, &uuid[0])) - return (-1); + goto error; virUUIDFormat(uuid, buf); return (0); +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(pool->conn); + return -1; } @@ -4951,25 +6145,37 @@ virStoragePoolGetInfo(virStoragePoolPtr virConnectPtr conn; DEBUG("pool=%p, info=%p", pool, info); + virThreadResetLastError(); + if (!VIR_IS_CONNECTED_STORAGE_POOL(pool)) { virLibStoragePoolError(NULL, VIR_ERR_INVALID_STORAGE_POOL, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (-1); } if (info == NULL) { virLibStoragePoolError(pool, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (-1); + goto error; } memset(info, 0, sizeof(virStoragePoolInfo)); conn = pool->conn; - if (conn->storageDriver->poolGetInfo) - return conn->storageDriver->poolGetInfo (pool, info); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); - return -1; - + if (conn->storageDriver->poolGetInfo) { + int ret; + ret = conn->storageDriver->poolGetInfo (pool, info); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(pool->conn); + return -1; } @@ -4991,23 +6197,35 @@ virStoragePoolGetXMLDesc(virStoragePoolP virConnectPtr conn; DEBUG("pool=%p, flags=%u", pool, flags); - if (!VIR_IS_STORAGE_POOL(pool)) { - virLibStoragePoolError(NULL, VIR_ERR_INVALID_STORAGE_POOL, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_STORAGE_POOL(pool)) { + virLibStoragePoolError(NULL, VIR_ERR_INVALID_STORAGE_POOL, __FUNCTION__); + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); return (NULL); } if (flags != 0) { virLibStoragePoolError(pool, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (NULL); - } - - conn = pool->conn; - - if (conn->storageDriver && conn->storageDriver->poolGetXMLDesc) - return conn->storageDriver->poolGetXMLDesc (pool, flags); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); - return NULL; - + goto error; + } + + conn = pool->conn; + + if (conn->storageDriver && conn->storageDriver->poolGetXMLDesc) { + char *ret; + ret = conn->storageDriver->poolGetXMLDesc (pool, flags); + if (!ret) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(pool->conn); + return NULL; } @@ -5028,21 +6246,34 @@ virStoragePoolGetAutostart(virStoragePoo virConnectPtr conn; DEBUG("pool=%p, autostart=%p", pool, autostart); - if (!VIR_IS_STORAGE_POOL(pool)) { - virLibStoragePoolError(NULL, VIR_ERR_INVALID_STORAGE_POOL, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_STORAGE_POOL(pool)) { + virLibStoragePoolError(NULL, VIR_ERR_INVALID_STORAGE_POOL, __FUNCTION__); + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); return (-1); } if (!autostart) { virLibStoragePoolError(pool, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (-1); - } - - conn = pool->conn; - - if (conn->storageDriver && conn->storageDriver->poolGetAutostart) - return conn->storageDriver->poolGetAutostart (pool, autostart); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + goto error; + } + + conn = pool->conn; + + if (conn->storageDriver && conn->storageDriver->poolGetAutostart) { + int ret; + ret = conn->storageDriver->poolGetAutostart (pool, autostart); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(pool->conn); return -1; } @@ -5063,17 +6294,30 @@ virStoragePoolSetAutostart(virStoragePoo virConnectPtr conn; DEBUG("pool=%p, autostart=%d", pool, autostart); - if (!VIR_IS_STORAGE_POOL(pool)) { - virLibStoragePoolError(NULL, VIR_ERR_INVALID_STORAGE_POOL, __FUNCTION__); - return (-1); - } - - conn = pool->conn; - - if (conn->storageDriver && conn->storageDriver->poolSetAutostart) - return conn->storageDriver->poolSetAutostart (pool, autostart); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_STORAGE_POOL(pool)) { + virLibStoragePoolError(NULL, VIR_ERR_INVALID_STORAGE_POOL, __FUNCTION__); + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); + return (-1); + } + + conn = pool->conn; + + if (conn->storageDriver && conn->storageDriver->poolSetAutostart) { + int ret; + ret = conn->storageDriver->poolSetAutostart (pool, autostart); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(pool->conn); return -1; } @@ -5091,15 +6335,28 @@ virStoragePoolNumOfVolumes(virStoragePoo { DEBUG("pool=%p", pool); + virThreadResetLastError(); + if (!VIR_IS_STORAGE_POOL(pool)) { virLibConnError(NULL, VIR_ERR_INVALID_STORAGE_POOL, __FUNCTION__); - return (-1); - } - - if (pool->conn->storageDriver && pool->conn->storageDriver->poolNumOfVolumes) - return pool->conn->storageDriver->poolNumOfVolumes (pool); + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); + return (-1); + } + + if (pool->conn->storageDriver && pool->conn->storageDriver->poolNumOfVolumes) { + int ret; + ret = pool->conn->storageDriver->poolNumOfVolumes (pool); + if (ret < 0) + goto error; + return ret; + } virLibConnError (pool->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(pool->conn); return -1; } @@ -5122,20 +6379,33 @@ virStoragePoolListVolumes(virStoragePool { DEBUG("pool=%p, names=%p, maxnames=%d", pool, names, maxnames); + virThreadResetLastError(); + if (!VIR_IS_STORAGE_POOL(pool)) { virLibConnError(NULL, VIR_ERR_INVALID_STORAGE_POOL, __FUNCTION__); + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); return (-1); } if ((names == NULL) || (maxnames < 0)) { virLibConnError(pool->conn, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (-1); - } - - if (pool->conn->storageDriver && pool->conn->storageDriver->poolListVolumes) - return pool->conn->storageDriver->poolListVolumes (pool, names, maxnames); + goto error; + } + + if (pool->conn->storageDriver && pool->conn->storageDriver->poolListVolumes) { + int ret; + ret = pool->conn->storageDriver->poolListVolumes (pool, names, maxnames); + if (ret < 0) + goto error; + return ret; + } virLibConnError (pool->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(pool->conn); return -1; } @@ -5159,8 +6429,12 @@ virStorageVolGetConnect (virStorageVolPt { DEBUG("vol=%p", vol); + virThreadResetLastError(); + if (!VIR_IS_STORAGE_VOL (vol)) { virLibStoragePoolError (NULL, VIR_ERR_INVALID_STORAGE_VOL, __FUNCTION__); + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); return NULL; } return vol->conn; @@ -5183,19 +6457,32 @@ virStorageVolLookupByName(virStoragePool { DEBUG("pool=%p, name=%s", pool, name); - if (!VIR_IS_STORAGE_POOL(pool)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_STORAGE_POOL(pool)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); return (NULL); } if (name == NULL) { virLibConnError(pool->conn, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (NULL); - } - - if (pool->conn->storageDriver && pool->conn->storageDriver->volLookupByName) - return pool->conn->storageDriver->volLookupByName (pool, name); + goto error; + } + + if (pool->conn->storageDriver && pool->conn->storageDriver->volLookupByName) { + virStorageVolPtr ret; + ret = pool->conn->storageDriver->volLookupByName (pool, name); + if (!ret) + goto error; + return ret; + } virLibConnError (pool->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(pool->conn); return NULL; } @@ -5217,19 +6504,32 @@ virStorageVolLookupByKey(virConnectPtr c { DEBUG("conn=%p, key=%s", conn, key); - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (NULL); } if (key == NULL) { virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (NULL); - } - - if (conn->storageDriver && conn->storageDriver->volLookupByKey) - return conn->storageDriver->volLookupByKey (conn, key); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + goto error; + } + + if (conn->storageDriver && conn->storageDriver->volLookupByKey) { + virStorageVolPtr ret; + ret = conn->storageDriver->volLookupByKey (conn, key); + if (!ret) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); return NULL; } @@ -5249,19 +6549,32 @@ virStorageVolLookupByPath(virConnectPtr { DEBUG("conn=%p, path=%s", conn, path); - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (NULL); } if (path == NULL) { virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (NULL); - } - - if (conn->storageDriver && conn->storageDriver->volLookupByPath) - return conn->storageDriver->volLookupByPath (conn, path); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + goto error; + } + + if (conn->storageDriver && conn->storageDriver->volLookupByPath) { + virStorageVolPtr ret; + ret = conn->storageDriver->volLookupByPath (conn, path); + if (!ret) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); return NULL; } @@ -5280,8 +6593,12 @@ virStorageVolGetName(virStorageVolPtr vo { DEBUG("vol=%p", vol); + virThreadResetLastError(); + if (!VIR_IS_STORAGE_VOL(vol)) { virLibStorageVolError(NULL, VIR_ERR_INVALID_STORAGE_VOL, __FUNCTION__); + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); return (NULL); } return (vol->name); @@ -5303,8 +6620,12 @@ virStorageVolGetKey(virStorageVolPtr vol { DEBUG("vol=%p", vol); + virThreadResetLastError(); + if (!VIR_IS_STORAGE_VOL(vol)) { virLibStorageVolError(NULL, VIR_ERR_INVALID_STORAGE_VOL, __FUNCTION__); + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); return (NULL); } return (vol->key); @@ -5330,20 +6651,33 @@ virStorageVolCreateXML(virStoragePoolPtr { DEBUG("pool=%p, flags=%u", pool, flags); + virThreadResetLastError(); + if (!VIR_IS_STORAGE_POOL(pool)) { virLibConnError(NULL, VIR_ERR_INVALID_STORAGE_VOL, __FUNCTION__); + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); return (NULL); } if (pool->conn->flags & VIR_CONNECT_RO) { virLibConnError(pool->conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); - return (NULL); - } - - if (pool->conn->storageDriver && pool->conn->storageDriver->volCreateXML) - return pool->conn->storageDriver->volCreateXML (pool, xmldesc, flags); + goto error; + } + + if (pool->conn->storageDriver && pool->conn->storageDriver->volCreateXML) { + virStorageVolPtr ret; + ret = pool->conn->storageDriver->volCreateXML (pool, xmldesc, flags); + if (!ret) + goto error; + return ret; + } virLibConnError (pool->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(pool->conn); return NULL; } @@ -5364,21 +6698,34 @@ virStorageVolDelete(virStorageVolPtr vol virConnectPtr conn; DEBUG("vol=%p, flags=%u", vol, flags); + virThreadResetLastError(); + if (!VIR_IS_CONNECTED_STORAGE_VOL(vol)) { virLibStorageVolError(NULL, VIR_ERR_INVALID_STORAGE_VOL, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (-1); } conn = vol->conn; if (conn->flags & VIR_CONNECT_RO) { virLibStorageVolError(vol, VIR_ERR_OPERATION_DENIED, __FUNCTION__); - return (-1); - } - - if (conn->storageDriver && conn->storageDriver->volDelete) - return conn->storageDriver->volDelete (vol, flags); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + goto error; + } + + if (conn->storageDriver && conn->storageDriver->volDelete) { + int ret; + ret = conn->storageDriver->volDelete (vol, flags); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(vol->conn); return -1; } @@ -5397,12 +6744,19 @@ virStorageVolFree(virStorageVolPtr vol) { DEBUG("vol=%p", vol); + virThreadResetLastError(); + if (!VIR_IS_STORAGE_VOL(vol)) { virLibStorageVolError(NULL, VIR_ERR_INVALID_STORAGE_VOL, __FUNCTION__); - return (-1); - } - if (virUnrefStorageVol(vol) < 0) - return (-1); + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); + return (-1); + } + if (virUnrefStorageVol(vol) < 0) { + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); + return (-1); + } return(0); } @@ -5424,23 +6778,36 @@ virStorageVolGetInfo(virStorageVolPtr vo virConnectPtr conn; DEBUG("vol=%p, info=%p", vol, info); + virThreadResetLastError(); + if (!VIR_IS_CONNECTED_STORAGE_VOL(vol)) { virLibStorageVolError(NULL, VIR_ERR_INVALID_STORAGE_VOL, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (-1); } if (info == NULL) { virLibStorageVolError(vol, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (-1); + goto error; } memset(info, 0, sizeof(virStorageVolInfo)); conn = vol->conn; - if (conn->storageDriver->volGetInfo) - return conn->storageDriver->volGetInfo (vol, info); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + if (conn->storageDriver->volGetInfo){ + int ret; + ret = conn->storageDriver->volGetInfo (vol, info); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(vol->conn); return -1; } @@ -5462,23 +6829,35 @@ virStorageVolGetXMLDesc(virStorageVolPtr virConnectPtr conn; DEBUG("vol=%p, flags=%u", vol, flags); + virThreadResetLastError(); + if (!VIR_IS_STORAGE_VOL(vol)) { virLibStorageVolError(NULL, VIR_ERR_INVALID_STORAGE_VOL, __FUNCTION__); + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); return (NULL); } if (flags != 0) { virLibStorageVolError(vol, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (NULL); + goto error; } conn = vol->conn; - if (conn->storageDriver && conn->storageDriver->volGetXMLDesc) - return conn->storageDriver->volGetXMLDesc (vol, flags); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); - return NULL; - + if (conn->storageDriver && conn->storageDriver->volGetXMLDesc) { + char *ret; + ret = conn->storageDriver->volGetXMLDesc (vol, flags); + if (!ret) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(vol->conn); + return NULL; } @@ -5500,17 +6879,30 @@ virStorageVolGetPath(virStorageVolPtr vo virConnectPtr conn; DEBUG("vol=%p", vol); + virThreadResetLastError(); + if (!VIR_IS_STORAGE_VOL(vol)) { virLibStorageVolError(NULL, VIR_ERR_INVALID_STORAGE_VOL, __FUNCTION__); + /* Copy to global error object for back compatability */ + virThreadSetGlobalError(); return (NULL); } conn = vol->conn; - if (conn->storageDriver && conn->storageDriver->volGetPath) - return conn->storageDriver->volGetPath (vol); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + if (conn->storageDriver && conn->storageDriver->volGetPath) { + char *ret; + ret = conn->storageDriver->volGetPath (vol); + if (!ret) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(vol->conn); return NULL; } @@ -5535,19 +6927,32 @@ virNodeNumOfDevices(virConnectPtr conn, { DEBUG("conn=%p, cap=%s, flags=%d", conn, cap, flags); - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (-1); } if (flags != 0) { virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (-1); - } - - if (conn->deviceMonitor && conn->deviceMonitor->numOfDevices) - return conn->deviceMonitor->numOfDevices (conn, cap, flags); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + goto error; + } + + if (conn->deviceMonitor && conn->deviceMonitor->numOfDevices) { + int ret; + ret = conn->deviceMonitor->numOfDevices (conn, cap, flags); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); return -1; } @@ -5576,19 +6981,32 @@ virNodeListDevices(virConnectPtr conn, DEBUG("conn=%p, cap=%s, names=%p, maxnames=%d, flags=%d", conn, cap, names, maxnames, flags); - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (-1); } if ((flags != 0) || (names == NULL) || (maxnames < 0)) { virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (-1); - } - - if (conn->deviceMonitor && conn->deviceMonitor->listDevices) - return conn->deviceMonitor->listDevices (conn, cap, names, maxnames, flags); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + goto error; + } + + if (conn->deviceMonitor && conn->deviceMonitor->listDevices) { + int ret; + ret = conn->deviceMonitor->listDevices (conn, cap, names, maxnames, flags); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); return -1; } @@ -5606,20 +7024,33 @@ virNodeDevicePtr virNodeDeviceLookupByNa { DEBUG("conn=%p, name=%p", conn, name); - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return NULL; } if (name == NULL) { virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); - return NULL; - } - - if (conn->deviceMonitor && conn->deviceMonitor->deviceLookupByName) - return conn->deviceMonitor->deviceLookupByName (conn, name); - - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + goto error; + } + + if (conn->deviceMonitor && conn->deviceMonitor->deviceLookupByName) { + virNodeDevicePtr ret; + ret = conn->deviceMonitor->deviceLookupByName (conn, name); + if (!ret) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); return NULL; } @@ -5638,15 +7069,28 @@ char *virNodeDeviceGetXMLDesc(virNodeDev { DEBUG("dev=%p, conn=%p", dev, dev ? dev->conn : NULL); + virThreadResetLastError(); + if (!VIR_IS_CONNECTED_NODE_DEVICE(dev)) { virLibNodeDeviceError(NULL, VIR_ERR_INVALID_NODE_DEVICE, __FUNCTION__); - return NULL; - } - - if (dev->conn->deviceMonitor && dev->conn->deviceMonitor->deviceDumpXML) - return dev->conn->deviceMonitor->deviceDumpXML (dev, flags); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); + return NULL; + } + + if (dev->conn->deviceMonitor && dev->conn->deviceMonitor->deviceDumpXML) { + char *ret; + ret = dev->conn->deviceMonitor->deviceDumpXML (dev, flags); + if (!ret) + goto error; + return ret; + } virLibConnError (dev->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(dev->conn); return NULL; } @@ -5684,8 +7128,12 @@ const char *virNodeDeviceGetParent(virNo { DEBUG("dev=%p, conn=%p", dev, dev ? dev->conn : NULL); + virThreadResetLastError(); + if (!VIR_IS_CONNECTED_NODE_DEVICE(dev)) { virLibNodeDeviceError(NULL, VIR_ERR_INVALID_NODE_DEVICE, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return NULL; } @@ -5712,15 +7160,28 @@ int virNodeDeviceNumOfCaps(virNodeDevice { DEBUG("dev=%p, conn=%p", dev, dev ? dev->conn : NULL); + virThreadResetLastError(); + if (!VIR_IS_CONNECTED_NODE_DEVICE(dev)) { virLibNodeDeviceError(NULL, VIR_ERR_INVALID_NODE_DEVICE, __FUNCTION__); - return -1; - } - - if (dev->conn->deviceMonitor && dev->conn->deviceMonitor->deviceNumOfCaps) - return dev->conn->deviceMonitor->deviceNumOfCaps (dev); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); + return -1; + } + + if (dev->conn->deviceMonitor && dev->conn->deviceMonitor->deviceNumOfCaps) { + int ret; + ret = dev->conn->deviceMonitor->deviceNumOfCaps (dev); + if (ret < 0) + goto error; + return ret; + } virLibConnError (dev->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(dev->conn); return -1; } @@ -5741,15 +7202,28 @@ int virNodeDeviceListCaps(virNodeDeviceP DEBUG("dev=%p, conn=%p, names=%p, maxnames=%d", dev, dev ? dev->conn : NULL, names, maxnames); + virThreadResetLastError(); + if (!VIR_IS_CONNECTED_NODE_DEVICE(dev)) { virLibNodeDeviceError(NULL, VIR_ERR_INVALID_NODE_DEVICE, __FUNCTION__); - return -1; - } - - if (dev->conn->deviceMonitor && dev->conn->deviceMonitor->deviceListCaps) - return dev->conn->deviceMonitor->deviceListCaps (dev, names, maxnames); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); + return -1; + } + + if (dev->conn->deviceMonitor && dev->conn->deviceMonitor->deviceListCaps) { + int ret; + ret = dev->conn->deviceMonitor->deviceListCaps (dev, names, maxnames); + if (ret < 0) + goto error; + return ret; + } virLibConnError (dev->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(dev->conn); return -1; } @@ -5767,12 +7241,19 @@ int virNodeDeviceFree(virNodeDevicePtr d { DEBUG("dev=%p, conn=%p", dev, dev ? dev->conn : NULL); + virThreadResetLastError(); + if (!VIR_IS_CONNECTED_NODE_DEVICE(dev)) { virLibNodeDeviceError(NULL, VIR_ERR_INVALID_NODE_DEVICE, __FUNCTION__); - return (-1); - } - if (virUnrefNodeDevice(dev) < 0) - return (-1); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); + return (-1); + } + if (virUnrefNodeDevice(dev) < 0) { + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); + return (-1); + } return(0); } @@ -5799,18 +7280,32 @@ virConnectDomainEventRegister(virConnect void *opaque, virFreeCallback freecb) { - - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + DEBUG("conn=%p, cb=%p, opaque=%p, freecb=%p", conn, cb, opaque, freecb); + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (-1); } if (cb == NULL) { virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (-1); - } - - if ((conn->driver) && (conn->driver->domainEventRegister)) - return conn->driver->domainEventRegister (conn, cb, opaque, freecb); + goto error; + } + + if ((conn->driver) && (conn->driver->domainEventRegister)) { + int ret; + ret = conn->driver->domainEventRegister (conn, cb, opaque, freecb); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError(conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); return -1; } @@ -5829,19 +7324,33 @@ virConnectDomainEventDeregister(virConne virConnectDomainEventDeregister(virConnectPtr conn, virConnectDomainEventCallback cb) { - - if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + DEBUG("conn=%p, cb=%p", conn, cb); + + virThreadResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + /* Copy to connection error object for back compatability */ + virThreadSetGlobalError(); return (-1); } if (cb == NULL) { virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); - return (-1); - } - if ((conn->driver) && (conn->driver->domainEventDeregister)) - return conn->driver->domainEventDeregister (conn, cb); - - return -1; -} - - + goto error; + } + if ((conn->driver) && (conn->driver->domainEventDeregister)) { + int ret; + ret = conn->driver->domainEventDeregister (conn, cb); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError(conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); +error: + /* Copy to connection error object for back compatability */ + virThreadSetConnError(conn); + return -1; +} + + diff --git a/src/libvirt_sym.version.in b/src/libvirt_sym.version.in --- a/src/libvirt_sym.version.in +++ b/src/libvirt_sym.version.in @@ -249,7 +249,13 @@ LIBVIRT_0.5.0 { } LIBVIRT_0.4.5; -/* no new entry point in 0.5.1 */ +LIBVIRT_0.5.2 { + global: + virThreadGetLastError; + virThreadCopyLastError; + virThreadResetLastError; +} LIBVIRT_0.5.0; + /* .... define new API here using predicted next version number .... */ diff --git a/src/virterror.c b/src/virterror.c --- a/src/virterror.c +++ b/src/virterror.c @@ -17,11 +17,14 @@ #include "virterror_internal.h" #include "datatypes.h" +#include "memory.h" -virError virLastErr = /* the last error */ +static virError virLastErr = /* the last error */ { .code = 0, .domain = 0, .message = NULL, .level = VIR_ERR_NONE, .conn = NULL, .dom = NULL, .str1 = NULL, .str2 = NULL, .str3 = NULL, .int1 = 0, .int2 = 0, .net = NULL }; +static PTHREAD_MUTEX_T(virLastErrLock); + virErrorFunc virErrorHandler = NULL; /* global error handler */ void *virUserData = NULL; /* associated data */ @@ -62,12 +65,49 @@ void *virUserData = NULL; /* asso }} \ } -/* +static int +virCopyError(virErrorPtr from, + virErrorPtr to) +{ + int ret = 0; + if (!to) + return 0; + virResetError(to); + if (!from) + return 0; + to->code = from->code; + to->domain = from->domain; + to->level = from->level; + if (from->message && !(to->message = strdup(from->message))) + ret = -1; + if (from->str1 && !(to->str1 = strdup(from->str1))) + ret = -1; + if (from->str2 && !(to->str2 = strdup(from->str2))) + ret = -1; + if (from->str3 && !(to->str3 = strdup(from->str3))) + ret = -1; + to->int1 = from->int1; + to->int2 = from->int2; + /* + * Delibrately not setting 'conn', 'dom', 'net' references + */ + return ret; +} + + + +/** * virGetLastError: * * Provide a pointer to the last error caught at the library level - * Simpler but may not be suitable for multithreaded accesses, in which - * case use virCopyLastError() + * + * This function is not safe for use in a multi-threaded + * application. Use virThreadGetLastError() instead. + * + * This function is also not very suitable for single-threaded + * applications because for any API call, it is impossible + * to determine whether an error was set globally or on the + * connection. Always use virThreadGetLastError() * * Returns a pointer to the last error or NULL if none occurred. */ @@ -79,11 +119,20 @@ virGetLastError(void) return (&virLastErr); } -/* +/** * virCopyLastError: * @to: target to receive the copy * * Copy the content of the last error caught at the library level + * + * This function is not safe for use in a multi-threaded + * application. Use virThreadCopyLastError() instead. + * + * This function is also not very suitable for single-threaded + * applications because for any API call, it is impossible + * to determine whether an error was set globally or on the + * connection. Always use virThreadCopyLastError() + * * One will need to free the result with virResetError() * * Returns 0 if no error was found and the error code otherwise and -1 in case @@ -92,12 +141,8 @@ int int virCopyLastError(virErrorPtr to) { - if (to == NULL) - return (-1); - if (virLastErr.code == VIR_ERR_OK) - return (0); - memcpy(to, &virLastErr, sizeof(virError)); - return (virLastErr.code); + virCopyError(&virLastErr, to); + return to->code; } /** @@ -118,10 +163,19 @@ virResetError(virErrorPtr err) memset(err, 0, sizeof(virError)); } + /** * virResetLastError: * * Reset the last error caught at the library level. + * + * This function is not safe for use in a multi-threaded + * application. Use virThreadResetLastError() instead. + * + * This function is also not very suitable for single-threaded + * applications because for any API call, it is impossible + * to determine whether an error was set globally or on the + * connection. Always use virThreadResetLastError() */ void virResetLastError(void) @@ -134,8 +188,14 @@ virResetLastError(void) * @conn: pointer to the hypervisor connection * * Provide a pointer to the last error caught on that connection - * Simpler but may not be suitable for multithreaded accesses, in which - * case use virConnCopyLastError() + * + * This function is not safe for use in a multi-threaded + * application. Use virThreadGetLastError() instead. + * + * This function is also not very suitable for single-threaded + * applications because for any API call, it is impossible + * to determine whether an error was set globally or on the + * connection. Always use virThreadGetLastError() * * Returns a pointer to the last error or NULL if none occurred. */ @@ -153,6 +213,15 @@ virConnGetLastError(virConnectPtr conn) * @to: target to receive the copy * * Copy the content of the last error caught on that connection + * + * This function is not safe for use in a multi-threaded + * application. Use virThreadCopyLastError() instead. + * + * This function is also not very suitable for single-threaded + * applications because for any API call, it is impossible + * to determine whether an error was set globally or on the + * connection. Always use virThreadCopyLastError() + * * One will need to free the result with virResetError() * * Returns 0 if no error was found and the error code otherwise and -1 in case @@ -163,17 +232,21 @@ virConnCopyLastError(virConnectPtr conn, { if (conn == NULL) return (-1); - if (to == NULL) - return (-1); - if (conn->err.code == VIR_ERR_OK) - return (0); - memcpy(to, &conn->err, sizeof(virError)); - return (conn->err.code); + virCopyError(&conn->err, to); + return to->code; } /** * virConnResetLastError: * @conn: pointer to the hypervisor connection + * + * This function is not safe for use in a multi-threaded + * application. Use virThreadResetLastError() instead. + * + * This function is also not very suitable for single-threaded + * applications because for any API call, it is impossible + * to determine whether an error was set globally or on the + * connection. Always use virThreadResetLastError() * * Reset the last error caught on that connection */ @@ -217,8 +290,10 @@ virConnSetErrorFunc(virConnectPtr conn, { if (conn == NULL) return; + pthread_mutex_lock(&conn->lock); conn->handler = handler; conn->userData = userData; + pthread_mutex_unlock(&conn->lock); } /** @@ -338,6 +413,146 @@ virDefaultErrorFunc(virErrorPtr err) dom, lvl, domain, network, err->message); } + +pthread_once_t virErrorKeyInit = PTHREAD_ONCE_INIT; +pthread_key_t virErrorKey; + +static void +virErrorKeyFreeData(void *data) +{ + virErrorPtr err = data; + virResetError(err); + VIR_FREE(err); +} + +static void +virErrorKeyCreate(void) +{ + pthread_key_create(&virErrorKey, virErrorKeyFreeData); +} + + +static void +virErrorGenericFailure(virErrorPtr err) +{ + err->code = VIR_ERR_INTERNAL_ERROR; + err->domain = VIR_FROM_NONE; + err->level = VIR_ERR_ERROR; + err->message = strdup(_("Unknown failure")); +} + +/** + * virThreadGetLastError: + * + * Provide a pointer to the last error caught during an API + * call in this thread. + * + * The contents of the returned error object are only valid + * until the next API call is made, or until the thread exits + * + * Returns a pointer to the last error or NULL if none occurred. + */ +virErrorPtr +virThreadGetLastError(void) +{ + virErrorPtr err; + pthread_once(&virErrorKeyInit, virErrorKeyCreate); + err = pthread_getspecific(virErrorKey); + if (!err) { + if (VIR_ALLOC(err) < 0) + return NULL; + pthread_setspecific(virErrorKey, err); + } + return err; +} + + +/** + * virThreadCopyLastError: + * @to: target to receive the copy + * + * Copy the content of the last error caught during an API + * call in this thread. + * + * One will need to free the result with virResetError() + * + * Returns 0 if no error was found and the error code otherwise and -1 in case + * of parameter error. + */ +int +virThreadCopyLastError (virErrorPtr to) +{ + virErrorPtr err; + + err = virThreadGetLastError(); + if (virCopyError(err, to) < 0) + return -1; + + return to->code; +} + + +/** + * virThreadResetLastError: + * + * Reset the last error caught during an API call + * in this thread + */ +void +virThreadResetLastError (void) +{ + virErrorPtr err; + + err = virThreadGetLastError(); + if (err) + virResetError(err); +} + + +/** + * virThreadSetConnError: + * + * Initialize the global error with the contents of the + * the thread local error + */ +void +virThreadSetGlobalError(void) +{ + virErrorPtr err; + + err = virThreadGetLastError(); + + if (err && err->code == VIR_ERR_OK) + virErrorGenericFailure(err); + + pthread_mutex_lock(&virLastErrLock); + virCopyError(err, &virLastErr); + pthread_mutex_unlock(&virLastErrLock); +} + +/** + * virThreadSetConnError: + * + * Initialize the connection error with the contents of the + * the thread local error + */ +void +virThreadSetConnError(virConnectPtr conn) +{ + virErrorPtr err; + + err = virThreadGetLastError(); + + if (err && err->code == VIR_ERR_OK) + virErrorGenericFailure(err); + + pthread_mutex_lock(&conn->lock); + virCopyError(err, &conn->err); + pthread_mutex_unlock(&conn->lock); +} + + + /** * virRaiseError: * @conn: the connection to the hypervisor if available @@ -358,15 +573,29 @@ virDefaultErrorFunc(virErrorPtr err) * immediately if a callback is found and store it for later handling. */ void -virRaiseError(virConnectPtr conn, virDomainPtr dom, virNetworkPtr net, +virRaiseError(virConnectPtr conn, + virDomainPtr dom ATTRIBUTE_UNUSED, + virNetworkPtr net ATTRIBUTE_UNUSED, int domain, int code, virErrorLevel level, const char *str1, const char *str2, const char *str3, int int1, int int2, const char *msg, ...) { - virErrorPtr to = &virLastErr; + virErrorPtr to; void *userData = virUserData; virErrorFunc handler = virErrorHandler; char *str; + + /* + * All errors are recorded in thread local storage + * For compatability, public API calls will copy them + * to the global or per-connection error object when + * neccessary + */ + to = virThreadGetLastError(); + if (!to) + return; /* Hit OOM allocating thread error object, sod all we can do now */ + + virResetError(to); if (code == VIR_ERR_OK) return; @@ -375,11 +604,12 @@ virRaiseError(virConnectPtr conn, virDom * try to find the best place to save and report the error */ if (conn != NULL) { - to = &conn->err; + pthread_mutex_lock(&conn->lock); if (conn->handler != NULL) { handler = conn->handler; userData = conn->userData; } + pthread_mutex_unlock(&conn->lock); } /* @@ -395,9 +625,10 @@ virRaiseError(virConnectPtr conn, virDom * Save the information about the error */ virResetError(to); - to->conn = conn; - to->dom = dom; - to->net = net; + /* + * Delibrately not setting conn, dom & net fields since + * they're utterly unsafe + */ to->domain = domain; to->code = code; to->message = str; diff --git a/src/virterror_internal.h b/src/virterror_internal.h --- a/src/virterror_internal.h +++ b/src/virterror_internal.h @@ -24,7 +24,6 @@ #include "internal.h" -extern virError virLastErr; extern virErrorFunc virErrorHandler; extern void *virUserData; @@ -53,4 +52,7 @@ void virReportErrorHelper(virConnectPtr ATTRIBUTE_FORMAT(printf, 7, 8); +void virThreadSetGlobalError(void); +void virThreadSetConnError(virConnectPtr conn); + #endif -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 6

[libvirt] 3 small patches
by Jim Meyering 07 Jan '09

07 Jan '09

1: cvs-ignore a stray, generated file 2: bootstrap: pull in gnulib's ioctl module (Daniel Berrange will use it shortly) 3: add more files pulled in via yesterday's gnulib upgrade The third is highest priority, since without it, running autogen.sh from just-checked-out sources fails due to 3 missing .m4 files. This isn't the first time that's happened. I tracked the problem to the way gnulib-tool updates .cvsignore files to mark pulled-in files as ignored, by default. That made it hard to use vc tools like cvs or git to identify new files. The 2nd patch adds gnulib-tools' --no-vc-files option to inhibit that behavior. >From 4b63b91ff4b8308cfde641686ea22ff51499bb00 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Wed, 7 Jan 2009 15:43:41 +0100 Subject: [PATCH 1/3] ignore generated libvirtd.logrotate. * qemud/.cvsignore: Add libvirtd.logrotate. * qemud/.gitignore: Regenerate. --- qemud/.cvsignore | 13 +++++++------ qemud/.gitignore | 13 +++++++------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/qemud/.cvsignore b/qemud/.cvsignore index 04fed54..38cf28d 100644 --- a/qemud/.cvsignore +++ b/qemud/.cvsignore @@ -1,11 +1,12 @@ -Makefile -Makefile.in +*.gcda +*.gcno +*.la +*.lo .deps .libs -*.lo -*.la +Makefile +Makefile.in libvirt_qemud libvirtd libvirtd.init -*.gcno -*.gcda +libvirtd.logrotate diff --git a/qemud/.gitignore b/qemud/.gitignore index 04fed54..38cf28d 100644 --- a/qemud/.gitignore +++ b/qemud/.gitignore @@ -1,11 +1,12 @@ -Makefile -Makefile.in +*.gcda +*.gcno +*.la +*.lo .deps .libs -*.lo -*.la +Makefile +Makefile.in libvirt_qemud libvirtd libvirtd.init -*.gcno -*.gcda +libvirtd.logrotate -- 1.6.1.121.g866a4a >From 8d6654775a277eca6bf52b011671920091cde9a4 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Wed, 7 Jan 2009 16:11:02 +0100 Subject: [PATCH 2/3] bootstrap: pull in gnulib's ioctl module * bootstrap: Invoke gnulib-tool with its --no-vc-files option, since we version-control the files it imports. This tells it not to mark imported files as cvs-ignored. (modules): Add ioctl. * gnulib/lib/ioctl.c: New file. * gnulib/lib/sys_ioctl.in.h: New file. * gnulib/tests/sys_ioctl.in.h: Removed. * gnulib/tests/ioctl.c: Removed. * gnulib/lib/Makefile.am: Update. * gnulib/m4/gnulib-cache.m4: Likewise. * gnulib/m4/gnulib-comp.m4: Likewise. * gnulib/tests/Makefile.am: Likewise. * gnulib/lib/.cvsignore: Ignore sys_ioctl.h. * gnulib/lib/.gitignore: Regenerate. --- bootstrap | 2 + gnulib/lib/.cvsignore | 1 + gnulib/lib/.gitignore | 1 + gnulib/lib/Makefile.am | 38 +++++++++++++++++++++++++++++++++- gnulib/{tests => lib}/ioctl.c | 8 +++--- gnulib/{tests => lib}/sys_ioctl.in.h | 8 +++--- gnulib/m4/gnulib-cache.m4 | 4 ++- gnulib/m4/gnulib-comp.m4 | 22 +++++++++--------- gnulib/tests/Makefile.am | 36 -------------------------------- 9 files changed, 63 insertions(+), 57 deletions(-) rename gnulib/{tests => lib}/ioctl.c (78%) rename gnulib/{tests => lib}/sys_ioctl.in.h (85%) diff --git a/bootstrap b/bootstrap index c5487b2..38dd3ae 100755 --- a/bootstrap +++ b/bootstrap @@ -73,6 +73,7 @@ gethostname getpass gettext inet_pton +ioctl mkstemp mktempd perror @@ -100,6 +101,7 @@ vc-list-files # put *.[ch] files in new gnulib/lib/ dir. $gnulib_tool \ + --no-vc-files \ --lgpl=2 \ --with-tests \ --m4-base=gnulib/m4 \ diff --git a/gnulib/lib/.cvsignore b/gnulib/lib/.cvsignore index 5a82aa0..9d6b35f 100644 --- a/gnulib/lib/.cvsignore +++ b/gnulib/lib/.cvsignore @@ -16,6 +16,7 @@ stdint.h stdio.h stdlib.h string.h +sys_ioctl.h sys_select.h sys_socket.h sys_stat.h diff --git a/gnulib/lib/.gitignore b/gnulib/lib/.gitignore index 5a82aa0..9d6b35f 100644 --- a/gnulib/lib/.gitignore +++ b/gnulib/lib/.gitignore @@ -16,6 +16,7 @@ stdint.h stdio.h stdlib.h string.h +sys_ioctl.h sys_select.h sys_socket.h sys_stat.h diff --git a/gnulib/lib/Makefile.am b/gnulib/lib/Makefile.am index 528142e..746881c 100644 --- a/gnulib/lib/Makefile.am +++ b/gnulib/lib/Makefile.am @@ -9,7 +9,7 @@ # the same distribution terms as the rest of that program. # # Generated by gnulib-tool. -# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --tests-base=gnulib/tests --aux-dir=build-aux --with-tests --lgpl=2 --libtool --macro-prefix=gl c-ctype close connect getaddrinfo gethostname getpass gettext inet_pton mkstemp mktempd perror physmem poll posix-shell recv send setsockopt socket strerror strndup strsep sys_stat time_r useless-if-before-free vasprintf vc-list-files verify +# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --tests-base=gnulib/tests --aux-dir=build-aux --with-tests --lgpl=2 --libtool --macro-prefix=gl --no-vc-files c-ctype close connect getaddrinfo gethostname getpass gettext inet_pton ioctl mkstemp mktempd perror physmem poll posix-shell recv send setsockopt socket strerror strndup strsep sys_stat time_r useless-if-before-free vasprintf vc-list-files verify AUTOMAKE_OPTIONS = 1.5 gnits @@ -291,6 +291,15 @@ EXTRA_DIST += intprops.h ## end gnulib module intprops +## begin gnulib module ioctl + + +EXTRA_DIST += ioctl.c w32sock.h + +EXTRA_libgnu_la_SOURCES += ioctl.c + +## end gnulib module ioctl + ## begin gnulib module link-warning LINK_WARNING_H=$(top_srcdir)/build-aux/link-warning.h @@ -831,6 +840,33 @@ EXTRA_libgnu_la_SOURCES += strsep.c ## end gnulib module strsep +## begin gnulib module sys_ioctl + +BUILT_SOURCES += $(SYS_IOCTL_H) + +# We need the following in order to create <sys/ioctl.h> when the system +# does not have a complete one. +sys/ioctl.h: sys_ioctl.in.h + @MKDIR_P@ sys + rm -f $@-t $@ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's|@''HAVE_SYS_IOCTL_H''@|$(HAVE_SYS_IOCTL_H)|g' \ + -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''NEXT_SYS_IOCTL_H''@|$(NEXT_SYS_IOCTL_H)|g' \ + -e 's|@''GNULIB_IOCTL''@|$(GNULIB_IOCTL)|g' \ + -e 's|@''SYS_IOCTL_H_HAVE_WINSOCK2_H''@|$(SYS_IOCTL_H_HAVE_WINSOCK2_H)|g' \ + -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ + < $(srcdir)/sys_ioctl.in.h; \ + } > $@-t + mv $@-t $@ +MOSTLYCLEANFILES += sys/ioctl.h sys/ioctl.h-t +MOSTLYCLEANDIRS += sys + +EXTRA_DIST += sys_ioctl.in.h + +## end gnulib module sys_ioctl + ## begin gnulib module sys_select BUILT_SOURCES += $(SYS_SELECT_H) diff --git a/gnulib/tests/ioctl.c b/gnulib/lib/ioctl.c similarity index 78% rename from gnulib/tests/ioctl.c rename to gnulib/lib/ioctl.c index a23d363..77e0101 100644 --- a/gnulib/tests/ioctl.c +++ b/gnulib/lib/ioctl.c @@ -3,16 +3,16 @@ Copyright (C) 2008 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or + 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 program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + GNU Lesser General Public License for more details. - You should have received a copy of the GNU General Public License + You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ /* Written by Paolo Bonzini */ diff --git a/gnulib/tests/sys_ioctl.in.h b/gnulib/lib/sys_ioctl.in.h similarity index 85% rename from gnulib/tests/sys_ioctl.in.h rename to gnulib/lib/sys_ioctl.in.h index 65c2c4a..6ce02d4 100644 --- a/gnulib/tests/sys_ioctl.in.h +++ b/gnulib/lib/sys_ioctl.in.h @@ -2,16 +2,16 @@ Copyright (C) 2008 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3, or (at your option) + it under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + GNU Lesser General Public License for more details. - You should have received a copy of the GNU General Public License + You should have received a copy of the GNU Lesser General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ diff --git a/gnulib/m4/gnulib-cache.m4 b/gnulib/m4/gnulib-cache.m4 index 9eb6064..77a285f 100644 --- a/gnulib/m4/gnulib-cache.m4 +++ b/gnulib/m4/gnulib-cache.m4 @@ -15,7 +15,7 @@ # Specification in the form of a command-line invocation: -# gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --tests-base=gnulib/tests --aux-dir=build-aux --with-tests --lgpl=2 --libtool --macro-prefix=gl c-ctype close connect getaddrinfo gethostname getpass gettext inet_pton mkstemp mktempd perror physmem poll posix-shell recv send setsockopt socket strerror strndup strsep sys_stat time_r useless-if-before-free vasprintf vc-list-files verify +# gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --tests-base=gnulib/tests --aux-dir=build-aux --with-tests --lgpl=2 --libtool --macro-prefix=gl --no-vc-files c-ctype close connect getaddrinfo gethostname getpass gettext inet_pton ioctl mkstemp mktempd perror physmem poll posix-shell recv send setsockopt socket strerror strndup strsep sys_stat time_r useless-if-before-free vasprintf vc-list-files verify # Specification in the form of a few gnulib-tool.m4 macro invocations: gl_LOCAL_DIR([]) @@ -28,6 +28,7 @@ gl_MODULES([ getpass gettext inet_pton + ioctl mkstemp mktempd perror @@ -61,3 +62,4 @@ gl_MAKEFILE_NAME([]) gl_LIBTOOL gl_MACRO_PREFIX([gl]) gl_PO_DOMAIN([]) +gl_VC_FILES([false]) diff --git a/gnulib/m4/gnulib-comp.m4 b/gnulib/m4/gnulib-comp.m4 index 072b9f0..1393b97 100644 --- a/gnulib/m4/gnulib-comp.m4 +++ b/gnulib/m4/gnulib-comp.m4 @@ -82,6 +82,13 @@ AC_SUBST([LTALLOCA]) gl_ARPA_INET_MODULE_INDICATOR([inet_ntop]) gl_INET_PTON gl_ARPA_INET_MODULE_INDICATOR([inet_pton]) + AC_REQUIRE([gl_HEADER_SYS_SOCKET]) + if test "$ac_cv_header_winsock2_h" = yes; then + AC_LIBOBJ([ioctl]) + gl_REPLACE_SYS_IOCTL_H + fi + gl_SYS_IOCTL_MODULE_INDICATOR([ioctl]) + gl_MODULE_INDICATOR([ioctl]) gl_FUNC_LSEEK gl_UNISTD_MODULE_INDICATOR([lseek]) gl_FUNC_LSTAT @@ -141,6 +148,8 @@ AC_SUBST([LTALLOCA]) gl_STRING_MODULE_INDICATOR([strnlen]) gl_FUNC_STRSEP gl_STRING_MODULE_INDICATOR([strsep]) + gl_SYS_IOCTL_H + AC_PROG_MKDIR_P gl_HEADER_SYS_SELECT AC_PROG_MKDIR_P gl_HEADER_SYS_SOCKET @@ -213,13 +222,6 @@ AC_SUBST([LTALLOCA]) gl_SYS_SOCKET_MODULE_INDICATOR([bind]) AC_REQUIRE([gl_HEADER_SYS_SOCKET]) if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([ioctl]) - gl_REPLACE_SYS_IOCTL_H - fi - gl_SYS_IOCTL_MODULE_INDICATOR([ioctl]) - gl_MODULE_INDICATOR([ioctl]) - AC_REQUIRE([gl_HEADER_SYS_SOCKET]) - if test "$ac_cv_header_winsock2_h" = yes; then AC_LIBOBJ([listen]) fi gl_SYS_SOCKET_MODULE_INDICATOR([listen]) @@ -227,8 +229,6 @@ AC_SUBST([LTALLOCA]) gl_SOCKETS gt_TYPE_WCHAR_T gt_TYPE_WINT_T - gl_SYS_IOCTL_H - AC_PROG_MKDIR_P AC_CHECK_FUNCS([shutdown]) abs_aux_dir=`cd "$ac_aux_dir"; pwd` AC_SUBST([abs_aux_dir]) @@ -354,6 +354,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/inet_ntop.c lib/inet_pton.c lib/intprops.h + lib/ioctl.c lib/lseek.c lib/lstat.c lib/malloc.c @@ -388,6 +389,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/strndup.c lib/strnlen.c lib/strsep.c + lib/sys_ioctl.in.h lib/sys_select.in.h lib/sys_socket.in.h lib/sys_stat.in.h @@ -535,10 +537,8 @@ AC_DEFUN([gl_FILE_LIST], [ tests/test-wchar.c tests=lib/accept.c tests=lib/bind.c - tests=lib/ioctl.c tests=lib/listen.c tests=lib/sockets.c tests=lib/sockets.h - tests=lib/sys_ioctl.in.h tests=lib/w32sock.h ]) diff --git a/gnulib/tests/Makefile.am b/gnulib/tests/Makefile.am index 4273d6c..ea40a21 100644 --- a/gnulib/tests/Makefile.am +++ b/gnulib/tests/Makefile.am @@ -150,15 +150,6 @@ EXTRA_DIST += test-gettimeofday.c ## end gnulib module gettimeofday-tests -## begin gnulib module ioctl - - -EXTRA_DIST += ioctl.c w32sock.h - -EXTRA_libtests_a_SOURCES += ioctl.c - -## end gnulib module ioctl - ## begin gnulib module listen @@ -298,33 +289,6 @@ EXTRA_DIST += test-string.c ## end gnulib module string-tests -## begin gnulib module sys_ioctl - -BUILT_SOURCES += $(SYS_IOCTL_H) - -# We need the following in order to create <sys/ioctl.h> when the system -# does not have a complete one. -sys/ioctl.h: sys_ioctl.in.h - @MKDIR_P@ sys - rm -f $@-t $@ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's|@''HAVE_SYS_IOCTL_H''@|$(HAVE_SYS_IOCTL_H)|g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''NEXT_SYS_IOCTL_H''@|$(NEXT_SYS_IOCTL_H)|g' \ - -e 's|@''GNULIB_IOCTL''@|$(GNULIB_IOCTL)|g' \ - -e 's|@''SYS_IOCTL_H_HAVE_WINSOCK2_H''@|$(SYS_IOCTL_H_HAVE_WINSOCK2_H)|g' \ - -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ - < $(srcdir)/sys_ioctl.in.h; \ - } > $@-t - mv $@-t $@ -MOSTLYCLEANFILES += sys/ioctl.h sys/ioctl.h-t -MOSTLYCLEANDIRS += sys - -EXTRA_DIST += sys_ioctl.in.h - -## end gnulib module sys_ioctl - ## begin gnulib module sys_select-tests TESTS += test-sys_select -- 1.6.1.121.g866a4a >From ca8eae50325df82b8f44d75bb80c3812d07fc30c Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Wed, 7 Jan 2009 16:13:08 +0100 Subject: [PATCH 3/3] add more files pulled in via yesterday's gnulib upgrade * gnulib/m4/multiarch.m4: New file. * gnulib/m4/hostent.m4: New file. * gnulib/m4/servent.m4: New file. * .x-sc_prohibit_gethostby: Exempt all gnulib/m4/* files, so hostent.m4's uses of gethostbyname and gethostbyaddr does not trigger a "make syntax-check" failure. --- .x-sc_prohibit_gethostby | 2 +- gnulib/m4/hostent.m4 | 45 ++++++++++++++++++++++++++++ gnulib/m4/multiarch.m4 | 74 ++++++++++++++++++++++++++++++++++++++++++++++ gnulib/m4/servent.m4 | 47 +++++++++++++++++++++++++++++ 4 files changed, 167 insertions(+), 1 deletions(-) create mode 100644 gnulib/m4/hostent.m4 create mode 100644 gnulib/m4/multiarch.m4 create mode 100644 gnulib/m4/servent.m4 diff --git a/.x-sc_prohibit_gethostby b/.x-sc_prohibit_gethostby index d74ea40..c771142 100644 --- a/.x-sc_prohibit_gethostby +++ b/.x-sc_prohibit_gethostby @@ -1,3 +1,3 @@ gnulib/lib/getaddrinfo.c -gnulib/m4/getaddrinfo.m4 +gnulib/m4/ src/xend_internal.c diff --git a/gnulib/m4/hostent.m4 b/gnulib/m4/hostent.m4 new file mode 100644 index 0000000..4a96af7 --- /dev/null +++ b/gnulib/m4/hostent.m4 @@ -0,0 +1,45 @@ +# hostent.m4 serial 1 +dnl Copyright (C) 2008 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([gl_HOSTENT], +[ + dnl Where are gethostent(), sethostent(), endhostent(), gethostbyname(), + dnl gethostbyaddr() defined? + dnl - On Solaris, they are in libnsl. Ignore libxnet. + dnl - On Haiku, they are in libnetwork. + dnl - On BeOS, they are in libnet. + dnl - On native Windows, they are in ws2_32.dll. + dnl - Otherwise they are in libc. + AC_REQUIRE([gl_HEADER_SYS_SOCKET])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H + HOSTENT_LIB= + gl_saved_libs="$LIBS" + AC_SEARCH_LIBS([gethostbyname], [nsl network net], + [if test "$ac_cv_search_gethostbyname" != "none required"; then + HOSTENT_LIB="$ac_cv_search_gethostbyname" + fi]) + LIBS="$gl_saved_libs" + if test -z "$HOSTENT_LIB"; then + AC_CHECK_FUNCS([gethostbyname], , [ + AC_CACHE_CHECK([for gethostbyname in winsock2.h and -lws2_32], + [gl_cv_w32_gethostbyname], + [gl_cv_w32_gethostbyname=no + gl_save_LIBS="$LIBS" + LIBS="$LIBS -lws2_32" + AC_TRY_LINK([ +#ifdef HAVE_WINSOCK2_H +#include <winsock2.h> +#endif +#include <stddef.h> +], [gethostbyname(NULL);], [gl_cv_w32_gethostbyname=yes]) + LIBS="$gl_save_LIBS" + ]) + if test "$gl_cv_w32_gethostbyname" = "yes"; then + HOSTENT_LIB="-lws2_32" + fi + ]) + fi + AC_SUBST([HOSTENT_LIB]) +]) diff --git a/gnulib/m4/multiarch.m4 b/gnulib/m4/multiarch.m4 new file mode 100644 index 0000000..7b73e15 --- /dev/null +++ b/gnulib/m4/multiarch.m4 @@ -0,0 +1,74 @@ +# multiarch.m4 serial 3 +dnl Copyright (C) 2008 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +# Determine whether the compiler is or may be producing universal binaries. +# +# On MacOS X 10.5 and later systems, the user can create libraries and +# executables that work on multiple system types--known as "fat" or +# "universal" binaries--by specifying multiple '-arch' options to the +# compiler but only a single '-arch' option to the preprocessor. Like +# this: +# +# ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ +# CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ +# CPP="gcc -E" CXXCPP="g++ -E" +# +# Detect this situation and set the macro AA_APPLE_UNIVERSAL_BUILD at the +# beginning of config.h and set APPLE_UNIVERSAL_BUILD accordingly. + +AC_DEFUN([gl_MULTIARCH], +[ + dnl This AC_REQUIRE is not necessary in theory. It works around a bug in + dnl autoconf <= 2.63: AC_REQUIRE invocations inside AC_REQUIREd macros are + dnl being handled better than AC_REQUIRE invocations inside normally invoked + dnl macros. + AC_REQUIRE([gl_MULTIARCH_BODY]) +]) + +AC_DEFUN([gl_MULTIARCH_BODY], +[ + dnl Code similar to autoconf-2.63 AC_C_BIGENDIAN. + gl_cv_c_multiarch=no + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#ifndef __APPLE_CC__ + not a universal capable compiler + #endif + typedef int dummy; + ]])], + [ + dnl Check for potential -arch flags. It is not universal unless + dnl there are at least two -arch flags with different values. + arch= + prev= + for word in ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}; do + if test -n "$prev"; then + case $word in + i?86 | x86_64 | ppc | ppc64) + if test -z "$arch" || test "$arch" = "$word"; then + arch="$word" + else + gl_cv_c_multiarch=yes + fi + ;; + esac + prev= + else + if test "x$word" = "x-arch"; then + prev=arch + fi + fi + done + ]) + if test $gl_cv_c_multiarch = yes; then + AC_DEFINE([AA_APPLE_UNIVERSAL_BUILD], [1], + [Define if the compiler is building for multiple architectures of Apple platforms at once.]) + APPLE_UNIVERSAL_BUILD=1 + else + APPLE_UNIVERSAL_BUILD=0 + fi + AC_SUBST([APPLE_UNIVERSAL_BUILD]) +]) diff --git a/gnulib/m4/servent.m4 b/gnulib/m4/servent.m4 new file mode 100644 index 0000000..242f9e3 --- /dev/null +++ b/gnulib/m4/servent.m4 @@ -0,0 +1,47 @@ +# servent.m4 serial 1 +dnl Copyright (C) 2008 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([gl_SERVENT], +[ + dnl Where are getservent(), setservent(), endservent(), getservbyname(), + dnl getservbyport() defined? + dnl Where are getprotoent(), setprotoent(), endprotoent(), getprotobyname(), + dnl getprotobynumber() defined? + dnl - On Solaris, they are in libsocket. Ignore libxnet. + dnl - On Haiku, they are in libnetwork. + dnl - On BeOS, they are in libnet. + dnl - On native Windows, they are in ws2_32.dll. + dnl - Otherwise they are in libc. + AC_REQUIRE([gl_HEADER_SYS_SOCKET])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H + SERVENT_LIB= + gl_saved_libs="$LIBS" + AC_SEARCH_LIBS([getservbyname], [socket network net], + [if test "$ac_cv_search_getservbyname" != "none required"; then + SERVENT_LIB="$ac_cv_search_getservbyname" + fi]) + LIBS="$gl_saved_libs" + if test -z "$SERVENT_LIB"; then + AC_CHECK_FUNCS([getservbyname], , [ + AC_CACHE_CHECK([for getservbyname in winsock2.h and -lws2_32], + [gl_cv_w32_getservbyname], + [gl_cv_w32_getservbyname=no + gl_save_LIBS="$LIBS" + LIBS="$LIBS -lws2_32" + AC_TRY_LINK([ +#ifdef HAVE_WINSOCK2_H +#include <winsock2.h> +#endif +#include <stddef.h> +], [getservbyname(NULL,NULL);], [gl_cv_w32_getservbyname=yes]) + LIBS="$gl_save_LIBS" + ]) + if test "$gl_cv_w32_getservbyname" = "yes"; then + SERVENT_LIB="-lws2_32" + fi + ]) + fi + AC_SUBST([SERVENT_LIB]) +]) -- 1.6.1.121.g866a4a

1 0

[libvirt] patch for pci passthrough
by Jason Krieg 07 Jan '09

07 Jan '09

Hi, This patch adds support for the -pcidevice host=bus:dev.func added in kvm-79 I used the structure as already defined in src/domain_conf.h so analog to usb one now can add pci devices as example: lspci: 06:02.0 Network controller: Eicon Networks Corporation Diva Server 2FX (rev 01) <hostdev mode='subsystem' type='pci'> <source> <address bus="0x06" slot="0x02" function="0x0"/> </source> </hostdev> values are hex so for bus: 0 to ff, slot: 0 to 1f and function: 0 to 7 Hope this patch is useful it applies to libvirt-0.5.1 and cvs checkout from today (with some hunks) Regards Jason -- Collax GmbH . Burkheimer Str. 3 . 79111 Freiburg . Germany p: +49 (0) 89-990157-0 f: +49 (0) 89-990157-11 . http://www.collax.com

4 5

[libvirt] OpenVZ: Still the same macs for host and domain veth devices.
by Ivan Vovk 07 Jan '09

07 Jan '09

Hi, guys. During domain creation from xml like this: <domain type="openvz" id="3005"> <name>3005</name> <memory>131072</memory> <currentMemory>131072</currentMemory> <vcpu>1</vcpu> <os> <type>exe</type> </os> <devices> <filesystem type="template"> <source name="altlinux-4.0"/> <target dir="/"/> </filesystem> <interface type="bridge"> <source bridge="vzrb0"/> <target dev="veth3005.0"/> </interface> </devices> i get veth3005.0 on a HW node connected to virtual bridge vzbr0 and eth0 inside a container. So that annoying bug with confused <source> and <target> tags seems to be fixed. Thanks for that! But mac generation still seems to be an issue, caz mac of eth0 and veth3005.0 are the same: [root@alt-03 ~]# cat /etc/vz/conf/3005.conf | grep NETIF NETIF="ifname=eth0,bridge=vzbr0,mac=52:54:00:97:72:8E,host_ifname=veth3005.0,host_mac=52:54:00:97:72:8E" So when i connect two containers via bridge they cannot "talk" to each other due to macs conflict. Can something be done to improve mac generation behaviour? Version I use at the moment: [root@alt-03 ~]# rpm -qa | grep libvirt libvirt-python-0.5.0-alt1 libvirt-0.5.0-alt1 libvirt-devel-0.5.0-alt1 And one more not an OpenVZ-specific question: I am working on a project using python and python API bindings in libvirt. I don't see a python method for virNetworkCreateXML: >>> dir(libvirt.virConnect.networkCreateXML) Traceback (most recent call last): File "<stdin>", line 1, in <module> AttributeError: class virConnect has no attribute 'networkCreateXML' There are two methods for virNetworkDefineXML and virNetworkCreate separately: >>> dir(libvirt.virConnect.networkDefineXML) ['__call__', '__class__', '__cmp__', '__delattr__', '__doc__', '__get__', '__getattribute__', '__hash__', '__init__', '__new__', '__reduce__', '__reduce_ex__', '__repr__', '__setattr__', '__str__', 'im_class', 'im_func', 'im_self'] >>> dir(libvirt.virNetwork.create) ['__call__', '__class__', '__cmp__', '__delattr__', '__doc__', '__get__', '__getattribute__', '__hash__', '__init__', '__new__', '__reduce__', '__reduce_ex__', '__repr__', '__setattr__', '__str__', 'im_class', 'im_func', 'im_self'] Is networkCreateXML missed? ________________________________ This message (including attachments) is private and confidential. If you have received this message in error, please notify us and remove it from your system.

2 1

[libvirt] [OpenVZ]
by Ivan Vovk 07 Jan '09

07 Jan '09

Hello, after updating to the last official release 0.5.1 my application stopped working. No errors to the log file though i raised exceptions where it was possible. i checked with virsh xml description used for creating OpenVZ container and got the following: virsh # create ovz.xml Segmentation fault after that virsh just closed (as well as my application did before). But itself container was created: [root@alt-03 ~]# vzlist -a CTID NPROC STATUS IP_ADDR HOSTNAME 3005 5 running - - Ovz.xml looks like this: <domain type="openvz" id="3005"> <name>3005</name> <memory>131072</memory> <vcpu>1</vcpu> <os> <type>exe</type> <init>/sbin/init</init> </os> <devices> <filesystem type="template"> <source name="altlinux-4.0"/> <target dir="/"/> </filesystem> <interface type="bridge"> <source bridge="vzrb1"/> <target dev="veth3005.0"/> </interface> </devices> <domain> With previous version it worked just fine. Further, it is impossible to create OpenVZ container without <memory> tag though i didn't notice any effects from it. Does it realy needed? <vcpu> tag stopped working. Previously it added in config file of the container a record like CPUS="1". No it doesn't add anything. Mac generation still an issue. It seems my notification about it was missed. Here is a string from config file for created container. [root@alt-03 ~]# cat /etc/vz/conf/3005.conf | grep NETIF NETIF="ifname=eth0,bridge=vzrb1,mac=52:54:00:4B:BB:F4,host_ifname=veth3005.0,host_mac=52:54:00:4B:BB:F4" mac = host_mac = network issue. ________________________________ This message (including attachments) is private and confidential. If you have received this message in error, please notify us and remove it from your system.

5 11

[libvirt] [PATCH] virConnectGetHostname: return a fully qualified hostname
by David Lutterkort 07 Jan '09

07 Jan '09

The attached patch makes virConnectGetHostname try a little harder to get a FQDN on systems where gethostname only returns a short name without a domain (which is pretty useless). The behavior is equivalent to 'hostname --fqdn'. > From 2ae57d0c8c68c453b3f9715fcc9f83af0ebe84a0 Mon Sep 17 00:00:00 2001 From: David Lutterkort <lutter(a)redhat.com> Date: Wed, 10 Dec 2008 18:34:39 -0800 Subject: [PATCH] virConnectGetHostname: return a fully qualified hostname Instead of doing the equivalent of 'hostname', do 'hostname --fqdn', i.e. try to qualify the local host name by an additional call to gethostbyname(3) --- src/libvirt_sym.version.in | 1 + src/qemu_driver.c | 16 ++++------------ src/test.c | 16 +++++----------- src/uml_driver.c | 15 ++++----------- src/util.c | 17 +++++++++++++++++ src/util.h | 2 ++ src/xen_unified.c | 15 +++++---------- 7 files changed, 38 insertions(+), 44 deletions(-) diff --git a/src/libvirt_sym.version.in b/src/libvirt_sym.version.in index de0bc4a..f02d9e0 100644 --- a/src/libvirt_sym.version.in +++ b/src/libvirt_sym.version.in @@ -594,6 +594,7 @@ LIBVIRT_PRIVATE_@VERSION@ { virFileReadLimFD; virFileReadPid; virFileLinkPointsTo; + virGetHostname; virParseNumber; virRun; virSkipSpaces; diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 5f6fbd1..d6b7515 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -1562,23 +1562,16 @@ cleanup: static char * qemudGetHostname (virConnectPtr conn) { - int r; - char hostname[HOST_NAME_MAX+1], *str; + char *result; - r = gethostname (hostname, HOST_NAME_MAX+1); - if (r == -1) { + result = virGetHostname(); + if (result == NULL) { qemudReportError (conn, NULL, NULL, VIR_ERR_SYSTEM_ERROR, "%s", strerror (errno)); return NULL; } /* Caller frees this string. */ - str = strdup (hostname); - if (str == NULL) { - qemudReportError (conn, NULL, NULL, VIR_ERR_SYSTEM_ERROR, - "%s", strerror (errno)); - return NULL; - } - return str; + return result; } static int qemudListDomains(virConnectPtr conn, int *ids, int nids) { @@ -4249,4 +4242,3 @@ int qemuRegister(void) { virRegisterStateDriver(&qemuStateDriver); return 0; } - diff --git a/src/test.c b/src/test.c index 257fc8a..cb623ed 100644 --- a/src/test.c +++ b/src/test.c @@ -651,22 +651,16 @@ static int testGetVersion(virConnectPtr conn ATTRIBUTE_UNUSED, static char *testGetHostname (virConnectPtr conn) { - int r; - char hostname [HOST_NAME_MAX+1], *str; + char *result; - r = gethostname (hostname, HOST_NAME_MAX+1); - if (r == -1) { + result = virGetHostname(); + if (result == NULL) { testError (conn, VIR_ERR_SYSTEM_ERROR, "%s", strerror (errno)); return NULL; } - str = strdup (hostname); - if (str == NULL) { - testError (conn, VIR_ERR_SYSTEM_ERROR, "%s", - strerror (errno)); - return NULL; - } - return str; + /* Caller frees this string. */ + return result; } static int testGetMaxVCPUs(virConnectPtr conn ATTRIBUTE_UNUSED, diff --git a/src/uml_driver.c b/src/uml_driver.c index 408096e..52a4e5b 100644 --- a/src/uml_driver.c +++ b/src/uml_driver.c @@ -1150,23 +1150,16 @@ cleanup: static char * umlGetHostname (virConnectPtr conn) { - int r; - char hostname[HOST_NAME_MAX+1], *str; + char *result; - r = gethostname (hostname, HOST_NAME_MAX+1); - if (r == -1) { + result = virGetHostname(); + if (result == NULL) { umlReportError (conn, NULL, NULL, VIR_ERR_SYSTEM_ERROR, "%s", strerror (errno)); return NULL; } /* Caller frees this string. */ - str = strdup (hostname); - if (str == NULL) { - umlReportError (conn, NULL, NULL, VIR_ERR_SYSTEM_ERROR, - "%s", strerror (errno)); - return NULL; - } - return str; + return result; } static int umlListDomains(virConnectPtr conn, int *ids, int nids) { diff --git a/src/util.c b/src/util.c index da26009..7188239 100644 --- a/src/util.c +++ b/src/util.c @@ -47,6 +47,7 @@ #ifdef HAVE_PATHS_H #include <paths.h> #endif +#include <netdb.h> #include "virterror_internal.h" #include "logging.h" @@ -1306,3 +1307,19 @@ int virDiskNameToIndex(const char *name) { return idx; } + +char *virGetHostname(void) +{ + int r; + char hostname[HOST_NAME_MAX+1], *str; + struct hostent *he; + + r = gethostname (hostname, HOST_NAME_MAX+1); + if (r == -1) + return NULL; + if (!(he = gethostbyname(hostname))) + return NULL; + + /* Caller frees this string. */ + return strdup (he->h_name); +} diff --git a/src/util.h b/src/util.h index 0748cbf..f85a61e 100644 --- a/src/util.h +++ b/src/util.h @@ -161,4 +161,6 @@ static inline int getuid (void) { return 0; } static inline int getgid (void) { return 0; } #endif +char *virGetHostname(void); + #endif /* __VIR_UTIL_H__ */ diff --git a/src/xen_unified.c b/src/xen_unified.c index a60bc79..dbda3b5 100644 --- a/src/xen_unified.c +++ b/src/xen_unified.c @@ -447,20 +447,15 @@ xenUnifiedGetVersion (virConnectPtr conn, unsigned long *hvVer) static char * xenUnifiedGetHostname (virConnectPtr conn) { - int r; - char hostname [HOST_NAME_MAX+1], *str; + char *result; - r = gethostname (hostname, HOST_NAME_MAX+1); - if (r == -1) { - xenUnifiedError (conn, VIR_ERR_SYSTEM_ERROR, "%s", strerror(errno)); - return NULL; - } - str = strdup (hostname); - if (str == NULL) { + result = virGetHostname(); + if (result == NULL) { xenUnifiedError (conn, VIR_ERR_SYSTEM_ERROR, "%s", strerror(errno)); return NULL; } - return str; + /* Caller frees this string. */ + return result; } static int -- 1.6.0.4

5 10

[libvirt] [PATCH] save state as string
by Guido Günther 07 Jan '09

07 Jan '09

Hi, current domstatus code saves the domain as number, attached patch safes it as string which looks a bit nicer. Cheers, -- Guido

3 4

[libvirt] PATCH: Implement virKill for Windows
by Daniel P. Berrange 06 Jan '09

06 Jan '09

The addition of virKill to src/util.c breaks Windows build which lacks the kill() function. Now we technically don't have any code which runs virKill when built on Windows, but after the 2 weeks holiday I'm very motivated so wrote a basic implement of virKill() which is a starting point for Win32 in case we need it based on the recommendations in this thread http://www.nabble.com/kill-signal-td149789.html Seems Perl does much the same for its kill() implement on Win32 (and is even more thorough/complete), though we can't just use the Perl code directly since its GPL licensed. So I've done a minimal stub Daniel Index: src/util.c =================================================================== RCS file: /data/cvs/libvirt/src/util.c,v retrieving revision 1.78 diff -u -p -u -p -r1.78 util.c --- src/util.c 6 Jan 2009 17:46:46 -0000 1.78 +++ src/util.c 6 Jan 2009 20:47:09 -0000 @@ -1346,5 +1346,50 @@ int virKillProcess(pid_t pid, int sig) return -1; } +#ifdef WIN32 + /* Mingw / Windows don't have many signals (AFAIK) */ + switch (sig) { + case SIGINT: + /* This does a Ctrl+C equiv */ + if (!GenerateConsoleCtrlEvent(CTRL_C_EVENT, pid)) { + errno = ESRCH; + return -1; + } + break; + + case SIGTERM: + /* Since TerminateProcess is closer to SIG_KILL, we do + * a Ctrl+Break equiv which is more pleasant like the + * good old unix SIGTERM/HUP + */ + if (!GenerateConsoleCtrlEvent(CTRL_BREAK_EVENT, pid)) { + errno = ESRCH; + return -1; + } + break; + + default: + { + HANDLE proc; + proc = OpenProcess(PROCESS_TERMINATE, FALSE, pid); + if (!proc) { + errno = ESRCH; /* Not entirely accurate, but close enough */ + return -1; + } + + /* + * TerminateProcess is more or less equiv to SIG_KILL, in that + * a process can't trap / block it + */ + if (!TerminateProcess(proc, sig)) { + errno = ESRCH; + return -1; + } + CloseHandle(proc); + } + } + return 0; +#else return kill(pid, sig); +#endif } -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

1 0

[libvirt] PATCH: Fix Windows / mingw32 build
by Daniel P. Berrange 06 Jan '09

06 Jan '09

There are a number of problems breaking the windows / mingw build currently. - Use of 'close' without importing unistd.h - Use of non-existant localtime_r - ERROR macro from logging.h clashes with a symbol imported from windows.h So this patch does - Adds the missing unistd.h include - Uses localtime() if localtime_r() is missing (as checked from configure) - Adds a VIR_ prefix onto all logging macros, keeping DEBUG() around because its just used in sooooo many places The use of localtime() on Windows is OK, because the MicroSoft implementation of this uses thread-local storage: http://msdn.microsoft.com/en-us/library/a442x3ye.aspx And all other OS we care about have localtime_r Finally I fix a few compile warnings, so that Mingw can now be built with --enable-compile-warnings=error to detect these problems more quickly in future. configure.in | 3 qemud/qemud.c | 206 ++++++++++++++++++++++++------------------------ qemud/remote.c | 104 ++++++++++++------------ qemud/remote_protocol.c | 4 qemud/rpcgen_fix.pl | 1 src/logging.c | 20 +++- src/logging.h | 57 +++++++------ src/test.c | 5 + tests/nodeinfotest.c | 2 9 files changed, 212 insertions(+), 190 deletions(-) Daniel diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in @@ -73,6 +73,9 @@ AC_SYS_LARGEFILE dnl Availability of various common functions (non-fatal if missing). AC_CHECK_FUNCS([cfmakeraw regexec uname sched_getaffinity getuid getgid]) + +dnl Availablility of threadsafe functions - fallback to non-threadsafe if missing +AC_CHECK_FUNCS([localtime_r]) dnl Availability of various common headers (non-fatal if missing). AC_CHECK_HEADERS([pwd.h paths.h regex.h sys/syslimits.h sys/utsname.h sys/wait.h winsock2.h sched.h termios.h sys/poll.h syslog.h]) diff --git a/qemud/qemud.c b/qemud/qemud.c --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -171,7 +171,7 @@ remoteCheckCertFile(const char *type, co { struct stat sb; if (stat(file, &sb) < 0) { - ERROR(_("Cannot access %s '%s': %s (%d)"), + VIR_ERROR(_("Cannot access %s '%s': %s (%d)"), type, file, strerror(errno), errno); return -1; } @@ -188,7 +188,7 @@ remoteInitializeGnuTLS (void) err = gnutls_certificate_allocate_credentials (&x509_cred); if (err) { - ERROR(_("gnutls_certificate_allocate_credentials: %s"), + VIR_ERROR(_("gnutls_certificate_allocate_credentials: %s"), gnutls_strerror (err)); return -1; } @@ -201,7 +201,7 @@ remoteInitializeGnuTLS (void) err = gnutls_certificate_set_x509_trust_file (x509_cred, ca_file, GNUTLS_X509_FMT_PEM); if (err < 0) { - ERROR(_("gnutls_certificate_set_x509_trust_file: %s"), + VIR_ERROR(_("gnutls_certificate_set_x509_trust_file: %s"), gnutls_strerror (err)); return -1; } @@ -215,7 +215,7 @@ remoteInitializeGnuTLS (void) err = gnutls_certificate_set_x509_crl_file (x509_cred, crl_file, GNUTLS_X509_FMT_PEM); if (err < 0) { - ERROR(_("gnutls_certificate_set_x509_crl_file: %s"), + VIR_ERROR(_("gnutls_certificate_set_x509_crl_file: %s"), gnutls_strerror (err)); return -1; } @@ -232,7 +232,7 @@ remoteInitializeGnuTLS (void) cert_file, key_file, GNUTLS_X509_FMT_PEM); if (err < 0) { - ERROR(_("gnutls_certificate_set_x509_key_file: %s"), + VIR_ERROR(_("gnutls_certificate_set_x509_key_file: %s"), gnutls_strerror (err)); return -1; } @@ -245,12 +245,12 @@ remoteInitializeGnuTLS (void) */ err = gnutls_dh_params_init (&dh_params); if (err < 0) { - ERROR(_("gnutls_dh_params_init: %s"), gnutls_strerror (err)); + VIR_ERROR(_("gnutls_dh_params_init: %s"), gnutls_strerror (err)); return -1; } err = gnutls_dh_params_generate2 (dh_params, DH_BITS); if (err < 0) { - ERROR(_("gnutls_dh_params_generate2: %s"), gnutls_strerror (err)); + VIR_ERROR(_("gnutls_dh_params_generate2: %s"), gnutls_strerror (err)); return -1; } @@ -271,7 +271,7 @@ qemudDispatchSignalEvent(int watch ATTRI pthread_mutex_lock(&server->lock); if (saferead(server->sigread, &siginfo, sizeof(siginfo)) != sizeof(siginfo)) { - ERROR(_("Failed to read from signal pipe: %s"), strerror(errno)); + VIR_ERROR(_("Failed to read from signal pipe: %s"), strerror(errno)); pthread_mutex_unlock(&server->lock); return; } @@ -280,20 +280,20 @@ qemudDispatchSignalEvent(int watch ATTRI switch (siginfo.si_signo) { case SIGHUP: - INFO0(_("Reloading configuration on SIGHUP")); + VIR_INFO0(_("Reloading configuration on SIGHUP")); if (virStateReload() < 0) - WARN0(_("Error while reloading drivers")); + VIR_WARN0(_("Error while reloading drivers")); break; case SIGINT: case SIGQUIT: case SIGTERM: - WARN(_("Shutting down on signal %d"), siginfo.si_signo); + VIR_WARN(_("Shutting down on signal %d"), siginfo.si_signo); server->shutdown = 1; break; default: - INFO(_("Received unexpected signal %d"), siginfo.si_signo); + VIR_INFO(_("Received unexpected signal %d"), siginfo.si_signo); break; } @@ -312,7 +312,7 @@ int qemudSetCloseExec(int fd) { goto error; return 0; error: - ERROR0(_("Failed to set close-on-exec file descriptor flag")); + VIR_ERROR0(_("Failed to set close-on-exec file descriptor flag")); return -1; } @@ -326,7 +326,7 @@ int qemudSetNonBlock(int fd) { goto error; return 0; error: - ERROR0(_("Failed to set non-blocking file descriptor flag")); + VIR_ERROR0(_("Failed to set non-blocking file descriptor flag")); return -1; } @@ -404,28 +404,28 @@ static int qemudWritePidFile(const char return 0; if ((fd = open(pidFile, O_WRONLY|O_CREAT|O_EXCL, 0644)) < 0) { - ERROR(_("Failed to open pid file '%s' : %s"), - pidFile, strerror(errno)); + VIR_ERROR(_("Failed to open pid file '%s' : %s"), + pidFile, strerror(errno)); return -1; } if (!(fh = fdopen(fd, "w"))) { - ERROR(_("Failed to fdopen pid file '%s' : %s"), - pidFile, strerror(errno)); + VIR_ERROR(_("Failed to fdopen pid file '%s' : %s"), + pidFile, strerror(errno)); close(fd); return -1; } if (fprintf(fh, "%lu\n", (unsigned long)getpid()) < 0) { - ERROR(_("Failed to write to pid file '%s' : %s"), - pidFile, strerror(errno)); + VIR_ERROR(_("Failed to write to pid file '%s' : %s"), + pidFile, strerror(errno)); close(fd); return -1; } if (fclose(fh) == EOF) { - ERROR(_("Failed to close pid file '%s' : %s"), - pidFile, strerror(errno)); + VIR_ERROR(_("Failed to close pid file '%s' : %s"), + pidFile, strerror(errno)); return -1; } @@ -440,7 +440,7 @@ static int qemudListenUnix(struct qemud_ gid_t oldgrp; if (VIR_ALLOC(sock) < 0) { - ERROR("%s", _("Failed to allocate memory for struct qemud_socket")); + VIR_ERROR("%s", _("Failed to allocate memory for struct qemud_socket")); return -1; } @@ -450,8 +450,8 @@ static int qemudListenUnix(struct qemud_ sock->auth = auth; if ((sock->fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) { - ERROR(_("Failed to create socket: %s"), - strerror(errno)); + VIR_ERROR(_("Failed to create socket: %s"), + strerror(errno)); goto cleanup; } @@ -472,8 +472,8 @@ static int qemudListenUnix(struct qemud_ setgid(unix_sock_gid); if (bind(sock->fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { - ERROR(_("Failed to bind socket to '%s': %s"), - path, strerror(errno)); + VIR_ERROR(_("Failed to bind socket to '%s': %s"), + path, strerror(errno)); goto cleanup; } umask(oldmask); @@ -481,8 +481,8 @@ static int qemudListenUnix(struct qemud_ setgid(oldgrp); if (listen(sock->fd, 30) < 0) { - ERROR(_("Failed to listen for connections on '%s': %s"), - path, strerror(errno)); + VIR_ERROR(_("Failed to listen for connections on '%s': %s"), + path, strerror(errno)); goto cleanup; } @@ -492,7 +492,7 @@ static int qemudListenUnix(struct qemud_ VIR_EVENT_HANDLE_HANGUP, qemudDispatchServerEvent, server, NULL)) < 0) { - ERROR0(_("Failed to add server event callback")); + VIR_ERROR0(_("Failed to add server event callback")); goto cleanup; } @@ -521,7 +521,7 @@ remoteMakeSockets (int *fds, int max_fds int e = getaddrinfo (node, service, &hints, &ai); if (e != 0) { - ERROR(_("getaddrinfo: %s\n"), gai_strerror (e)); + VIR_ERROR(_("getaddrinfo: %s\n"), gai_strerror (e)); return -1; } @@ -530,7 +530,7 @@ remoteMakeSockets (int *fds, int max_fds fds[*nfds_r] = socket (runp->ai_family, runp->ai_socktype, runp->ai_protocol); if (fds[*nfds_r] == -1) { - ERROR(_("socket: %s"), strerror (errno)); + VIR_ERROR(_("socket: %s"), strerror (errno)); return -1; } @@ -539,14 +539,14 @@ remoteMakeSockets (int *fds, int max_fds if (bind (fds[*nfds_r], runp->ai_addr, runp->ai_addrlen) == -1) { if (errno != EADDRINUSE) { - ERROR(_("bind: %s"), strerror (errno)); + VIR_ERROR(_("bind: %s"), strerror (errno)); return -1; } close (fds[*nfds_r]); } else { if (listen (fds[*nfds_r], SOMAXCONN) == -1) { - ERROR(_("listen: %s"), strerror (errno)); + VIR_ERROR(_("listen: %s"), strerror (errno)); return -1; } ++*nfds_r; @@ -581,7 +581,7 @@ remoteListenTCP (struct qemud_server *se socklen_t salen = sizeof(sa); if (VIR_ALLOC(sock) < 0) { - ERROR(_("remoteListenTCP: calloc: %s"), strerror (errno)); + VIR_ERROR(_("remoteListenTCP: calloc: %s"), strerror (errno)); goto cleanup; } @@ -611,7 +611,7 @@ remoteListenTCP (struct qemud_server *se goto cleanup; if (listen (sock->fd, 30) < 0) { - ERROR(_("remoteListenTCP: listen: %s"), strerror (errno)); + VIR_ERROR(_("remoteListenTCP: listen: %s"), strerror (errno)); goto cleanup; } @@ -621,7 +621,7 @@ remoteListenTCP (struct qemud_server *se VIR_EVENT_HANDLE_HANGUP, qemudDispatchServerEvent, server, NULL)) < 0) { - ERROR0(_("Failed to add server event callback")); + VIR_ERROR0(_("Failed to add server event callback")); goto cleanup; } @@ -660,7 +660,7 @@ static int qemudInitPaths(struct qemud_s struct passwd *pw; if (!(pw = getpwuid(uid))) { - ERROR(_("Failed to find user record for uid '%d': %s"), + VIR_ERROR(_("Failed to find user record for uid '%d': %s"), uid, strerror(errno)); return -1; } @@ -676,7 +676,7 @@ static int qemudInitPaths(struct qemud_s return 0; snprintf_error: - ERROR("%s", _("Resulting path too long for buffer in qemudInitPaths()")); + VIR_ERROR("%s", _("Resulting path too long for buffer in qemudInitPaths()")); return -1; } @@ -684,7 +684,7 @@ static struct qemud_server *qemudInitial struct qemud_server *server; if (VIR_ALLOC(server) < 0) { - ERROR0(_("Failed to allocate struct qemud_server")); + VIR_ERROR0(_("Failed to allocate struct qemud_server")); return NULL; } @@ -696,7 +696,7 @@ static struct qemud_server *qemudInitial server->sigread = sigread; if (virEventInit() < 0) { - ERROR0(_("Failed to initialize event system")); + VIR_ERROR0(_("Failed to initialize event system")); VIR_FREE(server); return NULL; } @@ -781,8 +781,8 @@ static struct qemud_server *qemudNetwork auth_tcp == REMOTE_AUTH_SASL || auth_tls == REMOTE_AUTH_SASL) { if ((err = sasl_server_init(NULL, "libvirt")) != SASL_OK) { - ERROR(_("Failed to initialize SASL authentication %s"), - sasl_errstring(err, NULL, NULL)); + VIR_ERROR(_("Failed to initialize SASL authentication %s"), + sasl_errstring(err, NULL, NULL)); goto cleanup; } } @@ -795,8 +795,8 @@ static struct qemud_server *qemudNetwork dbus_error_init(&derr); server->sysbus = dbus_bus_get(DBUS_BUS_SYSTEM, &derr); if (!(server->sysbus)) { - ERROR(_("Failed to connect to system bus for PolicyKit auth: %s"), - derr.message); + VIR_ERROR(_("Failed to connect to system bus for PolicyKit auth: %s"), + derr.message); dbus_error_free(&derr); goto cleanup; } @@ -906,7 +906,7 @@ remoteInitializeTLSSession (void) return session; failed: - ERROR(_("remoteInitializeTLSSession: %s"), + VIR_ERROR(_("remoteInitializeTLSSession: %s"), gnutls_strerror (err)); return NULL; } @@ -922,7 +922,7 @@ remoteCheckDN (gnutls_x509_crt_t cert) err = gnutls_x509_crt_get_dn (cert, name, &namesize); if (err != 0) { - ERROR(_("remoteCheckDN: gnutls_x509_cert_get_dn: %s"), + VIR_ERROR(_("remoteCheckDN: gnutls_x509_cert_get_dn: %s"), gnutls_strerror (err)); return 0; } @@ -954,40 +954,40 @@ remoteCheckCertificate (gnutls_session_t time_t now; if ((ret = gnutls_certificate_verify_peers2 (session, &status)) < 0){ - ERROR(_("remoteCheckCertificate: verify failed: %s"), + VIR_ERROR(_("remoteCheckCertificate: verify failed: %s"), gnutls_strerror (ret)); return -1; } if (status != 0) { if (status & GNUTLS_CERT_INVALID) - ERROR0(_("remoteCheckCertificate: " - "the client certificate is not trusted.")); + VIR_ERROR0(_("remoteCheckCertificate: " + "the client certificate is not trusted.")); if (status & GNUTLS_CERT_SIGNER_NOT_FOUND) - ERROR0(_("remoteCheckCertificate: the client " - "certificate has unknown issuer.")); + VIR_ERROR0(_("remoteCheckCertificate: the client " + "certificate has unknown issuer.")); if (status & GNUTLS_CERT_REVOKED) - ERROR0(_("remoteCheckCertificate: " - "the client certificate has been revoked.")); + VIR_ERROR0(_("remoteCheckCertificate: " + "the client certificate has been revoked.")); #ifndef GNUTLS_1_0_COMPAT if (status & GNUTLS_CERT_INSECURE_ALGORITHM) - ERROR0(_("remoteCheckCertificate: the client certificate" - " uses an insecure algorithm.")); + VIR_ERROR0(_("remoteCheckCertificate: the client certificate" + " uses an insecure algorithm.")); #endif return -1; } if (gnutls_certificate_type_get (session) != GNUTLS_CRT_X509) { - ERROR0(_("remoteCheckCertificate: certificate is not X.509")); + VIR_ERROR0(_("remoteCheckCertificate: certificate is not X.509")); return -1; } if (!(certs = gnutls_certificate_get_peers(session, &nCerts))) { - ERROR0(_("remoteCheckCertificate: no peers")); + VIR_ERROR0(_("remoteCheckCertificate: no peers")); return -1; } @@ -997,7 +997,7 @@ remoteCheckCertificate (gnutls_session_t gnutls_x509_crt_t cert; if (gnutls_x509_crt_init (&cert) < 0) { - ERROR0(_("remoteCheckCertificate: gnutls_x509_crt_init failed")); + VIR_ERROR0(_("remoteCheckCertificate: gnutls_x509_crt_init failed")); return -1; } @@ -1007,15 +1007,15 @@ remoteCheckCertificate (gnutls_session_t } if (gnutls_x509_crt_get_expiration_time (cert) < now) { - ERROR0(_("remoteCheckCertificate: " - "the client certificate has expired")); + VIR_ERROR0(_("remoteCheckCertificate: " + "the client certificate has expired")); gnutls_x509_crt_deinit (cert); return -1; } if (gnutls_x509_crt_get_activation_time (cert) > now) { - ERROR0(_("remoteCheckCertificate: the client " - "certificate is not yet activated")); + VIR_ERROR0(_("remoteCheckCertificate: the client " + "certificate is not yet activated")); gnutls_x509_crt_deinit (cert); return -1; } @@ -1023,7 +1023,7 @@ remoteCheckCertificate (gnutls_session_t if (i == 0) { if (!remoteCheckDN (cert)) { /* This is the most common error: make it informative. */ - ERROR0(_("remoteCheckCertificate: client's Distinguished Name is not on the list of allowed clients (tls_allowed_dn_list). Use 'openssl x509 -in clientcert.pem -text' to view the Distinguished Name field in the client certificate, or run this daemon with --verbose option.")); + VIR_ERROR0(_("remoteCheckCertificate: client's Distinguished Name is not on the list of allowed clients (tls_allowed_dn_list). Use 'openssl x509 -in clientcert.pem -text' to view the Distinguished Name field in the client certificate, or run this daemon with --verbose option.")); gnutls_x509_crt_deinit (cert); return -1; } @@ -1039,11 +1039,11 @@ remoteCheckAccess (struct qemud_client * { /* Verify client certificate. */ if (remoteCheckCertificate (client->tlssession) == -1) { - ERROR0(_("remoteCheckCertificate: " - "failed to verify client's certificate")); + VIR_ERROR0(_("remoteCheckCertificate: " + "failed to verify client's certificate")); if (!tls_no_verify_certificate) return -1; - else INFO0(_("remoteCheckCertificate: tls_no_verify_certificate " - "is set so the bad certificate is ignored")); + else VIR_INFO0(_("remoteCheckCertificate: tls_no_verify_certificate " + "is set so the bad certificate is ignored")); } /* Checks have succeeded. Write a '\1' byte back to the client to @@ -1064,8 +1064,8 @@ int qemudGetSocketIdentity(int fd, uid_t unsigned int cr_len = sizeof (cr); if (getsockopt (fd, SOL_SOCKET, SO_PEERCRED, &cr, &cr_len) < 0) { - ERROR(_("Failed to verify client credentials: %s"), - strerror(errno)); + VIR_ERROR(_("Failed to verify client credentials: %s"), + strerror(errno)); return -1; } @@ -1089,18 +1089,18 @@ static int qemudDispatchServer(struct qe if ((fd = accept(sock->fd, (struct sockaddr *)&addr, &addrlen)) < 0) { if (errno == EAGAIN) return 0; - ERROR(_("Failed to accept connection: %s"), strerror(errno)); + VIR_ERROR(_("Failed to accept connection: %s"), strerror(errno)); return -1; } if (server->nclients >= max_clients) { - ERROR0(_("Too many active clients, dropping connection")); + VIR_ERROR0(_("Too many active clients, dropping connection")); close(fd); return -1; } if (VIR_REALLOC_N(server->clients, server->nclients+1) < 0) { - ERROR0(_("Out of memory allocating clients")); + VIR_ERROR0(_("Out of memory allocating clients")); close(fd); return -1; } @@ -1143,7 +1143,7 @@ static int qemudDispatchServer(struct qe /* Client is running as root, so disable auth */ if (uid == 0) { - INFO(_("Turn off polkit auth for privileged client %d"), pid); + VIR_INFO(_("Turn off polkit auth for privileged client %d"), pid); client->auth = REMOTE_AUTH_NONE; } } @@ -1182,7 +1182,7 @@ static int qemudDispatchServer(struct qe if (qemudRegisterClientEvent (server, client, 0) < 0) goto cleanup; } else { - ERROR(_("TLS handshake failed: %s"), + VIR_ERROR(_("TLS handshake failed: %s"), gnutls_strerror (ret)); goto cleanup; } @@ -1288,7 +1288,7 @@ static int qemudClientReadBuf(struct qem if ((ret = read (client->fd, data, len)) <= 0) { if (ret == 0 || errno != EAGAIN) { if (ret != 0) - ERROR(_("read: %s"), strerror (errno)); + VIR_ERROR(_("read: %s"), strerror (errno)); qemudDispatchClientFailure(server, client); } return -1; @@ -1301,7 +1301,7 @@ static int qemudClientReadBuf(struct qem if (ret == 0 || (ret != GNUTLS_E_AGAIN && ret != GNUTLS_E_INTERRUPTED)) { if (ret != 0) - ERROR(_("gnutls_record_recv: %s"), + VIR_ERROR(_("gnutls_record_recv: %s"), gnutls_strerror (ret)); qemudDispatchClientFailure (server, client); } @@ -1461,7 +1461,7 @@ static void qemudDispatchClientRead(stru else if (qemudRegisterClientEvent (server, client, 1) < 0) qemudDispatchClientFailure (server, client); } else if (ret != GNUTLS_E_AGAIN && ret != GNUTLS_E_INTERRUPTED) { - ERROR(_("TLS handshake failed: %s"), + VIR_ERROR(_("TLS handshake failed: %s"), gnutls_strerror (ret)); qemudDispatchClientFailure (server, client); } else { @@ -1485,7 +1485,7 @@ static int qemudClientWriteBuf(struct qe int ret; if (!client->tlssession) { if ((ret = safewrite(client->fd, data, len)) == -1) { - ERROR(_("write: %s"), strerror (errno)); + VIR_ERROR(_("write: %s"), strerror (errno)); qemudDispatchClientFailure(server, client); return -1; } @@ -1495,7 +1495,7 @@ static int qemudClientWriteBuf(struct qe qemudDispatchClientFailure (server, client); else if (ret < 0) { if (ret != GNUTLS_E_INTERRUPTED && ret != GNUTLS_E_AGAIN) { - ERROR(_("gnutls_record_send: %s"), gnutls_strerror (ret)); + VIR_ERROR(_("gnutls_record_send: %s"), gnutls_strerror (ret)); qemudDispatchClientFailure (server, client); } return -1; @@ -1604,7 +1604,7 @@ qemudDispatchClientWrite(struct qemud_se else if (qemudRegisterClientEvent (server, client, 1)) qemudDispatchClientFailure (server, client); } else if (ret != GNUTLS_E_AGAIN && ret != GNUTLS_E_INTERRUPTED) { - ERROR(_("TLS handshake failed: %s"), gnutls_strerror (ret)); + VIR_ERROR(_("TLS handshake failed: %s"), gnutls_strerror (ret)); qemudDispatchClientFailure (server, client); } else { if (qemudRegisterClientEvent (server, client, 1)) @@ -1731,7 +1731,7 @@ static int qemudOneLoop(void) { errors = sig_errors; if (errors) { sig_errors -= errors; - ERROR(_("Signal handler reported %d errors: last error: %s"), + VIR_ERROR(_("Signal handler reported %d errors: last error: %s"), errors, strerror (sig_lasterrno)); return -1; } @@ -1756,7 +1756,7 @@ static int qemudRunLoop(struct qemud_ser server->nworkers = min_workers; if (VIR_ALLOC_N(server->workers, server->nworkers) < 0) { - ERROR0(_("Failed to allocate workers")); + VIR_ERROR0(_("Failed to allocate workers")); return -1; } @@ -1882,13 +1882,13 @@ remoteConfigGetStringList(virConfPtr con switch (p->type) { case VIR_CONF_STRING: if (VIR_ALLOC_N(list, 2) < 0) { - ERROR(_("failed to allocate memory for %s config list"), key); + VIR_ERROR(_("failed to allocate memory for %s config list"), key); return -1; } list[0] = strdup (p->str); list[1] = NULL; if (list[0] == NULL) { - ERROR(_("failed to allocate memory for %s config list value"), + VIR_ERROR(_("failed to allocate memory for %s config list value"), key); VIR_FREE(list); return -1; @@ -1901,13 +1901,13 @@ remoteConfigGetStringList(virConfPtr con for (pp = p->list; pp; pp = pp->next) len++; if (VIR_ALLOC_N(list, 1+len) < 0) { - ERROR(_("failed to allocate memory for %s config list"), key); + VIR_ERROR(_("failed to allocate memory for %s config list"), key); return -1; } for (i = 0, pp = p->list; pp; ++i, pp = pp->next) { if (pp->type != VIR_CONF_STRING) { - ERROR(_("remoteReadConfigFile: %s: %s:" - " must be a string or list of strings\n"), + VIR_ERROR(_("remoteReadConfigFile: %s: %s:" + " must be a string or list of strings\n"), filename, key); VIR_FREE(list); return -1; @@ -1918,8 +1918,8 @@ remoteConfigGetStringList(virConfPtr con for (j = 0 ; j < i ; j++) VIR_FREE(list[j]); VIR_FREE(list); - ERROR(_("failed to allocate memory for %s config list value"), - key); + VIR_ERROR(_("failed to allocate memory for %s config list value"), + key); return -1; } @@ -1929,8 +1929,8 @@ remoteConfigGetStringList(virConfPtr con } default: - ERROR(_("remoteReadConfigFile: %s: %s:" - " must be a string or list of strings\n"), + VIR_ERROR(_("remoteReadConfigFile: %s: %s:" + " must be a string or list of strings\n"), filename, key); return -1; } @@ -1945,7 +1945,7 @@ checkType (virConfValuePtr p, const char const char *key, virConfType required_type) { if (p->type != required_type) { - ERROR(_("remoteReadConfigFile: %s: %s: invalid type:" + VIR_ERROR(_("remoteReadConfigFile: %s: %s: invalid type:" " got %s; expected %s\n"), filename, key, virConfTypeName (p->type), virConfTypeName (required_type)); @@ -1966,7 +1966,7 @@ checkType (virConfValuePtr p, const char goto free_and_fail; \ (var_name) = strdup (p->str); \ if ((var_name) == NULL) { \ - ERROR(_("remoteReadConfigFile: %s\n"),strerror (errno));\ + VIR_ERROR(_("remoteReadConfigFile: %s\n"),strerror (errno)); \ goto free_and_fail; \ } \ } \ @@ -2008,7 +2008,7 @@ static int remoteConfigGetAuth(virConfPt *auth = REMOTE_AUTH_POLKIT; #endif } else { - ERROR(_("remoteReadConfigFile: %s: %s: unsupported auth %s\n"), + VIR_ERROR(_("remoteReadConfigFile: %s: %s: unsupported auth %s\n"), filename, key, p->str); return -1; } @@ -2155,11 +2155,11 @@ remoteReadConfigFile (struct qemud_serve GET_CONF_STR (conf, filename, unix_sock_group); if (unix_sock_group) { if (getuid() != 0) { - WARN0(_("Cannot set group when not running as root")); + VIR_WARN0(_("Cannot set group when not running as root")); } else { struct group *grp = getgrnam(unix_sock_group); if (!grp) { - ERROR(_("Failed to lookup group '%s'"), unix_sock_group); + VIR_ERROR(_("Failed to lookup group '%s'"), unix_sock_group); goto free_and_fail; } unix_sock_gid = grp->gr_gid; @@ -2171,7 +2171,7 @@ remoteReadConfigFile (struct qemud_serve GET_CONF_STR (conf, filename, unix_sock_ro_perms); if (unix_sock_ro_perms) { if (virStrToLong_i (unix_sock_ro_perms, NULL, 8, &unix_sock_ro_mask) != 0) { - ERROR(_("Failed to parse mode '%s'"), unix_sock_ro_perms); + VIR_ERROR(_("Failed to parse mode '%s'"), unix_sock_ro_perms); goto free_and_fail; } free (unix_sock_ro_perms); @@ -2181,7 +2181,7 @@ remoteReadConfigFile (struct qemud_serve GET_CONF_STR (conf, filename, unix_sock_rw_perms); if (unix_sock_rw_perms) { if (virStrToLong_i (unix_sock_rw_perms, NULL, 8, &unix_sock_rw_mask) != 0) { - ERROR(_("Failed to parse mode '%s'"), unix_sock_rw_perms); + VIR_ERROR(_("Failed to parse mode '%s'"), unix_sock_rw_perms); goto free_and_fail; } free (unix_sock_rw_perms); @@ -2374,7 +2374,7 @@ int main(int argc, char **argv) { if (godaemon) { if (qemudGoDaemon() < 0) { - ERROR(_("Failed to fork as daemon: %s"), strerror(errno)); + VIR_ERROR(_("Failed to fork as daemon: %s"), strerror(errno)); goto error1; } } @@ -2395,7 +2395,7 @@ int main(int argc, char **argv) { qemudSetNonBlock(sigpipe[1]) < 0 || qemudSetCloseExec(sigpipe[0]) < 0 || qemudSetCloseExec(sigpipe[1]) < 0) { - ERROR(_("Failed to create pipe: %s"), strerror(errno)); + VIR_ERROR(_("Failed to create pipe: %s"), strerror(errno)); goto error2; } sigwrite = sigpipe[1]; @@ -2427,14 +2427,14 @@ int main(int argc, char **argv) { const char *sockdirname = LOCAL_STATE_DIR "/run/libvirt"; if (chown(sockdirname, -1, unix_sock_gid) < 0) - ERROR(_("Failed to change group ownership of %s"), sockdirname); + VIR_ERROR(_("Failed to change group ownership of %s"), sockdirname); } if (virEventAddHandleImpl(sigpipe[0], VIR_EVENT_HANDLE_READABLE, qemudDispatchSignalEvent, server, NULL) < 0) { - ERROR0(_("Failed to register callback for signal pipe")); + VIR_ERROR0(_("Failed to register callback for signal pipe")); ret = 3; goto error2; } diff --git a/qemud/remote.c b/qemud/remote.c --- a/qemud/remote.c +++ b/qemud/remote.c @@ -2542,7 +2542,7 @@ remoteDispatchAuthSaslInit (struct qemud REMOTE_DEBUG("Initialize SASL auth %d", client->fd); if (client->auth != REMOTE_AUTH_SASL || client->saslconn != NULL) { - ERROR0(_("client tried invalid SASL init request")); + VIR_ERROR0(_("client tried invalid SASL init request")); goto authfail; } @@ -2582,8 +2582,8 @@ remoteDispatchAuthSaslInit (struct qemud VIR_FREE(localAddr); VIR_FREE(remoteAddr); if (err != SASL_OK) { - ERROR(_("sasl context setup failed %d (%s)"), - err, sasl_errstring(err, NULL, NULL)); + VIR_ERROR(_("sasl context setup failed %d (%s)"), + err, sasl_errstring(err, NULL, NULL)); client->saslconn = NULL; goto authfail; } @@ -2595,7 +2595,7 @@ remoteDispatchAuthSaslInit (struct qemud cipher = gnutls_cipher_get(client->tlssession); if (!(ssf = (sasl_ssf_t)gnutls_cipher_get_key_size(cipher))) { - ERROR0(_("cannot TLS get cipher size")); + VIR_ERROR0(_("cannot TLS get cipher size")); sasl_dispose(&client->saslconn); client->saslconn = NULL; goto authfail; @@ -2604,8 +2604,8 @@ remoteDispatchAuthSaslInit (struct qemud err = sasl_setprop(client->saslconn, SASL_SSF_EXTERNAL, &ssf); if (err != SASL_OK) { - ERROR(_("cannot set SASL external SSF %d (%s)"), - err, sasl_errstring(err, NULL, NULL)); + VIR_ERROR(_("cannot set SASL external SSF %d (%s)"), + err, sasl_errstring(err, NULL, NULL)); sasl_dispose(&client->saslconn); client->saslconn = NULL; goto authfail; @@ -2632,8 +2632,8 @@ remoteDispatchAuthSaslInit (struct qemud err = sasl_setprop(client->saslconn, SASL_SEC_PROPS, &secprops); if (err != SASL_OK) { - ERROR(_("cannot set SASL security props %d (%s)"), - err, sasl_errstring(err, NULL, NULL)); + VIR_ERROR(_("cannot set SASL security props %d (%s)"), + err, sasl_errstring(err, NULL, NULL)); sasl_dispose(&client->saslconn); client->saslconn = NULL; goto authfail; @@ -2648,8 +2648,8 @@ remoteDispatchAuthSaslInit (struct qemud NULL, NULL); if (err != SASL_OK) { - ERROR(_("cannot list SASL mechanisms %d (%s)"), - err, sasl_errdetail(client->saslconn)); + VIR_ERROR(_("cannot list SASL mechanisms %d (%s)"), + err, sasl_errdetail(client->saslconn)); sasl_dispose(&client->saslconn); client->saslconn = NULL; goto authfail; @@ -2657,7 +2657,7 @@ remoteDispatchAuthSaslInit (struct qemud REMOTE_DEBUG("Available mechanisms for client: '%s'", mechlist); ret->mechlist = strdup(mechlist); if (!ret->mechlist) { - ERROR0(_("cannot allocate mechlist")); + VIR_ERROR0(_("cannot allocate mechlist")); sasl_dispose(&client->saslconn); client->saslconn = NULL; goto authfail; @@ -2688,8 +2688,8 @@ remoteSASLCheckSSF (struct qemud_client err = sasl_getprop(client->saslconn, SASL_SSF, &val); if (err != SASL_OK) { - ERROR(_("cannot query SASL ssf on connection %d (%s)"), - err, sasl_errstring(err, NULL, NULL)); + VIR_ERROR(_("cannot query SASL ssf on connection %d (%s)"), + err, sasl_errstring(err, NULL, NULL)); remoteDispatchAuthError(rerr); sasl_dispose(&client->saslconn); client->saslconn = NULL; @@ -2698,7 +2698,7 @@ remoteSASLCheckSSF (struct qemud_client ssf = *(const int *)val; REMOTE_DEBUG("negotiated an SSF of %d", ssf); if (ssf < 56) { /* 56 is good for Kerberos */ - ERROR(_("negotiated SSF %d was not strong enough"), ssf); + VIR_ERROR(_("negotiated SSF %d was not strong enough"), ssf); remoteDispatchAuthError(rerr); sasl_dispose(&client->saslconn); client->saslconn = NULL; @@ -2727,15 +2727,15 @@ remoteSASLCheckAccess (struct qemud_serv err = sasl_getprop(client->saslconn, SASL_USERNAME, &val); if (err != SASL_OK) { - ERROR(_("cannot query SASL username on connection %d (%s)"), - err, sasl_errstring(err, NULL, NULL)); + VIR_ERROR(_("cannot query SASL username on connection %d (%s)"), + err, sasl_errstring(err, NULL, NULL)); remoteDispatchAuthError(rerr); sasl_dispose(&client->saslconn); client->saslconn = NULL; return -1; } if (val == NULL) { - ERROR0(_("no client username was found")); + VIR_ERROR0(_("no client username was found")); remoteDispatchAuthError(rerr); sasl_dispose(&client->saslconn); client->saslconn = NULL; @@ -2745,7 +2745,7 @@ remoteSASLCheckAccess (struct qemud_serv client->saslUsername = strdup((const char*)val); if (client->saslUsername == NULL) { - ERROR0(_("out of memory copying username")); + VIR_ERROR0(_("out of memory copying username")); remoteDispatchAuthError(rerr); sasl_dispose(&client->saslconn); client->saslconn = NULL; @@ -2764,7 +2764,7 @@ remoteSASLCheckAccess (struct qemud_serv } /* Denied */ - ERROR(_("SASL client %s not allowed in whitelist"), client->saslUsername); + VIR_ERROR(_("SASL client %s not allowed in whitelist"), client->saslUsername); remoteDispatchAuthError(rerr); sasl_dispose(&client->saslconn); client->saslconn = NULL; @@ -2794,7 +2794,7 @@ remoteDispatchAuthSaslStart (struct qemu REMOTE_DEBUG("Start SASL auth %d", client->fd); if (client->auth != REMOTE_AUTH_SASL || client->saslconn == NULL) { - ERROR0(_("client tried invalid SASL start request")); + VIR_ERROR0(_("client tried invalid SASL start request")); goto authfail; } @@ -2809,14 +2809,14 @@ remoteDispatchAuthSaslStart (struct qemu &serveroutlen); if (err != SASL_OK && err != SASL_CONTINUE) { - ERROR(_("sasl start failed %d (%s)"), - err, sasl_errdetail(client->saslconn)); + VIR_ERROR(_("sasl start failed %d (%s)"), + err, sasl_errdetail(client->saslconn)); sasl_dispose(&client->saslconn); client->saslconn = NULL; goto authfail; } if (serveroutlen > REMOTE_AUTH_SASL_DATA_MAX) { - ERROR(_("sasl start reply data too long %d"), serveroutlen); + VIR_ERROR(_("sasl start reply data too long %d"), serveroutlen); sasl_dispose(&client->saslconn); client->saslconn = NULL; goto authfail; @@ -2881,7 +2881,7 @@ remoteDispatchAuthSaslStep (struct qemud REMOTE_DEBUG("Step SASL auth %d", client->fd); if (client->auth != REMOTE_AUTH_SASL || client->saslconn == NULL) { - ERROR0(_("client tried invalid SASL start request")); + VIR_ERROR0(_("client tried invalid SASL start request")); goto authfail; } @@ -2895,16 +2895,16 @@ remoteDispatchAuthSaslStep (struct qemud &serveroutlen); if (err != SASL_OK && err != SASL_CONTINUE) { - ERROR(_("sasl step failed %d (%s)"), - err, sasl_errdetail(client->saslconn)); + VIR_ERROR(_("sasl step failed %d (%s)"), + err, sasl_errdetail(client->saslconn)); sasl_dispose(&client->saslconn); client->saslconn = NULL; goto authfail; } if (serveroutlen > REMOTE_AUTH_SASL_DATA_MAX) { - ERROR(_("sasl step reply data too long %d"), - serveroutlen); + VIR_ERROR(_("sasl step reply data too long %d"), + serveroutlen); sasl_dispose(&client->saslconn); client->saslconn = NULL; goto authfail; @@ -2959,7 +2959,7 @@ remoteDispatchAuthSaslInit (struct qemud void *args ATTRIBUTE_UNUSED, remote_auth_sasl_init_ret *ret ATTRIBUTE_UNUSED) { - ERROR0(_("client tried unsupported SASL init request")); + VIR_ERROR0(_("client tried unsupported SASL init request")); remoteDispatchAuthError(rerr); return -1; } @@ -2972,7 +2972,7 @@ remoteDispatchAuthSaslStart (struct qemu remote_auth_sasl_start_args *args ATTRIBUTE_UNUSED, remote_auth_sasl_start_ret *ret ATTRIBUTE_UNUSED) { - ERROR0(_("client tried unsupported SASL start request")); + VIR_ERROR0(_("client tried unsupported SASL start request")); remoteDispatchAuthError(rerr); return -1; } @@ -2985,7 +2985,7 @@ remoteDispatchAuthSaslStep (struct qemud remote_auth_sasl_step_args *args ATTRIBUTE_UNUSED, remote_auth_sasl_step_ret *ret ATTRIBUTE_UNUSED) { - ERROR0(_("client tried unsupported SASL step request")); + VIR_ERROR0(_("client tried unsupported SASL step request")); remoteDispatchAuthError(rerr); return -1; } @@ -3021,26 +3021,26 @@ remoteDispatchAuthPolkit (struct qemud_s REMOTE_DEBUG("Start PolicyKit auth %d", client->fd); if (client->auth != REMOTE_AUTH_POLKIT) { - ERROR0(_("client tried invalid PolicyKit init request")); + VIR_ERROR0(_("client tried invalid PolicyKit init request")); goto authfail; } if (qemudGetSocketIdentity(client->fd, &callerUid, &callerPid) < 0) { - ERROR0(_("cannot get peer socket identity")); - goto authfail; - } - - INFO(_("Checking PID %d running as %d"), callerPid, callerUid); + VIR_ERROR0(_("cannot get peer socket identity")); + goto authfail; + } + + VIR_INFO(_("Checking PID %d running as %d"), callerPid, callerUid); dbus_error_init(&err); if (!(pkcaller = polkit_caller_new_from_pid(server->sysbus, callerPid, &err))) { - ERROR(_("Failed to lookup policy kit caller: %s"), err.message); + VIR_ERROR(_("Failed to lookup policy kit caller: %s"), err.message); dbus_error_free(&err); goto authfail; } if (!(pkaction = polkit_action_new())) { - ERROR(_("Failed to create polkit action %s\n"), strerror(errno)); + VIR_ERROR(_("Failed to create polkit action %s\n"), strerror(errno)); polkit_caller_unref(pkcaller); goto authfail; } @@ -3048,9 +3048,9 @@ remoteDispatchAuthPolkit (struct qemud_s if (!(pkcontext = polkit_context_new()) || !polkit_context_init(pkcontext, &pkerr)) { - ERROR(_("Failed to create polkit context %s\n"), - (pkerr ? polkit_error_get_error_message(pkerr) - : strerror(errno))); + VIR_ERROR(_("Failed to create polkit context %s\n"), + (pkerr ? polkit_error_get_error_message(pkerr) + : strerror(errno))); if (pkerr) polkit_error_free(pkerr); polkit_caller_unref(pkcaller); @@ -3066,9 +3066,9 @@ remoteDispatchAuthPolkit (struct qemud_s 0, &pkerr); if (pkerr && polkit_error_is_set(pkerr)) { - ERROR(_("Policy kit failed to check authorization %d %s"), - polkit_error_get_error_code(pkerr), - polkit_error_get_error_message(pkerr)); + VIR_ERROR(_("Policy kit failed to check authorization %d %s"), + polkit_error_get_error_code(pkerr), + polkit_error_get_error_message(pkerr)); goto authfail; } #else @@ -3080,12 +3080,12 @@ remoteDispatchAuthPolkit (struct qemud_s polkit_caller_unref(pkcaller); polkit_action_unref(pkaction); if (pkresult != POLKIT_RESULT_YES) { - ERROR(_("Policy kit denied action %s from pid %d, uid %d, result: %s\n"), - action, callerPid, callerUid, - polkit_result_to_string_representation(pkresult)); - goto authfail; - } - INFO(_("Policy allowed action %s from pid %d, uid %d, result %s"), + VIR_ERROR(_("Policy kit denied action %s from pid %d, uid %d, result: %s\n"), + action, callerPid, callerUid, + polkit_result_to_string_representation(pkresult)); + goto authfail; + } + VIR_INFO(_("Policy allowed action %s from pid %d, uid %d, result %s"), action, callerPid, callerUid, polkit_result_to_string_representation(pkresult)); ret->complete = 1; @@ -3110,7 +3110,7 @@ remoteDispatchAuthPolkit (struct qemud_s void *args ATTRIBUTE_UNUSED, remote_auth_polkit_ret *ret ATTRIBUTE_UNUSED) { - ERROR0(_("client tried unsupported PolicyKit init request")); + VIR_ERROR0(_("client tried unsupported PolicyKit init request")); remoteDispatchAuthError(rerr); return -1; } diff --git a/qemud/remote_protocol.c b/qemud/remote_protocol.c --- a/qemud/remote_protocol.c +++ b/qemud/remote_protocol.c @@ -332,7 +332,7 @@ xdr_remote_node_get_info_ret (XDR *xdrs, return FALSE; if (!xdr_quad_t (xdrs, &objp->memory)) return FALSE; - buf = XDR_INLINE (xdrs, 6 * BYTES_PER_XDR_UNIT); + buf = (int32_t*)XDR_INLINE (xdrs, 6 * BYTES_PER_XDR_UNIT); if (buf == NULL) { if (!xdr_int (xdrs, &objp->cpus)) return FALSE; @@ -361,7 +361,7 @@ xdr_remote_node_get_info_ret (XDR *xdrs, return FALSE; if (!xdr_quad_t (xdrs, &objp->memory)) return FALSE; - buf = XDR_INLINE (xdrs, 6 * BYTES_PER_XDR_UNIT); + buf = (int32_t*)XDR_INLINE (xdrs, 6 * BYTES_PER_XDR_UNIT); if (buf == NULL) { if (!xdr_int (xdrs, &objp->cpus)) return FALSE; diff --git a/qemud/rpcgen_fix.pl b/qemud/rpcgen_fix.pl --- a/qemud/rpcgen_fix.pl +++ b/qemud/rpcgen_fix.pl @@ -68,6 +68,7 @@ while (<>) { # be ignored. Correct both these mistakes. @function = map { s/\bIXDR_PUT_((U_)?)LONG\b/(void)IXDR_PUT_$1INT32/; $_ } + map { s/\bXDR_INLINE\b/(int32_t*)XDR_INLINE/; $_ } @function; print (join ("", @function)); diff --git a/src/logging.c b/src/logging.c --- a/src/logging.c +++ b/src/logging.c @@ -29,6 +29,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> +#include <unistd.h> #if HAVE_SYSLOG_H #include <syslog.h> #endif @@ -483,7 +484,10 @@ void virLogMessage(const char *category, char *str = NULL; char *msg; struct timeval cur_time; - struct tm time_info; +#if HAVE_LOCALTIME_R + struct tm tmdata; +#endif + struct tm *tm; int len, fprio, i, ret; if (!virLogInitialized) @@ -509,17 +513,21 @@ void virLogMessage(const char *category, if (str == NULL) return; gettimeofday(&cur_time, NULL); - localtime_r(&cur_time.tv_sec, &time_info); +#if HAVE_LOCALTIME_R + tm = localtime_r(&cur_time.tv_sec, &tmdata); +#else + tm = localtime(&cur_time.tv_sec); +#endif if ((funcname != NULL) && (priority == VIR_LOG_DEBUG)) { ret = virAsprintf(&msg, "%02d:%02d:%02d.%03d: %s : %s:%lld : %s\n", - time_info.tm_hour, time_info.tm_min, - time_info.tm_sec, (int) cur_time.tv_usec / 1000, + tm->tm_hour, tm->tm_min, + tm->tm_sec, (int) cur_time.tv_usec / 1000, virLogPriorityString(priority), funcname, linenr, str); } else { ret = virAsprintf(&msg, "%02d:%02d:%02d.%03d: %s : %s\n", - time_info.tm_hour, time_info.tm_min, - time_info.tm_sec, (int) cur_time.tv_usec / 1000, + tm->tm_hour, tm->tm_min, + tm->tm_sec, (int) cur_time.tv_usec / 1000, virLogPriorityString(priority), str); } VIR_FREE(str); diff --git a/src/logging.h b/src/logging.h --- a/src/logging.h +++ b/src/logging.h @@ -30,48 +30,53 @@ * defined at runtime of from the libvirt daemon configuration file */ #ifdef ENABLE_DEBUG -#define VIR_DEBUG(category, f, l, fmt,...) \ +#define VIR_DEBUG_INT(category, f, l, fmt,...) \ virLogMessage(category, VIR_LOG_DEBUG, f, l, 0, fmt, __VA_ARGS__) -#define VIR_INFO(category, f, l, fmt,...) \ +#define VIR_INFO_INT(category, f, l, fmt,...) \ virLogMessage(category, VIR_LOG_INFO, f, l, 0, fmt, __VA_ARGS__) -#define VIR_WARN(category, f, l, fmt,...) \ +#define VIR_WARN_INT(category, f, l, fmt,...) \ virLogMessage(category, VIR_LOG_WARN, f, l, 0, fmt, __VA_ARGS__) -#define VIR_ERROR(category, f, l, fmt,...) \ +#define VIR_ERROR_INT(category, f, l, fmt,...) \ virLogMessage(category, VIR_LOG_ERROR, f, l, 0, fmt, __VA_ARGS__) #else -#define VIR_DEBUG(category, f, l, fmt,...) \ +#define VIR_DEBUG_INT(category, f, l, fmt,...) \ do { } while (0) -#define VIR_INFO(category, f, l, fmt,...) \ +#define VIR_INFO_INT(category, f, l, fmt,...) \ do { } while (0) -#define VIR_WARN(category, f, l, fmt,...) \ +#define VIR_WARN_INT(category, f, l, fmt,...) \ do { } while (0) -#define VIR_ERROR(category, f, l, fmt,...) \ +#define VIR_ERROR_INT(category, f, l, fmt,...) \ do { } while (0) -#define VIR_INFO(category, fmt,...) \ +#define VIR_INFO_INT(category, fmt,...) \ do { } while (0) -#define VIR_WARN(category, fmt,...) \ +#define VIR_WARN_INT(category, fmt,...) \ do { } while (0) -#define VIR_ERROR(category, fmt,...) \ +#define VIR_ERROR_INT(category, fmt,...) \ do { } while (0) #endif /* !ENABLE_DEBUG */ +#define VIR_DEBUG(fmt,...) \ + VIR_DEBUG_INT("file." __FILE__, __func__, __LINE__, fmt, __VA_ARGS__) +#define VIR_DEBUG0(msg) \ + VIR_DEBUG_INT("file." __FILE__, __func__, __LINE__, "%s", msg) +#define VIR_INFO(fmt,...) \ + VIR_INFO_INT("file." __FILE__, __func__, __LINE__, fmt, __VA_ARGS__) +#define VIR_INFO0(msg) \ + VIR_INFO_INT("file." __FILE__, __func__, __LINE__, "%s", msg) +#define VIR_WARN(fmt,...) \ + VIR_WARN_INT("file." __FILE__, __func__, __LINE__, fmt, __VA_ARGS__) +#define VIR_WARN0(msg) \ + VIR_WARN_INT("file." __FILE__, __func__, __LINE__, "%s", msg) +#define VIR_ERROR(fmt,...) \ + VIR_ERROR_INT("file." __FILE__, __func__, __LINE__, fmt, __VA_ARGS__) +#define VIR_ERROR0(msg) \ + VIR_ERROR_INT("file." __FILE__, __func__, __LINE__, "%s", msg) + +/* Legacy compat */ #define DEBUG(fmt,...) \ - VIR_DEBUG("file." __FILE__, __func__, __LINE__, fmt, __VA_ARGS__) + VIR_DEBUG_INT("file." __FILE__, __func__, __LINE__, fmt, __VA_ARGS__) #define DEBUG0(msg) \ - VIR_DEBUG("file." __FILE__, __func__, __LINE__, "%s", msg) -#define INFO(fmt,...) \ - VIR_INFO("file." __FILE__, __func__, __LINE__, fmt, __VA_ARGS__) -#define INFO0(msg) \ - VIR_INFO("file." __FILE__, __func__, __LINE__, "%s", msg) -#define WARN(fmt,...) \ - VIR_WARN("file." __FILE__, __func__, __LINE__, fmt, __VA_ARGS__) -#define WARN0(msg) \ - VIR_WARN("file." __FILE__, __func__, __LINE__, "%s", msg) -#define ERROR(fmt,...) \ - VIR_ERROR("file." __FILE__, __func__, __LINE__, fmt, __VA_ARGS__) -#define ERROR0(msg) \ - VIR_ERROR("file." __FILE__, __func__, __LINE__, "%s", msg) - + VIR_DEBUG_INT("file." __FILE__, __func__, __LINE__, "%s", msg) /* * To be made public diff --git a/src/test.c b/src/test.c --- a/src/test.c +++ b/src/test.c @@ -93,6 +93,7 @@ static const virNodeInfo defaultNodeInfo virReportErrorHelper(conn, VIR_FROM_TEST, code, __FILE__, \ __FUNCTION__, __LINE__, fmt) +#ifdef HAVE_THREAD_H static void testDriverLock(testConnPtr driver) { pthread_mutex_lock(&driver->lock); @@ -102,6 +103,10 @@ static void testDriverUnlock(testConnPtr { pthread_mutex_unlock(&driver->lock); } +#else +static void testDriverLock(testConnPtr driver ATTRIBUTE_UNUSED) {} +static void testDriverUnlock(testConnPtr driver ATTRIBUTE_UNUSED) {} +#endif static virCapsPtr testBuildCapabilities(virConnectPtr conn) { diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c --- a/tests/nodeinfotest.c +++ b/tests/nodeinfotest.c @@ -13,7 +13,7 @@ #ifndef __linux__ static int -mymain(int argc, char **argv) +mymain(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) { exit (77); /* means 'test skipped' for automake */ } -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

3 6

[libvirt] [PATCH] fix "make dist" (from scratch) failure
by Jim Meyering 06 Jan '09

06 Jan '09

Daniel Veillard noticed that "make dist" would fail when run from a clean source directory, due to our attempt to distribute a no-longer-generated file. I've committed this: >From 97e99d702dbb15176177bfd2055632ee6fdb6491 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 6 Jan 2009 16:21:24 +0100 Subject: [PATCH] fix "make dist" (from scratch) failure * src/Makefile.am (EXTRA_DIST): Don't distribute libvirt_sym.version, now that it's been removed. Spotted by Daniel Veillard. --- src/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index b3020cc..dd7dea8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -28,7 +28,7 @@ ICON_FILES = \ libvirt_win_icon_64x64.ico \ virsh_win_icon.rc -EXTRA_DIST = libvirt_sym.version $(conf_DATA) $(ICON_FILES) +EXTRA_DIST = $(conf_DATA) $(ICON_FILES) lib_LTLIBRARIES = libvirt.la -- 1.6.1.121.g866a4a

2 1

[libvirt] [PATCH 2/5] daemonize qemu processes
by Guido Günther 06 Jan '09

06 Jan '09

Make sure vms don't get killed when the libvirtd quits unexpectedly. Needs the previous patch since it looks at the pid file. --- src/qemu_driver.c | 36 ++++++++++++++++++++++++------------ 1 files changed, 24 insertions(+), 12 deletions(-) diff --git a/src/qemu_driver.c b/src/qemu_driver.c index a2e573e..7804094 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -858,6 +858,7 @@ static int qemudStartVMDaemon(virConnectPtr conn, const char *emulator; uid_t uid = geteuid(); mode_t logmode; + pid_t child; FD_ZERO(&keepfd); @@ -988,12 +989,26 @@ static int qemudStartVMDaemon(virConnectPtr conn, for (i = 0 ; i < ntapfds ; i++) FD_SET(tapfds[i], &keepfd); - ret = virExec(conn, argv, progenv, &keepfd, &vm->pid, + ret = virExec(conn, argv, progenv, &keepfd, &child, vm->stdin_fd, &vm->stdout_fd, &vm->stderr_fd, - VIR_EXEC_NONBLOCK); - if (ret == 0) + VIR_EXEC_NONBLOCK | VIR_EXEC_DAEMON); + + /* wait for qemu process to to show up */ + if (ret == 0) { + int retries = 100; + while (retries) { + if ((ret = virFileReadPid(driver->stateDir, vm->def->name, &vm->pid)) == 0) + break; + usleep(10*1000); + retries--; + } + if (ret) + qemudLog(QEMUD_WARN, _("Domain %s didn't show up\n"), vm->def->name); + } + + if (ret == 0) { vm->state = migrateFrom ? VIR_DOMAIN_PAUSED : VIR_DOMAIN_RUNNING; - else + } else vm->def->id = -1; for (i = 0 ; argv[i] ; i++) @@ -1069,7 +1084,9 @@ static void qemudShutdownVMDaemon(virConnectPtr conn ATTRIBUTE_UNUSED, qemudLog(QEMUD_INFO, _("Shutting down VM '%s'\n"), vm->def->name); - kill(vm->pid, SIGTERM); + if (kill(vm->pid, SIGTERM) < 0) + qemudLog(QEMUD_ERROR, _("Failed to send SIGTERM to %s (%d): %s\n"), + vm->def->name, vm->pid, strerror(errno)); qemudVMData(driver, vm, vm->stdout_fd); qemudVMData(driver, vm, vm->stderr_fd); @@ -1089,13 +1106,8 @@ static void qemudShutdownVMDaemon(virConnectPtr conn ATTRIBUTE_UNUSED, vm->stderr_fd = -1; vm->monitor = -1; - if (waitpid(vm->pid, NULL, WNOHANG) != vm->pid) { - kill(vm->pid, SIGKILL); - if (waitpid(vm->pid, NULL, 0) != vm->pid) { - qemudLog(QEMUD_WARN, - "%s", _("Got unexpected pid, damn\n")); - } - } + /* shut it off for sure */ + kill(vm->pid, SIGKILL); vm->pid = -1; vm->def->id = -1; -- 1.6.0.2

3 8

[libvirt] 5 minor cleanups
by Guido Günther 06 Jan '09

06 Jan '09

Hi, these accumulated over time. O.k. to apply? -- Guido

3 3

[libvirt] [PATCH] dist: distribute all libvirt_*.syms files, ...
by Jim Meyering 06 Jan '09

06 Jan '09

Some of the new libvirt_*.syms files were included in EXTRA_DIST only conditionally. Here's the fix: >From 272938681646e3aeefe5d9b13fab312a47e5d862 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 6 Jan 2009 12:09:40 +0100 Subject: [PATCH] dist: distribute all libvirt_*.syms files, ... * src/Makefile.am (EXTRA_DIST): Distribute all libvirt_*.syms files, not just those that happen to be selected at configure time. --- src/Makefile.am | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 1f707e2..b3020cc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -192,7 +192,7 @@ libvirt_driver_la_SOURCES = \ libvirt_driver_la_CFLAGS = $(XEN_CFLAGS) $(NUMACTL_CFLAGS) libvirt_driver_la_LDFLAGS = $(XEN_LIBS) $(NUMACTL_LIBS) -PRIVSYMFILES = libvirt_private.syms +USED_SYM_FILES = libvirt_private.syms if WITH_TEST if WITH_DRIVER_MODULES @@ -412,31 +412,37 @@ EXTRA_DIST += \ # if ENABLE_DEBUG -PRIVSYMFILES += libvirt_debug.syms +USED_SYM_FILES += libvirt_debug.syms endif if WITH_DRIVER_MODULES -PRIVSYMFILES += libvirt_driver_modules.syms +USED_SYM_FILES += libvirt_driver_modules.syms endif if WITH_BRIDGE -PRIVSYMFILES += libvirt_bridge.syms +USED_SYM_FILES += libvirt_bridge.syms endif if WITH_LINUX -PRIVSYMFILES += libvirt_linux.syms +USED_SYM_FILES += libvirt_linux.syms endif -EXTRA_DIST += libvirt_public.syms $(PRIVSYMFILES) +EXTRA_DIST += \ + libvirt_public.syms \ + libvirt_private.syms \ + libvirt_debug.syms \ + libvirt_driver_modules.syms \ + libvirt_bridge.syms \ + libvirt_linux.syms -libvirt.syms: libvirt_public.syms $(PRIVSYMFILES) +libvirt.syms: libvirt_public.syms $(USED_SYM_FILES) rm -f $@-tmp $@ printf '# WARNING: generated from the following:\n# $^\n\n' >$@-tmp cat $(srcdir)/libvirt_public.syms >>$@-tmp printf '\n\n# Private symbols\n\n' >>$@-tmp printf 'LIBVIRT_PRIVATE_$(VERSION) {\n\n' >>$@-tmp printf 'global:\n\n' >>$@-tmp - for file in $(PRIVSYMFILES); do \ + for file in $(USED_SYM_FILES); do \ cat $(srcdir)/$$file >>$@-tmp; \ done printf '\n\nlocal:\n*;\n\n};' >>$@-tmp -- 1.6.1.rc3.350.g541da

2 2

[libvirt] Libvirt - Xen Enterprise - Koan
by Tom Brown 06 Jan '09

06 Jan '09

Hi Our VM's currently run on top of Xen Enterprise, not my choice but thats the way it has to be at the moment. I'd like to be able to still use cobbler/koan to provision the systems and so i have managed to get libvirt installed onto a Xen Enterprise host. Libvirt starts but it cant connect to Xend as i presume Xen Enterprise behaves differently to Xen. Does anyone have any success with libvirt and Xen Enterprise ? thanks for any tips/experience

2 3

[libvirt] [PATCH] avoid syntax-check (po-check) failure due to FP match on gettext.m4
by Jim Meyering 06 Jan '09

06 Jan '09

spotted by Dan Berrange and the autobuilder http://builder.virt-manager.org/logs/modules/libvirt--devel-build-output.log >From ee91ab81dbd458078df39ef52e22e9a489d5cc72 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 6 Jan 2009 10:42:29 +0100 Subject: [PATCH] avoid syntax-check (po-check) failure due to FP match on gettext.m4 * Makefile.maint (po-check): Exclude .m4 files. --- Makefile.maint | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Makefile.maint b/Makefile.maint index 4e2d347..cfbdf56 100644 --- a/Makefile.maint +++ b/Makefile.maint @@ -558,6 +558,7 @@ po-check: files=; \ for file in $$($(VC_LIST_EXCEPT)); do \ case $$file in \ + *.m4) continue;; \ *.?|*.??) ;; \ *) continue;; \ esac; \ -- 1.6.1.rc3.350.g541da

3 2

[libvirt] [PATCH] Fix !SASL qemud compile
by john.levon＠sun.com 06 Jan '09

06 Jan '09

# HG changeset patch # User john.levon(a)sun.com # Date 1229980020 28800 # Node ID 4fbf7139ca42757d771f03578e91038bf28a5e0e # Parent fd97ec8e5799120ebf5ea9ed73d681c6d1386970 Fix !SASL qemud compile Replace qemudLog() with ERROR0() Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/qemud/remote.c b/qemud/remote.c --- a/qemud/remote.c +++ b/qemud/remote.c @@ -2968,7 +2968,7 @@ remoteDispatchAuthSaslInit (struct qemud void *args ATTRIBUTE_UNUSED, remote_auth_sasl_init_ret *ret ATTRIBUTE_UNUSED) { - qemudLog(QEMUD_ERR, "%s", _("client tried unsupported SASL init request")); + ERROR0(_("client tried unsupported SASL init request")); remoteDispatchAuthError(rerr); return -1; } @@ -2981,7 +2981,7 @@ remoteDispatchAuthSaslStart (struct qemu remote_auth_sasl_start_args *args ATTRIBUTE_UNUSED, remote_auth_sasl_start_ret *ret ATTRIBUTE_UNUSED) { - qemudLog(QEMUD_ERR, "%s", _("client tried unsupported SASL start request")); + ERROR0(_("client tried unsupported SASL start request")); remoteDispatchAuthError(rerr); return -1; } @@ -2994,7 +2994,7 @@ remoteDispatchAuthSaslStep (struct qemud remote_auth_sasl_step_args *args ATTRIBUTE_UNUSED, remote_auth_sasl_step_ret *ret ATTRIBUTE_UNUSED) { - qemudLog(QEMUD_ERR, "%s", _("client tried unsupported SASL step request")); + ERROR0(_("client tried unsupported SASL step request")); remoteDispatchAuthError(rerr); return -1; }

2 1

[libvirt] [PATCH] Make mntent.h specific to the FS storage backend
by john.levon＠sun.com 06 Jan '09

06 Jan '09

# HG changeset patch # User john.levon(a)sun.com # Date 1229789393 28800 # Node ID c433c57ef39b2c343653910df84130c8849a7c11 # Parent 100de621beed6e146b239df3691bd426090955b4 Make mntent.h specific to the FS storage backend It's Linux specific, so for now, put it behind a WITH_STORAGE_FS guard. Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/src/storage_backend_fs.c b/src/storage_backend_fs.c --- a/src/storage_backend_fs.c +++ b/src/storage_backend_fs.c @@ -31,7 +31,6 @@ #include <errno.h> #include <fcntl.h> #include <unistd.h> -#include <mntent.h> #include <string.h> #include <libxml/parser.h> @@ -242,6 +241,9 @@ static int virStorageBackendProbeFile(vi } #if WITH_STORAGE_FS + +#include <mntent.h> + struct _virNetfsDiscoverState { const char *host; virStoragePoolSourceList list;

2 1

[libvirt] [PATCH] virAsprintf cleanup
by Guido Günther 06 Jan '09

06 Jan '09

Hi, please find a possible asprintf vs. virAsprintf cleanup attached. There were several occations where the result of a failed asprintf was used. Cheers, -- Guido

3 5

Re: [libvirt] KVM/qemu: problems with autostart of vms with non-bridged nets
by Gerd v. Egidy 05 Jan '09

05 Jan '09

> > I came up with the attached patch to fix this for me, but > > a) I'm not sure if it is a clean use of the api to call virConnectOpen() > > from within a state-initializer function > > b) This is just for qemu/kvm, I haven't looked at any other drivers > > > > It would be nice if an experienced libvirt-developer could take a look at > > this. Thank you very much. > > Thanks for the bug report & patch. > > Did this patch actually make it work for you ? AFAICT, there's a problem > even earlier, which is that we are doing autostart of the virtual machines, > before autostart of the networks and storage pools, so I'm not sure that > this patch is sufficient. This patch alone not, but this patch + the one in my first mail (see https://www.redhat.com/archives/libvir-list/2008-November/msg00457.html) together make it work for me. The first patch fixes the autostart order, the second one adds the necessary conn structure. Kind regards, Gerd -- Address (better: trap) for people I really don't want to get mail from: james(a)cactusamerica.com

3 7

[libvirt] [PATCH 0 of 5] Split up version script
by john.levon＠sun.com 05 Jan '09

05 Jan '09

This series starts splitting up the linker script into various portions, as described within.

4 11

[libvirt] [PATCH] avoid xgettext warning aboug bug-reporting address
by Jim Meyering 05 Jan '09

05 Jan '09

Building "make distcheck", I saw this go by: /usr/bin/xgettext: warning: The option --msgid-bugs-address was not specified. If you are using a `Makevars' file, please specify the MSGID_BUGS_ADDRESS variable there; otherwise please specify an --msgid-bugs-address command line option. Here's the part of Makevars where that's defined: # This is the email address or URL to which the translators shall report # bugs in the untranslated strings: # - Strings which are not entire sentences, see the maintainer guidelines # in the GNU gettext documentation, section 'Preparing Strings'. # - Strings which use unclear terms or require additional context to be # understood. # - Strings which make invalid assumptions about notation of date, time or # money. # - Pluralisation problems. # - Incorrect English spelling. # - Incorrect formatting. # It can be your email address, or a mailing list address where translators # can write to without being subscribed, or the URL of a web page through # which the translators can contact you. MSGID_BUGS_ADDRESS = http://translate.fedoraproject.org/ I figure it's better to point people at the Fedora Translation pages than at libvirt's mailing list. I had to propagate this into libvirt.pot as well to avoid a "make distcheck" failure when update-po would try to move the just-changed libvirt.po onto a read-only libvirt.pot file because of the differing Report-Msgid-Bugs-To line. >From 1bb5f75174200e465038ac5cb5b7eee2e798627b Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 5 Jan 2009 10:23:52 +0100 Subject: [PATCH] avoid xgettext warning aboug bug-reporting address * po/Makevars (MSGID_BUGS_ADDRESS): Set, to avoid xgettext warning. * po/libvirt.pot: Set bug-reporting address. --- po/Makevars | 2 +- po/libvirt.pot | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/Makevars b/po/Makevars index 32692ab..9fbda10 100644 --- a/po/Makevars +++ b/po/Makevars @@ -34,7 +34,7 @@ COPYRIGHT_HOLDER = Free Software Foundation, Inc. # It can be your email address, or a mailing list address where translators # can write to without being subscribed, or the URL of a web page through # which the translators can contact you. -MSGID_BUGS_ADDRESS = +MSGID_BUGS_ADDRESS = http://translate.fedoraproject.org/ # This is the list of locale categories, beyond LC_MESSAGES, for which the # message catalogs shall be used. It is usually empty. diff --git a/po/libvirt.pot b/po/libvirt.pot index 92d6d88..23e6987 100644 --- a/po/libvirt.pot +++ b/po/libvirt.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" +"Report-Msgid-Bugs-To: http://translate.fedoraproject.org/\n" "POT-Creation-Date: 2008-12-04 16:26+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -- 1.6.1.rc3.350.g541da

4 4

[libvirt] [PATCH 1/2] mark a few diagnostics for translation
by Jim Meyering 05 Jan '09

05 Jan '09

Here are two warning-avoidance changes I'm about to commit: >From 588ecf78ffd6f284aa7872c13d946b9b5a146ef0 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 23 Dec 2008 16:49:26 +0100 Subject: [PATCH 1/2] mark a few diagnostics for translation * src/xen_inotify.c (xenInotifyXendDomainsDirLookup): Mark a diagnostic. (xenInotifyXendDomainsDirRemoveEntry, xenInotifyOpen): Likewise. --- src/xen_inotify.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/xen_inotify.c b/src/xen_inotify.c index fe1bc76..f6a7992 100644 --- a/src/xen_inotify.c +++ b/src/xen_inotify.c @@ -128,7 +128,7 @@ xenInotifyXendDomainsDirLookup(virConnectPtr conn, const char *filename, if (virUUIDParse(uuid_str, rawuuid) < 0) { virXenInotifyError(NULL, VIR_ERR_INTERNAL_ERROR, - "parsing uuid %s", uuid_str); + _("parsing uuid %s"), uuid_str); return -1; } /* call directly into xend here, as driver may not yet @@ -145,7 +145,7 @@ xenInotifyXendDomainsDirLookup(virConnectPtr conn, const char *filename, *name = strdup(configInfoList->doms[i]->name); if (!*name) { virXenInotifyError(NULL, VIR_ERR_INTERNAL_ERROR, - "finding dom for %s", uuid_str); + _("finding dom for %s"), uuid_str); return -1; } memcpy(uuid, configInfoList->doms[i]->uuid, VIR_UUID_BUFLEN); @@ -201,7 +201,7 @@ xenInotifyXendDomainsDirRemoveEntry(virConnectPtr conn ATTRIBUTE_UNUSED, if (virUUIDParse(uuidstr, uuid) < 0) { virXenInotifyError(NULL, VIR_ERR_INTERNAL_ERROR, - "parsing uuid %s", uuidstr); + _("parsing uuid %s"), uuidstr); return -1; } @@ -428,7 +428,7 @@ xenInotifyOpen(virConnectPtr conn ATTRIBUTE_UNUSED, IN_CLOSE_WRITE | IN_DELETE | IN_MOVED_TO | IN_MOVED_FROM) < 0) { virXenInotifyError(NULL, VIR_ERR_INTERNAL_ERROR, - "adding watch on %s", _(configDir)); + _("adding watch on %s"), _(configDir)); return -1; } -- 1.6.1.302.gccd4d >From 527665ea39b24b46c9f276b879dbcf12049787c4 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 23 Dec 2008 16:54:05 +0100 Subject: [PATCH 2/2] * Makefile.maint (msg_gen_function): Add to the list. --- Makefile.maint | 64 +++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 47 insertions(+), 17 deletions(-) diff --git a/Makefile.maint b/Makefile.maint index 0f43b1c..2f65bcf 100644 --- a/Makefile.maint +++ b/Makefile.maint @@ -361,36 +361,66 @@ sc_two_space_separator_in_usage: echo "$(ME): an option and its description"; \ 1>&2; exit 1; } || : +# Many of the function names below came from this filter: +# git grep -B2 '\<_('|grep -E '\.c- *[[:alpha:]_][[:alnum:]_]* ?\(.*[,;]$' \ +# |sed 's/.*\.c- *//'|perl -pe 's/ ?\(.*//'|sort -u \ +# |grep -vE '^(qsort|if|close|assert|fputc|free|N_|vir.*GetName|.*Unlock|virNodeListDevices|virHashRemoveEntry|freeaddrinfo|.*[fF]ree|xdrmem_create|xmlXPathFreeObject|virUUIDFormat|openvzSetProgramSentinal|polkit_action_unref)$' + msg_gen_function = +msg_gen_function += DEBUG0 msg_gen_function += DISABLE_fprintf -msg_gen_function += virXendError -msg_gen_function += virXMLError -msg_gen_function += virHashError +msg_gen_function += ERROR +msg_gen_function += ERROR0 +msg_gen_function += REMOTE_DEBUG +msg_gen_function += ReportError +msg_gen_function += VIR_FREE +msg_gen_function += VIR_USE_CPU +msg_gen_function += errorf +msg_gen_function += lxcError +msg_gen_function += networkLog +msg_gen_function += networkReportError +msg_gen_function += openvzError +msg_gen_function += openvzLog +msg_gen_function += qemudDispatchClientFailure +msg_gen_function += qemudLog +msg_gen_function += qemudReportError +msg_gen_function += regerror +msg_gen_function += remoteDispatchError +msg_gen_function += remoteDispatchFormatError +msg_gen_function += umlError +msg_gen_function += umlLog +msg_gen_function += umlReportError msg_gen_function += virConfError -msg_gen_function += virTestError +msg_gen_function += virDomainReportError +msg_gen_function += virHashError msg_gen_function += virLibConnError -msg_gen_function += virStorageReportError -msg_gen_function += virxmlRpcError +msg_gen_function += virLibDomainError msg_gen_function += virLog -msg_gen_function += qemudLog -msg_gen_function += remoteDispatchError +msg_gen_function += virNetworkReportError +msg_gen_function += virNodeDeviceReportError +msg_gen_function += virRaiseError +msg_gen_function += virReportErrorHelper +msg_gen_function += virSexprError msg_gen_function += virStorageLog +msg_gen_function += virStorageReportError +msg_gen_function += virTestError +msg_gen_function += virXMLError +msg_gen_function += virXenInotifyError +msg_gen_function += virXenStoreError +msg_gen_function += virXendError +msg_gen_function += virxmlRpcError +msg_gen_function += vshCloseLogFile msg_gen_function += xenXMError -msg_gen_function += ReportError -msg_gen_function += qemudReportError -msg_gen_function += openvzLog -msg_gen_function += openvzError -msg_gen_function += virDomainReportError -msg_gen_function += virReportErrorHelper -msg_gen_function += lxcError -msg_gen_function += umlError # Uncomment the following and run "make syntax-check" to see diagnostics # that are not yet marked for translation, but that need to be rewritten # so that they are translatable. # msg_gen_function += error -# msg_gen_function += virXenError +# msg_gen_function += fprintf # msg_gen_function += testError +# msg_gen_function += virXenError +# msg_gen_function += vshPrint +# msg_gen_function += vshError func_or := $(shell printf '$(msg_gen_function)'|tr -s '[[:space:]]' '|') func_re := ($(func_or)) -- 1.6.1.302.gccd4d

3 2

[libvirt] PATCH: Fix numa build failure on 32-bit f9
by Daniel P. Berrange 05 Jan '09

05 Jan '09

The automated build on Fedora 9, i386 is currently failing with cc1: warnings being treated as errors nodeinfo.c: In function 'virCapsInitNUMA': nodeinfo.c:212: error: passing argument 2 of 'numa_node_to_cpus' from incompatible pointer type make[3]: *** [libvirt_driver_la-nodeinfo.lo] Error 1 make[3]: *** Waiting for unfinished jobs.... The following patch addresses it: Index: src/nodeinfo.c =================================================================== RCS file: /data/cvs/libvirt/src/nodeinfo.c,v retrieving revision 1.15 diff -u -p -u -r1.15 nodeinfo.c --- src/nodeinfo.c 21 Dec 2008 18:55:09 -0000 1.15 +++ src/nodeinfo.c 5 Jan 2009 12:22:04 -0000 @@ -194,7 +194,7 @@ int virCapsInitNUMA(virCapsPtr caps) { int n; - uint64_t *mask = NULL; + unsigned long *mask = NULL; int *cpus = NULL; int ret = -1; int max_n_cpus = NUMA_MAX_N_CPUS; Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 2

[libvirt] Where are libvirt configuration files located ?
by Fabien Dupont 05 Jan '09

05 Jan '09

Hello. As there's a /etc/libvirt/qemu/networks directory, where are located configuration files for pools, domains, storage volumes ? How can I autostart a pool, as I don't know where to store its XML Dump ? Your help would be very useful. Thanks. -- Fabien Dupont System Engineer Email : evenit(a)gmail.com

2 1

[libvirt] [PATCH] Makefile.maint: sync from coreutils
by Jim Meyering 05 Jan '09

05 Jan '09

I sync'd Makefile.maint from coreutils a few weeks ago. Here's the result I'll push soon: [no review needed, imho, since this affects only "make syntax-check"] >From fb3793e69bf25ccd71b8e0815e86cdd952f3b759 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 5 Dec 2008 13:57:48 +0100 Subject: [PATCH] Makefile.maint: sync from coreutils --- Makefile.maint | 77 ++++++++++++++++++++++++++++++------------------------- 1 files changed, 42 insertions(+), 35 deletions(-) diff --git a/Makefile.maint b/Makefile.maint index 2f65bcf..4e2d347 100644 --- a/Makefile.maint +++ b/Makefile.maint @@ -62,7 +62,7 @@ sc_avoid_write: fi sc_cast_of_argument_to_free: - @grep -nE '\<free $\(' $$($(VC_LIST_EXCEPT)) && \ + @grep -nE '\<free *\( *\(' $$($(VC_LIST_EXCEPT)) && \ { echo '$(ME): don'\''t cast free argument' 1>&2; \ exit 1; } || : @@ -100,9 +100,10 @@ sc_prohibit_atoi_atof: # Use STREQ rather than comparing strcmp == 0, or != 0. # Similarly, use STREQLEN or STRPREFIX rather than strncmp. sc_prohibit_strcmp: - @grep -nE '! *str''n?cmp *\(|\<str''n?cmp *\([^)]+$ *==' \ - $$($(VC_LIST_EXCEPT)) && \ - { echo '$(ME): use STREQ in place of the above uses of str''cmp' \ + @grep -nE '! *strn?cmp *$|\<strn?cmp *\([^)]+$ *==' \ + $$($(VC_LIST_EXCEPT)) \ + | grep -vE ':# *define STREQ(LEN)?\(' && \ + { echo '$(ME): use STREQ(LEN) in place of the above uses of strcmp(strncmp)' \ 1>&2; exit 1; } || : # Use virAsprintf rather than a'sprintf since *strp is undefined on error. @@ -124,6 +125,7 @@ sc_file_system: 'rewrite to use "file system"' 1>&2; \ exit 1; } || : +# Don't use cpp tests of this symbol. All code assumes config.h is included. sc_no_have_config_h: @grep -n '^# *if.*HAVE''_CONFIG_H' $$($(VC_LIST_EXCEPT)) && \ { echo '$(ME): found use of HAVE''_CONFIG_H; remove' \ @@ -235,19 +237,22 @@ endif # On 2004-04-13, they were all changed to start with gl_ instead. # Make sure that none are inadvertently reintroduced. sc_prohibit_jm_in_m4: - @grep -nE 'jm_[A-Z]' \ - $$($(VC_LIST) m4 |grep '\.m4$$'; echo /dev/null) && \ - { echo '$(ME): do not use jm_ in m4 macro names' \ + @grep -nE 'jm_[A-Z]' \ + $$($(VC_LIST) m4 |grep '\.m4$$'; echo /dev/null) && \ + { echo '$(ME): do not use jm_ in m4 macro names' \ 1>&2; exit 1; } || : +# Ensure that each root-requiring test is run via the "check-root" rule. sc_root_tests: @if test -d tests \ && grep check-root tests/Makefile.am>/dev/null 2>&1; then \ t1=sc-root.expected; t2=sc-root.actual; \ grep -nl '^require_root_$$' \ - $$($(VC_LIST) tests) |sed s,tests,., |sort > $$t1; \ - sed -n 's, cd $[^ ]*$ .*MAKE..check TESTS=$.*$,./\1/\2,p' \ - $(srcdir)/tests/Makefile.am |sort > $$t2; \ + $$($(VC_LIST) tests) |sed s,tests/,, |sort > $$t1; \ + sed -n '/^root_tests =[ ]*\\$$/,/[^\]$$/p' \ + $(srcdir)/tests/Makefile.am \ + | sed 's/^ *//;/^root_tests =/d' \ + | tr -s '\012\\' ' ' | fmt -1 | sort > $$t2; \ diff -u $$t1 $$t2 || diff=1; \ rm -f $$t1 $$t2; \ test "$$diff" \ @@ -469,12 +474,20 @@ sc_GPL_version: # Ensure that the c99-to-c89 patch applies cleanly. patch-check: rm -rf src-c89 $@.1 $@.2 - cp -a src src-c89 - (cd src-c89; patch -p1 -V never --fuzz=0) < src/c99-to-c89.diff \ + cp -a $(srcdir)/src src-c89 + if test "x$(srcdir)" != x.; then \ + cp -a src/* src-c89; \ + dotfiles=`ls src/.[!.]* 2>/dev/null`; \ + test -z "$$dotfiles" || cp -a src/.[!.]* src-c89; \ + fi + (cd src-c89; patch -p1 -V never --fuzz=0) < $(srcdir)/src/c99-to-c89.diff \ > $@.1 2>&1 - if test "$$REGEN_PATCH" = yes; then \ - diff -upr src src-c89 | sed 's,src-c89/,src/,' \ - | grep -v '^Only in' > new-diff || : ; fi + if test "$(REGEN_PATCH)" = yes; then \ + diff -upr $(srcdir)/src src-c89 | sed 's,$(srcdir)/src-c89/,src/,' \ + | grep -vE '^(Only in|File )' \ + | perl -pe 's/^((?:\+\+\+|---) \S+\t).*/$${1}$(epoch_date)/;' \ + -e 's/^ $$//' \ + > new-diff || : ; fi grep -v '^patching file ' $@.1 > $@.2 || : msg=ok; test -s $@.2 && msg='fuzzy patch' || : ; \ rm -f src-c89/*.o || msg='rm failed'; \ @@ -529,7 +542,7 @@ changelog-check: m4-check: @grep -n 'AC_DEFUN([^[]' $(srcdir)/m4/*.m4 \ - && { echo 'Makefile.maint: quote the first arg to AC_DEFUN' 1>&2; \ + && { echo '$(ME): quote the first arg to AC_DEFUN' 1>&2; \ exit 1; } || : fix_po_file_diag = \ @@ -539,20 +552,19 @@ apply the above patch\n' # Verify that all source files using _() are listed in po/POTFILES.in. po_file = po/POTFILES.in po-check: - @if test -f po/POTFILES.in; then \ - grep -E -v '^(#|$$)' po/POTFILES.in \ + @if test -f $(po_file); then \ + grep -E -v '^(#|$$)' $(po_file) \ | grep -v '^src/false\.c$$' | sort > $@-1; \ files=; \ for file in $$($(VC_LIST_EXCEPT)); do \ case $$file in \ - djgpp/* | man/*) continue;; \ - */c99-to-c89.diff) continue;; \ + *.?|*.??) ;; \ + *) continue;; \ esac; \ case $$file in \ *.[ch]) \ base=`expr " $$file" : ' $.*$\..'`; \ { test -f $$base.l || test -f $$base.y; } && continue;; \ - *) continue;; \ esac; \ files="$$files $$file"; \ done; \ @@ -568,7 +580,7 @@ po-check: # gettext recognizes it as a string requiring translation. author_mark_check: @grep -n '^# *define AUTHORS "[^"]* and ' src/*.c |grep -v ' N_ (' && \ - { echo 'Makefile.maint: enclose the above strings in N_ (...)' 1>&2; \ + { echo '$(ME): enclose the above strings in N_ (...)' 1>&2; \ exit 1; } || : # Sometimes it is useful to change the PATH environment variable @@ -577,7 +589,7 @@ author_mark_check: # It'd be better to use `find -print0 ...|xargs -0 ...', but less portable, # and there probably aren't many projects with so many Makefile.am files # that we'd have to worry about limits on command line length. -msg = 'Makefile.maint: Do not use `:'\'' above; use @PATH_SEPARATOR@ instead' +msg = '$(ME): Do not use `:'\'' above; use @PATH_SEPARATOR@ instead' makefile_path_separator_check: @grep -n 'PATH=.*:' `find $(srcdir) -name Makefile.am` \ && { echo $(msg) 1>&2; exit 1; } || : @@ -591,7 +603,7 @@ writable-files: test -w $$file \ || { echo ERROR: $$file is not writable; fail=1; }; \ done; \ - test "$$fail" && exit 1 || : + test "$$fail" && exit 1 || : ; \ fi v_etc_file = lib/version-etc.c @@ -640,16 +652,18 @@ maintainer-distcheck: # arithmetic problems with -Wpointer-arith. # These CFLAGS are pretty strict. If you build this target, you probably # have to have a recent version of gcc and glibc headers. -# The for-loop below ensures that there is a bin/ directory full of all -# of the programs under test (except the few that are required for basic -# Makefile rules), all symlinked to the just-built "false" program. +# The hard-linking for-loop below ensures that there is a bin/ directory +# full of all of the programs under test (except the ones that are required +# for basic Makefile rules), all symlinked to the just-built "false" program. # This is to ensure that if ever a test neglects to make PATH include # the build srcdir, these always-failing programs will run. # Otherwise, it is too easy to test the wrong programs. # Note that "false" itself is a symlink to true, so it too will malfunction. TMPDIR ?= /tmp t=$(TMPDIR)/$(PACKAGE)/test -my-distcheck: $(local-check) check +my-distcheck: $(DIST_ARCHIVES) $(local-check) + $(MAKE) syntax-check + $(MAKE) check -rm -rf $(t) mkdir -p $(t) GZIP=$(GZIP_ENV) $(AMTAR) -C $(t) -zxf $(distdir).tar.gz @@ -662,13 +676,6 @@ my-distcheck: $(local-check) check (cd $(t) && mv $(distdir) $(distdir).old \ && $(AMTAR) -zxf - ) < $(distdir).tar.gz diff -ur $(t)/$(distdir).old $(t)/$(distdir) - if test -f $(srcdir)/src/c99-to-c89.diff; then \ - cd $(t)/$(distdir) \ - && (cd src && patch -V never --fuzz=0 <c99-to-c89.diff) \ - && ./configure --disable-largefile \ - CFLAGS='-Werror -ansi -Wno-long-long' \ - && $(MAKE); \ - fi -rm -rf $(t) @echo "========================"; \ echo "$(distdir).tar.gz is ready for distribution"; \ -- 1.6.1.94.g9388

1 0

[libvirt] [PATCH] avoid bogus descriptions due to use of gettext with the empty string
by Jim Meyering 05 Jan '09

05 Jan '09

I noticed many warnings like this: src/virsh.c:2115: warning: Empty msgid. It is reserved by GNU gettext: gettext("") returns the header entry with meta information, not the empty string. This is the trivial fix I'll commit shortly: >From ac43b94577b8df451b420be70202c1e2aa4c1742 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 5 Jan 2009 09:55:47 +0100 Subject: [PATCH] avoid bogus descriptions due to use of gettext with the empty string * src/virsh.c: Use `""', not `gettext_noop("")', in numerous vshCmdInfo definitions. The latter provokes a warning from gettext. --- src/virsh.c | 33 ++++++++++++++++----------------- 1 files changed, 16 insertions(+), 17 deletions(-) diff --git a/src/virsh.c b/src/virsh.c index 3d55b32..fd23e9f 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -1,7 +1,7 @@ /* * virsh.c: a Xen shell used to exercise the libvirt API * - * Copyright (C) 2005, 2007-2008 Red Hat, Inc. + * Copyright (C) 2005, 2007-2009 Red Hat, Inc. * * See COPYING.LIB for the License of this software * @@ -2112,7 +2112,7 @@ cmdDumpXML(vshControl *ctl, const vshCmd *cmd) */ static const vshCmdInfo info_domname[] = { {"help", gettext_noop("convert a domain id or UUID to domain name")}, - {"desc", gettext_noop("")}, /* FIXME: describe */ + {"desc", ""}, {NULL, NULL} }; @@ -2142,7 +2142,7 @@ cmdDomname(vshControl *ctl, const vshCmd *cmd) */ static const vshCmdInfo info_domid[] = { {"help", gettext_noop("convert a domain name or UUID to domain id")}, - {"desc", gettext_noop("")}, /* FIXME: describe */ + {"desc", ""}, {NULL, NULL} }; @@ -2177,7 +2177,7 @@ cmdDomid(vshControl *ctl, const vshCmd *cmd) */ static const vshCmdInfo info_domuuid[] = { {"help", gettext_noop("convert a domain name or id to domain UUID")}, - {"desc", gettext_noop("")}, /* FIXME: describe */ + {"desc", ""}, {NULL, NULL} }; @@ -2625,7 +2625,7 @@ cmdNetworkList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) */ static const vshCmdInfo info_network_name[] = { {"help", gettext_noop("convert a network UUID to network name")}, - {"desc", gettext_noop("")}, /* FIXME: describe */ + {"desc", ""}, {NULL, NULL} }; @@ -2732,7 +2732,7 @@ cmdNetworkUndefine(vshControl *ctl, const vshCmd *cmd) */ static const vshCmdInfo info_network_uuid[] = { {"help", gettext_noop("convert a network name to network UUID")}, - {"desc", gettext_noop("")}, /* FIXME: describe */ + {"desc", ""}, {NULL, NULL} }; @@ -3600,7 +3600,7 @@ cmdPoolInfo(vshControl *ctl, const vshCmd *cmd) */ static const vshCmdInfo info_pool_name[] = { {"help", gettext_noop("convert a pool UUID to pool name")}, - {"desc", gettext_noop("")}, /* FIXME: describe */ + {"desc", ""}, {NULL, NULL} }; @@ -3828,7 +3828,7 @@ cmdPoolUndefine(vshControl *ctl, const vshCmd *cmd) */ static const vshCmdInfo info_pool_uuid[] = { {"help", gettext_noop("convert a pool name to pool UUID")}, - {"desc", gettext_noop("")}, /* FIXME: describe */ + {"desc", ""}, {NULL, NULL} }; @@ -4135,7 +4135,7 @@ cmdVolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) */ static const vshCmdInfo info_vol_name[] = { {"help", gettext_noop("convert a vol UUID to vol name")}, - {"desc", gettext_noop("")}, /* FIXME: describe */ + {"desc", ""}, {NULL, NULL} }; @@ -4168,7 +4168,7 @@ cmdVolName(vshControl *ctl, const vshCmd *cmd) */ static const vshCmdInfo info_vol_key[] = { {"help", gettext_noop("convert a vol UUID to vol key")}, - {"desc", gettext_noop("")}, /* FIXME: describe */ + {"desc", ""}, {NULL, NULL} }; @@ -4201,7 +4201,7 @@ cmdVolKey(vshControl *ctl, const vshCmd *cmd) */ static const vshCmdInfo info_vol_path[] = { {"help", gettext_noop("convert a vol UUID to vol path")}, - {"desc", gettext_noop("")}, /* FIXME: describe */ + {"desc", ""}, {NULL, NULL} }; @@ -4317,7 +4317,7 @@ cmdVersion(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) */ static const vshCmdInfo info_node_list_devices[] = { {"help", gettext_noop("enumerate devices on this host")}, - {"desc", gettext_noop("")}, /* FIXME: describe */ + {"desc", ""}, {NULL, NULL} }; @@ -4405,7 +4405,7 @@ cmdNodeDeviceDumpXML (vshControl *ctl, const vshCmd *cmd) */ static const vshCmdInfo info_hostname[] = { {"help", gettext_noop("print the hypervisor hostname")}, - {"desc", gettext_noop("")}, /* FIXME: describe */ + {"desc", ""}, {NULL, NULL} }; @@ -4434,7 +4434,7 @@ cmdHostname (vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) */ static const vshCmdInfo info_uri[] = { {"help", gettext_noop("print the hypervisor canonical URI")}, - {"desc", gettext_noop("")}, /* FIXME: describe */ + {"desc", ""}, {NULL, NULL} }; @@ -5480,7 +5480,7 @@ static const vshCmdOptDef opts_pool_edit[] = { */ static const vshCmdInfo info_quit[] = { {"help", gettext_noop("quit this interactive terminal")}, - {"desc", gettext_noop("")}, /* FIXME: describe */ + {"desc", ""}, {NULL, NULL} }; @@ -5722,8 +5722,7 @@ vshCmddefHelp(vshControl *ctl, const char *cmdname) fputc('\n', stdout); if (desc[0]) { - /* FIXME: remove this test once all of the empty descriptions - have been removed; see `FIXME: describe' lines. */ + /* Print the description only if it's not empty. */ fputs(_("\n DESCRIPTION\n"), stdout); fprintf(stdout, " %s\n", desc); } -- 1.6.1.rc3.350.g541da

1 0

[libvirt] libvirt.org going down for hardware upgrade in one hour
by Daniel Veillard 02 Jan '09

02 Jan '09

The box is being replaced with something more current, hopefully this won't disturb people much, and the switch will take less than an hour, please avoid commiting to the various CVS/mercurial bases at this point, thanks, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 1

[libvirt] document vnc's keymap option
by Guido Günther 26 Dec '08

26 Dec '08

Hi, possible patch attached. -- Guido

2 2

[libvirt] libvirtd crashing with network bridge configuration
by Emre Erenoglu 24 Dec '08

24 Dec '08

Dear Developers, Users, I'm trying to package libvirt for our distribution, however, having some problems past the libvirt 0.4.3 series. Everything compiles and installs fine. With versions above and including 0.5.1, I'm getting the following errors in the dmesg output: virbr0: Dropping NETIF_F_UFO since no NETIF_F_HW_CSUM feature. virbr0: starting userspace STP failed, starting kernel STP sysfs: duplicate filename '0' can not be created ------------[ cut here ]------------ WARNING: at fs/sysfs/dir.c:424 sysfs_add_one+0x34/0xa6() Modules linked in: ipt_MASQUERADE iptable_nat nf_nat nf_conntrack_ipv4 xt_state nf_conntrack ipt_REJECT xt_tcpudp iptable_filter ip_tables x_tables microcode firmware_class acpi_cpufreq cpufreq_powersave cpufreq_userspace ipv6 bridge fuse loop tun kvm_intel kvm coretemp w83627ehf hwmon_vid hwmon snd_hda_intel nvidia(P) snd_seq_dummy snd_seq_oss snd_seq_midi_event joydev snd_seq rtc_cmos rtc_core rtc_lib snd_seq_device i2c_i801 iTCO_wdt usbhid serio_raw snd_pcm_oss snd_mixer_oss hid iTCO_vendor_support snd_pcm ff_memless snd_timer snd_page_alloc thermal atl1 snd_hwdep processor intel_agp snd button mii agpgart i2c_core soundcore sg ext3 jbd mbcache raid456 async_xor async_memcpy async_tx xor raid10 raid1 raid0 dm_mod sd_mod sr_mod cdrom usb_storage pata_jmicron ehci_hcd uhci_hcd usbcore ohci1394 ieee1394 pata_acpi ahci ata_generic libata scsi_mod dock Pid: 3605, comm: libvirtd Tainted: P 2.6.25.20-113 #1 [<c02d60e6>] ? printk+0xf/0x11 [<c0122e01>] warn_on_slowpath+0x41/0x67 [<c01dbae8>] ? vsnprintf+0x287/0x40f [<c012352e>] ? release_console_sem+0x194/0x19c [<c01d7e32>] ? ida_get_new_above+0xd0/0x171 [<c0185afb>] ? find_inode+0x1f/0x5b [<c01afde8>] ? sysfs_ilookup_test+0x0/0x11 [<c0185bfb>] ? ifind+0x32/0x76 [<c01b00ca>] sysfs_add_one+0x34/0xa6 [<c01b05b2>] create_dir+0x43/0x72 [<c01b060e>] sysfs_create_dir+0x2d/0x41 [<c01d85de>] ? kobject_get+0x12/0x17 [<c01d86dc>] kobject_add_internal+0xa9/0x14a [<c01d8811>] kobject_add_varg+0x35/0x41 [<c01d883d>] kobject_init_and_add+0x20/0x22 [<c012ae70>] uids_user_create+0x36/0x5b [<c012b028>] alloc_uid+0xf3/0x1b6 [<c01486c6>] copy_user_ns+0x59/0xaf [<c0136833>] create_new_namespaces+0xe9/0x196 [<c013697e>] copy_namespaces+0x45/0x73 [<c0122152>] copy_process+0xba9/0x11e5 [<c012283d>] do_fork+0xaf/0x1e4 [<c0103428>] sys_clone+0x1f/0x21 [<c0104a2e>] syscall_call+0x7/0xb [<c02d0000>] ? pci_fixup_msi_k8t_onboard_sound+0x68/0x98 ======================= ---[ end trace e8211acaf4c7288d ]--- kobject_add_internal failed for 0 with -EEXIST, don't try to register things with the same name in the same directory. Pid: 3605, comm: libvirtd Tainted: P 2.6.25.20-113 #1 [<c01d876b>] kobject_add_internal+0x138/0x14a [<c01d8811>] kobject_add_varg+0x35/0x41 [<c01d883d>] kobject_init_and_add+0x20/0x22 [<c012ae70>] uids_user_create+0x36/0x5b [<c012b028>] alloc_uid+0xf3/0x1b6 [<c01486c6>] copy_user_ns+0x59/0xaf [<c0136833>] create_new_namespaces+0xe9/0x196 [<c013697e>] copy_namespaces+0x45/0x73 [<c0122152>] copy_process+0xba9/0x11e5 [<c012283d>] do_fork+0xaf/0x1e4 [<c0103428>] sys_clone+0x1f/0x21 [<c0104a2e>] syscall_call+0x7/0xb [<c02d0000>] ? pci_fixup_msi_k8t_onboard_sound+0x68/0x98 ======================= virbr0: no IPv6 routers present ps ax shows the following output right after the service is started: 3605 ? S 0:00 /usr/sbin/libvirtd --daemon 3624 ? Z 0:00 [libvirtd] <defunct> If I don't enable any network at /etc/libvirt/qemu/networks/autostart, then there's no error. Any clues are appreciated, I'm unable to proceed with it. Best Regards. Emre

2 9

[libvirt] [PATCH] 0/8 logging infrastructure for libvirt[d]
by Daniel Veillard 23 Dec '08

23 Dec '08

the following set of patches implement the logging infrastructure based on the discussion about it last month. It is based on the following interfaces, and in a large part reflects the log4j principles. 4 level of logging priorities: typedef enum { VIR_LOG_DEBUG = 1, VIR_LOG_INFO, VIR_LOG_WARN, VIR_LOG_ERROR, } virLogPriority; An output is a channel to output logging informations and a filter is a rule to allow or not log information to flow through. At any given time a set of output and filters can be defined though a public API (but I didn't put them yet in libvirt.h that's still confined in logging.h ATM) /** * virLogOutputFunc: * @data: extra output logging data * @category: the category for the message * @priority: the priority for the message * @msg: the message to log, preformatted and zero terminated * @len: the lenght of the message in bytes without the terminating zero * * Callback function used to output messages * * Returns the number of bytes written or -1 in case of error */ typedef int (*virLogOutputFunc) (void *data, const char *category, int priority, const char *str, int len); /** * virLogCloseFunc: * @data: extra output logging data * * Callback function used to close a log output */ typedef void (*virLogCloseFunc) (void *data); extern int virLogSetDefaultPriority(int priority); extern int virLogDefineFilter(const char *match, int priority, int flags); extern int virLogDefineOutput(virLogOutputFunc f, virLogCloseFunc c, void *data, int priority, int flags); The default priority allows to set a default level of logging, individual logs matching filters will follow the rules defined for the filters, i.e. if the logged data is of a lower level than what the first filter matching it then it is dropped. The internal APIs defines a function to log a message: extern void virLogMessage(const char *category, int priority, int flags, const char *fmt, ...); the category is in general the file name as defined by __FILE__ The matching is done against the category based on a substring, for example "xen" would match all logs emitted by xend_internal.c xen_inotify.c xen_internal.c xen_unified.c Something more complex could be defined for example matching based on regexp or based on the full message content and not just the category but this gets heavier and could be done later using specific flags in virLogDefineFilter. The preferred user interface for setting the output and filters is through environment variables for application linking to libvirt LIBVIRT_DEBUG defines the default logging level from 1 to 4 LIBVIRT_LOG_FILTERS defines the set filters LIBVIRT_LOG_OUTPUTS defines the set outputs and though the configuration file libvirtd.conf for the daemon with the corresponding values: log_level log_filters log_outputs The convenience internal functions virLogParseFilters and virLogParseOutputs parse the format of the values for filters and outputs, so they share the same format explained in libvirtd.conf: ------------------------------------------------------------------ # Logging filters: # A filter allows to select a different logging level for a given category # of logs # The format for a filter is: # x:name # where name is a match string e.g. remote or qemu # the x prefix is the minimal level where matching messages should be logged # 1: DEBUG # 2: INFO # 3: WARNING # 4: ERROR # # Multiple filter can be defined in a single @filters, they just need to be # separated by spaces. # # e.g: # log_filters="3:remote 4:event" # to only get warning or errors from the remote layer and only errors from # the event layer. # Logging outputs: # An output is one of the places to save logging informations # The format for an output can be: # x:stderr # output goes to stderr # x:syslog:name # use syslog for the output and use the given name as the ident # x:file:file_path # output to a file, with the given filepath # In all case the x prefix is the minimal level, acting as a filter # 0: everything # 1: DEBUG # 2: INFO # 3: WARNING # 4: ERROR # # Multiple output can be defined , they just need to be separated by spaces. # e.g.: # log_outputs="3:syslog:libvirtd" # to log all warnings and errors to syslog under the libvirtd ident ----------------------------------------------------------------------- In practice export LIBVIRT_DEBUG=1 export LIBVIRT_LOG_OUTPUTS="0:file:virsh.log" and then running virsh will accumulate all logging to the virsh.log file in the current directory. One thing which I feel is somewhat incomplete is that it's impossible to remotely get debugging output from the libvirt daemon serving the requests. Currently all logs are also accumulated in a cyclic logging buffer, I would associate a dump function later to be hooked for example to a signal handler in the daemon. But I'm unsure we should allow dumping logging information to the remote end, probably not the whole set. So there is still room for a bit more development, but I think it's usable as-is and already cleans quite a bit of the various logging interface scattered in the various modules. Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

3 5

[libvirt] [PATCH] Correct comment type in the linker script
by john.levon＠sun.com 22 Dec '08

22 Dec '08

# HG changeset patch # User john.levon(a)sun.com # Date 1229980017 28800 # Node ID 1521894aacfa409ec6017f4e1603a040f4866f64 # Parent 9d764ab75280a4ce9e4c3779b5848e670c7fc460 Correct comment type in the linker script Use more-portable form. Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/src/libvirt_sym.version.in b/src/libvirt_sym.version.in --- a/src/libvirt_sym.version.in +++ b/src/libvirt_sym.version.in @@ -462,7 +462,7 @@ LIBVIRT_PRIVATE_@VERSION@ { virRegisterStorageDriver; virRegisterDeviceMonitor; - /* logging.h */ + # logging.h virLogSetDefaultPriority; virLogDefineFilter; virLogDefineOutput;

1 0

[libvirt] [PATCH] Unify pool-create-as and pool-define-as xml building
by Cole Robinson 22 Dec '08

22 Dec '08

The attached patch unifies the xml building and command line option registering for the virsh pool-*-as commands, fixing a few bugs in the process: - pool-define-as was creating <host> without a name attribute (rhbz 476708) - pool-create-as wasn't adding a closing tag to its <host> block - pool-create-as didn't have the source-name option All seem like a good justification for not duplicating the logic. The patch ends up looking a bit bizarre, but it's mostly just moving the xml building from create-as into a separate function buildPoolXML, and then wiring it up. Thanks, Cole

2 2

[libvirt] [PATCH] Fix pool define crash
by Cole Robinson 22 Dec '08

22 Dec '08

There's a null dereference in the storage driver when defining a pool. Attached patch fixes it for me. Thanks, Cole

4 8

[libvirt] [PATCH] fix numa-related (and kernel-dependent) test failures
by Jim Meyering 21 Dec '08

21 Dec '08

Following up on this thread, http://thread.gmane.org/gmane.comp.emulators.libvirt/10402 Here's a patch that appears to work for kernels before and after the CONFIG_NR_CPUS change. I've tested it via a small stand-alone program on both kernels, but via libvirt only on rawhide. Dave, can you confirm the tests pass for you on the 2.6.27.x-based kernel? >From b78a48c7a401ecdf37de95b0b01435578ad30e12 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 12 Dec 2008 16:22:34 +0100 Subject: [PATCH] fix numa-related (and kernel-dependent) test failures This change is required on some kernels due to the way a change in the kernel's CONFIG_NR_CPUS propagates through the numa library. * src/qemu_conf.c (qemudCapsInitNUMA): Pass numa_all_cpus_ptr->size/8 as the buffer-length-in-bytes in the call to numa_node_to_cpus, since that's what is required on second and subseqent calls. * src/uml_conf.c (umlCapsInitNUMA): Likewise. --- src/qemu_conf.c | 2 +- src/uml_conf.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu_conf.c b/src/qemu_conf.c index 59171e7..206fb0b 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -324,7 +324,7 @@ qemudCapsInitNUMA(virCapsPtr caps) for (n = 0 ; n <= numa_max_node() ; n++) { - if (numa_node_to_cpus(n, mask, MAX_CPUS_MASK_LEN / 8) < 0) + if (numa_node_to_cpus(n, mask, MAX_CPUS_MASK_LEN) < 0) goto cleanup; for (ncpus = 0, i = 0 ; i < MAX_CPUS ; i++) diff --git a/src/uml_conf.c b/src/uml_conf.c index 3659c6b..7eb630d 100644 --- a/src/uml_conf.c +++ b/src/uml_conf.c @@ -80,7 +80,7 @@ umlCapsInitNUMA(virCapsPtr caps) for (n = 0 ; n <= numa_max_node() ; n++) { - if (numa_node_to_cpus(n, mask, MAX_CPUS_MASK_LEN / 8) < 0) + if (numa_node_to_cpus(n, mask, MAX_CPUS_MASK_LEN) < 0) goto cleanup; for (ncpus = 0, i = 0 ; i < MAX_CPUS ; i++) -- 1.6.1.rc2.316.geb2f0

4 9

[libvirt] [PATCH] avoid testcase failures due to LANG!=C
by Guido Günther 21 Dec '08

21 Dec '08

Hi, some checks compare to the english error messages: --- out 2008-12-18 15:36:44.000000000 +0100 +++ exp 2008-12-18 15:36:44.000000000 +0100 @@ -1,3 +1,3 @@ -libvir: Domain Config Fehler : failed Xen syscall Topologie-Syntaxfehler beim Cpuset -Fehler: Fehler beim Definieren einer Domain von xml-invalid +libvir: Domain Config error : failed Xen syscall topology cpuset syntax error +error: Failed to define domain from xml-invalid FAIL: cpuset so we should set LC_ALL=C in the checks. Possible patch attached. -- Guido

2 2

[libvirt] virDomainInterfaceStats why is there a size?
by Stefan de Konink 20 Dec '08

20 Dec '08

Another simple question, what is the reasoning about the size field in this call. I would really be a happy boy if anyone said: if you put in path == NULL, it will fill your stats structure up to size interfaces. ...but since this is not the case (yet) what is the reason behind it? Stefan

3 2

[libvirt] [PATCH 4/5] save domain status during vm creation and remove it on shutdown.
by Guido Günther 20 Dec '08

20 Dec '08

This patch does the actual saving and removal of the vm status. It does so only at vm creation time at the moment. We need to update the config every time the life config changes later. --- src/qemu_driver.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 7804094..d8b87e4 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -182,6 +182,44 @@ qemudAutostartConfigs(struct qemud_driver *driver) { virConnectClose(conn); } + +/** + * qemudRemoveDomainStatus + * + * remove all state files of a domain from statedir + * + * Returns 0 on success + */ +static int +qemudRemoveDomainStatus(virConnectPtr conn, + struct qemud_driver *driver, + virDomainObjPtr vm) +{ + int rc = -1; + char *file = NULL; + + if (asprintf(&file, "%s/%s.xml", driver->stateDir, vm->def->name) < 0) { + qemudReportError(conn, vm, NULL, VIR_ERR_NO_MEMORY, + "%s", _("failed to allocate space for status file")); + goto cleanup; + } + + if (unlink(file) < 0 && errno != ENOENT && errno != ENOTDIR) { + qemudReportError(conn, vm, NULL, VIR_ERR_INTERNAL_ERROR, + _("Failed to unlink status file %s"), file); + goto cleanup; + } + + if(virFileDeletePid(driver->stateDir, vm->def->name)) + goto cleanup; + + rc = 0; +cleanup: + VIR_FREE(file); + return rc; +} + + /** * qemudStartup: * @@ -532,6 +570,12 @@ static int qemudOpenMonitor(virConnectPtr conn, qemudCheckMonitorPrompt, "monitor", 10000); + if (!(vm->monitorpath = strdup(monitor))) { + qemudReportError(conn, NULL, NULL, VIR_ERR_NO_MEMORY, + "%s", _("failed to allocate space for monitor path")); + goto error; + } + /* Keep monitor open upon success */ if (ret == 0) return ret; @@ -1046,6 +1090,7 @@ static int qemudStartVMDaemon(virConnectPtr conn, return -1; } } + qemudSaveDomainStatus(conn, qemu_driver, vm); return ret; } @@ -1108,6 +1153,7 @@ static void qemudShutdownVMDaemon(virConnectPtr conn ATTRIBUTE_UNUSED, /* shut it off for sure */ kill(vm->pid, SIGKILL); + qemudRemoveDomainStatus(conn, driver, vm); vm->pid = -1; vm->def->id = -1; -- 1.6.0.2

4 7

[libvirt] [PATCH 3/5] add XML parsing for vm status file
by Guido Günther 20 Dec '08

20 Dec '08

Functions to read and write vm status in $(statedir)/qemu/<domain>.xml. Keeps the necessary to reconnect to a running domain state within <domstate>...</domstate>. I kept most of the code in qemu_config.c for now. We can easily move it should another hypervisor need to do something similar. --- src/domain_conf.c | 36 ++++++--- src/domain_conf.h | 6 ++ src/libvirt_sym.version.in | 2 + src/qemu_conf.c | 191 ++++++++++++++++++++++++++++++++++++++++++++ src/qemu_conf.h | 17 ++++ 5 files changed, 241 insertions(+), 11 deletions(-) diff --git a/src/domain_conf.c b/src/domain_conf.c index 32ed59f..1b53c09 100644 --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -430,6 +430,7 @@ void virDomainObjFree(virDomainObjPtr dom) virDomainDefFree(dom->def); virDomainDefFree(dom->newDef); + VIR_FREE(dom->monitorpath); VIR_FREE(dom->vcpupids); VIR_FREE(dom); @@ -3224,11 +3225,11 @@ char *virDomainDefFormat(virConnectPtr conn, #ifndef PROXY -int virDomainSaveConfig(virConnectPtr conn, - const char *configDir, - virDomainDefPtr def) +int virDomainSaveXML(virConnectPtr conn, + const char *configDir, + virDomainDefPtr def, + const char *xml) { - char *xml; char *configFile = NULL; int fd = -1, ret = -1; size_t towrite; @@ -3237,11 +3238,6 @@ int virDomainSaveConfig(virConnectPtr conn, if ((configFile = virDomainConfigFile(conn, configDir, def->name)) == NULL) goto cleanup; - if (!(xml = virDomainDefFormat(conn, - def, - VIR_DOMAIN_XML_SECURE))) - goto cleanup; - if ((err = virFileMakePath(configDir))) { virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, _("cannot create config directory %s: %s"), @@ -3274,12 +3270,30 @@ int virDomainSaveConfig(virConnectPtr conn, } ret = 0; - cleanup: - VIR_FREE(xml); if (fd != -1) close(fd); + return ret; +} + +int virDomainSaveConfig(virConnectPtr conn, + const char *configDir, + virDomainDefPtr def) +{ + int ret = -1; + char *xml; + if (!(xml = virDomainDefFormat(conn, + def, + VIR_DOMAIN_XML_SECURE))) + goto cleanup; + + if (virDomainSaveXML(conn, configDir, def, xml)) + goto cleanup; + + ret = 0; +cleanup: + VIR_FREE(xml); return ret; } diff --git a/src/domain_conf.h b/src/domain_conf.h index 51cf6d5..d44e2ad 100644 --- a/src/domain_conf.h +++ b/src/domain_conf.h @@ -462,6 +462,7 @@ struct _virDomainObj { int stderr_fd; int stderr_watch; int monitor; + char *monitorpath; int monitorWatch; int logfile; int pid; @@ -553,6 +554,11 @@ int virDomainDiskQSort(const void *a, const void *b); int virDomainDiskCompare(virDomainDiskDefPtr a, virDomainDiskDefPtr b); +int virDomainSaveXML(virConnectPtr conn, + const char *configDir, + virDomainDefPtr def, + const char *xml); + int virDomainSaveConfig(virConnectPtr conn, const char *configDir, virDomainDefPtr def); diff --git a/src/libvirt_sym.version.in b/src/libvirt_sym.version.in index 1eff790..e7b352d 100644 --- a/src/libvirt_sym.version.in +++ b/src/libvirt_sym.version.in @@ -368,6 +368,7 @@ LIBVIRT_PRIVATE_@VERSION@ { virDomainObjFree; virDomainObjListFree; virDomainRemoveInactive; + virDomainSaveXML; virDomainSaveConfig; virDomainSoundDefFree; virDomainSoundModelTypeFromString; @@ -614,6 +615,7 @@ LIBVIRT_PRIVATE_@VERSION@ { /* xml.h */ virXPathLong; + virXPathNode; virXPathNodeSet; virXPathString; virXMLPropString; diff --git a/src/qemu_conf.c b/src/qemu_conf.c index 218aefa..4cede63 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -49,6 +49,8 @@ #include "util.h" #include "memory.h" #include "verify.h" +#include "datatypes.h" +#include "xml.h" VIR_ENUM_DECL(virDomainDiskQEMUBus) VIR_ENUM_IMPL(virDomainDiskQEMUBus, VIR_DOMAIN_DISK_BUS_LAST, @@ -1335,3 +1337,192 @@ int qemudBuildCommandLine(virConnectPtr conn, #undef ADD_ENV_LIT #undef ADD_ENV_SPACE } + + +/* Called from SAX on parsing errors in the XML. */ +static void +catchXMLError (void *ctx, const char *msg ATTRIBUTE_UNUSED, ...) +{ + xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx; + + if (ctxt) { + virConnectPtr conn = ctxt->_private; + + if (ctxt->lastError.level == XML_ERR_FATAL && + ctxt->lastError.message != NULL) { + qemudReportError (conn, NULL, NULL, VIR_ERR_XML_DETAIL, + _("at line %d: %s"), + ctxt->lastError.line, + ctxt->lastError.message); + } + } +} + + +/** + * qemudDomainStatusParseFile + * + * read the last known status of a domain + * + * Returns 0 on success + */ +qemudDomainStatusPtr +qemudDomainStatusParseFile(virConnectPtr conn, + virCapsPtr caps, + const char *filename, int flags) +{ + xmlParserCtxtPtr pctxt = NULL; + xmlXPathContextPtr ctxt = NULL; + xmlDocPtr xml = NULL; + xmlNodePtr root, config_root; + virDomainDefPtr def = NULL; + char *tmp = NULL; + long val; + qemudDomainStatusPtr status = NULL; + + if (VIR_ALLOC(status) < 0) { + qemudReportError(conn, NULL, NULL, VIR_ERR_NO_MEMORY, + "%s", _("failed to allocate space for vm status")); + goto error; + } + + /* Set up a parser context so we can catch the details of XML errors. */ + pctxt = xmlNewParserCtxt (); + if (!pctxt || !pctxt->sax) + goto error; + pctxt->sax->error = catchXMLError; + pctxt->_private = conn; + + if (conn) virResetError (&conn->err); + xml = xmlCtxtReadFile (pctxt, filename, NULL, + XML_PARSE_NOENT | XML_PARSE_NONET | + XML_PARSE_NOWARNING); + if (!xml) { + if (conn && conn->err.code == VIR_ERR_NONE) + qemudReportError(conn, NULL, NULL, VIR_ERR_XML_ERROR, + "%s", _("failed to parse xml document")); + goto error; + } + + if ((root = xmlDocGetRootElement(xml)) == NULL) { + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + "%s", _("missing root element")); + goto error; + } + + ctxt = xmlXPathNewContext(xml); + if (ctxt == NULL) { + qemudReportError(conn, NULL, NULL, VIR_ERR_NO_MEMORY, NULL); + goto error; + } + + if (!xmlStrEqual(root->name, BAD_CAST "domstatus")) { + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + "%s", _("incorrect root element")); + goto error; + } + + ctxt->node = root; + if((virXPathLong(conn, "string(./@state)", ctxt, &val)) < 0) { + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + "%s", _("invalid domain state")); + goto error; + } else + status->state = (int)val; + + if((virXPathLong(conn, "string(./@pid)", ctxt, &val)) < 0) { + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + "%s", _("invalid pid")); + goto error; + } else + status->pid = (pid_t)val; + + if(!(tmp = virXPathString(conn, "string(./monitor[1]/@path)", ctxt))) { + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + "%s", _("no monitor path")); + goto error; + } else + status->monitorpath = tmp; + + if(!(config_root = virXPathNode(conn, "./domain", ctxt))) { + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + "%s", _("no domain config")); + goto error; + } + if(!(def = virDomainDefParseNode(conn, caps, xml, config_root, flags))) + goto error; + else + status->def = def; + +cleanup: + xmlFreeParserCtxt (pctxt); + xmlXPathFreeContext(ctxt); + xmlFreeDoc (xml); + return status; + +error: + VIR_FREE(tmp); + VIR_FREE(status); + goto cleanup; +} + + +/** + * qemudDomainStatusFormat + * + * Get the state of a running domain as XML + * + * Returns xml on success + */ +static char* +qemudDomainStatusFormat(virConnectPtr conn, + virDomainObjPtr vm) +{ + char *config_xml = NULL, *xml = NULL; + virBuffer buf = VIR_BUFFER_INITIALIZER; + + virBufferVSprintf(&buf, "<domstatus state='%d' pid='%d'>\n", vm->state, vm->pid); + virBufferVSprintf(&buf, " <monitor path='%s'/>\n", vm->monitorpath); + + if (!(config_xml = virDomainDefFormat(conn, + vm->def, + VIR_DOMAIN_XML_SECURE))) + goto cleanup; + + virBufferVSprintf(&buf, "%s", config_xml); + virBufferVSprintf(&buf, "</domstatus>\n"); + + xml = virBufferContentAndReset(&buf); +cleanup: + VIR_FREE(config_xml); + return xml; +} + + +/** + * qemudSaveDomainStatus + * + * Save the current status of a running domain + * + * Returns 0 on success + */ +int +qemudSaveDomainStatus(virConnectPtr conn, + struct qemud_driver *driver, + virDomainObjPtr vm) +{ + int ret = -1; + char *xml = NULL; + + if (!(xml = qemudDomainStatusFormat(conn, vm))) + goto cleanup; + + if ((ret = virDomainSaveXML(conn, driver->stateDir, vm->def, xml))) + goto cleanup; + + ret = 0; +cleanup: + VIR_FREE(xml); + return ret; +} + diff --git a/src/qemu_conf.h b/src/qemu_conf.h index ffbd0e7..70d9394 100644 --- a/src/qemu_conf.h +++ b/src/qemu_conf.h @@ -77,6 +77,16 @@ struct qemud_driver { int domainEventDispatching; }; +/* Status needed to reconenct to running VMs */ +typedef struct _qemudDomainStatus qemudDomainStatus; +typedef qemudDomainStatus *qemudDomainStatusPtr; +struct _qemudDomainStatus { + char *monitorpath; + pid_t pid; + int state; + virDomainDefPtr def; +}; + /* Port numbers used for KVM migration. */ #define QEMUD_MIGRATION_FIRST_PORT 49152 #define QEMUD_MIGRATION_NUM_PORTS 64 @@ -108,5 +118,12 @@ int qemudBuildCommandLine (virConnectPtr conn, const char *migrateFrom); const char *qemudVirtTypeToString (int type); +qemudDomainStatusPtr qemudDomainStatusParseFile(virConnectPtr conn, + virCapsPtr caps, + const char *filename, + int flags); +int qemudSaveDomainStatus(virConnectPtr conn, + struct qemud_driver *driver, + virDomainObjPtr vm); #endif /* __QEMUD_CONF_H */ -- 1.6.0.2

3 6

[libvirt] libvirt autostart VM is broken
by Dr. Michael J. Chudobiak 19 Dec '08

19 Dec '08

Hi all, The libvirtd autostart VM option seems to be broken [1,2], so I need a work-around. How can I start the libvirtd service, and then (after the service has fully started) start a particular VM from the command line? (I can do this from the gui of course, but I want to stick it in a script). - Mike [1] https://bugzilla.redhat.com/show_bug.cgi?id=477025 [2] http://www.mail-archive.com/libvir-list@redhat.com/msg09937.html

1 0

Re: [libvirt] libvirt remote connection failing
by Richard W.M. Jones 19 Dec '08

19 Dec '08

On Fri, Dec 19, 2008 at 11:44:47AM +0530, Shanmuga Rajan wrote: > i am getting the following error > > >>> dcconn = libvirt.open('qemu://192.168.1.82/system') Try: LIBVIRT_DEBUG=1 virsh -c qemu://192.168.1.82/system nodeinfo Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones virt-df lists disk usage of guests without needing to install any software inside the virtual machine. Supports Linux and Windows. http://et.redhat.com/~rjones/virt-df/

1 0

[libvirt] [PATCH] fix device hotplug
by Guido Günther 18 Dec '08

18 Dec '08

Hi, due to some restructuring we free the device structure so devices are plugged correctly but "dumpxml" fails since the dev structure is already freed. Cheers, -- Guido

3 4

[libvirt] Website typo
by Richard W.M. Jones 18 Dec '08

18 Dec '08

Spotted by 'aozturk' on #virt ... Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://et.redhat.com/~rjones/virt-top

2 1

[libvirt] libvirt remote connection failing
by Shanmuga Rajan 18 Dec '08

18 Dec '08

hi I was trying to migrate KVM based vM between two machine. when i tried to make connection with destination machine but it is not working for me. i got some error. i tried the following uri qemu://192.168.1.22/ qemu://hostname/ everything is failed. Can any one help me with correct uri to connect with remote machine. i am using python binding of libvirt. KVM-79 libvirt 5.0 Thanks and Regards, - Shan

3 2

[libvirt] [PATCH] 2/8 logging header and core implementation
by Daniel Veillard 18 Dec '08

18 Dec '08

This exports the internal function from logging.h (later the public part should be moved to libvirt.h) augments the set of convenience macros. libvirt_sym.version.in is also extended to export internally all the header functions, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 2

[libvirt] PATCH: 0/28: Thread safety for libvirtd daemon and drivers
by Daniel P. Berrange 18 Dec '08

18 Dec '08

The following huge series of patches adds thread safety for the libvirtd daemon and drivers, and makes the daemon multi-threaded in processing RPC calls. This enables multiple clients to be processed in parallel, without blocking each other. It does not change the thread rules for the virConnectPtr object though, so each individual client is still serialized. There are two core places where we have to have synchronization in the threading model this patch series introduces - The libvirt daemon code - A single global server lock (aka struct qemud_server) - One lock per client connection (aka struct qemud_client) - The driver implementations - One lock per driver (aka QEMU, LXC, Test, UML, OpenVZ, Network, Storage, Node Devices) - One lock per primary object in a driver (virDomainObjPtr, virNetworkObjPtr, virStoragePoolObjPtr, virNodeDeviceObjptr instances) For most cases, the big global server / driver locks are only held while obtaining one of the finer grained locks. This gives a fairly good level of concurrency for operations touching different objects. Once this core infrastructure is merged, it will be possible to iterate on impl of drivers to reduce the time locks are held - eg avoid holding a lock while talking to the QEMU monitor interface. To try and make it easier to spot thread locking problems this series refactors alot of methods so that there is only a single return point where the unlock call can be placed, rather than multiple return point which increases the chances of missing an unlock call. This touches a huge amount of code, so I'd like to get this all merged ASAP as it'll be really hard to keep it synced with ongoing changes. Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

7 93

[libvirt] [PATCH 1/5] write pid file into stateDir
by Guido Günther 18 Dec '08

18 Dec '08

Let qemu write out a pid file so we can check in stateDir for running vm later. TODO: Fix up the rest of the qemuxml2argvdata testcases, simple search and replace. I sikpped that for now since it makes rebasing harder. --- src/libvirt_sym.version.in | 1 + src/qemu_conf.c | 7 +++++++ src/qemu_conf.h | 1 + src/qemu_driver.c | 15 +++++++++++++++ src/util.c | 20 ++++++++++++++++---- src/util.h | 2 ++ .../qemuxml2argv-hostdev-usb-address.args | 2 +- tests/qemuxml2argvtest.c | 2 ++ 8 files changed, 45 insertions(+), 5 deletions(-) diff --git a/src/libvirt_sym.version.in b/src/libvirt_sym.version.in index de0bc4a..1eff790 100644 --- a/src/libvirt_sym.version.in +++ b/src/libvirt_sym.version.in @@ -592,6 +592,7 @@ LIBVIRT_PRIVATE_@VERSION@ { virFileMakePath; virFileOpenTty; virFileReadLimFD; + virFilePid; virFileReadPid; virFileLinkPointsTo; virParseNumber; diff --git a/src/qemu_conf.c b/src/qemu_conf.c index e6c378f..218aefa 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -724,6 +724,7 @@ int qemudBuildCommandLine(virConnectPtr conn, const char *emulator; char uuid[VIR_UUID_STRING_BUFLEN]; char domid[50]; + char *pidfile; uname(&ut); @@ -816,6 +817,9 @@ int qemudBuildCommandLine(virConnectPtr conn, snprintf(memory, sizeof(memory), "%lu", vm->def->memory/1024); snprintf(vcpus, sizeof(vcpus), "%lu", vm->def->vcpus); snprintf(domid, sizeof(domid), "%d", vm->def->id); + pidfile = virFilePid(driver->stateDir, vm->def->name); + if (!pidfile) + goto error; ADD_ENV_LIT("LC_ALL=C"); @@ -870,6 +874,9 @@ int qemudBuildCommandLine(virConnectPtr conn, ADD_ARG_LIT("-monitor"); ADD_ARG_LIT("pty"); + ADD_ARG_LIT("-pidfile"); + ADD_ARG(pidfile); + if (vm->def->localtime) ADD_ARG_LIT("-localtime"); diff --git a/src/qemu_conf.h b/src/qemu_conf.h index 36d09d1..ffbd0e7 100644 --- a/src/qemu_conf.h +++ b/src/qemu_conf.h @@ -62,6 +62,7 @@ struct qemud_driver { char *configDir; char *autostartDir; char *logDir; + char *stateDir; unsigned int vncTLS : 1; unsigned int vncTLSx509verify : 1; char *vncTLSx509certdir; diff --git a/src/qemu_driver.c b/src/qemu_driver.c index ca96223..a2e573e 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -220,6 +220,10 @@ qemudStartup(void) { if ((base = strdup (SYSCONF_DIR "/libvirt")) == NULL) goto out_of_memory; + + if (asprintf (&qemu_driver->stateDir, + "%s/run/libvirt/qemu/", LOCAL_STATE_DIR) == -1) + goto out_of_memory; } else { if (!(pw = getpwuid(uid))) { qemudLog(QEMUD_ERR, _("Failed to find user record for uid '%d': %s\n"), @@ -233,6 +237,16 @@ qemudStartup(void) { if (asprintf (&base, "%s/.libvirt", pw->pw_dir) == -1) goto out_of_memory; + + if (asprintf (&qemu_driver->stateDir, + "%s/run/libvirt/qemu/", base) == -1) + goto out_of_memory; + } + + if (virFileMakePath(qemu_driver->stateDir) < 0) { + qemudLog(QEMUD_ERR, _("Failed to create state dir '%s': %s\n"), + qemu_driver->stateDir, strerror(errno)); + goto error; } /* Configuration paths are either ~/.libvirt/qemu/... (session) or @@ -378,6 +392,7 @@ qemudShutdown(void) { VIR_FREE(qemu_driver->logDir); VIR_FREE(qemu_driver->configDir); VIR_FREE(qemu_driver->autostartDir); + VIR_FREE(qemu_driver->stateDir); VIR_FREE(qemu_driver->vncTLSx509certdir); VIR_FREE(qemu_driver->vncListen); diff --git a/src/util.c b/src/util.c index da26009..481f136 100644 --- a/src/util.c +++ b/src/util.c @@ -918,6 +918,17 @@ int virFileOpenTty(int *ttymaster ATTRIBUTE_UNUSED, #endif +char* virFilePid(const char *dir, const char* name) +{ + char* pidfile; + + if (asprintf(&pidfile, "%s/%s.pid", dir, name) < 0) { + pidfile = NULL; + } + return pidfile; +} + + int virFileWritePid(const char *dir, const char *name, pid_t pid) @@ -930,7 +941,7 @@ int virFileWritePid(const char *dir, if ((rc = virFileMakePath(dir))) goto cleanup; - if (asprintf(&pidfile, "%s/%s.pid", dir, name) < 0) { + if (!(pidfile = virFilePid(dir, name))) { rc = ENOMEM; goto cleanup; } @@ -973,7 +984,8 @@ int virFileReadPid(const char *dir, FILE *file; char *pidfile = NULL; *pid = 0; - if (asprintf(&pidfile, "%s/%s.pid", dir, name) < 0) { + + if (!(pidfile = virFilePid(dir, name))) { rc = ENOMEM; goto cleanup; } @@ -1006,8 +1018,8 @@ int virFileDeletePid(const char *dir, int rc = 0; char *pidfile = NULL; - if (asprintf(&pidfile, "%s/%s.pid", dir, name) < 0) { - rc = errno; + if (!(pidfile = virFilePid(dir, name))) { + rc = ENOMEM; goto cleanup; } diff --git a/src/util.h b/src/util.h index 0748cbf..58488ae 100644 --- a/src/util.h +++ b/src/util.h @@ -79,6 +79,8 @@ int virFileOpenTty(int *ttymaster, char **ttyName, int rawmode); +char* virFilePid(const char *dir, + const char *name); int virFileWritePid(const char *dir, const char *name, pid_t pid); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args index 3d6c16d..e1c5638 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args @@ -1 +1 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -usbdevice host:014.006 +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor pty -pidfile /tmp/QEMUGuest1.pid -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -usbdevice host:014.006 diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 6e5355a..585eb08 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -156,6 +156,8 @@ mymain(int argc, char **argv) if ((driver.caps = testQemuCapsInit()) == NULL) return EXIT_FAILURE; + if((driver.stateDir = strdup("/tmp")) == NULL) + return EXIT_FAILURE; #define DO_TEST(name, extraFlags) \ do { \ -- 1.6.0.2

4 11

[libvirt] how to connect LXC via libvirt
by Ian jonhson 18 Dec '08

18 Dec '08

Hi Daniel, I followed the instructions in: https://lists.linux-foundation.org/pipermail/containers/2008-September/0132… to try to connect with LXC which is built in my VM (ubuntu7.10 + kernel 2.6.27-rc8). Unfortunately, I fail. The container can work when I use its user-space interfaces, however I can not execute the "virsh --connect lxc:/// define mycontainer.xml" after I have installed the libvirt (downloaded from CVS). I checked the libvirt.c and found there are only the "xen:///" support, not any codes to support LXC. Therefore, I am wondering whether LXC has been supported in libvirt mainstream and what should I do to get the result as your statement in maillist. Thanks, Ian

2 1

[libvirt] [PATCH] Fix compiler warnings in test code
by john.levon＠sun.com 18 Dec '08

18 Dec '08

# HG changeset patch # User john.levon(a)sun.com # Date 1229399267 28800 # Node ID 1b81ac255ad765ab782829e7fe0a55dc7bab72ab # Parent ee6ccfc062f49f514d7ae8924d5a596b18441fee Fix compiler warnings in test code Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/src/test.c b/src/test.c --- a/src/test.c +++ b/src/test.c @@ -1299,7 +1299,7 @@ static unsigned long testGetMaxMemory(vi static unsigned long testGetMaxMemory(virDomainPtr domain) { testConnPtr privconn = domain->conn->privateData; virDomainObjPtr privdom; - unsigned long ret = -1; + unsigned long ret = (unsigned long)-1; testDriverLock(privconn); privdom = virDomainFindByName(&privconn->domains, diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c --- a/tests/nodeinfotest.c +++ b/tests/nodeinfotest.c @@ -9,6 +9,16 @@ #include "internal.h" #include "nodeinfo.h" #include "util.h" + +#ifndef __linux__ + +static int +mymain(int argc, char **argv) +{ + exit (77); /* means 'test skipped' for automake */ +} + +#else static char *progname; static char *abs_srcdir; @@ -78,9 +88,6 @@ mymain(int argc, char **argv) "nodeinfo-6", }; char cwd[PATH_MAX]; -#ifndef __linux__ - exit (77); /* means 'test skipped' for automake */ -#endif abs_srcdir = getenv("abs_srcdir"); if (!abs_srcdir) @@ -102,4 +109,7 @@ mymain(int argc, char **argv) return(ret==0 ? EXIT_SUCCESS : EXIT_FAILURE); } +#endif /* __linux__ */ + VIRT_TEST_MAIN(mymain) +

4 4

[libvirt] [PATCH] Fix GCC hard-coding in python/
by john.levon＠sun.com 18 Dec '08

18 Dec '08

# HG changeset patch # User john.levon(a)sun.com # Date 1229399267 28800 # Node ID b105e5a7cd6190e0b952a1587d7e80f39d02e63c # Parent 35512df785342cd15214790e17e0c1f4d2182b32 Fix GCC hard-coding in python/ Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/acinclude.m4 b/acinclude.m4 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -75,6 +75,11 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ WARN_CFLAGS="$COMPILER_FLAGS $complCFLAGS" AC_SUBST(WARN_CFLAGS) + + COMPILER_FLAGS= + gl_COMPILER_FLAGS(-Wno-redundant-decls) + NO_RDECLS_CFLAGS=$COMPILER_FLAGS + AC_SUBST(NO_RDECLS_CFLAGS) ]) diff --git a/python/Makefile.am b/python/Makefile.am --- a/python/Makefile.am +++ b/python/Makefile.am @@ -35,7 +35,7 @@ python_LTLIBRARIES = libvirtmod.la libvirtmod_la_SOURCES = libvir.c types.c libvirt-py.c libvirt-py.h # Python header files contain a redundant decl, hence: -libvirtmod_la_CFLAGS = -Wno-redundant-decls +libvirtmod_la_CFLAGS = @NO_RDECLS_CFLAGS@ libvirtmod_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/.libs \ @CYGWIN_EXTRA_LDFLAGS@

3 4

Re: [libvirt] PATCH 0/5: connection cloning support (WIP)
by David Lively 18 Dec '08

18 Dec '08

Hi Daniel - When I apply these patches, I'm seeing segfaults on event delivery when just running the existing synchronous examples/domain-events/events-c/event-test.c (using the remote driver). I've added a little debug. Apparently event->name is being NULLed out sometime after the event is put on the queue: DEBUG: remote_internal.c: remoteDomainEventFired (Event fired 0 3 1 1) DEBUG: remote_internal.c: processCallRecv (Do 4 0) DEBUG: remote_internal.c: processCallRecvLen (Got length, now need 64 total (60 more)) DEBUG: remote_internal.c: processCallRecv (Do 64 4) DEBUG: remote_internal.c: processCallAsyncEvent (Encountered an event while waiting for a response) DEBUG: remote_internal.c: get_nonnull_domain (domain.name: dsl) DEBUG: datatypes.c: virGetDomain (New hash entry 0x804c728) DEBUG: domain_event.c: virDomainEventNew (event: 0x804c770 ->name: dsl) DEBUG: libvirt.c: virDomainFree (domain=0x804c728) DEBUG: datatypes.c: virUnrefDomain (unref domain 0x804c728 dsl 1) DEBUG: datatypes.c: virReleaseDomain (release domain 0x804c728 dsl) DEBUG: datatypes.c: virReleaseDomain (unref connection 0x804b040 4) DEBUG: domain_event.c: virDomainEventQueuePush (event: 0x804c770 ->name: dsl) DEBUG: remote_internal.c: processCallRecv (Do 0 0) DEBUG: remote_internal.c: remoteDomainEventQueueFlush () DEBUG: domain_event.c: virDomainEventDispatchDefaultFunc (event: 0x804c770 ->name: (null)) virGetDomain: name is NULL Segmentation fault I'll continue looking into it. But please let me know if you're familiar with the problem ... Thanks, Dave On Tue, 2008-12-16 at 10:24 -0500, David Lively wrote: > Hi Daniels - > Sorry for the delay. Life's been crazy. But now I'm finally looking > into using this series of patches with my Java event implementation > (which I've now redone via the java.nio.Select mechanism; ready to > submit pending resolution of the RPC concurrency issues). I should have > some feedback for you later today ... > > Thanks, > Dave > > On Tue, 2008-12-09 at 12:08 +0000, Daniel P. Berrange wrote: > > This series is a work-in-progress set of patches implementing connection > > cloning. The idea is that if you want to use a connection form multiple > > threads, you could do > > > > virConnectPtr copy = virConnectClone(conn) > > > > and use 'copy' from the other thread. This avoids the problem of having > > to make all the virError handling stuff thread-local whic is the blocker > > for allowing real mutlti-thread access to a single virConnectPtr object. > > > > I believe this cloning support should be sufficient for the Java bindings > > need to use a thread for its event loop. The idea being that if you wanted > > to use an event loop in a background thread, you'd create a cloned object > > for use event loop triggered callbacks like domain events notifications. > > > > I'd still like to do some experiments later making the single virConnectPtr > > fully thread safe, but that'll take a little more time. I'm hoping this > > cloning will address the Java needs right now... > > > > Daniel

2 5

[libvirt] [SECURITY] PATCH: Fix missing read-only access checks (CVE-2008-5086)
by Daniel P. Berrange 18 Dec '08

18 Dec '08

The following methods in libvirt.c are missing a check against the read-only connection flag: virDomainMigrate virDomainMigratePrepare virDomainMigratePerform virDomainMigrateFinish virDomainMigratePrepare2 virDomainMigrateFinish2 virDomainBlockPeek virDomainMemoryPeek virDomainSetAutostart virNetworkSetAutostart virConnectFindStoragePoolSources virStoragePoolSetAutostart If using PolicyKit auth, the default policy will allow any local user to make a read-only connection to the libvirtd daemon without needing authentication. If not using PolicyKit, the default libvirtd.conf configuration settings will allow an unprivileged user to make a read-only connection to the libvirtd daemon without needing authentication. Thus out of the box unprivileged local users may be able to migrate VMs, set or unset the autostart flag for domains, networks & storage pools, and access privileged data in the VM memory, or disks. All TCP remote connections are read-write, and default settings require full authentication, thus remote access is not impacted by this flaw. Administrators can apply a workaround by editting /etc/libvirt/libvirtd.conf to explicitly set 'unix_sock_ro_perms' parameter to '0700'. Restart the libvirtd daemon after making this change. The first vulnerable release was 0.3.2, where the virDomainMigrate API was added for the Xen driver. Other APIs were added in various subsequent releases depending on the hypervisor driver in question. The attached patch has been committed to CVS, and OS distributors are recommended to apply this patch to all existing releases shipped. It was diff'd against current CVS head, and applies against 0.5.1, and is trivially re-diffable for all earlier releases. This flaw has been assigned the identifier CVE-2008-5086 Daniel diff --git a/src/libvirt.c b/src/libvirt.c --- a/src/libvirt.c +++ b/src/libvirt.c @@ -2296,6 +2296,16 @@ virDomainMigrate (virDomainPtr domain, conn = domain->conn; /* Source connection. */ if (!VIR_IS_CONNECT (dconn)) { virLibConnError (conn, VIR_ERR_INVALID_CONN, __FUNCTION__); + return NULL; + } + + if (domain->conn->flags & VIR_CONNECT_RO) { + virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + return NULL; + } + if (dconn->flags & VIR_CONNECT_RO) { + /* NB, delibrately report error against source object, not dest here */ + virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); return NULL; } @@ -2426,6 +2436,11 @@ virDomainMigratePrepare (virConnectPtr d return -1; } + if (dconn->flags & VIR_CONNECT_RO) { + virLibConnError(dconn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + return -1; + } + if (dconn->driver->domainMigratePrepare) return dconn->driver->domainMigratePrepare (dconn, cookie, cookielen, uri_in, uri_out, @@ -2457,6 +2472,11 @@ virDomainMigratePerform (virDomainPtr do } conn = domain->conn; + if (domain->conn->flags & VIR_CONNECT_RO) { + virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + return -1; + } + if (conn->driver->domainMigratePerform) return conn->driver->domainMigratePerform (domain, cookie, cookielen, uri, @@ -2482,6 +2502,11 @@ virDomainMigrateFinish (virConnectPtr dc if (!VIR_IS_CONNECT (dconn)) { virLibConnError (NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + return NULL; + } + + if (dconn->flags & VIR_CONNECT_RO) { + virLibConnError(dconn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); return NULL; } @@ -2517,6 +2542,11 @@ virDomainMigratePrepare2 (virConnectPtr return -1; } + if (dconn->flags & VIR_CONNECT_RO) { + virLibConnError(dconn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + return -1; + } + if (dconn->driver->domainMigratePrepare2) return dconn->driver->domainMigratePrepare2 (dconn, cookie, cookielen, uri_in, uri_out, @@ -2547,6 +2577,11 @@ virDomainMigrateFinish2 (virConnectPtr d return NULL; } + if (dconn->flags & VIR_CONNECT_RO) { + virLibConnError(dconn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + return NULL; + } + if (dconn->driver->domainMigrateFinish2) return dconn->driver->domainMigrateFinish2 (dconn, dname, cookie, cookielen, @@ -2905,6 +2940,11 @@ virDomainBlockPeek (virDomainPtr dom, } conn = dom->conn; + if (dom->conn->flags & VIR_CONNECT_RO) { + virLibDomainError(dom, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + return (-1); + } + if (!path) { virLibDomainError (dom, VIR_ERR_INVALID_ARG, _("path is NULL")); @@ -2980,6 +3020,11 @@ virDomainMemoryPeek (virDomainPtr dom, } conn = dom->conn; + if (dom->conn->flags & VIR_CONNECT_RO) { + virLibDomainError(dom, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + return (-1); + } + /* Flags must be VIR_MEMORY_VIRTUAL at the moment. * * Note on access to physical memory: A VIR_MEMORY_PHYSICAL flag is @@ -3246,6 +3291,11 @@ virDomainSetAutostart(virDomainPtr domai } conn = domain->conn; + + if (domain->conn->flags & VIR_CONNECT_RO) { + virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + return (-1); + } if (conn->driver->domainSetAutostart) return conn->driver->domainSetAutostart (domain, autostart); @@ -4197,6 +4247,11 @@ virNetworkSetAutostart(virNetworkPtr net return (-1); } + if (network->conn->flags & VIR_CONNECT_RO) { + virLibNetworkError(network, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + return (-1); + } + conn = network->conn; if (conn->networkDriver && conn->networkDriver->networkSetAutostart) @@ -4395,6 +4450,11 @@ virConnectFindStoragePoolSources(virConn return NULL; } + if (conn->flags & VIR_CONNECT_RO) { + virLibConnError(conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + return NULL; + } + if (conn->storageDriver && conn->storageDriver->findPoolSources) return conn->storageDriver->findPoolSources(conn, type, srcSpec, flags); @@ -5068,6 +5128,11 @@ virStoragePoolSetAutostart(virStoragePoo return (-1); } + if (pool->conn->flags & VIR_CONNECT_RO) { + virLibStoragePoolError(pool, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + return (-1); + } + conn = pool->conn; if (conn->storageDriver && conn->storageDriver->poolSetAutostart) -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 2

[libvirt] [PATCH] don't assume builddir == srcdir
by Guido Günther 18 Dec '08

18 Dec '08

Hi, Makefile.maint assumes this in some places. This doesn't make the world perfect but maybe a bit better? Cheers, -- Guido

3 6

[libvirt] libvirt and 192.168.122.0/24
by H. Peter Anvin 18 Dec '08

18 Dec '08

I'm kind of wondering why libvirt defaults to 192.168.122.0/24 by default. It is a piece of address space which is relatively likely to conflict with address space used in the environment surrounding the machine. Since libvirtd is on by default if installed, this is particularly problematic. I would like to suggest either one of the following as default address space, unless the user has explicitly configured otherwise: 192.0.2.0/24 - reserved as "test and example network" 198.18.0.0/15 - reserved as "benchmark test network" See RFC 3330 and RFC 2544 for the definitions of these networks. Both of them are "should not appear on the public Internet" address blocks, and much less likely than the RFC 1918 address block (10.0.0.0/8, 172.16.0.0/12, and 192.168.0.0/16) to be encountered "in the wild" by a user. -hpa

2 1

[libvirt] [PATCH] [OpenVZ] Segmentation fault
by Anton Protopopov 17 Dec '08

17 Dec '08

2008/12/13 Ivan Vovk <ivovk(a)intermedia.net> > Hello, > > > > after updating to the last official release 0.5.1 my application stopped > working. No errors to the log file though i raised exceptions where it was > possible. > > i checked with virsh xml description used for creating OpenVZ container and > got the following: > > > > virsh # create ovz.xml > Segmentation fault > > Attached patch, fixes that.

2 5

[libvirt] [PATCH] Portability fixes for directory storage backend
by john.levon＠sun.com 17 Dec '08

17 Dec '08

# HG changeset patch # User john.levon(a)sun.com # Date 1229399267 28800 # Node ID 53a18080ea210168c044d7ade8dd8db0881d5c85 # Parent cd2fb266824178c4d63296b587eeedb2360f9f1c Portability fixes for directory storage backend Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in @@ -75,7 +75,7 @@ AC_CHECK_FUNCS([cfmakeraw regexec uname AC_CHECK_FUNCS([cfmakeraw regexec uname sched_getaffinity getuid getgid]) dnl Availability of various common headers (non-fatal if missing). -AC_CHECK_HEADERS([pwd.h paths.h regex.h sys/syslimits.h sys/utsname.h sys/wait.h winsock2.h sched.h termios.h sys/poll.h]) +AC_CHECK_HEADERS([pwd.h paths.h regex.h sys/syslimits.h sys/utsname.h sys/wait.h winsock2.h sched.h termios.h sys/poll.h endian.h]) dnl Where are the XDR functions? dnl If portablexdr is installed, prefer that. diff --git a/src/storage_backend_fs.c b/src/storage_backend_fs.c --- a/src/storage_backend_fs.c +++ b/src/storage_backend_fs.c @@ -31,10 +31,14 @@ #include <errno.h> #include <fcntl.h> #include <unistd.h> +#include <string.h> + +#ifdef HAVE_ENDIAN_H #include <endian.h> -#include <byteswap.h> -#include <mntent.h> -#include <string.h> +#else +#define __LITTLE_ENDIAN 1234 +#define __BIG_ENDIAN 4321 +#endif #include <libxml/parser.h> #include <libxml/tree.h> @@ -240,6 +244,9 @@ static int virStorageBackendProbeFile(vi } #if WITH_STORAGE_FS + +#include <mntent.h> + struct _virNetfsDiscoverState { const char *host; virStoragePoolSourceList list;

4 4

[libvirt] [PATCH] 4/8 convert virterror to the logging infrastructure
by Daniel Veillard 17 Dec '08

17 Dec '08

Basically having the debug information in one place and the errors in another place is not very helpful, so this plugs the virterror handling into the logging routine. mostly a bit of refactoring, and calling virLogMessage. Just that we pass an extra flag to virLogMessage stating it comes from the error handling level to avoid outputting the error twice on stderr in case where there is no output defined. Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 3

[libvirt] [PATCH] let gcc's -Wformat do its job; avoid "make syntax-check" failure
by Jim Meyering 17 Dec '08

17 Dec '08

I first noticed that "make syntax-check" failed. Then I saw that virAsprintf's prototype lacked ATTRIBUTE_FORMAT. This fixes both and updates HACKING. >From 5bae37c505738ed4223625f8e3cc88ad6f4bf68c Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Wed, 17 Dec 2008 08:54:46 +0100 Subject: [PATCH] let gcc's -Wformat do its job; avoid "make syntax-check" failure * src/util.c (virAsprintf): Remove trailing space. * src/util.h (virAsprintf): Use ATTRIBUTE_FORMAT. * HACKING (Printf-style functions): New section. --- HACKING | 16 ++++++++++++++++ src/util.c | 2 +- src/util.h | 3 ++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/HACKING b/HACKING index 3945833..e088da8 100644 --- a/HACKING +++ b/HACKING @@ -247,6 +247,22 @@ are some special reasons why you cannot include these files explicitly. +Printf-style functions +====================== + +Whenever you add a new printf-style function, i.e., one with a format +string argument and following "..." in its prototype, be sure to use +gcc's printf attribute directive in the prototype. For example, here's +the one for virAsprintf, in util.h: + + int virAsprintf(char **strp, const char *fmt, ...) + ATTRIBUTE_FORMAT(printf, 2, 3); + +This makes it so gcc's -Wformat and -Wformat-security options can do +their jobs and cross-check format strings with the number and types +of arguments. + + Libvirt commiters guidelines ============================ diff --git a/src/util.c b/src/util.c index 12097d4..9eda378 100644 --- a/src/util.c +++ b/src/util.c @@ -1158,7 +1158,7 @@ virParseNumber(const char **str) * * like asprintf but makes sure *strp == NULL on failure */ -int +int virAsprintf(char **strp, const char *fmt, ...) { va_list ap; diff --git a/src/util.h b/src/util.h index 3d603dc..0475bd3 100644 --- a/src/util.h +++ b/src/util.h @@ -112,7 +112,8 @@ int virMacAddrCompare (const char *mac1, const char *mac2); void virSkipSpaces(const char **str); int virParseNumber(const char **str); -int virAsprintf(char **strp, const char *fmt, ...); +int virAsprintf(char **strp, const char *fmt, ...) + ATTRIBUTE_FORMAT(printf, 2, 3); #define VIR_MAC_BUFLEN 6 #define VIR_MAC_PREFIX_BUFLEN 3 -- 1.6.1.rc2.316.geb2f0

2 2

[libvirt] [PATCH] Fix _FILE_OFFSET_BITS re-definition
by john.levon＠sun.com 17 Dec '08

17 Dec '08

# HG changeset patch # User john.levon(a)sun.com # Date 1229399267 28800 # Node ID db36391b739c117f5887388f65f31e6a9d2d361b # Parent 020f8b8e9340287a6ab3d869b359e39b905cd0ff Fix _FILE_OFFSET_BITS re-definition Since config.h contains the _FILE_OFFSET_BITS setting (a little dubious in itself), it must be the first header included, otherwise system headers can define _FILE_OFFSET_BITS differently themselves. Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/src/node_device_hal.c b/src/node_device_hal.c --- a/src/node_device_hal.c +++ b/src/node_device_hal.c @@ -21,10 +21,11 @@ * Author: David F. Lively <dlively(a)virtualiron.com> */ +#include <config.h> + #include <stdio.h> #include <stdlib.h> -#include <config.h> #include <libhal.h> #include "node_device_conf.h"

4 4

[libvirt] [PATHC] 8/8 extra settings in libvirtd.conf
by Daniel Veillard 17 Dec '08

17 Dec '08

Basically documents the 3 new configuration variables, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 2

[libvirt] [PATCH] 6/8 Convert qemud to the logging infrastructure
by Daniel Veillard 17 Dec '08

17 Dec '08

This is a bit more massive because qemud already had a limited logging primitive, so we remove the old one, put the new one, initialize the logging at the beginning of remoteReadConfigFile (maybe that should be renamed, I think it's launched in all cases). The painful part is to convert the whole set of existing log calls to the new macro, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 2

[libvirt] [PATCH] 7/8 conver the remaining modules from qemud
by Daniel Veillard 17 Dec '08

17 Dec '08

Rename of the macros where available, or remapping of the qemudLog to the new macros. Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 1

[libvirt] [PATCH] 3/8 convert libvirt.c to the new logging infrastructure
by Daniel Veillard 17 Dec '08

17 Dec '08

Basically there is the initialization part which looks for the environment variables, and all DEBUG calls are modified to show the entry point, this was lost over time just the arguments of the functions wasn't great for debugging, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 1

[libvirt] [PATCH] 1/8 detect syslog.h
by Daniel Veillard 17 Dec '08

17 Dec '08

the ability to syslog gets into libvirt.c so we need to detect its presence at configure time to compile it out on platform without support, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 2

[libvirt] [PATCH] rpcgen fixes
by john.levon＠sun.com 17 Dec '08

17 Dec '08

# HG changeset patch # User john.levon(a)sun.com # Date 1229399266 28800 # Node ID 12c9b283b11f5e20b9dcc91e3d10a862da5d6e81 # Parent 1ba824db09286ebc758e035211da2c533bbd1e0f rpcgen fixes quad_t is not a portable type, but rather than force rpcgen every build, we just patch in the fixes needed. Also, since we ship the rpcgen-derived files in CVS, don't leave Makefile rules that could trigger during a normal build: make a special maintainer target for refreshing the derived sources. Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/qemud/Makefile.am b/qemud/Makefile.am --- a/qemud/Makefile.am +++ b/qemud/Makefile.am @@ -32,23 +32,23 @@ EXTRA_DIST = \ $(DAEMON_SOURCES) if RPCGEN -SUFFIXES = .x -.x.c: - rm -f $@ $@-t $@-t2 - rpcgen -c -o $@-t $< +# +# Maintainer-only target for re-generating the derived .c/.h source +# files, which are actually derived from the .x file. +# +rpcgen: + rm -f rp.c-t rp.h-t + rpcgen -h -o rp.h-t @top_srcdir@/qemud/remote_protocol.x + rpcgen -c -o rp.c-t @top_srcdir@/qemud/remote_protocol.x if GLIBC_RPCGEN - perl -w rpcgen_fix.pl $@-t > $@-t2 - chmod 444 $@-t2 - mv $@-t2 $@ -endif - -.x.h: - rm -f $@ $@-t - rpcgen -h -o $@-t $< -if GLIBC_RPCGEN - perl -pi -e 's/\t/ /g' $@-t - chmod 444 $@-t - mv $@-t $@ + perl -w @top_srcdir@/qemud/rpcgen_fix.pl rp.h-t \ + >@top_srcdir@/qemud/remote_protocol.h + perl -w @top_srcdir@/qemud/rpcgen_fix.pl rp.c-t \ + >@top_srcdir@/qemud/remote_protocol.c + rm -f rp.c-t rp.h-t +else + mv rp.h-t @top_srcdir@/remote_protocol.h + mv rp.c-t @top_srcdir@/remote_protocol.c endif endif diff --git a/qemud/rpcgen_fix.pl b/qemud/rpcgen_fix.pl --- a/qemud/rpcgen_fix.pl +++ b/qemud/rpcgen_fix.pl @@ -25,6 +25,15 @@ while (<>) { } s/\t/ /g; + + # Portability for Solaris RPC + s/u_quad_t/uint64_t/g; + s/quad_t/int64_t/g; + s/xdr_u_quad_t/xdr_uint64_t/g; + s/xdr_quad_t/xdr_int64_t/g; + s/IXDR_GET_LONG/IXDR_GET_INT32/g; + s/XDR_INLINE/(int32_t *)XDR_INLINE/g; + s/#include <rpc\/rpc.h>/#include <config.h>\n#include <rpc\/rpc.h>/g; if (m/^}/) { $in_function = 0;

4 4

[libvirt] [PATCH] __FUNCTION__ is not portable
by john.levon＠sun.com 17 Dec '08

17 Dec '08

# HG changeset patch # User john.levon(a)sun.com # Date 1229399267 28800 # Node ID ee6ccfc062f49f514d7ae8924d5a596b18441fee # Parent b105e5a7cd6190e0b952a1587d7e80f39d02e63c __FUNCTION__ is not portable __func__ is. Some places aren't covered by the back-compat define (why is that there?) Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/examples/domain-events/events-c/event-test.c b/examples/domain-events/events-c/event-test.c --- a/examples/domain-events/events-c/event-test.c +++ b/examples/domain-events/events-c/event-test.c @@ -11,9 +11,9 @@ #include <libvirt/libvirt.h> #define DEBUG0(fmt) printf("%s:%d :: " fmt "\n", \ - __FUNCTION__, __LINE__) + __func__, __LINE__) #define DEBUG(fmt, ...) printf("%s:%d: " fmt "\n", \ - __FUNCTION__, __LINE__, __VA_ARGS__) + __func__, __LINE__, __VA_ARGS__) #define STREQ(a,b) (strcmp((a),(b)) == 0) #ifndef ATTRIBUTE_UNUSED @@ -158,7 +158,7 @@ int myDomainEventCallback1 (virConnectPt int detail, void *opaque ATTRIBUTE_UNUSED) { - printf("%s EVENT: Domain %s(%d) %s %s\n", __FUNCTION__, virDomainGetName(dom), + printf("%s EVENT: Domain %s(%d) %s %s\n", __func__, virDomainGetName(dom), virDomainGetID(dom), eventToString(event), eventDetailToString(event, detail)); return 0; @@ -170,7 +170,7 @@ int myDomainEventCallback2 (virConnectPt int detail, void *opaque ATTRIBUTE_UNUSED) { - printf("%s EVENT: Domain %s(%d) %s %s\n", __FUNCTION__, virDomainGetName(dom), + printf("%s EVENT: Domain %s(%d) %s %s\n", __func__, virDomainGetName(dom), virDomainGetID(dom), eventToString(event), eventDetailToString(event, detail)); return 0; @@ -179,7 +179,7 @@ static void myFreeFunc(void *opaque) static void myFreeFunc(void *opaque) { char *str = opaque; - printf("%s: Freeing [%s]\n", __FUNCTION__, str); + printf("%s: Freeing [%s]\n", __func__, str); free(str); } diff --git a/python/types.c b/python/types.c --- a/python/types.c +++ b/python/types.c @@ -185,7 +185,7 @@ libvirt_virEventHandleCallbackWrap(virEv if (node == NULL) { Py_INCREF(Py_None); - printf("%s: WARNING - Wrapping None\n", __FUNCTION__); + printf("%s: WARNING - Wrapping None\n", __func__); return (Py_None); } ret = @@ -200,7 +200,7 @@ libvirt_virEventTimeoutCallbackWrap(virE PyObject *ret; if (node == NULL) { - printf("%s: WARNING - Wrapping None\n", __FUNCTION__); + printf("%s: WARNING - Wrapping None\n", __func__); Py_INCREF(Py_None); return (Py_None); }

3 2

[libvirt] [PATCH] Fix compiler error when !HAVE_POLKIT
by john.levon＠sun.com 17 Dec '08

17 Dec '08

# HG changeset patch # User john.levon(a)sun.com # Date 1229399439 28800 # Node ID f622c9de5e2488de8ae16bc7a0b50d8fa76af364 # Parent db36391b739c117f5887388f65f31e6a9d2d361b Fix compiler error when !HAVE_POLKIT Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/qemud/remote.c b/qemud/remote.c --- a/qemud/remote.c +++ b/qemud/remote.c @@ -3116,7 +3116,7 @@ static int static int remoteDispatchAuthPolkit (struct qemud_server *server ATTRIBUTE_UNUSED, struct qemud_client *client ATTRIBUTE_UNUSED, - virConnectPtr conn, + virConnectPtr conn ATTRIBUTE_UNUSED, remote_error *rerr, void *args ATTRIBUTE_UNUSED, remote_auth_polkit_ret *ret ATTRIBUTE_UNUSED)

3 2

[libvirt] [PATCH] 5/8 converts a few others modules to use the logging
by Daniel Veillard 17 Dec '08

17 Dec '08

just a few redefines and using the new values, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] pid_t portability in virExec()
by john.levon＠sun.com 17 Dec '08

17 Dec '08

# HG changeset patch # User john.levon(a)sun.com # Date 1229399267 28800 # Node ID 020f8b8e9340287a6ab3d869b359e39b905cd0ff # Parent 1b81ac255ad765ab782829e7fe0a55dc7bab72ab pid_t portability in virExec() Use the right type for handling process IDs. Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/src/openvz_driver.c b/src/openvz_driver.c --- a/src/openvz_driver.c +++ b/src/openvz_driver.c @@ -1093,7 +1093,8 @@ static char *openvzGetCapabilities(virCo static int openvzListDomains(virConnectPtr conn, int *ids, int nids) { int got = 0; - int veid, pid; + int veid; + pid_t pid; int outfd = -1; int errfd = -1; int ret; @@ -1144,7 +1145,8 @@ static int openvzListDefinedDomains(virC static int openvzListDefinedDomains(virConnectPtr conn, char **const names, int nnames) { int got = 0; - int veid, pid, outfd = -1, errfd = -1, ret; + int veid, outfd = -1, errfd = -1, ret; + pid_t pid; char vpsname[32]; char buf[32]; char *endptr; diff --git a/src/proxy_internal.c b/src/proxy_internal.c --- a/src/proxy_internal.c +++ b/src/proxy_internal.c @@ -144,7 +144,8 @@ virProxyForkServer(void) virProxyForkServer(void) { const char *proxyPath = virProxyFindServerPath(); - int ret, pid, status; + int ret, status; + pid_t pid; const char *proxyarg[2]; if (!proxyPath) { diff --git a/src/remote_internal.c b/src/remote_internal.c --- a/src/remote_internal.c +++ b/src/remote_internal.c @@ -252,7 +252,8 @@ remoteForkDaemon(virConnectPtr conn) { const char *daemonPath = remoteFindDaemonPath(); const char *const daemonargs[] = { daemonPath, "--timeout=30", NULL }; - int ret, pid, status; + int ret, status; + pid_t pid; if (!daemonPath) { error(conn, VIR_ERR_INTERNAL_ERROR, _("failed to find libvirtd binary")); diff --git a/src/storage_backend.c b/src/storage_backend.c --- a/src/storage_backend.c +++ b/src/storage_backend.c @@ -411,7 +411,8 @@ virStorageBackendRunProgRegex(virConnect void *data, int *outexit) { - int child = 0, fd = -1, exitstatus, err, failed = 1; + int fd = -1, exitstatus, err, failed = 1; + pid_t child = 0; FILE *list = NULL; regex_t *reg; regmatch_t *vars = NULL; @@ -575,7 +576,8 @@ virStorageBackendRunProgNul(virConnectPt void *data) { size_t n_tok = 0; - int child = 0, fd = -1, exitstatus; + int fd = -1, exitstatus; + pid_t child = 0; FILE *fp = NULL; char **v; int err = -1; diff --git a/src/uml_driver.c b/src/uml_driver.c --- a/src/uml_driver.c +++ b/src/uml_driver.c @@ -711,7 +711,8 @@ static int umlStartVMDaemon(virConnectPt virDomainObjPtr vm) { const char **argv = NULL, **tmp; const char **progenv = NULL; - int i, ret, pid; + int i, ret; + pid_t pid; char *logfile; int logfd = -1; struct stat sb; diff --git a/src/util.c b/src/util.c --- a/src/util.c +++ b/src/util.c @@ -182,10 +182,11 @@ __virExec(virConnectPtr conn, const char *const*argv, const char *const*envp, const fd_set *keepfd, - int *retpid, + pid_t *retpid, int infd, int *outfd, int *errfd, int flags) { - int pid, null, i, openmax; + pid_t pid; + int null, i, openmax; int pipeout[2] = {-1,-1}; int pipeerr[2] = {-1,-1}; int childout = -1; @@ -439,7 +440,7 @@ virExec(virConnectPtr conn, const char *const*argv, const char *const*envp, const fd_set *keepfd, - int *retpid, + pid_t *retpid, int infd, int *outfd, int *errfd, int flags) { char *argv_str; @@ -554,7 +555,8 @@ virRun(virConnectPtr conn, virRun(virConnectPtr conn, const char *const*argv, int *status) { - int childpid, exitstatus, execret, waitret; + pid_t childpid; + int exitstatus, execret, waitret; int ret = -1; int errfd = -1, outfd = -1; char *outbuf = NULL; diff --git a/src/util.h b/src/util.h --- a/src/util.h +++ b/src/util.h @@ -27,6 +27,7 @@ #include "verify.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); @@ -41,7 +42,7 @@ int virExec(virConnectPtr conn, const char *const*argv, const char *const*envp, const fd_set *keepfd, - int *retpid, + pid_t *retpid, int infd, int *outfd, int *errfd,

3 2

[libvirt] [PATCH] Makefile portability in qemud
by john.levon＠sun.com 17 Dec '08

17 Dec '08

# HG changeset patch # User john.levon(a)sun.com # Date 1229399267 28800 # Node ID 35512df785342cd15214790e17e0c1f4d2182b32 # Parent 57c76efe37988edc64beb12ca5dc1ff5863f0085 Makefile portability in qemud Neither uuidgen nor sed -i are portable - only make the edit on platforms that can do so. Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/qemud/Makefile.am b/qemud/Makefile.am --- a/qemud/Makefile.am +++ b/qemud/Makefile.am @@ -56,7 +56,7 @@ remote_protocol.c: remote_protocol.h if WITH_LIBVIRTD -UUID=$(shell uuidgen) +UUID=$(shell type uuidgen >/dev/null 2>&1 && uuidgen) sbin_PROGRAMS = libvirtd @@ -142,8 +142,9 @@ install-data-local: install-init install mkdir -p $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart $(INSTALL_DATA) $(srcdir)/default-network.xml \ $(DESTDIR)$(sysconfdir)/$(default_xml_dest) - sed -i -e "s,</name>,</name>\n <uuid>$(UUID)</uuid>," \ - $(DESTDIR)$(sysconfdir)/$(default_xml_dest) + test -z "$(UUID)" || \ + sed -i -e "s,</name>,</name>\n <uuid>$(UUID)</uuid>," \ + $(DESTDIR)$(sysconfdir)/$(default_xml_dest) test -e $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml || \ ln -s ../default.xml \ $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml

3 2

[libvirt] [PATCH] Improve compiler flag checking
by john.levon＠sun.com 17 Dec '08

17 Dec '08

# HG changeset patch # User john.levon(a)sun.com # Date 1229399267 28800 # Node ID 1f7707a3d49b20397011897cdc04c347322ad0c5 # Parent a6c317b5fe1b4081ccb40ba90af7d31298cf6b44 Improve compiler flag checking Some compilers (including GCC) don't set the return value consistently if an erroneous option is passed on the command line. Account for that. Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/acinclude.m4 b/acinclude.m4 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -45,21 +45,9 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ ;; esac - compiler_flags= + COMPILER_FLAGS= for option in $try_compiler_flags; do - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $option" - AC_MSG_CHECKING([whether gcc understands $option]) - AC_TRY_LINK([], [], - has_option=yes, - has_option=no,) - CFLAGS="$SAVE_CFLAGS" - AC_MSG_RESULT($has_option) - if test $has_option = yes; then - compiler_flags="$compiler_flags $option" - fi - unset has_option - unset SAVE_CFLAGS + gl_COMPILER_FLAGS($option) done unset option unset try_compiler_flags @@ -85,7 +73,7 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ fi AC_MSG_RESULT($complCFLAGS) - WARN_CFLAGS="$compiler_flags $complCFLAGS" + WARN_CFLAGS="$COMPILER_FLAGS $complCFLAGS" AC_SUBST(WARN_CFLAGS) ]) diff --git a/m4/compiler-flags.m4 b/m4/compiler-flags.m4 --- a/m4/compiler-flags.m4 +++ b/m4/compiler-flags.m4 @@ -23,12 +23,14 @@ AC_DEFUN([gl_COMPILER_FLAGS], AC_DEFUN([gl_COMPILER_FLAGS], [AC_MSG_CHECKING(whether compiler accepts $1) AC_SUBST(COMPILER_FLAGS) - ac_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $1" - AC_TRY_COMPILE(, - [int x;], - COMPILER_FLAGS="$COMPILER_FLAGS $1" - AC_MSG_RESULT(yes), - AC_MSG_RESULT(no)) - CFLAGS="$ac_save_CFLAGS" + echo 'int x;' >conftest.c + $CC $CFLAGS $1 -c conftest.c 2>conftest.err + ret=$? + if test $ret != 0 -o -s conftest.err; then + AC_MSG_RESULT(no) + else + AC_MSG_RESULT(yes) + COMPILER_FLAGS="$COMPILER_FLAGS $1" + fi + rm -f conftest* ])

2 1

[libvirt] [PATCH] qemud compile fixes
by john.levon＠sun.com 17 Dec '08

17 Dec '08

# HG changeset patch # User john.levon(a)sun.com # Date 1229399267 28800 # Node ID a6c317b5fe1b4081ccb40ba90af7d31298cf6b44 # Parent a8109ee7d505787957468ebd03b09c613e3372cf qemud compile fixes Let qemud/ compile with Sun cc. Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/qemud/qemud.c b/qemud/qemud.c --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -28,7 +28,6 @@ #include <sys/stat.h> #include <unistd.h> #include <fcntl.h> -#include <paths.h> #include <limits.h> #include <sys/socket.h> #include <sys/un.h> @@ -801,7 +800,8 @@ static struct qemud_server *qemudInitial #ifdef WITH_STORAGE_DIR storageRegister(); #endif -#if defined(HAVE_HAL) || defined(HAVE_DEVKIT) +#if defined(WITH_NODE_DEVICES) && \ + (defined(HAVE_HAL) || defined(HAVE_DEVKIT)) nodedevRegister(); #endif #ifdef WITH_QEMU diff --git a/qemud/remote.c b/qemud/remote.c --- a/qemud/remote.c +++ b/qemud/remote.c @@ -27,7 +27,6 @@ #include <sys/stat.h> #include <unistd.h> #include <fcntl.h> -#include <paths.h> #include <limits.h> #include <sys/socket.h> #include <sys/un.h>

3 2

[libvirt] [PATCH] Fix statement not reached compiler error
by john.levon＠sun.com 17 Dec '08

17 Dec '08

# HG changeset patch # User john.levon(a)sun.com # Date 1229399267 28800 # Node ID 77dceb31cae41057c4274517f5c3246e47545de3 # Parent 8b69f84c9498d05ae03f5389eb83290aaeab23e6 Fix statement not reached compiler error Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/src/remote_internal.c b/src/remote_internal.c --- a/src/remote_internal.c +++ b/src/remote_internal.c @@ -5090,7 +5090,6 @@ really_read_buf (virConnectPtr conn, str VIR_ERR_RPC, _("socket closed unexpectedly")); return -1; } - return err; } else { reread: err = recv (priv->sock, bytes, len, 0); @@ -5106,10 +5105,9 @@ really_read_buf (virConnectPtr conn, str VIR_ERR_RPC, _("socket closed unexpectedly")); return -1; } - return err; - } - - return 0; + } + + return err; } static int

2 1

[libvirt] [PATCH] Fix register/deregister driver method declaration
by john.levon＠sun.com 17 Dec '08

17 Dec '08

# HG changeset patch # User john.levon(a)sun.com # Date 1229399267 28800 # Node ID 357ed6194907962940e31382fe988f3b64bd1968 # Parent 1d913a11d0b4df41c6a749ea34a5a2f37cb2c903 Fix register/deregister driver method declaration Callback parameter should be of type virConnectDomainEventCallback. Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/src/driver.h b/src/driver.h --- a/src/driver.h +++ b/src/driver.h @@ -282,14 +282,14 @@ typedef int typedef int (*virDrvDomainEventRegister) (virConnectPtr conn, - void *callback, + virConnectDomainEventCallback cb, void *opaque, virFreeCallback freecb); typedef int (*virDrvDomainEventDeregister) (virConnectPtr conn, - void *callback); + virConnectDomainEventCallback cb); typedef int (*virDrvDomainMigratePrepare2) diff --git a/src/qemu_driver.c b/src/qemu_driver.c --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -3751,7 +3751,7 @@ cleanup: static int qemudDomainEventRegister (virConnectPtr conn, - void *callback, + virConnectDomainEventCallback callback, void *opaque, virFreeCallback freecb) { @@ -3768,7 +3768,7 @@ qemudDomainEventRegister (virConnectPtr static int qemudDomainEventDeregister (virConnectPtr conn, - void *callback) + virConnectDomainEventCallback callback) { struct qemud_driver *driver = conn->privateData; int ret; diff --git a/src/remote_internal.c b/src/remote_internal.c --- a/src/remote_internal.c +++ b/src/remote_internal.c @@ -4724,8 +4724,8 @@ remoteAuthPolkit (virConnectPtr conn, st /*----------------------------------------------------------------------*/ static int remoteDomainEventRegister (virConnectPtr conn, - void *callback ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED, + virConnectDomainEventCallback callback, + void *opaque, virFreeCallback freecb) { struct private_data *priv = conn->privateData; @@ -4752,7 +4752,7 @@ static int remoteDomainEventRegister (vi } static int remoteDomainEventDeregister (virConnectPtr conn, - void *callback ATTRIBUTE_UNUSED) + virConnectDomainEventCallback callback) { struct private_data *priv = conn->privateData; diff --git a/src/xen_unified.c b/src/xen_unified.c --- a/src/xen_unified.c +++ b/src/xen_unified.c @@ -1360,7 +1360,7 @@ xenUnifiedNodeGetFreeMemory (virConnectP static int xenUnifiedDomainEventRegister (virConnectPtr conn, - void *callback, + virConnectDomainEventCallback callback, void *opaque, void (*freefunc)(void *)) { @@ -1377,7 +1377,7 @@ xenUnifiedDomainEventRegister (virConnec static int xenUnifiedDomainEventDeregister (virConnectPtr conn, - void *callback) + virConnectDomainEventCallback callback) { int ret; GET_PRIVATE (conn);

2 1

[libvirt] libvir: error could not connect to qemu://localhost/system
by Kenneth Nagin 17 Dec '08

17 Dec '08

I downloaded libvirt on December 14 and did the installation procedure (autogen, make, make install). I installed it on host which worked fine with a previous version. However, now the libvirtd is not accepting remote connections. What has changed in this version? Am I doing something wrong? Details: I brought up libvirtd in listen mode: [root@arenal kvm1]# ps -ef | grep libvirtd root 1443 803 0 15:34 pts/3 00:00:00 grep libvirtd? root 32258 5093 0 15:12 pts/1 00:00:00 libvirtd --listen I ran virsh and it works fine as long as the connection is not remote. virsh # version Compiled against library: libvir 0.5.1 Using library: libvir 0.5.1 Using API: QEMU 0.5.1 Running hypervisor: QEMU 0.9.0 virsh # connect test:///default virsh # connect qemu:///system I then tried to connect to itself (the host has credentials for both client and host). But it fails: virsh # connect qemu://arenal/system libvir: error : could not connect to qemu://arenal/system error: Failed to connect to the hypervisor virsh # connect test://arenal/default libvir: error : could not connect to test://arenal/default error: Failed to connect to the hypervisor Kenneth Nagin

1 0

[libvirt] [RFC] sVirt 0.20
by James Morris 17 Dec '08

17 Dec '08

This is to announce the release of v0.20 of sVirt, a project to add security labeling support to Linux-based virtualization. Project page: http://www.selinuxproject.org/page/SVirt A patch against libvirt is attached; and also included in a release tarball at http://namei.org/svirt/. See 'readme.txt' there for more details on building and running the code. This release is an update in response to feedback received on the v0.10 prototype release, per the discussion thread at: https://www.redhat.com/archives/libvir-list/2008-October/msg00478.html Changes are as follows: ----------------------------------------------------------------------------- v0.20 - 11/Dec/2008 ----------------------------------------------------------------------------- * Published TODO list: http://selinuxproject.org/page/SVirt/TODO * Rebased to current upstream: converted to new build system, locking etc. * Changed DOI format to an integer value, represented via a string, defaulting to "0". Ongoing general discussion on DOI formats and semantics may be found at: http://mail.opensolaris.org/mailman/listinfo/doi-discuss * Introduced the concept of a "security model", to more easily distinguish between security models and labels in the API. * The security model and DOI attributes are now properties of the hypervisor (instead of the domain label), and included in its host capabilities, e.g.: <capabilities> <host> <cpu> <arch>x86_64</arch> </cpu> <secmodel> <model>selinux</model> <doi>0</doi> </secmodel> </host> .... </capabilities> Implicit here is the assumption that each hypervisor may only be associated with one security model. * Integrated security model support into "virsh capabilities". * The domain configuration label is now of the form: <domain> .... <seclabel model='selinux'> <label>system_u:system_r:virtd_t:s0</label> </seclabel> </domain> * The model attribute of the seclabel element above is validated against the host security model at runtime. * The output of "virsh dominfo" for a running labeled domain is now as follows: # dominfo sys1 Id: 1 Name: sys1 UUID: fa3c8e06-0877-2a08-06fd-f2479b7bacb0 OS Type: hvm Security model: selinux Security DOI: 0 State: running CPU(s): 1 CPU time: 24.9s Max memory: 524288 kB Used memory: 524288 kB Autostart: disable Security label: system_u:system_r:virtd_t:s0 (enforcing) * The security policy enforcing is a dynamic property of the domain security label, as it may be applied on a per-domain basis. * The main aspects to security labeling support in the library and associated data structures are as follows: Domain configuration: virDomainSecLabelDef Host capabilities: virDomainSecModel Active domain state: virDomainSecLabel ----------------------------------------------------------------------------- I'm hoping to be able to propose an initial version for upstream merge within the next few minor releases, tasks for which are being scoped out in the new TODO list: http://selinuxproject.org/page/SVirt/TODO If the current release passes review, the next major task will be to add dynamic MCS labeling of domains and disk images for simple isolation. Feedback is welcome. - James -- James Morris <jmorris(a)namei.org> Makefile.maint | 1 autobuild.sh | 10 +- include/libvirt/libvirt.h | 67 ++++++++++++++ include/libvirt/libvirt.h.in | 67 ++++++++++++++ include/libvirt/virterror.h | 2 po/POTFILES.in | 2 python/generator.py | 2 qemud/Makefile.am | 1 qemud/remote.c | 82 +++++++++++++++++ qemud/remote_dispatch_args.h | 2 qemud/remote_dispatch_prototypes.h | 14 ++ qemud/remote_dispatch_ret.h | 2 qemud/remote_dispatch_table.h | 10 ++ qemud/remote_protocol.c | 46 +++++++++ qemud/remote_protocol.h | 44 +++++++++ qemud/remote_protocol.x | 38 +++++++- src/Makefile.am | 26 ++++- src/capabilities.c | 10 ++ src/capabilities.h | 7 + src/domain_conf.c | 73 +++++++++++++++ src/domain_conf.h | 9 + src/driver.h | 8 + src/libvirt.c | 69 ++++++++++++++ src/libvirt_sym.version.in | 3 src/lxc_driver.c | 2 src/openvz_driver.c | 2 src/qemu_conf.h | 3 src/qemu_driver.c | 175 +++++++++++++++++++++++++++++++++++++ src/remote_internal.c | 66 +++++++++++++ src/seclabel.c | 114 ++++++++++++++++++++++++ src/seclabel.h | 62 +++++++++++++ src/seclabel_selinux.c | 106 ++++++++++++++++++++++ src/seclabel_selinux.h | 18 +++ src/storage_backend.c | 1 src/test.c | 2 src/uml_driver.c | 2 src/virsh.c | 22 ++++ src/virterror.c | 9 + tests/daemon-conf | 3 39 files changed, 1177 insertions(+), 5 deletions(-) diff --git a/Makefile.maint b/Makefile.maint index 10d481b..0dcdcf8 100644 --- a/Makefile.maint +++ b/Makefile.maint @@ -353,6 +353,7 @@ msg_gen_function += qemudReportError msg_gen_function += openvzLog msg_gen_function += openvzError msg_gen_function += virDomainReportError +msg_gen_function += virSecLabelReportError msg_gen_function += virReportErrorHelper msg_gen_function += lxcError msg_gen_function += umlError diff --git a/autobuild.sh b/autobuild.sh index e5d8554..bee3f34 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -14,10 +14,18 @@ rm -rf coverage #mkdir build #cd build +SELINUXENABLED=/usr/sbin/selinuxenabled + +if [ -x $SELINUXENABLED ] && $SELINUXENABLED ; then + WITH_SELINUX="--with-selinux=yes" +else + WITH_SELINUX="" +fi + ./autogen.sh --prefix="$AUTOBUILD_INSTALL_ROOT" \ --enable-test-coverage \ --enable-compile-warnings=error \ - --with-xen-proxy + --with-xen-proxy $WITH_SELINUX # If the MAKEFLAGS envvar does not yet include a -j option, # add -jN where N depends on the number of processors. diff --git a/include/libvirt/libvirt.h b/include/libvirt/libvirt.h index 97b4489..46cd3f4 100644 --- a/include/libvirt/libvirt.h +++ b/include/libvirt/libvirt.h @@ -111,6 +111,69 @@ typedef enum { } virDomainCreateFlags; /** + * VIR_SECLABEL_LABEL_BUFLEN: + * + * Macro providing the maximum length of the virDomainSecLabel + * label string. Note that this value is based on that used + * by Labeled NFS. + */ +#define VIR_SECLABEL_LABEL_BUFLEN (4096 + 1) + +/** + * virDomainSecLabel: + * + * a virDomainSecLabel is a structure filled by virDomainGetSecLabel(), + * providing the security label and associated attributes for the specified + * domain. + * + */ +typedef struct _virDomainSecLabel { + char label[VIR_SECLABEL_LABEL_BUFLEN]; /* security label string */ + int enforcing; /* 1 if security policy is being enforced for domain */ +} virDomainSecLabel; + +/** + * virDomainSecLabelPtr: + * + * a virDomainSecLabelPtr is a pointer to a virDomainSecLabel. + */ +typedef virDomainSecLabel *virDomainSecLabelPtr; + +/** + * VIR_SECLABEL_MODEL_BUFLEN: + * + * Macro providing the maximum length of the virDomainSecModel model string. + */ +#define VIR_SECLABEL_MODEL_BUFLEN (256 + 1) + +/** + * VIR_SECLABEL_DOI_BUFLEN: + * + * Macro providing the maximum length of the virDomainSecModel doi string. + */ +#define VIR_SECLABEL_DOI_BUFLEN (256 + 1) + +/** + * virDomainSecModel: + * + * a virDomainSecModel is a structure filled by virDomainGetSecModel(), + * providing the per-hypervisor security model and DOI attributes for the + * specified domain. + * + */ +typedef struct _virDomainSecModel { + char model[VIR_SECLABEL_MODEL_BUFLEN]; /* security model string */ + char doi[VIR_SECLABEL_DOI_BUFLEN]; /* domain of interpetation */ +} virDomainSecModel; + +/** + * virDomainSecModelPtr: + * + * a virDomainSecModelPtr is a pointer to a virDomainSecModel. + */ +typedef virDomainSecModel *virDomainSecModelPtr; + +/** * virNodeInfoPtr: * * a virNodeInfo is a structure filled by virNodeGetInfo() and providing @@ -504,6 +567,10 @@ int virDomainSetMaxMemory (virDomainPtr domain, int virDomainSetMemory (virDomainPtr domain, unsigned long memory); int virDomainGetMaxVcpus (virDomainPtr domain); +int virDomainGetSecLabel (virDomainPtr domain, + virDomainSecLabelPtr seclabel); +int virDomainGetSecModel (virDomainPtr domain, + virDomainSecModelPtr secmodel); /* * XML domain description diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index fc322e6..63cf21d 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -111,6 +111,69 @@ typedef enum { } virDomainCreateFlags; /** + * VIR_SECLABEL_LABEL_BUFLEN: + * + * Macro providing the maximum length of the virDomainSecLabel + * label string. Note that this value is based on that used + * by Labeled NFS. + */ +#define VIR_SECLABEL_LABEL_BUFLEN (4096 + 1) + +/** + * virDomainSecLabel: + * + * a virDomainSecLabel is a structure filled by virDomainGetSecLabel(), + * providing the security label and associated attributes for the specified + * domain. + * + */ +typedef struct _virDomainSecLabel { + char label[VIR_SECLABEL_LABEL_BUFLEN]; /* security label string */ + int enforcing; /* 1 if security policy is being enforced for domain */ +} virDomainSecLabel; + +/** + * virDomainSecLabelPtr: + * + * a virDomainSecLabelPtr is a pointer to a virDomainSecLabel. + */ +typedef virDomainSecLabel *virDomainSecLabelPtr; + +/** + * VIR_SECLABEL_MODEL_BUFLEN: + * + * Macro providing the maximum length of the virDomainSecModel model string. + */ +#define VIR_SECLABEL_MODEL_BUFLEN (256 + 1) + +/** + * VIR_SECLABEL_DOI_BUFLEN: + * + * Macro providing the maximum length of the virDomainSecModel doi string. + */ +#define VIR_SECLABEL_DOI_BUFLEN (256 + 1) + +/** + * virDomainSecModel: + * + * a virDomainSecModel is a structure filled by virDomainGetSecModel(), + * providing the per-hypervisor security model and DOI attributes for the + * specified domain. + * + */ +typedef struct _virDomainSecModel { + char model[VIR_SECLABEL_MODEL_BUFLEN]; /* security model string */ + char doi[VIR_SECLABEL_DOI_BUFLEN]; /* domain of interpetation */ +} virDomainSecModel; + +/** + * virDomainSecModelPtr: + * + * a virDomainSecModelPtr is a pointer to a virDomainSecModel. + */ +typedef virDomainSecModel *virDomainSecModelPtr; + +/** * virNodeInfoPtr: * * a virNodeInfo is a structure filled by virNodeGetInfo() and providing @@ -504,6 +567,10 @@ int virDomainSetMaxMemory (virDomainPtr domain, int virDomainSetMemory (virDomainPtr domain, unsigned long memory); int virDomainGetMaxVcpus (virDomainPtr domain); +int virDomainGetSecLabel (virDomainPtr domain, + virDomainSecLabelPtr seclabel); +int virDomainGetSecModel (virDomainPtr domain, + virDomainSecModelPtr secmodel); /* * XML domain description diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h index 0f1f08c..e987d9e 100644 --- a/include/libvirt/virterror.h +++ b/include/libvirt/virterror.h @@ -61,6 +61,7 @@ typedef enum { VIR_FROM_UML, /* Error at the UML driver */ VIR_FROM_NODEDEV, /* Error from node device monitor */ VIR_FROM_XEN_INOTIFY, /* Error from xen inotify layer */ + VIR_FROM_SECLABEL, /* Error from security labeling framework */ } virErrorDomain; @@ -154,6 +155,7 @@ typedef enum { VIR_WAR_NO_NODE, /* failed to start node driver */ VIR_ERR_INVALID_NODE_DEVICE,/* invalid node device object */ VIR_ERR_NO_NODE_DEVICE,/* node device not found */ + VIR_ERR_NO_SECLABEL_MODEL, /* security labeling model not found */ } virErrorNumber; /** diff --git a/po/POTFILES.in b/po/POTFILES.in index d33d24b..8dab48e 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -20,6 +20,8 @@ src/proxy_internal.c src/qemu_conf.c src/qemu_driver.c src/remote_internal.c +src/seclabel.c +src/seclabel_selinux.c src/sexpr.c src/storage_backend.c src/storage_backend_disk.c diff --git a/python/generator.py b/python/generator.py index 9c71c05..7a99eb3 100755 --- a/python/generator.py +++ b/python/generator.py @@ -342,6 +342,8 @@ skip_function = ( 'virCopyLastError', # Python API is called virGetLastError instead 'virConnectOpenAuth', # Python C code is manually written 'virDefaultErrorFunc', # Python virErrorFuncHandler impl calls this from C + 'virDomainGetSecLabel', # Needs investigation... + 'virDomainGetSecModel', # Needs investigation... 'virConnectDomainEventRegister', # overridden in virConnect.py 'virConnectDomainEventDeregister', # overridden in virConnect.py ) diff --git a/qemud/Makefile.am b/qemud/Makefile.am index 8cb0847..9db9ee8 100644 --- a/qemud/Makefile.am +++ b/qemud/Makefile.am @@ -122,6 +122,7 @@ libvirtd_LDADD += ../src/libvirt_driver_nodedev.la endif endif +libvirtd_LDADD += ../src/libvirt_driver_seclabel.la libvirtd_LDADD += ../src/libvirt.la if HAVE_POLKIT diff --git a/qemud/remote.c b/qemud/remote.c index 0488e6c..ab2d754 100644 --- a/qemud/remote.c +++ b/qemud/remote.c @@ -1319,6 +1319,88 @@ remoteDispatchDomainGetMaxVcpus (struct qemud_server *server ATTRIBUTE_UNUSED, } static int +remoteDispatchDomainGetSeclabel(struct qemud_server *server ATTRIBUTE_UNUSED, + struct qemud_client *client ATTRIBUTE_UNUSED, + virConnectPtr conn, + remote_error *rerr, + remote_domain_get_seclabel_args *args, + remote_domain_get_seclabel_ret *ret) +{ + virDomainPtr dom; + virDomainSecLabel seclabel; + + dom = get_nonnull_domain(conn, args->dom); + if (dom == NULL) { + remoteDispatchFormatError(rerr, "%s", _("domain not found")); + return -2; + } + + memset(&seclabel, 0, sizeof seclabel); + + if (virDomainGetSecLabel(dom, &seclabel) == -1) { + virDomainFree(dom); + remoteDispatchFormatError(rerr, "%s", _("unable to get security label")); + return -1; + } + + ret->label.label_len = strlen(seclabel.label) + 1; + if (VIR_ALLOC_N(ret->label.label_val, ret->label.label_len) < 0) { + virDomainFree (dom); + remoteDispatchFormatError(rerr, "%s", strerror (errno)); + return -2; + } + strcpy(ret->label.label_val, seclabel.label); + ret->enforcing = seclabel.enforcing; + + virDomainFree(dom); + return 0; +} + +static int +remoteDispatchDomainGetSecmodel(struct qemud_server *server ATTRIBUTE_UNUSED, + struct qemud_client *client ATTRIBUTE_UNUSED, + virConnectPtr conn, + remote_error *rerr, + remote_domain_get_secmodel_args *args, + remote_domain_get_secmodel_ret *ret) +{ + virDomainPtr dom; + virDomainSecModel secmodel; + + dom = get_nonnull_domain(conn, args->dom); + if (dom == NULL) { + remoteDispatchFormatError(rerr, "%s", _("domain not found")); + return -2; + } + + memset(&secmodel, 0, sizeof secmodel); + if (virDomainGetSecModel(dom, &secmodel) == -1) { + virDomainFree(dom); + remoteDispatchFormatError(rerr, "%s", _("unable to get security model")); + return -1; + } + + ret->model.model_len = strlen(secmodel.model) + 1; + if (VIR_ALLOC_N(ret->model.model_val, ret->model.model_len) < 0) { + virDomainFree(dom); + remoteDispatchFormatError(rerr, "%s", strerror (errno)); + return -2; + } + strcpy(ret->model.model_val, secmodel.model); + + ret->doi.doi_len = strlen(secmodel.doi) + 1; + if (VIR_ALLOC_N(ret->doi.doi_val, ret->doi.doi_len) < 0) { + virDomainFree(dom); + remoteDispatchFormatError(rerr, "%s", strerror (errno)); + return -2; + } + strcpy(ret->doi.doi_val, secmodel.doi); + + virDomainFree(dom); + return 0; +} + +static int remoteDispatchDomainGetOsType (struct qemud_server *server ATTRIBUTE_UNUSED, struct qemud_client *client ATTRIBUTE_UNUSED, virConnectPtr conn, diff --git a/qemud/remote_dispatch_args.h b/qemud/remote_dispatch_args.h index a19ab79..ec5e346 100644 --- a/qemud/remote_dispatch_args.h +++ b/qemud/remote_dispatch_args.h @@ -99,3 +99,5 @@ remote_node_device_get_parent_args val_remote_node_device_get_parent_args; remote_node_device_num_of_caps_args val_remote_node_device_num_of_caps_args; remote_node_device_list_caps_args val_remote_node_device_list_caps_args; + remote_domain_get_seclabel_args val_remote_domain_get_seclabel_args; + remote_domain_get_secmodel_args val_remote_domain_get_secmodel_args; diff --git a/qemud/remote_dispatch_prototypes.h b/qemud/remote_dispatch_prototypes.h index 3ffb164..13fbf6a 100644 --- a/qemud/remote_dispatch_prototypes.h +++ b/qemud/remote_dispatch_prototypes.h @@ -184,6 +184,20 @@ static int remoteDispatchDomainGetSchedulerType( remote_error *err, remote_domain_get_scheduler_type_args *args, remote_domain_get_scheduler_type_ret *ret); +static int remoteDispatchDomainGetSeclabel( + struct qemud_server *server, + struct qemud_client *client, + virConnectPtr conn, + remote_error *err, + remote_domain_get_seclabel_args *args, + remote_domain_get_seclabel_ret *ret); +static int remoteDispatchDomainGetSecmodel( + struct qemud_server *server, + struct qemud_client *client, + virConnectPtr conn, + remote_error *err, + remote_domain_get_secmodel_args *args, + remote_domain_get_secmodel_ret *ret); static int remoteDispatchDomainGetVcpus( struct qemud_server *server, struct qemud_client *client, diff --git a/qemud/remote_dispatch_ret.h b/qemud/remote_dispatch_ret.h index 563167f..1b4779f 100644 --- a/qemud/remote_dispatch_ret.h +++ b/qemud/remote_dispatch_ret.h @@ -86,3 +86,5 @@ remote_node_device_get_parent_ret val_remote_node_device_get_parent_ret; remote_node_device_num_of_caps_ret val_remote_node_device_num_of_caps_ret; remote_node_device_list_caps_ret val_remote_node_device_list_caps_ret; + remote_domain_get_seclabel_ret val_remote_domain_get_seclabel_ret; + remote_domain_get_secmodel_ret val_remote_domain_get_secmodel_ret; diff --git a/qemud/remote_dispatch_table.h b/qemud/remote_dispatch_table.h index 60f0e1c..4e6921f 100644 --- a/qemud/remote_dispatch_table.h +++ b/qemud/remote_dispatch_table.h @@ -592,3 +592,13 @@ .args_filter = (xdrproc_t) xdr_remote_node_device_list_caps_args, .ret_filter = (xdrproc_t) xdr_remote_node_device_list_caps_ret, }, +{ /* DomainGetSeclabel => 118 */ + .fn = (dispatch_fn) remoteDispatchDomainGetSeclabel, + .args_filter = (xdrproc_t) xdr_remote_domain_get_seclabel_args, + .ret_filter = (xdrproc_t) xdr_remote_domain_get_seclabel_ret, +}, +{ /* DomainGetSecmodel => 119 */ + .fn = (dispatch_fn) remoteDispatchDomainGetSecmodel, + .args_filter = (xdrproc_t) xdr_remote_domain_get_secmodel_args, + .ret_filter = (xdrproc_t) xdr_remote_domain_get_secmodel_ret, +}, diff --git a/qemud/remote_protocol.c b/qemud/remote_protocol.c index ec8e653..44aba3f 100644 --- a/qemud/remote_protocol.c +++ b/qemud/remote_protocol.c @@ -1166,6 +1166,52 @@ xdr_remote_domain_get_max_vcpus_ret (XDR *xdrs, remote_domain_get_max_vcpus_ret } bool_t +xdr_remote_domain_get_seclabel_args (XDR *xdrs, remote_domain_get_seclabel_args *objp) +{ + + if (!xdr_remote_nonnull_domain (xdrs, &objp->dom)) + return FALSE; + return TRUE; +} + +bool_t +xdr_remote_domain_get_seclabel_ret (XDR *xdrs, remote_domain_get_seclabel_ret *objp) +{ + char **objp_cpp0 = (char **) (void *) &objp->label.label_val; + + if (!xdr_array (xdrs, objp_cpp0, (u_int *) &objp->label.label_len, REMOTE_SECLABEL_LABEL_MAX, + sizeof (char), (xdrproc_t) xdr_char)) + return FALSE; + if (!xdr_int (xdrs, &objp->enforcing)) + return FALSE; + return TRUE; +} + +bool_t +xdr_remote_domain_get_secmodel_args (XDR *xdrs, remote_domain_get_secmodel_args *objp) +{ + + if (!xdr_remote_nonnull_domain (xdrs, &objp->dom)) + return FALSE; + return TRUE; +} + +bool_t +xdr_remote_domain_get_secmodel_ret (XDR *xdrs, remote_domain_get_secmodel_ret *objp) +{ + char **objp_cpp1 = (char **) (void *) &objp->doi.doi_val; + char **objp_cpp0 = (char **) (void *) &objp->model.model_val; + + if (!xdr_array (xdrs, objp_cpp0, (u_int *) &objp->model.model_len, REMOTE_SECLABEL_MODEL_MAX, + sizeof (char), (xdrproc_t) xdr_char)) + return FALSE; + if (!xdr_array (xdrs, objp_cpp1, (u_int *) &objp->doi.doi_len, REMOTE_SECLABEL_DOI_MAX, + sizeof (char), (xdrproc_t) xdr_char)) + return FALSE; + return TRUE; +} + +bool_t xdr_remote_domain_attach_device_args (XDR *xdrs, remote_domain_attach_device_args *objp) { diff --git a/qemud/remote_protocol.h b/qemud/remote_protocol.h index bf107ae..a13e234 100644 --- a/qemud/remote_protocol.h +++ b/qemud/remote_protocol.h @@ -39,6 +39,9 @@ typedef remote_nonnull_string *remote_string; #define REMOTE_AUTH_TYPE_LIST_MAX 20 #define REMOTE_DOMAIN_BLOCK_PEEK_BUFFER_MAX 65536 #define REMOTE_DOMAIN_MEMORY_PEEK_BUFFER_MAX 65536 +#define REMOTE_SECLABEL_MODEL_MAX VIR_SECLABEL_MODEL_BUFLEN +#define REMOTE_SECLABEL_LABEL_MAX VIR_SECLABEL_LABEL_BUFLEN +#define REMOTE_SECLABEL_DOI_MAX VIR_SECLABEL_DOI_BUFLEN typedef char remote_uuid[VIR_UUID_BUFLEN]; @@ -638,6 +641,37 @@ struct remote_domain_get_max_vcpus_ret { }; typedef struct remote_domain_get_max_vcpus_ret remote_domain_get_max_vcpus_ret; +struct remote_domain_get_seclabel_args { + remote_nonnull_domain dom; +}; +typedef struct remote_domain_get_seclabel_args remote_domain_get_seclabel_args; + +struct remote_domain_get_seclabel_ret { + struct { + u_int label_len; + char *label_val; + } label; + int enforcing; +}; +typedef struct remote_domain_get_seclabel_ret remote_domain_get_seclabel_ret; + +struct remote_domain_get_secmodel_args { + remote_nonnull_domain dom; +}; +typedef struct remote_domain_get_secmodel_args remote_domain_get_secmodel_args; + +struct remote_domain_get_secmodel_ret { + struct { + u_int model_len; + char *model_val; + } model; + struct { + u_int doi_len; + char *doi_val; + } doi; +}; +typedef struct remote_domain_get_secmodel_ret remote_domain_get_secmodel_ret; + struct remote_domain_attach_device_args { remote_nonnull_domain dom; remote_nonnull_string xml; @@ -1349,6 +1383,8 @@ enum remote_procedure { REMOTE_PROC_NODE_DEVICE_GET_PARENT = 115, REMOTE_PROC_NODE_DEVICE_NUM_OF_CAPS = 116, REMOTE_PROC_NODE_DEVICE_LIST_CAPS = 117, + REMOTE_PROC_DOMAIN_GET_SECLABEL = 118, + REMOTE_PROC_DOMAIN_GET_SECMODEL = 119, }; typedef enum remote_procedure remote_procedure; @@ -1475,6 +1511,10 @@ extern bool_t xdr_remote_domain_get_vcpus_args (XDR *, remote_domain_get_vcpus_ extern bool_t xdr_remote_domain_get_vcpus_ret (XDR *, remote_domain_get_vcpus_ret*); extern bool_t xdr_remote_domain_get_max_vcpus_args (XDR *, remote_domain_get_max_vcpus_args*); extern bool_t xdr_remote_domain_get_max_vcpus_ret (XDR *, remote_domain_get_max_vcpus_ret*); +extern bool_t xdr_remote_domain_get_seclabel_args (XDR *, remote_domain_get_seclabel_args*); +extern bool_t xdr_remote_domain_get_seclabel_ret (XDR *, remote_domain_get_seclabel_ret*); +extern bool_t xdr_remote_domain_get_secmodel_args (XDR *, remote_domain_get_secmodel_args*); +extern bool_t xdr_remote_domain_get_secmodel_ret (XDR *, remote_domain_get_secmodel_ret*); extern bool_t xdr_remote_domain_attach_device_args (XDR *, remote_domain_attach_device_args*); extern bool_t xdr_remote_domain_detach_device_args (XDR *, remote_domain_detach_device_args*); extern bool_t xdr_remote_domain_get_autostart_args (XDR *, remote_domain_get_autostart_args*); @@ -1680,6 +1720,10 @@ extern bool_t xdr_remote_domain_get_vcpus_args (); extern bool_t xdr_remote_domain_get_vcpus_ret (); extern bool_t xdr_remote_domain_get_max_vcpus_args (); extern bool_t xdr_remote_domain_get_max_vcpus_ret (); +extern bool_t xdr_remote_domain_get_seclabel_args (); +extern bool_t xdr_remote_domain_get_seclabel_ret (); +extern bool_t xdr_remote_domain_get_secmodel_args (); +extern bool_t xdr_remote_domain_get_secmodel_ret (); extern bool_t xdr_remote_domain_attach_device_args (); extern bool_t xdr_remote_domain_detach_device_args (); extern bool_t xdr_remote_domain_get_autostart_args (); diff --git a/qemud/remote_protocol.x b/qemud/remote_protocol.x index 22327fd..c88fd35 100644 --- a/qemud/remote_protocol.x +++ b/qemud/remote_protocol.x @@ -116,6 +116,21 @@ const REMOTE_DOMAIN_BLOCK_PEEK_BUFFER_MAX = 65536; */ const REMOTE_DOMAIN_MEMORY_PEEK_BUFFER_MAX = 65536; +/* + * Maximum length of a security label model field. + */ +const REMOTE_SECLABEL_MODEL_MAX = VIR_SECLABEL_MODEL_BUFLEN; + +/* + * Maximum length of a security label field. + */ +const REMOTE_SECLABEL_LABEL_MAX = VIR_SECLABEL_LABEL_BUFLEN; + +/* + * Maximum length of a security label DOI field. + */ +const REMOTE_SECLABEL_DOI_MAX = VIR_SECLABEL_DOI_BUFLEN; + /* UUID. VIR_UUID_BUFLEN definition comes from libvirt.h */ typedef opaque remote_uuid[VIR_UUID_BUFLEN]; @@ -618,6 +633,24 @@ struct remote_domain_get_max_vcpus_ret { int num; }; +struct remote_domain_get_seclabel_args { + remote_nonnull_domain dom; +}; + +struct remote_domain_get_seclabel_ret { + char label<REMOTE_SECLABEL_LABEL_MAX>; + int enforcing; +}; + +struct remote_domain_get_secmodel_args { + remote_nonnull_domain dom; +}; + +struct remote_domain_get_secmodel_ret { + char model<REMOTE_SECLABEL_MODEL_MAX>; + char doi<REMOTE_SECLABEL_DOI_MAX>; +}; + struct remote_domain_attach_device_args { remote_nonnull_domain dom; remote_nonnull_string xml; @@ -1224,7 +1257,10 @@ enum remote_procedure { REMOTE_PROC_NODE_DEVICE_DUMP_XML = 114, REMOTE_PROC_NODE_DEVICE_GET_PARENT = 115, REMOTE_PROC_NODE_DEVICE_NUM_OF_CAPS = 116, - REMOTE_PROC_NODE_DEVICE_LIST_CAPS = 117 + REMOTE_PROC_NODE_DEVICE_LIST_CAPS = 117, + + REMOTE_PROC_DOMAIN_GET_SECLABEL = 118, + REMOTE_PROC_DOMAIN_GET_SECMODEL = 119 }; /* Custom RPC structure. */ diff --git a/src/Makefile.am b/src/Makefile.am index c32a1d4..076ef85 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -134,7 +134,7 @@ UML_DRIVER_SOURCES = \ NETWORK_DRIVER_SOURCES = \ network_driver.h network_driver.c -# And finally storage backend specific impls +# Storage backend specific impls STORAGE_DRIVER_SOURCES = \ storage_driver.h storage_driver.c \ storage_backend.h storage_backend.c @@ -159,6 +159,12 @@ STORAGE_DRIVER_DISK_SOURCES = \ STORAGE_HELPER_DISK_SOURCES = \ parthelper.c +# Security framework and drivers for various models +SECLABEL_DRIVER_SOURCES = \ + seclabel.h seclabel.c + +SECLABEL_DRIVER_SELINUX_SOURCES = \ + seclabel_selinux.h seclabel_selinux.c NODE_DEVICE_DRIVER_SOURCES = \ node_device.c node_device.h @@ -370,6 +376,19 @@ libvirt_driver_nodedev_la_LDFLAGS += -module -avoid-version endif endif +libvirt_driver_seclabel_la_SOURCES = $(SECLABEL_DRIVER_SOURCES) +if WITH_DRIVER_MODULES +mod_LTLIBRARIES += libvirt_driver_seclabel.la +else +noinst_LTLIBRARIES += libvirt_driver_seclabel.la +endif +if WITH_DRIVER_MODULES +libvirt_driver_seclabel_la_LDFLAGS = -module -avoid-version +endif +# XXX fixme +# if WITH_SELINUX +libvirt_driver_seclabel_la_SOURCES += $(SECLABEL_DRIVER_SELINUX_SOURCES) +# endif # Add all conditional sources just in case... EXTRA_DIST += \ @@ -388,8 +407,9 @@ EXTRA_DIST += \ $(STORAGE_DRIVER_DISK_SOURCES) \ $(NODE_DEVICE_DRIVER_SOURCES) \ $(NODE_DEVICE_DRIVER_HAL_SOURCES) \ - $(NODE_DEVICE_DRIVER_DEVKIT_SOURCES) - + $(NODE_DEVICE_DRIVER_DEVKIT_SOURCES) \ + $(SECLABEL_DRIVER_SOURCES) \ + $(SECLABEL_DRIVER_SELINUX_SOURCES) # Empty source list - it merely links a bunch of convenience libs together libvirt_la_SOURCES = diff --git a/src/capabilities.c b/src/capabilities.c index 158873c..6a09f36 100644 --- a/src/capabilities.c +++ b/src/capabilities.c @@ -150,6 +150,8 @@ virCapabilitiesFree(virCapsPtr caps) { VIR_FREE(caps->host.migrateTrans); VIR_FREE(caps->host.arch); + VIR_FREE(caps->host.secModel.model); + VIR_FREE(caps->host.secModel.doi); VIR_FREE(caps); } @@ -575,6 +577,14 @@ virCapabilitiesFormatXML(virCapsPtr caps) virBufferAddLit(&xml, " </cells>\n"); virBufferAddLit(&xml, " </topology>\n"); } + + if (caps->host.secModel.model) { + virBufferAddLit(&xml, " <secmodel>\n"); + virBufferVSprintf(&xml, " <model>%s</model>\n", caps->host.secModel.model); + virBufferVSprintf(&xml, " <doi>%s</doi>\n", caps->host.secModel.doi); + virBufferAddLit(&xml, " </secmodel>\n"); + } + virBufferAddLit(&xml, " </host>\n\n"); diff --git a/src/capabilities.h b/src/capabilities.h index c991ea1..6257ac3 100644 --- a/src/capabilities.h +++ b/src/capabilities.h @@ -78,6 +78,12 @@ struct _virCapsHostNUMACell { int *cpus; }; +typedef struct _virCapsHostSecModel virCapsHostSecModel; +struct _virCapsHostSecModel { + char *model; + char *doi; +}; + typedef struct _virCapsHost virCapsHost; typedef virCapsHost *virCapsHostPtr; struct _virCapsHost { @@ -90,6 +96,7 @@ struct _virCapsHost { char **migrateTrans; int nnumaCell; virCapsHostNUMACellPtr *numaCell; + virCapsHostSecModel secModel; }; typedef struct _virCaps virCaps; diff --git a/src/domain_conf.c b/src/domain_conf.c index 32ed59f..5a0d4de 100644 --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -359,6 +359,16 @@ void virDomainDeviceDefFree(virDomainDeviceDefPtr def) VIR_FREE(def); } +void virDomainSecLabelDefFree(virDomainDefPtr def); + +void virDomainSecLabelDefFree(virDomainDefPtr def) +{ + if (def->seclabel.model) + VIR_FREE(def->seclabel.model); + if (def->seclabel.label) + VIR_FREE(def->seclabel.label); +} + void virDomainDefFree(virDomainDefPtr def) { unsigned int i; @@ -417,6 +427,8 @@ void virDomainDefFree(virDomainDefPtr def) VIR_FREE(def->cpumask); VIR_FREE(def->emulator); + virDomainSecLabelDefFree(def); + VIR_FREE(def); } @@ -1644,6 +1656,56 @@ static int virDomainLifecycleParseXML(virConnectPtr conn, return 0; } +static int +virDomainSecLabelDefParseXMLString(virConnectPtr conn, + const char *str, + int maxlen, + const char *name, + char **to, + xmlXPathContextPtr ctxt) +{ + char *tmp = virXPathString(conn, str, ctxt); + + if (tmp != NULL) { + if (strlen(tmp) >= maxlen) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("\'%s\' longer than %d characters"), + name, maxlen); + return -1; + } + *to = tmp; + } else { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("\'%s\' missing"), name); + return -1; + } + return 0; +} + +static int +virDomainSecLabelDefParseXML(virConnectPtr conn, + const virDomainDefPtr def, + xmlXPathContextPtr ctxt) +{ + if (virXPathNode(conn, "./seclabel", ctxt) == NULL) + return 0; + + if (virDomainSecLabelDefParseXMLString(conn, "string(./seclabel/label[1])", + VIR_SECLABEL_LABEL_BUFLEN-1, "label", + &def->seclabel.label, ctxt) == -1) + goto error; + + if (virDomainSecLabelDefParseXMLString(conn, "string(./seclabel/@model)", + VIR_SECLABEL_MODEL_BUFLEN-1, "model", + &def->seclabel.model, ctxt) == -1) + goto error; + + return 0; + +error: + virDomainSecLabelDefFree(def); + return -1; +} virDomainDeviceDefPtr virDomainDeviceDefParse(virConnectPtr conn, virCapsPtr caps, @@ -2212,6 +2274,10 @@ static virDomainDefPtr virDomainDefParseXML(virConnectPtr conn, } VIR_FREE(nodes); + /* analysis of security label */ + if (virDomainSecLabelDefParseXML(conn, def, ctxt) == -1) + goto error; + return def; no_memory: @@ -3206,6 +3272,13 @@ char *virDomainDefFormat(virConnectPtr conn, goto cleanup; virBufferAddLit(&buf, " </devices>\n"); + + if (def->seclabel.model) { + virBufferEscapeString(&buf, " <seclabel model='%s'>\n", def->seclabel.model); + virBufferEscapeString(&buf, " <label>%s</label>\n", def->seclabel.label); + virBufferAddLit(&buf, " </seclabel>\n"); + } + virBufferAddLit(&buf, "</domain>\n"); if (virBufferError(&buf)) diff --git a/src/domain_conf.h b/src/domain_conf.h index 51cf6d5..aee6459 100644 --- a/src/domain_conf.h +++ b/src/domain_conf.h @@ -391,6 +391,14 @@ struct _virDomainOSDef { char *bootloaderArgs; }; +/* Security label configuration for domain */ +typedef struct _virDomainSecLabelDef virDomainSecLabelDef; +typedef virDomainSecLabelDef *virDomainSecLabelDefPtr; +struct _virDomainSecLabelDef { + char *model; /* name of security labeling model */ + char *label; /* security label string */ +}; + #define VIR_DOMAIN_CPUMASK_LEN 1024 /* Guest VM main configuration */ @@ -448,6 +456,7 @@ struct _virDomainDef { /* Only 1 */ virDomainChrDefPtr console; + virDomainSecLabelDef seclabel; }; /* Guest VM runtime state */ diff --git a/src/driver.h b/src/driver.h index 8c394e2..393621f 100644 --- a/src/driver.h +++ b/src/driver.h @@ -181,6 +181,12 @@ typedef int typedef int (*virDrvDomainGetMaxVcpus) (virDomainPtr domain); typedef int + (*virDrvDomainGetSecLabel) (virDomainPtr domain, + virDomainSecLabelPtr seclabel); +typedef int + (*virDrvDomainGetSecModel) (virDomainPtr domain, + virDomainSecModelPtr secmodel); +typedef int (*virDrvDomainAttachDevice) (virDomainPtr domain, const char *xml); typedef int @@ -361,6 +367,8 @@ struct _virDriver { virDrvDomainPinVcpu domainPinVcpu; virDrvDomainGetVcpus domainGetVcpus; virDrvDomainGetMaxVcpus domainGetMaxVcpus; + virDrvDomainGetSecLabel domainGetSecLabel; + virDrvDomainGetSecModel domainGetSecModel; virDrvDomainDumpXML domainDumpXML; virDrvListDefinedDomains listDefinedDomains; virDrvNumOfDefinedDomains numOfDefinedDomains; diff --git a/src/libvirt.c b/src/libvirt.c index a4a0df5..9b127e3 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -3438,6 +3438,75 @@ virDomainGetMaxVcpus(virDomainPtr domain) return -1; } +/** + * virDomainGetSecLabel: + * @domain: a domain object + * @seclabel: pointer to a virDomainSecLabel structure + * + * Extract security label of an active domain. + * + * Returns 0 in case of success, -1 in case of failure, and -2 + * if the operation is not supported (caller decides if that's + * an error). + */ +int +virDomainGetSecLabel(virDomainPtr domain, virDomainSecLabelPtr seclabel) +{ + virConnectPtr conn; + + if (!VIR_IS_CONNECTED_DOMAIN(domain)) { + virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + return -1; + } + + if (seclabel == NULL) { + virLibDomainError(domain, VIR_ERR_INVALID_ARG, __FUNCTION__); + return -1; + } + + conn = domain->conn; + + if (conn->driver->domainGetSecLabel) + return conn->driver->domainGetSecLabel(domain, seclabel); + + virLibConnWarning(conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + return -2; +} + +/** + * virDomainGetSecModel: + * @domain: a domain object + * @secmodel: pointer to a virDomainSecModel structure + * + * Extract the security model of a hypervisor. + * + * Returns 0 in case of success, -1 in case of failure, and -2 + * if the operation is not supported (caller decides if that's + * an error). + */ +int +virDomainGetSecModel(virDomainPtr domain, virDomainSecModelPtr secmodel) +{ + virConnectPtr conn; + + if (!VIR_IS_CONNECTED_DOMAIN(domain)) { + virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + return -1; + } + + if (secmodel == NULL) { + virLibDomainError(domain, VIR_ERR_INVALID_ARG, __FUNCTION__); + return -1; + } + + conn = domain->conn; + + if (conn->driver->domainGetSecModel) + return conn->driver->domainGetSecModel(domain, secmodel); + + virLibConnWarning(conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + return -2; +} /** * virDomainAttachDevice: diff --git a/src/libvirt_sym.version.in b/src/libvirt_sym.version.in index de0bc4a..f533c17 100644 --- a/src/libvirt_sym.version.in +++ b/src/libvirt_sym.version.in @@ -617,6 +617,9 @@ LIBVIRT_PRIVATE_@VERSION@ { virXPathString; virXMLPropString; + /* WIP */ + virDomainGetSecLabel; + virDomainGetSecModel; /* Finally everything else is totally private */ local: diff --git a/src/lxc_driver.c b/src/lxc_driver.c index 12f6adc..6cd8001 100644 --- a/src/lxc_driver.c +++ b/src/lxc_driver.c @@ -1423,6 +1423,8 @@ static virDriver lxcDriver = { NULL, /* domainPinVcpu */ NULL, /* domainGetVcpus */ NULL, /* domainGetMaxVcpus */ + NULL, /* domainGetSecLabel */ + NULL, /* domainGetSecModel */ lxcDomainDumpXML, /* domainDumpXML */ lxcListDefinedDomains, /* listDefinedDomains */ lxcNumDefinedDomains, /* numOfDefinedDomains */ diff --git a/src/openvz_driver.c b/src/openvz_driver.c index 95ac7dc..bee7471 100644 --- a/src/openvz_driver.c +++ b/src/openvz_driver.c @@ -1279,6 +1279,8 @@ static virDriver openvzDriver = { NULL, /* domainPinVcpu */ NULL, /* domainGetVcpus */ openvzDomainGetMaxVcpus, /* domainGetMaxVcpus */ + NULL, /* domainGetSecLabel */ + NULL, /* domainGetSecModel */ openvzDomainDumpXML, /* domainDumpXML */ openvzListDefinedDomains, /* listDomains */ openvzNumDefinedDomains, /* numOfDomains */ diff --git a/src/qemu_conf.h b/src/qemu_conf.h index 36d09d1..736b21c 100644 --- a/src/qemu_conf.h +++ b/src/qemu_conf.h @@ -32,6 +32,7 @@ #include "network_conf.h" #include "domain_conf.h" #include "domain_event.h" +#include "seclabel.h" #define qemudDebug(fmt, ...) do {} while(0) @@ -74,6 +75,8 @@ struct qemud_driver { virDomainEventQueuePtr domainEventQueue; int domainEventTimer; int domainEventDispatching; + + virSecLabelDriverPtr secLabelDriver; }; /* Port numbers used for KVM migration. */ diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 5f6fbd1..fa04fa3 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -68,6 +68,7 @@ #include "memory.h" #include "uuid.h" #include "domain_conf.h" +#include "seclabel.h" /* For storing short-lived temporary files. */ #define TEMPDIR LOCAL_STATE_DIR "/cache/libvirt" @@ -182,6 +183,50 @@ qemudAutostartConfigs(struct qemud_driver *driver) { virConnectClose(conn); } +static int +qemudSecLabelInit(struct qemud_driver *qemud_drv) +{ + int ret; + const char *doi, *model; + virCapsPtr caps; + virSecLabelDriverPtr seclabel_drv; + + ret = virSecLabelDriverStartup(&seclabel_drv); + if (ret == -1) { + qemudLog(QEMUD_ERR, _("Failed to start security labeling driver")); + return -1; + } + if (ret == -2) + return 0; + + qemud_drv->secLabelDriver = seclabel_drv; + doi = virSecLabelDriverGetDOI(seclabel_drv); + model = virSecLabelDriverGetModel(seclabel_drv); + + qemudLog(QEMUD_DEBUG, "Initialized security labeling driver \"%s\" with " + "DOI \"%s\".\n", model, doi); + + /* + * Add security policy host caps now that the labeling driver is + * initialized. + */ + caps = qemud_drv->caps; + + caps->host.secModel.model = strdup(model); + if (!caps->host.secModel.model) { + qemudLog(QEMUD_ERR, _("Failed to copy secModel model: %s"), strerror(errno)); + return -1; + } + + caps->host.secModel.doi = strdup(doi); + if (!caps->host.secModel.doi) { + qemudLog(QEMUD_ERR, _("Failed to copy secModel DOI: %s"), strerror(errno)); + return -1; + } + + return 0; +} + /** * qemudStartup: * @@ -253,6 +298,11 @@ qemudStartup(void) { if ((qemu_driver->caps = qemudCapsInit()) == NULL) goto out_of_memory; + if (qemudSecLabelInit(qemu_driver) < 0) { + qemudShutdown(); + return -1; + } + if (qemudLoadDriverConfig(qemu_driver, driverConf) < 0) { goto error; } @@ -824,6 +874,15 @@ static int qemudNextFreeVNCPort(struct qemud_driver *driver ATTRIBUTE_UNUSED) { return -1; } +static int qemudDomainSetSecLabel(virConnectPtr conn, struct qemud_driver *driver, virDomainObjPtr vm) +{ + if (vm->def->seclabel.label != NULL) + if (driver->secLabelDriver && driver->secLabelDriver->domainSetLabel) + return driver->secLabelDriver->domainSetLabel(conn, driver->secLabelDriver, + &vm->def->seclabel); + return 0; +} + static virDomainPtr qemudDomainLookupByName(virConnectPtr conn, const char *name); @@ -924,6 +983,16 @@ static int qemudStartVMDaemon(virConnectPtr conn, return -1; } + /* + * Set up the security label for the domain here, before doing + * too much else. + */ + if (qemudDomainSetSecLabel(conn, driver, vm) < 0) { + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("Failed to set security label")); + return -1; + } + if (qemudExtractVersionInfo(emulator, NULL, &qemuCmdFlags) < 0) { @@ -2453,7 +2522,111 @@ cleanup: return ret; } +static int qemudDomainGetSecLabel(virDomainPtr dom, virDomainSecLabelPtr seclabel) +{ + struct qemud_driver *driver = (struct qemud_driver *)dom->conn->privateData; + virDomainObjPtr vm; + const char *type; + int ret = -1; + + qemuDriverLock(driver); + vm = virDomainFindByUUID(&driver->domains, dom->uuid); + qemuDriverUnlock(driver); + + if (!vm) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + + virUUIDFormat(dom->uuid, uuidstr); + qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_DOMAIN, + _("no domain with matching uuid '%s'"), uuidstr); + goto cleanup; + } + + if (!(type = virDomainVirtTypeToString(vm->def->virtType))) { + qemudReportError(dom->conn, dom, NULL, VIR_ERR_INTERNAL_ERROR, + _("unknown virt type in domain definition '%d'"), + vm->def->virtType); + goto cleanup; + } + + /* + * Theoretically, the pid can be replaced during this operation and + * return the label of a different process. If atomicity is needed, + * further validation will be required. + */ + if (virDomainIsActive(vm)) { + if (driver->secLabelDriver && driver->secLabelDriver->domainGetLabel) { + if (driver->secLabelDriver->domainGetLabel(dom->conn, vm, seclabel) == -1) { + qemudReportError(dom->conn, dom, NULL, VIR_ERR_INTERNAL_ERROR, + _("Failed to get security label")); + goto cleanup; + } + } + } + + ret = 0; + +cleanup: + if (vm) + virDomainObjUnlock(vm); + return ret; +} + +static int qemudDomainGetSecModel(virDomainPtr dom, virDomainSecModelPtr secmodel) +{ + struct qemud_driver *driver = (struct qemud_driver *)dom->conn->privateData; + virDomainObjPtr vm; + const char *type; + char *p; + int ret = -1; + + qemuDriverLock(driver); + vm = virDomainFindByUUID(&driver->domains, dom->uuid); + qemuDriverUnlock(driver); + + if (!vm) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + + virUUIDFormat(dom->uuid, uuidstr); + qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_DOMAIN, + _("no domain with matching uuid '%s'"), uuidstr); + goto cleanup; + } + + if (!(type = virDomainVirtTypeToString(vm->def->virtType))) { + qemudReportError(dom->conn, dom, NULL, VIR_ERR_INTERNAL_ERROR, + _("unknown virt type in domain definition '%d'"), + vm->def->virtType); + goto cleanup; + } + + p = driver->caps->host.secModel.model; + if (strlen(p) >= VIR_SECLABEL_MODEL_BUFLEN-1) { + qemudReportError(dom->conn, dom, NULL, VIR_ERR_INTERNAL_ERROR, + _("security model string exceeds max %d bytes"), + VIR_SECLABEL_MODEL_BUFLEN-1); + goto cleanup; + } + strcpy(secmodel->model, p); + + p = driver->caps->host.secModel.doi; + if (strlen(p) >= VIR_SECLABEL_DOI_BUFLEN-1) { + qemudReportError(dom->conn, dom, NULL, VIR_ERR_INTERNAL_ERROR, + _("security DOI string exceeds max %d bytes"), + VIR_SECLABEL_DOI_BUFLEN-1); + goto cleanup; + } + strcpy(secmodel->doi, p); + + ret = 0; + +cleanup: + if (vm) + virDomainObjUnlock(vm); + return ret; +} +/* TODO: check seclabel restore */ static int qemudDomainRestore(virConnectPtr conn, const char *path) { struct qemud_driver *driver = conn->privateData; @@ -4203,6 +4376,8 @@ static virDriver qemuDriver = { NULL, /* domainGetVcpus */ #endif qemudDomainGetMaxVcpus, /* domainGetMaxVcpus */ + qemudDomainGetSecLabel, /* domainGetSecLabel */ + qemudDomainGetSecModel, /* domainGetSecModel */ qemudDomainDumpXML, /* domainDumpXML */ qemudListDefinedDomains, /* listDomains */ qemudNumDefinedDomains, /* numOfDomains */ diff --git a/src/remote_internal.c b/src/remote_internal.c index 1d0c5ac..99e2926 100644 --- a/src/remote_internal.c +++ b/src/remote_internal.c @@ -1983,6 +1983,70 @@ remoteDomainGetMaxVcpus (virDomainPtr domain) return ret.num; } +static int +remoteDomainGetSecLabel (virDomainPtr domain, virDomainSecLabelPtr seclabel) +{ + remote_domain_get_seclabel_args args; + remote_domain_get_seclabel_ret ret; + GET_PRIVATE (domain->conn, -1); + + make_nonnull_domain (&args.dom, domain); + memset (&ret, 0, sizeof ret); + if (call (domain->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_SECLABEL, + (xdrproc_t) xdr_remote_domain_get_seclabel_args, (char *)&args, + (xdrproc_t) xdr_remote_domain_get_seclabel_ret, (char *)&ret) == -1) { + return -1; + } + + if (ret.label.label_val != NULL) { + if (strlen (ret.label.label_val) >= sizeof seclabel->label) { + errorf (domain->conn, VIR_ERR_RPC, _("security label exceeds maximum: %zd"), + sizeof seclabel->label - 1); + return -1; + } + strcpy (seclabel->label, ret.label.label_val); + seclabel->enforcing = ret.enforcing; + } + + return 0; +} + +static int +remoteDomainGetSecModel (virDomainPtr domain, virDomainSecModelPtr secmodel) +{ + remote_domain_get_secmodel_args args; + remote_domain_get_secmodel_ret ret; + GET_PRIVATE (domain->conn, -1); + + make_nonnull_domain (&args.dom, domain); + memset (&ret, 0, sizeof ret); + if (call (domain->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_SECMODEL, + (xdrproc_t) xdr_remote_domain_get_secmodel_args, (char *)&args, + (xdrproc_t) xdr_remote_domain_get_secmodel_ret, (char *)&ret) == -1) { + return -1; + } + + if (ret.model.model_val != NULL) { + if (strlen (ret.model.model_val) >= sizeof secmodel->model) { + errorf (domain->conn, VIR_ERR_RPC, _("security model exceeds maximum: %zd"), + sizeof secmodel->model - 1); + return -1; + } + strcpy (secmodel->model, ret.model.model_val); + } + + if (ret.doi.doi_val != NULL) { + if (strlen (ret.doi.doi_val) >= sizeof secmodel->doi) { + errorf (domain->conn, VIR_ERR_RPC, _("security doi exceeds maximum: %zd"), + sizeof secmodel->doi - 1); + return -1; + } + strcpy (secmodel->doi, ret.doi.doi_val); + } + + return 0; +} + static char * remoteDomainDumpXML (virDomainPtr domain, int flags) { @@ -5352,6 +5416,8 @@ static virDriver driver = { .domainPinVcpu = remoteDomainPinVcpu, .domainGetVcpus = remoteDomainGetVcpus, .domainGetMaxVcpus = remoteDomainGetMaxVcpus, + .domainGetSecLabel = remoteDomainGetSecLabel, + .domainGetSecModel = remoteDomainGetSecModel, .domainDumpXML = remoteDomainDumpXML, .listDefinedDomains = remoteListDefinedDomains, .numOfDefinedDomains = remoteNumOfDefinedDomains, diff --git a/src/seclabel.c b/src/seclabel.c new file mode 100644 index 0000000..854e81e --- /dev/null +++ b/src/seclabel.c @@ -0,0 +1,114 @@ +/* + * Copyright (C) 2008 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. + * + * Authors: + * James Morris <jmorris(a)namei.org> + * + */ +#include <config.h> +#include <string.h> + +#include "virterror_internal.h" + +#include "seclabel.h" + +#if HAVE_SELINUX +#include "seclabel_selinux.h" +#endif + +static virSecLabelDriverPtr seclabel_drivers[] = { +#ifdef HAVE_SELINUX + &virSELinuxSecLabelDriver, +#endif +}; + +/* + * Probe each security labeling driver: each should perform a test to see if + * it should be loaded, e.g. if the currently active host security mechanism + * matches. If the probe succeeds, initialize the driver and return it. + * + * Returns 0 on success, -1 on error, and -2 on no driver found (caller + * to determine if that's an error). + */ +int +virSecLabelDriverStartup(virSecLabelDriverPtr * drv) +{ + unsigned int i; + + /* FIXME: gcc warning when no drivers enabled */ + for (i = 0; i < (sizeof(seclabel_drivers) / sizeof(seclabel_drivers[0])); i++) { + virSecLabelDriverPtr tmp = seclabel_drivers[i]; + + if (tmp->probe()) { + virSecLabelDriverInit(tmp); + if (tmp->open(NULL, tmp) == -1) { + return -1; + } else { + *drv = tmp; + break; + } + } else + return -2; + } + return 0; +} + +void +virSecLabelReportError(virConnectPtr conn, int code, const char *fmt, ...) +{ + va_list args; + char errorMessage[1024]; + + if (fmt) { + va_start(args, fmt); + vsnprintf(errorMessage, sizeof(errorMessage) - 1, fmt, args); + va_end(args); + } else + errorMessage[0] = '\0'; + + virRaiseError(conn, NULL, NULL, VIR_FROM_SECLABEL, code, + VIR_ERR_ERROR, NULL, NULL, NULL, -1, -1, "%s", + errorMessage); +} + +/* + * Helpers + */ +void +virSecLabelDriverInit(virSecLabelDriverPtr drv) +{ + memset(&drv->_private, 0, sizeof drv->_private); +} + +int +virSecLabelDriverSetDOI(virConnectPtr conn, + virSecLabelDriverPtr drv, + const char *doi) +{ + if (strlen(doi) >= VIR_SECLABEL_DOI_BUFLEN) { + virSecLabelReportError(conn, VIR_ERR_ERROR, + _("%s: DOI \'%s\' is " + "longer than the maximum allowed length of %d"), + __func__, doi, VIR_SECLABEL_DOI_BUFLEN - 1); + return -1; + } + strcpy(drv->_private.doi, doi); + return 0; +} + +const char * +virSecLabelDriverGetDOI(virSecLabelDriverPtr drv) +{ + return drv->_private.doi; +} + +const char * +virSecLabelDriverGetModel(virSecLabelDriverPtr drv) +{ + return drv->name; +} diff --git a/src/seclabel.h b/src/seclabel.h new file mode 100644 index 0000000..0eead78 --- /dev/null +++ b/src/seclabel.h @@ -0,0 +1,62 @@ +/* + * Copyright (C) 2008 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. + * + * Authors: + * James Morris <jmorris(a)namei.org> + * + */ +#ifndef __VIR_SECLABEL_H__ +#define __VIR_SECLABEL_H__ + +#include "internal.h" +#include "domain_conf.h" + +typedef struct _virSecLabelDriver virSecLabelDriver; +typedef virSecLabelDriver *virSecLabelDriverPtr; +typedef int (*virSecLabelDriverProbe) (void); +typedef int (*virSecLabelDriverOpen) (virConnectPtr conn, + virSecLabelDriverPtr drv); +typedef int (*virSecLabelDomainGetLabel) (virConnectPtr conn, + virDomainObjPtr vm, + virDomainSecLabelPtr sec); +typedef int (*virSecLabelDomainSetLabel) (virConnectPtr conn, + virSecLabelDriverPtr drv, + virDomainSecLabelDefPtr secdef); + +struct _virSecLabelDriver { + const char *name; + virSecLabelDriverProbe probe; + virSecLabelDriverOpen open; + virSecLabelDomainGetLabel domainGetLabel; + virSecLabelDomainSetLabel domainSetLabel; + + /* + * This is internally managed driver state and should only be accessed + * via helpers below. + */ + struct { + char doi[VIR_SECLABEL_DOI_BUFLEN]; + } _private; +}; + +/* Global methods */ +int virSecLabelDriverStartup(virSecLabelDriverPtr * drv); + +void +virSecLabelReportError(virConnectPtr conn, int code, const char *fmt, ...) + ATTRIBUTE_FORMAT(printf, 3, 4); + +/* Helpers */ +void virSecLabelDriverInit(virSecLabelDriverPtr drv); +int virSecLabelDriverSetDOI(virConnectPtr conn, + virSecLabelDriverPtr drv, + const char *doi); +const char *virSecLabelDriverGetDOI(virSecLabelDriverPtr drv); +const char *virSecLabelDriverGetModel(virSecLabelDriverPtr drv); + +#endif /* __VIR_SECLABEL_H__ */ diff --git a/src/seclabel_selinux.c b/src/seclabel_selinux.c new file mode 100644 index 0000000..f3dbb8d --- /dev/null +++ b/src/seclabel_selinux.c @@ -0,0 +1,106 @@ +/* + * Copyright (C) 2008 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. + * + * Authors: + * James Morris <jmorris(a)namei.org> + * + * SELinux seclabel driver. + */ +#include <config.h> +#include <selinux/selinux.h> + +#include "seclabel.h" +#include "seclabel_selinux.h" + +#define SECLABEL_SELINUX_VOID_DOI "0" + +static int +SELinuxSecLabelDriverProbe(void) +{ + return is_selinux_enabled(); +} + +static int +SELinuxSecLabelDriverOpen(virConnectPtr conn, virSecLabelDriverPtr drv) +{ + /* + * Where will the DOI come from? SELinux configuration, or qemu + * configuration? For the moment, we'll just set it to "0". + */ + virSecLabelDriverSetDOI(conn, drv, SECLABEL_SELINUX_VOID_DOI); + + return 0; +} + +static int +SELinuxSecLabelDomainGetLabel(virConnectPtr conn, + virDomainObjPtr vm, virDomainSecLabelPtr sec) +{ + security_context_t ctx; + + if (getpidcon(vm->pid, &ctx) == -1) { + virSecLabelReportError(conn, VIR_ERR_ERROR, _("%s: error calling " + "getpidcon(): %s"), __func__, + strerror(errno)); + return -1; + } + + if (strlen((char *) ctx) >= VIR_SECLABEL_LABEL_BUFLEN) { + virSecLabelReportError(conn, VIR_ERR_ERROR, + _("%s: security label exceeds " + "maximum length: %d"), __func__, + VIR_SECLABEL_LABEL_BUFLEN - 1); + return -1; + } + + strcpy(sec->label, (char *) ctx); + free(ctx); + + sec->enforcing = security_getenforce(); + if (sec->enforcing == -1) { + virSecLabelReportError(conn, VIR_ERR_ERROR, _("%s: error calling " + "security_getenforce(): %s"), __func__, + strerror(errno)); + return -1; + } + + return 0; +} + +static int +SELinuxSecLabelDomainSetLabel(virConnectPtr conn, + virSecLabelDriverPtr drv, const virDomainSecLabelDefPtr secdef) +{ + /* TODO: verify DOI */ + + if (!STREQ(drv->name, secdef->model)) { + virSecLabelReportError(conn, VIR_ERR_ERROR, + _("%s: security label driver mismatch: " + "\'%s\' model configured for domain, but " + "hypervisor driver is \'%s\'."), + __func__, secdef->model, drv->name); + return -1; + } + + if (setexeccon(secdef->label) == -1) { + virSecLabelReportError(conn, VIR_ERR_ERROR, + _("%s: unable to set security context " + "'\%s\': %s."), __func__, secdef->label, + strerror(errno)); + return -1; + } + return 0; +} + +virSecLabelDriver virSELinuxSecLabelDriver = { + .name = "selinux", + .probe = SELinuxSecLabelDriverProbe, + .open = SELinuxSecLabelDriverOpen, + .domainGetLabel = SELinuxSecLabelDomainGetLabel, + .domainSetLabel = SELinuxSecLabelDomainSetLabel, +}; diff --git a/src/seclabel_selinux.h b/src/seclabel_selinux.h new file mode 100644 index 0000000..20e575d --- /dev/null +++ b/src/seclabel_selinux.h @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2008 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. + * + * Authors: + * James Morris <jmorris(a)namei.org> + * + */ +#ifndef __VIR_SECLABEL_SELINUX_H__ +#define __VIR_SECLABEL_SELINUX_H__ + +extern virSecLabelDriver virSELinuxSecLabelDriver; + +#endif /* __VIR_SECLABEL_SELINUX_H__ */ diff --git a/src/storage_backend.c b/src/storage_backend.c index bb24727..227817a 100644 --- a/src/storage_backend.c +++ b/src/storage_backend.c @@ -246,6 +246,7 @@ virStorageBackendUpdateVolInfoFD(virConnectPtr conn, VIR_FREE(vol->target.perms.label); #if HAVE_SELINUX +/* XXX: make this a security driver call */ if (fgetfilecon(fd, &filecon) == -1) { if (errno != ENODATA && errno != ENOTSUP) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, diff --git a/src/test.c b/src/test.c index 257fc8a..0e27789 100644 --- a/src/test.c +++ b/src/test.c @@ -3270,6 +3270,8 @@ static virDriver testDriver = { NULL, /* domainPinVcpu */ NULL, /* domainGetVcpus */ NULL, /* domainGetMaxVcpus */ + NULL, /* domainGetSecLabel */ + NULL, /* domainGetSecModel */ testDomainDumpXML, /* domainDumpXML */ testListDefinedDomains, /* listDefinedDomains */ testNumOfDefinedDomains, /* numOfDefinedDomains */ diff --git a/src/uml_driver.c b/src/uml_driver.c index 408096e..eb56687 100644 --- a/src/uml_driver.c +++ b/src/uml_driver.c @@ -1855,6 +1855,8 @@ static virDriver umlDriver = { NULL, /* domainPinVcpu */ NULL, /* domainGetVcpus */ NULL, /* domainGetMaxVcpus */ + NULL, /* domainGetSecLabel */ + NULL, /* domainGetSecModel */ umlDomainDumpXML, /* domainDumpXML */ umlListDefinedDomains, /* listDomains */ umlNumDefinedDomains, /* numOfDomains */ diff --git a/src/virsh.c b/src/virsh.c index 1a5b42f..afadc08 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -958,6 +958,7 @@ static const vshCmdOptDef opts_undefine[] = { {NULL, 0, 0, NULL} }; +/* XXX MAC policy for defining & undefining domains ?? */ static int cmdUndefine(vshControl *ctl, const vshCmd *cmd) { @@ -1519,6 +1520,8 @@ cmdDominfo(vshControl *ctl, const vshCmd *cmd) { virDomainInfo info; virDomainPtr dom; + virDomainSecModel secmodel; + virDomainSecLabel seclabel; int ret = TRUE, autostart; unsigned int id; char *str, uuid[VIR_UUID_STRING_BUFLEN]; @@ -1544,6 +1547,12 @@ cmdDominfo(vshControl *ctl, const vshCmd *cmd) free(str); } + memset(&secmodel, 0, sizeof secmodel); + if (virDomainGetSecModel(dom, &secmodel) == 0) { + vshPrint(ctl, "%-15s %s\n", _("Security model:"), secmodel.model); + vshPrint(ctl, "%-15s %s\n", _("Security DOI:"), secmodel.doi); + } + if (virDomainGetInfo(dom, &info) == 0) { vshPrint(ctl, "%-15s %s\n", _("State:"), N_(vshDomainStateToString(info.state))); @@ -1577,6 +1586,19 @@ cmdDominfo(vshControl *ctl, const vshCmd *cmd) autostart ? _("enable") : _("disable") ); } + memset(&seclabel, 0, sizeof seclabel); + if (virDomainGetSecLabel(dom, &seclabel) == -1) + ret = FALSE; + else { + /* + * Security labels are only valid for active + * domains. + */ + if (seclabel.label[0] != '\0') + vshPrint(ctl, "%-15s %s (%s)\n", + _("Security label:"), seclabel.label, + seclabel.enforcing ? "enforcing" : "permissive"); + } virDomainFree(dom); return ret; } diff --git a/src/virterror.c b/src/virterror.c index 5a0b827..88b7e18 100644 --- a/src/virterror.c +++ b/src/virterror.c @@ -319,6 +319,9 @@ virDefaultErrorFunc(virErrorPtr err) case VIR_FROM_UML: dom = "UML "; break; + case VIR_FROM_SECLABEL: + dom = "Security Labeling "; + break; } if ((err->dom != NULL) && (err->code != VIR_ERR_INVALID_DOMAIN)) { domain = err->dom->name; @@ -745,6 +748,12 @@ virErrorMsg(virErrorNumber error, const char *info) else errmsg = _("Node device not found: %s"); break; + case VIR_ERR_NO_SECLABEL_MODEL: + if (info == NULL) + errmsg = _("Security labeling model not found"); + else + errmsg = _("Security labeling model not found: %s"); + break; } return (errmsg); } diff --git a/tests/daemon-conf b/tests/daemon-conf index 03189d5..e492846 100755 --- a/tests/daemon-conf +++ b/tests/daemon-conf @@ -59,6 +59,9 @@ while :; do # Filter out this diagnostic. sed '/^Cannot set group when not running as root$/d' err > k && mv k err + # Filter out this diagnostic, too. + sed '/^Initialized security labeling driver/d' err > k && mv k err + printf '%s\n\n' "remoteReadConfigFile: $f: $param_name: $msg" > expected-err diff -u expected-err err || fail=1

2 5

[libvirt] [PATCH] Fix qemud link
by john.levon＠sun.com 17 Dec '08

17 Dec '08

# HG changeset patch # User john.levon(a)sun.com # Date 1229399267 28800 # Node ID 57c76efe37988edc64beb12ca5dc1ff5863f0085 # Parent 1f7707a3d49b20397011897cdc04c347322ad0c5 Fix qemud link Order the LDADDs such that symbols are correctly resolved (namely asprintf() and getdelim()). Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/qemud/Makefile.am b/qemud/Makefile.am --- a/qemud/Makefile.am +++ b/qemud/Makefile.am @@ -95,6 +95,8 @@ libvirtd_LDADD = \ $(SASL_LIBS) \ $(POLKIT_LIBS) +libvirtd_LDADD += ../src/libvirt.la + if ! WITH_DRIVER_MODULES if WITH_QEMU libvirtd_LDADD += ../src/libvirt_driver_qemu.la @@ -121,7 +123,7 @@ endif endif endif -libvirtd_LDADD += ../src/libvirt.la +libvirtd_LDADD += ../gnulib/lib/libgnu.la if HAVE_POLKIT policydir = $(datadir)/PolicyKit/policy

2 1

[libvirt] [PATCH] Allow storage FS backend to be disabled
by john.levon＠sun.com 15 Dec '08

15 Dec '08

# HG changeset patch # User john.levon(a)sun.com # Date 1229369745 28800 # Node ID 56d77e29bf90057791feebfa47506fc0933cd690 # Parent ce24d41d372948cd5440cf17bdb58ce33faffa84 Allow storage FS backend to be disabled It's Linux-specific, and it should be possible to disable it Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/src/Makefile.am b/src/Makefile.am --- a/src/Makefile.am +++ b/src/Makefile.am @@ -326,6 +326,9 @@ libvirt_driver_storage_la_LDFLAGS = -mod libvirt_driver_storage_la_LDFLAGS = -module -avoid-version endif libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_SOURCES) +endif + +if WITH_STORAGE_FS libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_FS_SOURCES) endif

3 3

[libvirt] version script and non-existent symbols
by John Levon 15 Dec '08

15 Dec '08

The current version script refers to symbols that don't exist in the code. What is the purpose of this? The Solaris linker (quite correctly, I think) generates hanging references to such symbols. If it's just for documentation, such symbols should be commented out in the script. But there is another more basic problem. If I configure out various components, such as storage, which is necessary in order to compile, then /those/ symbols don't exist, and the build fails as above. I think the solution to the latter is to provide stubs that return failure codes for every symbol that can be ./configured out. So we'd introduce a stubs.c file that has these for everything, and compile each of the stubs if the relevant WITH_ option isn't set. Finally, C-style comments aren't supported with the Solaris linker. Since both linkers support # as a comment delimiter, any objections to changing it to do that? regards john

2 5

[libvirt] [PATCH] Fix domain_conf.c compile warning
by john.levon＠sun.com 15 Dec '08

15 Dec '08

# HG changeset patch # User john.levon(a)sun.com # Date 1229367890 28800 # Node ID ead0d1c1d3adacf478db05ee8d6abe270c96c5da # Parent 728f90c86f2cd950463923c80fc57754d6e762eb Fix domain_conf.c compile warning Fix this problem in all the places needed: "src/domain_conf.c", line 122: warning: syntax error: empty declaration Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/src/domain_conf.c b/src/domain_conf.c --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -119,7 +119,7 @@ VIR_ENUM_IMPL(virDomainSoundModel, VIR_D VIR_ENUM_IMPL(virDomainSoundModel, VIR_DOMAIN_SOUND_MODEL_LAST, "sb16", "es1370", - "pcspk"); + "pcspk") VIR_ENUM_IMPL(virDomainInput, VIR_DOMAIN_INPUT_TYPE_LAST, "mouse", diff --git a/src/node_device_conf.c b/src/node_device_conf.c --- a/src/node_device_conf.c +++ b/src/node_device_conf.c @@ -45,11 +45,11 @@ VIR_ENUM_IMPL(virNodeDevCap, VIR_NODE_DE "net", "scsi_host", "scsi", - "storage"); + "storage") VIR_ENUM_IMPL(virNodeDevNetCap, VIR_NODE_DEV_CAP_NET_LAST, "80203", - "80211"); + "80211") #define virNodeDeviceLog(msg...) fprintf(stderr, msg) diff --git a/src/node_device_conf.h b/src/node_device_conf.h --- a/src/node_device_conf.h +++ b/src/node_device_conf.h @@ -47,8 +47,8 @@ enum virNodeDevNetCapType { VIR_NODE_DEV_CAP_NET_LAST }; -VIR_ENUM_DECL(virNodeDevCap); -VIR_ENUM_DECL(virNodeDevNetCap); +VIR_ENUM_DECL(virNodeDevCap) +VIR_ENUM_DECL(virNodeDevNetCap) enum virNodeDevStorageCapFlags { VIR_NODE_DEV_CAP_STORAGE_REMOVABLE = (1 << 0), diff --git a/src/storage_conf.c b/src/storage_conf.c --- a/src/storage_conf.c +++ b/src/storage_conf.c @@ -49,26 +49,26 @@ VIR_ENUM_IMPL(virStoragePool, VIR_STORAGE_POOL_LAST, "dir", "fs", "netfs", "logical", "disk", "iscsi", - "scsi"); + "scsi") VIR_ENUM_IMPL(virStoragePoolFormatFileSystem, VIR_STORAGE_POOL_FS_LAST, "auto", "ext2", "ext3", "ext4", "ufs", "iso9660", "udf", - "gfs", "gfs2", "vfat", "hfs+", "xfs"); + "gfs", "gfs2", "vfat", "hfs+", "xfs") VIR_ENUM_IMPL(virStoragePoolFormatFileSystemNet, VIR_STORAGE_POOL_NETFS_LAST, - "auto", "nfs"); + "auto", "nfs") VIR_ENUM_IMPL(virStoragePoolFormatDisk, VIR_STORAGE_POOL_DISK_LAST, "unknown", "dos", "dvh", "gpt", - "mac", "bsd", "pc98", "sun", "lvm2"); + "mac", "bsd", "pc98", "sun", "lvm2") VIR_ENUM_IMPL(virStoragePoolFormatLogical, VIR_STORAGE_POOL_LOGICAL_LAST, - "unknown", "lvm2"); + "unknown", "lvm2") VIR_ENUM_IMPL(virStorageVolFormatDisk, @@ -76,13 +76,13 @@ VIR_ENUM_IMPL(virStorageVolFormatDisk, "none", "linux", "fat16", "fat32", "linux-swap", "linux-lvm", "linux-raid", - "extended"); + "extended") VIR_ENUM_IMPL(virStorageVolFormatFileSystem, VIR_STORAGE_VOL_FILE_LAST, "raw", "dir", "bochs", "cloop", "cow", "dmg", "iso", - "qcow", "qcow2", "vmdk", "vpc"); + "qcow", "qcow2", "vmdk", "vpc") typedef const char *(*virStorageVolFormatToString)(int format); diff --git a/src/storage_conf.h b/src/storage_conf.h --- a/src/storage_conf.h +++ b/src/storage_conf.h @@ -113,7 +113,7 @@ enum virStoragePoolType { VIR_STORAGE_POOL_LAST, }; -VIR_ENUM_DECL(virStoragePool); +VIR_ENUM_DECL(virStoragePool) enum virStoragePoolAuthType { @@ -342,14 +342,14 @@ enum virStoragePoolFormatFileSystem { VIR_STORAGE_POOL_FS_XFS, VIR_STORAGE_POOL_FS_LAST, }; -VIR_ENUM_DECL(virStoragePoolFormatFileSystem); +VIR_ENUM_DECL(virStoragePoolFormatFileSystem) enum virStoragePoolFormatFileSystemNet { VIR_STORAGE_POOL_NETFS_AUTO = 0, VIR_STORAGE_POOL_NETFS_NFS, VIR_STORAGE_POOL_NETFS_LAST, }; -VIR_ENUM_DECL(virStoragePoolFormatFileSystemNet); +VIR_ENUM_DECL(virStoragePoolFormatFileSystemNet) enum virStoragePoolFormatDisk { VIR_STORAGE_POOL_DISK_UNKNOWN = 0, @@ -364,14 +364,14 @@ enum virStoragePoolFormatDisk { VIR_STORAGE_POOL_DISK_LAST, }; -VIR_ENUM_DECL(virStoragePoolFormatDisk); +VIR_ENUM_DECL(virStoragePoolFormatDisk) enum virStoragePoolFormatLogical { VIR_STORAGE_POOL_LOGICAL_UNKNOWN = 0, VIR_STORAGE_POOL_LOGICAL_LVM2 = 1, VIR_STORAGE_POOL_LOGICAL_LAST, }; -VIR_ENUM_DECL(virStoragePoolFormatLogical); +VIR_ENUM_DECL(virStoragePoolFormatLogical) enum virStorageVolFormatFileSystem { @@ -388,7 +388,7 @@ enum virStorageVolFormatFileSystem { VIR_STORAGE_VOL_FILE_VPC, VIR_STORAGE_VOL_FILE_LAST, }; -VIR_ENUM_DECL(virStorageVolFormatFileSystem); +VIR_ENUM_DECL(virStorageVolFormatFileSystem) /* * XXX these are basically partition types. @@ -410,7 +410,7 @@ enum virStorageVolFormatDisk { VIR_STORAGE_VOL_DISK_EXTENDED, VIR_STORAGE_VOL_DISK_LAST, }; -VIR_ENUM_DECL(virStorageVolFormatDisk); +VIR_ENUM_DECL(virStorageVolFormatDisk)

3 2

[libvirt] [PATCH] Port library versioning to Solaris
by john.levon＠sun.com 15 Dec '08

15 Dec '08

# HG changeset patch # User john.levon(a)sun.com # Date 1229369745 28800 # Node ID ce24d41d372948cd5440cf17bdb58ce33faffa84 # Parent 9e1a44b5c166b73e36d3cffc5398af0bec39ddc7 Port library versioning to Solaris Use a more-porable comment character in the version file, and pass in the right linker options. Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in @@ -59,6 +59,11 @@ AM_PROG_LIBTOOL AM_PROG_LIBTOOL AM_PROG_CC_C_O + +VERSION_SCRIPT_FLAGS=-Wl,--version-script= +`/usr/bin/ld --help 2>&1 | grep -- --version-script >/dev/null` || \ + VERSION_SCRIPT_FLAGS="-Wl,-M -Wl," +AC_SUBST(VERSION_SCRIPT_FLAGS) LIBVIRT_COMPILE_WARNINGS([maximum]) diff --git a/src/Makefile.am b/src/Makefile.am --- a/src/Makefile.am +++ b/src/Makefile.am @@ -395,7 +395,7 @@ libvirt_la_SOURCES = libvirt_la_SOURCES = libvirt_la_LIBADD += \ @CYGWIN_EXTRA_LIBADD@ ../gnulib/lib/libgnu.la -libvirt_la_LDFLAGS = -Wl,--version-script=libvirt_sym.version \ +libvirt_la_LDFLAGS = @VERSION_SCRIPT_FLAGS@libvirt_sym.version \ -version-info @LIBVIRT_VERSION_INFO@ \ $(COVERAGE_CFLAGS:-f%=-Wc,-f%) \ $(LIBXML_LIBS) $(SELINUX_LIBS) \ diff --git a/src/libvirt_sym.version.in b/src/libvirt_sym.version.in --- a/src/libvirt_sym.version.in +++ b/src/libvirt_sym.version.in @@ -1,21 +1,21 @@ -/* - * WARNING: libvirt_sym.version.in is the master file - * - * WARNING: libvirt_sym.version is auto-generated by configure - */ - -/* - * First officially exported symbols, for which header - * file definitions are installed in /usr/include/libvirt - * either from libvirt.h and virterror.h - * - * Versions here are *fixed* to match the libvirt version - * at which the symbol was introduced. This ensures that - * a new client app requiring symbol foo() can't accidentally - * run with old libvirt.so not providing foo() - the global - * soname version info can't enforce this since we never - * change the soname - */ +# +# WARNING: libvirt_sym.version.in is the master file +# +# WARNING: libvirt_sym.version is auto-generated by configure +# + +# +# First officially exported symbols, for which header +# file definitions are installed in /usr/include/libvirt +# either from libvirt.h and virterror.h +# +# Versions here are *fixed* to match the libvirt version +# at which the symbol was introduced. This ensures that +# a new client app requiring symbol foo() can't accidentally +# run with old libvirt.so not providing foo() - the global +# soname version info can't enforce this since we never +# change the soname +#/ LIBVIRT_0.0.3 { global: virConnectClose; @@ -249,30 +249,30 @@ LIBVIRT_0.5.0 { } LIBVIRT_0.4.5; -/* .... define new API here using predicted next version number .... */ - - - - -/* - * Finally these symbols are private and semantics may change - * on every release, hence the version number is spliced in at - * build time. This ensures that if libvirtd, virsh, or a driver - * module was built against one libvirt release, it will refuse - * to load with another where symbols may have same names but - * different semantics. - * - * No header files are provided outside the source tree. - * - * Keep this section ordered alphabetically by header file name - * - * Symbols here are only for use by virsh, libvirtd and dlopen - * driver modules - */ +# .... define new API here using predicted next version number .... + + + + +# +# Finally these symbols are private and semantics may change +# on every release, hence the version number is spliced in at +# build time. This ensures that if libvirtd, virsh, or a driver +# module was built against one libvirt release, it will refuse +# to load with another where symbols may have same names but +# different semantics. +# +# No header files are provided outside the source tree. +# +# Keep this section ordered alphabetically by header file name +# +# Symbols here are only for use by virsh, libvirtd and dlopen +# driver modules +#/ LIBVIRT_PRIVATE_@VERSION@ { global: - /* bridge.h */ + # bridge.h brAddBridge; brAddInterface; brAddTap; @@ -286,7 +286,7 @@ LIBVIRT_PRIVATE_@VERSION@ { brShutdown; - /* buf.h */ + # buf.h virBufferVSprintf; virBufferAdd; virBufferAddChar; @@ -294,7 +294,7 @@ LIBVIRT_PRIVATE_@VERSION@ { virBufferError; - /* caps.h */ + # caps.h virCapabilitiesAddGuest; virCapabilitiesAddGuestDomain; virCapabilitiesAddGuestFeature; @@ -310,7 +310,7 @@ LIBVIRT_PRIVATE_@VERSION@ { virCapabilitiesSetMacPrefix; - /* conf.h */ + # conf.h virConfNew; virConfReadFile; virConfReadMem; @@ -322,7 +322,7 @@ LIBVIRT_PRIVATE_@VERSION@ { virConfWriteMem; - /* datatypes.h */ + # datatypes.h virGetDomain; virGetNetwork; virGetStoragePool; @@ -331,7 +331,7 @@ LIBVIRT_PRIVATE_@VERSION@ { virUnrefDomain; - /* domain_conf.h */ + # domain_conf.h virDiskNameToBusDeviceIndex; virDiskNameToIndex; virDomainAssignDef; @@ -375,7 +375,7 @@ LIBVIRT_PRIVATE_@VERSION@ { virDomainFSDefFree; - /* domain_event.h */ + # domain_event.h virDomainEventCallbackListAdd; virDomainEventCallbackListFree; virDomainEventCallbackListRemove; @@ -385,11 +385,11 @@ LIBVIRT_PRIVATE_@VERSION@ { virDomainEventCallbackQueuePush; - /* driver.h */ + # driver.h virDriverLoadModule; - /* event.h */ + # event.h virEventAddHandle; virEventAddTimeout; virEventRemoveHandle; @@ -398,7 +398,7 @@ LIBVIRT_PRIVATE_@VERSION@ { virEventUpdateTimeout; - /* hash.h */ + # hash.h virHashAddEntry; virHashCreate; virHashForEach; @@ -410,7 +410,7 @@ LIBVIRT_PRIVATE_@VERSION@ { virHashSize; - /* iptables.h */ + # iptables.h iptablesAddForwardAllowCross; iptablesAddForwardAllowIn; iptablesAddForwardAllowOut; @@ -435,7 +435,7 @@ LIBVIRT_PRIVATE_@VERSION@ { iptablesSaveRules; - /* libvirt_internal.h */ + # libvirt_internal.h debugFlag; virStateInitialize; virStateCleanup; @@ -455,14 +455,14 @@ LIBVIRT_PRIVATE_@VERSION@ { virRegisterDeviceMonitor; - /* memory.h */ + # memory.h virAlloc; virAllocN; virReallocN; virFree; - /* network_conf.h */ + # network_conf.h virNetworkAssignDef; virNetworkDefFormat; virNetworkDefFree; @@ -479,11 +479,11 @@ LIBVIRT_PRIVATE_@VERSION@ { virNetworkSaveConfig; - /* nodeinfo.h */ + # nodeinfo.h virNodeInfoPopulate; - /* node_device_conf.h */ + # node_device_conf.h virNodeDeviceObjRemove; virNodeDevCapTypeToString; virNodeDeviceFindByName; @@ -493,18 +493,18 @@ LIBVIRT_PRIVATE_@VERSION@ { virNodeDeviceDefFormat; - /* qparams.h */ + # qparams.h qparam_get_query; qparam_query_parse; free_qparam_set; - /* stats_linux.h */ + # stats_linux.h linuxDomainInterfaceStats; xenLinuxDomainBlockStats; - /* storage_backend.h */ + # storage_backend.h virStorageBackendForType; virStorageBackendFromString; virStorageBackendPartTableTypeFromString; @@ -517,7 +517,7 @@ LIBVIRT_PRIVATE_@VERSION@ { virStorageBackendUpdateVolInfoFD; - /* storage_conf.h */ + # storage_conf.h virStorageBackendPoolOptionsForType; virStoragePoolDefFormat; virStoragePoolDefFree; @@ -546,7 +546,7 @@ LIBVIRT_PRIVATE_@VERSION@ { virStoragePoolTypeFromString; - /* util.h */ + # util.h virFileReadAll; virStrToLong_i; virStrToLong_ll; @@ -577,26 +577,26 @@ LIBVIRT_PRIVATE_@VERSION@ { virSkipSpaces; - /* uuid.h */ + # uuid.h virUUIDFormat; virUUIDGenerate; virUUIDParse; - /* virterror_internal.h */ + # virterror_internal.h virReportErrorHelper; virErrorMsg; virRaiseError; - /* xml.h */ + # xml.h virXPathLong; virXPathNodeSet; virXPathString; virXMLPropString; - /* Finally everything else is totally private */ + # Finally everything else is totally private local: *; };

2 1

[libvirt] [PATCH] Fix __sun conditional
by john.levon＠sun.com 15 Dec '08

15 Dec '08

# HG changeset patch # User john.levon(a)sun.com # Date 1229369745 28800 # Node ID 9e1a44b5c166b73e36d3cffc5398af0bec39ddc7 # Parent 2bee618a0557131c383b124b2b88bd407b462df4 Fix __sun conditional It's __sun not __sun__. Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/src/xen_internal.c b/src/xen_internal.c --- a/src/xen_internal.c +++ b/src/xen_internal.c @@ -76,7 +76,7 @@ typedef struct v1_hypercall_struct #define XEN_V1_IOCTL_HYPERCALL_CMD \ _IOC(_IOC_NONE, 'P', 0, sizeof(v1_hypercall_t)) typedef v1_hypercall_t hypercall_t; -#elif defined(__sun__) +#elif defined(__sun) typedef privcmd_hypercall_t hypercall_t; #else #error "unsupported platform" @@ -663,7 +663,7 @@ typedef struct xen_op_v2_dom xen_op_v2_d #define XEN_HYPERVISOR_SOCKET "/proc/xen/privcmd" #define HYPERVISOR_CAPABILITIES "/sys/hypervisor/properties/capabilities" #define CPUINFO "/proc/cpuinfo" -#elif defined(__sun__) +#elif defined(__sun) #define XEN_HYPERVISOR_SOCKET "/dev/xen/privcmd" #define HYPERVISOR_CAPABILITIES "" #define CPUINFO "/dev/cpu/self/cpuid" @@ -1906,7 +1906,7 @@ xenHypervisorInit(void) goto detect_v2; } -#ifndef __sun__ +#ifndef __sun /* * check if the old hypercall are actually working */ diff --git a/src/xen_unified.c b/src/xen_unified.c --- a/src/xen_unified.c +++ b/src/xen_unified.c @@ -213,7 +213,7 @@ xenUnifiedProbe (void) if (virFileExists("/proc/xen")) return 1; #endif -#ifdef __sun__ +#ifdef __sun FILE *fh; if (fh = fopen("/dev/xen/domcaps", "r")) { diff --git a/src/xs_internal.c b/src/xs_internal.c --- a/src/xs_internal.c +++ b/src/xs_internal.c @@ -39,7 +39,7 @@ #ifdef __linux__ #define XEN_HYPERVISOR_SOCKET "/proc/xen/privcmd" -#elif defined(__sun__) +#elif defined(__sun) #define XEN_HYPERVISOR_SOCKET "/dev/xen/privcmd" #else #error "unsupported platform"

2 1

[libvirt] [PATCH] Fix statement not reached compiler error
by john.levon＠sun.com 15 Dec '08

15 Dec '08

# HG changeset patch # User john.levon(a)sun.com # Date 1229369745 28800 # Node ID 2bee618a0557131c383b124b2b88bd407b462df4 # Parent 16ceb6f2e00c4639e97440723e57ec0be6d12cd9 Fix statement not reached compiler error Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/src/remote_internal.c b/src/remote_internal.c --- a/src/remote_internal.c +++ b/src/remote_internal.c @@ -5091,25 +5091,23 @@ really_read_buf (virConnectPtr conn, str return -1; } return err; - } else { - reread: - err = recv (priv->sock, bytes, len, 0); - if (err == -1) { - if (errno == EINTR) - goto reread; - error (in_open ? NULL : conn, - VIR_ERR_SYSTEM_ERROR, strerror (errno)); - return -1; - } - if (err == 0) { - error (in_open ? NULL : conn, - VIR_ERR_RPC, _("socket closed unexpectedly")); - return -1; - } - return err; - } - - return 0; + } + +reread: + err = recv (priv->sock, bytes, len, 0); + if (err == -1) { + if (errno == EINTR) + goto reread; + error (in_open ? NULL : conn, + VIR_ERR_SYSTEM_ERROR, strerror (errno)); + return -1; + } + if (err == 0) { + error (in_open ? NULL : conn, + VIR_ERR_RPC, _("socket closed unexpectedly")); + return -1; + } + return err; } static int

2 1

[libvirt] [PATCH] Fix initialization mismatch
by john.levon＠sun.com 15 Dec '08

15 Dec '08

# HG changeset patch # User john.levon(a)sun.com # Date 1229369743 28800 # Node ID 16ceb6f2e00c4639e97440723e57ec0be6d12cd9 # Parent ead0d1c1d3adacf478db05ee8d6abe270c96c5da Fix initialization mismatch Make driver open routines correctly declare their return type. Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/src/proxy_internal.c b/src/proxy_internal.c --- a/src/proxy_internal.c +++ b/src/proxy_internal.c @@ -36,7 +36,7 @@ static int debug = 0; static int debug = 0; static int xenProxyClose(virConnectPtr conn); -static int xenProxyOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags); +static virDrvOpenStatus xenProxyOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags); static int xenProxyGetVersion(virConnectPtr conn, unsigned long *hvVer); static int xenProxyNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info); static char *xenProxyGetCapabilities(virConnectPtr conn); @@ -477,7 +477,7 @@ retry: * * Returns 0 in case of success, and -1 in case of failure */ -int +virDrvOpenStatus xenProxyOpen(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED, int flags) diff --git a/src/remote_internal.c b/src/remote_internal.c --- a/src/remote_internal.c +++ b/src/remote_internal.c @@ -851,7 +851,7 @@ doRemoteOpen (virConnectPtr conn, goto cleanup; } -static int +static virDrvOpenStatus remoteOpen (virConnectPtr conn, virConnectAuthPtr auth, int flags) @@ -2633,7 +2633,7 @@ remoteDomainMemoryPeek (virDomainPtr dom /*----------------------------------------------------------------------*/ -static int +static virDrvOpenStatus remoteNetworkOpen (virConnectPtr conn, virConnectAuthPtr auth, int flags) @@ -3033,7 +3033,7 @@ remoteNetworkSetAutostart (virNetworkPtr /*----------------------------------------------------------------------*/ -static int +static virDrvOpenStatus remoteStorageOpen (virConnectPtr conn, virConnectAuthPtr auth, int flags) diff --git a/src/test.c b/src/test.c --- a/src/test.c +++ b/src/test.c @@ -634,7 +634,7 @@ static int testOpenFromFile(virConnectPt } -static int testOpen(virConnectPtr conn, +static virDrvOpenStatus testOpen(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED, int flags ATTRIBUTE_UNUSED) { diff --git a/src/xen_inotify.c b/src/xen_inotify.c --- a/src/xen_inotify.c +++ b/src/xen_inotify.c @@ -347,7 +347,7 @@ reread: * * Returns 0 or -1 in case of error. */ -int +virDrvOpenStatus xenInotifyOpen(virConnectPtr conn ATTRIBUTE_UNUSED, virConnectAuthPtr auth ATTRIBUTE_UNUSED, int flags ATTRIBUTE_UNUSED) diff --git a/src/xen_inotify.h b/src/xen_inotify.h --- a/src/xen_inotify.h +++ b/src/xen_inotify.h @@ -21,10 +21,13 @@ */ #ifndef __VIR_XEN_INOTIFY_H__ #define __VIR_XEN_INOTIFY_H__ + #include "internal.h" +#include "driver.h" + extern struct xenUnifiedDriver xenInotifyDriver; -int xenInotifyOpen (virConnectPtr conn, +virDrvOpenStatus xenInotifyOpen (virConnectPtr conn, virConnectAuthPtr auth, int flags); int xenInotifyClose (virConnectPtr conn); diff --git a/src/xen_internal.c b/src/xen_internal.c --- a/src/xen_internal.c +++ b/src/xen_internal.c @@ -2031,7 +2031,7 @@ xenHypervisorInit(void) * * Returns 0 or -1 in case of error. */ -int +virDrvOpenStatus xenHypervisorOpen(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED, int flags ATTRIBUTE_UNUSED) diff --git a/src/xen_internal.h b/src/xen_internal.h --- a/src/xen_internal.h +++ b/src/xen_internal.h @@ -15,6 +15,7 @@ #include "internal.h" #include "capabilities.h" +#include "driver.h" extern struct xenUnifiedDriver xenHypervisorDriver; int xenHypervisorInit (void); @@ -32,7 +33,8 @@ char * char * xenHypervisorDomainGetOSType (virDomainPtr dom); -int xenHypervisorOpen (virConnectPtr conn, +virDrvOpenStatus + xenHypervisorOpen (virConnectPtr conn, virConnectAuthPtr auth, int flags); int xenHypervisorClose (virConnectPtr conn); diff --git a/src/xen_unified.c b/src/xen_unified.c --- a/src/xen_unified.c +++ b/src/xen_unified.c @@ -224,7 +224,7 @@ xenUnifiedProbe (void) return 0; } -static int +static virDrvOpenStatus xenUnifiedOpen (virConnectPtr conn, virConnectAuthPtr auth, int flags) { int i, ret = VIR_DRV_OPEN_DECLINED; diff --git a/src/xend_internal.c b/src/xend_internal.c --- a/src/xend_internal.c +++ b/src/xend_internal.c @@ -2704,7 +2704,7 @@ error: * * Returns 0 in case of success, -1 in case of error. */ -int +virDrvOpenStatus xenDaemonOpen(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED, int flags ATTRIBUTE_UNUSED) diff --git a/src/xend_internal.h b/src/xend_internal.h --- a/src/xend_internal.h +++ b/src/xend_internal.h @@ -24,6 +24,7 @@ #include "internal.h" #include "capabilities.h" #include "domain_conf.h" +#include "driver.h" #include "buf.h" int @@ -129,7 +130,7 @@ xenDaemonFormatSxpr(virConnectPtr conn, /* refactored ones */ -int xenDaemonOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags); +virDrvOpenStatus xenDaemonOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags); int xenDaemonClose(virConnectPtr conn); int xenDaemonGetVersion(virConnectPtr conn, unsigned long *hvVer); int xenDaemonNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info); diff --git a/src/xm_internal.c b/src/xm_internal.c --- a/src/xm_internal.c +++ b/src/xm_internal.c @@ -581,7 +581,7 @@ int xenXMConfigCacheRefresh (virConnectP * We only support a single directory, so repeated calls * to open all end up using the same cache of files */ -int +virDrvOpenStatus xenXMOpen (virConnectPtr conn ATTRIBUTE_UNUSED, virConnectAuthPtr auth ATTRIBUTE_UNUSED, int flags ATTRIBUTE_UNUSED) diff --git a/src/xm_internal.h b/src/xm_internal.h --- a/src/xm_internal.h +++ b/src/xm_internal.h @@ -26,6 +26,7 @@ #define _LIBVIRT_XM_INTERNAL_H_ #include "internal.h" +#include "driver.h" #include "conf.h" #include "domain_conf.h" @@ -38,7 +39,7 @@ int xenXMConfigCacheAddFile(virConnectPt int xenXMConfigCacheAddFile(virConnectPtr conn, const char *filename); int xenXMConfigCacheRemoveFile(virConnectPtr conn, const char *filename); -int xenXMOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags); +virDrvOpenStatus xenXMOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags); int xenXMClose(virConnectPtr conn); const char *xenXMGetType(virConnectPtr conn); int xenXMDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info); diff --git a/src/xs_internal.c b/src/xs_internal.c --- a/src/xs_internal.c +++ b/src/xs_internal.c @@ -281,7 +281,7 @@ virDomainGetVMInfo(virDomainPtr domain, * * Returns 0 or -1 in case of error. */ -int +virDrvOpenStatus xenStoreOpen(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED, int flags ATTRIBUTE_UNUSED) diff --git a/src/xs_internal.h b/src/xs_internal.h --- a/src/xs_internal.h +++ b/src/xs_internal.h @@ -12,11 +12,12 @@ #define __VIR_XS_INTERNAL_H__ #include "internal.h" +#include "driver.h" extern struct xenUnifiedDriver xenStoreDriver; int xenStoreInit (void); -int xenStoreOpen (virConnectPtr conn, +virDrvOpenStatus xenStoreOpen (virConnectPtr conn, virConnectAuthPtr auth, int flags); int xenStoreClose (virConnectPtr conn);

2 1

[libvirt] [PATCH] Cast callbacks to the correct type
by john.levon＠sun.com 15 Dec '08

15 Dec '08

# HG changeset patch # User john.levon(a)sun.com # Date 1229367890 28800 # Node ID 728f90c86f2cd950463923c80fc57754d6e762eb # Parent 6a8e82d7d2e166880fed8d7ad860a3e2e93d62be Cast callbacks to the correct type Avoid compiler warnings by performing the correct casts. Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/src/libvirt.c b/src/libvirt.c --- a/src/libvirt.c +++ b/src/libvirt.c @@ -5806,7 +5806,8 @@ virConnectDomainEventRegister(virConnect } if ((conn->driver) && (conn->driver->domainEventRegister)) - return conn->driver->domainEventRegister (conn, cb, opaque, freecb); + return conn->driver->domainEventRegister (conn, (void *)cb, + opaque, freecb); return -1; } @@ -5835,9 +5836,9 @@ virConnectDomainEventDeregister(virConne return (-1); } if ((conn->driver) && (conn->driver->domainEventDeregister)) - return conn->driver->domainEventDeregister (conn, cb); - - return -1; -} - - + return conn->driver->domainEventDeregister (conn, (void *)cb); + + return -1; +} + + diff --git a/src/remote_internal.c b/src/remote_internal.c --- a/src/remote_internal.c +++ b/src/remote_internal.c @@ -4735,7 +4735,7 @@ static int remoteDomainEventRegister (vi return -1; } if (virDomainEventCallbackListAdd(conn, priv->callbackList, - callback, opaque, freecb) < 0) { + (virConnectDomainEventCallback)callback, opaque, freecb) < 0) { error (conn, VIR_ERR_RPC, _("adding cb to list")); return -1; } @@ -4757,7 +4757,7 @@ static int remoteDomainEventDeregister ( struct private_data *priv = conn->privateData; if (virDomainEventCallbackListRemove(conn, priv->callbackList, - callback) < 0) { + (virConnectDomainEventCallback)callback) < 0) { error (conn, VIR_ERR_RPC, _("removing cb fron list")); return -1; } diff --git a/src/xen_unified.c b/src/xen_unified.c --- a/src/xen_unified.c +++ b/src/xen_unified.c @@ -1372,7 +1372,7 @@ xenUnifiedDomainEventRegister (virConnec conn->refs++; return virDomainEventCallbackListAdd(conn, priv->domainEventCallbacks, - callback, opaque, freefunc); + (virConnectDomainEventCallback)callback, opaque, freefunc); } static int @@ -1387,7 +1387,7 @@ xenUnifiedDomainEventDeregister (virConn } ret = virDomainEventCallbackListRemove(conn, priv->domainEventCallbacks, - callback); + (virConnectDomainEventCallback)callback); virUnrefConnect(conn); return ret; }

2 1

[libvirt] [PATCH] Remove _PATH_DEVNULL usage
by john.levon＠sun.com 15 Dec '08

15 Dec '08

# HG changeset patch # User john.levon(a)sun.com # Date 1229367890 28800 # Node ID c324c231c6a50be9f970f0f6c6d1629a7c09ab3b # Parent 63174fd9f33749cb68431fd5d1ff6133ba48863b Remove _PATH_DEVNULL usage _PATH_DEVNULL provides no apparent advantage, and isn't available on Solaris: replace with the string literal. Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/qemud/qemud.c b/qemud/qemud.c --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -397,9 +397,9 @@ static int qemudGoDaemon(void) { int stdoutfd = -1; int nextpid; - if ((stdinfd = open(_PATH_DEVNULL, O_RDONLY)) < 0) + if ((stdinfd = open("/dev/null", O_RDONLY)) < 0) goto cleanup; - if ((stdoutfd = open(_PATH_DEVNULL, O_WRONLY)) < 0) + if ((stdoutfd = open("/dev/null", O_WRONLY)) < 0) goto cleanup; if (dup2(stdinfd, STDIN_FILENO) != STDIN_FILENO) goto cleanup; diff --git a/src/util.c b/src/util.c --- a/src/util.c +++ b/src/util.c @@ -205,10 +205,10 @@ __virExec(virConnectPtr conn, return -1; } - if ((null = open(_PATH_DEVNULL, O_RDONLY)) < 0) { + if ((null = open("/dev/null", O_RDONLY)) < 0) { ReportError(conn, VIR_ERR_INTERNAL_ERROR, _("cannot open %s: %s"), - _PATH_DEVNULL, strerror(errno)); + "/dev/null", strerror(errno)); goto cleanup; } diff --git a/tests/testutils.c b/tests/testutils.c --- a/tests/testutils.c +++ b/tests/testutils.c @@ -35,10 +35,6 @@ #ifdef HAVE_PATHS_H #include <paths.h> -#endif - -#ifndef _PATH_DEVNULL -#define _PATH_DEVNULL "/dev/null" #endif #define GETTIMEOFDAY(T) gettimeofday(T, NULL) @@ -157,9 +153,9 @@ void virtTestCaptureProgramExecChild(con NULL }; - if ((stdinfd = open(_PATH_DEVNULL, O_RDONLY)) < 0) - goto cleanup; - if ((stderrfd = open(_PATH_DEVNULL, O_WRONLY)) < 0) + if ((stdinfd = open("/dev/null", O_RDONLY)) < 0) + goto cleanup; + if ((stderrfd = open("/dev/null", O_WRONLY)) < 0) goto cleanup; open_max = sysconf (_SC_OPEN_MAX);

2 1

[libvirt] [PATCH] Remove non-existent symbols from the version script
by john.levon＠sun.com 15 Dec '08

15 Dec '08

# HG changeset patch # User john.levon(a)sun.com # Date 1229369745 28800 # Node ID d3e5c2e138bd794ab711cc2548c45112ba603ea2 # Parent 56d77e29bf90057791feebfa47506fc0933cd690 Remove non-existent symbols from the version script The Solaris linker rightfully complains if a non-existent symbol is referenced. Since these symbols don't exist in the current source, they can have no purpose in a version script, so remove them. Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/src/libvirt_sym.version.in b/src/libvirt_sym.version.in --- a/src/libvirt_sym.version.in +++ b/src/libvirt_sym.version.in @@ -62,7 +62,6 @@ LIBVIRT_0.1.0 { virCopyLastError; virConnSetErrorFunc; virResetLastError; - virErrorFunc; virResetError; virConnGetLastError; virGetLastError; @@ -199,8 +198,6 @@ LIBVIRT_0.4.1 { virStoragePoolNumOfVolumes; virStoragePoolListVolumes; - virConnectNumOfStorageVolumes; - virConnectListStorageVolumes; virStorageVolGetConnect; virStorageVolLookupByName; virStorageVolLookupByKey; @@ -235,13 +232,9 @@ LIBVIRT_0.5.0 { virNodeNumOfDevices; virNodeListDevices; - virNodeNumOfDevicesByCap; - virNodeListDevicesByCap; virNodeDeviceLookupByName; virNodeDeviceFree; virNodeDeviceGetXMLDesc; - virNodeDeviceCreate; - virNodeDeviceDestroy; virNodeDeviceGetName; virNodeDeviceGetParent; virNodeDeviceNumOfCaps; @@ -441,7 +434,6 @@ LIBVIRT_PRIVATE_@VERSION@ { virStateCleanup; virStateReload; virStateActive; - virStateSigDispatcher; virDrvSupportsFeature; virDomainMigratePrepare; virDomainMigratePerform; @@ -506,10 +498,6 @@ LIBVIRT_PRIVATE_@VERSION@ { # storage_backend.h virStorageBackendForType; - virStorageBackendFromString; - virStorageBackendPartTableTypeFromString; - virStorageBackendPartTableTypeToString; - virStorageBackendRegister; virStorageBackendRunProgNul; virStorageBackendRunProgRegex; virStorageBackendStablePath; @@ -518,7 +506,6 @@ LIBVIRT_PRIVATE_@VERSION@ { # storage_conf.h - virStorageBackendPoolOptionsForType; virStoragePoolDefFormat; virStoragePoolDefFree; virStoragePoolDefParse;

2 1

[libvirt] [PATCH] Fix crash in storageVolumeCreateXML
by Miloslav Trmač 15 Dec '08

15 Dec '08

Hello, storageVolumeCreateXML() recently started unconditionally accessing vol->name with vol == NULL. The attached patch fixes that. Mirek

2 1

[libvirt] virsh save produces "unknown migration protocol: stdio"
by Richard W.M. Jones 15 Dec '08

15 Dec '08

I just want to forward this comment on from #virt so that we don't lose it. It appears to be an incompatibility between libvirt 0.5.0 and recent KVM. <knowinters> Hi, I'm using libvirt 0.5.0 with kvm-79, when I do virsh save kvm replies with "unknown migration protocol: stdio". A state file is created, but it's only 4K and when restored the vm boots from scratch instead of starting where it was when i saved. I googled but couldn't find a resolution. Is this a known issue? <knowinters> nm i think i see what's happening.. it <knowinters> 's using the exec: migration method to call dd to move the state from stdio to a file <knowinters> exec: isn't in kvm-79 i don't think, but i see it in git so ill try that Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones Read my OCaml programming blog: http://camltastic.blogspot.com/ Fedora now supports 68 OCaml packages (the OPEN alternative to F#) http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora

2 1

[libvirt] PATCH: Fix deadlock upon config file reload
by Daniel P. Berrange 15 Dec '08

15 Dec '08

Turned out there was a small locking bug when reloading domain config files after SIGHUP. I committed the following patch to add in the missing unlock call. This was one of the files I'm unable to do static analysis on, hence why it was missed. Daniel Index: domain_conf.c =================================================================== RCS file: /data/cvs/libvirt/src/domain_conf.c,v retrieving revision 1.45 diff -u -p -r1.45 domain_conf.c --- domain_conf.c 11 Dec 2008 11:44:30 -0000 1.45 +++ domain_conf.c 15 Dec 2008 10:51:11 -0000 @@ -3330,8 +3330,11 @@ virDomainObjPtr virDomainLoadConfig(virC VIR_DOMAIN_XML_INACTIVE))) goto error; - if (virDomainFindByName(doms, def->name)) + if ((dom = virDomainFindByName(doms, def->name))) { + virDomainObjUnlock(dom); + dom = NULL; newVM = 0; + } if (!(dom = virDomainAssignDef(conn, doms, def))) goto error; -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

1 0

[libvirt] [PATCH] remove redundant optname arguments
by Jim Meyering 15 Dec '08

15 Dec '08

>From a5c76721c22cf51b47059a91317f87a9f47c6868 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 9 Dec 2008 22:22:08 +0100 Subject: [PATCH] remove redundant optname arguments This is the second part of the change mentioned here: http://thread.gmane.org/gmane.comp.emulators.libvirt/10331 It removes the essentially redundant "optname" parameter from each of the vshCommandOptNetworkBy and vshCommandOptDomainBy functions as well as the correspond macros (without "By" suffix). Now, instead of always passing the optname, "domain", to vshCommandOptDomainBy, that function requires that its command argument refer to an opts array containing a "domain" option. This normalization makes one more help-related change: it renames the net-start "name" argument to the more sensible and consistent "network". * src/virsh.c (VSH_BYNAME, vshCommandOptDomain) (cmd_has_option): New function, used in vshCommandOptDomainBy and vshCommandOptNetworkBy. (vshCommandOptDomainBy, vshCommandOptNetworkBy): Remove the optname parameter, it's always "domain" ("network"). Update all callers. Call cmd_has_option. (vshCommandOptNetwork, cmdAutostart, cmdConsole, cmdDomstate) (cmdDomblkstat, cmdDomIfstat, cmdSuspend, cmdUndefine, cmdStart) (cmdSave, cmdSchedinfo, cmdDump, cmdResume, cmdShutdown) (cmdReboot, cmdDestroy, cmdDominfo, cmdVcpuinfo, cmdVcpupin) (cmdSetvcpus, cmdSetmem, cmdSetmaxmem, cmdDumpXML, cmdDomname) (cmdDomid, cmdDomuuid, cmdMigrate, cmdNetworkAutostart) (cmdNetworkDestroy, cmdNetworkDumpXML, cmdNetworkName) (opts_network_start, cmdNetworkStart, cmdNetworkUndefine) (cmdNetworkUuid, cmdVNCDisplay, cmdTTYConsole, cmdAttachDevice) (cmdDetachDevice, cmdAttachInterface, cmdDetachInterface) (cmdAttachDisk, cmdDetachDisk, cmdEdit) * src/Makefile.am (virsh-pool-edit.c): This code is generated from cmdEdit, and cmdEdit uses the vshCommandOptDomain macro which now, with the changes above, has only 3 (was 4) arguments, yet the macro use is mapped to vshCommandOptPool, which still requires 4 arguments. So this change adjusts the sed code to reinsert the just-removed argument -- we're not changing pool-related code right now, because it's not as straight-forward. --- src/Makefile.am | 1 + src/virsh.c | 132 +++++++++++++++++++++++++++++++++---------------------- 2 files changed, 81 insertions(+), 52 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index c32a1d4..2053528 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -461,6 +461,7 @@ virsh-pool-edit.c: virsh.c Makefile.am | sed -e 's/domain/pool/g' \ -e 's/vshCommandOptDomain/vshCommandOptPool/g' \ -e 's/Domain %s/Pool %s/g' \ + -e 's/(ctl, cmd, NULL);/(ctl, cmd, "pool", NULL);/' \ -e 's/Domain/StoragePool/g' \ -e 's/cmdEdit/cmdPoolEdit/g' \ -e 's/$virStoragePoolDefineXML.*$);/\1, 0);/' \ diff --git a/src/virsh.c b/src/virsh.c index f4a57f4..7828272 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -246,19 +246,18 @@ static int vshCommandOptBool(const vshCmd *cmd, const char *name); #define VSH_BYNAME (1 << 3) static virDomainPtr vshCommandOptDomainBy(vshControl *ctl, const vshCmd *cmd, - const char *optname, char **name, int flag); + char **name, int flag); /* default is lookup by Id, Name and UUID */ -#define vshCommandOptDomain(_ctl, _cmd, _optname, _name) \ - vshCommandOptDomainBy(_ctl, _cmd, _optname, _name, \ - VSH_BYID|VSH_BYUUID|VSH_BYNAME) +#define vshCommandOptDomain(_ctl, _cmd, _name) \ + vshCommandOptDomainBy(_ctl, _cmd, _name, VSH_BYID|VSH_BYUUID|VSH_BYNAME) static virNetworkPtr vshCommandOptNetworkBy(vshControl *ctl, const vshCmd *cmd, - const char *optname, char **name, int flag); + char **name, int flag); /* default is lookup by Name and UUID */ -#define vshCommandOptNetwork(_ctl, _cmd, _optname, _name) \ - vshCommandOptNetworkBy(_ctl, _cmd, _optname, _name, \ +#define vshCommandOptNetwork(_ctl, _cmd, _name) \ + vshCommandOptNetworkBy(_ctl, _cmd, _name, \ VSH_BYUUID|VSH_BYNAME) static virStoragePoolPtr vshCommandOptPoolBy(vshControl *ctl, const vshCmd *cmd, @@ -386,7 +385,7 @@ cmdAutostart(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; - if (!(dom = vshCommandOptDomain(ctl, cmd, "domain", &name))) + if (!(dom = vshCommandOptDomain(ctl, cmd, &name))) return FALSE; autostart = !vshCommandOptBool(cmd, "disable"); @@ -488,7 +487,7 @@ cmdConsole(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; - if (!(dom = vshCommandOptDomain(ctl, cmd, "domain", NULL))) + if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return FALSE; doc = virDomainGetXMLDesc(dom, 0); @@ -675,7 +674,7 @@ cmdDomstate(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; - if (!(dom = vshCommandOptDomain(ctl, cmd, "domain", NULL))) + if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return FALSE; if (virDomainGetInfo(dom, &info) == 0) @@ -712,7 +711,7 @@ cmdDomblkstat (vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability (ctl, ctl->conn, TRUE)) return FALSE; - if (!(dom = vshCommandOptDomain (ctl, cmd, "domain", &name))) + if (!(dom = vshCommandOptDomain (ctl, cmd, &name))) return FALSE; if (!(device = vshCommandOptString (cmd, "device", NULL))) @@ -768,7 +767,7 @@ cmdDomIfstat (vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability (ctl, ctl->conn, TRUE)) return FALSE; - if (!(dom = vshCommandOptDomain (ctl, cmd, "domain", &name))) + if (!(dom = vshCommandOptDomain (ctl, cmd, &name))) return FALSE; if (!(device = vshCommandOptString (cmd, "interface", NULL))) @@ -833,7 +832,7 @@ cmdSuspend(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; - if (!(dom = vshCommandOptDomain(ctl, cmd, "domain", &name))) + if (!(dom = vshCommandOptDomain(ctl, cmd, &name))) return FALSE; if (virDomainSuspend(dom) == 0) { @@ -979,7 +978,7 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) virDomainFree(dom); return FALSE; } - if (!(dom = vshCommandOptDomainBy(ctl, cmd, "domain", &name, + if (!(dom = vshCommandOptDomainBy(ctl, cmd, &name, VSH_BYNAME|VSH_BYUUID))) return FALSE; @@ -1018,7 +1017,7 @@ cmdStart(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; - if (!(dom = vshCommandOptDomainBy(ctl, cmd, "domain", NULL, VSH_BYNAME))) + if (!(dom = vshCommandOptDomainBy(ctl, cmd, NULL, VSH_BYNAME))) return FALSE; if (virDomainGetID(dom) != (unsigned int)-1) { @@ -1068,7 +1067,7 @@ cmdSave(vshControl *ctl, const vshCmd *cmd) if (!(to = vshCommandOptString(cmd, "file", NULL))) return FALSE; - if (!(dom = vshCommandOptDomain(ctl, cmd, "domain", &name))) + if (!(dom = vshCommandOptDomain(ctl, cmd, &name))) return FALSE; if (virDomainSave(dom, to) == 0) { @@ -1124,7 +1123,7 @@ cmdSchedinfo(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; - if (!(dom = vshCommandOptDomain(ctl, cmd, "domain", NULL))) + if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return FALSE; /* Deprecated Xen-only options */ @@ -1330,7 +1329,7 @@ cmdDump(vshControl *ctl, const vshCmd *cmd) if (!(to = vshCommandOptString(cmd, "file", NULL))) return FALSE; - if (!(dom = vshCommandOptDomain(ctl, cmd, "domain", &name))) + if (!(dom = vshCommandOptDomain(ctl, cmd, &name))) return FALSE; if (virDomainCoreDump(dom, to, 0) == 0) { @@ -1369,7 +1368,7 @@ cmdResume(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; - if (!(dom = vshCommandOptDomain(ctl, cmd, "domain", &name))) + if (!(dom = vshCommandOptDomain(ctl, cmd, &name))) return FALSE; if (virDomainResume(dom) == 0) { @@ -1407,7 +1406,7 @@ cmdShutdown(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; - if (!(dom = vshCommandOptDomain(ctl, cmd, "domain", &name))) + if (!(dom = vshCommandOptDomain(ctl, cmd, &name))) return FALSE; if (virDomainShutdown(dom) == 0) { @@ -1445,7 +1444,7 @@ cmdReboot(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; - if (!(dom = vshCommandOptDomain(ctl, cmd, "domain", &name))) + if (!(dom = vshCommandOptDomain(ctl, cmd, &name))) return FALSE; if (virDomainReboot(dom, 0) == 0) { @@ -1483,7 +1482,7 @@ cmdDestroy(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; - if (!(dom = vshCommandOptDomain(ctl, cmd, "domain", &name))) + if (!(dom = vshCommandOptDomain(ctl, cmd, &name))) return FALSE; if (virDomainDestroy(dom) == 0) { @@ -1523,7 +1522,7 @@ cmdDominfo(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; - if (!(dom = vshCommandOptDomain(ctl, cmd, "domain", NULL))) + if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return FALSE; id = virDomainGetID(dom); @@ -1648,7 +1647,7 @@ cmdVcpuinfo(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; - if (!(dom = vshCommandOptDomain(ctl, cmd, "domain", NULL))) + if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return FALSE; if (virNodeGetInfo(ctl->conn, &nodeinfo) != 0) { @@ -1739,7 +1738,7 @@ cmdVcpupin(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; - if (!(dom = vshCommandOptDomain(ctl, cmd, "domain", NULL))) + if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return FALSE; vcpu = vshCommandOptInt(cmd, "vcpu", &vcpufound); @@ -1864,7 +1863,7 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; - if (!(dom = vshCommandOptDomain(ctl, cmd, "domain", NULL))) + if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return FALSE; count = vshCommandOptInt(cmd, "count", &count); @@ -1920,7 +1919,7 @@ cmdSetmem(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; - if (!(dom = vshCommandOptDomain(ctl, cmd, "domain", NULL))) + if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return FALSE; kilobytes = vshCommandOptInt(cmd, "kilobytes", &kilobytes); @@ -1976,7 +1975,7 @@ cmdSetmaxmem(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; - if (!(dom = vshCommandOptDomain(ctl, cmd, "domain", NULL))) + if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return FALSE; kilobytes = vshCommandOptInt(cmd, "kilobytes", &kilobytes); @@ -2093,7 +2092,7 @@ cmdDumpXML(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; - if (!(dom = vshCommandOptDomain(ctl, cmd, "domain", NULL))) + if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return FALSE; dump = virDomainGetXMLDesc(dom, 0); @@ -2129,7 +2128,7 @@ cmdDomname(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; - if (!(dom = vshCommandOptDomainBy(ctl, cmd, "domain", NULL, + if (!(dom = vshCommandOptDomainBy(ctl, cmd, NULL, VSH_BYID|VSH_BYUUID))) return FALSE; @@ -2160,7 +2159,7 @@ cmdDomid(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; - if (!(dom = vshCommandOptDomainBy(ctl, cmd, "domain", NULL, + if (!(dom = vshCommandOptDomainBy(ctl, cmd, NULL, VSH_BYNAME|VSH_BYUUID))) return FALSE; @@ -2195,7 +2194,7 @@ cmdDomuuid(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; - if (!(dom = vshCommandOptDomainBy(ctl, cmd, "domain", NULL, + if (!(dom = vshCommandOptDomainBy(ctl, cmd, NULL, VSH_BYNAME|VSH_BYID))) return FALSE; @@ -2240,7 +2239,7 @@ cmdMigrate (vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability (ctl, ctl->conn, TRUE)) return FALSE; - if (!(dom = vshCommandOptDomain (ctl, cmd, "domain", NULL))) + if (!(dom = vshCommandOptDomain (ctl, cmd, NULL))) return FALSE; desturi = vshCommandOptString (cmd, "desturi", &found); @@ -2301,7 +2300,7 @@ cmdNetworkAutostart(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; - if (!(network = vshCommandOptNetwork(ctl, cmd, "network", &name))) + if (!(network = vshCommandOptNetwork(ctl, cmd, &name))) return FALSE; autostart = !vshCommandOptBool(cmd, "disable"); @@ -2443,7 +2442,7 @@ cmdNetworkDestroy(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; - if (!(network = vshCommandOptNetwork(ctl, cmd, "network", &name))) + if (!(network = vshCommandOptNetwork(ctl, cmd, &name))) return FALSE; if (virNetworkDestroy(network) == 0) { @@ -2482,7 +2481,7 @@ cmdNetworkDumpXML(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; - if (!(network = vshCommandOptNetwork(ctl, cmd, "network", NULL))) + if (!(network = vshCommandOptNetwork(ctl, cmd, NULL))) return FALSE; dump = virNetworkGetXMLDesc(network, 0); @@ -2642,7 +2641,7 @@ cmdNetworkName(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; - if (!(network = vshCommandOptNetworkBy(ctl, cmd, "network", NULL, + if (!(network = vshCommandOptNetworkBy(ctl, cmd, NULL, VSH_BYUUID))) return FALSE; @@ -2662,7 +2661,7 @@ static const vshCmdInfo info_network_start[] = { }; static const vshCmdOptDef opts_network_start[] = { - {"name", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("name of the inactive network")}, + {"network", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("name of the inactive network")}, {NULL, 0, 0, NULL} }; @@ -2675,7 +2674,7 @@ cmdNetworkStart(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; - if (!(network = vshCommandOptNetworkBy(ctl, cmd, "name", NULL, VSH_BYNAME))) + if (!(network = vshCommandOptNetworkBy(ctl, cmd, NULL, VSH_BYNAME))) return FALSE; if (virNetworkCreate(network) == 0) { @@ -2714,7 +2713,7 @@ cmdNetworkUndefine(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; - if (!(network = vshCommandOptNetwork(ctl, cmd, "network", &name))) + if (!(network = vshCommandOptNetwork(ctl, cmd, &name))) return FALSE; if (virNetworkUndefine(network) == 0) { @@ -2751,7 +2750,7 @@ cmdNetworkUuid(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; - if (!(network = vshCommandOptNetworkBy(ctl, cmd, "network", NULL, + if (!(network = vshCommandOptNetworkBy(ctl, cmd, NULL, VSH_BYNAME))) return FALSE; @@ -4527,7 +4526,7 @@ cmdVNCDisplay(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; - if (!(dom = vshCommandOptDomain(ctl, cmd, "domain", NULL))) + if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return FALSE; doc = virDomainGetXMLDesc(dom, 0); @@ -4601,7 +4600,7 @@ cmdTTYConsole(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; - if (!(dom = vshCommandOptDomain(ctl, cmd, "domain", NULL))) + if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return FALSE; doc = virDomainGetXMLDesc(dom, 0); @@ -4661,7 +4660,7 @@ cmdAttachDevice(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; - if (!(dom = vshCommandOptDomain(ctl, cmd, "domain", NULL))) + if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return FALSE; from = vshCommandOptString(cmd, "file", &found); @@ -4719,7 +4718,7 @@ cmdDetachDevice(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; - if (!(dom = vshCommandOptDomain(ctl, cmd, "domain", NULL))) + if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return FALSE; from = vshCommandOptString(cmd, "file", &found); @@ -4780,7 +4779,7 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) goto cleanup; - if (!(dom = vshCommandOptDomain(ctl, cmd, "domain", NULL))) + if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) goto cleanup; if (!(type = vshCommandOptString(cmd, "type", NULL))) @@ -4899,7 +4898,7 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) goto cleanup; - if (!(dom = vshCommandOptDomain(ctl, cmd, "domain", NULL))) + if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) goto cleanup; if (!(type = vshCommandOptString(cmd, "type", NULL))) @@ -5017,7 +5016,7 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) goto cleanup; - if (!(dom = vshCommandOptDomain(ctl, cmd, "domain", NULL))) + if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) goto cleanup; if (!(source = vshCommandOptString(cmd, "source", NULL))) @@ -5181,7 +5180,7 @@ cmdDetachDisk(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) goto cleanup; - if (!(dom = vshCommandOptDomain(ctl, cmd, "domain", NULL))) + if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) goto cleanup; if (!(target = vshCommandOptString(cmd, "target", NULL))) @@ -5410,7 +5409,7 @@ cmdEdit (vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) goto cleanup; - dom = vshCommandOptDomain (ctl, cmd, "domain", NULL); + dom = vshCommandOptDomain (ctl, cmd, NULL); if (dom == NULL) goto cleanup; @@ -5912,14 +5911,40 @@ vshCommandOptBool(const vshCmd *cmd, const char *name) return vshCommandOpt(cmd, name) ? TRUE : FALSE; } +/* Determine whether CMD->opts includes an option with name OPTNAME. + If not, give a diagnostic and return false. + If so, return true. */ +static bool +cmd_has_option (vshControl *ctl, const vshCmd *cmd, const char *optname) +{ + /* Iterate through cmd->opts, to ensure that there is an entry + with name OPTNAME and type VSH_OT_DATA. */ + bool found = false; + const vshCmdOpt *opt; + for (opt = cmd->opts; opt; opt = opt->next) { + if (STREQ (opt->def->name, optname) && opt->def->type == VSH_OT_DATA) { + found = true; + break; + } + } + + if (!found) + vshError(ctl, FALSE, + _("internal error: virsh %s: no %s VSH_OT_DATA option"), + cmd->def->name, optname); + return found; +} static virDomainPtr -vshCommandOptDomainBy(vshControl *ctl, const vshCmd *cmd, const char *optname, +vshCommandOptDomainBy(vshControl *ctl, const vshCmd *cmd, char **name, int flag) { virDomainPtr dom = NULL; char *n; int id; + const char *optname = "domain"; + if (!cmd_has_option (ctl, cmd, optname)) + return NULL; if (!(n = vshCommandOptString(cmd, optname, NULL))) { vshError(ctl, FALSE, "%s", _("undefined domain name or id")); @@ -5960,11 +5985,14 @@ vshCommandOptDomainBy(vshControl *ctl, const vshCmd *cmd, const char *optname, } static virNetworkPtr -vshCommandOptNetworkBy(vshControl *ctl, const vshCmd *cmd, const char *optname, +vshCommandOptNetworkBy(vshControl *ctl, const vshCmd *cmd, char **name, int flag) { virNetworkPtr network = NULL; char *n; + const char *optname = "network"; + if (!cmd_has_option (ctl, cmd, optname)) + return NULL; if (!(n = vshCommandOptString(cmd, optname, NULL))) { vshError(ctl, FALSE, "%s", _("undefined network name")); -- 1.6.0.4.1044.g77718

2 1

[libvirt] [PATCH] remove cvs $Id$ strings
by Jim Meyering 15 Dec '08

15 Dec '08

Here's the change to remove the few remaining CVS $Id$ strings: >From f2a2d1403656cdfe6e927c476da66ad0c49487ae Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 12 Dec 2008 13:36:08 +0100 Subject: [PATCH] remove cvs $Id$ strings * po/id.po: Likewise. * qemud/remote_generate_stubs.pl: Likewise. * src/virsh.c: Likewise. * tests/testutils.c: Likewise. * tests/testutils.h: Likewise. * RENAMES: Likewise. --- RENAMES | 2 -- po/id.po | 1 - qemud/remote_generate_stubs.pl | 2 -- src/virsh.c | 3 --- tests/testutils.c | 4 +--- tests/testutils.h | 4 +--- 6 files changed, 2 insertions(+), 14 deletions(-) diff --git a/RENAMES b/RENAMES index 27f85a4..143aebd 100644 --- a/RENAMES +++ b/RENAMES @@ -2,8 +2,6 @@ # # File renames don't normally go into patches because they make # the patches much harder to read, so list them here instead. -# -# $Id$ # Clearer naming scheme after Xen-unified patch went in. src/xen_internal.c src/xen_internal_hv.c diff --git a/po/id.po b/po/id.po index 5590e65..458b033 100644 --- a/po/id.po +++ b/po/id.po @@ -1,7 +1,6 @@ # translation of libvirt to Bahasa Indonesia (id). # This file is distributed under the same license as the libvirt package. # Teguh DC <dheche(a)songolimo.net>, 2007. -# $Id$ msgid "" msgstr "" "Project-Id-Version: libvirt\n" diff --git a/qemud/remote_generate_stubs.pl b/qemud/remote_generate_stubs.pl index 2dff468..44e1552 100755 --- a/qemud/remote_generate_stubs.pl +++ b/qemud/remote_generate_stubs.pl @@ -4,8 +4,6 @@ # code for both ends of the remote connection. # # By Richard Jones <rjones(a)redhat.com> -# -# $Id$ use strict; diff --git a/src/virsh.c b/src/virsh.c index 1a5b42f..f4a57f4 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -8,9 +8,6 @@ * Daniel Veillard <veillard(a)redhat.com> * Karel Zak <kzak(a)redhat.com> * Daniel P. Berrange <berrange(a)redhat.com> - * - * - * $Id$ */ #include <config.h> diff --git a/tests/testutils.c b/tests/testutils.c index 0255bdf..187123c 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -1,13 +1,11 @@ /* * testutils.c: basic test utils * - * Copyright (C) 2005-2007 Red Hat, Inc. + * Copyright (C) 2005-2008 Red Hat, Inc. * * See COPYING.LIB for the License of this software * * Karel Zak <kzak(a)redhat.com> - * - * $Id$ */ #include <config.h> diff --git a/tests/testutils.h b/tests/testutils.h index 7afd579..fd326ae 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -1,13 +1,11 @@ /* * utils.c: test utils * - * Copyright (C) 2005 Red Hat, Inc. + * Copyright (C) 2005, 2008 Red Hat, Inc. * * See COPYING.LIB for the License of this software * * Karel Zak <kzak(a)redhat.com> - * - * $Id$ */ #ifndef __VIT_TEST_UTILS_H__ -- 1.6.0.4.1044.g77718

2 3

[libvirt] Re: [PATCH/RFC] kvm/qemu vs libvirtd restarts
by Daniel P. Berrange 12 Dec '08

12 Dec '08

Moving thread to libvir-list.... On Tue, Oct 07, 2008 at 06:12:33PM +0200, Guido G?nther wrote: > On Fri, Sep 26, 2008 at 04:47:05PM +0100, Daniel P. Berrange wrote: > > On Fri, Sep 26, 2008 at 05:41:02PM +0200, Guido G?nther wrote: > > > > We've got this problem sorted in the 'lxc' driver and need to apply > > the same approach to the QEMU driver. The problem was always finding > > the Pseduo-TTY/PID for the monitor after restart, and associating the > > live config with it. We've "solved" that in LXC driver by savingt the > > live XML & PID to /var/run/libvirt/lxc/. It basically needs the same > > approach to be applied to the QEMU daemons. In addition the DNSmasq > > deamon needs adapting for simiarl reasons. > > Attached is a very early patch. It keeps the qemu instances running and > writes out their states upon shutdown. Reconnecting (and therefore sending > monitor commands, etc.) works but since stdout/stderr don't get picked > up again yet we don't handle virEventAddhandle. I'll grab them from > /proc/<pid>/fd/{1,2} later. Network state is missing too, but since this > is moving into a separate file it's becoming a different matter anyway. First off, thanks for working on this! A few general comments, and then I'll put rest inline.. For stdout/err, it need to be setup so that the logfile is dup()'d onto the QEMU process' file descriptors directly, and get libvirt outof the business of I/O forwarding. This avoids any complications with re-attaching to stdout/err, and loosing any log data while libvirt isn't running. This also needs to be implemented with the assumption that the daemon can & will crash any time. So putting the state-saving hooks into the qemudShutdown() method won't be sufficient. We need to write out the state we need when initially starting the VM, and then update it any time we hot-plug/unplug devices. Ignoring network state is fine - we can address that separately.. > Subject: [PATCH] let qemu/kvm survive libvirtd restarts > > --- > src/domain_conf.c | 1 + > src/domain_conf.h | 1 + > src/qemu_conf.h | 1 + > src/qemu_driver.c | 264 +++++++++++++++++++++++++++++++++++++++++++++++++---- > src/util.c | 4 +- > src/util.h | 1 + > 6 files changed, 254 insertions(+), 18 deletions(-) > > diff --git a/src/domain_conf.c b/src/domain_conf.c > index 6a35064..aa102f6 100644 > --- a/src/domain_conf.c > +++ b/src/domain_conf.c > @@ -420,6 +420,7 @@ void virDomainObjFree(virDomainObjPtr dom) > virDomainDefFree(dom->def); > virDomainDefFree(dom->newDef); > > + VIR_FREE(dom->monitorpath); > VIR_FREE(dom->vcpupids); > > VIR_FREE(dom); > diff --git a/src/domain_conf.h b/src/domain_conf.h > index 632e5ad..1ac1561 100644 > --- a/src/domain_conf.h > +++ b/src/domain_conf.h > @@ -448,6 +448,7 @@ struct _virDomainObj { > int stdout_fd; > int stderr_fd; > int monitor; > + char *monitorpath; I think we can avoid needing this. If we write out the staste the moment the VM is started, we don't need to carry this around in memory. Alternatively, since we're writing all stdout/err data to the logfile, we could simply re-parse the log to extract the monitor path upon restart. > int logfile; > int pid; > int state; > diff --git a/src/qemu_conf.h b/src/qemu_conf.h > index 88dfade..f47582e 100644 > --- a/src/qemu_conf.h > +++ b/src/qemu_conf.h > @@ -62,6 +62,7 @@ struct qemud_driver { > char *networkConfigDir; > char *networkAutostartDir; > char *logDir; > + char *stateDir; > unsigned int vncTLS : 1; > unsigned int vncTLSx509verify : 1; > char *vncTLSx509certdir; > diff --git a/src/qemu_driver.c b/src/qemu_driver.c > index 806608d..87789a9 100644 > --- a/src/qemu_driver.c > +++ b/src/qemu_driver.c > @@ -172,6 +172,181 @@ void qemudAutostartConfigs(struct qemud_driver *driver) { > } > > #ifdef WITH_LIBVIRTD > + > +static int > +qemudFileWriteMonitor(const char *dir, > + const char *name, > + const char *path) > +{ > + int rc; > + int fd; > + FILE *file = NULL; > + char *monitorfile = NULL; > + > + if ((rc = virFileMakePath(dir))) > + goto cleanup; > + > + if (asprintf(&monitorfile, "%s/%s.monitor", dir, name) < 0) { > + rc = ENOMEM; > + goto cleanup; > + } > + > + if ((fd = open(monitorfile, > + O_WRONLY | O_CREAT | O_TRUNC, > + S_IRUSR | S_IWUSR)) < 0) { > + rc = errno; > + goto cleanup; > + } > + > + if (!(file = fdopen(fd, "w"))) { > + rc = errno; > + close(fd); > + goto cleanup; > + } > + > + if (fprintf(file, "%s", path) < 0) { > + rc = errno; > + goto cleanup; > + } > + > + rc = 0; > + > +cleanup: > + if (file && > + fclose(file) < 0) { > + rc = errno; > + } > + > + VIR_FREE(monitorfile); > + return rc; > +} > + > +static int > +qemudFileReadMonitor(const char *dir, > + const char *name, > + char **path) > +{ > + int rc; > + FILE *file; > + char *monitorfile = NULL; > + > + if (asprintf(&monitorfile, "%s/%s.monitor", dir, name) < 0) { > + rc = ENOMEM; > + goto cleanup; > + } > + > + if (!(file = fopen(monitorfile, "r"))) { > + rc = errno; > + goto cleanup; > + } > + > + if (fscanf(file, "%as", path) != 1) { > + rc = EINVAL; > + goto cleanup; > + } > + > + if (fclose(file) < 0) { > + rc = errno; > + goto cleanup; > + } > + > + rc = 0; > + > + cleanup: > + VIR_FREE(monitorfile); > + return rc; > +} If we re-parse the logfile to extract the monitiro PTY path, this is unneccessary. If not, this can be simplied by just calling the convenient virFileReadAll() method. > + > +static int > +qemudFileDeleteMonitor(const char *dir, > + const char *name) > +{ > + int rc = 0; > + char *pidfile = NULL; > + > + if (asprintf(&pidfile, "%s/%s.monitor", dir, name) < 0) { > + rc = errno; > + goto cleanup; > + } > + > + if (unlink(pidfile) < 0 && errno != ENOENT) > + rc = errno; > + > +cleanup: > + VIR_FREE(pidfile); > + return rc; > +} > + > + > +static int qemudOpenMonitor(virConnectPtr conn, > + struct qemud_driver *driver, > + virDomainObjPtr vm, > + const char *monitor, > + int reconnect); > +/** > + * qemudReconnectVMs > + * > + * Reconnect running vms to the daemon process > + */ > +static int > +qemudReconnectVMs(struct qemud_driver *driver) > +{ > + virDomainObjPtr vm = driver->domains; > + > + while (vm) { > + virDomainDefPtr tmp; > + char *config = NULL; > + char *monitor = NULL; > + int rc; > + > + /* Read pid */ > + if ((rc = virFileReadPid(driver->stateDir, vm->def->name, &vm->pid)) == 0) { > + virFileDeletePid(driver->stateDir, vm->def->name); > + DEBUG("Found pid %d for '%s'", vm->pid, vm->def->name); > + } else > + goto next; > + > + if ((config = virDomainConfigFile(NULL, > + driver->stateDir, > + vm->def->name)) == NULL) { > + qemudLog(QEMUD_ERR, _("Failed to read back domain config for %s\n"), > + vm->def->name); > + goto next; > + } > + > + /* Try and load the config */ > + tmp = virDomainDefParseFile(NULL, driver->caps, config); > + unlink(config); > + if (tmp) { > + vm->newDef = vm->def; > + vm->def = tmp; > + } > + > + /* read back monitor path */ > + if ((rc = qemudFileReadMonitor(driver->stateDir, vm->def->name, &monitor)) != 0) { > + qemudLog(QEMUD_ERR, _("Failed to read back monitor path for %s: %s\n"), > + vm->def->name, strerror(rc)); > + goto next; > + } > + qemudFileDeleteMonitor(driver->stateDir, vm->def->name); > + > + /* FIXME: reconnect stdout/stderr via /proc/pid/fd/ */ > + > + if ((rc = qemudOpenMonitor(NULL, driver, vm, monitor, 1)) != 0) { > + qemudLog(QEMUD_ERR, _("Failed to reconnect to monitor for %s: %d\n"), > + vm->def->name, rc); > + goto next; > + } > + vm->def->id = driver->nextvmid++; The ID of a vm must never change for until it is rebooted. Simply don't overwrite the existing vm->def->id that we jjust loaded off disk. And instead adjust the nextvmid field, eg if (vm->def->id >= driver->nextvmid) driver->nextvmid = vm->def->id + 1; > + vm->state = VIR_DOMAIN_RUNNING; > +next: > + VIR_FREE(config); > + VIR_FREE(monitor); > + vm = vm->next; > + } > + return 0; > +} > + > /** > * qemudStartup: > * > @@ -197,6 +372,10 @@ qemudStartup(void) { > > if ((base = strdup (SYSCONF_DIR "/libvirt")) == NULL) > goto out_of_memory; > + > + if (asprintf (&qemu_driver->stateDir, > + "%s/run/libvirt/qemu/", LOCAL_STATE_DIR) == -1) > + goto out_of_memory; > } else { > if (!(pw = getpwuid(uid))) { > qemudLog(QEMUD_ERR, _("Failed to find user record for uid '%d': %s\n"), > @@ -210,6 +389,10 @@ qemudStartup(void) { > > if (asprintf (&base, "%s/.libvirt", pw->pw_dir) == -1) > goto out_of_memory; > + > + if (asprintf (&qemu_driver->stateDir, > + "%s/run/libvirt/qemu/", base) == -1) > + goto out_of_memory; > } > > /* Configuration paths are either ~/.libvirt/qemu/... (session) or > @@ -250,6 +433,8 @@ qemudStartup(void) { > qemudShutdown(); > return -1; > } > + qemudReconnectVMs(qemu_driver); > + > if (virNetworkLoadAllConfigs(NULL, > &qemu_driver->networks, > qemu_driver->networkConfigDir, > @@ -329,6 +514,34 @@ qemudActive(void) { > return 0; > } > > +/** > + * qemudSaveDomainState > + * > + * Save the full state of a running domain to statedir > + * > + * Returns 0 on success > + */ > +static int > +qemudSaveDomainState(struct qemud_driver * driver, virDomainObjPtr vm) { > + int ret; > + > + if ((ret = virFileWritePid(driver->stateDir, vm->def->name, vm->pid)) != 0) { > + qemudLog(QEMUD_ERR, _("Unable to safe pidfile for %s: %s\n"), > + vm->def->name, strerror(ret)); > + return ret; > + } > + if ((ret = virDomainSaveConfig(NULL, driver->stateDir, vm->def))) { > + qemudLog(QEMUD_ERR, _("Unable to save domain %s\n"), vm->def->name); > + return ret; > + } > + if ((ret = qemudFileWriteMonitor(driver->stateDir, vm->def->name, vm->monitorpath)) != 0) { > + qemudLog(QEMUD_ERR, _("Unable to monitor file for %s: %s\n"), > + vm->def->name, strerror(ret)); > + return ret; > + } > + return 0; > +} > + This will need to be called at time of VM creation, and the XSL config will need updating whether live config changes. > /** > * qemudShutdown: > * > @@ -349,10 +562,14 @@ qemudShutdown(void) { > while (vm) { > virDomainObjPtr next = vm->next; > if (virDomainIsActive(vm)) > +#if 1 > + qemudSaveDomainState(qemu_driver, vm); > +#else > qemudShutdownVMDaemon(NULL, qemu_driver, vm); > if (!vm->persistent) > virDomainRemoveInactive(&qemu_driver->domains, > vm); > +#endif > vm = next; > } > > @@ -389,6 +606,7 @@ qemudShutdown(void) { > VIR_FREE(qemu_driver->networkConfigDir); > VIR_FREE(qemu_driver->networkAutostartDir); > VIR_FREE(qemu_driver->vncTLSx509certdir); > + VIR_FREE(qemu_driver->stateDir); > > if (qemu_driver->brctl) > brShutdown(qemu_driver->brctl); > @@ -499,7 +717,7 @@ qemudCheckMonitorPrompt(virConnectPtr conn ATTRIBUTE_UNUSED, > static int qemudOpenMonitor(virConnectPtr conn, > struct qemud_driver *driver, > virDomainObjPtr vm, > - const char *monitor) { > + const char *monitor, int reconnect) { > int monfd; > char buf[1024]; > int ret = -1; > @@ -520,11 +738,26 @@ static int qemudOpenMonitor(virConnectPtr conn, > goto error; > } > > - ret = qemudReadMonitorOutput(conn, > - driver, vm, monfd, > - buf, sizeof(buf), > - qemudCheckMonitorPrompt, > - "monitor"); > + if (!reconnect) { > + ret = qemudReadMonitorOutput(conn, > + driver, vm, monfd, > + buf, sizeof(buf), > + qemudCheckMonitorPrompt, > + "monitor"); > + > + } else { > + vm->monitor = monfd; > + ret = 0; > + } > + > + if (ret != 0) > + goto error; > + > + if (!(vm->monitorpath = strdup(monitor))) { > + qemudReportError(conn, NULL, NULL, VIR_ERR_NO_MEMORY, > + "%s", _("failed to allocate space for monitor path")); > + goto error; > + } > > /* Keep monitor open upon success */ > if (ret == 0) > @@ -623,7 +856,7 @@ qemudFindCharDevicePTYs(virConnectPtr conn, > } > > /* Got them all, so now open the monitor console */ > - ret = qemudOpenMonitor(conn, driver, vm, monitor); > + ret = qemudOpenMonitor(conn, driver, vm, monitor, 0); > > cleanup: > VIR_FREE(monitor); > @@ -966,12 +1199,11 @@ static int qemudStartVMDaemon(virConnectPtr conn, > > ret = virExec(conn, argv, NULL, &keepfd, &vm->pid, > vm->stdin_fd, &vm->stdout_fd, &vm->stderr_fd, > - VIR_EXEC_NONBLOCK); > + VIR_EXEC_NONBLOCK | VIR_EXEC_SETSID); > if (ret == 0) { > vm->def->id = driver->nextvmid++; > vm->state = migrateFrom ? VIR_DOMAIN_PAUSED : VIR_DOMAIN_RUNNING; > } > - > for (i = 0 ; argv[i] ; i++) > VIR_FREE(argv[i]); > VIR_FREE(argv); > @@ -1037,7 +1269,9 @@ static void qemudShutdownVMDaemon(virConnectPtr conn ATTRIBUTE_UNUSED, > > qemudLog(QEMUD_INFO, _("Shutting down VM '%s'\n"), vm->def->name); > > - kill(vm->pid, SIGTERM); > + if (kill(vm->pid, SIGTERM) < 0) > + qemudLog(QEMUD_ERROR, _("Failed to send SIGTERM to %s (%d): %s\n"), > + vm->def->name, vm->pid, strerror(errno)); > > qemudVMData(driver, vm, vm->stdout_fd); > qemudVMData(driver, vm, vm->stderr_fd); > @@ -1057,13 +1291,9 @@ static void qemudShutdownVMDaemon(virConnectPtr conn ATTRIBUTE_UNUSED, > vm->stderr_fd = -1; > vm->monitor = -1; > > - if (waitpid(vm->pid, NULL, WNOHANG) != vm->pid) { > - kill(vm->pid, SIGKILL); > - if (waitpid(vm->pid, NULL, 0) != vm->pid) { > - qemudLog(QEMUD_WARN, > - "%s", _("Got unexpected pid, damn\n")); > - } > - } > + /* shut if off for sure */ > + kill(vm->pid, SIGKILL); > + virFileDeletePid(driver->stateDir, vm->def->name); > > vm->pid = -1; > vm->def->id = -1; > diff --git a/src/util.c b/src/util.c > index ca14be1..442c810 100644 > --- a/src/util.c > +++ b/src/util.c > @@ -299,14 +299,16 @@ virExec(virConnectPtr conn, > !FD_ISSET(i, keepfd))) > close(i); > > - if (flags & VIR_EXEC_DAEMON) { > + if (flags & VIR_EXEC_DAEMON || flags & VIR_EXEC_SETSID) { > if (setsid() < 0) { > ReportError(conn, VIR_ERR_INTERNAL_ERROR, > _("cannot become session leader: %s"), > strerror(errno)); > _exit(1); > } > + } > > + if (flags & VIR_EXEC_DAEMON) { > if (chdir("/") < 0) { > ReportError(conn, VIR_ERR_INTERNAL_ERROR, > _("cannot change to root directory: %s"), > diff --git a/src/util.h b/src/util.h > index 093ef46..8fbe2cd 100644 > --- a/src/util.h > +++ b/src/util.h > @@ -32,6 +32,7 @@ enum { > VIR_EXEC_NONE = 0, > VIR_EXEC_NONBLOCK = (1 << 0), > VIR_EXEC_DAEMON = (1 << 1), > + VIR_EXEC_SETSID = (1 << 2), > }; Shouldn't we simply be starting all the QEMU VMs with VIR_EXEC_DAEMON so they totally disassociate themselves from libvirtd right away. They will be disassociated anyway if the libvirtd is ever restarted, so best to daemonize from time they are started, to avoid any surprising changes in behaviour Regards, Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

3 10

[libvirt] [PATCH] fix size parameter in calls to numa_node_to_cpus
by Dave Allan 12 Dec '08

12 Dec '08

I was getting the error: map size mismatch; abort when running the daemon-conf tests. I traced it to two places in which we were passing a parameter as a number of bits to numa_node_to_cpus which expects a number of bytes (see numa_node_to_cpus_compat in numa.h in the numactl source). The attached patch fixes the problem. Dave diff --git a/src/qemu_conf.c b/src/qemu_conf.c index e6c378f..7019c14 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -324,7 +324,7 @@ qemudCapsInitNUMA(virCapsPtr caps) for (n = 0 ; n <= numa_max_node() ; n++) { - if (numa_node_to_cpus(n, mask, MAX_CPUS_MASK_LEN) < 0) + if (numa_node_to_cpus(n, mask, MAX_CPUS_MASK_LEN / 8) < 0) goto cleanup; for (ncpus = 0, i = 0 ; i < MAX_CPUS ; i++) diff --git a/src/uml_conf.c b/src/uml_conf.c index 7eb630d..3659c6b 100644 --- a/src/uml_conf.c +++ b/src/uml_conf.c @@ -80,7 +80,7 @@ umlCapsInitNUMA(virCapsPtr caps) for (n = 0 ; n <= numa_max_node() ; n++) { - if (numa_node_to_cpus(n, mask, MAX_CPUS_MASK_LEN) < 0) + if (numa_node_to_cpus(n, mask, MAX_CPUS_MASK_LEN / 8) < 0) goto cleanup; for (ncpus = 0, i = 0 ; i < MAX_CPUS ; i++)

4 11

[libvirt] [PATCH] avoid a spurious test failure on non-numa systems
by Jim Meyering 12 Dec '08

12 Dec '08

Daniel Veillard spotted this failure, due to a harmless diagnostic: --- expected-err 2008-12-12 16:10:18.000000000 +0100 [16:21] +++ err 2008-12-12 16:10:18.000000000 +0100 @@ -1,2 +1,3 @@ +libnuma: Warning: /sys not mounted or no numa system. Assuming one node: No such file or directory Here's a patch that should make the test ignore that diagnostic. Daniel, if you could test, I'd appreciate it. >From d336426d0127313b014ee453062b342b82ffcf6a Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 12 Dec 2008 16:38:58 +0100 Subject: [PATCH] avoid a spurious test failure on non-numa systems * tests/daemon-conf: Ignore a spurious libnuma warning. Reported by Daniel Veillard. --- tests/daemon-conf | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/daemon-conf b/tests/daemon-conf index 03189d5..65a9655 100755 --- a/tests/daemon-conf +++ b/tests/daemon-conf @@ -56,8 +56,11 @@ while :; do test $i = $n && break - # Filter out this diagnostic. - sed '/^Cannot set group when not running as root$/d' err > k && mv k err + # Filter out some ignorable diagnostics. + sed \ + -e '/^Cannot set group when not running as root$/d' \ + -e '/^libnuma: Warning: .sys not mounted or no numa system/d' \ + err > k && mv k err printf '%s\n\n' "remoteReadConfigFile: $f: $param_name: $msg" > expected-err diff -u expected-err err || fail=1 -- 1.6.0.4.1044.g77718

2 2

[libvirt] [PATCH] clarify Makefile message about tabbed indentation
by Dave Allan 12 Dec '08

12 Dec '08

I made a few changes to some of the sources, not realizing my editor was using tabs for indentation which caused the build to complain. I wasn't sure what the error was trying to tell me at first; here's a patch that makes the message clearer (to me at least). Dave diff --git a/Makefile.maint b/Makefile.maint index 10d481b..3b7594d 100644 --- a/Makefile.maint +++ b/Makefile.maint @@ -310,7 +310,7 @@ sc_TAB_in_indentation: $$($(VC_LIST_EXCEPT) \ | grep -E '\.[ch](\.in)?$$' \ | grep -v '^gnulib/') && \ - { echo '$(ME): found TAB(s) use for indentation; use spaces' \ + { echo '$(ME): found TAB(s) used for indentation in C sources; use spaces' \ 1>&2; exit 1; } || : ctype_re = isalnum|isalpha|isascii|isblank|iscntrl|isdigit|isgraph|islower\

3 2

[libvirt] FYI, recent cvs history edit
by Jim Meyering 12 Dec '08

12 Dec '08

FYI, today, I committed this change libvirtd: plug a nominal leak * qemud/qemud.c (qemudRunLoop): Free server->workers. http://git.et.redhat.com/?p=libvirt.git;a=commitdiff;h=87a6fa131464 Notice that it does have a proper ChangeLog entry, but the git commit log contains only "*** empty log message ***". Normally it would contain a copy of the ChangeLog lines. However, in CVS, it is fixed because I manually edited the cvs commit log. I expect that some day we'll regenerate the git repository from cvs, so the empty summary in git will eventually go away

1 0

[libvirt] [PATCH] remove unused xmlrpc-related files
by Jim Meyering 12 Dec '08

12 Dec '08

While we once thought we'd use this xmlrpc code, it looks like that's no longer in the cards, so this patch removes it, along with the testing-related bits: >From 18b7dbc92ad9d9f026bdc01ec735e389caffdfc1 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 12 Dec 2008 11:29:09 +0100 Subject: [PATCH] remove unused xmlrpc-related files * src/xmlrpc.h: Remove file. * src/xmlrpc.c: Likewise. * tests/test_xmlrpc.sh: Likewise. * tests/xmlrpctest.c: Likewise. * tests/xmlrpcserver.py: Remove file. * tests/Makefile.am (EXTRA_DIST): Remove xmlserver.py. (noinst_PROGRAMS): Remove xmlrpctest, along with associated variables. * po/POTFILES.in: Remove src/xmlrpc.c. * tests/.cvsignore: Remove xmlrpctest. --- po/POTFILES.in | 1 - src/xmlrpc.c | 688 ------------------------------------------------- src/xmlrpc.h | 115 -------- tests/.cvsignore | 1 - tests/Makefile.am | 12 +- tests/test_xmlrpc.sh | 6 - tests/xmlrpcserver.py | 49 ---- tests/xmlrpctest.c | 269 ------------------- 8 files changed, 1 insertions(+), 1140 deletions(-) delete mode 100644 src/xmlrpc.c delete mode 100644 src/xmlrpc.h delete mode 100755 tests/test_xmlrpc.sh delete mode 100755 tests/xmlrpcserver.py delete mode 100644 tests/xmlrpctest.c diff --git a/po/POTFILES.in b/po/POTFILES.in index d33d24b..26617a0 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -40,5 +40,4 @@ src/xen_internal.c src/xend_internal.c src/xm_internal.c src/xml.c -src/xmlrpc.c src/xs_internal.c diff --git a/src/xmlrpc.c b/src/xmlrpc.c deleted file mode 100644 index c90d694..0000000 --- a/src/xmlrpc.c +++ /dev/null @@ -1,688 +0,0 @@ -/* - * xmlrpc.c: XML-RPC protocol handler for libvir library - * - * Copyright (C) 2006 IBM, Corp. - * - * See COPYING.LIB for the License of this software - * - * Anthony Liguori <aliguori(a)us.ibm.com> - */ - -#include <config.h> - -#include "xmlrpc.h" -#include "virterror_internal.h" -#include "memory.h" - -#include <libxml/nanohttp.h> - -#include <string.h> -#include <errno.h> - -/* TODO - 1) Lots of error checking - 2) xmlRpcValueToSexpr -*/ - -static xmlNodePtr xmlFirstElement(xmlNodePtr node); -static xmlNodePtr xmlNextElement(xmlNodePtr node); - -struct _xmlRpcContext -{ - char *uri; - int faultCode; - char *faultMessage; -}; - -static void xmlRpcError(virErrorNumber error, const char *info, int value) -{ - const char *errmsg; - - if (error == VIR_ERR_OK) - return; - - errmsg = virErrorMsg(error, info); - virRaiseError(NULL, NULL, NULL, VIR_FROM_RPC, error, VIR_ERR_ERROR, - errmsg, info, NULL, value, 0, errmsg, info, value); -} - -static xmlRpcValuePtr xmlRpcValueNew(xmlRpcValueType type) -{ - xmlRpcValuePtr ret = NULL; - if (VIR_ALLOC(ret) < 0) - xmlRpcError(VIR_ERR_NO_MEMORY, _("allocate value"), sizeof(*ret)); - else - ret->kind = type; - return ret; -} - -static char *xmlGetText(xmlNodePtr node) -{ - for (node = node->children; node; node = node->next) - if (node->type == XML_TEXT_NODE) { - char *x = strdup((const char *)node->content); - if (!x) - xmlRpcError(VIR_ERR_NO_MEMORY, _("copying node content"), - strlen((const char *)node->content)); - return x; - } - return NULL; -} - -static xmlNodePtr xmlFirstElement(xmlNodePtr node) -{ - for (node = node->children; node; node = node->next) - if (node->type == XML_ELEMENT_NODE) - break; - return node; -} - -static xmlNodePtr xmlNextElement(xmlNodePtr node) -{ - for (node = node->next; node; node = node->next) - if (node->type == XML_ELEMENT_NODE) - break; - return node; -} - -static xmlRpcValuePtr xmlRpcValueUnmarshalDateTime(xmlNodePtr node ATTRIBUTE_UNUSED) -{ - /* we don't need this */ - TODO - return NULL; -} - -static xmlRpcValuePtr xmlRpcValueUnmarshalString(xmlNodePtr node) -{ - xmlRpcValuePtr ret = xmlRpcValueNew(XML_RPC_STRING); - - if (ret) - ret->value.string = xmlGetText(node); - return ret; -} - -static xmlRpcValuePtr xmlRpcValueUnmarshalBase64(xmlNodePtr node ATTRIBUTE_UNUSED) -{ - /* we don't need this */ - TODO - return NULL; -} - -static xmlRpcValuePtr xmlRpcValueUnmarshalInteger(xmlNodePtr node) -{ - xmlRpcValuePtr ret = xmlRpcValueNew(XML_RPC_INTEGER); - char *value = xmlGetText(node); - - if (ret && value) - ret->value.integer = atoi(value); - VIR_FREE(value); - return ret; -} - -static xmlRpcValuePtr xmlRpcValueUnmarshalBoolean(xmlNodePtr node) -{ - xmlRpcValuePtr ret = xmlRpcValueNew(XML_RPC_BOOLEAN); - char *value = xmlGetText(node); - - if (!ret) - return NULL; - if (value && atoi(value)) - ret->value.boolean = true; - else - ret->value.boolean = false; - VIR_FREE(value); - return ret; -} - -static xmlRpcValuePtr xmlRpcValueUnmarshalDouble(xmlNodePtr node) -{ - xmlRpcValuePtr ret = xmlRpcValueNew(XML_RPC_DOUBLE); - char *value = xmlGetText(node); - - if (ret && value) - ret->value.real = atof(value); - VIR_FREE(value); - return ret; -} - -static xmlRpcValuePtr xmlRpcValueUnmarshalArray(xmlNodePtr node) -{ - xmlRpcValuePtr ret = xmlRpcValueNew(XML_RPC_ARRAY); - xmlNodePtr cur; - int n_elements = 0; - xmlRpcValuePtr *elems; - - if (!ret) - return NULL; - - for (cur = xmlFirstElement(node); cur; cur = xmlNextElement(cur)) - n_elements += 1; - - if (VIR_ALLOC_N(elems, n_elements) < 0) { - xmlRpcError(VIR_ERR_NO_MEMORY, _("allocate value array"), - n_elements * sizeof(*elems)); - VIR_FREE(ret); - return NULL; - } - n_elements = 0; - for (cur = xmlFirstElement(node); cur; cur = xmlNextElement(cur)) { - elems[n_elements] = xmlRpcValueUnmarshal(cur); - n_elements += 1; - } - - ret->value.array.elements = elems; - ret->value.array.n_elements = n_elements; - - return ret; -} - -static xmlRpcValueDictElementPtr xmlRpcValueUnmarshalDictElement(xmlNodePtr node) -{ - xmlRpcValueDictElementPtr ret; - xmlNodePtr cur; - - if (VIR_ALLOC(ret) < 0) { - xmlRpcError(VIR_ERR_NO_MEMORY, _("allocate dict"), sizeof(*ret)); - return NULL; - } - memset(ret, 0, sizeof(*ret)); - - for (cur = xmlFirstElement(node); cur; cur = xmlNextElement(cur)) { - if (xmlStrEqual(cur->name, BAD_CAST "name")) { - ret->name = xmlGetText(cur); - } else if (xmlStrEqual(cur->name, BAD_CAST "value")) { - ret->value = xmlRpcValueUnmarshal(cur); - } else { - xmlRpcError(VIR_ERR_XML_ERROR, _("unexpected dict node"), 0); - VIR_FREE(ret->name); - if (ret->value) - xmlRpcValueFree(ret->value); - VIR_FREE(ret); - return NULL; - } - } - - ret->next = NULL; - - return ret; -} - -static xmlRpcValuePtr xmlRpcValueUnmarshalDict(xmlNodePtr node) -{ - xmlRpcValueDictElementPtr root = NULL, *elem = &root; - xmlRpcValuePtr ret = xmlRpcValueNew(XML_RPC_STRUCT); - xmlNodePtr cur; - - if (!ret) - return NULL; - - ret->value.dict.root = root; - - for (cur = xmlFirstElement(node); cur; cur = xmlNextElement(cur)) { - *elem = xmlRpcValueUnmarshalDictElement(cur); - if (*elem==NULL) { - xmlRpcValueFree(ret); - return NULL; - } - elem = &(*elem)->next; - } - - return ret; -} - -xmlRpcValuePtr xmlRpcValueUnmarshal(xmlNodePtr node) -{ - xmlNodePtr n; - xmlRpcValuePtr ret = NULL; - - if (xmlStrEqual(node->name, BAD_CAST "value")) { - n = xmlFirstElement(node); - if (n == NULL) { - ret = xmlRpcValueUnmarshalString(node); - } else { - ret = xmlRpcValueUnmarshal(n); - } - } else if (xmlStrEqual(node->name, BAD_CAST "dateTime.iso8601")) { - ret = xmlRpcValueUnmarshalDateTime(node); - } else if (xmlStrEqual(node->name, BAD_CAST "string")) { - ret = xmlRpcValueUnmarshalString(node); - } else if (xmlStrEqual(node->name, BAD_CAST "base64")) { - ret = xmlRpcValueUnmarshalBase64(node); - } else if (xmlStrEqual(node->name, BAD_CAST "i4") || - xmlStrEqual(node->name, BAD_CAST "int")) { - ret = xmlRpcValueUnmarshalInteger(node); - } else if (xmlStrEqual(node->name, BAD_CAST "boolean")) { - ret = xmlRpcValueUnmarshalBoolean(node); - } else if (xmlStrEqual(node->name, BAD_CAST "double")) { - ret = xmlRpcValueUnmarshalDouble(node); - } else if (xmlStrEqual(node->name, BAD_CAST "array")) { - ret = xmlRpcValueUnmarshal(xmlFirstElement(node)); - } else if (xmlStrEqual(node->name, BAD_CAST "data")) { - ret = xmlRpcValueUnmarshalArray(node); - } else if (xmlStrEqual(node->name, BAD_CAST "struct")) { - ret = xmlRpcValueUnmarshalDict(node); - } else if (xmlStrEqual(node->name, BAD_CAST "nil")) { - ret = xmlRpcValueNew(XML_RPC_NIL); - } else { - xmlRpcError(VIR_ERR_XML_ERROR, _("unexpected value node"), 0); - } - - return ret; -} - -void xmlRpcValueFree(xmlRpcValuePtr value) -{ - int i; - xmlRpcValueDictElementPtr cur, next; - - if (value == NULL) - return; - - switch (value->kind) { - case XML_RPC_ARRAY: - for (i = 0; i < value->value.array.n_elements; i++) - xmlRpcValueFree(value->value.array.elements[i]); - VIR_FREE(value->value.array.elements); - break; - case XML_RPC_STRUCT: - next = value->value.dict.root; - while (next) { - cur = next; - next = next->next; - VIR_FREE(cur->name); - xmlRpcValueFree(cur->value); - VIR_FREE(cur); - } - break; - case XML_RPC_STRING: - VIR_FREE(value->value.string); - break; - default: - break; - } - - VIR_FREE(value); -} - -void xmlRpcValueMarshal(xmlRpcValuePtr value, virBufferPtr buf, int indent) -{ - int i; - xmlRpcValueDictElement *elem; - - virBufferVSprintf(buf, "%*s<value>", indent, ""); - switch (value->kind) { - case XML_RPC_ARRAY: - virBufferStrcat(buf, "<array><data>\n", NULL); - for (i = 0; i < value->value.array.n_elements; i++) - xmlRpcValueMarshal(value->value.array.elements[i], buf, indent+2); - virBufferVSprintf(buf, "%*s</data></array>", indent, ""); - break; - case XML_RPC_STRUCT: - virBufferStrcat(buf, "<struct>\n", NULL); - indent += 2; - for (elem = value->value.dict.root; elem; elem = elem->next) { - virBufferVSprintf(buf, "%*s<member>\n", indent, ""); - virBufferVSprintf(buf, "%*s<name>%s</name>\n", - indent + 2, "", elem->name); - xmlRpcValueMarshal(elem->value, buf, indent + 2); - virBufferVSprintf(buf, "%*s</member>\n", indent, ""); - } - indent -= 2; - virBufferVSprintf(buf, "%*s</struct>", indent, ""); - break; - case XML_RPC_INTEGER: - virBufferVSprintf(buf, "<int>%d</int>", value->value.integer); - break; - case XML_RPC_DOUBLE: - virBufferVSprintf(buf, "<double>%f</double>", value->value.real); - break; - case XML_RPC_BOOLEAN: - if (value->value.boolean) - i = 1; - else - i = 0; - virBufferVSprintf(buf, "<boolean>%d</boolean>", i); - break; - case XML_RPC_DATE_TIME: - /* FIXME */ - TODO - break; - case XML_RPC_BASE64: - /* FIXME */ - TODO - break; - case XML_RPC_STRING: - virBufferStrcat(buf, - "<string>", value->value.string, "</string>", NULL); - break; - case XML_RPC_NIL: - virBufferStrcat(buf, "<nil> </nil>", NULL); - break; - } - virBufferStrcat(buf, "</value>\n", NULL); -} - -void xmlRpcMarshalRequest(const char *request, - virBufferPtr buf, - int argc, xmlRpcValuePtr *argv) -{ - int i; - - virBufferStrcat(buf, - "<?xml version=\"1.0\"?>\n" - "<methodCall>\n" - " <methodName>", request, "</methodName>\n" - " <params>\n", NULL); - for (i = 0; i < argc; i++) { - virBufferStrcat(buf, - " <param>\n", NULL); - xmlRpcValueMarshal(argv[i], buf, 6); - virBufferStrcat(buf, - " </param>\n", NULL); - } - virBufferStrcat(buf, - " </params>\n" - "</methodCall>\n", NULL); -} - -xmlRpcValuePtr xmlRpcUnmarshalResponse(xmlNodePtr node, bool *is_fault) -{ - if (!node) - return NULL; - - if (!xmlStrEqual(node->name, BAD_CAST "methodResponse")) - return NULL; - - node = xmlFirstElement(node); - if (xmlStrEqual(node->name, BAD_CAST "params")) { - node = xmlFirstElement(node); - - if (!xmlStrEqual(node->name, BAD_CAST "param")) - return NULL; - - *is_fault = false; - return xmlRpcValueUnmarshal(xmlFirstElement(node)); - } else if (xmlStrEqual(node->name, BAD_CAST "fault")) { - *is_fault = true; - return xmlRpcValueUnmarshal(xmlFirstElement(node)); - } else - return NULL; -} - -static char *xmlRpcCallRaw(const char *url, const char *request) -{ - void *cxt; - char *contentType = (char *) "text/xml"; - int len, ret, serrno; - char *response = NULL; - - cxt = xmlNanoHTTPMethod(url, - "POST", - request, - &contentType, - NULL, - strlen(request)); - - if (cxt == NULL) { - xmlRpcError(VIR_ERR_POST_FAILED, _("send request"), 0); - goto error; - } - - if (contentType && STRNEQ(contentType, "text/xml")) { - errno = EINVAL; - xmlRpcError(VIR_ERR_POST_FAILED, _("unexpected mime type"), 0); - goto error; - } - - len = xmlNanoHTTPContentLength(cxt); - if (VIR_ALLOC_N(response, len + 1) < 0) { - xmlRpcError(VIR_ERR_NO_MEMORY, _("allocate response"), len); - goto error; - } - ret = xmlNanoHTTPRead(cxt, response, len); - if (ret != len) { - errno = EINVAL; - VIR_FREE(response); - xmlRpcError(VIR_ERR_POST_FAILED, _("read response"), 0); - } - - response[len] = 0; - - error: - serrno = errno; - if (cxt) { - xmlNanoHTTPClose(cxt); - VIR_FREE(contentType); - } - errno = serrno; - - return response; -} - -static char **xmlRpcStringArray(xmlRpcValuePtr value) -{ - char **ret, *ptr; - int i; - size_t size = 0; - - if (value->kind != XML_RPC_ARRAY) - return NULL; - - size = sizeof(char *) * (value->value.array.n_elements + 1); - - for (i = 0; i < value->value.array.n_elements; i++) - if (value->value.array.elements[i]->kind == XML_RPC_STRING) - size += strlen(value->value.array.elements[i]->value.string) + 1; - - if (VIR_ALLOC_N(ptr, size) < 0) { - xmlRpcError(VIR_ERR_NO_MEMORY, _("allocate string array"), size); - return NULL; - } - ret = (char **)ptr; - ptr += sizeof(char *) * (value->value.array.n_elements + 1); - - for (i = 0; i < value->value.array.n_elements; i++) { - if (value->value.array.elements[i]->kind == XML_RPC_STRING) { - char *s = value->value.array.elements[i]->value.string; - strcpy(ptr, s); - ret[i] = ptr; - ptr += strlen(s) + 1; - } else - ret[i] = (char *) ""; - } - - ret[i] = NULL; - - return ret; -} - -xmlRpcValuePtr * -xmlRpcArgvNew(const char *fmt, va_list ap, int *argc) -{ - xmlRpcValuePtr *argv; - const char *ptr; - int i; - - *argc = strlen(fmt); - if (VIR_ALLOC_N(argv, *argc) < 0) { - xmlRpcError(VIR_ERR_NO_MEMORY, _("read response"), sizeof(*argv) * *argc); - return NULL; - } - i = 0; - for (ptr = fmt; *ptr; ptr++) { - switch (*ptr) { - case 'i': - if ((argv[i] = xmlRpcValueNew(XML_RPC_INTEGER))) - argv[i]->value.integer = va_arg(ap, int32_t); - break; - case 'f': - if ((argv[i] = xmlRpcValueNew(XML_RPC_DOUBLE))) - argv[i]->value.real = va_arg(ap, double); - break; - case 'b': - if ((argv[i] = xmlRpcValueNew(XML_RPC_BOOLEAN))) - argv[i]->value.boolean = va_arg(ap, int); - break; - case 's': - if ((argv[i] = xmlRpcValueNew(XML_RPC_STRING))) - argv[i]->value.string = strdup(va_arg(ap, const char *)); - break; - default: - argv[i] = NULL; - break; - } - if (argv[i]==NULL) { - xmlRpcArgvFree(i, argv); - return NULL; - } - i++; - } - return argv; -} - -void -xmlRpcArgvFree(int argc, xmlRpcValuePtr *argv) -{ - int i; - if (!argv) - return; - for (i = 0; i < argc; i++) - xmlRpcValueFree(argv[i]); - - VIR_FREE(argv); -} - -int xmlRpcCall(xmlRpcContextPtr context, const char *method, - const char *retfmt, const char *fmt, ...) -{ - va_list ap; - int argc; - xmlRpcValuePtr *argv; - virBuffer buf = VIR_BUFFER_INITIALIZER; - char *ret; - xmlDocPtr xml; - xmlNodePtr node; - bool fault; - xmlRpcValuePtr value; - void *retval = NULL; - char *content; - - va_start(ap, fmt); - - if (retfmt && *retfmt) - retval = va_arg(ap, void *); - - if (!(argv = xmlRpcArgvNew(fmt, ap, &argc))) - return -1; - - va_end(ap); - - xmlRpcMarshalRequest(method, &buf, argc, argv); - - xmlRpcArgvFree(argc, argv); - - if (virBufferError(&buf)) - return -1; - - content = virBufferContentAndReset(&buf); - ret = xmlRpcCallRaw(context->uri, content); - VIR_FREE(content); - - if (!ret) - return -1; - - xml = xmlReadDoc((const xmlChar *)ret, "response.xml", NULL, - XML_PARSE_NOENT | XML_PARSE_NONET | - XML_PARSE_NOERROR | XML_PARSE_NOWARNING); - VIR_FREE(ret); - - if (xml == NULL) { - errno = EINVAL; - xmlRpcError(VIR_ERR_XML_ERROR, _("parse server response failed"), 0); - return -1; - } - - node = xmlDocGetRootElement(xml); - - value = xmlRpcUnmarshalResponse(node, &fault); - - if (!fault) { - switch (*retfmt) { - case 'i': - if (value->kind == XML_RPC_INTEGER) - *(int32_t *)retval = value->value.integer; - break; - case 'b': - if (value->kind == XML_RPC_BOOLEAN) - *(bool *)retval = value->value.boolean; - break; - case 'f': - if (value->kind == XML_RPC_DOUBLE) - *(double *)retval = value->value.real; - break; - case 's': - if (value->kind == XML_RPC_STRING) - *(char **)retval = strdup(value->value.string); - break; - case 'S': - *(char ***)retval = xmlRpcStringArray(value); - break; - case 'V': - *(xmlRpcValuePtr *)retval = value; - value = NULL; - break; - default: - printf("not supported yet\n"); - break; - } - } - - xmlFreeDoc(xml); - - if (fault) { - /* FIXME we need generic dict routines */ - /* FIXME we need faultMessage propagate to libvirt error API */ - context->faultCode = value->value.dict.root->value->value.integer; - context->faultMessage = strdup(value->value.dict.root->next->value->value.string); - xmlRpcValueFree(value); - errno = EFAULT; - return -1; - } - - xmlRpcValueFree(value); - - return 0; -} - -xmlRpcContextPtr xmlRpcContextNew(const char *uri) -{ - xmlRpcContextPtr ret; - - if (VIR_ALLOC(ret) < 0) { - xmlRpcError(VIR_ERR_NO_MEMORY, _("allocate new context"), sizeof(*ret)); - } else { - ret->uri = strdup(uri); - ret->faultMessage = NULL; - } - - return ret; -} - -void xmlRpcContextFree(xmlRpcContextPtr context) -{ - if (context) { - VIR_FREE(context->uri); - VIR_FREE(context->faultMessage); - VIR_FREE(context); - } -} - -int xmlRpcContextFaultCode(xmlRpcContextPtr context) -{ - return context->faultCode; -} - -const char *xmlRpcContextFaultMessage(xmlRpcContextPtr context) -{ - return context->faultMessage; -} diff --git a/src/xmlrpc.h b/src/xmlrpc.h deleted file mode 100644 index 2a9c92a..0000000 --- a/src/xmlrpc.h +++ /dev/null @@ -1,115 +0,0 @@ -/* - * xmlrpc.c: XML-RPC protocol handler for libvir library - * - * Copyright (C) 2006 IBM, Corp. - * - * See COPYING.LIB for the License of this software - * - * Anthony Liguori <aliguori(a)us.ibm.com> - */ - -#ifndef _VIR_XML_RPC_H_ -#define _VIR_XML_RPC_H_ - -#include <libxml/parser.h> -#include <libxml/tree.h> - -#include <stdbool.h> -#include <stdint.h> -#include <time.h> -#include <stdarg.h> - -#include "buf.h" - -typedef enum _xmlRpcValueType xmlRpcValueType; - -typedef struct _xmlRpcValueArray xmlRpcValueArray; -typedef struct _xmlRpcValueDictElement xmlRpcValueDictElement; -typedef struct _xmlRpcValueDict xmlRpcValueDict; -typedef struct _xmlRpcValueBase64 xmlRpcValueBase64; -typedef struct _xmlRpcValue xmlRpcValue; -typedef struct _xmlRpcContext xmlRpcContext; - -typedef xmlRpcValueArray *xmlRpcValueArrayPtr; -typedef xmlRpcValueDictElement *xmlRpcValueDictElementPtr; -typedef xmlRpcValueDict *xmlRpcValueDictPtr; -typedef xmlRpcValueBase64 *xmlRpcValueBase64Ptr; -typedef xmlRpcValue *xmlRpcValuePtr; -typedef xmlRpcContext *xmlRpcContextPtr; - -enum _xmlRpcValueType { - XML_RPC_ARRAY, - XML_RPC_STRUCT, - XML_RPC_INTEGER, - XML_RPC_DOUBLE, - XML_RPC_BOOLEAN, - XML_RPC_DATE_TIME, - XML_RPC_BASE64, - XML_RPC_STRING, - XML_RPC_NIL, -}; - -struct _xmlRpcValueArray { - int n_elements; - xmlRpcValuePtr *elements; -}; - -struct _xmlRpcValueDictElement { - char *name; - xmlRpcValuePtr value; - xmlRpcValueDictElementPtr next; -}; - -struct _xmlRpcValueDict { - xmlRpcValueDictElementPtr root; -}; - -struct _xmlRpcValueBase64 { - void *data; - size_t n_data; -}; - -struct _xmlRpcValue { - xmlRpcValueType kind; - - union { - char *string; - xmlRpcValueArray array; - xmlRpcValueDict dict; - int32_t integer; - double real; - bool boolean; - time_t dateTime; - xmlRpcValueBase64 base64; - } value; -}; - -struct _xmlRpcContext; - -xmlRpcValuePtr *xmlRpcArgvNew(const char *fmt, va_list ap, int *argc); -void xmlRpcArgvFree(int argc, xmlRpcValuePtr *argv); - -void xmlRpcMarshalRequest(const char *request, - virBufferPtr buf, - int argc, xmlRpcValuePtr *argv); - -xmlRpcValuePtr xmlRpcUnmarshalResponse(xmlNodePtr node, bool *is_fault); - -void xmlRpcValueMarshal(xmlRpcValuePtr value, virBufferPtr buf, int indent); - -xmlRpcValuePtr xmlRpcValueUnmarshal(xmlNodePtr node); - -void xmlRpcValueFree(xmlRpcValuePtr value); - -int xmlRpcCall(xmlRpcContextPtr context, const char *method, - const char *retval, const char *fmt, ...); - -xmlRpcContextPtr xmlRpcContextNew(const char *uri); - -void xmlRpcContextFree(xmlRpcContextPtr context); - -int xmlRpcContextFaultCode(xmlRpcContextPtr context); - -const char *xmlRpcContextFaultMessage(xmlRpcContextPtr context); - -#endif diff --git a/tests/.cvsignore b/tests/.cvsignore index e45c3dc..679cc20 100644 --- a/tests/.cvsignore +++ b/tests/.cvsignore @@ -2,7 +2,6 @@ Makefile Makefile.in .deps .libs -xmlrpctest sexpr2xmltest xml2sexprtest virshtest diff --git a/tests/Makefile.am b/tests/Makefile.am index 9e794c5..87e4235 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -38,13 +38,12 @@ LDADDS = \ EXTRA_DIST = \ oomtrace.pl \ test-lib.sh \ - xmlrpcserver.py \ qemuxml2argvdata \ nodeinfodata \ domainschematest \ domainschemadata -noinst_PROGRAMS = xmlrpctest virshtest conftest \ +noinst_PROGRAMS = virshtest conftest \ nodeinfotest statstest qparamtest if WITH_XEN @@ -111,15 +110,6 @@ TESTS_ENVIRONMENT = \ valgrind: $(MAKE) check VG="valgrind --quiet --leak-check=full --suppressions=$(srcdir)/.valgrind.supp" -# Note: xmlrpc.[c|h] is not in libvirt yet -xmlrpctest_SOURCES = \ - xmlrpctest.c \ - testutils.c testutils.h \ - @top_srcdir@/src/xmlrpc.c \ - @top_srcdir@/src/xmlrpc.h - -xmlrpctest_LDADD = $(LDADDS) - if WITH_XEN xml2sexprtest_SOURCES = \ xml2sexprtest.c testutilsxen.c testutilsxen.h \ diff --git a/tests/test_xmlrpc.sh b/tests/test_xmlrpc.sh deleted file mode 100755 index ccdfdbc..0000000 --- a/tests/test_xmlrpc.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -./xmlrpcserver.py >/dev/null 2>&1 & -sleep 1 -./xmlrpctest -pkill -f xmlrpcserver.py >/dev/null 2>&1 & diff --git a/tests/xmlrpcserver.py b/tests/xmlrpcserver.py deleted file mode 100755 index debff93..0000000 --- a/tests/xmlrpcserver.py +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/env python - -# -# xmlrpcserver.py: simple server for XML-RPC tests -# -# Copyright (C) 2005 Red Hat, Inc. -# -# See COPYING.LIB for the License of this software -# -# Karel Zak <kzak(a)redhat.com> -# -# $Id$ -# -# -# simple client: -# -# >>> import xmlrpclib -# >>> s=xmlrpclib.Server('http://localhost:8000') -# >>> s.plus(10,10) -# 20 -# - -import sys -from SimpleXMLRPCServer import SimpleXMLRPCServer - -SERVER_PORT = 8000 - - -class VirtRPCServer(SimpleXMLRPCServer): - def _dispatch(self, method, params): - try: - func = getattr(self, 'test_' + method) - except AttributeError: - raise Exception('method "%s" is not supported' % method) - else: - return func(*params) - - def test_plus(self, x, y): - return x + y - - -server = VirtRPCServer(("localhost", SERVER_PORT)) -server.serve_forever() - - - -# vim: set tabstop=4: -# vim: set shiftwidth=4: -# vim: set expandtab: diff --git a/tests/xmlrpctest.c b/tests/xmlrpctest.c deleted file mode 100644 index bc8eb8a..0000000 --- a/tests/xmlrpctest.c +++ /dev/null @@ -1,269 +0,0 @@ -/* - * xmlrpctest.c: simple client for XML-RPC tests - * - * Copyright (C) 2005, 2008 Red Hat, Inc. - * - * See COPYING.LIB for the License of this software - * - * Karel Zak <kzak(a)redhat.com> - * - * $Id$ - */ - -#include <config.h> - -#include <stdio.h> -#include <stdlib.h> -#include <stdarg.h> -#include <string.h> -#include <limits.h> -#include <libxml/parser.h> -#include <libxml/tree.h> -#include <libxml/xpath.h> - -#include "internal.h" -#include "buf.h" -#include "xmlrpc.h" - -#include "testutils.h" - - -#define NLOOPS 100 /* default number of loops per test */ - -static char *progname; - - -static int -testMethodPlusINT(const void *data) -{ - int retval = 0; - xmlRpcContextPtr cxt = (xmlRpcContextPtr) data; - - if (xmlRpcCall(cxt, "plus", "i", "ii", - (const char *) &retval, 10, 10) < 0) - return -1; - - return retval==(10+10) ? 0 : -1; -} - -static int -testMethodPlusDOUBLE(const void *data) -{ - double retval = 0; - xmlRpcContextPtr cxt = (xmlRpcContextPtr) data; - - if (xmlRpcCall(cxt, "plus", "f", "ff", - (const char *) &retval, 10.1234, 10.1234) < 0) - return -1; - - return retval==(10.1234+10.1234) ? 0 : -1; -} - -static void -marshalRequest(virBufferPtr buf, const char *fmt, ...) -{ - int argc; - xmlRpcValuePtr *argv; - va_list ap; - - va_start(ap, fmt); - argv = xmlRpcArgvNew(fmt, ap, &argc); - va_end(ap); - - xmlRpcMarshalRequest("test", buf, argc, argv); - - xmlRpcArgvFree(argc, argv); -} - -static int -checkRequestValue(const char *xmlstr, const char *xpath, int type, void *expected) -{ - xmlDocPtr xml = NULL; - xmlXPathContextPtr ctxt = NULL; - xmlXPathObjectPtr obj = NULL; - int ret = -1; - - xml = xmlReadDoc((const xmlChar *) xmlstr, "xmlrpctest.xml", NULL, - XML_PARSE_NOENT | XML_PARSE_NONET | - XML_PARSE_NOERROR | XML_PARSE_NOWARNING); - if (!xml) - goto error; - - if (!(ctxt = xmlXPathNewContext(xml))) - goto error; - - if (!(obj = xmlXPathEval(BAD_CAST xpath, ctxt))) - goto error; - - switch(type) { - case XML_RPC_INTEGER: - if ((obj->type != XPATH_NUMBER) || - ((int) obj->floatval != *((int *)expected))) - goto error; - break; - case XML_RPC_DOUBLE: - if ((obj->type != XPATH_NUMBER) || - ((double) obj->floatval != *((double *)expected))) - goto error; - break; - case XML_RPC_STRING: - if ((obj->type != XPATH_STRING) || - (STRNEQ((const char *)obj->stringval, (const char *)expected))) - goto error; - break; - default: - goto error; - } - ret = 0; - -error: - xmlXPathFreeObject(obj); - xmlXPathFreeContext(ctxt); - if (xml) - xmlFreeDoc(xml); - return ret; -} - -static int -testMarshalRequestINT(const void *data) -{ - int num = INT_MAX; - int ret = 0; - int check = data ? *((int *)data) : 0; - virBuffer buf = VIR_BUFFER_INITIALIZER; - marshalRequest(&buf, "i", num); - char *content; - - if (virBufferError(&buf)) - return -1; - - content = virBufferContentAndReset(&buf); - - if (check) - ret = checkRequestValue(content, - "number(/methodCall/params/param[1]/value/int)", - XML_RPC_INTEGER, (void *) &num); - - free(content); - return ret; -} - -static int -testMarshalRequestSTRING(const void *data ATTRIBUTE_UNUSED) -{ - const char *str = "This library will be really sexy."; - int ret = 0; - int check = data ? *((int *)data) : 0; - virBuffer buf = VIR_BUFFER_INITIALIZER; - char *content; - - marshalRequest(&buf, "s", str); - - if (virBufferError(&buf)) - return -1; - - content = virBufferContentAndReset(&buf); - if (check) - ret = checkRequestValue(content, - "string(/methodCall/params/param[1]/value/string)", - XML_RPC_STRING, (void *) str); - - free(content); - return ret; -} - -static int -testMarshalRequestDOUBLE(const void *data) -{ - double num = 123456789.123; - int ret = 0; - int check = data ? *((int *)data) : 0; - virBuffer buf = VIR_BUFFER_INITIALIZER; - char *content; - - marshalRequest(&buf, "f", num); - - if (virBufferError(&buf)) - return -1; - - content = virBufferContentAndReset(&buf); - if (check) - ret = checkRequestValue(content, - "number(/methodCall/params/param[1]/value/double)", - XML_RPC_DOUBLE, (void *) &num); - - free(content); - return ret; -} - - -int -main(int argc, char **argv) -{ - xmlRpcContextPtr cxt = NULL; - int check = 1; - int ret = 0; - const char *url = "http://localhost:8000"; - - progname = argv[0]; - - if (argc > 2) - { - fprintf(stderr, "Usage: %s [url]\n", progname); - exit(EXIT_FAILURE); - } - if (argc == 2) - url = argv[1]; - - /* - * client-server tests - */ - if (!(cxt = xmlRpcContextNew(url))) - { - fprintf(stderr, "%s: failed create new RPC context\n", progname); - exit(EXIT_FAILURE); - } - - if (virtTestRun("XML-RPC methodCall INT+INT", - NLOOPS, testMethodPlusINT, (const void *) cxt) != 0) - ret = -1; - - if (virtTestRun("XML-RPC methodCall DOUBLE+DOUBLE", - NLOOPS, testMethodPlusDOUBLE, (const void *) cxt) != 0) - ret = -1; - - xmlRpcContextFree(cxt); - - /* - * regression / performance tests - */ - if (virtTestRun("XML-RPC request marshalling: INT (check)", - 1, testMarshalRequestINT, (const void *) &check) != 0) - ret = -1; - if (virtTestRun("XML-RPC request marshalling: INT", - NLOOPS, testMarshalRequestINT, NULL) != 0) - ret = -1; - - if (virtTestRun("XML-RPC request marshalling: DOUBLE (check)", - 1, testMarshalRequestDOUBLE, (const void *) &check) != 0) - ret = -1; - if (virtTestRun("XML-RPC request marshalling: DOUBLE", - NLOOPS, testMarshalRequestDOUBLE, NULL) != 0) - ret = -1; - - if (virtTestRun("XML-RPC request marshalling: STRING (check)", - 1, testMarshalRequestSTRING, (void *) &check) != 0) - ret = -1; - if (virtTestRun("XML-RPC request marshalling: STRING", - NLOOPS, testMarshalRequestSTRING, NULL) != 0) - ret = -1; - - exit(ret==0 ? EXIT_SUCCESS : EXIT_FAILURE); -} - - -/* - * vim: set tabstop=4: - * vim: set shiftwidth=4: - * vim: set expandtab: - */ -- 1.6.0.4.1044.g77718

3 3