- Devel - libvirt List Archives

[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