- Devel - libvirt List Archives

[libvirt] [PATCH] Allow use of file images for LXC container filesystems
by Daniel P. Berrange 26 Oct '11

26 Oct '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> A previous commit gave the LXC driver the ability to mount block devices for the container filesystem. Through use of the loopback device functionality, we can build on this to support use of plain file images for LXC filesytems. By setting the LO_FLAGS_AUTOCLEAR flag we can ensure that the loop device automatically disappears when the container dies / shuts down * src/lxc/lxc_container.c: Raise error if we see a file based filesystem, since it should have been turned into a loopback device already * src/lxc/lxc_controller.c: Rewrite any filesystems of type=file, into type=block, by binding the file image to a free loop device --- src/lxc/lxc_container.c | 5 ++ src/lxc/lxc_controller.c | 176 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 179 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index f6ab407..bf772e5 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -797,6 +797,11 @@ static int lxcContainerMountFS(virDomainFSDefPtr fs, if (lxcContainerMountFSBlock(fs, srcprefix) < 0) return -1; break; + case VIR_DOMAIN_FS_TYPE_FILE: + lxcError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected filesystem type %s"), + virDomainFSTypeToString(fs->type)); + break; default: lxcError(VIR_ERR_CONFIG_UNSUPPORTED, _("Cannot mount filesystem type %s"), diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 8848ae2..45b4c70 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -39,6 +39,8 @@ #include <getopt.h> #include <sys/mount.h> #include <locale.h> +#include <linux/loop.h> +#include <dirent.h> #if HAVE_CAPNG # include <cap-ng.h> @@ -63,6 +65,160 @@ struct cgroup_device_policy { int minor; }; + +static int lxcGetLoopFD(char **devname) +{ + int fd = -1; + DIR *dh = NULL; + struct dirent *de; + char *looppath; + struct loop_info64 lo; + + VIR_DEBUG("Looking for loop devices in /dev"); + + if (!(dh = opendir("/dev"))) { + virReportSystemError(errno, "%s", + _("Unable to read /dev")); + goto cleanup; + } + + while ((de = readdir(dh)) != NULL) { + if (!STRPREFIX(de->d_name, "loop")) + continue; + + if (virAsprintf(&looppath, "/dev/%s", de->d_name) < 0) { + virReportOOMError(); + goto cleanup; + } + + VIR_DEBUG("Checking up on device %s", looppath); + if ((fd = open(looppath, O_RDWR)) < 0) { + virReportSystemError(errno, + _("Unable to open %s"), looppath); + goto cleanup; + } + + if (ioctl(fd, LOOP_GET_STATUS64, &lo) < 0) { + /* Got a free device, return the fd */ + if (errno == ENXIO) + goto cleanup; + + VIR_FORCE_CLOSE(fd); + virReportSystemError(errno, + _("Unable to get loop status on %s"), + looppath); + goto cleanup; + } + + /* Oh well, try the next device */ + VIR_FORCE_CLOSE(fd); + VIR_FREE(looppath); + } + + lxcError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Unable to find a free loop device in /dev")); + +cleanup: + if (fd != -1) { + VIR_DEBUG("Got free loop device %s %d", looppath, fd); + *devname = looppath; + } else { + VIR_DEBUG("No free loop devices available"); + VIR_FREE(looppath); + } + if (dh) + closedir(dh); + return fd; +} + +static int lxcSetupLoopDevice(virDomainFSDefPtr fs) +{ + int lofd = -1; + int fsfd = -1; + struct loop_info64 lo; + char *loname = NULL; + int ret = -1; + + if ((lofd = lxcGetLoopFD(&loname)) < 0) + return -1; + + memset(&lo, 0, sizeof(lo)); + lo.lo_flags = LO_FLAGS_AUTOCLEAR; + + if ((fsfd = open(fs->src, O_RDWR)) < 0) { + virReportSystemError(errno, + _("Unable to open %s"), fs->src); + goto cleanup; + } + + if (ioctl(lofd, LOOP_SET_FD, fsfd) < 0) { + virReportSystemError(errno, + _("Unable to attach %s to loop device"), + fs->src); + goto cleanup; + } + + if (ioctl(lofd, LOOP_SET_STATUS64, &lo) < 0) { + virReportSystemError(errno, "%s", + _("Unable to mark loop device as autoclear")); + + if (ioctl(lofd, LOOP_CLR_FD, 0) < 0) + VIR_WARN("Unable to detach %s from loop device", fs->src); + goto cleanup; + } + + VIR_DEBUG("Attached loop device %s %d to %s", fs->src, lofd, loname); + /* + * We now change it into a block device type, so that + * the rest of container setup 'just works' + */ + fs->type = VIR_DOMAIN_FS_TYPE_BLOCK; + VIR_FREE(fs->src); + fs->src = loname; + loname = NULL; + + ret = 0; + +cleanup: + VIR_FREE(loname); + VIR_FORCE_CLOSE(fsfd); + if (ret == -1) + VIR_FORCE_CLOSE(lofd); + return lofd; +} + + +static int lxcSetupLoopDevices(virDomainDefPtr def, size_t *nloopDevs, int **loopDevs) +{ + size_t i; + int ret = -1; + + for (i = 0 ; i < def->nfss ; i++) { + int fd; + + if (def->fss[i]->type != VIR_DOMAIN_FS_TYPE_FILE) + continue; + + fd = lxcSetupLoopDevice(def->fss[i]); + if (fd < 0) + goto cleanup; + + VIR_DEBUG("Saving loop fd %d", fd); + if (VIR_REALLOC_N(*loopDevs, *nloopDevs+1) < 0) { + VIR_FORCE_CLOSE(fd); + virReportOOMError(); + goto cleanup; + } + (*loopDevs)[*nloopDevs++] = fd; + } + + VIR_DEBUG("Setup all loop devices"); + ret = 0; + +cleanup: + return ret; +} + /** * lxcSetContainerResources * @def: pointer to virtual machine structure @@ -641,6 +797,9 @@ lxcControllerRun(virDomainDefPtr def, virDomainFSDefPtr root; char *devpts = NULL; char *devptmx = NULL; + size_t nloopDevs = 0; + int *loopDevs = NULL; + size_t i; if (socketpair(PF_UNIX, SOCK_STREAM, 0, control) < 0) { virReportSystemError(errno, "%s", @@ -654,6 +813,9 @@ lxcControllerRun(virDomainDefPtr def, goto cleanup; } + if (lxcSetupLoopDevices(def, &nloopDevs, &loopDevs) < 0) + goto cleanup; + root = virDomainGetRootFilesystem(def); if (lxcSetContainerResources(def) < 0) @@ -778,8 +940,14 @@ lxcControllerRun(virDomainDefPtr def, goto cleanup; } - /* Now the container is running, there's no need for us to keep - any elevated capabilities */ + /* Now the container is fully setup... */ + + /* ...we can close the loop devices... */ + + for (i = 0 ; i < nloopDevs ; i++) + VIR_FORCE_CLOSE(loopDevs[i]); + + /* ...and reduce our privileges */ if (lxcControllerClearCapabilities() < 0) goto cleanup; @@ -803,6 +971,10 @@ cleanup: VIR_FORCE_CLOSE(containerhandshake[0]); VIR_FORCE_CLOSE(containerhandshake[1]); + for (i = 0 ; i < nloopDevs ; i++) + VIR_FORCE_CLOSE(loopDevs[i]); + VIR_FREE(loopDevs); + if (container > 1) { int status; kill(container, SIGTERM); -- 1.7.6

2 8

[libvirt] [PATCH] startupPolicy: Change event argument
by Michal Privoznik 26 Oct '11

26 Oct '11

As this is on yet unreleased API this change is possible. This patch changes devAlias parameter in event callback to disk target as mgmt application is more likely to know target (it's required on domain definition) but aliases are generated by the daemon. So we can say this spares mgmt application at least one subsequent call of dumpxml on incoming event. --- daemon/remote.c | 6 +++--- examples/domain-events/events-c/event-test.c | 6 +++--- examples/domain-events/events-python/event-test.py | 6 +++--- include/libvirt/libvirt.h.in | 3 ++- python/libvirt-override-virConnect.py | 4 ++-- python/libvirt-override.c | 4 ++-- src/conf/domain_event.c | 18 +++++++++--------- src/conf/domain_event.h | 4 ++-- src/qemu/qemu_domain.c | 2 +- src/remote/remote_driver.c | 2 +- src/remote/remote_protocol.x | 2 +- src/remote_protocol-structs | 2 +- 12 files changed, 30 insertions(+), 29 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 9d70163..c1441d1 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -455,7 +455,7 @@ static int remoteRelayDomainEventDiskChange(virConnectPtr conn ATTRIBUTE_UNUSED, virDomainPtr dom, const char *oldSrcPath, const char *newSrcPath, - const char *devAlias, + const char *target, int reason, void *opaque) { @@ -467,7 +467,7 @@ static int remoteRelayDomainEventDiskChange(virConnectPtr conn ATTRIBUTE_UNUSED, return -1; VIR_DEBUG("Relaying domain %s %d disk change %s %s %s %d", - dom->name, dom->id, oldSrcPath, newSrcPath, devAlias, reason); + dom->name, dom->id, oldSrcPath, newSrcPath, target, reason); /* build return data */ memset(&data, 0, sizeof data); @@ -483,7 +483,7 @@ static int remoteRelayDomainEventDiskChange(virConnectPtr conn ATTRIBUTE_UNUSED, data.oldSrcPath = oldSrcPath_p; data.newSrcPath = newSrcPath_p; - if (!(data.devAlias = strdup(devAlias))) + if (!(data.target = strdup(target))) goto mem_error; data.reason = reason; diff --git a/examples/domain-events/events-c/event-test.c b/examples/domain-events/events-c/event-test.c index 7c99222..adc6d7c 100644 --- a/examples/domain-events/events-c/event-test.c +++ b/examples/domain-events/events-c/event-test.c @@ -293,13 +293,13 @@ static int myDomainEventDiskChangeCallback(virConnectPtr conn ATTRIBUTE_UNUSED, virDomainPtr dom, const char *oldSrcPath, const char *newSrcPath, - const char *devAlias, + const char *target, int reason, void *opaque ATTRIBUTE_UNUSED) { - printf("%s EVENT: Domain %s(%d) disk change oldSrcPath: %s newSrcPath: %s devAlias: %s reason: %s\n", + printf("%s EVENT: Domain %s(%d) disk change oldSrcPath: %s newSrcPath: %s target: %s reason: %s\n", __func__, virDomainGetName(dom), virDomainGetID(dom), - oldSrcPath, newSrcPath, devAlias, diskChangeReasonStrings[reason]); + oldSrcPath, newSrcPath, target, diskChangeReasonStrings[reason]); return 0; } diff --git a/examples/domain-events/events-python/event-test.py b/examples/domain-events/events-python/event-test.py index 9628f6e..5dd6eaa 100644 --- a/examples/domain-events/events-python/event-test.py +++ b/examples/domain-events/events-python/event-test.py @@ -469,9 +469,9 @@ def myDomainEventIOErrorCallback(conn, dom, srcpath, devalias, action, opaque): def myDomainEventGraphicsCallback(conn, dom, phase, localAddr, remoteAddr, authScheme, subject, opaque): print "myDomainEventGraphicsCallback: Domain %s(%s) %d %s" % (dom.name(), dom.ID(), phase, authScheme) -def myDomainEventDiskChangeCallback(conn, dom, oldSrcPath, newSrcPath, devAlias, reason, opaque): - print "myDomainEventDiskChangeCallback: Domain %s(%s) disk change oldSrcPath: %s newSrcPath: %s devAlias: %s reason: %s" % ( - dom.name(), dom.ID(), oldSrcPath, newSrcPath, devAlias, reason) +def myDomainEventDiskChangeCallback(conn, dom, oldSrcPath, newSrcPath, target, reason, opaque): + print "myDomainEventDiskChangeCallback: Domain %s(%s) disk change oldSrcPath: %s newSrcPath: %s target %s reason: %s" % ( + dom.name(), dom.ID(), oldSrcPath, newSrcPath, target, reason) def usage(out=sys.stderr): print >>out, "usage: "+os.path.basename(sys.argv[0])+" [-hdl] [uri]" print >>out, " uri will default to qemu:///system" diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 7102bce..7bcbae6 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -3010,6 +3010,7 @@ typedef enum { * @dom: domain on which the event occurred * @oldSrcPath: old source path * @newSrcPath: new source path + * @target: disk target where event occurred * @reason: reason why this callback was called; any of * virConnectDomainEventDiskChangeReason * @opaque: application specified data @@ -3026,7 +3027,7 @@ typedef void (*virConnectDomainEventDiskChangeCallback)(virConnectPtr conn, virDomainPtr dom, const char *oldSrcPath, const char *newSrcPath, - const char *devAlias, + const char *target, int reason, void *opaque); diff --git a/python/libvirt-override-virConnect.py b/python/libvirt-override-virConnect.py index b908b32..75058d9 100644 --- a/python/libvirt-override-virConnect.py +++ b/python/libvirt-override-virConnect.py @@ -125,13 +125,13 @@ except AttributeError: pass - def _dispatchDomainEventDiskChangeCallback(self, dom, oldSrcPath, newSrcPath, devAlias, reason, cbData): + def _dispatchDomainEventDiskChangeCallback(self, dom, oldSrcPath, newSrcPath, target, reason, cbData): """Dispatches event to python user domain diskChange event callbacks """ cb = cbData["cb"] opaque = cbData["opaque"] - cb(self, virDomain(self, _obj=dom), oldSrcPath, newSrcPath, devAlias, reason, opaque) + cb(self, virDomain(self, _obj=dom), oldSrcPath, newSrcPath, target, reason, opaque) return 0; def domainEventDeregisterAny(self, callbackID): diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 1759bae..310bc00 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -4379,7 +4379,7 @@ libvirt_virConnectDomainEventDiskChangeCallback(virConnectPtr conn ATTRIBUTE_UNU virDomainPtr dom, const char *oldSrcPath, const char *newSrcPath, - const char *devAlias, + const char *target, int reason, void *opaque) { @@ -4407,7 +4407,7 @@ libvirt_virConnectDomainEventDiskChangeCallback(virConnectPtr conn ATTRIBUTE_UNU (char*)"OsssiO", pyobj_dom, oldSrcPath, newSrcPath, - devAlias, reason, pyobj_cbData); + target, reason, pyobj_cbData); Py_DECREF(pyobj_cbData); Py_DECREF(pyobj_dom); diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index a04b9d0..2ab68dc 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -91,7 +91,7 @@ struct _virDomainEvent { struct { char *oldSrcPath; char *newSrcPath; - char *devAlias; + char *target; int reason; } diskChange; } data; @@ -519,7 +519,7 @@ void virDomainEventFree(virDomainEventPtr event) case VIR_DOMAIN_EVENT_ID_DISK_CHANGE: VIR_FREE(event->data.diskChange.oldSrcPath); VIR_FREE(event->data.diskChange.newSrcPath); - VIR_FREE(event->data.diskChange.devAlias); + VIR_FREE(event->data.diskChange.target); break; } @@ -978,14 +978,14 @@ virDomainEventDiskChangeNew(int id, const char *name, unsigned char *uuid, const char *oldSrcPath, const char *newSrcPath, - const char *devAlias, int reason) + const char *target, int reason) { virDomainEventPtr ev = virDomainEventNewInternal(VIR_DOMAIN_EVENT_ID_DISK_CHANGE, id, name, uuid); if (ev) { - if (!(ev->data.diskChange.devAlias = strdup(devAlias))) + if (!(ev->data.diskChange.target = strdup(target))) goto error; if (oldSrcPath && @@ -1010,23 +1010,23 @@ error: virDomainEventPtr virDomainEventDiskChangeNewFromObj(virDomainObjPtr obj, const char *oldSrcPath, const char *newSrcPath, - const char *devAlias, + const char *target, int reason) { return virDomainEventDiskChangeNew(obj->def->id, obj->def->name, obj->def->uuid, oldSrcPath, - newSrcPath, devAlias, reason); + newSrcPath, target, reason); } virDomainEventPtr virDomainEventDiskChangeNewFromDom(virDomainPtr dom, const char *oldSrcPath, const char *newSrcPath, - const char *devAlias, + const char *target, int reason) { return virDomainEventDiskChangeNew(dom->id, dom->name, dom->uuid, oldSrcPath, newSrcPath, - devAlias, reason); + target, reason); } /** @@ -1175,7 +1175,7 @@ void virDomainEventDispatchDefaultFunc(virConnectPtr conn, ((virConnectDomainEventDiskChangeCallback)cb)(conn, dom, event->data.diskChange.oldSrcPath, event->data.diskChange.newSrcPath, - event->data.diskChange.devAlias, + event->data.diskChange.target, event->data.diskChange.reason, cbopaque); break; diff --git a/src/conf/domain_event.h b/src/conf/domain_event.h index 3ba418e..6c56fbd 100644 --- a/src/conf/domain_event.h +++ b/src/conf/domain_event.h @@ -182,12 +182,12 @@ virDomainEventPtr virDomainEventBlockJobNewFromDom(virDomainPtr dom, virDomainEventPtr virDomainEventDiskChangeNewFromObj(virDomainObjPtr obj, const char *oldSrcPath, const char *newSrcPath, - const char *devAlias, + const char *target, int reason); virDomainEventPtr virDomainEventDiskChangeNewFromDom(virDomainPtr dom, const char *oldSrcPath, const char *newSrcPath, - const char *devAlias, + const char *target, int reason); int virDomainEventQueuePush(virDomainEventQueuePtr evtQueue, diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 198ebcc..82e2d70 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1668,7 +1668,7 @@ qemuDomainCheckDiskPresence(struct qemud_driver *driver, "due to not accessible source '%s'", disk->dst, vm->def->name, uuid, disk->src); - event = virDomainEventDiskChangeNewFromObj(vm, disk->src, NULL, disk->info.alias, + event = virDomainEventDiskChangeNewFromObj(vm, disk->src, NULL, disk->dst, VIR_DOMAIN_DISK_CHANGE_MISSING_ON_START); if (event) qemuDomainEventQueue(driver, event); diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index e98ebd7..8726112 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -3354,7 +3354,7 @@ remoteDomainBuildEventDiskChange(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, event = virDomainEventDiskChangeNewFromDom(dom, msg->oldSrcPath ? *msg->oldSrcPath : NULL, msg->newSrcPath ? *msg->newSrcPath : NULL, - msg->devAlias, + msg->target, msg->reason); virDomainFree(dom); diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index d135653..8f8c55b 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -2014,7 +2014,7 @@ struct remote_domain_event_disk_change_msg { remote_nonnull_domain dom; remote_string oldSrcPath; remote_string newSrcPath; - remote_nonnull_string devAlias; + remote_nonnull_string target; int reason; }; diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index 569fcb3..fe347fa 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -1513,7 +1513,7 @@ struct remote_domain_event_disk_change_msg { remote_nonnull_domain dom; remote_string oldSrcPath; remote_string newSrcPath; - remote_nonnull_string devAlias; + remote_nonnull_string target; int reason; }; struct remote_domain_managed_save_args { -- 1.7.3.4

3 4

[libvirt] [PATCH] nwfilter: extend schema to support new targets
by Stefan Berger 26 Oct '11

26 Oct '11

Extend the nwfilter schema to support the continue and return targets. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- docs/schemas/nwfilter.rng | 2 ++ 1 file changed, 2 insertions(+) Index: libvirt-acl/docs/schemas/nwfilter.rng =================================================================== --- libvirt-acl.orig/docs/schemas/nwfilter.rng +++ libvirt-acl/docs/schemas/nwfilter.rng @@ -866,6 +866,8 @@ <value>drop</value> <value>accept</value> <value>reject</value> + <value>continue</value> + <value>return</value> </choice> </define>

2 4

[libvirt] [libosinfo 1/2] Set GError even if libvirt error is unknown
by Zeeshan Ali (Khattak) 26 Oct '11

26 Oct '11

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-glib/libvirt-glib-error.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/libvirt-glib/libvirt-glib-error.c b/libvirt-glib/libvirt-glib-error.c index f59b464..0319687 100644 --- a/libvirt-glib/libvirt-glib-error.c +++ b/libvirt-glib/libvirt-glib-error.c @@ -80,7 +80,10 @@ GError *gvir_error_new_literal(GQuark domain, virErrorPtr verr = virGetLastError(); if (!verr) - return NULL; + return g_error_new(domain, + code, + "%s", + message); if (message) return g_error_new(domain, -- 1.7.6.4

2 5

[libvirt] [libvirt PATCHv3 00/10] DHCP snooping support for libvirt
by David L Stevens 25 Oct '11

25 Oct '11

This series of patches adds DHCP snooping support to libvirt. This version saves leases on disk for restoration after a libvirtd restart and allows selection of different ip_learning methods by setting filter parameter "ip_learning" to one of "any" (existing IP learning code) "none" (static only addresses) or "DHCP" (DHCP Snooping). This code does not (yet) support passing lease information across a migration. A migrated guest requires a DHCP ACK (e.g., via ifdown/ifup on the guest) to send/receive traffic for DHCP-learned addresses after a migration. Differences from v2: added support for multiple static IP addresses using a comma-separated list. David L Stevens (10): support continue/return allow required ARP packets reverse sense of address matching make default chain policy "DROP" allow chain modification support addRules support variable value changing add DHCP snooping add leasefile support support multiple static IP addresses examples/xml/nwfilter/Makefile.am | 5 +- examples/xml/nwfilter/allow-arp.xml | 5 +- examples/xml/nwfilter/allow-arpip.xml | 3 + examples/xml/nwfilter/allow-arpmac.xml | 3 + examples/xml/nwfilter/clean-traffic.xml | 6 +- examples/xml/nwfilter/no-arp-spoofing.xml | 38 +- examples/xml/nwfilter/no-arpip-spoofing.xml | 10 + examples/xml/nwfilter/no-arpmac-spoofing.xml | 5 + examples/xml/nwfilter/no-ip-spoofing.xml | 9 +- examples/xml/nwfilter/no-mac-spoofing.xml | 10 +- examples/xml/nwfilter/no-other-l2-traffic.xml | 13 +- examples/xml/nwfilter/no-other-rarp-traffic.xml | 3 - examples/xml/nwfilter/qemu-announce-self.xml | 1 - src/Makefile.am | 2 + src/conf/nwfilter_conf.c | 12 +- src/conf/nwfilter_conf.h | 16 +- src/nwfilter/nwfilter_dhcpsnoop.c | 938 +++++++++++++++++++++++ src/nwfilter/nwfilter_dhcpsnoop.h | 36 + src/nwfilter/nwfilter_driver.c | 5 + src/nwfilter/nwfilter_ebiptables_driver.c | 225 +++++-- src/nwfilter/nwfilter_gentech_driver.c | 225 +++++- src/nwfilter/nwfilter_gentech_driver.h | 11 + 22 files changed, 1445 insertions(+), 136 deletions(-) create mode 100644 examples/xml/nwfilter/allow-arpip.xml create mode 100644 examples/xml/nwfilter/allow-arpmac.xml create mode 100644 examples/xml/nwfilter/no-arpip-spoofing.xml create mode 100644 examples/xml/nwfilter/no-arpmac-spoofing.xml delete mode 100644 examples/xml/nwfilter/no-other-rarp-traffic.xml create mode 100644 src/nwfilter/nwfilter_dhcpsnoop.c create mode 100644 src/nwfilter/nwfilter_dhcpsnoop.h -- 1.7.6.4

3 34

[libvirt] [PATCH] build: use gnulib fdatasync
by Eric Blake 25 Oct '11

25 Oct '11

Commit 1726a73 hacked around MacOS' lack of fdatasync, since gnulib did not have it at the time. But now that we use newer gnulib, we can avoid the hack. * bootstrap.conf (gnulib_modules): Add fdatasync. * configure.ac (AC_CHECK_FUNCS_ONCE): Drop our own check. --- bootstrap.conf | 1 + configure.ac | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index d029253..0faa2e2 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -40,6 +40,7 @@ environ fclose fcntl fcntl-h +fdatasync ffs fnmatch fsync diff --git a/configure.ac b/configure.ac index df19445..6a0936a 100644 --- a/configure.ac +++ b/configure.ac @@ -135,12 +135,9 @@ AC_CHECK_SIZEOF([long]) dnl Availability of various common functions (non-fatal if missing), dnl and various less common threadsafe functions -AC_CHECK_FUNCS_ONCE([cfmakeraw fdatasync geteuid getgid getgrnam_r getmntent_r \ +AC_CHECK_FUNCS_ONCE([cfmakeraw geteuid getgid getgrnam_r getmntent_r \ getpwuid_r getuid initgroups kill mmap posix_fallocate posix_memalign \ regexec sched_getaffinity]) -if test $ac_cv_func_fdatasync = no; then - AC_DEFINE([fdatasync], [fsync], [Define to fsync if you lack fdatasync]) -fi dnl Availability of pthread functions (if missing, win32 threading is dnl assumed). Because of $LIB_PTHREAD, we cannot use AC_CHECK_FUNCS_ONCE. -- 1.7.4.4

4 7

[libvirt] [PATCH/RFC] Introduce VIR_MIGRATE_FORCE flag to allow for risky migration
by Guido Günther 25 Oct '11

25 Oct '11

Hi, Migration will be disallowed when the vm uses host devices or has snapshots (qemuMigrationIsAllowed)[1]. Would it make sense to introduce a VIR_MIGRATE_FORCE similar to VIR_REVERT_FORCE here? We could then introduce error codes similar to the snapshot case (VIR_ERR_MIGRATE_RISKY). This path is just to illustrate the idea not to be applied as is. Cheers, -- Guido [1] Hopefully we can make migration with snapshots safe in the future by transfering the metadata. A current hack around is to put this onto shared storage and reread it on the destination side after migration.

3 4

[libvirt] [PATCH 0/8 v2] Allow a client to connect to QEMU's VNC by passing an FD via libvirt
by Daniel P. Berrange 25 Oct '11

25 Oct '11

A overdue followup to https://www.redhat.com/archives/libvir-list/2011-June/msg01130.html New in this series - Completely re-written all RPC integration, to work with the new RPC layer code - Added systemtap probes for FD passing - Split into multiple patches - Renamed API to virDomainOpenGraphics - Untangled a patch to the graphics event

2 21

[libvirt] [PATCH 0/4] New APIs and virsh commands to manage saved-state & core-dump files
by Hong Xiang 25 Oct '11

25 Oct '11

This patch series is a followup of "[PATCH 0/3] Restrict saved-state and core-dump files in controlled directories". A few new APIs and virsh commands are added to manage saved-state & core-dump files. Hong Xiang (4): New APIs to manage saved-state & core-dump files. qemu driver for new APIs to manage saved-state & core-dump files remote driver for new APIs to manage saved-state & core-dump files New virsh commands to manage saved-state and core-dump files include/libvirt/libvirt.h.in | 18 +++ python/generator.py | 2 + python/libvirt-override-api.xml | 10 ++ python/libvirt-override.c | 92 ++++++++++++ src/driver.h | 34 +++++ src/libvirt.c | 314 +++++++++++++++++++++++++++++++++++++++ src/libvirt_public.syms | 12 ++ src/qemu/qemu_driver.c | 253 +++++++++++++++++++++++++++++++ src/remote/remote_driver.c | 8 + src/remote/remote_protocol.x | 61 ++++++++- src/rpc/gendispatch.pl | 1 + tools/virsh.c | 309 ++++++++++++++++++++++++++++++++++++++ 12 files changed, 1113 insertions(+), 1 deletions(-)

2 6

[libvirt] [PATCH] fix compile error :undefined reference to `virFileAccessibleAs'
by taget＠linux.vnet.ibm.com 25 Oct '11

25 Oct '11

From: Eli Qiao <taget(a)linux.vnet.ibm.com> Signed-off-by: Eli Qiao <taget(a)linux.vnet.ibm.com> --- src/libvirt_private.syms | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 3f97e23..e888204 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1154,6 +1154,7 @@ virTimeMs; virTimestamp; virTrimSpaces; virVasprintf; +virFileAccessibleAs; # uuid.h -- 1.7.4.4

2 1

[libvirt] [PATCH] util: Add virFileAccessibleAs to private symbols
by Michal Privoznik 25 Oct '11

25 Oct '11

Commit 458b7099b2e791b58f1286002974927d3e8bcc80 introduced this function. However it was not added into libvirt_private.syms so the compilation may not succeed on some hosts. --- Pushing under trivial & build breaker rules. src/libvirt_private.syms | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 3f97e23..a81966d 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1094,6 +1094,7 @@ virEnumToString; virEventAddHandle; virEventRemoveHandle; virFileAbsPath; +virFileAccessibleAs; virFileBuildPath; virFileExists; virFileFindMountPoint; -- 1.7.3.4

1 0

[libvirt] [PATCH 0/3] Restrict saved-state and core-dump files in controlled directories
by Hong Xiang 25 Oct '11

25 Oct '11

This patch series tries to address the issue discussed in: https://www.redhat.com/archives/libvir-list/2011-September/msg01025.html In this series: . The filename parameter for virDomainSave[Flags], virDomainRestore[Flags], virDomainSaveImageGetXMLDesc, virDomainSaveImageDefineXML, and virDomainCoreDump, is interpreted as an ID; . The file ID is later translated to a real filesystem pathname by corresponding drivers; . The real file system paths are under controlled directories, different for saved-state-files and core-dumps, respectively; Hong Xiang (3): New util API virBase64EncodePathname/virBase64DecodePathname Remove virFileAbsPath() from virDomainSave*() and virDomainCoreDump() calls Encode input file id in qemuDomainSave/Restore and qemudDomainCoreDump src/libvirt.c | 84 +++------------------------------------ src/libvirt_private.syms | 2 + src/qemu/qemu_conf.h | 3 + src/qemu/qemu_driver.c | 98 +++++++++++++++++++++++++++++++++++++++++++-- src/util/util.c | 73 ++++++++++++++++++++++++++++++++++ src/util/util.h | 4 ++ 6 files changed, 182 insertions(+), 82 deletions(-)

2 5

[libvirt] [PATCH v4 0/5] Allow to make disk optional on migration
by Michal Privoznik 25 Oct '11

25 Oct '11

This is a 4rd version of patches [1]. Diff to v3 includes Daniel's review and some other improvements. The aim of these patches is to mark CDROM and floppy optional, thus they might get dropped during migration, domain startup, restore, etc. The granularity is set on disk level, so user can decide which cd-roms are important and which not. There are 3 levels of optionality: - mandatory - fail if missing for any reason (the default) - requisite - fail if missing on boot up, drop if missing on migrate/restore/revert - optional - drop if missing at any start attempt. To assign a disk one of these, just append 'startupPolicy' attribute to its <source>. If a domain is then eventually started (migrated, restored, whatever), we check for source path being accessible (currently only qemu driver is supported) from hypervisor's POV. This is done by virFileAccessibleAs() function. Currently, only uid+gid are considered. Ideally, this should be extended to SElinux labeling and cgroups. 1: https://www.redhat.com/archives/libvir-list/2011-October/msg00896.html Michal Privoznik (5): conf: Introduce optional startupPolicy attribute for cdrom and floppy util: Create virFileAccessibleAs function qemu: Move device alias assigning before command line construction qemu: implement startupPolicy on_missing: Emit event on disk source dropping daemon/remote.c | 39 ++++++++++ docs/formatdomain.html.in | 26 ++++++- docs/schemas/domaincommon.rng | 22 +++++- examples/domain-events/events-c/event-test.c | 28 +++++++- examples/domain-events/events-python/event-test.py | 4 + include/libvirt/libvirt.h.in | 29 +++++++ python/libvirt-override-virConnect.py | 9 ++ python/libvirt-override.c | 52 +++++++++++++ src/conf/domain_conf.c | 43 ++++++++++- src/conf/domain_conf.h | 11 +++ src/conf/domain_event.c | 61 +++++++++++++++ src/conf/domain_event.h | 9 ++ src/libvirt_private.syms | 4 + src/qemu/qemu_command.c | 5 +- src/qemu/qemu_command.h | 1 + src/qemu/qemu_domain.c | 73 ++++++++++++++++++ src/qemu/qemu_domain.h | 4 + src/qemu/qemu_driver.c | 3 + src/qemu/qemu_process.c | 7 ++ src/remote/remote_driver.c | 35 +++++++++ src/remote/remote_protocol.x | 10 ++- src/remote_protocol-structs | 6 ++ src/util/util.c | 78 ++++++++++++++++++++ src/util/util.h | 3 + tests/qemuxml2argvtest.c | 3 + .../qemuxml2xmlout-disk-cdrom-empty.xml | 31 ++++++++ tests/qemuxmlnstest.c | 3 + 27 files changed, 585 insertions(+), 14 deletions(-) create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-cdrom-empty.xml -- 1.7.3.4

4 21

[libvirt] [PATCH 1/2] storage: plug iscsi memory leak
by Eric Blake 25 Oct '11

25 Oct '11

Detected by Coverity. virStoragePoolSourceFree does not free the actual passed-in pointer. A bigger patch would be to rename it virStoragePoolSourceClear to match behavior, or even split it into two functions depending on needed behavior; but this is the minimal fix to the one location out of eight that leaked memory. * src/storage/storage_backend_iscsi.c (virStorageBackendISCSIFindPoolSources): Free memory. --- src/storage/storage_backend_iscsi.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c index 99e69c9..c6e782d 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/src/storage/storage_backend_iscsi.c @@ -611,6 +611,7 @@ cleanup: VIR_FREE(targets); VIR_FREE(portal); virStoragePoolSourceFree(source); + VIR_FREE(source); return ret; } -- 1.7.4.4

2 4

[libvirt] libvirt and clustered volume group problems
by Rommer 25 Oct '11

25 Oct '11

Hello, Description of problem: a) libvirt should use vgchange -aly/-aln instead of vgchange -ay/-an for clustered volume groups b) libvirt should skip not activated/suspended volumes during pool-create/pool-refresh for logical pools Version-Release number of selected component (if applicable): libvirt-0.9.6 How reproducible: always Steps to Reproduce: a) vgchange -ay/-an 1. Build 2-node cluster 2. Create clustered volume group 3. Create logical storage pool in libvirt 4. Open/mount any volume on the first node 5. Try to destroy storage pool on the second node b) not activated volumes: 1. Build 2-node cluster 2. Create clustered volume group 3. Activate exclusively any volume on the first node 4. Try to create pool on the second node Actual results: a) vgchange -ay/-an # virsh pool-destroy vg error: Failed to destroy pool vg error: internal error '/sbin/vgchange -an vg' exited with non-zero status 5 and signal 0: Error locking on node node1: LV vg/lv1 in use: not deactivating b) not activated volumes: # virsh pool-create vg.xml error: Failed to create pool from vg.xml error: internal error lvs command failed Expected results: a) vgchange -ay/-an # virsh pool-destroy vg Pool vg destroyed b) not activated volumes: # virsh pool-create vg.xml Pool vg created from vg.xml Additional info: Attached patch fix problem for me. Original bug report: https://bugzilla.redhat.com/show_bug.cgi?id=748437 a) https://bugzilla.redhat.com/show_bug.cgi?id=748248 b) https://bugzilla.redhat.com/show_bug.cgi?id=748282 -- С уважением, Роман Шишнёв, CTO | ActiveCloud | http://www.active.by Т +375 17 2 911 511 доб. 308 | rommer(a)active.by Облачные решения | Серверы и инфраструктура | IaaS | SaaS | Хостинг

2 1

[libvirt] How to use "virsh migrat" with p2p option?
by Guangya Liu 25 Oct '11

25 Oct '11

Hi libvirt support, Can you please give me some example of how to use "virsh migrate --live" with p2p option including both source host and target host? I try to get some info from your website, but no info with migrate. [root@vmoactive02 qemu]# virsh help migrate NAME migrate - migrate domain to another host SYNOPSIS migrate [--live] [--p2p] [--direct] [--tunnelled] [--persistent] [--undefinesource] [--suspend] [--copy-storage-all] [--copy-storage-inc] <domain> <desturi> [<migrateuri>] [<dname>] DESCRIPTION Migrate domain to another host. Add --live for live migration. OPTIONS --live live migration --p2p peer-2-peer migration --direct direct migration --tunnelled tunnelled migration --persistent persist VM on destination --undefinesource undefine VM on source --suspend do not restart the domain on the destination host --copy-storage-all migration with non-shared storage with full disk copy --copy-storage-inc migration with non-shared storage with incremental copy (same base image shared between source and destination) [--domain] <string> domain name, id or uuid [--desturi] <string> connection URI of the destination host [--migrateuri] <string> migration URI, usually can be omitted [--dname] <string> rename to new name during migration (if supported) Thanks, Guangya

2 3

[libvirt] [PATCH] lxc: check for waitpid failure
by Eric Blake 24 Oct '11

24 Oct '11

Detected by Coverity. waitpid() can leak resources if it fails with EINTR, so it should never be used without checking return status. * src/lxc/lxc_container.c (lxcContainerAvailable): Use safer virWaitPid. --- src/lxc/lxc_container.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index e9891f7..06ccf7e 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1229,7 +1229,6 @@ int lxcContainerAvailable(int features) int cpid; char *childStack; char *stack; - int childStatus; if (features & LXC_CONTAINER_FEATURE_USER) flags |= CLONE_NEWUSER; @@ -1251,8 +1250,8 @@ int lxcContainerAvailable(int features) VIR_DEBUG("clone call returned %s, container support is not enabled", virStrerror(errno, ebuf, sizeof ebuf)); return -1; - } else { - waitpid(cpid, &childStatus, 0); + } else if (virPidWait(cpid, NULL) < 0) { + return -1; } VIR_DEBUG("Mounted all filesystems"); -- 1.7.4.4

2 3

[libvirt] [PATCH] qemu: avoid leaking uninit data from hotplug to dumpxml
by Eric Blake 24 Oct '11

24 Oct '11

Detected by Coverity. Both text and JSON monitors set only the bus and unit fields, which means driveAddr.controller spends life as garbage on the stack, and is then memcpy()'d into the in-memory representation which the user can see via dumpxml. * src/qemu/qemu_hotplug.c (qemuDomainAttachSCSIDisk): Only copy defined fields. --- I have to admit that Coverity is good - it took me several minutes to follow the trail down to qemu_monitor_{text,json}.c and prove to myself that driveAddr.controller really is untouched on success. I didn't actually try to exploit this one - it depends on whatever is already on the stack, and your compiler optimization levels, before you would ever see dumpxml giving bogus information in the <address controller='garbage'> field of the hotplugged <disk>. src/qemu/qemu_hotplug.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index bfa524b..037f4aa 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -505,7 +505,8 @@ int qemuDomainAttachSCSIDisk(struct qemud_driver *driver, /* XXX we should probably validate that the addr matches * our existing defined addr instead of overwriting */ disk->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE; - memcpy(&disk->info.addr.drive, &driveAddr, sizeof(driveAddr)); + disk->info.addr.drive.bus = driveAddr.bus; + disk->info.addr.drive.unit = driveAddr.unit; } } qemuDomainObjExitMonitorWithDriver(driver, vm); -- 1.7.4.4

2 2

[libvirt] [PATCH] Report 'errno' in int1 field of virErrorPtr
by Daniel P. Berrange 24 Oct '11

24 Oct '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> When reporting a system error (VIR_ERR_SYSTEM_ERROR) via virReportSystemError, we should copy the errno value into the 'int1' field of the virErrorPtr struct. This allows callers to detect certain errno conditions & discard the error * src/util/virterror.c: Place errno value in int1 field --- src/util/virterror.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util/virterror.c b/src/util/virterror.c index 5006fa2..a9d4d38 100644 --- a/src/util/virterror.c +++ b/src/util/virterror.c @@ -1327,7 +1327,7 @@ void virReportSystemErrorFull(int domcode, virRaiseErrorFull(filename, funcname, linenr, domcode, VIR_ERR_SYSTEM_ERROR, VIR_ERR_ERROR, - msg, msgDetail, NULL, -1, -1, msg, msgDetail); + msg, msgDetail, NULL, theerrno, -1, msg, msgDetail); errno = save_errno; } -- 1.7.6.4

2 1

[libvirt] [PATCH] Fix off-by-one printing month in logging code
by Daniel P. Berrange 24 Oct '11

24 Oct '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> The field 'mon' in 'struct tm' gives months 0-11, where as humans tend to expect months 1-12. Thus the month number needing adjusting by 1 * src/util/logging.c: Use human friendly month number --- src/util/logging.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/util/logging.c b/src/util/logging.c index 9df9003..17c7e84 100644 --- a/src/util/logging.c +++ b/src/util/logging.c @@ -628,6 +628,7 @@ virLogFormatTimestamp(void) gettimeofday(&cur_time, NULL); localtime_r(&cur_time.tv_sec, &time_info); time_info.tm_year += 1900; + time_info.tm_mon += 1; if (virAsprintf(&str, "%4d-%02d-%02d %02d:%02d:%02d.%03d", time_info.tm_year, time_info.tm_mon, time_info.tm_mday, -- 1.7.6.4

2 1

[libvirt] [PATCH V2 0/4] Support for multiple IP addresses using lists
by Stefan Berger 24 Oct '11

24 Oct '11

This patch series builds on the previously posted patch series https://www.redhat.com/archives/libvir-list/2011-October/msg00912.html and introduces the capability to assign a list to a variable and have multiple rules instantiated, one for each item in the list. This means, that if for example a variable like IP has been assigned the following values IP = [1.2.3.4, 5.6.7.8, 10.0.0.1] it will generate 3 rules, which then in turn allows us to build filters that can evaluate multiple possible values per field, i.e., allow the filtering for multiple IP addresses (per interface). It would then need David Steven's patch for support of 'RETURN' (and 'CONTINUE') target(s). v2: - reimplementation of iterator - other nits Regards, Stefan

2 6

[libvirt] [PATCH] storage: Fix error message on vol-create-from failure
by Ryota Ozaki 24 Oct '11

24 Oct '11

If vol-create-from is failed due to 'input volume not found', virsh outputs like this: $ sudo virsh vol-create-from testpool test-vol.xml test.img error: failed to get vol 'test.img', specifying --pool might help error: Storage volume not found: no storage vol with matching path However, '--pool' is incorrect because it is already specified as second argument ('testpool' in this case). It should be "--inputpool". The patch fixes this by using pooloptname, which will be "inputpool" in this case and "pool" in other cases, as error message. --- tools/virsh.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 72344f0..5544a41 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -15216,8 +15216,8 @@ vshCommandOptVolBy(vshControl *ctl, const vshCmd *cmd, if (pool) vshError(ctl, _("failed to get vol '%s'"), n); else - vshError(ctl, _("failed to get vol '%s', specifying --pool " - "might help"), n); + vshError(ctl, _("failed to get vol '%s', specifying --%s " + "might help"), n, pooloptname); } if (pool) -- 1.7.4.1

1 1

[libvirt] [PATCH] qemu: Forbid specify target path for disk vol
by Osier Yang 24 Oct '11

24 Oct '11

target path for disk vol is just meaningless, and it's never used but free()ed silently when creating the volume. --- src/conf/storage_conf.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index e893b2d..5f4f264 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1052,6 +1052,12 @@ virStorageVolDefParseXML(virStoragePoolDefPtr pool, } ret->target.path = virXPathString("string(./target/path)", ctxt); + if (ret->target.path && (pool->type == VIR_STORAGE_POOL_DISK)) { + virStorageReportError(VIR_ERR_XML_ERROR, "%s", + _("target path for disk vol is just meaningless")); + goto cleanup; + } + if (options->formatFromString) { char *format = virXPathString("string(./target/format/@type)", ctxt); if (format == NULL) -- 1.7.6

2 2

[libvirt] Expose qemu monitor command query_block?
by Osier Yang 24 Oct '11

24 Oct '11

Command "query-block" is only used internally for medium's checking before migration currently. Should we expose it as a public API, such as virDomainQueryBlock (or a qemu specific API, virDomainQemuQueryBlock)? It has enough useful infomation which user may care out, such as "io-status", "locked", "removable", "inserted". And perhaps more info in future. Osier

2 2

[libvirt] [PATCH][Take2] virsh: Fix vol-info's 'Type' output
by Ryota Ozaki 24 Oct '11

24 Oct '11

We have a new vol type "dir" in addition to "file" and "block", but virsh doesn't know it. Fix it. Additionally, the patch lets virsh output "unknown" if not matched any of them. --- tools/virsh.c | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 42f62d7..72344f0 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -9540,9 +9540,22 @@ cmdVolInfo(vshControl *ctl, const vshCmd *cmd) if (virStorageVolGetInfo(vol, &info) == 0) { double val; const char *unit; - vshPrint(ctl, "%-15s %s\n", _("Type:"), - info.type == VIR_STORAGE_VOL_FILE ? - _("file") : _("block")); + switch(info.type) { + case VIR_STORAGE_VOL_FILE: + vshPrint(ctl, "%-15s %s\n", _("Type:"), _("file")); + break; + + case VIR_STORAGE_VOL_BLOCK: + vshPrint(ctl, "%-15s %s\n", _("Type:"), _("block")); + break; + + case VIR_STORAGE_VOL_DIR: + vshPrint(ctl, "%-15s %s\n", _("Type:"), _("dir")); + break; + + default: + vshPrint(ctl, "%-15s %s\n", _("Type:"), _("unknown")); + } val = prettyCapacity(info.capacity, &unit); vshPrint(ctl, "%-15s %2.2lf %s\n", _("Capacity:"), val, unit); -- 1.7.4.1

2 1

[libvirt] [PATCH v2] pci address conflict when virtio disk with drive type
by Xu He Jie 23 Oct '11

23 Oct '11

When using the xml as below: ------------------------------------------------------ <devices> <emulator>/home/soulxu/data/work-code/qemu-kvm/x86_64-softmmu/qemu-system-x86_64</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/home/soulxu/data/VM/images/linux.img'/> <target dev='vda' bus='virtio'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> <input type='mouse' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes'/> <video> <model type='cirrus' vram='9216' heads='1'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </video> <memballoon model='virtio'> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </memballoon> </devices> ------------------------------------------------------ Then can't startup qemu, the error message as below: virsh # start test-vm error: Failed to start domain test-vm error: internal error process exited while connecting to monitor: qemu-system-x86_64: -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3: PCI: slot 3 function 0 not available for virtio-balloon-pci, in use by virtio-blk-pci qemu-system-x86_64: -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3: Device 'virtio-balloon-pci' could not be initialized So adding check for bus type and address type. Only the address of pci type support by virtio bus. Signed-off-by: Xu He Jie <xuhj(a)linux.vnet.ibm.com> --- src/qemu/qemu_command.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 30c0be6..7c4bc0a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1321,13 +1321,17 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, qemuDomainPCIAddressSetPtr addrs) /* Disks (VirtIO only for now */ for (i = 0; i < def->ndisks ; i++) { - if (def->disks[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) - continue; - /* Only VirtIO disks use PCI addrs */ if (def->disks[i]->bus != VIR_DOMAIN_DISK_BUS_VIRTIO) continue; + if ((def->disks[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) && + (def->disks[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE)) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("virtio only support device address type 'PCI' ")); + goto error; + } + if (qemuDomainPCIAddressSetNextAddr(addrs, &def->disks[i]->info) < 0) goto error; } -- 1.7.4.1

1 1

[libvirt] [PATCH V1 0/4] Support for multiple IP addresses using lists
by Stefan Berger 22 Oct '11

22 Oct '11

This patch series builds on the previously posted patch series https://www.redhat.com/archives/libvir-list/2011-October/msg00912.html and introduces the capability to assign a list to a variable and have multiple rules instantiated, one for each item in the list. This means, that if for example a variable like IP has been assigned the following values IP = [1.2.3.4, 5.6.7.8, 10.0.0.1] it will generate 3 rules, which then in turn allows us to build filters that can evaluate multiple possible values per field, i.e., allow the filtering for multiple IP addresses (per interface). It would then need David Steven's patch for support of 'RETURN' (and 'CONTINUE') target(s). Regards, Stefan

1 5

[libvirt] [PATCH] virsh: Fix vol-info's 'Type' output
by Ryota Ozaki 22 Oct '11

22 Oct '11

We have a new type "dir" in addition to "file" and "block", but virsh doen't know it. Fix it. Additionally, the patch lets virsh output "unknown" if not matched any of them. --- tools/virsh.c | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 42f62d7..72344f0 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -9540,9 +9540,22 @@ cmdVolInfo(vshControl *ctl, const vshCmd *cmd) if (virStorageVolGetInfo(vol, &info) == 0) { double val; const char *unit; - vshPrint(ctl, "%-15s %s\n", _("Type:"), - info.type == VIR_STORAGE_VOL_FILE ? - _("file") : _("block")); + switch(info.type) { + case VIR_STORAGE_VOL_FILE: + vshPrint(ctl, "%-15s %s\n", _("Type:"), _("file")); + break; + + case VIR_STORAGE_VOL_BLOCK: + vshPrint(ctl, "%-15s %s\n", _("Type:"), _("block")); + break; + + case VIR_STORAGE_VOL_DIR: + vshPrint(ctl, "%-15s %s\n", _("Type:"), _("dir")); + break; + + default: + vshPrint(ctl, "%-15s %s\n", _("Type:"), _("unknown")); + } val = prettyCapacity(info.capacity, &unit); vshPrint(ctl, "%-15s %2.2lf %s\n", _("Capacity:"), val, unit); -- 1.7.4.1

2 2

[libvirt] [PATCH] docs: Document filesystem type='block' for LXC
by Ryota Ozaki 21 Oct '11

21 Oct '11

Commit 77791dc0e allows LXC to use a host block device as a guest filesystem, but it isn't documented yet. --- docs/formatdomain.html.in | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 95d33c0..dc6b152 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1196,7 +1196,9 @@ </dd> <dt><code>type='block'</code></dt> <dd> - Currently unused. + A host block device to mount in the guest. The filesystem + format will be autodetected. Only used by LXC driver + <span class="since">(since 0.9.5)</span>. </dd> </dl> -- 1.7.4.1

2 1

[libvirt] [PATCH 1/3] Add vapi bindings generation
by Marc-André Lureau 21 Oct '11

21 Oct '11

--- Makefile.am | 2 +- configure.ac | 19 +++++++++++++++++++ vapi/Makefile.am | 37 +++++++++++++++++++++++++++++++++++++ vapi/libvirt-gobject-1.0.deps | 1 + vapi/libvirt-gobject-1.0.metada | 2 ++ 5 files changed, 60 insertions(+), 1 deletions(-) create mode 100644 vapi/Makefile.am create mode 100644 vapi/libvirt-gobject-1.0.deps create mode 100644 vapi/libvirt-gobject-1.0.metada diff --git a/Makefile.am b/Makefile.am index 3df8626..8d082c0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ -SUBDIRS = libvirt-glib libvirt-gconfig libvirt-gobject python examples +SUBDIRS = libvirt-glib libvirt-gconfig libvirt-gobject python vapi examples ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index 0581874..c474f0b 100644 --- a/configure.ac +++ b/configure.ac @@ -198,12 +198,31 @@ if test "x$enable_introspection" != "xno" ; then fi AM_CONDITIONAL([WITH_GOBJECT_INTROSPECTION], [test "x$enable_introspection" = "xyes"]) +AC_ARG_ENABLE([vala], + AS_HELP_STRING([--enable-vala], [enable Vala binding generation]), + [], [enable_vala=check]) +if test "x$enable_introspection" = "xyes" ; then + if test "x$enable_vala" != "xno" ; then + AC_PATH_PROG(VAPIGEN, vapigen, no) + if test "x$VAPIGEN" != "xno"; then + if test "x$enable_vala" == "xcheck" ; then + enable_vala=yes + AC_SUBST(VAPIGEN) + fi + else + AC_MSG_ERROR([Cannot find the "vapigen" binary in your PATH]) + fi + fi +fi +AM_CONDITIONAL([WITH_VALA], [test "x$enable_vala" = "xyes"]) + AC_OUTPUT(Makefile libvirt-glib/Makefile libvirt-gconfig/Makefile libvirt-gobject/Makefile examples/Makefile python/Makefile + vapi/Makefile libvirt-glib-1.0.pc libvirt-gconfig-1.0.pc libvirt-gobject-1.0.pc diff --git a/vapi/Makefile.am b/vapi/Makefile.am new file mode 100644 index 0000000..f844576 --- /dev/null +++ b/vapi/Makefile.am @@ -0,0 +1,37 @@ +NULL = + +if WITH_VALA +vapidir = $(datadir)/vala/vapi +vapi_DATA = \ + libvirt-gconfig-1.0.vapi \ + libvirt-glib-1.0.vapi \ + libvirt-gobject-1.0.vapi \ + $(NULL) + +libvirt-glib-1.0.vapi: $(top_builddir)/libvirt-glib/LibvirtGLib-1.0.gir + $(AM_V_GEN)$(VAPIGEN) \ + --vapidir=. \ + --pkg gobject-2.0 \ + --pkg gio-2.0 \ + --library libvirt-glib-1.0 \ + $< + +libvirt-gobject-1.0.vapi: $(top_builddir)/libvirt-gobject/LibvirtGObject-1.0.gir + $(AM_V_GEN)$(VAPIGEN) \ + --vapidir=. \ + --pkg gobject-2.0 \ + --pkg gio-2.0 \ + --pkg libvirt-glib-1.0 \ + --library libvirt-gobject-1.0 \ + $< + +libvirt-gconfig-1.0.vapi: $(top_builddir)/libvirt-gconfig/LibvirtGConfig-1.0.gir + $(AM_V_GEN)$(VAPIGEN) \ + --vapidir=. \ + --pkg gobject-2.0 \ + --library libvirt-gconfig-1.0 \ + $< + +endif + +CLEANFILES = $(vapi_DATA) diff --git a/vapi/libvirt-gobject-1.0.deps b/vapi/libvirt-gobject-1.0.deps new file mode 100644 index 0000000..899e8e8 --- /dev/null +++ b/vapi/libvirt-gobject-1.0.deps @@ -0,0 +1 @@ +libvirt-gconfig-1.0 diff --git a/vapi/libvirt-gobject-1.0.metada b/vapi/libvirt-gobject-1.0.metada new file mode 100644 index 0000000..90e5197 --- /dev/null +++ b/vapi/libvirt-gobject-1.0.metada @@ -0,0 +1,2 @@ +init_object.argv unowned +init_object_check.argv unowned -- 1.7.6.2

3 7

[libvirt] passing secrets to block devices
by Josh Durgin 21 Oct '11

21 Oct '11

We're working on libvirt support for block device authentication [1]. To authenticate, rbd needs a username and a secret. Normally, to avoid putting the secret on the command line, you can store the secret in a file and pass the file to qemu, but when this is automated, there's no good way to know when the file can be removed. There are a few ways to pass the secret to qemu that avoid this problem: 1) pass an fd to an unlinked file containing the secret This is the simplest method, but it sounds like qemu developers don't like fd passing from libvirt. [2] 2) start guests paused, without disks requiring authentication, then use the drive_add monitor command to attach them This would make disks with authentication somewhat of a special case in libvirt, but would be simple to implement, and require no qemu changes. 3) start guests paused, then send the secret via a new QMP/HMP command (block_set_conf <key> <value>?) This is a larger change, but it would be more generally useful for changing configuration at runtime. What do you think is the best approach? [1] http://permalink.gmane.org/gmane.comp.file-systems.ceph.devel/4129 [2] http://lists.gnu.org/archive/html/qemu-devel/2011-08/msg02494.html

4 7

[libvirt] [PATCH libvirt-glib] Fix vapigen on uninstalled environment
by Marc-André Lureau 21 Oct '11

21 Oct '11

--- vapi/Makefile.am | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/vapi/Makefile.am b/vapi/Makefile.am index 129ce58..1e94a87 100644 --- a/vapi/Makefile.am +++ b/vapi/Makefile.am @@ -11,25 +11,27 @@ vapi_DATA = \ libvirt-glib-1.0.vapi: $(top_builddir)/libvirt-glib/LibvirtGLib-1.0.gir $(AM_V_GEN)$(VAPIGEN) \ - --vapidir=. \ + --vapidir=$(builddir) \ --pkg gobject-2.0 \ --pkg gio-2.0 \ --library libvirt-glib-1.0 \ $< libvirt-gobject-1.0.vapi: $(top_builddir)/libvirt-gobject/LibvirtGObject-1.0.gir - $(AM_V_GEN)$(VAPIGEN) \ - --vapidir=. \ - --pkg gobject-2.0 \ - --pkg gio-2.0 \ - --pkg libvirt-glib-1.0 \ - --library libvirt-gobject-1.0 \ - --metadatadir=$(srcdir) \ + $(AM_V_GEN)$(VAPIGEN) \ + --vapidir=$(builddir) \ + --pkg gobject-2.0 \ + --pkg gio-2.0 \ + --pkg libvirt-glib-1.0 \ + --library libvirt-gobject-1.0 \ + --metadatadir=$(srcdir) \ + --girdir=$(top_builddir)/libvirt-glib \ + --girdir=$(top_builddir)/libvirt-gconfig \ $< libvirt-gconfig-1.0.vapi: $(top_builddir)/libvirt-gconfig/LibvirtGConfig-1.0.gir $(AM_V_GEN)$(VAPIGEN) \ - --vapidir=. \ + --vapidir=$(builddir) \ --pkg gobject-2.0 \ --library libvirt-gconfig-1.0 \ $< -- 1.7.6.2

2 1

[libvirt] [PATCH libvirt-glib] Fix GIR scanner on uninstalled environment
by Marc-André Lureau 21 Oct '11

21 Oct '11

--- libvirt-gobject/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libvirt-gobject/Makefile.am b/libvirt-gobject/Makefile.am index 7013675..1c36fb0 100644 --- a/libvirt-gobject/Makefile.am +++ b/libvirt-gobject/Makefile.am @@ -99,7 +99,7 @@ CLEANFILES = $(BUILT_SOURCES) if WITH_GOBJECT_INTROSPECTION LibvirtGObject-1.0.gir: libvirt-gobject-1.0.la $(G_IR_SCANNER) Makefile.am - $(AM_V_GEN)$(G_IR_SCANNER) \ + $(AM_V_GEN)PKG_CONFIG_PATH=$(top_builddir) $(G_IR_SCANNER) \ --quiet \ --warn-all \ --namespace LibvirtGObject \ -- 1.7.6.2

2 1

[libvirt] [libvirt PATCH] support continue/return targets in nwfilter
by David L Stevens 21 Oct '11

21 Oct '11

This patch adds support for "continue" and "return" actions in filter rules. Signed-off-by: David L Stevens <dlstevens(a)us.ibm.com> diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 04bfa22..3e28806 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -55,12 +55,16 @@ VIR_ENUM_IMPL(virNWFilterRuleAction, VIR_NWFILTER_RULE_ACTION_LAST, "drop", "accept", - "reject"); + "reject", + "return", + "continue"); VIR_ENUM_IMPL(virNWFilterJumpTarget, VIR_NWFILTER_RULE_ACTION_LAST, "DROP", "ACCEPT", - "REJECT"); + "REJECT", + "RETURN", + "CONTINUE"); VIR_ENUM_IMPL(virNWFilterRuleDirection, VIR_NWFILTER_RULE_DIRECTION_LAST, "in", diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h index 5306403..c96851a 100644 --- a/src/conf/nwfilter_conf.h +++ b/src/conf/nwfilter_conf.h @@ -299,6 +299,8 @@ enum virNWFilterRuleActionType { VIR_NWFILTER_RULE_ACTION_DROP = 0, VIR_NWFILTER_RULE_ACTION_ACCEPT, VIR_NWFILTER_RULE_ACTION_REJECT, + VIR_NWFILTER_RULE_ACTION_RETURN, + VIR_NWFILTER_RULE_ACTION_CONTINUE, VIR_NWFILTER_RULE_ACTION_LAST, };

4 3

Re: [libvirt] [PATCH] qemu: Relax -no-shutdown check to [0.14.0, 0.15.0]
by lvroyce 21 Oct '11

21 Oct '11

tested-by :Royce Lv<lvroyce(a)linux.vnet.ibm.com> patch workes expected,qemu version 0.15.50.reboot domain with ACPI support.

1 0

[libvirt] [PATCH] docs: document managed=yes of hostdev passthrough
by Eric Blake 21 Oct '11

21 Oct '11

Clarify some of the effects of managed passthrough <hostdev> devices; with today's recent changes, a nodedev-reattach is only needed to pair up to an explicit nodedev-dettach (but beware that virt-manager has a bug where it uses explicit nodedev-dettach under the hood when using the gui to hotplug a hostdev device). * docs/formatdomain.html.in: Mention reattach. * tools/virsh.pod (nodedev): Mention managed mode. --- My earlier commit beeab55 was pessimistic on when nodedev-reattach was needed, especially in light of today's patches. Hopefully this describes the situation with more accuracy. docs/formatdomain.html.in | 5 ++++- tools/virsh.pod | 30 ++++++++++++++++++------------ 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index c007dff..bc20392 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1410,7 +1410,10 @@ "subsystem" and <code>type</code> is "usb" for a USB device and "pci" for a PCI device. When <code>managed</code> is "yes" for a PCI device, it is detached from the host before being passed on to - the guest.</dd> + the guest, and reattached to the host after the guest exits; + otherwise, the user is responsible to + call <code>virNodeDeviceDettach</code> + and <code>virNodeDeviceReAttach</code> at appropriate points.</dd> <dt><code>source</code></dt> <dd>The source element describes the device as seen from the host. The USB device can either be addressed by vendor / product id using the diff --git a/tools/virsh.pod b/tools/virsh.pod index 74ae647..f9ac6b8 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1211,7 +1211,8 @@ Attach a device to the domain, using a device definition in an XML file. See the documentation to learn about libvirt XML format for a device. For cdrom and floppy devices, this command only replaces the media within the single existing device; consider using B<update-device> for this usage. -For passthrough host devices, see also B<nodedev-dettach>. +For passthrough host devices, see also B<nodedev-dettach>, needed if +the device does not use managed mode. =item B<attach-disk> I<domain-id> I<source> I<target> [I<--driver driver>] [I<--subdriver subdriver>] [I<--cache cache>] @@ -1257,7 +1258,8 @@ will be created automatically. Detach a device from the domain, takes the same kind of XML descriptions as command B<attach-device>. -For passthrough host devices, see also B<nodedev-reattach>. +For passthrough host devices, see also B<nodedev-reattach>, needed if +the device does not use managed mode. =item B<detach-disk> I<domain-id> I<target> @@ -1299,11 +1301,16 @@ For more information on node device definition see: L<http://libvirt.org/formatnode.html>. Passthrough devices cannot be simultaneously used by the host and its -guest domains. Attempts to use a passthrough <hostdev> for a guest may -have the ability to behave as if B<nodedev-dettach> had been called, -although making this call explicitly is safe. Once a guest no longer -needs a passthrough device, reversing the process so that the host can -again use the device requires the explicit use of B<nodedev-reattach>. +guest domains. If the <hostdev> description includes the attribute +B<managed='yes'>, and the hypervisor supports it, then the device is +in managed mode, and attempts to use that passthrough device in an +active guest will automatically behave as if B<nodedev-dettach> (guest +start, device hot-plug) and B<nodedev-reattach> (guest stop, device +hot-unplug) were called at the right points. If a device is not +marked as managed, then it must manually be detached and reattached +before a guest can use it. Also, if a device is manually detached, +then the host does not regain control of the device without a matching +reattach, even if the guests use the device in managed mode. =over 4 @@ -1325,7 +1332,7 @@ by the rest of the physical host until a reboot. Detach I<nodedev> from the host, so that it can safely be used by guests via <hostdev> passthrough. This is reversed with -B<nodedev-reattach>. +B<nodedev-reattach>, and is done automatically for managed devices. =item B<nodedev-dumpxml> I<nodedev> @@ -1344,10 +1351,9 @@ formatted in a tree representing parents of each node. =item B<nodedev-reattach> I<nodedev> Declare that I<nodedev> is no longer in use by any guests, and that -the host can resume normal use of the device. While libvirt can -sometimes perform an implicit B<nodedev-dettach> when creating a -guest, it currently requires an explicit B<nodedev-reattach> after -the last guest use of the device before the host regains full control. +the host can resume normal use of the device. This is done +automatically for devices in managed mode, but must be done explicitly +to match any explicit B<nodedev-dettach>. =item B<nodedev-reset> I<nodedev> -- 1.7.4.4

2 3

[libvirt] [FYI] Skript to extract qcow2 snapshot info to libvirt snapshot xml
by Philipp Hahn 20 Oct '11

20 Oct '11

Hello, I sometimes get foreign qcow2 images with embedded snapshots. Without the corresponding XML files libvirt doesn't recognize them. Therefor I created the attached script to fake-create the missing snapshot XML files. Be advised that the XML files might not work in all cases, especially when the configuration was changed between snapshots, but at least I prefer a solution working 95% of the times instead of 0% ;-) And since I already wrote it, others might find it useful as well. Sincerely Philipp Hahn PS: An a drink of their reasonable choosing to the first one writing a qemu-img version printing (shell-)parsable output :-( -- Philipp Hahn Open Source Software Engineer hahn(a)univention.de Univention GmbH Linux for Your Business fon: +49 421 22 232- 0 Mary-Somerville-Str.1 D-28359 Bremen fax: +49 421 22 232-99 http://www.univention.de/

4 3

[libvirt] [PATCH] The output of domxml-to-native should be the same as the actual commandline.
by tangchen 20 Oct '11

20 Oct '11

Hi, There is a little difference between the output of domxml-to-native and the actual commandline. No matter qemu is in control or readline mode, domxml-to-native always converts it to readline mode. That is because the parameter "monitor_json" for qemuBuildCommandLine() is always set to false in qemuDomainXMLToNative(). Here is the patch, please comment! Signed-off-by: tangchen <tangchen(a)cn.fujitsu.com> --- src/qemu/qemu_driver.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2e6f3e4..a564afb 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4480,6 +4480,7 @@ static char *qemuDomainXMLToNative(virConnectPtr conn, virDomainDefPtr def = NULL; virDomainChrSourceDef monConfig; virBitmapPtr qemuCaps = NULL; + bool monitor_json = false; virCommandPtr cmd = NULL; char *ret = NULL; int i; @@ -4577,11 +4578,15 @@ static char *qemuDomainXMLToNative(virConnectPtr conn, &qemuCaps) < 0) goto cleanup; +#ifdef HAVE_YAJL + monitor_json = qemuCapsGet(qemuCaps, QEMU_CAPS_MONITOR_JSON); +#endif + if (qemuProcessPrepareMonitorChr(driver, &monConfig, def->name) < 0) goto cleanup; if (!(cmd = qemuBuildCommandLine(conn, driver, def, - &monConfig, false, qemuCaps, + &monConfig, monitor_json, qemuCaps, NULL, -1, NULL, VIR_VM_OP_NO_OP))) goto cleanup; -- 1.7.3.1 -- Best Regards, Tang chen

2 1

[libvirt] [PATCH] docs: fix incorrect info about routed networks
by Laine Stump 20 Oct '11

20 Oct '11

In a recent expansion of the documentation on network forward modes, I incorrectly stated that incoming sessions to guests on routed networks were blocked. This is true for guests on NATed networks, but not routed. This patch corrects that error, and adds a pointer to the nwfilter page for those who do want to restrict incoming sessions to hosts on routed networks. --- docs/formatnetwork.html.in | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index e06392b..02302fa 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -134,12 +134,12 @@ attribute is set, firewall rules will restrict forwarding to the named device only. This presumes that the local LAN router has suitable routing table entries to return - traffic to this host. Firewall rules are also installed - that prevent incoming sessions from the physical network - to the guests, but outgoing sessions are unrestricted (as - are sessions from the host to the guests, and between - guests on the same network.)<span class="since">Since - 0.4.2</span> + traffic to this host. All incoming and outgoing sessions + to guest on these networks are unrestricted. (To restrict + incoming traffic to a guest on a routed network, you can + configure <a href="formatnwfilter.html">nwfilter rules</a> + on the guest's interfaces.) + <span class="since">Since 0.4.2</span> </dd> <dt><code>bridge</code></dt> -- 1.7.6.4

2 1

[libvirt] [PATCH] macvtap: Fix error return values to -1 instead of 1
by Roopa Prabhu 20 Oct '11

20 Oct '11

From: Roopa Prabhu <roprabhu(a)cisco.com> Fixes some cases where 1 was being returned instead of -1. There are still some inconsistencies in the file with respect to what the return variable is initialized to. Can be fixed as a separate patch if needed. The scope of this patch is just to fix the return value 1. Did some basic sanity test. Signed-off-by: Roopa Prabhu <roprabhu(a)cisco.com> Reported-by: Eric Blake <eblake(a)cisco.com> --- src/util/macvtap.c | 22 ++++++++-------------- 1 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/util/macvtap.c b/src/util/macvtap.c index 7fd6eb5..f8b9d55 100644 --- a/src/util/macvtap.c +++ b/src/util/macvtap.c @@ -480,7 +480,7 @@ getPortProfileStatus(struct nlattr **tb, int32_t vf, bool is8021Qbg, uint16_t *status) { - int rc = 1; + int rc = -1; const char *msg = NULL; struct nlattr *tb_port[IFLA_PORT_MAX + 1] = { NULL, }; @@ -806,7 +806,7 @@ doPortProfileOpCommon(bool nltarget_kernel, _("error %d during port-profile setlink on " "interface %s (%d)"), status, ifname, ifindex); - rc = 1; + rc = -1; break; } @@ -867,7 +867,7 @@ doPortProfileOp8021Qbg(const char *ifname, const virVirtualPortProfileParamsPtr virtPort, enum virVirtualPortOp virtPortOp) { - int rc; + int rc = -1; # ifndef IFLA_VF_PORT_MAX @@ -877,7 +877,6 @@ doPortProfileOp8021Qbg(const char *ifname, (void)virtPortOp; macvtapError(VIR_ERR_INTERNAL_ERROR, "%s", _("Kernel VF Port support was missing at compile time.")); - rc = 1; # else /* IFLA_VF_PORT_MAX */ @@ -893,10 +892,8 @@ doPortProfileOp8021Qbg(const char *ifname, int vf = PORT_SELF_VF; if (getPhysdevAndVlan(ifname, &physdev_ifindex, physdev_ifname, - &vlanid) != 0) { - rc = 1; + &vlanid) != 0) goto err_exit; - } if (vlanid < 0) vlanid = 0; @@ -918,7 +915,6 @@ doPortProfileOp8021Qbg(const char *ifname, default: macvtapError(VIR_ERR_INTERNAL_ERROR, _("operation type %d not supported"), virtPortOp); - rc = 1; goto err_exit; } @@ -982,7 +978,7 @@ doPortProfileOp8021Qbh(const char *ifname, const unsigned char *vm_uuid, enum virVirtualPortOp virtPortOp) { - int rc; + int rc = -1; # ifndef IFLA_VF_PORT_MAX @@ -993,7 +989,6 @@ doPortProfileOp8021Qbh(const char *ifname, (void)virtPortOp; macvtapError(VIR_ERR_INTERNAL_ERROR, "%s", _("Kernel VF Port support was missing at compile time.")); - rc = 1; # else /* IFLA_VF_PORT_MAX */ @@ -1008,10 +1003,9 @@ doPortProfileOp8021Qbh(const char *ifname, if (rc) goto err_exit; - if (ifaceGetIndex(true, physfndev, &ifindex) < 0) { - rc = 1; + rc = ifaceGetIndex(true, physfndev, &ifindex); + if (rc < 0) goto err_exit; - } switch (virtPortOp) { case PREASSOCIATE_RR: @@ -1059,7 +1053,7 @@ doPortProfileOp8021Qbh(const char *ifname, default: macvtapError(VIR_ERR_INTERNAL_ERROR, _("operation type %d not supported"), virtPortOp); - rc = 1; + rc = -1; } err_exit:

2 2

[libvirt] [PATCH v3 0/4] Allow to make disk optional on migration
by Michal Privoznik 20 Oct '11

20 Oct '11

This is a 3rd version of patches [1]. Diff to v2 includes Daniel's review and some other improvements. The aim of these patches is to mark CDROM and floppy optional, thus they might get dropped during migration, domain startup, restore, etc. The granularity is set on disk level, so user can decide which cd-roms are important and which not. There are 3 levels of optionality: - mandatory - fail if missing for any reason (the default) - requisite - fail if missing on boot up, drop if missing on migrate/restore/revert - optional - drop if missing at any start attempt. To assign a disk one of these, just append 'on_missing' attribute to its <source>. If a domain is then eventually started (migrated, restored, whatever), we check for source path being accessible (currently only qemu driver is supported) from hypervisor's POV. This is done by virFileAccessibleAs() function. Currently, only uid+gid are considered. Ideally, this should be extended to SElinux labeling and cgroups. 1: https://www.redhat.com/archives/libvir-list/2011-October/msg00032.html Michal Privoznik (4): conf: Introduce optional on_missing attribute for cdrom and floppy util: Create virFileAccessibleAs function qemu: implement on_missing on_missing: Emit event on disk source dropping daemon/remote.c | 37 ++++++++++ docs/formatdomain.html.in | 26 ++++++- docs/schemas/domaincommon.rng | 22 +++++- examples/domain-events/events-c/event-test.c | 27 +++++++- examples/domain-events/events-python/event-test.py | 4 + include/libvirt/libvirt.h.in | 28 +++++++ python/libvirt-override-virConnect.py | 9 +++ python/libvirt-override.c | 51 +++++++++++++ src/conf/domain_conf.c | 43 ++++++++++- src/conf/domain_conf.h | 11 +++ src/conf/domain_event.c | 50 +++++++++++++ src/conf/domain_event.h | 7 ++ src/libvirt_private.syms | 4 + src/qemu/qemu_domain.c | 73 +++++++++++++++++++ src/qemu/qemu_domain.h | 4 + src/qemu/qemu_process.c | 4 + src/remote/remote_driver.c | 34 +++++++++ src/remote/remote_protocol.x | 9 ++- src/remote_protocol-structs | 5 ++ src/util/util.c | 76 ++++++++++++++++++++ src/util/util.h | 3 + .../qemuxml2xmlout-disk-cdrom-empty.xml | 31 ++++++++ 22 files changed, 548 insertions(+), 10 deletions(-) create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-cdrom-empty.xml -- 1.7.3.4

3 9

[libvirt] [PATCH 1/2] Fix occasional container creation failure due to misuse of grantpt
by Serge E. Hallyn 20 Oct '11

20 Oct '11

glibc's grantpt and ptsname cannot be used on a fd for a pty not in /dev/pts. The lxc controller tries to do just that. So if you try to start a container on a system where /dev/pts/0 is not available, it will fail. You can make this happen by opening a terminal on /dev/pts/0, and doing 'sleep 2h & disown; exit'. To fix this, I call the virFileOpenTtyAt() from a forked task in a new mount ns, and first mount the container's /dev/pts onto /dev/pts. (Then the opened fd must be passed back to the lxc driver). Another solution would be to just do it all by hand without grantpt and ptsname. Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/863629 Signed-off-by: Serge Hallyn <serge.hallyn(a)canonical.com> --- src/lxc/lxc_controller.c | 117 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 112 insertions(+), 5 deletions(-) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 51488e7..1a56e0c 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -780,6 +780,113 @@ static int lxcSetPersonality(virDomainDefPtr def) # define MS_SLAVE (1<<19) #endif +static int send_pty(int sock, int *pty) +{ + struct iovec vector; + struct msghdr msg; + struct cmsghdr * cmsg; + int ret; + + vector.iov_base = "PTY"; + vector.iov_len = 3; + + msg.msg_name = NULL; + msg.msg_namelen = 0; + msg.msg_iov = &vector; + msg.msg_iovlen = 1; + + cmsg = alloca(sizeof(struct cmsghdr) + sizeof(*pty)); + cmsg->cmsg_len = sizeof(struct cmsghdr) + sizeof(*pty); + cmsg->cmsg_level = SOL_SOCKET; + cmsg->cmsg_type = SCM_RIGHTS; + + memcpy(CMSG_DATA(cmsg), pty, sizeof(*pty)); + + msg.msg_control = cmsg; + msg.msg_controllen = cmsg->cmsg_len; + + ret = sendmsg(sock, &msg, 0); + if (ret < 0) + return -1; + return 0; +} + +static int recv_pty(int sock, int *pty, char **path, char *devpts) +{ + char buf[50]; + struct iovec vector; + struct msghdr msg; + struct cmsghdr * cmsg; + int ret; + + vector.iov_base = buf; + vector.iov_len = 50; + + msg.msg_name = NULL; + msg.msg_namelen = 0; + msg.msg_iov = &vector; + msg.msg_iovlen = 1; + + cmsg = alloca(sizeof(struct cmsghdr) + sizeof(*pty)); + cmsg->cmsg_len = sizeof(struct cmsghdr) + sizeof(*pty); + msg.msg_control = cmsg; + msg.msg_controllen = cmsg->cmsg_len; + + ret = recvmsg(sock, &msg, 0); + if (ret < 0) + return ret; + + memcpy(pty, CMSG_DATA(cmsg), sizeof(*pty)); + + if (VIR_ALLOC_N(*path, PATH_MAX) < 0) { + virReportSystemError(errno, "%s", + _("Failed to allocate space for ptyname")); + return -ENOMEM; + } + //snprintf(*path, PATH_MAX, "%s/0", devpts); + snprintf(*path, PATH_MAX, "/dev/pts/0"); + return 0; +} + +static int private_open_tty_at(char *devpts, char *devptmx, + int *containerPty, + char **containerPtyPath, int rawmode) +{ + int pid; + int ret; + int status; + int s[2]; + + ret = socketpair(PF_UNIX, SOCK_DGRAM, 0, s); + if (ret < 0) + return ret; + + pid = fork(); + if (pid < 0) + exit(pid); + if (pid == 0) { + close(s[1]); + ret = unshare(CLONE_NEWNS); + if (ret < 0) + exit(ret); + ret = mount(devpts, "/dev/pts", "none", MS_BIND, NULL); + if (ret < 0) + exit(ret); + ret = virFileOpenTtyAt(devptmx, containerPty, containerPtyPath, rawmode); + if (ret < 0) + exit(ret); + send_pty(s[0], containerPty); + exit(ret); + } + close(s[0]); + ret = recv_pty(s[1], containerPty, containerPtyPath, devpts); + close(s[1]); + if (ret) + return ret; + waitpid(pid, &status, 0); + return WEXITSTATUS(status); +} + static int lxcControllerRun(virDomainDefPtr def, unsigned int nveths, @@ -894,12 +1001,12 @@ lxcControllerRun(virDomainDefPtr def, if (devptmx) { VIR_DEBUG("Opening tty on private %s", devptmx); - if (virFileOpenTtyAt(devptmx, - &containerPty, - &containerPtyPath, - 0) < 0) { + if (private_open_tty_at(devpts, devptmx, + &containerPty, + &containerPtyPath, + 0) < 0) { virReportSystemError(errno, "%s", - _("Failed to allocate tty")); + _("Failed to allocate tty")); goto cleanup; } } else { -- 1.7.5.4

5 20

[libvirt] [PATCH V2 00/10] Make inner workings of nwfilters more flexible + extensions
by Stefan Berger 20 Oct '11

20 Oct '11

The following series of patches re-does some of the inner workings of nwfilters with the goal to enable users to write filters that have other than the system-known chains supported right now ('root','arp','rarp','ipv4' and 'ipv6'). Ideally users should be able to provide a chain name in the chains XML attribute and either be able to jump to it as an 'action' or have the chain created automatically as it is the case right now for those chains enumerated before. The latter is now added in this patch series as well. I am first introducing internal priorities for the chains mentioned above so that their creation can be made more flexible -- currently their creation and the order in which they are accessed is hardcoded. This largely does away with the hardcoded stuff. All assigned priorities have negative values. Later on the priorities for the chains are made accessible via an XML attribute. Further, filters will be automatically accessed from the (ebtables) interface 'root' chain using the prefix of the name of the chain. As an example, the following filter will be accessed from the root chain for 'arp' packets since its name 'arp-xyz' has the prefix 'arp'. <filter name='test-arp-xyz' chain='arp-xyz' priority='-650'> <uuid>94abeecc-c956-0ac8-1f49-a06ee8995688</uuid> <rule action='accept' direction='out' priority='100'> <arp opcode='Request_Reverse' arpsrcmacaddr='$MAC' arpdstmacaddr='$MAC' arpsrcipaddr='0.0.0.0' arpdstipaddr='0.0.0.0'/> </rule> <rule action='accept' direction='inout' priority='500'/> </filter> In another step the priorities of rules is extended to also allow negativ values. This then allows the creation of rules and chains in the interface 'root' chain to be mixed so that the following layout becomes possible: Bridge chain: libvirt-I-vnet0, entries: 6, policy: ACCEPT -p IPv4 -j I-vnet0-ipv4 -p ARP -j I-vnet0-arp -p ARP -j ACCEPT -p 0x8035 -j I-vnet0-rarp -p 0x835 -j ACCEPT -j DROP In the above list of rules the '-p ARP -j ACCEPT' can now be found in between the 'jumps' to protocol-specific chains, which allows for more efficient rule evaluation. I did testing with the test cases in libvirt-tck as well as those in the tests/ directory and did not see any regressions. Regards, Stefan

5 19

[libvirt] [PATCH] support setting bandwidth from virsh attach-interface
by Hu Tao 20 Oct '11

20 Oct '11

Adds two options, inbound and outbound, to attach-interface to set bandwidth when attaching interfaces --- tools/virsh.c | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++- tools/virsh.pod | 5 ++- 2 files changed, 98 insertions(+), 3 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index bcf0603..d6c9450 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -59,6 +59,7 @@ #include "threads.h" #include "command.h" #include "virkeycode.h" +#include "network.h" static char *progname; @@ -11225,15 +11226,49 @@ static const vshCmdOptDef opts_attach_interface[] = { {"script", VSH_OT_DATA, 0, N_("script used to bridge network interface")}, {"model", VSH_OT_DATA, 0, N_("model type")}, {"persistent", VSH_OT_BOOL, 0, N_("persist interface attachment")}, + {"inbound", VSH_OT_DATA, VSH_OFLAG_NONE, N_("control domain's incoming traffics")}, + {"outbound", VSH_OT_DATA, VSH_OFLAG_NONE, N_("control domain's outgoing traffics")}, {NULL, 0, 0, NULL} }; +/* parse inbound and outbound which are in the format of + * 'average,peak,burst', in which peak and burst are optional, + * thus 'average,,burst' and 'average,peak' are also legal. */ +static int parseRateStr(const char *rateStr, virRatePtr rate) +{ + char *average = NULL, *peak = NULL, *burst = NULL; + + average = (char *)rateStr; + if (!average) + return -1; + rate->average = atol(average); + + peak = strchr(average, ','); + if (peak) { + burst = strchr(peak + 1, ','); + if (!(burst && (burst - peak == 1))) { + if (virStrToLong_ull(peak + 1, &burst, 10, &rate->peak) < 0) + return -1; + } + + if (burst) { + if (virStrToLong_ull(burst + 1, NULL, 10, &rate->burst) < 0) + return -1; + } + } + + + return 0; +} + static bool cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom = NULL; const char *mac = NULL, *target = NULL, *script = NULL, - *type = NULL, *source = NULL, *model = NULL; + *type = NULL, *source = NULL, *model = NULL, + *inboundStr = NULL, *outboundStr = NULL; + virRate inbound, outbound; int typ; int ret; bool functionReturn = false; @@ -11254,7 +11289,9 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) vshCommandOptString(cmd, "target", &target) < 0 || vshCommandOptString(cmd, "mac", &mac) < 0 || vshCommandOptString(cmd, "script", &script) < 0 || - vshCommandOptString(cmd, "model", &model) < 0) { + vshCommandOptString(cmd, "model", &model) < 0 || + vshCommandOptString(cmd, "inbound", &inboundStr) < 0 || + vshCommandOptString(cmd, "outbound", &outboundStr) < 0) { vshError(ctl, "missing argument"); goto cleanup; } @@ -11270,6 +11307,29 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) goto cleanup; } + if (inboundStr) { + memset(&inbound, 0, sizeof(inbound)); + if (parseRateStr(inboundStr, &inbound) < 0) { + vshError(ctl, _("inbound format is incorrect")); + goto cleanup; + } + if (inbound.average == 0) { + vshError(ctl, _("inbound average is mandatory")); + goto cleanup; + } + } + if (outboundStr) { + memset(&outbound, 0, sizeof(outbound)); + if (parseRateStr(outboundStr, &outbound) < 0) { + vshError(ctl, _("outbound format is incorrect")); + goto cleanup; + } + if (outbound.average == 0) { + vshError(ctl, _("outbound average is mandatory")); + goto cleanup; + } + } + /* Make XML of interface */ virBufferAsprintf(&buf, "<interface type='%s'>\n", type); @@ -11287,6 +11347,38 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) if (model != NULL) virBufferAsprintf(&buf, " <model type='%s'/>\n", model); + if (inboundStr || outboundStr) { + virBufferAsprintf(&buf, " <bandwidth>\n"); + if (inboundStr && inbound.average > 0) { + if (inbound.peak > 0 && inbound.burst > 0) + virBufferAsprintf(&buf, " <inbound average='%lld' peak='%lld' burst='%lld'/>\n", + inbound.average, inbound.peak, inbound.burst); + else if (inbound.peak > 0) + virBufferAsprintf(&buf, " <inbound average='%lld' peak='%lld'/>\n", + inbound.average, inbound.peak); + else if (inbound.burst > 0) + virBufferAsprintf(&buf, " <inbound average='%lld' burst='%lld'/>\n", + inbound.average, inbound.burst); + else + virBufferAsprintf(&buf, " <inbound average='%lld'/>\n", inbound.average); + } + if (outboundStr && outbound.average > 0) { + if (outbound.peak > 0 && outbound.burst > 0) + virBufferAsprintf(&buf, " <outbound average='%lld' peak='%lld' burst='%lld'/>\n", + outbound.average, outbound.peak, outbound.burst); + else if (outbound.peak > 0) + virBufferAsprintf(&buf, " <outbound average='%lld' peak='%lld'/>\n", + outbound.average, outbound.peak); + else if (outbound.burst > 0) + virBufferAsprintf(&buf, " <outbound average='%lld' burst='%lld'/>\n", + outbound.average, outbound.burst); + else + virBufferAsprintf(&buf, " <outbound average='%lld'/>\n", outbound.average); + + } + virBufferAsprintf(&buf, " </bandwidth>\n"); + } + virBufferAddLit(&buf, "</interface>\n"); if (virBufferError(&buf)) { diff --git a/tools/virsh.pod b/tools/virsh.pod index d0b7937..06dc06a 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1235,7 +1235,7 @@ scsi:controller.bus.unit or ide:controller.bus.unit. =item B<attach-interface> I<domain-id> I<type> I<source> [I<--target target>] [I<--mac mac>] [I<--script script>] [I<--model model>] -[I<--persistent>] +[I<--persistent>] [I<--inbound average,peak,burst>] [I<--outbound average,peak,burst>] Attach a new network interface to the domain. I<type> can be either I<network> to indicate a physical network device or I<bridge> to indicate a bridge to a device. @@ -1246,6 +1246,9 @@ I<script> allows to specify a path to a script handling a bridge instead of the default one. I<model> allows to specify the model type. I<persistent> indicates the changes will affect the next boot of the domain. +I<inbound> and I<outbound> control the bandwidth of the interface. I<peak> +and I<burst> are optional, so "average,peak", "average,,burst" and +"average" are also legal. B<Note>: the optional target value is the name of a device to be created as the back-end on the node. If not provided a device named "vnetN" or "vifN" -- 1.7.3.1

3 9

Re: [libvirt] [PATCHv2] snapshot: detect when qemu lacks disk-snapshot support
by lvroyce 20 Oct '11

20 Oct '11

Tested by: Royce Lv Patch works as expected: tested with cmd "snapshot-create domain_name --disk-only" (1)when without hmp cmd support ,snapshot failed,0 size source file deleted (2)when source file creating failed,no snapshot taken and no crash with "need_unlink" flag set

1 0

[libvirt] Plan for the next release
by Daniel Veillard 20 Oct '11

20 Oct '11

Hello, I think it's time to plan for the next release, it may be a bit late to target the end of the month but I would think entering freeze around Friday 28 allowing for a release of 0.9.7 around Nov 4th should give people enough time to get reviews and push feeatures in, so unless there is an objection, let's plan to enter feature freeze at the end of next week ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] pci address conflict when virtio disk with drive type address
by Xu He Jie 20 Oct '11

20 Oct '11

When using the xml as below: ------------------------------- <devices> <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/home/soulxu/VM/images/linux.img'/> <target dev='hda' bus='virtio'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> <input type='mouse' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes'/> <video> <model type='cirrus' vram='9216' heads='1'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </video> <memballoon model='virtio'> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </memballoon> </devices> ----------------------------- Then can't statup qemu, the error message as below: qemu-system-x86_64: -device virtio-balloon-pci,id=balloon0,bus=pci.0,multifunction=on,addr=0x3.0x0: Device 'virtio-balloon-pci' could not be initialized Adding check for bus type and address type. Only the address of pci type support by virtio bus. Signed-off-by: Xu He Jie <xuhj(a)linux.vnet.ibm.com> --- src/conf/domain_conf.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 5959593..b8aa1a2 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2644,6 +2644,14 @@ virDomainDiskDefParseXML(virCapsPtr caps, } else { if (virDomainDeviceInfoParseXML(node, &def->info, flags) < 0) goto error; + + if ((def->bus == VIR_DOMAIN_DISK_BUS_VIRTIO) && + (def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) && + (def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE)) { + virDomainReportError(VIR_ERR_INTERNAL_ERROR, + _("virtio only support device address type 'PCI' ")); + goto error; + } } def->src = source; -- 1.7.5.4

2 4

[libvirt] [PATCH] compile: fix undefined reference to gnutls_x509_crt_get_dn with gcc-4.6.1
by Xu He Jie 20 Oct '11

20 Oct '11

From: soulxu <soulxu(a)soulxu-ThinkPad-T410.(none)> When I compile libvirt with gcc-4.6.1 in ubuntu 11.10, got error as below: CCLD libvirtd /usr/bin/ld: ../src/.libs/libvirt_driver_qemu.a(libvirt_driver_qemu_la-qemu_migration.o): undefined reference to symbol 'gnutls_x509_crt_get_dn@@GNUTLS_1_4' /usr/bin/ld: note: 'gnutls_x509_crt_get_dn@@GNUTLS_1_4' is defined in DSO /usr/lib/x86_64-linux-gnu/libgnutls.so so try adding it to the linker command line /usr/lib/x86_64-linux-gnu/libgnutls.so: could not read symbols: Invalid operation collect2: ld returned 1 exit status make[3]: *** [libvirtd] Error 1 It can compile with gcc-4.5.2 in ubuntu 11.04, but it can not compile with gcc-4.6.1 in ubuntu 11.10. I didn't find reason. Does Anyone know the reason or the different between gcc-4.5.2 and gcc-4.6.1? I still provide a patch for this. Just make it is working now. Signed-off-by: soulxu <soulxu(a)soulxu-ThinkPad-T410.(none)> --- src/Makefile.am | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 87d91ed..104efc6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -776,10 +776,14 @@ noinst_LTLIBRARIES += libvirt_driver_qemu.la #libvirt_la_BUILT_LIBADD += libvirt_driver_qemu.la endif libvirt_driver_qemu_la_CFLAGS = $(NUMACTL_CFLAGS) \ + $(GNUTLS_CFLAGS) \ + $(LIBXML_CFLAGS) \ -I@top_srcdir@/src/conf $(AM_CFLAGS) libvirt_driver_qemu_la_LDFLAGS = $(AM_LDFLAGS) libvirt_driver_qemu_la_LIBADD = $(NUMACTL_LIBS) \ - $(CAPNG_LIBS) + $(CAPNG_LIBS) \ + $(GNUTLS_LIBS) \ + $(LIBXML_LIBS) if WITH_DRIVER_MODULES libvirt_driver_qemu_la_LIBADD += ../gnulib/lib/libgnu.la libvirt_driver_qemu_la_LDFLAGS += -module -avoid-version -- 1.7.5.4

3 5

[libvirt] [PATCH] build: ignore test executable
by Eric Blake 19 Oct '11

19 Oct '11

* .gitignore: Add exemption. --- Pushing under the trivial rule (I almost did a 'git add' of the test binary). .gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 41fa50f..b04db58 100644 --- a/.gitignore +++ b/.gitignore @@ -74,6 +74,7 @@ /tests/networkxml2argvtest /tests/nwfilterxml2xmltest /tests/openvzutilstest +/tests/qemuxmlnstest /tests/shunloadtest /update.log Makefile -- 1.7.4.4

1 0

[libvirt] qemu-namespace handling?
by Philipp Hahn 19 Oct '11

19 Oct '11

Hello, some time ago I hand to manipulate the domain XML description using Pythons Elemtree XML implementation, which had problems generating the right format for libvirt: elemtree just supports adding Qname elements (that is "{http://libvirt.org/schemas/domain/qemu/1.0}commandline") which internally would create a temporary binding of this namespace to the "ns0" Prefix. My work-around for Elemtree was the add the name-space mapping for "qemu" to "http://libvirt.org/schemas/domain/qemu/1.0" to ETs internal mapping table and add an "xmlns:qemu" attribute by hand: ET._namespace_map[QEMU_URI] = 'qemu' domain.attrib['xmlns:qemu'] = QEMU_URI libvirt on the other hand expects the prefix to be "qemu" and only checks, that this prefix is bound to the URI mentioned above at the root node). The following examples would be XML valid, but are not accepted by libvirt: <domain>... <qemu:commandline xmlns:qemu="http://libvirt.org/schemas/domain/qemu/1.0"> ...</qemu:commandline> </domain> <domain xmlns:ns0="http://libvirt.org/schemas/domain/qemu/1.0">... <ns0:commandline> ...</ns0:commandline> </domain> The following (esoteric) example might be wrongly accepted by libvirt (untested): <domain xmlns:qemu="http://libvirt.org/schemas/domain/qemu/1.0"> <qemu:commandline xmlns:qemu="urn:foo"> ...</qemu:commandline> </domain> I don't know if this is worth fixing, but I still encountered the first two problems myself and had to spend some time to detecting what I did wrong. So at least I want to share my finding with others, so they don't do the same mistake. Sincerely Philipp Hahn -- Philipp Hahn Open Source Software Engineer hahn(a)univention.de Univention GmbH Linux for Your Business fon: +49 421 22 232- 0 Mary-Somerville-Str.1 D-28359 Bremen fax: +49 421 22 232-99 http://www.univention.de/

3 7

[libvirt] [PATCH] qemu: Do not free the device from activePciHostdevs if it's in use
by Osier Yang 19 Oct '11

19 Oct '11

* src/qemu/qemu_hostdev.c (qemuDomainReAttachHostdevDevices): pciDeviceListFree(pcidevs) at the end free()s the device even if it's in use by other domain, this is complete wrong, and will cause race. E.g. # sh test1.sh Device pci_0000_00_19_0 dettached Domain test started Device attached successfully error: Failed to start domain test2 error: Requested operation is not valid: PCI device 0000:00:19.0 is in use by domain test [ -- 1th time --] Device pci_0000_00_19_0 re-attached [ -- 2th time --] Device pci_0000_00_19_0 re-attached [ -- 3th time --] Device pci_0000_00_19_0 re-attached [ -- 4th time --] Device pci_0000_00_19_0 re-attached [ -- 5th time --] Device pci_0000_00_19_0 re-attached clean up Domain test destroyed Device pci_0000_00_19_0 re-attached [root@Osier libvirt]# sh test1.sh Device pci_0000_00_19_0 dettached Domain test started Device attached successfully error: Failed to start domain test2 error: Requested operation is not valid: PCI device 0000:00:19.0 is in use by domain test [ -- 1th time --] Device pci_0000_00_19_0 re-attached [ -- 2th time --] Device pci_0000_00_19_0 re-attached [ -- 3th time --] Device pci_0000_00_19_0 re-attached [ -- 4th time --] Device pci_0000_00_19_0 re-attached [ -- 5th time --] Device pci_0000_00_19_0 re-attached clean up Domain test destroyed Device pci_0000_00_19_0 re-attached [root@Osier libvirt]# sh test1.sh Device pci_0000_00_19_0 dettached Domain test started Device attached successfully error: Failed to start domain test2 error: Requested operation is not valid: PCI device 0000:00:19.0 is in use by domain test [ -- 1th time --] Device pci_0000_00_19_0 re-attached [ -- 2th time --] Device pci_0000_00_19_0 re-attached [ -- 3th time --] Device pci_0000_00_19_0 re-attached [ -- 4th time --] Device pci_0000_00_19_0 re-attached [ -- 5th time --] Device pci_0000_00_19_0 re-attached clean up Domain test destroyed Device pci_0000_00_19_0 re-attached [root@Osier libvirt]# sh test1.sh Device pci_0000_00_19_0 dettached Domain test started Device attached successfully error: Failed to start domain test2 error: Requested operation is not valid: PCI device 0000:00:19.0 is in use by domain test [ -- 1th time --] error: Failed to re-attach device pci_0000_00_19_0 error: internal error Not reattaching active device 0000:00:19.0 [ -- 2th time --] Device pci_0000_00_19_0 re-attached [ -- 3th time --] Device pci_0000_00_19_0 re-attached [ -- 4th time --] Device pci_0000_00_19_0 re-attached [ -- 5th time --] Device pci_0000_00_19_0 re-attached clean up Domain test destroyed Device pci_0000_00_19_0 re-attached The patch also fixes another problem alongside, there won't be error like "qemuDomainReAttachHostdevDevices: Not reattaching active device 0000:00:19.0" in daemon log if some device is in active. As pciResetDevice and pciReattachDevice won't be called for the device anymore. This is sensiable as we already reported error when preparing the device if it's active. Blindly trying to pciResetDevice & pciReattachDevice on the device and getting an error is just redundant. --- src/qemu/qemu_hostdev.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index 1fb373e..7efbab0 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -369,8 +369,10 @@ void qemuDomainReAttachHostdevDevices(struct qemud_driver *driver, */ activeDev = pciDeviceListFind(driver->activePciHostdevs, dev); if (activeDev && - STRNEQ_NULLABLE(name, pciDeviceGetUsedBy(activeDev))) + STRNEQ_NULLABLE(name, pciDeviceGetUsedBy(activeDev))) { + pciDeviceListSteal(pcidevs, dev); continue; + } /* pciDeviceListFree() will take care of freeing the dev. */ pciDeviceListSteal(driver->activePciHostdevs, dev); -- 1.7.6

1 1

Re: [libvirt] [PATCH] snapshot: use correct qmp monitor command
by lvroyce 19 Oct '11

19 Oct '11

Tested by:lvroyce test with cmd snapshot-create domain --disk-only ,patch works when qmp or hmp monitor accessible, Got trace below when issue cmd "snapshot-delete domain --snapshotname name",no "delvm/savevm" in qmp, only "delvm/savevm" commands in hmp.Is this for future compability? 2011-09-19 16:15:54.938: 25648: debug : qemuMonitorJSONIOProcessLine:115 : Line [{"id": "libvirt-11", "error": {"class": "CommandNotFound", "desc": "The command delvm has not been found", "data": {"name": "delvm"}}}] 2011-09-19 16:15:54.939: 25666: debug : virJSONValueToString:1071 : result={"execute":"human-monitor-command","arguments":{"command-line":"delvm \"1319011620\""},"id":"libvirt-12"} 2011-09-19 16:15:54.939: 25666: debug : qemuMonitorJSONCommandWithFd:224 : Send command '{"execute":"human-monitor-command","arguments":{"command-line":"delvm \"1319011620\""},"id":"libvirt-12"}' for write with FD -1

2 1

[libvirt] [PATCH] Replace virBufferAdd with virBufferAddLit for const string
by Daniel P. Berrange 19 Oct '11

19 Oct '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> The statement virBufferAdd(buf, "''", 2); triggers a syntax-check warning * src/util/buf.c: Replace virBufferAdd with virBufferAddLit --- src/util/buf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Pushed as a build-breaker fix diff --git a/src/util/buf.c b/src/util/buf.c index b7fcf6d..5893e11 100644 --- a/src/util/buf.c +++ b/src/util/buf.c @@ -520,7 +520,7 @@ virBufferEscapeShell(virBufferPtr buf, const char *str) return; } } else { - virBufferAdd(buf, "''", 2); + virBufferAddLit(buf, "''"); return; } -- 1.7.6.4

1 0

[libvirt] [PATCH] documentation: trivial spelling fix
by Philipp Hahn 19 Oct '11

19 Oct '11

Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- docs/formatdomain.html.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index c007dff..4a75026 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -778,7 +778,7 @@ The guest clock will have an arbitrary offset applied relative to UTC. The delta relative to UTC is specified in seconds, using the <code>adjustment</code> attribute. - The guest is free to adjust the RTC over time an expect + The guest is free to adjust the RTC over time and expect that it will be honoured at next reboot. This is in contrast to 'utc' mode, where the RTC adjustments are lost at each reboot. <span class="since">Since 0.7.7</span> -- 1.7.1

3 2

[libvirt] [PATCH 1/3] virBufferEscapeShell: Emit quotes for the empty string
by Guido Günther 19 Oct '11

19 Oct '11

Make the empty string return '' to match cmdEcho's behavior. --- src/util/buf.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/util/buf.c b/src/util/buf.c index f582cd2..b7fcf6d 100644 --- a/src/util/buf.c +++ b/src/util/buf.c @@ -507,15 +507,20 @@ virBufferEscapeShell(virBufferPtr buf, const char *str) return; /* Only quote if str includes shell metacharacters. */ - if (!strpbrk(str, "\r\t\n !\"#$&'()*;<>?[\\]^`{|}~")) { + if (*str && !strpbrk(str, "\r\t\n !\"#$&'()*;<>?[\\]^`{|}~")) { virBufferAdd(buf, str, -1); return; } - len = strlen(str); - if (xalloc_oversized(4, len) || - VIR_ALLOC_N(escaped, 4 * len + 3) < 0) { - virBufferSetError(buf); + if (*str) { + len = strlen(str); + if (xalloc_oversized(4, len) || + VIR_ALLOC_N(escaped, 4 * len + 3) < 0) { + virBufferSetError(buf); + return; + } + } else { + virBufferAdd(buf, "''", 2); return; } -- 1.7.6.3

2 2

[libvirt] [PATCH] snapshot: detect when qemu lacks disk-snapshot support
by Eric Blake 18 Oct '11

18 Oct '11

Noticed when testing new libvirt against old qemu that lacked the snapshot_blkdev HMP command. Libvirt was mistakenly treating the command as successful, and re-writing the domain XML to use the just-created 0-byte file, rendering the domain broken on restart. * src/qemu/qemu_monitor_text.c (qemuMonitorTextDiskSnapshot): Notice another possible error message. --- src/qemu/qemu_monitor_text.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 2f31d99..4774df9 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -3064,7 +3064,8 @@ qemuMonitorTextDiskSnapshot(qemuMonitorPtr mon, const char *device, goto cleanup; } - if (strstr(reply, "error while creating qcow2") != NULL) { + if (strstr(reply, "error while creating qcow2") != NULL || + strstr(reply, "unknown command:") != NULL) { qemuReportError(VIR_ERR_OPERATION_FAILED, _("Failed to take snapshot: %s"), reply); goto cleanup; -- 1.7.4.4

2 4

[libvirt] [PATCH 3/3] qemu: replace qemuMonitorEscapeShell by virBufferEscapeShell
by Guido Günther 18 Oct '11

18 Oct '11

--- src/qemu/qemu_monitor.c | 49 ++++------------------------------------------ src/qemu/qemu_monitor.h | 1 - 2 files changed, 5 insertions(+), 45 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index c9dd69e..182e63d 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -139,48 +139,6 @@ char *qemuMonitorEscapeArg(const char *in) return out; } -char *qemuMonitorEscapeShell(const char *in) -{ - int len = 2; /* leading and trailing single quote */ - int i, j; - char *out; - - for (i = 0; in[i] != '\0'; i++) { - switch(in[i]) { - case '\'': - len += 4; /* '\'' */ - break; - default: - len += 1; - break; - } - } - - if (VIR_ALLOC_N(out, len + 1) < 0) - return NULL; - - j = 0; - out[j++] = '\''; - for (i = 0; in[i] != '\0'; i++) { - switch(in[i]) { - case '\'': - out[j++] = '\''; - out[j++] = '\\'; - out[j++] = '\''; - out[j++] = '\''; - break; - default: - out[j++] = in[i]; - break; - } - } - out[j++] = '\''; - out[j] = '\0'; - - return out; -} - - #if DEBUG_RAW_IO # include <c-ctype.h> static char * qemuMonitorEscapeNonPrintable(const char *text) @@ -1734,6 +1692,7 @@ int qemuMonitorMigrateToFile(qemuMonitorPtr mon, char *dest = NULL; int ret = -1; char *safe_target = NULL; + virBuffer buf = VIR_BUFFER_INITIALIZER; VIR_DEBUG("mon=%p argv=%p target=%s offset=%llu flags=%x", mon, argv, target, offset, flags); @@ -1757,11 +1716,13 @@ int qemuMonitorMigrateToFile(qemuMonitorPtr mon, } /* Migrate to file */ - safe_target = qemuMonitorEscapeShell(target); - if (!safe_target) { + virBufferEscapeShell(&buf, target); + if (virBufferError(&buf)) { virReportOOMError(); + virBufferFreeAndReset(&buf); goto cleanup; } + safe_target = virBufferContentAndReset(&buf); /* Two dd processes, sharing the same stdout, are necessary to * allow starting at an alignment of 512, but without wasting diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 3ec78ad..90e7b45 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -127,7 +127,6 @@ struct _qemuMonitorCallbacks { char *qemuMonitorEscapeArg(const char *in); -char *qemuMonitorEscapeShell(const char *in); qemuMonitorPtr qemuMonitorOpen(virDomainObjPtr vm, virDomainChrSourceDefPtr config, -- 1.7.6.3

2 1

[libvirt] [PATCH 2/3] Use virBufferEscapeShell in cmdEcho
by Guido Günther 18 Oct '11

18 Oct '11

--- tools/virsh.c | 39 ++++++++++++++++++--------------------- 1 files changed, 18 insertions(+), 21 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 54684f6..d45baa6 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -12322,7 +12322,7 @@ static const vshCmdOptDef opts_echo[] = { * quotes for later evaluation. */ static bool -cmdEcho (vshControl *ctl ATTRIBUTE_UNUSED, const vshCmd *cmd) +cmdEcho (vshControl *ctl, const vshCmd *cmd) { bool shell = false; bool xml = false; @@ -12337,34 +12337,31 @@ cmdEcho (vshControl *ctl ATTRIBUTE_UNUSED, const vshCmd *cmd) xml = true; while ((opt = vshCommandOptArgv(cmd, opt))) { - bool close_quote = false; - char *q; + char *str; + virBuffer xmlbuf = VIR_BUFFER_INITIALIZER; arg = opt->data; + if (count) virBufferAddChar(&buf, ' '); - /* Add outer '' only if arg included shell metacharacters. */ - if (shell && - (strpbrk(arg, "\r\t\n !\"#$&'()*;<>?[\\]^`{|}~") || !*arg)) { - virBufferAddChar(&buf, '\''); - close_quote = true; - } + if (xml) { - virBufferEscapeString(&buf, "%s", arg); - } else { - if (shell && (q = strchr(arg, '\''))) { - do { - virBufferAdd(&buf, arg, q - arg); - virBufferAddLit(&buf, "'\\''"); - arg = q + 1; - q = strchr(arg, '\''); - } while (q); + virBufferEscapeString(&xmlbuf, "%s", arg); + if (virBufferError(&buf)) { + vshPrint(ctl, "%s", _("Failed to allocate XML buffer")); + return false; } - virBufferAdd(&buf, arg, strlen(arg)); + str = virBufferContentAndReset(&xmlbuf); + } else { + str = vshStrdup(ctl, arg); } - if (close_quote) - virBufferAddChar(&buf, '\''); + + if (shell) + virBufferEscapeShell(&buf, str); + else + virBufferAdd(&buf, str, -1); count++; + VIR_FREE(str); } if (virBufferError(&buf)) { -- 1.7.6.3

2 1

[libvirt] [PATCH] virNetSocketNewConnectSSH: Escape netcat path too
by Guido Günther 18 Oct '11

18 Oct '11

What holds for netcat is also true for the socket path since it can be part of the connection URI as well. Make both subject to the same amount of shell parsing. Cheers, -- Guido --- src/rpc/virnetsocket.c | 30 +++++++++++++++++++++--------- tests/virnetsockettest.c | 14 +++++++------- 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index e4eff49..d7a055f 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -612,9 +612,10 @@ int virNetSocketNewConnectSSH(const char *nodename, const char *path, virNetSocketPtr *retsock) { - char *quoted; + char *qnetcat, *qpath; virCommandPtr cmd; - virBuffer buf = VIR_BUFFER_INITIALIZER; + virBuffer ncbuf = VIR_BUFFER_INITIALIZER; + virBuffer pathbuf = VIR_BUFFER_INITIALIZER; *retsock = NULL; @@ -643,13 +644,23 @@ int virNetSocketNewConnectSSH(const char *nodename, virCommandAddArgList(cmd, nodename, "sh", "-c", NULL); - virBufferEscapeShell(&buf, netcat); - if (virBufferError(&buf)) { - virBufferFreeAndReset(&buf); + virBufferEscapeShell(&ncbuf, netcat); + if (virBufferError(&ncbuf)) { + virBufferFreeAndReset(&ncbuf); virReportOOMError(); return -1; } - quoted = virBufferContentAndReset(&buf); + + virBufferEscapeShell(&pathbuf, path); + if (virBufferError(&pathbuf)) { + virBufferFreeAndReset(&ncbuf); + virBufferFreeAndReset(&pathbuf); + virReportOOMError(); + return -1; + } + + qnetcat = virBufferContentAndReset(&ncbuf); + qpath = virBufferContentAndReset(&pathbuf); /* * This ugly thing is a shell script to detect availability of * the -q option for 'nc': debian and suse based distros need this @@ -666,10 +677,11 @@ int virNetSocketNewConnectSSH(const char *nodename, "else " "ARG=;" "fi;" - "'%s' $ARG -U %s'", - quoted, quoted, path); + "'%s' $ARG -U '%s", + qnetcat, qnetcat, qpath); - VIR_FREE(quoted); + VIR_FREE(qnetcat); + VIR_FREE(qpath); return virNetSocketNewConnectCommand(cmd, retsock); } diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c index 6320ce0..5c93f0f 100644 --- a/tests/virnetsockettest.c +++ b/tests/virnetsockettest.c @@ -501,7 +501,7 @@ mymain(void) "else " "ARG=;" "fi;" - "'nc' $ARG -U /tmp/socket'\n", + "'nc' $ARG -U '/tmp/socket\n", }; if (virtTestRun("SSH test 1", 1, testSocketSSH, &sshData1) < 0) ret = -1; @@ -520,7 +520,7 @@ mymain(void) "else " "ARG=;" "fi;" - "'netcat' $ARG -U /tmp/socket'\n", + "'netcat' $ARG -U '/tmp/socket\n", }; if (virtTestRun("SSH test 2", 1, testSocketSSH, &sshData2) < 0) ret = -1; @@ -539,7 +539,7 @@ mymain(void) "else " "ARG=;" "fi;" - "'netcat' $ARG -U /tmp/socket'\n", + "'netcat' $ARG -U '/tmp/socket\n", }; if (virtTestRun("SSH test 3", 1, testSocketSSH, &sshData3) < 0) ret = -1; @@ -561,7 +561,7 @@ mymain(void) "else " "ARG=;" "fi;" - "'nc' $ARG -U /tmp/socket'\n", + "'nc' $ARG -U '/tmp/socket\n", .dieEarly = true, }; if (virtTestRun("SSH test 5", 1, testSocketSSH, &sshData5) < 0) @@ -578,7 +578,7 @@ mymain(void) "else " "ARG=;" "fi;" - "'nc' $ARG -U /tmp/socket'\n", + "'nc' $ARG -U '/tmp/socket\n", }; if (virtTestRun("SSH test 6", 1, testSocketSSH, &sshData6) < 0) ret = -1; @@ -586,13 +586,13 @@ mymain(void) struct testSSHData sshData7 = { .nodename = "somehost", .netcat = "nc -4", - .path = "/tmp/socket", + .path = "/tmp/so cket", .expectOut = "somehost sh -c 'if ''nc -4'' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then " "ARG=-q0;" "else " "ARG=;" "fi;" - "''nc -4'' $ARG -U /tmp/socket'\n", + "''nc -4'' $ARG -U ''/tmp/so cket'\n", }; if (virtTestRun("SSH test 7", 1, testSocketSSH, &sshData7) < 0) ret = -1; -- 1.7.6.3

2 2

[libvirt] [PATCH 0/3] Consolidate shell escape functions
by Guido Günther 18 Oct '11

18 Oct '11

The attached patches use virBufferEscapeShell in virsh's virCmd and eliminate qemuMonitorEscapeShell so we have only one function that does the shell escaping. Cheers, -- Guido Guido Günther (3): virBufferEscapeShell: Emit quotes for the empty string Use virBufferEscapeShell in cmdEcho qemu: replace qemuMonitorEscapeShell by virBufferEscapeShell src/qemu/qemu_monitor.c | 49 ++++------------------------------------------ src/qemu/qemu_monitor.h | 1 - src/util/buf.c | 15 +++++++++---- tools/virsh.c | 39 +++++++++++++++++-------------------- 4 files changed, 33 insertions(+), 71 deletions(-) -- 1.7.6.3

1 0

[libvirt] [PATCH libvirt-snmp 0/3] fix problems found by coverity
by Laine Stump 18 Oct '11

18 Oct '11

These three problems were found by coverity during the run documented here: https://bugzilla.redhat.com/show_bug.cgi?id=732015 The three fixes are all very simple, but sufficiently unrelated (other than the method used for finding them) to warrant separate patches.

2 4

[libvirt] [PATCH] Allow for URI aliases when connecting to libvirt
by Daniel P. Berrange 18 Oct '11

18 Oct '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> I finally got fed up of typing URIs when using virsh.... This adds support for a libvirt client configuration file either /etc/libvirt/libvirt.conf for privileged clients, or $HOME/.libvirt/libvirt.conf for unprivileged clients. It allows one parameter uri_aliases = [ "hail=qemu+ssh://root@hail.cloud.example.com/system", "sleet=qemu+ssh://root@sleet.cloud.example.com/system", ] Any call to virConnectOpen with a non-NULL URI will first attempt to match against the uri_aliases list. An application can disable this by using VIR_CONNECT_NO_ALIASES * docs/uri.html.in: Document URI aliases * include/libvirt/libvirt.h.in: Add VIR_CONNECT_NO_ALIASES * libvirt.spec.in, mingw32-libvirt.spec.in: Add /etc/libvirt/libvirt.conf * src/Makefile.am: Install default config file * src/libvirt.c: Add support for URI aliases * src/remote/remote_driver.c: Don't try to handle URIs with no scheme and which clearly are not paths * src/util/conf.c: Don't raise error on virConfFree(NULL) * src/xen/xen_driver.c: Don't raise error on URIs with no scheme --- docs/uri.html.in | 101 ++++++++++++++------------- include/libvirt/libvirt.h.in | 3 +- libvirt.spec.in | 1 + mingw32-libvirt.spec.in | 2 + src/Makefile.am | 2 +- src/libvirt.c | 157 ++++++++++++++++++++++++++++++++++++++---- src/libvirt.conf | 13 ++++ src/remote/remote_driver.c | 5 ++ src/util/conf.c | 6 +- src/xen/xen_driver.c | 12 +--- 10 files changed, 223 insertions(+), 79 deletions(-) create mode 100644 src/libvirt.conf diff --git a/docs/uri.html.in b/docs/uri.html.in index e6326b2..5cc4dbf 100644 --- a/docs/uri.html.in +++ b/docs/uri.html.in @@ -2,6 +2,8 @@ <html> <body> <h1 >Connection URIs</h1> + + <ul id="toc"></ul> <p> Since libvirt supports many different kinds of virtualization (often referred to as "drivers" or "hypervisors"), we need a @@ -13,41 +15,44 @@ machine over the network. To this end, libvirt uses URIs as used on the Web and as defined in <a href="http://www.ietf.org/rfc/rfc2396.txt">RFC 2396</a>. This page documents libvirt URIs. </p> - <ul> - <li> - <a href="#URI_libvirt">Specifying URIs to libvirt</a> - </li> - <li> - <a href="#URI_virsh">Specifying URIs to virsh, virt-manager and virt-install</a> - </li> - <li> - <a href="#URI_xen">xen:/// URI</a> - </li> - <li> - <a href="#URI_qemu">qemu:///... QEMU and KVM URIs</a> - </li> - <li> - <a href="#URI_remote">Remote URIs</a> - </li> - <li> - <a href="#URI_test">test:///... Test URIs</a> - </li> - <li> - <a href="#URI_legacy">Other & legacy URI formats</a> - </li> - </ul> - <h3> - <a name="URI_libvirt">Specifying URIs to libvirt</a> - </h3> + <h2><a name="URI_libvirt">Specifying URIs to libvirt</a></h2> + <p> The URI is passed as the <code>name</code> parameter to <a href="html/libvirt-libvirt.html#virConnectOpen"><code>virConnectOpen</code></a> or <a href="html/libvirt-libvirt.html#virConnectOpenReadOnly"><code>virConnectOpenReadOnly</code></a>. For example: </p> <pre> virConnectPtr conn = virConnectOpenReadOnly (<b>"test:///default"</b>); </pre> - <h3> + <h2> + <a name="URI_config">Configuring URI aliases</a> + </h2> + + <p> +To simplify live for administrators, it is possible to setup URI aliases in a +libvirt client configuration file. The configuration file is <code>/etc/libvirt/libvirt.conf</code> +for the root user, or <code>$HOME/.libvirt/libvirt.conf</code> for any unprivileged user. +In this file, the following syntax can be used to setup aliases + </p> + +<pre> +uri_aliases = [ + "hail=qemu+ssh://root@hail.cloud.example.com/system", + "sleet=qemu+ssh://root@sleet.cloud.example.com/system", +] +</pre> + +<p> + A URI alias should be a string made up from the characters + <code>a-Z, 0-9, _, -</code>. Following the <code>=</code> + can be any libvirt URI string, including arbitrary URI parameters. + URI aliases will apply to any application opening a libvirt + connection, unless it has explicitly passed the <code>VIR_CONNECT_NO_ALIASES</code> + parameter to <code>virConnectOpenAuth</code>. +</p> + + <h2> <a name="URI_virsh">Specifying URIs to virsh, virt-manager and virt-install</a> - </h3> + </h2> <p> In virsh use the <code>-c</code> or <code>--connect</code> option: </p> @@ -76,9 +81,9 @@ In virt-install use the <code>--connect=</code><i>URI</i> option: <pre> virt-install <b>--connect=test:///default</b> <i>[other options]</i> </pre> - <h3> + <h2> <a name="URI_xen">xen:/// URI</a> - </h3> + </h2> <p> <i>This section describes a feature which is new in libvirt > 0.2.3. For libvirt ≤ 0.2.3 use <a href="#URI_legacy_xen"><code>"xen"</code></a>.</i> @@ -87,9 +92,9 @@ virt-install <b>--connect=test:///default</b> <i>[other options]</i> To access a Xen hypervisor running on the local machine use the URI <code>xen:///</code>. </p> - <h3> + <h2> <a name="URI_qemu">qemu:///... QEMU and KVM URIs</a> - </h3> + </h2> <p> To use QEMU support in libvirt you must be running the <code>libvirtd</code> daemon (named <code>libvirt_qemud</code> @@ -119,9 +124,9 @@ KVM URIs are identical. You select between qemu, qemu accelerated and KVM guests in the <a href="format.html#KVM1">guest XML as described here</a>. </p> - <h3> + <h2> <a name="URI_remote">Remote URIs</a> - </h3> + </h2> <p> Remote URIs are formed by taking ordinary local URIs and adding a hostname and/or transport name. As a special case, using a URI @@ -182,9 +187,9 @@ We refer you to <a href="remote.html#Remote_URI_reference">the libvirt remote URI reference</a> and <a href="remote.html">full documentation for libvirt remote support</a>. </p> - <h3> + <h2> <a name="URI_test">test:///... Test URIs</a> - </h3> + </h2> <p> The test driver is a dummy hypervisor for test purposes. The URIs supported are: @@ -196,12 +201,12 @@ host definitions built into the driver. </li> a set of host definitions held in the named file. </li> </ul> - <h3> + <h2> <a name="URI_legacy">Other & legacy URI formats</a> - </h3> - <h4> + </h2> + <h3> <a name="URI_NULL">NULL and empty string URIs</a> - </h4> + </h3> <p> Libvirt allows you to pass a <code>NULL</code> pointer to <code>virConnectOpen*</code>. Empty string (<code>""</code>) acts in @@ -223,9 +228,9 @@ the user to type a URI in directly (if that is appropriate). If your application wishes to connect specifically to a Xen hypervisor, then for future proofing it should choose a full <a href="#URI_xen"><code>xen:///</code> URI</a>. </p> - <h4> + <h3> <a name="URI_file">File paths (xend-unix-server)</a> - </h4> + </h3> <p> If XenD is running and configured in <code>/etc/xen/xend-config.sxp</code>: </p> @@ -240,9 +245,9 @@ using a file URI such as: <pre> virsh -c ///var/run/xend/xend-socket </pre> - <h4> + <h3> <a name="URI_http">Legacy: <code>http://...</code> (xend-http-server)</a> - </h4> + </h3> <p> If XenD is running and configured in <code>/etc/xen/xend-config.sxp</code>: @@ -276,17 +281,17 @@ Notes: libvirt, only the old-style sexpr interface known in the Xen documentation as "unix server" or "http server".</li> </ol> - <h4> + <h3> <a name="URI_legacy_xen">Legacy: <code>"xen"</code></a> - </h4> + </h3> <p> Another legacy URI is to specify name as the string <code>"xen"</code>. This will continue to refer to the Xen hypervisor. However you should prefer a full <a href="#URI_xen"><code>xen:///</code> URI</a> in all future code. </p> - <h4> + <h3> <a name="URI_legacy_proxy">Legacy: Xen proxy</a> - </h4> + </h3> <p> Libvirt continues to support connections to a separately running Xen proxy daemon. This provides a way to allow non-root users to make a diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index c991dfc..6bb27c7 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -843,7 +843,8 @@ typedef virNodeMemoryStats *virNodeMemoryStatsPtr; * Flags when opening a connection to a hypervisor */ typedef enum { - VIR_CONNECT_RO = 1, /* A readonly connection */ + VIR_CONNECT_RO = (1 << 0), /* A readonly connection */ + VIR_CONNECT_NO_ALIASES = (1 << 1), /* Don't try to resolve URI aliases */ } virConnectFlags; diff --git a/libvirt.spec.in b/libvirt.spec.in index 7c63710..d6f4564 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1085,6 +1085,7 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd %defattr(-, root, root) %doc AUTHORS ChangeLog.gz NEWS README COPYING.LIB TODO +%config(noreplace) %{_sysconfdir}/libvirt/libvirt.conf %{_mandir}/man1/virsh.1* %{_mandir}/man1/virt-xml-validate.1* %{_mandir}/man1/virt-pki-validate.1* diff --git a/mingw32-libvirt.spec.in b/mingw32-libvirt.spec.in index f651d11..f5e0d05 100644 --- a/mingw32-libvirt.spec.in +++ b/mingw32-libvirt.spec.in @@ -83,6 +83,8 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) +%config(noreplace) %{_mingw32_sysconfdir}/libvirt/libvirt.conf + %{_mingw32_bindir}/libvirt-0.dll %{_mingw32_bindir}/virsh.exe %{_mingw32_bindir}/virt-xml-validate diff --git a/src/Makefile.am b/src/Makefile.am index 302d395..fccc54d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -39,7 +39,7 @@ moddir = $(libdir)/libvirt/connection-driver mod_LTLIBRARIES = confdir = $(sysconfdir)/libvirt -conf_DATA = +conf_DATA = libvirt.conf augeasdir = $(datadir)/augeas/lenses augeas_DATA = diff --git a/src/libvirt.c b/src/libvirt.c index f07c720..c285e31 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -40,6 +40,7 @@ #include "memory.h" #include "configmake.h" #include "intprops.h" +#include "conf.h" #include "rpc/virnettlscontext.h" #ifndef WITH_DRIVER_MODULES @@ -968,6 +969,125 @@ error: return -1; } +static char * +virConnectConfigFile(void) +{ + char *path; + if (geteuid() == 0) { + if (virAsprintf(&path, "%s/libvirt/libvirt.conf", + SYSCONFDIR) < 0) + goto no_memory; + } else { + char *userdir = virGetUserDirectory(geteuid()); + if (!userdir) + goto error; + + if (virAsprintf(&path, "%s/.libvirt/libvirt.conf", + userdir) < 0) + goto no_memory; + } + + return path; + +no_memory: + virReportOOMError(); +error: + return NULL; +} + +static int +virConnectOpenFindURIAliasMatch(virConfValuePtr value, const char *alias, char **uri) +{ + virConfValuePtr entry; + if (value->type != VIR_CONF_LIST) { + virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Expected a list for 'uri_aliases' config parameter")); + return -1; + } + + entry = value->list; + while (entry) { + char *offset; + size_t safe; + + if (entry->type != VIR_CONF_STRING) { + virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Expected a string for 'uri_aliases' config parameter list entry")); + return -1; + } + + if (!(offset = strchr(entry->str, '='))) { + virLibConnError(VIR_ERR_INTERNAL_ERROR, + _("Malformed 'uri_aliases' config entry '%s', expected 'alias=uri://host/path'"), + entry->str); + return -1; + } + + safe = strspn(entry->str, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_-"); + if (safe < (offset - entry->str)) { + virLibConnError(VIR_ERR_INTERNAL_ERROR, + _("Malformed 'uri_aliases' config entry '%s', aliases may only container 'a-Z, 0-9, _, -'"), + entry->str); + return -1; + } + + if (STREQLEN(entry->str, alias, offset-entry->str)) { + VIR_DEBUG("Resolved alias '%s' to '%s'", + alias, offset+1); + if (!(*uri = strdup(offset+1))) { + virReportOOMError(); + return -1; + } + return 0; + } + + entry = entry->next; + } + + VIR_DEBUG("No alias found for '%s', passing through to drivers", + alias); + return 0; +} + +static int +virConnectOpenResolveURIAlias(const char *alias, char **uri) +{ + char *config = NULL; + int ret = -1; + virConfPtr conf = NULL; + virConfValuePtr value = NULL; + + *uri = NULL; + + /* Short circuit to avoid doing URI alias resolution + * when it clearly isn't an alias */ + if (strchr(alias, '/') || + strchr(alias, ':')) + return 0; + + if (!(config = virConnectConfigFile())) + goto cleanup; + + if (!virFileExists(config)) { + ret = 0; + goto cleanup; + } + + VIR_DEBUG("Loading config file '%s'", config); + if (!(conf = virConfReadFile(config, 0))) + goto cleanup; + + if ((value = virConfGetValue(conf, "uri_aliases"))) + ret = virConnectOpenFindURIAliasMatch(value, alias, uri); + else + ret = 0; + +cleanup: + virConfFree(conf); + VIR_FREE(config); + return ret; +} + static virConnectPtr do_open (const char *name, virConnectAuthPtr auth, @@ -998,6 +1118,7 @@ do_open (const char *name, } if (name) { + char *alias = NULL; /* Convert xen -> xen:/// for back compat */ if (STRCASEEQ(name, "xen")) name = "xen:///"; @@ -1008,26 +1129,34 @@ do_open (const char *name, if (STREQ (name, "xen://")) name = "xen:///"; - ret->uri = xmlParseURI (name); + if (!(flags & VIR_CONNECT_NO_ALIASES) && + virConnectOpenResolveURIAlias(name, &alias) < 0) + goto failed; + + ret->uri = xmlParseURI (alias ? alias : name); if (!ret->uri) { virLibConnError(VIR_ERR_INVALID_ARG, - _("could not parse connection URI")); + _("could not parse connection URI %s"), + alias ? alias : name); + VIR_FREE(alias); goto failed; } VIR_DEBUG("name \"%s\" to URI components:\n" - " scheme %s\n" - " opaque %s\n" - " authority %s\n" - " server %s\n" - " user %s\n" - " port %d\n" - " path %s\n", - name, - NULLSTR(ret->uri->scheme), NULLSTR(ret->uri->opaque), - NULLSTR(ret->uri->authority), NULLSTR(ret->uri->server), - NULLSTR(ret->uri->user), ret->uri->port, - NULLSTR(ret->uri->path)); + " scheme %s\n" + " opaque %s\n" + " authority %s\n" + " server %s\n" + " user %s\n" + " port %d\n" + " path %s\n", + alias ? alias : name, + NULLSTR(ret->uri->scheme), NULLSTR(ret->uri->opaque), + NULLSTR(ret->uri->authority), NULLSTR(ret->uri->server), + NULLSTR(ret->uri->user), ret->uri->port, + NULLSTR(ret->uri->path)); + + VIR_FREE(alias); } else { VIR_DEBUG("no name, allowing driver auto-select"); } diff --git a/src/libvirt.conf b/src/libvirt.conf new file mode 100644 index 0000000..ffe8c21 --- /dev/null +++ b/src/libvirt.conf @@ -0,0 +1,13 @@ + +# +# This can be used to setup URI aliases for frequently +# used connection URIs. Aliases may contain only the +# characters a-Z, 0-9, _, -. +# +# Following the '=' may be any valid libvirt connection +# URI, including arbitrary parameters + +#uri_aliases = [ +# "hail=qemu+ssh://root@hail.cloud.example.com/system", +# "sleet=qemu+ssh://root@sleet.cloud.example.com/system", +#] diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 4dc6974..1dea327 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -313,6 +313,11 @@ doRemoteOpen (virConnectPtr conn, if (conn->uri) { if (!conn->uri->scheme) { /* This is the ///var/lib/xen/xend-socket local path style */ + if (!conn->uri->path) + return VIR_DRV_OPEN_DECLINED; + if (conn->uri->path[0] != '/') + return VIR_DRV_OPEN_DECLINED; + transport = trans_unix; } else { transport_str = get_transport_from_scheme (conn->uri->scheme); diff --git a/src/util/conf.c b/src/util/conf.c index 00045b5..c8dcc7f 100644 --- a/src/util/conf.c +++ b/src/util/conf.c @@ -808,10 +808,8 @@ int virConfFree(virConfPtr conf) { virConfEntryPtr tmp; - if (conf == NULL) { - virConfError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); - return(-1); - } + if (conf == NULL) + return 0; tmp = conf->entries; while (tmp) { diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index 9c96fca..0a2267d 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -296,17 +296,7 @@ xenUnifiedOpen (virConnectPtr conn, virConnectAuthPtr auth, unsigned int flags) conn->uri->server) return VIR_DRV_OPEN_DECLINED; } else { - /* Special case URI for Xen driver only: - * - * Treat a plain path as a Xen UNIX socket path, and give - * error unless path is absolute - */ - if (!conn->uri->path || conn->uri->path[0] != '/') { - xenUnifiedError(VIR_ERR_INTERNAL_ERROR, - _("unexpected Xen URI path '%s', try ///var/lib/xen/xend-socket"), - NULLSTR(conn->uri->path)); - return VIR_DRV_OPEN_ERROR; - } + return VIR_DRV_OPEN_DECLINED; } } -- 1.7.6.4

2 2

[libvirt] [PATCH] Add AHCI support to qemu driver
by Jim Fehlig 18 Oct '11

18 Oct '11

Tested with multiple AHCI controllers and multiple disks attached to a controller. E.g., <disk type='file' device='disk'> <driver name='qemu' type='raw'/> <source file='/var/lib/libvirt/images/test/disk0.raw'/> <target dev='sda' bus='sata'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> <disk type='file' device='disk'> <driver name='qemu' type='raw'/> <source file='/var/lib/libvirt/images/test/disk1.raw'/> <target dev='sdb' bus='sata'/> <address type='drive' controller='0' bus='0' unit='1'/> </disk> <disk type='file' device='disk'> <driver name='qemu' type='raw'/> <source file='/var/lib/libvirt/images/test/disk2.raw'/> <target dev='sdc' bus='sata'/> <address type='drive' controller='1' bus='0' unit='0'/> </disk> <controller type='sata' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </controller> <controller type='sata' index='1'> <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> </controller> --- docs/formatdomain.html.in | 9 +++-- docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 14 +++++++++ src/qemu/qemu_capabilities.c | 3 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 30 ++++++++++++++++---- .../qemuxml2argv-disk-sata-device.args | 6 ++++ .../qemuxml2argv-disk-sata-device.xml | 25 ++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ 9 files changed, 82 insertions(+), 10 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 3087d01..b6a0c66 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -972,11 +972,12 @@ as a device ordering hint. The optional <code>bus</code> attribute specifies the type of disk device to emulate; possible values are driver specific, with typical values being - "ide", "scsi", "virtio", "xen" or "usb". If omitted, the bus type is - inferred from the style of the device name. eg, a device named 'sda' - will typically be exported using a SCSI bus. + "ide", "scsi", "virtio", "xen", "usb" or "sata". If omitted, the bus + type is inferred from the style of the device name. eg, a device named + 'sda' will typically be exported using a SCSI bus. <span class="since">Since 0.0.3; <code>bus</code> attribute since 0.4.3; - "usb" attribute value since after 0.4.4</span></dd> + "usb" attribute value since after 0.4.4; "sata" attribute value since + 0.9.7</span></dd> <dt><code>driver</code></dt> <dd> The optional driver element allows specifying further details diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index be98be0..675d55d 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -790,6 +790,7 @@ <value>xen</value> <value>usb</value> <value>uml</value> + <value>sata</value> </choice> </attribute> </optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a918679..6a7f296 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2157,6 +2157,15 @@ virDomainDiskDefAssignAddress(virCapsPtr caps, virDomainDiskDefPtr def) def->info.addr.drive.unit = (idx % 2); break; + case VIR_DOMAIN_DISK_BUS_SATA: + /* For SATA we define the default mapping to be 6 units + * per bus, 1 bus per controller, many controllers */ + def->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE; + def->info.addr.drive.controller = idx / 6; + def->info.addr.drive.bus = 0; + def->info.addr.drive.unit = idx % 6; + break; + case VIR_DOMAIN_DISK_BUS_FDC: /* For FDC we define the default mapping to be 2 units * per bus, 1 bus per controller, many controllers */ @@ -8675,6 +8684,11 @@ int virDomainDefAddImplicitControllers(virDomainDefPtr def) VIR_DOMAIN_DISK_BUS_IDE) < 0) return -1; + if (virDomainDefAddDiskControllersForType(def, + VIR_DOMAIN_CONTROLLER_TYPE_SATA, + VIR_DOMAIN_DISK_BUS_SATA) < 0) + return -1; + if (virDomainDefMaybeAddVirtioSerialController(def) < 0) return -1; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 8e20e3f..7122756 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -139,6 +139,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "no-shutdown", "cache-unsafe", /* 75 */ + "ich9-ahci", ); struct qemu_feature_flags { @@ -1241,6 +1242,8 @@ qemuCapsParseDeviceStr(const char *str, virBitmapPtr flags) qemuCapsSet(flags, QEMU_CAPS_USB_REDIR); if (strstr(str, "name \"usb-hub\"")) qemuCapsSet(flags, QEMU_CAPS_USB_HUB); + if (strstr(str, "name \"ich9-ahci\"")) + qemuCapsSet(flags, QEMU_CAPS_ICH9_AHCI); /* Prefer -chardev spicevmc (detected earlier) over -device spicevmc */ if (!qemuCapsGet(flags, QEMU_CAPS_CHARDEV_SPICEVMC) && diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index ae3de90..1e23451 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -113,6 +113,7 @@ enum qemuCapsFlags { QEMU_CAPS_NO_SHUTDOWN = 74, /* usable -no-shutdown */ QEMU_CAPS_DRIVE_CACHE_UNSAFE = 75, /* Is cache=unsafe supported? */ + QEMU_CAPS_ICH9_AHCI = 76, /* -device ich9-ahci */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9174a5f..6d6e67d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1702,6 +1702,12 @@ qemuBuildDriveDevStr(virDomainDiskDefPtr disk, disk->info.addr.drive.bus, disk->info.addr.drive.unit); break; + case VIR_DOMAIN_DISK_BUS_SATA: + virBufferAddLit(&opt, "ide-drive"); + virBufferAsprintf(&opt, ",bus=ahci%d.%d", + disk->info.addr.drive.controller, + disk->info.addr.drive.unit); + break; case VIR_DOMAIN_DISK_BUS_VIRTIO: virBufferAddLit(&opt, "virtio-blk-pci"); qemuBuildIoEventFdStr(&opt, disk->ioeventfd, qemuCaps); @@ -1902,6 +1908,10 @@ qemuBuildControllerDevStr(virDomainControllerDefPtr def, virBufferAsprintf(&buf, "usb-ccid,id=ccid%d", def->idx); break; + case VIR_DOMAIN_CONTROLLER_TYPE_SATA: + virBufferAsprintf(&buf, "ahci,id=ahci%d", def->idx); + break; + case VIR_DOMAIN_CONTROLLER_TYPE_USB: if (qemuBuildUSBControllerDevStr(def, qemuCaps, &buf) == -1) goto error; @@ -3683,14 +3693,22 @@ qemuBuildCommandLine(virConnectPtr conn, cont->type == VIR_DOMAIN_CONTROLLER_TYPE_FDC) continue; - /* QEMU doesn't implement a SATA driver */ + /* Only recent QEMU implements a SATA (AHCI) controller */ if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_SATA) { - qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, - "%s", _("SATA is not supported with this QEMU binary")); - goto error; - } + if (!qemuCapsGet(qemuCaps, QEMU_CAPS_ICH9_AHCI)) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", _("SATA is not supported with this QEMU binary")); + goto error; + } else { + char *devstr; - if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_USB && + virCommandAddArg(cmd, "-device"); + if (!(devstr = qemuBuildControllerDevStr(cont, qemuCaps, NULL))) + goto error; + + virCommandAddArg(cmd, devstr); + } + } else if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_USB && def->controllers[i]->model == -1 && !qemuCapsGet(qemuCaps, QEMU_CAPS_PIIX3_USB_UHCI)) { if (usblegacy) { diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args new file mode 100644 index 0000000..9908da6 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args @@ -0,0 +1,6 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ +pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor \ +unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -device ahci,id=ahci0,\ +bus=pci.0,addr=0x3 -drive file=/dev/HostVG/QEMUGuest1,if=none,\ +id=drive-sata0-0-0 -device ide-drive,bus=ahci0.0,drive=drive-sata0-0-0,\ +id=sata0-0-0 -usb -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.xml new file mode 100644 index 0000000..68a14f2 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.xml @@ -0,0 +1,25 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219136</memory> + <currentMemory>219136</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='sda' bus='sata'/> + <address type='drive' controller='0' bus='0' unit='0'/> + </disk> + <controller type='sata' index='0'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 9e174b3..f298d37 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -359,6 +359,9 @@ mymain(void) QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); DO_TEST("disk-scsi-device-auto", false, QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); + DO_TEST("disk-sata-device", false, + QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_ICH9_AHCI); DO_TEST("disk-aio", false, QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_AIO, QEMU_CAPS_DRIVE_CACHE_V2, QEMU_CAPS_DRIVE_FORMAT); -- 1.7.5.4

4 9

[libvirt] [RFC] Use libssh2 for ssh transport instead of forking ssh process.
by Peter Krempa 18 Oct '11

18 Oct '11

The current state of the ssh transport involves starting the ssh client process (command ssh) that communicates using pipes and a socked with the libvirt client. Thereafter it behaves as a standard virNetSocket. This configuration has some drawbacks, but changing the ssh transport to libssh2 could break some users configurations. My concern is, that someone might be using advanced configurations of ssh done via the ssh config file, and removing this "old" way to do it would break it. Libssh2 does not use any configuration files, but is configured using the API. The URI scheme we are using now allows to specify configuration of the transport layer using parameters. In my opinion, this would be a nice way how to set configs on a per-connection basis, but would not take into account default configurations the users are familiar with, while using ssh. Advantages of using libssh2: - no need to spawn external process and comunicate through pipes (with all scheduling benefits) - multi platform support (should provide ssh support on m$ windows) - allow to configure transport connection using the uri - use auth callbacks to query for passwords/passphrases (no ssh-askpass) - control over error messages - nicely integrates with virNetSocket, as open socket must be provided to libssh2 to work on. Disadvantages: - break configurations for users that use advanced ssh configurations in the ssh client config file Possible implementation options: 1.) Add libssh2 support as a new transport option ( qemu+libssh2://user@host/system ) 2.) Use libssh2 as the default ssh transport provider and move old ssh stuff to a new transport option ( qemu+cmdssh://user@host/system, or similar) 3.) Drop old ssh completly and get mauled by users :/ 4.) Leave it in current state. 5.) Add the choice on compile time. I think, that the most favourable option is 2.) as it retains the old way for users that have configured it to work for them, and adding some letters to the uri would be less painfull for them and at the same time prefers the new api for new configurations as the default. Option 1) includes the risk, that tie change to the new api would be ignored, as nearly everybody would not care about changing their URIs even if it would not break anything. The two other options (not counting leaving it as-is) are really bad in my opinion. I'd like to have your opinions on changing the ssh transport provider. Thanks. Peter

3 2

[libvirt] [PATCH] virBufferEscapeShell: Fix escaping of single quotes.
by Guido Günther 18 Oct '11

18 Oct '11

When checking if we need to escape a single quote we were looking at the character after the quote instead of at the quote itself. --- src/util/buf.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/buf.c b/src/util/buf.c index 7dd9852..2d9499a 100644 --- a/src/util/buf.c +++ b/src/util/buf.c @@ -524,13 +524,13 @@ virBufferEscapeShell(virBufferPtr buf, const char *str) *out++ = '\''; while (*cur != 0) { - *out++ = *cur++; if (*cur == '\'') { + *out++ = '\''; /* Replace literal ' with a close ', a \', and a open ' */ *out++ = '\\'; *out++ = '\''; - *out++ = '\''; } + *out++ = *cur++; } *out++ = '\''; *out = 0; -- 1.7.6.3

2 2

[libvirt] Compiler warnings
by Alex Jia 18 Oct '11

18 Oct '11

Hi all, I meet the following compiler warnings today: ...... CC libvirt_util_la-buf.lo util/buf.c: In function 'virBufferEscape': util/buf.c:430: warning: logical '&&' with non-zero constant will always evaluate as true [-Wlogical-op] CC libvirt_util_la-command.lo ...... CC libvirt_lxc-buf.o util/buf.c: In function 'virBufferEscape': util/buf.c:430: warning: logical '&&' with non-zero constant will always evaluate as true [-Wlogical-op] CC libvirt_lxc-command.o ...... Has anybody the same experience? Thanks, Alex

4 13

[libvirt] [PATCH] compile: Add a missing function 'pciDeviceListFind' to libvirt_private.syms
by Xu He Jie 18 Oct '11

18 Oct '11

compile error: ../src/.libs/libvirt_driver_qemu.a(libvirt_driver_qemu_la-qemu_hostdev.o): In function `qemuPrepareHostdevPCIDevices': /home/soulxu/data/work-code/libvirt/src/qemu/qemu_hostdev.c:183: undefined reference to `pciDeviceListFind' /home/soulxu/data/work-code/libvirt/src/qemu/qemu_hostdev.c:230: undefined reference to `pciDeviceListFind' ../src/.libs/libvirt_driver_qemu.a(libvirt_driver_qemu_la-qemu_hostdev.o): In function `qemuGetActivePciHostDeviceList': /home/soulxu/data/work-code/libvirt/src/qemu/qemu_hostdev.c:102: undefined reference to `pciDeviceListFind' ../src/.libs/libvirt_driver_qemu.a(libvirt_driver_qemu_la-qemu_hostdev.o): In function `qemuDomainReAttachHostdevDevices': /home/soulxu/data/work-code/libvirt/src/qemu/qemu_hostdev.c:370: undefined reference to `pciDeviceListFind' Signed-off-by: Xu He Jie <xuhj(a)linux.vnet.ibm.com> --- src/libvirt_private.syms | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 1e03e33..61f4dc4 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -892,6 +892,7 @@ pciDeviceListFree; pciDeviceListGet; pciDeviceListNew; pciDeviceListSteal; +pciDeviceListFind; pciDeviceNetName; pciDeviceReAttachInit; pciDeviceSetManaged; -- 1.7.4.1

3 3

[libvirt] [PATCH] qemu: Relax -no-shutdown check to [0.14.0, 0.15.0]
by Jiri Denemark 18 Oct '11

18 Oct '11

The patch that fixes SIGTERM handling with -no-shutdown was taken into 0.15.1 stable release of qemu. --- src/qemu/qemu_capabilities.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 8f16a49..2f55000 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1018,9 +1018,9 @@ qemuCapsComputeCmdFlags(const char *help, /* Do not use -no-shutdown if qemu doesn't support it or SIGTERM handling * is most likely buggy when used with -no-shutdown (which applies for qemu - * 0.14.* and <0.15.50) + * 0.14.* and 0.15.0) */ - if (strstr(help, "-no-shutdown") && (version < 14000 || version >= 15050)) + if (strstr(help, "-no-shutdown") && (version < 14000 || version > 15000)) qemuCapsSet(flags, QEMU_CAPS_NO_SHUTDOWN); /* -- 1.7.7

2 2

[libvirt] [PATCH] Fix VPATH build
by Jiri Denemark 18 Oct '11

18 Oct '11

probes.h is generated in build directory; setting a dependency on probes.h from source directory doesn't work well in VPATH builds. Caused by commit 1afcfbdda0cac112faa61f74ec943e46aa43f2f5 --- src/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 510e5ef..87d91ed 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -191,7 +191,7 @@ REMOTE_DRIVER_GENERATED = \ # The remote RPC driver needs probes.h if WITH_DTRACE -REMOTE_DRIVER_GENERATED += $(srcdir)/probes.h +REMOTE_DRIVER_GENERATED += probes.h endif REMOTE_PROTOCOL = $(srcdir)/remote/remote_protocol.x -- 1.7.7

2 2

[libvirt] [PATCH] qemu: Honor the original properties of PCI device when detaching
by Osier Yang 18 Oct '11

18 Oct '11

This patch fixes two problems: 1) The device will be reattached to host even if it's not managed, as there is a "pciDeviceSetManaged". 2) The device won't be reattached to host with original driver properly. As it doesn't honor the device original properties which are maintained by driver->activePciHostdevs. --- src/qemu/qemu_hotplug.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index bfa524b..f3f0060 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1956,6 +1956,7 @@ int qemuDomainDetachHostPciDevice(struct qemud_driver *driver, qemuDomainObjPrivatePtr priv = vm->privateData; int i, ret; pciDevice *pci; + pciDevice *activePci; for (i = 0 ; i < vm->def->nhostdevs ; i++) { if (vm->def->hostdevs[i]->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS || @@ -2015,16 +2016,15 @@ int qemuDomainDetachHostPciDevice(struct qemud_driver *driver, detach->source.subsys.u.pci.bus, detach->source.subsys.u.pci.slot, detach->source.subsys.u.pci.function); - if (!pci) - ret = -1; - else { - pciDeviceSetManaged(pci, detach->managed); - pciDeviceListDel(driver->activePciHostdevs, pci); - if (pciResetDevice(pci, driver->activePciHostdevs, NULL) < 0) + if (pci) { + activePci = pciDeviceListSteal(driver->activePciHostdevs, pci); + if (pciResetDevice(activePci, driver->activePciHostdevs, NULL) < 0) ret = -1; - pciDeviceReAttachInit(pci); - qemuReattachPciDevice(pci, driver); + qemuReattachPciDevice(activePci, driver); pciFreeDevice(pci); + pciFreeDevice(activePci); + } else { + ret = -1; } if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE) && -- 1.7.6

2 2

[libvirt] [PATCH] qemu: Do not wait if the PCI device is not managed when reattaching
by Osier Yang 18 Oct '11

18 Oct '11

Waiting for qemu-kvm cleaning up the PCI bar(s) mapping with long time while the device is not managed is just waste of time. --- src/qemu/qemu_hostdev.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index c65f6f5..1fb373e 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -322,19 +322,20 @@ void qemuReattachPciDevice(pciDevice *dev, struct qemud_driver *driver) { int retries = 100; + if (!pciDeviceGetManaged(dev)) + return; + while (pciWaitForDeviceCleanup(dev, "kvm_assigned_device") && retries) { usleep(100*1000); retries--; } - if (pciDeviceGetManaged(dev)) { - if (pciReAttachDevice(dev, driver->activePciHostdevs) < 0) { - virErrorPtr err = virGetLastError(); - VIR_ERROR(_("Failed to re-attach PCI device: %s"), - err ? err->message : _("unknown error")); - virResetError(err); - } + if (pciReAttachDevice(dev, driver->activePciHostdevs) < 0) { + virErrorPtr err = virGetLastError(); + VIR_ERROR(_("Failed to re-attach PCI device: %s"), + err ? err->message : _("unknown error")); + virResetError(err); } } -- 1.7.6

2 2

[libvirt] [PATCH] Add support for autodestroy of guests to the LXC and UML drivers
by Daniel P. Berrange 17 Oct '11

17 Oct '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> I wrote this months ago and thought I had already submitted/merged it. Obviously not. I need this for the virt sandbox tools asap. We recently added support for VIR_DOMAIN_START_AUTODESTROY and an impl to the QEMU driver. It is very desirable to support in other drivers, so this adds it to LXC and UML * src/lxc/lxc_conf.h, src/lxc/lxc_driver.c, src/uml/uml_conf.h, src/uml/uml_driver.c: Wire up autodestroy functions --- src/lxc/lxc_conf.h | 5 ++ src/lxc/lxc_driver.c | 140 +++++++++++++++++++++++++++++++++++++++++-- src/uml/uml_conf.h | 6 ++ src/uml/uml_driver.c | 164 +++++++++++++++++++++++++++++++++++++++++++------- 4 files changed, 289 insertions(+), 26 deletions(-) diff --git a/src/lxc/lxc_conf.h b/src/lxc/lxc_conf.h index 66aa469..b124330 100644 --- a/src/lxc/lxc_conf.h +++ b/src/lxc/lxc_conf.h @@ -56,6 +56,11 @@ struct __lxc_driver { int have_netns; virDomainEventStatePtr domainEventState; + + /* Mapping of 'char *uuidstr' -> virConnectPtr + * of guests which will be automatically killed + * when the virConnectPtr is closed*/ + virHashTablePtr autodestroy; }; int lxcLoadDriverConfig(lxc_driver_t *driver); diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index c475887..f08e8d1 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -110,6 +110,19 @@ static void lxcDomainEventFlush(int timer, void *opaque); static void lxcDomainEventQueue(lxc_driver_t *driver, virDomainEventPtr event); +static int lxcVmTerminate(lxc_driver_t *driver, + virDomainObjPtr vm, + virDomainShutoffReason reason); +static int lxcProcessAutoDestroyInit(lxc_driver_t *driver); +static void lxcProcessAutoDestroyRun(lxc_driver_t *driver, + virConnectPtr conn); +static void lxcProcessAutoDestroyShutdown(lxc_driver_t *driver); +static int lxcProcessAutoDestroyAdd(lxc_driver_t *driver, + virDomainObjPtr vm, + virConnectPtr conn); +static int lxcProcessAutoDestroyRemove(lxc_driver_t *driver, + virDomainObjPtr vm); + static virDrvOpenStatus lxcOpen(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED, @@ -165,6 +178,7 @@ static int lxcClose(virConnectPtr conn) lxcDriverLock(driver); virDomainEventCallbackListRemoveConn(conn, driver->domainEventState->callbacks); + lxcProcessAutoDestroyRun(driver, conn); lxcDriverUnlock(driver); conn->privateData = NULL; @@ -1001,6 +1015,104 @@ cleanup: } +static int lxcProcessAutoDestroyInit(lxc_driver_t *driver) +{ + if (!(driver->autodestroy = virHashCreate(5, NULL))) + return -1; + + return 0; +} + +struct lxcProcessAutoDestroyData { + lxc_driver_t *driver; + virConnectPtr conn; +}; + +static void lxcProcessAutoDestroyDom(void *payload, + const void *name, + void *opaque) +{ + struct lxcProcessAutoDestroyData *data = opaque; + virConnectPtr conn = payload; + const char *uuidstr = name; + unsigned char uuid[VIR_UUID_BUFLEN]; + virDomainObjPtr dom; + virDomainEventPtr event = NULL; + + VIR_DEBUG("conn=%p uuidstr=%s thisconn=%p", conn, uuidstr, data->conn); + + if (data->conn != conn) + return; + + if (virUUIDParse(uuidstr, uuid) < 0) { + VIR_WARN("Failed to parse %s", uuidstr); + return; + } + + if (!(dom = virDomainFindByUUID(&data->driver->domains, + uuid))) { + VIR_DEBUG("No domain object to kill"); + return; + } + + VIR_DEBUG("Killing domain"); + lxcVmTerminate(data->driver, dom, VIR_DOMAIN_SHUTOFF_DESTROYED); + virDomainAuditStop(dom, "destroyed"); + event = virDomainEventNewFromObj(dom, + VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_DESTROYED); + + if (dom && !dom->persistent) + virDomainRemoveInactive(&data->driver->domains, dom); + + if (dom) + virDomainObjUnlock(dom); + if (event) + lxcDomainEventQueue(data->driver, event); + virHashRemoveEntry(data->driver->autodestroy, uuidstr); +} + +/* + * Precondition: driver is locked + */ +static void lxcProcessAutoDestroyRun(lxc_driver_t *driver, virConnectPtr conn) +{ + struct lxcProcessAutoDestroyData data = { + driver, conn + }; + VIR_DEBUG("conn=%p", conn); + virHashForEach(driver->autodestroy, lxcProcessAutoDestroyDom, &data); +} + +static void lxcProcessAutoDestroyShutdown(lxc_driver_t *driver) +{ + virHashFree(driver->autodestroy); +} + +static int lxcProcessAutoDestroyAdd(lxc_driver_t *driver, + virDomainObjPtr vm, + virConnectPtr conn) +{ + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(vm->def->uuid, uuidstr); + VIR_DEBUG("vm=%s uuid=%s conn=%p", vm->def->name, uuidstr, conn); + if (virHashAddEntry(driver->autodestroy, uuidstr, conn) < 0) + return -1; + return 0; +} + +static int lxcProcessAutoDestroyRemove(lxc_driver_t *driver, + virDomainObjPtr vm) +{ + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(vm->def->uuid, uuidstr); + VIR_DEBUG("vm=%s uuid=%s", vm->def->name, uuidstr); + if (virHashRemoveEntry(driver->autodestroy, uuidstr) < 0) + return -1; + return 0; +} + + /** * lxcVmCleanup: * @driver: pointer to driver structure @@ -1028,6 +1140,9 @@ static void lxcVmCleanup(lxc_driver_t *driver, VIR_FREE(xml); } + /* Stop autodestroy in case guest is restarted */ + lxcProcessAutoDestroyRemove(driver, vm); + virEventRemoveHandle(priv->monitorWatch); VIR_FORCE_CLOSE(priv->monitor); @@ -1496,6 +1611,7 @@ cleanup: * @conn: pointer to connection * @driver: pointer to driver structure * @vm: pointer to virtual machine structure + * @autoDestroy: mark the domain for auto destruction * @reason: reason for switching vm to running state * * Starts a vm @@ -1505,6 +1621,7 @@ cleanup: static int lxcVmStart(virConnectPtr conn, lxc_driver_t * driver, virDomainObjPtr vm, + bool autoDestroy, virDomainRunningReason reason) { int rc = -1, r; @@ -1665,6 +1782,10 @@ static int lxcVmStart(virConnectPtr conn, goto cleanup; } + if (autoDestroy && + lxcProcessAutoDestroyAdd(driver, vm, conn) < 0) + goto cleanup; + /* * Again, need to save the live configuration, because the function * requires vm->def->id != -1 to save tty info surely. @@ -1719,7 +1840,7 @@ static int lxcDomainStartWithFlags(virDomainPtr dom, unsigned int flags) virDomainEventPtr event = NULL; int ret = -1; - virCheckFlags(0, -1); + virCheckFlags(VIR_DOMAIN_START_AUTODESTROY, -1); lxcDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, dom->uuid); @@ -1743,7 +1864,9 @@ static int lxcDomainStartWithFlags(virDomainPtr dom, unsigned int flags) goto cleanup; } - ret = lxcVmStart(dom->conn, driver, vm, VIR_DOMAIN_RUNNING_BOOTED); + ret = lxcVmStart(dom->conn, driver, vm, + (flags & VIR_DOMAIN_START_AUTODESTROY), + VIR_DOMAIN_RUNNING_BOOTED); if (ret == 0) { event = virDomainEventNewFromObj(vm, @@ -1796,7 +1919,7 @@ lxcDomainCreateAndStart(virConnectPtr conn, virDomainPtr dom = NULL; virDomainEventPtr event = NULL; - virCheckFlags(0, NULL); + virCheckFlags(VIR_DOMAIN_START_AUTODESTROY, NULL); lxcDriverLock(driver); if (!(def = virDomainDefParseString(driver->caps, xml, @@ -1819,7 +1942,9 @@ lxcDomainCreateAndStart(virConnectPtr conn, goto cleanup; def = NULL; - if (lxcVmStart(conn, driver, vm, VIR_DOMAIN_RUNNING_BOOTED) < 0) { + if (lxcVmStart(conn, driver, vm, + (flags & VIR_DOMAIN_START_AUTODESTROY), + VIR_DOMAIN_RUNNING_BOOTED) < 0) { virDomainAuditStart(vm, "booted", false); virDomainRemoveInactive(&driver->domains, vm); vm = NULL; @@ -2054,7 +2179,7 @@ lxcAutostartDomain(void *payload, const void *name ATTRIBUTE_UNUSED, void *opaqu virDomainObjLock(vm); if (vm->autostart && !virDomainObjIsActive(vm)) { - int ret = lxcVmStart(data->conn, data->driver, vm, + int ret = lxcVmStart(data->conn, data->driver, vm, false, VIR_DOMAIN_RUNNING_BOOTED); virDomainAuditStart(vm, "booted", ret >= 0); if (ret < 0) { @@ -2205,6 +2330,9 @@ static int lxcStartup(int privileged) lxc_driver->caps->privateDataAllocFunc = lxcDomainObjPrivateAlloc; lxc_driver->caps->privateDataFreeFunc = lxcDomainObjPrivateFree; + if (lxcProcessAutoDestroyInit(lxc_driver) < 0) + goto cleanup; + /* Get all the running persistent or transient configs first */ if (virDomainLoadAllConfigs(lxc_driver->caps, &lxc_driver->domains, @@ -2285,6 +2413,8 @@ static int lxcShutdown(void) virDomainObjListDeinit(&lxc_driver->domains); virDomainEventStateFree(lxc_driver->domainEventState); + lxcProcessAutoDestroyShutdown(lxc_driver); + virCapabilitiesFree(lxc_driver->caps); VIR_FREE(lxc_driver->configDir); VIR_FREE(lxc_driver->autostartDir); diff --git a/src/uml/uml_conf.h b/src/uml/uml_conf.h index 5401a7e..657f877 100644 --- a/src/uml/uml_conf.h +++ b/src/uml/uml_conf.h @@ -33,6 +33,7 @@ # include "virterror_internal.h" # include "threads.h" # include "command.h" +# include "hash.h" # define umlDebug(fmt, ...) do {} while(0) @@ -64,6 +65,11 @@ struct uml_driver { /* Event handling */ virDomainEventStatePtr domainEventState; + + /* Mapping of 'char *uuidstr' -> virConnectPtr + * of guests which will be automatically killed + * when the virConnectPtr is closed*/ + virHashTablePtr autodestroy; }; diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 2b7219a..16ab73a 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -75,6 +75,16 @@ struct _umlDomainObjPrivate { int monitorWatch; }; +static int umlProcessAutoDestroyInit(struct uml_driver *driver); +static void umlProcessAutoDestroyRun(struct uml_driver *driver, + virConnectPtr conn); +static void umlProcessAutoDestroyShutdown(struct uml_driver *driver); +static int umlProcessAutoDestroyAdd(struct uml_driver *driver, + virDomainObjPtr vm, + virConnectPtr conn); +static int umlProcessAutoDestroyRemove(struct uml_driver *driver, + virDomainObjPtr vm); + static int umlShutdown(void); @@ -119,10 +129,10 @@ static void umlDomainEventQueue(struct uml_driver *driver, static int umlStartVMDaemon(virConnectPtr conn, struct uml_driver *driver, - virDomainObjPtr vm); + virDomainObjPtr vm, + bool autoDestroy); -static void umlShutdownVMDaemon(virConnectPtr conn, - struct uml_driver *driver, +static void umlShutdownVMDaemon(struct uml_driver *driver, virDomainObjPtr vm, virDomainShutoffReason reason); @@ -150,7 +160,7 @@ umlAutostartDomain(void *payload, const void *name ATTRIBUTE_UNUSED, void *opaqu !virDomainObjIsActive(vm)) { int ret; virResetLastError(); - ret = umlStartVMDaemon(data->conn, data->driver, vm); + ret = umlStartVMDaemon(data->conn, data->driver, vm, false); virDomainAuditStart(vm, "booted", ret >= 0); if (ret < 0) { virErrorPtr err = virGetLastError(); @@ -309,7 +319,7 @@ reread: continue; } - umlShutdownVMDaemon(NULL, driver, dom, VIR_DOMAIN_SHUTOFF_SHUTDOWN); + umlShutdownVMDaemon(driver, dom, VIR_DOMAIN_SHUTOFF_SHUTDOWN); virDomainAuditStop(dom, "shutdown"); event = virDomainEventNewFromObj(dom, VIR_DOMAIN_EVENT_STOPPED, @@ -337,7 +347,7 @@ reread: if (umlOpenMonitor(driver, dom) < 0) { VIR_WARN("Could not open monitor for new domain"); - umlShutdownVMDaemon(NULL, driver, dom, + umlShutdownVMDaemon(driver, dom, VIR_DOMAIN_SHUTOFF_FAILED); virDomainAuditStop(dom, "failed"); event = virDomainEventNewFromObj(dom, @@ -350,7 +360,7 @@ reread: } } else if (umlIdentifyChrPTY(driver, dom) < 0) { VIR_WARN("Could not identify character devices for new domain"); - umlShutdownVMDaemon(NULL, driver, dom, + umlShutdownVMDaemon(driver, dom, VIR_DOMAIN_SHUTOFF_FAILED); virDomainAuditStop(dom, "failed"); event = virDomainEventNewFromObj(dom, @@ -480,6 +490,9 @@ umlStartup(int privileged) umlInotifyEvent, uml_driver, NULL)) < 0) goto error; + if (umlProcessAutoDestroyInit(uml_driver) < 0) + goto error; + if (virDomainLoadAllConfigs(uml_driver->caps, &uml_driver->domains, uml_driver->configDir, @@ -577,7 +590,7 @@ umlShutdownOneVM(void *payload, const void *name ATTRIBUTE_UNUSED, void *opaque) virDomainObjLock(dom); if (virDomainObjIsActive(dom)) { - umlShutdownVMDaemon(NULL, driver, dom, VIR_DOMAIN_SHUTOFF_SHUTDOWN); + umlShutdownVMDaemon(driver, dom, VIR_DOMAIN_SHUTOFF_SHUTDOWN); virDomainAuditStop(dom, "shutdown"); } virDomainObjUnlock(dom); @@ -612,6 +625,8 @@ umlShutdown(void) { VIR_FREE(uml_driver->autostartDir); VIR_FREE(uml_driver->monitorDir); + umlProcessAutoDestroyShutdown(uml_driver); + if (uml_driver->brctl) brShutdown(uml_driver->brctl); @@ -623,6 +638,104 @@ umlShutdown(void) { } +static int umlProcessAutoDestroyInit(struct uml_driver *driver) +{ + if (!(driver->autodestroy = virHashCreate(5, NULL))) + return -1; + + return 0; +} + +struct umlProcessAutoDestroyData { + struct uml_driver *driver; + virConnectPtr conn; +}; + +static void umlProcessAutoDestroyDom(void *payload, + const void *name, + void *opaque) +{ + struct umlProcessAutoDestroyData *data = opaque; + virConnectPtr conn = payload; + const char *uuidstr = name; + unsigned char uuid[VIR_UUID_BUFLEN]; + virDomainObjPtr dom; + virDomainEventPtr event = NULL; + + VIR_DEBUG("conn=%p uuidstr=%s thisconn=%p", conn, uuidstr, data->conn); + + if (data->conn != conn) + return; + + if (virUUIDParse(uuidstr, uuid) < 0) { + VIR_WARN("Failed to parse %s", uuidstr); + return; + } + + if (!(dom = virDomainFindByUUID(&data->driver->domains, + uuid))) { + VIR_DEBUG("No domain object to kill"); + return; + } + + VIR_DEBUG("Killing domain"); + umlShutdownVMDaemon(data->driver, dom, VIR_DOMAIN_SHUTOFF_DESTROYED); + virDomainAuditStop(dom, "destroyed"); + event = virDomainEventNewFromObj(dom, + VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_DESTROYED); + + if (dom && !dom->persistent) + virDomainRemoveInactive(&data->driver->domains, dom); + + if (dom) + virDomainObjUnlock(dom); + if (event) + umlDomainEventQueue(data->driver, event); + virHashRemoveEntry(data->driver->autodestroy, uuidstr); +} + +/* + * Precondition: driver is locked + */ +static void umlProcessAutoDestroyRun(struct uml_driver *driver, virConnectPtr conn) +{ + struct umlProcessAutoDestroyData data = { + driver, conn + }; + VIR_DEBUG("conn=%p", conn); + virHashForEach(driver->autodestroy, umlProcessAutoDestroyDom, &data); +} + +static void umlProcessAutoDestroyShutdown(struct uml_driver *driver) +{ + virHashFree(driver->autodestroy); +} + +static int umlProcessAutoDestroyAdd(struct uml_driver *driver, + virDomainObjPtr vm, + virConnectPtr conn) +{ + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(vm->def->uuid, uuidstr); + VIR_DEBUG("vm=%s uuid=%s conn=%p", vm->def->name, uuidstr, conn); + if (virHashAddEntry(driver->autodestroy, uuidstr, conn) < 0) + return -1; + return 0; +} + +static int umlProcessAutoDestroyRemove(struct uml_driver *driver, + virDomainObjPtr vm) +{ + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(vm->def->uuid, uuidstr); + VIR_DEBUG("vm=%s uuid=%s", vm->def->name, uuidstr); + if (virHashRemoveEntry(driver->autodestroy, uuidstr) < 0) + return -1; + return 0; +} + + static int umlReadPidFile(struct uml_driver *driver, virDomainObjPtr vm) { @@ -842,8 +955,7 @@ error: } -static int umlCleanupTapDevices(virConnectPtr conn ATTRIBUTE_UNUSED, - virDomainObjPtr vm) { +static int umlCleanupTapDevices(virDomainObjPtr vm) { int i; int err; int ret = 0; @@ -873,7 +985,8 @@ static int umlCleanupTapDevices(virConnectPtr conn ATTRIBUTE_UNUSED, static int umlStartVMDaemon(virConnectPtr conn, struct uml_driver *driver, - virDomainObjPtr vm) { + virDomainObjPtr vm, + bool autoDestroy) { int ret; char *logfile; int logfd = -1; @@ -935,7 +1048,7 @@ static int umlStartVMDaemon(virConnectPtr conn, if (!(cmd = umlBuildCommandLine(conn, driver, vm))) { VIR_FORCE_CLOSE(logfd); virDomainConfVMNWFilterTeardown(vm); - umlCleanupTapDevices(conn, vm); + umlCleanupTapDevices(vm); return -1; } @@ -953,13 +1066,17 @@ static int umlStartVMDaemon(virConnectPtr conn, if (ret < 0) goto cleanup; + if (autoDestroy && + umlProcessAutoDestroyAdd(driver, vm, conn) < 0) + goto cleanup; + ret = virDomainObjSetDefTransient(driver->caps, vm, false); cleanup: virCommandFree(cmd); if (ret < 0) { virDomainConfVMNWFilterTeardown(vm); - umlCleanupTapDevices(conn, vm); + umlCleanupTapDevices(vm); } /* NB we don't mark it running here - we do that async @@ -972,8 +1089,7 @@ cleanup: return ret; } -static void umlShutdownVMDaemon(virConnectPtr conn ATTRIBUTE_UNUSED, - struct uml_driver *driver ATTRIBUTE_UNUSED, +static void umlShutdownVMDaemon(struct uml_driver *driver, virDomainObjPtr vm, virDomainShutoffReason reason) { @@ -997,7 +1113,10 @@ static void umlShutdownVMDaemon(virConnectPtr conn ATTRIBUTE_UNUSED, virDomainObjSetState(vm, VIR_DOMAIN_SHUTOFF, reason); virDomainConfVMNWFilterTeardown(vm); - umlCleanupTapDevices(conn, vm); + umlCleanupTapDevices(vm); + + /* Stop autodestroy in case guest is restarted */ + umlProcessAutoDestroyRemove(driver, vm); if (vm->newDef) { virDomainDefFree(vm->def); @@ -1072,6 +1191,7 @@ static int umlClose(virConnectPtr conn) { umlDriverLock(driver); virDomainEventCallbackListRemoveConn(conn, driver->domainEventState->callbacks); + umlProcessAutoDestroyRun(driver, conn); umlDriverUnlock(driver); conn->privateData = NULL; @@ -1342,7 +1462,7 @@ static virDomainPtr umlDomainCreate(virConnectPtr conn, const char *xml, virDomainPtr dom = NULL; virDomainEventPtr event = NULL; - virCheckFlags(0, NULL); + virCheckFlags(VIR_DOMAIN_START_AUTODESTROY, NULL); umlDriverLock(driver); if (!(def = virDomainDefParseString(driver->caps, xml, @@ -1359,7 +1479,8 @@ static virDomainPtr umlDomainCreate(virConnectPtr conn, const char *xml, goto cleanup; def = NULL; - if (umlStartVMDaemon(conn, driver, vm) < 0) { + if (umlStartVMDaemon(conn, driver, vm, + (flags & VIR_DOMAIN_START_AUTODESTROY)) < 0) { virDomainAuditStart(vm, "booted", false); virDomainRemoveInactive(&driver->domains, vm); @@ -1436,7 +1557,7 @@ umlDomainDestroyFlags(virDomainPtr dom, goto cleanup; } - umlShutdownVMDaemon(dom->conn, driver, vm, VIR_DOMAIN_SHUTOFF_DESTROYED); + umlShutdownVMDaemon(driver, vm, VIR_DOMAIN_SHUTOFF_DESTROYED); virDomainAuditStop(vm, "destroyed"); event = virDomainEventNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, @@ -1717,7 +1838,7 @@ static int umlDomainStartWithFlags(virDomainPtr dom, unsigned int flags) { virDomainEventPtr event = NULL; int ret = -1; - virCheckFlags(0, -1); + virCheckFlags(VIR_DOMAIN_START_AUTODESTROY, -1); umlDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, dom->uuid); @@ -1728,7 +1849,8 @@ static int umlDomainStartWithFlags(virDomainPtr dom, unsigned int flags) { goto cleanup; } - ret = umlStartVMDaemon(dom->conn, driver, vm); + ret = umlStartVMDaemon(dom->conn, driver, vm, + (flags & VIR_DOMAIN_START_AUTODESTROY)); virDomainAuditStart(vm, "booted", ret >= 0); if (ret == 0) event = virDomainEventNewFromObj(vm, -- 1.7.6.4

2 1

[libvirt] [PATCH 0/3] snapshot: another snapshot-list filter
by Eric Blake 17 Oct '11

17 Oct '11

Previously, we could filter 'virsh snapshot-list --roots' to show just snapshots lacking parents, which is good for top-down algorithms. But sometimes you want just snapshots lacking children, for bottom-up algorithms - this implements that. Once again, I can only compile-test esx. Also, I haven't yet spent time with the vbox code to write up this patch, partly because the previous round of factoring it into reusable recursive iteration is still in churn in an edit-compile-test cycle between Matthias and me. I'm still debating on whether to emulate --leaves when talking to an 0.9.5 server. Probably not too hard... Eric Blake (3): snapshot: add API for filtering by leaves snapshot: implement LIST_LEAVES flag in qemu snapshot: implement LIST_LEAVES flag in esx include/libvirt/libvirt.h.in | 2 ++ src/conf/domain_conf.c | 8 ++++++-- src/esx/esx_driver.c | 29 +++++++++++++++++++++-------- src/esx/esx_vi.c | 27 ++++++++++++++++----------- src/esx/esx_vi.h | 4 ++-- src/libvirt.c | 16 ++++++++++++++-- src/qemu/qemu_driver.c | 12 ++++++++---- tools/virsh.c | 12 ++++++++++++ tools/virsh.pod | 7 ++++++- 9 files changed, 87 insertions(+), 30 deletions(-) -- 1.7.4.4

3 9

[libvirt] [PATCH v2] qemu: Do not reattach PCI device used by other domain when shutdown
by Osier Yang 17 Oct '11

17 Oct '11

When failing on starting a domain, it tries to reattach all the PCI devices defined in the domain conf, regardless of whether the devices are still used by other domain. This will cause the devices to be deleted from the list qemu_driver->activePciHostdevs, thus the devices will be thought as usable even if it's not true. And following commands nodedev-{reattach,reset} will be successful. How to reproduce: 1) Define two domains with same PCI device defined in the confs. 2) # virsh start domain1 3) # virsh start domain2 4) # virsh nodedev-reattach $pci_device You will see the device will be reattached to host successfully. As pciDeviceReattach just check if the device is still used by other domain via checking if the device is in list driver->activePciHostdevs, however, the device is deleted from the list by step 2). This patch is to prohibit the bug by: 1) Prohibit a domain starting or device attachment right at preparation period (qemuPrepareHostdevPCIDevices) if the device is in list driver->activePciHostdevs, which means it's used by other domain. 2) Introduces a new field for struct _pciDevice, (const char *used_by), it will be set as the domain name at preparation period, (qemuPrepareHostdevPCIDevices). Thus we can prohibit deleting the device from driver->activePciHostdevs if it's still used by other domain when stopping the domain process. * src/pci.h (define two internal functions, pciDeviceSetUsedBy and pciDevceGetUsedBy) * src/pci.c (new field "const char *used_by" for struct _pciDevice, implementations for the two new functions) * src/libvirt_private.syms (Add the two new internal functions) * src/qemu_hostdev.h (Modify the definition of functions qemuPrepareHostdevPCIDevices, and qemuDomainReAttachHostdevDevices) * src/qemu_hostdev.c (Prohibit preparation and don't delete the device from activePciHostdevs list if it's still used by other domain) * src/qemu_hotplug.c (Update function usage, as the definitions are changed) v1 - v2: * char * used_by => const char *used_by, and no strdup() * Other nits pointed out by Eric. --- src/libvirt_private.syms | 2 ++ src/qemu/qemu_hostdev.c | 43 ++++++++++++++++++++++++++++++++++++++----- src/qemu/qemu_hostdev.h | 2 ++ src/qemu/qemu_hotplug.c | 4 ++-- src/util/pci.c | 15 +++++++++++++++ src/util/pci.h | 3 +++ 6 files changed, 62 insertions(+), 7 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 4f96518..4d50d86 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -880,6 +880,7 @@ virNWFilterHashTableRemoveEntry; pciDettachDevice; pciDeviceFileIterate; pciDeviceGetManaged; +pciDeviceGetUsedBy; pciDeviceIsAssignable; pciDeviceIsVirtualFunction; pciDeviceListAdd; @@ -892,6 +893,7 @@ pciDeviceListSteal; pciDeviceNetName; pciDeviceReAttachInit; pciDeviceSetManaged; +pciDeviceSetUsedBy; pciFreeDevice; pciGetDevice; pciGetPhysicalFunction; diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index 6f77717..f354ea8 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -101,6 +101,7 @@ cleanup: int qemuPrepareHostdevPCIDevices(struct qemud_driver *driver, + const char *name, virDomainHostdevDefPtr *hostdevs, int nhostdevs) { @@ -111,7 +112,7 @@ int qemuPrepareHostdevPCIDevices(struct qemud_driver *driver, if (!(pcidevs = qemuGetPciHostDeviceList(hostdevs, nhostdevs))) return -1; - /* We have to use 4 loops here. *All* devices must + /* We have to use 6 loops here. *All* devices must * be detached before we reset any of them, because * in some cases you have to reset the whole PCI, * which impacts all devices on it. Also, all devices @@ -125,9 +126,16 @@ int qemuPrepareHostdevPCIDevices(struct qemud_driver *driver, for (i = 0; i < pciDeviceListCount(pcidevs); i++) { pciDevice *dev = pciDeviceListGet(pcidevs, i); - if (!pciDeviceIsAssignable(dev, !driver->relaxedACS)) - goto reattachdevs; + /* The device is in use by other active domain if + * the dev is in list driver->activePciHostdevs. + */ + if (!pciDeviceIsAssignable(dev, !driver->relaxedACS) || + pciDeviceListFind(driver->activePciHostdevs, dev)) + goto cleanup; + } + for (i = 0; i < pciDeviceListCount(pcidevs); i++) { + pciDevice *dev = pciDeviceListGet(pcidevs, i); if (pciDeviceGetManaged(dev) && pciDettachDevice(dev, driver->activePciHostdevs) < 0) goto reattachdevs; @@ -150,6 +158,18 @@ int qemuPrepareHostdevPCIDevices(struct qemud_driver *driver, } } + /* Now set the used_by_domain of the device in driver->activePciHostdevs + * as domain name. + */ + for (i = 0; i < pciDeviceListCount(pcidevs); i++) { + pciDevice *dev, *activeDev; + + dev = pciDeviceListGet(pcidevs, i); + activeDev = pciDeviceListFind(driver->activePciHostdevs, dev); + + pciDeviceSetUsedBy(activeDev, name); + } + /* Now steal all the devices from pcidevs */ while (pciDeviceListCount(pcidevs) > 0) { pciDevice *dev = pciDeviceListGet(pcidevs, 0); @@ -183,7 +203,7 @@ static int qemuPrepareHostPCIDevices(struct qemud_driver *driver, virDomainDefPtr def) { - return qemuPrepareHostdevPCIDevices(driver, def->hostdevs, def->nhostdevs); + return qemuPrepareHostdevPCIDevices(driver, def->name, def->hostdevs, def->nhostdevs); } @@ -258,6 +278,7 @@ void qemuReattachPciDevice(pciDevice *dev, struct qemud_driver *driver) void qemuDomainReAttachHostdevDevices(struct qemud_driver *driver, + const char *name, virDomainHostdevDefPtr *hostdevs, int nhostdevs) { @@ -277,6 +298,18 @@ void qemuDomainReAttachHostdevDevices(struct qemud_driver *driver, for (i = 0; i < pciDeviceListCount(pcidevs); i++) { pciDevice *dev = pciDeviceListGet(pcidevs, i); + pciDevice *activeDev = NULL; + const char *used_by = NULL; + + /* Never delete the dev from list driver->activePciHostdevs + * if it's used by other domain. + */ + activeDev = pciDeviceListFind(driver->activePciHostdevs, dev); + if (activeDev && + (used_by = pciDeviceGetUsedBy(activeDev)) && + STRNEQ(name, used_by)) + continue; + pciDeviceListDel(driver->activePciHostdevs, dev); } @@ -305,5 +338,5 @@ void qemuDomainReAttachHostDevices(struct qemud_driver *driver, if (!def->nhostdevs) return; - qemuDomainReAttachHostdevDevices(driver, def->hostdevs, def->nhostdevs); + qemuDomainReAttachHostdevDevices(driver, def->name, def->hostdevs, def->nhostdevs); } diff --git a/src/qemu/qemu_hostdev.h b/src/qemu/qemu_hostdev.h index 1f3d1bc..07d7de2 100644 --- a/src/qemu/qemu_hostdev.h +++ b/src/qemu/qemu_hostdev.h @@ -30,12 +30,14 @@ int qemuUpdateActivePciHostdevs(struct qemud_driver *driver, virDomainDefPtr def); int qemuPrepareHostdevPCIDevices(struct qemud_driver *driver, + const char *name, virDomainHostdevDefPtr *hostdevs, int nhostdevs); int qemuPrepareHostDevices(struct qemud_driver *driver, virDomainDefPtr def); void qemuReattachPciDevice(pciDevice *dev, struct qemud_driver *driver); void qemuDomainReAttachHostdevDevices(struct qemud_driver *driver, + const char *name, virDomainHostdevDefPtr *hostdevs, int nhostdevs); void qemuDomainReAttachHostDevices(struct qemud_driver *driver, diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 4c1705d..bfa524b 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -893,7 +893,7 @@ int qemuDomainAttachHostPciDevice(struct qemud_driver *driver, return -1; } - if (qemuPrepareHostdevPCIDevices(driver, &hostdev, 1) < 0) + if (qemuPrepareHostdevPCIDevices(driver, vm->def->name, &hostdev, 1) < 0) return -1; if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { @@ -959,7 +959,7 @@ error: hostdev->info.addr.pci.slot) < 0) VIR_WARN("Unable to release PCI address on host device"); - qemuDomainReAttachHostdevDevices(driver, &hostdev, 1); + qemuDomainReAttachHostdevDevices(driver, vm->def->name, &hostdev, 1); VIR_FREE(devstr); VIR_FREE(configfd_name); diff --git a/src/util/pci.c b/src/util/pci.c index 8d8e157..888784a 100644 --- a/src/util/pci.c +++ b/src/util/pci.c @@ -62,6 +62,7 @@ struct _pciDevice { char name[PCI_ADDR_LEN]; /* domain:bus:slot.function */ char id[PCI_ID_LEN]; /* product vendor */ char *path; + const char *used_by; /* The domain which uses the device */ int fd; unsigned initted; @@ -1312,6 +1313,7 @@ pciGetDevice(unsigned domain, dev->bus = bus; dev->slot = slot; dev->function = function; + dev->used_by = NULL; if (snprintf(dev->name, sizeof(dev->name), "%.4x:%.2x:%.2x.%.1x", dev->domain, dev->bus, dev->slot, @@ -1374,6 +1376,7 @@ pciFreeDevice(pciDevice *dev) VIR_DEBUG("%s %s: freeing", dev->id, dev->name); pciCloseConfig(dev); VIR_FREE(dev->path); + dev->used_by = NULL; VIR_FREE(dev); } @@ -1387,6 +1390,18 @@ unsigned pciDeviceGetManaged(pciDevice *dev) return dev->managed; } +void +pciDeviceSetUsedBy(pciDevice *dev, const char *name) +{ + dev->used_by = name; +} + +const char * +pciDeviceGetUsedBy(pciDevice *dev) +{ + return dev->used_by; +} + void pciDeviceReAttachInit(pciDevice *pci) { pci->unbind_from_stub = 1; diff --git a/src/util/pci.h b/src/util/pci.h index a1600fe..640c6af 100644 --- a/src/util/pci.h +++ b/src/util/pci.h @@ -47,6 +47,9 @@ int pciResetDevice (pciDevice *dev, void pciDeviceSetManaged(pciDevice *dev, unsigned managed); unsigned pciDeviceGetManaged(pciDevice *dev); +void pciDeviceSetUsedBy(pciDevice *dev, + const char *used_by); +const char *pciDeviceGetUsedBy(pciDevice *dev); void pciDeviceReAttachInit(pciDevice *dev); pciDeviceList *pciDeviceListNew (void); -- 1.7.6

2 5

[libvirt] [PATCH] Fix virt-sanlock-cleanup documentation
by Philipp Hahn 17 Oct '11

17 Oct '11

The referenced page does not exist, but locking.html has a section about sanlock. Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- tools/virt-sanlock-cleanup.in | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/virt-sanlock-cleanup.in b/tools/virt-sanlock-cleanup.in index 72cd5e0..e143e7d 100644 --- a/tools/virt-sanlock-cleanup.in +++ b/tools/virt-sanlock-cleanup.in @@ -64,8 +64,8 @@ active. =head1 EXIT STATUS -Upon successful processing of leases cleanup, the exit status -will be 0 will be set. Upon fatal error a non-zero status will +Upon successful processing of leases cleanup, an exit status +of 0 will be set. Upon fatal error a non-zero status will be set. =head1 AUTHOR @@ -91,6 +91,6 @@ PURPOSE =head1 SEE ALSO -C<virsh(1)>, online instructions C<http://libvirt.org/locksanlock.html> +C<virsh(1)>, online instructions C<http://libvirt.org/locking.html> =cut -- 1.7.1

2 1

[libvirt] [PATCH] qemu: avoid dereferencing a NULL pointer
by ajia＠redhat.com 17 Oct '11

17 Oct '11

From: Alex Jia <ajia(a)redhat.com> * src/qemu/qemu_hostdev.c: function 'pciDeviceListFind' probably explicitly returns null, however, the function 'pciDeviceSetUsedBy' directly uses it without any judgement. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/qemu/qemu_hostdev.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index c65f6f5..4e148b0 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -227,9 +227,8 @@ int qemuPrepareHostdevPCIDevices(struct qemud_driver *driver, pciDevice *dev, *activeDev; dev = pciDeviceListGet(pcidevs, i); - activeDev = pciDeviceListFind(driver->activePciHostdevs, dev); - - pciDeviceSetUsedBy(activeDev, name); + if ((activeDev = pciDeviceListFind(driver->activePciHostdevs, dev))) + pciDeviceSetUsedBy(activeDev, name); } /* Loop 6: Now steal all the devices from pcidevs */ -- 1.7.1

3 2

[libvirt] [PATCH] Fix two comments related to error handling
by Philipp Hahn 17 Oct '11

17 Oct '11

Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- include/libvirt/virterror.h | 2 +- python/libvirt-override.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h index dfbe2bc..a8549b7 100644 --- a/include/libvirt/virterror.h +++ b/include/libvirt/virterror.h @@ -206,7 +206,7 @@ typedef enum { VIR_ERR_INVALID_STORAGE_VOL = 47, /* invalid storage vol object */ VIR_WAR_NO_STORAGE = 48, /* failed to start storage */ VIR_ERR_NO_STORAGE_POOL = 49, /* storage pool not found */ - VIR_ERR_NO_STORAGE_VOL = 50, /* storage pool not found */ + VIR_ERR_NO_STORAGE_VOL = 50, /* storage volume not found */ VIR_WAR_NO_NODE = 51, /* failed to start node driver */ VIR_ERR_INVALID_NODE_DEVICE = 52, /* invalid node device object */ VIR_ERR_NO_NODE_DEVICE = 53, /* node device not found */ diff --git a/python/libvirt-override.py b/python/libvirt-override.py index 387fddf..8427eab 100644 --- a/python/libvirt-override.py +++ b/python/libvirt-override.py @@ -79,7 +79,7 @@ class libvirtError(Exception): # register the libvirt global error handler # def registerErrorHandler(f, ctx): - """Register a Python written function to for error reporting. + """Register a Python function for error reporting. The function is called back as f(ctx, error), with error being a list of information about the error being raised. Returns 1 in case of success.""" -- 1.7.1

2 1

[libvirt] [PATCH V1 0/6] Make part of inner workings of nwfilters more flexible
by Stefan Berger 17 Oct '11

17 Oct '11

The following series of patches re-does some of the inner workings of nwfilters with the goal to enable users to write filters that have other than the system-known chains supported right now ('root','arp','rarp','ipv4' and 'ipv6'). Ideally users should be able to provide a chain name in the chains XML attribute and either be able to jump to it as an 'action' or have the chain created automatically as it is the case right now for those chains enumerated before. I am introducing internal priorities for the chains mentioned above so that their creation can be made more flexible -- currently their creation and the order in which they are accessed is hardcoded. This largely does away with the hardcoded stuff. Further, filters will be automatically accessed from the (ebtables) 'root' chain using the prefix of the name of the chain. As an example, this filter will be accessed from the root chain for 'arp' packets since its name 'arpmac' has the prefix 'arp'. <filter name='allow-arpmac' chain='arpmac'> <uuid>94abeecc-c956-0ac8-1f49-a06ee8995688</uuid> <rule action='accept' direction='out' priority='100'> <arp opcode='Request_Reverse' arpsrcmacaddr='$MAC' arpdstmacaddr='$MAC' arpsrcipaddr='0.0.0.0' arpdstipaddr='0.0.0.0'/> </rule> <rule action='accept' direction='inout' priority='500'/> </filter> In the future the chains may have priorities supported in the XML in order to control the order in which they are accessed. <filter name='allow-arpmac' chain='arpmac' prirotiy='650'> [...] The series does not enable users yet to provide names of chains but instead pushes the problem of their later enablement into the XML parser and prepares the rest of the code to handle it (as far as this can be seen). I did the testing with the test cases in libvirt-tck and did not see regressions. Regards, Stefan

1 6

[libvirt] [BUG, RFC] Python generator: missing error_codes in generated libvirError exceptions
by Philipp Hahn 17 Oct '11

17 Oct '11

Hello, I just encountered a situation, where a KVM instance was reported as "no state" in virsh. This broke some code of mine, which was using "lookupByUUID()" to lookup several VMs. The Python code did raise a libvirt.libvirtError('virDomainLookupByUUID() failed',), where all get_error_*() functions return None. This is because the generated libvirt.py wrapper just raises libvirtError('%s() failed'), which makes deteting the exact fault harder. My current code explicitly checks for get_error_code() == VIR_ERR_NO_DOMAIN. On further investigation I also noticed that qemudDomainLookupByUUID() uses qemuReportError() to reports the error condition, which doesn't associate that error condition with the connection. What's the most appropriate way to fix this: 1. Assume lookupBy*() only will ever report an invalid lookup key and catch all libvirtErrors? 2. Parse the exception string? 3. Extend the generator to add additional information from annotations? 4. Replace the generated code with hand-extended code. Any ideas? Thanks for your input. Sincerely Philipp -- Philipp Hahn Open Source Software Engineer hahn(a)univention.de Univention GmbH Linux for Your Business fon: +49 421 22 232- 0 Mary-Somerville-Str.1 D-28359 Bremen fax: +49 421 22 232-99 http://www.univention.de/

1 0

[libvirt] [libvirt-glib] Turn GVirStream into a GIOStream
by Marc-André Lureau 17 Oct '11

17 Oct '11

Allows to read async from a stream with GVirInputStream. This is modelled after GSocket. --- libvirt-gobject/Makefile.am | 2 + libvirt-gobject/libvirt-gobject-connection.c | 2 +- libvirt-gobject/libvirt-gobject-input-stream.c | 239 ++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-input-stream.h | 68 +++++++ libvirt-gobject/libvirt-gobject-stream.c | 130 +++++++++++++- libvirt-gobject/libvirt-gobject-stream.h | 10 +- 6 files changed, 443 insertions(+), 8 deletions(-) create mode 100644 libvirt-gobject/libvirt-gobject-input-stream.c create mode 100644 libvirt-gobject/libvirt-gobject-input-stream.h diff --git a/libvirt-gobject/Makefile.am b/libvirt-gobject/Makefile.am index 8147db2..7013675 100644 --- a/libvirt-gobject/Makefile.am +++ b/libvirt-gobject/Makefile.am @@ -40,6 +40,8 @@ libvirt_gobject_1_0_la_HEADERS = \ libvirt_gobject_1_0_la_SOURCES = \ $(libvirt_gobject_1_0_la_HEADERS) \ libvirt-gobject-enums.c \ + libvirt-gobject-input-stream.c \ + libvirt-gobject-input-stream.h \ $(GOBJECT_SOURCE_FILES) libvirt_gobject_1_0_la_CFLAGS = \ -DDATADIR="\"$(datadir)\"" \ diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index 5fc0a9e..95cd878 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -1151,7 +1151,7 @@ GVirStream *gvir_connection_get_stream(GVirConnection *self, klass = GVIR_CONNECTION_GET_CLASS(self); g_return_val_if_fail(klass->stream_new, NULL); - virStreamPtr st = virStreamNew(self->priv->conn, flags); + virStreamPtr st = virStreamNew(self->priv->conn, flags | VIR_STREAM_NONBLOCK); return klass->stream_new(self, st); } diff --git a/libvirt-gobject/libvirt-gobject-input-stream.c b/libvirt-gobject/libvirt-gobject-input-stream.c new file mode 100644 index 0000000..a76d670 --- /dev/null +++ b/libvirt-gobject/libvirt-gobject-input-stream.c @@ -0,0 +1,239 @@ +/* + * libvirt-gobject-input-stream.h: libvirt gobject integration + * + * Copyright (C) 2011 Red Hat + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Authors: Daniel P. Berrange <berrange(a)redhat.com> + * Marc-André Lureau <marcandre.lureau(a)redhat.com> + */ + +#include <config.h> + +#include <libvirt/virterror.h> +#include <string.h> + +#include "libvirt-glib/libvirt-glib.h" +#include "libvirt-gobject/libvirt-gobject.h" +#include "libvirt-gobject-input-stream.h" + +extern gboolean debugFlag; + +#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) + +#define gvir_input_stream_get_type _gvir_input_stream_get_type +G_DEFINE_TYPE(GVirInputStream, gvir_input_stream, G_TYPE_INPUT_STREAM); + +enum +{ + PROP_0, + PROP_STREAM +}; + +struct _GVirInputStreamPrivate +{ + GVirStream *stream; + + /* pending operation metadata */ + GSimpleAsyncResult *result; + GCancellable *cancellable; + gpointer buffer; + gsize count; +}; + +static void gvir_input_stream_get_property(GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + GVirInputStream *stream = GVIR_INPUT_STREAM(object); + + switch (prop_id) { + case PROP_STREAM: + g_value_set_object(value, stream->priv->stream); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + } +} + +static void gvir_input_stream_set_property(GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + GVirInputStream *stream = GVIR_INPUT_STREAM(object); + + switch (prop_id) { + case PROP_STREAM: + stream->priv->stream = g_value_dup_object(value); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + } +} + +static void gvir_input_stream_finalize(GObject *object) +{ + GVirInputStream *stream = GVIR_INPUT_STREAM(object); + + if (stream->priv->stream) + g_object_unref(stream->priv->stream); + + if (G_OBJECT_CLASS(gvir_input_stream_parent_class)->finalize) + (*G_OBJECT_CLASS(gvir_input_stream_parent_class)->finalize)(object); +} + +static void +gvir_input_stream_read_ready (G_GNUC_UNUSED virStreamPtr st, + int events, void *opaque) +{ + GVirInputStream *stream = GVIR_INPUT_STREAM(opaque); + GVirInputStreamPrivate *priv = stream->priv; + GSimpleAsyncResult *simple; + GError *error = NULL; + gssize result; + + g_return_if_fail(events & VIR_STREAM_EVENT_READABLE); + + result = gvir_stream_receive(priv->stream, priv->buffer, priv->count, + priv->cancellable, &error); + + if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK)) { + g_warn_if_reached(); + return; + } + + simple = stream->priv->result; + stream->priv->result = NULL; + + if (result >= 0) + g_simple_async_result_set_op_res_gssize(simple, result); + + if (error) + g_simple_async_result_take_error(simple, error); + + if (priv->cancellable) { + g_object_unref(stream->priv->cancellable); + priv->cancellable = NULL; + } + + g_simple_async_result_complete(simple); + g_object_unref(simple); + + return; +} + +static void gvir_input_stream_read_async(GInputStream *stream, + void *buffer, + gsize count, + G_GNUC_UNUSED int io_priority, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GVirInputStream *input_stream = GVIR_INPUT_STREAM(stream); + virStreamPtr handle; + + g_return_if_fail(GVIR_IS_INPUT_STREAM(stream)); + g_return_if_fail(input_stream->priv->result == NULL); + + g_object_get(input_stream->priv->stream, "handle", &handle, NULL); + + if (virStreamEventAddCallback(handle, VIR_STREAM_EVENT_READABLE, + gvir_input_stream_read_ready, stream, NULL) < 0) { + g_simple_async_report_error_in_idle(G_OBJECT(stream), + callback, + user_data, + G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, + "Couldn't add event callback %s", + G_STRFUNC); + goto end; + } + + input_stream->priv->result = + g_simple_async_result_new(G_OBJECT(stream), callback, user_data, + gvir_input_stream_read_async); + if (cancellable) + g_object_ref(cancellable); + input_stream->priv->cancellable = cancellable; + input_stream->priv->buffer = buffer; + input_stream->priv->count = count; + +end: + virStreamFree(handle); +} + + +static gssize gvir_input_stream_read_finish(GInputStream *stream, + GAsyncResult *result, + G_GNUC_UNUSED GError **error) +{ + GVirInputStream *input_stream = GVIR_INPUT_STREAM(stream); + GSimpleAsyncResult *simple; + virStreamPtr handle; + gssize count; + + g_return_val_if_fail(GVIR_IS_INPUT_STREAM(stream), -1); + g_object_get(input_stream->priv->stream, "handle", &handle, NULL); + + simple = G_SIMPLE_ASYNC_RESULT(result); + + g_warn_if_fail(g_simple_async_result_get_source_tag(simple) == gvir_input_stream_read_async); + + count = g_simple_async_result_get_op_res_gssize(simple); + + virStreamEventRemoveCallback(handle); + virStreamFree(handle); + + return count; +} + + +static void gvir_input_stream_class_init(GVirInputStreamClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS(klass); + GInputStreamClass *ginputstream_class = G_INPUT_STREAM_CLASS(klass); + + g_type_class_add_private(klass, sizeof(GVirInputStreamPrivate)); + + gobject_class->finalize = gvir_input_stream_finalize; + gobject_class->get_property = gvir_input_stream_get_property; + gobject_class->set_property = gvir_input_stream_set_property; + + ginputstream_class->read_fn = NULL; + ginputstream_class->read_async = gvir_input_stream_read_async; + ginputstream_class->read_finish = gvir_input_stream_read_finish; + + g_object_class_install_property(gobject_class, PROP_STREAM, + g_param_spec_object("stream", + "stream", + "GVirStream", + GVIR_TYPE_STREAM, G_PARAM_CONSTRUCT_ONLY | + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); +} + +static void gvir_input_stream_init(GVirInputStream *stream) +{ + stream->priv = G_TYPE_INSTANCE_GET_PRIVATE(stream, GVIR_TYPE_INPUT_STREAM, GVirInputStreamPrivate); +} + +GVirInputStream* _gvir_input_stream_new(GVirStream *stream) +{ + return GVIR_INPUT_STREAM(g_object_new(GVIR_TYPE_INPUT_STREAM, "stream", stream, NULL)); +} diff --git a/libvirt-gobject/libvirt-gobject-input-stream.h b/libvirt-gobject/libvirt-gobject-input-stream.h new file mode 100644 index 0000000..e8002b9 --- /dev/null +++ b/libvirt-gobject/libvirt-gobject-input-stream.h @@ -0,0 +1,68 @@ +/* + * libvirt-gobject-input-stream.h: libvirt gobject integration + * + * Copyright (C) 2011 Red Hat + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Authors: Daniel P. Berrange <berrange(a)redhat.com> + * Marc-André Lureau <marcandre.lureau(a)redhat.com> + */ + +#if !defined(__LIBVIRT_GOBJECT_H__) && !defined(LIBVIRT_GOBJECT_BUILD) +#error "Only <libvirt-gobject/libvirt-gobject.h> can be included directly." +#endif + +#ifndef __LIBVIRT_GOBJECT_INPUT_STREAM_H__ +#define __LIBVIRT_GOBJECT_INPUT_STREAM_H__ + +#include <gio/gio.h> +#include "libvirt-gobject-stream.h" + +G_BEGIN_DECLS + +#define GVIR_TYPE_INPUT_STREAM (_gvir_input_stream_get_type ()) +#define GVIR_INPUT_STREAM(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \ + GVIR_TYPE_INPUT_STREAM, GVirInputStream)) +#define GVIR_INPUT_STREAM_CLASS(class) (G_TYPE_CHECK_CLASS_CAST ((class), \ + GVIR_TYPE_INPUT_STREAM, GVirInputStreamClass)) +#define GVIR_IS_INPUT_STREAM(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \ + GVIR_TYPE_INPUT_STREAM)) +#define GVIR_IS_INPUT_STREAM_CLASS(class) (G_TYPE_CHECK_CLASS_TYPE ((class), \ + GVIR_TYPE_INPUT_STREAM)) +#define GVIR_INPUT_STREAM_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), \ + GVIR_TYPE_INPUT_STREAM, GVirInputStreamClass)) + +typedef struct _GVirInputStreamPrivate GVirInputStreamPrivate; +typedef struct _GVirInputStreamClass GVirInputStreamClass; +typedef struct _GVirInputStream GVirInputStream; + +struct _GVirInputStreamClass +{ + GInputStreamClass parent_class; +}; + +struct _GVirInputStream +{ + GInputStream parent_instance; + GVirInputStreamPrivate *priv; +}; + +GType _gvir_input_stream_get_type (void) G_GNUC_CONST; +GVirInputStream * _gvir_input_stream_new (GVirStream *stream); + +G_END_DECLS + +#endif /* __LIBVIRT_GOBJECT_INPUT_STREAM_H__ */ diff --git a/libvirt-gobject/libvirt-gobject-stream.c b/libvirt-gobject/libvirt-gobject-stream.c index 519d733..88e3a40 100644 --- a/libvirt-gobject/libvirt-gobject-stream.c +++ b/libvirt-gobject/libvirt-gobject-stream.c @@ -30,6 +30,8 @@ #include "libvirt-glib/libvirt-glib.h" #include "libvirt-gobject/libvirt-gobject.h" +#include "libvirt-gobject/libvirt-gobject-input-stream.h" + extern gboolean debugFlag; #define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) @@ -39,10 +41,12 @@ extern gboolean debugFlag; struct _GVirStreamPrivate { - virStreamPtr handle; + virStreamPtr handle; + GInputStream *input_stream; + gboolean in_dispose; }; -G_DEFINE_TYPE(GVirStream, gvir_stream, G_TYPE_OBJECT); +G_DEFINE_TYPE(GVirStream, gvir_stream, G_TYPE_IO_STREAM); enum { @@ -60,6 +64,71 @@ gvir_stream_error_quark(void) return g_quark_from_static_string("vir-g-stream"); } + +static GInputStream* gvir_stream_get_input_stream(GIOStream *io_stream) +{ + GVirStream *self = GVIR_STREAM(io_stream); + + if (self->priv->input_stream == NULL) + self->priv->input_stream = (GInputStream *)_gvir_input_stream_new(self); + + return self->priv->input_stream; +} + + +static gboolean gvir_stream_close(GIOStream *io_stream, + GCancellable *cancellable, G_GNUC_UNUSED GError **error) +{ + GVirStream *self = GVIR_STREAM(io_stream); + + if (self->priv->input_stream) + g_input_stream_close(self->priv->input_stream, cancellable, NULL); + + if (self->priv->in_dispose) + return TRUE; + + return TRUE; /* FIXME: really close the stream? */ +} + + +static void gvir_stream_close_async(GIOStream *stream, G_GNUC_UNUSED int io_priority, + GCancellable *cancellable, GAsyncReadyCallback callback, + gpointer user_data) +{ + GSimpleAsyncResult *res; + GIOStreamClass *class; + GError *error; + + class = G_IO_STREAM_GET_CLASS(stream); + + /* close is not blocked, just do it! */ + error = NULL; + if (class->close_fn && + !class->close_fn(stream, cancellable, &error)) { + g_simple_async_report_take_gerror_in_idle(G_OBJECT (stream), + callback, user_data, + error); + return; + } + + res = g_simple_async_result_new(G_OBJECT (stream), + callback, + user_data, + gvir_stream_close_async); + g_simple_async_result_complete_in_idle(res); + g_object_unref (res); +} + + +static gboolean +gvir_stream_close_finish(G_GNUC_UNUSED GIOStream *stream, + G_GNUC_UNUSED GAsyncResult *result, + G_GNUC_UNUSED GError **error) +{ + return TRUE; +} + + static void gvir_stream_get_property(GObject *object, guint prop_id, GValue *value, @@ -107,6 +176,9 @@ static void gvir_stream_finalize(GObject *object) DEBUG("Finalize GVirStream=%p", self); + if (self->priv->input_stream) + g_object_unref(self->priv->input_stream); + if (priv->handle) { if (virStreamFinish(priv->handle) < 0) g_critical("cannot finish stream"); @@ -120,12 +192,18 @@ static void gvir_stream_finalize(GObject *object) static void gvir_stream_class_init(GVirStreamClass *klass) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); + GObjectClass *object_class = G_OBJECT_CLASS(klass); + GIOStreamClass *stream_class = G_IO_STREAM_CLASS(klass); object_class->finalize = gvir_stream_finalize; object_class->get_property = gvir_stream_get_property; object_class->set_property = gvir_stream_set_property; + stream_class->get_input_stream = gvir_stream_get_input_stream; + stream_class->close_fn = gvir_stream_close; + stream_class->close_async = gvir_stream_close_async; + stream_class->close_finish = gvir_stream_close_finish; + g_object_class_install_property(object_class, PROP_HANDLE, g_param_spec_boxed("handle", @@ -170,6 +248,50 @@ GType gvir_stream_handle_get_type(void) return handle_type; } +/** + * gvir_stream_receive: + * @stream: the stream + * @buffer: a buffer to read data into (which should be at least @size + * bytes long). + * @size: the number of bytes you want to read from the stream + * @cancellable: (allow-none): a %GCancellable or %NULL + * @error: #GError for error reporting, or %NULL to ignore. + * + * Receive data (up to @size bytes) from a stream. + * On error -1 is returned and @error is set accordingly. + * + * gvir_stream_receive() can return any number of bytes, up to + * @size. If more than @size bytes have been received, the additional + * data will be returned in future calls to gvir_stream_receive(). + * + * If there is no data available, a %G_IO_ERROR_WOULD_BLOCK error will be + * returned. + * + * Returns: Number of bytes read, or 0 if the end of stream reached, + * or -1 on error. + */ +gssize gvir_stream_receive(GVirStream *self, gchar *buffer, gsize size, + GCancellable *cancellable, GError **error) +{ + int got; + + g_return_val_if_fail(GVIR_IS_STREAM(self), -1); + g_return_val_if_fail(buffer != NULL, -1); + + if (g_cancellable_set_error_if_cancelled (cancellable, error)) + return -1; + + got = virStreamRecv(self->priv->handle, buffer, size); + + if (got == -2) { /* blocking */ + g_set_error(error, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK, NULL); + } else if (got < 0) { + g_set_error(error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, + "Got virStreamRecv error in %s", G_STRFUNC); + } + + return got; +} struct stream_sink_helper { GVirStream *self; @@ -197,7 +319,7 @@ stream_sink(virStreamPtr st G_GNUC_UNUSED, * requested data sink. This is simply a convenient alternative * to virStreamRecv, for apps that do blocking-I/o. */ -gint +gssize gvir_stream_receive_all(GVirStream *self, GVirStreamSinkFunc func, gpointer user_data, GError **err) { struct stream_sink_helper helper = { diff --git a/libvirt-gobject/libvirt-gobject-stream.h b/libvirt-gobject/libvirt-gobject-stream.h index 5181e24..35526db 100644 --- a/libvirt-gobject/libvirt-gobject-stream.h +++ b/libvirt-gobject/libvirt-gobject-stream.h @@ -28,6 +28,9 @@ #ifndef __LIBVIRT_GOBJECT_STREAM_H__ #define __LIBVIRT_GOBJECT_STREAM_H__ +#include <glib-object.h> +#include <gio/gio.h> + G_BEGIN_DECLS #define GVIR_TYPE_STREAM (gvir_stream_get_type ()) @@ -45,7 +48,7 @@ typedef struct _GVirStreamClass GVirStreamClass; struct _GVirStream { - GObject parent; + GIOStream parent_instance; GVirStreamPrivate *priv; @@ -54,7 +57,7 @@ struct _GVirStream struct _GVirStreamClass { - GObjectClass parent_class; + GIOStreamClass parent_class; gpointer padding[20]; }; @@ -76,7 +79,8 @@ typedef gint (* GVirStreamSinkFunc) (GVirStream *stream, GType gvir_stream_get_type(void); GType gvir_stream_handle_get_type(void); -gint gvir_stream_receive_all(GVirStream *stream, GVirStreamSinkFunc func, gpointer user_data, GError **err); +gssize gvir_stream_receive_all(GVirStream *stream, GVirStreamSinkFunc func, gpointer user_data, GError **err); +gssize gvir_stream_receive(GVirStream *stream, gchar *buffer, gsize size, GCancellable *cancellable, GError **error); G_END_DECLS -- 1.7.6.2

3 3

[libvirt] [libvirt-glib] Remove vir- prefix from signals
by Christophe Fergeau 17 Oct '11

17 Oct '11

gobject signals are generally not namespaced this way, removing this prefix makes things look a bit nicer. --- libvirt-gobject/libvirt-gobject-connection.c | 50 +++++++++++++------------- libvirt-gobject/libvirt-gobject-domain.c | 10 +++--- libvirt-gobject/libvirt-gobject-manager.c | 8 ++-- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index 4832908..8813e96 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -170,7 +170,7 @@ static void gvir_connection_class_init(GVirConnectionClass *klass) G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)); - signals[VIR_CONNECTION_OPENED] = g_signal_new("vir-connection-opened", + signals[VIR_CONNECTION_OPENED] = g_signal_new("connection-opened", G_OBJECT_CLASS_TYPE(object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET(GVirConnectionClass, vir_connection_opened), @@ -179,7 +179,7 @@ static void gvir_connection_class_init(GVirConnectionClass *klass) G_TYPE_NONE, 0); - signals[VIR_CONNECTION_CLOSED] = g_signal_new("vir-connection-closed", + signals[VIR_CONNECTION_CLOSED] = g_signal_new("connection-closed", G_OBJECT_CLASS_TYPE(object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET(GVirConnectionClass, vir_connection_closed), @@ -188,7 +188,7 @@ static void gvir_connection_class_init(GVirConnectionClass *klass) G_TYPE_NONE, 0); - signals[VIR_DOMAIN_ADDED] = g_signal_new("vir-domain-added", + signals[VIR_DOMAIN_ADDED] = g_signal_new("domain-added", G_OBJECT_CLASS_TYPE(object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET(GVirConnectionClass, vir_domain_added), @@ -198,7 +198,7 @@ static void gvir_connection_class_init(GVirConnectionClass *klass) 1, G_TYPE_OBJECT); - signals[VIR_DOMAIN_REMOVED] = g_signal_new("vir-domain-removed", + signals[VIR_DOMAIN_REMOVED] = g_signal_new("domain-removed", G_OBJECT_CLASS_TYPE(object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET(GVirConnectionClass, vir_domain_removed), @@ -282,7 +282,7 @@ static int domain_event_cb(virConnectPtr conn G_GNUC_UNUSED, if (detail == VIR_DOMAIN_EVENT_DEFINED_ADDED) g_signal_emit(gconn, signals[VIR_DOMAIN_ADDED], 0, gdom); else if (detail == VIR_DOMAIN_EVENT_DEFINED_UPDATED) - g_signal_emit_by_name(gdom, "vir-updated"); + g_signal_emit_by_name(gdom, "updated"); else g_warn_if_reached(); break; @@ -301,60 +301,60 @@ static int domain_event_cb(virConnectPtr conn G_GNUC_UNUSED, case VIR_DOMAIN_EVENT_STARTED: if (detail == VIR_DOMAIN_EVENT_STARTED_BOOTED) - g_signal_emit_by_name(gdom, "vir-started::booted"); + g_signal_emit_by_name(gdom, "started::booted"); else if (detail == VIR_DOMAIN_EVENT_STARTED_MIGRATED) - g_signal_emit_by_name(gdom, "vir-started::migrated"); + g_signal_emit_by_name(gdom, "started::migrated"); else if (detail == VIR_DOMAIN_EVENT_STARTED_RESTORED) - g_signal_emit_by_name(gdom, "vir-started::restored"); + g_signal_emit_by_name(gdom, "started::restored"); else if (detail == VIR_DOMAIN_EVENT_STARTED_FROM_SNAPSHOT) - g_signal_emit_by_name(gdom, "vir-started::from-snapshot"); + g_signal_emit_by_name(gdom, "started::from-snapshot"); else g_warn_if_reached(); break; case VIR_DOMAIN_EVENT_SUSPENDED: if (detail == VIR_DOMAIN_EVENT_SUSPENDED_PAUSED) - g_signal_emit_by_name(gdom, "vir-suspended::paused"); + g_signal_emit_by_name(gdom, "suspended::paused"); else if (detail == VIR_DOMAIN_EVENT_SUSPENDED_MIGRATED) - g_signal_emit_by_name(gdom, "vir-suspended::migrated"); + g_signal_emit_by_name(gdom, "suspended::migrated"); else if (detail == VIR_DOMAIN_EVENT_SUSPENDED_IOERROR) - g_signal_emit_by_name(gdom, "vir-suspended::ioerror"); + g_signal_emit_by_name(gdom, "suspended::ioerror"); else if (detail == VIR_DOMAIN_EVENT_SUSPENDED_WATCHDOG) - g_signal_emit_by_name(gdom, "vir-suspended::watchdog"); + g_signal_emit_by_name(gdom, "suspended::watchdog"); else if (detail == VIR_DOMAIN_EVENT_SUSPENDED_RESTORED) - g_signal_emit_by_name(gdom, "vir-suspended::restored"); + g_signal_emit_by_name(gdom, "suspended::restored"); else if (detail == VIR_DOMAIN_EVENT_SUSPENDED_FROM_SNAPSHOT) - g_signal_emit_by_name(gdom, "vir-suspended::from-snapshot"); + g_signal_emit_by_name(gdom, "suspended::from-snapshot"); else g_warn_if_reached(); break; case VIR_DOMAIN_EVENT_RESUMED: if (detail == VIR_DOMAIN_EVENT_RESUMED_UNPAUSED) - g_signal_emit_by_name(gdom, "vir-resumed::unpaused"); + g_signal_emit_by_name(gdom, "resumed::unpaused"); else if (detail == VIR_DOMAIN_EVENT_RESUMED_MIGRATED) - g_signal_emit_by_name(gdom, "vir-resumed::migrated"); + g_signal_emit_by_name(gdom, "resumed::migrated"); else if (detail == VIR_DOMAIN_EVENT_RESUMED_FROM_SNAPSHOT) - g_signal_emit_by_name(gdom, "vir-resumed::from-snapshot"); + g_signal_emit_by_name(gdom, "resumed::from-snapshot"); else g_warn_if_reached(); break; case VIR_DOMAIN_EVENT_STOPPED: if (detail == VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN) - g_signal_emit_by_name(gdom, "vir-stopped::shutdown"); + g_signal_emit_by_name(gdom, "stopped::shutdown"); else if (detail == VIR_DOMAIN_EVENT_STOPPED_DESTROYED) - g_signal_emit_by_name(gdom, "vir-stopped::destroyed"); + g_signal_emit_by_name(gdom, "stopped::destroyed"); else if (detail == VIR_DOMAIN_EVENT_STOPPED_CRASHED) - g_signal_emit_by_name(gdom, "vir-stopped::crashed"); + g_signal_emit_by_name(gdom, "stopped::crashed"); else if (detail == VIR_DOMAIN_EVENT_STOPPED_MIGRATED) - g_signal_emit_by_name(gdom, "vir-stopped::migrated"); + g_signal_emit_by_name(gdom, "stopped::migrated"); else if (detail == VIR_DOMAIN_EVENT_STOPPED_SAVED) - g_signal_emit_by_name(gdom, "vir-stopped::saved"); + g_signal_emit_by_name(gdom, "stopped::saved"); else if (detail == VIR_DOMAIN_EVENT_STOPPED_FAILED) - g_signal_emit_by_name(gdom, "vir-stopped::failed"); + g_signal_emit_by_name(gdom, "stopped::failed"); else if (detail == VIR_DOMAIN_EVENT_STOPPED_FROM_SNAPSHOT) - g_signal_emit_by_name(gdom, "vir-stopped::from-snapshot"); + g_signal_emit_by_name(gdom, "stopped::from-snapshot"); else g_warn_if_reached(); break; diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index 2a5c9fd..70d8d6d 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -159,7 +159,7 @@ static void gvir_domain_class_init(GVirDomainClass *klass) G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)); - signals[VIR_STARTED] = g_signal_new("vir-started", + signals[VIR_STARTED] = g_signal_new("started", G_OBJECT_CLASS_TYPE(object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS | G_SIGNAL_DETAILED, @@ -169,7 +169,7 @@ static void gvir_domain_class_init(GVirDomainClass *klass) G_TYPE_NONE, 1, G_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE); - signals[VIR_SUSPENDED] = g_signal_new("vir-suspended", + signals[VIR_SUSPENDED] = g_signal_new("suspended", G_OBJECT_CLASS_TYPE(object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS | G_SIGNAL_DETAILED, @@ -179,7 +179,7 @@ static void gvir_domain_class_init(GVirDomainClass *klass) G_TYPE_NONE, 1, G_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE); - signals[VIR_RESUMED] = g_signal_new("vir-resumed", + signals[VIR_RESUMED] = g_signal_new("resumed", G_OBJECT_CLASS_TYPE(object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS | G_SIGNAL_DETAILED, @@ -189,7 +189,7 @@ static void gvir_domain_class_init(GVirDomainClass *klass) G_TYPE_NONE, 1, G_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE); - signals[VIR_STOPPED] = g_signal_new("vir-stopped", + signals[VIR_STOPPED] = g_signal_new("stopped", G_OBJECT_CLASS_TYPE(object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS | G_SIGNAL_DETAILED, @@ -199,7 +199,7 @@ static void gvir_domain_class_init(GVirDomainClass *klass) G_TYPE_NONE, 1, G_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE); - signals[VIR_UPDATED] = g_signal_new("vir-updated", + signals[VIR_UPDATED] = g_signal_new("updated", G_OBJECT_CLASS_TYPE(object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS, G_STRUCT_OFFSET(GVirDomainClass, vir_domain_updated), diff --git a/libvirt-gobject/libvirt-gobject-manager.c b/libvirt-gobject/libvirt-gobject-manager.c index 36167be..ae3e4a1 100644 --- a/libvirt-gobject/libvirt-gobject-manager.c +++ b/libvirt-gobject/libvirt-gobject-manager.c @@ -88,7 +88,7 @@ static void gvir_manager_class_init(GVirManagerClass *klass) object_class->finalize = gvir_manager_finalize; - g_signal_new("vir-connection-added", + g_signal_new("connection-added", G_OBJECT_CLASS_TYPE(object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET(GVirManagerClass, vir_connection_added), @@ -97,7 +97,7 @@ static void gvir_manager_class_init(GVirManagerClass *klass) G_TYPE_NONE, 1, GVIR_TYPE_CONNECTION); - g_signal_new("vir-connection-removed", + g_signal_new("connection-removed", G_OBJECT_CLASS_TYPE(object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET(GVirManagerClass, vir_connection_removed), @@ -145,7 +145,7 @@ void gvir_manager_add_connection(GVirManager *man, /* Hold extra reference while emitting signal */ g_object_ref(conn); g_mutex_unlock(priv->lock); - g_signal_emit_by_name(man, "vir-connection-added", conn); + g_signal_emit_by_name(man, "connection-added", conn); g_object_unref(conn); } @@ -158,7 +158,7 @@ void gvir_manager_remove_connection(GVirManager *man, priv->connections = g_list_remove(priv->connections, conn); g_mutex_unlock(priv->lock); - g_signal_emit_by_name(man, "vir-connection-removed", conn); + g_signal_emit_by_name(man, "connection-removed", conn); g_object_unref(conn); } -- 1.7.6.4

2 1

[libvirt] [PATCH] build: fix 'make dist' error
by Wen Congyang 15 Oct '11

15 Oct '11

When I run 'make dist', I receive the following error messages: make[1]: Entering directory `/home/wency/source/libvirt/src' GEN remote/remote_protocol.h GEN remote/remote_protocol.c GEN remote/qemu_protocol.h GEN remote/qemu_protocol.c GEN remote/qemu_client_bodies.h CC libvirt_driver_remote_la-remote_protocol.lo In file included from ./remote/remote_protocol.h:16, from ./remote/remote_protocol.c:7: ./internal.h:249:23: error: probes.h: No such file or directory make[1]: *** [libvirt_driver_remote_la-remote_protocol.lo] Error 1 make[1]: Leaving directory `/home/wency/source/libvirt/src' make: *** [distdir] Error 1 The reason is that we use probes.h before generating it. --- src/Makefile.am | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 302d395..510e5ef 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -189,6 +189,11 @@ REMOTE_DRIVER_GENERATED = \ $(srcdir)/remote/qemu_protocol.h \ $(srcdir)/remote/qemu_client_bodies.h +# The remote RPC driver needs probes.h +if WITH_DTRACE +REMOTE_DRIVER_GENERATED += $(srcdir)/probes.h +endif + REMOTE_PROTOCOL = $(srcdir)/remote/remote_protocol.x QEMU_PROTOCOL = $(srcdir)/remote/qemu_protocol.x REMOTE_DRIVER_PROTOCOL = $(REMOTE_PROTOCOL) $(QEMU_PROTOCOL) -- 1.7.1

3 2

[libvirt] [PATCH] qemu: Get the dev from activePciHostdevs list before reattachment
by Osier Yang 15 Oct '11

15 Oct '11

BZ# https://bugzilla.redhat.com/show_bug.cgi?id=736214 The problem is caused by the original info of domain's PCI dev is maintained by qemu_driver->activePciHostdevs list, (E.g. dev->reprobe, which stands for whether need to reprobe driver for the dev when do reattachment). The fields (dev->reprobe, dev->unbind_from_stub, and dev->remove_slot) are initialized properly when preparing the PCI device for managed attachment. However, when do reattachment, it construct a complete new "pciDevice" without honoring the original dev info, and thus the dev won't get the original driver or can get other problem. This patch is to fix the problem by get the dev from list driver->activePciHostdevs if it's in the list, though it's unlikely the dev to be reattached is not in the list, as any PCI dev is added to the list when do preparation (qemuPrepareHostdevPCIDevices), the patch doesn't completely desert the old design so the device can be reattached even if it's not in list driver->activePciHostdevs. -- v1 patch to fix this problem is: http://www.redhat.com/archives/libvir-list/2011-September/msg01101.html But the patch title is complete different, so I don't send this and a v2. --- src/qemu/qemu_hostdev.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index 6f77717..73cadc5 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -262,6 +262,7 @@ void qemuDomainReAttachHostdevDevices(struct qemud_driver *driver, int nhostdevs) { pciDeviceList *pcidevs; + pciDeviceList *pci_list = NULL; int i; if (!(pcidevs = qemuGetPciHostDeviceList(hostdevs, nhostdevs))) { @@ -272,12 +273,23 @@ void qemuDomainReAttachHostdevDevices(struct qemud_driver *driver, return; } + if (!(pci_list = pciDeviceListNew())) + return; + /* Again 3 loops; mark all devices as inactive before reset * them and reset all the devices before re-attach */ - for (i = 0; i < pciDeviceListCount(pcidevs); i++) { pciDevice *dev = pciDeviceListGet(pcidevs, i); - pciDeviceListDel(driver->activePciHostdevs, dev); + pciDevice *pci = NULL; + pci = pciDeviceListSteal(driver->activePciHostdevs, dev); + + if (pci) { + pciDeviceListDel(pcidevs, dev); + if (pciDeviceListAdd(pci_list, pci) < 0) { + pciFreeDevice(pci); + goto cleanup; + } + } } for (i = 0; i < pciDeviceListCount(pcidevs); i++) { @@ -290,11 +302,18 @@ void qemuDomainReAttachHostdevDevices(struct qemud_driver *driver, } } + for (i = 0; i < pciDeviceListCount(pci_list); i++) { + pciDevice *dev = pciDeviceListGet(pci_list, i); + qemuReattachPciDevice(dev, driver); + } + for (i = 0; i < pciDeviceListCount(pcidevs); i++) { pciDevice *dev = pciDeviceListGet(pcidevs, i); qemuReattachPciDevice(dev, driver); } +cleanup: + pciDeviceListFree(pci_list); pciDeviceListFree(pcidevs); } -- 1.7.6

2 8

[libvirt] [PATCH] Add missing strdup return value check
by Roopa Prabhu 14 Oct '11

14 Oct '11

From: Roopa Prabhu <roprabhu(a)cisco.com> Check strdup return value and fail if error Signed-off-by: Roopa Prabhu <roprabhu(a)cisco.com> --- src/util/pci.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/util/pci.c b/src/util/pci.c index 2bbb90c..df4e6c8 100644 --- a/src/util/pci.c +++ b/src/util/pci.c @@ -2018,7 +2018,13 @@ pciDeviceNetName(char *device_link_sysfs_path, char **netname) /* Assume a single directory entry */ *netname = strdup(entry->d_name); - ret = 0; + if (!*netname) { + virReportOOMError(); + ret = -1; + } + else { + ret = 0; + } break; }

2 2

[libvirt] [RFC PATCH 0/3] Guest NUMA topology support - v0
by Bharata B Rao 14 Oct '11

14 Oct '11

Hi, I discussed the possibilities of adding NUMA topology XML specification support for guests here some time back. Since my latest proposal (http://permalink.gmane.org/gmane.comp.emulators.libvirt/44626) didn't get any response, I am posting a prototype implementation that supports specifying NUMA topology for QEMU guests. - The implementation is based on the last proposal I listed above. - The implementation is for QEMU only. - The patchset has gone through extremely light testing and I have just tested booting a 2 socket 2 core 2 thread QEMU guest. - I haven't really bothered to cover all the corner cases and haven't run libvirt tests after this patchset. For eg, there is no code to validate if the CPU combination specified by <topology> and <numa> match with each other. I plan to cover all these after we freeze the specification itself. Regards, Bharata.

3 7

[libvirt] New repositories and comments for Code Search
by Richard W.M. Jones 14 Oct '11

14 Oct '11

Enter your code repository type (SVN, CVS, Hg, Git, Archive) and URL here: GIT git://libvirt.org/libvirt.git Libvirt is the virtualization API. Comment: You already have some random forks of libvirt.git in the archive, but as far as I can see, not the real upstream git repo. GIT git://git.annexia.org/git/libguestfs.git libguestfs is a set of tools for manipulating virtual machine disk images. Comment: You are already taking the Fedora packaging git archive (eg: git://pkgs.fedoraproject.org/libguestfs.git) but those aren't the sources, they contain the spec files and tarballs. Now, if you were to just unpack all those tarballs, you'd have the source for 10,000s of verified open source projects!

2 1

[libvirt] [PATCH] macvtap: plug memory leak for 802.1Qbh
by Eric Blake 14 Oct '11

14 Oct '11

Detected by Coverity. Leak present since commit ca3b22b. * src/util/macvtap.c (doPortProfileOp8021Qbh): Release device name. --- getPhysfnDev allocates physfndev, but nothing freed it. Pushing under the trivial rule. src/util/macvtap.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/util/macvtap.c b/src/util/macvtap.c index 9bf7fa6..a020c90 100644 --- a/src/util/macvtap.c +++ b/src/util/macvtap.c @@ -983,27 +983,27 @@ doPortProfileOp8021Qbh(const char *ifname, # ifndef IFLA_VF_PORT_MAX (void)ifname; (void)macaddr; (void)virtPort; (void)vm_uuid; (void)virtPortOp; macvtapError(VIR_ERR_INTERNAL_ERROR, "%s", _("Kernel VF Port support was missing at compile time.")); rc = 1; # else /* IFLA_VF_PORT_MAX */ - char *physfndev; + char *physfndev = NULL; unsigned char hostuuid[VIR_UUID_BUFLEN]; int32_t vf; bool nltarget_kernel = true; int ifindex; int vlanid = -1; rc = getPhysfnDev(ifname, &vf, &physfndev); if (rc) goto err_exit; if (ifaceGetIndex(true, physfndev, &ifindex) < 0) { rc = 1; goto err_exit; @@ -1049,26 +1049,27 @@ doPortProfileOp8021Qbh(const char *ifname, NULL, NULL, vf, PORT_REQUEST_DISASSOCIATE); break; default: macvtapError(VIR_ERR_INTERNAL_ERROR, _("operation type %d not supported"), virtPortOp); rc = 1; } err_exit: + VIR_FREE(physfndev); # endif /* IFLA_VF_PORT_MAX */ return rc; } /** * vpAssociatePortProfile * * @macvtap_ifname: The name of the macvtap device * @virtPort: pointer to the object holding port profile parameters * @vmuuid : the UUID of the virtual machine * @vmOp : The VM operation (i.e., create, no-op) -- 1.7.4.4

2 5

Re: [libvirt] [PATCH] Bug Fix: Fix getPhysfnDev to always allocate memory for physfndev on success
by Eric Blake 14 Oct '11

14 Oct '11

On 10/14/2011 04:12 PM, Roopa Prabhu wrote: > From: Roopa Prabhu<roprabhu(a)cisco.com> > > getPhysfnDev was conditionally allocating memory for physfndev on success. > Recently added unconditional free in the caller of getPhysfnDev > can result in a crash. So fix getPhysfnDev to unconditionally allocate > memory for physfndev on success > > Signed-off-by: Roopa Prabhu<roprabhu(a)cisco.com> > Acked-by: Eric Blake<eblake(a)redhat.com> > --- > src/util/macvtap.c | 6 +++++- > 1 files changed, 5 insertions(+), 1 deletions(-) Already pushed. -- Eric Blake eblake(a)redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org

1 0

[libvirt] [PATCH] Clarify semantics of virDomainMigrate2
by Jiri Denemark 14 Oct '11

14 Oct '11

Explicitly disallow conflicts between domain name from dxml and dname. --- src/libvirt.c | 3 +++ src/qemu/qemu_driver.c | 4 ++-- src/qemu/qemu_migration.c | 17 ++++++++++++++--- src/qemu/qemu_migration.h | 1 + 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index f1e6a6b..69cffc5 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -4854,6 +4854,9 @@ error: * in accessing the underlying storage. The migration will fail * if @dxml would cause any guest-visible changes. Pass NULL * if no changes are needed to the XML between source and destination. + * @dxml cannot be used to rename the domain during migration (use + * @dname for that purpose). Domain name in @dxml must either match the + * original domain name or @dname if it was specified. * * Returns the new domain object if the migration was successful, * or NULL in case of error. Note that the new domain object diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 98f4d7f..f833655 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8043,7 +8043,7 @@ qemuDomainMigrateBegin3(virDomainPtr domain, char **cookieout, int *cookieoutlen, unsigned long flags, - const char *dname ATTRIBUTE_UNUSED, + const char *dname, unsigned long resource ATTRIBUTE_UNUSED) { struct qemud_driver *driver = domain->conn->privateData; @@ -8083,7 +8083,7 @@ qemuDomainMigrateBegin3(virDomainPtr domain, if (qemuDomainCheckEjectableMedia(driver, vm) < 0) goto endjob; - if (!(xml = qemuMigrationBegin(driver, vm, xmlin, + if (!(xml = qemuMigrationBegin(driver, vm, xmlin, dname, cookieout, cookieoutlen))) goto endjob; diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index f0a0e49..3770bb6 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -993,6 +993,7 @@ qemuDomainMigrateGraphicsRelocate(struct qemud_driver *driver, char *qemuMigrationBegin(struct qemud_driver *driver, virDomainObjPtr vm, const char *xmlin, + const char *dname, char **cookieout, int *cookieoutlen) { @@ -1001,8 +1002,10 @@ char *qemuMigrationBegin(struct qemud_driver *driver, virDomainDefPtr def = NULL; qemuDomainObjPrivatePtr priv = vm->privateData; - VIR_DEBUG("driver=%p, vm=%p, xmlin=%s, cookieout=%p, cookieoutlen=%p", - driver, vm, NULLSTR(xmlin), cookieout, cookieoutlen); + VIR_DEBUG("driver=%p, vm=%p, xmlin=%s, dname=%s," + " cookieout=%p, cookieoutlen=%p", + driver, vm, NULLSTR(xmlin), NULLSTR(dname), + cookieout, cookieoutlen); /* Only set the phase if we are inside QEMU_ASYNC_JOB_MIGRATION_OUT. * Otherwise we will start the async job later in the perform phase losing @@ -1028,6 +1031,14 @@ char *qemuMigrationBegin(struct qemud_driver *driver, VIR_DOMAIN_XML_INACTIVE))) goto cleanup; + if (STRNEQ(def->name, vm->def->name) && + (!dname || STRNEQ(def->name, dname))) { + qemuReportError(VIR_ERR_INVALID_ARG, "%s", + "target domain name doesn't match source name" + " nor destination name"); + goto cleanup; + } + if (!virDomainDefCheckABIStability(vm->def, def)) goto cleanup; @@ -2012,7 +2023,7 @@ static int doPeer2PeerMigrate3(struct qemud_driver *driver, * bit here, because we are already running inside the context of * a single job. */ - dom_xml = qemuMigrationBegin(driver, vm, xmlin, + dom_xml = qemuMigrationBegin(driver, vm, xmlin, dname, &cookieout, &cookieoutlen); if (!dom_xml) goto cleanup; diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index ec70422..f806ca1 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -79,6 +79,7 @@ int qemuMigrationSetOffline(struct qemud_driver *driver, char *qemuMigrationBegin(struct qemud_driver *driver, virDomainObjPtr vm, const char *xmlin, + const char *dname, char **cookieout, int *cookieoutlen); -- 1.7.7

2 2

[libvirt] [PATCH] docs: fix network XML documentation
by Laine Stump 14 Oct '11

14 Oct '11

A few people have attempted to use the new forwarding modes with older versions of libvirt. The docs where the modes are described have always stated the minimum required libvirt version, but the examples at the end didn't, which I believe is what has caused the confusion. Similarly, the section on portgroups now has a version tag added at the beginning. I also noticed that there was no example of defining a <dns> hostname, so I added one, as well as making the domain name example more recognizable (by adding ".com" to the domain). --- docs/formatnetwork.html.in | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index 99031d0..e06392b 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -58,7 +58,7 @@ <pre> ... <bridge name="virbr0" stp="on" delay="5"/> - <domain name="example"/> + <domain name="example.com"/> <forward mode="nat" dev="eth0"/> ...</pre> @@ -214,7 +214,7 @@ As mentioned above, a <code><forward></code> element can have multiple <code><interface></code> subelements, each one giving the name of a physical interface that can be used - for this network<span class="since">Since 0.9.4</span>: + for this network <span class="since">Since 0.9.4</span>: <pre> ... <forward mode='passthrough'> @@ -301,9 +301,11 @@ ...</pre> <p> + <span class="since">Since 0.9.4</span> A portgroup provides a method of easily putting guest connections to the network into different classes, with each - class potentially having a different level/type of service. Each + class potentially having a different level/type of service. + <span class="since">Since 0.9.4</span> Each network can have multiple portgroup elements (and one of those can optionally be designated as the 'default' portgroup for the network), and each portgroup has a name, as well as various @@ -340,8 +342,12 @@ <pre> ... <mac address='00:16:3E:5D:C7:9E'/> + <domain name="example.com"/> <dns> <txt name="example" value="example value" /> + <host ip='192.168.122.2'> + <hostname>myhost</hostname> + <hostname>myhostalias</hostname> </dns> <ip address="192.168.122.1" netmask="255.255.255.0"> <dhcp> @@ -542,6 +548,7 @@ <h3><a name="examplesBridge">Using an existing host bridge</a></h3> <p> + <span class="since">Since 0.9.4</span> This shows how to use a pre-existing host bridge "br0". The guests will effectively be directly connected to the physical network (i.e. their IP addresses will all be on the subnet of @@ -559,6 +566,8 @@ <h3><a name="examplesDirect">Using a macvtap "direct" connection</a></h3> <p> + <span class="since">Since 0.9.4, QEMU and KVM only, requires + Linux kernel 2.6.34 or newer</span> This shows how to use macvtap to connect to the physical network directly through one of a group of physical devices (without using a host bridge device). As with the host bridge network, -- 1.7.6.4

2 1

[libvirt] [PATCH] util: Make getaddrinfo failure nonfatal in virGetHostname
by Jiri Denemark 14 Oct '11

14 Oct '11

Setting a hostname that cannot be resolved is not the best configuration but since virGetHostname only calls getaddrinfo to get host's canonical name and we do not fail if the returned canonical name is NULL or "localhost", there is no reason why we should fail if getaddrinfo itself fails. --- src/util/util.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index 1ff287d..fd4d7fa 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -1858,10 +1858,10 @@ char *virIndexToDiskName(int idx, const char *prefix) * try to resolve this to a fully-qualified name. Therefore we pass it * to getaddrinfo(). There are two possible responses: * a) getaddrinfo() resolves to a FQDN - return the FQDN - * b) getaddrinfo() resolves to localhost - in this case, the data we got - * from gethostname() is actually more useful than what we got from - * getaddrinfo(). Return the value from gethostname() and hope for - * the best. + * b) getaddrinfo() files or resolves to localhost - in this case, the + * data we got from gethostname() is actually more useful than what + * we got from getaddrinfo(). Return the value from gethostname() + * and hope for the best. */ char *virGetHostname(virConnectPtr conn ATTRIBUTE_UNUSED) { @@ -1897,10 +1897,10 @@ char *virGetHostname(virConnectPtr conn ATTRIBUTE_UNUSED) hints.ai_family = AF_UNSPEC; r = getaddrinfo(hostname, NULL, &hints, &info); if (r != 0) { - virUtilError(VIR_ERR_INTERNAL_ERROR, - _("getaddrinfo failed for '%s': %s"), - hostname, gai_strerror(r)); - return NULL; + VIR_WARN("getaddrinfo failed for '%s': %s", + hostname, gai_strerror(r)); + result = strdup(hostname); + goto check_and_return; } /* Tell static analyzers about getaddrinfo semantics. */ -- 1.7.7

2 2

[libvirt] [PATCH] qemu: Make sure BeginJob is always followed by EndJob
by Jiri Denemark 14 Oct '11

14 Oct '11

Otherwise we can end up with a dangling job that can only be cleared by restarting libvirtd. --- src/qemu/qemu_driver.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0e307e1..98f4d7f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2010,42 +2010,42 @@ static int qemuDomainSendKey(virDomainPtr domain, if (!vm) { char uuidstr[VIR_UUID_STRING_BUFLEN]; virUUIDFormat(domain->uuid, uuidstr); qemuReportError(VIR_ERR_NO_DOMAIN, _("no domain with matching uuid '%s'"), uuidstr); goto cleanup; } priv = vm->privateData; if (qemuDomainObjBeginJobWithDriver(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; if (!virDomainObjIsActive(vm)) { qemuReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); - goto cleanup; + goto endjob; } qemuDomainObjEnterMonitorWithDriver(driver, vm); ret = qemuMonitorSendKey(priv->mon, holdtime, keycodes, nkeycodes); qemuDomainObjExitMonitorWithDriver(driver, vm); - if (qemuDomainObjEndJob(driver, vm) == 0) { + +endjob: + if (qemuDomainObjEndJob(driver, vm) == 0) vm = NULL; - goto cleanup; - } cleanup: if (vm) virDomainObjUnlock(vm); qemuDriverUnlock(driver); return ret; } static int qemudDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) { struct qemud_driver *driver = dom->conn->privateData; virDomainObjPtr vm; int ret = -1; int err; unsigned long balloon; @@ -7208,103 +7208,103 @@ qemudDomainBlockStatsFlags (virDomainPtr dom, &errs); qemuDomainObjExitMonitor(driver, vm); if (ret < 0) goto endjob; /* Field 'errs' is meaningless for QEMU, won't set it. */ for (i = 0; i < *nparams; i++) { virTypedParameterPtr param = &params[i]; switch (i) { case 0: /* fill write_bytes here */ if (virStrcpyStatic(param->field, VIR_DOMAIN_BLOCK_STATS_WRITE_BYTES) == NULL) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Field write bytes too long for destination")); - goto cleanup; + goto endjob; } param->type = VIR_TYPED_PARAM_LLONG; param->value.l = wr_bytes; break; case 1: /* fill wr_operations here */ if (virStrcpyStatic(param->field, VIR_DOMAIN_BLOCK_STATS_WRITE_REQ) == NULL) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Field write requests too long for destination")); - goto cleanup; + goto endjob; } param->type = VIR_TYPED_PARAM_LLONG; param->value.l = wr_req; break; case 2: /* fill read_bytes here */ if (virStrcpyStatic(param->field, VIR_DOMAIN_BLOCK_STATS_READ_BYTES) == NULL) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Field read bytes too long for destination")); - goto cleanup; + goto endjob; } param->type = VIR_TYPED_PARAM_LLONG; param->value.l = rd_bytes; break; case 3: /* fill rd_operations here */ if (virStrcpyStatic(param->field, VIR_DOMAIN_BLOCK_STATS_READ_REQ) == NULL) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Field read requests too long for destination")); - goto cleanup; + goto endjob; } param->type = VIR_TYPED_PARAM_LLONG; param->value.l = rd_req; break; case 4: /* fill flush_operations here */ if (virStrcpyStatic(param->field, VIR_DOMAIN_BLOCK_STATS_FLUSH_REQ) == NULL) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Field flush requests too long for destination")); - goto cleanup; + goto endjob; } param->type = VIR_TYPED_PARAM_LLONG; param->value.l = flush_req; break; case 5: /* fill wr_total_times_ns here */ if (virStrcpyStatic(param->field, VIR_DOMAIN_BLOCK_STATS_WRITE_TOTAL_TIMES) == NULL) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Field write total times too long for destination")); - goto cleanup; + goto endjob; } param->type = VIR_TYPED_PARAM_LLONG; param->value.l = wr_total_times; break; case 6: /* fill rd_total_times_ns here */ if (virStrcpyStatic(param->field, VIR_DOMAIN_BLOCK_STATS_READ_TOTAL_TIMES) == NULL) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Field read total times too long for destination")); - goto cleanup; + goto endjob; } param->type = VIR_TYPED_PARAM_LLONG; param->value.l = rd_total_times; break; case 7: /* fill flush_total_times_ns here */ if (virStrcpyStatic(param->field, VIR_DOMAIN_BLOCK_STATS_READ_TOTAL_TIMES) == NULL) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Field flush total times too long for destination")); - goto cleanup; + goto endjob; } param->type = VIR_TYPED_PARAM_LLONG; param->value.l = flush_total_times; break; default: break; /* should not hit here */ } } endjob: if (qemuDomainObjEndJob(driver, vm) == 0) vm = NULL; cleanup: -- 1.7.7

2 2

[libvirt] [PATCH] qemu: Log debug messages when changing job
by Jiri Denemark 14 Oct '11

14 Oct '11

Log debug messages anytime we call *BeginJob* or *EndJob* so that it's easier to spot incorrect usage of domain job APIs. --- src/qemu/qemu_domain.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 85bebd6..5abc900 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -761,8 +761,13 @@ retry: qemuDomainObjResetJob(priv); if (job != QEMU_JOB_ASYNC) { + VIR_DEBUG("Starting job: %s (async=%s)", + qemuDomainJobTypeToString(job), + qemuDomainAsyncJobTypeToString(priv->job.asyncJob)); priv->job.active = job; } else { + VIR_DEBUG("Starting async job: %s", + qemuDomainAsyncJobTypeToString(asyncJob)); qemuDomainObjResetAsyncJob(priv); priv->job.asyncJob = asyncJob; priv->job.start = now; @@ -873,6 +878,10 @@ int qemuDomainObjEndJob(struct qemud_driver *driver, virDomainObjPtr obj) priv->jobs_queued--; + VIR_DEBUG("Stopping job: %s (async=%s)", + qemuDomainJobTypeToString(priv->job.active), + qemuDomainAsyncJobTypeToString(priv->job.asyncJob)); + qemuDomainObjResetJob(priv); qemuDomainObjSaveJob(driver, obj); virCondSignal(&priv->job.cond); @@ -887,6 +896,9 @@ qemuDomainObjEndAsyncJob(struct qemud_driver *driver, virDomainObjPtr obj) priv->jobs_queued--; + VIR_DEBUG("Stopping async job: %s", + qemuDomainAsyncJobTypeToString(priv->job.asyncJob)); + qemuDomainObjResetAsyncJob(priv); qemuDomainObjSaveJob(driver, obj); virCondBroadcast(&priv->job.asyncCond); -- 1.7.7

2 2

[libvirt] [PATCH v2 0/2] Xen: skip xenHypervisor version init in tests
by Philipp Hahn 14 Oct '11

14 Oct '11

Several tests fail when run as root on a Xen-dom0-system, since virInitialize() then succeeds to open /proc/xen/privcmd and returns the actual supported features instead of the faked one when calling xenHypervisorMakeCapabilitiesInternal(). Since Xen-3.3 supports additional features like "hap" and "viridian", the xencapstest fails. v2: Skip initialization of static version variables for Xen Hypervisor and use provided values for unit test cases. Philipp Hahn (2): Xen: move versions to struct Xen: Fake versions in xencapstest src/xen/xen_driver.c | 2 +- src/xen/xen_hypervisor.c | 307 ++++++++++++++++++++++++---------------------- src/xen/xen_hypervisor.h | 10 ++- tests/xencapstest.c | 10 ++ 4 files changed, 180 insertions(+), 149 deletions(-)

2 4

[libvirt] [PATCH] esx: drop dead code to silence Coverity
by Eric Blake 14 Oct '11

14 Oct '11

Coverity detected that the only way to get to the cleanup label is if objectSpec had been successfully allocated, so the null check was dead code. * src/esx/esx_vi.c (esxVI_LookupObjectContentByType): Drop redundant null check. --- I'll wait for a review on this one. src/esx/esx_vi.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 4a8c709..8bcd76c 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -1763,11 +1763,8 @@ esxVI_LookupObjectContentByType(esxVI_Context *ctx, * Remove values given by the caller from the data structures to prevent * them from being freed by the call to esxVI_PropertyFilterSpec_Free(). */ - if (objectSpec != NULL) { - objectSpec->obj = NULL; - objectSpec->selectSet = NULL; - } - + objectSpec->obj = NULL; + objectSpec->selectSet = NULL; if (propertySpec != NULL) { propertySpec->type = NULL; propertySpec->pathSet = NULL; -- 1.7.4.4

3 3

[libvirt] [RFC PATCH v2 0/2] API to invoke S3/S4 on a host and also resume from within libvirt
by Srivatsa S. Bhat 14 Oct '11

14 Oct '11

This patch adds a new API to put a host to a suspended state (either Suspend-to-RAM or Suspend-to-Disk) and also resume the host back from within libvirt. This uses the RTC wakeup mechanism to set up a timer alarm before suspending the host, so that in-band resume is facilitated by the firing of the RTC alarm, which wakes up the host. The decision to use the RTC Wakeup mechanism to resume the host from sleep was taken in [1]. An initial API was discussed in [2]. Some design ideas for the asynchronous mechanism implementation was discussed in [3]. This patch is positioned to go in along with the patch that exports the host power management capabilities as XML, posted in [4]. v2: * Added an init function which finds out if S3/S4 is supported by the host, upon the first request to suspend/hibernate. * Added synchronization/locking to ensure that only one suspend operation is active at a time. v1: http://www.redhat.com/archives/libvir-list/2011-September/msg00830.html References: [1]. http://www.redhat.com/archives/libvir-list/2011-August/msg00327.html [2]. http://www.redhat.com/archives/libvir-list/2011-August/msg00248.html [3]. http://www.redhat.com/archives/libvir-list/2011-September/msg00438.html [4]. http://www.redhat.com/archives/libvir-list/2011-August/msg00324.html Srivatsa S. Bhat (2): Implement the asynchronous suspend and RTC wakeup Make the API public include/libvirt/libvirt.h.in | 9 ++ src/driver.h | 5 + src/libvirt.c | 46 +++++++++ src/libvirt_private.syms | 7 + src/libvirt_public.syms | 1 src/nodeinfo.c | 215 ++++++++++++++++++++++++++++++++++++++++++ src/nodeinfo.h | 14 +++ src/qemu/qemu_driver.c | 6 + src/remote/remote_driver.c | 1 src/remote/remote_protocol.x | 12 ++ src/util/threads-pthread.c | 17 +++ src/util/threads.h | 1 12 files changed, 332 insertions(+), 2 deletions(-)

1 2

[libvirt] (no subject)
by Wayne Sun 14 Oct '11

14 Oct '11

For last patch of update migrate module, remote define domain is deleted in migrate. Now add this function into define module in this fix. Also update modules which include create, define and installation for the new option uuid added. [test-API][PATCH 1/2] Update define module with remote define [test-API][PATCH 2/2] Add optional argument uuid in create and install module repos/domain/create.py | 6 +- repos/domain/define.py | 141 +++------------------------------ repos/domain/install_image.py | 5 +- repos/domain/install_linux_cdrom.py | 12 +-- repos/domain/install_linux_net.py | 13 +-- repos/domain/install_windows_cdrom.py | 12 +-- 6 files changed, 29 insertions(+), 160 deletions(-)

2 3

[libvirt] [PATCH] [libvirt-tck] vol->as_xml: fix backing store element
by Guido Günther 14 Oct '11

14 Oct '11

Fix typo that breaks setting the backing store format. --- lib/Sys/Virt/TCK/StorageVolBuilder.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/Sys/Virt/TCK/StorageVolBuilder.pm b/lib/Sys/Virt/TCK/StorageVolBuilder.pm index 515795f..da90788 100644 --- a/lib/Sys/Virt/TCK/StorageVolBuilder.pm +++ b/lib/Sys/Virt/TCK/StorageVolBuilder.pm @@ -112,7 +112,7 @@ sub as_xml { $w->startTag("backingStore"); $w->dataElement("path", $self->{backingFile}); if ($self->{backingFormat}) { - $w->emptyTag("format", type => $self->{backinFormat}); + $w->emptyTag("format", type => $self->{backingFormat}); } if ($self->{secret}) { $w->startTag("encryption", format => "qcow"); -- 1.7.6.3

2 2

[libvirt] [PATCH] Fix syntax problem in mingw32-libvirt.spec.in
by Daniel P. Berrange 14 Oct '11

14 Oct '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> When defining macros, you can't put comments on the end of the line because they will get included in the macro definition * mingw32-libvirt.spec.in: Fix comment about hyperv --- mingw32-libvirt.spec.in | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) Pushed under the build-breaker rule diff --git a/mingw32-libvirt.spec.in b/mingw32-libvirt.spec.in index 57c67ae..521790c 100644 --- a/mingw32-libvirt.spec.in +++ b/mingw32-libvirt.spec.in @@ -10,7 +10,8 @@ # libraries exist. %define with_phyp 0%{!?_without_phyp:1} %define with_esx 0%{!?_without_esx:1} -%define with_hyperv 0%{!?_without_hyperv:0} # missing libwsman +# missing libwsman, so can't build hyper-v +%define with_hyperv 0%{!?_without_hyperv:0} %define with_xenapi 0%{!?_without_xenapi:1} # RHEL ships ESX but not PowerHypervisor, HyperV, or libxenserver (xenapi) -- 1.7.6.4

1 0

[libvirt] [RFC PATCH 0/4] powerpc : Libvirt for the PowerPC platform
by Prerna Saxena 14 Oct '11

14 Oct '11

Recent development in KVM for 64-bit Power ISA Book3S machines, allows users to run multiple KVM guest instances on POWER7 and PPC970 processor based systems. Also qemu-system-ppc64 has been enhanced to support a new machine type "pseries" suitable for Power Book3S machines. This addition effectively brings the KVM+qemu combination to run multiple guest instances on a Power Book3S machine. Libvirt continues to be the key interface to configure and manage the KVM guest instances on x86. We would like to enhance libvirt to support KVM guest configuration and management on Power Book3S machines. The following set of patches tries to illustrate the porting issues in libvirt since it has been predominantly designed and used for x86 KVM. I would like to discuss these issues and list out the possibilities of refactoring the code and make it easier for adding support for non-x86 architectures. Some of the key changes that would be needed in libvirt to manage guests on qemu-system-ppc64 'pseries' platform would be as follows: 1) A new driver would be needed for PowerPC CPU, to identify and filter supported PowerPC-CPU families. 2) A new set of interfaces would be needed to extract host system and firmware information (SMBIOS and host-OS information like CPU and memory topology, processor type, hardware threads, etc). 3) Clean abstraction of platform-specific references such as ACPI dependencies from generic domain initialization sequence. (Many such options get automatically selected by libvirt, unless they are explicitly flagged as unrequired in XML. This default list will differ for every architecture). 4) A mechanism to specify the list of allowable devices for every architecture -- the 'pseries' vm would boot with its own set of devices, some of which may not be available with x86. In order to address the above requirements, we could take one of the following implementation schemes: Approach 1: ----------- Create a new host backend for powerpc-kvm -- similar to xen, kvm, esx, etc. Advantage : Even if the qemu device model on ppc varies significantly, the difference between the device model between qemu-system-ppc64 and qemu-system-x86_64 can be easily managed. It could possibly allow easier ways of segregating supported devices, and also specifying a new set of methods to gather host system information. Drawback: - Overhead of maintaining a new backend, which is expected to have some similarities with the x86-specific 'KVM' backend. - Might get confusing for end users. Approach 2: ----------- Hack the present 'kvm' backend to add powerpc-specific features. Advantage: Having a seamless 'kvm' interface across architectures would be of more convenience to the end-user -- a single XML spec could work with only a small subset of arch-specific changes. Also, newer features that come in for one arch would be more easily ported to others. However, it would entail more run-time switches based on the host kvm architecture. One way to do this would be to add a new arch-specific layer within the 'kvm' backend. This would be compiled-in depending on the host architecture, and would expose only those features (system information, devices, features etc) which are implemented in kvm _on_that_platform_. Drawback: This will cause some rewriting of how internal qemu/kvm interfaces interact in libvirt. The attached patch series (albeit hackish in nature) attempts to illustrate the difference in the architecture and call out parts of the libvirt code that would need changes. -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India

3 17