- Devel - libvirt List Archives

[libvirt] [libvirt-glib 1/2] Add API to build & start storage pools
by Zeeshan Ali (Khattak) 27 Oct '11

27 Oct '11

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gobject/libvirt-gobject-storage-pool.c | 44 ++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-storage-pool.h | 8 ++++ libvirt-gobject/libvirt-gobject.sym | 2 + 3 files changed, 54 insertions(+), 0 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.c b/libvirt-gobject/libvirt-gobject-storage-pool.c index bd3be94..74ecabc 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.c +++ b/libvirt-gobject/libvirt-gobject-storage-pool.c @@ -518,3 +518,47 @@ GVirStorageVol *gvir_storage_pool_create_volume return g_object_ref(volume); } + +/** + * gvir_storage_pool_build: + * @pool: the storage pool to build + * @flags: the flags + * @err: return location for any #GError + * + * Return value: #True on success, #False otherwise. + */ +gboolean gvir_storage_pool_build (GVirStoragePool *pool, + guint64 flags G_GNUC_UNUSED, + GError **err) +{ + if (virStoragePoolBuild(pool->priv->handle, 0)) { + *err = gvir_error_new_literal(GVIR_STORAGE_POOL_ERROR, + flags, + "Failed to build storage pool"); + return FALSE; + } + + return TRUE; +} + +/** + * gvir_storage_pool_start: + * @pool: the storage pool to start + * @flags: the flags + * @err: return location for any #GError + * + * Return value: #True on success, #False otherwise. + */ +gboolean gvir_storage_pool_start (GVirStoragePool *pool, + guint64 flags G_GNUC_UNUSED, + GError **err) +{ + if (virStoragePoolCreate(pool->priv->handle, 0)) { + *err = gvir_error_new_literal(GVIR_STORAGE_POOL_ERROR, + flags, + "Failed to start storage pool"); + return FALSE; + } + + return TRUE; +} diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.h b/libvirt-gobject/libvirt-gobject-storage-pool.h index 620f888..7b13ef9 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.h +++ b/libvirt-gobject/libvirt-gobject-storage-pool.h @@ -88,6 +88,14 @@ GVirStorageVol *gvir_storage_pool_create_volume GVirConfigStorageVol *conf, GError **err); +gboolean gvir_storage_pool_build (GVirStoragePool *pool, + guint64 flags, + GError **err); + +gboolean gvir_storage_pool_start (GVirStoragePool *pool, + guint64 flags, + GError **err); + G_END_DECLS #endif /* __LIBVIRT_GOBJECT_STORAGE_POOL_H__ */ diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index f1fa78b..4b1b84c 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -89,6 +89,8 @@ LIBVIRT_GOBJECT_0.0.1 { gvir_storage_pool_get_volumes; gvir_storage_pool_get_volume; gvir_storage_pool_create_volume; + gvir_storage_pool_build; + gvir_storage_pool_start; gvir_storage_vol_get_type; gvir_storage_vol_handle_get_type; -- 1.7.6.4

2 3

Re: [libvirt] [RFC PATCH v3 0/4] Improve Ceph Qemu+RBD support
by Sage Weil 27 Oct '11

27 Oct '11

