- Devel - libvirt List Archives

[libvirt] [PATCH v1 1/2] change qemu_driver's qemuImgBinary field
by liguang 22 Nov '12

22 Nov '12

qemuImgBinary is a poor name, change to qemuImgTool, and init it at qemu driver start-up phase, before this change, if we need qemu-img or kvm-img we have to call qemuFindQemuImgBinary every time, seems a little boring, from then on, we can use qemuImgTool directly, e.g. use virCommandRun(driver->qemuImgTool, ...) instead of img_tool = qemuFindQemuImgBinary(driver); qemuFindQemuImgBinary(img_tool, ...); Signed-off-by: liguang <lig.fnst(a)cn.fujitsu.com> --- src/qemu/qemu_conf.h | 2 +- src/qemu/qemu_domain.c | 22 ++-------------------- src/qemu/qemu_domain.h | 2 -- src/qemu/qemu_driver.c | 12 ++++++++++-- 4 files changed, 13 insertions(+), 25 deletions(-) diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 2c7f70c..47f349c 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -84,7 +84,7 @@ struct qemud_driver { char *cacheDir; char *saveDir; char *snapshotDir; - char *qemuImgBinary; + char *qemuImgTool; unsigned int vncAutoUnixSocket : 1; unsigned int vncTLS : 1; unsigned int vncTLSx509verify : 1; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index e0d6951..97e4fa1 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1588,22 +1588,6 @@ cleanup: return ret; } -/* Locate an appropriate 'qemu-img' binary. */ -const char * -qemuFindQemuImgBinary(struct qemud_driver *driver) -{ - if (!driver->qemuImgBinary) { - driver->qemuImgBinary = virFindFileInPath("kvm-img"); - if (!driver->qemuImgBinary) - driver->qemuImgBinary = virFindFileInPath("qemu-img"); - if (!driver->qemuImgBinary) - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("unable to find kvm-img or qemu-img")); - } - - return driver->qemuImgBinary; -} - int qemuDomainSnapshotWriteMetadata(virDomainObjPtr vm, virDomainSnapshotObjPtr snapshot, @@ -1659,11 +1643,9 @@ qemuDomainSnapshotForEachQcow2Raw(struct qemud_driver *driver, int i; bool skipped = false; - qemuimgarg[0] = qemuFindQemuImgBinary(driver); - if (qemuimgarg[0] == NULL) { - /* qemuFindQemuImgBinary set the error */ + qemuimgarg[0] = driver->qemuImgTool; + if (qemuimgarg[0] == NULL) return -1; - } qemuimgarg[2] = op; qemuimgarg[3] = name; diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index a2acc0a..548cd20 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -300,8 +300,6 @@ int qemuDomainAppendLog(struct qemud_driver *driver, int logFD, const char *fmt, ...) ATTRIBUTE_FMT_PRINTF(4, 5); -const char *qemuFindQemuImgBinary(struct qemud_driver *driver); - int qemuDomainSnapshotWriteMetadata(virDomainObjPtr vm, virDomainSnapshotObjPtr snapshot, char *snapshotDir); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 436e853..e87e7b4 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -643,6 +643,14 @@ qemudStartup(int privileged) { if (!qemu_driver->domainEventState) goto error; + /* find kvm-img or qemu-img */ + qemu_driver->qemuImgTool = virFindFileInPath("kvm-img"); + if (!qemu_driver->qemuImgTool) + qemu_driver->qemuImgTool = virFindFileInPath("qemu-img"); + if (!qemu_driver->qemuImgTool) + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("unable to find kvm-img or qemu-img")); + /* read the host sysinfo */ if (privileged) qemu_driver->hostsysinfo = virSysinfoRead(); @@ -1029,7 +1037,7 @@ qemudShutdown(void) { VIR_FREE(qemu_driver->cacheDir); VIR_FREE(qemu_driver->saveDir); VIR_FREE(qemu_driver->snapshotDir); - VIR_FREE(qemu_driver->qemuImgBinary); + VIR_FREE(qemu_driver->qemuImgTool); VIR_FREE(qemu_driver->autoDumpPath); VIR_FREE(qemu_driver->vncTLSx509certdir); VIR_FREE(qemu_driver->vncListen); @@ -10706,7 +10714,7 @@ qemuDomainSnapshotCreateInactiveExternal(struct qemud_driver *driver, int ret = -1; - if (!(qemuImgPath = qemuFindQemuImgBinary(driver))) + if (!(qemuImgPath = driver->qemuImgTool)) return -1; if (!(created = virBitmapNew(snap->def->ndisks))) { -- 1.7.1

4 8

[libvirt] [PATCH] storage: Improve virStorageBackendFileSystemStop
by Osier Yang 22 Nov '12

22 Nov '12

It's actually not used for DIR pool. So removing the checking. --- src/storage/storage_backend_fs.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 3322677..10daee3 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -933,7 +933,7 @@ no_memory: * @conn connection to report errors against * @pool storage pool to start * - * Stops a directory or FS based storage pool. + * Stops a FS based storage pool. * * - If it is a FS based pool, unmounts the unlying source device on the pool * - Releases all cached data about volumes @@ -943,8 +943,7 @@ static int virStorageBackendFileSystemStop(virConnectPtr conn ATTRIBUTE_UNUSED, virStoragePoolObjPtr pool) { - if (pool->def->type != VIR_STORAGE_POOL_DIR && - virStorageBackendFileSystemUnmount(pool) < 0) + if (virStorageBackendFileSystemUnmount(pool) < 0) return -1; return 0; -- 1.7.7.6

2 2

[libvirt] [PATCH] storage: Fix bug of fs pool destroying
by Osier Yang 22 Nov '12

22 Nov '12

Regression introduced by commit 258e06c85b7, "ret" could be set to 1 or 0 by virStorageBackendFileSystemIsMounted before goto cleanup. This could mislead the callers (up to the public API virStoragePoolDestroy) to return success even the underlying umount command fails. --- src/storage/storage_backend_fs.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 10daee3..cbcbe34 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -449,6 +449,7 @@ static int virStorageBackendFileSystemUnmount(virStoragePoolObjPtr pool) { virCommandPtr cmd = NULL; int ret = -1; + int rc; if (pool->def->type == VIR_STORAGE_POOL_NETFS) { if (pool->def->source.nhost != 1) { @@ -475,8 +476,8 @@ virStorageBackendFileSystemUnmount(virStoragePoolObjPtr pool) { } /* Short-circuit if already unmounted */ - if ((ret = virStorageBackendFileSystemIsMounted(pool)) != 1) { - if (ret < 0) + if ((rc = virStorageBackendFileSystemIsMounted(pool)) != 1) { + if (rc < 0) return -1; else return 0; -- 1.7.7.6

2 2

[libvirt] [PATCH] run bootstrap if .gnulib is not present
by Hu Tao 22 Nov '12

22 Nov '12

If .gnulib is deleted unexpectedly, autogen.sh will fail with message: fatal: ambiguous argument '.gnulib': unknown revision or path not in the working tree. Use '--' to separate paths from revisions, like this: 'git <command> [<revision>...] -- [<file>...]' which is actually given by git diff .gnulib, which doesn't exist. In the case to run bootstrap to create .gnulib. --- autogen.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/autogen.sh b/autogen.sh index d183397..07c58a1 100755 --- a/autogen.sh +++ b/autogen.sh @@ -62,7 +62,9 @@ bootstrap_hash() # Only run bootstrap from a git checkout, never from a tarball. if test -d .git; then curr_status=.git-module-status - t=$(bootstrap_hash; git diff .gnulib) + if test -d .gnulib; then + t=$(bootstrap_hash; git diff .gnulib) + fi case $t:${CLEAN_SUBMODULE+set} in *:set) ;; *-dirty*) -- 1.7.11.7

2 3

[libvirt] [PATCHv4 0/4] Add initial support for reverting snapshots
by Peter Krempa 21 Nov '12

21 Nov '12

I'm reposting another version of the series. This version fixes small mistakes in patches 1-3 and reposts patch 4 as it got missing due to a sending error. Peter Krempa (4): qemu: Split out guts of qemuDomainSaveImageStartVM() to allow reuse snapshot: Add flag VIR_DOMAIN_SNAPSHOT_REVERT_STOPPED snapshot: Add flag to allow hypervisor restart when reverting snapshots snapshot: qemu: Implement reverting of external snapshots include/libvirt/libvirt.h.in | 3 + src/libvirt.c | 36 ++-- src/qemu/qemu_driver.c | 389 ++++++++++++++++++++++++++++++++++++++++--- tools/virsh-snapshot.c | 7 + tools/virsh.pod | 19 ++- 5 files changed, 410 insertions(+), 44 deletions(-) -- 1.8.0

3 14

[libvirt] libvirt RBD attach regression?
by Scott Sullivan 21 Nov '12

21 Nov '12

Hello, I have been testing libvirt v1.0.0 for deployment within my organization, and in the process discovered what appears to be a bug that breaks virsh attach-device, when attaching an RBD volume to an instance. First, here is the error presented, with v1.0.0 (this worked in v0.10.2): [root@host ~]# virsh attach-device W5APQ8 G84VV1.xml error: Failed to attach device from G84VV1.xml error: cannot open file 'dc3-1-test/G84VV1': No such file or directory [root@host ~]# W5APQ8 is my running QEMU/KVM instance, and G84VV1.xml contains the following: <disk type='network' device='disk'> <driver name='qemu' type='raw'/> <auth username="removed"> <secret type="ceph" uuid="removed"/> </auth> <source protocol='rbd' name='dc3-1-test/G84VV1'> <host name="X.X.X.X" port="6789"/> <host name="X.X.X.X" port="6789"/> <host name="X.X.X.X" port="6789"/> </source> <target dev='vdc' bus='virtio'/> <serial>hpbs-G84VV1</serial> </disk> Using git bisect, I narrowed the problem down to this as the first commit to break this setup: 4d34c92947e8cf9e9bedfa227ada1d2dba92d68a is the first bad commit commit 4d34c92947e8cf9e9bedfa227ada1d2dba92d68a Author: Eric Blake <eblake(a)redhat.com> Date: Tue Oct 9 16:08:14 2012 -0600 These all look closely related as well to the problem commit: http://libvirt.org/git/?p=libvirt.git;a=commitdiff;h=67aea3fb780346b4aa5aea… http://libvirt.org/git/?p=libvirt.git;a=commitdiff;h=38c4a9cc40476bd2e598a1… http://libvirt.org/git/?p=libvirt.git;a=commitdiff;h=4d34c92947e8cf9e9bedfa… If I build libvirt from sources before these commits and then run the exact virsh-attach command shown above, the attachment works and I do not get any errors. I wanted to see if anyone had any insights on this, or perhaps a commit to correct this issue. If I can be of any further assistance with this, let me know. Thanks, Scott Sullivan

2 3

[libvirt] [libvirt-glib] gobject: Also delete storage volume from its pool's list
by Zeeshan Ali (Khattak) 21 Nov '12

21 Nov '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> Without this patch, storage pool still lists the volume even after it is deleted. Related Boxes bug: https://bugzilla.gnome.org/show_bug.cgi?id=688724 --- libvirt-gobject/libvirt-gobject-storage-pool.c | 23 +++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-storage-vol.c | 4 ++++ 2 files changed, 27 insertions(+) diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.c b/libvirt-gobject/libvirt-gobject-storage-pool.c index 8f579a1..df7e77c 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.c +++ b/libvirt-gobject/libvirt-gobject-storage-pool.c @@ -29,6 +29,7 @@ #include "libvirt-glib/libvirt-glib.h" #include "libvirt-gobject/libvirt-gobject.h" #include "libvirt-gobject-compat.h" +#include "libvirt-gobject-storage-pool-private.h" #define GVIR_STORAGE_POOL_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_STORAGE_POOL, GVirStoragePoolPrivate)) @@ -1129,3 +1130,25 @@ gboolean gvir_storage_pool_delete_finish(GVirStoragePool *pool, return TRUE; } + +G_GNUC_INTERNAL gboolean gvir_storage_pool_delete_vol(GVirStoragePool *pool, + GVirStorageVol *volume) +{ + GVirStoragePoolPrivate *priv; + gboolean ret = FALSE; + + g_return_val_if_fail(GVIR_IS_STORAGE_POOL(pool), FALSE); + g_return_val_if_fail(GVIR_IS_STORAGE_VOL(volume), FALSE); + + priv = pool->priv; + g_mutex_lock(priv->lock); + if (priv->volumes != NULL) { + const gchar *name = gvir_storage_vol_get_name(volume); + ret = g_hash_table_remove(priv->volumes, name); + } else { + g_warn_if_reached(); + } + g_mutex_unlock(priv->lock); + + return ret; +} diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.c b/libvirt-gobject/libvirt-gobject-storage-vol.c index c7ebb45..4352d30 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.c +++ b/libvirt-gobject/libvirt-gobject-storage-vol.c @@ -29,6 +29,7 @@ #include "libvirt-glib/libvirt-glib.h" #include "libvirt-gobject/libvirt-gobject.h" #include "libvirt-gobject-compat.h" +#include "libvirt-gobject-storage-pool-private.h" #define GVIR_STORAGE_VOL_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_STORAGE_VOL, GVirStorageVolPrivate)) @@ -309,6 +310,9 @@ gboolean gvir_storage_vol_delete(GVirStorageVol *vol, g_return_val_if_fail(GVIR_IS_STORAGE_VOL(vol), FALSE); g_return_val_if_fail(err == NULL || *err == NULL, FALSE); + if (!gvir_storage_pool_delete_vol(vol->priv->pool, vol)) + return FALSE; + if (virStorageVolDelete(vol->priv->handle, flags) < 0) { gvir_set_error_literal(err, GVIR_STORAGE_VOL_ERROR, -- 1.8.0

3 4

[libvirt] RFC: Migration with NPIV
by Osier Yang 21 Nov '12

21 Nov '12

Hi, This proposal is trying to figure out a solution for migration of domain which uses LUN behind vHBA as disk device (QEMU emulated disk only at this stage). And other related NPIV improvements which are not related with migration. I'm not luck to get a environment to test if the thoughts are workable, but I'd like see if guys have good idea/suggestions earlier. 1) Persistent vHBA support This is the useful stuff missed for long time. Assuming that one created a vHBA, did masking/zoning, everything works as expected. However, after a system rebooting, everything is just lost. If the user wants to get things back, he has to find out the preivous WWNN & WWPN, and create the vHBA again. On the other hand, Persistent vHBA support is actually required for domain which uses LUN behind a vHBA. Othewise the domain could fail to start after a system rebooting. To support the persistent vHBA, new APIs like virNodeDeviceDefineXML, virNodeDeviceUndefine is required. Also it's useful to introduce "autostart" for vHBA, so that the vHBA could be started automatically after system rebooting. Proposed APIs: virNodeDevicePtr virNodeDeviceDefineXML(virConnectPtr conn, const char *xml, unsigned int flags); int virNodeDeviceUndefine(virConnectPtr conn, virNodeDevicePtr dev, unsigned int flags); int virNodeDeviceSetAutostart(virNodeDevicePtr dev, int autostart, unsigned int flags); int virNodeDeviceGetAutostart(virNodeDevicePtr dev, int *autostart, unsigned int flags); 2) Associate vHBA with domain XML There are two ways to attach a LUN to a domain: as an QEMU emulated device; or passthrough. Since passthrough a LUN is not supported in libvirt yet, let's focus on the emulated LUN at this stage. New attributes "wwnn" and "wwpn" are introduced to indicate the LUN behind the vHBA. E.g. <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source wwnn="2001001b32a9da4e" wwpn="2101001b32a90004"/> <target dev='vda' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> </disk> Before the domain starting, we have to check if there is LUN assigned to the vHBA, error out if not. Using the stable path of LUN also works, e.g. <source dev="/dev/disk/by-path/pci-0000\:00\:07.0-scsi-0\:0\:0\:0"/> But the disadvantage is the user have to figure out the stable path himself; And we have to do checking of every stable path to see if it's behind a vHBA in migration "Begin" stage. Or an new XML tag for element "source" to indicate that it's behind a vHBA? such as: <source dev="disk-by-path" model="vport"/> 3) Migration with vHBA One possible solution for migration with vHBA is to use one pair of WWNN & WWPN on source host, one is using for domain, one is reserved for migration purpose. It requires the storage admin maps the same LUN to the two vHBAs when doing the masking and zoning. One of the two vHBA is called "Primary vHBA", another is called "secondary vHBA". To maitain the relationship between these two vHBAs, we have to introduce new XMLs to vHBA. E.g. In XML of primary vHBA: <secondary wwpn="2101001b32a90004"/> In XML of secondary vHBA: <primary wwpn="2101001b32a90002"/> Primary vHBA is going to be guaranteed not used by any domain which is driven by libvirt (we do some checking eariler before the domain starting). And it's also guaranteed that the LUN can't be used by other domain with sVirt or Sanlock. So it's safe to have two vHBAs on source host too. To prevent one using the LUN by creating vHBA using the same WWNN & WWPN on another host, we must create the secondary vHBA on source host, even it's not being used. Both primary and secondary vHBA must be defined and marked as "autostart" so that the domain could be started after system rebooting. When do migration, we have to bake a bigger cookie with secondary vHBA's info (basically it's WWNN and WWPN) in migration "Begin" stage, and eat that in migration "Prepare" stage on target host. In "Begin" stage, the XMLs represents the secondary vHBA is constructed. And the secondary vHBA is destoyed on source host, not undefined though. In "Prepare" stage, a new vHBA is created (define and start) on target host with the same WWNN & WWPN as secondary vHBA on source host. The LUN then should be visible to target host automatically? and thus migration can be performed. After migration is finished on target host, the primary vHBA on source host is destroyed, not undefined. If migration fails, the new vHBA created on target host will be destroyed and undefined. And both primary and secondary vHBA on source host will be started, so that the domain could be resumed. Finally if migration succeeds, primary vHBA on source host will be transtered to target host as secondary vHBA (defined). And both primary and secondary vHBA on source host will be undefined. 4) Enrich HBA's XML It's hard to known the vHBAs created from a HBA with current implementation. One have to dump XML of each (v)HBAs and find out the clue with element "parent" of vHBAs. It's good to introduce new element for HBA like "vports", so that one can easily known what (how many) vHBAs are created from the HBA? And also it's good to have the maximum vports the HBA supports. Except these, other useful information should be exposed too, such as the vendor name, the HBA state, PCI address, etc. The new XMLs should be like: <vports num='2' max='64'> <vport name="scsi_host40" wwpn="2101001b32a90004"/> <vport name="scsi_host40" wwpn="2101001b32a90005"/> </vports> <online/> <vendor>QLogic</vendor> <address type="pci" domain="0" bus="0" slot="5" function="0"/> "online", "vendor", "address" make sense to vHBA too. 5) Improve the way to lookup LUN's stable path Currently, to lookup the LUN's stable path with WWNN & WWPN, it needs to iterate over the sysfs each time, maintaining the stable path in vHBA's XML doesn't make sense, as the LUN assigned to the vHBA could be changed as the storage admin's mood. I'm wondering if there is a way to notify the change asynchronously, if there is, then maintaining the stable path internally make sense. 6) Miscellaneous This is only about QEMU emulated device, passthroughed scsi_host with vHBA is still not covered, we have to support the vHBA passthough first. The good thing is the solution should be similiar. Regards, Osier

5 11

[libvirt] [libvirt-glib] Return an error when virConnectGetVersion returns 0
by Christophe Fergeau 21 Nov '12

21 Nov '12

virConnectGetVersion can return 0 'if the version can't be extracted by lack of capabilities'. I've also seen it return 0 when libvirtd 1.0 is running but virsh 0.10.2 is used to get the version. gvir_connection_get_version is documented as returning 0 on error. However, currently it only sets the corresponding GError when virConnectGetVersion returns -1. Makes sure the GError is also set when 0 is returned. The old behaviour was causing a crash in conn-test as this assumes that the GError will be set when gvir_connection_get_version returns 0. --- libvirt-gobject/libvirt-gobject-connection.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index 3157a66..91cc535 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -1108,6 +1108,12 @@ gvir_connection_get_version(GVirConnection *conn, if (virConnectGetVersion(priv->conn, &ret) < 0) { gvir_set_error_literal(err, GVIR_CONNECTION_ERROR, 0, "Unable to get hypervisor version"); + ret = 0; + } else if (ret == 0) { + /* From virConnectGetVersion doc: "if the version can't be + * extracted by lack of capacities returns 0 and @hvVer is 0" */ + g_set_error_literal(err, GVIR_CONNECTION_ERROR, 0, + "Unknown hypervisor version"); } cleanup: -- 1.8.0

1 0

[libvirt] [PATCH] Use virNetServerRun instead of custom main loop
by Daniel P. Berrange 21 Nov '12

21 Nov '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> The LXC controller code currently directly invokes the libvirt main loop code. The problem is that this misses the cleanup of virNetServerClient connections that virNetServerRun takes care of. The result is that when libvirtd is stopped, the libvirt_lxc controller process gets stuck in a I/O loop. When libvirtd is then started again, it fails to connect to the controller and thus kills of the entire domain. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_controller.c | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 4746897..aec2d4c 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -97,6 +97,8 @@ struct _virLXCControllerConsole { char fromHostBuf[1024]; size_t fromContLen; char fromContBuf[1024]; + + virNetServerPtr server; }; typedef struct _virLXCController virLXCController; @@ -278,6 +280,7 @@ static int virLXCControllerAddConsole(virLXCControllerPtr ctrl, virReportOOMError(); return -1; } + ctrl->consoles[ctrl->nconsoles-1].server = ctrl->server; ctrl->consoles[ctrl->nconsoles-1].hostFd = hostFd; ctrl->consoles[ctrl->nconsoles-1].hostWatch = -1; @@ -663,12 +666,11 @@ static int lxcControllerClearCapabilities(void) return 0; } -static bool quit = false; static bool wantReboot = false; static virMutex lock; -static void virLXCControllerSignalChildIO(virNetServerPtr server ATTRIBUTE_UNUSED, +static void virLXCControllerSignalChildIO(virNetServerPtr server, siginfo_t *info ATTRIBUTE_UNUSED, void *opaque) { @@ -678,8 +680,8 @@ static void virLXCControllerSignalChildIO(virNetServerPtr server ATTRIBUTE_UNUSE ret = waitpid(-1, &status, WNOHANG); if (ret == ctrl->initpid) { + virNetServerQuit(server); virMutexLock(&lock); - quit = true; if (WIFSIGNALED(status) && WTERMSIG(status) == SIGHUP) wantReboot = true; @@ -731,7 +733,7 @@ static void virLXCControllerConsoleUpdateWatch(virLXCControllerConsolePtr consol VIR_DEBUG(":fail"); virReportSystemError(errno, "%s", _("Unable to add epoll fd")); - quit = true; + virNetServerQuit(console->server); goto cleanup; } console->hostEpoll = events; @@ -742,8 +744,8 @@ static void virLXCControllerConsoleUpdateWatch(virLXCControllerConsolePtr consol if (epoll_ctl(console->epollFd, EPOLL_CTL_DEL, console->hostFd, NULL) < 0) { virReportSystemError(errno, "%s", _("Unable to remove epoll fd")); - VIR_DEBUG(":fail"); - quit = true; + VIR_DEBUG(":fail"); + virNetServerQuit(console->server); goto cleanup; } console->hostEpoll = 0; @@ -768,7 +770,7 @@ static void virLXCControllerConsoleUpdateWatch(virLXCControllerConsolePtr consol virReportSystemError(errno, "%s", _("Unable to add epoll fd")); VIR_DEBUG(":fail"); - quit = true; + virNetServerQuit(console->server); goto cleanup; } console->contEpoll = events; @@ -779,8 +781,8 @@ static void virLXCControllerConsoleUpdateWatch(virLXCControllerConsolePtr consol if (epoll_ctl(console->epollFd, EPOLL_CTL_DEL, console->contFd, NULL) < 0) { virReportSystemError(errno, "%s", _("Unable to remove epoll fd")); - VIR_DEBUG(":fail"); - quit = true; + VIR_DEBUG(":fail"); + virNetServerQuit(console->server); goto cleanup; } console->contEpoll = 0; @@ -809,7 +811,7 @@ static void virLXCControllerConsoleEPoll(int watch, int fd, int events, void *op continue; virReportSystemError(errno, "%s", _("Unable to wait on epoll")); - quit = true; + virNetServerQuit(console->server); goto cleanup; } @@ -926,7 +928,7 @@ error: virEventRemoveHandle(console->contWatch); virEventRemoveHandle(console->hostWatch); console->contWatch = console->hostWatch = -1; - quit = true; + virNetServerQuit(console->server); virMutexUnlock(&lock); } @@ -995,14 +997,7 @@ static int virLXCControllerMain(virLXCControllerPtr ctrl) } } - virMutexLock(&lock); - while (!quit) { - virMutexUnlock(&lock); - if (virEventRunDefaultImpl() < 0) - goto cleanup; - virMutexLock(&lock); - } - virMutexUnlock(&lock); + virNetServerRun(ctrl->server); err = virGetLastError(); if (!err || err->code == VIR_ERR_OK) -- 1.7.11.7

2 1