- Devel - libvirt List Archives

[libvirt] [libosinfo 1/2] Add gvir_connection_create_storage_pool()
by Zeeshan Ali (Khattak) 26 Oct '11

26 Oct '11

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> API to create new storage pools. --- libvirt-gobject/libvirt-gobject-connection.c | 40 ++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-connection.h | 6 ++++ libvirt-gobject/libvirt-gobject.sym | 1 + 3 files changed, 47 insertions(+), 0 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index 30b7792..43a262a 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -1201,3 +1201,43 @@ GVirDomain *gvir_connection_create_domain(GVirConnection *conn, return g_object_ref(domain); } + +/** + * gvir_connection_create_storage_pool: + * @conn: the connection on which to create the pool + * @conf: the configuration for the new storage pool + * Returns: (transfer full): the newly created storage pool + */ +GVirStoragePool *gvir_connection_create_storage_pool + (GVirConnection *conn, + GVirConfigStoragePool *conf, + GError **err) { + const gchar *xml; + virStoragePoolPtr handle; + GVirConnectionPrivate *priv = conn->priv; + + xml = gvir_config_object_get_doc(GVIR_CONFIG_OBJECT(conf)); + + g_return_val_if_fail(xml != NULL, NULL); + + if (!(handle = virStoragePoolDefineXML(priv->conn, xml, 0))) { + *err = gvir_error_new_literal(GVIR_CONNECTION_ERROR, + 0, + "Failed to create storage pool"); + return NULL; + } + + GVirStoragePool *pool; + + pool = GVIR_STORAGE_POOL(g_object_new(GVIR_TYPE_STORAGE_POOL, + "handle", handle, + NULL)); + + g_mutex_lock(priv->lock); + g_hash_table_insert(priv->pools, + (gpointer)gvir_storage_pool_get_uuid(pool), + pool); + g_mutex_unlock(priv->lock); + + return g_object_ref(pool); +} diff --git a/libvirt-gobject/libvirt-gobject-connection.h b/libvirt-gobject/libvirt-gobject-connection.h index 8c1d1a4..3a8d888 100644 --- a/libvirt-gobject/libvirt-gobject-connection.h +++ b/libvirt-gobject/libvirt-gobject-connection.h @@ -160,6 +160,12 @@ GVirStoragePool *gvir_connection_get_storage_pool(GVirConnection *conn, GVirStoragePool *gvir_connection_find_storage_pool_by_name(GVirConnection *conn, const gchar *name); +GVirStoragePool *gvir_connection_create_storage_pool + (GVirConnection *conn, + GVirConfigStoragePool *conf, + GError **err); + + GVirStream *gvir_connection_get_stream(GVirConnection *conn, gint flags); diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index e019e22..f1fa78b 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -27,6 +27,7 @@ LIBVIRT_GOBJECT_0.0.1 { gvir_connection_find_domain_by_name; gvir_connection_find_storage_pool_by_name; gvir_connection_create_domain; + gvir_connection_create_storage_pool; gvir_domain_get_type; gvir_domain_handle_get_type; -- 1.7.6.4

2 5

[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