Hi Daniel, Is this iteration closer to what you had in mind? Obscuring the passing of secrets into qemu is going to need changes on the qemu end, but it would be great to get authentication at least working in the meantime. sage On Thu, 20 Oct 2011, Josh Durgin wrote: > The current support for qemu and Ceph RBD (rados block device) has two > main deficiencies: authentication doesn't work, and it relies on > environment variables (which don't work with latest upstream). This > patch set addresses both those problems. > > The first two patches update the xml schemas and conf to add a Ceph > secret type and to specify authentication information along with the > rbd disk. > > The next patch passes virConnectPtr into the Domain{Attach,Detach} > methods (needed to access secrets while building the qemu command). > > The final patch replaces the current RBD qemu code and uses the new > conf info to do authentication properly. We still need to make a > change there to avoid having the authentication key show up on qemu > command line (there are a few ways to do this, which will be discussed > in a separate email). > > Changes from v2: > make <auth> a direct child of <disk> instead of <source> > allow secret lookup by UUID or usage > test with fake secret driver > other fixes from Daniel's review > > Changes from v1: > update docs/schemas/{domain,secret}.rng > > Josh Durgin (1): > storage: add auth to virDomainDiskDef > > Sage Weil (3): > secret: add Ceph secret type > qemu: pass virConnectPtr into Domain{Attach,Detach}* > qemu/rbd: improve rbd device specification > > docs/schemas/domaincommon.rng | 29 ++ > docs/schemas/secret.rng | 10 + > include/libvirt/libvirt.h.in | 3 + > src/Makefile.am | 3 +- > src/conf/domain_conf.c | 105 +++++++- > src/conf/domain_conf.h | 17 ++ > src/conf/secret_conf.c | 23 ++- > src/conf/secret_conf.h | 1 + > src/qemu/qemu_command.c | 289 ++++++++++++-------- > src/qemu/qemu_command.h | 3 +- > src/qemu/qemu_driver.c | 17 +- > src/qemu/qemu_hotplug.c | 15 +- > src/qemu/qemu_hotplug.h | 9 +- > src/secret/secret_driver.c | 8 + > .../qemuxml2argv-disk-drive-network-rbd-auth.args | 6 + > .../qemuxml2argv-disk-drive-network-rbd-auth.xml | 37 +++ > .../qemuxml2argv-disk-drive-network-rbd.args | 6 +- > tests/qemuxml2argvtest.c | 52 ++++ > 18 files changed, 485 insertions(+), 148 deletions(-) > create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args > create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.xml > > -- > To unsubscribe from this list: send the line "unsubscribe ceph-devel" in > the body of a message to majordomo(a)vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > >

1 0

[libvirt] Minor correction in the website text
by Siddhesh Poyarekar 26 Oct '11

26 Oct '11

Hi, http://libvirt.org/qpid/ mentions QMF as the Qpid Modeling Framework, which is incorrect. It is the Qpid Management Framework. -- Siddhesh

2 1

[libvirt] [PATCH] qemu: simplify use of HAVE_YAJL
by Eric Blake 26 Oct '11

26 Oct '11

Rather than making all clients of monitor commands that are JSON-only check whether yajl support was compiled in, it is simpler to just avoid setting the capability bit up front if we can't use the capability. * src/qemu/qemu_capabilities.c (qemuCapsComputeCmdFlags): Only set capability bit if we also have yajl library to use it. * src/qemu/qemu_driver.c (qemuDomainReboot): Drop #ifdefs. * src/qemu/qemu_process.c (qemuProcessStart): Likewise. --- As mentioned here: https://www.redhat.com/archives/libvir-list/2011-October/msg01004.html src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_driver.c | 6 ------ src/qemu/qemu_process.c | 2 -- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 5f0356c..b4ab55b 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1060,8 +1060,10 @@ qemuCapsComputeCmdFlags(const char *help, * two features. The benefits of JSON mode now outweigh * the downside. */ +#if HAVE_YAJL if (version >= 13000) qemuCapsSet(flags, QEMU_CAPS_MONITOR_JSON); +#endif if (version >= 13000) qemuCapsSet(flags, QEMU_CAPS_PCI_MULTIFUNCTION); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0a0a34a..55a9652 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1538,9 +1538,7 @@ static int qemuDomainReboot(virDomainPtr dom, unsigned int flags) { struct qemud_driver *driver = dom->conn->privateData; virDomainObjPtr vm; int ret = -1; -#if HAVE_YAJL qemuDomainObjPrivatePtr priv; -#endif virCheckFlags(0, -1); @@ -1556,7 +1554,6 @@ static int qemuDomainReboot(virDomainPtr dom, unsigned int flags) { goto cleanup; } -#if HAVE_YAJL priv = vm->privateData; if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_MONITOR_JSON)) { @@ -1586,12 +1583,9 @@ static int qemuDomainReboot(virDomainPtr dom, unsigned int flags) { if (qemuDomainObjEndJob(driver, vm) == 0) vm = NULL; } else { -#endif qemuReportError(VIR_ERR_OPERATION_INVALID, "%s", _("Reboot is not supported without the JSON monitor")); -#if HAVE_YAJL } -#endif cleanup: if (vm) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index a7fe86c..cc2395f 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2962,11 +2962,9 @@ int qemuProcessStart(virConnectPtr conn, if (qemuProcessPrepareMonitorChr(driver, priv->monConfig, vm->def->name) < 0) goto cleanup; -#if HAVE_YAJL if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_MONITOR_JSON)) priv->monJSON = 1; else -#endif priv->monJSON = 0; priv->monError = false; -- 1.7.4.4

