- Devel - libvirt List Archives

[libvirt] libvirt and redis
by B Gordon 26 Apr '11

26 Apr '11

Is there interest in teaching libvirt to store configs in a DB? I'd like to talk out what's desirable in the scope and design with someone who knows libvirt. My eventual goal is to synchronize config between multiple libvirtds using Redis. I've been playing with a prototype that abstracts config writing and reading into handlers that can be selected at run time or from libvirtd.conf. This was to get me some familiarity--please tell me what aspects I should change to suit the rest of libvirt. The high-level, emphasizing the more questionable aspects: * "conf drivers" that cargo-cult the jargon used in "drivers" a bit even though they (currently) aren't quite a fit with the way current ones are used. * One global conf driver, because it needs to be accessed in other state drivers when a connection is not currently present in the API. * conf drivers present a file system-like key/value API to the rest of libvirt to minimize disruption. They receive an XML string to store and must be able to list the keys in a given "directory". Retrieval is done by passing an optional callback to xml.c that it will use instead of xmlCtxtReadFile(). * Keys should probably not include the full sysconfdir path, and many other ways the prototype is too FS-like. * With a relational DB, API calls to store each type of libvirt struct might make more sense than formatted XML strings. I have not tried to do this and vaguely hope that working with XML in a relational DB would be acceptable or that those calls could be added later. Using the DB's native XML handling might better for abstraction, actually. * The conf driver needs a way to receive parameters from libvirtd.conf. URI parsing? Some other key-value format? As a low-level example, here's my (current, expected to change based on feedback!) conversion of domain_conf.c: diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b6aaf33..0c7bb3c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -47,6 +47,7 @@ #include "storage_file.h" #include "files.h" #include "bitmap.h" +#include "conf_driver.h" #define VIR_FROM_THIS VIR_FROM_DOMAIN @@ -6158,7 +6159,7 @@ virDomainDefParse(const char *xmlStr, xmlDocPtr xml; virDomainDefPtr def = NULL; - if ((xml = virXMLParse(filename, xmlStr, "domain.xml"))) { + if ((xml = virConfParse(filename, xmlStr, "domain.xml"))) { def = virDomainDefParseNode(caps, xml, xmlDocGetRootElement(xml), flags); xmlFreeDoc(xml); } @@ -6245,7 +6246,7 @@ virDomainObjPtr virDomainObjParseFile(virCapsPtr caps, xmlDocPtr xml; virDomainObjPtr obj = NULL; - if ((xml = virXMLParseFile(filename))) { + if ((xml = virConfParse(filename, NULL, filename))) { obj = virDomainObjParseNode(caps, xml, xmlDocGetRootElement(xml)); xmlFreeDoc(xml); } @@ -8324,46 +8325,26 @@ int virDomainSaveXML(const char *configDir, const char *xml) { char *configFile = NULL; - int fd = -1, ret = -1; - size_t towrite; + int ret = -1; + int err; if ((configFile = virDomainConfigFile(configDir, def->name)) == NULL) goto cleanup; - if (virFileMakePath(configDir)) { - virReportSystemError(errno, + if ((err = virConfMakePath(configDir, 0))) { + virReportSystemError(err, _("cannot create config directory '%s'"), configDir); goto cleanup; } - if ((fd = open(configFile, - O_WRONLY | O_CREAT | O_TRUNC, - S_IRUSR | S_IWUSR )) < 0) { - virReportSystemError(errno, - _("cannot create config file '%s'"), - configFile); - goto cleanup; - } - - towrite = strlen(xml); - if (safewrite(fd, xml, towrite) < 0) { - virReportSystemError(errno, - _("cannot write config file '%s'"), - configFile); - goto cleanup; - } - - if (VIR_CLOSE(fd) < 0) { - virReportSystemError(errno, - _("cannot save config file '%s'"), - configFile); + if (virConfSave(configFile, xml, 0) < 0) { goto cleanup; } ret = 0; + cleanup: - VIR_FORCE_CLOSE(fd); VIR_FREE(configFile); return ret; @@ -8441,7 +8422,7 @@ static virDomainObjPtr virDomainLoadConfig(virCapsPtr caps, if ((autostartLink = virDomainConfigFile(autostartDir, name)) == NULL) goto error; - if ((autostart = virFileLinkPointsTo(autostartLink, configFile)) < 0) + if ((autostart = virConfLinkPointsTo(autostartLink, configFile, 0)) < 0) goto error; if (!(dom = virDomainAssignDef(caps, doms, def, false))) @@ -8514,12 +8495,12 @@ int virDomainLoadAllConfigs(virCapsPtr caps, virDomainLoadConfigNotify notify, void *opaque) { - DIR *dir; - struct dirent *entry; + virConfDirPtr dir; + virConfDirEntryPtr entry; VIR_INFO("Scanning for configs in %s", configDir); - if (!(dir = opendir(configDir))) { + if (!(dir = virConfOpenDir(configDir, 0))) { if (errno == ENOENT) return 0; virReportSystemError(errno, @@ -8528,23 +8509,17 @@ int virDomainLoadAllConfigs(virCapsPtr caps, return -1; } - while ((entry = readdir(dir))) { + while ((entry = virConfReadDir(dir, 0))) { virDomainObjPtr dom; - if (entry->d_name[0] == '.') - continue; - - if (!virFileStripSuffix(entry->d_name, ".xml")) - continue; - /* NB: ignoring errors, so one malformed config doesn't kill the whole process */ - VIR_INFO("Loading config file '%s.xml'", entry->d_name); + VIR_INFO("Loading config file '%s.xml'", entry->name); if (liveStatus) dom = virDomainLoadStatus(caps, doms, configDir, - entry->d_name, + entry->name, notify, opaque); else @@ -8552,7 +8527,7 @@ int virDomainLoadAllConfigs(virCapsPtr caps, doms, configDir, autostartDir, - entry->d_name, + entry->name, notify, opaque); if (dom) { @@ -8562,7 +8537,7 @@ int virDomainLoadAllConfigs(virCapsPtr caps, } } - closedir(dir); + virConfCloseDir(dir, 0); return 0; } @@ -8580,9 +8555,9 @@ int virDomainDeleteConfig(const char *configDir, goto cleanup; /* Not fatal if this doesn't work */ - unlink(autostartLink); + virConfDeletePath(autostartLink, 0); - if (unlink(configFile) < 0 && + if (virConfDeletePath(autostartLink, 0) < 0 && errno != ENOENT) { virReportSystemError(errno, _("cannot remove config %s"), @@ -8863,7 +8838,7 @@ virDomainSnapshotDefPtr virDomainSnapshotDefParseString(const char *xmlStr, char *creation = NULL, *state = NULL; struct timeval tv; - xml = virXMLParse(NULL, xmlStr, "domainsnapshot.xml"); + xml = virXMLParseString(xmlStr, "domainsnapshot.xml"); if (!xml) { virDomainReportError(VIR_ERR_XML_ERROR, "%s",_("failed to parse snapshot xml document")); -- http://www.fastmail.fm - Choose from over 50 domains or use your own

1 0

[libvirt] [PATCH] qemu: Add flags checking in DomainCoreDump
by Jiri Denemark 26 Apr '11

26 Apr '11

--- src/qemu/qemu_driver.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f6e503a..f35616d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2345,7 +2345,8 @@ getCompressionType(struct qemud_driver *driver) static int qemudDomainCoreDump(virDomainPtr dom, const char *path, - int flags ATTRIBUTE_UNUSED) { + int flags) +{ struct qemud_driver *driver = dom->conn->privateData; virDomainObjPtr vm; int resume = 0, paused = 0; @@ -2353,6 +2354,8 @@ static int qemudDomainCoreDump(virDomainPtr dom, virDomainEventPtr event = NULL; qemuDomainObjPrivatePtr priv; + virCheckFlags(VIR_DUMP_LIVE | VIR_DUMP_CRASH, -1); + qemuDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, dom->uuid); -- 1.7.5.rc1

2 2

[libvirt] [PATCH] Make the options "--crash" and "--live" of "virsh dump" mutually exclusive
by Mark Wu 26 Apr '11

26 Apr '11

This patch makes the options "--crash" and "--live" of "virsh dump" mutually exclusive diff --git a/tools/virsh.c b/tools/virsh.c index 2e35021..ef77d7f 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1869,14 +1869,19 @@ cmdDump(vshControl *ctl, const vshCmd *cmd) flags |= VIR_DUMP_LIVE; if (vshCommandOptBool (cmd, "crash")) flags |= VIR_DUMP_CRASH; - + if ((flags& VIR_DUMP_CRASH)&& (flags& VIR_DUMP_CRASH)) { + vshError(ctl, "%s", _("--crash and --live are mutually exclusive. " + "Please choose only one.")); + ret = FALSE; + goto cleanup; + } if (virDomainCoreDump(dom, to, flags) == 0) { vshPrint(ctl, _("Domain %s dumped to %s\n"), name, to); } else { vshError(ctl, _("Failed to core dump domain %s to %s"), name, to); ret = FALSE; } - +cleanup: virDomainFree(dom); return ret; }

3 3

[libvirt] libvirt spice command line appears to be incorrect (was: Re: [virt-tools-list] vdagent does not start with domain defined by virt-manager 0.8.7)
by Richard W.M. Jones 26 Apr '11

26 Apr '11

[Copying this to libvir-list] On Mon, Apr 25, 2011 at 01:07:37AM +0400, Emre Erenoglu wrote: > Hi, > > I'm the package maintainer for virt-manager and related packages for Pardus > distribution. While testing the latest libvirt, virtinst & virt-manager > packages, I've come across a strange issue and I would like to get your > valuable opinion. > > I add all spice related devices and everything works good, except the > vdagent inside the windows xp guest. The virtio serial driver is loaded > correctly. As I track down the issue, I found out that libvirt is starting > qemu-kvm with parameters which do not match the ones adviced by the spice > people. Please see below email discussion with them on this. The offending > line seems to be the chardev parameter. qemu-kvm is started by virt-manager > with the following parameter for chardev: > > -chardev null,id=channel0 > > and the full spice related parameters are: > > -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x8 -chardev > null,id=channel0 -device > virtserialport,bus=virtio-serial0.0,nr=0,chardev=channel0,name=com.redhat.spice.0 > -usb -device usb-tablet,id=input0 -spice > port=5900,addr=127.0.0.1,disable-ticketing -vga qxl -device > qxl,id=video1,bus=pci.0,addr=0x7 > > while spice people adviced: > > -chardev spicevmc,id=channel0,name=vdagent > > and the rest of the parameters to match it. See below mail on the details. > I don't know if this is really the issue, but I also recognize the following > inside the domain XML: > > <channel type='null'> > <target type='virtio' name='com.redhat.spice.0'/> > <address type='virtio-serial' controller='0' bus='0' port='0'/> > </channel> > > the "channel type" is listed as "null", while I assume it should have been > listed as "spicevmc". (not sure of this, I saw this in some other > websites). When I edit the domain xml with virsh edit, it saves my changes > but the "null" stays the same how many times I try to change it. > > Please note that I've applied the following patches to virtinst 0.500.6: > > constrain-spicevmc-usage-correct.patch > virtinst-fix-channel-parse.patch > virtinst-spicevmc-fixes.patch > > which I obtained from the git. I also patched virt-manager 0.8.7 with the > following I obtained from the git: > > chardev-hide-unsupported-params-for-selected-type.patch > only-show-relevant-char-device-fields.patch > show-char-device-target-name.patch > chardev-propose-to-add-remove-spice-agent.patch > allow-setting-char-device-target-name.patch > fix-adding-removing-channel-device.patch > > Any idea what I might be missing to get the vdagent run inside the windows > guest? > > Many thanks, > > Emre Erenoglu > > ---------- Forwarded message ---------- > From: Marian Krcmarik <mkrcmari(a)redhat.com> > Date: Mon, Apr 18, 2011 at 5:56 PM > Subject: Re: [Spice-devel] vdagent does not start > To: Emre Erenoglu <erenoglu(a)gmail.com> > Cc: spice-devel(a)lists.freedesktop.org > > > > > ----- Original Message ----- > > From: "Emre Erenoglu" <erenoglu(a)gmail.com> > > To: spice-devel(a)lists.freedesktop.org > > Sent: Sunday, April 17, 2011 1:10:16 PM > > Subject: [Spice-devel] vdagent does not start > > Dear Developers, > > > > I have a virtual XP system with the spice channel enabled through the > > serial port. The command line that runs qemu has (reduced): > > > > -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x8 > > -chardev null,id=channel0 -device > > > virtserialport,bus=virtio-serial0.0,nr=0,chardev=channel0,name=com.redhat.spice.0 > > -usb -device usb-tablet,id=input0 -spice > > port=5900,addr=127.0.0.1,disable-ticketing -vga qxl -device > > qxl,id=video1,bus=pci.0,addr=0x7 > > I think you may need to specify chardev for spice so I would modify: > > -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x8 -chardev > spicevmc,id=channel0,name=vdagent -device > virtserialport,bus=virtio-serial0.0,nr=0,chardev=channel0,name=com.redhat.spice.0 > -usb -device usb-tablet,id=input0 -spice > port=5900,addr=127.0.0.1,disable-ticketing -vga qxl -device > qxl,id=video1,bus=pci.0,addr=0x7 > > with agent and virtio-serial driver installed on guest. > > > > However, the vdagent services does not start. when I give it a start > > control, it reports to start then stop immediately. Here are the logs > > I've found: > > > > -- > Emre -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming blog: http://rwmj.wordpress.com Fedora now supports 80 OCaml packages (the OPEN alternative to F#) http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora

4 4

[libvirt] [PATCH] Make sure DNSMASQ_STATE_DIR exists
by Guido Günther 25 Apr '11

25 Apr '11

