- Devel - libvirt List Archives

[Libvir] [PATCH] 0/2 Factor out query parsing from remote
by Richard W.M. Jones 15 Dec '07

15 Dec '07

We need to do query string assembly and parsing for the Amazon EC2 backend. These two patches factor out this code from inside remote_internal.c into a separate utility file. Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

3 6

[Libvir] [PATCH] Fix the cpus parameter setting of xenXMParseXMLToConfig
by Saori Fukuta 14 Dec '07

14 Dec '07

I think there is a unnecessary code for setting cpus parameter at xenXMParseXMLToConfig, since the cpus parameter is already set on the upper code. Because of this, converted cpus string will not be used. So, can I remove it ? Regards, Saori Fukuta

4 4

[Libvir] [PATCH] Fix detach-disk command for tap device
by Saori Fukuta 14 Dec '07

14 Dec '07

The detach-disk command does not work for tap device, since xenStoreDomainGetDiskID is always searching for vbd device from XenStore. c.f. This is a the related patch: http://git.et.redhat.com/?p=libvirt.git;a=commit;h=d27506d3a36e12b977f6a896… So, I changed the searching path to both vbd and tap. Regards, Saori Fukuta

4 3

[Libvir] Disks and NICs
by Katti, Vadiraj (STSD-Openview) 13 Dec '07

13 Dec '07

Hi, Libvirt provides the disk and Network interfaces statistics for each of the guests configured. Is there a api which tells me how many disk and network interface are configured per guest so that can make the corrosponding calls to get the statistics of each the disk/nic (like virDomainBlockStats and virDomainInterfaceStats). Thanks, Vadiraj

3 2

[Libvir] [PATCH] Fix escaping of '<' in virBufferEscapeString
by Richard W.M. Jones 12 Dec '07

12 Dec '07

< is currently escaped as &ll; I'm guessing it should be < These are the places where this function is used: src/xend_internal.c: virBufferEscapeString(buf, " <cmdline>%s</cmdline>\n", tmp); src/xend_internal.c: virBufferEscapeString(&buf, " <bootloader_args>%s</bootloader_args>\n", tmp); src/xm_internal.c: virBufferEscapeString(buf, " <bootloader_args>%s</bootloader_args>\n", str); src/xm_internal.c: virBufferEscapeString(buf, " <cmdline>%s</cmdline>\n", str); Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

3 2

[Libvir] [PATCH] Always build in python/ subdir.
by Jim Meyering 12 Dec '07

12 Dec '07

Hi guys, I'd like to remove the PYTHON_SUBDIR parameter, but (of course) still allow configure/build to proceed even when python-devel is not installed. Why? Because with the current code, I was able to build and _try_ to test a broken distribution tarball. Here's how it happened: While I had temporarily removed python-devel, I configured/built libvirt, ran "make check" to ensure that everything was ok, created a tarball to test on a remote RHEL5 system, and copied it over. But on the RHEL5 system, configure failed due to lack of python/Makefile.in. The entire python/ directory was missing. With the following change, I've confirmed it works as well as before (on both rawhide and RHEL5), yet can't cause the trouble I described: Always build in python/ subdir. * configure.in (PYTHON_SUBDIR): Don't set. Remove all uses. * Makefile.am (SUBDIRS): Hard-code "python" here. (tests): Test equivalent "$(pythondir)", not @PYTHON_SUBDIR@. --- Makefile.am | 4 ++-- configure.in | 7 ------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/Makefile.am b/Makefile.am index c49c533..34a1eb5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in SUBDIRS = gnulib/lib include src qemud proxy docs gnulib/tests \ - @PYTHON_SUBDIR@ tests po scripts + python tests po scripts ACLOCAL_AMFLAGS = -I m4 -I gnulib/m4 @@ -21,7 +21,7 @@ check-local: all tests tests: @(cd docs/examples ; $(MAKE) MAKEFLAGS+=--silent tests) - @(if [ "@PYTHON_SUBDIR@" != "" ] ; then cd python ; \ + @(if [ "$(pythondir)" != "" ] ; then cd python ; \ $(MAKE) MAKEFLAGS+=--silent tests ; fi) cov: cov-recursive cov-am diff --git a/configure.in b/configure.in index 8e5cca4..d37c0d8 100644 --- a/configure.in +++ b/configure.in @@ -568,14 +568,7 @@ else PYTHON= fi AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "") -if test "$PYTHON_INCLUDES" != "" -then - PYTHON_SUBDIR=python -else - PYTHON_SUBDIR= -fi AC_SUBST(pythondir) -AC_SUBST(PYTHON_SUBDIR) AC_SUBST(PYTHON_VERSION) AC_SUBST(PYTHON_INCLUDES) AC_SUBST(PYTHON_SITE_PACKAGES) -- 1.5.3.7.1112.g9758e

2 2

[Libvir] begin conversion to safer use of sizeof: exposes a harmless bug
by Jim Meyering 12 Dec '07

12 Dec '07

Since no one objected to my suggestion here: http://thread.gmane.org/gmane.comp.emulators.libvirt/3956/focus=4039 > Given code like T *var = calloc (n, sizeof (T)); > I prefer this: T *var = calloc (n, sizeof (*var)); I've gone ahead with some first steps. With the patch below, there are only two .o files with differences. Mainly for my own reference, here's what I did: make CFLAGS=-g mkdir ../obj for i in $(find . -name '*.o'); do cp -l --parents $i ../obj;done make clean patch -p1 < this-patch make CFLAGS=-g for i in $(find . -name '*.o'); do cmp $i ../obj/$i;done The first difference was due to my minor factorization in xmlrpc.c. That was expected. However, the second was not. The calloc stmt below (from remote_internal.c) applies sizeof to the wrong type: static int remoteAuthMakeCredentials(sasl_interact_t *interact, virConnectCredentialPtr *cred) { int ninteract; if (!cred) return -1; for (ninteract = 0 ; interact[ninteract].id != 0 ; ninteract++) ; /* empty */ *cred = calloc(ninteract, sizeof(virConnectCredential)); if (!*cred) ------------------------ We're lucky virConnectCredential is not smaller than sizeof void*. If it had been, this would have been a real bug, rather than just an over-allocation. I've also removed all casts of malloc, realloc, calloc return values on the touched lines, since they are universally unnecessary. ----------------------- Subject: [PATCH] Use a variable name as sizeof argument, not a type name. Given code like: T *var = calloc (n, sizeof (T)); Convert to this: T *var = calloc (n, sizeof (*var)); This first-cut change adjusts all malloc, calloc, and realloc statements. The only binary differences are in remote_internal.c (due to the bug fix) and in xmlrpc.c (due to factorization). * python/libvir.c: As above. * qemud/event.c: Likewise. * qemud/mdns.c: Likewise. * qemud/qemud.c: Likewise. * qemud/remote.c: Likewise. * src/bridge.c: Likewise. * src/buf.c: Likewise. * src/conf.c: Likewise. * src/hash.c: Likewise. * src/iptables.c: Likewise. * src/openvz_conf.c: Likewise. * src/qemu_conf.c: Likewise. * src/qemu_driver.c: Likewise. * src/test.c: Likewise. * src/xen_internal.c: Likewise. * src/xen_unified.c: Likewise. * src/xm_internal.c: Likewise. * src/xml.c: Likewise. * tests/qemuxml2argvtest.c: Likewise. * src/xmlrpc.c (xmlRpcValuePtr): Likewise, and minor factorization. * src/remote_internal.c (remoteAuthMakeCredentials): Use the right type when allocating space for an array of cred _pointers_. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- ChangeLog | 25 +++++++++++++++++++++++++ python/libvir.c | 12 ++++++------ qemud/event.c | 2 +- qemud/mdns.c | 12 ++++++------ qemud/qemud.c | 6 +++--- qemud/remote.c | 24 ++++++++++++------------ src/bridge.c | 6 +++--- src/buf.c | 2 +- src/conf.c | 8 ++++---- src/hash.c | 16 ++++++++-------- src/iptables.c | 10 +++++----- src/openvz_conf.c | 12 ++++++------ src/qemu_conf.c | 24 ++++++++++++------------ src/qemu_driver.c | 4 ++-- src/remote_internal.c | 14 +++++++------- src/test.c | 4 ++-- src/xen_internal.c | 22 +++++++++++----------- src/xen_unified.c | 4 ++-- src/xm_internal.c | 30 +++++++++++++++--------------- src/xml.c | 10 +++++----- src/xmlrpc.c | 10 ++++++---- tests/qemuxml2argvtest.c | 2 +- 22 files changed, 143 insertions(+), 116 deletions(-) diff --git a/ChangeLog b/ChangeLog index efc765b..8a6526c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,28 @@ +2007-12-11 Jim Meyering <meyering(a)redhat.com> + + Change RHS of T *V = *alloc (sizeof (T) to *alloc (sizeof *V) + * python/libvir.c: + * qemud/event.c: + * qemud/mdns.c: + * qemud/qemud.c: + * qemud/remote.c: + * src/bridge.c: + * src/buf.c: + * src/conf.c: + * src/hash.c: + * src/iptables.c: + * src/openvz_conf.c: + * src/qemu_conf.c: + * src/qemu_driver.c: + * src/remote_internal.c: + * src/test.c: + * src/xen_internal.c: + * src/xen_unified.c: + * src/xm_internal.c: + * src/xml.c: + * src/xmlrpc.c: + * tests/qemuxml2argvtest.c: + Mon Dec 10 19:25:22 CET 2007 Jim Meyering <meyering(a)redhat.com> Add gnulib-tool unit tests. diff --git a/python/libvir.c b/python/libvir.c index 0edec41..3b41dc1 100644 --- a/python/libvir.c +++ b/python/libvir.c @@ -347,7 +347,7 @@ libvirt_virConnectOpenAuth(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { auth.ncredtype = PyList_Size(pycredtype); if (auth.ncredtype) { int i; - auth.credtype = malloc(sizeof(int) * auth.ncredtype); + auth.credtype = malloc(sizeof(*auth.credtype) * auth.ncredtype); if (auth.credtype == NULL) { Py_INCREF(Py_None); return (Py_None); @@ -490,7 +490,7 @@ libvirt_virConnectListDefinedDomains(PyObject *self ATTRIBUTE_UNUSED, } if (c_retval) { - names = malloc(sizeof(char *) * c_retval); + names = malloc(sizeof(*names) * c_retval); if (!names) { Py_INCREF(Py_None); return (Py_None); @@ -670,7 +670,7 @@ libvirt_virConnectListNetworks(PyObject *self ATTRIBUTE_UNUSED, } if (c_retval) { - names = malloc(sizeof(char *) * c_retval); + names = malloc(sizeof(*names) * c_retval); if (!names) { Py_INCREF(Py_None); return (Py_None); @@ -717,7 +717,7 @@ libvirt_virConnectListDefinedNetworks(PyObject *self ATTRIBUTE_UNUSED, } if (c_retval) { - names = malloc(sizeof(char *) * c_retval); + names = malloc(sizeof(*names) * c_retval); if (!names) { Py_INCREF(Py_None); return (Py_None); @@ -863,8 +863,8 @@ PyObject * libvirt_virNodeGetCellsFreeMemory(PyObject *self ATTRIBUTE_UNUSED, goto error; conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); - freeMems = (unsigned long long *) - malloc(maxCells * sizeof(unsigned long long)); + freeMems = + malloc(maxCells * sizeof(*freeMems)); if (freeMems == NULL) goto error; diff --git a/qemud/event.c b/qemud/event.c index 1faeaf1..b7d75a0 100644 --- a/qemud/event.c +++ b/qemud/event.c @@ -281,7 +281,7 @@ static int virEventMakePollFDs(struct pollfd **retfds) { } *retfds = NULL; /* Setup the poll file handle data structs */ - if (!(fds = malloc(sizeof(struct pollfd) * nfds))) + if (!(fds = malloc(sizeof(*fds) * nfds))) return -1; for (i = 0, nfds = 0 ; i < eventLoop.handlesCount ; i++) { diff --git a/qemud/mdns.c b/qemud/mdns.c index bd1f548..1585b5b 100644 --- a/qemud/mdns.c +++ b/qemud/mdns.c @@ -239,7 +239,7 @@ static void libvirtd_mdns_watch_dispatch(int fd, int events, void *opaque) static AvahiWatch *libvirtd_mdns_watch_new(const AvahiPoll *api ATTRIBUTE_UNUSED, int fd, AvahiWatchEvent event, AvahiWatchCallback cb, void *userdata) { - AvahiWatch *w = malloc(sizeof(AvahiWatch)); + AvahiWatch *w = malloc(sizeof(*w)); if (!w) return NULL; @@ -289,7 +289,7 @@ static AvahiTimeout *libvirtd_mdns_timeout_new(const AvahiPoll *api ATTRIBUTE_UN AvahiTimeoutCallback cb, void *userdata) { - AvahiTimeout *t = malloc(sizeof(AvahiTimeout)); + AvahiTimeout *t = malloc(sizeof(*t)); struct timeval now; long long nowms, thenms, timeout; AVAHI_DEBUG("Add timeout %p TV %p", t, tv); @@ -359,7 +359,7 @@ static void libvirtd_mdns_timeout_free(AvahiTimeout *t) static AvahiPoll *libvirtd_create_poll(void) { - AvahiPoll *p = malloc(sizeof(AvahiPoll)); + AvahiPoll *p = malloc(sizeof(*p)); if (!p) return NULL; @@ -379,7 +379,7 @@ static AvahiPoll *libvirtd_create_poll(void) struct libvirtd_mdns *libvirtd_mdns_new(void) { - struct libvirtd_mdns *mdns = malloc(sizeof(struct libvirtd_mdns)); + struct libvirtd_mdns *mdns = malloc(sizeof(*mdns)); if (!mdns) return NULL; memset(mdns, 0, sizeof(*mdns)); @@ -408,7 +408,7 @@ int libvirtd_mdns_start(struct libvirtd_mdns *mdns) } struct libvirtd_mdns_group *libvirtd_mdns_add_group(struct libvirtd_mdns *mdns, const char *name) { - struct libvirtd_mdns_group *group = malloc(sizeof(struct libvirtd_mdns_group)); + struct libvirtd_mdns_group *group = malloc(sizeof(*group)); AVAHI_DEBUG("Adding group '%s'", name); if (!group) @@ -444,7 +444,7 @@ void libvirtd_mdns_remove_group(struct libvirtd_mdns *mdns, struct libvirtd_mdns } struct libvirtd_mdns_entry *libvirtd_mdns_add_entry(struct libvirtd_mdns_group *group, const char *type, int port) { - struct libvirtd_mdns_entry *entry = malloc(sizeof(struct libvirtd_mdns_entry)); + struct libvirtd_mdns_entry *entry = malloc(sizeof(*entry)); AVAHI_DEBUG("Adding entry %s %d to group %s", type, port, group->name); if (!entry) diff --git a/qemud/qemud.c b/qemud/qemud.c index 9794c03..5360cf8 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -460,7 +460,7 @@ static int qemudWritePidFile(const char *pidFile) { static int qemudListenUnix(struct qemud_server *server, const char *path, int readonly, int auth) { - struct qemud_socket *sock = calloc(1, sizeof(struct qemud_socket)); + struct qemud_socket *sock = calloc(1, sizeof(*sock)); struct sockaddr_un addr; mode_t oldmask; gid_t oldgrp; @@ -703,7 +703,7 @@ static int qemudInitPaths(struct qemud_server *server, static struct qemud_server *qemudInitialize(int sigread) { struct qemud_server *server; - if (!(server = calloc(1, sizeof(struct qemud_server)))) { + if (!(server = calloc(1, sizeof(*server)))) { qemudLog(QEMUD_ERR, "Failed to allocate struct qemud_server"); return NULL; } @@ -1043,7 +1043,7 @@ static int qemudDispatchServer(struct qemud_server *server, struct qemud_socket return -1; } - client = calloc(1, sizeof(struct qemud_client)); + client = calloc(1, sizeof(*client)); if (client == NULL) goto cleanup; client->magic = QEMUD_CLIENT_MAGIC; diff --git a/qemud/remote.c b/qemud/remote.c index 8c07b95..b5b0ef6 100644 --- a/qemud/remote.c +++ b/qemud/remote.c @@ -639,7 +639,7 @@ remoteDispatchDomainGetSchedulerParameters (struct qemud_server *server ATTRIBUT remoteDispatchError (client, req, "nparams too large"); return -2; } - params = malloc (sizeof (virSchedParameter) * nparams); + params = malloc (sizeof (*params) * nparams); if (params == NULL) { remoteDispatchError (client, req, "out of memory allocating array"); return -2; @@ -661,7 +661,7 @@ remoteDispatchDomainGetSchedulerParameters (struct qemud_server *server ATTRIBUT /* Serialise the scheduler parameters. */ ret->params.params_len = nparams; - ret->params.params_val = malloc (sizeof (struct remote_sched_param) + ret->params.params_val = malloc (sizeof (*(ret->params.params_val)) * nparams); if (ret->params.params_val == NULL) { virDomainFree(dom); @@ -726,7 +726,7 @@ remoteDispatchDomainSetSchedulerParameters (struct qemud_server *server ATTRIBUT remoteDispatchError (client, req, "nparams too large"); return -2; } - params = malloc (sizeof (virSchedParameter) * nparams); + params = malloc (sizeof (*params) * nparams); if (params == NULL) { remoteDispatchError (client, req, "out of memory allocating array"); return -2; @@ -1158,8 +1158,8 @@ remoteDispatchDomainGetVcpus (struct qemud_server *server ATTRIBUTE_UNUSED, } /* Allocate buffers to take the results. */ - info = calloc (args->maxinfo, sizeof (virVcpuInfo)); - cpumaps = calloc (args->maxinfo * args->maplen, sizeof (unsigned char)); + info = calloc (args->maxinfo, sizeof (*info)); + cpumaps = calloc (args->maxinfo * args->maplen, sizeof (*cpumaps)); info_len = virDomainGetVcpus (dom, info, args->maxinfo, @@ -1171,7 +1171,7 @@ remoteDispatchDomainGetVcpus (struct qemud_server *server ATTRIBUTE_UNUSED, /* Allocate the return buffer for info. */ ret->info.info_len = info_len; - ret->info.info_val = calloc (info_len, sizeof (remote_vcpu_info)); + ret->info.info_val = calloc (info_len, sizeof (*(ret->info.info_val))); for (i = 0; i < info_len; ++i) { ret->info.info_val[i].number = info[i].number; @@ -1210,7 +1210,7 @@ remoteDispatchDomainMigratePrepare (struct qemud_server *server ATTRIBUTE_UNUSED dname = args->dname == NULL ? NULL : *args->dname; /* Wacky world of XDR ... */ - uri_out = calloc (1, sizeof (char *)); + uri_out = calloc (1, sizeof (*uri_out)); r = __virDomainMigratePrepare (client->conn, &cookie, &cookielen, uri_in, uri_out, @@ -1295,7 +1295,7 @@ remoteDispatchListDefinedDomains (struct qemud_server *server ATTRIBUTE_UNUSED, } /* Allocate return buffer. */ - ret->names.names_val = calloc (args->maxnames, sizeof (char *)); + ret->names.names_val = calloc (args->maxnames, sizeof (*(ret->names.names_val))); ret->names.names_len = virConnectListDefinedDomains (client->conn, @@ -1703,7 +1703,7 @@ remoteDispatchListDefinedNetworks (struct qemud_server *server ATTRIBUTE_UNUSED, } /* Allocate return buffer. */ - ret->names.names_val = calloc (args->maxnames, sizeof (char *)); + ret->names.names_val = calloc (args->maxnames, sizeof (*(ret->names.names_val))); ret->names.names_len = virConnectListDefinedNetworks (client->conn, @@ -1729,7 +1729,7 @@ remoteDispatchListDomains (struct qemud_server *server ATTRIBUTE_UNUSED, } /* Allocate return buffer. */ - ret->ids.ids_val = calloc (args->maxids, sizeof (int)); + ret->ids.ids_val = calloc (args->maxids, sizeof (*(ret->ids.ids_val))); ret->ids.ids_len = virConnectListDomains (client->conn, ret->ids.ids_val, args->maxids); @@ -1754,7 +1754,7 @@ remoteDispatchListNetworks (struct qemud_server *server ATTRIBUTE_UNUSED, } /* Allocate return buffer. */ - ret->names.names_val = calloc (args->maxnames, sizeof (char *)); + ret->names.names_val = calloc (args->maxnames, sizeof (*(ret->names.names_val))); ret->names.names_len = virConnectListNetworks (client->conn, @@ -2062,7 +2062,7 @@ remoteDispatchAuthList (struct qemud_server *server ATTRIBUTE_UNUSED, remote_auth_list_ret *ret) { ret->types.types_len = 1; - if ((ret->types.types_val = calloc (ret->types.types_len, sizeof (remote_auth_type))) == NULL) { + if ((ret->types.types_val = calloc (ret->types.types_len, sizeof (*(ret->types.types_val)))) == NULL) { remoteDispatchSendError(client, req, VIR_ERR_NO_MEMORY, "auth types"); return -2; } diff --git a/src/bridge.c b/src/bridge.c index 5badc21..caa6ebf 100644 --- a/src/bridge.c +++ b/src/bridge.c @@ -83,7 +83,7 @@ brInit(brControl **ctlp) return err; } - *ctlp = (brControl *)malloc(sizeof(struct _brControl)); + *ctlp = malloc(sizeof(**ctlp)); if (!*ctlp) { close(fd); return ENOMEM; @@ -680,7 +680,7 @@ brSetForwardDelay(brControl *ctl ATTRIBUTE_UNUSED, snprintf(delayStr, sizeof(delayStr), "%d", delay); - if (!(argv = (char **)calloc(n + 1, sizeof(char *)))) + if (!(argv = calloc(n + 1, sizeof(*argv)))) goto error; n = 0; @@ -737,7 +737,7 @@ brSetEnableSTP(brControl *ctl ATTRIBUTE_UNUSED, 1 + /* brige name */ 1; /* value */ - if (!(argv = (char **)calloc(n + 1, sizeof(char *)))) + if (!(argv = calloc(n + 1, sizeof(*argv)))) goto error; n = 0; diff --git a/src/buf.c b/src/buf.c index 5b7f15d..0229be9 100644 --- a/src/buf.c +++ b/src/buf.c @@ -40,7 +40,7 @@ virBufferGrow(virBufferPtr buf, unsigned int len) size = buf->use + len + 1000; - newbuf = (char *) realloc(buf->content, size); + newbuf = realloc(buf->content, size); if (newbuf == NULL) return -1; buf->content = newbuf; buf->size = size; diff --git a/src/conf.c b/src/conf.c index 4c725bf..8190de1 100644 --- a/src/conf.c +++ b/src/conf.c @@ -152,7 +152,7 @@ __virConfNew(void) { virConfPtr ret; - ret = (virConfPtr) calloc(1, sizeof(virConf)); + ret = calloc(1, sizeof(*ret)); if (ret == NULL) { virConfError(NULL, VIR_ERR_NO_MEMORY, _("allocating configuration"), 0); return(NULL); @@ -201,7 +201,7 @@ virConfAddEntry(virConfPtr conf, char *name, virConfValuePtr value, char *comm) if ((comm == NULL) && (name == NULL)) return(NULL); - ret = (virConfEntryPtr) calloc(1, sizeof(virConfEntry)); + ret = calloc(1, sizeof(*ret)); if (ret == NULL) { virConfError(NULL, VIR_ERR_NO_MEMORY, _("allocating configuration"), 0); return(NULL); @@ -486,7 +486,7 @@ virConfParseValue(virConfParserCtxtPtr ctxt) ctxt->line); return(NULL); } - ret = (virConfValuePtr) calloc(1, sizeof(virConfValue)); + ret = calloc(1, sizeof(*ret)); if (ret == NULL) { virConfError(NULL, VIR_ERR_NO_MEMORY, _("allocating configuration"), 0); if (str != NULL) @@ -837,7 +837,7 @@ __virConfSetValue (virConfPtr conf, } if (!cur) { - if (!(cur = malloc(sizeof(virConfEntry)))) { + if (!(cur = malloc(sizeof(*cur)))) { virConfFreeValue(value); return (-1); } diff --git a/src/hash.c b/src/hash.c index b7962d9..8f322f1 100644 --- a/src/hash.c +++ b/src/hash.c @@ -87,11 +87,11 @@ virHashCreate(int size) if (size <= 0) size = 256; - table = malloc(sizeof(virHashTable)); + table = malloc(sizeof(*table)); if (table) { table->size = size; table->nbElems = 0; - table->table = calloc(1, size * sizeof(virHashEntry)); + table->table = calloc(1, size * sizeof(*(table->table))); if (table->table) { return (table); } @@ -133,7 +133,7 @@ virHashGrow(virHashTablePtr table, int size) if (oldtable == NULL) return (-1); - table->table = calloc(1, size * sizeof(virHashEntry)); + table->table = calloc(1, size * sizeof(*(table->table))); if (table->table == NULL) { table->table = oldtable; return (-1); @@ -279,7 +279,7 @@ virHashAddEntry(virHashTablePtr table, const char *name, void *userdata) if (insert == NULL) { entry = &(table->table[key]); } else { - entry = malloc(sizeof(virHashEntry)); + entry = malloc(sizeof(*entry)); if (entry == NULL) return (-1); } @@ -352,7 +352,7 @@ virHashUpdateEntry(virHashTablePtr table, const char *name, if (insert == NULL) { entry = &(table->table[key]); } else { - entry = malloc(sizeof(virHashEntry)); + entry = malloc(sizeof(*entry)); if (entry == NULL) return (-1); } @@ -661,7 +661,7 @@ virConnectPtr virGetConnect(void) { virConnectPtr ret; - ret = (virConnectPtr) calloc(1, sizeof(virConnect)); + ret = calloc(1, sizeof(*ret)); if (ret == NULL) { virHashError(NULL, VIR_ERR_NO_MEMORY, _("allocating connection")); goto failed; @@ -768,7 +768,7 @@ __virGetDomain(virConnectPtr conn, const char *name, const unsigned char *uuid) /* * not found, allocate a new one */ - ret = (virDomainPtr) calloc(1, sizeof(virDomain)); + ret = calloc(1, sizeof(*ret)); if (ret == NULL) { virHashError(conn, VIR_ERR_NO_MEMORY, _("allocating domain")); goto error; @@ -901,7 +901,7 @@ __virGetNetwork(virConnectPtr conn, const char *name, const unsigned char *uuid) /* * not found, allocate a new one */ - ret = (virNetworkPtr) calloc(1, sizeof(virNetwork)); + ret = calloc(1, sizeof(*ret)); if (ret == NULL) { virHashError(conn, VIR_ERR_NO_MEMORY, _("allocating network")); goto error; diff --git a/src/iptables.c b/src/iptables.c index ee92796..26794d2 100644 --- a/src/iptables.c +++ b/src/iptables.c @@ -215,7 +215,7 @@ iptRulesAppend(iptRules *rules, { iptRule *r; - if (!(r = (iptRule *)realloc(rules->rules, sizeof(iptRule) * (rules->nrules+1)))) { + if (!(r = realloc(rules->rules, sizeof(*r) * (rules->nrules+1)))) { int i = 0; while (argv[i]) free(argv[i++]); @@ -319,7 +319,7 @@ iptRulesNew(const char *table, { iptRules *rules; - if (!(rules = (iptRules *)calloc(1, sizeof (iptRules)))) + if (!(rules = calloc(1, sizeof (*rules)))) return NULL; if (!(rules->table = strdup(table))) @@ -400,7 +400,7 @@ iptablesAddRemoveChain(iptRules *rules, int action) 2 + /* --table foo */ 2; /* --new-chain bar */ - if (!(argv = (char **)calloc(n + 1, sizeof(char *)))) + if (!(argv = calloc(n + 1, sizeof(*argv)))) goto error; n = 0; @@ -458,7 +458,7 @@ iptablesAddRemoveRule(iptRules *rules, int action, const char *arg, ...) va_end(args); - if (!(argv = (char **)calloc(n + 1, sizeof(char *)))) + if (!(argv = calloc(n + 1, sizeof(*argv)))) goto error; if (!(rule = (char *)malloc(rulelen))) @@ -549,7 +549,7 @@ iptablesContextNew(void) { iptablesContext *ctx; - if (!(ctx = (iptablesContext *) calloc(1, sizeof (iptablesContext)))) + if (!(ctx = calloc(1, sizeof (*ctx)))) return NULL; if (!(ctx->input_filter = iptRulesNew("filter", IPTABLES_PREFIX "INPUT"))) diff --git a/src/openvz_conf.c b/src/openvz_conf.c index 0502a1d..a886001 100644 --- a/src/openvz_conf.c +++ b/src/openvz_conf.c @@ -246,7 +246,7 @@ openvzAssignVMDef(virConnectPtr conn, return vm; } - if (!(vm = calloc(1, sizeof(struct openvz_vm)))) { + if (!(vm = calloc(1, sizeof(*vm)))) { openvzFreeVMDef(def); error(conn, VIR_ERR_NO_MEMORY, "vm"); return NULL; @@ -298,7 +298,7 @@ static struct openvz_vm_def struct ovz_ip *ovzIp; struct ovz_ns *ovzNs; - if (!(def = calloc(1, sizeof(struct openvz_vm_def)))) { + if (!(def = calloc(1, sizeof(*def)))) { error(conn, VIR_ERR_NO_MEMORY, "xmlXPathContext"); return NULL; } @@ -393,7 +393,7 @@ static struct openvz_vm_def error(conn, VIR_ERR_INTERNAL_ERROR, errorMessage); goto bail_out; } - if (!(ovzIp = calloc(1, sizeof(struct ovz_ip)))) { + if (!(ovzIp = calloc(1, sizeof(*ovzIp)))) { openvzLog(OPENVZ_ERR, "Failed to Create Memory for 'ovz_ip' structure"); goto bail_out; } @@ -465,7 +465,7 @@ static struct openvz_vm_def error(conn, VIR_ERR_INTERNAL_ERROR, errorMessage); goto bail_out; } - if (!(ovzNs = calloc(1, sizeof(struct ovz_ns)))) { + if (!(ovzNs = calloc(1, sizeof(*ovzNs)))) { openvzLog(OPENVZ_ERR, "Failed to Create Memory for 'ovz_ns' structure"); goto bail_out; } @@ -527,7 +527,7 @@ openvzGetVPSInfo(virConnectPtr conn) { } pnext = &vm; while(!feof(fp)) { - *pnext = calloc(1, sizeof(struct openvz_vm)); + *pnext = calloc(1, sizeof(**pnext)); if(!*pnext) { error(conn, VIR_ERR_INTERNAL_ERROR, "calloc failed"); goto error; @@ -557,7 +557,7 @@ openvzGetVPSInfo(virConnectPtr conn) { (*pnext)->vpsid = -1; } - vmdef = calloc(1, sizeof(struct openvz_vm_def)); + vmdef = calloc(1, sizeof(*vmdef)); if(!vmdef) { error(conn, VIR_ERR_INTERNAL_ERROR, "calloc failed"); free(*pnext); diff --git a/src/qemu_conf.c b/src/qemu_conf.c index 2d003af..2b87c88 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -918,7 +918,7 @@ static struct qemud_vm_def *qemudParseXML(virConnectPtr conn, int i; struct qemud_vm_def *def; - if (!(def = calloc(1, sizeof(struct qemud_vm_def)))) { + if (!(def = calloc(1, sizeof(*def)))) { qemudReportError(conn, NULL, NULL, VIR_ERR_NO_MEMORY, "xmlXPathContext"); return NULL; } @@ -1264,7 +1264,7 @@ static struct qemud_vm_def *qemudParseXML(virConnectPtr conn, (obj->nodesetval != NULL) && (obj->nodesetval->nodeNr >= 0)) { struct qemud_vm_disk_def *prev = NULL; for (i = 0; i < obj->nodesetval->nodeNr; i++) { - struct qemud_vm_disk_def *disk = calloc(1, sizeof(struct qemud_vm_disk_def)); + struct qemud_vm_disk_def *disk = calloc(1, sizeof(*disk)); if (!disk) { qemudReportError(conn, NULL, NULL, VIR_ERR_NO_MEMORY, "disk"); goto error; @@ -1292,7 +1292,7 @@ static struct qemud_vm_def *qemudParseXML(virConnectPtr conn, (obj->nodesetval != NULL) && (obj->nodesetval->nodeNr >= 0)) { struct qemud_vm_net_def *prev = NULL; for (i = 0; i < obj->nodesetval->nodeNr; i++) { - struct qemud_vm_net_def *net = calloc(1, sizeof(struct qemud_vm_net_def)); + struct qemud_vm_net_def *net = calloc(1, sizeof(*net)); if (!net) { qemudReportError(conn, NULL, NULL, VIR_ERR_NO_MEMORY, "net"); goto error; @@ -1319,7 +1319,7 @@ static struct qemud_vm_def *qemudParseXML(virConnectPtr conn, (obj->nodesetval != NULL) && (obj->nodesetval->nodeNr >= 0)) { struct qemud_vm_input_def *prev = NULL; for (i = 0; i < obj->nodesetval->nodeNr; i++) { - struct qemud_vm_input_def *input = calloc(1, sizeof(struct qemud_vm_input_def)); + struct qemud_vm_input_def *input = calloc(1, sizeof(*input)); if (!input) { qemudReportError(conn, NULL, NULL, VIR_ERR_NO_MEMORY, "input"); goto error; @@ -1359,7 +1359,7 @@ static struct qemud_vm_def *qemudParseXML(virConnectPtr conn, } if (!hasPS2mouse) { - input = calloc(1, sizeof(struct qemud_vm_input_def)); + input = calloc(1, sizeof(*input)); if (!input) { qemudReportError(conn, NULL, NULL, VIR_ERR_NO_MEMORY, "input"); goto error; @@ -1454,7 +1454,7 @@ qemudNetworkIfaceConnect(virConnectPtr conn, if (!(retval = strdup(tapfdstr))) goto no_memory; - if (!(tapfds = realloc(vm->tapfds, sizeof(int) * (vm->ntapfds+2)))) + if (!(tapfds = realloc(vm->tapfds, sizeof(*tapfds) * (vm->ntapfds+2)))) goto no_memory; vm->tapfds = tapfds; @@ -1554,7 +1554,7 @@ int qemudBuildCommandLine(virConnectPtr conn, snprintf(memory, sizeof(memory), "%d", vm->def->memory/1024); snprintf(vcpus, sizeof(vcpus), "%d", vm->def->vcpus); - if (!(*argv = malloc(sizeof(char *) * (len+1)))) + if (!(*argv = malloc(sizeof(**argv) * (len+1)))) goto no_memory; if (!((*argv)[++n] = strdup(vm->def->os.binary))) goto no_memory; @@ -1899,7 +1899,7 @@ qemudParseVMDeviceDef(virConnectPtr conn, { xmlDocPtr xml; xmlNodePtr node; - struct qemud_vm_device_def *dev = calloc(1, sizeof(struct qemud_vm_device_def)); + struct qemud_vm_device_def *dev = calloc(1, sizeof(*dev)); if (!(xml = xmlReadDoc(BAD_CAST xmlStr, "device.xml", NULL, XML_PARSE_NOENT | XML_PARSE_NONET | @@ -1981,7 +1981,7 @@ qemudAssignVMDef(virConnectPtr conn, return vm; } - if (!(vm = calloc(1, sizeof(struct qemud_vm)))) { + if (!(vm = calloc(1, sizeof(*vm)))) { qemudReportError(conn, NULL, NULL, VIR_ERR_NO_MEMORY, "vm"); return NULL; } @@ -2180,7 +2180,7 @@ static int qemudParseDhcpRangesXML(virConnectPtr conn, continue; } - if (!(range = calloc(1, sizeof(struct qemud_dhcp_range_def)))) { + if (!(range = calloc(1, sizeof(*range)))) { qemudReportError(conn, NULL, NULL, VIR_ERR_NO_MEMORY, "range"); return 0; } @@ -2272,7 +2272,7 @@ static struct qemud_network_def *qemudParseNetworkXML(virConnectPtr conn, xmlXPathObjectPtr obj = NULL, tmp = NULL; struct qemud_network_def *def; - if (!(def = calloc(1, sizeof(struct qemud_network_def)))) { + if (!(def = calloc(1, sizeof(*def)))) { qemudReportError(conn, NULL, NULL, VIR_ERR_NO_MEMORY, "network_def"); return NULL; } @@ -2433,7 +2433,7 @@ qemudAssignNetworkDef(virConnectPtr conn, return network; } - if (!(network = calloc(1, sizeof(struct qemud_network)))) { + if (!(network = calloc(1, sizeof(*network)))) { qemudReportError(conn, NULL, NULL, VIR_ERR_NO_MEMORY, "network"); return NULL; } diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 8c3e0af..f792eba 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -158,7 +158,7 @@ qemudStartup(void) { char *base = NULL; char driverConf[PATH_MAX]; - if (!(qemu_driver = calloc(1, sizeof(struct qemud_driver)))) { + if (!(qemu_driver = calloc(1, sizeof(*qemu_driver)))) { return -1; } @@ -838,7 +838,7 @@ qemudBuildDnsmasqArgv(virConnectPtr conn, (2 * network->def->nranges) + /* --dhcp-range 10.0.0.2,10.0.0.254 */ 1; /* NULL */ - if (!(*argv = calloc(len, sizeof(char *)))) + if (!(*argv = calloc(len, sizeof(**argv)))) goto no_memory; #define APPEND_ARG(v, n, s) do { \ diff --git a/src/remote_internal.c b/src/remote_internal.c index 8174ba5..b6513fb 100644 --- a/src/remote_internal.c +++ b/src/remote_internal.c @@ -661,7 +661,7 @@ doRemoteOpen (virConnectPtr conn, // Generate the final command argv[] array. // ssh -p $port [-l $username] $hostname $netcat -U $sockname [NULL] - cmd_argv = malloc (nr_args * sizeof (char *)); + cmd_argv = malloc (nr_args * sizeof (*cmd_argv)); if (cmd_argv == NULL) { error (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno)); goto failed; @@ -724,7 +724,7 @@ doRemoteOpen (virConnectPtr conn, // Run the external process. if (!cmd_argv) { - cmd_argv = malloc (2 * sizeof (char *)); + cmd_argv = malloc (2 * sizeof (*cmd_argv)); if (cmd_argv == NULL) { error (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno)); goto failed; @@ -833,7 +833,7 @@ remoteOpen (virConnectPtr conn, if (inside_daemon) return VIR_DRV_OPEN_DECLINED; - priv = malloc (sizeof(struct private_data)); + priv = malloc (sizeof(*priv)); if (!priv) { error (conn, VIR_ERR_NO_MEMORY, "struct private_data"); return VIR_DRV_OPEN_ERROR; @@ -2381,7 +2381,7 @@ remoteDomainSetSchedulerParameters (virDomainPtr domain, /* Serialise the scheduler parameters. */ args.params.params_len = nparams; - args.params.params_val = malloc (sizeof (struct remote_sched_param) + args.params.params_val = malloc (sizeof (*args.params.params_val) * nparams); if (args.params.params_val == NULL) { error (domain->conn, VIR_ERR_RPC, "out of memory allocating array"); @@ -2513,7 +2513,7 @@ remoteNetworkOpen (virConnectPtr conn, * use the UNIX transport. This handles Xen driver * which doesn't have its own impl of the network APIs. */ - struct private_data *priv = malloc (sizeof(struct private_data)); + struct private_data *priv = malloc (sizeof(*priv)); int ret, rflags = 0; if (!priv) { error (conn, VIR_ERR_NO_MEMORY, "struct private_data"); @@ -3088,7 +3088,7 @@ static int remoteAuthCredSASL2Vir(int vircred) */ static sasl_callback_t *remoteAuthMakeCallbacks(int *credtype, int ncredtype) { - sasl_callback_t *cbs = calloc(ncredtype+1, sizeof (sasl_callback_t)); + sasl_callback_t *cbs = calloc(ncredtype+1, sizeof (*cbs)); int i, n; if (!cbs) { return NULL; @@ -3125,7 +3125,7 @@ static int remoteAuthMakeCredentials(sasl_interact_t *interact, for (ninteract = 0 ; interact[ninteract].id != 0 ; ninteract++) ; /* empty */ - *cred = calloc(ninteract, sizeof(virConnectCredential)); + *cred = calloc(ninteract, sizeof(*cred)); if (!*cred) return -1; diff --git a/src/test.c b/src/test.c index 0e85f73..825707c 100644 --- a/src/test.c +++ b/src/test.c @@ -592,7 +592,7 @@ static int testLoadNetworkFromFile(virConnectPtr conn, static int testOpenDefault(virConnectPtr conn) { int u; struct timeval tv; - testConnPtr privconn = malloc(sizeof(testConn)); + testConnPtr privconn = malloc(sizeof(*privconn)); if (!privconn) { testError(conn, NULL, NULL, VIR_ERR_NO_MEMORY, "testConn"); return VIR_DRV_OPEN_ERROR; @@ -678,7 +678,7 @@ static int testOpenFromFile(virConnectPtr conn, xmlNodePtr *domains, *networks = NULL; xmlXPathContextPtr ctxt = NULL; virNodeInfoPtr nodeInfo; - testConnPtr privconn = malloc(sizeof(testConn)); + testConnPtr privconn = malloc(sizeof(*privconn)); if (!privconn) { testError(NULL, NULL, NULL, VIR_ERR_NO_MEMORY, "testConn"); return VIR_DRV_OPEN_ERROR; diff --git a/src/xen_internal.c b/src/xen_internal.c index 58ac677..20cf408 100644 --- a/src/xen_internal.c +++ b/src/xen_internal.c @@ -1,7 +1,7 @@ /* * xen_internal.c: direct access to Xen hypervisor level * - * Copyright (C) 2005, 2006 Red Hat, Inc. + * Copyright (C) 2005, 2006, 2007 Red Hat, Inc. * * See COPYING.LIB for the License of this software * @@ -220,10 +220,10 @@ typedef struct xen_v2s4_availheap xen_v2s4_availheap; #define XEN_GETDOMAININFOLIST_ALLOC(domlist, size) \ (hypervisor_version < 2 ? \ - ((domlist.v0 = malloc(sizeof(xen_v0_getdomaininfo)*(size))) != NULL) : \ + ((domlist.v0 = malloc(sizeof(*domlist.v0)*(size))) != NULL) : \ (dom_interface_version < 5 ? \ - ((domlist.v2 = malloc(sizeof(xen_v2_getdomaininfo)*(size))) != NULL) : \ - ((domlist.v2d5 = malloc(sizeof(xen_v2d5_getdomaininfo)*(size))) != NULL))) + ((domlist.v2 = malloc(sizeof(*domlist.v2)*(size))) != NULL) : \ + ((domlist.v2d5 = malloc(sizeof(*domlist.v2d5)*(size))) != NULL))) #define XEN_GETDOMAININFOLIST_FREE(domlist) \ (hypervisor_version < 2 ? \ @@ -232,12 +232,12 @@ typedef struct xen_v2s4_availheap xen_v2s4_availheap; free(domlist.v2) : \ free(domlist.v2d5))) -#define XEN_GETDOMAININFOLIST_CLEAR(domlist, size) \ - (hypervisor_version < 2 ? \ - memset(domlist.v0, 0, sizeof(xen_v0_getdomaininfo) * size) : \ - (dom_interface_version < 5 ? \ - memset(domlist.v2, 0, sizeof(xen_v2_getdomaininfo) * size) : \ - memset(domlist.v2d5, 0, sizeof(xen_v2d5_getdomaininfo) * size))) +#define XEN_GETDOMAININFOLIST_CLEAR(domlist, size) \ + (hypervisor_version < 2 ? \ + memset(domlist.v0, 0, sizeof(*domlist.v0) * size) : \ + (dom_interface_version < 5 ? \ + memset(domlist.v2, 0, sizeof(*domlist.v2) * size) : \ + memset(domlist.v2d5, 0, sizeof(*domlist.v2d5) * size))) #define XEN_GETDOMAININFOLIST_DOMAIN(domlist, n) \ (hypervisor_version < 2 ? \ @@ -1964,7 +1964,7 @@ xenHypervisorInit(void) */ hypervisor_version = 2; - ipt = malloc(sizeof(virVcpuInfo)); + ipt = malloc(sizeof(*ipt)); if (ipt == NULL){ #ifdef DEBUG fprintf(stderr, "Memory allocation failed at xenHypervisorInit()\n"); diff --git a/src/xen_unified.c b/src/xen_unified.c index 520424c..99f99ce 100644 --- a/src/xen_unified.c +++ b/src/xen_unified.c @@ -168,10 +168,10 @@ xenDomainUsedCpus(virDomainPtr dom) if (xenUnifiedNodeGetInfo(dom->conn, &nodeinfo) < 0) return(NULL); - cpulist = (char *) calloc(nb_cpu, sizeof(char)); + cpulist = calloc(nb_cpu, sizeof(*cpulist)); if (cpulist == NULL) goto done; - cpuinfo = malloc(sizeof(virVcpuInfo) * nb_vcpu); + cpuinfo = malloc(sizeof(*cpuinfo) * nb_vcpu); if (cpuinfo == NULL) goto done; cpumaplen = VIR_CPU_MAPLEN(VIR_NODEINFO_MAXCPUS(nodeinfo)); diff --git a/src/xm_internal.c b/src/xm_internal.c index 07abbb1..7d9eccd 100644 --- a/src/xm_internal.c +++ b/src/xm_internal.c @@ -231,7 +231,7 @@ static int xenXMConfigEnsureIdentity(virConfPtr conf, const char *filename) { /* Had better have a name...*/ if (xenXMConfigGetString(conf, "name", &name) < 0) { virConfValuePtr value; - value = malloc(sizeof(virConfValue)); + value = malloc(sizeof(*value)); if (!value) { return (-1); } @@ -252,7 +252,7 @@ static int xenXMConfigEnsureIdentity(virConfPtr conf, const char *filename) { virConfValuePtr value; char uuidstr[VIR_UUID_STRING_BUFLEN]; - value = malloc(sizeof(virConfValue)); + value = malloc(sizeof(*value)); if (!value) { return (-1); } @@ -401,7 +401,7 @@ static int xenXMConfigCacheRefresh (virConnectPtr conn) { entry->conf = NULL; } else { /* Completely new entry */ newborn = 1; - if (!(entry = malloc(sizeof(xenXMConfCache)))) { + if (!(entry = malloc(sizeof(*entry)))) { xenXMError (conn, VIR_ERR_NO_MEMORY, strerror (errno)); goto cleanup; } @@ -1081,7 +1081,7 @@ int xenXMDomainSetMemory(virDomainPtr domain, unsigned long memory) { if (!(entry = virHashLookup(configCache, filename))) return (-1); - if (!(value = malloc(sizeof(virConfValue)))) + if (!(value = malloc(sizeof(*value)))) return (-1); value->type = VIR_CONF_LONG; @@ -1123,7 +1123,7 @@ int xenXMDomainSetMaxMemory(virDomainPtr domain, unsigned long memory) { if (!(entry = virHashLookup(configCache, filename))) return (-1); - if (!(value = malloc(sizeof(virConfValue)))) + if (!(value = malloc(sizeof(*value)))) return (-1); value->type = VIR_CONF_LONG; @@ -1196,7 +1196,7 @@ int xenXMDomainSetVcpus(virDomainPtr domain, unsigned int vcpus) { if (!(entry = virHashLookup(configCache, filename))) return (-1); - if (!(value = malloc(sizeof(virConfValue)))) + if (!(value = malloc(sizeof(*value)))) return (-1); value->type = VIR_CONF_LONG; @@ -1481,7 +1481,7 @@ static int xenXMConfigSetInt(virConfPtr conf, const char *setting, long l) { virConfValuePtr value = NULL; - if (!(value = malloc(sizeof(virConfValue)))) + if (!(value = malloc(sizeof(*value)))) return -1; value->type = VIR_CONF_LONG; @@ -1496,7 +1496,7 @@ static int xenXMConfigSetString(virConfPtr conf, const char *setting, const char *str) { virConfValuePtr value = NULL; - if (!(value = malloc(sizeof(virConfValue)))) + if (!(value = malloc(sizeof(*value)))) return -1; value->type = VIR_CONF_STRING; @@ -2112,7 +2112,7 @@ virConfPtr xenXMParseXMLToConfig(virConnectPtr conn, const char *xml) { obj = xmlXPathEval(BAD_CAST "/domain/devices/graphics", ctxt); if ((obj != NULL) && (obj->type == XPATH_NODESET) && (obj->nodesetval != NULL) && (obj->nodesetval->nodeNr >= 0)) { - if (!(vfb = malloc(sizeof(virConfValue)))) { + if (!(vfb = malloc(sizeof(*vfb)))) { xenXMError(conn, VIR_ERR_NO_MEMORY, "config"); goto error; } @@ -2177,7 +2177,7 @@ virConfPtr xenXMParseXMLToConfig(virConnectPtr conn, const char *xml) { xmlFree(type); if (val) { virConfValuePtr disp; - if (!(disp = malloc(sizeof(virConfValue)))) { + if (!(disp = malloc(sizeof(*disp)))) { free(val); xenXMError(conn, VIR_ERR_NO_MEMORY, "config"); goto error; @@ -2199,7 +2199,7 @@ virConfPtr xenXMParseXMLToConfig(virConnectPtr conn, const char *xml) { if ((obj != NULL) && (obj->type == XPATH_NODESET) && (obj->nodesetval != NULL) && (obj->nodesetval->nodeNr >= 0)) { virConfValuePtr disks; - if (!(disks = malloc(sizeof(virConfValue)))) { + if (!(disks = malloc(sizeof(*disks)))) { xenXMError(conn, VIR_ERR_NO_MEMORY, "config"); goto error; } @@ -2211,7 +2211,7 @@ virConfPtr xenXMParseXMLToConfig(virConnectPtr conn, const char *xml) { if (xenXMParseXMLDisk(obj->nodesetval->nodeTab[i], hvm, priv->xendConfigVersion, &disk) < 0) goto error; if (disk) { - if (!(thisDisk = malloc(sizeof(virConfValue)))) { + if (!(thisDisk = malloc(sizeof(*thisDisk)))) { free(disk); xenXMError(conn, VIR_ERR_NO_MEMORY, "config"); goto error; @@ -2231,7 +2231,7 @@ virConfPtr xenXMParseXMLToConfig(virConnectPtr conn, const char *xml) { if ((obj != NULL) && (obj->type == XPATH_NODESET) && (obj->nodesetval != NULL) && (obj->nodesetval->nodeNr >= 0)) { virConfValuePtr vifs; - if (!(vifs = malloc(sizeof(virConfValue)))) { + if (!(vifs = malloc(sizeof(*vifs)))) { xenXMError(conn, VIR_ERR_NO_MEMORY, "config"); goto error; } @@ -2242,7 +2242,7 @@ virConfPtr xenXMParseXMLToConfig(virConnectPtr conn, const char *xml) { char *vif = xenXMParseXMLVif(conn, obj->nodesetval->nodeTab[i], hvm); if (!vif) goto error; - if (!(thisVif = malloc(sizeof(virConfValue)))) { + if (!(thisVif = malloc(sizeof(*thisVif)))) { if (vif) free(vif); xenXMError(conn, VIR_ERR_NO_MEMORY, "config"); @@ -2377,7 +2377,7 @@ virDomainPtr xenXMDomainDefineXML(virConnectPtr conn, const char *xml) { goto error; } - if (!(entry = calloc(1, sizeof(xenXMConfCache)))) { + if (!(entry = calloc(1, sizeof(*entry)))) { xenXMError(conn, VIR_ERR_NO_MEMORY, "config"); goto error; } diff --git a/src/xml.c b/src/xml.c index c75b0ce..c698889 100644 --- a/src/xml.c +++ b/src/xml.c @@ -322,7 +322,7 @@ virParseXenCpuTopology(virConnectPtr conn, virBufferPtr xml, if ((str == NULL) || (xml == NULL) || (maxcpu <= 0) || (maxcpu > 100000)) return (-1); - cpuset = malloc(maxcpu * sizeof(char)); + cpuset = malloc(maxcpu * sizeof(*cpuset)); if (cpuset == NULL) goto memory_error; @@ -433,7 +433,7 @@ virConvertCpuSet(virConnectPtr conn, const char *str, int maxcpu) { if (maxcpu <= 0) maxcpu = 4096; - cpuset = calloc(maxcpu, sizeof(char)); + cpuset = calloc(maxcpu, sizeof(*cpuset)); if (cpuset == NULL) { virXMLError(conn, VIR_ERR_NO_MEMORY, _("allocate buffer"), 0); return(NULL); @@ -676,11 +676,11 @@ virXPathNodeSet(const char *xpath, xmlXPathContextPtr ctxt, ret = obj->nodesetval->nodeNr; if (list != NULL) { - *list = malloc(ret * sizeof(xmlNodePtr)); + *list = malloc(ret * sizeof(**list)); if (*list == NULL) { virXMLError(NULL, VIR_ERR_NO_MEMORY, _("allocate string array"), - ret * sizeof(xmlNodePtr)); + ret * sizeof(**list)); } else { memcpy(*list, obj->nodesetval->nodeTab, ret * sizeof(xmlNodePtr)); @@ -1636,7 +1636,7 @@ virDomainParseXMLDesc(virConnectPtr conn, const char *xmldesc, char **name, * it in a range format guaranteed to be understood by Xen. */ if (maxcpu > 0) { - cpuset = malloc(maxcpu * sizeof(char)); + cpuset = malloc(maxcpu * sizeof(*cpuset)); if (cpuset != NULL) { res = virParseCpuSet(conn, &cur, 0, cpuset, maxcpu); if (res > 0) { diff --git a/src/xmlrpc.c b/src/xmlrpc.c index d65a7a9..b433ef5 100644 --- a/src/xmlrpc.c +++ b/src/xmlrpc.c @@ -153,6 +153,7 @@ static xmlRpcValuePtr xmlRpcValueUnmarshalArray(xmlNodePtr node) xmlRpcValuePtr ret = xmlRpcValueNew(XML_RPC_ARRAY); xmlNodePtr cur; int n_elements = 0; + xmlRpcValuePtr *elems; if (!ret) return NULL; @@ -160,19 +161,20 @@ static xmlRpcValuePtr xmlRpcValueUnmarshalArray(xmlNodePtr node) for (cur = xmlFirstElement(node); cur; cur = xmlNextElement(cur)) n_elements += 1; - ret->value.array.elements = malloc(n_elements * sizeof(xmlRpcValue)); - if (!ret->value.array.elements) { + elems = malloc(n_elements * sizeof(*elems)); + if (!elems) { xmlRpcError(VIR_ERR_NO_MEMORY, _("allocate value array"), - n_elements * sizeof(xmlRpcValue)); + n_elements * sizeof(*elems)); free(ret); return NULL; } n_elements = 0; for (cur = xmlFirstElement(node); cur; cur = xmlNextElement(cur)) { - ret->value.array.elements[n_elements] = xmlRpcValueUnmarshal(cur); + elems[n_elements] = xmlRpcValueUnmarshal(cur); n_elements += 1; } + ret->value.array.elements = elems; ret->value.array.n_elements = n_elements; return ret; diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 95b4679..d4e39b2 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -60,7 +60,7 @@ static int testCompareXMLToArgvFiles(const char *xml, const char *cmd) { len += strlen(*tmp) + 1; tmp++; } - actualargv = malloc(sizeof(char)*len); + actualargv = malloc(sizeof(*actualargv)*len); actualargv[0] = '\0'; tmp = argv; len = 0; -- 1.5.3.7.1116.gae2a9

2 2

[Libvir] [PATCH] Test libvirtd's config-processing code.
by Jim Meyering 12 Dec '07

12 Dec '07

Until now, there has been no coverage of libvirtd's config-processing code. In adding this, (and esp. in comparing actual/expected diagnostics), I noticed and fixed a trivial inconsistency: for a parameter expecting a string value, an invalid values, you'd get a different diagnostic for the four config parameters that are parsed via remoteConfigGetAuth than for all of the other config parameters (which go through checkType). This fixes that, too: Test libvirtd's config-processing code. And remove a minor diagnostic inconsistency. * tests/daemon-conf: New test. * tests/Makefile.am (TESTS_ENVIRONMENT): Prepend qemud/ to PATH, so we can invoke libvirtd without an absolute name. (test_scripts): Add daemon-conf. * qemud/qemud.c (remoteConfigGetAuth): Use checkType, rather than open-coding it with a different diagnostic. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- qemud/qemud.c | 4 +-- tests/Makefile.am | 3 ++ tests/daemon-conf | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 3 deletions(-) create mode 100755 tests/daemon-conf diff --git a/qemud/qemud.c b/qemud/qemud.c index 9794c03..f15cadd 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -1783,10 +1783,8 @@ static int remoteConfigGetAuth(virConfPtr conf, const char *key, int *auth, cons if (!p) return 0; - if (p->type != VIR_CONF_STRING) { - qemudLog (QEMUD_ERR, "remoteReadConfigFile: %s: %s: should be a string\n", filename, key); + if (checkType (p, filename, key, VIR_CONF_STRING) < 0) return -1; - } if (!p->str) return 0; diff --git a/tests/Makefile.am b/tests/Makefile.am index bec8b05..a918bcc 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -47,7 +47,9 @@ noinst_PROGRAMS = xmlrpctest xml2sexprtest sexpr2xmltest virshtest conftest \ nodeinfotest test_scripts = \ + daemon-conf \ int-overflow + EXTRA_DIST += $(test_scripts) TESTS = xml2sexprtest sexpr2xmltest virshtest test_conf.sh xmconfigtest \ @@ -63,6 +65,7 @@ endif TESTS_ENVIRONMENT = \ abs_top_builddir=`pwd`/'$(top_builddir)' \ abs_top_srcdir=`pwd`/'$(top_srcdir)' \ + PATH='$(abs_top_builddir)/qemud$(PATH_SEPARATOR)'"$$PATH" \ $(VG) valgrind: diff --git a/tests/daemon-conf b/tests/daemon-conf new file mode 100755 index 0000000..db1f0d3 --- /dev/null +++ b/tests/daemon-conf @@ -0,0 +1,64 @@ +#!/bin/sh +# Get coverage of libvirtd's config-parsing code. + +# Boilerplate code to set up a test directory, cd into it, +# and to ensure we remove it upon completion. +this_test_() { echo "./$0" | sed 's,.*/,,'; } +t_=$(this_test_)-$$ +init_cwd_=$(pwd) +trap 'st=$?; d='"$t_"'; + cd '"$init_cwd_"' && chmod -R u+rwx "$d" && rm -rf "$d" && exit $st' 0 +trap '(exit $?); exit $?' 1 2 13 15 +mkdir "$t_" || fail=1 +cd "$t_" || fail=1 + +# Start with the sample libvirtd.conf file, uncommenting all real directives. +sed -n 's/^#$[^ #]$/\1/p' $abs_top_srcdir/qemud/libvirtd.conf > tmp.conf + +# Iterate through that list of directives, corrupting one RHS at a +# time and running libvirtd with the resulting config. Each libvirtd +# invocation must fail. +n=$(wc -l < tmp.conf) +i=1 +while :; do + param_name=$(sed -n "$i"'s/ = .*//p' tmp.conf) + rhs=$(sed -n "$i"'s/.* = $.*$/\1/p' tmp.conf) + f=in$i.conf + # Change an RHS that starts with '"' or '[' to "3". + # Change an RHS that starts with 0 or 1 to the string '"foo"'. + sed "$i"'s/ = [["].*/ = 3/;'"$i"'s/ = [01].*/ = "foo"/' tmp.conf > $f + libvirtd --config=$f 2> err && fail=1 + case $rhs in + # '"'*) msg='should be a string';; + '"'*) msg='invalid type: got long; expected string';; + [01]*) msg='invalid type: got string; expected long';; + '['*) msg='must be a string or list of strings';; + *) echo "unexpected RHS: $rhs" 1>&2; fail=1;; + esac + + test $i = $n && break + + # Filter out this diagnostic. + sed '/^Cannot set group when not running as root$/d' err > k && mv k err + + printf '%s\n\n' "remoteReadConfigFile: $f: $param_name: $msg" > expected-err + diff -u expected-err err || fail=1 + + i=$(expr $i + 1) +done + +# Run with the unmodified config file. +libvirtd --config=tmp.conf > log 2>&1 & pid=$! +sleep 2 +kill $pid + +# Expect an orderly shut-down and successful exit. +wait $pid || fail=1 + +# "cat log" would print this for non-root: +# Cannot set group when not running as root +# Shutting down on signal 15 +# And normally, we'd require that output, but obviously +# it'd be different for root. + +exit $fail -- 1.5.3.7.1116.gae2a9

2 3

[Libvir] [PATCH] Accommodate automake-1.9.
by Jim Meyering 12 Dec '07

12 Dec '07

My libvirtd.config testing relied on automake-1.10 in that it used $(abs_top_builddir). And while that variable is defined just prior to the new use, the variable is a *shell* variable, not a make one. This fixes it to use the shell variable instead. Portability is ugly. Accommodate automake-1.9. * tests/Makefile.am (TESTS_ENVIRONMENT): Adjust PATH setting to work also with automake-1.9. Can't use $(abs_top_builddir). --- ChangeLog | 6 ++++++ tests/Makefile.am | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index ea5b85b..cf1085b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Jim Meyering <meyering(a)redhat.com> + + Accommodate automake-1.9. + * tests/Makefile.am (TESTS_ENVIRONMENT): Adjust PATH setting + to work also with automake-1.9. Can't use $(abs_top_builddir). + Tue Dec 11 22:19:22 CET 2007 Jim Meyering <meyering(a)redhat.com> Test libvirtd's config-processing code. diff --git a/tests/Makefile.am b/tests/Makefile.am index a918bcc..dfd9e34 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -65,7 +65,7 @@ endif TESTS_ENVIRONMENT = \ abs_top_builddir=`pwd`/'$(top_builddir)' \ abs_top_srcdir=`pwd`/'$(top_srcdir)' \ - PATH='$(abs_top_builddir)/qemud$(PATH_SEPARATOR)'"$$PATH" \ + PATH="$$abs_top_builddir/qemud$(PATH_SEPARATOR)$$PATH" \ $(VG) valgrind: -- 1.5.3.7.1116.gae2a9

2 2

Re: [Libvir] C bindings
by Richard W.M. Jones 11 Dec '07

11 Dec '07

Katti, Vadiraj (STSD-Openview) wrote: > Hi Richard, > > DOMFLAGS_DYING is available in dom0_ops.h > > # find /usr/include -name '*.h' | xargs grep DOMFLAGS_DYING > /usr/include/xen/dom0_ops.h:#define DOMFLAGS_DYING (1<<0) /* Domain > is scheduled to die. */ I'm pretty certain this is a bug in libvirt, introduced by this patch: http://www.redhat.com/archives/libvir-list/2007-April/msg00078.html I think Dan's probably the best one to tell us what's going on here, but from my understanding the patch above is wrong and should have instead added this: #ifndef DOMFLAGS_HVM #define DOMFLAGS_HVM (1<<1) #endif //... #ifdef DOMFLAGS_HVM domain_flags &= ~DOMFLAGS_HVM; /* Mask out HVM flags */ #endif > The versions of xen I'm running are : > # rpm -qa |grep -i xen > xen-3.0.4_13138-0.40 > xen-doc-html-3.0.4_13138-0.40 > xen-devel-3.0_8259-0.1 > xen-libs-3.0.4_13138-0.40 > kernel-xen-2.6.16.46-0.12 > xen-tools-ioemu-3.0.4_13138-0.40 > xen-doc-pdf-3.0.4_13138-0.40 > xen-tools-3.0.4_13138-0.40 > > xenstored and xend both of them are running. > # ps -ef|grep xenstored > root 32458 1 0 09:36 ? 00:00:00 xenstored --pid-file > /var/run/xenstore.pid > Now info1 fails with the following error > # ./info1 > failed to find libvirt_proxy > Domains 0: 4 CPUs > This was error I had encountered earlier, which is why I wanted to know > what libvirt_proxy does. I think if the Xen driver can be correctly built then you won't need the proxy. Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

2 1

[Libvir] [PATCH] Re-add gnulib-tool unit tests.
by Jim Meyering 10 Dec '07

10 Dec '07

Since Bruno Haible quickly added support in gnulib-tool to do what I wanted, the least I can do is to re-add the tests in libvirt. This does it: The manual changes in this delta are very small: just the first few files listed below. I've also included some induced diffs, due to libvirt-prompted fixes in gnulib. I've omitted the 2000+ lines of diffs for all of the added files. FYI, this is using stock gnulib-tool with one addition: the m4_foreach_w patch for which I'm still awaiting feedback. Add gnulib-tool unit tests. * bootstrap: Re-add --with-tests, now that gnulib-tool arranges to use separate libraries for lib/ and tests/. * configure.in (AC_OUTPUT): Add gnulib/tests/Makefile.in. * Makefile.am (SUBDIRS): Add gnulib/tests. * gnulib/tests/Makefile.am: New file. * gnulib/lib/.cvsignore: Sort. * gnulib/lib/Makefile.am, gnulib/m4/getdelim.m4, gnulib/m4/getline.m4: * gnulib/m4/gnulib-cache.m4, gnulib/m4/gnulib-comp.m4: Regenerate. * gnulib/tests/test-alloca-opt.c: New file, from gnulib. * gnulib/tests/test-arpa_inet.c: Likewise. * gnulib/tests/test-fseeko.c: Likewise. * gnulib/tests/test-fseeko.sh: Likewise. * gnulib/tests/test-getaddrinfo.c: Likewise. * gnulib/tests/test-getdelim.c: Likewise. * gnulib/tests/test-getline.c: Likewise. * gnulib/tests/test-lseek.c: Likewise. * gnulib/tests/test-lseek.sh: Likewise. * gnulib/tests/test-netinet_in.c: Likewise. * gnulib/tests/test-snprintf.c: Likewise. * gnulib/tests/test-stdbool.c: Likewise. * gnulib/tests/test-stdint.c: Likewise. * gnulib/tests/test-stdio.c: Likewise. * gnulib/tests/test-stdlib.c: Likewise. * gnulib/tests/test-string.c: Likewise. * gnulib/tests/test-sys_select.c: Likewise. * gnulib/tests/test-sys_socket.c: Likewise. * gnulib/tests/test-sys_stat.c: Likewise. * gnulib/tests/test-sys_time.c: Likewise. * gnulib/tests/test-unistd.c: Likewise. * gnulib/tests/test-vasnprintf.c: Likewise. * gnulib/tests/test-vasprintf.c: Likewise. * gnulib/tests/test-wchar.c: Likewise. * gnulib/tests/dummy.c: Likewise. * gnulib/tests/intprops.h: Likewise. * gnulib/tests/verify.h: Likewise. --- Makefile.am | 2 +- bootstrap | 1 + configure.in | 1 + gnulib/lib/.cvsignore | 8 +- gnulib/lib/Makefile.am | 2 +- gnulib/m4/getdelim.m4 | 4 +- gnulib/m4/getline.m4 | 4 +- gnulib/m4/gnulib-cache.m4 | 3 +- gnulib/m4/gnulib-comp.m4 | 87 +++++++++- gnulib/tests/Makefile.am | 271 +++++++++++++++++++++++++++++ gnulib/tests/dummy.c | 42 +++++ gnulib/tests/intprops.h | 77 +++++++++ gnulib/tests/test-alloca-opt.c | 62 +++++++ gnulib/tests/test-arpa_inet.c | 27 +++ gnulib/tests/test-fseeko.c | 35 ++++ gnulib/tests/test-fseeko.sh | 5 + gnulib/tests/test-getaddrinfo.c | 137 +++++++++++++++ gnulib/tests/test-getdelim.c | 89 ++++++++++ gnulib/tests/test-getline.c | 89 ++++++++++ gnulib/tests/test-lseek.c | 102 +++++++++++ gnulib/tests/test-lseek.sh | 17 ++ gnulib/tests/test-netinet_in.c | 27 +++ gnulib/tests/test-snprintf.c | 71 ++++++++ gnulib/tests/test-stdbool.c | 95 +++++++++++ gnulib/tests/test-stdint.c | 356 +++++++++++++++++++++++++++++++++++++++ gnulib/tests/test-stdio.c | 30 ++++ gnulib/tests/test-stdlib.c | 37 ++++ gnulib/tests/test-string.c | 27 +++ gnulib/tests/test-sys_select.c | 27 +++ gnulib/tests/test-sys_socket.c | 47 +++++ gnulib/tests/test-sys_stat.c | 260 ++++++++++++++++++++++++++++ gnulib/tests/test-sys_time.c | 29 +++ gnulib/tests/test-unistd.c | 44 +++++ gnulib/tests/test-vasnprintf.c | 127 ++++++++++++++ gnulib/tests/test-vasprintf.c | 88 ++++++++++ gnulib/tests/test-wchar.c | 27 +++ gnulib/tests/verify.h | 140 +++++++++++++++ 37 files changed, 2486 insertions(+), 11 deletions(-) create mode 100644 gnulib/tests/Makefile.am create mode 100644 gnulib/tests/dummy.c create mode 100644 gnulib/tests/intprops.h create mode 100644 gnulib/tests/test-alloca-opt.c create mode 100644 gnulib/tests/test-arpa_inet.c create mode 100644 gnulib/tests/test-fseeko.c create mode 100755 gnulib/tests/test-fseeko.sh create mode 100644 gnulib/tests/test-getaddrinfo.c create mode 100644 gnulib/tests/test-getdelim.c create mode 100644 gnulib/tests/test-getline.c create mode 100644 gnulib/tests/test-lseek.c create mode 100755 gnulib/tests/test-lseek.sh create mode 100644 gnulib/tests/test-netinet_in.c create mode 100644 gnulib/tests/test-snprintf.c create mode 100644 gnulib/tests/test-stdbool.c create mode 100644 gnulib/tests/test-stdint.c create mode 100644 gnulib/tests/test-stdio.c create mode 100644 gnulib/tests/test-stdlib.c create mode 100644 gnulib/tests/test-string.c create mode 100644 gnulib/tests/test-sys_select.c create mode 100644 gnulib/tests/test-sys_socket.c create mode 100644 gnulib/tests/test-sys_stat.c create mode 100644 gnulib/tests/test-sys_time.c create mode 100644 gnulib/tests/test-unistd.c create mode 100644 gnulib/tests/test-vasnprintf.c create mode 100644 gnulib/tests/test-vasprintf.c create mode 100644 gnulib/tests/test-wchar.c create mode 100644 gnulib/tests/verify.h diff --git a/Makefile.am b/Makefile.am index d12f3aa..c49c533 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = gnulib/lib include src qemud proxy docs \ +SUBDIRS = gnulib/lib include src qemud proxy docs gnulib/tests \ @PYTHON_SUBDIR@ tests po scripts ACLOCAL_AMFLAGS = -I m4 -I gnulib/m4 diff --git a/bootstrap b/bootstrap index d61d2e3..751b244 100755 --- a/bootstrap +++ b/bootstrap @@ -71,6 +71,7 @@ gnulib_tool=$GNULIB_SRCDIR/gnulib-tool $gnulib_tool \ --lgpl=2 \ + --with-tests \ --m4-base=gnulib/m4 \ --source-base=gnulib/lib \ --tests-base=gnulib/tests \ diff --git a/configure.in b/configure.in index 425bb4c..8e5cca4 100644 --- a/configure.in +++ b/configure.in @@ -678,6 +678,7 @@ AC_OUTPUT(Makefile src/Makefile include/Makefile docs/Makefile \ docs/examples/Makefile docs/devhelp/Makefile \ docs/examples/python/Makefile \ gnulib/lib/Makefile \ + gnulib/tests/Makefile \ libvirt.pc libvirt.spec \ po/Makefile.in scripts/Makefile \ include/libvirt/Makefile include/libvirt/libvirt.h \ diff --git a/gnulib/lib/.cvsignore b/gnulib/lib/.cvsignore index 99e7fab..0f10d7f 100644 --- a/gnulib/lib/.cvsignore +++ b/gnulib/lib/.cvsignore @@ -1,11 +1,11 @@ -alloca.h -.deps -float.h *.la -.libs *.lo +.deps +.libs Makefile Makefile.in +alloca.h +float.h netinet_in.h poll.h stdbool.h diff --git a/gnulib/lib/Makefile.am b/gnulib/lib/Makefile.am index f1c4fa0..a94ed2d 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 --aux-dir=build-aux --lgpl=2 --libtool --macro-prefix=gl getaddrinfo getpass gettext physmem poll strndup strsep sys_stat vasprintf +# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --aux-dir=build-aux --with-tests --lgpl=2 --libtool --macro-prefix=gl getaddrinfo getpass gettext physmem poll strndup strsep sys_stat vasprintf AUTOMAKE_OPTIONS = 1.5 gnits diff --git a/gnulib/m4/getdelim.m4 b/gnulib/m4/getdelim.m4 index 5563227..18b96be 100644 --- a/gnulib/m4/getdelim.m4 +++ b/gnulib/m4/getdelim.m4 @@ -1,4 +1,4 @@ -# getdelim.m4 serial 4 +# getdelim.m4 serial 5 dnl Copyright (C) 2005, 2006, 2007 Free Software dnl Foundation, Inc. dnl @@ -6,6 +6,8 @@ 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_PREREQ([2.59]) + AC_DEFUN([gl_FUNC_GETDELIM], [ AC_REQUIRE([gl_STDIO_H_DEFAULTS]) diff --git a/gnulib/m4/getline.m4 b/gnulib/m4/getline.m4 index e4ccd12..57625da 100644 --- a/gnulib/m4/getline.m4 +++ b/gnulib/m4/getline.m4 @@ -1,4 +1,4 @@ -# getline.m4 serial 17 +# getline.m4 serial 18 dnl Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007 Free dnl Software Foundation, Inc. @@ -7,6 +7,8 @@ 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_PREREQ([2.59]) + dnl See if there's a working, system-supplied version of the getline function. dnl We can't just do AC_REPLACE_FUNCS(getline) because some systems dnl have a function by that name in -linet that doesn't have anything diff --git a/gnulib/m4/gnulib-cache.m4 b/gnulib/m4/gnulib-cache.m4 index 05a4503..d55e07a 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 --aux-dir=build-aux --lgpl=2 --libtool --macro-prefix=gl getaddrinfo getpass gettext physmem poll strndup strsep sys_stat vasprintf +# gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --aux-dir=build-aux --with-tests --lgpl=2 --libtool --macro-prefix=gl getaddrinfo getpass gettext physmem poll strndup strsep sys_stat vasprintf # Specification in the form of a few gnulib-tool.m4 macro invocations: gl_LOCAL_DIR([]) @@ -26,6 +26,7 @@ gl_M4_BASE([gnulib/m4]) gl_PO_BASE([]) gl_DOC_BASE([doc]) gl_TESTS_BASE([gnulib/tests]) +gl_WITH_TESTS gl_LIB([libgnu]) gl_LGPL([2]) gl_MAKEFILE_NAME([]) diff --git a/gnulib/m4/gnulib-comp.m4 b/gnulib/m4/gnulib-comp.m4 index 259e28b..d92a377 100644 --- a/gnulib/m4/gnulib-comp.m4 +++ b/gnulib/m4/gnulib-comp.m4 @@ -34,11 +34,11 @@ AC_DEFUN([gl_EARLY], # "Check for header files, types and library functions". AC_DEFUN([gl_INIT], [ + AM_CONDITIONAL([GL_COND_LIBTOOL], [true]) + gl_cond_libtool=true m4_pushdef([AC_LIBOBJ], m4_defn([gl_LIBOBJ])) m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gl_REPLACE_FUNCS])) m4_pushdef([AC_LIBSOURCES], m4_defn([gl_LIBSOURCES])) - AM_CONDITIONAL([GL_COND_LIBTOOL], [true]) - gl_cond_libtool=true gl_source_base='gnulib/lib' gl_FUNC_ALLOCA gl_HEADER_ARPA_INET @@ -120,6 +120,34 @@ AC_DEFUN([gl_INIT], AC_SUBST([gl_LIBOBJS], [$gl_libobjs]) AC_SUBST([gl_LTLIBOBJS], [$gl_ltlibobjs]) ]) + gltests_libdeps= + gltests_ltlibdeps= + m4_pushdef([AC_LIBOBJ], m4_defn([gltests_LIBOBJ])) + m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gltests_REPLACE_FUNCS])) + m4_pushdef([AC_LIBSOURCES], m4_defn([gltests_LIBSOURCES])) + gl_source_base='gnulib/tests' + gt_TYPE_WCHAR_T + gt_TYPE_WINT_T + AC_CHECK_FUNCS([shutdown]) + m4_popdef([AC_LIBSOURCES]) + m4_popdef([AC_REPLACE_FUNCS]) + m4_popdef([AC_LIBOBJ]) + AC_CONFIG_COMMANDS_PRE([ + gltests_libobjs= + gltests_ltlibobjs= + if test -n "$gltests_LIBOBJS"; then + # Remove the extension. + sed_drop_objext='s/\.o$//;s/\.obj$//' + for i in `for i in $gltests_LIBOBJS; do echo "$i"; done | sed "$sed_drop_objext" | sort | uniq`; do + gltests_libobjs="$gltests_libobjs $i.$ac_objext" + gltests_ltlibobjs="$gltests_ltlibobjs $i.lo" + done + fi + AC_SUBST([gltests_LIBOBJS], [$gltests_libobjs]) + AC_SUBST([gltests_LTLIBOBJS], [$gltests_ltlibobjs]) + ]) + LIBTESTS_LIBDEPS="$gltests_libdeps" + AC_SUBST([LIBTESTS_LIBDEPS]) ]) # Like AC_LIBOBJ, except that the module name goes @@ -150,6 +178,34 @@ AC_DEFUN([gl_LIBSOURCES], [ ]) ]) +# Like AC_LIBOBJ, except that the module name goes +# into gltests_LIBOBJS instead of into LIBOBJS. +AC_DEFUN([gltests_LIBOBJ], [ + AS_LITERAL_IF([$1], [gltests_LIBSOURCES([$1.c])])dnl + gltests_LIBOBJS="$gltests_LIBOBJS $1.$ac_objext" +]) + +# Like AC_REPLACE_FUNCS, except that the module name goes +# into gltests_LIBOBJS instead of into LIBOBJS. +AC_DEFUN([gltests_REPLACE_FUNCS], [ + m4_foreach_w([gl_NAME], [$1], [AC_LIBSOURCES(gl_NAME[.c])])dnl + AC_CHECK_FUNCS([$1], , [gltests_LIBOBJ($ac_func)]) +]) + +# Like AC_LIBSOURCES, except the directory where the source file is +# expected is derived from the gnulib-tool parametrization, +# and alloca is special cased (for the alloca-opt module). +# We could also entirely rely on EXTRA_lib..._SOURCES. +AC_DEFUN([gltests_LIBSOURCES], [ + m4_foreach([_gl_NAME], [$1], [ + m4_if(_gl_NAME, [alloca.c], [], [ + m4_syscmd([test -r gnulib/tests/]_gl_NAME[ || test ! -d gnulib/tests])dnl + m4_if(m4_sysval, [0], [], + [AC_FATAL([missing gnulib/tests/]_gl_NAME)]) + ]) + ]) +]) + # This macro records the list of files which have been installed by # gnulib-tool and may be removed by future gnulib-tool invocations. AC_DEFUN([gl_FILE_LIST], [ @@ -278,4 +334,31 @@ AC_DEFUN([gl_FILE_LIST], [ m4/wchar_t.m4 m4/wint_t.m4 m4/xsize.m4 + tests/test-alloca-opt.c + tests/test-arpa_inet.c + tests/test-fseeko.c + tests/test-fseeko.sh + tests/test-getaddrinfo.c + tests/test-getdelim.c + tests/test-getline.c + tests/test-lseek.c + tests/test-lseek.sh + tests/test-netinet_in.c + tests/test-snprintf.c + tests/test-stdbool.c + tests/test-stdint.c + tests/test-stdio.c + tests/test-stdlib.c + tests/test-string.c + tests/test-sys_select.c + tests/test-sys_socket.c + tests/test-sys_stat.c + tests/test-sys_time.c + tests/test-unistd.c + tests/test-vasnprintf.c + tests/test-vasprintf.c + tests/test-wchar.c + tests=lib/dummy.c + tests=lib/intprops.h + tests=lib/verify.h ])

2 3

[Libvir] C bindings
by Katti, Vadiraj (STSD-Openview) 10 Dec '07

10 Dec '07

> Hi All, > I'm new to Xen world and am in the process of collecting performance > information of various guests from dom0. Can somebody help me out with > these problems. > 1. I downloaded libvirt-0.3.3 src and did a 'make' and I'm seeing this > problem. > > xen_internal.c: In function 'xenHypervisorDomainGetOSType': > xen_internal.c:2711: error: 'DOMFLAGS_HVM' undeclared (first use in > this function) > xen_internal.c:2711: error: (Each undeclared identifier is reported > only once > xen_internal.c:2711: error: for each function it appears in.) > xen_internal.c: In function 'xenHypervisorGetDomInfo': > xen_internal.c:2943: error: 'DOMFLAGS_HVM' undeclared (first use in > this function) > make[2]: *** [libvirt_la-xen_internal.lo] Error 1 > > 2. I want to know what are the rpm that the Xen server must have to > pull out the performance data of various guests. > > 3. My Xen server now has these rpms : > # rpm -qa |grep libvirt > libvirt-0.2.0-0.16 > libvirt-python-0.2.0-0.16 > > Do I need any other rpms to compile my c programs ? Is there any > document which says how I can compile my c-program using libvirt ? I > tried running info1 example in debug mode and I get this error : > ./info1 > libvirt: virConnectOpenReadOnly (name=(null)) > libvirt: virInitialize () > libvirt: virInitialize () > libvirt: virInitialize () > libvirt: virInitialize () > libvirt: virInitialize () > libvirt: virInitialize () > libvirt: virInitialize () > libvirt: virInitialize () > libvirt: virInitialize () > libvirt: do_open: proceeding with name=xen:/// > libvirt: do_open: trying driver 0 (Test) ... > libvirt: do_open: driver 0 Test returned DECLINED > libvirt: do_open: trying driver 1 (QEMU) ... > libvirt: do_open: driver 1 QEMU returned DECLINED > libvirt: do_open: trying driver 2 (Xen) ... > libvirt: xenUnifiedOpen: trying Xen sub-driver 0 > libvirt: xenUnifiedOpen: Xen sub-driver 0 open ok > libvirt: xenUnifiedOpen: trying Xen sub-driver 2 > libvirt: xenUnifiedOpen: Xen sub-driver 2 open ok > libvirt: xenUnifiedOpen: trying Xen sub-driver 3 > libvir: Xen Store error : could not use Xen hypervisor entry failed to > connect to Xen Store > libvirt: xenUnifiedOpen: Xen sub-driver 3 open failed > libvirt: do_open: driver 2 Xen returned ERROR > Failed to connect to hypervisor > > 4. what is libvirt_proxy ? What is its use ? > I assume this is used to connect to hypervisor (am I right ?) When I > run this, it says "Failed to open Xen hypervisor" > > Is there any document which can give more details of all these details > ? > Any help will be greatly helpful > > Thanks, > Vadiraj >

3 3

[Libvir] os/bootloader
by John Levon 09 Dec '07

09 Dec '07

I'm no good at reading relax/ng, but I think that this: <group> <ref name='os'/> <optional> <ref name='bootloader'/> </optional> </group> <group> <ref name='bootloader'/> <optional> <ref name='os'/> </optional> </group> means I can specify either os, or bootloader, or both. The latter case makes a lot of sense when using pygrub. However, src/xml.c doesn't implement those semantics: 1219 if (!bootloader) { 1220 if ((node = virXPathNode("/domain/os[1]", ctxt)) != NULL) { 1221 /* Analyze of the os description, based on HVM or PV. */ 1222 str = virXPathString("string(/domain/os/type[1])", ctxt); I think that we should just remove the "if (!bootloader) {" bit here - agree? I'm looking at the schema and I don't see (at least) domain/devices/input, which appears to be used in src/xml.c too - is the schema out of date in 0.3.3 ? The tests don't pass xmllint! thanks john

2 2

[Libvir] [PATCH] 0/22 Compile libvirt, virsh under MinGW
by Richard W.M. Jones 07 Dec '07

07 Dec '07

-- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

4 74

[Libvir] PATCH: Don't send callbacks invalid credentials
by Daniel P. Berrange 07 Dec '07

07 Dec '07

The PolicyKit auth code was invoking the authentication callback even if the app hadn't indicated support for VIR_CREDENTIAL_EXTERNAL. The default authentication callback was also not returning errors for credentials it doesn't support. This patch fixes both those flaws Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

1 0

[Libvir] [PATCH] Python bindings for virNodeGetCellsFreeMemory
by Daniel Veillard 07 Dec '07

07 Dec '07

I realized that one of the NUMA API entry point didn't had a binding in Python, the enclosed patch adds it, it's a method on a virConnect class, taking the startCell and maxCells integer parameters and returning a list of available memory for that range of cell, using it should be as simple as launching python as root after reinstallation of the libvirt library and bindings and doing the following: >>> import libvirt >>> conn = libvirt.open(None) >>> conn.getCellsFreeMemory(0, 20) it should return the array of available heap for each of the 20 first cells in machine, but I can't test this at the moment. Saori, Beth is there any chance you could test that patch ? thanks, Daniel -- Red Hat Virtualization group http://redhat.com/virtualization/ Daniel Veillard | virtualization library http://libvirt.org/ veillard(a)redhat.com | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/

3 4

[Libvir] Latest MinGW patch
by Richard W.M. Jones 06 Dec '07

06 Dec '07

There are still a few bits which don't work. Also attached, the output of './configure --without-xen --without-qemu --without-sasl', and the output of 'make -k' after the second time it has run (so you just see which bits fail to compile). Some tips: * Install MinGW and MSYS. MSYS 1.0.10 under Vista has known problems (MinGW bug 1593268) so you'll also need to install the tech preview versions of: gcc, gdb, binutils, w32api. * Build and install libxml2. * Install gnutls. There are binaries for Windows available on their site. * Install SunRPC from http://www.plt.rwth-aachen.de/index.php?id=258. * Get libvirt from CVS, apply the patch below, run ./bootstrap and ./autogen.sh (you'll have to do this from a Linux machine). * Set the following environment variables under Windows: gnutls=/c/Users/rjones/Desktop/gnutls oncrpc=/c/oncrpc CC=gcc-sjlj CFLAGS="-I $gnutls/include -I $oncrpc" LDFLAGS="-L $gnutls/lib -L $oncrpc/bin" PATH=$oncrpc/bin:$PATH export CC CFLAGS LDFLAGS PATH * Enable config.cache (./configure -C) because shell scripts under Windows are slooooooooow. Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903 checking for a BSD-compatible install... /bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking build system type... i686-pc-mingw32 checking host system type... i686-pc-mingw32 checking for gcc... gcc-sjlj checking for C compiler default output file name... a.exe checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... .exe checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc-sjlj accepts -g... yes checking for gcc-sjlj option to accept ISO C89... none needed checking for style of include used by make... GNU checking dependency style of gcc-sjlj... gcc3 checking for a BSD-compatible install... /bin/install -c checking how to run the C preprocessor... gcc-sjlj -E checking for ranlib... ranlib checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking minix/config.h usability... no checking minix/config.h presence... no checking for minix/config.h... no checking whether it is safe to define __EXTENSIONS__... yes checking for working alloca.h... no checking for alloca... yes checking arpa/inet.h usability... no checking arpa/inet.h presence... no checking for arpa/inet.h... no checking float.h usability... yes checking float.h presence... yes checking for float.h... yes checking sys/socket.h usability... no checking sys/socket.h presence... no checking for sys/socket.h... no checking netdb.h usability... no checking netdb.h presence... no checking for netdb.h... no checking netinet/in.h usability... no checking netinet/in.h presence... no checking for netinet/in.h... no checking sys/ioctl.h usability... no checking sys/ioctl.h presence... no checking for sys/ioctl.h... no checking sys/filio.h usability... no checking sys/filio.h presence... no checking for sys/filio.h... no checking for stdint.h... (cached) yes checking wchar.h usability... yes checking wchar.h presence... yes checking for wchar.h... yes checking stdio.h usability... yes checking stdio.h presence... yes checking for stdio.h... yes checking for stdlib.h... (cached) yes checking for string.h... (cached) yes checking sys/select.h usability... no checking sys/select.h presence... no checking for sys/select.h... no checking for sys/stat.h... (cached) yes checking sys/time.h usability... yes checking sys/time.h presence... yes checking for sys/time.h... yes checking for unistd.h... (cached) yes checking whether the preprocessor supports include_next... yes checking whether <sys/socket.h> is self-contained... no checking winsock2.h usability... yes checking winsock2.h presence... yes checking for winsock2.h... yes checking ws2tcpip.h usability... yes checking ws2tcpip.h presence... yes checking for ws2tcpip.h... yes checking for C/C++ restrict keyword... __restrict checking for IPv4 sockets... yes checking for IPv6 sockets... no checking for inline... inline checking whether malloc, realloc, calloc are POSIX compliant... no checking for external symbol _system_configuration... no checking whether snprintf is declared... yes checking for stdbool.h that conforms to C99... yes checking for _Bool... yes checking for long long int... yes checking for unsigned long long int... yes checking whether strdup is declared... yes checking whether strndup is declared... no checking whether strnlen is declared... no checking for lstat... no checking for vasnprintf... no checking whether stat file-mode macros are broken... no checking for struct timeval... yes checking for EOVERFLOW... E2BIG checking for size_t... yes checking for inttypes.h... yes checking for stdint.h... yes checking for intmax_t... yes checking for a thread-safe mkdir -p... /bin/mkdir -p configure: checking how to do getaddrinfo, freeaddrinfo and getnameinfo checking for library containing getaddrinfo... no checking for getaddrinfo... no checking for getaddrinfo in ws2tcpip.h and -lws2_32... no checking for gai_strerror (possibly via ws2tcpip.h)... yes checking for library containing gethostbyname... no checking for library containing getservbyname... no checking for gethostbyname... no checking for gethostbyname in winsock2.h and -lws2_32... yes checking whether getaddrinfo is declared... no checking whether freeaddrinfo is declared... no checking whether gai_strerror is declared... yes checking whether getnameinfo is declared... no checking for struct addrinfo... yes checking for inet_ntop... no checking whether inet_ntop is declared... no checking whether <netinet/in.h> is self-contained... no checking for netinet/in.h... (cached) no checking for a thread-safe mkdir -p... /bin/mkdir -p checking for sys/pstat.h... no checking for sys/sysmp.h... no checking for sys/sysinfo.h... no checking for machine/hal_sysinfo.h... no checking for sys/table.h... no checking for sys/param.h... yes checking for sys/sysctl.h... no checking for sys/systemcfg.h... no checking for pstat_getstatic... no checking for pstat_getdynamic... no checking for sysmp... no checking for getsysinfo... no checking for sysctl... no checking for table... no checking poll.h usability... no checking poll.h presence... no checking for poll.h... no checking for stdint.h... (cached) yes checking for SIZE_MAX... yes checking for snprintf... yes checking for socklen_t... yes checking whether stdint.h conforms to C99... yes checking for wchar_t... yes checking for wint_t... yes checking for strdup... yes checking for working strndup... no checking for working strnlen... no checking for strpbrk... yes checking for strsep... no checking whether <sys/select.h> is self-contained... no checking for a thread-safe mkdir -p... /bin/mkdir -p checking whether <sys/socket.h> is self-contained... (cached) no checking for winsock2.h... (cached) yes checking for ws2tcpip.h... (cached) yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for shutdown... no checking whether mkdir is declared... no checking io.h usability... yes checking io.h presence... yes checking for io.h... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for a thread-safe mkdir -p... /bin/mkdir -p checking for ptrdiff_t... yes checking for snprintf... (cached) yes checking for wcslen... yes checking whether _snprintf is declared... yes checking for vasprintf... no checking whether <wchar.h> is standalone... yes checking for stdint.h... (cached) yes checking for gcc... (cached) gcc-sjlj checking whether we are using the GNU C compiler... (cached) yes checking whether gcc-sjlj accepts -g... (cached) yes checking for gcc-sjlj option to accept ISO C89... (cached) none needed checking dependency style of gcc-sjlj... (cached) gcc3 checking for an ANSI C-conforming const... yes checking for function prototypes... yes checking for string.h... (cached) yes checking for a sed that does not truncate output... /bin/sed checking for ld used by gcc-sjlj... c:/mingw/mingw32/bin/ld.exe checking if the linker (c:/mingw/mingw32/bin/ld.exe) is GNU ld... yes checking for c:/mingw/mingw32/bin/ld.exe option to reload object files... -r checking for BSD-compatible nm... /mingw/bin/nm checking whether ln -s works... no, using cp -p checking how to recognize dependent libraries... file_magic file format pei*-i386(.*architecture: i386)? checking for dlltool... dlltool checking for as... as checking for objdump... objdump checking dlfcn.h usability... no checking dlfcn.h presence... no checking for dlfcn.h... no checking for g++... no checking for c++... no checking for gpp... no checking for aCC... no checking for CC... no checking for cxx... no checking for cc++... no checking for cl.exe... no checking for FCC... no checking for KCC... no checking for RCC... no checking for xlC_r... no checking for xlC... no checking whether we are using the GNU C++ compiler... no checking whether g++ accepts -g... no checking dependency style of g++... none checking for g77... no checking for xlf... no checking for f77... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for xlf90... no checking for f90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for xlf95... no checking for f95... no checking for fort... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 8192 checking command to parse /mingw/bin/nm output from gcc-sjlj object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... (cached) ranlib checking for strip... strip checking if gcc-sjlj supports -fno-rtti -fno-exceptions... no checking for gcc-sjlj option to produce PIC... -DDLL_EXPORT checking if gcc-sjlj PIC flag -DDLL_EXPORT works... yes checking if gcc-sjlj static flag -static works... yes checking if gcc-sjlj supports -c -o file.o... yes checking whether the gcc-sjlj linker (c:/mingw/mingw32/bin/ld.exe) supports shared libraries... yes checking whether -lc should be explicitly linked in... yes checking dynamic linker characteristics... Win32 ld.exe checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool appending configuration tag "F77" to libtool checking whether gcc-sjlj and cc understand -c and -o together... yes checking whether gcc understands -Wall... yes checking whether gcc understands -Wformat... yes checking whether gcc understands -Wformat-security... yes checking whether gcc understands -Wmissing-prototypes... yes checking whether gcc understands -Wnested-externs... yes checking whether gcc understands -Wpointer-arith... yes checking whether gcc understands -Wextra... yes checking whether gcc understands -Wshadow... yes checking whether gcc understands -Wcast-align... yes checking whether gcc understands -Wwrite-strings... yes checking whether gcc understands -Waggregate-return... yes checking whether gcc understands -Wstrict-prototypes... yes checking whether gcc understands -Winline... yes checking whether gcc understands -Wredundant-decls... yes checking whether gcc understands -Wno-sign-compare... yes checking whether gcc understands -Wp,-D_FORTIFY_SOURCE=2... yes checking whether gcc understands -fexceptions... yes checking whether gcc understands -fasynchronous-unwind-tables... yes checking what language compliance flags to pass to the C compiler... checking for cfmakeraw... no checking for regexec... no checking for uname... no checking libintl.h usability... no checking libintl.h presence... no checking for libintl.h... no checking pwd.h usability... no checking pwd.h presence... no checking for pwd.h... no checking paths.h usability... no checking paths.h presence... no checking for paths.h... no checking sys/syslimits.h usability... no checking sys/syslimits.h presence... no checking for sys/syslimits.h... no checking sys/utsname.h usability... no checking sys/utsname.h presence... no checking for sys/utsname.h... no checking sys/wait.h usability... no checking sys/wait.h presence... no checking for sys/wait.h... no checking winsock.h usability... yes checking winsock.h presence... yes checking for winsock.h... yes checking for library containing xdrmem_create... no checking for rpcgen... /c/oncrpc/bin/rpcgen checking for rm... /bin/rm checking for mv... /bin/mv checking for tar... /bin/tar checking for xmllint... /usr/local/bin/xmllint checking for xsltproc... /usr/bin/xsltproc checking for dnsmasq... dnsmasq checking for brctl... brctl checking where to write libvirtd PID file... ${prefix}/var/run/libvirtd.pid checking for init script flavor... none checking for iptables... /sbin/iptables checking for pkg-config... no checking libxml2 xml2-config >= 2.5.0 ... yes checking for struct _xmlURI.query_raw... yes checking gnutls/gnutls.h usability... yes checking gnutls/gnutls.h presence... no configure: WARNING: gnutls/gnutls.h: accepted by the compiler, rejected by the preprocessor! configure: WARNING: gnutls/gnutls.h: proceeding with the compiler's result checking for gnutls/gnutls.h... yes checking for gnutls_handshake in -lgnutls... yes checking for gnutls_session... yes checking readline/readline.h usability... no checking readline/readline.h presence... no checking for readline/readline.h... no checking for main in -lreadline... no configure: WARNING: readline library not found checking for python... no checking whether this host is running a Xen kernel... no checking If XenD UNIX socket /var/run/xend/xmlrpc.sock is accessible... no checking if Xen setuid proxy is needed... no checking whether NLS is requested... yes checking for msgfmt... no checking for gmsgfmt... : checking for xgettext... no checking for msgmerge... no checking for ld used by GCC... c:/mingw/mingw32/bin/ld.exe checking if the linker (c:/mingw/mingw32/bin/ld.exe) is GNU ld... yes checking for shared library run path origin... done checking whether NLS is requested... yes checking for GNU gettext in libc... no checking for iconv... no, consider installing GNU libiconv checking for GNU gettext in libintl... no checking whether to use NLS... no configure: creating ./config.status config.status: creating Makefile config.status: creating src/Makefile config.status: creating include/Makefile config.status: creating docs/Makefile config.status: creating docs/examples/Makefile config.status: creating docs/devhelp/Makefile config.status: creating docs/examples/python/Makefile config.status: creating gnulib/lib/Makefile config.status: creating gnulib/tests/Makefile config.status: creating libvirt.pc config.status: creating libvirt.spec config.status: creating po/Makefile.in config.status: WARNING: po/Makefile.in.in seems to ignore the --datarootdir setting config.status: creating scripts/Makefile config.status: creating include/libvirt/Makefile config.status: creating include/libvirt/libvirt.h config.status: creating python/Makefile config.status: creating python/tests/Makefile config.status: creating qemud/Makefile config.status: creating tests/Makefile config.status: creating proxy/Makefile config.status: creating tests/xml2sexprdata/Makefile config.status: creating tests/sexpr2xmldata/Makefile config.status: creating tests/xmconfigdata/Makefile config.status: creating tests/xencapsdata/Makefile config.status: creating tests/virshdata/Makefile config.status: creating tests/confdata/Makefile config.status: creating config.h config.status: executing depfiles commands config.status: executing default-1 commands config.status: creating po/POTFILES config.status: creating po/Makefile configure: configure: Configuration summary configure: ===================== configure: configure: Drivers configure: configure: Xen: no configure: Proxy: no configure: QEMU: no configure: OpenVZ: no configure: Test: yes configure: Remote: yes configure: configure: Libraries configure: configure: libxml: -I/usr/local/include/libxml2 -L/usr/local/lib -lxml2 -lws2_32 configure: gnutls: -lgnutls -lws2_32 configure: sasl: no configure: avahi: no configure: polkit: no configure: configure: Miscellaneous configure: configure: Debug: no configure: Readline: no configure: make all-recursive make[1]: Entering directory `/z/d/libvirt-mingw' Making all in gnulib/lib make[2]: Entering directory `/z/d/libvirt-mingw/gnulib/lib' make all-am make[3]: Entering directory `/z/d/libvirt-mingw/gnulib/lib' make[3]: Nothing to be done for `all-am'. make[3]: Leaving directory `/z/d/libvirt-mingw/gnulib/lib' make[2]: Leaving directory `/z/d/libvirt-mingw/gnulib/lib' Making all in include make[2]: Entering directory `/z/d/libvirt-mingw/include' Making all in libvirt make[3]: Entering directory `/z/d/libvirt-mingw/include/libvirt' make[3]: Nothing to be done for `all'. make[3]: Leaving directory `/z/d/libvirt-mingw/include/libvirt' make[3]: Entering directory `/z/d/libvirt-mingw/include' make[3]: Nothing to be done for `all-am'. make[3]: Leaving directory `/z/d/libvirt-mingw/include' make[2]: Leaving directory `/z/d/libvirt-mingw/include' Making all in src make[2]: Entering directory `/z/d/libvirt-mingw/src' /bin/sh ../libtool --tag=CC --mode=compile gcc-sjlj -DHAVE_CONFIG_H -I. -I.. -I../gnulib/lib -I../gnulib/lib -I../include -I../include -I../qemud -I/usr/local/include/libxml2 -DBINDIR=\""/usr/local/libexec"\" -DSBINDIR=\""/usr/local/sbin"\" -DSYSCONF_DIR="\"/usr/local/etc\"" -DLOCALEBASEDIR=\""/usr/local/share/locale"\" -DLOCAL_STATE_DIR=\""/usr/local/var"\" -DGETTEXT_PACKAGE=\"libvirt\" -Wall -Wformat -Wformat-security -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Winline -Wredundant-decls -Wno-sign-compare -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fasynchronous-unwind-tables -DWITH_TEST -DWITH_REMOTE -I /c/Users/rjones/Desktop/gnutls/include -I /c/oncrpc -MT libvirt_la-remote_internal.lo -MD -MP -MF .deps/libvirt_la-remote_internal.Tpo -c -o libvirt_la-remote_internal.lo `test -f 'remote_internal.c' || echo './'`remote_internal.c gcc-sjlj -DHAVE_CONFIG_H -I. -I.. -I../gnulib/lib -I../gnulib/lib -I../include -I../include -I../qemud -I/usr/local/include/libxml2 -DBINDIR=\"/usr/local/libexec\" -DSBINDIR=\"/usr/local/sbin\" -DSYSCONF_DIR=\"/usr/local/etc\" -DLOCALEBASEDIR=\"/usr/local/share/locale\" -DLOCAL_STATE_DIR=\"/usr/local/var\" -DGETTEXT_PACKAGE=\"libvirt\" -Wall -Wformat -Wformat-security -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Winline -Wredundant-decls -Wno-sign-compare -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fasynchronous-unwind-tables -DWITH_TEST -DWITH_REMOTE -I /c/Users/rjones/Desktop/gnutls/include -I /c/oncrpc -MT libvirt_la-remote_internal.lo -MD -MP -MF .deps/libvirt_la-remote_internal.Tpo -c remote_internal.c -DDLL_EXPORT -DPIC -o .libs/libvirt_la-remote_internal.o In file included from ../gnulib/lib/sys/stat.h:28, from remote_internal.c:34: ../gnulib/lib/sys/stat.h:272: warning: unused parameter 'mode' In file included from remote_internal.c:59: c:/oncrpc/rpc/xdr.h:116: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:127: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:128: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:129: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:130: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:131: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:132: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:133: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:134: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:242: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:243: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:244: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:245: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:246: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:247: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:248: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:249: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:250: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:251: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:252: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:253: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:254: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:255: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:256: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:257: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:258: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:259: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:260: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:261: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:262: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:263: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:275: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:281: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:282: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:283: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:284: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:285: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:286: warning: function declaration isn't a prototype In file included from ../gnulib/lib/sys/socket.h:65, from ../gnulib/lib/getaddrinfo.h:29, from remote_internal.c:74: c:\mingw\bin\../lib/gcc/mingw32/4.2.1-sjlj/../../../../include/ws2tcpip.h:16:2: error: #error "ws2tcpip.h is not compatible with winsock.h. Include winsock2.h instead." In file included from ../gnulib/lib/sys/socket.h:65, from ../gnulib/lib/getaddrinfo.h:29, from remote_internal.c:74: c:\mingw\bin\../lib/gcc/mingw32/4.2.1-sjlj/../../../../include/ws2tcpip.h:124: error: redefinition of 'struct ip_mreq' In file included from ../qemud/remote_protocol.h:9, from remote_internal.c:76: c:/oncrpc/rpc/rpc.h:52:1: warning: "FD_SETSIZE" redefined In file included from remote_internal.c:55: c:\mingw\bin\../lib/gcc/mingw32/4.2.1-sjlj/../../../../include/winsock.h:35:1: warning: this is the location of the previous definition In file included from ../qemud/remote_protocol.h:9, from remote_internal.c:76: c:/oncrpc/rpc/rpc.h:71: warning: function declaration isn't a prototype In file included from ../qemud/remote_protocol.h:9, from remote_internal.c:76: c:/oncrpc/rpc/rpc.h:74: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:89, from ../qemud/remote_protocol.h:9, from remote_internal.c:76: c:/oncrpc/rpc/auth.h:105: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:125: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:126: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:127: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:128: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:129: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:196: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:197: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:198: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:199: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:92, from ../qemud/remote_protocol.h:9, from remote_internal.c:76: c:/oncrpc/rpc/clnt.h:134: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:135: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:136: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:137: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:138: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:139: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:256: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:263: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:284: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:307: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:308: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:313: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:314: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:319: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:324: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:325: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:353: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:95, from ../qemud/remote_protocol.h:9, from remote_internal.c:76: c:/oncrpc/rpc/rpc_msg.h:184: warning: function declaration isn't a prototype c:/oncrpc/rpc/rpc_msg.h:192: warning: function declaration isn't a prototype c:/oncrpc/rpc/rpc_msg.h:200: warning: function declaration isn't a prototype c:/oncrpc/rpc/rpc_msg.h:208: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:97, from ../qemud/remote_protocol.h:9, from remote_internal.c:76: c:/oncrpc/rpc/auth_uni.h:84: warning: function declaration isn't a prototype In file included from ../qemud/remote_protocol.h:9, from remote_internal.c:76: c:/oncrpc/rpc/rpc.h:105:29: warning: "/*" within comment In file included from c:/oncrpc/rpc/rpc.h:108, from ../qemud/remote_protocol.h:9, from remote_internal.c:76: c:/oncrpc/rpc/svc.h:94: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:95: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:96: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:97: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:98: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:99: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:108, from ../qemud/remote_protocol.h:9, from remote_internal.c:76: c:/oncrpc/rpc/svc.h:173:19: warning: "/*" within comment c:/oncrpc/rpc/svc.h:175: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:184: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:192: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:200: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:231: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:232: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:233: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:234: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:235: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:236: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:237: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:238: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:278: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:280: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:281: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:282: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:296: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:301: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:302: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:307: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:109, from ../qemud/remote_protocol.h:9, from remote_internal.c:76: c:/oncrpc/rpc/svc_auth.h:56: error: 'auth_stat' defined as wrong kind of tag c:/oncrpc/rpc/svc_auth.h:56: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:117, from ../qemud/remote_protocol.h:9, from remote_internal.c:76: c:/oncrpc/rpc/netdb.h:51: warning: function declaration isn't a prototype c:/oncrpc/rpc/netdb.h:51: warning: function declaration isn't a prototype c:/oncrpc/rpc/netdb.h:51: warning: function declaration isn't a prototype In file included from remote_internal.c:76: ../qemud/remote_protocol.h:78: error: expected specifier-qualifier-list before 'u_quad_t' ../qemud/remote_protocol.h:88: error: expected specifier-qualifier-list before 'quad_t' ../qemud/remote_protocol.h:124: error: expected specifier-qualifier-list before 'quad_t' ../qemud/remote_protocol.h:145: error: expected specifier-qualifier-list before 'quad_t' ../qemud/remote_protocol.h:201: error: expected specifier-qualifier-list before 'quad_t' ../qemud/remote_protocol.h:216: error: expected specifier-qualifier-list before 'quad_t' ../qemud/remote_protocol.h:328: error: expected specifier-qualifier-list before 'u_quad_t' ../qemud/remote_protocol.h:334: error: expected specifier-qualifier-list before 'u_quad_t' ../qemud/remote_protocol.h:340: error: expected specifier-qualifier-list before 'u_quad_t' ../qemud/remote_protocol.h:351: error: expected specifier-qualifier-list before 'u_quad_t' ../qemud/remote_protocol.h:389: error: expected specifier-qualifier-list before 'u_quad_t' ../qemud/remote_protocol.h:411: error: expected specifier-qualifier-list before 'u_quad_t' ../qemud/remote_protocol.h:424: error: expected specifier-qualifier-list before 'u_quad_t' remote_internal.c: In function 'remoteForkDaemon': remote_internal.c:247: warning: implicit declaration of function 'fork' remote_internal.c:252: error: '_PATH_DEVNULL' undeclared (first use in this function) remote_internal.c:252: error: (Each undeclared identifier is reported only once remote_internal.c:252: error: for each function it appears in.) remote_internal.c:269: warning: implicit declaration of function 'sysconf' remote_internal.c:269: warning: nested extern declaration of 'sysconf' remote_internal.c:269: error: '_SC_OPEN_MAX' undeclared (first use in this function) remote_internal.c:276: warning: implicit declaration of function 'setsid' remote_internal.c:276: warning: nested extern declaration of 'setsid' remote_internal.c:299: warning: implicit declaration of function 'waitpid' remote_internal.c:299: warning: nested extern declaration of 'waitpid' remote_internal.c: In function 'doRemoteOpen': remote_internal.c:513: error: 'AI_ADDRCONFIG' undeclared (first use in this function) remote_internal.c:579: error: 'uid_t' undeclared (first use in this function) remote_internal.c:579: error: expected ';' before 'uid' remote_internal.c:581: warning: implicit declaration of function 'getpwuid' remote_internal.c:581: warning: nested extern declaration of 'getpwuid' remote_internal.c:581: error: 'uid' undeclared (first use in this function) remote_internal.c:581: warning: assignment makes pointer from integer without a cast remote_internal.c:586: error: dereferencing pointer to incomplete type remote_internal.c:605: error: storage size of 'addr' isn't known remote_internal.c:628: error: 'ECONNREFUSED' undeclared (first use in this function) remote_internal.c:635: warning: implicit declaration of function 'usleep' remote_internal.c:635: warning: nested extern declaration of 'usleep' remote_internal.c:605: warning: unused variable 'addr' remote_internal.c:703: warning: implicit declaration of function 'socketpair' remote_internal.c:703: warning: nested extern declaration of 'socketpair' remote_internal.c:731: warning: passing argument 2 of 'execvp' from incompatible pointer type remote_internal.c: In function 'remoteOpen': remote_internal.c:837: warning: implicit declaration of function 'getuid' remote_internal.c:837: warning: nested extern declaration of 'getuid' remote_internal.c: In function 'remoteVersion': remote_internal.c:1421: error: 'remote_get_version_ret' has no member named 'hv_ver' remote_internal.c: In function 'remoteNodeGetInfo': remote_internal.c:1472: error: 'remote_node_get_info_ret' has no member named 'memory' remote_internal.c:1473: error: 'remote_node_get_info_ret' has no member named 'cpus' remote_internal.c:1474: error: 'remote_node_get_info_ret' has no member named 'mhz' remote_internal.c:1475: error: 'remote_node_get_info_ret' has no member named 'nodes' remote_internal.c:1476: error: 'remote_node_get_info_ret' has no member named 'sockets' remote_internal.c:1477: error: 'remote_node_get_info_ret' has no member named 'cores' remote_internal.c:1478: error: 'remote_node_get_info_ret' has no member named 'threads' remote_internal.c: In function 'remoteListDomains': remote_internal.c:1520: warning: implicit declaration of function 'xdr_free' remote_internal.c:1520: warning: nested extern declaration of 'xdr_free' remote_internal.c: In function 'remoteDomainGetMaxMemory': remote_internal.c:1752: error: 'remote_domain_get_max_memory_ret' has no member named 'memory' remote_internal.c:1753: warning: control reaches end of non-void function remote_internal.c: In function 'remoteDomainSetMaxMemory': remote_internal.c:1762: error: 'remote_domain_set_max_memory_args' has no member named 'memory' remote_internal.c: In function 'remoteDomainSetMemory': remote_internal.c:1779: error: 'remote_domain_set_memory_args' has no member named 'memory' remote_internal.c: In function 'remoteDomainGetInfo': remote_internal.c:1805: error: 'remote_domain_get_info_ret' has no member named 'max_mem' remote_internal.c:1806: error: 'remote_domain_get_info_ret' has no member named 'memory' remote_internal.c:1807: error: 'remote_domain_get_info_ret' has no member named 'nr_virt_cpu' remote_internal.c:1808: error: 'remote_domain_get_info_ret' has no member named 'cpu_time' remote_internal.c: In function 'remoteDomainGetVcpus': remote_internal.c:1956: error: 'remote_vcpu_info' has no member named 'cpu_time' remote_internal.c:1957: error: 'remote_vcpu_info' has no member named 'cpu' remote_internal.c: In function 'remoteDomainMigratePrepare': remote_internal.c:2017: error: 'remote_domain_migrate_prepare_args' has no member named 'flags' remote_internal.c:2018: error: 'remote_domain_migrate_prepare_args' has no member named 'dname' remote_internal.c:2019: error: 'remote_domain_migrate_prepare_args' has no member named 'resource' remote_internal.c: In function 'remoteDomainMigratePerform': remote_internal.c:2053: error: 'remote_domain_migrate_perform_args' has no member named 'flags' remote_internal.c:2054: error: 'remote_domain_migrate_perform_args' has no member named 'dname' remote_internal.c:2055: error: 'remote_domain_migrate_perform_args' has no member named 'resource' remote_internal.c: In function 'remoteDomainMigrateFinish': remote_internal.c:2082: error: 'remote_domain_migrate_finish_args' has no member named 'flags' remote_internal.c: In function 'remoteDomainGetSchedulerParameters': remote_internal.c:2334: error: 'union <anonymous>' has no member named 'l' remote_internal.c:2336: error: 'union <anonymous>' has no member named 'ul' remote_internal.c:2338: error: 'union <anonymous>' has no member named 'd' remote_internal.c:2340: error: 'union <anonymous>' has no member named 'b' remote_internal.c: In function 'remoteDomainSetSchedulerParameters': remote_internal.c:2386: error: 'union <anonymous>' has no member named 'l' remote_internal.c:2388: error: 'union <anonymous>' has no member named 'ul' remote_internal.c:2390: error: 'union <anonymous>' has no member named 'd' remote_internal.c:2392: error: 'union <anonymous>' has no member named 'b' remote_internal.c: In function 'remoteDomainBlockStats': remote_internal.c:2430: error: 'remote_domain_block_stats_ret' has no member named 'rd_req' remote_internal.c:2431: error: 'remote_domain_block_stats_ret' has no member named 'rd_bytes' remote_internal.c:2432: error: 'remote_domain_block_stats_ret' has no member named 'wr_req' remote_internal.c:2433: error: 'remote_domain_block_stats_ret' has no member named 'wr_bytes' remote_internal.c:2434: error: 'remote_domain_block_stats_ret' has no member named 'errs' remote_internal.c: In function 'remoteDomainInterfaceStats': remote_internal.c:2458: error: 'remote_domain_interface_stats_ret' has no member named 'rx_bytes' remote_internal.c:2459: error: 'remote_domain_interface_stats_ret' has no member named 'rx_packets' remote_internal.c:2460: error: 'remote_domain_interface_stats_ret' has no member named 'rx_errs' remote_internal.c:2461: error: 'remote_domain_interface_stats_ret' has no member named 'rx_drop' remote_internal.c:2462: error: 'remote_domain_interface_stats_ret' has no member named 'tx_bytes' remote_internal.c:2463: error: 'remote_domain_interface_stats_ret' has no member named 'tx_packets' remote_internal.c:2464: error: 'remote_domain_interface_stats_ret' has no member named 'tx_errs' remote_internal.c:2465: error: 'remote_domain_interface_stats_ret' has no member named 'tx_drop' make[2]: *** [libvirt_la-remote_internal.lo] Error 1 /bin/sh ../libtool --tag=CC --mode=compile gcc-sjlj -DHAVE_CONFIG_H -I. -I.. -I../gnulib/lib -I../gnulib/lib -I../include -I../include -I../qemud -I/usr/local/include/libxml2 -DBINDIR=\""/usr/local/libexec"\" -DSBINDIR=\""/usr/local/sbin"\" -DSYSCONF_DIR="\"/usr/local/etc\"" -DLOCALEBASEDIR=\""/usr/local/share/locale"\" -DLOCAL_STATE_DIR=\""/usr/local/var"\" -DGETTEXT_PACKAGE=\"libvirt\" -Wall -Wformat -Wformat-security -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Winline -Wredundant-decls -Wno-sign-compare -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fasynchronous-unwind-tables -DWITH_TEST -DWITH_REMOTE -I /c/Users/rjones/Desktop/gnutls/include -I /c/oncrpc -MT libvirt_la-iptables.lo -MD -MP -MF .deps/libvirt_la-iptables.Tpo -c -o libvirt_la-iptables.lo `test -f 'iptables.c' || echo './'`iptables.c gcc-sjlj -DHAVE_CONFIG_H -I. -I.. -I../gnulib/lib -I../gnulib/lib -I../include -I../include -I../qemud -I/usr/local/include/libxml2 -DBINDIR=\"/usr/local/libexec\" -DSBINDIR=\"/usr/local/sbin\" -DSYSCONF_DIR=\"/usr/local/etc\" -DLOCALEBASEDIR=\"/usr/local/share/locale\" -DLOCAL_STATE_DIR=\"/usr/local/var\" -DGETTEXT_PACKAGE=\"libvirt\" -Wall -Wformat -Wformat-security -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Winline -Wredundant-decls -Wno-sign-compare -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fasynchronous-unwind-tables -DWITH_TEST -DWITH_REMOTE -I /c/Users/rjones/Desktop/gnutls/include -I /c/oncrpc -MT libvirt_la-iptables.lo -MD -MP -MF .deps/libvirt_la-iptables.Tpo -c iptables.c -DDLL_EXPORT -DPIC -o .libs/libvirt_la-iptables.o In file included from ../gnulib/lib/sys/stat.h:28, from iptables.c:35: ../gnulib/lib/sys/stat.h:272: warning: unused parameter 'mode' iptables.c: In function 'iptablesSpawn': iptables.c:355: error: '_PATH_DEVNULL' undeclared (first use in this function) iptables.c:355: error: (Each undeclared identifier is reported only once iptables.c:355: error: for each function it appears in.) iptables.c:358: warning: implicit declaration of function 'fork' iptables.c:373: warning: passing argument 2 of 'execvp' from incompatible pointer type iptables.c:381: warning: implicit declaration of function 'waitpid' iptables.c:381: warning: nested extern declaration of 'waitpid' iptables.c:388: warning: implicit declaration of function 'WIFEXITED' iptables.c:388: warning: nested extern declaration of 'WIFEXITED' iptables.c:388: warning: implicit declaration of function 'WEXITSTATUS' iptables.c:388: warning: nested extern declaration of 'WEXITSTATUS' make[2]: *** [libvirt_la-iptables.lo] Error 1 /bin/sh ../libtool --tag=CC --mode=compile gcc-sjlj -DHAVE_CONFIG_H -I. -I.. -I../gnulib/lib -I../gnulib/lib -I../include -I../include -I../qemud -I/usr/local/include/libxml2 -DBINDIR=\""/usr/local/libexec"\" -DSBINDIR=\""/usr/local/sbin"\" -DSYSCONF_DIR="\"/usr/local/etc\"" -DLOCALEBASEDIR=\""/usr/local/share/locale"\" -DLOCAL_STATE_DIR=\""/usr/local/var"\" -DGETTEXT_PACKAGE=\"libvirt\" -Wall -Wformat -Wformat-security -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Winline -Wredundant-decls -Wno-sign-compare -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fasynchronous-unwind-tables -DWITH_TEST -DWITH_REMOTE -I /c/Users/rjones/Desktop/gnutls/include -I /c/oncrpc -MT libvirt_la-util.lo -MD -MP -MF .deps/libvirt_la-util.Tpo -c -o libvirt_la-util.lo `test -f 'util.c' || echo './'`util.c gcc-sjlj -DHAVE_CONFIG_H -I. -I.. -I../gnulib/lib -I../gnulib/lib -I../include -I../include -I../qemud -I/usr/local/include/libxml2 -DBINDIR=\"/usr/local/libexec\" -DSBINDIR=\"/usr/local/sbin\" -DSYSCONF_DIR=\"/usr/local/etc\" -DLOCALEBASEDIR=\"/usr/local/share/locale\" -DLOCAL_STATE_DIR=\"/usr/local/var\" -DGETTEXT_PACKAGE=\"libvirt\" -Wall -Wformat -Wformat-security -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Winline -Wredundant-decls -Wno-sign-compare -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fasynchronous-unwind-tables -DWITH_TEST -DWITH_REMOTE -I /c/Users/rjones/Desktop/gnutls/include -I /c/oncrpc -MT libvirt_la-util.lo -MD -MP -MF .deps/libvirt_la-util.Tpo -c util.c -DDLL_EXPORT -DPIC -o .libs/libvirt_la-util.o util.c:33:19: error: paths.h: No such file or directory In file included from ../gnulib/lib/sys/stat.h:28, from util.c:36: ../gnulib/lib/sys/stat.h:272: warning: unused parameter 'mode' util.c: In function 'virExec': util.c:213: warning: implicit declaration of function 'ReportError' util.c:213: warning: nested extern declaration of 'ReportError' make[2]: *** [libvirt_la-util.lo] Error 1 /bin/sh ../libtool --tag=CC --mode=compile gcc-sjlj -DHAVE_CONFIG_H -I. -I.. -I../gnulib/lib -I../gnulib/lib -I../include -I../include -I../qemud -I/usr/local/include/libxml2 -DBINDIR=\""/usr/local/libexec"\" -DSBINDIR=\""/usr/local/sbin"\" -DSYSCONF_DIR="\"/usr/local/etc\"" -DLOCALEBASEDIR=\""/usr/local/share/locale"\" -DLOCAL_STATE_DIR=\""/usr/local/var"\" -DGETTEXT_PACKAGE=\"libvirt\" -Wall -Wformat -Wformat-security -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Winline -Wredundant-decls -Wno-sign-compare -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fasynchronous-unwind-tables -DWITH_TEST -DWITH_REMOTE -I /c/Users/rjones/Desktop/gnutls/include -I /c/oncrpc -MT libvirt_la-remote_protocol.lo -MD -MP -MF .deps/libvirt_la-remote_protocol.Tpo -c -o libvirt_la-remote_protocol.lo `test -f '../qemud/remote_protocol.c' || echo './'`../qemud/remote_protocol.c gcc-sjlj -DHAVE_CONFIG_H -I. -I.. -I../gnulib/lib -I../gnulib/lib -I../include -I../include -I../qemud -I/usr/local/include/libxml2 -DBINDIR=\"/usr/local/libexec\" -DSBINDIR=\"/usr/local/sbin\" -DSYSCONF_DIR=\"/usr/local/etc\" -DLOCALEBASEDIR=\"/usr/local/share/locale\" -DLOCAL_STATE_DIR=\"/usr/local/var\" -DGETTEXT_PACKAGE=\"libvirt\" -Wall -Wformat -Wformat-security -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Winline -Wredundant-decls -Wno-sign-compare -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fasynchronous-unwind-tables -DWITH_TEST -DWITH_REMOTE -I /c/Users/rjones/Desktop/gnutls/include -I /c/oncrpc -MT libvirt_la-remote_protocol.lo -MD -MP -MF .deps/libvirt_la-remote_protocol.Tpo -c ../qemud/remote_protocol.c -DDLL_EXPORT -DPIC -o .libs/libvirt_la-remote_protocol.o In file included from ../gnulib/lib/string.h:23, from c:\mingw\bin\../lib/gcc/mingw32/4.2.1-sjlj/../../../../include/winnt.h:37, from c:\mingw\bin\../lib/gcc/mingw32/4.2.1-sjlj/../../../../include/windef.h:253, from c:\mingw\bin\../lib/gcc/mingw32/4.2.1-sjlj/../../../../include/windows.h:48, from c:\mingw\bin\../lib/gcc/mingw32/4.2.1-sjlj/../../../../include/winsock.h:19, from c:/oncrpc/rpc/rpc.h:55, from ../qemud/remote_protocol.h:9, from ../qemud/remote_protocol.c:6: ../gnulib/lib/string.h:283: error: expected ';', ',' or ')' before '__stringp' In file included from ../qemud/remote_protocol.h:9, from ../qemud/remote_protocol.c:6: c:/oncrpc/rpc/rpc.h:71: warning: function declaration isn't a prototype In file included from ../qemud/remote_protocol.h:9, from ../qemud/remote_protocol.c:6: c:/oncrpc/rpc/rpc.h:74: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:86, from ../qemud/remote_protocol.h:9, from ../qemud/remote_protocol.c:6: c:/oncrpc/rpc/xdr.h:116: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:127: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:128: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:129: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:130: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:131: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:132: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:133: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:134: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:242: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:243: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:244: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:245: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:246: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:247: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:248: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:249: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:250: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:251: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:252: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:253: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:254: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:255: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:256: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:257: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:258: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:259: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:260: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:261: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:262: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:263: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:275: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:281: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:282: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:283: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:284: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:285: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:286: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:89, from ../qemud/remote_protocol.h:9, from ../qemud/remote_protocol.c:6: c:/oncrpc/rpc/auth.h:105: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:125: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:126: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:127: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:128: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:129: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:196: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:197: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:198: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:199: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:92, from ../qemud/remote_protocol.h:9, from ../qemud/remote_protocol.c:6: c:/oncrpc/rpc/clnt.h:134: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:135: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:136: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:137: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:138: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:139: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:256: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:263: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:284: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:307: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:308: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:313: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:314: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:319: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:324: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:325: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:353: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:95, from ../qemud/remote_protocol.h:9, from ../qemud/remote_protocol.c:6: c:/oncrpc/rpc/rpc_msg.h:184: warning: function declaration isn't a prototype c:/oncrpc/rpc/rpc_msg.h:192: warning: function declaration isn't a prototype c:/oncrpc/rpc/rpc_msg.h:200: warning: function declaration isn't a prototype c:/oncrpc/rpc/rpc_msg.h:208: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:97, from ../qemud/remote_protocol.h:9, from ../qemud/remote_protocol.c:6: c:/oncrpc/rpc/auth_uni.h:84: warning: function declaration isn't a prototype In file included from ../qemud/remote_protocol.h:9, from ../qemud/remote_protocol.c:6: c:/oncrpc/rpc/rpc.h:105:29: warning: "/*" within comment In file included from c:/oncrpc/rpc/rpc.h:108, from ../qemud/remote_protocol.h:9, from ../qemud/remote_protocol.c:6: c:/oncrpc/rpc/svc.h:94: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:95: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:96: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:97: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:98: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:99: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:108, from ../qemud/remote_protocol.h:9, from ../qemud/remote_protocol.c:6: c:/oncrpc/rpc/svc.h:173:19: warning: "/*" within comment c:/oncrpc/rpc/svc.h:175: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:184: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:192: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:200: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:231: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:232: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:233: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:234: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:235: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:236: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:237: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:238: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:278: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:280: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:281: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:282: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:296: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:301: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:302: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:307: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:109, from ../qemud/remote_protocol.h:9, from ../qemud/remote_protocol.c:6: c:/oncrpc/rpc/svc_auth.h:56: error: 'auth_stat' defined as wrong kind of tag c:/oncrpc/rpc/svc_auth.h:56: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:117, from ../qemud/remote_protocol.h:9, from ../qemud/remote_protocol.c:6: c:/oncrpc/rpc/netdb.h:51: warning: function declaration isn't a prototype c:/oncrpc/rpc/netdb.h:51: warning: function declaration isn't a prototype c:/oncrpc/rpc/netdb.h:51: warning: function declaration isn't a prototype In file included from ../qemud/remote_protocol.c:6: ../qemud/remote_protocol.h:78: error: expected specifier-qualifier-list before 'u_quad_t' ../qemud/remote_protocol.h:88: error: expected specifier-qualifier-list before 'quad_t' ../qemud/remote_protocol.h:124: error: expected specifier-qualifier-list before 'quad_t' ../qemud/remote_protocol.h:145: error: expected specifier-qualifier-list before 'quad_t' ../qemud/remote_protocol.h:201: error: expected specifier-qualifier-list before 'quad_t' ../qemud/remote_protocol.h:216: error: expected specifier-qualifier-list before 'quad_t' ../qemud/remote_protocol.h:328: error: expected specifier-qualifier-list before 'u_quad_t' ../qemud/remote_protocol.h:334: error: expected specifier-qualifier-list before 'u_quad_t' ../qemud/remote_protocol.h:340: error: expected specifier-qualifier-list before 'u_quad_t' ../qemud/remote_protocol.h:351: error: expected specifier-qualifier-list before 'u_quad_t' ../qemud/remote_protocol.h:389: error: expected specifier-qualifier-list before 'u_quad_t' ../qemud/remote_protocol.h:411: error: expected specifier-qualifier-list before 'u_quad_t' ../qemud/remote_protocol.h:424: error: expected specifier-qualifier-list before 'u_quad_t' ../qemud/remote_protocol.c: In function 'xdr_remote_vcpu_info': ../qemud/remote_protocol.c:124: warning: implicit declaration of function 'xdr_u_quad_t' ../qemud/remote_protocol.c:124: warning: nested extern declaration of 'xdr_u_quad_t' ../qemud/remote_protocol.c:124: error: 'remote_vcpu_info' has no member named 'cpu_time' ../qemud/remote_protocol.c:126: error: 'remote_vcpu_info' has no member named 'cpu' ../qemud/remote_protocol.c: In function 'xdr_remote_sched_param_value': ../qemud/remote_protocol.c:146: warning: implicit declaration of function 'xdr_quad_t' ../qemud/remote_protocol.c:146: warning: nested extern declaration of 'xdr_quad_t' ../qemud/remote_protocol.c:146: error: 'union <anonymous>' has no member named 'l' ../qemud/remote_protocol.c:150: error: 'union <anonymous>' has no member named 'ul' ../qemud/remote_protocol.c:154: error: 'union <anonymous>' has no member named 'd' ../qemud/remote_protocol.c:158: error: 'union <anonymous>' has no member named 'b' ../qemud/remote_protocol.c: In function 'xdr_remote_get_version_ret': ../qemud/remote_protocol.c:220: error: 'remote_get_version_ret' has no member named 'hv_ver' ../qemud/remote_protocol.c: In function 'xdr_remote_node_get_info_ret': ../qemud/remote_protocol.c:255: error: expected '=', ',', ';', 'asm' or '__attribute__' before '*' token ../qemud/remote_protocol.c:255: error: 'buf' undeclared (first use in this function) ../qemud/remote_protocol.c:255: error: (Each undeclared identifier is reported only once ../qemud/remote_protocol.c:255: error: for each function it appears in.) ../qemud/remote_protocol.c:262: error: 'remote_node_get_info_ret' has no member named 'memory' ../qemud/remote_protocol.c:266: error: 'remote_node_get_info_ret' has no member named 'cpus' ../qemud/remote_protocol.c:268: error: 'remote_node_get_info_ret' has no member named 'mhz' ../qemud/remote_protocol.c:270: error: 'remote_node_get_info_ret' has no member named 'nodes' ../qemud/remote_protocol.c:272: error: 'remote_node_get_info_ret' has no member named 'sockets' ../qemud/remote_protocol.c:274: error: 'remote_node_get_info_ret' has no member named 'cores' ../qemud/remote_protocol.c:276: error: 'remote_node_get_info_ret' has no member named 'threads' ../qemud/remote_protocol.c:279: warning: implicit declaration of function 'IXDR_PUT_INT32' ../qemud/remote_protocol.c:279: warning: nested extern declaration of 'IXDR_PUT_INT32' ../qemud/remote_protocol.c:279: error: 'remote_node_get_info_ret' has no member named 'cpus' ../qemud/remote_protocol.c:280: error: 'remote_node_get_info_ret' has no member named 'mhz' ../qemud/remote_protocol.c:281: error: 'remote_node_get_info_ret' has no member named 'nodes' ../qemud/remote_protocol.c:282: error: 'remote_node_get_info_ret' has no member named 'sockets' ../qemud/remote_protocol.c:283: error: 'remote_node_get_info_ret' has no member named 'cores' ../qemud/remote_protocol.c:284: error: 'remote_node_get_info_ret' has no member named 'threads' ../qemud/remote_protocol.c:291: error: 'remote_node_get_info_ret' has no member named 'memory' ../qemud/remote_protocol.c:295: error: 'remote_node_get_info_ret' has no member named 'cpus' ../qemud/remote_protocol.c:297: error: 'remote_node_get_info_ret' has no member named 'mhz' ../qemud/remote_protocol.c:299: error: 'remote_node_get_info_ret' has no member named 'nodes' ../qemud/remote_protocol.c:301: error: 'remote_node_get_info_ret' has no member named 'sockets' ../qemud/remote_protocol.c:303: error: 'remote_node_get_info_ret' has no member named 'cores' ../qemud/remote_protocol.c:305: error: 'remote_node_get_info_ret' has no member named 'threads' ../qemud/remote_protocol.c:308: error: 'remote_node_get_info_ret' has no member named 'cpus' ../qemud/remote_protocol.c:309: error: 'remote_node_get_info_ret' has no member named 'mhz' ../qemud/remote_protocol.c:310: error: 'remote_node_get_info_ret' has no member named 'nodes' ../qemud/remote_protocol.c:311: error: 'remote_node_get_info_ret' has no member named 'sockets' ../qemud/remote_protocol.c:312: error: 'remote_node_get_info_ret' has no member named 'cores' ../qemud/remote_protocol.c:313: error: 'remote_node_get_info_ret' has no member named 'threads' ../qemud/remote_protocol.c:321: error: 'remote_node_get_info_ret' has no member named 'memory' ../qemud/remote_protocol.c:323: error: 'remote_node_get_info_ret' has no member named 'cpus' ../qemud/remote_protocol.c:325: error: 'remote_node_get_info_ret' has no member named 'mhz' ../qemud/remote_protocol.c:327: error: 'remote_node_get_info_ret' has no member named 'nodes' ../qemud/remote_protocol.c:329: error: 'remote_node_get_info_ret' has no member named 'sockets' ../qemud/remote_protocol.c:331: error: 'remote_node_get_info_ret' has no member named 'cores' ../qemud/remote_protocol.c:333: error: 'remote_node_get_info_ret' has no member named 'threads' ../qemud/remote_protocol.c: In function 'xdr_remote_domain_block_stats_ret': ../qemud/remote_protocol.c:417: error: 'remote_domain_block_stats_ret' has no member named 'rd_req' ../qemud/remote_protocol.c:419: error: 'remote_domain_block_stats_ret' has no member named 'rd_bytes' ../qemud/remote_protocol.c:421: error: 'remote_domain_block_stats_ret' has no member named 'wr_req' ../qemud/remote_protocol.c:423: error: 'remote_domain_block_stats_ret' has no member named 'wr_bytes' ../qemud/remote_protocol.c:425: error: 'remote_domain_block_stats_ret' has no member named 'errs' ../qemud/remote_protocol.c: In function 'xdr_remote_domain_interface_stats_ret': ../qemud/remote_protocol.c:445: error: 'remote_domain_interface_stats_ret' has no member named 'rx_bytes' ../qemud/remote_protocol.c:447: error: 'remote_domain_interface_stats_ret' has no member named 'rx_packets' ../qemud/remote_protocol.c:449: error: 'remote_domain_interface_stats_ret' has no member named 'rx_errs' ../qemud/remote_protocol.c:451: error: 'remote_domain_interface_stats_ret' has no member named 'rx_drop' ../qemud/remote_protocol.c:453: error: 'remote_domain_interface_stats_ret' has no member named 'tx_bytes' ../qemud/remote_protocol.c:455: error: 'remote_domain_interface_stats_ret' has no member named 'tx_packets' ../qemud/remote_protocol.c:457: error: 'remote_domain_interface_stats_ret' has no member named 'tx_errs' ../qemud/remote_protocol.c:459: error: 'remote_domain_interface_stats_ret' has no member named 'tx_drop' ../qemud/remote_protocol.c: In function 'xdr_remote_domain_get_max_memory_ret': ../qemud/remote_protocol.c:645: error: 'remote_domain_get_max_memory_ret' has no member named 'memory' ../qemud/remote_protocol.c: In function 'xdr_remote_domain_set_max_memory_args': ../qemud/remote_protocol.c:656: error: 'remote_domain_set_max_memory_args' has no member named 'memory' ../qemud/remote_protocol.c: In function 'xdr_remote_domain_set_memory_args': ../qemud/remote_protocol.c:667: error: 'remote_domain_set_memory_args' has no member named 'memory' ../qemud/remote_protocol.c: In function 'xdr_remote_domain_get_info_ret': ../qemud/remote_protocol.c:687: error: 'remote_domain_get_info_ret' has no member named 'max_mem' ../qemud/remote_protocol.c:689: error: 'remote_domain_get_info_ret' has no member named 'memory' ../qemud/remote_protocol.c:691: error: 'remote_domain_get_info_ret' has no member named 'nr_virt_cpu' ../qemud/remote_protocol.c:693: error: 'remote_domain_get_info_ret' has no member named 'cpu_time' ../qemud/remote_protocol.c: In function 'xdr_remote_domain_migrate_prepare_args': ../qemud/remote_protocol.c:757: error: 'remote_domain_migrate_prepare_args' has no member named 'flags' ../qemud/remote_protocol.c:759: error: 'remote_domain_migrate_prepare_args' has no member named 'dname' ../qemud/remote_protocol.c:761: error: 'remote_domain_migrate_prepare_args' has no member named 'resource' ../qemud/remote_protocol.c: In function 'xdr_remote_domain_migrate_perform_args': ../qemud/remote_protocol.c:789: error: 'remote_domain_migrate_perform_args' has no member named 'flags' ../qemud/remote_protocol.c:791: error: 'remote_domain_migrate_perform_args' has no member named 'dname' ../qemud/remote_protocol.c:793: error: 'remote_domain_migrate_perform_args' has no member named 'resource' ../qemud/remote_protocol.c: In function 'xdr_remote_domain_migrate_finish_args': ../qemud/remote_protocol.c:809: error: 'remote_domain_migrate_finish_args' has no member named 'flags' make[2]: *** [libvirt_la-remote_protocol.lo] Error 1 gcc-sjlj -DHAVE_CONFIG_H -I. -I.. -I../gnulib/lib -I../gnulib/lib -I../include -I../include -I../qemud -I/usr/local/include/libxml2 -DBINDIR=\""/usr/local/libexec"\" -DSBINDIR=\""/usr/local/sbin"\" -DSYSCONF_DIR="\"/usr/local/etc\"" -DLOCALEBASEDIR=\""/usr/local/share/locale"\" -DLOCAL_STATE_DIR=\""/usr/local/var"\" -DGETTEXT_PACKAGE=\"libvirt\" -Wall -Wformat -Wformat-security -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Winline -Wredundant-decls -Wno-sign-compare -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fasynchronous-unwind-tables -DWITH_TEST -DWITH_REMOTE -I /c/Users/rjones/Desktop/gnutls/include -I /c/oncrpc -MT virsh-virsh.o -MD -MP -MF .deps/virsh-virsh.Tpo -c -o virsh-virsh.o `test -f 'virsh.c' || echo './'`virsh.c In file included from ../gnulib/lib/sys/stat.h:28, from virsh.c:36: ../gnulib/lib/sys/stat.h:272: warning: unused parameter 'mode' virsh.c:209: error: expected specifier-qualifier-list before 'uid_t' virsh.c: In function 'cmdConnect': virsh.c:436: error: 'vshControl' has no member named 'readonly' virsh.c:439: error: 'vshControl' has no member named 'readonly' virsh.c: In function 'cmdQuit': virsh.c:3701: error: 'vshControl' has no member named 'imode' virsh.c: In function 'vshCommandRun': virsh.c:4101: error: 'vshControl' has no member named 'timing' virsh.c:4106: error: 'vshControl' has no member named 'timing' virsh.c:4112: error: 'vshControl' has no member named 'timing' virsh.c: In function 'vshDebug': virsh.c:4412: error: 'vshControl' has no member named 'debug' virsh.c: In function 'vshPrintExtra': virsh.c:4425: error: 'vshControl' has no member named 'quiet' virsh.c: In function 'vshInit': virsh.c:4521: error: 'vshControl' has no member named 'uid' virsh.c:4521: warning: implicit declaration of function 'getuid' virsh.c:4521: warning: nested extern declaration of 'getuid' virsh.c:4530: error: 'vshControl' has no member named 'uid' virsh.c:4531: error: 'vshControl' has no member named 'readonly' virsh.c:4535: error: 'vshControl' has no member named 'readonly' virsh.c: In function 'vshOpenLogFile': virsh.c:4560: error: 'vshControl' has no member named 'logfile' virsh.c:4564: error: 'vshControl' has no member named 'logfile' virsh.c:4579: error: 'vshControl' has no member named 'log_fd' virsh.c:4579: error: 'vshControl' has no member named 'logfile' virsh.c:4579: error: 'O_SYNC' undeclared (first use in this function) virsh.c:4579: error: (Each undeclared identifier is reported only once virsh.c:4579: error: for each function it appears in.) virsh.c: In function 'vshOutputLogFile': virsh.c:4597: error: 'vshControl' has no member named 'log_fd' virsh.c:4646: error: 'vshControl' has no member named 'log_fd' virsh.c: In function 'vshCloseLogFile': virsh.c:4661: error: 'vshControl' has no member named 'log_fd' virsh.c:4662: error: 'vshControl' has no member named 'log_fd' virsh.c:4664: error: 'vshControl' has no member named 'logfile' virsh.c:4664: error: 'vshControl' has no member named 'logfile' virsh.c:4665: error: 'vshControl' has no member named 'log_fd' virsh.c:4668: error: 'vshControl' has no member named 'logfile' virsh.c:4669: error: 'vshControl' has no member named 'logfile' virsh.c:4670: error: 'vshControl' has no member named 'logfile' virsh.c: In function 'vshParseArgv': virsh.c:4948: error: 'vshControl' has no member named 'debug' virsh.c:4954: error: 'vshControl' has no member named 'quiet' virsh.c:4957: error: 'vshControl' has no member named 'timing' virsh.c:4966: error: 'vshControl' has no member named 'readonly' virsh.c:4969: error: 'vshControl' has no member named 'logfile' virsh.c:4989: error: 'vshControl' has no member named 'imode' virsh.c: In function 'main': virsh.c:5021: warning: implicit declaration of function 'bindtextdomain' virsh.c:5021: warning: nested extern declaration of 'bindtextdomain' virsh.c:5025: warning: implicit declaration of function 'textdomain' virsh.c:5025: warning: nested extern declaration of 'textdomain' virsh.c:5036: error: 'vshControl' has no member named 'imode' virsh.c:5037: error: 'vshControl' has no member named 'log_fd' virsh.c:5053: error: 'vshControl' has no member named 'imode' virsh.c:5057: error: 'vshControl' has no member named 'quiet' virsh.c:5068: error: 'vshControl' has no member named 'uid' virsh.c:5080: error: 'vshControl' has no member named 'imode' make[2]: *** [virsh-virsh.o] Error 1 make[2]: Target `all' not remade because of errors. make[2]: Leaving directory `/z/d/libvirt-mingw/src' Making all in qemud make[2]: Entering directory `/z/d/libvirt-mingw/qemud' gcc-sjlj -DHAVE_CONFIG_H -I. -I.. -I../gnulib/lib -I../gnulib/lib -I../include -I../include -I/usr/local/include/libxml2 -Wall -Wformat -Wformat-security -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Winline -Wredundant-decls -Wno-sign-compare -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fasynchronous-unwind-tables -DLOCAL_STATE_DIR="\"/usr/local/var\"" -DSYSCONF_DIR="\"/usr/local/etc\"" -DQEMUD_PID_FILE="\"\"" -DREMOTE_PID_FILE="\"/usr/local/var/run/libvirtd.pid\"" -DGETTEXT_PACKAGE=\"libvirt\" -I /c/Users/rjones/Desktop/gnutls/include -I /c/oncrpc -MT libvirtd-qemud.o -MD -MP -MF .deps/libvirtd-qemud.Tpo -c -o libvirtd-qemud.o `test -f 'qemud.c' || echo './'`qemud.c qemud.c:27:22: error: sys/wait.h: No such file or directory In file included from ../gnulib/lib/sys/stat.h:28, from qemud.c:28: ../gnulib/lib/sys/stat.h:272: warning: unused parameter 'mode' qemud.c:31:19: error: paths.h: No such file or directory qemud.c:34:20: error: sys/un.h: No such file or directory qemud.c:35:22: error: sys/poll.h: No such file or directory qemud.c:37:25: error: netinet/tcp.h: No such file or directory qemud.c:38:19: error: netdb.h: No such file or directory qemud.c:40:17: error: pwd.h: No such file or directory qemud.c:43:20: error: syslog.h: No such file or directory qemud.c:48:21: error: fnmatch.h: No such file or directory qemud.c:49:17: error: grp.h: No such file or directory In file included from internal.h:44, from qemud.c:53: c:/oncrpc/rpc/xdr.h:116: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:127: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:128: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:129: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:130: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:131: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:132: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:133: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:134: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:242: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:243: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:244: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:245: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:246: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:247: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:248: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:249: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:250: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:251: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:252: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:253: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:254: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:255: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:256: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:257: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:258: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:259: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:260: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:261: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:262: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:263: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:275: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:281: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:282: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:283: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:284: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:285: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:286: warning: function declaration isn't a prototype In file included from remote_protocol.h:9, from internal.h:45, from qemud.c:53: c:/oncrpc/rpc/rpc.h:52:1: warning: "FD_SETSIZE" redefined In file included from ../gnulib/lib/sys/socket.h:62, from qemud.c:33: c:\mingw\bin\../lib/gcc/mingw32/4.2.1-sjlj/../../../../include/winsock2.h:46:1: warning: this is the location of the previous definition In file included from remote_protocol.h:9, from internal.h:45, from qemud.c:53: c:/oncrpc/rpc/rpc.h:71: warning: function declaration isn't a prototype In file included from remote_protocol.h:9, from internal.h:45, from qemud.c:53: c:/oncrpc/rpc/rpc.h:74: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:89, from remote_protocol.h:9, from internal.h:45, from qemud.c:53: c:/oncrpc/rpc/auth.h:105: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:125: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:126: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:127: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:128: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:129: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:196: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:197: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:198: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:199: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:92, from remote_protocol.h:9, from internal.h:45, from qemud.c:53: c:/oncrpc/rpc/clnt.h:134: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:135: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:136: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:137: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:138: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:139: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:256: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:263: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:284: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:307: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:308: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:313: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:314: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:319: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:324: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:325: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:353: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:95, from remote_protocol.h:9, from internal.h:45, from qemud.c:53: c:/oncrpc/rpc/rpc_msg.h:184: warning: function declaration isn't a prototype c:/oncrpc/rpc/rpc_msg.h:192: warning: function declaration isn't a prototype c:/oncrpc/rpc/rpc_msg.h:200: warning: function declaration isn't a prototype c:/oncrpc/rpc/rpc_msg.h:208: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:97, from remote_protocol.h:9, from internal.h:45, from qemud.c:53: c:/oncrpc/rpc/auth_uni.h:84: warning: function declaration isn't a prototype In file included from remote_protocol.h:9, from internal.h:45, from qemud.c:53: c:/oncrpc/rpc/rpc.h:105:29: warning: "/*" within comment In file included from c:/oncrpc/rpc/rpc.h:108, from remote_protocol.h:9, from internal.h:45, from qemud.c:53: c:/oncrpc/rpc/svc.h:94: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:95: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:96: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:97: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:98: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:99: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:108, from remote_protocol.h:9, from internal.h:45, from qemud.c:53: c:/oncrpc/rpc/svc.h:173:19: warning: "/*" within comment c:/oncrpc/rpc/svc.h:175: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:184: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:192: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:200: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:231: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:232: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:233: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:234: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:235: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:236: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:237: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:238: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:278: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:280: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:281: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:282: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:296: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:301: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:302: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:307: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:109, from remote_protocol.h:9, from internal.h:45, from qemud.c:53: c:/oncrpc/rpc/svc_auth.h:56: error: 'auth_stat' defined as wrong kind of tag c:/oncrpc/rpc/svc_auth.h:56: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:117, from remote_protocol.h:9, from internal.h:45, from qemud.c:53: c:/oncrpc/rpc/netdb.h:51: warning: function declaration isn't a prototype c:/oncrpc/rpc/netdb.h:51: warning: function declaration isn't a prototype c:/oncrpc/rpc/netdb.h:51: warning: function declaration isn't a prototype In file included from internal.h:45, from qemud.c:53: remote_protocol.h:78: error: expected specifier-qualifier-list before 'u_quad_t' remote_protocol.h:88: error: expected specifier-qualifier-list before 'quad_t' remote_protocol.h:124: error: expected specifier-qualifier-list before 'quad_t' remote_protocol.h:145: error: expected specifier-qualifier-list before 'quad_t' remote_protocol.h:201: error: expected specifier-qualifier-list before 'quad_t' remote_protocol.h:216: error: expected specifier-qualifier-list before 'quad_t' remote_protocol.h:328: error: expected specifier-qualifier-list before 'u_quad_t' remote_protocol.h:334: error: expected specifier-qualifier-list before 'u_quad_t' remote_protocol.h:340: error: expected specifier-qualifier-list before 'u_quad_t' remote_protocol.h:351: error: expected specifier-qualifier-list before 'u_quad_t' remote_protocol.h:389: error: expected specifier-qualifier-list before 'u_quad_t' remote_protocol.h:411: error: expected specifier-qualifier-list before 'u_quad_t' remote_protocol.h:424: error: expected specifier-qualifier-list before 'u_quad_t' qemud.c:75: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'unix_sock_gid' qemud.c:109: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'sig_errors' qemud.c: In function 'sig_handler': qemud.c:117: error: 'SIGCHLD' undeclared (first use in this function) qemud.c:117: error: (Each undeclared identifier is reported only once qemud.c:117: error: for each function it appears in.) qemud.c:123: error: 'sig_errors' undeclared (first use in this function) qemud.c: In function 'qemudDispatchSignalEvent': qemud.c:247: error: 'SIGHUP' undeclared (first use in this function) qemud.c:253: error: 'SIGINT' undeclared (first use in this function) qemud.c:254: error: 'SIGQUIT' undeclared (first use in this function) qemud.c:255: error: 'SIGTERM' undeclared (first use in this function) qemud.c: In function 'qemudSetCloseExec': qemud.c:270: warning: implicit declaration of function 'fcntl' qemud.c:270: warning: nested extern declaration of 'fcntl' qemud.c:270: error: 'F_GETFD' undeclared (first use in this function) qemud.c:272: error: 'FD_CLOEXEC' undeclared (first use in this function) qemud.c:273: error: 'F_SETFD' undeclared (first use in this function) qemud.c: In function 'qemudSetNonBlock': qemud.c:284: error: 'F_GETFL' undeclared (first use in this function) qemud.c:286: error: 'O_NONBLOCK' undeclared (first use in this function) qemud.c:287: error: 'F_SETFL' undeclared (first use in this function) qemud.c: In function 'qemudLog': qemud.c:306: error: 'LOG_ERR' undeclared (first use in this function) qemud.c:309: error: 'LOG_WARNING' undeclared (first use in this function) qemud.c:313: error: 'LOG_INFO' undeclared (first use in this function) qemud.c:326: warning: implicit declaration of function 'vsyslog' qemud.c:326: warning: nested extern declaration of 'vsyslog' qemud.c: In function 'qemudGoDaemon': qemud.c:359: warning: implicit declaration of function 'fork' qemud.c:367: error: '_PATH_DEVNULL' undeclared (first use in this function) qemud.c:384: warning: implicit declaration of function 'setsid' qemud.c:384: warning: nested extern declaration of 'setsid' qemud.c:414: warning: implicit declaration of function 'waitpid' qemud.c:414: warning: nested extern declaration of 'waitpid' qemud.c: In function 'qemudListenUnix': qemud.c:464: error: storage size of 'addr' isn't known qemud.c:466: error: 'gid_t' undeclared (first use in this function) qemud.c:466: error: expected ';' before 'oldgrp' qemud.c:495: error: 'oldgrp' undeclared (first use in this function) qemud.c:495: warning: implicit declaration of function 'getgid' qemud.c:495: warning: nested extern declaration of 'getgid' qemud.c:497: warning: implicit declaration of function 'getuid' qemud.c:497: warning: nested extern declaration of 'getuid' qemud.c:498: warning: implicit declaration of function 'setgid' qemud.c:498: warning: nested extern declaration of 'setgid' qemud.c:498: error: 'unix_sock_gid' undeclared (first use in this function) qemud.c:516: error: 'POLLIN' undeclared (first use in this function) qemud.c:516: error: 'POLLERR' undeclared (first use in this function) qemud.c:516: error: 'POLLHUP' undeclared (first use in this function) qemud.c:464: warning: unused variable 'addr' qemud.c: In function 'remoteMakeSockets': qemud.c:543: error: 'AI_ADDRCONFIG' undeclared (first use in this function) qemud.c:562: warning: passing argument 4 of 'setsockopt' from incompatible pointer type qemud.c: In function 'remoteListenTCP': qemud.c:646: error: 'POLLIN' undeclared (first use in this function) qemud.c:646: error: 'POLLERR' undeclared (first use in this function) qemud.c:646: error: 'POLLHUP' undeclared (first use in this function) qemud.c: In function 'qemudInitPaths': qemud.c:663: error: 'uid_t' undeclared (first use in this function) qemud.c:663: error: expected ';' before 'uid' qemud.c:666: error: 'uid' undeclared (first use in this function) qemud.c:684: warning: implicit declaration of function 'getpwuid' qemud.c:684: warning: nested extern declaration of 'getpwuid' qemud.c:684: warning: assignment makes pointer from integer without a cast qemud.c:690: error: dereferencing pointer to incomplete type qemud.c:693: error: dereferencing pointer to incomplete type qemud.c:696: error: dereferencing pointer to incomplete type qemud.c: In function 'remoteCheckDN': qemud.c:912: warning: implicit declaration of function 'fnmatch' qemud.c:912: warning: nested extern declaration of 'fnmatch' qemud.c: In function 'qemudDispatchClientEvent': qemud.c:1508: error: 'POLLOUT' undeclared (first use in this function) qemud.c:1510: error: 'POLLIN' undeclared (first use in this function) qemud.c: In function 'qemudRegisterClientEvent': qemud.c:1523: error: 'POLLIN' undeclared (first use in this function) qemud.c:1525: error: 'POLLOUT' undeclared (first use in this function) qemud.c:1546: error: 'POLLERR' undeclared (first use in this function) qemud.c:1546: error: 'POLLHUP' undeclared (first use in this function) qemud.c: In function 'qemudOneLoop': qemud.c:1574: error: 'sig_atomic_t' undeclared (first use in this function) qemud.c:1574: error: expected ';' before 'errors' qemud.c:1580: error: 'errors' undeclared (first use in this function) qemud.c:1580: error: 'sig_errors' undeclared (first use in this function) qemud.c: In function 'remoteReadConfigFile': qemud.c:1890: warning: implicit declaration of function 'getgrnam' qemud.c:1890: warning: nested extern declaration of 'getgrnam' qemud.c:1890: warning: initialization makes pointer from integer without a cast qemud.c:1896: error: 'unix_sock_gid' undeclared (first use in this function) qemud.c:1896: error: dereferencing pointer to incomplete type qemud.c: In function 'main': qemud.c:2017: error: storage size of 'sig_action' isn't known qemud.c:2086: warning: implicit declaration of function 'pipe' qemud.c:2086: warning: nested extern declaration of 'pipe' qemud.c:2106: warning: implicit declaration of function 'openlog' qemud.c:2106: warning: nested extern declaration of 'openlog' qemud.c:2128: warning: implicit declaration of function 'sigemptyset' qemud.c:2128: warning: nested extern declaration of 'sigemptyset' qemud.c:2130: warning: implicit declaration of function 'sigaction' qemud.c:2130: warning: nested extern declaration of 'sigaction' qemud.c:2130: error: 'SIGHUP' undeclared (first use in this function) qemud.c:2131: error: 'SIGINT' undeclared (first use in this function) qemud.c:2132: error: 'SIGQUIT' undeclared (first use in this function) qemud.c:2133: error: 'SIGTERM' undeclared (first use in this function) qemud.c:2134: error: 'SIGCHLD' undeclared (first use in this function) qemud.c:2136: error: 'SIG_IGN' undeclared (first use in this function) qemud.c:2137: error: 'SIGPIPE' undeclared (first use in this function) qemud.c:2140: error: 'POLLIN' undeclared (first use in this function) qemud.c:2160: warning: implicit declaration of function 'closelog' qemud.c:2160: warning: nested extern declaration of 'closelog' qemud.c:2017: warning: unused variable 'sig_action' make[2]: *** [libvirtd-qemud.o] Error 1 gcc-sjlj -DHAVE_CONFIG_H -I. -I.. -I../gnulib/lib -I../gnulib/lib -I../include -I../include -I/usr/local/include/libxml2 -Wall -Wformat -Wformat-security -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Winline -Wredundant-decls -Wno-sign-compare -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fasynchronous-unwind-tables -DLOCAL_STATE_DIR="\"/usr/local/var\"" -DSYSCONF_DIR="\"/usr/local/etc\"" -DQEMUD_PID_FILE="\"\"" -DREMOTE_PID_FILE="\"/usr/local/var/run/libvirtd.pid\"" -DGETTEXT_PACKAGE=\"libvirt\" -I /c/Users/rjones/Desktop/gnutls/include -I /c/oncrpc -MT libvirtd-remote_protocol.o -MD -MP -MF .deps/libvirtd-remote_protocol.Tpo -c -o libvirtd-remote_protocol.o `test -f 'remote_protocol.c' || echo './'`remote_protocol.c In file included from ../gnulib/lib/string.h:23, from c:\mingw\bin\../lib/gcc/mingw32/4.2.1-sjlj/../../../../include/winnt.h:37, from c:\mingw\bin\../lib/gcc/mingw32/4.2.1-sjlj/../../../../include/windef.h:253, from c:\mingw\bin\../lib/gcc/mingw32/4.2.1-sjlj/../../../../include/windows.h:48, from c:\mingw\bin\../lib/gcc/mingw32/4.2.1-sjlj/../../../../include/winsock.h:19, from c:/oncrpc/rpc/rpc.h:55, from remote_protocol.h:9, from remote_protocol.c:6: ../gnulib/lib/string.h:283: error: expected ';', ',' or ')' before '__stringp' In file included from remote_protocol.h:9, from remote_protocol.c:6: c:/oncrpc/rpc/rpc.h:71: warning: function declaration isn't a prototype In file included from remote_protocol.h:9, from remote_protocol.c:6: c:/oncrpc/rpc/rpc.h:74: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:86, from remote_protocol.h:9, from remote_protocol.c:6: c:/oncrpc/rpc/xdr.h:116: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:127: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:128: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:129: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:130: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:131: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:132: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:133: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:134: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:242: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:243: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:244: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:245: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:246: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:247: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:248: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:249: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:250: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:251: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:252: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:253: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:254: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:255: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:256: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:257: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:258: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:259: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:260: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:261: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:262: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:263: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:275: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:281: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:282: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:283: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:284: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:285: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:286: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:89, from remote_protocol.h:9, from remote_protocol.c:6: c:/oncrpc/rpc/auth.h:105: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:125: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:126: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:127: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:128: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:129: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:196: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:197: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:198: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:199: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:92, from remote_protocol.h:9, from remote_protocol.c:6: c:/oncrpc/rpc/clnt.h:134: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:135: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:136: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:137: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:138: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:139: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:256: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:263: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:284: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:307: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:308: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:313: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:314: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:319: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:324: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:325: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:353: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:95, from remote_protocol.h:9, from remote_protocol.c:6: c:/oncrpc/rpc/rpc_msg.h:184: warning: function declaration isn't a prototype c:/oncrpc/rpc/rpc_msg.h:192: warning: function declaration isn't a prototype c:/oncrpc/rpc/rpc_msg.h:200: warning: function declaration isn't a prototype c:/oncrpc/rpc/rpc_msg.h:208: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:97, from remote_protocol.h:9, from remote_protocol.c:6: c:/oncrpc/rpc/auth_uni.h:84: warning: function declaration isn't a prototype In file included from remote_protocol.h:9, from remote_protocol.c:6: c:/oncrpc/rpc/rpc.h:105:29: warning: "/*" within comment In file included from c:/oncrpc/rpc/rpc.h:108, from remote_protocol.h:9, from remote_protocol.c:6: c:/oncrpc/rpc/svc.h:94: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:95: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:96: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:97: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:98: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:99: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:108, from remote_protocol.h:9, from remote_protocol.c:6: c:/oncrpc/rpc/svc.h:173:19: warning: "/*" within comment c:/oncrpc/rpc/svc.h:175: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:184: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:192: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:200: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:231: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:232: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:233: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:234: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:235: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:236: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:237: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:238: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:278: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:280: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:281: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:282: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:296: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:301: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:302: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:307: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:109, from remote_protocol.h:9, from remote_protocol.c:6: c:/oncrpc/rpc/svc_auth.h:56: error: 'auth_stat' defined as wrong kind of tag c:/oncrpc/rpc/svc_auth.h:56: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:117, from remote_protocol.h:9, from remote_protocol.c:6: c:/oncrpc/rpc/netdb.h:51: warning: function declaration isn't a prototype c:/oncrpc/rpc/netdb.h:51: warning: function declaration isn't a prototype c:/oncrpc/rpc/netdb.h:51: warning: function declaration isn't a prototype In file included from remote_protocol.c:6: remote_protocol.h:78: error: expected specifier-qualifier-list before 'u_quad_t' remote_protocol.h:88: error: expected specifier-qualifier-list before 'quad_t' remote_protocol.h:124: error: expected specifier-qualifier-list before 'quad_t' remote_protocol.h:145: error: expected specifier-qualifier-list before 'quad_t' remote_protocol.h:201: error: expected specifier-qualifier-list before 'quad_t' remote_protocol.h:216: error: expected specifier-qualifier-list before 'quad_t' remote_protocol.h:328: error: expected specifier-qualifier-list before 'u_quad_t' remote_protocol.h:334: error: expected specifier-qualifier-list before 'u_quad_t' remote_protocol.h:340: error: expected specifier-qualifier-list before 'u_quad_t' remote_protocol.h:351: error: expected specifier-qualifier-list before 'u_quad_t' remote_protocol.h:389: error: expected specifier-qualifier-list before 'u_quad_t' remote_protocol.h:411: error: expected specifier-qualifier-list before 'u_quad_t' remote_protocol.h:424: error: expected specifier-qualifier-list before 'u_quad_t' remote_protocol.c: In function 'xdr_remote_vcpu_info': remote_protocol.c:124: warning: implicit declaration of function 'xdr_u_quad_t' remote_protocol.c:124: warning: nested extern declaration of 'xdr_u_quad_t' remote_protocol.c:124: error: 'remote_vcpu_info' has no member named 'cpu_time' remote_protocol.c:126: error: 'remote_vcpu_info' has no member named 'cpu' remote_protocol.c: In function 'xdr_remote_sched_param_value': remote_protocol.c:146: warning: implicit declaration of function 'xdr_quad_t' remote_protocol.c:146: warning: nested extern declaration of 'xdr_quad_t' remote_protocol.c:146: error: 'union <anonymous>' has no member named 'l' remote_protocol.c:150: error: 'union <anonymous>' has no member named 'ul' remote_protocol.c:154: error: 'union <anonymous>' has no member named 'd' remote_protocol.c:158: error: 'union <anonymous>' has no member named 'b' remote_protocol.c: In function 'xdr_remote_get_version_ret': remote_protocol.c:220: error: 'remote_get_version_ret' has no member named 'hv_ver' remote_protocol.c: In function 'xdr_remote_node_get_info_ret': remote_protocol.c:255: error: expected '=', ',', ';', 'asm' or '__attribute__' before '*' token remote_protocol.c:255: error: 'buf' undeclared (first use in this function) remote_protocol.c:255: error: (Each undeclared identifier is reported only once remote_protocol.c:255: error: for each function it appears in.) remote_protocol.c:262: error: 'remote_node_get_info_ret' has no member named 'memory' remote_protocol.c:266: error: 'remote_node_get_info_ret' has no member named 'cpus' remote_protocol.c:268: error: 'remote_node_get_info_ret' has no member named 'mhz' remote_protocol.c:270: error: 'remote_node_get_info_ret' has no member named 'nodes' remote_protocol.c:272: error: 'remote_node_get_info_ret' has no member named 'sockets' remote_protocol.c:274: error: 'remote_node_get_info_ret' has no member named 'cores' remote_protocol.c:276: error: 'remote_node_get_info_ret' has no member named 'threads' remote_protocol.c:279: warning: implicit declaration of function 'IXDR_PUT_INT32' remote_protocol.c:279: warning: nested extern declaration of 'IXDR_PUT_INT32' remote_protocol.c:279: error: 'remote_node_get_info_ret' has no member named 'cpus' remote_protocol.c:280: error: 'remote_node_get_info_ret' has no member named 'mhz' remote_protocol.c:281: error: 'remote_node_get_info_ret' has no member named 'nodes' remote_protocol.c:282: error: 'remote_node_get_info_ret' has no member named 'sockets' remote_protocol.c:283: error: 'remote_node_get_info_ret' has no member named 'cores' remote_protocol.c:284: error: 'remote_node_get_info_ret' has no member named 'threads' remote_protocol.c:291: error: 'remote_node_get_info_ret' has no member named 'memory' remote_protocol.c:295: error: 'remote_node_get_info_ret' has no member named 'cpus' remote_protocol.c:297: error: 'remote_node_get_info_ret' has no member named 'mhz' remote_protocol.c:299: error: 'remote_node_get_info_ret' has no member named 'nodes' remote_protocol.c:301: error: 'remote_node_get_info_ret' has no member named 'sockets' remote_protocol.c:303: error: 'remote_node_get_info_ret' has no member named 'cores' remote_protocol.c:305: error: 'remote_node_get_info_ret' has no member named 'threads' remote_protocol.c:308: error: 'remote_node_get_info_ret' has no member named 'cpus' remote_protocol.c:309: error: 'remote_node_get_info_ret' has no member named 'mhz' remote_protocol.c:310: error: 'remote_node_get_info_ret' has no member named 'nodes' remote_protocol.c:311: error: 'remote_node_get_info_ret' has no member named 'sockets' remote_protocol.c:312: error: 'remote_node_get_info_ret' has no member named 'cores' remote_protocol.c:313: error: 'remote_node_get_info_ret' has no member named 'threads' remote_protocol.c:321: error: 'remote_node_get_info_ret' has no member named 'memory' remote_protocol.c:323: error: 'remote_node_get_info_ret' has no member named 'cpus' remote_protocol.c:325: error: 'remote_node_get_info_ret' has no member named 'mhz' remote_protocol.c:327: error: 'remote_node_get_info_ret' has no member named 'nodes' remote_protocol.c:329: error: 'remote_node_get_info_ret' has no member named 'sockets' remote_protocol.c:331: error: 'remote_node_get_info_ret' has no member named 'cores' remote_protocol.c:333: error: 'remote_node_get_info_ret' has no member named 'threads' remote_protocol.c: In function 'xdr_remote_domain_block_stats_ret': remote_protocol.c:417: error: 'remote_domain_block_stats_ret' has no member named 'rd_req' remote_protocol.c:419: error: 'remote_domain_block_stats_ret' has no member named 'rd_bytes' remote_protocol.c:421: error: 'remote_domain_block_stats_ret' has no member named 'wr_req' remote_protocol.c:423: error: 'remote_domain_block_stats_ret' has no member named 'wr_bytes' remote_protocol.c:425: error: 'remote_domain_block_stats_ret' has no member named 'errs' remote_protocol.c: In function 'xdr_remote_domain_interface_stats_ret': remote_protocol.c:445: error: 'remote_domain_interface_stats_ret' has no member named 'rx_bytes' remote_protocol.c:447: error: 'remote_domain_interface_stats_ret' has no member named 'rx_packets' remote_protocol.c:449: error: 'remote_domain_interface_stats_ret' has no member named 'rx_errs' remote_protocol.c:451: error: 'remote_domain_interface_stats_ret' has no member named 'rx_drop' remote_protocol.c:453: error: 'remote_domain_interface_stats_ret' has no member named 'tx_bytes' remote_protocol.c:455: error: 'remote_domain_interface_stats_ret' has no member named 'tx_packets' remote_protocol.c:457: error: 'remote_domain_interface_stats_ret' has no member named 'tx_errs' remote_protocol.c:459: error: 'remote_domain_interface_stats_ret' has no member named 'tx_drop' remote_protocol.c: In function 'xdr_remote_domain_get_max_memory_ret': remote_protocol.c:645: error: 'remote_domain_get_max_memory_ret' has no member named 'memory' remote_protocol.c: In function 'xdr_remote_domain_set_max_memory_args': remote_protocol.c:656: error: 'remote_domain_set_max_memory_args' has no member named 'memory' remote_protocol.c: In function 'xdr_remote_domain_set_memory_args': remote_protocol.c:667: error: 'remote_domain_set_memory_args' has no member named 'memory' remote_protocol.c: In function 'xdr_remote_domain_get_info_ret': remote_protocol.c:687: error: 'remote_domain_get_info_ret' has no member named 'max_mem' remote_protocol.c:689: error: 'remote_domain_get_info_ret' has no member named 'memory' remote_protocol.c:691: error: 'remote_domain_get_info_ret' has no member named 'nr_virt_cpu' remote_protocol.c:693: error: 'remote_domain_get_info_ret' has no member named 'cpu_time' remote_protocol.c: In function 'xdr_remote_domain_migrate_prepare_args': remote_protocol.c:757: error: 'remote_domain_migrate_prepare_args' has no member named 'flags' remote_protocol.c:759: error: 'remote_domain_migrate_prepare_args' has no member named 'dname' remote_protocol.c:761: error: 'remote_domain_migrate_prepare_args' has no member named 'resource' remote_protocol.c: In function 'xdr_remote_domain_migrate_perform_args': remote_protocol.c:789: error: 'remote_domain_migrate_perform_args' has no member named 'flags' remote_protocol.c:791: error: 'remote_domain_migrate_perform_args' has no member named 'dname' remote_protocol.c:793: error: 'remote_domain_migrate_perform_args' has no member named 'resource' remote_protocol.c: In function 'xdr_remote_domain_migrate_finish_args': remote_protocol.c:809: error: 'remote_domain_migrate_finish_args' has no member named 'flags' make[2]: *** [libvirtd-remote_protocol.o] Error 1 gcc-sjlj -DHAVE_CONFIG_H -I. -I.. -I../gnulib/lib -I../gnulib/lib -I../include -I../include -I/usr/local/include/libxml2 -Wall -Wformat -Wformat-security -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Winline -Wredundant-decls -Wno-sign-compare -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fasynchronous-unwind-tables -DLOCAL_STATE_DIR="\"/usr/local/var\"" -DSYSCONF_DIR="\"/usr/local/etc\"" -DQEMUD_PID_FILE="\"\"" -DREMOTE_PID_FILE="\"/usr/local/var/run/libvirtd.pid\"" -DGETTEXT_PACKAGE=\"libvirt\" -I /c/Users/rjones/Desktop/gnutls/include -I /c/oncrpc -MT libvirtd-remote.o -MD -MP -MF .deps/libvirtd-remote.Tpo -c -o libvirtd-remote.o `test -f 'remote.c' || echo './'`remote.c remote.c:26:22: error: sys/wait.h: No such file or directory In file included from ../gnulib/lib/sys/stat.h:28, from remote.c:27: ../gnulib/lib/sys/stat.h:272: warning: unused parameter 'mode' remote.c:30:19: error: paths.h: No such file or directory remote.c:33:20: error: sys/un.h: No such file or directory remote.c:34:22: error: sys/poll.h: No such file or directory remote.c:36:19: error: netdb.h: No such file or directory remote.c:38:17: error: pwd.h: No such file or directory remote.c:41:20: error: syslog.h: No such file or directory remote.c:47:21: error: fnmatch.h: No such file or directory In file included from internal.h:44, from remote.c:56: c:/oncrpc/rpc/xdr.h:116: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:127: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:128: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:129: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:130: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:131: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:132: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:133: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:134: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:242: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:243: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:244: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:245: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:246: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:247: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:248: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:249: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:250: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:251: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:252: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:253: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:254: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:255: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:256: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:257: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:258: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:259: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:260: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:261: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:262: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:263: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:275: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:281: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:282: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:283: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:284: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:285: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:286: warning: function declaration isn't a prototype In file included from remote_protocol.h:9, from internal.h:45, from remote.c:56: c:/oncrpc/rpc/rpc.h:52:1: warning: "FD_SETSIZE" redefined In file included from ../gnulib/lib/sys/socket.h:62, from remote.c:32: c:\mingw\bin\../lib/gcc/mingw32/4.2.1-sjlj/../../../../include/winsock2.h:46:1: warning: this is the location of the previous definition In file included from remote_protocol.h:9, from internal.h:45, from remote.c:56: c:/oncrpc/rpc/rpc.h:71: warning: function declaration isn't a prototype In file included from remote_protocol.h:9, from internal.h:45, from remote.c:56: c:/oncrpc/rpc/rpc.h:74: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:89, from remote_protocol.h:9, from internal.h:45, from remote.c:56: c:/oncrpc/rpc/auth.h:105: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:125: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:126: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:127: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:128: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:129: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:196: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:197: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:198: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:199: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:92, from remote_protocol.h:9, from internal.h:45, from remote.c:56: c:/oncrpc/rpc/clnt.h:134: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:135: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:136: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:137: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:138: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:139: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:256: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:263: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:284: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:307: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:308: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:313: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:314: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:319: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:324: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:325: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:353: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:95, from remote_protocol.h:9, from internal.h:45, from remote.c:56: c:/oncrpc/rpc/rpc_msg.h:184: warning: function declaration isn't a prototype c:/oncrpc/rpc/rpc_msg.h:192: warning: function declaration isn't a prototype c:/oncrpc/rpc/rpc_msg.h:200: warning: function declaration isn't a prototype c:/oncrpc/rpc/rpc_msg.h:208: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:97, from remote_protocol.h:9, from internal.h:45, from remote.c:56: c:/oncrpc/rpc/auth_uni.h:84: warning: function declaration isn't a prototype In file included from remote_protocol.h:9, from internal.h:45, from remote.c:56: c:/oncrpc/rpc/rpc.h:105:29: warning: "/*" within comment In file included from c:/oncrpc/rpc/rpc.h:108, from remote_protocol.h:9, from internal.h:45, from remote.c:56: c:/oncrpc/rpc/svc.h:94: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:95: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:96: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:97: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:98: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:99: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:108, from remote_protocol.h:9, from internal.h:45, from remote.c:56: c:/oncrpc/rpc/svc.h:173:19: warning: "/*" within comment c:/oncrpc/rpc/svc.h:175: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:184: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:192: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:200: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:231: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:232: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:233: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:234: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:235: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:236: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:237: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:238: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:278: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:280: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:281: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:282: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:296: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:301: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:302: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:307: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:109, from remote_protocol.h:9, from internal.h:45, from remote.c:56: c:/oncrpc/rpc/svc_auth.h:56: error: 'auth_stat' defined as wrong kind of tag c:/oncrpc/rpc/svc_auth.h:56: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:117, from remote_protocol.h:9, from internal.h:45, from remote.c:56: c:/oncrpc/rpc/netdb.h:51: warning: function declaration isn't a prototype c:/oncrpc/rpc/netdb.h:51: warning: function declaration isn't a prototype c:/oncrpc/rpc/netdb.h:51: warning: function declaration isn't a prototype In file included from internal.h:45, from remote.c:56: remote_protocol.h:78: error: expected specifier-qualifier-list before 'u_quad_t' remote_protocol.h:88: error: expected specifier-qualifier-list before 'quad_t' remote_protocol.h:124: error: expected specifier-qualifier-list before 'quad_t' remote_protocol.h:145: error: expected specifier-qualifier-list before 'quad_t' remote_protocol.h:201: error: expected specifier-qualifier-list before 'quad_t' remote_protocol.h:216: error: expected specifier-qualifier-list before 'quad_t' remote_protocol.h:328: error: expected specifier-qualifier-list before 'u_quad_t' remote_protocol.h:334: error: expected specifier-qualifier-list before 'u_quad_t' remote_protocol.h:340: error: expected specifier-qualifier-list before 'u_quad_t' remote_protocol.h:351: error: expected specifier-qualifier-list before 'u_quad_t' remote_protocol.h:389: error: expected specifier-qualifier-list before 'u_quad_t' remote_protocol.h:411: error: expected specifier-qualifier-list before 'u_quad_t' remote_protocol.h:424: error: expected specifier-qualifier-list before 'u_quad_t' remote.c: In function 'remoteDispatchClientRequest': remote.c:173: warning: implicit declaration of function 'xdr_free' remote.c:173: warning: nested extern declaration of 'xdr_free' remote.c: In function 'remoteDispatchGetVersion': remote.c:514: error: 'remote_get_version_ret' has no member named 'hv_ver' remote.c: In function 'remoteDispatchNodeGetInfo': remote.c:566: error: 'remote_node_get_info_ret' has no member named 'memory' remote.c:567: error: 'remote_node_get_info_ret' has no member named 'cpus' remote.c:568: error: 'remote_node_get_info_ret' has no member named 'mhz' remote.c:569: error: 'remote_node_get_info_ret' has no member named 'nodes' remote.c:570: error: 'remote_node_get_info_ret' has no member named 'sockets' remote.c:571: error: 'remote_node_get_info_ret' has no member named 'cores' remote.c:572: error: 'remote_node_get_info_ret' has no member named 'threads' remote.c: In function 'remoteDispatchDomainGetSchedulerParameters': remote.c:691: error: 'union <anonymous>' has no member named 'l' remote.c:693: error: 'union <anonymous>' has no member named 'ul' remote.c:695: error: 'union <anonymous>' has no member named 'd' remote.c:697: error: 'union <anonymous>' has no member named 'b' remote.c: In function 'remoteDispatchDomainSetSchedulerParameters': remote.c:747: error: 'union <anonymous>' has no member named 'l' remote.c:749: error: 'union <anonymous>' has no member named 'ul' remote.c:751: error: 'union <anonymous>' has no member named 'd' remote.c:753: error: 'union <anonymous>' has no member named 'b' remote.c: In function 'remoteDispatchDomainBlockStats': remote.c:794: error: 'remote_domain_block_stats_ret' has no member named 'rd_req' remote.c:795: error: 'remote_domain_block_stats_ret' has no member named 'rd_bytes' remote.c:796: error: 'remote_domain_block_stats_ret' has no member named 'wr_req' remote.c:797: error: 'remote_domain_block_stats_ret' has no member named 'wr_bytes' remote.c:798: error: 'remote_domain_block_stats_ret' has no member named 'errs' remote.c: In function 'remoteDispatchDomainInterfaceStats': remote.c:825: error: 'remote_domain_interface_stats_ret' has no member named 'rx_bytes' remote.c:826: error: 'remote_domain_interface_stats_ret' has no member named 'rx_packets' remote.c:827: error: 'remote_domain_interface_stats_ret' has no member named 'rx_errs' remote.c:828: error: 'remote_domain_interface_stats_ret' has no member named 'rx_drop' remote.c:829: error: 'remote_domain_interface_stats_ret' has no member named 'tx_bytes' remote.c:830: error: 'remote_domain_interface_stats_ret' has no member named 'tx_packets' remote.c:831: error: 'remote_domain_interface_stats_ret' has no member named 'tx_errs' remote.c:832: error: 'remote_domain_interface_stats_ret' has no member named 'tx_drop' remote.c: In function 'remoteDispatchDomainGetInfo': remote.c:1043: error: 'remote_domain_get_info_ret' has no member named 'max_mem' remote.c:1044: error: 'remote_domain_get_info_ret' has no member named 'memory' remote.c:1045: error: 'remote_domain_get_info_ret' has no member named 'nr_virt_cpu' remote.c:1046: error: 'remote_domain_get_info_ret' has no member named 'cpu_time' remote.c: In function 'remoteDispatchDomainGetMaxMemory': remote.c:1069: error: 'remote_domain_get_max_memory_ret' has no member named 'memory' remote.c:1070: error: 'remote_domain_get_max_memory_ret' has no member named 'memory' remote.c: In function 'remoteDispatchDomainGetVcpus': remote.c:1179: error: 'remote_vcpu_info' has no member named 'cpu_time' remote.c:1180: error: 'remote_vcpu_info' has no member named 'cpu' remote.c: In function 'remoteDispatchDomainMigratePrepare': remote.c:1210: error: 'remote_domain_migrate_prepare_args' has no member named 'dname' remote.c:1210: error: 'remote_domain_migrate_prepare_args' has no member named 'dname' remote.c:1217: error: 'remote_domain_migrate_prepare_args' has no member named 'flags' remote.c:1217: error: 'remote_domain_migrate_prepare_args' has no member named 'resource' remote.c: In function 'remoteDispatchDomainMigratePerform': remote.c:1248: error: 'remote_domain_migrate_perform_args' has no member named 'dname' remote.c:1248: error: 'remote_domain_migrate_perform_args' has no member named 'dname' remote.c:1254: error: 'remote_domain_migrate_perform_args' has no member named 'flags' remote.c:1254: error: 'remote_domain_migrate_perform_args' has no member named 'resource' remote.c: In function 'remoteDispatchDomainMigrateFinish': remote.c:1274: error: 'remote_domain_migrate_finish_args' has no member named 'flags' remote.c: In function 'remoteDispatchDomainSetMaxMemory': remote.c:1562: error: 'remote_domain_set_max_memory_args' has no member named 'memory' remote.c: In function 'remoteDispatchDomainSetMemory': remote.c:1586: error: 'remote_domain_set_memory_args' has no member named 'memory' make[2]: *** [libvirtd-remote.o] Error 1 gcc-sjlj -DHAVE_CONFIG_H -I. -I.. -I../gnulib/lib -I../gnulib/lib -I../include -I../include -I/usr/local/include/libxml2 -Wall -Wformat -Wformat-security -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Winline -Wredundant-decls -Wno-sign-compare -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fasynchronous-unwind-tables -DLOCAL_STATE_DIR="\"/usr/local/var\"" -DSYSCONF_DIR="\"/usr/local/etc\"" -DQEMUD_PID_FILE="\"\"" -DREMOTE_PID_FILE="\"/usr/local/var/run/libvirtd.pid\"" -DGETTEXT_PACKAGE=\"libvirt\" -I /c/Users/rjones/Desktop/gnutls/include -I /c/oncrpc -MT libvirtd-event.o -MD -MP -MF .deps/libvirtd-event.Tpo -c -o libvirtd-event.o `test -f 'event.c' || echo './'`event.c In file included from internal.h:44, from event.c:32: c:/oncrpc/rpc/xdr.h:116: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:127: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:128: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:129: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:130: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:131: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:132: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:133: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:134: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:242: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:243: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:244: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:245: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:246: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:247: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:248: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:249: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:250: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:251: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:252: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:253: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:254: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:255: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:256: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:257: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:258: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:259: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:260: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:261: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:262: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:263: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:275: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:281: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:282: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:283: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:284: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:285: warning: function declaration isn't a prototype c:/oncrpc/rpc/xdr.h:286: warning: function declaration isn't a prototype In file included from remote_protocol.h:9, from internal.h:45, from event.c:32: c:/oncrpc/rpc/rpc.h:71: warning: function declaration isn't a prototype In file included from remote_protocol.h:9, from internal.h:45, from event.c:32: c:/oncrpc/rpc/rpc.h:74: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:89, from remote_protocol.h:9, from internal.h:45, from event.c:32: c:/oncrpc/rpc/auth.h:105: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:125: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:126: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:127: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:128: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:129: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:196: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:197: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:198: warning: function declaration isn't a prototype c:/oncrpc/rpc/auth.h:199: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:92, from remote_protocol.h:9, from internal.h:45, from event.c:32: c:/oncrpc/rpc/clnt.h:134: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:135: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:136: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:137: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:138: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:139: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:256: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:263: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:284: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:307: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:308: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:313: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:314: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:319: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:324: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:325: warning: function declaration isn't a prototype c:/oncrpc/rpc/clnt.h:353: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:95, from remote_protocol.h:9, from internal.h:45, from event.c:32: c:/oncrpc/rpc/rpc_msg.h:184: warning: function declaration isn't a prototype c:/oncrpc/rpc/rpc_msg.h:192: warning: function declaration isn't a prototype c:/oncrpc/rpc/rpc_msg.h:200: warning: function declaration isn't a prototype c:/oncrpc/rpc/rpc_msg.h:208: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:97, from remote_protocol.h:9, from internal.h:45, from event.c:32: c:/oncrpc/rpc/auth_uni.h:84: warning: function declaration isn't a prototype In file included from remote_protocol.h:9, from internal.h:45, from event.c:32: c:/oncrpc/rpc/rpc.h:105:29: warning: "/*" within comment In file included from c:/oncrpc/rpc/rpc.h:108, from remote_protocol.h:9, from internal.h:45, from event.c:32: c:/oncrpc/rpc/svc.h:94: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:95: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:96: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:97: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:98: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:99: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:108, from remote_protocol.h:9, from internal.h:45, from event.c:32: c:/oncrpc/rpc/svc.h:173:19: warning: "/*" within comment c:/oncrpc/rpc/svc.h:175: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:184: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:192: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:200: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:231: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:232: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:233: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:234: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:235: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:236: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:237: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:238: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:278: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:280: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:281: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:282: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:296: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:301: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:302: warning: function declaration isn't a prototype c:/oncrpc/rpc/svc.h:307: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:109, from remote_protocol.h:9, from internal.h:45, from event.c:32: c:/oncrpc/rpc/svc_auth.h:56: error: 'auth_stat' defined as wrong kind of tag c:/oncrpc/rpc/svc_auth.h:56: warning: function declaration isn't a prototype In file included from c:/oncrpc/rpc/rpc.h:117, from remote_protocol.h:9, from internal.h:45, from event.c:32: c:/oncrpc/rpc/netdb.h:51: warning: function declaration isn't a prototype c:/oncrpc/rpc/netdb.h:51: warning: function declaration isn't a prototype c:/oncrpc/rpc/netdb.h:51: warning: function declaration isn't a prototype In file included from internal.h:45, from event.c:32: remote_protocol.h:78: error: expected specifier-qualifier-list before 'u_quad_t' remote_protocol.h:88: error: expected specifier-qualifier-list before 'quad_t' remote_protocol.h:124: error: expected specifier-qualifier-list before 'quad_t' remote_protocol.h:145: error: expected specifier-qualifier-list before 'quad_t' remote_protocol.h:201: error: expected specifier-qualifier-list before 'quad_t' remote_protocol.h:216: error: expected specifier-qualifier-list before 'quad_t' remote_protocol.h:328: error: expected specifier-qualifier-list before 'u_quad_t' remote_protocol.h:334: error: expected specifier-qualifier-list before 'u_quad_t' remote_protocol.h:340: error: expected specifier-qualifier-list before 'u_quad_t' remote_protocol.h:351: error: expected specifier-qualifier-list before 'u_quad_t' remote_protocol.h:389: error: expected specifier-qualifier-list before 'u_quad_t' remote_protocol.h:411: error: expected specifier-qualifier-list before 'u_quad_t' remote_protocol.h:424: error: expected specifier-qualifier-list before 'u_quad_t' In file included from event.c:32: internal.h:101: error: field 'addr' has incomplete type internal.h:102: error: expected specifier-qualifier-list before 'socklen_t' internal.h:154: error: 'PATH_MAX' undeclared here (not in a function) make[2]: *** [libvirtd-event.o] Error 1 make[2]: *** No rule to make target `../src/libvirt.la', needed by `libvirtd.exe'. make[2]: Target `all' not remade because of errors. make[2]: Leaving directory `/z/d/libvirt-mingw/qemud' Making all in proxy make[2]: Entering directory `/z/d/libvirt-mingw/proxy' make[2]: Nothing to be done for `all'. make[2]: Leaving directory `/z/d/libvirt-mingw/proxy' Making all in docs make[2]: Entering directory `/z/d/libvirt-mingw/docs' Making all in . make[3]: Entering directory `/z/d/libvirt-mingw/docs' make[3]: Nothing to be done for `all-am'. make[3]: Leaving directory `/z/d/libvirt-mingw/docs' Making all in examples make[3]: Entering directory `/z/d/libvirt-mingw/docs/examples' Making all in python make[4]: Entering directory `/z/d/libvirt-mingw/docs/examples/python' make[4]: Nothing to be done for `all'. make[4]: Leaving directory `/z/d/libvirt-mingw/docs/examples/python' make[4]: Entering directory `/z/d/libvirt-mingw/docs/examples' make[4]: *** No rule to make target `../../src/libvirt.la', needed by `info1.exe'. make[4]: Target `all-am' not remade because of errors. make[4]: Leaving directory `/z/d/libvirt-mingw/docs/examples' make[3]: *** [all-recursive] Error 1 make[3]: Target `all' not remade because of errors. make[3]: Leaving directory `/z/d/libvirt-mingw/docs/examples' Making all in devhelp make[3]: Entering directory `/z/d/libvirt-mingw/docs/devhelp' make[3]: Nothing to be done for `all'. make[3]: Leaving directory `/z/d/libvirt-mingw/docs/devhelp' make[2]: *** [all-recursive] Error 1 make[2]: Target `all' not remade because of errors. make[2]: Leaving directory `/z/d/libvirt-mingw/docs' Making all in gnulib/tests make[2]: Entering directory `/z/d/libvirt-mingw/gnulib/tests' make all-recursive make[3]: Entering directory `/z/d/libvirt-mingw/gnulib/tests' make[4]: Entering directory `/z/d/libvirt-mingw/gnulib/tests' make[4]: Nothing to be done for `all-am'. make[4]: Leaving directory `/z/d/libvirt-mingw/gnulib/tests' make[3]: Leaving directory `/z/d/libvirt-mingw/gnulib/tests' make[2]: Leaving directory `/z/d/libvirt-mingw/gnulib/tests' Making all in tests make[2]: Entering directory `/z/d/libvirt-mingw/tests' Making all in virshdata make[3]: Entering directory `/z/d/libvirt-mingw/tests/virshdata' make[3]: Nothing to be done for `all'. make[3]: Leaving directory `/z/d/libvirt-mingw/tests/virshdata' Making all in confdata make[3]: Entering directory `/z/d/libvirt-mingw/tests/confdata' make[3]: Nothing to be done for `all'. make[3]: Leaving directory `/z/d/libvirt-mingw/tests/confdata' Making all in sexpr2xmldata make[3]: Entering directory `/z/d/libvirt-mingw/tests/sexpr2xmldata' make[3]: Nothing to be done for `all'. make[3]: Leaving directory `/z/d/libvirt-mingw/tests/sexpr2xmldata' Making all in xml2sexprdata make[3]: Entering directory `/z/d/libvirt-mingw/tests/xml2sexprdata' make[3]: Nothing to be done for `all'. make[3]: Leaving directory `/z/d/libvirt-mingw/tests/xml2sexprdata' Making all in xmconfigdata make[3]: Entering directory `/z/d/libvirt-mingw/tests/xmconfigdata' make[3]: Nothing to be done for `all'. make[3]: Leaving directory `/z/d/libvirt-mingw/tests/xmconfigdata' Making all in xencapsdata make[3]: Entering directory `/z/d/libvirt-mingw/tests/xencapsdata' make[3]: Nothing to be done for `all'. make[3]: Leaving directory `/z/d/libvirt-mingw/tests/xencapsdata' make[3]: Entering directory `/z/d/libvirt-mingw/tests' gcc-sjlj -DHAVE_CONFIG_H -I. -I.. -I../gnulib/lib -I../gnulib/lib -I../include -I../src -I../include -I../src -I/usr/local/include/libxml2 -D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=199506L -DGETTEXT_PACKAGE=\"libvirt\" -Wall -Wformat -Wformat-security -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Winline -Wredundant-decls -Wno-sign-compare -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fasynchronous-unwind-tables -DWITH_TEST -DWITH_REMOTE -I /c/Users/rjones/Desktop/gnutls/include -I /c/oncrpc -MT testutils.o -MD -MP -MF .deps/testutils.Tpo -c -o testutils.o testutils.c In file included from ../gnulib/lib/sys/stat.h:28, from testutils.c:17: ../gnulib/lib/sys/stat.h:272: warning: unused parameter 'mode' testutils.c:18:22: error: sys/wait.h: No such file or directory testutils.c: In function 'virtTestCaptureProgramExecChild': testutils.c:137: warning: implicit declaration of function 'sysconf' testutils.c:137: warning: nested extern declaration of 'sysconf' testutils.c:137: error: '_SC_OPEN_MAX' undeclared (first use in this function) testutils.c:137: error: (Each undeclared identifier is reported only once testutils.c:137: error: for each function it appears in.) testutils.c:153: warning: passing argument 2 of 'execve' from incompatible pointer type testutils.c:153: warning: passing argument 3 of 'execve' from incompatible pointer type testutils.c: In function 'virtTestCaptureProgramOutput': testutils.c:168: warning: implicit declaration of function 'pipe' testutils.c:168: warning: nested extern declaration of 'pipe' testutils.c:171: warning: implicit declaration of function 'fork' testutils.c:202: warning: implicit declaration of function 'waitpid' testutils.c:202: warning: nested extern declaration of 'waitpid' make[3]: *** [testutils.o] Error 1 /bin/sh ../libtool --tag=CC --mode=link gcc-sjlj -I /c/Users/rjones/Desktop/gnutls/include -I /c/oncrpc -L /c/Users/rjones/Desktop/gnutls/lib -L /c/oncrpc/bin -o conftest.exe conftest.o -L/usr/local/lib -lxml2 -lws2_32 -lgnutls -lws2_32 -Wall -Wformat -Wformat-security -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Winline -Wredundant-decls -Wno-sign-compare -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fasynchronous-unwind-tables ../src/.libs/libvirt_la-bridge.o ../src/.libs/libvirt_la-buf.o ../src/.libs/libvirt_la-conf.o ../src/.libs/libvirt_la-event.o ../src/.libs/libvirt_la-hash.o ../src/.libs/libvirt_la-libvirt.o ../src/.libs/libvirt_la-nodeinfo.o ../src/.libs/libvirt_la-openvz_conf.o ../src/.libs/libvirt_la-openvz_driver.o ../src/.libs/libvirt_la-proxy_internal.o ../src/.libs/libvirt_la-qemu_conf.o ../src/.libs/libvirt_la-qemu_driver.o ../src/.libs/libvirt_la-sexpr.o ../src/.libs/libvirt_la-stats_linux.o ../src/.libs/libvirt_la-test.o ../src/.libs/libvirt_la-uuid.o ../src/.libs/libvirt_la-virterror.o ../src/.libs/libvirt_la-xen_internal.o ../src/.libs/libvirt_la-xen_unified.o ../src/.libs/libvirt_la-xend_internal.o ../src/.libs/libvirt_la-xm_internal.o ../src/.libs/libvirt_la-xml.o ../src/.libs/libvirt_la-xs_internal.o ../gnulib/lib/libgnu.la -lws2_32 gcc-sjlj -I /c/Users/rjones/Desktop/gnutls/include -I /c/oncrpc /c/Users/rjones/Desktop/gnutls/lib /c/oncrpc/bin -o conftest.exe conftest.o -Wall -Wformat -Wformat-security -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Winline -Wredundant-decls -Wno-sign-compare -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fasynchronous-unwind-tables ../src/.libs/libvirt_la-bridge.o ../src/.libs/libvirt_la-buf.o ../src/.libs/libvirt_la-conf.o ../src/.libs/libvirt_la-event.o ../src/.libs/libvirt_la-hash.o ../src/.libs/libvirt_la-libvirt.o ../src/.libs/libvirt_la-nodeinfo.o ../src/.libs/libvirt_la-openvz_conf.o ../src/.libs/libvirt_la-openvz_driver.o ../src/.libs/libvirt_la-proxy_internal.o ../src/.libs/libvirt_la-qemu_conf.o ../src/.libs/libvirt_la-qemu_driver.o ../src/.libs/libvirt_la-sexpr.o ../src/.libs/libvirt_la-stats_linux.o ../src/.libs/libvirt_la-test.o ../src/.libs/libvirt_la-uuid.o ../src/.libs/libvirt_la-virterror.o ../src/.libs/libvirt_la-xen_internal.o ../src/.libs/libvirt_la-xen_unified.o ../src/.libs/libvirt_la-xend_internal.o ../src/.libs/libvirt_la-xm_internal.o ../src/.libs/libvirt_la-xml.o ../src/.libs/libvirt_la-xs_internal.o -L/z/d/libvirt-mingw/tests -L/usr/local/lib /usr/local/lib/libxml2.dll.a -lgnutls ../gnulib/lib/.libs/libgnu.a -L/z/d/libvirt-mingw/gnulib/lib -lws2_32 -L/usr/local/lib -L/usr/local/lib c:/mingw/bin/../lib/gcc/mingw32/4.2.1-sjlj/../../../../mingw32/bin/ld.exe: c:/Users/rjones/Desktop/gnutls/lib: No such file: Permission denied collect2: ld returned 1 exit status make[3]: *** [conftest.exe] Error 1 /bin/sh ../libtool --tag=CC --mode=link gcc-sjlj -I /c/Users/rjones/Desktop/gnutls/include -I /c/oncrpc -L /c/Users/rjones/Desktop/gnutls/lib -L /c/oncrpc/bin -o reconnect.exe reconnect.o -L/usr/local/lib -lxml2 -lws2_32 -lgnutls -lws2_32 -Wall -Wformat -Wformat-security -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Winline -Wredundant-decls -Wno-sign-compare -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fasynchronous-unwind-tables ../src/.libs/libvirt_la-bridge.o ../src/.libs/libvirt_la-buf.o ../src/.libs/libvirt_la-conf.o ../src/.libs/libvirt_la-event.o ../src/.libs/libvirt_la-hash.o ../src/.libs/libvirt_la-libvirt.o ../src/.libs/libvirt_la-nodeinfo.o ../src/.libs/libvirt_la-openvz_conf.o ../src/.libs/libvirt_la-openvz_driver.o ../src/.libs/libvirt_la-proxy_internal.o ../src/.libs/libvirt_la-qemu_conf.o ../src/.libs/libvirt_la-qemu_driver.o ../src/.libs/libvirt_la-sexpr.o ../src/.libs/libvirt_la-stats_linux.o ../src/.libs/libvirt_la-test.o ../src/.libs/libvirt_la-uuid.o ../src/.libs/libvirt_la-virterror.o ../src/.libs/libvirt_la-xen_internal.o ../src/.libs/libvirt_la-xen_unified.o ../src/.libs/libvirt_la-xend_internal.o ../src/.libs/libvirt_la-xm_internal.o ../src/.libs/libvirt_la-xml.o ../src/.libs/libvirt_la-xs_internal.o ../gnulib/lib/libgnu.la -lws2_32 gcc-sjlj -I /c/Users/rjones/Desktop/gnutls/include -I /c/oncrpc /c/Users/rjones/Desktop/gnutls/lib /c/oncrpc/bin -o reconnect.exe reconnect.o -Wall -Wformat -Wformat-security -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Winline -Wredundant-decls -Wno-sign-compare -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fasynchronous-unwind-tables ../src/.libs/libvirt_la-bridge.o ../src/.libs/libvirt_la-buf.o ../src/.libs/libvirt_la-conf.o ../src/.libs/libvirt_la-event.o ../src/.libs/libvirt_la-hash.o ../src/.libs/libvirt_la-libvirt.o ../src/.libs/libvirt_la-nodeinfo.o ../src/.libs/libvirt_la-openvz_conf.o ../src/.libs/libvirt_la-openvz_driver.o ../src/.libs/libvirt_la-proxy_internal.o ../src/.libs/libvirt_la-qemu_conf.o ../src/.libs/libvirt_la-qemu_driver.o ../src/.libs/libvirt_la-sexpr.o ../src/.libs/libvirt_la-stats_linux.o ../src/.libs/libvirt_la-test.o ../src/.libs/libvirt_la-uuid.o ../src/.libs/libvirt_la-virterror.o ../src/.libs/libvirt_la-xen_internal.o ../src/.libs/libvirt_la-xen_unified.o ../src/.libs/libvirt_la-xend_internal.o ../src/.libs/libvirt_la-xm_internal.o ../src/.libs/libvirt_la-xml.o ../src/.libs/libvirt_la-xs_internal.o -L/z/d/libvirt-mingw/tests -L/usr/local/lib /usr/local/lib/libxml2.dll.a -lgnutls ../gnulib/lib/.libs/libgnu.a -L/z/d/libvirt-mingw/gnulib/lib -lws2_32 -L/usr/local/lib -L/usr/local/lib c:/mingw/bin/../lib/gcc/mingw32/4.2.1-sjlj/../../../../mingw32/bin/ld.exe: c:/Users/rjones/Desktop/gnutls/lib: No such file: Permission denied collect2: ld returned 1 exit status make[3]: *** [reconnect.exe] Error 1 make[3]: Target `all-am' not remade because of errors. make[3]: Leaving directory `/z/d/libvirt-mingw/tests' make[2]: *** [all-recursive] Error 1 make[2]: Target `all' not remade because of errors. make[2]: Leaving directory `/z/d/libvirt-mingw/tests' Making all in po make[2]: Entering directory `/z/d/libvirt-mingw/po' make[2]: Nothing to be done for `all'. make[2]: Leaving directory `/z/d/libvirt-mingw/po' Making all in scripts make[2]: Entering directory `/z/d/libvirt-mingw/scripts' make[2]: Nothing to be done for `all'. make[2]: Leaving directory `/z/d/libvirt-mingw/scripts' make[2]: Entering directory `/z/d/libvirt-mingw' make[2]: Leaving directory `/z/d/libvirt-mingw' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/z/d/libvirt-mingw' make: *** [all] Error 2

2 8

[Libvir] more missing #include's of "config.h"
by Jim Meyering 06 Dec '07

06 Dec '07

This is the last of the non-generated files requiring #include "config.h": Include "config.h" in remaining non-generated files. * docs/examples/info1.c: Likewise. * docs/examples/suspend.c: Likewise. * proxy/libvirt_proxy.c: Likewise. * python/libvir.c: Likewise. * python/types.c: Likewise. * src/event.c: Likewise. * src/xm_internal.c: Likewise. * tests/reconnect.c: Likewise. * tests/testutils.c: Likewise. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- docs/examples/info1.c | 2 ++ docs/examples/suspend.c | 2 ++ proxy/libvirt_proxy.c | 4 +++- python/libvir.c | 4 +++- python/types.c | 4 +++- src/event.c | 1 + src/xm_internal.c | 2 ++ tests/reconnect.c | 2 ++ tests/testutils.c | 2 ++ 9 files changed, 20 insertions(+), 3 deletions(-) diff --git a/docs/examples/info1.c b/docs/examples/info1.c index f17bde8..53a9844 100644 --- a/docs/examples/info1.c +++ b/docs/examples/info1.c @@ -9,6 +9,8 @@ * copy: see Copyright for the status of this software. */ +#include "config.h" + #include <stdio.h> #include <libvirt/libvirt.h> diff --git a/docs/examples/suspend.c b/docs/examples/suspend.c index 80e4da7..5bc47a4 100644 --- a/docs/examples/suspend.c +++ b/docs/examples/suspend.c @@ -11,6 +11,8 @@ * copy: see Copyright for the status of this software. */ +#include "config.h" + #include <stdlib.h> #include <stdio.h> #include <libvirt/libvirt.h> diff --git a/proxy/libvirt_proxy.c b/proxy/libvirt_proxy.c index d7deb44..152df56 100644 --- a/proxy/libvirt_proxy.c +++ b/proxy/libvirt_proxy.c @@ -2,13 +2,15 @@ * proxy_svr.c: root suid proxy server for Xen access to APIs with no * side effects from unauthenticated clients. * - * Copyright (C) 2006 Red Hat, Inc. + * Copyright (C) 2006, 2007 Red Hat, Inc. * * See COPYING.LIB for the License of this software * * Daniel Veillard <veillard(a)redhat.com> */ +#include "config.h" + #include <stdio.h> #include <stdlib.h> #include <unistd.h> diff --git a/python/libvir.c b/python/libvir.c index bab34b3..a025afd 100644 --- a/python/libvir.c +++ b/python/libvir.c @@ -4,11 +4,13 @@ * entry points where an automatically generated stub is * unpractical * - * Copyright (C) 2005 Red Hat, Inc. + * Copyright (C) 2005, 2007 Red Hat, Inc. * * Daniel Veillard <veillard(a)redhat.com> */ +#include "config.h" + #include <Python.h> #include "libvirt/libvirt.h" #include "libvirt/virterror.h" diff --git a/python/types.c b/python/types.c index cc0f2b1..146bb24 100644 --- a/python/types.c +++ b/python/types.c @@ -2,11 +2,13 @@ * types.c: converter functions between the internal representation * and the Python objects * - * Copyright (C) 2005 Red Hat, Inc. + * Copyright (C) 2005, 2007 Red Hat, Inc. * * Daniel Veillard <veillard(a)redhat.com> */ +#include "config.h" + #include "libvirt_wrap.h" PyObject * diff --git a/src/event.c b/src/event.c index 2fe9a26..7dcbf32 100644 --- a/src/event.c +++ b/src/event.c @@ -21,6 +21,7 @@ * Author: Daniel P. Berrange <berrange(a)redhat.com> */ +#include "config.h" #include "event.h" diff --git a/src/xm_internal.c b/src/xm_internal.c index 43263d7..07abbb1 100644 --- a/src/xm_internal.c +++ b/src/xm_internal.c @@ -23,6 +23,8 @@ */ #ifdef WITH_XEN +#include "config.h" + #include <dirent.h> #include <time.h> #include <sys/stat.h> diff --git a/tests/reconnect.c b/tests/reconnect.c index 246e3bb..d94f5c7 100644 --- a/tests/reconnect.c +++ b/tests/reconnect.c @@ -1,3 +1,5 @@ +#include "config.h" + #include <stdio.h> #include <stdlib.h> #include "libvirt/libvirt.h" diff --git a/tests/testutils.c b/tests/testutils.c index 6121785..1141edb 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -10,6 +10,8 @@ * $Id$ */ +#include "config.h" + #include <stdio.h> #include <stdlib.h> #include <sys/time.h> -- 1.5.3.7.1006.g8c6a6

3 5

[Libvir] schedifo for qemu guests.
by Fabian Deutsch 06 Dec '07

06 Dec '07

Hey. I'm using Fedora 8 and the included libvirt and virt-manager packages. I just noticed that it is not possible so set scheddunling for qemu guests. Could this be implemented by setting the guests nice value, so instances are handled different by Linux's prcoess scheduler? - fabian

3 3

[Libvir] [PATCH] qemud/qemud.c (qemudInitPaths): Remove unused code.
by Jim Meyering 06 Dec '07

06 Dec '07

Here, "base" is set, gets memory allocated for it, and is written to, then freed, but it is never used. diff --git a/qemud/qemud.c b/qemud/qemud.c index f88ed42..6b515d9 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -644,10 +644,8 @@ static int qemudInitPaths(struct qemud_server *server, char *sockname, char *roSockname, int maxlen) { - char *base = 0; uid_t uid = geteuid(); - if (!uid) { if (snprintf (sockname, maxlen, "%s/run/libvirt/libvirt-sock", LOCAL_STATE_DIR) >= maxlen) @@ -678,15 +676,8 @@ static int qemudInitPaths(struct qemud_server *server, if (snprintf(server->logDir, PATH_MAX, "%s/.libvirt/log", pw->pw_dir) >= PATH_MAX) goto snprintf_error; - if (asprintf (&base, "%s/.libvirt", pw->pw_dir) == -1) { - qemudLog (QEMUD_ERR, "out of memory in asprintf"); - return -1; - } - } /* !remote */ - if (base) free (base); - return 0; snprintf_error: -- 1.5.3.7.949.g2221a6

2 2

[Libvir] [PATCH] Virsh prompt
by Richard W.M. Jones 06 Dec '07

06 Dec '07

The virsh prompt seems to depend on your UID, rather than whether the connection is really readonly or not. Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

3 2

[Libvir] [PATCH] Add --without-libvirtd option
by Richard W.M. Jones 06 Dec '07

06 Dec '07

This patch adds a configure option --without-libvirtd which disables building of libvirtd. It doesn't attempt any type of auto-detection and the default is still to build libvirtd. I had to move stuff around in the qemud/Makefile.am file in order to bring the libvirtd-dependent parts together, but I didn't change any of it. Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

3 2

[Libvir] Use of getpass
by Richard W.M. Jones 06 Dec '07

06 Dec '07

We recently added a call to getpass(3) function. Needless to say this doesn't exist on Windows. More seriously the man-page for getpass on Linux has strong exhortations not to use the function. NAME getpass - get a password SYNOPSIS #include <unistd.h> char *getpass( const char * prompt ); DESCRIPTION This function is obsolete. Do not use it. The getpass() function opens /dev/tty (the controlling terminal of the process), outputs the string prompt, turns off echoing, reads one line (the "password"), restores the terminal state and closes /dev/tty again. [...] CONFORMING TO Present in SUSv2, but marked LEGACY. Removed in POSIX.1-2001. Should we remove it? Replace it? Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

3 4

[Libvir] moving "aux" files into a subdir
by Jim Meyering 06 Dec '07

06 Dec '07

I noticed that gnulib-tool had deposited a file named link-warning.h into the top-level directory. How odd, I thought. This doesn't affect other projects because most of them define what autoconf calls the "AUX" directory, with a line like this in configure.in or configure.ac: AC_CONFIG_AUX_DIR(build-aux) If you don't define that, it defaults to the top level directory, and that's where files pulled in by gettextize like these are deposited: config.guess compile libtool ltconfig ltmain.sh config.sub config.rpath mkinstalldirs Rather than committing link-warning.h in the top-level, I propose to add the above AC_CONFIG_AUX_DIR line. That change should be transparent to all the other tools, and would let me commit link-warning.h in the build-aux subdir, instead of in the top-level dir. Any objection?

2 2

[Libvir] Preliminary packages for libvirt on Debian
by Richard W.M. Jones 06 Dec '07

06 Dec '07

These are preliminary packages for libvirt 0.3.3 on Debian. The libvirt package is derived from the one in Ubuntu, originally packaged by Andrew Mitchell. Xen --- Unfortunately a patch is needed to the base Xen package in Debian, so that it includes the header files needed by libvirt. Doubly unfortunately because of the strange way that Xen is packaged in Debian it isn't possible to modify the changelog (therefore the version or release number) without some voodoo which I don't understand[1]. So the version here has the same version/release as the one currently in Debian testing. As a result you'll have to manually install it using dpkg. Binary for i386: http://et.redhat.com/~rjones/debian-libvirt/xen-docs-3.1_3.1.1-1_all.deb http://et.redhat.com/~rjones/debian-libvirt/xen-hypervisor-3.1-1-i386_3.1.1… http://et.redhat.com/~rjones/debian-libvirt/xen-hypervisor-3.1-1-i386-nonpa… http://et.redhat.com/~rjones/debian-libvirt/xen-utils-3.1-1_3.1.1-1_i386.deb Patch required to get the right header files: http://et.redhat.com/~rjones/debian-libvirt/debian-xen-includes.patch libvirt ------- Source: http://et.redhat.com/~rjones/debian-libvirt/libvirt_0.3.3-1.diff.gz http://et.redhat.com/~rjones/debian-libvirt/libvirt_0.3.3-1.dsc http://et.redhat.com/~rjones/debian-libvirt/libvirt_0.3.3-1_i386.changes http://et.redhat.com/~rjones/debian-libvirt/libvirt_0.3.3.orig.tar.gz Binary for i386: http://et.redhat.com/~rjones/debian-libvirt/libvirt0_0.3.3-1_i386.deb http://et.redhat.com/~rjones/debian-libvirt/libvirt-bin_0.3.3-1_i386.deb http://et.redhat.com/~rjones/debian-libvirt/libvirt-dev_0.3.3-1_i386.deb http://et.redhat.com/~rjones/debian-libvirt/python-libvirt_0.3.3-1_i386.deb virt-install & virt-manager --------------------------- I'm working on these, although I managed to "brick" my Debian install because of some stupidity in pycentral ... Rich. [1] See this thread for the full details: http://lists.alioth.debian.org/pipermail/pkg-xen-devel/2007-November/001506… -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

2 1

[Libvir] [PATCH] Clean up a warning in remote_internal.c
by Richard W.M. Jones 06 Dec '07

06 Dec '07

After applying this patch, you can compile CVS libvirt with -Werror. Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

3 2

[Libvir] [PATCH] fix compilation if readline lib is not available
by Daniel Veillard 06 Dec '07

06 Dec '07

The current CVS code doesn't compile on RHEL5/F6 because readline lib there require ncurses, and we removed that check earlier. Sor we find the readline headers but the lib is not found. Unfortunately virsh.c tests the availablility of the header to use readline, and link time failures follow. The patch below: - exports a READLINE_CFLAGS from configure if used - use the READLINE_CFLAGS when compiling virsh.c - change virsh.c to rely on this instead of the header test - adds a message about readline usage at the end of configure configure: Miscellaneous configure: configure: Debug: no configure: Readline: yes configure: Another patch available soon should fix the readline library detection itself, Daniel -- Red Hat Virtualization group http://redhat.com/virtualization/ Daniel Veillard | virtualization library http://libvirt.org/ veillard(a)redhat.com | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/

3 8

[Libvir] searchable archive of this list?
by jack snodgrass 06 Dec '07

06 Dec '07

Is there a searchable archive of this list somewhere? Thanks - jack

3 2

[Libvir] libvirt and dnsmasq question
by jack snodgrass 06 Dec '07

06 Dec '07

I have Fedora 8 witch contains: libvirt-0.3.3-2.fc8 This version of libvirt automatically starts a copy of dnsmasq if it exists. Is there a way to specify a dnsmasq.conf file that this will use or specify command line options for dnsmasq when it is started? There are dnsmasq options and config changes that I'd like to specify but I can't figure out where this would be done. libvirt does not use the /etc/dnsmasq.conf file or start dnsmasq using the normal init scripts. Thanks - jack

2 1

[Libvir] gnulib: take2, trunk-relative patch
by Jim Meyering 06 Dec '07

06 Dec '07

Here's the complete patch (but still none of the new files), rebased and relative to the trunk. As before, this passes "make distcheck". And as Daniel Veillard noted, you'd need git. However the next patch will cvs-add all of the bootstrap-imported files, so you won't need git unless you want to try this particular patch. ------------------------------------------------------------- Use gnulib, starting with its physmem and getaddrinfo modules. New files go into these directories: gnulib/lib gnulib/m4 tests/gnulib * bootstrap: A wrapper around gnulib-tool. * configure.in: Invoke gl_EARLY and gl_INIT, being careful to put gl_EARLY before any macro that uses AC_COMPILE_IFELSE. (AC_OUTPUT): Add lib/Makefile and gl-tests/Makefile. Remove m4/Makefile. * Makefile.am (SUBDIRS): Add gnulib/lib and tests/gnulib. Remove m4. * m4/Makefile.am: Remove file. Not needed. * src/Makefile.am (INCLUDES): Add -I$(top_srcdir)/gnulib/lib -I../gnulib/lib. (LDADDS, libvirt_la_LIBADD): Add ../gnulib/lib/libgnu.la. * src/nodeinfo.c: Include "physmem.h". * qemud/qemud.c, src/remote_internal.c: Include "getaddrinfo.h". (MEMINFO_PATH, linuxNodeInfoMemPopulate): Remove definitions. (virNodeInfoPopulate): Use physmem_total, not linuxNodeInfoMemPopulate. * tests/Makefile.am (INCLUDES): Add -I$(top_srcdir)/gnulib/lib -I../gnulib/lib. (LDADDS): Add ../gnulib/lib/libgnu.la. * qemud/Makefile.am (libvirtd_LDADD): Add ../gnulib/lib/libgnu.la. * tests/nodeinfotest.c (linuxTestCompareFiles): No longer read total memory from a file. Update expected output not to include "Memory: NNNN" * tests/nodeinfodata/linux-nodeinfo-1.txt: * tests/nodeinfodata/linux-nodeinfo-2.txt: * tests/nodeinfodata/linux-nodeinfo-3.txt: * tests/nodeinfodata/linux-nodeinfo-4.txt: * tests/nodeinfodata/linux-nodeinfo-5.txt: * tests/nodeinfodata/linux-nodeinfo-6.txt: * src/test.c [WITH_TEST]: Remove definition of _GNU_SOURCE that would conflict with the one now in "config.h". * autogen.sh: Add -I gnulib/m4. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- Makefile.am | 5 +- autogen.sh | 2 +- bootstrap | 108 +++++++++++++++++++++++++++++++ configure.in | 11 ++- m4/Makefile.am | 3 - qemud/Makefile.am | 3 +- qemud/qemud.c | 1 + src/Makefile.am | 8 ++- src/nodeinfo.c | 55 +++------------- src/remote_internal.c | 1 + src/test.c | 2 - tests/Makefile.am | 2 + tests/nodeinfodata/linux-nodeinfo-1.txt | 2 +- tests/nodeinfodata/linux-nodeinfo-2.txt | 2 +- tests/nodeinfodata/linux-nodeinfo-3.txt | 2 +- tests/nodeinfodata/linux-nodeinfo-4.txt | 2 +- tests/nodeinfodata/linux-nodeinfo-5.txt | 2 +- tests/nodeinfodata/linux-nodeinfo-6.txt | 2 +- tests/nodeinfotest.c | 23 ++----- 19 files changed, 151 insertions(+), 85 deletions(-) create mode 100755 bootstrap delete mode 100644 m4/Makefile.am diff --git a/Makefile.am b/Makefile.am index eaa204e..1f2ca52 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,8 +1,9 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = src qemud proxy include docs @PYTHON_SUBDIR@ tests po m4 scripts +SUBDIRS = gnulib/lib src qemud proxy include docs @PYTHON_SUBDIR@ \ + tests/gnulib tests po scripts -ACLOCAL_AMFLAGS = -I m4 +ACLOCAL_AMFLAGS = -I m4 -I gnulib/m4 EXTRA_DIST = libvirt.spec.in libvirt.spec COPYING.LIB \ libvirt.pc.in libvirt.pc TODO AUTHORS ChangeLog \ diff --git a/autogen.sh b/autogen.sh index 97b636d..3bcffd3 100755 --- a/autogen.sh +++ b/autogen.sh @@ -57,7 +57,7 @@ fi autopoint --force #rm -rf m4 libtoolize --copy --force -aclocal -I m4 +aclocal -I m4 -I gnulib/m4 autoheader automake --add-missing autoconf diff --git a/bootstrap b/bootstrap new file mode 100755 index 0000000..ca186bd --- /dev/null +++ b/bootstrap @@ -0,0 +1,108 @@ +#!/bin/sh +# Run this after autogen.sh, to pull in all of the gnulib-related bits. +# It's important to run *after* autogen.sh, since it updates some of +# the same files autogen.sh does, yet those from gnulib are newer, +# and match the tests. So if a gnulib bug has been fixed since the +# snapshot taken for whatever gettext release you're using, yet you +# run "make check" against the wrong version, the corresponding unit +# test in gl-tests/ may well fail. + +usage() { + echo >&2 "\ +Usage: $0 [OPTION]... +Bootstrap this package from the checked-out sources. + +Options: + --gnulib-srcdir=DIRNAME Specify the local directory where gnulib + sources reside. Use this if you already + have gnulib sources on your machine, and + do not want to waste your bandwidth downloading + them again. + +If the file bootstrap.conf exists in the current working directory, its +contents are read as shell variables to configure the bootstrap. + +Running without arguments will suffice in most cases. +" +} + +for option +do + case $option in + --help) + usage + exit;; + --gnulib-srcdir=*) + GNULIB_SRCDIR=`expr "$option" : '--gnulib-srcdir=$.*$'`;; + *) + echo >&2 "$0: $option: unknown option" + exit 1;; + esac +done + +cleanup_gnulib() { + st=$? + rm -fr .gnulib + exit $st +} + +case ${GNULIB_SRCDIR--} in +-) + if [ ! -d gnulib ]; then + echo "$0: getting gnulib files..." + + trap cleanup_gnulib 1 2 13 15 + + git clone --depth 1 git://git.sv.gnu.org/gnulib .gnulib || + cleanup_gnulib + + trap - 1 2 13 15 + fi + GNULIB_SRCDIR=.gnulib +esac + +gnulib_tool=$GNULIB_SRCDIR/gnulib-tool +<$gnulib_tool || exit + +# Tell gnulib to: +# put tests in new tests/gnulib/ dir +# put *.m4 files in new gnulib/m4/ dir +# put *.[ch] files in new gnulib/lib/ dir. +# With --avoid=snprintf, we drop support for systems (many!) with +# losing snprintf but pull in about 30 fewer files +# With the current gnulib and gettext-0.17, the following +# files are added to m4/ by both. But gnulib is stable enough +# and gettext-0.16.1 is new enough that they are identical. +# compiler-flags.m4 +# inttypes_h.m4 +# longlong.m4 +# size_max.m4 +# stdint_h.m4 +# wchar_t.m4 +# wint_t.m4 +# xsize.m4 + +# Note that if we don't exclude the snprintf module, there are two tests +# that have incompatible licenses, so we would have to exclude them. Even +# excluding those two test modules, find reports a total of 94 added files. +# Yes, snprintf has some heavy-duty dependents. +# --avoid=snprintf-tests +# --avoid=vasnprintf-tests + +avoid='--avoid=snprintf' + +avoid=' + --avoid=snprintf-tests + --avoid=vasnprintf-tests +' + +$gnulib_tool \ + --lgpl \ + $avoid \ + --avoid=snprintf-tests \ + --avoid=vasnprintf-tests \ + --with-tests \ + --m4-base=gnulib/m4 \ + --source-base=gnulib/lib \ + --tests-base=tests/gnulib \ + --import physmem getaddrinfo diff --git a/configure.in b/configure.in index 6cd7fe2..0cc8b6d 100644 --- a/configure.in +++ b/configure.in @@ -28,11 +28,15 @@ AVAHI_REQUIRED="0.6.0" dnl Checks for C compiler. AC_PROG_CC -AM_PROG_CC_STDC -AC_C_CONST AC_PROG_INSTALL AC_PROG_CPP +gl_EARLY +gl_INIT + +AM_PROG_CC_STDC +AC_C_CONST + dnl Make sure we have an ANSI compiler AM_C_PROTOTYPES test "x$U" != "x" && AC_MSG_ERROR(Compiler not ANSI compliant) @@ -555,11 +559,12 @@ cp COPYING.LIB COPYING AC_OUTPUT(Makefile src/Makefile include/Makefile docs/Makefile \ docs/examples/Makefile docs/devhelp/Makefile \ docs/examples/python/Makefile \ + gnulib/lib/Makefile tests/gnulib/Makefile \ libvirt.pc libvirt.spec \ po/Makefile.in scripts/Makefile \ include/libvirt/Makefile include/libvirt/libvirt.h \ python/Makefile python/tests/Makefile \ - qemud/Makefile m4/Makefile \ + qemud/Makefile \ tests/Makefile proxy/Makefile \ tests/xml2sexprdata/Makefile \ tests/sexpr2xmldata/Makefile \ diff --git a/m4/Makefile.am b/m4/Makefile.am deleted file mode 100644 index 188b2fe..0000000 --- a/m4/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ - -EXTRA_DIST = compiler-flags.m4 - diff --git a/qemud/Makefile.am b/qemud/Makefile.am index 1737176..7e3b694 100644 --- a/qemud/Makefile.am +++ b/qemud/Makefile.am @@ -27,6 +27,7 @@ libvirtd_SOURCES = \ #-D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED=1 -D_POSIX_C_SOURCE=199506L libvirtd_CFLAGS = \ + -I$(top_srcdir)/gnulib/lib -I../gnulib/lib \ -I$(top_srcdir)/include -I$(top_builddir)/include \ $(LIBXML_CFLAGS) $(GNUTLS_CFLAGS) \ $(WARN_CFLAGS) -DLOCAL_STATE_DIR="\"$(localstatedir)\"" \ @@ -37,7 +38,7 @@ libvirtd_CFLAGS = \ libvirtd_LDFLAGS = $(WARN_CFLAGS) $(LIBXML_LIBS) $(GNUTLS_LIBS) libvirtd_DEPENDENCIES = ../src/libvirt.la -libvirtd_LDADD = ../src/libvirt.la +libvirtd_LDADD = ../src/libvirt.la ../gnulib/lib/libgnu.la if HAVE_AVAHI libvirtd_SOURCES += mdns.c mdns.h diff --git a/qemud/qemud.c b/qemud/qemud.c index f88ed42..caccd29 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -53,6 +53,7 @@ #include <libvirt/virterror.h> #include "internal.h" +#include "getaddrinfo.h" #include "../src/internal.h" #include "../src/remote_internal.h" #include "../src/conf.h" diff --git a/src/Makefile.am b/src/Makefile.am index 52ffbaf..f9a2308 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,8 @@ ## Process this file with automake to produce Makefile.in -INCLUDES = -I$(top_builddir)/include \ +INCLUDES = \ + -I$(top_srcdir)/gnulib/lib -I../gnulib/lib \ + -I../include \ -I@top_srcdir@/include \ -I@top_srcdir@/qemud \ $(LIBXML_CFLAGS) \ @@ -14,7 +16,7 @@ INCLUDES = -I$(top_builddir)/include \ $(WARN_CFLAGS) \ $(LIBVIRT_FEATURES) DEPS = libvirt.la -LDADDS = @STATIC_BINARIES@ $(WARN_CFLAGS) libvirt.la +LDADDS = @STATIC_BINARIES@ $(WARN_CFLAGS) libvirt.la ../gnulib/lib/libgnu.la VIRSH_LIBS = @VIRSH_LIBS@ confdir = $(sysconfdir)/libvirt/ @@ -60,7 +62,7 @@ SERVER_SOURCES = \ libvirt_la_SOURCES = $(CLIENT_SOURCES) $(SERVER_SOURCES) libvirt_la_LIBADD = $(LIBXML_LIBS) $(GNUTLS_LIBS) $(LTLIBOBJS) \ - @CYGWIN_EXTRA_LIBADD@ + @CYGWIN_EXTRA_LIBADD@ ../gnulib/lib/libgnu.la libvirt_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libvirt_sym.version \ -version-info @LIBVIRT_VERSION_INFO@ \ $(COVERAGE_CFLAGS:-f%=-Wc,-f%) \ diff --git a/src/nodeinfo.c b/src/nodeinfo.c index a0a26eb..2ef49cb 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -29,14 +29,14 @@ #include <ctype.h> #include "nodeinfo.h" +#include "physmem.h" #ifdef __linux__ -#define MEMINFO_PATH "/proc/meminfo" #define CPUINFO_PATH "/proc/cpuinfo" /* NB, these are not static as we need to call them from testsuite */ -int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, virNodeInfoPtr nodeinfo); -int linuxNodeInfoMemPopulate(virConnectPtr conn, FILE *meminfo, virNodeInfoPtr nodeinfo); +int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, + virNodeInfoPtr nodeinfo); int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, virNodeInfoPtr nodeinfo) { char line[1024]; @@ -114,44 +114,11 @@ int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, virNodeInfoPtr n return 0; } - -int linuxNodeInfoMemPopulate(virConnectPtr conn, FILE *meminfo, - virNodeInfoPtr nodeinfo) { - char line[1024]; - - nodeinfo->memory = 0; - - while (fgets(line, sizeof(line), meminfo) != NULL) { - if (STREQLEN(line, "MemTotal:", 9)) { - char *p; - unsigned int ui; - if (xstrtol_ui(line + 10, &p, 10, &ui) == 0 - && (*p == '\0' || isspace(*p))) { - nodeinfo->memory = ui; - break; - } - } - } - if (!nodeinfo->memory) { - __virRaiseError(conn, NULL, NULL, 0, VIR_ERR_INTERNAL_ERROR, - VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, - "no memory found"); - return -1; - } - - return 0; -} - - #endif int virNodeInfoPopulate(virConnectPtr conn, virNodeInfoPtr nodeinfo) { struct utsname info; -#ifdef __linux__ - int ret; - FILE *cpuinfo, *meminfo; -#endif if (uname(&info) < 0) { __virRaiseError(conn, NULL, NULL, 0, VIR_ERR_INTERNAL_ERROR, @@ -164,7 +131,9 @@ int virNodeInfoPopulate(virConnectPtr conn, nodeinfo->model[sizeof(nodeinfo->model)-1] = '\0'; #ifdef __linux__ - cpuinfo = fopen(CPUINFO_PATH, "r"); + { + int ret; + FILE *cpuinfo = fopen(CPUINFO_PATH, "r"); if (!cpuinfo) { __virRaiseError(conn, NULL, NULL, 0, VIR_ERR_INTERNAL_ERROR, VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, @@ -176,17 +145,11 @@ int virNodeInfoPopulate(virConnectPtr conn, if (ret < 0) return -1; - meminfo = fopen(MEMINFO_PATH, "r"); - if (!meminfo) { - __virRaiseError(conn, NULL, NULL, 0, VIR_ERR_INTERNAL_ERROR, - VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, - "cannot open %s %s", MEMINFO_PATH, strerror(errno)); - return -1; - } - ret = linuxNodeInfoMemPopulate(conn, meminfo, nodeinfo); - fclose(meminfo); + /* Convert to KB. */ + nodeinfo->memory = physmem_total () / 1024; return ret; + } #else /* XXX Solaris will need an impl later if they port QEMU driver */ __virRaiseError(conn, NULL, NULL, 0, VIR_ERR_INTERNAL_ERROR, diff --git a/src/remote_internal.c b/src/remote_internal.c index a8227f3..275405a 100644 --- a/src/remote_internal.c +++ b/src/remote_internal.c @@ -52,6 +52,7 @@ #include "internal.h" #include "driver.h" +#include "getaddrinfo.h" #include "remote_internal.h" #include "remote_protocol.h" diff --git a/src/test.c b/src/test.c index 010ea15..bab280f 100644 --- a/src/test.c +++ b/src/test.c @@ -25,8 +25,6 @@ #ifdef WITH_TEST -#define _GNU_SOURCE /* for asprintf */ - #include <stdio.h> #include <string.h> #include <sys/time.h> diff --git a/tests/Makefile.am b/tests/Makefile.am index 512162b..8220e1b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -11,6 +11,7 @@ SUBDIRS = virshdata confdata sexpr2xmldata xml2sexprdata xmconfigdata xencapsdat LIBVIRT = $(wildcard $(top_builddir)/src/.libs/libvirt_la-*.o) INCLUDES = \ + -I$(top_srcdir)/gnulib/lib -I../gnulib/lib \ -I$(top_builddir)/include \ -I$(top_builddir)/src \ -I$(top_srcdir)/include \ @@ -29,6 +30,7 @@ LDADDS = \ $(GNUTLS_LIBS) \ $(WARN_CFLAGS) \ $(LIBVIRT) \ + ../gnulib/lib/libgnu.la \ $(COVERAGE_LDFLAGS) EXTRA_DIST = \ diff --git a/tests/nodeinfodata/linux-nodeinfo-1.txt b/tests/nodeinfodata/linux-nodeinfo-1.txt index 1a38ad1..e52e20a 100644 --- a/tests/nodeinfodata/linux-nodeinfo-1.txt +++ b/tests/nodeinfodata/linux-nodeinfo-1.txt @@ -1 +1 @@ -CPUs: 2, MHz: 2800, Nodes: 1, Sockets: 1, Cores: 2, Threads: 1, Memory: 2053960 +CPUs: 2, MHz: 2800, Nodes: 1, Sockets: 1, Cores: 2, Threads: 1 diff --git a/tests/nodeinfodata/linux-nodeinfo-2.txt b/tests/nodeinfodata/linux-nodeinfo-2.txt index 1c31a0c..12e819b 100644 --- a/tests/nodeinfodata/linux-nodeinfo-2.txt +++ b/tests/nodeinfodata/linux-nodeinfo-2.txt @@ -1 +1 @@ -CPUs: 2, MHz: 2211, Nodes: 1, Sockets: 1, Cores: 2, Threads: 1, Memory: 4059540 +CPUs: 2, MHz: 2211, Nodes: 1, Sockets: 1, Cores: 2, Threads: 1 diff --git a/tests/nodeinfodata/linux-nodeinfo-3.txt b/tests/nodeinfodata/linux-nodeinfo-3.txt index e2cc841..d285781 100644 --- a/tests/nodeinfodata/linux-nodeinfo-3.txt +++ b/tests/nodeinfodata/linux-nodeinfo-3.txt @@ -1 +1 @@ -CPUs: 4, MHz: 1595, Nodes: 1, Sockets: 2, Cores: 2, Threads: 1, Memory: 4059272 +CPUs: 4, MHz: 1595, Nodes: 1, Sockets: 2, Cores: 2, Threads: 1 diff --git a/tests/nodeinfodata/linux-nodeinfo-4.txt b/tests/nodeinfodata/linux-nodeinfo-4.txt index 2c75ea3..991d4f9 100644 --- a/tests/nodeinfodata/linux-nodeinfo-4.txt +++ b/tests/nodeinfodata/linux-nodeinfo-4.txt @@ -1 +1 @@ -CPUs: 4, MHz: 1000, Nodes: 1, Sockets: 1, Cores: 4, Threads: 1, Memory: 4059272 +CPUs: 4, MHz: 1000, Nodes: 1, Sockets: 1, Cores: 4, Threads: 1 diff --git a/tests/nodeinfodata/linux-nodeinfo-5.txt b/tests/nodeinfodata/linux-nodeinfo-5.txt index 01fee52..dce7ada 100644 --- a/tests/nodeinfodata/linux-nodeinfo-5.txt +++ b/tests/nodeinfodata/linux-nodeinfo-5.txt @@ -1 +1 @@ -CPUs: 4, MHz: 2814, Nodes: 1, Sockets: 2, Cores: 2, Threads: 1, Memory: 4059272 +CPUs: 4, MHz: 2814, Nodes: 1, Sockets: 2, Cores: 2, Threads: 1 diff --git a/tests/nodeinfodata/linux-nodeinfo-6.txt b/tests/nodeinfodata/linux-nodeinfo-6.txt index a7a2cfe..75cdaa9 100644 --- a/tests/nodeinfodata/linux-nodeinfo-6.txt +++ b/tests/nodeinfodata/linux-nodeinfo-6.txt @@ -1 +1 @@ -CPUs: 4, MHz: 1000, Nodes: 1, Sockets: 2, Cores: 2, Threads: 1, Memory: 4059272 +CPUs: 4, MHz: 1000, Nodes: 1, Sockets: 2, Cores: 2, Threads: 1 diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c index 7275cc3..fb563b5 100644 --- a/tests/nodeinfotest.c +++ b/tests/nodeinfotest.c @@ -21,14 +21,13 @@ static char *abs_top_srcdir; #ifdef __linux__ extern int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, virNodeInfoPtr nodeinfo); -extern int linuxNodeInfoMemPopulate(virConnectPtr conn, FILE *meminfo, virNodeInfoPtr nodeinfo); -static int linuxTestCompareFiles(const char *cpuinfofile, const char *meminfofile, const char *outputfile) { +static int linuxTestCompareFiles(const char *cpuinfofile, const char *outputfile) { char actualData[MAX_FILE]; char expectData[MAX_FILE]; char *expect = &expectData[0]; virNodeInfo nodeinfo; - FILE *cpuinfo, *meminfo; + FILE *cpuinfo; if (virtTestLoadFile(outputfile, &expect, MAX_FILE) < 0) return -1; @@ -42,19 +41,10 @@ static int linuxTestCompareFiles(const char *cpuinfofile, const char *meminfofil } fclose(cpuinfo); - meminfo = fopen(meminfofile, "r"); - if (!meminfo) - return -1; - if (linuxNodeInfoMemPopulate(NULL, meminfo, &nodeinfo) < 0) { - fclose(meminfo); - return -1; - } - fclose(meminfo); - snprintf(actualData, MAX_FILE, - "CPUs: %u, MHz: %u, Nodes: %u, Sockets: %u, Cores: %u, Threads: %u, Memory: %lu\n", + "CPUs: %u, MHz: %u, Nodes: %u, Sockets: %u, Cores: %u, Threads: %u\n", nodeinfo.cpus, nodeinfo.mhz, nodeinfo.nodes, nodeinfo.sockets, - nodeinfo.cores, nodeinfo.threads, nodeinfo.memory); + nodeinfo.cores, nodeinfo.threads); if (STRNEQ(actualData, expectData)) { if (getenv("DEBUG_TESTS")) { @@ -70,15 +60,12 @@ static int linuxTestCompareFiles(const char *cpuinfofile, const char *meminfofil static int linuxTestNodeInfo(const void *data) { char cpuinfo[PATH_MAX]; - char meminfo[PATH_MAX]; char output[PATH_MAX]; snprintf(cpuinfo, PATH_MAX, "%s/tests/nodeinfodata/linux-%s.cpuinfo", abs_top_srcdir, (const char*)data); - snprintf(meminfo, PATH_MAX, "%s/tests/nodeinfodata/linux-%s.meminfo", - abs_top_srcdir, (const char*)data); snprintf(output, PATH_MAX, "%s/tests/nodeinfodata/linux-%s.txt", abs_top_srcdir, (const char*)data); - return linuxTestCompareFiles(cpuinfo, meminfo, output); + return linuxTestCompareFiles(cpuinfo, output); } #endif -- 1.5.3.6.950.g92b7b

4 20

[Libvir] gnulib: done (first two modules)
by Jim Meyering 06 Dec '07

06 Dec '07

I've checked in all of the changes to let libvirt use the first two modules from gnulib. That exposed the fact that gnulib's gl_INIT macro depends on autoconf-2.59c or newer for its definition of the m4_foreach_w macro. Here's a kludgey work-around patch, just committed, to fix build failure for developers who are stuck using such old tools: (also removed some trailing blanks) Accommodate developers using autoconf-2.59. * configure.in (m4_foreach_w): Define if not defined. I'll propose the proper change (in gnulib) tomorrow. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- ChangeLog | 5 +++++ configure.in | 17 ++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4b3c266..302706c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Dec 5 23:57:53 CET 2007 Jim Meyering <meyering(a)redhat.com> + + Accommodate developers using autoconf-2.59. + * configure.in (m4_foreach_w): Define if not defined. + Wed Dec 5 22:38:18 CET 2007 Jim Meyering <meyering(a)redhat.com> Include "config.h". diff --git a/configure.in b/configure.in index a7f692e..8d2a143 100644 --- a/configure.in +++ b/configure.in @@ -33,6 +33,13 @@ AC_PROG_CC AC_PROG_INSTALL AC_PROG_CPP +dnl gl_INIT uses m4_foreach_w, yet that is not defined in autoconf-2.59. +dnl In order to accommodate developers with such old tools, here's a +dnl replacement definition. +m4_ifndef([m4_foreach_w], + [m4_define([m4_foreach_w], + [m4_foreach([$1], m4_split(m4_normalize([$2]), [ ]), [$3])])]) + gl_EARLY gl_INIT @@ -289,8 +296,8 @@ LIBXML_LIBS="" LIBXML_FOUND="no" AC_ARG_WITH(libxml, [ --with-libxml=[PFX] libxml2 location]) -if test "z$with_libxml" = "zno" ; then - AC_MSG_CHECKING(for libxml2 libraries >= $LIBXML_REQUIRED) +if test "z$with_libxml" = "zno" ; then + AC_MSG_CHECKING(for libxml2 libraries >= $LIBXML_REQUIRED) AC_MSG_ERROR(libxml2 >= $LIBXML_REQUIRED is required for libvirt) elif test "z$with_libxml" = "z" -a "x$PKG_CONFIG" != "x" ; then PKG_CHECK_EXISTS(libxml-2.0,[LIBXML_FOUND=yes]) @@ -299,7 +306,7 @@ elif test "z$with_libxml" = "z" -a "x$PKG_CONFIG" != "x" ; then fi fi if test "z$LIBXML_FOUND" = "zno" ; then - if test "z$with_libxml" != "z" ; then + if test "z$with_libxml" != "z" ; then LIBXML_CONFIG=$with_libxml/bin/$LIBXML_CONFIG fi AC_MSG_CHECKING(libxml2 $LIBXML_CONFIG >= $LIBXML_REQUIRED ) @@ -442,8 +449,8 @@ AC_SUBST(AVAHI_LIBS) dnl virsh libraries AC_CHECK_HEADERS([readline/readline.h]) -AC_CHECK_LIB(readline, main, - [VIRSH_LIBS="$VIRSH_LIBS -lreadline"], +AC_CHECK_LIB(readline, main, + [VIRSH_LIBS="$VIRSH_LIBS -lreadline"], [AC_MSG_WARN([readline library not found])], [$VIRSH_LIBS]) AC_SUBST(VIRSH_LIBS) -- 1.5.3.7.1006.g8c6a6

1 0

[Libvir] Fix compilation --without-sasl
by Richard W.M. Jones 05 Dec '07

05 Dec '07

Fixes compilation when ./configure --without-sasl. Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

2 1

[Libvir] PATCH: 0/10: remote authentication support
by Daniel P. Berrange 05 Dec '07

05 Dec '07

This the 3rd iteration of the remote authentication / SASL patches previously provided here: v1: http://www.redhat.com/archives/libvir-list/2007-October/msg00131.html v2: http://www.redhat.com/archives/libvir-list/2007-November/msg00005.html This iteration has incorporate the feedback /bugs identified from previous iterations. It also adds in an API for a callback to collect credentials from the client applications, meaning username+password based authentication is now also supported alongside Kerberos/GSSAPI. I have also re-worked my previous PolicyKit patches: http://www.redhat.com/archives/libvir-list/2007-September/msg00168.html To fit into the generic authentication RPC mechanisms I added for SASL. The resulting incremental patch for PolicyKit is much simpler, and integrates better with client applications. Finally, I have exposed the authentication callback support to python and prototyped its use in virt-manager as a sanity check for the whole API style. Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

4 66

[Libvir] [PATCH] Detect heap allocation failure; factor out some duplication.
by Jim Meyering 05 Dec '07

05 Dec '07

I spotted a few unchecked heap allocations (strdup, malloc, calloc) in qemud.c and have fixed it so such failure evokes a proper diagnostic rather than e.g., a segfault. I've also arranged to free some of the memory upon failure, but not all (see comments for why). In spite of those additions, this patch factors out enough duplication that the net change is to remove a few lines from the file. Although in general I prefer to factor things out into separate functions, in this case, it seemed better to use macros. Wed Nov 28 14:16:17 CET 2007 Jim Meyering <meyering(a)redhat.com> Detect heap allocation failure; factor out some duplication. * qemud/qemud.c (mdns_name, tls_allowed_ip_list, tls_allowed_dn_list): Remove "const", now that we free these. (remoteCheckDN, remoteCheckAccess): Adapt to const removal. (qemudDispatchServer): Check for heap allocation failure. CHECK_TYPE, GET_CONF_INT, GET_CONF_STR, GET_CONF_STR_LIST): New and changed macros. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- qemud/qemud.c | 247 ++++++++++++++++++++++++++++----------------------------- 1 files changed, 121 insertions(+), 126 deletions(-) diff --git a/qemud/qemud.c b/qemud/qemud.c index 5f76a26..34ab815 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -79,13 +79,13 @@ static int unix_sock_ro_perms = 0777; /* Allow world */ #ifdef HAVE_AVAHI static int mdns_adv = 1; -static const char *mdns_name = NULL; +static char *mdns_name = NULL; #endif static int tls_no_verify_certificate = 0; static int tls_no_verify_address = 0; -static const char **tls_allowed_ip_list = 0; -static const char **tls_allowed_dn_list = 0; +static char **tls_allowed_ip_list = NULL; +static char **tls_allowed_dn_list = NULL; static const char *key_file = LIBVIRT_SERVERKEY; static const char *cert_file = LIBVIRT_SERVERCERT; @@ -840,7 +840,7 @@ remoteCheckDN (gnutls_x509_crt_t cert) { char name[256]; size_t namesize = sizeof name; - const char **wildcards; + char **wildcards; int err; err = gnutls_x509_crt_get_dn (cert, name, &namesize); @@ -959,7 +959,7 @@ static int remoteCheckAccess (struct qemud_client *client) { char addr[NI_MAXHOST]; - const char **wildcards; + char **wildcards; int found, err; /* Verify client certificate. */ @@ -1044,6 +1044,8 @@ static int qemudDispatchServer(struct qemud_server *server, struct qemud_socket } client = calloc(1, sizeof(struct qemud_client)); + if (client == NULL) + goto cleanup; client->magic = QEMUD_CLIENT_MAGIC; client->fd = fd; client->readonly = sock->readonly; @@ -1523,31 +1525,38 @@ remoteReadConfigFile (const char *filename) virConfValuePtr p; -#define CHECK_TYPE(name,typ) if (p && p->type != (typ)) { \ - qemudLog (QEMUD_ERR, \ - "remoteReadConfigFile: %s: %s: expected type " #typ "\n", \ - filename, (name)); \ - return -1; \ - } - - p = virConfGetValue (conf, "listen_tls"); - CHECK_TYPE ("listen_tls", VIR_CONF_LONG); - listen_tls = p ? p->l : listen_tls; - - p = virConfGetValue (conf, "listen_tcp"); - CHECK_TYPE ("listen_tcp", VIR_CONF_LONG); - listen_tcp = p ? p->l : listen_tcp; - - p = virConfGetValue (conf, "tls_port"); - CHECK_TYPE ("tls_port", VIR_CONF_STRING); - tls_port = p ? strdup (p->str) : tls_port; - - p = virConfGetValue (conf, "tcp_port"); - CHECK_TYPE ("tcp_port", VIR_CONF_STRING); - tcp_port = p ? strdup (p->str) : tcp_port; - - p = virConfGetValue (conf, "unix_sock_group"); - CHECK_TYPE ("unix_sock_group", VIR_CONF_STRING); +#define CHECK_TYPE(p, filename, conf, var_name, Type) \ + do { \ + (p) = virConfGetValue ((conf), #Type); \ + if ((p) && (p)->type != (Type)) { \ + qemudLog (QEMUD_ERR, \ + "remoteReadConfigFile: %s: %s:" \ + " expected type " #Type "\n", \ + filename, #var_name); \ + goto free_and_fail; \ + } \ + } while (0) + +#define GET_CONF_INT(p, filename, conf, var_name) \ + do { \ + CHECK_TYPE(p, filename, conf, var_name, VIR_CONF_LONG); \ + if (p) \ + (var_name) = p->l; \ + } while (0) + +#define GET_CONF_STR(p, filename, conf, var_name) \ + do { \ + CHECK_TYPE(p, filename, conf, var_name, VIR_CONF_STRING); \ + if (p) { \ + if (!((var_name) = strdup ((p)->str))) \ + goto diagnose_alloc_failure_and_fail; \ + } \ + } while (0) + + GET_CONF_STR (p, filename, conf, tls_port); + GET_CONF_STR (p, filename, conf, tcp_port); + + CHECK_TYPE (p, filename, conf, unix_sock_group, VIR_CONF_STRING); if (p && p->str) { if (getuid() != 0) { qemudLog (QEMUD_WARN, "Cannot set group when not running as root"); @@ -1561,8 +1570,7 @@ remoteReadConfigFile (const char *filename) } } - p = virConfGetValue (conf, "unix_sock_ro_perms"); - CHECK_TYPE ("unix_sock_ro_perms", VIR_CONF_STRING); + GET_CONF_INT (p, filename, conf, unix_sock_ro_perms); if (p && p->str) { if (xstrtol_i(p->str, NULL, 8, &unix_sock_ro_perms) != 0) { qemudLog (QEMUD_ERR, "Failed to parse mode '%s'", p->str); @@ -1570,8 +1578,7 @@ remoteReadConfigFile (const char *filename) } } - p = virConfGetValue (conf, "unix_sock_rw_perms"); - CHECK_TYPE ("unix_sock_rw_perms", VIR_CONF_STRING); + GET_CONF_INT (p, filename, conf, unix_sock_rw_perms); if (p && p->str) { if (xstrtol_i(p->str, NULL, 8, &unix_sock_rw_perms) != 0) { qemudLog (QEMUD_ERR, "Failed to parse mode '%s'", p->str); @@ -1580,107 +1587,95 @@ remoteReadConfigFile (const char *filename) } #ifdef HAVE_AVAHI - p = virConfGetValue (conf, "mdns_adv"); - CHECK_TYPE ("mdns_adv", VIR_CONF_LONG); - mdns_adv = p ? p->l : mdns_adv; - - p = virConfGetValue (conf, "mdns_name"); - CHECK_TYPE ("mdns_name", VIR_CONF_STRING); - mdns_name = p ? strdup (p->str) : NULL; + GET_CONF_INT (p, filename, conf, mdns_adv); + GET_CONF_STR (p, filename, conf, mdns_name); #endif - p = virConfGetValue (conf, "tls_no_verify_certificate"); - CHECK_TYPE ("tls_no_verify_certificate", VIR_CONF_LONG); - tls_no_verify_certificate = p ? p->l : tls_no_verify_certificate; - - p = virConfGetValue (conf, "tls_no_verify_address"); - CHECK_TYPE ("tls_no_verify_address", VIR_CONF_LONG); - tls_no_verify_address = p ? p->l : tls_no_verify_address; - - p = virConfGetValue (conf, "key_file"); - CHECK_TYPE ("key_file", VIR_CONF_STRING); - key_file = p ? strdup (p->str) : key_file; - - p = virConfGetValue (conf, "cert_file"); - CHECK_TYPE ("cert_file", VIR_CONF_STRING); - cert_file = p ? strdup (p->str) : cert_file; - - p = virConfGetValue (conf, "ca_file"); - CHECK_TYPE ("ca_file", VIR_CONF_STRING); - ca_file = p ? strdup (p->str) : ca_file; - - p = virConfGetValue (conf, "crl_file"); - CHECK_TYPE ("crl_file", VIR_CONF_STRING); - crl_file = p ? strdup (p->str) : crl_file; - - p = virConfGetValue (conf, "tls_allowed_dn_list"); - if (p) { - switch (p->type) { - case VIR_CONF_STRING: - tls_allowed_dn_list = malloc (2 * sizeof (char *)); - tls_allowed_dn_list[0] = strdup (p->str); - tls_allowed_dn_list[1] = 0; - break; + GET_CONF_INT (p, filename, conf, tls_no_verify_certificate); + GET_CONF_INT (p, filename, conf, tls_no_verify_address); + + GET_CONF_STR (p, filename, conf, key_file); + GET_CONF_STR (p, filename, conf, cert_file); + GET_CONF_STR (p, filename, conf, ca_file); + GET_CONF_STR (p, filename, conf, crl_file); + +#define GET_CONF_STR_LIST(List_var) \ + do { \ + p = virConfGetValue (conf, #List_var); \ + if (p) { \ + switch (p->type) { \ + case VIR_CONF_STRING: \ + if (!((List_var) = malloc (2 * sizeof (char *)))) \ + goto free_and_fail; \ + if (!((List_var)[0] = strdup (p->str))) \ + goto free_and_fail; \ + (List_var)[1] = NULL; \ + break; \ + \ + case VIR_CONF_LIST: { \ + int i, len = 0; \ + virConfValuePtr pp; \ + for (pp = p->list; pp; pp = p->next) \ + len++; \ + if (!((List_var) = malloc ((1+len) * sizeof (char *)))) \ + goto free_and_fail; \ + for (i = 0, pp = p->list; pp; ++i, pp = p->next) { \ + if (pp->type != VIR_CONF_STRING) { \ + qemudLog (QEMUD_ERR, "remoteReadConfigFile: %s: %s: " \ + "must be a string or list of strings\n", \ + filename, #List_var); \ + goto free_and_fail; \ + } \ + if (!((List_var)[i] = strdup (pp->str))) \ + goto free_and_fail; \ + } \ + (List_var)[i] = NULL; \ + break; \ + } \ + \ + default: \ + qemudLog (QEMUD_ERR, "remoteReadConfigFile: %s: %s: " \ + "must be a string or list of strings\n", \ + filename, #List_var); \ + goto free_and_fail; \ + } \ + } \ + } while (0) + + GET_CONF_STR_LIST (tls_allowed_dn_list); + GET_CONF_STR_LIST (tls_allowed_ip_list); - case VIR_CONF_LIST: { - int i, len = 0; - virConfValuePtr pp; - for (pp = p->list; pp; pp = p->next) - len++; - tls_allowed_dn_list = - malloc ((1+len) * sizeof (char *)); - for (i = 0, pp = p->list; pp; ++i, pp = p->next) { - if (pp->type != VIR_CONF_STRING) { - qemudLog (QEMUD_ERR, "remoteReadConfigFile: %s: tls_allowed_dn_list: should be a string or list of strings\n", filename); - return -1; - } - tls_allowed_dn_list[i] = strdup (pp->str); - } - tls_allowed_dn_list[i] = 0; - break; - } + virConfFree (conf); + return 0; - default: - qemudLog (QEMUD_ERR, "remoteReadConfigFile: %s: tls_allowed_dn_list: should be a string or list of strings\n", filename); - return -1; - } - } + diagnose_alloc_failure_and_fail: + qemudLog (QEMUD_ERR, "remoteReadConfigFile: %s\n", strerror (errno)); - p = virConfGetValue (conf, "tls_allowed_ip_list"); - if (p) { - switch (p->type) { - case VIR_CONF_STRING: - tls_allowed_ip_list = malloc (2 * sizeof (char *)); - tls_allowed_ip_list[0] = strdup (p->str); - tls_allowed_ip_list[1] = 0; - break; + free_and_fail: + free (mdns_name); + mdns_name = NULL; - case VIR_CONF_LIST: { - int i, len = 0; - virConfValuePtr pp; - for (pp = p->list; pp; pp = p->next) - len++; - tls_allowed_ip_list = - malloc ((1+len) * sizeof (char *)); - for (i = 0, pp = p->list; pp; ++i, pp = p->next) { - if (pp->type != VIR_CONF_STRING) { - qemudLog (QEMUD_ERR, "remoteReadConfigFile: %s: tls_allowed_ip_list: should be a string or list of strings\n", filename); - return -1; - } - tls_allowed_ip_list[i] = strdup (pp->str); - } - tls_allowed_ip_list[i] = 0; - break; - } + /* Don't bother trying to free tcp_port, tls_port, key_file, cert_file, + ca_file, or crl_file, since they are initialized to non-malloc'd + strings. Besides, these are static variables, and callers are + unlikely to call this function more than once, so there wouldn't + even be a real leak. */ - default: - qemudLog (QEMUD_ERR, "remoteReadConfigFile: %s: tls_allowed_ip_list: should be a string or list of strings\n", filename); - return -1; - } + if (tls_allowed_ip_list) { + char *t; + for (t = *tls_allowed_ip_list; t; t++) + free (t); + tls_allowed_ip_list = NULL; } - virConfFree (conf); - return 0; + if (tls_allowed_dn_list) { + char *t; + for (t = *tls_allowed_dn_list; t; t++) + free (t); + tls_allowed_dn_list = NULL; + } + + return -1; } /* Print command-line usage. */ -- 1.5.3.6.961.gecf4

3 8

[Libvir] gnulib, take2: incremental
by Jim Meyering 05 Dec '07

05 Dec '07

Here is the first of two patches. For now, neither includes all of the new files. That one's coming up shortly. First the incremental one, to show you what's changed since last time: (so you would apply this on top of the patch from last night) I'll post the combined, (i.e., full, trunk-relative) one separately. Adapt to change directory names: Now we use these: gnulib/lib gnulib/m4 tests/gnulib * Makefile.am (SUBDIRS): Change dir names. * autogen.sh: Add -I gnulib/m4. * bootstrap: Don't exclude snprintf after all. Define cleanup function. * configure.in: adjust dir/Makefile names. * qemud/Makefile.am: Adjust -I and .a paths. * src/Makefile.am: Likewise. * tests/Makefile.am: Likewise. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- Makefile.am | 6 +++--- autogen.sh | 2 +- bootstrap | 34 ++++++++++++++++++++++++++-------- configure.in | 2 +- qemud/Makefile.am | 4 ++-- src/Makefile.am | 6 +++--- tests/Makefile.am | 4 ++-- 7 files changed, 38 insertions(+), 20 deletions(-) diff --git a/Makefile.am b/Makefile.am index fcf0eb6..1f2ca52 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,9 +1,9 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = lib src qemud proxy include docs @PYTHON_SUBDIR@ \ - gl-tests tests po scripts +SUBDIRS = gnulib/lib src qemud proxy include docs @PYTHON_SUBDIR@ \ + tests/gnulib tests po scripts -ACLOCAL_AMFLAGS = -I m4 +ACLOCAL_AMFLAGS = -I m4 -I gnulib/m4 EXTRA_DIST = libvirt.spec.in libvirt.spec COPYING.LIB \ libvirt.pc.in libvirt.pc TODO AUTHORS ChangeLog \ diff --git a/autogen.sh b/autogen.sh index 97b636d..3bcffd3 100755 --- a/autogen.sh +++ b/autogen.sh @@ -57,7 +57,7 @@ fi autopoint --force #rm -rf m4 libtoolize --copy --force -aclocal -I m4 +aclocal -I m4 -I gnulib/m4 autoheader automake --add-missing autoconf diff --git a/bootstrap b/bootstrap index b49378d..ca186bd 100755 --- a/bootstrap +++ b/bootstrap @@ -40,6 +40,12 @@ do esac done +cleanup_gnulib() { + st=$? + rm -fr .gnulib + exit $st +} + case ${GNULIB_SRCDIR--} in -) if [ ! -d gnulib ]; then @@ -47,22 +53,23 @@ case ${GNULIB_SRCDIR--} in trap cleanup_gnulib 1 2 13 15 - git clone --depth 1 git://git.sv.gnu.org/gnulib || + git clone --depth 1 git://git.sv.gnu.org/gnulib .gnulib || cleanup_gnulib trap - 1 2 13 15 fi - GNULIB_SRCDIR=gnulib + GNULIB_SRCDIR=.gnulib esac gnulib_tool=$GNULIB_SRCDIR/gnulib-tool <$gnulib_tool || exit # Tell gnulib to: -# put tests in new gl-tests/ dir -# put m4/*.m4 files in existing m4/ dir -# lib/*.[ch] files in new lib/ dir. -# With --avoid=snprintf, we pull in about 30 fewer files +# put tests in new tests/gnulib/ dir +# put *.m4 files in new gnulib/m4/ dir +# put *.[ch] files in new gnulib/lib/ dir. +# With --avoid=snprintf, we drop support for systems (many!) with +# losing snprintf but pull in about 30 fewer files # With the current gnulib and gettext-0.17, the following # files are added to m4/ by both. But gnulib is stable enough # and gettext-0.16.1 is new enough that they are identical. @@ -82,9 +89,20 @@ gnulib_tool=$GNULIB_SRCDIR/gnulib-tool # --avoid=snprintf-tests # --avoid=vasnprintf-tests +avoid='--avoid=snprintf' + +avoid=' + --avoid=snprintf-tests + --avoid=vasnprintf-tests +' + $gnulib_tool \ --lgpl \ - --avoid=snprintf \ + $avoid \ + --avoid=snprintf-tests \ + --avoid=vasnprintf-tests \ --with-tests \ - --tests-base=gl-tests \ + --m4-base=gnulib/m4 \ + --source-base=gnulib/lib \ + --tests-base=tests/gnulib \ --import physmem getaddrinfo diff --git a/configure.in b/configure.in index 18a533f..2ab8411 100644 --- a/configure.in +++ b/configure.in @@ -566,7 +566,7 @@ cp COPYING.LIB COPYING AC_OUTPUT(Makefile src/Makefile include/Makefile docs/Makefile \ docs/examples/Makefile docs/devhelp/Makefile \ docs/examples/python/Makefile \ - lib/Makefile gl-tests/Makefile \ + gnulib/lib/Makefile tests/gnulib/Makefile \ libvirt.pc libvirt.spec \ po/Makefile.in scripts/Makefile \ include/libvirt/Makefile include/libvirt/libvirt.h \ diff --git a/qemud/Makefile.am b/qemud/Makefile.am index 267b43e..7e3b694 100644 --- a/qemud/Makefile.am +++ b/qemud/Makefile.am @@ -27,7 +27,7 @@ libvirtd_SOURCES = \ #-D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED=1 -D_POSIX_C_SOURCE=199506L libvirtd_CFLAGS = \ - -I$(top_srcdir)/lib -I../lib \ + -I$(top_srcdir)/gnulib/lib -I../gnulib/lib \ -I$(top_srcdir)/include -I$(top_builddir)/include \ $(LIBXML_CFLAGS) $(GNUTLS_CFLAGS) \ $(WARN_CFLAGS) -DLOCAL_STATE_DIR="\"$(localstatedir)\"" \ @@ -38,7 +38,7 @@ libvirtd_CFLAGS = \ libvirtd_LDFLAGS = $(WARN_CFLAGS) $(LIBXML_LIBS) $(GNUTLS_LIBS) libvirtd_DEPENDENCIES = ../src/libvirt.la -libvirtd_LDADD = ../src/libvirt.la ../lib/libgnu.la +libvirtd_LDADD = ../src/libvirt.la ../gnulib/lib/libgnu.la if HAVE_AVAHI libvirtd_SOURCES += mdns.c mdns.h diff --git a/src/Makefile.am b/src/Makefile.am index efea233..f9a2308 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in INCLUDES = \ - -I$(top_srcdir)/lib -I../lib \ + -I$(top_srcdir)/gnulib/lib -I../gnulib/lib \ -I../include \ -I@top_srcdir@/include \ -I@top_srcdir@/qemud \ @@ -16,7 +16,7 @@ INCLUDES = \ $(WARN_CFLAGS) \ $(LIBVIRT_FEATURES) DEPS = libvirt.la -LDADDS = @STATIC_BINARIES@ $(WARN_CFLAGS) libvirt.la ../lib/libgnu.la +LDADDS = @STATIC_BINARIES@ $(WARN_CFLAGS) libvirt.la ../gnulib/lib/libgnu.la VIRSH_LIBS = @VIRSH_LIBS@ confdir = $(sysconfdir)/libvirt/ @@ -62,7 +62,7 @@ SERVER_SOURCES = \ libvirt_la_SOURCES = $(CLIENT_SOURCES) $(SERVER_SOURCES) libvirt_la_LIBADD = $(LIBXML_LIBS) $(GNUTLS_LIBS) $(LTLIBOBJS) \ - @CYGWIN_EXTRA_LIBADD@ ../lib/libgnu.la + @CYGWIN_EXTRA_LIBADD@ ../gnulib/lib/libgnu.la libvirt_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libvirt_sym.version \ -version-info @LIBVIRT_VERSION_INFO@ \ $(COVERAGE_CFLAGS:-f%=-Wc,-f%) \ diff --git a/tests/Makefile.am b/tests/Makefile.am index 4de0c45..8220e1b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -11,7 +11,7 @@ SUBDIRS = virshdata confdata sexpr2xmldata xml2sexprdata xmconfigdata xencapsdat LIBVIRT = $(wildcard $(top_builddir)/src/.libs/libvirt_la-*.o) INCLUDES = \ - -I$(top_srcdir)/lib -I../lib \ + -I$(top_srcdir)/gnulib/lib -I../gnulib/lib \ -I$(top_builddir)/include \ -I$(top_builddir)/src \ -I$(top_srcdir)/include \ @@ -30,7 +30,7 @@ LDADDS = \ $(GNUTLS_LIBS) \ $(WARN_CFLAGS) \ $(LIBVIRT) \ - ../lib/libgnu.la \ + ../gnulib/lib/libgnu.la \ $(COVERAGE_LDFLAGS) EXTRA_DIST = \ -- 1.5.3.6.950.g92b7b

1 0

[Libvir] using gnulib: starting with the physmem and getaddrinfo modules
by Jim Meyering 05 Dec '07

05 Dec '07

Recently, I heard of two tricky portability problems in libvirt that are easy to solve with gnulib. Of course, gnulib provides a lot more, and is not exactly lightweight if you count "lines of code imported", but once the framework (this patch) is installed, adding an additional module is as easy as adding the module name to a list. Keep in mind that what matters with a portability library is that it stay out of your way -- and of course do its job well. To that end, gnulib has many per-module unit tests. Since a large part of its job is portability, and insulating your code from bugs (be they bugs in the very latest glibc printf functions, or in the regexp library, or just protection against that crufty old SunOS4 free function that can't deal with NULL), it provides a mechanism to let you conveniently include its self tests in your own package and run them when users run "make check" for your project. This is pretty important, so that if someone builds your package on an unusual or poorly-configured system, often the gnulib tests will fail right away, and that will save you the trouble of digging through your own package's code. For those of you who don't know, gnulib is the GNU Portability Library. http://www.gnu.org/software/gnulib/ and it is used in many widely-used packages: http://git.sv.gnu.org/gitweb/?p=gnulib.git;a=blob;f=users.txt;hb=HEAD Of course, there's no guarantee that the code is bug-free, but in practice, the few bugs being fixed these days involve portability to relatively unusual systems. With so many widely-used packages using gnulib, you can imagine that if there are bugs, they will be encountered, reported, and fixed pretty quickly. One of the biggest advantages of using gnulib is that you can add new modules and get all the benefits with *no* additional tweaking. I.e., you don't have to write .m4 macros, modify configure.ac or any Makefile.am. It just works. If something doesn't, or if the documentation is unclear, you can report it to bug-gnulib(a)gnu.org and usually get a fix or an explanation pretty quickly. ---------- Enough of the hype. The first portability problem was to determine the total physical memory available on the current system. Currently the code works only on Linux-like systems that have /proc/meminfo of an expected form. However, the gnulib physmem module handles 13 distinct types of systems and is well tested: http://www.gnu.org/software/gnulib/MODULES.html#module=physmem The second portability problem was to find a robust and LGPL-compatible getaddrinfo function to be used on systems lacking it. Here's the gnulib module: http://www.gnu.org/software/gnulib/MODULES.html#module=getaddrinfo Once the few gnulib hooks are in your configure.ac and Makefile.am files, there is very little extra work required to use the new functions. In the case of physmem, just use the function and include "physmem.h". For getaddrinfo, merely include "getaddrinfo.h" from the two files that use the function. This change brings in a lot of code, but many of the lib/.[ch] files are used only on systems that lack some required functionality. For example, the getaddrinfo.c file isn't even compiled when it's not needed. In the patch below, I've included a new script called bootstrap. It is a wrapper around gnulib-tool that pulls into libvirt the files selected by the (currently two) modules in use. Those new files go in three places: m4/*.m4 lib/*.[ch] and a few template .h.in files gl-tests/ for unit test C programs and Bourne shell scripts However, note that gettextize and libtoolize (run by autogen.sh) also deposit many *.m4 files in m4. I compared and found that 8 of the files that are already pulled in by the *ize programs are also pulled in (potentially newer versions) from gnulib. But currently, using gettext-0.16.1 or gettext-0.17, there is no difference in any of the overlapping files. Re Licenses: the two modules (and all of their dependent modules) are LGPL-compatible. This is enforced by running gnulib-tool with the --lgpl option. If you were to request a module with an incompatible license (say GPL or LGPLv3), it would fail. ---------------------- Here's the patch that shows what existing parts of libvirt have to be modified to use these two new modules. To try it out, just apply the patch and then run this: ./autogen.sh && ./bootstrap && make && make check Running bootstrap creates the new lib/ and gl-tests/ directories. Personally, I prefer not to add generated files to version control systems, because it can lead to problems with version skew if all developers don't use the same releases of the tools that do the generating. Perhaps more importantly, when there are massive diffs in the generated files, that can obscure real changes in non-generated parts of the code. That already happens to me whenever the .po files change. But if people prefer to add all of these imported files to CVS, just say the word and I'll prepare the patch. If so, do you guys want the gettextize- and libtoolize-added files to be version-controlled, now, too? Use gnulib, starting with physmem and getaddrinfo modules. * bootstrap: A wrapper around gnulib-tool. * configure.in: Invoke gl_EARLY and gl_INIT, being careful to put gl_EARLY before any macro that uses AC_COMPILE_IFELSE. (AC_OUTPUT): Add lib/Makefile and gl-tests/Makefile. Remove m4/Makefile. * Makefile.am (SUBDIRS): Add lib and gl-tests. Remove m4. * m4/Makefile.am: Remove file. Not needed. * src/Makefile.am (INCLUDES): Add -I$(top_srcdir)/lib -I../lib. (LDADDS, libvirt_la_LIBADD): Add ../lib/libgnu.la. * src/nodeinfo.c: Include "physmem.h". * qemud/qemud.c, src/remote_internal.c: Include "getaddrinfo.h". (MEMINFO_PATH, linuxNodeInfoMemPopulate): Remove definitions. (virNodeInfoPopulate): Use physmem_total, not linuxNodeInfoMemPopulate. * tests/Makefile.am (INCLUDES): Add -I$(top_srcdir)/lib -I../lib. (LDADDS): Add ../lib/libgnu.la. * qemud/Makefile.am (libvirtd_LDADD): Add ../lib/libgnu.la. * tests/nodeinfotest.c (linuxTestCompareFiles): No longer read total memory from a file. Update expected output not to include "Memory: NNNN" * tests/nodeinfodata/linux-nodeinfo-1.txt: * tests/nodeinfodata/linux-nodeinfo-2.txt: * tests/nodeinfodata/linux-nodeinfo-3.txt: * tests/nodeinfodata/linux-nodeinfo-4.txt: * tests/nodeinfodata/linux-nodeinfo-5.txt: * tests/nodeinfodata/linux-nodeinfo-6.txt: * src/test.c [WITH_TEST]: Remove definition of _GNU_SOURCE that would conflict with the one now in "config.h". Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- Makefile.am | 3 +- bootstrap | 90 +++++++++++++++++++++++++++++++ configure.in | 11 +++- m4/Makefile.am | 3 - qemud/Makefile.am | 3 +- qemud/qemud.c | 1 + src/Makefile.am | 8 ++- src/nodeinfo.c | 55 +++---------------- src/remote_internal.c | 1 + src/test.c | 2 - tests/Makefile.am | 2 + tests/nodeinfodata/linux-nodeinfo-1.txt | 2 +- tests/nodeinfodata/linux-nodeinfo-2.txt | 2 +- tests/nodeinfodata/linux-nodeinfo-3.txt | 2 +- tests/nodeinfodata/linux-nodeinfo-4.txt | 2 +- tests/nodeinfodata/linux-nodeinfo-5.txt | 2 +- tests/nodeinfodata/linux-nodeinfo-6.txt | 2 +- tests/nodeinfotest.c | 23 ++------ 18 files changed, 131 insertions(+), 83 deletions(-) create mode 100755 bootstrap delete mode 100644 m4/Makefile.am diff --git a/Makefile.am b/Makefile.am index eaa204e..fcf0eb6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,7 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = src qemud proxy include docs @PYTHON_SUBDIR@ tests po m4 scripts +SUBDIRS = lib src qemud proxy include docs @PYTHON_SUBDIR@ \ + gl-tests tests po scripts ACLOCAL_AMFLAGS = -I m4 diff --git a/bootstrap b/bootstrap new file mode 100755 index 0000000..b49378d --- /dev/null +++ b/bootstrap @@ -0,0 +1,90 @@ +#!/bin/sh +# Run this after autogen.sh, to pull in all of the gnulib-related bits. +# It's important to run *after* autogen.sh, since it updates some of +# the same files autogen.sh does, yet those from gnulib are newer, +# and match the tests. So if a gnulib bug has been fixed since the +# snapshot taken for whatever gettext release you're using, yet you +# run "make check" against the wrong version, the corresponding unit +# test in gl-tests/ may well fail. + +usage() { + echo >&2 "\ +Usage: $0 [OPTION]... +Bootstrap this package from the checked-out sources. + +Options: + --gnulib-srcdir=DIRNAME Specify the local directory where gnulib + sources reside. Use this if you already + have gnulib sources on your machine, and + do not want to waste your bandwidth downloading + them again. + +If the file bootstrap.conf exists in the current working directory, its +contents are read as shell variables to configure the bootstrap. + +Running without arguments will suffice in most cases. +" +} + +for option +do + case $option in + --help) + usage + exit;; + --gnulib-srcdir=*) + GNULIB_SRCDIR=`expr "$option" : '--gnulib-srcdir=$.*$'`;; + *) + echo >&2 "$0: $option: unknown option" + exit 1;; + esac +done + +case ${GNULIB_SRCDIR--} in +-) + if [ ! -d gnulib ]; then + echo "$0: getting gnulib files..." + + trap cleanup_gnulib 1 2 13 15 + + git clone --depth 1 git://git.sv.gnu.org/gnulib || + cleanup_gnulib + + trap - 1 2 13 15 + fi + GNULIB_SRCDIR=gnulib +esac + +gnulib_tool=$GNULIB_SRCDIR/gnulib-tool +<$gnulib_tool || exit + +# Tell gnulib to: +# put tests in new gl-tests/ dir +# put m4/*.m4 files in existing m4/ dir +# lib/*.[ch] files in new lib/ dir. +# With --avoid=snprintf, we pull in about 30 fewer files +# With the current gnulib and gettext-0.17, the following +# files are added to m4/ by both. But gnulib is stable enough +# and gettext-0.16.1 is new enough that they are identical. +# compiler-flags.m4 +# inttypes_h.m4 +# longlong.m4 +# size_max.m4 +# stdint_h.m4 +# wchar_t.m4 +# wint_t.m4 +# xsize.m4 + +# Note that if we don't exclude the snprintf module, there are two tests +# that have incompatible licenses, so we would have to exclude them. Even +# excluding those two test modules, find reports a total of 94 added files. +# Yes, snprintf has some heavy-duty dependents. +# --avoid=snprintf-tests +# --avoid=vasnprintf-tests + +$gnulib_tool \ + --lgpl \ + --avoid=snprintf \ + --with-tests \ + --tests-base=gl-tests \ + --import physmem getaddrinfo diff --git a/configure.in b/configure.in index a845720..18a533f 100644 --- a/configure.in +++ b/configure.in @@ -28,11 +28,15 @@ AVAHI_REQUIRED="0.6.0" dnl Checks for C compiler. AC_PROG_CC -AM_PROG_CC_STDC -AC_C_CONST AC_PROG_INSTALL AC_PROG_CPP +gl_EARLY +gl_INIT + +AM_PROG_CC_STDC +AC_C_CONST + dnl Make sure we have an ANSI compiler AM_C_PROTOTYPES test "x$U" != "x" && AC_MSG_ERROR(Compiler not ANSI compliant) @@ -562,11 +566,12 @@ cp COPYING.LIB COPYING AC_OUTPUT(Makefile src/Makefile include/Makefile docs/Makefile \ docs/examples/Makefile docs/devhelp/Makefile \ docs/examples/python/Makefile \ + lib/Makefile gl-tests/Makefile \ libvirt.pc libvirt.spec \ po/Makefile.in scripts/Makefile \ include/libvirt/Makefile include/libvirt/libvirt.h \ python/Makefile python/tests/Makefile \ - qemud/Makefile m4/Makefile \ + qemud/Makefile \ tests/Makefile proxy/Makefile \ tests/xml2sexprdata/Makefile \ tests/sexpr2xmldata/Makefile \ diff --git a/m4/Makefile.am b/m4/Makefile.am deleted file mode 100644 index 188b2fe..0000000 --- a/m4/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ - -EXTRA_DIST = compiler-flags.m4 - diff --git a/qemud/Makefile.am b/qemud/Makefile.am index 1737176..267b43e 100644 --- a/qemud/Makefile.am +++ b/qemud/Makefile.am @@ -27,6 +27,7 @@ libvirtd_SOURCES = \ #-D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED=1 -D_POSIX_C_SOURCE=199506L libvirtd_CFLAGS = \ + -I$(top_srcdir)/lib -I../lib \ -I$(top_srcdir)/include -I$(top_builddir)/include \ $(LIBXML_CFLAGS) $(GNUTLS_CFLAGS) \ $(WARN_CFLAGS) -DLOCAL_STATE_DIR="\"$(localstatedir)\"" \ @@ -37,7 +38,7 @@ libvirtd_CFLAGS = \ libvirtd_LDFLAGS = $(WARN_CFLAGS) $(LIBXML_LIBS) $(GNUTLS_LIBS) libvirtd_DEPENDENCIES = ../src/libvirt.la -libvirtd_LDADD = ../src/libvirt.la +libvirtd_LDADD = ../src/libvirt.la ../lib/libgnu.la if HAVE_AVAHI libvirtd_SOURCES += mdns.c mdns.h diff --git a/qemud/qemud.c b/qemud/qemud.c index f88ed42..caccd29 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -53,6 +53,7 @@ #include <libvirt/virterror.h> #include "internal.h" +#include "getaddrinfo.h" #include "../src/internal.h" #include "../src/remote_internal.h" #include "../src/conf.h" diff --git a/src/Makefile.am b/src/Makefile.am index 52ffbaf..efea233 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,8 @@ ## Process this file with automake to produce Makefile.in -INCLUDES = -I$(top_builddir)/include \ +INCLUDES = \ + -I$(top_srcdir)/lib -I../lib \ + -I../include \ -I@top_srcdir@/include \ -I@top_srcdir@/qemud \ $(LIBXML_CFLAGS) \ @@ -14,7 +16,7 @@ INCLUDES = -I$(top_builddir)/include \ $(WARN_CFLAGS) \ $(LIBVIRT_FEATURES) DEPS = libvirt.la -LDADDS = @STATIC_BINARIES@ $(WARN_CFLAGS) libvirt.la +LDADDS = @STATIC_BINARIES@ $(WARN_CFLAGS) libvirt.la ../lib/libgnu.la VIRSH_LIBS = @VIRSH_LIBS@ confdir = $(sysconfdir)/libvirt/ @@ -60,7 +62,7 @@ SERVER_SOURCES = \ libvirt_la_SOURCES = $(CLIENT_SOURCES) $(SERVER_SOURCES) libvirt_la_LIBADD = $(LIBXML_LIBS) $(GNUTLS_LIBS) $(LTLIBOBJS) \ - @CYGWIN_EXTRA_LIBADD@ + @CYGWIN_EXTRA_LIBADD@ ../lib/libgnu.la libvirt_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libvirt_sym.version \ -version-info @LIBVIRT_VERSION_INFO@ \ $(COVERAGE_CFLAGS:-f%=-Wc,-f%) \ diff --git a/src/nodeinfo.c b/src/nodeinfo.c index a0a26eb..2ef49cb 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -29,14 +29,14 @@ #include <ctype.h> #include "nodeinfo.h" +#include "physmem.h" #ifdef __linux__ -#define MEMINFO_PATH "/proc/meminfo" #define CPUINFO_PATH "/proc/cpuinfo" /* NB, these are not static as we need to call them from testsuite */ -int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, virNodeInfoPtr nodeinfo); -int linuxNodeInfoMemPopulate(virConnectPtr conn, FILE *meminfo, virNodeInfoPtr nodeinfo); +int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, + virNodeInfoPtr nodeinfo); int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, virNodeInfoPtr nodeinfo) { char line[1024]; @@ -114,44 +114,11 @@ int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, virNodeInfoPtr n return 0; } - -int linuxNodeInfoMemPopulate(virConnectPtr conn, FILE *meminfo, - virNodeInfoPtr nodeinfo) { - char line[1024]; - - nodeinfo->memory = 0; - - while (fgets(line, sizeof(line), meminfo) != NULL) { - if (STREQLEN(line, "MemTotal:", 9)) { - char *p; - unsigned int ui; - if (xstrtol_ui(line + 10, &p, 10, &ui) == 0 - && (*p == '\0' || isspace(*p))) { - nodeinfo->memory = ui; - break; - } - } - } - if (!nodeinfo->memory) { - __virRaiseError(conn, NULL, NULL, 0, VIR_ERR_INTERNAL_ERROR, - VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, - "no memory found"); - return -1; - } - - return 0; -} - - #endif int virNodeInfoPopulate(virConnectPtr conn, virNodeInfoPtr nodeinfo) { struct utsname info; -#ifdef __linux__ - int ret; - FILE *cpuinfo, *meminfo; -#endif if (uname(&info) < 0) { __virRaiseError(conn, NULL, NULL, 0, VIR_ERR_INTERNAL_ERROR, @@ -164,7 +131,9 @@ int virNodeInfoPopulate(virConnectPtr conn, nodeinfo->model[sizeof(nodeinfo->model)-1] = '\0'; #ifdef __linux__ - cpuinfo = fopen(CPUINFO_PATH, "r"); + { + int ret; + FILE *cpuinfo = fopen(CPUINFO_PATH, "r"); if (!cpuinfo) { __virRaiseError(conn, NULL, NULL, 0, VIR_ERR_INTERNAL_ERROR, VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, @@ -176,17 +145,11 @@ int virNodeInfoPopulate(virConnectPtr conn, if (ret < 0) return -1; - meminfo = fopen(MEMINFO_PATH, "r"); - if (!meminfo) { - __virRaiseError(conn, NULL, NULL, 0, VIR_ERR_INTERNAL_ERROR, - VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, - "cannot open %s %s", MEMINFO_PATH, strerror(errno)); - return -1; - } - ret = linuxNodeInfoMemPopulate(conn, meminfo, nodeinfo); - fclose(meminfo); + /* Convert to KB. */ + nodeinfo->memory = physmem_total () / 1024; return ret; + } #else /* XXX Solaris will need an impl later if they port QEMU driver */ __virRaiseError(conn, NULL, NULL, 0, VIR_ERR_INTERNAL_ERROR, diff --git a/src/remote_internal.c b/src/remote_internal.c index a8227f3..275405a 100644 --- a/src/remote_internal.c +++ b/src/remote_internal.c @@ -52,6 +52,7 @@ #include "internal.h" #include "driver.h" +#include "getaddrinfo.h" #include "remote_internal.h" #include "remote_protocol.h" diff --git a/src/test.c b/src/test.c index 010ea15..bab280f 100644 --- a/src/test.c +++ b/src/test.c @@ -25,8 +25,6 @@ #ifdef WITH_TEST -#define _GNU_SOURCE /* for asprintf */ - #include <stdio.h> #include <string.h> #include <sys/time.h> diff --git a/tests/Makefile.am b/tests/Makefile.am index 512162b..4de0c45 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -11,6 +11,7 @@ SUBDIRS = virshdata confdata sexpr2xmldata xml2sexprdata xmconfigdata xencapsdat LIBVIRT = $(wildcard $(top_builddir)/src/.libs/libvirt_la-*.o) INCLUDES = \ + -I$(top_srcdir)/lib -I../lib \ -I$(top_builddir)/include \ -I$(top_builddir)/src \ -I$(top_srcdir)/include \ @@ -29,6 +30,7 @@ LDADDS = \ $(GNUTLS_LIBS) \ $(WARN_CFLAGS) \ $(LIBVIRT) \ + ../lib/libgnu.la \ $(COVERAGE_LDFLAGS) EXTRA_DIST = \ diff --git a/tests/nodeinfodata/linux-nodeinfo-1.txt b/tests/nodeinfodata/linux-nodeinfo-1.txt index 1a38ad1..e52e20a 100644 --- a/tests/nodeinfodata/linux-nodeinfo-1.txt +++ b/tests/nodeinfodata/linux-nodeinfo-1.txt @@ -1 +1 @@ -CPUs: 2, MHz: 2800, Nodes: 1, Sockets: 1, Cores: 2, Threads: 1, Memory: 2053960 +CPUs: 2, MHz: 2800, Nodes: 1, Sockets: 1, Cores: 2, Threads: 1 diff --git a/tests/nodeinfodata/linux-nodeinfo-2.txt b/tests/nodeinfodata/linux-nodeinfo-2.txt index 1c31a0c..12e819b 100644 --- a/tests/nodeinfodata/linux-nodeinfo-2.txt +++ b/tests/nodeinfodata/linux-nodeinfo-2.txt @@ -1 +1 @@ -CPUs: 2, MHz: 2211, Nodes: 1, Sockets: 1, Cores: 2, Threads: 1, Memory: 4059540 +CPUs: 2, MHz: 2211, Nodes: 1, Sockets: 1, Cores: 2, Threads: 1 diff --git a/tests/nodeinfodata/linux-nodeinfo-3.txt b/tests/nodeinfodata/linux-nodeinfo-3.txt index e2cc841..d285781 100644 --- a/tests/nodeinfodata/linux-nodeinfo-3.txt +++ b/tests/nodeinfodata/linux-nodeinfo-3.txt @@ -1 +1 @@ -CPUs: 4, MHz: 1595, Nodes: 1, Sockets: 2, Cores: 2, Threads: 1, Memory: 4059272 +CPUs: 4, MHz: 1595, Nodes: 1, Sockets: 2, Cores: 2, Threads: 1 diff --git a/tests/nodeinfodata/linux-nodeinfo-4.txt b/tests/nodeinfodata/linux-nodeinfo-4.txt index 2c75ea3..991d4f9 100644 --- a/tests/nodeinfodata/linux-nodeinfo-4.txt +++ b/tests/nodeinfodata/linux-nodeinfo-4.txt @@ -1 +1 @@ -CPUs: 4, MHz: 1000, Nodes: 1, Sockets: 1, Cores: 4, Threads: 1, Memory: 4059272 +CPUs: 4, MHz: 1000, Nodes: 1, Sockets: 1, Cores: 4, Threads: 1 diff --git a/tests/nodeinfodata/linux-nodeinfo-5.txt b/tests/nodeinfodata/linux-nodeinfo-5.txt index 01fee52..dce7ada 100644 --- a/tests/nodeinfodata/linux-nodeinfo-5.txt +++ b/tests/nodeinfodata/linux-nodeinfo-5.txt @@ -1 +1 @@ -CPUs: 4, MHz: 2814, Nodes: 1, Sockets: 2, Cores: 2, Threads: 1, Memory: 4059272 +CPUs: 4, MHz: 2814, Nodes: 1, Sockets: 2, Cores: 2, Threads: 1 diff --git a/tests/nodeinfodata/linux-nodeinfo-6.txt b/tests/nodeinfodata/linux-nodeinfo-6.txt index a7a2cfe..75cdaa9 100644 --- a/tests/nodeinfodata/linux-nodeinfo-6.txt +++ b/tests/nodeinfodata/linux-nodeinfo-6.txt @@ -1 +1 @@ -CPUs: 4, MHz: 1000, Nodes: 1, Sockets: 2, Cores: 2, Threads: 1, Memory: 4059272 +CPUs: 4, MHz: 1000, Nodes: 1, Sockets: 2, Cores: 2, Threads: 1 diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c index 7275cc3..fb563b5 100644 --- a/tests/nodeinfotest.c +++ b/tests/nodeinfotest.c @@ -21,14 +21,13 @@ static char *abs_top_srcdir; #ifdef __linux__ extern int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, virNodeInfoPtr nodeinfo); -extern int linuxNodeInfoMemPopulate(virConnectPtr conn, FILE *meminfo, virNodeInfoPtr nodeinfo); -static int linuxTestCompareFiles(const char *cpuinfofile, const char *meminfofile, const char *outputfile) { +static int linuxTestCompareFiles(const char *cpuinfofile, const char *outputfile) { char actualData[MAX_FILE]; char expectData[MAX_FILE]; char *expect = &expectData[0]; virNodeInfo nodeinfo; - FILE *cpuinfo, *meminfo; + FILE *cpuinfo; if (virtTestLoadFile(outputfile, &expect, MAX_FILE) < 0) return -1; @@ -42,19 +41,10 @@ static int linuxTestCompareFiles(const char *cpuinfofile, const char *meminfofil } fclose(cpuinfo); - meminfo = fopen(meminfofile, "r"); - if (!meminfo) - return -1; - if (linuxNodeInfoMemPopulate(NULL, meminfo, &nodeinfo) < 0) { - fclose(meminfo); - return -1; - } - fclose(meminfo); - snprintf(actualData, MAX_FILE, - "CPUs: %u, MHz: %u, Nodes: %u, Sockets: %u, Cores: %u, Threads: %u, Memory: %lu\n", + "CPUs: %u, MHz: %u, Nodes: %u, Sockets: %u, Cores: %u, Threads: %u\n", nodeinfo.cpus, nodeinfo.mhz, nodeinfo.nodes, nodeinfo.sockets, - nodeinfo.cores, nodeinfo.threads, nodeinfo.memory); + nodeinfo.cores, nodeinfo.threads); if (STRNEQ(actualData, expectData)) { if (getenv("DEBUG_TESTS")) { @@ -70,15 +60,12 @@ static int linuxTestCompareFiles(const char *cpuinfofile, const char *meminfofil static int linuxTestNodeInfo(const void *data) { char cpuinfo[PATH_MAX]; - char meminfo[PATH_MAX]; char output[PATH_MAX]; snprintf(cpuinfo, PATH_MAX, "%s/tests/nodeinfodata/linux-%s.cpuinfo", abs_top_srcdir, (const char*)data); - snprintf(meminfo, PATH_MAX, "%s/tests/nodeinfodata/linux-%s.meminfo", - abs_top_srcdir, (const char*)data); snprintf(output, PATH_MAX, "%s/tests/nodeinfodata/linux-%s.txt", abs_top_srcdir, (const char*)data); - return linuxTestCompareFiles(cpuinfo, meminfo, output); + return linuxTestCompareFiles(cpuinfo, output); } #endif -- 1.5.3.6.950.g92b7b

4 11

[Libvir] [PATCH] Miscellaneous fixes to #includes
by Richard W.M. Jones 05 Dec '07

05 Dec '07

(1) #include <libvirt/*.h> ---> #include "libvirt/*.h" (2) src/internal.h has become a dumping ground for all sorts of includes. Removed the ones which are not actually used in this file (ie. almost all of them) and moved them down into the two files which actually needed them. (3) Remove <ansidecl.h>, which is apparently some legacy thing. (4) Add a comment that __func__ is from the C99 standard. (5) xen_unified.c was defining a symbol called 'VERSION' which clashed with the one from "config.h", so change it to HV_VERSION. (6) <limits.h> / <sys/syslimits.h> / backup plan if neither exists -- is done in src/internal.h, so remove explicit includes from other files. Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

2 1

[Libvir] Port forwarding
by Richard W.M. Jones 05 Dec '07

05 Dec '07

What do people think about adding port forwarding to network configurations? At the moment it's unnecessarily difficult to connect to (eg.) sshd port or remote desktop port on a virtual machine running under the virtual network configuration. If those ports could be mapped to consecutive ports on the public (eth0) interface then connecting would be simply a matter of knowing the port number. AFAICS this could be implemented by adding rules such as these to the iptables: iptables -t nat -A PREROUTING -i $EXTIF -p tcp --dport 80 \ -j DNAT --to-destination 192.168.122.5 iptables -A FORWARD -i $EXTIF -p tcp --dport 80 -j ACCEPT iptables -t nat -A PREROUTING -i $INTIF -p tcp -d $EXTIP --dport 80 \ -j DNAT --to-destination 192.168.122.5 iptables -A FORWARD -i $INTIF -p tcp -d $EXTIP --dport 80 -j ACCEPT (rules taken from http://www.ma.utexas.edu/users/stirling/computergeek/server.html) Rich. PS. I'm assuming that this is _not_ what the current /network/forward XML does? It seems to enable forwarding for a single privileged guest as far as I can work out. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

3 3

[Libvir] [PATCH] Remove curses, don't require readline
by Richard W.M. Jones 04 Dec '07

04 Dec '07

This patch removes checking for curses/ncurses. It is never used. It also allows libvirt to be compiled without readline support. If readline support is not available then the only difference is that 'virsh' will be built without it -- in other words, command line editing will not work in virsh. Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

4 3

[Libvir] [PATCH] No rpcgen at all
by Richard W.M. Jones 04 Dec '07

04 Dec '07

If there is no 'rpcgen' program at all then ./configure fails. It should not, because rpcgen is not necessary to build libvirt. Patch fixes. Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

2 1

[Libvir] PATCH: strip auto-generated VIF names from XML
by Daniel P. Berrange 04 Dec '07

04 Dec '07

For the QEMU / KVM driver, if the user doesn't specify an explicit name for the TAP device associated with a virtual NIC, we auto-generate one with a name vnetXXX. You can see this if you dump XML for a running QEMU guest. Unfortunately if you dump XML, make a change and then feed it back in with the define XML API, you have now persisted this auto-generated VIF name. Do this for several domains at varying times and you'll eventually get 2 domains which have persisted the same auto-generated vnetXXX device name. You can now not start both of these VMs at once. The fix for this is simple - simply strip any TAP device name starting with the string 'vnet' when defining a new VM. It will thus get assigned a new automatically generate name which doesn't clash. The patch also strips out hardcoded vnetXXX names when starting a VM to proactively deal with any existing VMs whose config has been broken in this way. Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

3 4

[Libvir] [PATCH] Avoid compile failure when HAVE_AVAHI is not defined.
by Jim Meyering 03 Dec '07

03 Dec '07

Without this patch, building without HAVE_AVAHI fails due to an unguarded use of mdns_name. Rather than adding yet another #ifdef..#endif (ugly and less maintainable), I've chosen to un-ifdef the declarations and a few uses. The more code that we compile and use unconditionally, the fewer surprises we'll encounter down the road. Mon Dec 3 14:24:20 CET 2007 Jim Meyering <meyering(a)redhat.com> Avoid compile failure when HAVE_AVAHI is not defined. * qemud/qemud.c (remoteReadConfigFile): Remove some of the "#ifdef HAVE_AVAHI" guards around uses of mdns_name and mdns_adv. diff --git a/qemud/qemud.c b/qemud/qemud.c index 9904e4a..f88ed42 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -77,10 +77,8 @@ static gid_t unix_sock_gid = 0; /* Only root by default */ static int unix_sock_rw_mask = 0700; /* Allow user only */ static int unix_sock_ro_mask = 0777; /* Allow world */ -#ifdef HAVE_AVAHI static int mdns_adv = 1; static char *mdns_name = NULL; -#endif static int tls_no_verify_certificate = 0; static int tls_no_verify_address = 0; @@ -1696,10 +1694,8 @@ remoteReadConfigFile (const char *filename) unix_sock_rw_perms = NULL; } -#ifdef HAVE_AVAHI GET_CONF_INT (conf, filename, mdns_adv); GET_CONF_STR (conf, filename, mdns_name); -#endif GET_CONF_INT (conf, filename, tls_no_verify_certificate); GET_CONF_INT (conf, filename, tls_no_verify_address); -- 1.5.3.7.949.g2221a6

4 7

[Libvir] PATCH: Pull generic I/O apis out of QEMU driver
by Daniel P. Berrange 03 Dec '07

03 Dec '07

The QEMU driver has a number of handy APIs which I want to use from the storage driver: - Read entire file in one go - Check filename suffix - Compare filename against name + suffix - Check link destination - Construct a filename from dir, name + suffix - Recursively make a directory This patch pulls all these methods out of the QEMU driver, gives them a sensible name and adds them to the util.h file. No functional change, this is a straight refactoring. qemu_conf.c | 256 ++++------------------------------------------------------ qemu_conf.h | 1 qemu_driver.c | 6 - util.c | 223 ++++++++++++++++++++++++++++++++++++++++++++++++++ util.h | 29 ++++++ 5 files changed, 275 insertions(+), 240 deletions(-) diff -r 41c9eb891349 src/qemu_conf.c --- a/src/qemu_conf.c Sun Dec 02 13:30:44 2007 -0500 +++ b/src/qemu_conf.c Sun Dec 02 13:40:44 2007 -0500 @@ -48,6 +48,7 @@ #include "uuid.h" #include "buf.h" #include "conf.h" +#include "util.h" #define qemudLog(level, msg...) fprintf(stderr, msg) @@ -227,55 +228,6 @@ void qemudFreeVM(struct qemud_vm *vm) { free(vm); } -/* Build up a fully qualfiied path for a config file to be - * associated with a persistent guest or network */ -static int -qemudMakeConfigPath(const char *configDir, - const char *name, - const char *ext, - char *buf, - unsigned int buflen) { - if ((strlen(configDir) + 1 + strlen(name) + (ext ? strlen(ext) : 0) + 1) > buflen) - return -1; - - strcpy(buf, configDir); - strcat(buf, "/"); - strcat(buf, name); - if (ext) - strcat(buf, ext); - return 0; -} - -int -qemudEnsureDir(const char *path) -{ - struct stat st; - char parent[PATH_MAX]; - char *p; - int err; - - if (stat(path, &st) >= 0) - return 0; - - strncpy(parent, path, PATH_MAX); - parent[PATH_MAX - 1] = '\0'; - - if (!(p = strrchr(parent, '/'))) - return EINVAL; - - if (p == parent) - return EPERM; - - *p = '\0'; - - if ((err = qemudEnsureDir(parent))) - return err; - - if (mkdir(path, 0777) < 0 && errno != EEXIST) - return errno; - - return 0; -} /* The list of possible machine types for various architectures, as supported by QEMU - taken from 'qemu -M ?' for each arch */ @@ -2075,22 +2027,22 @@ qemudSaveVMDef(virConnectPtr conn, if (vm->configFile[0] == '\0') { int err; - if ((err = qemudEnsureDir(driver->configDir))) { + if ((err = virFileMakePath(driver->configDir))) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "cannot create config directory %s: %s", driver->configDir, strerror(err)); return -1; } - if (qemudMakeConfigPath(driver->configDir, def->name, ".xml", - vm->configFile, PATH_MAX) < 0) { + if (virFileBuildPath(driver->configDir, def->name, ".xml", + vm->configFile, PATH_MAX) < 0) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "cannot construct config file path"); return -1; } - if (qemudMakeConfigPath(driver->autostartDir, def->name, ".xml", - vm->autostartLink, PATH_MAX) < 0) { + if (virFileBuildPath(driver->autostartDir, def->name, ".xml", + vm->autostartLink, PATH_MAX) < 0) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "cannot construct autostart link path"); vm->configFile[0] = '\0'; @@ -2114,7 +2066,7 @@ static int qemudSaveNetworkConfig(virCon return -1; } - if ((err = qemudEnsureDir(driver->networkConfigDir))) { + if ((err = virFileMakePath(driver->networkConfigDir))) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "cannot create config directory %s: %s", driver->networkConfigDir, strerror(err)); @@ -2521,22 +2473,22 @@ qemudSaveNetworkDef(virConnectPtr conn, if (network->configFile[0] == '\0') { int err; - if ((err = qemudEnsureDir(driver->networkConfigDir))) { + if ((err = virFileMakePath(driver->networkConfigDir))) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "cannot create config directory %s: %s", driver->networkConfigDir, strerror(err)); return -1; } - if (qemudMakeConfigPath(driver->networkConfigDir, def->name, ".xml", - network->configFile, PATH_MAX) < 0) { + if (virFileBuildPath(driver->networkConfigDir, def->name, ".xml", + network->configFile, PATH_MAX) < 0) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "cannot construct config file path"); return -1; } - if (qemudMakeConfigPath(driver->networkAutostartDir, def->name, ".xml", - network->autostartLink, PATH_MAX) < 0) { + if (virFileBuildPath(driver->networkAutostartDir, def->name, ".xml", + network->autostartLink, PATH_MAX) < 0) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "cannot construct autostart link path"); network->configFile[0] = '\0'; @@ -2547,174 +2499,6 @@ qemudSaveNetworkDef(virConnectPtr conn, return qemudSaveNetworkConfig(conn, driver, network, def); } -static int -qemudReadFile(const char *path, - char *buf, - int maxlen) { - FILE *fh; - struct stat st; - int ret = 0; - - if (!(fh = fopen(path, "r"))) { - qemudLog(QEMUD_WARN, "Failed to open file '%s': %s", - path, strerror(errno)); - goto error; - } - - if (fstat(fileno(fh), &st) < 0) { - qemudLog(QEMUD_WARN, "Failed to stat file '%s': %s", - path, strerror(errno)); - goto error; - } - - if (S_ISDIR(st.st_mode)) { - qemudDebug("Ignoring directory '%s' - clearly not a config file", path); - goto error; - } - - if (st.st_size >= maxlen) { - qemudLog(QEMUD_WARN, "File '%s' is too large", path); - goto error; - } - - if ((ret = fread(buf, st.st_size, 1, fh)) != 1) { - qemudLog(QEMUD_WARN, "Failed to read config file '%s': %s", - path, strerror(errno)); - goto error; - } - - buf[st.st_size] = '\0'; - - ret = 1; - - error: - if (fh) - fclose(fh); - - return ret; -} - -static int -compareFileToNameSuffix(const char *file, - const char *name, - const char *suffix) { - int filelen = strlen(file); - int namelen = strlen(name); - int suffixlen = strlen(suffix); - - if (filelen == (namelen + suffixlen) && - !strncmp(file, name, namelen) && - !strncmp(file + namelen, suffix, suffixlen)) - return 1; - else - return 0; -} - -static int -hasSuffix(const char *str, - const char *suffix) -{ - int len = strlen(str); - int suffixlen = strlen(suffix); - - if (len < suffixlen) - return 0; - - return strcmp(str + len - suffixlen, suffix) == 0; -} - -static int -checkLinkPointsTo(const char *checkLink, - const char *checkDest) -{ - char dest[PATH_MAX]; - char real[PATH_MAX]; - char checkReal[PATH_MAX]; - int n; - int passed = 0; - - /* read the link destination */ - if ((n = readlink(checkLink, dest, PATH_MAX)) < 0) { - switch (errno) { - case ENOENT: - case ENOTDIR: - break; - - case EINVAL: - qemudLog(QEMUD_WARN, "Autostart file '%s' is not a symlink", - checkLink); - break; - - default: - qemudLog(QEMUD_WARN, "Failed to read autostart symlink '%s': %s", - checkLink, strerror(errno)); - break; - } - - goto failed; - } else if (n >= PATH_MAX) { - qemudLog(QEMUD_WARN, "Symlink '%s' contents too long to fit in buffer", - checkLink); - goto failed; - } - - dest[n] = '\0'; - - /* make absolute */ - if (dest[0] != '/') { - char dir[PATH_MAX]; - char tmp[PATH_MAX]; - char *p; - - strncpy(dir, checkLink, PATH_MAX); - dir[PATH_MAX-1] = '\0'; - - if (!(p = strrchr(dir, '/'))) { - qemudLog(QEMUD_WARN, "Symlink path '%s' is not absolute", checkLink); - goto failed; - } - - if (p == dir) /* handle unlikely root dir case */ - p++; - - *p = '\0'; - - if (qemudMakeConfigPath(dir, dest, NULL, tmp, PATH_MAX) < 0) { - qemudLog(QEMUD_WARN, "Path '%s/%s' is too long", dir, dest); - goto failed; - } - - strncpy(dest, tmp, PATH_MAX); - dest[PATH_MAX-1] = '\0'; - } - - /* canonicalize both paths */ - if (!realpath(dest, real)) { - qemudLog(QEMUD_WARN, "Failed to expand path '%s' :%s", - dest, strerror(errno)); - strncpy(real, dest, PATH_MAX); - real[PATH_MAX-1] = '\0'; - } - - if (!realpath(checkDest, checkReal)) { - qemudLog(QEMUD_WARN, "Failed to expand path '%s' :%s", - checkDest, strerror(errno)); - strncpy(checkReal, checkDest, PATH_MAX); - checkReal[PATH_MAX-1] = '\0'; - } - - /* compare */ - if (strcmp(checkReal, real) != 0) { - qemudLog(QEMUD_WARN, "Autostart link '%s' is not a symlink to '%s', ignoring", - checkLink, checkReal); - goto failed; - } - - passed = 1; - - failed: - return passed; -} static struct qemud_vm * qemudLoadConfig(struct qemud_driver *driver, @@ -2732,7 +2516,7 @@ qemudLoadConfig(struct qemud_driver *dri return NULL; } - if (!compareFileToNameSuffix(file, def->name, ".xml")) { + if (!virFileMatchesNameSuffix(file, def->name, ".xml")) { qemudLog(QEMUD_WARN, "QEMU guest config filename '%s' does not match guest name '%s'", path, def->name); qemudFreeVMDef(def); @@ -2751,7 +2535,7 @@ qemudLoadConfig(struct qemud_driver *dri strncpy(vm->autostartLink, autostartLink, PATH_MAX); vm->autostartLink[PATH_MAX-1] = '\0'; - vm->autostart = checkLinkPointsTo(vm->autostartLink, vm->configFile); + vm->autostart = virFileLinkPointsTo(vm->autostartLink, vm->configFile); return vm; } @@ -2772,7 +2556,7 @@ qemudLoadNetworkConfig(struct qemud_driv return NULL; } - if (!compareFileToNameSuffix(file, def->name, ".xml")) { + if (!virFileMatchesNameSuffix(file, def->name, ".xml")) { qemudLog(QEMUD_WARN, "Network config filename '%s' does not match network name '%s'", path, def->name); qemudFreeNetworkDef(def); @@ -2791,7 +2575,7 @@ qemudLoadNetworkConfig(struct qemud_driv strncpy(network->autostartLink, autostartLink, PATH_MAX); network->autostartLink[PATH_MAX-1] = '\0'; - network->autostart = checkLinkPointsTo(network->autostartLink, network->configFile); + network->autostart = virFileLinkPointsTo(network->autostartLink, network->configFile); return network; } @@ -2820,22 +2604,22 @@ int qemudScanConfigDir(struct qemud_driv if (entry->d_name[0] == '.') continue; - if (!hasSuffix(entry->d_name, ".xml")) + if (!virFileHasSuffix(entry->d_name, ".xml")) continue; - if (qemudMakeConfigPath(configDir, entry->d_name, NULL, path, PATH_MAX) < 0) { + if (virFileBuildPath(configDir, entry->d_name, NULL, path, PATH_MAX) < 0) { qemudLog(QEMUD_WARN, "Config filename '%s/%s' is too long", configDir, entry->d_name); continue; } - if (qemudMakeConfigPath(autostartDir, entry->d_name, NULL, autostartLink, PATH_MAX) < 0) { + if (virFileBuildPath(autostartDir, entry->d_name, NULL, autostartLink, PATH_MAX) < 0) { qemudLog(QEMUD_WARN, "Autostart link path '%s/%s' is too long", autostartDir, entry->d_name); continue; } - if (!qemudReadFile(path, xml, QEMUD_MAX_XML_LEN)) + if (virFileReadAll(path, xml, QEMUD_MAX_XML_LEN) < 0) continue; if (isGuest) diff -r 41c9eb891349 src/qemu_conf.h --- a/src/qemu_conf.h Sun Dec 02 13:30:44 2007 -0500 +++ b/src/qemu_conf.h Sun Dec 02 13:40:44 2007 -0500 @@ -362,7 +362,6 @@ int qemudDeleteConfig struct qemud_driver *driver, const char *configFile, const char *name); -int qemudEnsureDir (const char *path); void qemudFreeVMDef (struct qemud_vm_def *vm); void qemudFreeVM (struct qemud_vm *vm); diff -r 41c9eb891349 src/qemu_driver.c --- a/src/qemu_driver.c Sun Dec 02 13:30:44 2007 -0500 +++ b/src/qemu_driver.c Sun Dec 02 13:40:44 2007 -0500 @@ -632,7 +632,7 @@ static int qemudStartVMDaemon(virConnect strcat(logfile, vm->def->name); strcat(logfile, ".log"); - if (qemudEnsureDir(driver->logDir) < 0) { + if (virFileMakePath(driver->logDir) < 0) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "cannot create log directory %s: %s", driver->logDir, strerror(errno)); @@ -2458,7 +2458,7 @@ static int qemudDomainSetAutostart(virDo if (autostart) { int err; - if ((err = qemudEnsureDir(driver->autostartDir))) { + if ((err = virFileMakePath(driver->autostartDir))) { qemudReportError(dom->conn, dom, NULL, VIR_ERR_INTERNAL_ERROR, "cannot create autostart directory %s: %s", driver->autostartDir, strerror(err)); @@ -2806,7 +2806,7 @@ static int qemudNetworkSetAutostart(virN if (autostart) { int err; - if ((err = qemudEnsureDir(driver->networkAutostartDir))) { + if ((err = virFileMakePath(driver->networkAutostartDir))) { qemudReportError(net->conn, NULL, net, VIR_ERR_INTERNAL_ERROR, "cannot create autostart directory %s: %s", driver->networkAutostartDir, strerror(err)); diff -r 41c9eb891349 src/util.c --- a/src/util.c Sun Dec 02 13:30:44 2007 -0500 +++ b/src/util.c Sun Dec 02 13:40:44 2007 -0500 @@ -30,12 +30,16 @@ #include <fcntl.h> #include <paths.h> #include <errno.h> +#include <sys/types.h> +#include <sys/stat.h> #include <libvirt/virterror.h> #include "event.h" #include "buf.h" #include "util.h" #define MAX_ERROR_LEN 1024 + +#define virLog(msg...) fprintf(stderr, msg) static void ReportError(virConnectPtr conn, @@ -214,6 +218,7 @@ ssize_t safewrite(int fd, const void *bu size_t nwritten = 0; while (count > 0) { int r = write(fd, buf, count); + if (r < 0 && errno == EINTR) continue; if (r < 0) @@ -226,3 +231,221 @@ ssize_t safewrite(int fd, const void *bu } return nwritten; } + + +int virFileReadAll(const char *path, + char *buf, + unsigned int buflen) +{ + FILE *fh; + struct stat st; + int ret = -1; + + if (!(fh = fopen(path, "r"))) { + virLog("Failed to open file '%s': %s", + path, strerror(errno)); + goto error; + } + + if (fstat(fileno(fh), &st) < 0) { + virLog("Failed to stat file '%s': %s", + path, strerror(errno)); + goto error; + } + + if (S_ISDIR(st.st_mode)) { + virLog("Ignoring directory '%s'", path); + goto error; + } + + if (st.st_size >= (buflen-1)) { + virLog("File '%s' is too large", path); + goto error; + } + + if ((ret = fread(buf, st.st_size, 1, fh)) != 1) { + virLog("Failed to read config file '%s': %s", + path, strerror(errno)); + goto error; + } + + buf[st.st_size] = '\0'; + + ret = 0; + + error: + if (fh) + fclose(fh); + + return ret; +} + +int virFileMatchesNameSuffix(const char *file, + const char *name, + const char *suffix) +{ + int filelen = strlen(file); + int namelen = strlen(name); + int suffixlen = strlen(suffix); + + if (filelen == (namelen + suffixlen) && + !strncmp(file, name, namelen) && + !strncmp(file + namelen, suffix, suffixlen)) + return 1; + else + return 0; +} + +int virFileHasSuffix(const char *str, + const char *suffix) +{ + int len = strlen(str); + int suffixlen = strlen(suffix); + + if (len < suffixlen) + return 0; + + return strcmp(str + len - suffixlen, suffix) == 0; +} + + +int virFileLinkPointsTo(const char *checkLink, + const char *checkDest) +{ + char dest[PATH_MAX]; + char real[PATH_MAX]; + char checkReal[PATH_MAX]; + int n; + + /* read the link destination */ + if ((n = readlink(checkLink, dest, PATH_MAX)) < 0) { + switch (errno) { + case ENOENT: + case ENOTDIR: + return 0; + + case EINVAL: + virLog("File '%s' is not a symlink", + checkLink); + return 0; + + } + virLog("Failed to read symlink '%s': %s", + checkLink, strerror(errno)); + return 0; + } else if (n >= PATH_MAX) { + virLog("Symlink '%s' contents too long to fit in buffer", + checkLink); + return 0; + } + + dest[n] = '\0'; + + /* make absolute */ + if (dest[0] != '/') { + char dir[PATH_MAX]; + char tmp[PATH_MAX]; + char *p; + + strncpy(dir, checkLink, PATH_MAX); + dir[PATH_MAX-1] = '\0'; + + if (!(p = strrchr(dir, '/'))) { + virLog("Symlink path '%s' is not absolute", checkLink); + return 0; + } + + if (p == dir) /* handle unlikely root dir case */ + p++; + + *p = '\0'; + + if (virFileBuildPath(dir, dest, NULL, tmp, PATH_MAX) < 0) { + virLog("Path '%s/%s' is too long", dir, dest); + return 0; + } + + strncpy(dest, tmp, PATH_MAX); + dest[PATH_MAX-1] = '\0'; + } + + /* canonicalize both paths */ + if (!realpath(dest, real)) { + virLog("Failed to expand path '%s' :%s", dest, strerror(errno)); + strncpy(real, dest, PATH_MAX); + real[PATH_MAX-1] = '\0'; + } + + if (!realpath(checkDest, checkReal)) { + virLog("Failed to expand path '%s' :%s", checkDest, strerror(errno)); + strncpy(checkReal, checkDest, PATH_MAX); + checkReal[PATH_MAX-1] = '\0'; + } + + /* compare */ + if (strcmp(checkReal, real) != 0) { + virLog("Link '%s' does not point to '%s', ignoring", + checkLink, checkReal); + return 0; + } + + return 1; +} + +int virFileMakePath(const char *path) +{ + struct stat st; + char parent[PATH_MAX]; + char *p; + int err; + + if (stat(path, &st) >= 0) + return 0; + + strncpy(parent, path, PATH_MAX); + parent[PATH_MAX - 1] = '\0'; + + if (!(p = strrchr(parent, '/'))) + return EINVAL; + + if (p == parent) + return EPERM; + + *p = '\0'; + + if ((err = virFileMakePath(parent))) + return err; + + if (mkdir(path, 0777) < 0 && errno != EEXIST) + return errno; + + return 0; +} + +/* Build up a fully qualfiied path for a config file to be + * associated with a persistent guest or network */ +int virFileBuildPath(const char *dir, + const char *name, + const char *ext, + char *buf, + unsigned int buflen) +{ + if ((strlen(dir) + 1 + strlen(name) + (ext ? strlen(ext) : 0) + 1) >= (buflen-1)) + return -1; + + strcpy(buf, dir); + strcat(buf, "/"); + strcat(buf, name); + if (ext) + strcat(buf, ext); + return 0; +} + +/* + * Local variables: + * indent-tabs-mode: nil + * c-indent-level: 4 + * c-basic-offset: 4 + * tab-width: 4 + * End: + */ diff -r 41c9eb891349 src/util.h --- a/src/util.h Sun Dec 02 13:30:44 2007 -0500 +++ b/src/util.h Sun Dec 02 13:40:44 2007 -0500 @@ -21,8 +21,37 @@ * File created Jul 18, 2007 - Shuveb Hussain <shuveb(a)binarykarma.com> */ +#ifndef __VIR_UTIL_H__ +#define __VIR_UTIL_H__ + +#include "internal.h" + int virExec(virConnectPtr conn, char **argv, int *retpid, int infd, int *outfd, int *errfd); int virExecNonBlock(virConnectPtr conn, char **argv, int *retpid, int infd, int *outfd, int *errfd); int saferead(int fd, void *buf, size_t count); ssize_t safewrite(int fd, const void *buf, size_t count); + +int virFileReadAll(const char *path, + char *buf, + unsigned int buflen); + +int virFileMatchesNameSuffix(const char *file, + const char *name, + const char *suffix); + +int virFileHasSuffix(const char *str, + const char *suffix); + +int virFileLinkPointsTo(const char *checkLink, + const char *checkDest); +int virFileMakePath(const char *path); + +int virFileBuildPath(const char *dir, + const char *name, + const char *ext, + char *buf, + unsigned int buflen); + + +#endif /* __VIR_UTIL_H__ */ Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

3 3

[Libvir] testing libvirtd: don't hard-code $HOME/.libvirt/libvirt-sock
by Jim Meyering 03 Dec '07

03 Dec '07

I've written a test to exercise libvirtd a little. Unfortunately, if I'm already running libvirtd, that test fails and I can't do anything about it: $ ./libvirtd & ./libvirtd Failed to bind socket to '@/j/.libvirt/libvirt-sock': Address already in use [Exit 2] Any objection to providing an option to libvirtd that specifies that directory (also used to form server->logDir)? It feels like it should come from the config file, but I haven't looked at details yet.

2 2

[Libvir] Semantic of xenUnifiedType()
by Daniel Veillard 03 Dec '07

03 Dec '07

It does the following: static const char * xenUnifiedType (virConnectPtr conn) { GET_PRIVATE(conn); int i; const char *ret; for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i) if (priv->opened[i] && drivers[i]->type) { ret = drivers[i]->type (conn); if (ret) return ret; } return NULL; } as a result if running as an user virConnectGetType() returns "XenXM" because the XM file parser backend ended up being registered first. I think that's bogus and we should change the function to return "Xen" in any case and drop the virDrvGetType type from struct xenUnifiedDriver and all associated functions in the various back-ends. Opinion ? Daniel -- Red Hat Virtualization group http://redhat.com/virtualization/ Daniel Veillard | virtualization library http://libvirt.org/ veillard(a)redhat.com | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/

3 3

[Libvir] [PATCH 0/3] More misc patches to improve Windows support
by Richard W.M. Jones 30 Nov '07

30 Nov '07

There follows some miscellaneous patches to configure.in and the Makefile.am's to improve Windows support. I'll explain each in the follow-ups. Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

4 15

[Libvir] Create domU without any disks
by Tim Verhoeven 29 Nov '07

29 Nov '07

Hi, I'm working on RHEL5.1 (libvirt-0.2.3-9.el5). I would like to know if it is possible, using libvirt, to create a Xen PVM domU that has no disks? And if this is possible how to code this ( a simple example is ok). I can create a configfile for "xm create ..." that works (just use "disk = [ ]"). But I also need to do this koan (companion to cobbler) and it uses libvirt. Thanks, Tim -- Tim Verhoeven - tim.verhoeven.be(a)gmail.com - 0479 / 88 11 83 Hoping the problem magically goes away by ignoring it is the "microsoft approach to programming" and should never be allowed. (Linus Torvalds)

5 5

[Libvir] libvirt on Windows - now supports DLLs and Python
by Richard W.M. Jones 29 Nov '07

29 Nov '07

With the latest patch to libvirt, Windows now supports building the libvirt.dll/cygvirt.dll DLL and the Python bindings now work too. http://libvirt.org/windows.html ftp://libvirt.org/libvirt/win32 Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

1 0

Re: [Libvir] Building libvirt-0.3.3 on CentOS4
by Carl Jones 29 Nov '07

29 Nov '07

Richard W.M. Jones wrote: > Daniel P. Berrange wrote: >> On Wed, Nov 28, 2007 at 01:25:41PM +1300, Carl Jones wrote: >>> Hi, >>> >>> I'm trying to build libvirt-0.3.3 on a CentOS4 machine. But I'm >>> hitting this error while running 'make': >>> >>> ./configure --with-init-script=redhat --without-qemu --without-remote >>> --without-test --with-xen --without-openvz --without-avahi >>> [...] >>> make[2]: Entering directory `/usr/src/redhat/SOURCES/libvirt-0.3.3/src' >>> gcc -DHAVE_CONFIG_H -I. -I.. -I../include -I../include -I../qemud >>> -I/usr/include/libxml2 -DBINDIR=\""/usr/local/libexec"\" >>> -DSBINDIR=\""/usr/local/sbin"\" -DSYSCONF_DIR="\"/usr/local/etc\"" >>> -DLOCALEBASEDIR=\""/usr/local/share/locale"\" >>> -DLOCAL_STATE_DIR=\""/usr/local/var"\" -DGETTEXT_PACKAGE=\"libvirt\" >>> -Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wextra >>> -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return >>> -Wstrict-prototypes -Winline -Wredundant-decls -Wno-sign-compare >>> -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fasynchronous-unwind-tables >>> -DWITH_XEN -g -O2 -MT virsh-virsh.o -MD -MP -MF >>> .deps/virsh-virsh.Tpo -c -o virsh-virsh.o `test -f 'virsh.c' || echo >>> './'`virsh.c >>> virsh.c: In function `vshOutputLogFile': >>> virsh.c:4577: warning: implicit declaration of function `localtime' >>> virsh.c:4577: warning: nested extern declaration of `localtime' >>> virsh.c:4577: warning: assignment makes pointer from integer without >>> a cast >> >> Looks like its missing an '#include <time.h>' statement from virsh.c > > Carl, can you let us know if adding that include line fixes it for you? > If so I'll make the change in CVS. > > Rich. After adding that include, it compiles and works nicely. Thanks. Regards, Carl

2 1

[Libvir] Building libvirt-0.3.3 on CentOS4
by Carl Jones 28 Nov '07

28 Nov '07

Hi, I'm trying to build libvirt-0.3.3 on a CentOS4 machine. But I'm hitting this error while running 'make': ./configure --with-init-script=redhat --without-qemu --without-remote --without-test --with-xen --without-openvz --without-avahi [...] make[2]: Entering directory `/usr/src/redhat/SOURCES/libvirt-0.3.3/src' gcc -DHAVE_CONFIG_H -I. -I.. -I../include -I../include -I../qemud -I/usr/include/libxml2 -DBINDIR=\""/usr/local/libexec"\" -DSBINDIR=\""/usr/local/sbin"\" -DSYSCONF_DIR="\"/usr/local/etc\"" -DLOCALEBASEDIR=\""/usr/local/share/locale"\" -DLOCAL_STATE_DIR=\""/usr/local/var"\" -DGETTEXT_PACKAGE=\"libvirt\" -Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Winline -Wredundant-decls -Wno-sign-compare -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fasynchronous-unwind-tables -DWITH_XEN -g -O2 -MT virsh-virsh.o -MD -MP -MF .deps/virsh-virsh.Tpo -c -o virsh-virsh.o `test -f 'virsh.c' || echo './'`virsh.c virsh.c: In function `vshOutputLogFile': virsh.c:4577: warning: implicit declaration of function `localtime' virsh.c:4577: warning: nested extern declaration of `localtime' virsh.c:4577: warning: assignment makes pointer from integer without a cast virsh.c:4578: error: dereferencing pointer to incomplete type virsh.c:4578: error: dereferencing pointer to incomplete type virsh.c:4578: error: dereferencing pointer to incomplete type virsh.c:4578: error: dereferencing pointer to incomplete type virsh.c:4578: error: dereferencing pointer to incomplete type virsh.c:4578: error: dereferencing pointer to incomplete type make[2]: *** [virsh-virsh.o] Error 1 make[2]: Leaving directory `/usr/src/redhat/SOURCES/libvirt-0.3.3/src' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/usr/src/redhat/SOURCES/libvirt-0.3.3' make: *** [all] Error 2 I've tried building from CVS, but that fails also (different issue). Any ideas? I've grabbed the newer gnutls from CentOS5, and other dependencies are already installed. Regards, Carl

3 2

[Libvir] libvirt: serving to web interface (swarm idea!)
by Grabber 28 Nov '07

28 Nov '07

Yeah, I'm focused to develop a decente web interface to manage Xen using libvirt. I have some ideas for the interface, can anyone help me saying: this is cool, this doesn't work?! The main idea for migrate virtual machines is use the swarm concept (you can look it at: http://www.jasoncoleman.net/images/Azureus_Swarm.png) can this be usable? For more informations about the project see: http://code.google.com/p/xenonrails/ (I'm starting this today ;) ) -- Regards, Luiz Vitor Martinez Cardoso [Grabber]. (11) 8187-8662 Student of Eletrical Engineer at maua.br

2 2

[Libvir] [PATCH] BZ#251641: Allow to change the cpu pinning for inactive domain
by Saori Fukuta 28 Nov '07

28 Nov '07

Hi, I want to change the cpu pinning for inactive domain on RHEL-5.1. So, I just add the xenXMDomainPinVcpu to xm_internal.c. We will be allowed to change "cpus" parameter in configuration file with "vcpupin" command by this patch, like "setmem" or "setvcpus". There is 2 things to note: - This is an effective feature for inactive domain with Xen3.0.3 (less than 3 of xendConfigVersion). - On the above environment, the number which specified as <vcpu> is ignored, because the virtual CPUs is not present when domain is shut off. So, when executing "vcpupin" command with this option # virsh vcpupin Guest 0 1 "0"(vcpu) is ignored and "1"(cpulist) is set to configuration file as "cpus". # cat /etc/xen/Guest | grep cpus cpus = "1" Regards, Saori Fukuta

3 7

[Libvir] [PATCH] (vshCloseLogFile): Diagnose close/write failure.
by Jim Meyering 28 Nov '07

28 Nov '07

I noticed a minor problem in vshCloseLogFile. Although callers do check for log-file write failure, this function doesn't check for close failure (which can happen, and indicates a write failure). I considered changing the function to return an int and propagating that success/failure "up" to callers, but that change is more invasive, and I'm not sure it's desirable. If any of you prefer it, let me know and I'll rewrite accordingly: Also slightly ugly: ctl->logfile may be null, so if/when it is (however unlikely), the diagnostic prints "?" as the file name rather than trying to dereference a NULL pointer. * src/virsh.c (vshCloseLogFile): Diagnose close/write failure. --- src/virsh.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/virsh.c b/src/virsh.c index 5b50524..86f5b8b 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -4643,7 +4643,9 @@ vshCloseLogFile(vshControl *ctl) { /* log file close */ if (ctl->log_fd >= 0) { - close(ctl->log_fd); + if (close(ctl->log_fd) < 0) + vshError(ctl, FALSE, _("%s: failed to write log file: %s") + ctl->logfile ? ctl->logfile : "?", strerror (errno)); ctl->log_fd = -1; } -- 1.5.3.6.961.gecf4

2 1

[Libvir] Web page for libvirt on Windows
by Richard W.M. Jones 27 Nov '07

27 Nov '07

Just a note to say that there is a web page tracking the status of libvirt, virt-manager, etc. on Windows. http://libvirt.org/windows.html Not a lot there at the moment! Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

1 0

[Libvir] [PATCH] When reporting errors, use "conn" whenever possible.
by Jim Meyering 27 Nov '07

27 Nov '07

Here's a first cut at cleaning up. There are more ab/uses in other files, but nowhere near as many as in this one, so I'm starting here: When reporting errors, use "conn" whenever possible. * src/remote_internal.c: change all error (NULL, ... to error (conn, ... (check_cert_file): Add+use parameter, conn. Adjust callers. (initialise_gnutls): The "conn" parameter *is* used, so remove ATTRIBUTE_UNUSED. Suggested by Richard Jones. --- src/remote_internal.c | 90 ++++++++++++++++++++++++------------------------ 1 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/remote_internal.c b/src/remote_internal.c index c365ff8..40c12c7 100644 --- a/src/remote_internal.c +++ b/src/remote_internal.c @@ -280,7 +280,7 @@ doRemoteOpen (virConnectPtr conn, struct private_data *priv, else if (strcasecmp (transport_str, "tcp") == 0) transport = trans_tcp; else { - error (NULL, VIR_ERR_INVALID_ARG, + error (conn, VIR_ERR_INVALID_ARG, "remote_open: transport in URL not recognised " "(should be tls|unix|ssh|ext|tcp)"); return VIR_DRV_OPEN_ERROR; @@ -308,7 +308,7 @@ doRemoteOpen (virConnectPtr conn, struct private_data *priv, server = strdup (uri->server ? uri->server : "localhost"); if (!server) { out_of_memory: - error (NULL, VIR_ERR_NO_MEMORY, "duplicating server name"); + error (conn, VIR_ERR_NO_MEMORY, "duplicating server name"); goto failed; } if (uri->port != 0) { @@ -394,7 +394,7 @@ doRemoteOpen (virConnectPtr conn, struct private_data *priv, /* For ext transport, command is required. */ if (transport == trans_ext && !command) { - error (NULL, VIR_ERR_INVALID_ARG, "remote_open: for 'ext' transport, command is required"); + error (conn, VIR_ERR_INVALID_ARG, "remote_open: for 'ext' transport, command is required"); goto failed; } @@ -438,7 +438,7 @@ doRemoteOpen (virConnectPtr conn, struct private_data *priv, hints.ai_flags = AI_ADDRCONFIG; int e = getaddrinfo (server, port, &hints, &res); if (e != 0) { - error (NULL, VIR_ERR_INVALID_ARG, gai_strerror (e)); + error (conn, VIR_ERR_INVALID_ARG, gai_strerror (e)); goto failed; } @@ -458,7 +458,7 @@ doRemoteOpen (virConnectPtr conn, struct private_data *priv, priv->sock = socket (r->ai_family, SOCK_STREAM, 0); if (priv->sock == -1) { - error (NULL, VIR_ERR_SYSTEM_ERROR, strerror (errno)); + error (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno)); continue; } @@ -468,7 +468,7 @@ doRemoteOpen (virConnectPtr conn, struct private_data *priv, sizeof no_slow_start); if (connect (priv->sock, r->ai_addr, r->ai_addrlen) == -1) { - error (NULL, VIR_ERR_SYSTEM_ERROR, strerror (errno)); + error (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno)); close (priv->sock); continue; } @@ -504,12 +504,12 @@ doRemoteOpen (virConnectPtr conn, struct private_data *priv, uid_t uid = getuid(); if (!(pw = getpwuid(uid))) { - error (NULL, VIR_ERR_SYSTEM_ERROR, strerror (errno)); + error (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno)); goto failed; } if (asprintf (&sockname, "@%s" LIBVIRTD_USER_UNIX_SOCKET, pw->pw_dir) < 0) { - error (NULL, VIR_ERR_SYSTEM_ERROR, strerror (errno)); + error (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno)); goto failed; } } else { @@ -518,7 +518,7 @@ doRemoteOpen (virConnectPtr conn, struct private_data *priv, else sockname = strdup (LIBVIRTD_PRIV_UNIX_SOCKET); if (sockname == NULL) { - error (NULL, VIR_ERR_SYSTEM_ERROR, strerror (errno)); + error (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno)); goto failed; } } @@ -539,7 +539,7 @@ doRemoteOpen (virConnectPtr conn, struct private_data *priv, autostart_retry: priv->sock = socket (AF_UNIX, SOCK_STREAM, 0); if (priv->sock == -1) { - error (NULL, VIR_ERR_SYSTEM_ERROR, strerror (errno)); + error (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno)); goto failed; } if (connect (priv->sock, (struct sockaddr *) &addr, sizeof addr) == -1) { @@ -561,7 +561,7 @@ doRemoteOpen (virConnectPtr conn, struct private_data *priv, goto autostart_retry; } } - error (NULL, VIR_ERR_SYSTEM_ERROR, strerror (errno)); + error (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno)); goto failed; } @@ -576,7 +576,7 @@ doRemoteOpen (virConnectPtr conn, struct private_data *priv, command = command ? : strdup ("ssh"); if (command == NULL) { - error (NULL, VIR_ERR_SYSTEM_ERROR, strerror (errno)); + error (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno)); goto failed; } @@ -584,7 +584,7 @@ doRemoteOpen (virConnectPtr conn, struct private_data *priv, // ssh -p $port [-l $username] $hostname $netcat -U $sockname [NULL] cmd_argv = malloc (nr_args * sizeof (char *)); if (cmd_argv == NULL) { - error (NULL, VIR_ERR_SYSTEM_ERROR, strerror (errno)); + error (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno)); goto failed; } @@ -611,7 +611,7 @@ doRemoteOpen (virConnectPtr conn, struct private_data *priv, assert (j == nr_args); for (j = 0; j < nr_args; j++) if (cmd_argv[j] == NULL) { - error (NULL, VIR_ERR_SYSTEM_ERROR, strerror (ENOMEM)); + error (conn, VIR_ERR_SYSTEM_ERROR, strerror (ENOMEM)); goto failed; } } @@ -626,13 +626,13 @@ doRemoteOpen (virConnectPtr conn, struct private_data *priv, * to faff around with two file descriptors (a la 'pipe(2)'). */ if (socketpair (PF_UNIX, SOCK_STREAM, 0, sv) == -1) { - error (NULL, VIR_ERR_SYSTEM_ERROR, strerror (errno)); + error (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno)); goto failed; } pid = fork (); if (pid == -1) { - error (NULL, VIR_ERR_SYSTEM_ERROR, strerror (errno)); + error (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno)); goto failed; } else if (pid == 0) { /* Child. */ close (sv[0]); @@ -647,7 +647,7 @@ doRemoteOpen (virConnectPtr conn, struct private_data *priv, if (!cmd_argv) { cmd_argv = malloc (2 * sizeof (char *)); if (cmd_argv == NULL) { - error (NULL, VIR_ERR_SYSTEM_ERROR, strerror (errno)); + error (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno)); goto failed; } cmd_argv[0] = command; @@ -724,7 +724,7 @@ remoteOpen (virConnectPtr conn, xmlURIPtr uri, int flags) priv = malloc (sizeof(struct private_data)); if (!priv) { - error (NULL, VIR_ERR_NO_MEMORY, "struct private_data"); + error (conn, VIR_ERR_NO_MEMORY, "struct private_data"); return VIR_DRV_OPEN_ERROR; } @@ -947,11 +947,11 @@ static gnutls_certificate_credentials_t x509_cred; static int -check_cert_file (const char *type, const char *file) +check_cert_file (virConnectPtr conn, const char *type, const char *file) { struct stat sb; if (stat(file, &sb) < 0) { - __virRaiseError (NULL, NULL, NULL, VIR_FROM_REMOTE, VIR_ERR_RPC, + __virRaiseError (conn, NULL, NULL, VIR_FROM_REMOTE, VIR_ERR_RPC, VIR_ERR_ERROR, LIBVIRT_CACERT, NULL, NULL, 0, 0, "Cannot access %s '%s': %s (%d)", type, file, strerror(errno), errno); @@ -962,7 +962,7 @@ check_cert_file (const char *type, const char *file) static int -initialise_gnutls (virConnectPtr conn ATTRIBUTE_UNUSED) +initialise_gnutls (virConnectPtr conn) { static int initialised = 0; int err; @@ -974,16 +974,16 @@ initialise_gnutls (virConnectPtr conn ATTRIBUTE_UNUSED) /* X509 stuff */ err = gnutls_certificate_allocate_credentials (&x509_cred); if (err) { - error (NULL, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (err)); + error (conn, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (err)); return -1; } - if (check_cert_file("CA certificate", LIBVIRT_CACERT) < 0) + if (check_cert_file(conn, "CA certificate", LIBVIRT_CACERT) < 0) return -1; - if (check_cert_file("client key", LIBVIRT_CLIENTKEY) < 0) + if (check_cert_file(conn, "client key", LIBVIRT_CLIENTKEY) < 0) return -1; - if (check_cert_file("client certificate", LIBVIRT_CLIENTCERT) < 0) + if (check_cert_file(conn, "client certificate", LIBVIRT_CLIENTCERT) < 0) return -1; /* Set the trusted CA cert. */ @@ -994,7 +994,7 @@ initialise_gnutls (virConnectPtr conn ATTRIBUTE_UNUSED) gnutls_certificate_set_x509_trust_file (x509_cred, LIBVIRT_CACERT, GNUTLS_X509_FMT_PEM); if (err < 0) { - error (NULL, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (err)); + error (conn, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (err)); return -1; } @@ -1009,7 +1009,7 @@ initialise_gnutls (virConnectPtr conn ATTRIBUTE_UNUSED) LIBVIRT_CLIENTKEY, GNUTLS_X509_FMT_PEM); if (err < 0) { - error (NULL, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (err)); + error (conn, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (err)); return -1; } @@ -1035,21 +1035,21 @@ negotiate_gnutls_on_connection (virConnectPtr conn, */ err = gnutls_init (&session, GNUTLS_CLIENT); if (err) { - error (NULL, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (err)); + error (conn, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (err)); return NULL; } /* Use default priorities */ err = gnutls_set_default_priority (session); if (err) { - error (NULL, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (err)); + error (conn, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (err)); return NULL; } err = gnutls_certificate_type_set_priority (session, cert_type_priority); if (err) { - error (NULL, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (err)); + error (conn, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (err)); return NULL; } @@ -1057,7 +1057,7 @@ negotiate_gnutls_on_connection (virConnectPtr conn, */ err = gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, x509_cred); if (err) { - error (NULL, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (err)); + error (conn, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (err)); return NULL; } @@ -1070,7 +1070,7 @@ negotiate_gnutls_on_connection (virConnectPtr conn, if (err < 0) { if (err == GNUTLS_E_AGAIN || err == GNUTLS_E_INTERRUPTED) goto again; - error (NULL, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (err)); + error (conn, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (err)); return NULL; } @@ -1091,11 +1091,11 @@ negotiate_gnutls_on_connection (virConnectPtr conn, if (len < 0 && len != GNUTLS_E_UNEXPECTED_PACKET_LENGTH) { if (len == GNUTLS_E_AGAIN || len == GNUTLS_E_INTERRUPTED) goto again_2; - error (NULL, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (len)); + error (conn, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (len)); return NULL; } if (len != 1 || buf[0] != '\1') { - error (NULL, VIR_ERR_RPC, + error (conn, VIR_ERR_RPC, "server verification (of our certificate or IP address) failed\n"); return NULL; } @@ -1120,12 +1120,12 @@ verify_certificate (virConnectPtr conn ATTRIBUTE_UNUSED, time_t now; if ((ret = gnutls_certificate_verify_peers2 (session, &status)) < 0) { - error (NULL, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (ret)); + error (conn, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (ret)); return -1; } if ((now = time(NULL)) == ((time_t)-1)) { - error (NULL, VIR_ERR_SYSTEM_ERROR, strerror (errno)); + error (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno)); return -1; } @@ -1146,17 +1146,17 @@ verify_certificate (virConnectPtr conn ATTRIBUTE_UNUSED, reason = "The certificate uses an insecure algorithm"; #endif - error (NULL, VIR_ERR_RPC, reason); + error (conn, VIR_ERR_RPC, reason); return -1; } if (gnutls_certificate_type_get(session) != GNUTLS_CRT_X509) { - error (NULL, VIR_ERR_RPC, "Certificate type is not X.509"); + error (conn, VIR_ERR_RPC, "Certificate type is not X.509"); return -1; } if (!(certs = gnutls_certificate_get_peers(session, &nCerts))) { - error (NULL, VIR_ERR_RPC, "gnutls_certificate_get_peers failed"); + error (conn, VIR_ERR_RPC, "gnutls_certificate_get_peers failed"); return -1; } @@ -1165,25 +1165,25 @@ verify_certificate (virConnectPtr conn ATTRIBUTE_UNUSED, ret = gnutls_x509_crt_init (&cert); if (ret < 0) { - error (NULL, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (ret)); + error (conn, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (ret)); return -1; } ret = gnutls_x509_crt_import (cert, &certs[i], GNUTLS_X509_FMT_DER); if (ret < 0) { - error (NULL, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (ret)); + error (conn, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (ret)); gnutls_x509_crt_deinit (cert); return -1; } if (gnutls_x509_crt_get_expiration_time (cert) < now) { - error (NULL, VIR_ERR_RPC, "The certificate has expired"); + error (conn, VIR_ERR_RPC, "The certificate has expired"); gnutls_x509_crt_deinit (cert); return -1; } if (gnutls_x509_crt_get_activation_time (cert) > now) { - error (NULL, VIR_ERR_RPC, "The certificate is not yet activated"); + error (conn, VIR_ERR_RPC, "The certificate is not yet activated"); gnutls_x509_crt_deinit (cert); return -1; } @@ -1191,7 +1191,7 @@ verify_certificate (virConnectPtr conn ATTRIBUTE_UNUSED, if (i == 0) { if (!gnutls_x509_crt_check_hostname (cert, hostname)) { __virRaiseError - (NULL, NULL, NULL, + (conn, NULL, NULL, VIR_FROM_REMOTE, VIR_ERR_RPC, VIR_ERR_ERROR, hostname, NULL, NULL, 0, 0, @@ -2390,7 +2390,7 @@ remoteNetworkOpen (virConnectPtr conn, struct private_data *priv = malloc (sizeof(struct private_data)); int ret, rflags = 0; if (!priv) { - error (NULL, VIR_ERR_NO_MEMORY, "struct private_data"); + error (conn, VIR_ERR_NO_MEMORY, "struct private_data"); return VIR_DRV_OPEN_ERROR; } if (flags & VIR_DRV_OPEN_RO) -- 1.5.3.6.950.g92b7b

3 3

[Libvir] [PATCH] add a gcc-printf attribute to remoteDispatchError
by Jim Meyering 26 Nov '07

26 Nov '07

Spotted this a week ago: add a gcc-printf attribute to remoteDispatchError diff --git a/qemud/remote.c b/qemud/remote.c index f4d76a1..047cae7 100644 --- a/qemud/remote.c +++ b/qemud/remote.c @@ -54,7 +54,8 @@ static void remoteDispatchError (struct qemud_client *client, remote_message_header *req, - const char *fmt, ...); + const char *fmt, ...) + ATTRIBUTE_FORMAT(printf, 3, 4); static virDomainPtr get_nonnull_domain (virConnectPtr conn, remote_nonnull_domain domain); static virNetworkPtr get_nonnull_network (virConnectPtr conn, remote_nonnull_network network); static void make_nonnull_domain (remote_nonnull_domain *dom_dst, virDomainPtr dom_src); -- 1.5.3.6.950.g92b7b

2 1

[Libvir] [PATCH] Compile libvirt under Windows (Cygwin)
by Richard W.M. Jones 26 Nov '07

26 Nov '07

The following patchset allows an incomplete compilation of libvirt under Windows using Cygwin. Current limitations are: (1) Xen driver does not work. This is not an important limitation because Windows cannot act as dom0 in a Xen hypervisor anyway (or if it can, it's not a very common configuration). (2) QEMU driver / libvirtd cannot be compiled. It's probably not too hard to fix this. The major area of concern is networking, in particular the very Linux-specific code in src/bridge.c. (2b) I have assumed for the purposes of (2) above that ./configure --without-qemu also disables libvirtd (server) support. QEMU and libvirtd are too entangled at the moment. (3) Cygwin is required. In other words, there is no true native compilation using VC++ or anything like that. However you still get *.exe files, so maybe this isn't an important limitation. Attached is a screenshot showing virsh being used to list QEMU instances over a TLS-encrypted remote connection. To compile this yourself: (a) Set up a Windows machine with plenty of free disk space (10GB+). (b) Install Cygwin (http://www.cygwin.com/) Cygwin has an obscure, unusable packaging system. The trick is to click the "recycling symbol" next to "All". This will download and install everything. You may if you prefer install just the packages you need, but the list of dependencies is long and currently undocumented. (c) Check out libvirt from CVS, apply these patches. (d) rm qemud/remote_protocol.[ch] qemud/remote_dispatch_*.h (e) ./configure --without-xen --without-qemu (f) make -C qemud remote_protocol.c (g) make (h) make install Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

5 33

[Libvir] Bindings for ruby
by Grabber 26 Nov '07

26 Nov '07

Yeah! I'm new to list! I search in archive and google for infomartions about bindings for ruby scripting language. I found some peoples saying ideas to organize class and structs, others using SWIG to simple generate the .so file compatible with ruby. But.... today how are the work? I'm confusing, SWIG can generate really good codes or the better way is develop by hand? -- Regards, Luiz Vitor Martinez Cardoso [Grabber].

5 6

[Libvir] PATCH: 0/4: Remote authentication support
by Daniel P. Berrange 26 Nov '07

26 Nov '07

This is the 2nd iteration of my remote authentication / SASL patches previously provided here: http://www.redhat.com/archives/libvir-list/2007-October/msg00131.html In this iteration I've changed the wire protocol to give better compatability with older libvirt clients. My previous version clients would get a cryptic "unknown status 3" if the server was mandating authentication. This is because I extended the reply codes for RPC to include a specific 'auth required' code which old clients are not expecting. The idea was that the new client would run the REMOTE_PROC_OPEN rpc call & it would return a special NEED_AUTH code, the client would then authenticate & redo the REMOTE_PROC_OPEN. In the new way of doing things, instead of calling REMOTE_PROC_OPEN as the first RPC, a new client will do REMOTE_PROC_AUTH_LIST to query auth types required by the server. It will choose an auth method (there may be several to choose from), then complete the auth sequence. Only then will it try to do the REMOTE_PROC_OPEN. For compatability with older servers which do not implement the REMOTE_PROC_AUTH_LIST rpc, it will catch & ignore the error this may generate. Old clients which don't know to call REMOTE_PROC_AUTH_LIST will get a proper virErrorPtr object returned from REMOTE_PROC_OPEN with a clear 'authentication required' message. The end result is that new client <-> new server has same level of functionality as my previous patches, and old client <-> new server gets friendly errors reported (if server mandates auth - if no auth is enabled old client works just fine). The main outstanding item to be finalized before these patches can be added to CVS is the question of callbacks. For some auth methods we need to be able to gather credentials from the user. There is no way for the caller to know ahead of time what credentials are needed, because this is deterined by the config of the server. Thus we need callbacks in some form. I've come up with a couple of ideas... 1. A global method to supply a list of callbacks per credential type: enum { VIR_CONN_AUTH_PASSWORD, VIR_CONN_AUTH_USERNAME, VIR_CONN_AUTH_LANG, VIR_CONN_AUTH_CHALLENGE, VIR_CONN_AUTH_REALM, } virConnectAuthToken; typedef int (virConnectAuthCBSimple)(const char **result, unsigned *len); typedef int (virConnectAuthCBPrompt)(const char *challenge, const char *prompt, const char *defresult, const char *result, unsigned *len); typedef int (virConnetAuthCBRealm)(const char **availrealms, const char *result); typedef struct { int token; union { virConnectAuthCBSimple simple; virConnectAuthCBPrompt prompt; virConnectAuthCBRealm realm; } cb; } virConnectAuthCallback; virConnectSetAuthCallbacks(virConnectAuthCallback *cbs, int ncbs) This is described a little more here: http://www.redhat.com/archives/libvir-list/2007-January/msg00024.html 2. A new variant of virConnectOpen which takes a callback. The callback gives invoked with a list of required credentials struct _virConnectInteract { int type; /* One of virConnectInteractType constants */ const char *prompt; const char *challenge; const char *defresult; char *result; unsigned int resultlen; }; typedef struct _virConnectInteract virConnectInteract; typedef virConnectInteract *virConnectInteractPtr; /** * When authentication requires one or more interactions, this callback * is invoked. For each interaction supplied, data must be gathered * from the user and filled in to the 'result' and 'resultlen' fields. * If an interaction can not be filled, fill in NULL and 0. * * Return 0 if all interactions were filled, or -1 upon error */ typedef int (*virConnectAuthCallbackPtr)(const char *uri, virConnectInteractPtr interact, unsigned int ninteract); virConnectPtr virConnectOpenAuth (const char *name, virConnectAuthCallbackPtr cb, int flags); Iternally the virConnectOpen & virConnectOpenReadOnly can both just be delegating to this new virConnectOpenAuth call. Existing users of libvirt won't know about this new call, but that doesn't matter because they're not loosing any functionality - merely not able to put up UI to prompt for auth credentials/ The compelling thing about the 2nd way of doing things is that the callback gets a complete list of all required data items at once. This makes it very easy to present a UI with form entry fields for all items. The first way where there is a separate callback per item makes UI very hard. There is one issue not addressed by those two options though - there may be a choice of authentication methods to use. eg SASL vs PolicyKit. The callback only provides a way to supply credentials, no way to choose between auth types if a server offers more than one. Again there's a couple of ways to address this. 1. A global method to set preferred auth type. Simply a sorted list of auth types. Internally, we pick the first auth type in this list that the server supports virConnectSetAuthPriority(int types[], int ntypes); 2. A 2nd callback providing the int types[] and letting the client app choose which one they want to use per connection. 3. Separate out the operation of creating a virConnectPtr object, from the act of connecting, eg /* Allocate a handle */ virConnectPtr virConnectNew(const char *uri); /* List available auth methods */ int virConnectListAuth(virConnectPtr conn, int **types, int *ntypes); /* Connect to HV, with a speciifc auth method */ int virConnectInit(virConnectPtr conn, int auth); Any of these three, can be combined with either of the 2 options for supplying auth credentials. So we've got a choice of 6 :-) My preference, is to go for option 2, of the credentials choice, and option 1 of the auth type priority choice. eg a static priority list for auth types, and a single callback passed into a new virConnectOpenAuth() call. The final tedious bit, is the question of how we deal with underlying HV which may need further authentication. eg, if connecting to XenAPI we may need to provide a username & password. If the XenAPI connection is being made through a local libvirt driver hooking up the callbacks as described is fairly easy. If the XenAPI connection is made indirectly via the remote driver, then we have two drivers requiring auth - the initial remote driver, and then the remotely run XenAPi driver. This would need us to figure out a way to hook up the callbacks to the REMOTE_PROC_OPEN api call. Not pleasant ! Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

3 12

[Libvir] netcat "-U" option
by Richard W.M. Jones 23 Nov '07

23 Nov '07

Debian ship a completely different version of netcat from Fedora. Not just a different version, but it appears to be a different codebase. Debian's netcat doesn't support the (very useful) -U option, so this code fails in src/remote_internal.c: cmd_argv[j++] = strdup (command); //..... cmd_argv[j++] = strdup (server); cmd_argv[j++] = strdup (netcat ? netcat : "nc"); cmd_argv[j++] = strdup ("-U"); cmd_argv[j++] = strdup (sockname ? sockname : LIBVIRTD_PRIV_UNIX_SOCKET); cmd_argv[j++] = 0; As a result of this remote-over-ssh fails on Debian. I'm not completely sure how to solve this at the moment. If anyone has any ideas ... Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

3 4

[Libvir] [PATCH] fixes when running as user or in tree tests
by Daniel Veillard 23 Nov '07

23 Nov '07

The following patches does 3 things which correct annoyances when running as an user or when running from a tree built with --prefix=/usr - avoid error message when non-root cannot open xenstore - avoid error message when non-root cannot directly access xend in those two cases the proxy (or remote code) should implement the access so there is no need to raise the error there. - when configuring with --prefix=/usr i.e. the same prefix as the installed libvirt, use the same localstatedir /var (instead of /usr/var) and sysconfdir /etc (instead of /usr/etc) to be able to connect to the system daemon, and use the system local options Daniel -- Red Hat Virtualization group http://redhat.com/virtualization/ Daniel Veillard | virtualization library http://libvirt.org/ veillard(a)redhat.com | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/

1 0

[Libvir] (remoteInitializeGnuTLS): Fix a typo in a variable name.
by Jim Meyering 22 Nov '07

22 Nov '07

2007-11-21 Jim Meyering <meyering(a)redhat.com> Fix a typo in a variable name. * qemud/qemud.c: Check crl_file, not ca_file, for revocation list, in remoteInitializeGnuTLS. diff --git a/qemud/qemud.c b/qemud/qemud.c index 55bd805..f6cd026 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -165,7 +165,7 @@ remoteInitializeGnuTLS (void) } if (crl_file && crl_file[0] != '\0') { - if (remoteCheckCertFile("CA revocation list", ca_file) < 0) + if (remoteCheckCertFile("CA revocation list", crl_file) < 0) return -1; qemudDebug ("loading CRL from %s", crl_file); -- 1.5.3.6.736.gb7f30

2 2

[Libvir] <disk> <shareable/> has no effect
by Markus Armbruster 21 Nov '07

21 Nov '07

Looks like <shareable/> within <disk> has no effect. I ran virsh dumpxml, inserted the <shareable/>, redefined the domain, and ran virsh dumpxml again. No shareable. I even ran virsh undefine and virsh define again, same thing. XML and output of xm list --long for this guest attached.

3 4

[Libvir] brSetForwardDelay / brSetEnableSTP
by Richard W.M. Jones 21 Nov '07

21 Nov '07

This code in qemu_driver.c doesn't look right to me. I think the second should be a call to brSetEnableSTP? Rich. if (network->def->forwardDelay && (err = brSetForwardDelay(driver->brctl, network->bridge, network->def->forwardDelay))) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "failed to set bridge forward delay to %d\n", network->def->forwardDelay); goto err_delbr; } if ((err = brSetForwardDelay(driver->brctl, network->bridge, network->def->disableSTP ? 0 : 1))) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "failed to set bridge STP to %s\n", network->def->disableSTP ? "off" : "on"); goto err_delbr; } -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

2 3

[Libvir] [PATCH] virterror Cleanups
by Saori Fukuta 20 Nov '07

20 Nov '07

Hi, The virsh command sometimes says wrong message that indicating where the error is coming from. So I have some fixes for libvirt error. * Add two number for virErrorDomain (virterror.h) * Add six message indicating where it's coming from (virterror.c) * Fix virErrorDomain number specified with __virRaiseError (openvz_conf.c/openvz_driver.c/stats_linux.c/xm_internal.c) Regards, Saori Fukuta

3 4

[Libvir] ANNOUNCE: Ruby bindings for libvirt
by David Lutterkort 20 Nov '07

20 Nov '07

I'm pleased to announce the availability of Ruby bindings for libvirt. The main site for them is http://libvirt.org/ruby API docs can be found at http://libvirt.org/ruby/api/index.html An initial release is at http://libvirt.org/ruby/download - the bindings are mostly complete, though there are a number of less frequently used functions that are not covered yet. Please send all your patches (and comments/questions) to this list. David

3 3

[Libvir] [PATCH]: Add virNodeGetInfo to ruby bindings
by Chris Lalancette 19 Nov '07

19 Nov '07

All, Attached is a patch to add the virNodeGetInfo() call to the Libvirt Ruby bindings. Although it is not technically a virConn* function, it acts like one since it uses the virConnectPtr structure, so I put it with those functions. Let me know if I am doing anything completely crazy in here; this is my first stab at Ruby binding code. It works like so: require 'libvirt' conn = Libvirt::open("qemu:///system") ni = c.nodeGetInfo print ni Signed-off-by: Chris Lalancette <clalance(a)redhat.com>

2 1

[Libvir] [Suggestion] The "ISP scenario"
by Richard W.M. Jones 19 Nov '07

19 Nov '07

This pattern has come up a few times now: ISP provides a Xen hosting service to customers. ISP wants to provide some basic statistics to their customers. The statistics could be provided to a customer through the libvirt remote protocol, eg: customer$ virsh -c xen://dom0/ dominfo mydom But the problem with this is that (as libvirt is currently architected) _any_ access to dom0, if it authenticates, gives access to information from all domains. We've previously discussed adding access control using something like SELinux (see for example: https://www.redhat.com/archives/libvir-list/2007-August/msg00030.html) but nothing much has come of it so far. But can we solve the single common case above directly, without thwarting our ability to solve the bigger picture later? My suggestion is that we add an option to /etc/libvirt/libvirtd.conf, something like: tls_restrict_dn: [ "DN1", "name:customer1", "DN2", "uuid:12345678", "DN3", "*" ] with the meaning that (presumably a customer) connecting with certificate DN1 could only find out information about the domain "customer1", DN2 similarly, DN3 is a privileged client, and any other DN would be rejected. (Compare and contrast to tls_allowed_dn_list: http://libvirt.org/remote.html#Remote_libvirtd_configuration) An implementation of this would modify the call to virConnectOpen to add an additional flag (or call?) allowing the access control to be passed, and this would have to be checked in the relevant virDomain* calls. This is not dissimilar to how read-only connections are implemented in libvirtd currently. I would also suggest as a matter of course that we modify all public API calls in src/libvirt.c to add a call to a generic permission checking routine, for example: int 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); - } + if (!check_permission (domain, OP_SUSPEND)) return -1; With the initial implementation of check_permission just doing the VIR_CONNECT_RO check to start with, but able to do other checks in future. Also relevant to this is SASL support, see: https://www.redhat.com/archives/libvir-list/2007-November/msg00005.html since AIUI this changes the possible formats for Distinguished Names, or could even make DNs irrelevant. Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

3 2

[Libvir] [Bug] keymap tag for vnc connections ignored for qemu and kvm
by C. Hemsing 19 Nov '07

19 Nov '07

The keymap entry in the respective xml file is being ignored when starting qemu. It should be honoured in src/qemu_conf.c when setting up argv in function qemudBuildCommandLine in case keymap is set and vnc has been chosen. Ignoring the keymap (not issuing -k ...) will make vnc impossible to use for many international keyboards. I've filed a bug report (https://bugzilla.redhat.com/show_bug.cgi?id=390461) Cheers, Chris

1 0

[Libvir] [Bug] keymap tag for vnc connections ignored for qemu and kvm
by C. Hemsing 19 Nov '07

19 Nov '07

The keymap entry in the respective xml file is being ignored when starting qemu. It should be honoured in src/qemu_conf.c when setting up argv in function qemudBuildCommandLine in case keymap is set and vnc has been chosen. Ignoring the keymap (not issuing -k ...) will make vnc impossible to use for many international keyboards. I've filed a bug report (https://bugzilla.redhat.com/show_bug.cgi?id=390461) Cheers, Chris

1 0

[Libvir] PATCH: Fix stats overflow
by Daniel P. Berrange 19 Nov '07

19 Nov '07

FYI, I have just applied the attached patch to fix a 32-bit overflow in the stats code. We were doing a left shift of more than 32 bits on '1L' which is only 32-bit wide on 32-bit platforms. I simply cast to a long long instead. Regards, Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

4 3

[Libvir] diagnose invalid domain ID numbers (and invalid integers, in general)
by Jim Meyering 18 Nov '07

18 Nov '07

Hello, There are over 30 uses of strtol in libvirt, and they all can silently accept invalid input. The invalid string might range from an outlandish domain ID like 4294967298 to strings of digits followed by bogus alpha. Maybe not worth worrying about, you say? But what if they indicate user confusion, e.g., 1,000 vs 1000? Silently interpreting "1,000" as "1" would leave the poor user even more confused :-) IMHO, they should all be diagnosed. Fixing them properly requires some infrastructure, so that you don't end up duplicating too much logic. This patch adds part of that infrastructure and fixes only a single instance, to start with. I'll fix the others once we're all agreed on the form of the infrastructure. I've fixed the bug that would make this command: echo domname $(echo 2^32+2|bc)|src/virsh ... act just like this one: echo domname 2|src/virsh ... Now, it does this: $ echo domname 4294967298|src/virsh --quiet --connect test://$PWD/docs/testnode.xml virsh > error: failed to get domain '4294967298' virsh > The new test script, tests/int-overflow demonstrates precisely that before/after behavior. This change adds some other new files. src/xstrtol.c and .h contain the first of a few new strtol-like functions. This first one, xstrtol_i, converts to an "int". Other wrappers will convert to wider types. The goal is to put the tedious tests into the wrappers so that applications can be robust without all the duplicated gore. It is important (from type-safety and maintainability standpoints) to ensure that the resulting integral value be "returned" via an argument pointer, not a return value. With the former, you're guaranteed to have matching types. Simply getting the value via "return", it is too easy to mistakenly change width or signedness. Here's the new function's description and signature: /* Like strtol, but produce an "int" result, and check more carefully. Return 0 upon success; return -1 to indicate failure. When END_PTR is NULL, the byte after the final valid digit must be NUL. Otherwise, it's like strtol and lets the caller check any suffix for validity. This function is careful to return -1 when the string S represents a number that is not representable as an "int". */ int xstrtol_i(char const *s, char **end_ptr, int base, int *result) My first attempt put the definition of xstrtol_i in the logical place: util.c. But that would have required linking virsh with util.c, and that fails due to an unsatisfied reference to __virRaiseError. So instead, it's in its own file, now. If you want it in some other file, just tell me where. BTW, I have no strong preference for the name xstrtol_i. Bear in mind that the name tells you that it's based on (and limited to) strtol's "long" type, and produces an 'i'nt value. It happens to be the same one used in at least one other project, and closely resembles the xstrto* functions in gnulib. Note that there are almost certainly places in the code where we'll want to use a variant that targets an unsigned type like "size_t" or a wider type like long long. In addition to other uses of strtol that I plan to fix, there are three uses of strtoll, too. Patch attached below. If you apply it with plain-old-patch, remember to run this: chmod a+x tests/int-overflow Thu Nov 8 09:59:43 CET 2007 Jim Meyering <meyering(a)redhat.com> Diagnose an invalid domain ID number. * src/virsh.c: Include "xstrtol.h" (vshCommandOptDomainBy): Detect integer overflow in domain ID number. * tests/int-overflow: New script. Test for the above-fixed bug. * tests/Makefile.am (TESTS): Add int-overflow. (TESTS_ENVIRONMENT): Define, to propagate $abs_top_* variables into the int-overflow script. (valgrind): Adapt rule not to clobber new TESTS_ENVIRONMENT. * src/xstrtol.h, src/xstrtol.c: New files. * src/Makefile.am (virsh_SOURCES): Add xstrtol.c and xstrtol.h. --- src/Makefile.am | 2 +- src/virsh.c | 10 ++++------ src/xstrtol.c | 33 +++++++++++++++++++++++++++++++++ src/xstrtol.h | 7 +++++++ tests/Makefile.am | 10 ++++++++-- tests/int-overflow | 22 ++++++++++++++++++++++ 6 files changed, 75 insertions(+), 9 deletions(-) create mode 100644 src/xstrtol.c create mode 100644 src/xstrtol.h create mode 100755 tests/int-overflow

3 8

[Libvir] [PATCH 0/2] KVM network stats
by Richard W.M. Jones 15 Nov '07

15 Nov '07

This two part patch collects network interface stats from KVM domains. With this patch, virt-top will show the stats in its network interface view, as in the screengrab below. Rich. virt-top 15:47:38 - x86_64 4/4CPU 2814MHz 3967MB 0.1% 1 domains, 1 active, 1 running, 0 sleeping, 0 paused, 0 inactive D:0 O:0 X:0 CPU: 3.0% Mem: 250 MB (250 MB by guests) ID S RXBY TXBY RXPK TXPK DOMAIN INTERFACE 1 R 222K 5436 175 78 debian32kvm vnet0 -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

2 5

[Libvir] [PATCH] Miscellaneous cleanups for virNodeGetFreeMemory and virNodeGetCellsFreeMemory
by Richard W.M. Jones 15 Nov '07

15 Nov '07

(1) Add documentation to the hvsupport page for virNodeGetFreeMemory (2) Fix documentation on the hvsupport page to show that the two new functions aren't supported in the QEMU, KVM or remote cases yet. (3) Add DEBUG() calls to both new functions. (4) xen_internal.c functions may now support a connection argument to virXenError / virXenErrorFunc. I have modified this file so that where the connection is known, it is passed. Because of the way virterror works, errors should always be attached to a connection if at all possible, otherwise there is no sane way to turn non-connection errors into exceptions in language bindings, and also error handling in threaded code won't work. Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

2 3

[Libvir] [PATCH] Make "make distcheck" work.
by Jim Meyering 15 Nov '07

15 Nov '07

Here's another infrastructure-fixing patch. I got most of the way to an honest "make distcheck", but fixing a final failing sub-test wasn't worth the effort, so I punted and added the top level "distuninstallcheck" target to make it skip that part. Make "make distcheck" work. * Makefile.am: Expand some "*" wildcards, and (for now) disable the relatively unimportant, distuninstallcheck target. Fix a few redirect-directly-to-target bugs. Add a few $(srcdir)/ prefixes and add an uninstall-local rule. * docs/Makefile.am: More of the same. Split some long lines. * docs/examples/Makefile.am: Likewise. * python/Makefile.am: Likewise. * python/tests/Makefile.am: Likewise. * qemud/Makefile.am: Likewise. * tests/Makefile.am: Remove the directories already listed in SUBDIRS. --- Makefile.am | 3 + docs/Makefile.am | 95 +++++++++++++++++++++++++++++++++++++++----- docs/examples/Makefile.am | 13 ++++-- python/Makefile.am | 6 ++- python/tests/Makefile.am | 2 + qemud/Makefile.am | 26 ++++++++---- tests/Makefile.am | 8 +--- 7 files changed, 120 insertions(+), 33 deletions(-) diff --git a/Makefile.am b/Makefile.am index e1e6884..eaa204e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -41,3 +41,6 @@ cov-am: > $(top_builddir)/coverage/index.html for i in $(top_builddir)/src/*.gcov ; do o=`echo $$i | sed -e 's,$(top_builddir)/src,coverage,'` ; \ perl $(srcdir)/scripts/coverage-report-entry.pl $$i > $$o.html ; done + +# disable this check +distuninstallcheck: diff --git a/docs/Makefile.am b/docs/Makefile.am index c7dfe24..2aa923d 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -7,18 +7,82 @@ DOC_SOURCE_DIR=../src PAGES= index.html bugs.html FAQ.html remote.html APIPAGES=APIconstructors.html APIfiles.html APIfunctions.html \ APIsymbols.html APIchunk0.html -EXTRA_DIST= \ - libvirt-api.xml libvirt-refs.xml apibuild.py \ - *.xsl *.html *.gif html/*.html html/*.png \ - *.xml *.rng - man_MANS= +html = \ + book1.html \ + index.html \ + libvirt-conf.html \ + libvirt-lib.html \ + libvirt-libvirt.html \ + libvirt-virterror.html + +png = \ + left.png \ + up.png \ + home.png \ + right.png + +gif = \ + Libxml2-Logo-90x34.gif \ + architecture.gif \ + node.gif \ + redhat.gif + +dot_html = \ + APIchunk0.html \ + APIchunk1.html \ + APIchunk2.html \ + APIchunk3.html \ + APIchunk4.html \ + APIchunk5.html \ + APIchunk6.html \ + APIchunk7.html \ + APIconstructors.html \ + APIfiles.html \ + APIfunctions.html \ + APIsymbols.html \ + FAQ.html \ + architecture.html \ + bugs.html \ + downloads.html \ + errors.html \ + format.html \ + hvsupport.html \ + index.html \ + intro.html \ + libvir.html \ + news.html \ + python.html \ + remote.html \ + uri.html + +xml = \ + libvirt-api.xml \ + libvirt-refs.xml \ + testdomfc4.xml \ + testdomfv0.xml \ + testnetdef.xml \ + testnetpriv.xml \ + testnode.xml + +rng = \ + libvirt.rng \ + network.rng + +EXTRA_DIST= \ + libvirt-api.xml libvirt-refs.xml apibuild.py \ + site.xsl newapi.xsl api.xsl \ + $(dot_html) $(gif) html \ + $(xml) $(rng) + all: web $(top_builddir)/NEWS $(man_MANS) virsh.1: virsh.pod - pod2man -c "Virtualization Support" virsh.pod > virsh.1 && cp virsh.1 $(top_builddir) + pod2man -c "Virtualization Support" $(srcdir)/virsh.pod > $@-t + mv $@-t $@ + cp $@ $(top_builddir) api: libvirt-api.xml libvirt-refs.xml $(APIPAGES) $(srcdir)/html/index.html @@ -50,7 +114,9 @@ $(srcdir)/html/index.html: libvirt-api.xml $(srcdir)/newapi.xsl echo "Validating the resulting XHTML pages" ; \ $(XMLLINT) --nonet --valid --noout html/*.html ; fi ); -libvirt-api.xml libvirt-refs.xml: apibuild.py ../include/libvirt/*.h ../src/*.h ../src/*.c +libvirt-api.xml libvirt-refs.xml: apibuild.py \ + $(srcdir)/../include/libvirt/*.h \ + $(srcdir)/../src/*.h $(srcdir)/../src/*.c -(./apibuild.py) $(top_builddir)/NEWS: $(top_srcdir)/docs/news.xsl $(top_srcdir)/docs/news.html @@ -67,8 +133,15 @@ rebuild: api all install-data-local: $(mkinstalldirs) $(DESTDIR)$(HTML_DIR) - -@INSTALL@ -m 0644 $(srcdir)/libvir.html $(srcdir)/FAQ.html $(srcdir)/redhat.gif $(srcdir)/Libxml2-Logo-90x34.gif $(DESTDIR)$(HTML_DIR) + -@INSTALL@ -m 0644 $(srcdir)/libvir.html $(srcdir)/FAQ.html \ + $(srcdir)/redhat.gif $(srcdir)/Libxml2-Logo-90x34.gif \ + $(DESTDIR)$(HTML_DIR) $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/html - -@INSTALL@ -m 0644 $(srcdir)/html/*.html $(DESTDIR)$(HTML_DIR)/html - -@INSTALL@ -m 0644 $(srcdir)/html/*.png $(DESTDIR)$(HTML_DIR)/html - + for h in $(html); do \ + $(INSTALL) -m 0644 $(srcdir)/html/$$h $(DESTDIR)$(HTML_DIR)/html; done + for p in $(png); do \ + $(INSTALL) -m 0644 $(srcdir)/html/$$p $(DESTDIR)$(HTML_DIR)/html; done + +uninstall-local: + for h in $(html); do rm $(DESTDIR)$(HTML_DIR)/html/$$h; done + for p in $(png); do rm $(DESTDIR)$(HTML_DIR)/html/$$p; done diff --git a/docs/examples/Makefile.am b/docs/examples/Makefile.am index c62d128..8a66999 100644 --- a/docs/examples/Makefile.am +++ b/docs/examples/Makefile.am @@ -6,15 +6,20 @@ LDADDS = @STATIC_BINARIES@ $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la rebuild: examples.xml index.html -examples.xml: index.py *.c +examples.xml: index.py info1.c suspend.c -(a)($(srcdir)/index.py) index.html: examples.xml examples.xsl $(top_srcdir)/docs/site.xsl - -@(if [ -x $(XSLTPROC) ] ; then $(XSLTPROC) examples.xsl examples.xml && echo "Rebuilt web page" && xmllint --valid --noout index.html ; fi) + -@(if [ -x $(XSLTPROC) ] ; then \ + $(XSLTPROC) examples.xsl examples.xml \ + && echo "Rebuilt web page" \ + && xmllint --valid --noout index.html; \ + fi) install-data-local: $(mkinstalldirs) $(DESTDIR)$(HTML_DIR) - -@INSTALL@ -m 0644 $(srcdir)/*.html $(srcdir)/*.c $(srcdir)/*.xml $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR) + -@INSTALL@ -m 0644 $(srcdir)/*.html $(srcdir)/*.c $(srcdir)/*.xml \ + $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR) EXTRA_DIST=examples.xsl index.py examples.xml @@ -37,5 +42,3 @@ tests: $(noinst_PROGRAMS) @(echo '## examples regression tests') @($(CHECKER) ./suspend) @($(CHECKER) ./info1) - - diff --git a/python/Makefile.am b/python/Makefile.am index 4f97610..1fe60ff 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -49,7 +49,8 @@ $(GENERATED): $(srcdir)/$(GENERATE) $(API_DESC) $(PYTHON) $(srcdir)/$(GENERATE) $(srcdir) libvirt.py: $(srcdir)/libvir.py libvirtclass.py - cat $(srcdir)/libvir.py libvirtclass.py > libvirt.py + cat $(srcdir)/libvir.py libvirtclass.py > $@-t + mv $@-t $@ $(libvirtmod_la_OBJECTS): $(GENERATED) @@ -60,6 +61,9 @@ install-data-local: @(for doc in $(DOCS) ; \ do @INSTALL@ -m 0644 $$doc $(DESTDIR)$(DOCS_DIR) ; done) +uninstall-local: + rm -f $(DESTDIR)$(pythondir)/libvirt.py + CLEANFILES= $(GENERATED) libvirt.py else diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am index dfa52e4..6011fef 100644 --- a/python/tests/Makefile.am +++ b/python/tests/Makefile.am @@ -32,3 +32,5 @@ install-data-local: -(for test in $(PYTESTS); \ do @INSTALL@ -m 0644 $(srcdir)/$$test $(DESTDIR)$(EXAMPLE_DIR) ; done) +uninstall-local: + for test in $(PYTESTS); do rm -f $(DESTDIR)$(EXAMPLE_DIR)/$$test; done diff --git a/qemud/Makefile.am b/qemud/Makefile.am index 3da6265..6aedf8c 100644 --- a/qemud/Makefile.am +++ b/qemud/Makefile.am @@ -47,19 +47,23 @@ libvirtd_CFLAGS += $(AVAHI_CFLAGS) libvirtd_LDADD += $(AVAHI_LIBS) endif +default_xml_dest = libvirt/qemu/networks/default.xml install-data-local: install-init mkdir -p $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart - $(INSTALL_DATA) $(srcdir)/default-network.xml $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml - sed -i -e "s,</name>,</name>\n <uuid>$(UUID)</uuid>," $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml + $(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 -e $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml || \ - ln -s ../default.xml $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml + ln -s ../default.xml \ + $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/qemu mkdir -p $(DESTDIR)$(localstatedir)/run/libvirt mkdir -p $(DESTDIR)$(localstatedir)/lib/libvirt uninstall-local: uninstall-init rm -f $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml - rm -f $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml + rm -f $(DESTDIR)$(sysconfdir)/$(default_xml_dest) rmdir $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart || : rmdir $(DESTDIR)$(localstatedir)/log/libvirt/qemu || : rmdir $(DESTDIR)$(localstatedir)/run/libvirt || : @@ -95,20 +99,24 @@ remote_dispatch_proc_switch.h: remote_generate_stubs.pl remote_protocol.x if LIBVIRT_INIT_SCRIPTS_RED_HAT install-init: libvirtd.init mkdir -p $(DESTDIR)$(sysconfdir)/rc.d/init.d - $(INSTALL_SCRIPT) libvirtd.init $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd + $(INSTALL_SCRIPT) libvirtd.init \ + $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd mkdir -p $(DESTDIR)$(sysconfdir)/sysconfig - $(INSTALL_SCRIPT) $(srcdir)/libvirtd.sysconf $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd + $(INSTALL_SCRIPT) $(srcdir)/libvirtd.sysconf \ + $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd uninstall-init: - rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd + rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd \ + $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd libvirtd.init: libvirtd.init.in sed \ -e s!\@localstatedir\@!@localstatedir@!g \ -e s!\@sbindir\@!@sbindir@!g \ -e s!\@sysconfdir\@!@sysconfdir@!g \ - < $< > $@ - chmod a+x libvirtd.init + < $< > $@-t + chmod a+x $@-t + mv $@-t $@ CLEANFILES = libvirtd.init else diff --git a/tests/Makefile.am b/tests/Makefile.am index fec2f20..998877a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -34,14 +34,8 @@ LDADDS = \ EXTRA_DIST = \ xmlrpcserver.py \ test_conf.sh \ - confdata \ qemuxml2argvdata \ - xml2sexprdata \ - nodeinfodata \ - virshdata \ - xencapsdata \ - sexpr2xmldata \ - xmconfigdata + nodeinfodata noinst_PROGRAMS = xmlrpctest xml2sexprtest sexpr2xmltest virshtest conftest \ reconnect xmconfigtest xencapstest qemuxml2argvtest qemuxml2xmltest \ -- 1.5.3.5.666.gfb5f

2 5

[Libvir] [PATCH] stats_linux.c: Only include xs.h if WITH_XEN.
by Jim Paris 15 Nov '07

15 Nov '07

Fixes compile error when building --without-xen on a host that has no Xen headers installed. --- src/stats_linux.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/stats_linux.c b/src/stats_linux.c index 5e6d06c..125af45 100644 --- a/src/stats_linux.c +++ b/src/stats_linux.c @@ -19,7 +19,9 @@ #include <string.h> #include <unistd.h> +#ifdef WITH_XEN #include <xs.h> +#endif #include "internal.h" #include "xen_unified.h" -- 1.5.3.4

3 3

[Libvir] documentation on the website is not in sync
by Gildas 15 Nov '07

15 Nov '07

Hi, As reported on the irc channel, the documentation at http://libvirt.org/uri.html#URI_qemu is not in sync with what is reported/supported by libvirtd v 0.3.3 Regards, Gildas

3 2

[Libvir] The problem of the definition of tuning informations
by Daniel Veillard 15 Nov '07

15 Nov '07

I promised that mail for the beginning of the week but I still have a very hard time to try to formulate a good plan of action, I'm still stuck in a dilemna, see below. What is it? ----------- I think tuning informations are that set of parameters associated to a domain or a host, which are not stricly needed to get the domain(s) working but improve their runtime behaviour. To me this includes: - scheduling parameters the scope may be host/hypervisor/domain - vcpu affinity i.e. to which set of physical CPU each of the vcpu may be bound - and possibly others ... The problem: ------------ People would like to associate those to the XML domain informations, the goal being to be able to restore those informations when a domain (re-)starts. I have been objecting it so far because, I think those informations don't have the same lifetime and scope as the other domain informations saved in the XML. Since they are not needed to start the domain, and that once the domain is started the existing domain API can be used to change those informations, it is better to keep them separate. However I got objections from David Lutterkort [1], Jim Fehlig [2], and John Levon [3] plus of course the initial request for it from Tatsuro Enokura (and the Fujistu people in general) [4] The problem to me comes from 2 things: 1/ storing tuning informations in domains descriptions is not sufficient 2/ if we store them there we also need to always save them when exporting the XML domain file 2/ is fairly important to avoid a lot of problems as we have experienced before for example with console informations. If the input for virsh create gets different from the output of dumpxml, a lot of rather annoying things happen in practice, it certainly generate confusion. So we really need to output those tuning data if we put them in. Also I strongly believe in 1/, i.e. tuning informations are cross domain and they are vey likely to change fast as soon as the management applications will get deployed, but even in relatively small deployment the tuning is rather a per host informations, which may depend on the current workload of the machine. I don't believe in tuning being loaded at create time and never changing later. Even in my own very basic usage that doesn't match my use which lead me to load and stop domain on demand for short period of time. My opinion: ----------- We need better tools, even for simple use case to be able to save an existing tuning for a domain or a full machine, and reload it when needed. This is IMHO better done on top of the existing API which already have the entry points to implement them. My idea is to provide tuning commands in virsh [5]. If you implement tuning both at creation time and in the tool, this mean you either make them different in which case you have no coherency between what you say when you create a domain or save its config and what you do at the virsh level. If you don't make it different (for example trying to use the same kind of XML syntax), then you need code for doing this both in the tool and in the library itself, or you export as a new API the tuning load and save. Exporting as a parallel API what we have already for scheduling and VCPU affinity makes the API more complex, and less coherent. I don't want to force the decision one way or another, it is probable I missed something, but I don't think adding tuning informations to the domain configuration file to be really that convenient, I could be done better, and with less associated problems by keeping those separate. Daniel [1] https://www.redhat.com/archives/libvir-list/2007-October/msg00250.html [2] https://www.redhat.com/archives/libvir-list/2007-November/msg00003.html [3] https://www.redhat.com/archives/libvir-list/2007-October/msg00046.html [4] https://www.redhat.com/archives/libvir-list/2007-October/msg00221.html [5] https://www.redhat.com/archives/libvir-list/2007-October/msg00245.html -- Red Hat Virtualization group http://redhat.com/virtualization/ Daniel Veillard | virtualization library http://libvirt.org/ veillard(a)redhat.com | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/

5 13

[Libvir] latest NUMA/cpuset code testing
by beth kon 15 Nov '07

15 Nov '07

I tested the latest CVS libvirt on a 128-way x3950 and create, define, and start appear to work well with various cpusets specified. The only thing I noticed was that dumpxml does not grab the cpuset info. I have not looked at the code to verify, but is this expected? Maybe you discussed this Daniel, but I can't remember at the moment. -- Elizabeth Kon (Beth) IBM Linux Technology Center Open Hypervisor Team email: eak(a)us.ibm.com

3 2

[Libvir] ANNOUNCE: ocaml-libvirt 0.3.3.1 released
by Richard W.M. Jones 14 Nov '07

14 Nov '07

I'm pleased to announce the release of ocaml-libvirt 0.3.3.1, type-safe libvirt bindings for OCaml. Main page: http://et.redhat.com/~rjones/ocaml-libvirt/ Source repo: http://hg.et.redhat.com/virt/applications/virt-top--devel Change log: http://et.redhat.com/~rjones/ocaml-libvirt/ChangeLog.txt This minor update contains bindings for the new API calls virNodeGetFreeMemory and virNodeGetCellsFreeMemory. http://et.redhat.com/~rjones/ocaml-libvirt/html/Libvirt.Connect.html#VALnod… The 'mlvirsh' command now has a new 'freecell' subcommand: mlvirsh freecell - Calls virNodeGetFreeMemory and prints free memory in the whole system. mlvirsh freecell <start> - Calls virNodeGetCellsFreeMemory (conn, start, 1) and prints free memory on a single NUMA cell. mlvirsh freecell <start> <max> - Calls virNodeGetCellsFreeMemory (conn, start, max) and prints free memory on the given range of NUMA cells. Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

1 1

[Libvir] [PATCH] Handle failed strdup and malloc.
by Jim Meyering 14 Nov '07

14 Nov '07

I noticed a bunch of unchecked strdup's in a row, and audited the rest of the file: Handle failed strdup and malloc. * src/remote_internal.c: Don't dereference NULL after failed strdup or malloc in doRemoteOpen. --- src/remote_internal.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/src/remote_internal.c b/src/remote_internal.c index 1420a88..bd8b5a7 100644 --- a/src/remote_internal.c +++ b/src/remote_internal.c @@ -522,6 +522,10 @@ doRemoteOpen (virConnectPtr conn, struct private_data *priv, const char *uri_str sockname = strdup (LIBVIRTD_PRIV_UNIX_SOCKET_RO); else sockname = strdup (LIBVIRTD_PRIV_UNIX_SOCKET); + if (sockname == NULL) { + error (NULL, VIR_ERR_SYSTEM_ERROR, strerror (errno)); + goto failed; + } } } @@ -576,10 +580,19 @@ doRemoteOpen (virConnectPtr conn, struct private_data *priv, const char *uri_str if (no_tty) nr_args += 5; /* For -T -o BatchMode=yes -e none */ command = command ? : strdup ("ssh"); + if (command == NULL) { + error (NULL, VIR_ERR_SYSTEM_ERROR, strerror (errno)); + goto failed; + } // Generate the final command argv[] array. // ssh -p $port [-l $username] $hostname $netcat -U $sockname [NULL] cmd_argv = malloc (nr_args * sizeof (char *)); + if (cmd_argv == NULL) { + error (NULL, VIR_ERR_SYSTEM_ERROR, strerror (errno)); + goto failed; + } + j = 0; cmd_argv[j++] = strdup (command); cmd_argv[j++] = strdup ("-p"); @@ -601,6 +614,11 @@ doRemoteOpen (virConnectPtr conn, struct private_data *priv, const char *uri_str cmd_argv[j++] = strdup (sockname ? sockname : LIBVIRTD_PRIV_UNIX_SOCKET); cmd_argv[j++] = 0; assert (j == nr_args); + for (j = 0; j < nr_args; j++) + if (cmd_argv[j] == NULL) { + error (NULL, VIR_ERR_SYSTEM_ERROR, strerror (ENOMEM)); + goto failed; + } } /*FALLTHROUGH*/ @@ -633,6 +651,10 @@ doRemoteOpen (virConnectPtr conn, struct private_data *priv, const char *uri_str // Run the external process. if (!cmd_argv) { cmd_argv = malloc (2 * sizeof (char *)); + if (cmd_argv == NULL) { + error (NULL, VIR_ERR_SYSTEM_ERROR, strerror (errno)); + goto failed; + } cmd_argv[0] = command; cmd_argv[1] = 0; } -- 1.5.3.5.666.gfb5f

2 3

[Libvir] [PATCH] Enhanced stats for fullvirt domains
by Richard W.M. Jones 14 Nov '07

14 Nov '07

This patch does a couple of primary things: Firstly it allows you to use "hda", etc. as a path for getting block device stats from fullvirt domains. Secondly it separates out the stats code into a new file called 'stats_linux.c'. The reasoning behind the name is that this code can be shared between Xen & QEMU, and that the code is Linux-specific (it never worked on Solaris, but now this is explicit). I anticipate a 'stats_solaris.c' file once I can get Solaris + Xen going on a test machine. Also we try to detect the case where the block dev stats of a fullvirt domain are stuck at 0 -- caused by there being no frontend driver connected. We detect the condition by a query to xenstore. XENVBD_MAJOR is no longer hard-coded if we can get it instead from Linux header files. This patch adds bytes written/read to block devices for Xen PV domains if available. This also corrects a bug where stats from xvdb, xvdc, .. could not be read out because the device number was being miscalculated. Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

3 7

[Libvir] [PATCH] Fix xen://hostname URIs with no trailing slash
by Richard W.M. Jones 14 Nov '07

14 Nov '07

It turns out that xmlParseURI gives an error if asked to parse the string "xen://". This string arises because after a URI such as "xen://hostname" has been stripped of its server field, it becomes "xen://" on the remote end of the connection, and the failure of xmlParseURI causes the whole connection to fail. I'm not sure of the best way to fix it. The attached patch is a semi-hack which at least allows xen://hostname to work. It's not a problem for qemu because these URIs should always contain a path. Nor for test for the same reason. Not sure about OpenVZ. Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

2 3

[Libvir] [PATCH] parse URI once in src/libvirt.c, pass parsed URI to all drivers
by Richard W.M. Jones 14 Nov '07

14 Nov '07

The basic change here is that the virDrvOpen call (the internal "open" call for drivers) now takes the parsed xmlURIPtr instead of the raw name string. typedef virDrvOpenStatus (*virDrvOpen) (virConnectPtr conn, - const char *name, + xmlURIPtr uri, int flags); So we avoid the redundant URI parsing which was going on inside all the drivers, and also the ad-hoc "does-it-look-like-a-URI" string comparisons. That's straightforward enough except that all of the drivers were saving the name string in their private data so that they could implement the virConnectGetURI call. I've changed this so that the name is copied and saved in the main virConnect structure, and virConnectGetURI will return that unless the driver wants to override it. You need another patch (coming shortly) to allow URIs like xen://localhost (without the trailing slash) to work, which was IIRC the original point of this discussion. Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

2 3

[Libvir] [PATCH] Parse integers more carefully, cont'd.
by Jim Meyering 13 Nov '07

13 Nov '07

Here's part two in the strtol fix-up series: Parse integers more carefully, cont'd. * qemud/qemud.c: Replace uses of strtol with uses of xstrtol_i. Avoid overflow for very large --timeout=N values. * src/nodeinfo.c: In linuxNodeInfoMemPopulate and linuxNodeInfoCPUPopulate, use xstrtol_i rather than strtol. Unlike in qemud.c, here we allow trailing "isspace", and in the case of "cpuinfo cpu MHz", also allow a "." terminator, since we ignore the decimal and any following digits. * src/internal.h: Define xstrtol_iu, too. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- qemud/qemud.c | 16 ++++++---------- src/internal.h | 19 +++++++++++++++++++ src/nodeinfo.c | 24 +++++++++++++++++++----- 3 files changed, 44 insertions(+), 15 deletions(-) diff --git a/qemud/qemud.c b/qemud/qemud.c index 8e3ba54..ee6f6ce 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -1583,9 +1583,7 @@ remoteReadConfigFile (const char *filename) p = virConfGetValue (conf, "unix_sock_ro_perms"); CHECK_TYPE ("unix_sock_ro_perms", VIR_CONF_STRING); if (p && p->str) { - char *tmp = NULL; - unix_sock_ro_perms = strtol(p->str, &tmp, 8); - if (*tmp) { + if (xstrtol_i(p->str, NULL, 8, &unix_sock_ro_perms) != 0) { qemudLog (QEMUD_ERR, "Failed to parse mode '%s'", p->str); return -1; } @@ -1594,9 +1592,7 @@ remoteReadConfigFile (const char *filename) p = virConfGetValue (conf, "unix_sock_rw_perms"); CHECK_TYPE ("unix_sock_rw_perms", VIR_CONF_STRING); if (p && p->str) { - char *tmp = NULL; - unix_sock_rw_perms = strtol(p->str, &tmp, 8); - if (*tmp) { + if (xstrtol_i(p->str, NULL, 8, &unix_sock_rw_perms) != 0) { qemudLog (QEMUD_ERR, "Failed to parse mode '%s'", p->str); return -1; } @@ -1797,10 +1793,10 @@ int main(int argc, char **argv) { break; case 't': - timeout = strtol(optarg, &tmp, 10); - if (!tmp) - timeout = -1; - if (timeout <= 0) + if (xstrtol_i(optarg, &tmp, 10, &timeout) != 0 + || timeout <= 0 + /* Ensure that we can multiply by 1000 without overflowing. */ + || timeout > INT_MAX / 1000) timeout = -1; break; diff --git a/src/internal.h b/src/internal.h index 4a31ea6..f6fb1c5 100644 --- a/src/internal.h +++ b/src/internal.h @@ -264,6 +264,25 @@ xstrtol_i(char const *s, char **end_ptr, int base, int *result) return 0; } +/* Just like xstrtol_i, above, but produce an "unsigned int" value. */ +static inline int +xstrtol_ui(char const *s, char **end_ptr, int base, unsigned int *result) +{ + unsigned long int val; + char *p; + int err; + + errno = 0; + val = strtoul(s, &p, base); + err = (errno || (!end_ptr && *p) || p == s || (unsigned int) val != val); + if (end_ptr) + *end_ptr = p; + if (err) + return -1; + *result = val; + return 0; +} + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 01d7e28..a0a26eb 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -63,6 +63,8 @@ int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, virNodeInfoPtr n } nodeinfo->cpus++; } else if (STREQLEN(buf, "cpu MHz", 7)) { + char *p; + unsigned int ui; buf += 9; while (*buf && isspace(*buf)) buf++; @@ -72,8 +74,12 @@ int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, virNodeInfoPtr n "parsing cpuinfo cpu MHz"); return -1; } - nodeinfo->mhz = (unsigned int)strtol(buf+1, NULL, 10); + if (xstrtol_ui(buf+1, &p, 10, &ui) == 0 + /* Accept trailing fractional part. */ + && (*p == '\0' || *p == '.' || isspace(*p))) + nodeinfo->mhz = ui; } else if (STREQLEN(buf, "cpu cores", 9)) { /* aka cores */ + char *p; unsigned int id; buf += 9; while (*buf && isspace(*buf)) @@ -84,8 +90,9 @@ int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, virNodeInfoPtr n "parsing cpuinfo cpu cores %c", *buf); return -1; } - id = (unsigned int)strtol(buf+1, NULL, 10); - if (id > nodeinfo->cores) + if (xstrtol_ui(buf+1, &p, 10, &id) == 0 + && (*p == '\0' || isspace(*p)) + && id > nodeinfo->cores) nodeinfo->cores = id; } } @@ -108,14 +115,21 @@ int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, virNodeInfoPtr n } -int linuxNodeInfoMemPopulate(virConnectPtr conn, FILE *meminfo, virNodeInfoPtr nodeinfo) { +int linuxNodeInfoMemPopulate(virConnectPtr conn, FILE *meminfo, + virNodeInfoPtr nodeinfo) { char line[1024]; nodeinfo->memory = 0; while (fgets(line, sizeof(line), meminfo) != NULL) { if (STREQLEN(line, "MemTotal:", 9)) { - nodeinfo->memory = (unsigned int)strtol(line + 10, NULL, 10); + char *p; + unsigned int ui; + if (xstrtol_ui(line + 10, &p, 10, &ui) == 0 + && (*p == '\0' || isspace(*p))) { + nodeinfo->memory = ui; + break; + } } } if (!nodeinfo->memory) { -- 1.5.3.5.643.g40e25

2 2

[Libvir] [PATCH] Arrange for tests to pass in a non-srcdir build.
by Jim Meyering 13 Nov '07

13 Nov '07

Most of the tests assumed that $(srcdir) == . This makes it so "make check" passes in a non-srcdir build, i.e., "mkdir build && cd build && ../configure && make && make check" Arrange for tests to pass in a non-srcdir build. * tests/Makefile.am: Include the contents of the *data directories in the make-dist-built tarball by adding each of that *data directories to EXTRA_DIST. Also add int-overflow (via $(test_scripts)) to EXTRA_DIST. * tests/nodeinfotest.c: Prepend "$abs_top_srcdir/tests" to each input file name. * tests/qemuxml2argvtest.c: Likewise. * tests/qemuxml2xmltest.c: Likewise. * tests/sexpr2xmltest.c: Likewise. * tests/test_conf.sh: Likewise. * tests/virshtest.c: Likewise. * tests/xencapstest.c: Likewise. * tests/xmconfigtest.c: Likewise. * tests/xml2sexprtest.c: Likewise. --- tests/Makefile.am | 18 ++++++++++++++++-- tests/nodeinfotest.c | 14 +++++++++++--- tests/qemuxml2argvtest.c | 11 +++++++++-- tests/qemuxml2xmltest.c | 8 +++++++- tests/sexpr2xmltest.c | 13 ++++++++++++- tests/test_conf.sh | 5 +++-- tests/virshtest.c | 13 +++++++++---- tests/xencapstest.c | 22 +++++++++++++++++++--- tests/xmconfigtest.c | 21 +++++++++++++++++++-- tests/xml2sexprtest.c | 13 ++++++++++++- 10 files changed, 117 insertions(+), 21 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 8a472f8..fec2f20 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -31,15 +31,29 @@ LDADDS = \ $(LIBVIRT) \ $(COVERAGE_LDFLAGS) -EXTRA_DIST = xmlrpcserver.py test_conf.sh +EXTRA_DIST = \ + xmlrpcserver.py \ + test_conf.sh \ + confdata \ + qemuxml2argvdata \ + xml2sexprdata \ + nodeinfodata \ + virshdata \ + xencapsdata \ + sexpr2xmldata \ + xmconfigdata noinst_PROGRAMS = xmlrpctest xml2sexprtest sexpr2xmltest virshtest conftest \ reconnect xmconfigtest xencapstest qemuxml2argvtest qemuxml2xmltest \ nodeinfotest +test_scripts = \ + int-overflow +EXTRA_DIST += $(test_scripts) + TESTS = xml2sexprtest sexpr2xmltest virshtest test_conf.sh xmconfigtest \ xencapstest qemuxml2argvtest qemuxml2xmltest nodeinfotest \ - int-overflow + $(test_scripts) if ENABLE_XEN_TESTS TESTS += reconnect endif diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c index 604f5a4..8b22b71 100644 --- a/tests/nodeinfotest.c +++ b/tests/nodeinfotest.c @@ -10,6 +10,7 @@ #include "nodeinfo.h" static char *progname; +static char *abs_top_srcdir; #define MAX_FILE 4096 @@ -67,9 +68,12 @@ static int linuxTestNodeInfo(const void *data) { char cpuinfo[PATH_MAX]; char meminfo[PATH_MAX]; char output[PATH_MAX]; - snprintf(cpuinfo, PATH_MAX, "nodeinfodata/linux-%s.cpuinfo", (const char*)data); - snprintf(meminfo, PATH_MAX, "nodeinfodata/linux-%s.meminfo", (const char*)data); - snprintf(output, PATH_MAX, "nodeinfodata/linux-%s.txt", (const char*)data); + snprintf(cpuinfo, PATH_MAX, "%s/tests/nodeinfodata/linux-%s.cpuinfo", + abs_top_srcdir, (const char*)data); + snprintf(meminfo, PATH_MAX, "%s/tests/nodeinfodata/linux-%s.meminfo", + abs_top_srcdir, (const char*)data); + snprintf(output, PATH_MAX, "%s/tests/nodeinfodata/linux-%s.txt", + abs_top_srcdir, (const char*)data); return linuxTestCompareFiles(cpuinfo, meminfo, output); } #endif @@ -90,6 +94,10 @@ main(int argc, char **argv) "nodeinfo-6", }; + abs_top_srcdir = getenv("abs_top_srcdir"); + if (!abs_top_srcdir) + return EXIT_FAILURE; + progname = argv[0]; if (argc > 1) { diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index a91cd03..052f3f3 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -9,6 +9,7 @@ #include "internal.h" static char *progname; +static char *abs_top_srcdir; struct qemud_driver driver; #define MAX_FILE 4096 @@ -93,8 +94,10 @@ static int testCompareXMLToArgvFiles(const char *xml, const char *cmd) { static int testCompareXMLToArgvHelper(const void *data) { char xml[PATH_MAX]; char args[PATH_MAX]; - snprintf(xml, PATH_MAX, "qemuxml2argvdata/qemuxml2argv-%s.xml", (const char*)data); - snprintf(args, PATH_MAX, "qemuxml2argvdata/qemuxml2argv-%s.args", (const char*)data); + snprintf(xml, PATH_MAX, "%s/tests/qemuxml2argvdata/qemuxml2argv-%s.xml", + abs_top_srcdir, (const char*)data); + snprintf(args, PATH_MAX, "%s/tests/qemuxml2argvdata/qemuxml2argv-%s.args", + abs_top_srcdir, (const char*)data); return testCompareXMLToArgvFiles(xml, args); } @@ -112,6 +115,10 @@ main(int argc, char **argv) exit(EXIT_FAILURE); } + abs_top_srcdir = getenv("abs_top_srcdir"); + if (!abs_top_srcdir) + return 1; + if (virtTestRun("QEMU XML-2-ARGV minimal", 1, testCompareXMLToArgvHelper, "minimal") < 0) ret = -1; diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 59eaf8a..11d8239 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -9,6 +9,7 @@ #include "internal.h" static char *progname; +static char *abs_top_srcdir; struct qemud_driver driver; #define MAX_FILE 4096 @@ -59,7 +60,8 @@ static int testCompareXMLToXMLFiles(const char *xml) { static int testCompareXMLToXMLHelper(const void *data) { char xml[PATH_MAX]; - snprintf(xml, PATH_MAX, "qemuxml2argvdata/qemuxml2argv-%s.xml", (const char*)data); + snprintf(xml, PATH_MAX, "%s/tests/qemuxml2argvdata/qemuxml2argv-%s.xml", + abs_top_srcdir, (const char*)data); return testCompareXMLToXMLFiles(xml); } @@ -76,6 +78,10 @@ main(int argc, char **argv) exit(EXIT_FAILURE); } + abs_top_srcdir = getenv("abs_top_srcdir"); + if (!abs_top_srcdir) + return 1; + if (virtTestRun("QEMU XML-2-ARGV minimal", 1, testCompareXMLToXMLHelper, "minimal") < 0) ret = -1; diff --git a/tests/sexpr2xmltest.c b/tests/sexpr2xmltest.c index eda1397..563941b 100644 --- a/tests/sexpr2xmltest.c +++ b/tests/sexpr2xmltest.c @@ -8,16 +8,23 @@ #include "internal.h" static char *progname; +static char *abs_top_srcdir; #define MAX_FILE 4096 -static int testCompareFiles(const char *xml, const char *sexpr, int xendConfigVersion) { +static int testCompareFiles(const char *xml_rel, const char *sexpr_rel, + int xendConfigVersion) { char xmlData[MAX_FILE]; char sexprData[MAX_FILE]; char *gotxml = NULL; char *xmlPtr = &(xmlData[0]); char *sexprPtr = &(sexprData[0]); int ret = -1; + char xml[PATH_MAX]; + char sexpr[PATH_MAX]; + + snprintf(xml, sizeof xml - 1, "%s/tests/%s", abs_top_srcdir, xml_rel); + snprintf(sexpr, sizeof sexpr - 1, "%s/tests/%s", abs_top_srcdir, sexpr_rel); if (virtTestLoadFile(xml, &xmlPtr, MAX_FILE) < 0) goto fail; @@ -175,6 +182,10 @@ main(int argc, char **argv) exit(EXIT_FAILURE); } + abs_top_srcdir = getenv("abs_top_srcdir"); + if (!abs_top_srcdir) + return 1; + if (virtTestRun("SEXPR-2-XML PV config (version 1)", 1, testComparePVversion1, NULL) != 0) ret = -1; diff --git a/tests/test_conf.sh b/tests/test_conf.sh index b5a6366..7735a66 100755 --- a/tests/test_conf.sh +++ b/tests/test_conf.sh @@ -1,9 +1,10 @@ #!/bin/bash +set -x NOK=0 -for f in confdata/*.conf +for f in $abs_top_srcdir/tests/confdata/*.conf do ./conftest $f > conftest.$$ - outfile=`echo $f | sed s+\.conf+\.out+` + outfile=`echo "$f" | sed s+\.conf$+\.out+` diff $outfile conftest.$$ > /dev/null if [ $? != 0 ] then diff --git a/tests/virshtest.c b/tests/virshtest.c index dc33c27..e26ef5c 100644 --- a/tests/virshtest.c +++ b/tests/virshtest.c @@ -9,6 +9,7 @@ #include "internal.h" static char *progname; +static char *abs_top_srcdir; #define MAX_FILE 4096 static int testFilterLine(char *buffer, @@ -27,11 +28,15 @@ static int testFilterLine(char *buffer, return 0; } -static int testCompareOutput(const char *expect, const char *filter, const char *const argv[]) { +static int testCompareOutput(const char *expect_rel, const char *filter, + const char *const argv[]) { char expectData[MAX_FILE]; char actualData[MAX_FILE]; char *expectPtr = &(expectData[0]); char *actualPtr = &(actualData[0]); + char expect[PATH_MAX]; + + snprintf(expect, sizeof expect - 1, "%s/tests/%s", abs_top_srcdir, expect_rel); if (virtTestLoadFile(expect, &expectPtr, MAX_FILE) < 0) return -1; @@ -268,13 +273,13 @@ int main(int argc, char **argv) { int ret = 0; - char cwd[PATH_MAX]; char buffer[PATH_MAX]; - if (!getcwd(cwd, PATH_MAX-1)) + abs_top_srcdir = getenv("abs_top_srcdir"); + if (!abs_top_srcdir) return 1; - snprintf(buffer, PATH_MAX-1, "test://%s/../docs/testnode.xml", cwd); + snprintf(buffer, PATH_MAX-1, "test://%s/docs/testnode.xml", abs_top_srcdir); buffer[PATH_MAX-1] = '\0'; progname = argv[0]; custom_uri = buffer; diff --git a/tests/xencapstest.c b/tests/xencapstest.c index 418bb7d..5744262 100644 --- a/tests/xencapstest.c +++ b/tests/xencapstest.c @@ -13,13 +13,14 @@ #include "xen_internal.h" static char *progname; +static char *abs_top_srcdir; #define MAX_FILE 4096 static int testCompareFiles(const char *hostmachine, - const char *xml, - const char *cpuinfo, - const char *capabilities) { + const char *xml_rel, + const char *cpuinfo_rel, + const char *capabilities_rel) { char xmlData[MAX_FILE]; char *expectxml = &(xmlData[0]); char *actualxml = NULL; @@ -27,6 +28,17 @@ static int testCompareFiles(const char *hostmachine, int ret = -1; + char xml[PATH_MAX]; + char cpuinfo[PATH_MAX]; + char capabilities[PATH_MAX]; + + snprintf(xml, sizeof xml - 1, "%s/tests/%s", + abs_top_srcdir, xml_rel); + snprintf(cpuinfo, sizeof cpuinfo - 1, "%s/tests/%s", + abs_top_srcdir, cpuinfo_rel); + snprintf(capabilities, sizeof capabilities - 1, "%s/tests/%s", + abs_top_srcdir, capabilities_rel); + if (virtTestLoadFile(xml, &expectxml, MAX_FILE) < 0) goto fail; @@ -152,6 +164,10 @@ main(int argc, char **argv) exit(EXIT_FAILURE); } + abs_top_srcdir = getenv("abs_top_srcdir"); + if (!abs_top_srcdir) + return 1; + virInitialize(); if (virtTestRun("Capabilities for i686, no PAE, no HVM", diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c index 524ef52..10024b9 100644 --- a/tests/xmconfigtest.c +++ b/tests/xmconfigtest.c @@ -32,10 +32,12 @@ #include "conf.h" static char *progname; +static char *abs_top_srcdir; #define MAX_FILE 4096 -static int testCompareParseXML(const char *xmcfg, const char *xml, int xendConfigVersion) { +static int testCompareParseXML(const char *xmcfg_rel, const char *xml_rel, + int xendConfigVersion) { char xmlData[MAX_FILE]; char xmcfgData[MAX_FILE]; char gotxmcfgData[MAX_FILE]; @@ -48,6 +50,11 @@ static int testCompareParseXML(const char *xmcfg, const char *xml, int xendConfi int wrote = MAX_FILE; void *old_priv; struct _xenUnifiedPrivate priv; + char xmcfg[PATH_MAX]; + char xml[PATH_MAX]; + + snprintf(xmcfg, sizeof xmcfg - 1, "%s/tests/%s", abs_top_srcdir, xmcfg_rel); + snprintf(xml, sizeof xml - 1, "%s/tests/%s", abs_top_srcdir, xml_rel); conn = virConnectOpenReadOnly("test:///default"); if (!conn) goto fail; @@ -92,7 +99,8 @@ static int testCompareParseXML(const char *xmcfg, const char *xml, int xendConfi return ret; } -static int testCompareFormatXML(const char *xmcfg, const char *xml, int xendConfigVersion) { +static int testCompareFormatXML(const char *xmcfg_rel, const char *xml_rel, + int xendConfigVersion) { char xmlData[MAX_FILE]; char xmcfgData[MAX_FILE]; char *xmlPtr = &(xmlData[0]); @@ -103,6 +111,11 @@ static int testCompareFormatXML(const char *xmcfg, const char *xml, int xendConf virConnectPtr conn; void *old_priv; struct _xenUnifiedPrivate priv; + char xmcfg[PATH_MAX]; + char xml[PATH_MAX]; + + snprintf(xmcfg, sizeof xmcfg - 1, "%s/tests/%s", abs_top_srcdir, xmcfg_rel); + snprintf(xml, sizeof xml - 1, "%s/tests/%s", abs_top_srcdir, xml_rel); conn = virConnectOpenReadOnly("test:///default"); if (!conn) goto fail; @@ -259,6 +272,10 @@ main(int argc, char **argv) exit(EXIT_FAILURE); } + abs_top_srcdir = getenv("abs_top_srcdir"); + if (!abs_top_srcdir) + return 1; + /* Config -> XML */ if (virtTestRun("Paravirt old PVFB (Format)", 1, testCompareParavirtOldPVFBFormat, NULL) != 0) diff --git a/tests/xml2sexprtest.c b/tests/xml2sexprtest.c index 2fcc6b3..4b356d4 100644 --- a/tests/xml2sexprtest.c +++ b/tests/xml2sexprtest.c @@ -9,10 +9,12 @@ #include "internal.h" static char *progname; +static char *abs_top_srcdir; #define MAX_FILE 4096 -static int testCompareFiles(const char *xml, const char *sexpr, const char *name, int xendConfigVersion) { +static int testCompareFiles(const char *xml_rel, const char *sexpr_rel, + const char *name, int xendConfigVersion) { char xmlData[MAX_FILE]; char sexprData[MAX_FILE]; char *gotname = NULL; @@ -20,6 +22,11 @@ static int testCompareFiles(const char *xml, const char *sexpr, const char *name char *xmlPtr = &(xmlData[0]); char *sexprPtr = &(sexprData[0]); int ret = -1; + char xml[PATH_MAX]; + char sexpr[PATH_MAX]; + + snprintf(xml, sizeof xml - 1, "%s/tests/%s", abs_top_srcdir, xml_rel); + snprintf(sexpr, sizeof sexpr - 1, "%s/tests/%s", abs_top_srcdir, sexpr_rel); if (virtTestLoadFile(xml, &xmlPtr, MAX_FILE) < 0) goto fail; @@ -225,6 +232,10 @@ main(int argc, char **argv) progname = argv[0]; + abs_top_srcdir = getenv("abs_top_srcdir"); + if (!abs_top_srcdir) + return 1; + if (argc > 1) { fprintf(stderr, "Usage: %s\n", progname); exit(EXIT_FAILURE); -- 1.5.3.5.643.g40e25

2 1

[Libvir] bug #384443 - packages for virt-install and virt-manager
by Richard W.M. Jones 13 Nov '07

13 Nov '07

1 1

[Libvir] [PATCH] Make qemud's install-init rule work in a non-srcdir build.
by Jim Meyering 13 Nov '07

13 Nov '07

When building from other than the source directory, several things currently fail. This one fails because $(srcdir)/libvirtd.init doesn't exist. The libvirtd.init file we want to install is the one just built, in the current directory. Here's the fix: Make qemud's install-init rule work in a non-srcdir build. * qemud/Makefile.am: In the install-init, remove an unneeded $(srcdir)/ prefix. --- qemud/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/qemud/Makefile.am b/qemud/Makefile.am index 506fde5..3da6265 100644 --- a/qemud/Makefile.am +++ b/qemud/Makefile.am @@ -95,7 +95,7 @@ remote_dispatch_proc_switch.h: remote_generate_stubs.pl remote_protocol.x if LIBVIRT_INIT_SCRIPTS_RED_HAT install-init: libvirtd.init mkdir -p $(DESTDIR)$(sysconfdir)/rc.d/init.d - $(INSTALL_SCRIPT) $(srcdir)/libvirtd.init $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd + $(INSTALL_SCRIPT) libvirtd.init $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd mkdir -p $(DESTDIR)$(sysconfdir)/sysconfig $(INSTALL_SCRIPT) $(srcdir)/libvirtd.sysconf $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd -- 1.5.3.5.643.g40e25

2 2

[Libvir] bug #384300 - libvirt package for Debian
by Richard W.M. Jones 13 Nov '07

13 Nov '07

This is a libvirt package for Debian. It's derived from the Ubuntu libvirt package, rebuilt for Debian testing. I'm not the greatest Debian packager in the world, so any comments / feedback are welcome. The previous patch to the base Xen package is also required before this can be built. Source: http://et.redhat.com/~rjones/debian-libvirt/libvirt_0.3.3.orig.tar.gz http://et.redhat.com/~rjones/debian-libvirt/libvirt_0.3.3-1_i386.changes http://et.redhat.com/~rjones/debian-libvirt/libvirt_0.3.3-1.dsc http://et.redhat.com/~rjones/debian-libvirt/libvirt_0.3.3-1.diff.gz Binary for i386: http://et.redhat.com/~rjones/debian-libvirt/libvirt-bin_0.3.3-1_i386.deb http://et.redhat.com/~rjones/debian-libvirt/libvirt-dev_0.3.3-1_i386.deb http://et.redhat.com/~rjones/debian-libvirt/libvirt0_0.3.3-1_i386.deb http://et.redhat.com/~rjones/debian-libvirt/python-libvirt_0.3.3-1_i386.deb There is a Debian ITP for libvirt here: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=384300 Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

1 0

[Libvir] [PATCH] bug #402249 - include <xen/*.h> header files
by Richard W.M. Jones 13 Nov '07

13 Nov '07

When you build Xen from source, the "make install" rule installs extra header files such as <xen/xen.h> and <xen/dom0_ops.h> which are all required for building libvirt. However the Debian package doesn't run the install rule, but instead runs (effectively) "make -C tools install" and that only installs a partial set of header files. In particular none of the vital public Xen header files are installed, making it impossible to build libvirt, and probably other stuff as well. This patch fixes that by copying the required files by hand: http://et.redhat.com/~rjones/debian-libvirt/debian-xen-includes.patch (It is similar to what the Fedora RPM does, faced with the same situation). There is a bug which is somewhat related to this issue: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=402249 Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

1 0

[Libvir] [PATCH] conftest: fix transposed size and count arguments to fwrite.
by Jim Meyering 12 Nov '07

12 Nov '07

I noticed conftest fail and tracked it down to this: conftest: fix transposed size and count arguments to fwrite. * tests/conftest.c: Include <string.h> and <errno.h>. Also include strerror in diagnostic. --- tests/conftest.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/conftest.c b/tests/conftest.c index 604e410..9c8e3a6 100644 --- a/tests/conftest.c +++ b/tests/conftest.c @@ -1,6 +1,8 @@ #include <unistd.h> #include <stdlib.h> #include <stdio.h> +#include <string.h> +#include <errno.h> #include "conf.h" int main(int argc, char **argv) { @@ -25,8 +27,8 @@ int main(int argc, char **argv) { exit(3); } virConfFree(conf); - if (fwrite(buffer, len, 1, stdout) != len) { - fprintf(stderr, "Write failed\n"); + if (fwrite(buffer, 1, len, stdout) != len) { + fprintf(stderr, "Write failed: %s\n", strerror (errno)); exit(1); } exit(0); -- 1.5.3.5.643.g40e25

2 2

[Libvir] Question about specifications of virsh start
by Masayuki Sunou 12 Nov '07

12 Nov '07

Hi I have a question about specifications of virsh start. It is necessary to remove "type=ioemu" from the configuration file of Xen, when HVM domain installed Para Virtualized Driver use unmodified driver on Xen 3.0.3. But,libvirt always adds "type=ioemu" to vif of HVM domain in xm_internal.c. Therefore virsh start cannot start correctly HVM domain installed Para Virtualized Driver. Could you teach why does libvirt disregard setting of configuration file and set type=ioemu ? Thanks, Masayuki Sunou.

3 4

[Libvir] [PATCH] missing printf attributes
by Jim Meyering 08 Nov '07

08 Nov '07

I stumbled across two more missing printf attributes: 2007-11-08 Jim Meyering <meyering(a)redhat.com> * src/virsh.c (vshPrintExtra, vshDebug): Use gcc's printf attribute. Attaching differently, in an attempt to defy mailman-2.1.5:

2 1

[Libvir] Re: [collectd] collectd libvirtstats plugin
by Florian Forster 08 Nov '07

08 Nov '07

Hi Rich, as promised, I've taken a more in-depth look at the `libvirtstats' plugin (I've adopted this as a working title for now and will do the renaming on the weekend or so..) and it looks very good, thanks again :) The `_virDomainInfo' structure has the members `memory' and `maxMem'. Can one calculate `unused' or `free' (or whatever the preferred term in this particular case is) memory using `maxMem - memory'? Would that be an interesting metric? I'm not sure what the best way to store the CPU usage is. Is the `cpuTime' member of the `_virDomainInfo' structure the same as the sum over all `(struct _virVcpuInfo).cpuTime'? Does collecting the total make sense in this case? I'd much rather use the same `type' for ``normal'' CPU statistics and this case which would be much simpler if we didn't collect the total.. I've done some minor things while looking through the code. It basically a mix of coding style and personal convention. Since there's no Debian package yet I didn't install try to compile it yet. I'll install the library and fix the errors I've made as soon as I have some more spare time. The things I've changed are basically: - Rather use `sizeof (array);' than the `DATA_MAX_NAME_LEN' define. - NULL-terminate the strings unconditionally after `strncpy' or `snprintf' was used. - Rather use -- 8< -- if (status != 0) { handle_error (); } -- >8 -- than -- 8< -- if (status == -1) { handle_error (); } -- >8 -- On Mon, Nov 05, 2007 at 02:00:12PM +0000, Richard W.M. Jones wrote: > In the types.db, I have set the max for virt_cpu_total to be > 256,000,000,000. [...] Therefore I have assumed here that > max CPUs = 256. That's basically the reason why I'd rather collect each virtual CPU in a separate file and ``simply'' combine the graphs. This will work for n+1 CPUs ;) > I'm using CSV output, which works, but it seems to report the > aggregate counter values instead of the differences. Is that to be > expected? Yes, that is expected. The changes I've made for the next feature release (4.3) include an easy way to get the rates for a counter value. So I will certainly add an option to store rates instead. Regards, -octo -- Florian octo Forster Hacker in training GnuPG: 0x91523C3D http://verplant.org/

2 1

Re: [Libvir] [PATCH] * src/virsh.c (vshCommandOptInt): Correct indentation
by Jim Meyering 08 Nov '07

08 Nov '07

Well, mailman-2.1.5 mangled yet another of my messages. [ I know why, and have reported the bug. Maybe we'll get a fixed/newer version of mailman. ] But at least the patch got through. Here's the part that it removed: Here's a tiny patch to fix indentation, since I'm about to change the code in that area, I'm submitting this first, so we don't mix syntax-only changes with ones that change semantics. The last two times I tried to send an attachment, mailman removed them. I'll try one more time, with this one: Jim Meyering <meyering(a)redhat.com> wrote: > Signed-off-by: Jim Meyering <meyering(a)redhat.com> > --- > ChangeLog | 4 ++++ > src/virsh.c | 10 +++++----- > 2 files changed, 9 insertions(+), 5 deletions(-) > > diff --git a/ChangeLog b/ChangeLog > index ce68401..a6de485 100644 > --- a/ChangeLog > +++ b/ChangeLog > @@ -1,3 +1,7 @@ > +2007-11-08 Jim Meyering <meyering(a)redhat.com> > + > + * src/virsh.c (vshCommandOptInt): Correct indentation > + > Wed Nov 7 14:38:43 CET 2007 Daniel Veillard <veillard(a)redhat.com> > > * docs/libvir.html docs/site.xsl: small updates with references > diff --git a/src/virsh.c b/src/virsh.c > index 0615a7d..852dea2 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 Red Hat, Inc. > + * Copyright (C) 2005, 2007 Red Hat, Inc. > * > * See COPYING.LIB for the License of this software > * > @@ -3956,10 +3956,10 @@ vshCommandOptInt(vshCmd * cmd, const char *name, int *found) > > if ((arg != NULL) && (arg->data != NULL)) { > res = strtol(arg->data, &end_p, 10); > - if ((arg->data == end_p) || (*end_p!= 0)) > - num_found = FALSE; > - else > - num_found = TRUE; > + if ((arg->data == end_p) || (*end_p!= 0)) > + num_found = FALSE; > + else > + num_found = TRUE; > } > if (found) > *found = num_found;

2 1

[Libvir] fix misleading indentation
by Jim Meyering 08 Nov '07

08 Nov '07

Here's a tiny patch to fix indentation, since I'm about to change the code in that area, I'm submitting this first, so we don't mix syntax-only changes with ones that change semantics. The last two times I tried to send an attachment, mailman removed them. I'll try one more time, with this one:

1 0

[Libvir] Strange warnings with gcc 4.1.2
by Richard W.M. Jones 07 Nov '07

07 Nov '07

This is with libvirt from CVS. They don't look like errors to me though... ------------ In function ‘open’, inlined from ‘readFile’ at virsh.c:850: /usr/include/bits/fcntl2.h:45: error: call to ‘__open_too_many_args’ declared with attribute error: open can be called either with 2 or 3 arguments, not more /usr/include/bits/fcntl2.h:51: error: call to ‘__open_missing_mode’ declared with attribute error: open with O_CREAT in second argument needs 3 arguments The code in question is: if ((fd = open(filename, O_RDONLY)) == -1) { Not a newly created file, so mode isn't needed AFAICS. ------------ In function ‘read’, inlined from ‘readFile’ at virsh.c:864: /usr/include/bits/unistd.h:43: warning: call to ‘__read_chk_warn’ declared with attribute warning: read called with bigger length than size of the destination buffer The code in question is: char buffer[1024]; char *new; int ret; if ((ret = read(fd, buffer, sizeof(buffer))) == 0) break; Also seems correct to me. ------------ Other warnings: virsh.c: In function ‘cmdSchedinfo’: virsh.c:1138: warning: ‘weight’ may be used uninitialized in this function virsh.c:1140: warning: ‘cap’ may be used uninitialized in this function For some reason gcc appears to have lots its ability to do the data flow analysis to find out that these warnings are bogus. In any case the fix is trivial: Index: src/virsh.c =================================================================== RCS file: /data/cvs/libvirt/src/virsh.c,v retrieving revision 1.105 diff -u -r1.105 virsh.c --- src/virsh.c 6 Nov 2007 09:41:18 -0000 1.105 +++ src/virsh.c 7 Nov 2007 12:37:07 -0000 @@ -1135,9 +1135,9 @@ int nr_inputparams = 0; int inputparams = 0; int weightfound = 0; - int weight; + int weight = 0; int capfound = 0; - int cap; + int cap = 0; char str_weight[] = "weight"; char str_cap[] = "cap"; int ret_val = FALSE; Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

2 3

[Libvir] PATCH: Avoid format string abuse (also avoids gcc warnings).
by Jim Meyering 07 Nov '07

07 Nov '07

This patch was prompted by warnings like this: util.c:56: warning: format not a string literal and no format arguments and they're legitimate. Imagine a format string contains "%%..." goes through the vnsprintf call, which reduces it to "%...". If the result string is then passed to __virRaiseError as the format string, then *boom*. Instead, use "%s" as the format, with the non-literal as the matching argument. Patch below. I searched the sources for %% and *did* find one potential problem: $ git-grep -B1 %% > k po/ms.po-msgid "too many drivers registered in %s" po/ms.po:msgstr "terlalu banyak spesifikasi penukaran %% pada suffiks" -- src/xend_internal.c- case '\n': src/xend_internal.c: snprintf(ptr, 4, "%%%02x", string[i]); since "% p" does happen to be a valid format string! So if someone using Malaysian messages provoked that particular diagnostic in a code path that takes it through __virRaiseError, bad things might happen. Big "if", of course :-) I didn't try. 2007-11-06 Jim Meyering <meyering(a)redhat.com> Avoid risk of format string abuse (also avoids gcc warnings). * src/util.c (ReportError): Use a literal "%s" format string. * src/remote_internal.c (server_error): Likewise. * src/qemu_conf.c (qemudReportError): Likewise.

3 3

[Libvir] PATCH: Avoid format string abuse (also avoids gcc warnings).
by Jim Meyering 06 Nov '07

06 Nov '07

[resending with the patch in-line, not as an attachment -- mailman removed my attached patch the first time! Bad mailman. Bad. ] This patch was prompted by warnings like this: util.c:56: warning: format not a string literal and no format arguments and they're legitimate. Imagine a format string contains "%%..." goes through the vnsprintf call, which reduces it to "%...". If the result string is then passed to __virRaiseError as the format string, then *boom*. Instead, use "%s" as the format, with the non-literal as the matching argument. Patch below. I searched the sources for %% and *did* find one potential problem: $ git-grep -B1 %% > k po/ms.po-msgid "too many drivers registered in %s" po/ms.po:msgstr "terlalu banyak spesifikasi penukaran %% pada suffiks" -- src/xend_internal.c- case '\n': src/xend_internal.c: snprintf(ptr, 4, "%%%02x", string[i]); since "% p" does happen to be a valid format string! So if someone using Malaysian messages provoked that particular diagnostic in a code path that takes it through __virRaiseError, bad things might happen. Big "if", of course :-) I didn't try. 2007-11-06 Jim Meyering <meyering(a)redhat.com> Avoid risk of format string abuse (also avoids gcc warnings). * src/util.c (ReportError): Use a literal "%s" format string. * src/remote_internal.c (server_error): Likewise. * src/qemu_conf.c (qemudReportError): Likewise. ----------------------------- >From 8e0cafec021ba3cbec55a4d691f19c14ed9e587f Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 6 Nov 2007 20:14:21 +0100 Subject: [PATCH] Avoid risk of format string abuse (also avoids gcc warnings). * src/util.c (ReportError): Use a literal "%s" format string. * src/remote_internal.c (server_error): Likewise. * src/qemu_conf.c (qemudReportError): Likewise. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- ChangeLog | 7 +++++++ src/qemu_conf.c | 2 +- src/remote_internal.c | 2 +- src/util.c | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 511ed6a..535173d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-11-06 Jim Meyering <meyering(a)redhat.com> + + Avoid risk of format string abuse (also avoids gcc warnings). + * src/util.c (ReportError): Use a literal "%s" format string. + * src/remote_internal.c (server_error): Likewise. + * src/qemu_conf.c (qemudReportError): Likewise. + Tue Nov 6 17:24:16 CET 2007 Daniel Veillard <veillard(a)redhat.com> * src/xs_internals.c: patch from Chris Lalancette, forgot to diff --git a/src/qemu_conf.c b/src/qemu_conf.c index 78f4699..3556a9a 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -64,7 +64,7 @@ void qemudReportError(virConnectPtr conn, errorMessage[0] = '\0'; } __virRaiseError(conn, dom, net, VIR_FROM_QEMU, code, VIR_ERR_ERROR, - NULL, NULL, NULL, -1, -1, errorMessage); + NULL, NULL, NULL, -1, -1, "%s", errorMessage); } int qemudLoadDriverConfig(struct qemud_driver *driver, diff --git a/src/remote_internal.c b/src/remote_internal.c index 3af326f..1420a88 100644 --- a/src/remote_internal.c +++ b/src/remote_internal.c @@ -3073,7 +3073,7 @@ server_error (virConnectPtr conn, remote_error *err) err->domain, err->code, err->level, str1, str2, str3, err->int1, err->int2, - message); + "%s", message); } /* get_nonnull_domain and get_nonnull_network turn an on-wire diff --git a/src/util.c b/src/util.c index eb57859..c964a63 100644 --- a/src/util.c +++ b/src/util.c @@ -53,7 +53,7 @@ ReportError(virConnectPtr conn, errorMessage[0] = '\0'; } __virRaiseError(conn, dom, net, VIR_FROM_NONE, code, VIR_ERR_ERROR, - NULL, NULL, NULL, -1, -1, errorMessage); + NULL, NULL, NULL, -1, -1, "%s", errorMessage); } static int virSetCloseExec(int fd) { -- 1.5.3.5.561.g140d

1 0

[Libvir] [PATCH]: Fix build warning in xs_internal.c
by Chris Lalancette 06 Nov '07

06 Nov '07

All, Attached is a trivial patch to fix a build warning in xs_internal.c; basically the xenUnifiedDriver structure doesn't have a domainDumpXML method, so we had one too many NULLs. Signed-off-by: Chris Lalancette <clalance(a)redhat.com>

2 1