2 5

[libvirt] [PATCHv2 00/13] fix <domainsnapshot> indentation
by Eric Blake 26 Oct '11

26 Oct '11

A rather revamped series, based on comments from v1: https://www.redhat.com/archives/libvir-list/2011-September/msg00916.html Implementing auto-indent as part of virBuffer indeed makes things easier - I no longer have to pass around an explicit indent parameter, since it is instead part of the virBufferPtr already being passed. If you are trying to compare to the v1 thread, the correlation is: 1 - new to this series 2 - split out from 1/14 3 - new to this series 4 - new to this series 5 - compare to 2/14 6 - compare to 14/14 7 - compare to 4/14 8 - compare to 5/14 9 - compare to 9/14 10 - compare to 11/14 11 - compare to 10/14 12 - folds in changes from 3, 6, 7, 8, 12, 13/14 13 - compare to 1/14, although I'm okay with ditching this one now With just patches 1-12, there is a net reduction in lines of code in src/ (the overall series adds lines, but that's thanks to tests/). Eric Blake (13): virbuf: fix const-correctness virbuf: improve testsuite reporting virbuf: more detailed error reporting virbuf: add auto-indentation support snapshot: indent domain xml when nesting snapshot: test domainsnapshot indentation snapshot: simplify indentation of sysinfo snapshot: simplify indentation of cpu features snapshot: simplify indentation of network xml snapshot: simplify indentation of nwfilter snapshot: simplify indentation of disk encryption xml snapshot: minor cleanups from reviewing indentation virbuf: add explicit indentation functions .gitignore | 1 + src/conf/capabilities.c | 8 +- src/conf/cpu_conf.c | 42 +-- src/conf/cpu_conf.h | 9 +- src/conf/domain_conf.c | 268 +++++++------- src/conf/domain_conf.h | 5 +- src/conf/network_conf.c | 14 +- src/conf/nwfilter_conf.c | 18 +- src/conf/nwfilter_params.c | 45 +-- src/conf/nwfilter_params.h | 7 +- src/conf/storage_conf.c | 9 +- src/conf/storage_encryption_conf.c | 20 +- src/conf/storage_encryption_conf.h | 5 +- src/cpu/cpu.c | 2 +- src/libvirt_private.syms | 6 + src/qemu/qemu_driver.c | 9 +- src/qemu/qemu_migration.c | 25 +- src/util/buf.c | 258 +++++++++---- src/util/buf.h | 46 ++- src/util/network.c | 49 +-- src/util/network.h | 11 +- src/util/sysinfo.c | 399 +++++++-------------- src/util/sysinfo.h | 3 +- tests/Makefile.am | 14 +- tests/cputest.c | 2 +- tests/domainsnapshotxml2xmlout/all_parameters.xml | 2 +- tests/domainsnapshotxml2xmlout/disk_snapshot.xml | 102 +++--- tests/domainsnapshotxml2xmlout/full_domain.xml | 52 ++-- tests/domainsnapshotxml2xmltest.c | 128 +++++++ tests/testutils.c | 2 +- tests/virbuftest.c | 123 ++++++- 31 files changed, 949 insertions(+), 735 deletions(-) create mode 100644 tests/domainsnapshotxml2xmltest.c -- 1.7.4.4

4 54

[libvirt] [PATCH] storage: avoid null deref on qemu-img failure
by Eric Blake 26 Oct '11

26 Oct '11

Detected by Coverity. Only possible if qemu-img gives bogus output, but we might as well be robust. * src/storage/storage_backend.c (virStorageBackendQEMUImgBackingFormat): Check for strstr failure. --- src/storage/storage_backend.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 64c35c2..7c8bfdc 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -631,8 +631,9 @@ static int virStorageBackendQEMUImgBackingFormat(const char *qemuimg) if (virCommandRun(cmd, &exitstatus) < 0) goto cleanup; - start = strstr(help, " create "); - end = strstr(start, "\n"); + if ((start = strstr(help, " create ")) == NULL || + (end = strstr(start, "\n")) == NULL) + goto cleanup; if (((tmp = strstr(start, "-F fmt")) && tmp < end) || ((tmp = strstr(start, "-F backing_fmt")) && tmp < end)) ret = QEMU_IMG_BACKING_FORMAT_FLAG; -- 1.7.4.4

2 2

[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