Hi, otherwise the directory returned by networkDnsmasqLeaseFileName will not be created if ipdef->nhosts == 0 in networkBuildDnsmasqArgv. O.k. to apply? Cheers, -- Guido --- src/network/bridge_driver.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 8b5c1b6..ed78710 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -662,6 +662,13 @@ networkStartDhcpDaemon(virNetworkObjPtr network) goto cleanup; } + if ((err = virFileMakePath(DNSMASQ_STATE_DIR)) != 0) { + virReportSystemError(err, + _("cannot create directory %s"), + DNSMASQ_STATE_DIR); + goto cleanup; + } + cmd = virCommandNew(DNSMASQ); if (networkBuildDnsmasqArgv(network, ipdef, pidfile, cmd) < 0) { goto cleanup; -- 1.7.4.1

2 2

[libvirt] [PATCH] Fix small memory leaks in config parsing related functions
by Matthias Bolte 25 Apr '11

25 Apr '11

Found by 'make -C tests valgrind'. xen_xm.c: Dummy allocation via virDomainChrDefNew is directly overwritten and lost. Free 'script' in success path too. vmx.c: Free virtualDev_string in success path too. domain_conf.c: Free compression in success path too. --- src/conf/domain_conf.c | 1 + src/vmx/vmx.c | 16 +++++++++------- src/xenxs/xen_xm.c | 3 +-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 381e692..0e7aeb5 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4058,6 +4058,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, int flags) { VIR_FREE(compression); goto error; } + VIR_FREE(compression); def->data.spice.zlib = compressionVal; } else if (xmlStrEqual(cur->name, BAD_CAST "playback")) { diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index daeedc3..aee2d80 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -1818,6 +1818,7 @@ int virVMXParseSCSIController(virConfPtr conf, int controller, bool *present, int *virtualDev) { + int result = -1; char present_name[32]; char virtualDev_name[32]; char *virtualDev_string = NULL; @@ -1840,16 +1841,17 @@ virVMXParseSCSIController(virConfPtr conf, int controller, bool *present, controller); if (virVMXGetConfigBoolean(conf, present_name, present, false, true) < 0) { - goto failure; + goto cleanup; } if (! *present) { - return 0; + result = 0; + goto cleanup; } if (virVMXGetConfigString(conf, virtualDev_name, &virtualDev_string, true) < 0) { - goto failure; + goto cleanup; } if (virtualDev_string != NULL) { @@ -1870,16 +1872,16 @@ virVMXParseSCSIController(virConfPtr conf, int controller, bool *present, _("Expecting VMX entry '%s' to be 'buslogic' or 'lsilogic' " "or 'lsisas1068' or 'pvscsi' but found '%s'"), virtualDev_name, virtualDev_string); - goto failure; + goto cleanup; } } - return 0; + result = 0; - failure: + cleanup: VIR_FREE(virtualDev_string); - return -1; + return result; } diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c index dbcaf15..63ba153 100644 --- a/src/xenxs/xen_xm.c +++ b/src/xenxs/xen_xm.c @@ -983,8 +983,6 @@ xenParseXM(virConfPtr conf, int xendConfigVersion, continue; } - if (!(chr = virDomainChrDefNew())) - goto cleanup; if (!(chr = xenParseSxprChar(port, NULL))) goto cleanup; @@ -1034,6 +1032,7 @@ xenParseXM(virConfPtr conf, int xendConfigVersion, goto cleanup; } + VIR_FREE(script); return def; no_memory: -- 1.7.0.4

2 2

[libvirt] [PATCH] Add virDomainEventRebootNew
by Matthias Bolte 25 Apr '11

25 Apr '11

This will be used in the ESX driver event handling. --- src/conf/domain_event.c | 8 ++++++++ src/conf/domain_event.h | 1 + 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index f0380d3..688bf6c 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -572,11 +572,19 @@ virDomainEventPtr virDomainEventNewFromDef(virDomainDefPtr def, int type, int de return virDomainEventNew(def->id, def->name, def->uuid, type, detail); } +virDomainEventPtr virDomainEventRebootNew(int id, const char *name, + const unsigned char *uuid) +{ + return virDomainEventNewInternal(VIR_DOMAIN_EVENT_ID_REBOOT, + id, name, uuid); +} + virDomainEventPtr virDomainEventRebootNewFromDom(virDomainPtr dom) { return virDomainEventNewInternal(VIR_DOMAIN_EVENT_ID_REBOOT, dom->id, dom->name, dom->uuid); } + virDomainEventPtr virDomainEventRebootNewFromObj(virDomainObjPtr obj) { return virDomainEventNewInternal(VIR_DOMAIN_EVENT_ID_REBOOT, diff --git a/src/conf/domain_event.h b/src/conf/domain_event.h index e28293d..c03a159 100644 --- a/src/conf/domain_event.h +++ b/src/conf/domain_event.h @@ -112,6 +112,7 @@ virDomainEventPtr virDomainEventNewFromDom(virDomainPtr dom, int type, int detai virDomainEventPtr virDomainEventNewFromObj(virDomainObjPtr obj, int type, int detail); virDomainEventPtr virDomainEventNewFromDef(virDomainDefPtr def, int type, int detail); +virDomainEventPtr virDomainEventRebootNew(int id, const char *name, const unsigned char *uuid); virDomainEventPtr virDomainEventRebootNewFromDom(virDomainPtr dom); virDomainEventPtr virDomainEventRebootNewFromObj(virDomainObjPtr obj); -- 1.7.0.4

2 2

[libvirt] [PATCH] threads: add one-time initialization support
by Eric Blake 25 Apr '11

25 Apr '11

mingw lacks the counterpart to PTHREAD_MUTEX_INITIALIZER, so the best we can do is portably expose once-only runtime initialization. * src/util/threads.h (virOnceControlPtr): New opaque type. (virOnceFunc): New callback type. (virOnce): New prototype. * src/util/threads-pthread.h (virOnceControl): Declare. (VIR_ONCE_CONTROL_INITIALIZER): Define. * src/util/threads-win32.h (virOnceControl) (VIR_ONCE_CONTROL_INITIALIZER): Likewise. * src/util/threads-pthread.c (virOnce): Implement in pthreads. * src/util/threads-win32.c (virOnce): Implement in WIN32. * src/libvirt_private.syms: Export it. --- src/libvirt_private.syms | 1 + src/util/threads-pthread.c | 5 +++++ src/util/threads-pthread.h | 11 ++++++++++- src/util/threads-win32.c | 15 ++++++++++++++- src/util/threads-win32.h | 11 ++++++++++- src/util/threads.h | 21 ++++++++++++++++++++- 6 files changed, 60 insertions(+), 4 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index ba7739d..cb67861 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -866,6 +866,7 @@ virMutexInit; virMutexInitRecursive; virMutexLock; virMutexUnlock; +virOnce; virThreadCreate; virThreadID; virThreadIsSelf; diff --git a/src/util/threads-pthread.c b/src/util/threads-pthread.c index 898c4d4..82ce5c6 100644 --- a/src/util/threads-pthread.c +++ b/src/util/threads-pthread.c @@ -40,6 +40,11 @@ void virThreadOnExit(void) { } +int virOnce(virOnceControlPtr once, virOnceFunc init) +{ + return pthread_once(&once->once, init); +} + int virMutexInit(virMutexPtr m) { diff --git a/src/util/threads-pthread.h b/src/util/threads-pthread.h index b25d0c2..dcaacb7 100644 --- a/src/util/threads-pthread.h +++ b/src/util/threads-pthread.h @@ -1,7 +1,7 @@ /* * threads.c: basic thread synchronization primitives * - * Copyright (C) 2009 Red Hat, Inc. + * Copyright (C) 2009, 2011 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -38,3 +38,12 @@ struct virThread { struct virThreadLocal { pthread_key_t key; }; + +struct virOnceControl { + pthread_once_t once; +}; + +#define VIR_ONCE_CONTROL_INITIALIZER \ +{ \ + .once = PTHREAD_ONCE_INIT \ +} diff --git a/src/util/threads-win32.c b/src/util/threads-win32.c index 5661437..f717f98 100644 --- a/src/util/threads-win32.c +++ b/src/util/threads-win32.c @@ -1,7 +1,7 @@ /* * threads-win32.c: basic thread synchronization primitives * - * Copyright (C) 2009-2010 Red Hat, Inc. + * Copyright (C) 2009-2011 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -69,6 +69,19 @@ void virThreadOnExit(void) virMutexUnlock(&virThreadLocalLock); } +static BOOL CALLBACK +virOnceCallback(PINIT_ONCE once, PVOID param, PVOID *context ATTRIBUTE_UNUSED) +{ + virOnceFunc func = param; + func(); + return TRUE; +} + +int virOnce(virOnceControlPtr once, virOnceFunc init) +{ + return InitOnceExecuteOnce(&once->once, virOnceCallback, init, + NULL) ? 0 : -1; +} int virMutexInit(virMutexPtr m) { diff --git a/src/util/threads-win32.h b/src/util/threads-win32.h index bb7c455..f169460 100644 --- a/src/util/threads-win32.h +++ b/src/util/threads-win32.h @@ -1,7 +1,7 @@ /* * threads-win32.h basic thread synchronization primitives * - * Copyright (C) 2009 Red Hat, Inc. + * Copyright (C) 2009, 2011 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -41,3 +41,12 @@ struct virThread { struct virThreadLocal { DWORD key; }; + +struct virOnceControl { + INIT_ONCE once; +}; + +#define VIR_ONCE_CONTROL_INITIALIZER \ +{ \ + .once = INIT_ONCE_STATIC_INIT \ +} diff --git a/src/util/threads.h b/src/util/threads.h index c129301..b72610c 100644 --- a/src/util/threads.h +++ b/src/util/threads.h @@ -1,7 +1,7 @@ /* * threads.h: basic thread synchronization primitives * - * Copyright (C) 2009-2010 Red Hat, Inc. + * Copyright (C) 2009-2011 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -36,6 +36,10 @@ typedef virThreadLocal *virThreadLocalPtr; typedef struct virThread virThread; typedef virThread *virThreadPtr; +typedef struct virOnceControl virOnceControl; +typedef virOnceControl *virOnceControlPtr; + +typedef void (*virOnceFunc)(void); int virThreadInitialize(void) ATTRIBUTE_RETURN_CHECK; void virThreadOnExit(void); @@ -57,6 +61,21 @@ void virThreadJoin(virThreadPtr thread); int virThreadSelfID(void); int virThreadID(virThreadPtr thread); +/* Static initialization of mutexes is not possible, so we instead + * provide for guaranteed one-time initialization via a callback + * function. Usage: + * static virOnceControl once = VIR_ONCE_CONTROL_INITIALIZER; + * static void initializer(void) { ... } + * void myfunc() + * { + * if (virOnce(&once, initializer) < 0) + * goto error; + * ...now guaranteed that initializer has completed exactly once + * } + */ +int virOnce(virOnceControlPtr once, virOnceFunc init) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + int virMutexInit(virMutexPtr m) ATTRIBUTE_RETURN_CHECK; int virMutexInitRecursive(virMutexPtr m) ATTRIBUTE_RETURN_CHECK; void virMutexDestroy(virMutexPtr m); -- 1.7.1

2 4

[libvirt] [PATCH] qemu: Unlink managed state file when a domain is undefined
by Osier Yang 25 Apr '11

25 Apr '11

The managed state file is not useful anymore after the domain is undefined, and perhaps cause confusion. E.g. define & start a domain which has same name with previous undefined domain later. --- src/qemu/qemu_driver.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f6e503a..874b455 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3739,6 +3739,7 @@ static int qemudDomainUndefine(virDomainPtr dom) { virDomainObjPtr vm; virDomainEventPtr event = NULL; int ret = -1; + char *managed_save = NULL; qemuDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, dom->uuid); @@ -3766,6 +3767,13 @@ static int qemudDomainUndefine(virDomainPtr dom) { if (virDomainDeleteConfig(driver->configDir, driver->autostartDir, vm) < 0) goto cleanup; + if (!(managed_save = qemuDomainManagedSavePath(driver, vm))) + goto cleanup; + + if (virFileExists(managed_save) && (unlink(managed_save) < 0)) { + VIR_WARN("Failed to remove the managed state %s", managed_save); + } + event = virDomainEventNewFromObj(vm, VIR_DOMAIN_EVENT_UNDEFINED, VIR_DOMAIN_EVENT_UNDEFINED_REMOVED); -- 1.7.4

2 4

[libvirt] [PATCH] build: fix 32-bit test failure
by Eric Blake 25 Apr '11

25 Apr '11

ARRAY_CARDINALITY is typed as size_t, not long; this matters on 32-bit platforms: hashtest.c: In function 'testHashRemoveForEach': hashtest.c:114: error: format '%lu' expects type 'long unsigned int', but argument 4 has type 'unsigned int' [-Wformat] * tests/hashtest.c (testHashRemoveForEach): Use correct format. --- Pushing under the build-breaker rule. tests/hashtest.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tests/hashtest.c b/tests/hashtest.c index dff0181..722b44c 100644 --- a/tests/hashtest.c +++ b/tests/hashtest.c @@ -112,7 +112,7 @@ testHashRemoveForEach(const void *data) if (count != ARRAY_CARDINALITY(uuids)) { if (virTestGetVerbose()) { testError("\nvirHashForEach didn't go through all entries," - " %d != %lu\n", + " %d != %zu\n", count, ARRAY_CARDINALITY(uuids)); } goto cleanup; -- 1.7.4.4

2 1

[libvirt] [PATCH] esx: Move CURL handling code to it's own type
by Matthias Bolte 24 Apr '11

24 Apr '11

--- src/esx/esx_driver.c | 4 +- src/esx/esx_vi.c | 348 ++++++++++++++++++++++++++------------------------ src/esx/esx_vi.h | 29 +++- 3 files changed, 205 insertions(+), 176 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index deda372..ef76350 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -2642,7 +2642,7 @@ esxDomainDumpXML(virDomainPtr domain, int flags) url = virBufferContentAndReset(&buffer); - if (esxVI_Context_DownloadFile(priv->primary, url, &vmx) < 0) { + if (esxVI_CURL_Download(priv->primary->curl, url, &vmx) < 0) { goto cleanup; } @@ -3111,7 +3111,7 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml) /* Upload VMX file */ VIR_DEBUG("Uploading .vmx config, url='%s' vmx='%s'", url, vmx); - if (esxVI_Context_UploadFile(priv->primary, url, vmx) < 0) { + if (esxVI_CURL_Upload(priv->primary->curl, url, vmx) < 0) { goto cleanup; } diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index fbab347..2fd09cd 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -76,42 +76,25 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Context + * CURL */ -/* esxVI_Context_Alloc */ -ESX_VI__TEMPLATE__ALLOC(Context); +/* esxVI_CURL_Alloc */ +ESX_VI__TEMPLATE__ALLOC(CURL) -/* esxVI_Context_Free */ -ESX_VI__TEMPLATE__FREE(Context, +/* esxVI_CURL_Free */ +ESX_VI__TEMPLATE__FREE(CURL, { - VIR_FREE(item->url); - VIR_FREE(item->ipAddress); - - if (item->curl_handle != NULL) { - curl_easy_cleanup(item->curl_handle); + if (item->handle != NULL) { + curl_easy_cleanup(item->handle); } - if (item->curl_headers != NULL) { - curl_slist_free_all(item->curl_headers); + if (item->headers != NULL) { + curl_slist_free_all(item->headers); } - virMutexDestroy(&item->curl_lock); - - VIR_FREE(item->username); - VIR_FREE(item->password); - esxVI_ServiceContent_Free(&item->service); - esxVI_UserSession_Free(&item->session); - esxVI_Datacenter_Free(&item->datacenter); - esxVI_ComputeResource_Free(&item->computeResource); - esxVI_HostSystem_Free(&item->hostSystem); - esxVI_SelectionSpec_Free(&item->selectSet_folderToChildEntity); - esxVI_SelectionSpec_Free(&item->selectSet_hostSystemToParent); - esxVI_SelectionSpec_Free(&item->selectSet_hostSystemToVm); - esxVI_SelectionSpec_Free(&item->selectSet_hostSystemToDatastore); - esxVI_SelectionSpec_Free(&item->selectSet_computeResourceToHost); - esxVI_SelectionSpec_Free(&item->selectSet_computeResourceToParentToParent); -}); + virMutexDestroy(&item->lock); +}) static size_t esxVI_CURL_ReadString(char *data, size_t size, size_t nmemb, void *ptrptr) @@ -218,7 +201,7 @@ esxVI_CURL_Debug(CURL *curl ATTRIBUTE_UNUSED, curl_infotype type, #endif static int -esxVI_CURL_Perform(esxVI_Context *ctx, const char *url) +esxVI_CURL_Perform(esxVI_CURL *curl, const char *url) { CURLcode errorCode; long responseCode = 0; @@ -226,23 +209,23 @@ esxVI_CURL_Perform(esxVI_Context *ctx, const char *url) const char *redirectUrl = NULL; #endif - errorCode = curl_easy_perform(ctx->curl_handle); + errorCode = curl_easy_perform(curl->handle); if (errorCode != CURLE_OK) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, _("curl_easy_perform() returned an error: %s (%d) : %s"), - curl_easy_strerror(errorCode), errorCode, ctx->curl_error); + curl_easy_strerror(errorCode), errorCode, curl->error); return -1; } - errorCode = curl_easy_getinfo(ctx->curl_handle, CURLINFO_RESPONSE_CODE, + errorCode = curl_easy_getinfo(curl->handle, CURLINFO_RESPONSE_CODE, &responseCode); if (errorCode != CURLE_OK) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, _("curl_easy_getinfo(CURLINFO_RESPONSE_CODE) returned an " "error: %s (%d) : %s"), curl_easy_strerror(errorCode), - errorCode, ctx->curl_error); + errorCode, curl->error); return -1; } @@ -255,7 +238,7 @@ esxVI_CURL_Perform(esxVI_Context *ctx, const char *url) if (responseCode == 301) { #if LIBCURL_VERSION_NUM >= 0x071202 /* 7.18.2 */ - errorCode = curl_easy_getinfo(ctx->curl_handle, CURLINFO_REDIRECT_URL, + errorCode = curl_easy_getinfo(curl->handle, CURLINFO_REDIRECT_URL, &redirectUrl); if (errorCode != CURLE_OK) { @@ -263,7 +246,7 @@ esxVI_CURL_Perform(esxVI_Context *ctx, const char *url) _("curl_easy_getinfo(CURLINFO_REDIRECT_URL) returned " "an error: %s (%d) : %s"), curl_easy_strerror(errorCode), - errorCode, ctx->curl_error); + errorCode, curl->error); } else { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, _("The server redirects from '%s' to '%s'"), url, @@ -281,32 +264,23 @@ esxVI_CURL_Perform(esxVI_Context *ctx, const char *url) } int -esxVI_Context_Connect(esxVI_Context *ctx, const char *url, - const char *ipAddress, const char *username, - const char *password, esxUtil_ParsedUri *parsedUri) +esxVI_CURL_Connect(esxVI_CURL *curl, esxUtil_ParsedUri *parsedUri) { - if (ctx == NULL || url == NULL || ipAddress == NULL || username == NULL || - password == NULL || ctx->url != NULL || ctx->service != NULL || - ctx->curl_handle != NULL || ctx->curl_headers != NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); - return -1; - } - - if (esxVI_String_DeepCopyValue(&ctx->url, url) < 0 || - esxVI_String_DeepCopyValue(&ctx->ipAddress, ipAddress) < 0) { + if (curl->handle != NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid call")); return -1; } - ctx->curl_handle = curl_easy_init(); + curl->handle = curl_easy_init(); - if (ctx->curl_handle == NULL) { + if (curl->handle == NULL) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not initialize CURL")); return -1; } - ctx->curl_headers = curl_slist_append(ctx->curl_headers, "Content-Type: " - "text/xml; charset=UTF-8"); + curl->headers = curl_slist_append(curl->headers, + "Content-Type: text/xml; charset=UTF-8"); /* * Add a dummy expect header to stop CURL from waiting for a response code @@ -316,56 +290,179 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, * 100 (Continue) response and the wait times out resulting in wasting * approx. 2 sec per POST operation. */ - ctx->curl_headers = curl_slist_append(ctx->curl_headers, - "Expect: nothing"); + curl->headers = curl_slist_append(curl->headers, "Expect: nothing"); - if (ctx->curl_headers == NULL) { + if (curl->headers == NULL) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not build CURL header list")); return -1; } - curl_easy_setopt(ctx->curl_handle, CURLOPT_URL, ctx->url); - curl_easy_setopt(ctx->curl_handle, CURLOPT_USERAGENT, "libvirt-esx"); - curl_easy_setopt(ctx->curl_handle, CURLOPT_HEADER, 0); - curl_easy_setopt(ctx->curl_handle, CURLOPT_FOLLOWLOCATION, 0); - curl_easy_setopt(ctx->curl_handle, CURLOPT_SSL_VERIFYPEER, + curl_easy_setopt(curl->handle, CURLOPT_USERAGENT, "libvirt-esx"); + curl_easy_setopt(curl->handle, CURLOPT_HEADER, 0); + curl_easy_setopt(curl->handle, CURLOPT_FOLLOWLOCATION, 0); + curl_easy_setopt(curl->handle, CURLOPT_SSL_VERIFYPEER, parsedUri->noVerify ? 0 : 1); - curl_easy_setopt(ctx->curl_handle, CURLOPT_SSL_VERIFYHOST, + curl_easy_setopt(curl->handle, CURLOPT_SSL_VERIFYHOST, parsedUri->noVerify ? 0 : 2); - curl_easy_setopt(ctx->curl_handle, CURLOPT_COOKIEFILE, ""); - curl_easy_setopt(ctx->curl_handle, CURLOPT_HTTPHEADER, ctx->curl_headers); - curl_easy_setopt(ctx->curl_handle, CURLOPT_READFUNCTION, + curl_easy_setopt(curl->handle, CURLOPT_COOKIEFILE, ""); + curl_easy_setopt(curl->handle, CURLOPT_HTTPHEADER, curl->headers); + curl_easy_setopt(curl->handle, CURLOPT_READFUNCTION, esxVI_CURL_ReadString); - curl_easy_setopt(ctx->curl_handle, CURLOPT_WRITEFUNCTION, + curl_easy_setopt(curl->handle, CURLOPT_WRITEFUNCTION, esxVI_CURL_WriteBuffer); - curl_easy_setopt(ctx->curl_handle, CURLOPT_ERRORBUFFER, - ctx->curl_error); + curl_easy_setopt(curl->handle, CURLOPT_ERRORBUFFER, curl->error); #if ESX_VI__CURL__ENABLE_DEBUG_OUTPUT - curl_easy_setopt(ctx->curl_handle, CURLOPT_DEBUGFUNCTION, esxVI_CURL_Debug); - curl_easy_setopt(ctx->curl_handle, CURLOPT_VERBOSE, 1); + curl_easy_setopt(curl->handle, CURLOPT_DEBUGFUNCTION, esxVI_CURL_Debug); + curl_easy_setopt(curl->handle, CURLOPT_VERBOSE, 1); #endif if (parsedUri->proxy) { - curl_easy_setopt(ctx->curl_handle, CURLOPT_PROXY, + curl_easy_setopt(curl->handle, CURLOPT_PROXY, parsedUri->proxy_hostname); - curl_easy_setopt(ctx->curl_handle, CURLOPT_PROXYTYPE, + curl_easy_setopt(curl->handle, CURLOPT_PROXYTYPE, parsedUri->proxy_type); - curl_easy_setopt(ctx->curl_handle, CURLOPT_PROXYPORT, + curl_easy_setopt(curl->handle, CURLOPT_PROXYPORT, parsedUri->proxy_port); } - if (virMutexInit(&ctx->curl_lock) < 0) { + if (virMutexInit(&curl->lock) < 0) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not initialize CURL mutex")); return -1; } - ctx->username = strdup(username); - ctx->password = strdup(password); + return 0; +} + +int +esxVI_CURL_Download(esxVI_CURL *curl, const char *url, char **content) +{ + virBuffer buffer = VIR_BUFFER_INITIALIZER; + int responseCode = 0; - if (ctx->username == NULL || ctx->password == NULL) { + if (content == NULL || *content != NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); + return -1; + } + + virMutexLock(&curl->lock); + + curl_easy_setopt(curl->handle, CURLOPT_URL, url); + curl_easy_setopt(curl->handle, CURLOPT_WRITEDATA, &buffer); + curl_easy_setopt(curl->handle, CURLOPT_UPLOAD, 0); + curl_easy_setopt(curl->handle, CURLOPT_HTTPGET, 1); + + responseCode = esxVI_CURL_Perform(curl, url); + + virMutexUnlock(&curl->lock); + + if (responseCode < 0) { + goto cleanup; + } else if (responseCode != 200) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, + _("HTTP response code %d for download from '%s'"), + responseCode, url); + goto cleanup; + } + + if (virBufferError(&buffer)) { virReportOOMError(); + goto cleanup; + } + + *content = virBufferContentAndReset(&buffer); + + cleanup: + if (*content == NULL) { + virBufferFreeAndReset(&buffer); + return -1; + } + + return 0; +} + +int +esxVI_CURL_Upload(esxVI_CURL *curl, const char *url, const char *content) +{ + int responseCode = 0; + + if (content == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); + return -1; + } + + virMutexLock(&curl->lock); + + curl_easy_setopt(curl->handle, CURLOPT_URL, url); + curl_easy_setopt(curl->handle, CURLOPT_READDATA, &content); + curl_easy_setopt(curl->handle, CURLOPT_UPLOAD, 1); + curl_easy_setopt(curl->handle, CURLOPT_INFILESIZE, strlen(content)); + + responseCode = esxVI_CURL_Perform(curl, url); + + virMutexUnlock(&curl->lock); + + if (responseCode < 0) { + return -1; + } else if (responseCode != 200 && responseCode != 201) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, + _("HTTP response code %d for upload to '%s'"), + responseCode, url); + return -1; + } + + return 0; +} + + + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Context + */ + +/* esxVI_Context_Alloc */ +ESX_VI__TEMPLATE__ALLOC(Context) + +/* esxVI_Context_Free */ +ESX_VI__TEMPLATE__FREE(Context, +{ + esxVI_CURL_Free(&item->curl); + VIR_FREE(item->url); + VIR_FREE(item->ipAddress); + VIR_FREE(item->username); + VIR_FREE(item->password); + esxVI_ServiceContent_Free(&item->service); + esxVI_UserSession_Free(&item->session); + esxVI_Datacenter_Free(&item->datacenter); + esxVI_ComputeResource_Free(&item->computeResource); + esxVI_HostSystem_Free(&item->hostSystem); + esxVI_SelectionSpec_Free(&item->selectSet_folderToChildEntity); + esxVI_SelectionSpec_Free(&item->selectSet_hostSystemToParent); + esxVI_SelectionSpec_Free(&item->selectSet_hostSystemToVm); + esxVI_SelectionSpec_Free(&item->selectSet_hostSystemToDatastore); + esxVI_SelectionSpec_Free(&item->selectSet_computeResourceToHost); + esxVI_SelectionSpec_Free(&item->selectSet_computeResourceToParentToParent); +}) + +int +esxVI_Context_Connect(esxVI_Context *ctx, const char *url, + const char *ipAddress, const char *username, + const char *password, esxUtil_ParsedUri *parsedUri) +{ + if (ctx == NULL || url == NULL || ipAddress == NULL || username == NULL || + password == NULL || ctx->url != NULL || ctx->service != NULL || + ctx->curl != NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); + return -1; + } + + if (esxVI_CURL_Alloc(&ctx->curl) < 0 || + esxVI_CURL_Connect(ctx->curl, parsedUri) < 0 || + esxVI_String_DeepCopyValue(&ctx->url, url) < 0 || + esxVI_String_DeepCopyValue(&ctx->ipAddress, ipAddress) < 0 || + esxVI_String_DeepCopyValue(&ctx->username, username) < 0 || + esxVI_String_DeepCopyValue(&ctx->password, password) < 0) { return -1; } @@ -577,87 +674,6 @@ esxVI_Context_LookupObjectsByHostSystemIp(esxVI_Context *ctx, } int -esxVI_Context_DownloadFile(esxVI_Context *ctx, const char *url, char **content) -{ - virBuffer buffer = VIR_BUFFER_INITIALIZER; - int responseCode = 0; - - if (content == NULL || *content != NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); - return -1; - } - - virMutexLock(&ctx->curl_lock); - - curl_easy_setopt(ctx->curl_handle, CURLOPT_URL, url); - curl_easy_setopt(ctx->curl_handle, CURLOPT_WRITEDATA, &buffer); - curl_easy_setopt(ctx->curl_handle, CURLOPT_UPLOAD, 0); - curl_easy_setopt(ctx->curl_handle, CURLOPT_HTTPGET, 1); - - responseCode = esxVI_CURL_Perform(ctx, url); - - virMutexUnlock(&ctx->curl_lock); - - if (responseCode < 0) { - goto cleanup; - } else if (responseCode != 200) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - _("HTTP response code %d for download from '%s'"), - responseCode, url); - goto cleanup; - } - - if (virBufferError(&buffer)) { - virReportOOMError(); - goto cleanup; - } - - *content = virBufferContentAndReset(&buffer); - - cleanup: - if (*content == NULL) { - virBufferFreeAndReset(&buffer); - return -1; - } - - return 0; -} - -int -esxVI_Context_UploadFile(esxVI_Context *ctx, const char *url, - const char *content) -{ - int responseCode = 0; - - if (content == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); - return -1; - } - - virMutexLock(&ctx->curl_lock); - - curl_easy_setopt(ctx->curl_handle, CURLOPT_URL, url); - curl_easy_setopt(ctx->curl_handle, CURLOPT_READDATA, &content); - curl_easy_setopt(ctx->curl_handle, CURLOPT_UPLOAD, 1); - curl_easy_setopt(ctx->curl_handle, CURLOPT_INFILESIZE, strlen(content)); - - responseCode = esxVI_CURL_Perform(ctx, url); - - virMutexUnlock(&ctx->curl_lock); - - if (responseCode < 0) { - return -1; - } else if (responseCode != 200 && responseCode != 201) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - _("HTTP response code %d for upload to '%s'"), - responseCode, url); - return -1; - } - - return 0; -} - -int esxVI_Context_Execute(esxVI_Context *ctx, const char *methodName, const char *request, esxVI_Response **response, esxVI_Occurrence occurrence) @@ -678,17 +694,17 @@ esxVI_Context_Execute(esxVI_Context *ctx, const char *methodName, return -1; } - virMutexLock(&ctx->curl_lock); + virMutexLock(&ctx->curl->lock); - curl_easy_setopt(ctx->curl_handle, CURLOPT_URL, ctx->url); - curl_easy_setopt(ctx->curl_handle, CURLOPT_WRITEDATA, &buffer); - curl_easy_setopt(ctx->curl_handle, CURLOPT_UPLOAD, 0); - curl_easy_setopt(ctx->curl_handle, CURLOPT_POSTFIELDS, request); - curl_easy_setopt(ctx->curl_handle, CURLOPT_POSTFIELDSIZE, strlen(request)); + curl_easy_setopt(ctx->curl->handle, CURLOPT_URL, ctx->url); + curl_easy_setopt(ctx->curl->handle, CURLOPT_WRITEDATA, &buffer); + curl_easy_setopt(ctx->curl->handle, CURLOPT_UPLOAD, 0); + curl_easy_setopt(ctx->curl->handle, CURLOPT_POSTFIELDS, request); + curl_easy_setopt(ctx->curl->handle, CURLOPT_POSTFIELDSIZE, strlen(request)); - (*response)->responseCode = esxVI_CURL_Perform(ctx, ctx->url); + (*response)->responseCode = esxVI_CURL_Perform(ctx->curl, ctx->url); - virMutexUnlock(&ctx->curl_lock); + virMutexUnlock(&ctx->curl->lock); if ((*response)->responseCode < 0) { goto cleanup; @@ -869,7 +885,7 @@ esxVI_Context_Execute(esxVI_Context *ctx, const char *methodName, */ /* esxVI_Response_Alloc */ -ESX_VI__TEMPLATE__ALLOC(Response); +ESX_VI__TEMPLATE__ALLOC(Response) /* esxVI_Response_Free */ ESX_VI__TEMPLATE__FREE(Response, @@ -879,7 +895,7 @@ ESX_VI__TEMPLATE__FREE(Response, if (item->document != NULL) { xmlFreeDoc(item->document); } -}); +}) diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index d046bf9..57788ac 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -82,6 +82,7 @@ typedef enum _esxVI_APIVersion esxVI_APIVersion; typedef enum _esxVI_ProductVersion esxVI_ProductVersion; typedef enum _esxVI_Occurrence esxVI_Occurrence; typedef struct _esxVI_ParsedHostCpuIdInfo esxVI_ParsedHostCpuIdInfo; +typedef struct _esxVI_CURL esxVI_CURL; typedef struct _esxVI_Context esxVI_Context; typedef struct _esxVI_Response esxVI_Response; typedef struct _esxVI_Enumeration esxVI_Enumeration; @@ -142,16 +143,32 @@ struct _esxVI_ParsedHostCpuIdInfo { /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * CURL + */ + +struct _esxVI_CURL { + CURL *handle; + virMutex lock; + struct curl_slist *headers; + char error[CURL_ERROR_SIZE]; +}; + +int esxVI_CURL_Alloc(esxVI_CURL **curl); +void esxVI_CURL_Free(esxVI_CURL **curl); +int esxVI_CURL_Connect(esxVI_CURL *curl, esxUtil_ParsedUri *parsedUri); +int esxVI_CURL_Download(esxVI_CURL *curl, const char *url, char **content); +int esxVI_CURL_Upload(esxVI_CURL *curl, const char *url, const char *content); + + + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Context */ struct _esxVI_Context { + esxVI_CURL *curl; char *url; char *ipAddress; - CURL *curl_handle; - struct curl_slist *curl_headers; - char curl_error[CURL_ERROR_SIZE]; - virMutex curl_lock; char *username; char *password; esxVI_ServiceContent *service; @@ -180,10 +197,6 @@ int esxVI_Context_LookupObjectsByPath(esxVI_Context *ctx, esxUtil_ParsedUri *parsedUri); int esxVI_Context_LookupObjectsByHostSystemIp(esxVI_Context *ctx, const char *hostSystemIpAddress); -int esxVI_Context_DownloadFile(esxVI_Context *ctx, const char *url, - char **content); -int esxVI_Context_UploadFile(esxVI_Context *ctx, const char *url, - const char *content); int esxVI_Context_Execute(esxVI_Context *ctx, const char *methodName, const char *request, esxVI_Response **response, esxVI_Occurrence occurrence); -- 1.7.0.4

2 3

[libvirt] [PATCH] daemon: Honor error variable name change in the generator
by Matthias Bolte 22 Apr '11

22 Apr '11

Commit 36b652138be renamed err to rerr, do the same in the generator. --- daemon/qemu_dispatch_prototypes.h | 2 +- daemon/remote_dispatch_prototypes.h | 404 +++++++++++++++++----------------- daemon/remote_generate_stubs.pl | 2 +- 3 files changed, 204 insertions(+), 204 deletions(-) diff --git a/daemon/qemu_dispatch_prototypes.h b/daemon/qemu_dispatch_prototypes.h index e6c83ba..4ec1ab4 100644 --- a/daemon/qemu_dispatch_prototypes.h +++ b/daemon/qemu_dispatch_prototypes.h @@ -7,6 +7,6 @@ static int qemuDispatchMonitorCommand( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, qemu_monitor_command_args *args, qemu_monitor_command_ret *ret); diff --git a/daemon/remote_dispatch_prototypes.h b/daemon/remote_dispatch_prototypes.h index 18bf41d..cf2f38c 100644 --- a/daemon/remote_dispatch_prototypes.h +++ b/daemon/remote_dispatch_prototypes.h @@ -7,7 +7,7 @@ static int remoteDispatchAuthList( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, void *args, remote_auth_list_ret *ret); static int remoteDispatchAuthPolkit( @@ -15,7 +15,7 @@ static int remoteDispatchAuthPolkit( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, void *args, remote_auth_polkit_ret *ret); static int remoteDispatchAuthSaslInit( @@ -23,7 +23,7 @@ static int remoteDispatchAuthSaslInit( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, void *args, remote_auth_sasl_init_ret *ret); static int remoteDispatchAuthSaslStart( @@ -31,7 +31,7 @@ static int remoteDispatchAuthSaslStart( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_auth_sasl_start_args *args, remote_auth_sasl_start_ret *ret); static int remoteDispatchAuthSaslStep( @@ -39,7 +39,7 @@ static int remoteDispatchAuthSaslStep( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_auth_sasl_step_args *args, remote_auth_sasl_step_ret *ret); static int remoteDispatchClose( @@ -47,7 +47,7 @@ static int remoteDispatchClose( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, void *args, void *ret); static int remoteDispatchCpuBaseline( @@ -55,7 +55,7 @@ static int remoteDispatchCpuBaseline( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_cpu_baseline_args *args, remote_cpu_baseline_ret *ret); static int remoteDispatchCpuCompare( @@ -63,7 +63,7 @@ static int remoteDispatchCpuCompare( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_cpu_compare_args *args, remote_cpu_compare_ret *ret); static int remoteDispatchDomainAbortJob( @@ -71,7 +71,7 @@ static int remoteDispatchDomainAbortJob( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_abort_job_args *args, void *ret); static int remoteDispatchDomainAttachDevice( @@ -79,7 +79,7 @@ static int remoteDispatchDomainAttachDevice( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_attach_device_args *args, void *ret); static int remoteDispatchDomainAttachDeviceFlags( @@ -87,7 +87,7 @@ static int remoteDispatchDomainAttachDeviceFlags( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_attach_device_flags_args *args, void *ret); static int remoteDispatchDomainBlockPeek( @@ -95,7 +95,7 @@ static int remoteDispatchDomainBlockPeek( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_block_peek_args *args, remote_domain_block_peek_ret *ret); static int remoteDispatchDomainBlockStats( @@ -103,7 +103,7 @@ static int remoteDispatchDomainBlockStats( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_block_stats_args *args, remote_domain_block_stats_ret *ret); static int remoteDispatchDomainCoreDump( @@ -111,7 +111,7 @@ static int remoteDispatchDomainCoreDump( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_core_dump_args *args, void *ret); static int remoteDispatchDomainCreate( @@ -119,7 +119,7 @@ static int remoteDispatchDomainCreate( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_create_args *args, void *ret); static int remoteDispatchDomainCreateWithFlags( @@ -127,7 +127,7 @@ static int remoteDispatchDomainCreateWithFlags( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_create_with_flags_args *args, remote_domain_create_with_flags_ret *ret); static int remoteDispatchDomainCreateXml( @@ -135,7 +135,7 @@ static int remoteDispatchDomainCreateXml( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_create_xml_args *args, remote_domain_create_xml_ret *ret); static int remoteDispatchDomainDefineXml( @@ -143,7 +143,7 @@ static int remoteDispatchDomainDefineXml( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_define_xml_args *args, remote_domain_define_xml_ret *ret); static int remoteDispatchDomainDestroy( @@ -151,7 +151,7 @@ static int remoteDispatchDomainDestroy( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_destroy_args *args, void *ret); static int remoteDispatchDomainDetachDevice( @@ -159,7 +159,7 @@ static int remoteDispatchDomainDetachDevice( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_detach_device_args *args, void *ret); static int remoteDispatchDomainDetachDeviceFlags( @@ -167,7 +167,7 @@ static int remoteDispatchDomainDetachDeviceFlags( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_detach_device_flags_args *args, void *ret); static int remoteDispatchDomainDumpXml( @@ -175,7 +175,7 @@ static int remoteDispatchDomainDumpXml( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_dump_xml_args *args, remote_domain_dump_xml_ret *ret); static int remoteDispatchDomainEventsDeregister( @@ -183,7 +183,7 @@ static int remoteDispatchDomainEventsDeregister( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, void *args, remote_domain_events_deregister_ret *ret); static int remoteDispatchDomainEventsDeregisterAny( @@ -191,7 +191,7 @@ static int remoteDispatchDomainEventsDeregisterAny( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_events_deregister_any_args *args, void *ret); static int remoteDispatchDomainEventsRegister( @@ -199,7 +199,7 @@ static int remoteDispatchDomainEventsRegister( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, void *args, remote_domain_events_register_ret *ret); static int remoteDispatchDomainEventsRegisterAny( @@ -207,7 +207,7 @@ static int remoteDispatchDomainEventsRegisterAny( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_events_register_any_args *args, void *ret); static int remoteDispatchDomainGetAutostart( @@ -215,7 +215,7 @@ static int remoteDispatchDomainGetAutostart( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_get_autostart_args *args, remote_domain_get_autostart_ret *ret); static int remoteDispatchDomainGetBlkioParameters( @@ -223,7 +223,7 @@ static int remoteDispatchDomainGetBlkioParameters( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_get_blkio_parameters_args *args, remote_domain_get_blkio_parameters_ret *ret); static int remoteDispatchDomainGetBlockInfo( @@ -231,7 +231,7 @@ static int remoteDispatchDomainGetBlockInfo( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_get_block_info_args *args, remote_domain_get_block_info_ret *ret); static int remoteDispatchDomainGetInfo( @@ -239,7 +239,7 @@ static int remoteDispatchDomainGetInfo( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_get_info_args *args, remote_domain_get_info_ret *ret); static int remoteDispatchDomainGetJobInfo( @@ -247,7 +247,7 @@ static int remoteDispatchDomainGetJobInfo( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_get_job_info_args *args, remote_domain_get_job_info_ret *ret); static int remoteDispatchDomainGetMaxMemory( @@ -255,7 +255,7 @@ static int remoteDispatchDomainGetMaxMemory( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_get_max_memory_args *args, remote_domain_get_max_memory_ret *ret); static int remoteDispatchDomainGetMaxVcpus( @@ -263,7 +263,7 @@ static int remoteDispatchDomainGetMaxVcpus( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_get_max_vcpus_args *args, remote_domain_get_max_vcpus_ret *ret); static int remoteDispatchDomainGetMemoryParameters( @@ -271,7 +271,7 @@ static int remoteDispatchDomainGetMemoryParameters( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_get_memory_parameters_args *args, remote_domain_get_memory_parameters_ret *ret); static int remoteDispatchDomainGetOsType( @@ -279,7 +279,7 @@ static int remoteDispatchDomainGetOsType( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_get_os_type_args *args, remote_domain_get_os_type_ret *ret); static int remoteDispatchDomainGetSchedulerParameters( @@ -287,7 +287,7 @@ static int remoteDispatchDomainGetSchedulerParameters( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_get_scheduler_parameters_args *args, remote_domain_get_scheduler_parameters_ret *ret); static int remoteDispatchDomainGetSchedulerType( @@ -295,7 +295,7 @@ static int remoteDispatchDomainGetSchedulerType( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_get_scheduler_type_args *args, remote_domain_get_scheduler_type_ret *ret); static int remoteDispatchDomainGetSecurityLabel( @@ -303,7 +303,7 @@ static int remoteDispatchDomainGetSecurityLabel( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_get_security_label_args *args, remote_domain_get_security_label_ret *ret); static int remoteDispatchDomainGetVcpus( @@ -311,7 +311,7 @@ static int remoteDispatchDomainGetVcpus( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_get_vcpus_args *args, remote_domain_get_vcpus_ret *ret); static int remoteDispatchDomainGetVcpusFlags( @@ -319,7 +319,7 @@ static int remoteDispatchDomainGetVcpusFlags( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_get_vcpus_flags_args *args, remote_domain_get_vcpus_flags_ret *ret); static int remoteDispatchDomainHasCurrentSnapshot( @@ -327,7 +327,7 @@ static int remoteDispatchDomainHasCurrentSnapshot( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_has_current_snapshot_args *args, remote_domain_has_current_snapshot_ret *ret); static int remoteDispatchDomainHasManagedSaveImage( @@ -335,7 +335,7 @@ static int remoteDispatchDomainHasManagedSaveImage( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_has_managed_save_image_args *args, remote_domain_has_managed_save_image_ret *ret); static int remoteDispatchDomainInterfaceStats( @@ -343,7 +343,7 @@ static int remoteDispatchDomainInterfaceStats( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_interface_stats_args *args, remote_domain_interface_stats_ret *ret); static int remoteDispatchDomainIsActive( @@ -351,7 +351,7 @@ static int remoteDispatchDomainIsActive( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_is_active_args *args, remote_domain_is_active_ret *ret); static int remoteDispatchDomainIsPersistent( @@ -359,7 +359,7 @@ static int remoteDispatchDomainIsPersistent( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_is_persistent_args *args, remote_domain_is_persistent_ret *ret); static int remoteDispatchDomainIsUpdated( @@ -367,7 +367,7 @@ static int remoteDispatchDomainIsUpdated( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_is_updated_args *args, remote_domain_is_updated_ret *ret); static int remoteDispatchDomainLookupById( @@ -375,7 +375,7 @@ static int remoteDispatchDomainLookupById( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_lookup_by_id_args *args, remote_domain_lookup_by_id_ret *ret); static int remoteDispatchDomainLookupByName( @@ -383,7 +383,7 @@ static int remoteDispatchDomainLookupByName( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_lookup_by_name_args *args, remote_domain_lookup_by_name_ret *ret); static int remoteDispatchDomainLookupByUuid( @@ -391,7 +391,7 @@ static int remoteDispatchDomainLookupByUuid( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_lookup_by_uuid_args *args, remote_domain_lookup_by_uuid_ret *ret); static int remoteDispatchDomainManagedSave( @@ -399,7 +399,7 @@ static int remoteDispatchDomainManagedSave( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_managed_save_args *args, void *ret); static int remoteDispatchDomainManagedSaveRemove( @@ -407,7 +407,7 @@ static int remoteDispatchDomainManagedSaveRemove( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_managed_save_remove_args *args, void *ret); static int remoteDispatchDomainMemoryPeek( @@ -415,7 +415,7 @@ static int remoteDispatchDomainMemoryPeek( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_memory_peek_args *args, remote_domain_memory_peek_ret *ret); static int remoteDispatchDomainMemoryStats( @@ -423,7 +423,7 @@ static int remoteDispatchDomainMemoryStats( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_memory_stats_args *args, remote_domain_memory_stats_ret *ret); static int remoteDispatchDomainMigrateFinish( @@ -431,7 +431,7 @@ static int remoteDispatchDomainMigrateFinish( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_migrate_finish_args *args, remote_domain_migrate_finish_ret *ret); static int remoteDispatchDomainMigrateFinish2( @@ -439,7 +439,7 @@ static int remoteDispatchDomainMigrateFinish2( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_migrate_finish2_args *args, remote_domain_migrate_finish2_ret *ret); static int remoteDispatchDomainMigratePerform( @@ -447,7 +447,7 @@ static int remoteDispatchDomainMigratePerform( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_migrate_perform_args *args, void *ret); static int remoteDispatchDomainMigratePrepare( @@ -455,7 +455,7 @@ static int remoteDispatchDomainMigratePrepare( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_migrate_prepare_args *args, remote_domain_migrate_prepare_ret *ret); static int remoteDispatchDomainMigratePrepare2( @@ -463,7 +463,7 @@ static int remoteDispatchDomainMigratePrepare2( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_migrate_prepare2_args *args, remote_domain_migrate_prepare2_ret *ret); static int remoteDispatchDomainMigratePrepareTunnel( @@ -471,7 +471,7 @@ static int remoteDispatchDomainMigratePrepareTunnel( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_migrate_prepare_tunnel_args *args, void *ret); static int remoteDispatchDomainMigrateSetMaxDowntime( @@ -479,7 +479,7 @@ static int remoteDispatchDomainMigrateSetMaxDowntime( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_migrate_set_max_downtime_args *args, void *ret); static int remoteDispatchDomainMigrateSetMaxSpeed( @@ -487,7 +487,7 @@ static int remoteDispatchDomainMigrateSetMaxSpeed( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_migrate_set_max_speed_args *args, void *ret); static int remoteDispatchDomainOpenConsole( @@ -495,7 +495,7 @@ static int remoteDispatchDomainOpenConsole( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_open_console_args *args, void *ret); static int remoteDispatchDomainPinVcpu( @@ -503,7 +503,7 @@ static int remoteDispatchDomainPinVcpu( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_pin_vcpu_args *args, void *ret); static int remoteDispatchDomainReboot( @@ -511,7 +511,7 @@ static int remoteDispatchDomainReboot( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_reboot_args *args, void *ret); static int remoteDispatchDomainRestore( @@ -519,7 +519,7 @@ static int remoteDispatchDomainRestore( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_restore_args *args, void *ret); static int remoteDispatchDomainResume( @@ -527,7 +527,7 @@ static int remoteDispatchDomainResume( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_resume_args *args, void *ret); static int remoteDispatchDomainRevertToSnapshot( @@ -535,7 +535,7 @@ static int remoteDispatchDomainRevertToSnapshot( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_revert_to_snapshot_args *args, void *ret); static int remoteDispatchDomainSave( @@ -543,7 +543,7 @@ static int remoteDispatchDomainSave( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_save_args *args, void *ret); static int remoteDispatchDomainSetAutostart( @@ -551,7 +551,7 @@ static int remoteDispatchDomainSetAutostart( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_set_autostart_args *args, void *ret); static int remoteDispatchDomainSetBlkioParameters( @@ -559,7 +559,7 @@ static int remoteDispatchDomainSetBlkioParameters( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_set_blkio_parameters_args *args, void *ret); static int remoteDispatchDomainSetMaxMemory( @@ -567,7 +567,7 @@ static int remoteDispatchDomainSetMaxMemory( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_set_max_memory_args *args, void *ret); static int remoteDispatchDomainSetMemory( @@ -575,7 +575,7 @@ static int remoteDispatchDomainSetMemory( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_set_memory_args *args, void *ret); static int remoteDispatchDomainSetMemoryFlags( @@ -583,7 +583,7 @@ static int remoteDispatchDomainSetMemoryFlags( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_set_memory_flags_args *args, void *ret); static int remoteDispatchDomainSetMemoryParameters( @@ -591,7 +591,7 @@ static int remoteDispatchDomainSetMemoryParameters( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_set_memory_parameters_args *args, void *ret); static int remoteDispatchDomainSetSchedulerParameters( @@ -599,7 +599,7 @@ static int remoteDispatchDomainSetSchedulerParameters( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_set_scheduler_parameters_args *args, void *ret); static int remoteDispatchDomainSetVcpus( @@ -607,7 +607,7 @@ static int remoteDispatchDomainSetVcpus( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_set_vcpus_args *args, void *ret); static int remoteDispatchDomainSetVcpusFlags( @@ -615,7 +615,7 @@ static int remoteDispatchDomainSetVcpusFlags( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_set_vcpus_flags_args *args, void *ret); static int remoteDispatchDomainShutdown( @@ -623,7 +623,7 @@ static int remoteDispatchDomainShutdown( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_shutdown_args *args, void *ret); static int remoteDispatchDomainSnapshotCreateXml( @@ -631,7 +631,7 @@ static int remoteDispatchDomainSnapshotCreateXml( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_snapshot_create_xml_args *args, remote_domain_snapshot_create_xml_ret *ret); static int remoteDispatchDomainSnapshotCurrent( @@ -639,7 +639,7 @@ static int remoteDispatchDomainSnapshotCurrent( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_snapshot_current_args *args, remote_domain_snapshot_current_ret *ret); static int remoteDispatchDomainSnapshotDelete( @@ -647,7 +647,7 @@ static int remoteDispatchDomainSnapshotDelete( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_snapshot_delete_args *args, void *ret); static int remoteDispatchDomainSnapshotDumpXml( @@ -655,7 +655,7 @@ static int remoteDispatchDomainSnapshotDumpXml( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_snapshot_dump_xml_args *args, remote_domain_snapshot_dump_xml_ret *ret); static int remoteDispatchDomainSnapshotListNames( @@ -663,7 +663,7 @@ static int remoteDispatchDomainSnapshotListNames( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_snapshot_list_names_args *args, remote_domain_snapshot_list_names_ret *ret); static int remoteDispatchDomainSnapshotLookupByName( @@ -671,7 +671,7 @@ static int remoteDispatchDomainSnapshotLookupByName( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_snapshot_lookup_by_name_args *args, remote_domain_snapshot_lookup_by_name_ret *ret); static int remoteDispatchDomainSnapshotNum( @@ -679,7 +679,7 @@ static int remoteDispatchDomainSnapshotNum( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_snapshot_num_args *args, remote_domain_snapshot_num_ret *ret); static int remoteDispatchDomainSuspend( @@ -687,7 +687,7 @@ static int remoteDispatchDomainSuspend( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_suspend_args *args, void *ret); static int remoteDispatchDomainUndefine( @@ -695,7 +695,7 @@ static int remoteDispatchDomainUndefine( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_undefine_args *args, void *ret); static int remoteDispatchDomainUpdateDeviceFlags( @@ -703,7 +703,7 @@ static int remoteDispatchDomainUpdateDeviceFlags( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_update_device_flags_args *args, void *ret); static int remoteDispatchDomainXmlFromNative( @@ -711,7 +711,7 @@ static int remoteDispatchDomainXmlFromNative( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_xml_from_native_args *args, remote_domain_xml_from_native_ret *ret); static int remoteDispatchDomainXmlToNative( @@ -719,7 +719,7 @@ static int remoteDispatchDomainXmlToNative( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_domain_xml_to_native_args *args, remote_domain_xml_to_native_ret *ret); static int remoteDispatchFindStoragePoolSources( @@ -727,7 +727,7 @@ static int remoteDispatchFindStoragePoolSources( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_find_storage_pool_sources_args *args, remote_find_storage_pool_sources_ret *ret); static int remoteDispatchGetCapabilities( @@ -735,7 +735,7 @@ static int remoteDispatchGetCapabilities( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, void *args, remote_get_capabilities_ret *ret); static int remoteDispatchGetHostname( @@ -743,7 +743,7 @@ static int remoteDispatchGetHostname( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, void *args, remote_get_hostname_ret *ret); static int remoteDispatchGetLibVersion( @@ -751,7 +751,7 @@ static int remoteDispatchGetLibVersion( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, void *args, remote_get_lib_version_ret *ret); static int remoteDispatchGetMaxVcpus( @@ -759,7 +759,7 @@ static int remoteDispatchGetMaxVcpus( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_get_max_vcpus_args *args, remote_get_max_vcpus_ret *ret); static int remoteDispatchGetSysinfo( @@ -767,7 +767,7 @@ static int remoteDispatchGetSysinfo( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_get_sysinfo_args *args, remote_get_sysinfo_ret *ret); static int remoteDispatchGetType( @@ -775,7 +775,7 @@ static int remoteDispatchGetType( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, void *args, remote_get_type_ret *ret); static int remoteDispatchGetUri( @@ -783,7 +783,7 @@ static int remoteDispatchGetUri( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, void *args, remote_get_uri_ret *ret); static int remoteDispatchGetVersion( @@ -791,7 +791,7 @@ static int remoteDispatchGetVersion( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, void *args, remote_get_version_ret *ret); static int remoteDispatchInterfaceCreate( @@ -799,7 +799,7 @@ static int remoteDispatchInterfaceCreate( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_interface_create_args *args, void *ret); static int remoteDispatchInterfaceDefineXml( @@ -807,7 +807,7 @@ static int remoteDispatchInterfaceDefineXml( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_interface_define_xml_args *args, remote_interface_define_xml_ret *ret); static int remoteDispatchInterfaceDestroy( @@ -815,7 +815,7 @@ static int remoteDispatchInterfaceDestroy( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_interface_destroy_args *args, void *ret); static int remoteDispatchInterfaceGetXmlDesc( @@ -823,7 +823,7 @@ static int remoteDispatchInterfaceGetXmlDesc( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_interface_get_xml_desc_args *args, remote_interface_get_xml_desc_ret *ret); static int remoteDispatchInterfaceIsActive( @@ -831,7 +831,7 @@ static int remoteDispatchInterfaceIsActive( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_interface_is_active_args *args, remote_interface_is_active_ret *ret); static int remoteDispatchInterfaceLookupByMacString( @@ -839,7 +839,7 @@ static int remoteDispatchInterfaceLookupByMacString( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_interface_lookup_by_mac_string_args *args, remote_interface_lookup_by_mac_string_ret *ret); static int remoteDispatchInterfaceLookupByName( @@ -847,7 +847,7 @@ static int remoteDispatchInterfaceLookupByName( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_interface_lookup_by_name_args *args, remote_interface_lookup_by_name_ret *ret); static int remoteDispatchInterfaceUndefine( @@ -855,7 +855,7 @@ static int remoteDispatchInterfaceUndefine( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_interface_undefine_args *args, void *ret); static int remoteDispatchIsSecure( @@ -863,7 +863,7 @@ static int remoteDispatchIsSecure( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, void *args, remote_is_secure_ret *ret); static int remoteDispatchListDefinedDomains( @@ -871,7 +871,7 @@ static int remoteDispatchListDefinedDomains( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_list_defined_domains_args *args, remote_list_defined_domains_ret *ret); static int remoteDispatchListDefinedInterfaces( @@ -879,7 +879,7 @@ static int remoteDispatchListDefinedInterfaces( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_list_defined_interfaces_args *args, remote_list_defined_interfaces_ret *ret); static int remoteDispatchListDefinedNetworks( @@ -887,7 +887,7 @@ static int remoteDispatchListDefinedNetworks( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_list_defined_networks_args *args, remote_list_defined_networks_ret *ret); static int remoteDispatchListDefinedStoragePools( @@ -895,7 +895,7 @@ static int remoteDispatchListDefinedStoragePools( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_list_defined_storage_pools_args *args, remote_list_defined_storage_pools_ret *ret); static int remoteDispatchListDomains( @@ -903,7 +903,7 @@ static int remoteDispatchListDomains( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_list_domains_args *args, remote_list_domains_ret *ret); static int remoteDispatchListInterfaces( @@ -911,7 +911,7 @@ static int remoteDispatchListInterfaces( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_list_interfaces_args *args, remote_list_interfaces_ret *ret); static int remoteDispatchListNetworks( @@ -919,7 +919,7 @@ static int remoteDispatchListNetworks( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_list_networks_args *args, remote_list_networks_ret *ret); static int remoteDispatchListNwfilters( @@ -927,7 +927,7 @@ static int remoteDispatchListNwfilters( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_list_nwfilters_args *args, remote_list_nwfilters_ret *ret); static int remoteDispatchListSecrets( @@ -935,7 +935,7 @@ static int remoteDispatchListSecrets( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_list_secrets_args *args, remote_list_secrets_ret *ret); static int remoteDispatchListStoragePools( @@ -943,7 +943,7 @@ static int remoteDispatchListStoragePools( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_list_storage_pools_args *args, remote_list_storage_pools_ret *ret); static int remoteDispatchNetworkCreate( @@ -951,7 +951,7 @@ static int remoteDispatchNetworkCreate( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_network_create_args *args, void *ret); static int remoteDispatchNetworkCreateXml( @@ -959,7 +959,7 @@ static int remoteDispatchNetworkCreateXml( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_network_create_xml_args *args, remote_network_create_xml_ret *ret); static int remoteDispatchNetworkDefineXml( @@ -967,7 +967,7 @@ static int remoteDispatchNetworkDefineXml( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_network_define_xml_args *args, remote_network_define_xml_ret *ret); static int remoteDispatchNetworkDestroy( @@ -975,7 +975,7 @@ static int remoteDispatchNetworkDestroy( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_network_destroy_args *args, void *ret); static int remoteDispatchNetworkDumpXml( @@ -983,7 +983,7 @@ static int remoteDispatchNetworkDumpXml( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_network_dump_xml_args *args, remote_network_dump_xml_ret *ret); static int remoteDispatchNetworkGetAutostart( @@ -991,7 +991,7 @@ static int remoteDispatchNetworkGetAutostart( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_network_get_autostart_args *args, remote_network_get_autostart_ret *ret); static int remoteDispatchNetworkGetBridgeName( @@ -999,7 +999,7 @@ static int remoteDispatchNetworkGetBridgeName( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_network_get_bridge_name_args *args, remote_network_get_bridge_name_ret *ret); static int remoteDispatchNetworkIsActive( @@ -1007,7 +1007,7 @@ static int remoteDispatchNetworkIsActive( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_network_is_active_args *args, remote_network_is_active_ret *ret); static int remoteDispatchNetworkIsPersistent( @@ -1015,7 +1015,7 @@ static int remoteDispatchNetworkIsPersistent( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_network_is_persistent_args *args, remote_network_is_persistent_ret *ret); static int remoteDispatchNetworkLookupByName( @@ -1023,7 +1023,7 @@ static int remoteDispatchNetworkLookupByName( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_network_lookup_by_name_args *args, remote_network_lookup_by_name_ret *ret); static int remoteDispatchNetworkLookupByUuid( @@ -1031,7 +1031,7 @@ static int remoteDispatchNetworkLookupByUuid( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_network_lookup_by_uuid_args *args, remote_network_lookup_by_uuid_ret *ret); static int remoteDispatchNetworkSetAutostart( @@ -1039,7 +1039,7 @@ static int remoteDispatchNetworkSetAutostart( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_network_set_autostart_args *args, void *ret); static int remoteDispatchNetworkUndefine( @@ -1047,7 +1047,7 @@ static int remoteDispatchNetworkUndefine( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_network_undefine_args *args, void *ret); static int remoteDispatchNodeDeviceCreateXml( @@ -1055,7 +1055,7 @@ static int remoteDispatchNodeDeviceCreateXml( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_node_device_create_xml_args *args, remote_node_device_create_xml_ret *ret); static int remoteDispatchNodeDeviceDestroy( @@ -1063,7 +1063,7 @@ static int remoteDispatchNodeDeviceDestroy( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_node_device_destroy_args *args, void *ret); static int remoteDispatchNodeDeviceDettach( @@ -1071,7 +1071,7 @@ static int remoteDispatchNodeDeviceDettach( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_node_device_dettach_args *args, void *ret); static int remoteDispatchNodeDeviceDumpXml( @@ -1079,7 +1079,7 @@ static int remoteDispatchNodeDeviceDumpXml( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_node_device_dump_xml_args *args, remote_node_device_dump_xml_ret *ret); static int remoteDispatchNodeDeviceGetParent( @@ -1087,7 +1087,7 @@ static int remoteDispatchNodeDeviceGetParent( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_node_device_get_parent_args *args, remote_node_device_get_parent_ret *ret); static int remoteDispatchNodeDeviceListCaps( @@ -1095,7 +1095,7 @@ static int remoteDispatchNodeDeviceListCaps( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_node_device_list_caps_args *args, remote_node_device_list_caps_ret *ret); static int remoteDispatchNodeDeviceLookupByName( @@ -1103,7 +1103,7 @@ static int remoteDispatchNodeDeviceLookupByName( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_node_device_lookup_by_name_args *args, remote_node_device_lookup_by_name_ret *ret); static int remoteDispatchNodeDeviceNumOfCaps( @@ -1111,7 +1111,7 @@ static int remoteDispatchNodeDeviceNumOfCaps( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_node_device_num_of_caps_args *args, remote_node_device_num_of_caps_ret *ret); static int remoteDispatchNodeDeviceReAttach( @@ -1119,7 +1119,7 @@ static int remoteDispatchNodeDeviceReAttach( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_node_device_re_attach_args *args, void *ret); static int remoteDispatchNodeDeviceReset( @@ -1127,7 +1127,7 @@ static int remoteDispatchNodeDeviceReset( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_node_device_reset_args *args, void *ret); static int remoteDispatchNodeGetCellsFreeMemory( @@ -1135,7 +1135,7 @@ static int remoteDispatchNodeGetCellsFreeMemory( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_node_get_cells_free_memory_args *args, remote_node_get_cells_free_memory_ret *ret); static int remoteDispatchNodeGetFreeMemory( @@ -1143,7 +1143,7 @@ static int remoteDispatchNodeGetFreeMemory( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, void *args, remote_node_get_free_memory_ret *ret); static int remoteDispatchNodeGetInfo( @@ -1151,7 +1151,7 @@ static int remoteDispatchNodeGetInfo( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, void *args, remote_node_get_info_ret *ret); static int remoteDispatchNodeGetSecurityModel( @@ -1159,7 +1159,7 @@ static int remoteDispatchNodeGetSecurityModel( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, void *args, remote_node_get_security_model_ret *ret); static int remoteDispatchNodeListDevices( @@ -1167,7 +1167,7 @@ static int remoteDispatchNodeListDevices( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_node_list_devices_args *args, remote_node_list_devices_ret *ret); static int remoteDispatchNodeNumOfDevices( @@ -1175,7 +1175,7 @@ static int remoteDispatchNodeNumOfDevices( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_node_num_of_devices_args *args, remote_node_num_of_devices_ret *ret); static int remoteDispatchNumOfDefinedDomains( @@ -1183,7 +1183,7 @@ static int remoteDispatchNumOfDefinedDomains( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, void *args, remote_num_of_defined_domains_ret *ret); static int remoteDispatchNumOfDefinedInterfaces( @@ -1191,7 +1191,7 @@ static int remoteDispatchNumOfDefinedInterfaces( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, void *args, remote_num_of_defined_interfaces_ret *ret); static int remoteDispatchNumOfDefinedNetworks( @@ -1199,7 +1199,7 @@ static int remoteDispatchNumOfDefinedNetworks( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, void *args, remote_num_of_defined_networks_ret *ret); static int remoteDispatchNumOfDefinedStoragePools( @@ -1207,7 +1207,7 @@ static int remoteDispatchNumOfDefinedStoragePools( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, void *args, remote_num_of_defined_storage_pools_ret *ret); static int remoteDispatchNumOfDomains( @@ -1215,7 +1215,7 @@ static int remoteDispatchNumOfDomains( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, void *args, remote_num_of_domains_ret *ret); static int remoteDispatchNumOfInterfaces( @@ -1223,7 +1223,7 @@ static int remoteDispatchNumOfInterfaces( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, void *args, remote_num_of_interfaces_ret *ret); static int remoteDispatchNumOfNetworks( @@ -1231,7 +1231,7 @@ static int remoteDispatchNumOfNetworks( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, void *args, remote_num_of_networks_ret *ret); static int remoteDispatchNumOfNwfilters( @@ -1239,7 +1239,7 @@ static int remoteDispatchNumOfNwfilters( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, void *args, remote_num_of_nwfilters_ret *ret); static int remoteDispatchNumOfSecrets( @@ -1247,7 +1247,7 @@ static int remoteDispatchNumOfSecrets( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, void *args, remote_num_of_secrets_ret *ret); static int remoteDispatchNumOfStoragePools( @@ -1255,7 +1255,7 @@ static int remoteDispatchNumOfStoragePools( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, void *args, remote_num_of_storage_pools_ret *ret); static int remoteDispatchNwfilterDefineXml( @@ -1263,7 +1263,7 @@ static int remoteDispatchNwfilterDefineXml( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_nwfilter_define_xml_args *args, remote_nwfilter_define_xml_ret *ret); static int remoteDispatchNwfilterGetXmlDesc( @@ -1271,7 +1271,7 @@ static int remoteDispatchNwfilterGetXmlDesc( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_nwfilter_get_xml_desc_args *args, remote_nwfilter_get_xml_desc_ret *ret); static int remoteDispatchNwfilterLookupByName( @@ -1279,7 +1279,7 @@ static int remoteDispatchNwfilterLookupByName( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_nwfilter_lookup_by_name_args *args, remote_nwfilter_lookup_by_name_ret *ret); static int remoteDispatchNwfilterLookupByUuid( @@ -1287,7 +1287,7 @@ static int remoteDispatchNwfilterLookupByUuid( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_nwfilter_lookup_by_uuid_args *args, remote_nwfilter_lookup_by_uuid_ret *ret); static int remoteDispatchNwfilterUndefine( @@ -1295,7 +1295,7 @@ static int remoteDispatchNwfilterUndefine( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_nwfilter_undefine_args *args, void *ret); static int remoteDispatchOpen( @@ -1303,7 +1303,7 @@ static int remoteDispatchOpen( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_open_args *args, void *ret); static int remoteDispatchSecretDefineXml( @@ -1311,7 +1311,7 @@ static int remoteDispatchSecretDefineXml( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_secret_define_xml_args *args, remote_secret_define_xml_ret *ret); static int remoteDispatchSecretGetValue( @@ -1319,7 +1319,7 @@ static int remoteDispatchSecretGetValue( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_secret_get_value_args *args, remote_secret_get_value_ret *ret); static int remoteDispatchSecretGetXmlDesc( @@ -1327,7 +1327,7 @@ static int remoteDispatchSecretGetXmlDesc( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_secret_get_xml_desc_args *args, remote_secret_get_xml_desc_ret *ret); static int remoteDispatchSecretLookupByUsage( @@ -1335,7 +1335,7 @@ static int remoteDispatchSecretLookupByUsage( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_secret_lookup_by_usage_args *args, remote_secret_lookup_by_usage_ret *ret); static int remoteDispatchSecretLookupByUuid( @@ -1343,7 +1343,7 @@ static int remoteDispatchSecretLookupByUuid( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_secret_lookup_by_uuid_args *args, remote_secret_lookup_by_uuid_ret *ret); static int remoteDispatchSecretSetValue( @@ -1351,7 +1351,7 @@ static int remoteDispatchSecretSetValue( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_secret_set_value_args *args, void *ret); static int remoteDispatchSecretUndefine( @@ -1359,7 +1359,7 @@ static int remoteDispatchSecretUndefine( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_secret_undefine_args *args, void *ret); static int remoteDispatchStoragePoolBuild( @@ -1367,7 +1367,7 @@ static int remoteDispatchStoragePoolBuild( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_storage_pool_build_args *args, void *ret); static int remoteDispatchStoragePoolCreate( @@ -1375,7 +1375,7 @@ static int remoteDispatchStoragePoolCreate( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_storage_pool_create_args *args, void *ret); static int remoteDispatchStoragePoolCreateXml( @@ -1383,7 +1383,7 @@ static int remoteDispatchStoragePoolCreateXml( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_storage_pool_create_xml_args *args, remote_storage_pool_create_xml_ret *ret); static int remoteDispatchStoragePoolDefineXml( @@ -1391,7 +1391,7 @@ static int remoteDispatchStoragePoolDefineXml( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_storage_pool_define_xml_args *args, remote_storage_pool_define_xml_ret *ret); static int remoteDispatchStoragePoolDelete( @@ -1399,7 +1399,7 @@ static int remoteDispatchStoragePoolDelete( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_storage_pool_delete_args *args, void *ret); static int remoteDispatchStoragePoolDestroy( @@ -1407,7 +1407,7 @@ static int remoteDispatchStoragePoolDestroy( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_storage_pool_destroy_args *args, void *ret); static int remoteDispatchStoragePoolDumpXml( @@ -1415,7 +1415,7 @@ static int remoteDispatchStoragePoolDumpXml( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_storage_pool_dump_xml_args *args, remote_storage_pool_dump_xml_ret *ret); static int remoteDispatchStoragePoolGetAutostart( @@ -1423,7 +1423,7 @@ static int remoteDispatchStoragePoolGetAutostart( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_storage_pool_get_autostart_args *args, remote_storage_pool_get_autostart_ret *ret); static int remoteDispatchStoragePoolGetInfo( @@ -1431,7 +1431,7 @@ static int remoteDispatchStoragePoolGetInfo( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_storage_pool_get_info_args *args, remote_storage_pool_get_info_ret *ret); static int remoteDispatchStoragePoolIsActive( @@ -1439,7 +1439,7 @@ static int remoteDispatchStoragePoolIsActive( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_storage_pool_is_active_args *args, remote_storage_pool_is_active_ret *ret); static int remoteDispatchStoragePoolIsPersistent( @@ -1447,7 +1447,7 @@ static int remoteDispatchStoragePoolIsPersistent( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_storage_pool_is_persistent_args *args, remote_storage_pool_is_persistent_ret *ret); static int remoteDispatchStoragePoolListVolumes( @@ -1455,7 +1455,7 @@ static int remoteDispatchStoragePoolListVolumes( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_storage_pool_list_volumes_args *args, remote_storage_pool_list_volumes_ret *ret); static int remoteDispatchStoragePoolLookupByName( @@ -1463,7 +1463,7 @@ static int remoteDispatchStoragePoolLookupByName( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_storage_pool_lookup_by_name_args *args, remote_storage_pool_lookup_by_name_ret *ret); static int remoteDispatchStoragePoolLookupByUuid( @@ -1471,7 +1471,7 @@ static int remoteDispatchStoragePoolLookupByUuid( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_storage_pool_lookup_by_uuid_args *args, remote_storage_pool_lookup_by_uuid_ret *ret); static int remoteDispatchStoragePoolLookupByVolume( @@ -1479,7 +1479,7 @@ static int remoteDispatchStoragePoolLookupByVolume( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_storage_pool_lookup_by_volume_args *args, remote_storage_pool_lookup_by_volume_ret *ret); static int remoteDispatchStoragePoolNumOfVolumes( @@ -1487,7 +1487,7 @@ static int remoteDispatchStoragePoolNumOfVolumes( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_storage_pool_num_of_volumes_args *args, remote_storage_pool_num_of_volumes_ret *ret); static int remoteDispatchStoragePoolRefresh( @@ -1495,7 +1495,7 @@ static int remoteDispatchStoragePoolRefresh( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_storage_pool_refresh_args *args, void *ret); static int remoteDispatchStoragePoolSetAutostart( @@ -1503,7 +1503,7 @@ static int remoteDispatchStoragePoolSetAutostart( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_storage_pool_set_autostart_args *args, void *ret); static int remoteDispatchStoragePoolUndefine( @@ -1511,7 +1511,7 @@ static int remoteDispatchStoragePoolUndefine( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_storage_pool_undefine_args *args, void *ret); static int remoteDispatchStorageVolCreateXml( @@ -1519,7 +1519,7 @@ static int remoteDispatchStorageVolCreateXml( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_storage_vol_create_xml_args *args, remote_storage_vol_create_xml_ret *ret); static int remoteDispatchStorageVolCreateXmlFrom( @@ -1527,7 +1527,7 @@ static int remoteDispatchStorageVolCreateXmlFrom( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_storage_vol_create_xml_from_args *args, remote_storage_vol_create_xml_from_ret *ret); static int remoteDispatchStorageVolDelete( @@ -1535,7 +1535,7 @@ static int remoteDispatchStorageVolDelete( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_storage_vol_delete_args *args, void *ret); static int remoteDispatchStorageVolDownload( @@ -1543,7 +1543,7 @@ static int remoteDispatchStorageVolDownload( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_storage_vol_download_args *args, void *ret); static int remoteDispatchStorageVolDumpXml( @@ -1551,7 +1551,7 @@ static int remoteDispatchStorageVolDumpXml( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_storage_vol_dump_xml_args *args, remote_storage_vol_dump_xml_ret *ret); static int remoteDispatchStorageVolGetInfo( @@ -1559,7 +1559,7 @@ static int remoteDispatchStorageVolGetInfo( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_storage_vol_get_info_args *args, remote_storage_vol_get_info_ret *ret); static int remoteDispatchStorageVolGetPath( @@ -1567,7 +1567,7 @@ static int remoteDispatchStorageVolGetPath( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_storage_vol_get_path_args *args, remote_storage_vol_get_path_ret *ret); static int remoteDispatchStorageVolLookupByKey( @@ -1575,7 +1575,7 @@ static int remoteDispatchStorageVolLookupByKey( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_storage_vol_lookup_by_key_args *args, remote_storage_vol_lookup_by_key_ret *ret); static int remoteDispatchStorageVolLookupByName( @@ -1583,7 +1583,7 @@ static int remoteDispatchStorageVolLookupByName( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_storage_vol_lookup_by_name_args *args, remote_storage_vol_lookup_by_name_ret *ret); static int remoteDispatchStorageVolLookupByPath( @@ -1591,7 +1591,7 @@ static int remoteDispatchStorageVolLookupByPath( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_storage_vol_lookup_by_path_args *args, remote_storage_vol_lookup_by_path_ret *ret); static int remoteDispatchStorageVolUpload( @@ -1599,7 +1599,7 @@ static int remoteDispatchStorageVolUpload( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_storage_vol_upload_args *args, void *ret); static int remoteDispatchStorageVolWipe( @@ -1607,7 +1607,7 @@ static int remoteDispatchStorageVolWipe( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_storage_vol_wipe_args *args, void *ret); static int remoteDispatchSupportsFeature( @@ -1615,6 +1615,6 @@ static int remoteDispatchSupportsFeature( struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, - remote_error *err, + remote_error *rerr, remote_supports_feature_args *args, remote_supports_feature_ret *ret); diff --git a/daemon/remote_generate_stubs.pl b/daemon/remote_generate_stubs.pl index a8c4e6d..dbde7da 100755 --- a/daemon/remote_generate_stubs.pl +++ b/daemon/remote_generate_stubs.pl @@ -132,7 +132,7 @@ elsif ($opt_p) { print " struct qemud_client *client,\n"; print " virConnectPtr conn,\n"; print " remote_message_header *hdr,\n"; - print " remote_error *err,\n"; + print " remote_error *rerr,\n"; print " $calls{$_}->{args} *args,\n"; print " $calls{$_}->{ret} *ret);\n"; } -- 1.7.0.4

2 2

[libvirt] [PATCH] Fix disability to run on systems with no PCI bus
by Michal Privoznik 22 Apr '11

22 Apr '11

The patch which moved libpciaccess initialization to one place caused regression - we were not able to run on system with no PCI bus, like s390(x). This patch fix it. --- src/node_device/node_device_udev.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 2139ef3..b6335ff 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1603,7 +1603,13 @@ static int udevDeviceMonitorStartup(int privileged) char ebuf[256]; VIR_ERROR(_("Failed to initialize libpciaccess: %s"), virStrerror(pciret, ebuf, sizeof ebuf)); +#if defined __s390__ || defined __s390x_ + /* On x390(x) system there is no PCI bus. + * Therefore we do not want to return error here */ + ret = 0; +#else ret = -1; +#endif goto out; } } -- 1.7.4.4

4 3

[libvirt] [PATCH] Add support for s390(x) cpu options parsing
by Michal Privoznik 22 Apr '11

22 Apr '11

Up to now we missed parser for cpuinfo on x390(x) machines. Those machines have only 1 thread, core, socket. What is missing is information about CPU frequency. --- src/nodeinfo.c | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index e0221f0..f55c83e 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -165,8 +165,10 @@ static int parse_socket(unsigned int cpu) { int ret = get_cpu_value(cpu, "topology/physical_package_id", false); # if defined(__powerpc__) || \ - defined(__powerpc64__) - /* ppc has -1 */ + defined(__powerpc64__) || \ + defined(__s390__) || \ + defined(__s390x__) + /* ppc and s390(x) has -1 */ if (ret < 0) ret = 0; # endif @@ -265,6 +267,29 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, && (*p == '\0' || *p == '.' || c_isspace(*p))) nodeinfo->mhz = ui; } +# elif defined(__s390__) || \ + defined(__s390x__) + } else if (STRPREFIX(buf, "# processors")) { + char *p; + unsigned int ui; + buf += 12; + while (*buf && c_isspace(*buf)) + buf++; + if (*buf != ':' || !buf[1]) { + nodeReportError(VIR_ERR_INTERNAL_ERROR, + _("parsing number of processors %c"), *buf); + return -1; + } + if (virStrToLong_ui(buf+1, &p, 10, &ui) == 0 + && (*p == '\0' || c_isspace(*p))) + nodeinfo->cpus = ui; + /* No other interesting infos are available in /proc/cpuinfo. + * However, there is a line identifying processor's version, + * identification and machine, but we don't want it to be caught + * and parsed in next iteration, because it is not in expected + * format and thus lead to error. */ + break; + } # else # warning Parser for /proc/cpuinfo needs to be adapted for your architecture # endif -- 1.7.4.4

3 2

Re: [libvirt] [PATCHv11 2/6] libvirt/qemu - clean up At(De)tachDeviceFlags() for consolidation.
by Eric Blake 22 Apr '11

22 Apr '11

On 04/21/2011 01:23 AM, KAMEZAWA Hiroyuki wrote: > clean up At(De)tachDeviceFlags() for consolidation. > > qemudDomainAttachDeviceFlags()/qemudDomainDetachFlags()/ > qemudDomainUpdateDeviceFlags() has similar logics and copied codes. > > This patch series tries to unify them to use shared code when it can. > At first, clean up At(De)tachDeviceFlags() and devide it into functions. > > By this, this patch pulls out shared components between functions. > Based on patch series by Eric Blake, I added some modification as > switch-case with QEMUD_DEVICE_ATTACH, QEMUD_DEVICE_DETACH, QEMUD_DEVICE_UPDATE I kind of liked my callback function pointers, but your switch statement isn't too many more lines of code and arguably a tiny bit more readable. I want this series in before 0.9.1, so I'm not going to reject the patch just because of a difference in approach :) > > +static int qemudDomainAttachDeviceDiskLive(struct qemud_driver *driver, The prefix qemud is a misnomer (it dates back to when we were running a daemon just for qemu and directly calling into xen; but now that the code has evolved, the daemon is named libvirtd and is independent of qemu, and the qemu code is independent of the daemon and no longer needs the 'd'). New code should use just 'qemu'. Yes, I know that changing it now means more merge conflicts to resolve later in the series. Oh well. > +static int qemudDomainDetachDeviceDiskLive(struct qemud_driver *driver, > + virDomainObjPtr vm, > + virDomainDeviceDefPtr dev, > + virBitmapPtr qemuCaps) > +{ > + virDomainDiskDefPtr disk = dev->data.disk; > + int ret = -1; > + > + switch (disk->device) { > + case VIR_DOMAIN_DISK_DEVICE_DISK: > + if (disk->bus == VIR_DOMAIN_DISK_BUS_VIRTIO) > + ret = qemuDomainDetachPciDiskDevice(driver, vm, dev, qemuCaps); > + else if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI) > + ret = qemuDomainDetachDiskDevice(driver, vm, dev, qemuCaps); > + else if (dev->data.disk->bus == VIR_DOMAIN_DISK_BUS_USB) > + ret = qemuDomainDetachDiskDevice(driver, vm, dev, qemuCaps); > + else > + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", > + _("This type of disk cannot be hot unplugged")); > + break; > + default: > + break; Oops, no error message on that path. > + > +enum { > + QEMUD_DEVICE_ATTACH, QEMUD_DEVICE_DETACH, QEMUD_DEVICE_UPDATE, I flattened these out to one-per-line as part of renaming to QEMU_*. > + * update domain status forcibly because the domain status may be changed > * even if we attach the device failed. For example, a new controller may > * be created. > */ > - if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) > + if (!ret && virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) This change violates the comment right before it. I undid it. ACK with those nits fixed, so I pushed a modified version (shoot; I've lost an easy way to have git show my incremental diffs, due to the merge conflict resolution from the renames). -- Eric Blake eblake(a)redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org

2 1

Re: [libvirt] [PATCHv11 1/6] libvirt/qemu - Centralize device modification in the more flexible APIs
by Eric Blake 22 Apr '11

22 Apr '11

On 04/21/2011 01:22 AM, KAMEZAWA Hiroyuki wrote: > > Centralize device modification in the more flexible APIs, to allow future > honoring of additional flags. Explicitly reject the > VIR_DOMAIN_DEVICE_MODIFY_FORCE flag on attach/detach. > > Based on Eric Blake<eblake(a)redhat.com>'s work. > > From: Eric Blake <eblake(a)redhat.com> > Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu(a)jp.fujitsu.com> > > * src/qemu/qemu_driver.c > (qemudDomainAttachDevice)(qemudDomainAttachDeviceFlags): Swap bodies,rename... Where's the rename? > (qemudDomainDetachDevice, qemudDomainDetachDeviceFlags): Likewise. > --- > src/qemu/qemu_driver.c | 53 ++++++++++++++++++++++++++--------------------- > 1 files changed, 29 insertions(+), 24 deletions(-) > > diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c > index f6e503a..a8f3849 100644 > --- a/src/qemu/qemu_driver.c > +++ b/src/qemu/qemu_driver.c > @@ -3786,8 +3786,8 @@ cleanup: > } > > > -static int qemudDomainAttachDevice(virDomainPtr dom, > - const char *xml) > +static int qemudDomainAttachDeviceFlags(virDomainPtr dom, const char *xml, > + unsigned int flags) I adjusted this to do s/qemud/qemu/ for the lines of code actually touched in this patch, plus fallout. ACK and pushed with this squashed in. diff --git c/src/qemu/qemu_driver.c w/src/qemu/qemu_driver.c index a8f3849..1f5a899 100644 --- c/src/qemu/qemu_driver.c +++ w/src/qemu/qemu_driver.c @@ -3786,8 +3786,8 @@ cleanup: } -static int qemudDomainAttachDeviceFlags(virDomainPtr dom, const char *xml, - unsigned int flags) +static int qemuDomainAttachDeviceFlags(virDomainPtr dom, const char *xml, + unsigned int flags) { struct qemud_driver *driver = dom->conn->privateData; virDomainObjPtr vm; @@ -3951,10 +3951,10 @@ cleanup: return ret; } -static int qemudDomainAttachDevice(virDomainPtr dom, const char *xml) +static int qemuDomainAttachDevice(virDomainPtr dom, const char *xml) { - return qemudDomainAttachDeviceFlags(dom, xml, - VIR_DOMAIN_DEVICE_MODIFY_LIVE); + return qemuDomainAttachDeviceFlags(dom, xml, + VIR_DOMAIN_DEVICE_MODIFY_LIVE); } @@ -4080,8 +4080,8 @@ cleanup: } -static int qemudDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, - unsigned int flags) +static int qemuDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, + unsigned int flags) { struct qemud_driver *driver = dom->conn->privateData; virDomainObjPtr vm; @@ -4175,10 +4175,10 @@ cleanup: return ret; } -static int qemudDomainDetachDevice(virDomainPtr dom, const char *xml) +static int qemuDomainDetachDevice(virDomainPtr dom, const char *xml) { - return qemudDomainDetachDeviceFlags(dom, xml, - VIR_DOMAIN_DEVICE_MODIFY_LIVE); + return qemuDomainDetachDeviceFlags(dom, xml, + VIR_DOMAIN_DEVICE_MODIFY_LIVE); } static int qemudDomainGetAutostart(virDomainPtr dom, @@ -6980,10 +6980,10 @@ static virDriver qemuDriver = { qemudDomainStartWithFlags, /* domainCreateWithFlags */ qemudDomainDefine, /* domainDefineXML */ qemudDomainUndefine, /* domainUndefine */ - qemudDomainAttachDevice, /* domainAttachDevice */ - qemudDomainAttachDeviceFlags, /* domainAttachDeviceFlags */ - qemudDomainDetachDevice, /* domainDetachDevice */ - qemudDomainDetachDeviceFlags, /* domainDetachDeviceFlags */ + qemuDomainAttachDevice, /* domainAttachDevice */ + qemuDomainAttachDeviceFlags, /* domainAttachDeviceFlags */ + qemuDomainDetachDevice, /* domainDetachDevice */ + qemuDomainDetachDeviceFlags, /* domainDetachDeviceFlags */ qemuDomainUpdateDeviceFlags, /* domainUpdateDeviceFlags */ qemudDomainGetAutostart, /* domainGetAutostart */ qemudDomainSetAutostart, /* domainSetAutostart */ -- Eric Blake eblake(a)redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org

2 1

Re: [libvirt] [PATCHv11 0/6] libvirt/qemu - persistent modification of devices
by Eric Blake 22 Apr '11

22 Apr '11

I'm assuming you meant for this to go to libvir-list rather than libvirt-users; all my subsequent mails will swap the list reply. On 04/21/2011 01:19 AM, KAMEZAWA Hiroyuki wrote: > > Here is v11. Fixed comments/bugs and updated against the latest libvirt.git. > > Changes v10->v11: > - fixed comments on each patches > - fixed cgroup handling in patch 3. > - fixed MODIFY_CURRENT handling in patch 4. > > most of diff comes from refactoring qemu/qemu_driver.c > -- > conf/domain_conf.c | 40 ++ > conf/domain_conf.h | 5 > libvirt_private.syms | 3 > qemu/qemu_driver.c | 727 +++++++++++++++++++++++++++++++-------------------- > 4 files changed, 500 insertions(+), 275 deletions(-) > > > Thanks, > -Kame > > -- Eric Blake eblake(a)redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org

2 1

[libvirt] [PATCH 00/16] Implement migration v3 protocol
by Daniel P. Berrange 22 Apr '11

22 Apr '11

This is an major update to http://www.redhat.com/archives/libvir-list/2011-February/msg00257.html In this update - Bug fixes from previous review - Remove assert() usage - Introduce SPICE graphics relocation - Refactoring of peer2peer & tunnelled migration code - Support for v3 migration with p2p & tunnelled migration - A (broken) attempt to make job signal/status updates work with tunnelled migration The latter item seemed to be working fine, but I've since found that it can cause QEMU to deadlock. While we're sending QEMU a montor command to update status, QEMU may be trying to write some migration data and it often blocks on write() to the migration socket. This could be a bug with us not giving it a non-blocking socket, or it could be a QEMU limitation. To be investigated....

2 19

[libvirt] [PATCH] Fix QEMU tunnelled migration FD handling
by Daniel P. Berrange 21 Apr '11

21 Apr '11

The two ends of the pipe used for feeding QEMU tunnelled migration data were interchanged, so QEMU got given the "write" end instead of the "read" end. The qemuMigrationPrepareTunnel method was also immediately closing the "write" end of the pipe, so the stream failed to actually write anything. * src/qemu/qemu_migration.c: Swap tunnelled migration pipe FDs & don't close pipe given to stream --- src/qemu/qemu_migration.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index bba76d5..7f4b111 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -301,7 +301,7 @@ qemuMigrationPrepareTunnel(struct qemud_driver *driver, vm->def->id = -1; if (pipe(dataFD) < 0 || - virSetCloseExec(dataFD[0]) < 0) { + virSetCloseExec(dataFD[1]) < 0) { virReportSystemError(errno, "%s", _("cannot create pipe for tunnelled migration")); goto endjob; @@ -318,7 +318,7 @@ qemuMigrationPrepareTunnel(struct qemud_driver *driver, /* Start the QEMU daemon, with the same command-line arguments plus * -incoming stdio (which qemu_command might convert to exec:cat or fd:n) */ - internalret = qemuProcessStart(dconn, driver, vm, "stdio", true, dataFD[1], + internalret = qemuProcessStart(dconn, driver, vm, "stdio", true, dataFD[0], NULL, VIR_VM_OP_MIGRATE_IN_START); if (internalret < 0) { qemuAuditDomainStart(vm, "migrated", false); @@ -332,7 +332,7 @@ qemuMigrationPrepareTunnel(struct qemud_driver *driver, goto endjob; } - if (virFDStreamOpen(st, dataFD[0]) < 0) { + if (virFDStreamOpen(st, dataFD[1]) < 0) { qemuAuditDomainStart(vm, "migrated", false); qemuProcessStop(driver, vm, 0); if (!vm->persistent) { @@ -344,6 +344,7 @@ qemuMigrationPrepareTunnel(struct qemud_driver *driver, _("cannot pass pipe for tunnelled migration")); goto endjob; } + dataFD[1] = -1; /* 'st' owns the FD now & will close it */ qemuAuditDomainStart(vm, "migrated", true); -- 1.7.4.4

2 1

[libvirt] [PATCH] Remove artificial minimum limit for guest memory
by Jiri Denemark 21 Apr '11

21 Apr '11

Remove the artificial minimum of 4096 KB for guest memory. It's drivers' job to set the limit if needed. --- src/libvirt.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 9e6784b..10c3cdf 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -2738,7 +2738,7 @@ virDomainSetMaxMemory(virDomainPtr domain, unsigned long memory) virLibDomainError(VIR_ERR_OPERATION_DENIED, __FUNCTION__); goto error; } - if (memory < 4096) { + if (!memory) { virLibDomainError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto error; } @@ -2792,7 +2792,7 @@ virDomainSetMemory(virDomainPtr domain, unsigned long memory) virLibDomainError(VIR_ERR_OPERATION_DENIED, __FUNCTION__); goto error; } - if (memory < 4096) { + if (!memory) { virLibDomainError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto error; } @@ -2861,7 +2861,7 @@ virDomainSetMemoryFlags(virDomainPtr domain, unsigned long memory, goto error; } - if (memory < 4096) { + if (!memory) { virLibDomainError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto error; } -- 1.7.5.rc1

2 2

[libvirt] tunnelled migration with libvirt 0.9.0
by Jason Krieg 21 Apr '11

21 Apr '11

Hi, is tunnelled migration with libvirt 0.9.0 and qemu-kvm 0.14.0 broken ? all I get is an error "unknown migration protocol" while looking at the code in src/qemu/qemu_migration.c src/qemu/qemu_migration.c: /* Start the QEMU daemon, with the same command-line arguments plus * -incoming stdin (which qemu_command might convert to exec:cat or fd:n) */ internalret = qemuProcessStart(dconn, driver, vm, "stdin", true, dataFD[1], NULL, VIR_VM_OP_MIGRATE_IN_START); migrateFrom is set to "stdin" but in src/qemu/qemu_command.c there is no such match which ends in the above error. Regards, Jason

5 7

[libvirt] [PATCH] PHYP: Adding reboot domain function
by Eduardo Otubo 21 Apr '11

21 Apr '11

Adding reboot <domain> function for pHyp driver. --- src/phyp/phyp_driver.c | 35 ++++++++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 deletions(-) diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index bb0e0ac..228751d 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -3384,6 +3384,39 @@ cleanup: } static int +phypDomainReboot(virDomainPtr dom) +{ + int result = -1; + ConnectionData *connection_data = dom->conn->networkPrivateData; + virConnectPtr conn = dom->conn; + LIBSSH2_SESSION *session = connection_data->session; + phyp_driverPtr phyp_driver = conn->privateData; + int system_type = phyp_driver->system_type; + char *managed_system = phyp_driver->managed_system; + int exit_status = 0; + char *ret = NULL; + virBuffer buf = VIR_BUFFER_INITIALIZER; + + virBufferAddLit(&buf, "chsysstate"); + if (system_type == HMC) + virBufferVSprintf(&buf, " -m %s", managed_system); + virBufferVSprintf(&buf, + " -r lpar -o shutdown --id %d --immed --restart", + dom->id); + ret = phypExecBuffer(session, &buf, &exit_status, dom->conn, false); + + if (exit_status < 0) + goto cleanup; + + result = 0; + + cleanup: + VIR_FREE(ret); + + return result; +} + +static int phypDomainShutdown(virDomainPtr dom) { int result = -1; @@ -3707,7 +3740,7 @@ static virDriver phypDriver = { NULL, /* domainSuspend */ phypDomainResume, /* domainResume */ phypDomainShutdown, /* domainShutdown */ - NULL, /* domainReboot */ + phypDomainReboot, /* domainReboot */ phypDomainDestroy, /* domainDestroy */ NULL, /* domainGetOSType */ NULL, /* domainGetMaxMemory */ -- 1.7.1

2 1

[libvirt] [PATCH] esx: Add a wrapper for shared CURL handles
by Matthias Bolte 21 Apr '11

21 Apr '11

To be used to share a CURL handle between multiple threads in the upcoming domain event support. --- src/esx/esx_vi.c | 176 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/esx/esx_vi.h | 19 ++++++ 2 files changed, 195 insertions(+), 0 deletions(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 2fd09cd..84ff2e2 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -85,6 +85,16 @@ ESX_VI__TEMPLATE__ALLOC(CURL) /* esxVI_CURL_Free */ ESX_VI__TEMPLATE__FREE(CURL, { + esxVI_SharedCURL *shared = item->shared; + + if (shared != NULL) { + esxVI_SharedCURL_Remove(shared, item); + + if (shared->count == 0) { + esxVI_SharedCURL_Free(&shared); + } + } + if (item->handle != NULL) { curl_easy_cleanup(item->handle); } @@ -418,6 +428,172 @@ esxVI_CURL_Upload(esxVI_CURL *curl, const char *url, const char *content) /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * SharedCURL + */ + +static void +esxVI_SharedCURL_Lock(CURL *handle ATTRIBUTE_UNUSED, curl_lock_data data, + curl_lock_access access_ ATTRIBUTE_UNUSED, void *userptr) +{ + int i; + esxVI_SharedCURL *shared = userptr; + + switch (data) { + case CURL_LOCK_DATA_SHARE: + i = 0; + break; + + case CURL_LOCK_DATA_COOKIE: + i = 1; + break; + + case CURL_LOCK_DATA_DNS: + i = 2; + break; + + default: + VIR_ERROR(_("Trying to lock unknown SharedCURL lock %d"), (int)data); + return; + } + + virMutexLock(&shared->locks[i]); +} + +static void +esxVI_SharedCURL_Unlock(CURL *handle ATTRIBUTE_UNUSED, curl_lock_data data, + void *userptr) +{ + int i; + esxVI_SharedCURL *shared = userptr; + + switch (data) { + case CURL_LOCK_DATA_SHARE: + i = 0; + break; + + case CURL_LOCK_DATA_COOKIE: + i = 1; + break; + + case CURL_LOCK_DATA_DNS: + i = 2; + break; + + default: + VIR_ERROR(_("Trying to unlock unknown SharedCURL lock %d"), (int)data); + return; + } + + virMutexUnlock(&shared->locks[i]); +} + +/* esxVI_SharedCURL_Alloc */ +ESX_VI__TEMPLATE__ALLOC(SharedCURL) + +/* esxVI_SharedCURL_Free */ +ESX_VI__TEMPLATE__FREE(SharedCURL, +{ + int i; + + if (item->count > 0) { + /* Better leak than crash */ + VIR_ERROR0(_("Trying to free SharedCURL object that is still in use")); + return; + } + + if (item->handle != NULL) { + curl_share_cleanup(item->handle); + } + + for (i = 0; i < ARRAY_CARDINALITY(item->locks); ++i) { + virMutexDestroy(&item->locks[i]); + } +}) + +int +esxVI_SharedCURL_Add(esxVI_SharedCURL *shared, esxVI_CURL *curl) +{ + int i; + + if (curl->handle == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Cannot share uninitialized CURL handle")); + return -1; + } + + if (curl->shared != NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Cannot share CURL handle that is already shared")); + return -1; + } + + if (shared->handle == NULL) { + shared->handle = curl_share_init(); + + if (shared->handle == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not initialize CURL (share)")); + return -1; + } + + curl_share_setopt(shared->handle, CURLSHOPT_LOCKFUNC, + esxVI_SharedCURL_Lock); + curl_share_setopt(shared->handle, CURLSHOPT_UNLOCKFUNC, + esxVI_SharedCURL_Unlock); + curl_share_setopt(shared->handle, CURLSHOPT_USERDATA, shared); + curl_share_setopt(shared->handle, CURLSHOPT_SHARE, + CURL_LOCK_DATA_COOKIE); + curl_share_setopt(shared->handle, CURLSHOPT_SHARE, + CURL_LOCK_DATA_DNS); + + for (i = 0; i < ARRAY_CARDINALITY(shared->locks); ++i) { + if (virMutexInit(&shared->locks[i]) < 0) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not initialize a CURL (share) mutex")); + return -1; + } + } + } + + curl_easy_setopt(curl->handle, CURLOPT_SHARE, shared->handle); + + curl->shared = shared; + ++shared->count; + + return 0; +} + +int +esxVI_SharedCURL_Remove(esxVI_SharedCURL *shared, esxVI_CURL *curl) +{ + if (curl->handle == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Cannot unshare uninitialized CURL handle")); + return -1; + } + + if (curl->shared == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Cannot unshare CURL handle that is not shared")); + return -1; + } + + if (curl->shared != shared) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("CURL (share) mismatch")); + return -1; + } + + curl_easy_setopt(curl->handle, CURLOPT_SHARE, NULL); + + curl->shared = NULL; + --shared->count; + + return 0; +} + + + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Context */ diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index 57788ac..560b2a6 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -83,6 +83,7 @@ typedef enum _esxVI_ProductVersion esxVI_ProductVersion; typedef enum _esxVI_Occurrence esxVI_Occurrence; typedef struct _esxVI_ParsedHostCpuIdInfo esxVI_ParsedHostCpuIdInfo; typedef struct _esxVI_CURL esxVI_CURL; +typedef struct _esxVI_SharedCURL esxVI_SharedCURL; typedef struct _esxVI_Context esxVI_Context; typedef struct _esxVI_Response esxVI_Response; typedef struct _esxVI_Enumeration esxVI_Enumeration; @@ -151,6 +152,7 @@ struct _esxVI_CURL { virMutex lock; struct curl_slist *headers; char error[CURL_ERROR_SIZE]; + esxVI_SharedCURL *shared; }; int esxVI_CURL_Alloc(esxVI_CURL **curl); @@ -162,6 +164,23 @@ int esxVI_CURL_Upload(esxVI_CURL *curl, const char *url, const char *content); /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * SharedCURL + */ + +struct _esxVI_SharedCURL { + CURLSH *handle; + virMutex locks[3]; /* share, cookie, dns */ + size_t count; +}; + +int esxVI_SharedCURL_Alloc(esxVI_SharedCURL **shared); +void esxVI_SharedCURL_Free(esxVI_SharedCURL **shared); +int esxVI_SharedCURL_Add(esxVI_SharedCURL *shared, esxVI_CURL *curl); +int esxVI_SharedCURL_Remove(esxVI_SharedCURL *shared, esxVI_CURL *curl); + + + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Context */ -- 1.7.0.4

1 1

[libvirt] [PATCH 0/6] virObject for reference-counting
by Hu Tao 20 Apr '11

20 Apr '11

This series adds a virObject structure that manages reference-counting. Some notes about referece-counting introduced by this series: A thread owns a virObject by incrementing its reference-count by 1. If a thread owns a virObject, the virObject is guarenteed not be freed until the thread releases ownership by decrementing its reference-count by 1. A thread can't access a virObject after it releases the ownership of virObject because it can be freed at anytime. A thread can own a virObject legally in these ways: - a thread owns a virObject that it creates. - a thread owns a virObject if another thread passes the ownership to it. Example: qemuMonitorOpen - a thread gets a virObject from a container. Example: virDomainFindByUUID - a container owns a virObject by incrementing its reference-count by 1 before adding it to the container - if a virObject is removed from a container its reference-count must be decremented by 1 By following these rules, there is no need to protect operations on an object's reference-count by an external lock. (like in old ways virDomainObj lock protects qemu monitor's ref-count.) This series is a draft and posted for early review. Any comments are welcome. Hu Tao (6): Add virObject and virAtomic. use virObject to manage reference-count of qemud_client use virObject to manage reference-count of virDomainObj qemu: use virObject to manages reference-counting for qemu monitor remove qemuDomainObjEnterMonitorWithDriver and qemuDomainObjExitMonitorWithDriver remove qemuDomainObjBeginJobWithDriver daemon/dispatch.c | 2 - daemon/libvirtd.c | 62 ++++++-- daemon/libvirtd.h | 5 +- src/Makefile.am | 2 + src/conf/domain_conf.c | 56 ++++---- src/conf/domain_conf.h | 6 +- src/libvirt_private.syms | 5 + src/openvz/openvz_conf.c | 8 +- src/qemu/qemu_domain.c | 121 +-------------- src/qemu/qemu_domain.h | 8 +- src/qemu/qemu_driver.c | 358 ++++++++++++++++++++------------------------- src/qemu/qemu_hotplug.c | 90 ++++++------ src/qemu/qemu_migration.c | 101 ++++++------- src/qemu/qemu_monitor.c | 109 ++++++++------- src/qemu/qemu_monitor.h | 4 +- src/qemu/qemu_process.c | 99 ++++++------- src/util/viratomic.c | 46 ++++++ src/util/viratomic.h | 30 ++++ src/util/virobject.c | 52 +++++++ src/util/virobject.h | 39 +++++ src/vmware/vmware_conf.c | 2 +- 21 files changed, 628 insertions(+), 577 deletions(-) create mode 100644 src/util/viratomic.c create mode 100644 src/util/viratomic.h create mode 100644 src/util/virobject.c create mode 100644 src/util/virobject.h -- 1.7.3.1

4 35

[libvirt] libvirt and virsh logging
by Supriya Kannery 20 Apr '11

20 Apr '11

I am trying to get virsh commands with timestamp logged into a file along with logs collected from libvirt. Finding that virsh and libvirt logs into separate log files. Please suggest on what could be a right approach to get both virsh and libvirt logs into a single file. Thanks, Supriya

1 0