- Devel - libvirt List Archives

[libvirt] [PATCH] Add support for bandwidth filtering on LXC guests
by Daniel P. Berrange 03 Oct '11

03 Oct '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> Call virBandwidthEnable after creating the LXC veth, so that any bandwidth controls get applied * src/lxc/lxc_driver.c: Enable bandwidth limiting --- src/lxc/lxc_driver.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 4b62600..c8e6119 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1166,6 +1166,14 @@ static int lxcSetupInterfaces(virConnectPtr conn, if (vethInterfaceUpOrDown(parentVeth, 1) < 0) goto error_exit; + if (virBandwidthEnable(virDomainNetGetActualBandwidth(def->nets[i]), + def->nets[i]->ifname) < 0) { + lxcError(VIR_ERR_INTERNAL_ERROR, + _("cannot set bandwidth limits on %s"), + def->nets[i]->ifname); + goto error_exit; + } + if (def->nets[i]->filter && virDomainConfNWFilterInstantiate(conn, def->nets[i]) < 0) goto error_exit; -- 1.7.6.2

3 2

[libvirt] hugepages error: "hugetlbfs filesystem is not mounted"
by Shahar Havivi 03 Oct '11

03 Oct '11

Hi, I am trying to run a VM (via VDSM) with hugepages and I am getting this error: "virNetClientProgramDispatchError:170 : internal error hugetlbfs filesystem is not mounted" hugepages is mounted with the proper permissions (36:36) in case of vdsm user, this code use to work..., now I am at version: libvirt-0.9.4-12.el6.x86_64 output of few commands: # tree /dev/hugepages/ /dev/hugepages/ `-- libvirt `-- qemu # ll -n /dev/hugepages/libvirt/ total 0 drwxr-xr-x 2 36 36 0 Oct 3 12:46 qemu/ # sysctl vm.nr_hugepages vm.nr_hugepages = 256 Any idea whats wrong? Thank you, Shahar Havivi

2 5

[libvirt] [PATCH 1/2] snapshot: implement getparent for esx
by Eric Blake 03 Oct '11

03 Oct '11

Pretty easy to paste together compared to existing functions. * src/esx/esx_driver.c (esxDomainSnapshotGetParent): New function. --- I can only compile-test this; I'm relying on someone with an actual esx setup to actually test it. Also, I didn't see anything in existing code that would efficiently implement virDomainSnapshotNumChildren; there may an API that I'm not aware of, but someone else will have to implement that API (Matthias?) src/esx/esx_driver.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index c15c0d6..ab93efd 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -4484,6 +4484,46 @@ esxDomainHasCurrentSnapshot(virDomainPtr domain, unsigned int flags) static virDomainSnapshotPtr +esxDomainSnapshotGetParent(virDomainSnapshotPtr snapshot, unsigned int flags) +{ + esxPrivate *priv = snapshot->domain->conn->privateData; + esxVI_VirtualMachineSnapshotTree *rootSnapshotList = NULL; + esxVI_VirtualMachineSnapshotTree *snapshotTree = NULL; + esxVI_VirtualMachineSnapshotTree *snapshotTreeParent = NULL; + virDomainSnapshotPtr parent = NULL; + + virCheckFlags(0, NULL); + + if (esxVI_EnsureSession(priv->primary) < 0) { + return NULL; + } + + if (esxVI_LookupRootSnapshotTreeList(priv->primary, snapshot->domain->uuid, + &rootSnapshotList) < 0 || + esxVI_GetSnapshotTreeByName(rootSnapshotList, snapshot->name, + &snapshotTree, &snapshotTreeParent, + esxVI_Occurrence_RequiredItem) < 0) { + goto cleanup; + } + + if (!snapshotTreeParent) { + ESX_ERROR(VIR_ERR_NO_DOMAIN_SNAPSHOT, + _("snapshot '%s' does not have a parent"), + snapshotTree->name); + goto cleanup; + } + + parent = virGetDomainSnapshot(snapshot->domain, snapshotTreeParent->name); + +cleanup: + esxVI_VirtualMachineSnapshotTree_Free(&rootSnapshotList); + + return parent; +} + + + +static virDomainSnapshotPtr esxDomainSnapshotCurrent(virDomainPtr domain, unsigned int flags) { esxPrivate *priv = domain->conn->privateData; @@ -4831,6 +4871,7 @@ static virDriver esxDriver = { .domainSnapshotListNames = esxDomainSnapshotListNames, /* 0.8.0 */ .domainSnapshotLookupByName = esxDomainSnapshotLookupByName, /* 0.8.0 */ .domainHasCurrentSnapshot = esxDomainHasCurrentSnapshot, /* 0.8.0 */ + .domainSnapshotGetParent = esxDomainSnapshotGetParent, /* 0.9.7 */ .domainSnapshotCurrent = esxDomainSnapshotCurrent, /* 0.8.0 */ .domainRevertToSnapshot = esxDomainRevertToSnapshot, /* 0.8.0 */ .domainSnapshotDelete = esxDomainSnapshotDelete, /* 0.8.0 */ -- 1.7.4.4

3 7

[libvirt] Comment inconsistency in bridge_driver.c
by Neil Wilson 03 Oct '11

03 Oct '11

Hi, At line 1560 in srv/network/bridge_driver.c it says: /* All interfaces used as a gateway (which is what this is, by * definition), must always have autoconf=0. */ and then promptly sets that variable to 1 with if (virFileWriteStr(field, "1", 0) < 0) { Is the comment or the code the correct value? Rgs Neil Wilson

2 2

[libvirt] [libvirt-glib] [PATCH] Explicitly link conn-test example against libgobject
by Guido Günther 03 Oct '11

03 Oct '11

Otherwise the build fails with: /usr/bin/ld: conn_test-conn-test.o: undefined reference to symbol 'g_type_check_instance_cast' /usr/bin/ld: note: 'g_type_check_instance_cast' is defined in DSO /usr/lib/libgobject-2.0.so.0 so try adding it to the linker command line /usr/lib/libgobject-2.0.so.0: could not read symbols: Invalid operation collect2: ld returned 1 exit status --- examples/Makefile.am | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/Makefile.am b/examples/Makefile.am index 10ce32d..0964597 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -25,5 +25,5 @@ conn_test_SOURCES = \ conn_test_LDADD = \ ../libvirt-gobject/libvirt-gobject-1.0.la \ $(LIBVIRT_LIBS) \ - $(GLIB2_LIBS) - + $(GLIB2_LIBS) \ + $(GOBJECT2_LIBS) -- 1.7.6.3

2 2

[libvirt] [libvirt-glib] event: remove timeout and handle from arrays
by Marc-André Lureau 03 Oct '11

03 Oct '11

Otherwise, it will crash next time it goes find(). ==9856== Invalid read of size 4 ==9856== at 0x84E4888: gvir_event_timeout_find (libvirt-glib-event.c:293) ==9856== by 0x84E48E4: gvir_event_timeout_update (libvirt-glib-event.c:308) ==9856== by 0x31AB04BBDB: virEventUpdateTimeout (event.c:122) ==9856== by 0x31AB148758: virNetClientStreamEventTimerUpdate (virnetclientstream.c:81) ==9856== by 0x31AB14991C: virNetClientStreamEventAddCallback (virnetclientstream.c:471) ==9856== by 0x31AB12944F: remoteStreamEventAddCallback (remote_driver.c:3484) ==9856== by 0x31AB108EAC: virStreamEventAddCallback (libvirt.c:14036) ... ==9856== Address 0x143be760 is 0 bytes inside a block of size 40 free'd ==9856== at 0x4A06928: free (vg_replace_malloc.c:427) ==9856== by 0x84E4AD6: gvir_event_timeout_remove (libvirt-glib-event.c:361) ==9856== by 0x31AB04BC2C: virEventRemoveTimeout (event.c:136) ==9856== by 0x31AB149B24: virNetClientStreamEventRemoveCallback (virnetclientstream.c:521) ==9856== by 0x31AB129566: remoteStreamEventRemoveCallback (remote_driver.c:3525) ==9856== by 0x31AB10918F: virStreamEventRemoveCallback (libvirt.c:14114) ... --- libvirt-glib/libvirt-glib-event.c | 83 +++++++++++++++++++++++------------- 1 files changed, 53 insertions(+), 30 deletions(-) diff --git a/libvirt-glib/libvirt-glib-event.c b/libvirt-glib/libvirt-glib-event.c index 8b1bddf..303bec7 100644 --- a/libvirt-glib/libvirt-glib-event.c +++ b/libvirt-glib/libvirt-glib-event.c @@ -61,12 +61,10 @@ struct gvir_event_timeout GMutex *eventlock = NULL; static int nextwatch = 1; -static unsigned int nhandles = 0; -static struct gvir_event_handle **handles = NULL; +static GPtrArray *handles; static int nexttimer = 1; -static unsigned int ntimeouts = 0; -static struct gvir_event_timeout **timeouts = NULL; +static GPtrArray *timeouts; static gboolean gvir_event_handle_dispatch(GIOChannel *source G_GNUC_UNUSED, @@ -106,9 +104,7 @@ gvir_event_handle_add(int fd, g_mutex_lock(eventlock); - handles = g_realloc(handles, sizeof(*handles)*(nhandles+1)); - data = g_malloc(sizeof(*data)); - memset(data, 0, sizeof(*data)); + data = g_new0(struct gvir_event_handle, 1); if (events & VIR_EVENT_HANDLE_READABLE) cond |= G_IO_IN; @@ -130,7 +126,7 @@ gvir_event_handle_add(int fd, gvir_event_handle_dispatch, data); - handles[nhandles++] = data; + g_ptr_array_add(handles, data); ret = data->watch; @@ -140,12 +136,24 @@ gvir_event_handle_add(int fd, } static struct gvir_event_handle * -gvir_event_handle_find(int watch) +gvir_event_handle_find(int watch, guint *idx) { - unsigned int i; - for (i = 0 ; i < nhandles ; i++) - if (handles[i]->watch == watch) - return handles[i]; + guint i; + + for (i = 0 ; i < handles->len ; i++) { + struct gvir_event_handle *h = g_ptr_array_index(handles, i); + + if (h == NULL) { + g_warn_if_reached (); + continue; + } + + if (h->watch == watch) { + if (idx != NULL) + *idx = i; + return h; + } + } return NULL; } @@ -158,7 +166,7 @@ gvir_event_handle_update(int watch, g_mutex_lock(eventlock); - data = gvir_event_handle_find(watch); + data = gvir_event_handle_find(watch, NULL); if (!data) { DEBUG("Update for missing handle watch %d", watch); goto cleanup; @@ -202,7 +210,8 @@ _handle_remove(gpointer data) if (h->ff) (h->ff)(h->opaque); - free(h); + + g_ptr_array_remove_fast(handles, h); return FALSE; } @@ -212,10 +221,11 @@ gvir_event_handle_remove(int watch) { struct gvir_event_handle *data; int ret = -1; + guint idx; g_mutex_lock(eventlock); - data = gvir_event_handle_find(watch); + data = gvir_event_handle_find(watch, &idx); if (!data) { DEBUG("Remove of missing watch %d", watch); goto cleanup; @@ -259,10 +269,7 @@ gvir_event_timeout_add(int interval, g_mutex_lock(eventlock); - timeouts = g_realloc(timeouts, sizeof(*timeouts)*(ntimeouts+1)); - data = g_malloc(sizeof(*data)); - memset(data, 0, sizeof(*data)); - + data = g_new0(struct gvir_event_timeout, 1); data->timer = nexttimer++; data->interval = interval; data->cb = cb; @@ -273,7 +280,7 @@ gvir_event_timeout_add(int interval, gvir_event_timeout_dispatch, data); - timeouts[ntimeouts++] = data; + g_ptr_array_add(timeouts, data); DEBUG("Add timeout %p %d %p %p %d\n", data, interval, cb, opaque, data->timer); @@ -286,12 +293,26 @@ gvir_event_timeout_add(int interval, static struct gvir_event_timeout * -gvir_event_timeout_find(int timer) +gvir_event_timeout_find(int timer, guint *idx) { - unsigned int i; - for (i = 0 ; i < ntimeouts ; i++) - if (timeouts[i]->timer == timer) - return timeouts[i]; + guint i; + + g_return_val_if_fail(timeouts != NULL, NULL); + + for (i = 0 ; i < timeouts->len ; i++) { + struct gvir_event_timeout *t = g_ptr_array_index(timeouts, i); + + if (t == NULL) { + g_warn_if_reached (); + continue; + } + + if (t->timer == timer) { + if (idx != NULL) + *idx = i; + return t; + } + } return NULL; } @@ -305,7 +326,7 @@ gvir_event_timeout_update(int timer, g_mutex_lock(eventlock); - data = gvir_event_timeout_find(timer); + data = gvir_event_timeout_find(timer, NULL); if (!data) { DEBUG("Update of missing timer %d", timer); goto cleanup; @@ -337,11 +358,12 @@ static int gvir_event_timeout_remove(int timer) { struct gvir_event_timeout *data; + guint idx; int ret = -1; g_mutex_lock(eventlock); - data = gvir_event_timeout_find(timer); + data = gvir_event_timeout_find(timer, &idx); if (!data) { DEBUG("Remove of missing timer %d", timer); goto cleanup; @@ -358,8 +380,7 @@ gvir_event_timeout_remove(int timer) if (data->ff) (data->ff)(data->opaque); - free(data); - + g_ptr_array_remove_index_fast(timeouts, idx); ret = 0; cleanup: @@ -371,6 +392,8 @@ cleanup: static gpointer event_register_once(gpointer data G_GNUC_UNUSED) { eventlock = g_mutex_new(); + timeouts = g_ptr_array_new_with_free_func(g_free); + handles = g_ptr_array_new_with_free_func(g_free); virEventRegisterImpl(gvir_event_handle_add, gvir_event_handle_update, gvir_event_handle_remove, -- 1.7.6.2

2 1

[libvirt] [libvirt-glib] enums: fix incorrect prefix strip
by Marc-André Lureau 03 Oct '11

03 Oct '11

GVIR_TYPE_VIR_FOO -> GVIR_TYPE_FOO --- 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 9430d40..8147db2 100644 --- a/libvirt-gobject/Makefile.am +++ b/libvirt-gobject/Makefile.am @@ -88,7 +88,7 @@ libvirt-gobject-enums.h: libvirt-gobject-domain.h libvirt-gobject-connection.h --ftail "#endif /* __LIBVIRT_GOBJECT_ENUMS_H__ */\n" \ --eprod "#define GVIR_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n" \ --eprod "GType @enum_name@_get_type (void);\n" \ - $^ | sed -e 's/g_vir/gvir/g' > $@ + $^ | sed -e 's/g_vir/gvir/g' | sed -e 's/_VIR_/_/g' > $@ BUILT_SOURCES = libvirt-gobject-enums.c libvirt-gobject-enums.h -- 1.7.6.2

2 1

[libvirt] [libvirt-glib] gir: fix introspection of asyncs and array delegate
by Marc-André Lureau 03 Oct '11

03 Oct '11

--- libvirt-gobject/libvirt-gobject-connection.c | 24 ++++++++++++------------ libvirt-gobject/libvirt-gobject-connection.h | 6 +++--- libvirt-gobject/libvirt-gobject-storage-pool.c | 8 ++++---- libvirt-gobject/libvirt-gobject-storage-pool.h | 2 +- libvirt-gobject/libvirt-gobject-stream.h | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index 90d1566..5fc0a9e 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -431,19 +431,19 @@ gvir_connection_open_helper(GSimpleAsyncResult *res, * gvir_connection_open_async: * @conn: the connection * @cancellable: (allow-none)(transfer none): cancellation object - * @callback: (transfer none): completion callback - * @opaque: (transfer none)(allow-none): opaque data for callback + * @callback: (scope async): completion callback + * @user_data: (closure): opaque data for callback */ void gvir_connection_open_async(GVirConnection *conn, GCancellable *cancellable, GAsyncReadyCallback callback, - gpointer opaque) + gpointer user_data) { GSimpleAsyncResult *res; res = g_simple_async_result_new(G_OBJECT(conn), callback, - opaque, + user_data, gvir_connection_open); g_simple_async_result_run_in_thread(res, gvir_connection_open_helper, @@ -828,19 +828,19 @@ gvir_connection_fetch_domains_helper(GSimpleAsyncResult *res, * gvir_connection_fetch_domains_async: * @conn: the connection * @cancellable: (allow-none)(transfer none): cancellation object - * @callback: (transfer none): completion callback - * @opaque: (transfer none)(allow-none): opaque data for callback + * @callback: (scope async): completion callback + * @user_data: (closure): opaque data for callback */ void gvir_connection_fetch_domains_async(GVirConnection *conn, GCancellable *cancellable, GAsyncReadyCallback callback, - gpointer opaque) + gpointer user_data) { GSimpleAsyncResult *res; res = g_simple_async_result_new(G_OBJECT(conn), callback, - opaque, + user_data, gvir_connection_fetch_domains); g_simple_async_result_run_in_thread(res, gvir_connection_fetch_domains_helper, @@ -889,19 +889,19 @@ gvir_connection_fetch_pools_helper(GSimpleAsyncResult *res, * gvir_connection_fetch_storage_pools_async: * @conn: the connection * @cancellable: (allow-none)(transfer none): cancellation object - * @callback: (transfer none): completion callback - * @opaque: (transfer none)(allow-none): opaque data for callback + * @callback: (scope async): completion callback + * @user_data: (closure): opaque data for callback */ void gvir_connection_fetch_storage_pools_async(GVirConnection *conn, GCancellable *cancellable, GAsyncReadyCallback callback, - gpointer opaque) + gpointer user_data) { GSimpleAsyncResult *res; res = g_simple_async_result_new(G_OBJECT(conn), callback, - opaque, + user_data, gvir_connection_fetch_storage_pools); g_simple_async_result_run_in_thread(res, gvir_connection_fetch_pools_helper, diff --git a/libvirt-gobject/libvirt-gobject-connection.h b/libvirt-gobject/libvirt-gobject-connection.h index d05f792..2eb58ec 100644 --- a/libvirt-gobject/libvirt-gobject-connection.h +++ b/libvirt-gobject/libvirt-gobject-connection.h @@ -77,7 +77,7 @@ gboolean gvir_connection_open(GVirConnection *conn, void gvir_connection_open_async(GVirConnection *conn, GCancellable *cancellable, GAsyncReadyCallback callback, - gpointer opaque); + gpointer user_data); gboolean gvir_connection_open_finish(GVirConnection *conn, GAsyncResult *result, GError **err); @@ -90,7 +90,7 @@ gboolean gvir_connection_fetch_domains(GVirConnection *conn, void gvir_connection_fetch_domains_async(GVirConnection *conn, GCancellable *cancellable, GAsyncReadyCallback callback, - gpointer opaque); + gpointer user_data); gboolean gvir_connection_fetch_domains_finish(GVirConnection *conn, GAsyncResult *result, GError **err); @@ -149,7 +149,7 @@ gboolean gvir_connection_fetch_storage_pools(GVirConnection *conn, void gvir_connection_fetch_storage_pools_async(GVirConnection *conn, GCancellable *cancellable, GAsyncReadyCallback callback, - gpointer opaque); + gpointer user_data); gboolean gvir_connection_fetch_storage_pools_finish(GVirConnection *conn, GAsyncResult *result, GError **err); diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.c b/libvirt-gobject/libvirt-gobject-storage-pool.c index 8f581eb..fc9cba9 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.c +++ b/libvirt-gobject/libvirt-gobject-storage-pool.c @@ -385,19 +385,19 @@ gvir_storage_pool_refresh_helper(GSimpleAsyncResult *res, * gvir_storage_pool_refresh_async: * @pool: the storage pool * @cancellable: (allow-none)(transfer none): cancellation object - * @callback: (transfer none): completion callback - * @opaque: (transfer none)(allow-none): opaque data for callback + * @callback: (scope async): completion callback + * @user_data: (closure): opaque data for callback */ void gvir_storage_pool_refresh_async(GVirStoragePool *pool, GCancellable *cancellable, GAsyncReadyCallback callback, - gpointer opaque) + gpointer user_data) { GSimpleAsyncResult *res; res = g_simple_async_result_new(G_OBJECT(pool), callback, - opaque, + user_data, gvir_storage_pool_refresh); g_simple_async_result_run_in_thread(res, gvir_storage_pool_refresh_helper, diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.h b/libvirt-gobject/libvirt-gobject-storage-pool.h index a789a6a..620f888 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.h +++ b/libvirt-gobject/libvirt-gobject-storage-pool.h @@ -75,7 +75,7 @@ gboolean gvir_storage_pool_refresh(GVirStoragePool *pool, void gvir_storage_pool_refresh_async(GVirStoragePool *pool, GCancellable *cancellable, GAsyncReadyCallback callback, - gpointer opaque); + gpointer user_data); gboolean gvir_storage_pool_refresh_finish(GVirStoragePool *pool, GAsyncResult *result, GError **err); diff --git a/libvirt-gobject/libvirt-gobject-stream.h b/libvirt-gobject/libvirt-gobject-stream.h index fd9c9bb..5181e24 100644 --- a/libvirt-gobject/libvirt-gobject-stream.h +++ b/libvirt-gobject/libvirt-gobject-stream.h @@ -62,7 +62,7 @@ struct _GVirStreamClass /** * GVirStreamSinkFunc: * @stream: a #GVirStream - * @buf: data pointer + * @buf: (out) (array length=nbytes) (transfer none): data pointer * @nbytes: data size * @user_data: user data passed to the function * Returns: the number of bytes filled, 0 upon end -- 1.7.6.2

2 1

[libvirt] [libvirt-glib] RFC: delay event handle freeing to avoid dead lock
by Marc-André Lureau 03 Oct '11

03 Oct '11

Can be reproduced with the updated test. --- examples/conn-test.c | 20 +++++++++++++++----- libvirt-glib/libvirt-glib-event.c | 17 +++++++++++++---- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/examples/conn-test.c b/examples/conn-test.c index 08045a4..8ea5ad7 100644 --- a/examples/conn-test.c +++ b/examples/conn-test.c @@ -31,12 +31,19 @@ do_connection_open(GObject *source, { GVirConnection *conn = GVIR_CONNECTION(source); GError *err = NULL; - GMainLoop *loop = opaque; if (!gvir_connection_open_finish(conn, res, &err)) { g_error("%s", err->message); } g_print("Connected to libvirt\n"); + g_object_unref(conn); +} + +static void quit(gpointer data, + GObject *where_the_object_was) +{ + GMainLoop *loop = data; + g_main_loop_quit(loop); } @@ -47,19 +54,22 @@ int main(int argc, char **argv) gvir_init_object(&argc, &argv); - if (argc != 2) + if (argc != 2) { g_error("syntax: %s URI", argv[0]); - - conn = gvir_connection_new(argv[1]); + return 1; + } loop = g_main_loop_new(g_main_context_default(), TRUE); - gvir_connection_open_async(conn, NULL, do_connection_open, loop); + conn = gvir_connection_new(argv[1]); + g_object_weak_ref(G_OBJECT(conn), quit, loop); + gvir_connection_open_async(conn, NULL, do_connection_open, loop); g_main_loop_run(loop); + return 0; } diff --git a/libvirt-glib/libvirt-glib-event.c b/libvirt-glib/libvirt-glib-event.c index a785c93..8b1bddf 100644 --- a/libvirt-glib/libvirt-glib-event.c +++ b/libvirt-glib/libvirt-glib-event.c @@ -195,6 +195,18 @@ cleanup: g_mutex_unlock(eventlock); } +static gboolean +_handle_remove(gpointer data) +{ + struct gvir_event_handle *h = data; + + if (h->ff) + (h->ff)(h->opaque); + free(h); + + return FALSE; +} + static int gvir_event_handle_remove(int watch) { @@ -217,10 +229,7 @@ gvir_event_handle_remove(int watch) g_source_remove(data->source); data->source = 0; data->events = 0; - if (data->ff) - (data->ff)(data->opaque); - free(data); - + g_idle_add(_handle_remove, data); ret = 0; cleanup: -- 1.7.6.2

2 1

[libvirt] [PATCH 0/2] qemu: make PCI multifunction support more manual
by Laine Stump 01 Oct '11

01 Oct '11

Problems have been encountered/realized with the practice of unconditionally setting the multifunction bit for all functions of all devices. PATCH 2/2 remedies that (details in its own commit comment). PATCH 1/2 is a one-liner I fixed in the meantime which will cause a simple conflict if it's not applied to other branches at the same time as PATCH 2/2, so I'm sending them together.

3 7

[libvirt] [PATCH] virsh: do not unlink NULL file
by Marc-André Lureau 01 Oct '11

01 Oct '11

error:could not take a screenshot of xp ==6216== Syscall param unlink(pathname) points to unaddressable byte(s) ==6216== at 0x373A0D4937: unlink (syscall-template.S:82) ==6216== by 0x40FD73: cmdScreenshot (virsh.c:3070) ==6216== by 0x42BA0D: vshCommandRun (virsh.c:14920) ==6216== by 0x42EC97: main (virsh.c:16379) ==6216== Address 0x0 is not stack'd, malloc'd or (recently) free'd ==6216== error:Requested operation is not valid: domain is not running --- tools/virsh.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 1909dce..89d355f 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -3004,7 +3004,7 @@ cmdScreenshot(vshControl *ctl, const vshCmd *cmd) unsigned int screen = 0; unsigned int flags = 0; /* currently unused */ int ret = false; - bool created = true; + bool created = false; bool generated = false; char *mime = NULL; @@ -3039,13 +3039,13 @@ cmdScreenshot(vshControl *ctl, const vshCmd *cmd) } if ((fd = open(file, O_WRONLY|O_CREAT|O_EXCL, 0666)) < 0) { - created = false; if (errno != EEXIST || (fd = open(file, O_WRONLY|O_TRUNC, 0666)) < 0) { vshError(ctl, _("cannot create file %s"), file); goto cleanup; } - } + } else + created = true; if (virStreamRecvAll(st, vshStreamSink, &fd) < 0) { vshError(ctl, _("could not receive data from domain %s"), name); -- 1.7.6.2

2 1

[libvirt] [PATCH 0/4] snapshot: listing children
by Eric Blake 30 Sep '11

30 Sep '11

My previous API added parent traversal; this one adds child traversal. virsh snapshot-list domain snapshot --tree is a nice end result for limiting the output to a particular subset of the overall hierarchy. Again, same story about not wiring up ESX and VBox support yet, but I'll play with that next. Eric Blake (4): snapshot: new virDomainSnapshotListChildrenNames API snapshot: virsh snapshot-list and children snapshot: remote protocol for snapshot children snapshot: implement snapshot children listing in qemu include/libvirt/libvirt.h.in | 27 +++++++-- python/generator.py | 4 ++ python/libvirt-override-api.xml | 12 +++- python/libvirt-override.c | 45 ++++++++++++++++ src/conf/domain_conf.c | 51 ++++++++++++++++++ src/conf/domain_conf.h | 7 +++ src/driver.h | 12 ++++ src/libvirt.c | 111 +++++++++++++++++++++++++++++++++++++++ src/libvirt_private.syms | 2 + src/libvirt_public.syms | 2 + src/qemu/qemu_driver.c | 87 ++++++++++++++++++++++++++++++ src/remote/remote_driver.c | 2 + src/remote/remote_protocol.x | 25 ++++++++- src/remote_protocol-structs | 20 +++++++ tools/virsh.c | 64 +++++++++++++++++++--- tools/virsh.pod | 9 +++- 16 files changed, 459 insertions(+), 21 deletions(-) -- 1.7.4.4

1 9

[libvirt] [PATCH 1/1] [RFC] lvm storage backend: handle command_names=1 in lvm.conf
by Serge E. Hallyn 30 Sep '11

30 Sep '11

If the regexes supported (?:pvs)?, then we could handle this by optionally matching but not returning the initial command name. But it doesn't. So add a new char* argument to virStorageBackendRunProgRegex(). If that argument is NULL then we act as usual. Otherwise, if the string at that argument is found at the start of a returned line, we drop that before running the regex. With this patch, virt-manager shows me lvs with command_names 1 or 0. The definitions of PVS_BASE etc may want to be moved into the configure scripts (though given how PVS is found, IIUC that could only happen if pvs was a link to pvs_real), but in any case no sense dealing with that until we're sure this is an ok way to handle it. Signed-off-by: Serge Hallyn <serge.hallyn(a)canonical.com> --- src/storage/storage_backend.c | 14 ++++++++++---- src/storage/storage_backend.h | 2 +- src/storage/storage_backend_fs.c | 2 +- src/storage/storage_backend_iscsi.c | 4 ++-- src/storage/storage_backend_logical.c | 9 ++++++--- 5 files changed, 20 insertions(+), 11 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index d125504..7a352da 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -1400,7 +1400,7 @@ virStorageBackendRunProgRegex(virStoragePoolObjPtr pool, const char **regex, int *nvars, virStorageBackendListVolRegexFunc func, - void *data) + void *data, char *cmd_to_ignore) { int fd = -1, err, ret = -1; FILE *list = NULL; @@ -1460,13 +1460,19 @@ virStorageBackendRunProgRegex(virStoragePoolObjPtr pool, } while (fgets(line, sizeof(line), list) != NULL) { + char *p; /* Strip trailing newline */ int len = strlen(line); if (len && line[len-1] == '\n') line[len-1] = '\0'; + p = line; + /* if cmd_to_ignore is specified, then ignore it */ + if (strncmp(line, cmd_to_ignore, strlen(cmd_to_ignore)) == 0) + p += strlen(cmd_to_ignore); + for (i = 0 ; i <= maxReg && i < nregex ; i++) { - if (regexec(&reg[i], line, nvars[i]+1, vars, 0) == 0) { + if (regexec(&reg[i], p, nvars[i]+1, vars, 0) == 0) { maxReg++; if (i == 0) @@ -1475,9 +1481,9 @@ virStorageBackendRunProgRegex(virStoragePoolObjPtr pool, /* NULL terminate each captured group in the line */ for (j = 0 ; j < nvars[i] ; j++) { /* NB vars[0] is the full pattern, so we offset j by 1 */ - line[vars[j+1].rm_eo] = '\0'; + p[vars[j+1].rm_eo] = '\0'; if ((groups[ngroup++] = - strdup(line + vars[j+1].rm_so)) == NULL) { + strdup(p + vars[j+1].rm_so)) == NULL) { virReportOOMError(); goto cleanup; } diff --git a/src/storage/storage_backend.h b/src/storage/storage_backend.h index 67ac32c..aa467f5 100644 --- a/src/storage/storage_backend.h +++ b/src/storage/storage_backend.h @@ -140,7 +140,7 @@ int virStorageBackendRunProgRegex(virStoragePoolObjPtr pool, const char **regex, int *nvars, virStorageBackendListVolRegexFunc func, - void *data); + void *data, char *cmd_to_ignore); int virStorageBackendRunProgNul(virStoragePoolObjPtr pool, const char **prog, diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 02c4c17..a98db4b 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -266,7 +266,7 @@ virStorageBackendFileSystemNetFindPoolSources(virConnectPtr conn ATTRIBUTE_UNUSE if (virStorageBackendRunProgRegex(NULL, prog, 1, regexes, vars, virStorageBackendFileSystemNetFindPoolSourcesFunc, - &state) < 0) + &state, NULL) < 0) goto cleanup; retval = virStoragePoolSourceListFormat(&state.list); diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c index 346e698..99e69c9 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/src/storage/storage_backend_iscsi.c @@ -160,7 +160,7 @@ virStorageBackendISCSISession(virStoragePoolObjPtr pool, regexes, vars, virStorageBackendISCSIExtractSession, - &session) < 0) + &session, NULL) < 0) return NULL; if (session == NULL && @@ -517,7 +517,7 @@ virStorageBackendISCSIScanTargets(const char *portal, regexes, vars, virStorageBackendISCSIGetTargets, - &list) < 0) { + &list, NULL) < 0) { return -1; } diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index 4f42047..7fac7b1 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -205,13 +205,14 @@ virStorageBackendLogicalFindLVs(virStoragePoolObjPtr pool, pool->def->source.name, NULL }; +#define LVS_BASE "lvs" if (virStorageBackendRunProgRegex(pool, prog, 1, regexes, vars, virStorageBackendLogicalMakeVol, - vol) < 0) { + vol, LVS_BASE) < 0) { return -1; } @@ -327,9 +328,10 @@ virStorageBackendLogicalFindPoolSources(virConnectPtr conn ATTRIBUTE_UNUSED, memset(&sourceList, 0, sizeof(sourceList)); sourceList.type = VIR_STORAGE_POOL_LOGICAL; +#define PVS_BASE "pvs" if (virStorageBackendRunProgRegex(NULL, prog, 1, regexes, vars, virStorageBackendLogicalFindPoolSourcesFunc, - &sourceList) < 0) + &sourceList, PVS_BASE) < 0) return NULL; retval = virStoragePoolSourceListFormat(&sourceList); @@ -496,6 +498,7 @@ virStorageBackendLogicalRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, return -1; } +#define VGS_BASE "vgs" /* Now get basic volgrp metadata */ if (virStorageBackendRunProgRegex(pool, prog, @@ -503,7 +506,7 @@ virStorageBackendLogicalRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, regexes, vars, virStorageBackendLogicalRefreshPoolFunc, - NULL) < 0) { + NULL, VGS_BASE) < 0) { virStoragePoolObjClearVols(pool); return -1; } -- 1.7.5.4

3 5

[libvirt] [RFC PATCH 0/2] Add some systemtap probes to RPC code
by Daniel P. Berrange 30 Sep '11

30 Sep '11

Trying to investigate & debug the keepalive series I decided we needed a better way to trace the RPC protocol than the regular debug messages. Ideally we'd have a wireshark dissector but that seems like it will be an awful lot of work todo. So instead I have added a few systemtap probes to the RPC call which fire everytime an RPC message is queued for dispatch, or a completed RPC message is read off the wire Now I can see all communications using a script like this # cat > watch.stp <<EOF function msginfo(prefix, prog, version, proc, type, status, serial) { if (type == 0) typestr = "call" else if (type == 1) typestr = "reply" else if (type == 2) typestr = "message" else if (type == 3) typestr = "stream" else typestr = "unknown" if (status == 0) statusstr = "ok" else if (status == 1) statusstr = "error" else if (status == 2) statusstr = "continue" else statusstr = "unknown" printf("%s program: %-10d version: %d procedure: %-4d type: %u:%-9s status: %u:%-9s serial: %-4d\n", prefix, prog, version, proc, type, typestr, status, statusstr, serial); } probe libvirt.rpc.server_msg_rx { msginfo(">S", prog, vers, proc, type, status, serial) } probe libvirt.rpc.server_msg_tx { msginfo("<S", prog, vers, proc, type, status, serial) } probe libvirt.rpc.client_msg_rx { msginfo("<C", prog, vers, proc, type, status, serial) } probe libvirt.rpc.client_msg_tx { msginfo(">C", prog, vers, proc, type, status, serial) } EOF # stap watch.stp >C program: 536903814 version: 1 procedure: 66 type: 0:call status: 0:ok serial: 0 >S program: 536903814 version: 1 procedure: 66 type: 0:call status: 0:ok serial: 0 <S program: 536903814 version: 1 procedure: 66 type: 1:reply status: 0:ok serial: 0 <C program: 536903814 version: 1 procedure: 66 type: 1:reply status: 0:ok serial: 0 >C program: 536903814 version: 1 procedure: 1 type: 0:call status: 0:ok serial: 1 >S program: 536903814 version: 1 procedure: 1 type: 0:call status: 0:ok serial: 1 <S program: 536903814 version: 1 procedure: 1 type: 1:reply status: 0:ok serial: 1 <C program: 536903814 version: 1 procedure: 1 type: 1:reply status: 0:ok serial: 1 >C program: 536903814 version: 1 procedure: 110 type: 0:call status: 0:ok serial: 2 >S program: 536903814 version: 1 procedure: 110 type: 0:call status: 0:ok serial: 2 <S program: 536903814 version: 1 procedure: 110 type: 1:reply status: 0:ok serial: 2 <C program: 536903814 version: 1 procedure: 110 type: 1:reply status: 0:ok serial: 2 >C program: 536903814 version: 1 procedure: 23 type: 0:call status: 0:ok serial: 3 >S program: 536903814 version: 1 procedure: 23 type: 0:call status: 0:ok serial: 3 <S program: 536903814 version: 1 procedure: 23 type: 1:reply status: 0:ok serial: 3 <C program: 536903814 version: 1 procedure: 23 type: 1:reply status: 0:ok serial: 3 >C program: 536903814 version: 1 procedure: 19 type: 0:call status: 0:ok serial: 4 >S program: 536903814 version: 1 procedure: 19 type: 0:call status: 0:ok serial: 4 <S program: 536903814 version: 1 procedure: 19 type: 1:reply status: 0:ok serial: 4 <C program: 536903814 version: 1 procedure: 19 type: 1:reply status: 0:ok serial: 4 >C program: 536903814 version: 1 procedure: 16 type: 0:call status: 0:ok serial: 5 >S program: 536903814 version: 1 procedure: 16 type: 0:call status: 0:ok serial: 5 <S program: 536903814 version: 1 procedure: 16 type: 1:reply status: 0:ok serial: 5 <C program: 536903814 version: 1 procedure: 16 type: 1:reply status: 0:ok serial: 5 >C program: 536903814 version: 1 procedure: 151 type: 0:call status: 0:ok serial: 6 >S program: 536903814 version: 1 procedure: 151 type: 0:call status: 0:ok serial: 6 <S program: 536903814 version: 1 procedure: 151 type: 1:reply status: 0:ok serial: 6 <C program: 536903814 version: 1 procedure: 151 type: 1:reply status: 0:ok serial: 6 >C program: 536903814 version: 1 procedure: 15 type: 0:call status: 0:ok serial: 7 >S program: 536903814 version: 1 procedure: 15 type: 0:call status: 0:ok serial: 7 <S program: 536903814 version: 1 procedure: 15 type: 1:reply status: 0:ok serial: 7 <C program: 536903814 version: 1 procedure: 15 type: 1:reply status: 0:ok serial: 7 >C program: 536903814 version: 1 procedure: 183 type: 0:call status: 0:ok serial: 8 >S program: 536903814 version: 1 procedure: 183 type: 0:call status: 0:ok serial: 8 <S program: 536903814 version: 1 procedure: 183 type: 1:reply status: 0:ok serial: 8 <C program: 536903814 version: 1 procedure: 183 type: 1:reply status: 0:ok serial: 8 >C program: 536903814 version: 1 procedure: 122 type: 0:call status: 0:ok serial: 9 >S program: 536903814 version: 1 procedure: 122 type: 0:call status: 0:ok serial: 9 <S program: 536903814 version: 1 procedure: 122 type: 1:reply status: 0:ok serial: 9 <C program: 536903814 version: 1 procedure: 122 type: 1:reply status: 0:ok serial: 9 >C program: 536903814 version: 1 procedure: 121 type: 0:call status: 0:ok serial: 10 >S program: 536903814 version: 1 procedure: 121 type: 0:call status: 0:ok serial: 10 <S program: 536903814 version: 1 procedure: 121 type: 1:reply status: 0:ok serial: 10 <C program: 536903814 version: 1 procedure: 121 type: 1:reply status: 0:ok serial: 10 >C program: 536903814 version: 1 procedure: 2 type: 0:call status: 0:ok serial: 11 >S program: 536903814 version: 1 procedure: 2 type: 0:call status: 0:ok serial: 11 <S program: 536903814 version: 1 procedure: 2 type: 1:reply status: 0:ok serial: 11 <C program: 536903814 version: 1 procedure: 2 type: 1:reply status: 0:ok serial: 11 Is the trace information resulting from 'virsh dominfo $VM' An RPC call shoudl result in 4 messages, tx by client, rx by server, tx by server and rx by client. An async event will only result in 2 messages, tx by server, rx by client and so on. A further enhancement I want to make is to make the rpc generator script, spit out a systemtap function for converting procedure numbers into function/event names, as well as adding helper functions for converting program type and status numbers into friendly strings

2 4

[libvirt] [PATCH] Improve the daemon man page
by Daniel Veillard 30 Sep '11

30 Sep '11

Add informations about the handling of USR2 and fatal signals and document the default log location. diff --git a/daemon/libvirtd.pod.in b/daemon/libvirtd.pod.in index 6e699b8..269e81f 100644 --- a/daemon/libvirtd.pod.in +++ b/daemon/libvirtd.pod.in @@ -69,6 +69,10 @@ Display version information then exit. =head1 SIGNALS On receipt of B<SIGHUP> libvirtd will reload its configuration. +On receipt of B<SIGUSR2> or other fatal signals like B<SIGFPE>, +B<SIGSEGV>, B<SIGILL>, B<SIGABRT> or B<SIGBUS>, libvirtd will dump +its internal debug message buffer content to the default log output, +usually B<@localstatedir@/log/libvirt/libvirtd.log> =head1 FILES @@ -105,6 +109,11 @@ The TLS B<Server> private key libvirtd will use. The PID file to use, unless overridden by the B<-p>|B<--pid-file> option. +=item F<@localstatedir@/log/libvirt/libvirtd.log> + +The default file where libvirtd will save its logs, this can be overriden +from the B<@sysconfdir@/libvirtd.conf> configuration file. + =back =head1 EXAMPLES -- 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/

2 1

[libvirt] [PATCH] build: Add missing <package> and <c:include> in gir
by Marc-André Lureau 30 Sep '11

30 Sep '11

This is required for generating source-level bindings, for vala --- libvirt-gconfig/Makefile.am | 2 ++ libvirt-glib/Makefile.am | 2 ++ libvirt-gobject/Makefile.am | 2 ++ 3 files changed, 6 insertions(+), 0 deletions(-) diff --git a/libvirt-gconfig/Makefile.am b/libvirt-gconfig/Makefile.am index 6f1c628..180d5ee 100644 --- a/libvirt-gconfig/Makefile.am +++ b/libvirt-gconfig/Makefile.am @@ -72,6 +72,8 @@ LibvirtGConfig-1.0.gir: libvirt-gconfig-1.0.la $(G_IR_SCANNER) Makefile.am -I$(top_builddir) \ --verbose \ --pkg=gobject-2.0 \ + --c-include="libvirt-gconfig/libvirt-gconfig.h" \ + --pkg-export=libvirt-gconfig-1.0 \ $(srcdir)/libvirt-gconfig.h \ $(GCONFIG_SOURCE_FILES:%=$(srcdir)/%) \ $(GCONFIG_HEADER_FILES:%=$(srcdir)/%) diff --git a/libvirt-glib/Makefile.am b/libvirt-glib/Makefile.am index 4da0a84..0638a64 100644 --- a/libvirt-glib/Makefile.am +++ b/libvirt-glib/Makefile.am @@ -53,6 +53,8 @@ LibvirtGLib-1.0.gir: libvirt-glib-1.0.la $(G_IR_SCANNER) Makefile.am -I$(srcdir) \ --pkg=glib-2.0 \ --pkg=gthread-2.0 \ + --c-include="libvirt-glib/libvirt-glib.h" \ + --pkg-export=libvirt-glib-1.0 \ $(libvirt_glib_1_0_la_SOURCES:%=$(srcdir)/%) girdir = $(datadir)/gir-1.0 diff --git a/libvirt-gobject/Makefile.am b/libvirt-gobject/Makefile.am index a50878f..9430d40 100644 --- a/libvirt-gobject/Makefile.am +++ b/libvirt-gobject/Makefile.am @@ -117,6 +117,8 @@ LibvirtGObject-1.0.gir: libvirt-gobject-1.0.la $(G_IR_SCANNER) Makefile.am --verbose \ --pkg=gobject-2.0 \ --pkg=gthread-2.0 \ + --c-include="libvirt-gobject/libvirt-gobject.h" \ + --pkg-export=libvirt-gobject-1.0 \ $(srcdir)/libvirt-gobject.h \ $(GOBJECT_SOURCE_FILES:%=$(srcdir)/%) \ $(GOBJECT_HEADER_FILES:%=$(srcdir)/%) \ -- 1.7.6.2

1 0

[libvirt] [PATCH 1/1] [RFC] Parallels Server Bare Metal driver stub
by Dmitry Mishin 30 Sep '11

30 Sep '11

Parallels Server Bare Metal is a virtualization solution which allows to run both Containers (OpenVZ-like) and virtual machines (like any other hardware hypervisor). This patch implements initial driver stub with almost no functionality except an ability to open and close driver. At the same time it contains initialization of Parallels API and clearly demonstrates supposed approach to future driver implementation. In particular, I suppose to use parallels-virtualization-sdk library provisioned with the PSBM distribution (and separately also) for PSBM's virtual servers management. Signed-off-by: Dmitry Mishin <dim(a)parallels.com> --- autobuild.sh | 1 + configure.ac | 21 +++++ include/libvirt/virterror.h | 1 + src/Makefile.am | 22 +++++ src/README | 1 + src/driver.h | 1 + src/libvirt.c | 9 ++ src/psbm/psbm_api.c | 117 ++++++++++++++++++++++++ src/psbm/psbm_api.h | 59 ++++++++++++ src/psbm/psbm_driver.c | 208 +++++++++++++++++++++++++++++++++++++++++++ src/psbm/psbm_driver.h | 32 +++++++ src/psbm/psbm_private.h | 49 ++++++++++ src/util/virterror.c | 3 + 13 files changed, 524 insertions(+), 0 deletions(-) create mode 100644 src/psbm/psbm_api.c create mode 100644 src/psbm/psbm_api.h create mode 100644 src/psbm/psbm_driver.c create mode 100644 src/psbm/psbm_driver.h create mode 100644 src/psbm/psbm_private.h diff --git a/autobuild.sh b/autobuild.sh index 491f1b8..f552343 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -81,6 +81,7 @@ if [ -x /usr/bin/i686-pc-mingw32-gcc ]; then --without-uml \ --without-vbox \ --without-openvz \ + --without-psbm \ --without-phyp \ --without-netcf \ --without-audit \ diff --git a/configure.ac b/configure.ac index df19445..7cff4f5 100644 --- a/configure.ac +++ b/configure.ac @@ -283,6 +283,8 @@ AC_ARG_WITH([uml], AC_HELP_STRING([--with-uml], [add UML support @<:@default=check@:>@]),[],[with_uml=check]) AC_ARG_WITH([openvz], AC_HELP_STRING([--with-openvz], [add OpenVZ support @<:@default=check@:>@]),[],[with_openvz=check]) +AC_ARG_WITH([psbm], + AC_HELP_STRING([--with-psbm], [add PSBM support @<:@default=no@:>@]),[],[with_psbm=no]) AC_ARG_WITH([vmware], AC_HELP_STRING([--with-vmware], [add VMware support @<:@default=yes@:>@]),[],[with_vmware=yes]) AC_ARG_WITH([libssh2], @@ -385,6 +387,24 @@ AM_CONDITIONAL([WITH_OPENVZ], [test "$with_openvz" = "yes"]) dnl +dnl Checks for the PSBM driver +dnl + +if test "$with_psbm" = "check"; then + with_psbm=$with_linux +fi + +if test "$with_psbm" = "yes" && test "$with_linux" = "no"; then + AC_MSG_ERROR([The PSBM driver can be enabled on Linux only.]) +fi + +if test "$with_psbm" = "yes"; then + AC_DEFINE_UNQUOTED([WITH_PSBM], 1, [whether PSBM driver is enabled]) +fi +AM_CONDITIONAL([WITH_PSBM], [test "$with_psbm" = "yes"]) + + +dnl dnl Checks for the VMware Workstation/Player driver dnl @@ -2504,6 +2524,7 @@ AC_MSG_NOTICE([ Xen: $with_xen]) AC_MSG_NOTICE([ QEMU: $with_qemu]) AC_MSG_NOTICE([ UML: $with_uml]) AC_MSG_NOTICE([ OpenVZ: $with_openvz]) +AC_MSG_NOTICE([ PSBM: $with_psbm]) AC_MSG_NOTICE([ VMware: $with_vmware]) AC_MSG_NOTICE([ VBox: $with_vbox]) AC_MSG_NOTICE([ XenAPI: $with_xenapi]) diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h index 0aae622..858e051 100644 --- a/include/libvirt/virterror.h +++ b/include/libvirt/virterror.h @@ -83,6 +83,7 @@ typedef enum { VIR_FROM_LIBXL = 41, /* Error from libxenlight driver */ VIR_FROM_LOCKING = 42, /* Error from lock manager */ VIR_FROM_HYPERV = 43, /* Error from Hyper-V driver */ + VIR_FROM_PSBM = 44, /* Error from PSBM driver */ } virErrorDomain; diff --git a/src/Makefile.am b/src/Makefile.am index 738ee91..99f4995 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -320,6 +320,11 @@ OPENVZ_DRIVER_SOURCES = \ openvz/openvz_conf.c openvz/openvz_conf.h \ openvz/openvz_driver.c openvz/openvz_driver.h +PSBM_DRIVER_SOURCES = \ + psbm/psbm_driver.c psbm/psbm_driver.h \ + psbm/psbm_api.c psbm/psbm_api.h \ + psbm/psbm_private.h + VMWARE_DRIVER_SOURCES = \ vmware/vmware_driver.c vmware/vmware_driver.h \ vmware/vmware_conf.c vmware/vmware_conf.h @@ -684,6 +689,22 @@ endif libvirt_driver_openvz_la_SOURCES = $(OPENVZ_DRIVER_SOURCES) endif +if WITH_PSBM +if WITH_DRIVER_MODULES +mod_LTLIBRARIES += libvirt_driver_psbm.la +else +noinst_LTLIBRARIES += libvirt_driver_psbm.la +libvirt_la_BUILT_LIBADD += libvirt_driver_psbm.la +endif +libvirt_driver_psbm_la_CFLAGS = \ + -I@top_srcdir@/src/conf $(AM_CFLAGS) +if WITH_DRIVER_MODULES +libvirt_driver_psbm_la_LIBADD = ../gnulib/lib/libgnu.la +libvirt_driver_psbm_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) +endif +libvirt_driver_psbm_la_SOURCES = $(PSBM_DRIVER_SOURCES) +endif + if WITH_VMWARE if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_vmware.la @@ -1078,6 +1099,7 @@ EXTRA_DIST += \ $(LXC_DRIVER_SOURCES) \ $(UML_DRIVER_SOURCES) \ $(OPENVZ_DRIVER_SOURCES) \ + $(PSBM_DRIVER_SOURCES) \ $(PHYP_DRIVER_SOURCES) \ $(VBOX_DRIVER_SOURCES) \ $(XENAPI_DRIVER_SOURCES) \ diff --git a/src/README b/src/README index 00d11d1..02c3f9c 100644 --- a/src/README +++ b/src/README @@ -29,6 +29,7 @@ Then there are the hypervisor implementations: * hyperv/ - Microsoft Hyper-V support using WinRM * lxc/ - Linux Native Containers * openvz/ - OpenVZ containers using cli tools + * psbm/ - Parallels Server Bare Metal using SDK API * phyp/ - IBM Power Hypervisor using CLI tools over SSH * qemu/ - QEMU / KVM using qemu CLI/monitor * remote/ - Generic libvirt native RPC client diff --git a/src/driver.h b/src/driver.h index 3792003..ad97790 100644 --- a/src/driver.h +++ b/src/driver.h @@ -30,6 +30,7 @@ typedef enum { VIR_DRV_VMWARE = 13, VIR_DRV_LIBXL = 14, VIR_DRV_HYPERV = 15, + VIR_DRV_PSBM = 16, } virDrvNo; diff --git a/src/libvirt.c b/src/libvirt.c index 8f94b11..59eb368 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -55,6 +55,9 @@ # ifdef WITH_OPENVZ # include "openvz/openvz_driver.h" # endif +# ifdef WITH_PSBM +# include "psbm/psbm_driver.h" +# endif # ifdef WITH_VMWARE # include "vmware/vmware_driver.h" # endif @@ -447,6 +450,9 @@ virInitialize(void) # ifdef WITH_OPENVZ virDriverLoadModule("openvz"); # endif +# ifdef WITH_PSBM + virDriverLoadModule("psbm"); +# endif # ifdef WITH_VMWARE virDriverLoadModule("vmware"); # endif @@ -475,6 +481,9 @@ virInitialize(void) # ifdef WITH_OPENVZ if (openvzRegister() == -1) return -1; # endif +# ifdef WITH_PSBM + if (psbmRegister() == -1) return -1; +# endif # ifdef WITH_VMWARE if (vmwareRegister() == -1) return -1; # endif diff --git a/src/psbm/psbm_api.c b/src/psbm/psbm_api.c new file mode 100644 index 0000000..b5a89f1 --- /dev/null +++ b/src/psbm/psbm_api.c @@ -0,0 +1,117 @@ +/* + * psbm_api.c: core driver methods for managing PSBM virtual servers + * + * Copyright (C) 2011 Parallels, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Authors: + * Dmitry Mishin <dim(a)parallels.com> + * + */ + +#include <config.h> + +#include <sys/utsname.h> +#include <dlfcn.h> + +#include "psbm_api.h" +#include "virterror_internal.h" + +#ifdef PRL_SDK_WRAP_FOR_EACH_ITERATOR + #undef PRL_SDK_WRAP_FOR_EACH_ITERATOR + #undef PRL_SDK_WRAP_FOR_EACH_DEPR_ITERATOR +#endif +#define PRL_SDK_WRAP_FOR_EACH_ITERATOR( name ) \ + name##wrap##_Ptr name; +#define PRL_SDK_WRAP_FOR_EACH_DEPR_ITERATOR( name ) \ + name##wrap##_Ptr name; + +PRL_SDK_WRAP_FOR_EACH() + +#ifdef PRL_SDK_WRAP_FOR_EACH_ITERATOR + #undef PRL_SDK_WRAP_FOR_EACH_ITERATOR + #undef PRL_SDK_WRAP_FOR_EACH_DEPR_ITERATOR +#endif + + +int psbmApiInit(struct psbm_driver *driver) +{ + const char *libname = "libprl_sdk.so"; + void *handle = NULL; + PRL_RESULT res; + + handle = dlopen(libname, RTLD_LAZY); + if (!handle) { + psbmError(VIR_ERR_INTERNAL_ERROR, + _("Failed to load SDK library %s %s"), libname, dlerror()); + return VIR_ERR_INTERNAL_ERROR; + } + +#define PRL_SDK_WRAP_FOR_EACH_ITERATOR(name) \ + if (!(name = (name##wrap##_Ptr)dlsym(handle, #name))) { \ + psbmError(VIR_ERR_INTERNAL_ERROR, \ + _("Failed to locate SDK symbol '%s' on initialization"), #name); \ + } + +#define PRL_SDK_WRAP_FOR_EACH_DEPR_ITERATOR(name) \ + if (!(name = (name##wrap##_Ptr)dlsym(handle, #name))) { \ + } + + PRL_SDK_WRAP_FOR_EACH(); +#undef PRL_SDK_WRAP_FOR_EACH_DEPR_ITERATOR +#undef PRL_SDK_WRAP_FOR_EACH_ITERATOR + + res = PrlApi_Init(PARALLELS_API_VER); + if (PRL_FAILED(res)) { + psbmError(VIR_ERR_OPERATION_FAILED, + _("Can't initialize Parallels SDK")); + dlclose(handle); + return VIR_ERR_OPERATION_FAILED; + } + + driver->handle = handle; + return VIR_ERR_OK; +} + +int psbmApiDeinit(struct psbm_driver *driver) +{ + if (driver->handle) { + PrlApi_Deinit(); + + if (dlclose(driver->handle)) { + psbmError(VIR_ERR_SYSTEM_ERROR, _("Can't unload Parallels SDK")); + return VIR_ERR_SYSTEM_ERROR; + } + } + +#ifdef PRL_SDK_WRAP_FOR_EACH_ITERATOR +# undef PRL_SDK_WRAP_FOR_EACH_ITERATOR +# undef PRL_SDK_WRAP_FOR_EACH_DEPR_ITERATOR +#endif + +#define PRL_SDK_WRAP_FOR_EACH_ITERATOR(name) \ + name = 0; +#define PRL_SDK_WRAP_FOR_EACH_DEPR_ITERATOR(name) \ + name = 0; + +PRL_SDK_WRAP_FOR_EACH() + +#undef PRL_SDK_WRAP_FOR_EACH_ITERATOR +#undef PRL_SDK_WRAP_FOR_EACH_DEPR_ITERATOR + + driver->handle = NULL; + return VIR_ERR_OK; +} diff --git a/src/psbm/psbm_api.h b/src/psbm/psbm_api.h new file mode 100644 index 0000000..8793bc6 --- /dev/null +++ b/src/psbm/psbm_api.h @@ -0,0 +1,59 @@ +/* + * psbm_api.h: SDK API methods for managing PSBM virtual servers + * + * Copyright (C) 2011 Parallels, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Authors: + * Dmitry Mishin <dim(a)parallels.com> + * + */ + + +#ifndef _PSBM_API_H_ +#define _PSBM_API_H_ + +/* necessary for dynamic loading of Parallels SDK library define */ +#define DYN_API_WRAP + +#include <parallels-virtualization-sdk/Parallels.h> +#include <parallels-virtualization-sdk/PrlApiMacro.h> + +#include "internal.h" +#include "psbm_private.h" + +#ifdef PRL_SDK_WRAP_FOR_EACH_ITERATOR + #undef PRL_SDK_WRAP_FOR_EACH_ITERATOR + #undef PRL_SDK_WRAP_FOR_EACH_DEPR_ITERATOR +#endif +#define PRL_SDK_WRAP_FOR_EACH_ITERATOR( name ) \ + extern name##wrap##_Ptr name; +#define PRL_SDK_WRAP_FOR_EACH_DEPR_ITERATOR( name ) \ + extern name##wrap##_Ptr name; + +PRL_SDK_WRAP_FOR_EACH() + +#ifdef PRL_SDK_WRAP_FOR_EACH_ITERATOR + #undef PRL_SDK_WRAP_FOR_EACH_ITERATOR + #undef PRL_SDK_WRAP_FOR_EACH_DEPR_ITERATOR +#endif + + +/* Library initialization/deinitialization */ +int psbmApiInit(struct psbm_driver *driver); +int psbmApiDeinit(struct psbm_driver *driver); + +#endif /* _PSBM_API_H_ */ diff --git a/src/psbm/psbm_driver.c b/src/psbm/psbm_driver.c new file mode 100644 index 0000000..183d5ba --- /dev/null +++ b/src/psbm/psbm_driver.c @@ -0,0 +1,208 @@ +/* + * psbm_driver.c: core driver methods for managing PSBM virtual servers + * + * Copyright (C) 2011 Parallels, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Authors: + * Dmitry Mishin <dim(a)parallels.com> + * + */ + +#include <config.h> + +#include <sys/utsname.h> + +#include "psbm_driver.h" +#include "psbm_api.h" +#include "virterror_internal.h" +#include "datatypes.h" +#include "memory.h" +#include "nodeinfo.h" + +static void psbmDriverLock(struct psbm_driver *driver) +{ + virMutexLock(&driver->lock); +} + +static void psbmDriverUnlock(struct psbm_driver *driver) +{ + virMutexUnlock(&driver->lock); +} + +static void psbmFreeDriver(struct psbm_driver *driver) +{ + if (!driver) + return; + + virDomainObjListDeinit(&driver->domains); + virCapabilitiesFree(driver->caps); + VIR_FREE(driver); +} + +static virCapsPtr psbmCapsInit(void) +{ + struct utsname utsname; + virCapsPtr caps; + virCapsGuestPtr guest; + + uname(&utsname); + + if ((caps = virCapabilitiesNew(utsname.machine, + 0, 0)) == NULL) + goto no_memory; + + if (nodeCapsInitNUMA(caps) < 0) + goto no_memory; + + virCapabilitiesSetMacPrefix(caps, (unsigned char[]){ 0x52, 0x54, 0x00 }); + + if ((guest = virCapabilitiesAddGuest(caps, + "exe", + utsname.machine, + sizeof(int) == 4 ? 32 : 8, + NULL, + NULL, + 0, + NULL)) == NULL) + goto no_memory; + + if (virCapabilitiesAddGuestDomain(guest, + "psbm", + NULL, + NULL, + 0, + NULL) == NULL) + goto no_memory; + + caps->defaultInitPath = "/sbin/init"; + + return caps; +no_memory: + virCapabilitiesFree(caps); + return NULL; +} + + +static virDrvOpenStatus psbmOpen(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + unsigned int flags) +{ + struct psbm_driver *driver; + + virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); + + /* Decline if the URI is NULL or the scheme is not 'psbm' */ + if (conn->uri == NULL || conn->uri->scheme == NULL || + STRCASENEQ(conn->uri->scheme, "psbm")) + return VIR_DRV_OPEN_DECLINED; + + + /* If path isn't /system, then they typoed, so tell them correct path */ + if (conn->uri->path == NULL || + STRNEQ (conn->uri->path, "/system")) { + psbmError(VIR_ERR_INTERNAL_ERROR, + _("unexpected PSBM URI path '%s', try psbm:///system"), + conn->uri->path); + return VIR_DRV_OPEN_ERROR; + } + + /* We now know the URI is definitely for this driver, so beyond + * here, don't return DECLINED, always use ERROR */ + + if (VIR_ALLOC(driver) < 0) { + virReportOOMError(); + return VIR_DRV_OPEN_ERROR; + } + + if (virDomainObjListInit(&driver->domains) < 0) + goto cleanup; + + if (!(driver->caps = psbmCapsInit())) + goto cleanup; + + /* load Parallels SDK library, resolve symbols, initialize it */ + if (psbmApiInit(driver) != VIR_ERR_OK) + goto cleanup; + + conn->privateData = driver; + + return VIR_DRV_OPEN_SUCCESS; + +cleanup: + psbmFreeDriver(driver); + return VIR_DRV_OPEN_ERROR; +}; + +static int psbmClose(virConnectPtr conn) { + struct psbm_driver *driver = conn->privateData; + int err; + + err = psbmApiDeinit(driver); + if (err != VIR_ERR_OK) + return err; + + psbmFreeDriver(driver); + conn->privateData = NULL; + + return 0; +} + +static const char *psbmGetType(virConnectPtr conn ATTRIBUTE_UNUSED) { + return "PSBM"; +} + +static int psbmGetVersion(virConnectPtr conn, unsigned long *version) { + struct psbm_driver *driver = conn->privateData; + psbmDriverLock(driver); + *version = driver->version; + psbmDriverUnlock(driver); + return 0; +} + +static int psbmListDomains(virConnectPtr conn ATTRIBUTE_UNUSED, + int *ids ATTRIBUTE_UNUSED , int nids ATTRIBUTE_UNUSED) { + /* FIXME implement via API */ + return -1; +} + +static int psbmNumDomains(virConnectPtr conn) { + struct psbm_driver *driver = conn->privateData; + int n; + + psbmDriverLock(driver); + n = virDomainObjListNumOfDomains(&driver->domains, 1); + psbmDriverUnlock(driver); + + return n; +} + +static virDriver psbmDriver = { + .no = VIR_DRV_PSBM, + .name = "PSBM", + .open = psbmOpen, /* 0.3.1 */ + .close = psbmClose, /* 0.3.1 */ + .type = psbmGetType, /* 0.3.1 */ + .version = psbmGetVersion, /* 0.3.1 */ + .nodeGetInfo = nodeGetInfo, /* 0.3.1 */ + .listDomains = psbmListDomains, /* 0.3.1 */ + .numOfDomains = psbmNumDomains, /* 0.3.1 */ +}; + +int psbmRegister(void) { + virRegisterDriver(&psbmDriver); + return 0; +} diff --git a/src/psbm/psbm_driver.h b/src/psbm/psbm_driver.h new file mode 100644 index 0000000..aff171c --- /dev/null +++ b/src/psbm/psbm_driver.h @@ -0,0 +1,32 @@ +/* + * psbm_driver.h: core driver methods for managing PSBM virtual servers + * + * Copyright (C) 2011 Parallels, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Authors: + * Dmitry Mishin <dim(a)parallels.com> + * + */ + +#ifndef _PSBM_DRIVER_H_ +#define _PSBM_DRIVER_H_ + +#include "internal.h" + +int psbmRegister(void); + +#endif /* _PSBM_DRIVER_H_ */ diff --git a/src/psbm/psbm_private.h b/src/psbm/psbm_private.h new file mode 100644 index 0000000..6994feb --- /dev/null +++ b/src/psbm/psbm_private.h @@ -0,0 +1,49 @@ +/* + * psbm_private.h: internal definitions for PSBM driver + * + * Copyright (C) 2011 Parallels, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Authors: + * Dmitry Mishin <dim(a)parallels.com> + * + */ + +#ifndef _PSBM_PRIVATE_H_ +#define _PSBM_PRIVATE_H_ + +#include "internal.h" +#include "threads.h" +#include "capabilities.h" +#include "domain_conf.h" + + +#define VIR_FROM_THIS VIR_FROM_PSBM + +# define psbmError(code, ...) \ + virReportErrorHelper(VIR_FROM_PSBM, code, __FILE__, \ + __FUNCTION__, __LINE__, __VA_ARGS__) + +struct psbm_driver { + virMutex lock; + + virCapsPtr caps; + virDomainObjList domains; + int version; + void *handle; +}; + +#endif /* _PSBM_PRIVATE_H_ */ diff --git a/src/util/virterror.c b/src/util/virterror.c index 26c4981..73f2618 100644 --- a/src/util/virterror.c +++ b/src/util/virterror.c @@ -100,6 +100,9 @@ static const char *virErrorDomainName(virErrorDomain domain) { case VIR_FROM_OPENVZ: dom = "OpenVZ "; break; + case VIR_FROM_PSBM: + dom = "PSBM "; + break; case VIR_FROM_VMWARE: dom = "VMware "; break; -- 1.7.3.4

4 11

[libvirt] [PATCH] qemu: Check for outstanding async job too
by Michal Privoznik 30 Sep '11

30 Sep '11

Currently, qemuDomainGetXMLDesc and qemudDomainGetInfo check for outstanding synchronous job before (eventual) monitor entering. However, there can be already async job set, e.g. migration. --- src/qemu/qemu_domain.c | 12 +++++++++--- src/qemu/qemu_domain.h | 2 ++ src/qemu/qemu_driver.c | 4 ++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 320a35c..d3ad192 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -696,11 +696,17 @@ qemuDomainObjDiscardAsyncJob(struct qemud_driver *driver, virDomainObjPtr obj) } static bool -qemuDomainJobAllowed(qemuDomainObjPrivatePtr priv, enum qemuDomainJob job) +qemuDomainNestedJobAllowed(qemuDomainObjPrivatePtr priv, enum qemuDomainJob job) { return !priv->job.asyncJob || (priv->job.mask & JOB_MASK(job)) != 0; } +bool +qemuDomainJobAllowed(qemuDomainObjPrivatePtr priv, enum qemuDomainJob job) +{ + return !priv->job.active && qemuDomainNestedJobAllowed(priv, job); +} + /* Give up waiting for mutex after 30 seconds */ #define QEMU_JOB_WAIT_TIME (1000ull * 30) @@ -736,7 +742,7 @@ retry: goto error; } - while (!nested && !qemuDomainJobAllowed(priv, job)) { + while (!nested && !qemuDomainNestedJobAllowed(priv, job)) { if (virCondWaitUntil(&priv->job.asyncCond, &obj->lock, then) < 0) goto error; } @@ -748,7 +754,7 @@ retry: /* No job is active but a new async job could have been started while obj * was unlocked, so we need to recheck it. */ - if (!nested && !qemuDomainJobAllowed(priv, job)) + if (!nested && !qemuDomainNestedJobAllowed(priv, job)) goto retry; qemuDomainObjResetJob(priv); diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 3b09419..cdf1375 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -277,4 +277,6 @@ void qemuDomainSetFakeReboot(struct qemud_driver *driver, virDomainObjPtr vm, bool value); +bool qemuDomainJobAllowed(qemuDomainObjPrivatePtr priv, + enum qemuDomainJob job); #endif /* __QEMU_DOMAIN_H__ */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ffa8b4c..a094fcc 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2019,7 +2019,7 @@ static int qemudDomainGetInfo(virDomainPtr dom, if ((vm->def->memballoon != NULL) && (vm->def->memballoon->model == VIR_DOMAIN_MEMBALLOON_MODEL_NONE)) { info->memory = vm->def->mem.max_balloon; - } else if (!priv->job.active) { + } else if (qemuDomainJobAllowed(priv, QEMU_JOB_QUERY)) { if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) goto cleanup; if (!virDomainObjIsActive(vm)) @@ -4351,7 +4351,7 @@ static char *qemuDomainGetXMLDesc(virDomainPtr dom, qemuDomainObjPrivatePtr priv = vm->privateData; /* Don't delay if someone's using the monitor, just use * existing most recent data instead */ - if (!priv->job.active) { + if (qemuDomainJobAllowed(priv, QEMU_JOB_QUERY)) { if (qemuDomainObjBeginJobWithDriver(driver, vm, QEMU_JOB_QUERY) < 0) goto cleanup; -- 1.7.3.4

2 2

[libvirt] [PATCH] qemu: qxl devices don't support multifunction yet
by Marc-André Lureau 30 Sep '11

30 Sep '11

This is a workaround for QXL bug RHBZ#728174. --- src/qemu/qemu_command.c | 33 +++++++++++--------- .../qemuxml2argv-graphics-spice-qxl-vga.args | 2 +- tests/qemuxml2argvtest.c | 3 +- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c7c183a..1bb136d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1350,7 +1350,8 @@ qemuUsbId(virBufferPtr buf, int idx) static int qemuBuildDeviceAddressStr(virBufferPtr buf, virDomainDeviceInfoPtr info, - virBitmapPtr qemuCaps) + virBitmapPtr qemuCaps, + bool multiFunc) { if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { if (info->addr.pci.domain != 0) { @@ -1389,7 +1390,7 @@ qemuBuildDeviceAddressStr(virBufferPtr buf, virBufferAsprintf(buf, ",bus=pci.0"); else virBufferAsprintf(buf, ",bus=pci"); - if (qemuCapsGet(qemuCaps, QEMU_CAPS_PCI_MULTIFUNCTION)) + if (qemuCapsGet(qemuCaps, QEMU_CAPS_PCI_MULTIFUNCTION) && multiFunc) virBufferAsprintf(buf, ",multifunction=on,addr=0x%x.0x%x", info->addr.pci.slot, info->addr.pci.function); else @@ -1697,7 +1698,7 @@ qemuBuildDriveDevStr(virDomainDiskDefPtr disk, virBufferAsprintf(&opt, ",event_idx=%s", virDomainVirtioEventIdxTypeToString(disk->event_idx)); } - qemuBuildDeviceAddressStr(&opt, &disk->info, qemuCaps); + qemuBuildDeviceAddressStr(&opt, &disk->info, qemuCaps, true); break; case VIR_DOMAIN_DISK_BUS_USB: virBufferAddLit(&opt, "usb-storage"); @@ -1776,7 +1777,7 @@ qemuBuildFSDevStr(virDomainFSDefPtr fs, virBufferAsprintf(&opt, ",id=%s", fs->info.alias); virBufferAsprintf(&opt, ",fsdev=%s%s", QEMU_FSDEV_HOST_PREFIX, fs->info.alias); virBufferAsprintf(&opt, ",mount_tag=%s", fs->dst); - qemuBuildDeviceAddressStr(&opt, &fs->info, qemuCaps); + qemuBuildDeviceAddressStr(&opt, &fs->info, qemuCaps, true); if (virBufferError(&opt)) { virReportOOMError(); @@ -1904,7 +1905,7 @@ qemuBuildControllerDevStr(virDomainControllerDefPtr def, goto error; } - if (qemuBuildDeviceAddressStr(&buf, &def->info, qemuCaps) < 0) + if (qemuBuildDeviceAddressStr(&buf, &def->info, qemuCaps, true) < 0) goto error; if (virBufferError(&buf)) { @@ -2007,7 +2008,7 @@ qemuBuildNicDevStr(virDomainNetDefPtr net, net->mac[0], net->mac[1], net->mac[2], net->mac[3], net->mac[4], net->mac[5]); - if (qemuBuildDeviceAddressStr(&buf, &net->info, qemuCaps) < 0) + if (qemuBuildDeviceAddressStr(&buf, &net->info, qemuCaps, true) < 0) goto error; if (bootindex && qemuCapsGet(qemuCaps, QEMU_CAPS_BOOTINDEX)) virBufferAsprintf(&buf, ",bootindex=%d", bootindex); @@ -2141,7 +2142,7 @@ qemuBuildWatchdogDevStr(virDomainWatchdogDefPtr dev, } virBufferAsprintf(&buf, "%s,id=%s", model, dev->info.alias); - if (qemuBuildDeviceAddressStr(&buf, &dev->info, qemuCaps) < 0) + if (qemuBuildDeviceAddressStr(&buf, &dev->info, qemuCaps, true) < 0) goto error; if (virBufferError(&buf)) { @@ -2165,7 +2166,7 @@ qemuBuildMemballoonDevStr(virDomainMemballoonDefPtr dev, virBufferAddLit(&buf, "virtio-balloon-pci"); virBufferAsprintf(&buf, ",id=%s", dev->info.alias); - if (qemuBuildDeviceAddressStr(&buf, &dev->info, qemuCaps) < 0) + if (qemuBuildDeviceAddressStr(&buf, &dev->info, qemuCaps, true) < 0) goto error; if (virBufferError(&buf)) { @@ -2191,7 +2192,7 @@ qemuBuildUSBInputDevStr(virDomainInputDefPtr dev, dev->type == VIR_DOMAIN_INPUT_TYPE_MOUSE ? "usb-mouse" : "usb-tablet", dev->info.alias); - if (qemuBuildDeviceAddressStr(&buf, &dev->info, qemuCaps) < 0) + if (qemuBuildDeviceAddressStr(&buf, &dev->info, qemuCaps, true) < 0) goto error; if (virBufferError(&buf)) { @@ -2229,7 +2230,7 @@ qemuBuildSoundDevStr(virDomainSoundDefPtr sound, model = "intel-hda"; virBufferAsprintf(&buf, "%s,id=%s", model, sound->info.alias); - if (qemuBuildDeviceAddressStr(&buf, &sound->info, qemuCaps) < 0) + if (qemuBuildDeviceAddressStr(&buf, &sound->info, qemuCaps, true) < 0) goto error; if (virBufferError(&buf)) { @@ -2272,6 +2273,7 @@ qemuBuildVideoDevStr(virDomainVideoDefPtr video, { virBuffer buf = VIR_BUFFER_INITIALIZER; const char *model = qemuVideoTypeToString(video->type); + bool multiFunc = true; if (!model) { qemuReportError(VIR_ERR_INTERNAL_ERROR, @@ -2291,9 +2293,10 @@ qemuBuildVideoDevStr(virDomainVideoDefPtr video, /* QEMU accepts bytes for vram_size. */ virBufferAsprintf(&buf, ",vram_size=%u", video->vram * 1024); + multiFunc = false; } - if (qemuBuildDeviceAddressStr(&buf, &video->info, qemuCaps) < 0) + if (qemuBuildDeviceAddressStr(&buf, &video->info, qemuCaps, multiFunc) < 0) goto error; if (virBufferError(&buf)) { @@ -2350,7 +2353,7 @@ qemuBuildPCIHostdevDevStr(virDomainHostdevDefPtr dev, const char *configfd, virBufferAsprintf(&buf, ",configfd=%s", configfd); if (dev->bootIndex) virBufferAsprintf(&buf, ",bootindex=%d", dev->bootIndex); - if (qemuBuildDeviceAddressStr(&buf, &dev->info, qemuCaps) < 0) + if (qemuBuildDeviceAddressStr(&buf, &dev->info, qemuCaps, true) < 0) goto error; if (virBufferError(&buf)) { @@ -2405,7 +2408,7 @@ qemuBuildRedirdevDevStr(virDomainRedirdevDefPtr dev, dev->info.alias, dev->info.alias); - if (qemuBuildDeviceAddressStr(&buf, &dev->info, qemuCaps) < 0) + if (qemuBuildDeviceAddressStr(&buf, &dev->info, qemuCaps, true) < 0) goto error; if (virBufferError(&buf)) { @@ -2438,7 +2441,7 @@ qemuBuildUSBHostdevDevStr(virDomainHostdevDefPtr dev, dev->source.subsys.u.usb.device, dev->info.alias); - if (qemuBuildDeviceAddressStr(&buf, &dev->info, qemuCaps) < 0) + if (qemuBuildDeviceAddressStr(&buf, &dev->info, qemuCaps, true) < 0) goto error; if (virBufferError(&buf)) { @@ -2475,7 +2478,7 @@ qemuBuildHubDevStr(virDomainHubDefPtr dev, virBufferAddLit(&buf, "usb-hub"); virBufferAsprintf(&buf, ",id=%s", dev->info.alias); - if (qemuBuildDeviceAddressStr(&buf, &dev->info, qemuCaps) < 0) + if (qemuBuildDeviceAddressStr(&buf, &dev->info, qemuCaps, true) < 0) goto error; if (virBufferError(&buf)) { diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args index 18013a5..5cd36f8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args @@ -4,4 +4,4 @@ unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \ /dev/HostVG/QEMUGuest1 -usb -spice port=5903,tls-port=5904,addr=127.0.0.1,\ x509-dir=/etc/pki/libvirt-spice,tls-channel=main,plaintext-channel=inputs -vga \ qxl -global qxl-vga.vram_size=33554432 -device qxl,id=video1,vram_size=67108864,bus=pci.0,addr=0x4 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 +-device virtio-balloon-pci,id=balloon0,bus=pci.0,multifunction=on,addr=0x3.0x0 diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 335af4a..a453511 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -402,7 +402,8 @@ mymain(void) DO_TEST("graphics-spice-qxl-vga", false, QEMU_CAPS_VGA, QEMU_CAPS_VGA_QXL, QEMU_CAPS_DEVICE, QEMU_CAPS_SPICE, - QEMU_CAPS_DEVICE_QXL_VGA); + QEMU_CAPS_DEVICE_QXL_VGA, + QEMU_CAPS_PCI_MULTIFUNCTION); DO_TEST("input-usbmouse", false, NONE); DO_TEST("input-usbtablet", false, NONE); -- 1.7.6

7 21

[libvirt] [PATCH v2 1/4] api: Add public api for 'reset'
by Xu He Jie 30 Sep '11

30 Sep '11

Add new public api for 'reset'. It can reset domain immediately without any guest shutdown. Signed-off-by: Xu He Jie <xuhj(a)linux.vnet.ibm.com> --- include/libvirt/libvirt.h.in | 3 ++ src/driver.h | 4 +++ src/libvirt.c | 50 ++++++++++++++++++++++++++++++++++++++++++ src/libvirt_public.syms | 1 + 4 files changed, 58 insertions(+), 0 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index afeb83f..a3c581d 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -1031,6 +1031,9 @@ virDomainPtr virDomainLookupByUUIDString (virConnectPtr conn, int virDomainShutdown (virDomainPtr domain); int virDomainReboot (virDomainPtr domain, unsigned int flags); +int virDomainReset (virDomainPtr domain, + unsigned int flags); + int virDomainDestroy (virDomainPtr domain); int virDomainDestroyFlags (virDomainPtr domain, unsigned int flags); diff --git a/src/driver.h b/src/driver.h index 7dcab8f..f85a1b1 100644 --- a/src/driver.h +++ b/src/driver.h @@ -124,6 +124,9 @@ typedef int (*virDrvDomainReboot) (virDomainPtr domain, unsigned int flags); typedef int + (*virDrvDomainReset) (virDomainPtr domain, + unsigned int flags); +typedef int (*virDrvDomainDestroy) (virDomainPtr domain); typedef int (*virDrvDomainDestroyFlags) (virDomainPtr domain, @@ -759,6 +762,7 @@ struct _virDriver { virDrvDomainResume domainResume; virDrvDomainShutdown domainShutdown; virDrvDomainReboot domainReboot; + virDrvDomainReset domainReset; virDrvDomainDestroy domainDestroy; virDrvDomainDestroyFlags domainDestroyFlags; virDrvDomainGetOSType domainGetOSType; diff --git a/src/libvirt.c b/src/libvirt.c index 38fcfbc..7fcbda4 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -3017,6 +3017,56 @@ error: } /** + * virDomainReset: + * @domain: a domain object + * @flags: extra flags for the reboot operation, not used yet + * + * Reset a domain immediately without any guest OS shutdown. + * Reset emulates the power reset of a button on a machine, i.e. + * All hardware see the RST line set and reinitialize their internal state. + * + * Note that the risk of data loss caused by reset without any + * guest OS shutdown. + * + * Returns 0 in case of success and -1 in case of failure. + */ +int +virDomainReset(virDomainPtr domain, unsigned int flags) +{ + virConnectPtr conn; + + VIR_DOMAIN_DEBUG(domain, "flags=%x", flags); + + virResetLastError(); + + if (!VIR_IS_CONNECTED_DOMAIN(domain)) { + virLibDomainError(VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virDispatchError(NULL); + return -1; + } + if (domain->conn->flags & VIR_CONNECT_RO) { + virLibDomainError(VIR_ERR_OPERATION_DENIED, __FUNCTION__); + goto error; + } + + conn = domain->conn; + + if (conn->driver->domainReset) { + int ret; + ret = conn->driver->domainReset (domain, flags); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError(VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + virDispatchError(domain->conn); + return -1; +} + +/** * virDomainGetName: * @domain: a domain object * diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index cef14f0..9e6f104 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -492,6 +492,7 @@ LIBVIRT_0.9.5 { LIBVIRT_0.9.7 { global: virDomainSnapshotGetParent; + virDomainReset; } LIBVIRT_0.9.5; # .... define new API here using predicted next version number .... -- 1.7.4.1

4 11

[libvirt] [PATCH] add a default event handle to passthough the new event from qemu
by Sheldon 29 Sep '11

29 Sep '11

1 0

[libvirt] [PATCH 1/4] api: Add new public api for 'reset'
by Xu He Jie 29 Sep '11

29 Sep '11

Add new public api for 'reset'. It can reset domain immediately without any guest shutdown. Signed-off-by: Xu He Jie <xuhj(a)linux.vnet.ibm.com> --- include/libvirt/libvirt.h.in | 2 + src/driver.h | 3 ++ src/libvirt.c | 44 ++++++++++++++++++++++++++++++++++++++++++ src/libvirt_public.syms | 5 ++++ 4 files changed, 54 insertions(+), 0 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 39155a6..3d60023 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -1031,6 +1031,8 @@ virDomainPtr virDomainLookupByUUIDString (virConnectPtr conn, int virDomainShutdown (virDomainPtr domain); int virDomainReboot (virDomainPtr domain, unsigned int flags); +int virDomainReset (virDomainPtr domain); + int virDomainDestroy (virDomainPtr domain); int virDomainDestroyFlags (virDomainPtr domain, unsigned int flags); diff --git a/src/driver.h b/src/driver.h index 3792003..fd0d3a1 100644 --- a/src/driver.h +++ b/src/driver.h @@ -124,6 +124,8 @@ typedef int (*virDrvDomainReboot) (virDomainPtr domain, unsigned int flags); typedef int + (*virDrvDomainReset) (virDomainPtr domain); +typedef int (*virDrvDomainDestroy) (virDomainPtr domain); typedef int (*virDrvDomainDestroyFlags) (virDomainPtr domain, @@ -755,6 +757,7 @@ struct _virDriver { virDrvDomainResume domainResume; virDrvDomainShutdown domainShutdown; virDrvDomainReboot domainReboot; + virDrvDomainReset domainReset; virDrvDomainDestroy domainDestroy; virDrvDomainDestroyFlags domainDestroyFlags; virDrvDomainGetOSType domainGetOSType; diff --git a/src/libvirt.c b/src/libvirt.c index 8f94b11..3c5cd5e 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -3017,6 +3017,50 @@ error: } /** + * virDomainReset: + * @domain: a domain object + * + * Reset a domain immediately without any guest shutdown + * + * Returns 0 in case of success and -1 in case of failure. + */ +int +virDomainReset(virDomainPtr domain) +{ + virConnectPtr conn; + + VIR_DOMAIN_DEBUG(domain); + + virResetLastError(); + + if (!VIR_IS_CONNECTED_DOMAIN(domain)) { + virLibDomainError(VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virDispatchError(NULL); + return -1; + } + if (domain->conn->flags & VIR_CONNECT_RO) { + virLibDomainError(VIR_ERR_OPERATION_DENIED, __FUNCTION__); + goto error; + } + + conn = domain->conn; + + if (conn->driver->domainReset) { + int ret; + ret = conn->driver->domainReset (domain); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError(VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + virDispatchError(domain->conn); + return -1; +} + +/** * virDomainGetName: * @domain: a domain object * diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index 8a6d55a..dffa33f 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -489,4 +489,9 @@ LIBVIRT_0.9.5 { virDomainSnapshotGetName; } LIBVIRT_0.9.4; +LIBVIRT_0.9.7 { + global: + virDomainReset; +} LIBVIRT_0.9.5; + # .... define new API here using predicted next version number .... -- 1.7.4.1

4 9

[libvirt] ANNOUNCE: Perl binding release Sys-Virt version 0.9.5
by Daniel P. Berrange 29 Sep '11

29 Sep '11

I am pleased to announce a new release of the Perl binding, Sys::Virt version 0.9.5, is now available for download: http://search.cpan.org/CPAN/authors/id/D/DA/DANBERR/Sys-Virt-0.9.5.tar.gz Changes in this release - Add all new APIs in libvirt 0.9.5 - Add missing snapshot creation/lookup methods - Fix typo in method listing snapshots - Add missing snapshot constant - Add example for save/restore usage - Re-add abort job binding accidentally deleted All historical releases and online documentation are available from the CPAN page http://search.cpan.org/dist/Sys-Virt/ There is no planned update for libvirt 0.9.6, since that did not introduce any new APIs that require work in the Perl layer. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [PATCH] qemu: Fix error message mentioning VNC instead of SPICE
by Peter Krempa 29 Sep '11

29 Sep '11

--- Simpe cut&paste error. Pushed under trivial rule. Peter src/qemu/qemu_hotplug.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 3adec48..4c1705d 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1397,7 +1397,7 @@ qemuDomainChangeGraphics(struct qemud_driver *driver, } if (STRNEQ_NULLABLE(oldListenNetwork,newListenNetwork)) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("cannot change listen network setting on vnc graphics")); + _("cannot change listen network setting on spice graphics")); return -1; } if (STRNEQ_NULLABLE(olddev->data.spice.keymap, -- 1.7.3.4

1 0

[libvirt] libguestfs integration: rich disk access for libvirt applications
by Stefan Hajnoczi 29 Sep '11

29 Sep '11

Libguestfs provides very nice functionality for applications that need to work with disk images. The includes provisioning applications that set up or customize disk images. It also includes backup applications that want to look inside disk image snapshots - both at the block and file level. What's missing for libguestfs to fill this role is integration that allows libvirt and libguestfs to work together with the same network-transparent remote API approach. In the past we have discussed remoting libguestfs and Richard presented possible approaches: https://www.redhat.com/archives/libguestfs/2011-May/msg00093.html Could libvirt could provide a secure channel over which the libguestfs client that an application is linked against talks to the remote guestfsd? Would libguestfs need some new parameters to connect to a remote libvirtd and create its appliance VM? In terms of application use cases, I'm thinking along the lines of using libvirt to enumerate storage volumes and then switching to libguestfs to actually access the storage volume remotely. Is there enough information exposed by libvirt today to switch over to libguestfs and point it at the storage volume/image file? Stefan

4 18

[libvirt] [PATCH 0/2] Improve timestamps in log messages
by Jiri Denemark 29 Sep '11

29 Sep '11

Jiri Denemark (2): logging: Do not log timestamp through syslog logging: Add date to log timestamp src/util/logging.c | 123 +++++++++++++++++++++++++++++++-------------------- src/util/logging.h | 9 ++-- 2 files changed, 80 insertions(+), 52 deletions(-) -- 1.7.6.1

3 7

Re: [libvirt] [libvirt-glib 8/9] Connect a bunch of domain event to signals
by Daniel P. Berrange 29 Sep '11

29 Sep '11

On Thu, Sep 29, 2011 at 02:25:43PM +0300, Zeeshan Ali (Khattak) wrote: > On Thu, Sep 29, 2011 at 11:45 AM, Daniel P. Berrange > <berrange(a)redhat.com> wrote: > > On Wed, Sep 28, 2011 at 09:30:57PM +0200, Marc-André Lureau wrote: > >> --- > >> libvirt-gobject/libvirt-gobject-connection.c | 126 ++++++++++++++++++++++++++ > >> 1 files changed, 126 insertions(+), 0 deletions(-) > >> > >> diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c > >> index e99a08d..34781e6 100644 > >> --- a/libvirt-gobject/libvirt-gobject-connection.c > >> +++ b/libvirt-gobject/libvirt-gobject-connection.c > > > >> @@ -277,6 +398,10 @@ gboolean gvir_connection_open(GVirConnection *conn, > >> return FALSE; > >> } > >> > >> + if (virConnectDomainEventRegister(priv->conn, domain_event_cb, conn, NULL) == -1) { > >> + g_warning("Failed to register domain events, ignoring"); > >> + } > >> + > > > > You might have noticed that we jump through some horrific hoops in > > gvir_connection_fetch_domains(). The reason for this is so that we > > can issue fake event notifications for start/stopped/added/removed > > when virConnectDomainEventRegister() is not available. Not all hypervisors > > support the virConnectDomainEventRegister() API, so we need that fallback > > code. When you succesfully call virConnectDomainEventRegister(), we should > > disable the event emitting part at the end of gvir_connection_fetch_domains() > > to avoid duplicate events. > > In that case, create_domain() method should emit the signal too when > event didn't register? If 'create_domain' updates the hash table directly with the new guest object, then, yes it should emit a signal. Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [libvirt-glib 8/9] Connect a bunch of domain event to signals
by Zeeshan Ali (Khattak) 29 Sep '11

29 Sep '11

Forgot to hit 'reply-all' :( ---------- Forwarded message ---------- From: Zeeshan Ali (Khattak) <zeeshanak(a)gnome.org> Date: Thu, Sep 29, 2011 at 2:25 PM Subject: Re: [libvirt] [libvirt-glib 8/9] Connect a bunch of domain event to signals To: "Daniel P. Berrange" <berrange(a)redhat.com> On Thu, Sep 29, 2011 at 11:45 AM, Daniel P. Berrange <berrange(a)redhat.com> wrote: > On Wed, Sep 28, 2011 at 09:30:57PM +0200, Marc-André Lureau wrote: >> --- >> libvirt-gobject/libvirt-gobject-connection.c | 126 ++++++++++++++++++++++++++ >> 1 files changed, 126 insertions(+), 0 deletions(-) >> >> diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c >> index e99a08d..34781e6 100644 >> --- a/libvirt-gobject/libvirt-gobject-connection.c >> +++ b/libvirt-gobject/libvirt-gobject-connection.c > >> @@ -277,6 +398,10 @@ gboolean gvir_connection_open(GVirConnection *conn, >> return FALSE; >> } >> >> + if (virConnectDomainEventRegister(priv->conn, domain_event_cb, conn, NULL) == -1) { >> + g_warning("Failed to register domain events, ignoring"); >> + } >> + > > You might have noticed that we jump through some horrific hoops in > gvir_connection_fetch_domains(). The reason for this is so that we > can issue fake event notifications for start/stopped/added/removed > when virConnectDomainEventRegister() is not available. Not all hypervisors > support the virConnectDomainEventRegister() API, so we need that fallback > code. When you succesfully call virConnectDomainEventRegister(), we should > disable the event emitting part at the end of gvir_connection_fetch_domains() > to avoid duplicate events. In that case, create_domain() method should emit the signal too when event didn't register? -- Regards, Zeeshan Ali (Khattak) FSF member#5124

1 0

[libvirt] [libvirt-glib 1/9] doc: add some missing return value documentation
by Marc-André Lureau 29 Sep '11

29 Sep '11

From: Marc-André Lureau <marcandre.lureau(a)gmail.com> --- libvirt-gobject/libvirt-gobject-stream.c | 1 + libvirt-gobject/libvirt-gobject-stream.h | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-stream.c b/libvirt-gobject/libvirt-gobject-stream.c index 255ad73..519d733 100644 --- a/libvirt-gobject/libvirt-gobject-stream.c +++ b/libvirt-gobject/libvirt-gobject-stream.c @@ -191,6 +191,7 @@ stream_sink(virStreamPtr st G_GNUC_UNUSED, * @stream: the stream * @func: (scope notified): the callback for writing data to application * @user_data: (closure): data to be passed to @callback + * Returns: the number of bytes consumed or -1 upon error * * Receive the entire data stream, sending the data to the * requested data sink. This is simply a convenient alternative diff --git a/libvirt-gobject/libvirt-gobject-stream.h b/libvirt-gobject/libvirt-gobject-stream.h index 27fa8b7..fd9c9bb 100644 --- a/libvirt-gobject/libvirt-gobject-stream.h +++ b/libvirt-gobject/libvirt-gobject-stream.h @@ -65,6 +65,8 @@ struct _GVirStreamClass * @buf: data pointer * @nbytes: data size * @user_data: user data passed to the function + * Returns: the number of bytes filled, 0 upon end + * of file, or -1 upon error */ typedef gint (* GVirStreamSinkFunc) (GVirStream *stream, const gchar *buf, -- 1.7.6.2

2 11

[libvirt] [PATCH] hyperv: Report an error for acceptable URI schemes with a transport
by Matthias Bolte 29 Sep '11

29 Sep '11

Before, URIs such as hyperv+ssh:// have been declined by the Hyper-V driver resulting in the remote driver trying to connect to an non-existing libvirtd. Now such URIs trigger an error in the Hyper-V driver suggesting to try again without the transport part in the scheme. --- src/hyperv/hyperv_driver.c | 25 ++++++++++++++++++++++--- 1 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index b022fee..c26d29f 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -69,6 +69,7 @@ static virDrvOpenStatus hypervOpen(virConnectPtr conn, virConnectAuthPtr auth, unsigned int flags) { virDrvOpenStatus result = VIR_DRV_OPEN_ERROR; + char *plus; hypervPrivate *priv = NULL; char *username = NULL; char *password = NULL; @@ -77,12 +78,30 @@ hypervOpen(virConnectPtr conn, virConnectAuthPtr auth, unsigned int flags) virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); - /* Decline if the URI is NULL or the scheme is not hyperv */ - if (conn->uri == NULL || conn->uri->scheme == NULL || - STRCASENEQ(conn->uri->scheme, "hyperv")) { + /* Decline if the URI is NULL or the scheme is NULL */ + if (conn->uri == NULL || conn->uri->scheme == NULL) { return VIR_DRV_OPEN_DECLINED; } + /* Decline if the scheme is not hyperv */ + plus = strchr(conn->uri->scheme, '+'); + + if (plus == NULL) { + if (STRCASENEQ(conn->uri->scheme, "hyperv")) { + return VIR_DRV_OPEN_DECLINED; + } + } else { + if (plus - conn->uri->scheme != 6 || + STRCASENEQLEN(conn->uri->scheme, "hyperv", 6)) { + return VIR_DRV_OPEN_DECLINED; + } + + HYPERV_ERROR(VIR_ERR_INVALID_ARG, "%s", + _("Transport in URI scheme is not supported, try again " + "without the transport part")); + return VIR_DRV_OPEN_ERROR; + } + /* Require server part */ if (conn->uri->server == NULL) { HYPERV_ERROR(VIR_ERR_INVALID_ARG, "%s", -- 1.7.4.1

2 2

[libvirt] [PATCH] esx: Report an error for acceptable URI schemes with a transport
by Matthias Bolte 29 Sep '11

29 Sep '11

Before, URIs such as esx+ssh:// have been declined by the ESX driver resulting in the remote driver trying to connect to an non-existing libvirtd. Now such URIs trigger and error in the ESX driver suggesting to try again without the transport part in the scheme. --- src/esx/esx_driver.c | 31 ++++++++++++++++++++++++++----- 1 files changed, 26 insertions(+), 5 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index f1102ea..c81eca8 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -938,20 +938,41 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, unsigned int flags) { virDrvOpenStatus result = VIR_DRV_OPEN_ERROR; + char *plus; esxPrivate *priv = NULL; char *potentialVCenterIpAddress = NULL; char vCenterIpAddress[NI_MAXHOST] = ""; virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); - /* Decline if the URI is NULL or the scheme is not one of {vpx|esx|gsx} */ - if (conn->uri == NULL || conn->uri->scheme == NULL || - (STRCASENEQ(conn->uri->scheme, "vpx") && - STRCASENEQ(conn->uri->scheme, "esx") && - STRCASENEQ(conn->uri->scheme, "gsx"))) { + /* Decline if the URI is NULL or the scheme is NULL */ + if (conn->uri == NULL || conn->uri->scheme == NULL) { return VIR_DRV_OPEN_DECLINED; } + /* Decline if the scheme is not one of {vpx|esx|gsx} */ + plus = strchr(conn->uri->scheme, '+'); + + if (plus == NULL) { + if (STRCASENEQ(conn->uri->scheme, "vpx") && + STRCASENEQ(conn->uri->scheme, "esx") && + STRCASENEQ(conn->uri->scheme, "gsx")) { + return VIR_DRV_OPEN_DECLINED; + } + } else { + if (plus - conn->uri->scheme != 3 || + (STRCASENEQLEN(conn->uri->scheme, "vpx", 3) && + STRCASENEQLEN(conn->uri->scheme, "esx", 3) && + STRCASENEQLEN(conn->uri->scheme, "gsx", 3))) { + return VIR_DRV_OPEN_DECLINED; + } + + ESX_ERROR(VIR_ERR_INVALID_ARG, "%s", + _("Transport in URI scheme is not supported, try again " + "without the transport part")); + return VIR_DRV_OPEN_ERROR; + } + /* Require server part */ if (conn->uri->server == NULL) { ESX_ERROR(VIR_ERR_INVALID_ARG, "%s", -- 1.7.4.1

2 2

[libvirt] [libvirt-glib 1/2] Actually provide gvir_storage_vol_get_path()
by Zeeshan Ali (Khattak) 29 Sep '11

29 Sep '11

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> This was only declared in header previously but not implemented. --- libvirt-gobject/libvirt-gobject-storage-vol.c | 11 +++++++++++ libvirt-gobject/libvirt-gobject.sym | 1 + 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.c b/libvirt-gobject/libvirt-gobject-storage-vol.c index b94f6cf..6cbae84 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.c +++ b/libvirt-gobject/libvirt-gobject-storage-vol.c @@ -182,6 +182,17 @@ const gchar *gvir_storage_vol_get_name(GVirStorageVol *vol) return name; } +const gchar *gvir_storage_vol_get_path(GVirStorageVol *vol) +{ + GVirStorageVolPrivate *priv = vol->priv; + const char *path; + + if (!(path = virStorageVolGetPath(priv->handle))) { + g_error("Failed to get storage_vol path on %p", priv->handle); + } + + return path; +} /** * gvir_storage_vol_get_config: diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index ff2f4cf..ea4ec38 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -83,6 +83,7 @@ LIBVIRT_GOBJECT_0.0.1 { gvir_storage_vol_get_type; gvir_storage_vol_handle_get_type; gvir_storage_vol_get_name; + gvir_storage_vol_get_path; gvir_storage_vol_get_config; gvir_connection_handle_get_type; -- 1.7.6.2

2 3

Re: [libvirt] [fedora-virt] Guest can no longer be bootet with libvirt 0.9.6 from virt-preview repo
by Eric Blake 29 Sep '11

29 Sep '11

[adding libvirt list] On 09/28/2011 09:24 AM, Dennis Jacobfeuerborn wrote: >>>>> I just noticed that once I upgrade to libvirt-0.9.6-1 from the >>>>> virt-preview >>>>> repo on my Fedora 15 machine I can no longer boot guests that use virtio >>>>> disks. I only get "Boot failed: could not read the boot disk". >>>>> Removing the disk and re-adding it as IDE drive allows KVM to boot from >>>>> the >>>>> disk (although the full boot obviously fails due to the hda/vda naming >>>>> difference but that's expected). >>>>> >>>>> After downgrading to libvirt-0.8.8-7 again the problem goes away and the >>>>> guest boot fine from virtio disks. >>>>> >> >> Somewhere around 0.9.4 libvirt switched to use a different method to >> indicate from which device to boot. >> See http://libvirt.org/git/?p=libvirt.git;a=commit;h=c3068d4d2381146ed46051ad63… >> >> I think this causes Seabios to skip using extboot.bin for booting and >> to try to directly boot from a disk. >> If your Seabios version is too old, it won't support booting from >> virtio disks directly. >> > > The libvirt package should probably be updated to require seabios-bin>= 0.6.2. Yes, that probably needs to happen to libvirt.spec when built for F16 (and thus imported into F15 via virt-preview). I'll tackle that, since I've been making a couple other spec file patches lately. -- Eric Blake eblake(a)redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org

5 6

[libvirt] [test-API][PATCH 1/2] update xmlgenerator.py to support for spice graphics type
by Nan Zhang 29 Sep '11

29 Sep '11

This extends graphics element for spice XML composing, and support sub-elements settings for audio, images, streaming and so on: <graphics type='spice' autoport='yes'> <image compression='auto_glz'/> <jpeg compression='auto'/> <zlib compression='auto'/> <playback compression='on'/> <streaming mode='filter'/> <clipboard copypaste='no'/> </graphics> --- utils/Python/xmlbuilder.py | 9 ++++++- utils/Python/xmlgenerator.py | 51 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 56 insertions(+), 4 deletions(-) diff --git a/utils/Python/xmlbuilder.py b/utils/Python/xmlbuilder.py index 5a0f8c8..3dbe576 100644 --- a/utils/Python/xmlbuilder.py +++ b/utils/Python/xmlbuilder.py @@ -297,6 +297,13 @@ if __name__ == "__main__": params['memory'] = '1048576' params['vcpu'] = '2' params['inputbus'] = 'usb' + params['graphtype'] = 'spice' + params['image'] = 'auto_glz' + params['jpeg'] = 'auto' + params['zlib'] = 'auto' + params['playback'] = 'on' + params['streaming'] = 'filter' + params['clipboard'] = 'no' params['sound'] = 'ac97' params['bootcd'] = '/iso/rhel5.iso' @@ -367,7 +374,7 @@ if __name__ == "__main__": #---------------------------------------- # get domain snapshot xml string #---------------------------------------- - params['name'] = 'hello' + params['snapshotname'] = 'hello' params['description'] = 'hello snapshot' snapshot_xml = xmlobj.build_domain_snapshot(params) diff --git a/utils/Python/xmlgenerator.py b/utils/Python/xmlgenerator.py index d57dd33..b61ceb1 100644 --- a/utils/Python/xmlgenerator.py +++ b/utils/Python/xmlgenerator.py @@ -235,9 +235,54 @@ def domain_xml(params, install = False): # <graphics> graphics_element = domain.createElement('graphics') - graphics_element.setAttribute('type', 'vnc') - graphics_element.setAttribute('port', '-1') - graphics_element.setAttribute('keymap', 'en-us') + if not params.has_key('graphtype'): + params['graphtype'] == 'vnc' + + graphics_element.setAttribute('type', params['graphtype']) + if params['graphtype'] == 'vnc': + graphics_element.setAttribute('port', '-1') + graphics_element.setAttribute('keymap', 'en-us') + elif params['graphtype'] == 'spice': + graphics_element.setAttribute('autoport', 'yes') + if params.has_key('image'): + image_element = domain.createElement('image') + # image to set image compression (accepts + # auto_glz, auto_lz, quic, glz, lz, off) + image_element.setAttribute('compression', params['image']) + graphics_element.appendChild(image_element) + if params.has_key('jpeg'): + jpeg_element = domain.createElement('jpeg') + # jpeg for JPEG compression for images over wan (accepts + # auto, never, always) + jpeg_element.setAttribute('compression', params['jpeg']) + graphics_element.appendChild(jpeg_element) + if params.has_key('zlib'): + zlib_element = domain.createElement('zlib') + # zlib for configuring wan image compression (accepts + # auto, never, always) + zlib_element.setAttribute('compression', params['zlib']) + graphics_element.appendChild(zlib_element) + if params.has_key('playback'): + playback_element = domain.createElement('playback') + # playback for enabling audio stream compression (accepts on or off) + playback_element.setAttribute('compression', params['playback']) + graphics_element.appendChild(playback_element) + if params.has_key('streaming'): + streaming_element = domain.createElement('streaming') + # streamming for settings it's mode attribute to one of + # filter, all or off + streaming_element.setAttribute('mode', params['streaming']) + graphics_element.appendChild(streaming_element) + if params.has_key('clipboard'): + clipboard_element = domain.createElement('clipboard') + # Copy & Paste functionality is enabled by default, and can + # be disabled by setting the copypaste property to no + clipboard_element.setAttribute('copypaste', params['clipboard']) + graphics_element.appendChild(clipboard_element) + else: + print 'Wrong graphics type was specified.' + sys.exit(1) + devices_element.appendChild(graphics_element) domain_element.appendChild(devices_element) -- 1.7.4.4

2 4

[libvirt] [test-API][PATCH] Add test case update_devflag.py for update device flag
by Nan Zhang 29 Sep '11

29 Sep '11

--- repos/domain/update_devflag.py | 163 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 163 insertions(+), 0 deletions(-) create mode 100644 repos/domain/update_devflag.py diff --git a/repos/domain/update_devflag.py b/repos/domain/update_devflag.py new file mode 100644 index 0000000..30f75b0 --- /dev/null +++ b/repos/domain/update_devflag.py @@ -0,0 +1,163 @@ +#!/usr/bin/evn python +"""Update virtual device to guest from an XML file +""" + +__author__ = 'Nan Zhang: nzhang(a)redhat.com' +__date__ = 'Fri Sep 2, 2011' +__version__ = '0.1.0' +__credits__ = 'Copyright (C) 2011 Red Hat, Inc.' +__all__ = ['usage', 'update_devflag'] + +import os +import re +import sys +import commands +from xml.dom import minidom + +def append_path(path): + """Append root path of package""" + if path in sys.path: + pass + else: + sys.path.append(path) + +pwd = os.getcwd() +result = re.search('(.*)libvirt-test-API', pwd) +append_path(result.group(0)) + +from lib import connectAPI +from lib import domainAPI +from utils.Python import utils +from utils.Python import xmlbuilder +from exception import LibvirtAPI + +def usage(): + print '''usage: mandatory arguments: + guestname + devtype + ''' + +def check_params(params): + """Verify inputing parameter dictionary""" + logger = params['logger'] + keys = ['guestname', 'devtype'] + for key in keys: + if key not in params: + logger.error("%s is required" %key) + usage() + return 1 + return 0 + +def create_image(params, img_name, img_size): + """Create an image file""" + logger = params['logger'] + stat, ret = commands.getstatusoutput("dd if=/dev/zero of=%s bs=1 \ + count=1 seek=%s" % (img_name, img_size)) + if stat == 0: + logger.debug("create image result:\n%s" % ret) + return True + else: + return False + +def check_updated_device(params, guestname, domobj, srcfile): + """Check if the device is updated""" + logger = params['logger'] + xmlobj = domobj.get_xml_desc(guestname) + domxml = minidom.parseString(xmlobj) + + for diskTag in domxml.getElementsByTagName("source"): + if diskTag.parentNode.getAttribute("device") == 'cdrom': + upfile = diskTag.getAttribute("file") + elif diskTag.parentNode.getAttribute('device') == 'floppy': + upfile = diskTag.getAttribute("file") + + if upfile == srcfile: + return False, upfile + else: + return True, upfile + +def update_devflag(params): + """Update virtual device to a domain from xml""" + + # Initiate and check parameters + params_check_result = check_params(params) + if params_check_result: + return 1 + logger = params['logger'] + guestname = params['guestname'] + devtype = params['devtype'] + if devtype == 'cdrom': + xmlargs = {} + xmlargs['guestname'] = guestname + xmlargs['guesttype'] = 'kvm' + xmlargs['hdmodel'] = 'ide' + xmlargs['bootcd'] = '/var/lib/libvirt/boot/cdrom.img' + srcfile = xmlargs['bootcd'] + create_image(params, srcfile, '100M') + elif devtype == 'floppy': + xmlargs = {} + xmlargs['guestname'] = guestname + xmlargs['floppysource'] = '/var/lib/libvirt/boot/floppy.img' + srcfile = xmlargs['floppysource'] + create_image(params, srcfile, '2M') + else: + srcfile = None + logger.error("Wrong device type was specified.") + return 1 + + if not params.has_key('flag'): + flag = domainAPI.VIR_DOMAIN_AFFECT_CONFIG + + # Connect to local hypervisor connection URI + util = utils.Utils() + uri = util.get_uri('127.0.0.1') + conn = connectAPI.ConnectAPI() + virconn = conn.open(uri) + + caps = conn.get_caps() + logger.debug(caps) + + # Generate device XML for updating + domobj = domainAPI.DomainAPI(virconn) + newxmlobj = xmlbuilder.XmlBuilder() + + if devtype == 'cdrom': + newdevxml = newxmlobj.build_cdrom(xmlargs) + elif devtype == 'floppy': + newdevxml = newxmlobj.build_floppy(xmlargs) + + logger.debug("block device xml desc:\n%s" %newdevxml) + + try: + try: + domobj.update_device_flag(guestname, newdevxml, flag) + res, upfile = check_updated_device(params, guestname, \ + domobj, srcfile) + if res: + logger.info("success to update '%s' device: %s\n" % \ + (devtype, upfile)) + else: + logger.error("fail to update '%s' device: %s\n" % \ + (devtype, upfile)) + except LibvirtAPI, e: + logger.error("API error message: %s, error code is %s" % + (e.response()['message'], e.response()['code'])) + conn.close() + logger.info("closed hypervisor connection") + return 1 + finally: + conn.close() + logger.info("closed hypervisor connection") + + return 0 + +def update_devflag_clean(params): + """Clean testing environment""" + logger = params['logger'] + + if params['devtype'] == 'cdrom': + os.system('rm -f /var/lib/libvirt/boot/cdrom.img') + elif params['devtype'] == 'floppy': + os.system('rm -f /var/lib/libvirt/boot/floppy.img') + else: + logger.debug("image file was not found.") -- 1.7.4.4

1 1

[libvirt] [PATCH] security: chown/label bidrectional and unidirectional fifos
by Laine Stump 29 Sep '11

29 Sep '11

This patch fixes the regression with using named pipes for qemu serial devices noted in: https://bugzilla.redhat.com/show_bug.cgi?id=740478 The problem was that, while new code in libvirt looks for a single bidirectional fifo of the name given in the config, then relabels that and continues without looking for / relabelling the two unidirectional fifos named ${name}.in and ${name}.out, qemu looks in the opposite order. So if the user had naively created all three fifos, libvirt would relabel the bidirectional fifo to allow qemu access, but qemu would attempt to use the two unidirectional fifos and fail (because it didn't have proper permissions/rights). The solution implemented here is to always look for and chown/relabel both types of fifos, then let qemu decide which one it wants to use (in the unusual case that both are present). If one of the types is present, libvirt will silently ignore when the other type is missing (since that will be the most common case), but if neither type is present, there will be an error logged about failing to relabel/chown one of the bidirectional pipes. (Likewise, if one direction of the unidirectional pipes is present but the other is missing, this will also result in an error log). (Note commit d37c6a3a (which first appeared in libvirt-0.9.2) added the code that checked for a bidirectional fifo. Prior to that commit, bidirectional fifos fdor serial devices didn't work unless the fifo was pre-owned/labelled such that qemu could access it.) --- src/security/security_dac.c | 39 ++++++++++++++++++++++++++++++--------- src/security/security_selinux.c | 39 ++++++++++++++++++++++++++++++--------- 2 files changed, 60 insertions(+), 18 deletions(-) diff --git a/src/security/security_dac.c b/src/security/security_dac.c index af02236..f97d2d6 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -397,6 +397,7 @@ virSecurityDACSetChardevLabel(virSecurityManagerPtr mgr, { virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); char *in = NULL, *out = NULL; + bool found_bipipe = false; int ret = -1; switch (dev->type) { @@ -406,19 +407,28 @@ virSecurityDACSetChardevLabel(virSecurityManagerPtr mgr, break; case VIR_DOMAIN_CHR_TYPE_PIPE: + /* look for / chown both bidirectional pipe and dual uni-directional + * pipes if found; let the hypervisor decide which to use. + */ if (virFileExists(dev->data.file.path)) { + found_bipipe = true; if (virSecurityDACSetOwnership(dev->data.file.path, priv->user, priv->group) < 0) goto done; - } else { - if ((virAsprintf(&in, "%s.in", dev->data.file.path) < 0) || - (virAsprintf(&out, "%s.out", dev->data.file.path) < 0)) { - virReportOOMError(); - goto done; - } - if ((virSecurityDACSetOwnership(in, priv->user, priv->group) < 0) || - (virSecurityDACSetOwnership(out, priv->user, priv->group) < 0)) - goto done; } + if ((virAsprintf(&in, "%s.in", dev->data.file.path) < 0) || + (virAsprintf(&out, "%s.out", dev->data.file.path) < 0)) { + virReportOOMError(); + goto done; + } + if (found_bipipe && + !(virFileExists(in) || virFileExists(out))) { + ret = 0; + goto done; + } + if ((virSecurityDACSetOwnership(in, priv->user, priv->group) < 0) || + (virSecurityDACSetOwnership(out, priv->user, priv->group) < 0)) + goto done; + ret = 0; break; @@ -438,6 +448,7 @@ virSecurityDACRestoreChardevLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, virDomainChrSourceDefPtr dev) { char *in = NULL, *out = NULL; + bool found_bipipe = false; int ret = -1; switch (dev->type) { @@ -447,11 +458,21 @@ virSecurityDACRestoreChardevLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, break; case VIR_DOMAIN_CHR_TYPE_PIPE: + if (virFileExists(dev->data.file.path)) { + found_bipipe = true; + if (virSecurityDACRestoreSecurityFileLabel(dev->data.file.path) < 0) + goto done; + } if ((virAsprintf(&out, "%s.out", dev->data.file.path) < 0) || (virAsprintf(&in, "%s.in", dev->data.file.path) < 0)) { virReportOOMError(); goto done; } + if (found_bipipe && + !(virFileExists(in) || virFileExists(out))) { + ret = 0; + goto done; + } if ((virSecurityDACRestoreSecurityFileLabel(out) < 0) || (virSecurityDACRestoreSecurityFileLabel(in) < 0)) goto done; diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 0807a34..e7a18a6 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -794,6 +794,7 @@ SELinuxSetSecurityChardevLabel(virDomainObjPtr vm, { const virSecurityLabelDefPtr secdef = &vm->def->seclabel; char *in = NULL, *out = NULL; + bool found_bipipe = false; int ret = -1; if (secdef->norelabel) @@ -806,19 +807,28 @@ SELinuxSetSecurityChardevLabel(virDomainObjPtr vm, break; case VIR_DOMAIN_CHR_TYPE_PIPE: + /* look for / chown both bidirectional pipe and dual uni-directional + * pipes if found; let the hypervisor decide which to use. + */ if (virFileExists(dev->data.file.path)) { + found_bipipe = true; if (SELinuxSetFilecon(dev->data.file.path, secdef->imagelabel) < 0) goto done; - } else { - if ((virAsprintf(&in, "%s.in", dev->data.file.path) < 0) || - (virAsprintf(&out, "%s.out", dev->data.file.path) < 0)) { - virReportOOMError(); - goto done; - } - if ((SELinuxSetFilecon(in, secdef->imagelabel) < 0) || - (SELinuxSetFilecon(out, secdef->imagelabel) < 0)) - goto done; } + if ((virAsprintf(&in, "%s.in", dev->data.file.path) < 0) || + (virAsprintf(&out, "%s.out", dev->data.file.path) < 0)) { + virReportOOMError(); + goto done; + } + if (found_bipipe && + !(virFileExists(in) || virFileExists(out))) { + ret = 0; + goto done; + } + if ((SELinuxSetFilecon(in, secdef->imagelabel) < 0) || + (SELinuxSetFilecon(out, secdef->imagelabel) < 0)) + goto done; + ret = 0; break; @@ -840,6 +850,7 @@ SELinuxRestoreSecurityChardevLabel(virDomainObjPtr vm, { const virSecurityLabelDefPtr secdef = &vm->def->seclabel; char *in = NULL, *out = NULL; + bool found_bipipe = false; int ret = -1; if (secdef->norelabel) @@ -853,11 +864,21 @@ SELinuxRestoreSecurityChardevLabel(virDomainObjPtr vm, ret = 0; break; case VIR_DOMAIN_CHR_TYPE_PIPE: + if (virFileExists(dev->data.file.path)) { + found_bipipe = true; + if (SELinuxRestoreSecurityFileLabel(dev->data.file.path) < 0) + goto done; + } if ((virAsprintf(&out, "%s.out", dev->data.file.path) < 0) || (virAsprintf(&in, "%s.in", dev->data.file.path) < 0)) { virReportOOMError(); goto done; } + if (found_bipipe && + !(virFileExists(in) || virFileExists(out))) { + ret = 0; + goto done; + } if ((SELinuxRestoreSecurityFileLabel(out) < 0) || (SELinuxRestoreSecurityFileLabel(in) < 0)) goto done; -- 1.7.3.4

3 4

[libvirt] [PATCH v2] qemu: add return value check
by ajia＠redhat.com 29 Sep '11

29 Sep '11

From: Alex Jia <ajia(a)redhat.com> * src/qemu/qemu_migration.c: if 'vmdef' is NULL, the function virDomainSaveConfig still dereferences it, it doesn't make sense, so should add return value check to make sure 'vmdef' is non-NULL before calling virDomainSaveConfig, in addition, in order to debug later, also should record error information into log. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/qemu/qemu_migration.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index ef48d65..a009a57 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2582,7 +2582,7 @@ qemuMigrationFinish(struct qemud_driver *driver, vm->newDef = vmdef = mig->persistent; else vmdef = virDomainObjGetPersistentDef(driver->caps, vm); - if (virDomainSaveConfig(driver->configDir, vmdef) < 0) { + if (!vmdef || virDomainSaveConfig(driver->configDir, vmdef) < 0) { /* Hmpf. Migration was successful, but making it persistent * was not. If we report successful, then when this domain * shuts down, management tools are in for a surprise. On the @@ -2603,6 +2603,9 @@ qemuMigrationFinish(struct qemud_driver *driver, if (newVM) vm->persistent = 0; } + if (!vmdef) + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("can't get vmdef")); goto endjob; } -- 1.7.1

3 2

[libvirt] [PATCH] formatdomain.html.in: fix tickpolicy
by Douglas Schilling Landgraf 29 Sep '11

29 Sep '11

there is no option "none": >From libvirt/src/conf/domain_conf.c <snip> VIR_ENUM_IMPL(virDomainTimerTickpolicy, VIR_DOMAIN_TIMER_TICKPOLICY_LAST, "delay", "catchup", "merge", "discard"); </snip> Replacing with delay. Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com> --- docs/formatdomain.html.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 9c3c2e8..49a2c09 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -746,7 +746,7 @@ <timer name="rtc" tickpolicy="catchup" track="guest"> <catchup threshold=123 slew=120 limit=10000/> </timer> - <timer name="pit" tickpolicy="none"/> + <timer name="pit" tickpolicy="delay"/> </clock> ...</pre> -- 1.7.1

2 1

[libvirt] [PATCH] Improve LXC startup error messages
by Daniel P. Berrange 29 Sep '11

29 Sep '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> The LXC controller and container attempt to run in lockstep using a series of handshakes. There was a flaw in the container side though, causing it todo partial setup work, before waiting for the initial controller handshake. This in turn meant some of the controller setup could fail, and obscure the real error from the container setup. Moving the lxcContainerWaitForContinue call to be the first thing the container does solves that. The controller still, however, pollutes the log with a message about the container handshake failing, when the container shuts down during startup. To deal with this requires special handling of the EOF condition on the controllers lxcContainerWaitForContinue() call. * src/lxc/lxc_container.c: Wait for continue message from controller before doing anything at all * src/lxc/lxc_controller.c: Don't pollute log with error message if EOF was returned from lxcContainerWaitForContinue. * src/lxc/lxc_driver.c: Handle EOF from controller handshake --- src/lxc/lxc_container.c | 38 ++++++++++++++++++++++++++------------ src/lxc/lxc_controller.c | 31 ++++++++++++++++++++++++++++--- src/lxc/lxc_driver.c | 2 +- 3 files changed, 55 insertions(+), 16 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 787df9a..ee5ca9f 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -214,7 +214,7 @@ error_out: * parent process. It will send this message on the socket pair stored in * the vm structure once it has completed the post clone container setup. * - * Returns 0 on success or -1 in case of error + * Returns 1 on success, 0 on EOF, or -1 in case of error */ int lxcContainerWaitForContinue(int control) { @@ -222,12 +222,18 @@ int lxcContainerWaitForContinue(int control) int readLen; readLen = saferead(control, &msg, sizeof(msg)); - if (readLen != sizeof(msg) || - msg != LXC_CONTINUE_MSG) { + if (readLen < 0) + return -1; + + if (readLen != sizeof(msg)) + return 0; + + if (msg != LXC_CONTINUE_MSG) { + errno = EINVAL; return -1; } - return 0; + return 1; } @@ -1036,6 +1042,20 @@ static int lxcContainerChild( void *data ) char *ttyPath = NULL; virDomainFSDefPtr root; virCommandPtr cmd = NULL; + int rc; + + /* Wait for interface devices to show up */ + if ((rc = lxcContainerWaitForContinue(argv->monitor)) <= 0) { + if (rc < 0) + virReportSystemError(errno, "%s", + _("Failed to read the container continue message")); + else + lxcError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Controller unexpectedly quit")); + goto cleanup; + } + + VIR_DEBUG("Received container continue message"); if (NULL == vmDef) { lxcError(VIR_ERR_INTERNAL_ERROR, @@ -1079,14 +1099,6 @@ static int lxcContainerChild( void *data ) goto cleanup; } - /* Wait for interface devices to show up */ - if (lxcContainerWaitForContinue(argv->monitor) < 0) { - virReportSystemError(errno, "%s", - _("Failed to read the container continue message")); - goto cleanup; - } - VIR_DEBUG("Received container continue message"); - /* rename and enable interfaces */ if (lxcContainerRenameAndEnableInterfaces(argv->nveths, argv->veths) < 0) { @@ -1120,6 +1132,8 @@ cleanup: } virCommandFree(cmd); + if (ret < 0) + virDispatchError(NULL); return ret; } diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 52d382e..8c3a54f 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -780,6 +780,9 @@ static int lxcSetPersonality(virDomainDefPtr def) # define MS_SLAVE (1<<19) #endif +/* + * Returns -1 on error, 0 if container quit unexpected, 1 on success + */ static int lxcControllerRun(virDomainDefPtr def, unsigned int nveths, @@ -801,6 +804,7 @@ lxcControllerRun(virDomainDefPtr def, size_t nloopDevs = 0; int *loopDevs = NULL; size_t i; + int ret; if (socketpair(PF_UNIX, SOCK_STREAM, 0, control) < 0) { virReportSystemError(errno, "%s", @@ -935,12 +939,25 @@ lxcControllerRun(virDomainDefPtr def, goto cleanup; } - if (lxcContainerWaitForContinue(containerhandshake[0]) < 0) { + if ((ret = lxcContainerWaitForContinue(containerhandshake[0])) < 0) { virReportSystemError(errno, "%s", _("error receiving signal from container")); goto cleanup; } + if (ret == 0) { + rc = 0; + /* We're not raising an error, since the container will have + * done that already and we don't want to confuse the driver + * when it fetches the error message from logs + */ +#if 0 + lxcError(VIR_ERR_INTERNAL_ERROR, "%s", + _("container quit during startup handshake")); +#endif + goto cleanup; + } + /* Now the container is fully setup... */ /* ...we can close the loop devices... */ @@ -959,7 +976,10 @@ lxcControllerRun(virDomainDefPtr def, } VIR_FORCE_CLOSE(handshakefd); - rc = lxcControllerMain(monitor, client, appPty, containerPty, container); + if (lxcControllerMain(monitor, client, appPty, containerPty, container) != 0) + goto cleanup; + + rc = 1; cleanup: VIR_FREE(devptmx); @@ -1186,5 +1206,10 @@ cleanup: unlink(sockpath); VIR_FREE(sockpath); - return rc ? EXIT_FAILURE : EXIT_SUCCESS; + /* If rc == 0, we have an error, but the lxc container + * startup will have printed it already.*/ + if (rc < 0) + virDispatchError(NULL); + + return rc <=0 ? EXIT_FAILURE : EXIT_SUCCESS; } diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 4b62600..759e3a9 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1622,7 +1622,7 @@ static int lxcVmStart(virConnectPtr conn, vm->def->id = vm->pid; virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, reason); - if (lxcContainerWaitForContinue(handshakefds[0]) < 0) { + if (lxcContainerWaitForContinue(handshakefds[0]) <= 0) { char out[1024]; if (!(lxcReadLogOutput(vm, logfile, pos, out, 1024) < 0)) { -- 1.7.6.2

2 1

[libvirt] [PATCH] virsh: update man page for cpu_shares parameter
by Daniel Veillard 29 Sep '11

29 Sep '11

The man page suggest that the cpu_shares parameter of schedinfo allows values 0-262144, but the kernel remaps values 0 and 1 to the minimum 2, just document that behaviour: [root@test ~]# cat /cgroup/cpu/libvirt/qemu/cpu.shares 1024 [root@test ~]# echo 0 > /cgroup/cpu/libvirt/qemu/cpu.shares [root@test ~]# cat /cgroup/cpu/libvirt/qemu/cpu.shares 2 [root@test ~]# echo 1 > /cgroup/cpu/libvirt/qemu/cpu.shares [root@test ~]# cat /cgroup/cpu/libvirt/qemu/cpu.shares 2 [root@test ~]# * tools/virsh.pod: update description of the cpu_shares parameter to indicate the values 0 and 1 are automatically changed by the kernel to minimal value 2 diff --git a/tools/virsh.pod b/tools/virsh.pod index a01d723..6e3febb 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -914,7 +914,9 @@ If I<--current> is specified, affect the current guest state. B<Note>: The cpu_shares parameter has a valid value range of 0-262144; Negative values are wrapped to positive, and larger values are capped at the maximum. -Therefore, -1 is a useful shorthand for 262144. +Therefore, -1 is a useful shorthand for 262144. The values 0 and 1 seems to +also be automatically changed by the Linux kernel to 2 which consider this +the minimal value. B<Note>: The weight and cap parameters are defined only for the XEN_CREDIT scheduler and are now I<DEPRECATED>. -- 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/

2 2

[libvirt] [PATCH] nodedev: document virsh nodedev-* commands
by Eric Blake 29 Sep '11

29 Sep '11

This section of the man page was completely missing; I stumbled on it when I had no clue that I had to use nodedev-reattach after I was done playing with <hostdev> device passthrough to one of my guests. * tools/virsh.pod (NODEDEV COMMANDS): New section. --- I also need to write something useful for http://libvirt.org/formatnode.html, but that's a patch for another day. Please double-check this for technical accuracy. tools/virsh.pod | 315 ++++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 241 insertions(+), 74 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 43ed1ea..e9f415a 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1163,84 +1163,251 @@ is not available the processes will provide an exit code of 1. =back -=head1 DEVICE COMMANDS +=head1 NODEDEV COMMANDS + +The following commands manipulate host devices that are intended to be +passed through to guest domains via <hostdev> elements in a domain's +<devices> section. A node device key is generally specified by the bus +name followed by its address, using underscores between all components, +such as pci_0000_00_02_1, usb_1_5_3, or net_eth1_00_27_13_6a_fe_00. +The B<nodedev-list> gives the full list of host devices that are known +to libvirt, although this includes devices that cannot be assigned to +a guest (for example, attempting to detach the PCI device that controls +the host's hard disk controller where the guest's disk images live could +cause the host system to lock up or reboot). + +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>. -The following commands manipulate devices associated to domains. -The domain-id can be specified as a short integer, a name or a full UUID. -To better understand the values allowed as options for the command -reading the documentation at L<http://libvirt.org/formatdomain.html> on the -format of the device sections to get the most accurate set of accepted values. +=over 4 + +=item B<nodedev-create> I<FILE> + +Create a device on the host node that can then be assigned to virtual +machines. Normally, libvirt is able to automatically determine which +host nodes are available for use, but this allows registration of +host hardware that libvirt did not automatically detect. I<file> +contains xml for a top-level <device> description of a node device. + +=item B<nodedev-destroy> I<nodedev> + +Destroy (stop) a device on the host. Note that this makes libvirt +quit managing a host device, and may even make that device unusable +by the rest of the physical host until a reboot. + +=item B<nodedev-dettach> I<nodedev> + +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>. + +=item B<nodedev-dumpxml> I<nodedev> + +Dump a <device> XML representation for the given node device, including +such information as the device name, which bus owns the device, the +vendor and product id, and any capabilities of the device usable by +libvirt (such as whether device reset is supported). + +=item B<nodedev-list> I<cap> I<--tree> + +List all of the devices available on the node that are known by libvirt. +If I<cap> is used, the list is filtered to show only the nodes that +include the given capability. If I<--tree> is used, the output is +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. + +=item B<nodedev-reset> I<nodedev> + +Trigger a device reset for I<nodedev>, useful prior to transferring +a node device between guest passthrough or the host. Libvirt will +often do this action implicitly when required, but this command +allows an explicit reset when needed. + +=back + +=head1 SNAPSHOT COMMMANDS + +The following commands manipulate domain snapshots. Snapshots take the +disk, memory, and device state of a domain at a point-of-time, and save it +for future use. They have many uses, from saving a "clean" copy of an OS +image to saving a domain's state before a potentially destructive operation. +Snapshots are identified with a unique name. See +L<http://libvirt.org/formatsnapshot.html> for documentation of the XML format +used to represent properties of snapshots. =over 4 -=item B<attach-device> I<domain-id> I<FILE> - -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. - -=item B<attach-disk> I<domain-id> I<source> I<target> -[I<--driver driver>] [I<--subdriver subdriver>] [I<--cache cache>] -[I<--type type>] [I<--mode mode>] [I<--persistent>] [I<--sourcetype soucetype>] -[I<--serial serial>] [I<--shareable>] [I<--address address>] - -Attach a new disk device to the domain. -I<source> and I<target> are paths for the files and devices. -I<driver> can be I<file>, I<tap> or I<phy> for the Xen hypervisor depending on -the kind of access; or I<qemu> for the QEMU emulator. -I<type> can indicate I<cdrom> or I<floppy> as alternative to the disk default, -although this use only replaces the media within the existing virtual cdrom or -floppy device; consider using B<update-device> for this usage instead. -I<mode> can specify the two specific mode I<readonly> or I<shareable>. -I<persistent> indicates the changes will affect the next boot of the domain. -I<sourcetype> can indicate the type of source (block|file) -I<cache> can be one of "default", "none", "writethrough", "writeback", -"directsync" or "unsafe". -I<serial> is the serial of disk device. I<shareable> indicates the disk device -is shareable between domains. -I<address> is the address of disk device in the form of pci:domain.bus.slot.function, -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>] - -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. -I<source> indicates the source device. -I<target> allows to indicate the target device in the guest. -I<mac> allows to specify the MAC address of the network interface. -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. - -=item B<detach-device> I<domain-id> I<FILE> - -Detach a device from the domain, takes the same kind of XML descriptions -as command B<attach-device>. - -=item B<detach-disk> I<domain-id> I<target> - -Detach a disk device from a domain. The I<target> is the device as seen -from the domain. - -=item B<detach-interface> I<domain-id> I<type> [I<--mac mac>] - -Detach a network interface from a domain. -I<type> can be either I<network> to indicate a physical network device or I<bridge> to indicate a bridge to a device. -It is recommended to use the I<mac> option to distinguish between the interfaces -if more than one are present on the domain. - -=item B<update-device> I<domain-id> I<file> [I<--persistent>] [I<--force>] - -Update the characteristics of a device associated with I<domain-id>, based on -the device definition in an XML I<file>. If the I<--persistent> option is -used, the changes will affect the next boot of the domain. The I<--force> -option can be used to force device update, e.g., to eject a CD-ROM even if it -is locked/mounted in the domain. See the documentation to learn about libvirt -XML format for a device. +=item B<snapshot-create> I<domain> [I<xmlfile>] {[I<--redefine> [I<--current>]] +| [I<--no-metadata>] [I<--halt>] [I<--disk-only>]} + +Create a snapshot for domain I<domain> with the properties specified in +I<xmlfile>. Normally, the only properties settable for a domain snapshot +are the <name> and <description> elements, as well as <disks> if +I<--disk-only> is given; the rest of the fields are +ignored, and automatically filled in by libvirt. If I<xmlfile> is +completely omitted, then libvirt will choose a value for all fields. +The new snapshot will become current, as listed by B<snapshot-current>. + +If I<--halt> is specified, the domain will be left in an inactive state +after the snapshot is created. + +If I<--disk-only> is specified, the snapshot will only include disk +state rather than the usual system checkpoint with vm state. Disk +snapshots are faster than full system checkpoints, but reverting to a +disk snapshot may require fsck or journal replays, since it is like +the disk state at the point when the power cord is abruptly pulled; +and mixing I<--halt> and I<--disk-only> loses any data that was not +flushed to disk at the time. + +If I<--redefine> is specified, then all XML elements produced by +B<snapshot-dumpxml> are valid; this can be used to migrate snapshot +hierarchy from one machine to another, to recreate hierarchy for the +case of a transient domain that goes away and is later recreated with +the same name and UUID, or to make slight alterations in the snapshot +metadata (such as host-specific aspects of the domain XML embedded in +the snapshot). When this flag is supplied, the I<xmlfile> argument +is mandatory, and the domain's current snapshot will not be altered +unless the I<--current> flag is also given. + +If I<--no-metadata> is specified, then the snapshot data is created, +but any metadata is immediately discarded (that is, libvirt does not +treat the snapshot as current, and cannot revert to the snapshot +unless I<--redefine> is later used to teach libvirt about the +metadata again). + +Existence of snapshot metadata will prevent attempts to B<undefine> +a persistent domain. However, for transient domains, snapshot +metadata is silently lost when the domain quits running (whether +by command such as B<destroy> or by internal guest action). + +=item B<snapshot-create-as> I<domain> {[I<--print-xml>] +| [I<--no-metadata>] [I<--halt>]} [I<name>] [I<description>] +[I<--disk-only> [[I<--diskspec>] B<diskspec>]... + +Create a snapshot for domain I<domain> with the given <name> and +<description>; if either value is omitted, libvirt will choose a +value. If I<--print-xml> is specified, then XML appropriate for +I<snapshot-create> is output, rather than actually creating a snapshot. +Otherwise, if I<--halt> is specified, the domain will be left in an +inactive state after the snapshot is created, and if I<--disk-only> +is specified, the snapshot will not include vm state. + +The I<--disk-only> flag is used to request a disk-only snapshot. When +this flag is in use, the command can also take additional I<diskspec> +arguments to add <disk> elements to the xml. Each <diskspec> is in the +form B<disk[,snapshot=type][,driver=type][,file=name]>. To include a +literal comma in B<disk> or in B<file=name>, escape it with a second +comma. A literal I<--diskspec> must preceed each B<diskspec> unless +all three of I<domain>, I<name>, and I<description> are also present. +For example, a diskspec of "vda,snapshot=external,file=/path/to,,new" +results in the following XML: + <disk name='vda' snapshot='external'> + <source file='/path/to,new'/> + </disk> + +If I<--no-metadata> is specified, then the snapshot data is created, +but any metadata is immediately discarded (that is, libvirt does not +treat the snapshot as current, and cannot revert to the snapshot +unless B<snapshot-create> is later used to teach libvirt about the +metadata again). This flag is incompatible with I<--print-xml>. + +=item B<snapshot-current> I<domain> {[I<--name>] | [I<--security-info] +| [I<snapshotname>]} + +Without I<snapshotname>, this will output the snapshot XML for the domain's +current snapshot (if any). If I<--name> is specified, just the +current snapshot name instead of the full xml. Otherwise, using +I<--security-info> will also include security sensitive information in +the XML. + +With I<snapshotname>, this is a request to make the existing named +snapshot become the current snapshot, without reverting the domain. + +=item B<snapshot-edit> I<domain> I<snapshotname> [I<--current>] + +Edit the XML configuration file for I<snapshotname> of a domain. If +I<--current> is specified, also force the edited snapshot to become +the current snapshot. + +This is equivalent to: + + virsh snapshot-dumpxml dom name > snapshot.xml + vi snapshot.xml (or make changes with your other text editor) + virsh snapshot-create dom snapshot.xml --redefine [--current] + +except that it does some error checking. + +The editor used can be supplied by the C<$VISUAL> or C<$EDITOR> environment +variables, and defaults to C<vi>. + +=item B<snapshot-list> I<domain> [{I<--parent> | I<--roots>}] [I<--metadata>] + +List all of the available snapshots for the given domain. + +If I<--parent> is specified, add a column to the output table giving +the name of the parent of each snapshot. + +If I<--roots> is specified, the list will be filtered to just snapshots +that have no parents; this option is not compatible with I<--parent>. + +If I<--metadata> is specified, the list will be filtered to just +snapshots that involve libvirt metadata, and thus would prevent +B<undefine> of a persistent domain, or be lost on B<destroy> of +a transient domain. + +=item B<snapshot-dumpxml> I<domain> I<snapshot> [I<--security-info>] + +Output the snapshot XML for the domain's snapshot named I<snapshot>. +Using I<--security-info> will also include security sensitive information. + +=item B<snapshot-parent> I<domain> I<snapshot> + +Output the name of the parent snapshot for the given I<snapshot>, if any. + +=item B<snapshot-revert> I<domain> I<snapshot> [{I<--running> | I<--paused>}] + +Revert the given domain to the snapshot specified by I<snapshot>. Be aware +that this is a destructive action; any changes in the domain since the last +snapshot was taken will be lost. Also note that the state of the domain after +snapshot-revert is complete will be the state of the domain at the time +the original snapshot was taken. + +Normally, reverting to a snapshot leaves the domain in the state it was +at the time the snapshot was created, except that a disk snapshot with +no vm state leaves the domain in an inactive state. Passing either the +I<--running> or I<--paused> flag will perform additional state changes +(such as booting an inactive domain, or pausing a running domain). Since +transient domains cannot be inactive, it is required to use one of these +flags when reverting to a disk snapshot of a transient domain. + +=item B<snapshot-delete> I<domain> I<snapshot> [I<--metadata>] +[{I<--children> | I<--children-only>}] + +Delete the snapshot for the domain named I<snapshot>. If this snapshot +has child snapshots, changes from this snapshot will be merged into the +children. If I<--children> is passed, then delete this snapshot and any +children of this snapshot. If I<--children-only> is passed, then delete +any children of this snapshot, but leave this snapshot intact. These +two flags are mutually exclusive. + +If I<--metadata> is specified, then only delete the snapshot metadata +maintained by libvirt, while leaving the snapshot contents intact for +access by external tools; otherwise deleting a snapshot also removes +the data contents from that point in time. =back -- 1.7.4.4

2 5

[libvirt] [PATCH 0/5] snapshot-list --tree
by Eric Blake 29 Sep '11

29 Sep '11

I liked 'nodedev-list --tree' so much that I wanted the same for 'snapshot-list domain --tree'. Eric Blake (5): snapshot: new virDomainSnapshotGetParent API snapshot: remote protocol for getparent snapshot: refactor virsh snapshot parent computation snapshot: add virsh snapshot-list --tree snapshot: implement getparent in qemu include/libvirt/libvirt.h.in | 4 + src/driver.h | 5 ++ src/libvirt.c | 44 +++++++++++++ src/libvirt_public.syms | 5 ++ src/qemu/qemu_driver.c | 46 +++++++++++++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 12 +++- src/remote_protocol-structs | 8 ++ src/rpc/gendispatch.pl | 4 +- tools/virsh.c | 147 ++++++++++++++++++++++++++++++++++-------- tools/virsh.pod | 14 ++-- 11 files changed, 254 insertions(+), 36 deletions(-) -- 1.7.4.4

2 13

[libvirt] AHCI support in qemu driver
by Jim Fehlig 28 Sep '11

28 Sep '11

I have some time this week to work on libvirt and thought Daniel's suggestion [1] for adding AHCI support in the qemu driver would be a useful endeavor. I've managed to start a qemu instance using AHCI with attached hackery, iff I have a controller defined. E.g. <disk type='file' device='disk'> <driver name='qemu' type='raw'/> <source file='/var/lib/libvirt/images/test/disk0.raw'/> <target dev='sda' bus='sata'/> </disk> <controller type='sata' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </controller> which results in qemu args -device ahci,id=ahci0,bus=pci.0,multifunction=on,addr=0x3.0x0 -drive file=/var/lib/libvirt/images/test/disk0.raw,if=none,id=drive-sata-dik0,format=raw -device ide-drive,bus=ahci0.0,drive=drive-sata-disk0,id=sata-disk0,bootindex=1 If the controller is not explicitly defined, the AHCI device (-device ahci,...) is not created and qemu fails with qemu-kvm: -device ide-drive,bus=ahci0.0,drive=drive-sata-disk0,id=sata-disk0,bootindex=1: Bus 'a hci0.0' not found I'm not quite sure how to create the controller when not explicitly defined in the config. Also, I suspect there are many things I'm missing in adding support for this controller. E.g., I've ignored hotplug for the moment. What would be considered minimal functionality for supporting this controller? Thanks! Jim [1] http://www.redhat.com/archives/libvir-list/2011-August/msg01034.html

2 2

[libvirt] [PATCH] qemu: Check for ejected media during startup and migration
by Michal Privoznik 28 Sep '11

28 Sep '11

If the daemon is restarted so we reconnect to monitor, cdrom media can be ejected. In that case we don't want to show it in domain xml, or require it on migration destination. To check for disk status use 'info block' monitor command. --- NB, the 'info block' is currently not updated yet. The qemu patches that extend the monitor command are in a queue (that will be merged quickly): http://repo.or.cz/w/qemu/kevin.git head for-anthony The commit that introduce requested feature: http://repo.or.cz/w/qemu/kevin.git/commitdiff/e4def80b36231e161b91fa984cd0d… src/qemu/qemu_conf.h | 6 +++ src/qemu/qemu_driver.c | 7 +++ src/qemu/qemu_hotplug.c | 31 ++++++++++++++ src/qemu/qemu_hotplug.h | 2 + src/qemu/qemu_monitor.c | 19 +++++++++ src/qemu/qemu_monitor.h | 4 ++ src/qemu/qemu_monitor_json.c | 89 +++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 3 + src/qemu/qemu_monitor_text.c | 90 ++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor_text.h | 3 + src/qemu/qemu_process.c | 3 + 11 files changed, 257 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index e8b92a4..ff5cf23 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -165,4 +165,10 @@ void qemuDriverUnlock(struct qemud_driver *driver); int qemudLoadDriverConfig(struct qemud_driver *driver, const char *filename); +struct qemuDomainDiskInfo { + bool removable; + bool locked; + bool tray_open; +}; + #endif /* __QEMUD_CONF_H */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b94d1c4..b10a56f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8236,6 +8236,13 @@ qemuDomainMigrateBegin3(virDomainPtr domain, goto endjob; } + /* Check if there is and ejected media. + * We don't want to require them on the destination. + */ + + if (qemuDomainCheckEjectableMedia(driver, vm) < 0) + goto endjob; + if (!(xml = qemuMigrationBegin(driver, vm, xmlin, cookieout, cookieoutlen))) goto endjob; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 6cfe392..91ac78a 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -150,6 +150,37 @@ error: return -1; } +int +qemuDomainCheckEjectableMedia(struct qemud_driver *driver, + virDomainObjPtr vm) +{ + qemuDomainObjPrivatePtr priv = vm->privateData; + int ret = -1; + int i; + + for (i = 0; i < vm->def->ndisks; i++) { + virDomainDiskDefPtr disk = vm->def->disks[i]; + struct qemuDomainDiskInfo info; + + memset(&info, 0, sizeof(info)); + + qemuDomainObjEnterMonitor(driver, vm); + if (qemuMonitorGetBlockInfo(priv->mon, disk->info.alias, &info) < 0) { + qemuDomainObjExitMonitor(driver, vm); + goto cleanup; + } + qemuDomainObjExitMonitor(driver, vm); + + if (info.tray_open && disk->src) + VIR_FREE(disk->src); + } + + ret = 0; + +cleanup: + return ret; +} + int qemuDomainAttachPciDiskDevice(struct qemud_driver *driver, virDomainObjPtr vm, diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h index 65d1d30..aaaed88 100644 --- a/src/qemu/qemu_hotplug.h +++ b/src/qemu/qemu_hotplug.h @@ -31,6 +31,8 @@ int qemuDomainChangeEjectableMedia(struct qemud_driver *driver, virDomainObjPtr vm, virDomainDiskDefPtr disk, bool force); +int qemuDomainCheckEjectableMedia(struct qemud_driver *driver, + virDomainObjPtr vm); int qemuDomainAttachPciDiskDevice(struct qemud_driver *driver, virDomainObjPtr vm, virDomainDiskDefPtr disk); diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index fca8fa4..7005564 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1215,6 +1215,25 @@ int qemuMonitorGetMemoryStats(qemuMonitorPtr mon, return ret; } +int qemuMonitorGetBlockInfo(qemuMonitorPtr mon, + const char *devname, + struct qemuDomainDiskInfo *info) +{ + int ret; + + VIR_DEBUG("mon=%p dev=%p info=%p", mon, devname, info); + if (!mon) { + qemuReportError(VIR_ERR_INVALID_ARG, "%s", + _("monitor must not be NULL")); + return -1; + } + + if (mon->json) + ret = qemuMonitorJSONGetBlockInfo(mon, devname, info); + else + ret = qemuMonitorTextGetBlockInfo(mon, devname, info); + return ret; +} int qemuMonitorGetBlockStatsInfo(qemuMonitorPtr mon, const char *devname, diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 390eeff..a05d548 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -28,6 +28,7 @@ # include "internal.h" # include "domain_conf.h" +# include "qemu_conf.h" # include "hash.h" typedef struct _qemuMonitor qemuMonitor; @@ -212,6 +213,9 @@ int qemuMonitorGetBalloonInfo(qemuMonitorPtr mon, int qemuMonitorGetMemoryStats(qemuMonitorPtr mon, virDomainMemoryStatPtr stats, unsigned int nr_stats); +int qemuMonitorGetBlockInfo(qemuMonitorPtr mon, + const char *devname, + struct qemuDomainDiskInfo *info); int qemuMonitorGetBlockStatsInfo(qemuMonitorPtr mon, const char *devname, long long *rd_req, diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 3a81ec8..812a78e 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1337,6 +1337,95 @@ cleanup: } +int qemuMonitorJSONGetBlockInfo(qemuMonitorPtr mon, + const char *devname, + struct qemuDomainDiskInfo *info) +{ + int ret = 0; + bool found = false; + int i; + + virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("query-block", + NULL); + virJSONValuePtr reply = NULL; + virJSONValuePtr devices; + + ret = qemuMonitorJSONCommand(mon, cmd, &reply); + if (ret == 0) + ret = qemuMonitorJSONCheckError(cmd, reply); + if (ret < 0) + goto cleanup; + + ret = -1; + + devices = virJSONValueObjectGet(reply, "return"); + if (!devices || devices->type != VIR_JSON_TYPE_ARRAY) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("block info reply was missing device list")); + goto cleanup; + } + + for (i = 0; i < virJSONValueArraySize(devices); i++) { + virJSONValuePtr dev = virJSONValueArrayGet(devices, i); + const char *thisdev; + + if (!dev || dev->type != VIR_JSON_TYPE_OBJECT) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("block info device entry was not in expected format")); + goto cleanup; + } + + if ((thisdev = virJSONValueObjectGetString(dev, "device")) == NULL) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("block info device entry was not in expected format")); + goto cleanup; + } + + if (STRPREFIX(thisdev, QEMU_DRIVE_HOST_PREFIX)) + thisdev += strlen(QEMU_DRIVE_HOST_PREFIX); + + if (STRNEQ(thisdev, devname)) + continue; + + found = true; + if (virJSONValueObjectGetBoolean(dev, "removable", &info->removable) < 0) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot read %s value"), + "removable"); + goto cleanup; + } + + if (virJSONValueObjectGetBoolean(dev, "locked", &info->locked) < 0) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot read %s value"), + "locked"); + goto cleanup; + } + + /* Don't check for success here, because 'tray-open' is presented iff + * medium is ejected. + */ + virJSONValueObjectGetBoolean(dev, "tray-open", &info->tray_open); + + break; + } + + if (!found) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot find info for device '%s'"), + devname); + goto cleanup; + } + + ret = 0; + +cleanup: + virJSONValueFree(cmd); + virJSONValueFree(reply); + return ret; +} + + int qemuMonitorJSONGetBlockStatsInfo(qemuMonitorPtr mon, const char *devname, long long *rd_req, diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index dfeba7e..24d6aec 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -60,6 +60,9 @@ int qemuMonitorJSONGetBalloonInfo(qemuMonitorPtr mon, int qemuMonitorJSONGetMemoryStats(qemuMonitorPtr mon, virDomainMemoryStatPtr stats, unsigned int nr_stats); +int qemuMonitorJSONGetBlockInfo(qemuMonitorPtr mon, + const char *devname, + struct qemuDomainDiskInfo *info); int qemuMonitorJSONGetBlockStatsInfo(qemuMonitorPtr mon, const char *devname, long long *rd_req, diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 0b50ba2..50b9836 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -750,6 +750,96 @@ int qemuMonitorTextGetMemoryStats(qemuMonitorPtr mon, } +int qemuMonitorTextGetBlockInfo(qemuMonitorPtr mon, + const char *devname, + struct qemuDomainDiskInfo *info) +{ + char *reply = NULL; + int ret = -1; + char *dummy; + const char *p, *eol; + int devnamelen = strlen(devname); + int tmp; + + if (qemuMonitorHMPCommand(mon, "info block", &reply) < 0) { + qemuReportError(VIR_ERR_OPERATION_FAILED, + "%s", _("info block command failed")); + goto cleanup; + } + + if (strstr(reply, "\ninfo ")) { + qemuReportError(VIR_ERR_OPERATION_INVALID, + "%s", + _("info block not supported by this qemu")); + goto cleanup; + } + + /* The output looks like this: + * drive-ide0-0-0: removable=0 file=<path> ro=0 drv=raw encrypted=0 + * drive-ide0-1-0: removable=1 locked=0 file=<path> ro=1 drv=raw encrypted=0 + */ + p = reply; + + while (*p) { + if (STRPREFIX(p, QEMU_DRIVE_HOST_PREFIX)) + p += strlen(QEMU_DRIVE_HOST_PREFIX); + + if (STREQLEN(p, devname, devnamelen) && + p[devnamelen] == ':' && p[devnamelen+1] == ' ') { + + eol = strchr(p, '\n'); + if (!eol) + eol = p + strlen(p); + + p += devnamelen + 2; /*Skip to first label. */ + + while (*p) { + if (STRPREFIX(p, "removable=")) { + p += strlen("removable="); + if (virStrToLong_i(p, &dummy, 10, &tmp) == -1) + VIR_DEBUG("error reading removable: %s", p); + else + info->removable = p ? true : false; + } else if (STRPREFIX(p, "locked=")) { + p += strlen("locked="); + if (virStrToLong_i(p, &dummy, 10, &tmp) == -1) + VIR_DEBUG("error reading locked: %s", p); + else + info->locked = p ? true : false; + } else if (STRPREFIX(p, "tray_open=")) { + p += strlen("tray_open="); + if (virStrToLong_i(p, &dummy, 10, &tmp) == -1) + VIR_DEBUG("error reading tray_open: %s", p); + else + info->tray_open = p ? true : false; + } else { + /* ignore because we don't parse all options */ + } + + /* skip to next label */ + p = strchr(p, ' '); + if (!p || p >= eol) break; + p++; + } + + ret = 0; + goto cleanup; + } + + /* skip to next line */ + p = strchr(p, '\n'); + if (!p) break; + p++; + } + + qemuReportError(VIR_ERR_INVALID_ARG, + _("no info for device '%s'"), devname); + +cleanup: + VIR_FREE(reply); + return ret; +} + int qemuMonitorTextGetBlockStatsInfo(qemuMonitorPtr mon, const char *devname, long long *rd_req, diff --git a/src/qemu/qemu_monitor_text.h b/src/qemu/qemu_monitor_text.h index 7cc3172..68e16b3 100644 --- a/src/qemu/qemu_monitor_text.h +++ b/src/qemu/qemu_monitor_text.h @@ -57,6 +57,9 @@ int qemuMonitorTextGetBalloonInfo(qemuMonitorPtr mon, int qemuMonitorTextGetMemoryStats(qemuMonitorPtr mon, virDomainMemoryStatPtr stats, unsigned int nr_stats); +int qemuMonitorTextGetBlockInfo(qemuMonitorPtr mon, + const char *devname, + struct qemuDomainDiskInfo *info); int qemuMonitorTextGetBlockStatsInfo(qemuMonitorPtr mon, const char *devname, long long *rd_req, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index f8a8475..7b5d10a 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2612,6 +2612,9 @@ qemuProcessReconnect(void *opaque) if (qemuProcessFiltersInstantiate(conn, obj->def)) goto error; + if (qemuDomainCheckEjectableMedia(driver, obj) < 0) + goto error; + if (qemuProcessRecoverJob(driver, obj, conn, &oldjob) < 0) goto error; -- 1.7.3.4

2 8

[libvirt] [PATCH] virsh: describe attach-interface parameter target
by Daniel Veillard 28 Sep '11

28 Sep '11

This patch is based on a improvement suggested by Kazuhiro Kikuchi of Fujitsu, it gives a description of the target parameter for that command * tools/virsh.pod: add description for target parameter of attach-interface diff --git a/tools/virsh.pod b/tools/virsh.pod index 6e3febb..ca37e57 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1239,6 +1239,10 @@ the default one. I<model> allows to specify the model type. I<persistent> indicates the changes will affect the next boot of the domain. +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" +will be created automatically. + =item B<detach-device> I<domain-id> I<FILE> Detach a device from the domain, takes the same kind of XML descriptions -- 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/

2 1

[libvirt] [PATCH] qemu: Preserve fakeReboot flag in domain status
by Jiri Denemark 28 Sep '11

28 Sep '11

Thus, when libvirtd is restarted, it will know if a domain is supposed to be killed or reset when it shuts down. --- src/qemu/qemu_domain.c | 21 +++++++++++++++++++++ src/qemu/qemu_domain.h | 4 ++++ src/qemu/qemu_driver.c | 11 +++++------ src/qemu/qemu_process.c | 4 ++-- 4 files changed, 32 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 4023648..320a35c 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -302,6 +302,9 @@ static int qemuDomainObjPrivateXMLFormat(virBufferPtr buf, void *data) virBufferAddLit(buf, "/>\n"); } + if (priv->fakeReboot) + virBufferAsprintf(buf, " <fakereboot/>\n"); + return 0; } @@ -445,6 +448,8 @@ static int qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, void *data) } } + priv->fakeReboot = virXPathBoolean("boolean(./fakereboot)", ctxt) == 1; + return 0; error: @@ -1566,3 +1571,19 @@ qemuDomainRemoveInactive(struct qemud_driver *driver, } virDomainRemoveInactive(&driver->domains, vm); } + +void +qemuDomainSetFakeReboot(struct qemud_driver *driver, + virDomainObjPtr vm, + bool value) +{ + qemuDomainObjPrivatePtr priv = vm->privateData; + + if (priv->fakeReboot == value) + return; + + priv->fakeReboot = value; + + if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) + VIR_WARN("Failed to save status on vm %s", vm->def->name); +} diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 00cfa3a..3b09419 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -273,4 +273,8 @@ int qemuDomainSnapshotDiscardAllMetadata(struct qemud_driver *driver, void qemuDomainRemoveInactive(struct qemud_driver *driver, virDomainObjPtr vm); +void qemuDomainSetFakeReboot(struct qemud_driver *driver, + virDomainObjPtr vm, + bool value); + #endif /* __QEMU_DOMAIN_H__ */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0d0bea2..8cbb850 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1512,13 +1512,13 @@ static int qemuDomainShutdown(virDomainPtr dom) { goto endjob; } + qemuDomainSetFakeReboot(driver, vm, false); + priv = vm->privateData; qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorSystemPowerdown(priv->mon); qemuDomainObjExitMonitor(driver, vm); - priv->fakeReboot = false; - endjob: if (qemuDomainObjEndJob(driver, vm) == 0) vm = NULL; @@ -1575,7 +1575,8 @@ static int qemuDomainReboot(virDomainPtr dom, unsigned int flags) { ret = qemuMonitorSystemPowerdown(priv->mon); qemuDomainObjExitMonitor(driver, vm); - priv->fakeReboot = true; + if (ret == 0) + qemuDomainSetFakeReboot(driver, vm, true); endjob: if (qemuDomainObjEndJob(driver, vm) == 0) @@ -1616,7 +1617,6 @@ qemuDomainDestroyFlags(virDomainPtr dom, virDomainObjPtr vm; int ret = -1; virDomainEventPtr event = NULL; - qemuDomainObjPrivatePtr priv; virCheckFlags(0, -1); @@ -1630,8 +1630,7 @@ qemuDomainDestroyFlags(virDomainPtr dom, goto cleanup; } - priv = vm->privateData; - priv->fakeReboot = false; + qemuDomainSetFakeReboot(driver, vm, false); /* Although qemuProcessStop does this already, there may * be an outstanding job active. We want to make sure we diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 106a47c..4c6b4a4 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -442,7 +442,7 @@ qemuProcessShutdownOrReboot(virDomainObjPtr vm) priv->gotShutdown = true; if (priv->fakeReboot) { - priv->fakeReboot = false; + qemuDomainSetFakeReboot(qemu_driver, vm, false); virDomainObjRef(vm); virThread th; if (virThreadCreate(&th, @@ -2846,7 +2846,7 @@ int qemuProcessStart(virConnectPtr conn, goto cleanup; vm->def->id = driver->nextvmid++; - priv->fakeReboot = false; + qemuDomainSetFakeReboot(driver, vm, false); virDomainObjSetState(vm, VIR_DOMAIN_SHUTOFF, VIR_DOMAIN_SHUTOFF_UNKNOWN); /* Run an early hook to set-up missing devices */ -- 1.7.6.1

2 2

[libvirt] [libvirt-glib] Remove redundant 'Config' in GIR identifiers
by Zeeshan Ali (Khattak) 28 Sep '11

28 Sep '11

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> libvirt-gconfig is in a separate namespace than libvirt-gobject so there is not reason to expose 'Config' part of identifiers to high-level languages. --- libvirt-gconfig/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libvirt-gconfig/Makefile.am b/libvirt-gconfig/Makefile.am index fbcb7ba..6f1c628 100644 --- a/libvirt-gconfig/Makefile.am +++ b/libvirt-gconfig/Makefile.am @@ -64,7 +64,7 @@ LibvirtGConfig-1.0.gir: libvirt-gconfig-1.0.la $(G_IR_SCANNER) Makefile.am --namespace LibvirtGConfig \ --nsversion 1.0 \ --include GObject-2.0 \ - --identifier-prefix=GVir \ + --identifier-prefix=GVirConfig \ --symbol-prefix=gvir \ --library=$(builddir)/libvirt-gconfig-1.0.la \ --output $@ \ -- 1.7.6.2

2 1

[libvirt] [PATCH] qemu: Init the pci device before reattachment
by Osier Yang 28 Sep '11

28 Sep '11

This patch is just like commit 2ce90ea296, to init the member of pciDevice before reattachment, otherwise the device won't be unbound from pci_stub, and won't get the original driver (no probing). --- src/qemu/qemu_hostdev.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index 6f77717..74c817c 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -292,6 +292,7 @@ void qemuDomainReAttachHostdevDevices(struct qemud_driver *driver, for (i = 0; i < pciDeviceListCount(pcidevs); i++) { pciDevice *dev = pciDeviceListGet(pcidevs, i); + pciDeviceReAttachInit(dev); qemuReattachPciDevice(dev, driver); } -- 1.7.6

2 2

[libvirt] [PATCH] qemu: Finish domain shutdown on reconnect
by Jiri Denemark 28 Sep '11

28 Sep '11

If a domain started with -no-shutdown shuts down while libvirtd is not running, it will be seen as paused when libvirtd reconnects to it. Use the paused reason to detect if a domain was stopped because of shutdown and finish the process just as if a SHUTDOWN event is delivered from qemu. --- src/qemu/qemu_process.c | 50 ++++++++++++++++++++++++++++++++-------------- 1 files changed, 35 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 21e6fbf..106a47c 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -429,18 +429,15 @@ cleanup: } -static int -qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE_UNUSED, - virDomainObjPtr vm) +static void +qemuProcessShutdownOrReboot(virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv = vm->privateData; - VIR_DEBUG("vm=%p", vm); - virDomainObjLock(vm); if (priv->gotShutdown) { VIR_DEBUG("Ignoring repeated SHUTDOWN event from domain %s", vm->def->name); - goto cleanup; + return; } priv->gotShutdown = true; @@ -454,16 +451,23 @@ qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE_UNUSED, vm) < 0) { VIR_ERROR(_("Failed to create reboot thread, killing domain")); qemuProcessKill(vm, true); - if (virDomainObjUnref(vm) == 0) - vm = NULL; + /* Safe to ignore value since ref count was incremented above */ + ignore_value(virDomainObjUnref(vm)); } } else { qemuProcessKill(vm, true); } +} -cleanup: - if (vm) - virDomainObjUnlock(vm); +static int +qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE_UNUSED, + virDomainObjPtr vm) +{ + VIR_DEBUG("vm=%p", vm); + + virDomainObjLock(vm); + qemuProcessShutdownOrReboot(vm); + virDomainObjUnlock(vm); return 0; } @@ -2572,6 +2576,8 @@ qemuProcessReconnect(void *opaque) qemuDomainObjPrivatePtr priv; virConnectPtr conn = data->conn; struct qemuDomainJobObj oldjob; + int state; + int reason; memcpy(&oldjob, &data->oldjob, sizeof(oldjob)); @@ -2603,7 +2609,8 @@ qemuProcessReconnect(void *opaque) if (qemuProcessUpdateState(driver, obj) < 0) goto error; - if (virDomainObjGetState(obj, NULL) == VIR_DOMAIN_SHUTOFF) { + state = virDomainObjGetState(obj, &reason); + if (state == VIR_DOMAIN_SHUTOFF) { VIR_DEBUG("Domain '%s' wasn't fully started yet, killing it", obj->def->name); goto error; @@ -2618,6 +2625,18 @@ qemuProcessReconnect(void *opaque) &priv->qemuCaps) < 0) goto error; + /* In case the domain was paused for shutdown while we were not running, + * we need to finish the shutdown process. And we need to do it after + * we have qemuCaps filled in. + */ + if (state == VIR_DOMAIN_PAUSED + && reason == VIR_DOMAIN_PAUSED_SHUTTING_DOWN) { + VIR_DEBUG("Domain %s shut down while we were not running;" + " finishing shutdown sequence", obj->def->name); + qemuProcessShutdownOrReboot(obj); + goto endjob; + } + if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { priv->persistentAddrs = 1; @@ -2647,12 +2666,13 @@ qemuProcessReconnect(void *opaque) if (obj->def->id >= driver->nextvmid) driver->nextvmid = obj->def->id + 1; - if (virDomainObjUnref(obj) > 0) - virDomainObjUnlock(obj); - +endjob: if (qemuDomainObjEndJob(driver, obj) == 0) obj = NULL; + if (obj && virDomainObjUnref(obj) > 0) + virDomainObjUnlock(obj); + qemuDriverUnlock(driver); virConnectClose(conn); -- 1.7.6.1

2 2

[libvirt] [PATCH] qemu: Check domain status details when reconnecting monitor
by Jiri Denemark 28 Sep '11

28 Sep '11

Current qemu is able to give us detailed domain status (not just if it is running or not) which we can translate into a status reason. --- src/qemu/qemu_monitor.c | 66 +++++++++++++++++++++++++++++++++++++++-- src/qemu/qemu_monitor.h | 25 +++++++++++++++- src/qemu/qemu_monitor_json.c | 15 +++++++++- src/qemu/qemu_monitor_json.h | 4 ++- src/qemu/qemu_monitor_text.c | 20 ++++++++++++- src/qemu/qemu_monitor_text.h | 4 ++- src/qemu/qemu_process.c | 15 ++++++---- 7 files changed, 134 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index b4c43ae..6e84131 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -81,6 +81,12 @@ VIR_ENUM_IMPL(qemuMonitorMigrationStatus, QEMU_MONITOR_MIGRATION_STATUS_LAST, "inactive", "active", "completed", "failed", "cancelled") +VIR_ENUM_IMPL(qemuMonitorVMStatus, + QEMU_MONITOR_VM_STATUS_LAST, + "debug", "inmigrate", "internal-error", "io-error", "paused", + "postmigrate", "prelaunch", "finish-migrate", "restore-vm", + "running", "save-vm", "shutdown", "watchdog") + char *qemuMonitorEscapeArg(const char *in) { int len = 0; @@ -1059,10 +1065,12 @@ qemuMonitorStopCPUs(qemuMonitorPtr mon) int -qemuMonitorGetStatus(qemuMonitorPtr mon, bool *running) +qemuMonitorGetStatus(qemuMonitorPtr mon, + bool *running, + virDomainPausedReason *reason) { int ret; - VIR_DEBUG("mon=%p, running=%p", mon, running); + VIR_DEBUG("mon=%p, running=%p, reason=%p", mon, running, reason); if (!mon || !running) { qemuReportError(VIR_ERR_INVALID_ARG, "%s", @@ -1071,9 +1079,9 @@ qemuMonitorGetStatus(qemuMonitorPtr mon, bool *running) } if (mon->json) - ret = qemuMonitorJSONGetStatus(mon, running); + ret = qemuMonitorJSONGetStatus(mon, running, reason); else - ret = qemuMonitorTextGetStatus(mon, running); + ret = qemuMonitorTextGetStatus(mon, running, reason); return ret; } @@ -2553,3 +2561,53 @@ int qemuMonitorBlockJob(qemuMonitorPtr mon, ret = qemuMonitorTextBlockJob(mon, device, bandwidth, info, mode); return ret; } + +int qemuMonitorVMStatusToPausedReason(const char *status) +{ + int st; + + if (!status) + return VIR_DOMAIN_PAUSED_UNKNOWN; + + if ((st = qemuMonitorVMStatusTypeFromString(status)) < 0) { + VIR_WARN("Qemu reported unknown VM status: '%s'", status); + return VIR_DOMAIN_PAUSED_UNKNOWN; + } + + switch ((qemuMonitorVMStatus) st) { + case QEMU_MONITOR_VM_STATUS_DEBUG: + case QEMU_MONITOR_VM_STATUS_INTERNAL_ERROR: + case QEMU_MONITOR_VM_STATUS_RESTORE_VM: + return VIR_DOMAIN_PAUSED_UNKNOWN; + + case QEMU_MONITOR_VM_STATUS_INMIGRATE: + case QEMU_MONITOR_VM_STATUS_POSTMIGRATE: + case QEMU_MONITOR_VM_STATUS_FINISH_MIGRATE: + return VIR_DOMAIN_PAUSED_MIGRATION; + + case QEMU_MONITOR_VM_STATUS_IO_ERROR: + return VIR_DOMAIN_PAUSED_IOERROR; + + case QEMU_MONITOR_VM_STATUS_PAUSED: + case QEMU_MONITOR_VM_STATUS_PRELAUNCH: + return VIR_DOMAIN_PAUSED_USER; + + case QEMU_MONITOR_VM_STATUS_RUNNING: + VIR_WARN("Qemu reports the guest is paused but status is 'running'"); + return VIR_DOMAIN_PAUSED_UNKNOWN; + + case QEMU_MONITOR_VM_STATUS_SAVE_VM: + return VIR_DOMAIN_PAUSED_SAVE; + + case QEMU_MONITOR_VM_STATUS_SHUTDOWN: + return VIR_DOMAIN_PAUSED_SHUTTING_DOWN; + + case QEMU_MONITOR_VM_STATUS_WATCHDOG: + return VIR_DOMAIN_PAUSED_WATCHDOG; + + /* unreachable from this point on */ + case QEMU_MONITOR_VM_STATUS_LAST: + ; + } + return VIR_DOMAIN_PAUSED_UNKNOWN; +} diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 477767f..a64c2c3 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -198,7 +198,30 @@ int qemuMonitorEmitBlockJob(qemuMonitorPtr mon, int qemuMonitorStartCPUs(qemuMonitorPtr mon, virConnectPtr conn); int qemuMonitorStopCPUs(qemuMonitorPtr mon); -int qemuMonitorGetStatus(qemuMonitorPtr mon, bool *running); + +typedef enum { + QEMU_MONITOR_VM_STATUS_DEBUG, + QEMU_MONITOR_VM_STATUS_INMIGRATE, + QEMU_MONITOR_VM_STATUS_INTERNAL_ERROR, + QEMU_MONITOR_VM_STATUS_IO_ERROR, + QEMU_MONITOR_VM_STATUS_PAUSED, + QEMU_MONITOR_VM_STATUS_POSTMIGRATE, + QEMU_MONITOR_VM_STATUS_PRELAUNCH, + QEMU_MONITOR_VM_STATUS_FINISH_MIGRATE, + QEMU_MONITOR_VM_STATUS_RESTORE_VM, + QEMU_MONITOR_VM_STATUS_RUNNING, + QEMU_MONITOR_VM_STATUS_SAVE_VM, + QEMU_MONITOR_VM_STATUS_SHUTDOWN, + QEMU_MONITOR_VM_STATUS_WATCHDOG, + + QEMU_MONITOR_VM_STATUS_LAST +} qemuMonitorVMStatus; +VIR_ENUM_DECL(qemuMonitorVMStatus) +int qemuMonitorVMStatusToPausedReason(const char *status); + +int qemuMonitorGetStatus(qemuMonitorPtr mon, + bool *running, + virDomainPausedReason *reason); int qemuMonitorSystemReset(qemuMonitorPtr mon); int qemuMonitorSystemPowerdown(qemuMonitorPtr mon); diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index e38c2ed..b720617 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -896,13 +896,19 @@ qemuMonitorJSONStopCPUs(qemuMonitorPtr mon) int -qemuMonitorJSONGetStatus(qemuMonitorPtr mon, bool *running) +qemuMonitorJSONGetStatus(qemuMonitorPtr mon, + bool *running, + virDomainPausedReason *reason) { int ret; + const char *status; virJSONValuePtr cmd; virJSONValuePtr reply = NULL; virJSONValuePtr data; + if (reason) + *reason = VIR_DOMAIN_PAUSED_UNKNOWN; + if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL))) return -1; @@ -928,6 +934,13 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon, bool *running) goto cleanup; } + if ((status = virJSONValueObjectGetString(data, "status"))) { + if (!*running && reason) + *reason = qemuMonitorVMStatusToPausedReason(status); + } else if (!*running) { + VIR_DEBUG("query-status reply was missing status details"); + } + ret = 0; cleanup: diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index 673444f..1a40716 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -46,7 +46,9 @@ int qemuMonitorJSONCheckHMP(qemuMonitorPtr mon); int qemuMonitorJSONStartCPUs(qemuMonitorPtr mon, virConnectPtr conn); int qemuMonitorJSONStopCPUs(qemuMonitorPtr mon); -int qemuMonitorJSONGetStatus(qemuMonitorPtr mon, bool *running); +int qemuMonitorJSONGetStatus(qemuMonitorPtr mon, + bool *running, + virDomainPausedReason *reason); int qemuMonitorJSONSystemPowerdown(qemuMonitorPtr mon); int qemuMonitorJSONSystemReset(qemuMonitorPtr mon); diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index cedf582..57e74a8 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -392,11 +392,16 @@ qemuMonitorTextStopCPUs(qemuMonitorPtr mon) { int -qemuMonitorTextGetStatus(qemuMonitorPtr mon, bool *running) +qemuMonitorTextGetStatus(qemuMonitorPtr mon, + bool *running, + virDomainPausedReason *reason) { char *reply; int ret = -1; + if (reason) + *reason = VIR_DOMAIN_PAUSED_UNKNOWN; + if (qemuMonitorHMPCommand(mon, "info status", &reply) < 0) { qemuReportError(VIR_ERR_OPERATION_FAILED, "%s", _("cannot get status info")); @@ -406,6 +411,19 @@ qemuMonitorTextGetStatus(qemuMonitorPtr mon, bool *running) if (strstr(reply, "running")) { *running = true; } else if (strstr(reply, "paused")) { + char *status; + + if ((status = strchr(reply, '('))) { + char *end = strchr(status, ')'); + if (end) + *end = '\0'; + else + status = NULL; + } + if (!status) + VIR_DEBUG("info status was missing status details"); + else if (reason) + *reason = qemuMonitorVMStatusToPausedReason(status); *running = false; } else { qemuReportError(VIR_ERR_OPERATION_FAILED, diff --git a/src/qemu/qemu_monitor_text.h b/src/qemu/qemu_monitor_text.h index 4651a17..207001d 100644 --- a/src/qemu/qemu_monitor_text.h +++ b/src/qemu/qemu_monitor_text.h @@ -43,7 +43,9 @@ int qemuMonitorTextCommandWithFd(qemuMonitorPtr mon, int qemuMonitorTextStartCPUs(qemuMonitorPtr mon, virConnectPtr conn); int qemuMonitorTextStopCPUs(qemuMonitorPtr mon); -int qemuMonitorTextGetStatus(qemuMonitorPtr mon, bool *running); +int qemuMonitorTextGetStatus(qemuMonitorPtr mon, + bool *running, + virDomainPausedReason *reason); int qemuMonitorTextSystemPowerdown(qemuMonitorPtr mon); int qemuMonitorTextSystemReset(qemuMonitorPtr mon); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c8f22e2..21e6fbf 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2321,11 +2321,12 @@ qemuProcessUpdateState(struct qemud_driver *driver, virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv = vm->privateData; virDomainState state; + virDomainPausedReason reason; bool running; int ret; qemuDomainObjEnterMonitorWithDriver(driver, vm); - ret = qemuMonitorGetStatus(priv->mon, &running); + ret = qemuMonitorGetStatus(priv->mon, &running, &reason); qemuDomainObjExitMonitorWithDriver(driver, vm); if (ret < 0 || !virDomainObjIsActive(vm)) @@ -2339,9 +2340,10 @@ qemuProcessUpdateState(struct qemud_driver *driver, virDomainObjPtr vm) virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, VIR_DOMAIN_RUNNING_UNPAUSED); } else if (state == VIR_DOMAIN_RUNNING && !running) { - VIR_DEBUG("Domain %s was paused while its monitor was disconnected;" - " changing state to paused", vm->def->name); - virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_UNKNOWN); + VIR_DEBUG("Domain %s was paused (%s) while its monitor was" + " disconnected; changing state to paused", + vm->def->name, virDomainPausedReasonTypeToString(reason)); + virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, reason); } else if (state == VIR_DOMAIN_SHUTOFF && running) { VIR_DEBUG("Domain %s finished booting; changing state to running", vm->def->name); @@ -3470,6 +3472,7 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED, char *timestamp; qemuDomainObjPrivatePtr priv = vm->privateData; bool running = true; + virDomainPausedReason reason; virSecurityLabelPtr seclabel = NULL; VIR_DEBUG("Beginning VM attach process"); @@ -3599,7 +3602,7 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED, qemuDomainObjExitMonitorWithDriver(driver, vm); goto cleanup; } - if (qemuMonitorGetStatus(priv->mon, &running) < 0) { + if (qemuMonitorGetStatus(priv->mon, &running, &reason) < 0) { qemuDomainObjExitMonitorWithDriver(driver, vm); goto cleanup; } @@ -3616,7 +3619,7 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED, virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, VIR_DOMAIN_RUNNING_UNPAUSED); else - virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_UNKNOWN); + virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, reason); VIR_DEBUG("Writing domain status to disk"); if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) -- 1.7.6.1

2 2

[libvirt] [PATCH] qemu: Always remove domain object if MigratePrepare fails
by Jiri Denemark 28 Sep '11

28 Sep '11

If migration failed in Prepare phase after virDomainAssignDef and before a job is started, the domain object was not properly removed. --- src/qemu/qemu_migration.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 0a5a13d..ea49093 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1178,8 +1178,12 @@ cleanup: virDomainDefFree(def); VIR_FORCE_CLOSE(dataFD[0]); VIR_FORCE_CLOSE(dataFD[1]); - if (vm) - virDomainObjUnlock(vm); + if (vm) { + if (vm->persistent) + virDomainObjUnlock(vm); + else + qemuDomainRemoveInactive(driver, vm); + } if (event) qemuDomainEventQueue(driver, event); qemuMigrationCookieFree(mig); @@ -1188,9 +1192,6 @@ cleanup: endjob: if (qemuMigrationJobFinish(driver, vm) == 0) { vm = NULL; - } else if (!vm->persistent) { - qemuDomainRemoveInactive(driver, vm); - vm = NULL; } goto cleanup; } -- 1.7.6.1

2 5

[libvirt] [libvirt-glib] Refactor two very huge functions a bit
by Zeeshan Ali (Khattak) 28 Sep '11

28 Sep '11

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gobject/libvirt-gobject-connection.c | 126 ++++++++++++++------------ 1 files changed, 69 insertions(+), 57 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index f97b50a..c0c47da 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -374,6 +374,51 @@ void gvir_connection_close(GVirConnection *conn) g_signal_emit_by_name(conn, "vir-connection-closed"); } +typedef gint (* CountFunction) (virConnectPtr vconn); +typedef gint (* ListFunction) (virConnectPtr vconn, gchar **lst, gint max); + +static gchar ** fetch_list(virConnectPtr vconn, + const char *name, + CountFunction count_func, + ListFunction list_func, + GCancellable *cancellable, + gint *length, + GError **err) +{ + gchar **lst = NULL; + gint n = 0; + gint i; + + if ((n = count_func(vconn)) < 0) { + *err = gvir_error_new(GVIR_CONNECTION_ERROR, + 0, + "Unable to count %s", name); + goto error; + } + + if (n) { + if (g_cancellable_set_error_if_cancelled(cancellable, err)) + goto error; + + lst = g_new(gchar *, n); + if ((n = list_func(vconn, lst, n)) < 0) { + *err = gvir_error_new(GVIR_CONNECTION_ERROR, + 0, + "Unable to list %s %d", name, n); + goto error; + } + } + + *length = n; + return lst; + +error: + for (i = 0 ; i < n; i++) + g_free(lst[i]); + g_free(lst); + return NULL; +} + /** * gvir_connection_fetch_domains: * @conn: the connection @@ -431,25 +476,15 @@ gboolean gvir_connection_fetch_domains(GVirConnection *conn, if (g_cancellable_set_error_if_cancelled(cancellable, err)) goto cleanup; - if ((ninactive = virConnectNumOfDefinedDomains(vconn)) < 0) { - *err = gvir_error_new(GVIR_CONNECTION_ERROR, - 0, - "Unable to count domains"); + inactive = fetch_list(vconn, + "Domains", + virConnectNumOfDefinedDomains, + virConnectListDefinedDomains, + cancellable, + &ninactive, + err); + if (*err != NULL) goto cleanup; - } - - if (ninactive) { - if (g_cancellable_set_error_if_cancelled(cancellable, err)) - goto cleanup; - - inactive = g_new(gchar *, ninactive); - if ((ninactive = virConnectListDefinedDomains(vconn, inactive, ninactive)) < 0) { - *err = gvir_error_new(GVIR_CONNECTION_ERROR, - 0, - "Unable to list domains %d", ninactive); - goto cleanup; - } - } doms = g_hash_table_new_full(g_str_hash, g_str_equal, @@ -544,51 +579,28 @@ gboolean gvir_connection_fetch_storage_pools(GVirConnection *conn, if (g_cancellable_set_error_if_cancelled(cancellable, err)) goto cleanup; - if ((nactive = virConnectNumOfStoragePools(vconn)) < 0) { - *err = gvir_error_new(GVIR_CONNECTION_ERROR, - 0, - "Unable to count pools"); + active = fetch_list(vconn, + "Storage Pools", + virConnectNumOfStoragePools, + virConnectListStoragePools, + cancellable, + &nactive, + err); + if (*err != NULL) goto cleanup; - } - if (nactive) { - if (g_cancellable_set_error_if_cancelled(cancellable, err)) - goto cleanup; - - active = g_new(gchar *, nactive); - if ((nactive = virConnectListStoragePools(vconn, - active, - nactive)) < 0) { - *err = gvir_error_new(GVIR_CONNECTION_ERROR, - 0, - "Unable to list pools"); - goto cleanup; - } - } if (g_cancellable_set_error_if_cancelled(cancellable, err)) goto cleanup; - if ((ninactive = virConnectNumOfDefinedStoragePools(vconn)) < 0) { - *err = gvir_error_new(GVIR_CONNECTION_ERROR, - 0, - "Unable to count pools"); + inactive = fetch_list(vconn, + "Storage Pools", + virConnectNumOfDefinedStoragePools, + virConnectListDefinedStoragePools, + cancellable, + &ninactive, + err); + if (*err != NULL) goto cleanup; - } - - if (ninactive) { - if (g_cancellable_set_error_if_cancelled(cancellable, err)) - goto cleanup; - - inactive = g_new(gchar *, ninactive); - if ((ninactive = virConnectListDefinedStoragePools(vconn, - inactive, - ninactive)) < 0) { - *err = gvir_error_new(GVIR_CONNECTION_ERROR, - 0, - "Unable to list pools %d", ninactive); - goto cleanup; - } - } pools = g_hash_table_new_full(g_str_hash, g_str_equal, -- 1.7.6.2

2 1

[libvirt] [libvirt-glib] Plug a leak
by Zeeshan Ali (Khattak) 28 Sep '11

28 Sep '11

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gobject/libvirt-gobject-connection.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index 074fe53..f97b50a 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -645,6 +645,8 @@ gboolean gvir_connection_fetch_storage_pools(GVirConnection *conn, ret = TRUE; cleanup: + for (i = 0 ; i < nactive ; i++) + g_free(active[i]); g_free(active); for (i = 0 ; i < ninactive ; i++) g_free(inactive[i]); -- 1.7.6.2

2 1

[libvirt] [PATCH] fix AppArmor driver for pipe character devices
by Jamie Strandboge 28 Sep '11

28 Sep '11

The AppArmor security driver adds only the path specified in the domain XML for character devices of type 'pipe'. It should be using <path>.in and <path>.out. We do this by creating a new vah_add_file_chardev() and use it for char devices instead of vah_add_file(). Also adjust valid_path() to accept S_FIFO (since qemu chardevs of type 'pipe' use fifos). This is https://launchpad.net/bugs/832507 -- Jamie Strandboge | http://www.canonical.com

2 2

[libvirt] [PATCH] virsh: Allow using domain and capabilities XMLs with cpu-compare
by Peter Krempa 28 Sep '11

28 Sep '11

This patch adds extraction of the <cpu> element from capabilities and domain definition XML documents to improve user experience. https://bugzilla.redhat.com/show_bug.cgi?id=731151 --- tools/virsh.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 46 insertions(+), 8 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 3c6e65a..ddb61af 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -11846,9 +11846,15 @@ static bool cmdCPUCompare(vshControl *ctl, const vshCmd *cmd) { const char *from = NULL; - bool ret = true; + bool ret = false; char *buffer; int result; + const char *snippet; + + xmlDocPtr xml = NULL; + xmlXPathContextPtr ctxt = NULL; + xmlBufferPtr xml_buf = NULL; + xmlNodePtr node; if (!vshConnectionUsability(ctl, ctl->conn)) return false; @@ -11856,37 +11862,69 @@ cmdCPUCompare(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptString(cmd, "file", &from) <= 0) return false; - if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) + if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) { + vshError(ctl, _("Failed to read file '%s' to compare."), + from); return false; + } - result = virConnectCompareCPU(ctl->conn, buffer, 0); - VIR_FREE(buffer); + /* try to extract the CPU element from as it would appear in a domain XML*/ + if (!(xml = virXMLParseStringCtxt(buffer, from, &ctxt))) + goto cleanup; + + if ((node = virXPathNode("/cpu|" + "/domain/cpu|" + "/capabilities/host/cpu", ctxt))) { + if (!(xml_buf = xmlBufferCreate())) { + vshError(ctl, _("Can't create XML buffer to extract CPU element.")); + goto cleanup; + } + + if (xmlNodeDump(xml_buf, xml, node, 0, 0) < 0) { + vshError(ctl, _("Failed to extract CPU element snippet from domain XML.")); + goto cleanup; + } + + snippet = (const char *) xmlBufferContent(xml_buf); + } else { + vshError(ctl, _("File '%s' does not contain a <cpu> element or is not " + "a valid domain or capabilities XML"), from); + goto cleanup; + } + + result = virConnectCompareCPU(ctl->conn, snippet, 0); switch (result) { case VIR_CPU_COMPARE_INCOMPATIBLE: vshPrint(ctl, _("CPU described in %s is incompatible with host CPU\n"), from); - ret = false; + goto cleanup; break; case VIR_CPU_COMPARE_IDENTICAL: vshPrint(ctl, _("CPU described in %s is identical to host CPU\n"), from); - ret = true; break; case VIR_CPU_COMPARE_SUPERSET: vshPrint(ctl, _("Host CPU is a superset of CPU described in %s\n"), from); - ret = true; break; case VIR_CPU_COMPARE_ERROR: default: vshError(ctl, _("Failed to compare host CPU with %s"), from); - ret = false; + goto cleanup; } + ret = true; + +cleanup: + VIR_FREE(buffer); + xmlBufferFree(xml_buf); + xmlXPathFreeContext(ctxt); + xmlFreeDoc(xml); + return ret; } -- 1.7.3.4

2 3

[libvirt] [PATCH] virsh: Allow using complete <capabilities> elements with cpu-baseline
by Peter Krempa 28 Sep '11

28 Sep '11

This patch cleans the cpu baseline function using new libvirt helper functions and fixes XPath expression that selects <cpu> elements from the source file, that can contain concatenated <capabilities> XMLs, domain XMLs and bare <cpu> elements. The fixed XPath expression ensures not to select NUMA <cpu id=... elements. https://bugzilla.redhat.com/show_bug.cgi?id=731645 --- tools/virsh.c | 88 ++++++++++++++++++++++++-------------------------------- 1 files changed, 38 insertions(+), 50 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 3c6e65a..7ea5e1b 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -11908,18 +11908,18 @@ static bool cmdCPUBaseline(vshControl *ctl, const vshCmd *cmd) { const char *from = NULL; - bool ret = true; + bool ret = false; char *buffer; char *result = NULL; const char **list = NULL; - unsigned int count = 0; - xmlDocPtr doc = NULL; - xmlNodePtr node_list; + int count = 0; + + xmlDocPtr xml = NULL; + xmlNodePtr *node_list = NULL; xmlXPathContextPtr ctxt = NULL; - xmlSaveCtxtPtr sctxt = NULL; - xmlBufferPtr buf = NULL; - xmlXPathObjectPtr obj = NULL; - int res, i; + xmlBufferPtr xml_buf = NULL; + virBuffer buf = VIR_BUFFER_INITIALIZER; + int i; if (!vshConnectionUsability(ctl, ctl->conn)) return false; @@ -11930,69 +11930,57 @@ cmdCPUBaseline(vshControl *ctl, const vshCmd *cmd) if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) return false; - doc = xmlNewDoc(NULL); - if (doc == NULL) + /* add an separate container around the xml */ + virBufferStrcat(&buf, "<container>", buffer, "</container>", NULL); + if (virBufferError(&buf)) goto no_memory; - res = xmlParseBalancedChunkMemory(doc, NULL, NULL, 0, - (const xmlChar *)buffer, &node_list); - if (res != 0) { - vshError(ctl, _("Failed to parse XML fragment %s"), from); - ret = false; + VIR_FREE(buffer); + buffer = virBufferContentAndReset(&buf); + + + if (!(xml = virXMLParseStringCtxt(buffer, from, &ctxt))) + goto cleanup; + + if ((count = virXPathNodeSet("//cpu[not(ancestor::cpus)]", + ctxt, &node_list)) == -1) + goto cleanup; + + if (count == 0) { + vshError(ctl, _("No host CPU specified in '%s'"), from); goto cleanup; } - xmlAddChildList((xmlNodePtr) doc, node_list); + list = vshCalloc(ctl, count, sizeof(const char *)); - ctxt = xmlXPathNewContext(doc); - if (!ctxt) + if (!(xml_buf = xmlBufferCreate())) goto no_memory; - obj = xmlXPathEval(BAD_CAST "//cpu[not(ancestor::cpu)]", ctxt); - if ((obj == NULL) || (obj->nodesetval == NULL) || - (obj->nodesetval->nodeTab == NULL)) - goto cleanup; + for (i = 0; i < count; i++) { + xmlBufferEmpty(xml_buf); - for (i = 0;i < obj->nodesetval->nodeNr;i++) { - buf = xmlBufferCreate(); - if (buf == NULL) - goto no_memory; - sctxt = xmlSaveToBuffer(buf, NULL, 0); - if (sctxt == NULL) { - xmlBufferFree(buf); - goto no_memory; + if (xmlNodeDump(xml_buf, xml, node_list[i], 0, 0) < 0) { + vshError(ctl, _("Failed to extract <cpu> element")); + goto cleanup; } - xmlSaveTree(sctxt, obj->nodesetval->nodeTab[i]); - xmlSaveClose(sctxt); - - list = vshRealloc(ctl, list, sizeof(char *) * (count + 1)); - list[count++] = (char *) buf->content; - buf->content = NULL; - xmlBufferFree(buf); - buf = NULL; - } - - if (count == 0) { - vshError(ctl, _("No host CPU specified in '%s'"), from); - ret = false; - goto cleanup; + list[i] = vshStrdup(ctl, (const char *)xmlBufferContent(xml_buf)); } result = virConnectBaselineCPU(ctl->conn, list, count, 0); - if (result) + if (result) { vshPrint(ctl, "%s", result); - else - ret = false; + ret = true; + } cleanup: - xmlXPathFreeObject(obj); xmlXPathFreeContext(ctxt); - xmlFreeDoc(doc); + xmlFreeDoc(xml); + xmlBufferFree(xml_buf); VIR_FREE(result); if ((list != NULL) && (count > 0)) { - for (i = 0;i < count;i++) + for (i = 0; i < count; i++) VIR_FREE(list[i]); } VIR_FREE(list); -- 1.7.3.4

2 3

[libvirt] [PATCH] snapshot: fix man page typos
by Eric Blake 27 Sep '11

27 Sep '11

pod2man from perl-5.8.8 (RHEL 5) errors out on ill-formed POD: *** ERROR: unterminated I<...> at line 1114 in file virsh.pod *** ERROR: unterminated I<...> at line 1851 in file virsh.pod Newer pod2man appears to be more tolerant (which is a shame, because it meant that this error is harder to detect). * tools/virsh.pod (undefine, snapshot-current): Add missing >. --- Pushing under the build-breaker rule. tools/virsh.pod | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 0e7acfa..a01d723 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1111,7 +1111,7 @@ hypervisor. Output the device used for the TTY console of the domain. If the information is not available the processes will provide an exit code of 1. -=item B<undefine> I<domain-id> [I<--managed-save>] [I<--snapshots-metadata] +=item B<undefine> I<domain-id> [I<--managed-save>] [I<--snapshots-metadata>] Undefine a domain. If the domain is running, this converts it to a transient domain, without stopping it. If the domain is inactive, @@ -1848,7 +1848,7 @@ treat the snapshot as current, and cannot revert to the snapshot unless B<snapshot-create> is later used to teach libvirt about the metadata again). This flag is incompatible with I<--print-xml>. -=item B<snapshot-current> I<domain> {[I<--name>] | [I<--security-info] +=item B<snapshot-current> I<domain> {[I<--name>] | [I<--security-info>] | [I<snapshotname>]} Without I<snapshotname>, this will output the snapshot XML for the domain's -- 1.7.4.4

1 0

[libvirt] [PATCH] qemu: add ability to set PCI device "rombar" on or off
by Laine Stump 27 Sep '11

27 Sep '11

This patch was made in response to: https://bugzilla.redhat.com/show_bug.cgi?id=738095 In short, qemu's default for the rombar setting (which makes the firmware ROM of a PCI device visible/not on the guest) was previously 0 (not visible), but they recently changed the default to 1 (visible). Unfortunately, there are some PCI devices that fail in the guest when rombar is 1, so the setting must be exposed in libvirt to prevent a regression in behavior (it will still require explicitly setting <rom bar='off'/> in the guest XML). rombar is forced on/off by adding: <rom bar='on|off'/> inside a <hostdev> element that defines a PCI device. It is currently ignored for all other types of devices. At the moment there is no clean method to determine whether or not the rombar option is supported by QEMU - this patch uses the advice of a QEMU developer to assume support for qemu-0.12+. There is currently a patch in the works to put this information in the output of "qemu-kvm -device pci-assign,?", but of course if we switch to keying off that, we would lose support for setting rombar on all the versions of qemu between 0.12 and whatever version gets that patch. --- docs/formatdomain.html.in | 12 +++++++ docs/schemas/domaincommon.rng | 10 ++++++ src/conf/domain_conf.c | 32 ++++++++++++++++++++ src/conf/domain_conf.h | 10 ++++++ src/qemu/qemu_capabilities.c | 4 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 19 ++++++++++++ tests/qemuhelptest.c | 15 ++++++--- .../qemuxml2argv-hostdev-pci-rombar.args | 5 +++ .../qemuxml2argv-hostdev-pci-rombar.xml | 29 ++++++++++++++++++ 10 files changed, 132 insertions(+), 5 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-rombar.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-rombar.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 0a7abaf..7654abf 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1371,6 +1371,7 @@ <address bus='0x06' slot='0x02' function='0x0'/> </source> <boot order='1'/> + <rom bar='0'/> </hostdev> </devices> ...</pre> @@ -1402,6 +1403,17 @@ used together with general boot elements in <a href="#elementsOSBIOS">BIOS bootloader</a> section. Since 0.8.8</dd> + <dt><code>rom</code></dt> + <dd>The <code>rom</code> element is used to change how a PCI + device's ROM is presented to the guest. The <code>bar</code> + attribute can be set to "on" or "off", and determines whether + or not the devices ROM will be visible in the guest's memory + map. (in PCI documentation, this is described as being + controlled by the "rombar" setting). If no rom bar is + specified, the qemu default will be used (older versions of + qemu used a default of "off", while newer qemus have a default + of "on"). Since 0.9.6 + </dd> <dt><code>address</code></dt> <dd>The <code>address</code> element for USB devices has a <code>bus</code> and <code>device</code> attribute to specify the diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index d0da41c..0ba35ef 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2059,6 +2059,16 @@ <optional> <ref name="address"/> </optional> + <optional> + <element name="rom"> + <attribute name="bar"> + <choice> + <value>on</value> + <value>off</value> + </choice> + </attribute> + </element> + </optional> </element> </define> <define name="usbproduct"> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7476447..d067415 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -442,6 +442,12 @@ VIR_ENUM_IMPL(virDomainHostdevSubsys, VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST, "usb", "pci") +VIR_ENUM_IMPL(virDomainPciRombarMode, + VIR_DOMAIN_PCI_ROMBAR_LAST, + "default", + "on", + "off") + VIR_ENUM_IMPL(virDomainHub, VIR_DOMAIN_HUB_TYPE_LAST, "usb") @@ -5485,6 +5491,20 @@ virDomainHostdevDefParseXML(const xmlNodePtr node, if (virDomainDeviceBootParseXML(cur, &def->bootIndex, bootMap)) goto error; + } else if (xmlStrEqual(cur->name, BAD_CAST "rom")) { + char *rombar = virXMLPropString(cur, "bar"); + if (!rombar) { + virDomainReportError(VIR_ERR_XML_ERROR, + "%s", _("missing rom bar attribute")); + goto error; + } + if ((def->rombar = virDomainPciRombarModeTypeFromString(rombar)) <= 0) { + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown rom bar value '%s'"), rombar); + VIR_FREE(rombar); + goto error; + } + VIR_FREE(rombar); } else { virDomainReportError(VIR_ERR_INTERNAL_ERROR, _("unknown node %s"), cur->name); @@ -10387,6 +10407,18 @@ virDomainHostdevDefFormat(virBufferPtr buf, if (virDomainDeviceInfoFormat(buf, &def->info, flags) < 0) return -1; + if (def->rombar) { + const char *rombar + = virDomainPciRombarModeTypeToString(def->rombar); + if (!rombar) { + virDomainReportError(VIR_ERR_INTERNAL_ERROR, + _("unexpected rom bar value %d"), + def->rombar); + return -1; + } + virBufferAsprintf(buf, " <rom bar='%s'/>\n", rombar); + } + virBufferAddLit(buf, " </hostdev>\n"); return 0; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 371f270..262c970 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -936,6 +936,14 @@ enum virDomainHostdevSubsysType { VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST }; +enum virDomainPciRombarMode { + VIR_DOMAIN_PCI_ROMBAR_DEFAULT = 0, + VIR_DOMAIN_PCI_ROMBAR_ON, + VIR_DOMAIN_PCI_ROMBAR_OFF, + + VIR_DOMAIN_PCI_ROMBAR_LAST +}; + typedef struct _virDomainHostdevDef virDomainHostdevDef; typedef virDomainHostdevDef *virDomainHostdevDefPtr; struct _virDomainHostdevDef { @@ -964,6 +972,7 @@ struct _virDomainHostdevDef { } source; int bootIndex; virDomainDeviceInfo info; /* Guest address */ + int rombar; /* rombar on/off/unspecified */ }; enum virDomainRedirdevBus { @@ -1855,6 +1864,7 @@ VIR_ENUM_DECL(virDomainWatchdogAction) VIR_ENUM_DECL(virDomainVideo) VIR_ENUM_DECL(virDomainHostdevMode) VIR_ENUM_DECL(virDomainHostdevSubsys) +VIR_ENUM_DECL(virDomainPciRombarMode) VIR_ENUM_DECL(virDomainHub) VIR_ENUM_DECL(virDomainRedirdevBus) VIR_ENUM_DECL(virDomainInput) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 36f47a9..1b9260a 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -136,6 +136,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "pci-ohci", "usb-redir", "usb-hub", + "rombar", ); struct qemu_feature_flags { @@ -1049,6 +1050,9 @@ qemuCapsComputeCmdFlags(const char *help, if (version >= 13000) qemuCapsSet(flags, QEMU_CAPS_PCI_MULTIFUNCTION); + + if (version >= 12000) + qemuCapsSet(flags, QEMU_CAPS_PCI_ROMBAR); } /* We parse the output of 'qemu -help' to get the QEMU diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 96b7a3b..3557bcb 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -110,6 +110,7 @@ enum qemuCapsFlags { QEMU_CAPS_PCI_OHCI = 71, /* -device pci-ohci */ QEMU_CAPS_USB_REDIR = 72, /* -device usb-redir */ QEMU_CAPS_USB_HUB = 73, /* -device usb-hub */ + QEMU_CAPS_PCI_ROMBAR = 74, /* -device rombar=0|1 */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index e8b1157..056927b 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2361,6 +2361,25 @@ qemuBuildPCIHostdevDevStr(virDomainHostdevDefPtr dev, const char *configfd, if (qemuBuildDeviceAddressStr(&buf, &dev->info, qemuCaps) < 0) goto error; + if (dev->rombar) { + if (!qemuCapsGet(qemuCaps, QEMU_CAPS_PCI_ROMBAR)) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", _("rombar not supported in this QEMU binary")); + goto error; + } + + switch (dev->rombar) { + case VIR_DOMAIN_PCI_ROMBAR_OFF: + virBufferAddLit(&buf, ",rombar=0"); + break; + case VIR_DOMAIN_PCI_ROMBAR_ON: + virBufferAddLit(&buf, ",rombar=1"); + break; + default: + break; + } + } + if (virBufferError(&buf)) { virReportOOMError(); goto error; diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index ffd30e2..17f160e 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -306,7 +306,8 @@ mymain(void) QEMU_CAPS_SMBIOS_TYPE, QEMU_CAPS_VGA_NONE, QEMU_CAPS_MIGRATE_QEMU_FD, - QEMU_CAPS_DRIVE_AIO); + QEMU_CAPS_DRIVE_AIO, + QEMU_CAPS_PCI_ROMBAR); DO_TEST("qemu-kvm-0.12.1.2-rhel60", 12001, 1, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -350,7 +351,8 @@ mymain(void) QEMU_CAPS_DEVICE_SPICEVMC, QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_PIIX4_USB_UHCI, - QEMU_CAPS_USB_HUB); + QEMU_CAPS_USB_HUB, + QEMU_CAPS_PCI_ROMBAR); DO_TEST("qemu-kvm-0.12.3", 12003, 1, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -387,7 +389,8 @@ mymain(void) QEMU_CAPS_SMBIOS_TYPE, QEMU_CAPS_VGA_NONE, QEMU_CAPS_MIGRATE_QEMU_FD, - QEMU_CAPS_DRIVE_AIO); + QEMU_CAPS_DRIVE_AIO, + QEMU_CAPS_PCI_ROMBAR); DO_TEST("qemu-kvm-0.13.0", 13000, 1, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -439,7 +442,8 @@ mymain(void) QEMU_CAPS_PIIX4_USB_UHCI, QEMU_CAPS_VT82C686B_USB_UHCI, QEMU_CAPS_PCI_OHCI, - QEMU_CAPS_USB_HUB); + QEMU_CAPS_USB_HUB, + QEMU_CAPS_PCI_ROMBAR); DO_TEST("qemu-kvm-0.12.1.2-rhel61", 12001, 1, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -487,7 +491,8 @@ mymain(void) QEMU_CAPS_VIRTIO_IOEVENTFD, QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_PIIX4_USB_UHCI, - QEMU_CAPS_USB_HUB); + QEMU_CAPS_USB_HUB, + QEMU_CAPS_PCI_ROMBAR); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-rombar.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-rombar.args new file mode 100644 index 0000000..1a8b14e --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-rombar.args @@ -0,0 +1,5 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ +pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor \ +unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \ +/dev/HostVG/QEMUGuest2 -usb -device pci-assign,host=06:12.5,id=hostdev0,\ +bus=pci.0,addr=0x3,rombar=0 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-rombar.xml b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-rombar.xml new file mode 100644 index 0000000..bf17cc4 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-rombar.xml @@ -0,0 +1,29 @@ +<domain type='qemu'> + <name>QEMUGuest2</name> + <uuid>c7a5fdbd-edaf-9466-926a-d65c16db1809</uuid> + <memory>219100</memory> + <currentMemory>219100</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest2'/> + <target dev='hda' bus='ide'/> + </disk> + <hostdev mode='subsystem' type='pci' managed='yes'> + <source> + <address domain='0x0000' bus='0x06' slot='0x12' function='0x5'/> + </source> + <rom bar='off'/> + </hostdev> + <memballoon model='virtio'/> + </devices> +</domain> -- 1.7.3.4

3 5

[libvirt] [PATCH 0/2] Allow to make disk optional on migration
by Michal Privoznik 27 Sep '11

27 Sep '11

If user wants to migrate a machine, it's all or nothing. Either he/she has all storage accessible under same paths, or migration will fail. But there are some cases, where allowing migration to drop some disks, may be useful. E.g. when host gets itself to a state where domains need to be migrated so host can be say rebooted. Therefore we might want to give user possibility to mark some cdroms/floppy as optional, meaning if destination cannot access them, they get ejected (on destination). This idea is implemented via <migration> element, which basically says what to do with (currently) disk on migration. Right now it contains only one attribute 'optional' accepting values 'yes' and 'no'. Then, if destination cannot access a path and corresponding disk is mared as: a) optional - it is ejected (source is free()'d) b) non-optional - migration simply fails. The default is understandably non-optional to all disks. NB, setting optional is supported only on cdrom & floppy. Michal Privoznik (2): migration: Introduce <migration> element for cdrom and floppy qemu: Implement migration optional disk docs/schemas/domaincommon.rng | 16 ++++++++ src/conf/domain_conf.c | 85 ++++++++++++++++++++++++++++++++++++++++- src/conf/domain_conf.h | 16 ++++++++ src/libvirt_private.syms | 2 + src/qemu/qemu_migration.c | 47 +++++++++++++++++++++- 5 files changed, 163 insertions(+), 3 deletions(-) -- 1.7.3.4

2 3

[libvirt] [PATCH] spec: F15 still uses cgconfig
by Eric Blake 27 Sep '11

27 Sep '11

Commit ecd8725c dropped attempts to probe the cgconfig service on new enough Fedora where systemd took over that aspect of the system, but mistakenly used F14 instead of F15 as the cutoff point. https://bugzilla.redhat.com/show_bug.cgi?id=741358 * libvirt.spec.in (with_cgconfig): Check cgconfig service in F15. --- libvirt.spec.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index c0ea898..03d6f1f 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -894,9 +894,9 @@ done %endif %if %{with_cgconfig} -# Starting with Fedora 15, systemd automounts all cgroups, and cgconfig is +# Starting with Fedora 16, systemd automounts all cgroups, and cgconfig is # no longer a necessary service. -%if 0%{?fedora} <= 14 || 0%{?rhel} <= 6 +%if 0%{?fedora} <= 15 || 0%{?rhel} <= 6 if [ "$1" -eq "1" ]; then /sbin/chkconfig cgconfig on fi -- 1.7.4.4

3 7

[libvirt] [PATCH] qemu: Relax -no-shutdown check to [0.14.0, 0.15.50)
by Jiri Denemark 27 Sep '11

27 Sep '11

SIGTERM handling for -no-shutdown is already fixed in qemu git and libvirt can safely use it. The downside is that 0.15.50 version of qemu can be any qemu compiled from git, even that without the fix for SIGTERM. However, I think this patch is worth it since someone using qemu from git should expect their data can get corrupted and excluding 0.15.50 from the check makes testing current qemu with libvirt much easier. --- src/qemu/qemu_capabilities.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 8e20e3f..4325f77 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1017,9 +1017,9 @@ qemuCapsComputeCmdFlags(const char *help, /* Do not use -no-shutdown if qemu doesn't support it or SIGTERM handling * is most likely buggy when used with -no-shutdown (which applies for qemu - * 0.14.* and 0.15.*) + * 0.14.* and <0.15.50) */ - if (strstr(help, "-no-shutdown") && (version < 14000 || version > 15999)) + if (strstr(help, "-no-shutdown") && (version < 14000 || version >= 15050)) qemuCapsSet(flags, QEMU_CAPS_NO_SHUTDOWN); /* -- 1.7.6.1

2 2

[libvirt] [PATCH] virsh: Better document --copy-storage migrate options
by Jiri Denemark 27 Sep '11

27 Sep '11

Both --copy-storage-{all,inc} options require disk images to be present on destination host. --- tools/virsh.pod | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index fbde57f..0e7acfa 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -727,9 +727,12 @@ and I<--suspend> leaves the domain paused on the destination host. I<--copy-storage-all> indicates migration with non-shared storage with full disk copy, I<--copy-storage-inc> indicates migration with non-shared storage with incremental copy (same base image shared between source and destination). -I<--change-protection> enforces that no incompatible configuration changes -will be made to the domain while the migration is underway; this flag is -implicitly enabled when supported by the hypervisor, but can be explicitly +In both cases the disk images have to exist on destination host, the +I<--copy-storage-...> options only tell libvirt to transfer data from the +images on source host to the images found at the same place on the destination +host. I<--change-protection> enforces that no incompatible configuration +changes will be made to the domain while the migration is underway; this flag +is implicitly enabled when supported by the hypervisor, but can be explicitly used to reject the migration if the hypervisor lacks change protection support. I<--verbose> displays the progress of migration. -- 1.7.6.1

2 2

[libvirt] [PATCH 00/14] snapshot: improve dumpxml output
by Eric Blake 27 Sep '11

27 Sep '11

This series fixes 'virsh snapshot-dumpxml' to use nicer formatting. Patch 1 adds some nice helper routines, patches 2-13 are mostly mechanical conversions to use the helpers and pass indentation levels through the entire call chain, and patch 14 adds a test which uncovered a couple minor issues in how formatting was done. Eric Blake (14): snapshot: indent domain xml when nesting, round 1 snapshot: indent domain xml when nesting, round 2 snapshot: indent domain xml when nesting, round 3 snapshot: indent domain xml when nesting, round 4 snapshot: indent domain xml when nesting, round 5 snapshot: indent domain xml when nesting, round 6 snapshot: indent domain xml when nesting, round 7 snapshot: indent domain xml when nesting, round 8 snapshot: indent domain xml when nesting, round 9 snapshot: indent domain xml when nesting, round 10 snapshot: indent domain xml when nesting, round 11 snapshot: indent domain xml when nesting, round 12 snapshot: indent domain xml when nesting, round 13 snapshot: test domainsnapshot indentation .gitignore | 1 + src/conf/capabilities.c | 6 +- src/conf/capabilities.h | 6 +- src/conf/cpu_conf.c | 43 +- src/conf/cpu_conf.h | 7 +- src/conf/domain_conf.c | 778 +++++++++++---------- src/conf/domain_conf.h | 6 +- src/conf/network_conf.c | 8 +- src/conf/nwfilter_conf.c | 16 +- src/conf/nwfilter_params.c | 41 +- src/conf/nwfilter_params.h | 8 +- src/conf/storage_encryption_conf.c | 4 +- src/cpu/cpu.c | 2 +- src/libvirt_private.syms | 3 + src/qemu/qemu_domain.c | 39 +- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_migration.c | 23 +- src/util/buf.c | 70 ++- src/util/buf.h | 19 +- src/util/network.c | 49 +- src/util/network.h | 9 +- src/util/sysinfo.c | 407 ++++------- src/util/sysinfo.h | 4 +- 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 | 32 +- 31 files changed, 1033 insertions(+), 852 deletions(-) create mode 100644 tests/domainsnapshotxml2xmltest.c -- 1.7.4.4

4 27

[libvirt] [PATCH] virsh: Enhance documentation of commands starting jobs
by Jiri Denemark 27 Sep '11

27 Sep '11

Some virsh commands start a (long-running) job that can be monitored using domjobinfo and aborted with domjobabort. Let's be explicit about this in virsh man page. --- tools/virsh.pod | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 43ed1ea..fbde57f 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -627,30 +627,35 @@ named by I<format> to a domain XML format. Convert the file I<xml> in domain XML format to the native guest configuration format named by I<format>. =item B<dump> I<domain-id> I<corefilepath> [I<--live>] [I<--crash>] [I<--bypass-cache>] Dumps the core of a domain to a file for analysis. If I<--live> is specified, the domain continues to run until the core dump is complete, rather than pausing up front. If I<--crash> is specified, the domain is halted with a crashed status, rather than merely left in a paused state. If I<--bypass-cache> is specified, the save will avoid the file system cache, although this may slow down the operation. +The progress may be monitored using B<domjobinfo> virsh command and canceled +with B<domjobabort> command (sent by another virsh instance). Interrupting +(usually with C<Ctrl-C>) the virsh process which runs B<dump> command is not +enough to actually cancel the operation. + NOTE: Some hypervisors may require the user to manually ensure proper permissions on file and path specified by argument I<corefilepath>. =item B<dumpxml> I<domain-id> [I<--inactive>] [I<--security-info>] [I<--update-cpu>] Output the domain information as an XML dump to stdout, this format can be used by the B<create> command. Additional options affecting the XML dump may be used. I<--inactive> tells virsh to dump domain configuration that will be used on next start of the domain as opposed to the current domain configuration. Using I<--security-info> will also include security sensitive information in the XML dump. I<--update-cpu> updates domain CPU requirements according to host CPU. =item B<echo> [I<--shell>] [I<--xml>] [I<arg>...] @@ -672,30 +677,35 @@ This is equivalent to: except that it does some error checking. The editor used can be supplied by the C<$VISUAL> or C<$EDITOR> environment variables, and defaults to C<vi>. =item B<managedsave> I<domain-id> [I<--bypass-cache>] [{I<--running> | I<--paused>}] Save and destroy (stop) a running domain, so it can be restarted from the same state at a later time. When the virsh B<start> command is next run for the domain, it will automatically be started from this saved state. If I<--bypass-cache> is specified, the save will avoid the file system cache, although this may slow down the operation. +The progress may be monitored using B<domjobinfo> virsh command and canceled +with B<domjobabort> command (sent by another virsh instance). Interrupting +(usually with C<Ctrl-C>) the virsh process which runs B<managedsave> command +is not enough to actually cancel the operation. + Normally, starting a managed save will decide between running or paused based on the state the domain was in when the save was done; passing either the I<--running> or I<--paused> flag will allow overriding which state the B<start> should use. The B<dominfo> command can be used to query whether a domain currently has any managed save image. =item B<managedsave-remove> I<domain-id> Remove the B<managedsave> state file for a domain, if it exists. This ensures the domain will do a full boot the next time it is started. =item B<maxvcpus> [I<type>] @@ -724,30 +734,33 @@ used to reject the migration if the hypervisor lacks change protection support. I<--verbose> displays the progress of migration. The I<desturi> is the connection URI of the destination host, and I<migrateuri> is the migration URI, which usually can be omitted. I<dname> is used for renaming the domain to new name during migration, which also usually can be omitted. Likewise, I<--xml> B<file> is usually omitted, but can be used to supply an alternative XML file for use on the destination to supply a larger set of changes to any host-specific portions of the domain XML, such as accounting for naming differences between source and destination in accessing underlying storage. I<--timeout> B<seconds> forces guest to suspend when live migration exceeds that many seconds, and then the migration will complete offline. It can only be used with I<--live>. +Running migration can be canceled by interrupting virsh (usually using +C<Ctrl-C>) or by B<domjobabort> command sent from another virsh instance. + B<Note>: The I<desturi> parameter for normal migration and peer2peer migration has different semantics: =over 4 =item * normal migration: the I<desturi> is an address of the target host as seen from the client machine. =item * peer2peer migration: the I<desturi> is an address of the target host as seen from the source machine. =back =item B<migrate-setmaxdowntime> I<domain-id> I<downtime> @@ -797,30 +810,35 @@ B<Note>: To avoid corrupting file system contents within the domain, you should not reuse the saved state file for a second B<restore> unless you have also reverted all storage volumes back to the same contents as when the state file was created. =item B<save> I<domain-id> I<state-file> [I<--bypass-cache>] [I<--xml> B<file>] [{I<--running> | I<--paused>}] Saves a running domain (RAM, but not disk state) to a state file so that it can be restored later. Once saved, the domain will no longer be running on the system, thus the memory allocated for the domain will be free for other domains to use. B<virsh restore> restores from this state file. If I<--bypass-cache> is specified, the save will avoid the file system cache, although this may slow down the operation. +The progress may be monitored using B<domjobinfo> virsh command and canceled +with B<domjobabort> command (sent by another virsh instance). Interrupting +(usually with C<Ctrl-C>) the virsh process which runs B<save> command is not +enough to actually cancel the operation. + This is roughly equivalent to doing a hibernate on a running computer, with all the same limitations. Open network connections may be severed upon restore, as TCP timeouts may have expired. I<--xml> B<file> is usually omitted, but can be used to supply an alternative XML file for use on the restored guest with changes only in the host-specific portions of the domain XML. For example, it can be used to account for file naming differences that are planned to be made via disk snapshots of underlying storage after the guest is saved. Normally, restoring a saved image will decide between running or paused based on the state the domain was in when the save was done; passing either the I<--running> or I<--paused> flag will allow overriding which state the B<restore> should use. -- 1.7.6.1

2 2

[libvirt] [libvirt-glib] Ability to create new domains
by Zeeshan Ali (Khattak) 27 Sep '11

27 Sep '11

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gobject/libvirt-gobject-connection.c | 38 ++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-connection.h | 3 ++ libvirt-gobject/libvirt-gobject.sym | 1 + 3 files changed, 42 insertions(+), 0 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index 32f749c..072484e 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -720,3 +720,41 @@ GVirStream *gvir_connection_get_stream(GVirConnection *self, return klass->stream_new(self, st); } + +/** + * gvir_connection_create_domain: + * @conn: the connection on which to create the dmain + * @conf: the configuration for the new domain + * Returns: (transfer full): the newly created domain + */ +GVirDomain *gvir_connection_create_domain(GVirConnection *conn, + GVirConfigDomain *conf, + GError **err) +{ + const gchar *xml; + virDomainPtr 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 = virDomainDefineXML(priv->conn, xml))) { + *err = gvir_error_new_literal(GVIR_CONNECTION_ERROR, + 0, + "Failed to create domain"); + return NULL; + } + + GVirDomain *domain; + + domain = GVIR_DOMAIN(g_object_new(GVIR_TYPE_DOMAIN, + "handle", handle, + NULL)); + + g_hash_table_insert(priv->domains, + g_strdup(gvir_domain_get_uuid(domain)), + domain); + + return domain; +} diff --git a/libvirt-gobject/libvirt-gobject-connection.h b/libvirt-gobject/libvirt-gobject-connection.h index 0172d02..c453bed 100644 --- a/libvirt-gobject/libvirt-gobject-connection.h +++ b/libvirt-gobject/libvirt-gobject-connection.h @@ -107,6 +107,9 @@ GVirDomain *gvir_connection_find_domain_by_id(GVirConnection *conn, GVirDomain *gvir_connection_find_domain_by_name(GVirConnection *conn, const gchar *name); +GVirDomain *gvir_connection_create_domain(GVirConnection *conn, + GVirConfigDomain *conf, + GError **err); #if 0 GList *gvir_connection_get_interfaces(GVirConnection *conn); diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index a68db4b..eae40a2 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -18,6 +18,7 @@ LIBVIRT_GOBJECT_0.0.1 { gvir_connection_get_domain; gvir_connection_find_domain_by_id; gvir_connection_find_domain_by_name; + gvir_connection_create_domain; gvir_domain_get_type; gvir_domain_handle_get_type; -- 1.7.6.2

2 3

[libvirt] [PATCH] virLockManagerNopInit: Rename flags to unused_flags
by Michal Privoznik 27 Sep '11

27 Sep '11

As these might be not used and make syntax-check complains about checking them via virCheckFlags. --- pushing under build-breaker rule src/locking/lock_driver_nop.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locking/lock_driver_nop.c b/src/locking/lock_driver_nop.c index 570b7e7..2ca6c4d 100644 --- a/src/locking/lock_driver_nop.c +++ b/src/locking/lock_driver_nop.c @@ -29,10 +29,10 @@ static int virLockManagerNopInit(unsigned int version ATTRIBUTE_UNUSED, const char *configFile ATTRIBUTE_UNUSED, - unsigned int flags ATTRIBUTE_UNUSED) + unsigned int flags_unused ATTRIBUTE_UNUSED) { VIR_DEBUG("version=%u configFile=%s flags=%x", - version, NULLSTR(configFile), flags); + version, NULLSTR(configFile), flags_unused); return 0; } -- 1.7.3.4

1 0

[libvirt] LPC2011 Virtualization Micro Conf
by Jes Sorensen 27 Sep '11

27 Sep '11

Hi, With the success of last year's Virtualization micro-conference track at Linux Plumbers 2010, I have accepted to organize a similar track for Linux Plumbers 2011 in Santa Rosa. Please see the official Linux Plumbers 2011 website for full details about the conference: http://www.linuxplumbersconf.org/2011/ The Linux Plumbers 2011 Virtualization track is focusing on general free software Linux Virtualization. It is not reserved for a specific hypervisor, but will focus on general virtualization issues and in particular collaboration amongst projects. This would include KVM, Xen, QEMU, containers etc. Deadline: --------- The deadline for submissions is April 30th. Please visit the following link to submit your proposal: http://www.linuxplumbersconf.org/2011/ocw/events/LPC2011MC/proposals Example topics: --------------- - Kernel and Hypervisor KVM/QEMU/Xen interaction - QEMU integration, sharing of code between the different projects - IO Performance and scalability - Live Migration - Managing and supporting enterprise storage - Support for new hardware features, and/or provide guest access to these features. - Guest agents - Virtualization management tools, libvirt, etc. - Desktop integration - Consumer Electronics device emulation - Custom platform configuration and coordination with the kernel Audience: --------- Virtualization hypervisor developers, developers of virtualization management tools and applications, embedded virtualization developers, vendors and others. Best regards, Jes

1 1

[libvirt] [PATCH v2] daemon: Update libvirtd SysV/upstart scripts to avoid confusion
by Peter Krempa 27 Sep '11

27 Sep '11

On some systems init scripts are installed along with upstart . This may cause trouble if user tries to restart/stop a instance of libvirtd managed with upstart with init script. Upstart config file uses "respawn" stanza to ensure that libvirtd is restarted after a crash/kill. This combined with a The SysV init script is now able to detect libvirtd managed with upstart explicitly and notify the user about this. This patch also modifies the way the PID file is handled. Libvirtd alone removes the pid file on a successful exit, so now, the init script does not delete it. It's only deleted while starting libvirtd, when the script detects, that no libvirtd with pid specified in the pid file is running. This patch also modifies the upstart configuration file for libvirt. Same logic as in the SysV script for handling pid files is used. The upstart script does not explicitly check for a SysV managed instance. Upstart alone prohibits to stop a not-started instance, so this issue is handled automaticaly. https://bugzilla.redhat.com/show_bug.cgi?id=728153 --- initctl_check() in the SysV init file is not strongly required. The purpose of this is to notify the user of the source of problem the user is experiencing. It can be left out, but then no (reasonable) notification will be provided and the user might kill libvirtd managed by upstart (which will thereafter respawn) daemon/libvirtd.init.in | 43 +++++++++++++++++++++++++++++++++++++++++-- daemon/libvirtd.upstart | 31 ++++++++++++++++++++++++------- 2 files changed, 65 insertions(+), 9 deletions(-) diff --git a/daemon/libvirtd.init.in b/daemon/libvirtd.init.in index 0697a2b..28801d1 100644 --- a/daemon/libvirtd.init.in +++ b/daemon/libvirtd.init.in @@ -43,6 +43,8 @@ LIBVIRTD_CONFIG= LIBVIRTD_ARGS= KRB5_KTNAME=/etc/libvirt/krb5.tab +INITCTL_PATH=/sbin/initctl + test -f @sysconfdir@/sysconfig/libvirtd && . @sysconfdir@/sysconfig/libvirtd export QEMU_AUDIO_DRV @@ -56,8 +58,45 @@ fi RETVAL=0 +# Check if libvirt is managed by upstart and fail if it's the case +initctl_check() { + if [ -x $INITCTL_PATH ]; then + #extract status from upstart + LIBVIRTD_UPSTART_STATUS=`$INITCTL_PATH status libvirtd | tr "/" " " | cut -d " " -f 2` + if [ $LIBVIRTD_UPSTART_STATUS = "start" ]; then + logger -t "libvirtd" -s "libvirtd is managed by upstart and started, use initctl instead" + exit 1 + fi + fi +} + +# test if a pidfile exists and if there's a libvirtd process associated with it +pidfile_check() { + #check if libvirtd is running + if [ -f "$PIDFILE" ]; then + PID=`cat $PIDFILE` + if [ -n "$PID" ]; then + PROCESSES=`pidof $PROCESS | grep $PID` + if [ -n "$PROCESSES" ]; then + logger -t "libvirtd" -s "$SERVICE with pid $PID is running"; + exit 1 + else + # pidfile exists but no running libvirtd found + # remove stuck pidfile + rm -f $PIDFILE + fi + else + # pidfile is empty + rm -f $PIDFILE + fi + fi +} + start() { echo -n $"Starting $SERVICE daemon: " + initctl_check + pidfile_check + mkdir -p @localstatedir@/cache/libvirt rm -rf @localstatedir@/cache/libvirt/* KRB5_KTNAME=$KRB5_KTNAME daemon --pidfile $PIDFILE --check $SERVICE $PROCESS --daemon $LIBVIRTD_CONFIG_ARGS $LIBVIRTD_ARGS @@ -68,14 +107,13 @@ start() { stop() { echo -n $"Stopping $SERVICE daemon: " + initctl_check killproc -p $PIDFILE $PROCESS RETVAL=$? echo if [ $RETVAL -eq 0 ]; then rm -f @localstatedir@/lock/subsys/$SERVICE - rm -f $PIDFILE - rm -rf @localstatedir@/cache/libvirt/* else exit $RETVAL fi @@ -88,6 +126,7 @@ restart() { reload() { echo -n $"Reloading $SERVICE configuration: " + initctl_check killproc -p $PIDFILE $PROCESS -HUP RETVAL=$? diff --git a/daemon/libvirtd.upstart b/daemon/libvirtd.upstart index fd1d951..c506d45 100644 --- a/daemon/libvirtd.upstart +++ b/daemon/libvirtd.upstart @@ -7,6 +7,29 @@ stop on runlevel [!345] respawn +pre-start script + PIDFILE=/var/run/libvirtd.pid + #check if libvirtd is running + if [ -f "$PIDFILE" ]; then + PID=`cat $PIDFILE` + if [ -n "$PID" ]; then + PROCESSES=`pidof libvirtd | grep $PID` + + if [ -n "$PROCESSES" ]; then + logger -t "libvirtd" -s "error: libvirtd is already running with pid $PID" + stop + exit 0 + else + # remove stuck pidfile + rm -f $PIDFILE + fi + else + # empty pidfile + rm -f $PIDFILE + fi + fi +end script + script LIBVIRTD_CONFIG= LIBVIRTD_ARGS= @@ -31,16 +54,10 @@ script ulimit -c "$DAEMON_COREFILE_LIMIT" fi - # Clean up a pidfile that might be left around - rm -f /var/run/libvirtd.pid - + # No pid file and/or libvirtd not running. mkdir -p /var/cache/libvirt rm -rf /var/cache/libvirt/* exec /usr/sbin/libvirtd $LIBVIRTD_CONFIG_ARGS $LIBVIRTD_ARGS end script -post-stop script - rm -f $PIDFILE - rm -rf /var/cache/libvirt/* -end script -- 1.7.3.4

3 5

[libvirt] [PATCH v3] qemu: Allow domain reboot after core dump
by Michal Privoznik 27 Sep '11

27 Sep '11

This patch introduces possibility to reboot domain after core dump finishes. The new flag VIR_DUMP_REBOOT was added to virDomainCoreDumpFlags. The new functionality is accessible via virsh too: virsh dump --reboot <domain> --- diff to v2: -issue reset command instead of qemuDomainReboot include/libvirt/libvirt.h.in | 1 + src/qemu/qemu_driver.c | 54 +++++++++++++++++++++++++++++++++++++++-- tools/virsh.c | 3 ++ 3 files changed, 55 insertions(+), 3 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 39155a6..8c41f5a 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -748,6 +748,7 @@ typedef enum { VIR_DUMP_CRASH = (1 << 0), /* crash after dump */ VIR_DUMP_LIVE = (1 << 1), /* live dump */ VIR_DUMP_BYPASS_CACHE = (1 << 2), /* avoid file system cache pollution */ + VIR_DUMP_REBOOT = (1 << 3), /* reboot domain after dump finishes */ } virDomainCoreDumpFlags; /* Domain migration flags. */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0d0bea2..3e05e14 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2860,6 +2860,47 @@ getCompressionType(struct qemud_driver *driver) return compress; } +static int +doSystemReset(struct qemud_driver *driver, + virDomainObjPtr *vm) +{ + int ret = -1; + qemuDomainObjPrivatePtr priv; + + /* Okay, this should never happen, but doesn't hurt to check. */ + if (!driver || !vm || !*vm) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("invalid argument supplied")); + goto cleanup; + } + + priv = (*vm)->privateData; + + if (qemuDomainObjBeginJob(driver, *vm, QEMU_JOB_MODIFY) < 0) + goto cleanup; + + if (!virDomainObjIsActive(*vm)) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("guest unexpectedly quit")); + goto endjob; + } + + qemuDomainObjEnterMonitorWithDriver(driver, *vm); + if (qemuMonitorSystemReset(priv->mon) < 0) { + qemuDomainObjExitMonitorWithDriver(driver, *vm); + goto endjob; + } + qemuDomainObjExitMonitorWithDriver(driver, *vm); + + ret = 0; + +endjob: + if (qemuDomainObjEndJob(driver, *vm) == 0) + *vm = NULL; +cleanup: + return ret; +} + static int qemudDomainCoreDump(virDomainPtr dom, const char *path, unsigned int flags) @@ -2870,7 +2911,8 @@ static int qemudDomainCoreDump(virDomainPtr dom, int ret = -1; virDomainEventPtr event = NULL; - virCheckFlags(VIR_DUMP_LIVE | VIR_DUMP_CRASH | VIR_DUMP_BYPASS_CACHE, -1); + virCheckFlags(VIR_DUMP_LIVE | VIR_DUMP_CRASH | + VIR_DUMP_BYPASS_CACHE | VIR_DUMP_REBOOT, -1); qemuDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, dom->uuid); @@ -2949,11 +2991,17 @@ endjob: } cleanup: - if (vm) - virDomainObjUnlock(vm); if (event) qemuDomainEventQueue(driver, event); + + if ((ret == 0) && (flags & VIR_DUMP_REBOOT) && vm) { + ret = doSystemReset(driver, &vm); + } + + if (vm) + virDomainObjUnlock(vm); qemuDriverUnlock(driver); + return ret; } diff --git a/tools/virsh.c b/tools/virsh.c index e5ea9d7..bdff33c 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2899,6 +2899,7 @@ static const vshCmdOptDef opts_dump[] = { {"crash", VSH_OT_BOOL, 0, N_("crash the domain after core dump")}, {"bypass-cache", VSH_OT_BOOL, 0, N_("avoid file system cache when saving")}, + {"reboot", VSH_OT_BOOL, 0, N_("reboot the domain after core dump")}, {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, {"file", VSH_OT_DATA, VSH_OFLAG_REQ, N_("where to dump the core")}, {NULL, 0, 0, NULL} @@ -2928,6 +2929,8 @@ cmdDump(vshControl *ctl, const vshCmd *cmd) flags |= VIR_DUMP_CRASH; if (vshCommandOptBool(cmd, "bypass-cache")) flags |= VIR_DUMP_BYPASS_CACHE; + if (vshCommandOptBool(cmd, "reboot")) + flags |= VIR_DUMP_REBOOT; if (virDomainCoreDump(dom, to, flags) < 0) { vshError(ctl, _("Failed to core dump domain %s to %s"), name, to); -- 1.7.3.4

5 4

[libvirt] [PATCH] debug: Annotate some variables as unused
by Michal Privoznik 27 Sep '11

27 Sep '11

as they are not used with debugging turned off. --- daemon/stream.c | 4 +- src/locking/lock_driver_nop.c | 6 ++-- src/lxc/lxc_container.c | 2 +- src/lxc/lxc_driver.c | 2 +- src/node_device/node_device_udev.c | 2 +- src/qemu/qemu_migration.c | 2 +- src/rpc/virnettlscontext.c | 5 ++- src/util/command.c | 9 +++++-- src/util/virpidfile.c | 2 +- src/vbox/vbox_tmpl.c | 37 +++++++++++++++++++++-------------- 10 files changed, 41 insertions(+), 30 deletions(-) diff --git a/daemon/stream.c b/daemon/stream.c index e3214c2..7df9952 100644 --- a/daemon/stream.c +++ b/daemon/stream.c @@ -94,7 +94,7 @@ daemonStreamUpdateEvents(daemonClientStream *stream) * fast stream, but slow client */ static void -daemonStreamMessageFinished(virNetMessagePtr msg, +daemonStreamMessageFinished(virNetMessagePtr msg ATTRIBUTE_UNUSED, void *opaque) { daemonClientStream *stream = opaque; @@ -244,7 +244,7 @@ cleanup: * -1 on fatal client error */ static int -daemonStreamFilter(virNetServerClientPtr client, +daemonStreamFilter(virNetServerClientPtr client ATTRIBUTE_UNUSED, virNetMessagePtr msg, void *opaque) { diff --git a/src/locking/lock_driver_nop.c b/src/locking/lock_driver_nop.c index 4f35afa..570b7e7 100644 --- a/src/locking/lock_driver_nop.c +++ b/src/locking/lock_driver_nop.c @@ -27,9 +27,9 @@ #include "uuid.h" -static int virLockManagerNopInit(unsigned int version, - const char *configFile, - unsigned int flags) +static int virLockManagerNopInit(unsigned int version ATTRIBUTE_UNUSED, + const char *configFile ATTRIBUTE_UNUSED, + unsigned int flags ATTRIBUTE_UNUSED) { VIR_DEBUG("version=%u configFile=%s flags=%x", version, NULLSTR(configFile), flags); diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 6991aec..787df9a 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1245,7 +1245,7 @@ int lxcContainerAvailable(int features) cpid = clone(lxcContainerDummyChild, childStack, flags, NULL); VIR_FREE(stack); if (cpid < 0) { - char ebuf[1024]; + char ebuf[1024] ATTRIBUTE_UNUSED; VIR_DEBUG("clone call returned %s, container support is not enabled", virStrerror(errno, ebuf, sizeof ebuf)); return -1; diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 6cf7203..4b62600 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -2165,7 +2165,7 @@ static int lxcStartup(int privileged) rc = virCgroupForDriver("lxc", &lxc_driver->cgroup, privileged, 1); if (rc < 0) { - char buf[1024]; + char buf[1024] ATTRIBUTE_UNUSED; VIR_DEBUG("Unable to create cgroup for LXC driver: %s", virStrerror(-rc, buf, sizeof(buf))); /* Don't abort startup. We will explicitly report to diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 08ef856..9112c96 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -703,7 +703,7 @@ out: } -static int udevGetSCSIType(virNodeDeviceDefPtr def, +static int udevGetSCSIType(virNodeDeviceDefPtr def ATTRIBUTE_UNUSED, unsigned int type, char **typestring) { int ret = 0; diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 0a5a13d..ef48d65 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1829,7 +1829,7 @@ cleanup: * instead of client app context & also adding in tunnel * handling */ static int doPeer2PeerMigrate2(struct qemud_driver *driver, - virConnectPtr sconn, + virConnectPtr sconn ATTRIBUTE_UNUSED, virConnectPtr dconn, virDomainObjPtr vm, const char *dconnuri, diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index e6123f9..971fb80 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -96,7 +96,8 @@ virNetTLSContextCheckCertFile(const char *type, const char *file, bool allowMiss } -static void virNetTLSLog(int level, const char *str) { +static void virNetTLSLog(int level ATTRIBUTE_UNUSED, + const char *str ATTRIBUTE_UNUSED) { VIR_DEBUG("%d %s", level, str); } @@ -490,7 +491,7 @@ static int virNetTLSContextCheckCertPair(gnutls_x509_crt_t cert, static gnutls_x509_crt_t virNetTLSContextLoadCertFromFile(const char *certFile, bool isServer, - bool isCA) + bool isCA ATTRIBUTE_UNUSED) { gnutls_datum_t data; gnutls_x509_crt_t cert = NULL; diff --git a/src/util/command.c b/src/util/command.c index d390478..699ba2d 100644 --- a/src/util/command.c +++ b/src/util/command.c @@ -1686,7 +1686,8 @@ virCommandProcessIO(virCommandPtr cmd) } else { inoff += done; if (inoff == inlen) { - int tmpfd = infd; + int tmpfd ATTRIBUTE_UNUSED; + tmpfd = infd; if (VIR_CLOSE(infd) < 0) VIR_DEBUG("ignoring failed close on fd %d", tmpfd); } @@ -1877,7 +1878,8 @@ virCommandRun(virCommandPtr cmd, int *exitstatus) VIR_DEBUG("ignoring failed close on fd %d", tmpfd); } if (cmd->outbuf == &outbuf) { - int tmpfd = cmd->outfd; + int tmpfd ATTRIBUTE_UNUSED; + tmpfd = cmd->outfd; if (VIR_CLOSE(cmd->outfd) < 0) VIR_DEBUG("ignoring failed close on fd %d", tmpfd); cmd->outfdptr = NULL; @@ -1885,7 +1887,8 @@ virCommandRun(virCommandPtr cmd, int *exitstatus) VIR_FREE(outbuf); } if (cmd->errbuf == &errbuf) { - int tmpfd = cmd->errfd; + int tmpfd ATTRIBUTE_UNUSED; + tmpfd = cmd->errfd; if (VIR_CLOSE(cmd->errfd) < 0) VIR_DEBUG("ignoring failed close on fd %d", tmpfd); cmd->errfdptr = NULL; diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c index 8206e1a..1fd6318 100644 --- a/src/util/virpidfile.c +++ b/src/util/virpidfile.c @@ -351,7 +351,7 @@ int virPidFileAcquirePath(const char *path, * one that now exists on the filesystem */ if (stat(path, &a) < 0) { - char ebuf[1024]; + char ebuf[1024] ATTRIBUTE_UNUSED; VIR_DEBUG("Pid file '%s' disappeared: %s", path, virStrerror(errno, ebuf, sizeof ebuf)); VIR_FORCE_CLOSE(fd); diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 0e4364f..b483d0f 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -6447,7 +6447,7 @@ cleanup: /* Functions needed for Callbacks */ static nsresult PR_COM_METHOD -vboxCallbackOnMachineStateChange(IVirtualBoxCallback *pThis, +vboxCallbackOnMachineStateChange(IVirtualBoxCallback *pThis ATTRIBUTE_UNUSED, PRUnichar *machineId, PRUint32 state) { virDomainPtr dom = NULL; @@ -6521,7 +6521,7 @@ vboxCallbackOnMachineStateChange(IVirtualBoxCallback *pThis, } static nsresult PR_COM_METHOD -vboxCallbackOnMachineDataChange(IVirtualBoxCallback *pThis, +vboxCallbackOnMachineDataChange(IVirtualBoxCallback *pThis ATTRIBUTE_UNUSED, PRUnichar *machineId) { VIR_DEBUG("IVirtualBoxCallback: %p", pThis); @@ -6531,11 +6531,11 @@ vboxCallbackOnMachineDataChange(IVirtualBoxCallback *pThis, } static nsresult PR_COM_METHOD -vboxCallbackOnExtraDataCanChange(IVirtualBoxCallback *pThis, +vboxCallbackOnExtraDataCanChange(IVirtualBoxCallback *pThis ATTRIBUTE_UNUSED, PRUnichar *machineId, PRUnichar *key, PRUnichar *value, PRUnichar **error ATTRIBUTE_UNUSED, - PRBool *allowChange) + PRBool *allowChange ATTRIBUTE_UNUSED) { VIR_DEBUG("IVirtualBoxCallback: %p, allowChange: %s", pThis, *allowChange ? "true" : "false"); DEBUGPRUnichar("machineId", machineId); @@ -6546,7 +6546,8 @@ vboxCallbackOnExtraDataCanChange(IVirtualBoxCallback *pThis, } static nsresult PR_COM_METHOD -vboxCallbackOnExtraDataChange(IVirtualBoxCallback *pThis, PRUnichar *machineId, +vboxCallbackOnExtraDataChange(IVirtualBoxCallback *pThis ATTRIBUTE_UNUSED, + PRUnichar *machineId, PRUnichar *key, PRUnichar *value) { VIR_DEBUG("IVirtualBoxCallback: %p", pThis); @@ -6559,8 +6560,10 @@ vboxCallbackOnExtraDataChange(IVirtualBoxCallback *pThis, PRUnichar *machineId, # if VBOX_API_VERSION < 3001 static nsresult PR_COM_METHOD -vboxCallbackOnMediaRegistered(IVirtualBoxCallback *pThis, PRUnichar *mediaId, - PRUint32 mediaType, PRBool registered) +vboxCallbackOnMediaRegistered(IVirtualBoxCallback *pThis ATTRIBUTE_UNUSED, + PRUnichar *mediaId, + PRUint32 mediaType ATTRIBUTE_UNUSED, + PRBool registered ATTRIBUTE_UNUSED) { VIR_DEBUG("IVirtualBoxCallback: %p, registered: %s", pThis, registered ? "true" : "false"); VIR_DEBUG("mediaType: %d", mediaType); @@ -6572,7 +6575,7 @@ vboxCallbackOnMediaRegistered(IVirtualBoxCallback *pThis, PRUnichar *mediaId, # endif /* VBOX_API_VERSION >= 3001 */ static nsresult PR_COM_METHOD -vboxCallbackOnMachineRegistered(IVirtualBoxCallback *pThis, +vboxCallbackOnMachineRegistered(IVirtualBoxCallback *pThis ATTRIBUTE_UNUSED, PRUnichar *machineId, PRBool registered) { virDomainPtr dom = NULL; @@ -6631,8 +6634,9 @@ vboxCallbackOnMachineRegistered(IVirtualBoxCallback *pThis, } static nsresult PR_COM_METHOD -vboxCallbackOnSessionStateChange(IVirtualBoxCallback *pThis, - PRUnichar *machineId, PRUint32 state) +vboxCallbackOnSessionStateChange(IVirtualBoxCallback *pThis ATTRIBUTE_UNUSED, + PRUnichar *machineId, + PRUint32 state ATTRIBUTE_UNUSED) { VIR_DEBUG("IVirtualBoxCallback: %p, state: %d", pThis, state); DEBUGPRUnichar("machineId", machineId); @@ -6641,7 +6645,8 @@ vboxCallbackOnSessionStateChange(IVirtualBoxCallback *pThis, } static nsresult PR_COM_METHOD -vboxCallbackOnSnapshotTaken(IVirtualBoxCallback *pThis, PRUnichar *machineId, +vboxCallbackOnSnapshotTaken(IVirtualBoxCallback *pThis ATTRIBUTE_UNUSED, + PRUnichar *machineId, PRUnichar *snapshotId) { VIR_DEBUG("IVirtualBoxCallback: %p", pThis); @@ -6652,7 +6657,8 @@ vboxCallbackOnSnapshotTaken(IVirtualBoxCallback *pThis, PRUnichar *machineId, } static nsresult PR_COM_METHOD -vboxCallbackOnSnapshotDiscarded(IVirtualBoxCallback *pThis, PRUnichar *machineId, +vboxCallbackOnSnapshotDiscarded(IVirtualBoxCallback *pThis ATTRIBUTE_UNUSED, + PRUnichar *machineId, PRUnichar *snapshotId) { VIR_DEBUG("IVirtualBoxCallback: %p", pThis); @@ -6663,7 +6669,8 @@ vboxCallbackOnSnapshotDiscarded(IVirtualBoxCallback *pThis, PRUnichar *machineId } static nsresult PR_COM_METHOD -vboxCallbackOnSnapshotChange(IVirtualBoxCallback *pThis, PRUnichar *machineId, +vboxCallbackOnSnapshotChange(IVirtualBoxCallback *pThis ATTRIBUTE_UNUSED, + PRUnichar *machineId, PRUnichar *snapshotId) { VIR_DEBUG("IVirtualBoxCallback: %p", pThis); @@ -6674,7 +6681,7 @@ vboxCallbackOnSnapshotChange(IVirtualBoxCallback *pThis, PRUnichar *machineId, } static nsresult PR_COM_METHOD -vboxCallbackOnGuestPropertyChange(IVirtualBoxCallback *pThis, +vboxCallbackOnGuestPropertyChange(IVirtualBoxCallback *pThis ATTRIBUTE_UNUSED, PRUnichar *machineId, PRUnichar *name, PRUnichar *value, PRUnichar *flags) { @@ -6688,7 +6695,7 @@ vboxCallbackOnGuestPropertyChange(IVirtualBoxCallback *pThis, } static nsresult PR_COM_METHOD -vboxCallbackAddRef(nsISupports *pThis) +vboxCallbackAddRef(nsISupports *pThis ATTRIBUTE_UNUSED) { nsresult c; -- 1.7.3.4

2 2

[libvirt] [test-API][PATCH] Add a case for testing update device flag
by Nan Zhang 27 Sep '11

27 Sep '11

--- repos/domain/update_devflag.py | 159 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 159 insertions(+), 0 deletions(-) create mode 100644 repos/domain/update_devflag.py diff --git a/repos/domain/update_devflag.py b/repos/domain/update_devflag.py new file mode 100644 index 0000000..b2d8d15 --- /dev/null +++ b/repos/domain/update_devflag.py @@ -0,0 +1,159 @@ +#!/usr/bin/evn python +"""Update virtual device to guest from an XML file +""" + +__author__ = 'Nan Zhang: nzhang(a)redhat.com' +__date__ = 'Fri Sep 2, 2011' +__version__ = '0.1.0' +__credits__ = 'Copyright (C) 2011 Red Hat, Inc.' +__all__ = ['usage', 'update_devflag'] + +import os +import re +import sys +import time +from xml.dom import minidom + +def append_path(path): + """Append root path of package""" + if path in sys.path: + pass + else: + sys.path.append(path) + +pwd = os.getcwd() +result = re.search('(.*)libvirt-test-API', pwd) +append_path(result.group(0)) + +from lib import connectAPI +from lib import domainAPI +from utils.Python import utils +from utils.Python import xmlbuilder +from exception import LibvirtAPI +from repos import domain + +def usage(): + print '''usage: mandatory arguments: + guestname + devtype + flag + ''' + +def check_params(params): + """Verify inputing parameter dictionary""" + logger = params['logger'] + keys = ['guestname', 'devtype', 'flag'] + for key in keys: + if key not in params: + logger.error("%s is required" %key) + usage() + return 1 + return 0 + +def create_image(img_name, img_size, logger): + """Create an image file""" + stat, ret = commands.getstatusoutput("dd if=/dev/zero of=%s bs=1 \ + count=1 seek=%s" % (img_name, img_size)) + if stat == 0: + logger.debug("create image result:\n%s" % ret) + return True + else: + return False + +def check_updated_device(guestname, domobj, srcfile): + """Check if the device is updated""" + xmlobj = domobj.get_xml_desc(guestname) + domxml = minidom.parseString(xmlobj) + + for diskTag in domxml.getElementsByTagName("source"): + if diskTag.parentNode.getAttribute("device") == 'cdrom': + upfile = diskTag.getAttribute("file") + elif diskTag.parentNode.getAttribute('device') == 'floppy': + upfile = diskTag.getAttribute("file") + else: + logger.error("No matched device was found.") + + if upfile == srcfile: + return True, upfile + else: + return False, upfile + +def update_devflag(params): + """Update virtual device to a domain from xml""" + + # Initiate and check parameters + params_check_result = check_params(params) + if params_check_result: + return 1 + logger = params['logger'] + guestname = params['guestname'] + devtype = params['devtype'] + if devtype == 'cdrom': + xmlargs = {} + xmlargs['guesttype'] = 'kvm' + xmlargs['hdmodel'] = 'ide' + xmlargs['bootcd'] = '/var/lib/libvirt/boot/cdrom.img' + srcfile = xmlargs['bootcd'] + create_image(srcfile, 100M, logger) + elif devtype = 'floppy': + xmlargs = {} + xmlargs['floppysource'] = '/var/lib/libvirt/boot/floppy.img' + srcfile = xmlargs['floppysource'] + create_image(srcfile, 2M, logger) + else: + logger.error("Wrong device type was specified.") + return 1 + + if not params.has_key('flag'): + flag = VIR_DOMAIN_AFFECT_CONFIG + + # Connect to local hypervisor connection URI + util = utils.Utils() + uri = util.get_uri('127.0.0.1') + conn = connectAPI.ConnectAPI() + virconn = conn.open(uri) + + caps = conn.get_caps() + logger.debug(caps) + + # Generate device XML for updating + domobj = domainAPI.DomainAPI(virconn) + newxmlobj = xmlbuilder.XmlBuilder() + + if devtype == 'cdrom': + newdevxml = newxmlobj.build_cdrom(xmlargs) + elif devtype == 'floppy': + newdevxml = newxmlobj.build_floppy(xmlargs) + + logger.debug("block device xml desc:\n%s" %newdevxml) + + try: + try: + domobj.update_device_flag(guestname, newdevxml, flag) + res, upfile = check_updated_device(guestname, domobj, srcfile) + if res: + logger.info("success to update '%s' device: %s\n" % \ + devtype, upfile) + else: + logger.error("fail to update '%s' device: %s\n" % \ + devtype, upfile) + except LibvirtAPI, e: + logger.error("API error message: %s, error code is %s" % + (e.response()['message'], e.response()['code'])) + conn.close() + logger.info("closed hypervisor connection") + return 1 + finally: + conn.close() + logger.info("closed hypervisor connection") + + return 0 + +def update_devflag_clean(params): + """Clean testing environment""" + if params['devtype'] == 'cdrom': + os.system('rm -f /var/lib/libvirt/boot/cdrom.img') + elif params['devtype'] == 'floppy': + os.system('rm -f /var/lib/libvirt/boot/floppy.img') + else: + logger.debug("image file was not found.") -- 1.7.4.4

3 4

[libvirt] [PATCH] qemu: add return value check
by ajia＠redhat.com 27 Sep '11

27 Sep '11

From: Alex Jia <ajia(a)redhat.com> * src/qemu/qemu_migration.c: if 'vmdef' is NULL, the function virDomainSaveConfig still dereferences it, it doesn't make sense, so should add return value check to make sure 'vmdef' is non-NULL before calling virDomainSaveConfig. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/qemu/qemu_migration.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 0a5a13d..ec994a5 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2580,8 +2580,14 @@ qemuMigrationFinish(struct qemud_driver *driver, vm->persistent = 1; if (mig->persistent) vm->newDef = vmdef = mig->persistent; - else + else { vmdef = virDomainObjGetPersistentDef(driver->caps, vm); + if (!vmdef) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("can't get vmdef")); + goto endjob; + } + } if (virDomainSaveConfig(driver->configDir, vmdef) < 0) { /* Hmpf. Migration was successful, but making it persistent * was not. If we report successful, then when this domain -- 1.7.1

3 2

[libvirt] [PATCH v2] storage: Do not break the whole vol lookup process in the middle
by Osier Yang 27 Sep '11

27 Sep '11

* src/storage/storage_driver.c: As virStorageVolLookupByPath lookups all the pool objs of the drivers, breaking when failing on getting the stable path of the pool will just breaks the whole lookup process, it can cause the API fails even if the vol exists indeed. It won't get any benefit. This patch is to fix it. --- src/storage/storage_driver.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index c05b74e..8c2d6e1 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1247,14 +1247,14 @@ storageVolumeLookupByPath(virConnectPtr conn, stable_path = virStorageBackendStablePath(driver->pools.objs[i], cleanpath); - /* - * virStorageBackendStablePath already does - * virStorageReportError if it fails; we just need to keep - * propagating the return code - */ if (stable_path == NULL) { + /* Don't break the whole lookup process if it fails on + * getting the stable path for some of the pools. + */ + VIR_WARN("Failed to get stable path for pool '%s'", + driver->pools.objs[i]->def->name); virStoragePoolObjUnlock(driver->pools.objs[i]); - goto cleanup; + continue; } vol = virStorageVolDefFindByPath(driver->pools.objs[i], @@ -1274,7 +1274,6 @@ storageVolumeLookupByPath(virConnectPtr conn, virStorageReportError(VIR_ERR_NO_STORAGE_VOL, "%s", _("no storage vol with matching path")); -cleanup: VIR_FREE(cleanpath); storageDriverUnlock(driver); return ret; -- 1.7.6

2 2

[libvirt] [libvirt-virshcmdref 01/10] clarify the format of XML file used in command attach-device and detach-device
by Hu Tao 23 Sep '11

23 Sep '11

--- source/attach-device.xml | 4 +++- source/detach-device.xml | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/source/attach-device.xml b/source/attach-device.xml index 18e3262..aab8313 100644 --- a/source/attach-device.xml +++ b/source/attach-device.xml @@ -27,7 +27,9 @@ <value type="string" requirement="required">file</value> <description> <text> - the XML file describing the device to be attached + the XML file describing the device to be attached, with + a root element of something that belongs inside <devices> + of domain xml </text> <text> "--file" itself is optional diff --git a/source/detach-device.xml b/source/detach-device.xml index 85ab17b..6262d49 100644 --- a/source/detach-device.xml +++ b/source/detach-device.xml @@ -27,7 +27,8 @@ <value type="string" requirement="required">file</value> <description> <text> - the XML file describing the device to be detached + the XML file describing the device to be detached, with + a root element of something that belongs inside <devices> </text> <text> "--file" itself is optional -- 1.7.3.1

2 13

[libvirt] [RFC PATCH] Prevent defining a domain has disk used by other domain
by Osier Yang 23 Sep '11

23 Sep '11

$subject + "If the disk is shared and readonly." If the disk is not shared or readonly, the later started domain will relabel the disk, thus the first domain will lose the permission to write to the disk and be corrupt. -- I'm not sure if it's the design to allow multiple domains use same disk not shared and readonly. So this patch just gives a demo of the implementation (it skips the checking of nbd disk, and only changes qemu driver), to see whether if the pricinple is right or not. --- src/conf/domain_conf.c | 34 ++++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 2 ++ src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 24 ++++++++++++++++++++++++ 4 files changed, 61 insertions(+), 0 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7463d7c..b64450b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -655,6 +655,40 @@ virDomainObjPtr virDomainFindByName(const virDomainObjListPtr doms, return obj; } +static int +virDomainObjListSearchDiskPath(const void *payload, + const void *name ATTRIBUTE_UNUSED, + const void *data) +{ + virDomainObjPtr obj = (virDomainObjPtr)payload; + int i; + int want = 0; + const char *path = NULL; + + path = (const char *)data; + + virDomainObjLock(obj); + for (i = 0; obj->def->ndisks; i++) { + if (STREQ(obj->def->disks[i]->src, path)) { + want = 1; + break; + } + } + virDomainObjUnlock(obj); + + return want; +} + +virDomainObjPtr +virDomainFindByDiskPath(const virDomainObjListPtr doms, + const char *path) +{ + virDomainObjPtr obj = NULL; + obj = virHashSearch(doms->objs, virDomainObjListSearchDiskPath, path); + if (obj) + virDomainObjLock(obj); + return obj; +} bool virDomainObjTaint(virDomainObjPtr obj, enum virDomainTaintFlags taint) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 371f270..d7d42dd 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1549,6 +1549,8 @@ virDomainObjPtr virDomainFindByUUID(const virDomainObjListPtr doms, const unsigned char *uuid); virDomainObjPtr virDomainFindByName(const virDomainObjListPtr doms, const char *name); +virDomainObjPtr virDomainFindByDiskPath(const virDomainObjListPtr doms, + const char *path); bool virDomainObjTaint(virDomainObjPtr obj, enum virDomainTaintFlags taint); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 8235ea1..c33cb2d 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -302,6 +302,7 @@ virDomainFSTypeToString; virDomainFindByID; virDomainFindByName; virDomainFindByUUID; +virDomainFindByDiskPath; virDomainGetRootFilesystem; virDomainGraphicsAuthConnectedTypeFromString; virDomainGraphicsAuthConnectedTypeToString; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0d0bea2..a448a0b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4796,6 +4796,7 @@ static virDomainPtr qemudDomainDefine(virConnectPtr conn, const char *xml) { virDomainPtr dom = NULL; virDomainEventPtr event = NULL; int dupVM; + int i; qemuDriverLock(driver); if (!(def = virDomainDefParseString(driver->caps, xml, @@ -4809,6 +4810,29 @@ static virDomainPtr qemudDomainDefine(virConnectPtr conn, const char *xml) { if ((dupVM = virDomainObjIsDuplicate(&driver->domains, def, 0)) < 0) goto cleanup; + /* Make sure no disk is used by other domain, if it's not + * either shareable or readonly. + */ + for (i = 0; i < def->ndisks; i++) { + /* XXX: Do we also need to check if same host&port is used by + * other domain for disk of nbd type? + */ + if (def->disks[i]->type == VIR_DOMAIN_DISK_TYPE_NETWORK && + def->disks[i]->protocol == VIR_DOMAIN_DISK_PROTOCOL_NBD) + continue; + + if (!def->disks[i]->shared && + !def->disks[i]->readonly && + (vm = virDomainFindByDiskPath(&driver->domains, + def->disks[i]->src))) { + qemuReportError(VIR_ERR_INVALID_ARG, + _("disk '%s' already used by domain '%s'"), + def->disks[i]->src, + vm->def->name); + goto cleanup; + } + } + if (qemudCanonicalizeMachine(driver, def) < 0) goto cleanup; -- 1.7.6

3 3

[libvirt] [PATCH v3 0/2] add blkio.weight_device support
by Hu Tao 23 Sep '11

23 Sep '11

This series adds support for blkio.weight_device. changes from v2: - fix the compatibility issue of TYPED_STRING with old clients and old servers - modify XML format for weight_device as danp suggested Hu Tao (2): Add VIR_TYPED_PARAM_STRING add interface for blkio.weight_device daemon/remote.c | 22 +++++ include/libvirt/libvirt.h.in | 14 +++- src/conf/domain_conf.c | 114 ++++++++++++++++++++++++- src/conf/domain_conf.h | 16 ++++ src/libvirt_private.syms | 1 + src/qemu/qemu_cgroup.c | 22 +++++ src/qemu/qemu_driver.c | 191 +++++++++++++++++++++++++++++++++++++++++- src/remote/remote_driver.c | 17 ++++ src/remote/remote_protocol.x | 2 + src/remote_protocol-structs | 2 + src/util/cgroup.c | 33 +++++++ src/util/cgroup.h | 3 + tools/virsh.c | 52 ++++++++++-- tools/virsh.pod | 5 +- 14 files changed, 479 insertions(+), 15 deletions(-) -- 1.7.3.1

2 4

[libvirt] [PATCH] storage: Do not break the whole vol lookup process in the middle
by Osier Yang 23 Sep '11

23 Sep '11

* src/storage/storage_driver.c: As virStorageVolLookupByPath lookups all the pool objs of the drivers, breaking when failing on getting the stable path of the pool will just breaks the lookup process, it can cause the API fails even if the vol exists indeed. It won't get any benifit. This patch is to fix it. --- src/storage/storage_driver.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index c05b74e..8a3b5be 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1247,14 +1247,13 @@ storageVolumeLookupByPath(virConnectPtr conn, stable_path = virStorageBackendStablePath(driver->pools.objs[i], cleanpath); - /* - * virStorageBackendStablePath already does - * virStorageReportError if it fails; we just need to keep - * propagating the return code - */ if (stable_path == NULL) { - virStoragePoolObjUnlock(driver->pools.objs[i]); - goto cleanup; + /* Don't break the whole lookup process if fails on + * getting the stabe path for some of the pool. + */ + VIR_WARN("Failed to get stable path for pool '%s'", + driver->pools.objs[i]->def->name); + continue; } vol = virStorageVolDefFindByPath(driver->pools.objs[i], @@ -1274,7 +1273,6 @@ storageVolumeLookupByPath(virConnectPtr conn, virStorageReportError(VIR_ERR_NO_STORAGE_VOL, "%s", _("no storage vol with matching path")); -cleanup: VIR_FREE(cleanpath); storageDriverUnlock(driver); return ret; -- 1.7.6

2 1

[libvirt] [PATCH 2/2] Modify generic ethernet interface so it will work when sVirt is enabled with qemu
by Tyler Coumbes 23 Sep '11

23 Sep '11

Update code to create generic ethernet interfaces using the new utility library tunctl making changes to create the TAP device in libvirt and pass it to qemu as a file descriptor. --- diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ee4b52b..181f56c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -396,6 +396,51 @@ qemuOpenVhostNet(virDomainDefPtr def, } +int qemuEthernetIfaceCreate(virDomainDefPtr def, + virDomainNetDefPtr net, + virBitmapPtr qemuCaps) +{ + int tapfd; + int err; + int vnet_hdr = 0; + unsigned char tapmac[VIR_MAC_BUFLEN]; + + if (qemuCapsGet(qemuCaps, QEMU_CAPS_VNET_HDR) && + net->model && STREQ(net->model, "virtio")) + vnet_hdr = 1; + + if (!net->ifname || + STRPREFIX(net->ifname, "vnet") || + strchr(net->ifname, '%')) { + VIR_FREE(net->ifname); + if (!(net->ifname = strdup("vnet%d"))) { + virReportOOMError(); + return -1; + } + } + + err = createTap(&net->ifname, vnet_hdr, &tapfd); + virDomainAuditNetDevice(def, net, "/dev/net/tun", tapfd >= 0); + if (tapfd < 0 || err) + return -1; + + memcpy(tapmac, net->mac, VIR_MAC_BUFLEN); + /* Discourage bridge from using TAP dev MAC */ + tapmac[0] = 0xFE; + err = tapSetInterfaceMac(net->ifname, tapmac); + + if (err) + return -1; + + err = tapSetInterfaceUp(net->ifname, 1); + + if (err) + return -1; + + return tapfd; +} + + static int qemuDomainDeviceAliasIndex(virDomainDeviceInfoPtr info, const char *prefix) { @@ -2055,14 +2100,17 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, case VIR_DOMAIN_NET_TYPE_ETHERNET: virBufferAddLit(&buf, "tap"); - if (net->ifname) { - virBufferAsprintf(&buf, "%cifname=%s", type_sep, net->ifname); - type_sep = ','; - } if (net->data.ethernet.script) { + if (net->ifname) { + virBufferAsprintf(&buf, "%cifname=%s", type_sep, net->ifname); + type_sep = ','; + } virBufferAsprintf(&buf, "%cscript=%s", type_sep, net->data.ethernet.script); type_sep = ','; + } else if(net->ifname) { + virBufferAsprintf(&buf, "%cfd=%s", type_sep, tapfd); + type_sep = ','; } is_tap = true; break; @@ -4064,6 +4112,18 @@ qemuBuildCommandLine(virConnectPtr conn, if (snprintf(tapfd_name, sizeof(tapfd_name), "%d", tapfd) >= sizeof(tapfd_name)) goto no_memory; + } else if (actualType == VIR_DOMAIN_NET_TYPE_ETHERNET && + !net->data.ethernet.script) { + int tapfd = qemuEthernetIfaceCreate(def, net, qemuCaps); + if (tapfd < 0) + goto error; + + last_good_net = i; + virCommandTransferFD(cmd, tapfd); + + if (snprintf(tapfd_name, sizeof(tapfd_name), "%d", + tapfd) >= sizeof(tapfd_name)) + goto no_memory; } if (actualType == VIR_DOMAIN_NET_TYPE_NETWORK || diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 00e58a2..b21eeb6 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -142,6 +142,10 @@ int qemuOpenVhostNet(virDomainDefPtr def, virBitmapPtr qemuCaps, int *vhostfd); +int qemuEthernetIfaceCreate(virDomainDefPtr def, + virDomainNetDefPtr net, + virBitmapPtr qemuCaps); + int qemudCanonicalizeMachine(struct qemud_driver *driver, virDomainDefPtr def); diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index e8b92a4..cbea145 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -29,6 +29,7 @@ # include "ebtables.h" # include "internal.h" # include "bridge.h" +# include "tunctl.h" # include "capabilities.h" # include "network_conf.h" # include "domain_conf.h" diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 6cfe392..32c5edb 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -645,6 +645,12 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, iface_connected = true; if (qemuOpenVhostNet(vm->def, net, priv->qemuCaps, &vhostfd) < 0) goto cleanup; + } else if (net->type == VIR_DOMAIN_NET_TYPE_ETHERNET && + !net->data.ethernet.script) + { + if ((tapfd = qemuEthernetIfaceCreate(vm->def, net, priv->qemuCaps)) < 0) + goto cleanup; + iface_connected = true; } if (VIR_REALLOC_N(vm->def->nets, vm->def->nnets+1) < 0) @@ -1881,6 +1887,10 @@ int qemuDomainDetachNetDevice(struct qemud_driver *driver, } #endif + if(detach->type == VIR_DOMAIN_NET_TYPE_ETHERNET && + !detach->data.ethernet.script) + delTap(detach->ifname); + if ((driver->macFilter) && (detach->ifname != NULL)) { if ((errno = networkDisallowMacOnPort(driver, detach->ifname, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 3baaa19..11e4219 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3392,6 +3392,14 @@ void qemuProcessStop(struct qemud_driver *driver, networkReleaseActualDevice(net); } + def = vm->def; + for(i=0; i < def->nnets; i++) { + virDomainNetDefPtr net = def->nets[i]; + if (net->type == VIR_DOMAIN_NET_TYPE_ETHERNET && + !net->data.ethernet.script) + delTap(net->ifname); + } + retry: if ((ret = qemuRemoveCgroup(driver, vm, 0)) < 0) { if (ret == -EBUSY && (retries++ < 5)) {

2 1

[libvirt] [PATCH 1/2] Modify generic ethernet interface so it will work when sVirt is enabled with qemu
by Tyler Coumbes 23 Sep '11

23 Sep '11

Add a generic utility library for working with the TUN driver (/dev/net/tun). --- diff --git a/src/Makefile.am b/src/Makefile.am index 738ee91..ddd1b77 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -88,7 +88,8 @@ UTIL_SOURCES = \ util/xml.c util/xml.h \ util/virterror.c util/virterror_internal.h \ util/virkeycode.c util/virkeycode.h \ - util/virkeymaps.h + util/virkeymaps.h \ + util/tunctl.c util/tunctl.h EXTRA_DIST += $(srcdir)/util/virkeymaps.h $(srcdir)/util/keymaps.csv \ $(srcdir)/util/virkeycode-mapgen.py @@ -1182,6 +1183,8 @@ if WITH_NETWORK USED_SYM_FILES += libvirt_network.syms endif +USED_SYM_FILES += libvirt_tunctl.syms + EXTRA_DIST += \ libvirt_public.syms \ libvirt_private.syms \ diff --git a/src/libvirt_tunctl.syms b/src/libvirt_tunctl.syms new file mode 100644 index 0000000..d1e00bb --- /dev/null +++ b/src/libvirt_tunctl.syms @@ -0,0 +1,5 @@ +#tunctl.h +createTap; +delTap; +tapSetInterfaceUp; +tapSetInterfaceMac; diff --git a/src/util/tunctl.c b/src/util/tunctl.c new file mode 100644 index 0000000..e758e6d --- /dev/null +++ b/src/util/tunctl.c @@ -0,0 +1,295 @@ +/* + * Copyright (C) 2007, 2009, 2011 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Authors: + */ + +# include <config.h> +# include "tunctl.h" +# include "virfile.h" + +# include <stdlib.h> +# include <stdio.h> +# include <string.h> +# include <unistd.h> +# include <fcntl.h> +# include <errno.h> +# include <arpa/inet.h> +# include <sys/types.h> +# include <sys/socket.h> +# include <sys/ioctl.h> +# include <paths.h> +# include <sys/wait.h> + +# include <linux/param.h> /* HZ */ +# include <linux/sockios.h> /* SIOCBRADDBR etc. */ +# include <linux/if_bridge.h> /* SYSFS_BRIDGE_ATTR */ +# include <linux/if_tun.h> /* IFF_TUN, IFF_NO_PI */ +# include <net/if_arp.h> /* ARPHRD_ETHER */ + +# include "internal.h" +# include "command.h" +# include "memory.h" +# include "util.h" +# include "logging.h" +# include "network.h" + +/** + * tapProbeVnetHdr: + * @tapfd: a tun/tap file descriptor + * + * Check whether it is safe to enable the IFF_VNET_HDR flag on the + * tap interface. + * + * Setting IFF_VNET_HDR enables QEMU's virtio_net driver to allow + * guests to pass larger (GSO) packets, with partial checksums, to + * the host. This greatly increases the achievable throughput. + * + * It is only useful to enable this when we're setting up a virtio + * interface. And it is only *safe* to enable it when we know for + * sure that a) qemu has support for IFF_VNET_HDR and b) the running + * kernel implements the TUNGETIFF ioctl(), which qemu needs to query + * the supplied tapfd. + * + * Returns 0 in case of success or an errno code in case of failure. + */ +# ifdef IFF_VNET_HDR +static int tapProbeVnetHdr(int tapfd) +{ +# if defined(IFF_VNET_HDR) && defined(TUNGETFEATURES) && defined(TUNGETIFF) + unsigned int features; + struct ifreq dummy; + + if (ioctl(tapfd, TUNGETFEATURES, &features) != 0) { + VIR_INFO("Not enabling IFF_VNET_HDR; " + "TUNGETFEATURES ioctl() not implemented"); + return 0; + } + + if (!(features & IFF_VNET_HDR)) { + VIR_INFO("Not enabling IFF_VNET_HDR; " + "TUNGETFEATURES ioctl() reports no IFF_VNET_HDR"); + return 0; + } + + /* The kernel will always return -1 at this point. + * If TUNGETIFF is not implemented then errno == EBADFD. + */ + if (ioctl(tapfd, TUNGETIFF, &dummy) != -1 || errno != EBADFD) { + VIR_INFO("Not enabling IFF_VNET_HDR; " + "TUNGETIFF ioctl() not implemented"); + return 0; + } + + VIR_INFO("Enabling IFF_VNET_HDR"); + + return 1; +# else + (void) tapfd; + VIR_INFO("Not enabling IFF_VNET_HDR; disabled at build time"); + return 0; +# endif +} +# endif + +/** + * createTap: + * @ifname: the interface name + * @vnet_hr: whether to try enabling IFF_VNET_HDR + * @tapfd: file descriptor return value for the new tap device + * + * Creates a tap interface. + * If the @tapfd parameter is supplied, the open tap device file + * descriptor will be returned, otherwise the TAP device will be made + * persistent and closed. The caller must use delTap to remove + * a persistent TAP devices when it is no longer needed. + * + * Returns 0 in case of success or an errno code in case of failure. + */ + +int createTap(char **ifname, + int vnet_hdr, + int *tapfd) +{ + + int fd; + struct ifreq ifr; + + if (!ifname) + return EINVAL; + + if ((fd = open("/dev/net/tun", O_RDWR)) < 0) + return errno; + + memset(&ifr, 0, sizeof(ifr)); + + ifr.ifr_flags = IFF_TAP|IFF_NO_PI; + +# ifdef IFF_VNET_HDR + if (vnet_hdr && tapProbeVnetHdr(fd)) + ifr.ifr_flags |= IFF_VNET_HDR; +# else + (void) vnet_hdr; +# endif + + if (virStrcpyStatic(ifr.ifr_name, *ifname) == NULL) { + errno = EINVAL; + goto error; + } + + if (ioctl(fd, TUNSETIFF, &ifr) < 0) + goto error; + + if (!tapfd && + (errno = ioctl(fd, TUNSETPERSIST, 1))) + goto error; + VIR_FREE(*ifname); + if (!(*ifname = strdup(ifr.ifr_name))) + goto error; + if(tapfd) + *tapfd = fd; + else + VIR_FORCE_CLOSE(fd); + return 0; + + error: + VIR_FORCE_CLOSE(fd); + + return errno; +} + +/** + * delTap: + * @ifname the interface name + * + * Deletes the tap interface. + * + * Returns 0 in case of success or an errno code in case of failure. + */ + +int delTap(const char *ifname) { + struct ifreq try; + int fd; + + if (!ifname) + return EINVAL; + + if ((fd = open("/dev/net/tun", O_RDWR)) < 0) + return errno; + + memset(&try, 0, sizeof(struct ifreq)); + try.ifr_flags = IFF_TAP|IFF_NO_PI; + + if (virStrcpyStatic(try.ifr_name, ifname) == NULL) { + errno = EINVAL; + goto error; + } + + if (ioctl(fd, TUNSETIFF, &try) == 0) { + if ((errno = ioctl(fd, TUNSETPERSIST, 0))) + goto error; + } + + error: + VIR_FORCE_CLOSE(fd); + + return errno; +} + +/** + * tapSetInterfaceUp: + * @ifname: the interface name + * @up: 1 for up, 0 for down + * + * Function to control if an interface is activated (up, 1) or not (down, 0) + * + * Returns 0 in case of success or an errno code in case of failure. + */ + +int tapSetInterfaceUp(const char *ifname, + int up) +{ + struct ifreq ifr; + int ifflags; + int ctrl_fd; + + if (!ifname) + return EINVAL; + + ctrl_fd = socket(AF_INET, SOCK_STREAM, 0); + if (ctrl_fd < 0) + return errno; + + memset(&ifr, 0, sizeof(struct ifreq)); + + if (virStrcpyStatic(ifr.ifr_name, ifname) == NULL) + return EINVAL; + + if (ioctl(ctrl_fd, SIOCGIFFLAGS, &ifr) < 0) + return errno; + + ifflags = up ? (ifr.ifr_flags | IFF_UP) : (ifr.ifr_flags & ~IFF_UP); + + if (ifr.ifr_flags != ifflags) { + ifr.ifr_flags = ifflags; + + if (ioctl(ctrl_fd, SIOCSIFFLAGS, &ifr) < 0) + return errno; + } + VIR_FORCE_CLOSE(ctrl_fd); + return 0; +} + +/** + * tapSetInterfaceMac: + * @ifname: interface name to set MTU for + * @macaddr: MAC address (VIR_MAC_BUFLEN in size) + * + * This function sets the @macaddr for a given interface @ifname. This + * gets rid of the kernel's automatically assigned random MAC. + * + * Returns 0 in case of success or an errno code in case of failure. + */ +int tapSetInterfaceMac(const char *ifname, + const unsigned char *macaddr) +{ + struct ifreq ifr; + int ctrl_fd; + int err; + + if (!ifname) + return EINVAL; + + ctrl_fd = socket(AF_INET, SOCK_STREAM, 0); + if (ctrl_fd < 0) + return errno; + + memset(&ifr, 0, sizeof(struct ifreq)); + if (virStrcpyStatic(ifr.ifr_name, ifname) == NULL) + return EINVAL; + /* To fill ifr.ifr_hdaddr.sa_family field */ + if (ioctl(ctrl_fd, SIOCGIFHWADDR, &ifr) != 0) + return errno; + + memcpy(ifr.ifr_hwaddr.sa_data, macaddr, VIR_MAC_BUFLEN); + + err = ioctl(ctrl_fd, SIOCSIFHWADDR, &ifr) == 0 ? 0 : errno; + + VIR_FORCE_CLOSE(ctrl_fd); + + return err; +} diff --git a/src/util/tunctl.h b/src/util/tunctl.h new file mode 100644 index 0000000..73dd4aa --- /dev/null +++ b/src/util/tunctl.h @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2007 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Authors: + */ + +#ifndef __QEMUD_TAP_H__ +# define __QEMUD_TAP_H__ + +# include <config.h> +# include <net/if.h> +# include <netinet/in.h> +# include "network.h" + +int createTap (char **ifname, + int vnet_hdr, + int *tapfd); +int delTap (const char *ifname); +int tapSetInterfaceUp (const char *ifname, + int up); +int tapSetInterfaceMac (const char *ifname, + const unsigned char *macaddr); + +#endif /* __QEMUD_TAP_H__ */

2 1

[libvirt] [PATCH] Add unsafe cache mode support for disk driver
by Oskari Saarenmaa 23 Sep '11

23 Sep '11

QEMU 0.13 introduced cache=unsafe for -drive, this patch exposes it in the libvirt layer. * Introduced a new QEMU capability flag ($prefix_CACHE_UNSAFE), as even if $prefix_CACHE_V2 is set, we can't known if unsafe is supported. * qemuhelptest prints test case name on failure. --- docs/formatdomain.html.in | 7 ++-- docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 3 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 15 ++++++++- tests/qemuargv2xmltest.c | 1 + tests/qemuhelptest.c | 19 ++++++----- .../qemuxml2argv-disk-drive-cache-unsafe.args | 5 +++ .../qemuxml2argv-disk-drive-cache-unsafe.xml | 33 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ tools/virsh.pod | 4 +- 13 files changed, 80 insertions(+), 16 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 0a7abaf..8087327 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -996,9 +996,10 @@ <li> The optional <code>cache</code> attribute controls the cache mechanism, possible values are "default", "none", - "writethrough", "writeback", and "directsync". "directsync" - is like "writethrough", but it bypasses the host page - cache. + "writethrough", "writeback", "directsync" (like + "writethrough", but it bypasses the host page cache) and + "unsafe" (host may cache all disk io and sync requests from + guest are ignored). Since 0.6.0 </li> <li> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index d0da41c..be98be0 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -848,6 +848,7 @@ <value>writeback</value> <value>writethrough</value> <value>directsync</value> + <value>unsafe</value> </choice> </attribute> </define> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7476447..21f4c6b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -164,7 +164,8 @@ VIR_ENUM_IMPL(virDomainDiskCache, VIR_DOMAIN_DISK_CACHE_LAST, "none", "writethrough", "writeback", - "directsync") + "directsync", + "unsafe") VIR_ENUM_IMPL(virDomainDiskErrorPolicy, VIR_DOMAIN_DISK_ERROR_POLICY_LAST, "default", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 371f270..86b4c79 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -192,6 +192,7 @@ enum virDomainDiskCache { VIR_DOMAIN_DISK_CACHE_WRITETHRU, VIR_DOMAIN_DISK_CACHE_WRITEBACK, VIR_DOMAIN_DISK_CACHE_DIRECTSYNC, + VIR_DOMAIN_DISK_CACHE_UNSAFE, VIR_DOMAIN_DISK_CACHE_LAST }; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 36f47a9..13f1aea 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -136,6 +136,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "pci-ohci", "usb-redir", "usb-hub", + "cache-unsafe", ); struct qemu_feature_flags { @@ -918,6 +919,8 @@ qemuCapsComputeCmdFlags(const char *help, if (strstr(help, "directsync")) qemuCapsSet(flags, QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC); } + if (strstr(help, "|unsafe")) + qemuCapsSet(flags, QEMU_CAPS_DRIVE_CACHE_UNSAFE); if (strstr(help, "format=")) qemuCapsSet(flags, QEMU_CAPS_DRIVE_FORMAT); if (strstr(help, "readonly=")) diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 96b7a3b..97fda0c 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -110,6 +110,7 @@ enum qemuCapsFlags { QEMU_CAPS_PCI_OHCI = 71, /* -device pci-ohci */ QEMU_CAPS_USB_REDIR = 72, /* -device usb-redir */ QEMU_CAPS_USB_HUB = 73, /* -device usb-hub */ + QEMU_CAPS_DRIVE_CACHE_UNSAFE = 74, /* Is cache=unsafe supported? */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index e8b1157..372f9fb 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -66,14 +66,16 @@ VIR_ENUM_IMPL(qemuDiskCacheV1, VIR_DOMAIN_DISK_CACHE_LAST, "off", "off", /* writethrough not supported, so for safety, disable */ "on", /* Old 'on' was equivalent to 'writeback' */ - "off"); /* directsync not supported, for safety, disable */ + "off", /* directsync not supported, for safety, disable */ + "off"); /* unsafe not supported, for safety, disable */ VIR_ENUM_IMPL(qemuDiskCacheV2, VIR_DOMAIN_DISK_CACHE_LAST, "default", "none", "writethrough", "writeback", - "directsync"); + "directsync", + "unsafe"); VIR_ENUM_DECL(qemuVideo) @@ -1623,6 +1625,13 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, "supported by this QEMU")); goto error; } + else if (disk->cachemode == VIR_DOMAIN_DISK_CACHE_UNSAFE && + !qemuCapsGet(qemuCaps, QEMU_CAPS_DRIVE_CACHE_UNSAFE)) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("disk cache mode 'unsafe' is not " + "supported by this QEMU")); + goto error; + } } else { mode = qemuDiskCacheV1TypeToString(disk->cachemode); } @@ -5536,6 +5545,8 @@ qemuParseCommandLineDisk(virCapsPtr caps, def->cachemode = VIR_DOMAIN_DISK_CACHE_WRITETHRU; else if (STREQ(values[i], "directsync")) def->cachemode = VIR_DOMAIN_DISK_CACHE_DIRECTSYNC; + else if (STREQ(values[i], "unsafe")) + def->cachemode = VIR_DOMAIN_DISK_CACHE_UNSAFE; } else if (STREQ(keywords[i], "werror") || STREQ(keywords[i], "rerror")) { if (STREQ(values[i], "stop")) diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index 91f15af..6a79630 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -169,6 +169,7 @@ mymain(void) DO_TEST("disk-drive-cache-v2-wb"); DO_TEST("disk-drive-cache-v2-none"); DO_TEST("disk-drive-cache-directsync"); + DO_TEST("disk-drive-cache-unsafe"); DO_TEST("disk-drive-network-nbd"); DO_TEST("disk-drive-network-rbd"); DO_TEST("disk-drive-network-sheepdog"); diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index ffd30e2..4d757e5 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -77,8 +77,8 @@ static int testHelpStrParsing(const void *data) if (STRNEQ(got, expected)) { fprintf(stderr, - "Computed flags do not match: got %s, expected %s\n", - got, expected); + "%s: computed flags do not match: got %s, expected %s\n", + info->name, got, expected); if (getenv("VIR_TEST_DEBUG")) printMismatchedFlags(flags, info->flags); @@ -87,22 +87,22 @@ static int testHelpStrParsing(const void *data) } if (version != info->version) { - fprintf(stderr, "Parsed versions do not match: got %u, expected %u\n", - version, info->version); + fprintf(stderr, "%s: parsed versions do not match: got %u, expected %u\n", + info->name, version, info->version); goto cleanup; } if (is_kvm != info->is_kvm) { fprintf(stderr, - "Parsed is_kvm flag does not match: got %u, expected %u\n", - is_kvm, info->is_kvm); + "%s: parsed is_kvm flag does not match: got %u, expected %u\n", + info->name, is_kvm, info->is_kvm); goto cleanup; } if (kvm_version != info->kvm_version) { fprintf(stderr, - "Parsed KVM versions do not match: got %u, expected %u\n", - kvm_version, info->kvm_version); + "%s: parsed KVM versions do not match: got %u, expected %u\n", + info->name, kvm_version, info->kvm_version); goto cleanup; } @@ -164,6 +164,7 @@ mymain(void) QEMU_CAPS_MIGRATE_QEMU_TCP, QEMU_CAPS_MIGRATE_QEMU_EXEC, QEMU_CAPS_DRIVE_CACHE_V2, + QEMU_CAPS_DRIVE_CACHE_UNSAFE, QEMU_CAPS_KVM, QEMU_CAPS_DRIVE_FORMAT, QEMU_CAPS_DRIVE_SERIAL, @@ -399,6 +400,7 @@ mymain(void) QEMU_CAPS_MIGRATE_QEMU_TCP, QEMU_CAPS_MIGRATE_QEMU_EXEC, QEMU_CAPS_DRIVE_CACHE_V2, + QEMU_CAPS_DRIVE_CACHE_UNSAFE, QEMU_CAPS_KVM, QEMU_CAPS_DRIVE_FORMAT, QEMU_CAPS_DRIVE_SERIAL, @@ -450,6 +452,7 @@ mymain(void) QEMU_CAPS_MIGRATE_QEMU_TCP, QEMU_CAPS_MIGRATE_QEMU_EXEC, QEMU_CAPS_DRIVE_CACHE_V2, + QEMU_CAPS_DRIVE_CACHE_UNSAFE, QEMU_CAPS_KVM, QEMU_CAPS_DRIVE_FORMAT, QEMU_CAPS_DRIVE_SERIAL, diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.args new file mode 100644 index 0000000..f8ddcd8 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.args @@ -0,0 +1,5 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ +pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi -boot c -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\ +format=qcow2,cache=unsafe -drive file=/dev/HostVG/QEMUGuest2,if=ide,\ +media=cdrom,bus=1,unit=0,format=raw -net none -serial none -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.xml new file mode 100644 index 0000000..37185f6 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.xml @@ -0,0 +1,33 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219136</memory> + <currentMemory>219136</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='qcow2' cache='unsafe'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' unit='0'/> + </disk> + <disk type='block' device='cdrom'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest2'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index fcb20bb..97b61d1 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -341,6 +341,9 @@ mymain(void) DO_TEST("disk-drive-cache-directsync", false, QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_CACHE_V2, QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC, QEMU_CAPS_DRIVE_FORMAT); + DO_TEST("disk-drive-cache-unsafe", false, + QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_CACHE_V2, + QEMU_CAPS_DRIVE_CACHE_UNSAFE, QEMU_CAPS_DRIVE_FORMAT); DO_TEST("disk-drive-network-nbd", false, QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT); DO_TEST("disk-drive-network-rbd", false, diff --git a/tools/virsh.pod b/tools/virsh.pod index 02726f3..73ed045 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1173,8 +1173,8 @@ floppy device; consider using B<update-device> for this usage instead. I<mode> can specify the two specific mode I<readonly> or I<shareable>. I<persistent> indicates the changes will affect the next boot of the domain. I<sourcetype> can indicate the type of source (block|file) -I<cache> can be one of "default", "none", "writethrough", "writeback", or -"directsync". +I<cache> can be one of "default", "none", "writethrough", "writeback", +"directsync" or "unsafe". I<serial> is the serial of disk device. I<shareable> indicates the disk device is shareable between domains. I<address> is the address of disk device in the form of pci:domain.bus.slot.function, -- 1.7.6.2

3 6

[libvirt] 1 of 85 tests failed
by vicom＠inbox.lv 23 Sep '11

23 Sep '11

2 1

[libvirt] [PATCH] selinux: Correctly report warning if virt_use_nfs not set
by Michal Privoznik 23 Sep '11

23 Sep '11

Previous patch c9b37fee tried to deal with virt_use_nfs. But setfilecon() returns EOPNOTSUPP on NFS so we need to move the warning to else branch. --- src/security/security_selinux.c | 27 +++++++++++++++------------ 1 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 028f5b2..9a9a305 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -420,23 +420,26 @@ SELinuxSetFilecon(const char *path, char *tcon) * virt_use_{nfs,usb,pci} boolean tunables to allow it... */ if (setfilecon_errno != EOPNOTSUPP) { - const char *errmsg; - if ((virStorageFileIsSharedFSType(path, - VIR_STORAGE_FILE_SHFS_NFS) == 1) && - security_get_boolean_active("virt_use_nfs") != 1) { - errmsg = _("unable to set security context '%s' on '%s'. " - "Consider setting virt_use_nfs"); - } else { - errmsg = _("unable to set security context '%s' on '%s'"); - } virReportSystemError(setfilecon_errno, - errmsg, + _("unable to set security context '%s' on '%s'"), tcon, path); if (security_getenforce() == 1) return -1; } else { - VIR_INFO("Setting security context '%s' on '%s' not supported", - tcon, path); + const char *msg; + if ((virStorageFileIsSharedFSType(path, + VIR_STORAGE_FILE_SHFS_NFS) == 1) && + security_get_boolean_active("virt_use_nfs") != 1) { + msg = _("Setting security context '%s' on '%s' not supported. " + "Consider setting virt_use_nfs"); + if (security_getenforce() == 1) + VIR_WARN(msg, tcon, path); + else + VIR_INFO(msg, tcon, path); + } else { + VIR_INFO(_("Setting security context '%s' " + "on '%s' not supported"), tcon, path); + } } } return 0; -- 1.7.3.4

3 3

[libvirt] [PATCH] storage: Do not use comma as seperator for lvs output
by Osier Yang 23 Sep '11

23 Sep '11

* src/storage/storage_backend_logical.c: If a logical vol is created with multiple stripes. (e.g. --stripes 3), the "device" field of lvs output will have multiple fileds which are seperated by comma. It means the RE we write in the codes will not work well anymore. E.g. (lvs output for a stripped vol, uses "#" as seperator here): test_stripes##fSLSZH-zAS2-yAIb-n4mV-Al9u-HA3V-oo9K1B#\ /dev/sdc1(10240),/dev/sdd1(0)#42949672960#4194304 The RE we uses: const char *regexes[] = { "^\\s*(\\S+),(\\S*),(\\S+),(\\S+)\$(\\S+)\$,(\\S+),([0-9]+),?\\s*$" }; This patch changes the seperator into "#" to fix the problem. Related RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=727474 --- src/storage/storage_backend_logical.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index 4f42047..6c13a6b 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -199,7 +199,7 @@ virStorageBackendLogicalFindLVs(virStoragePoolObjPtr pool, 7 }; const char *prog[] = { - LVS, "--separator", ",", "--noheadings", "--units", "b", + LVS, "--separator", "#", "--noheadings", "--units", "b", "--unbuffered", "--nosuffix", "--options", "lv_name,origin,uuid,devices,seg_size,vg_extent_size", pool->def->source.name, NULL -- 1.7.6

5 10

Re: [libvirt] [PATCH] qemu: Allow domain reboot after core dump
by Sheldon 23 Sep '11

23 Sep '11

yes, the patch can work, when I execute virsh dump --reboot <domain> <file> and the type of file is: QEMU's suspend to disk image but the guest does not reboot. The guest does nothing. but I try virsh shutdown <domain>, the guest Ubuntu OS pop up a dialog box with four options: Shut Down, Restart, Suspend and HIbernate. -------- ???? -------- > ??: [libvirt] [PATCH] qemu: Allow domain reboot after core dump > ??: Tue, 20 Sep 2011 13:34:27 +0200 > ???: Michal Privoznik <mprivozn(a)redhat.com> > ???: libvir-list(a)redhat.com > > > > This patch introduces possibility to reboot domain after core dump > finishes. The new flag VIR_DUMP_REBOOT was added to > virDomainCoreDumpFlags. The new functionality is accessible via virsh > too: virsh dump --reboot<domain> > --- > include/libvirt/libvirt.h.in | 1 + > src/qemu/qemu_driver.c | 8 +++++++- > tools/virsh.c | 3 +++ > 3 files changed, 11 insertions(+), 1 deletions(-) > > diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in > index 39155a6..8c41f5a 100644 > --- a/include/libvirt/libvirt.h.in > +++ b/include/libvirt/libvirt.h.in > @@ -748,6 +748,7 @@ typedef enum { > VIR_DUMP_CRASH = (1<< 0), /* crash after dump */ > VIR_DUMP_LIVE = (1<< 1), /* live dump */ > VIR_DUMP_BYPASS_CACHE = (1<< 2), /* avoid file system cache pollution */ > + VIR_DUMP_REBOOT = (1<< 3), /* reboot domain after dump finishes */ > } virDomainCoreDumpFlags; > > /* Domain migration flags. */ > diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c > index e2f428f..22576a8 100644 > --- a/src/qemu/qemu_driver.c > +++ b/src/qemu/qemu_driver.c > @@ -3104,7 +3104,8 @@ static int qemudDomainCoreDump(virDomainPtr dom, > int ret = -1; > virDomainEventPtr event = NULL; > > - virCheckFlags(VIR_DUMP_LIVE | VIR_DUMP_CRASH | VIR_DUMP_BYPASS_CACHE, -1); > + virCheckFlags(VIR_DUMP_LIVE | VIR_DUMP_CRASH | > + VIR_DUMP_BYPASS_CACHE | VIR_DUMP_REBOOT, -1); > > qemuDriverLock(driver); > vm = virDomainFindByUUID(&driver->domains, dom->uuid); > @@ -3189,6 +3190,11 @@ cleanup: > if (event) > qemuDomainEventQueue(driver, event); > qemuDriverUnlock(driver); > + > + if ((ret == 0)&& (flags& VIR_DUMP_REBOOT)) { > + qemuDomainReboot(dom, 0); > + } > + > return ret; > } > > diff --git a/tools/virsh.c b/tools/virsh.c > index d575425..74f6a79 100644 > --- a/tools/virsh.c > +++ b/tools/virsh.c > @@ -2840,6 +2840,7 @@ static const vshCmdOptDef opts_dump[] = { > {"crash", VSH_OT_BOOL, 0, N_("crash the domain after core dump")}, > {"bypass-cache", VSH_OT_BOOL, 0, > N_("avoid file system cache when saving")}, > + {"reboot", VSH_OT_BOOL, 0, N_("reboot the domain after core dump")}, > {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, > {"file", VSH_OT_DATA, VSH_OFLAG_REQ, N_("where to dump the core")}, > {NULL, 0, 0, NULL} > @@ -2869,6 +2870,8 @@ cmdDump(vshControl *ctl, const vshCmd *cmd) > flags |= VIR_DUMP_CRASH; > if (vshCommandOptBool(cmd, "bypass-cache")) > flags |= VIR_DUMP_BYPASS_CACHE; > + if (vshCommandOptBool(cmd, "reboot")) > + flags |= VIR_DUMP_REBOOT; > > if (virDomainCoreDump(dom, to, flags)< 0) { > vshError(ctl, _("Failed to core dump domain %s to %s"), name, to); > -- > 1.7.3.4 > > -- > libvir-list mailing list > libvir-list(a)redhat.com > https://www.redhat.com/mailman/listinfo/libvir-list >

1 0

Re: [libvirt] [PATCH] qemu: Allow domain reboot after core dump
by Sheldon 23 Sep '11

23 Sep '11

yes, the patch can work, when I execute virsh dump --reboot <domian> <file> and the type of file is: QEMU's suspend to disk image > -------- ???? -------- > ??: [libvirt] [PATCH] qemu: Allow domain reboot after core dump > ??: Tue, 20 Sep 2011 13:34:27 +0200 > ???: Michal Privoznik <mprivozn(a)redhat.com> > ???: libvir-list(a)redhat.com > > > > This patch introduces possibility to reboot domain after core dump > finishes. The new flag VIR_DUMP_REBOOT was added to > virDomainCoreDumpFlags. The new functionality is accessible via virsh > too: virsh dump --reboot<domain> > --- > include/libvirt/libvirt.h.in | 1 + > src/qemu/qemu_driver.c | 8 +++++++- > tools/virsh.c | 3 +++ > 3 files changed, 11 insertions(+), 1 deletions(-) > > diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in > index 39155a6..8c41f5a 100644 > --- a/include/libvirt/libvirt.h.in > +++ b/include/libvirt/libvirt.h.in > @@ -748,6 +748,7 @@ typedef enum { > VIR_DUMP_CRASH = (1<< 0), /* crash after dump */ > VIR_DUMP_LIVE = (1<< 1), /* live dump */ > VIR_DUMP_BYPASS_CACHE = (1<< 2), /* avoid file system cache pollution */ > + VIR_DUMP_REBOOT = (1<< 3), /* reboot domain after dump finishes */ > } virDomainCoreDumpFlags; > > /* Domain migration flags. */ > diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c > index e2f428f..22576a8 100644 > --- a/src/qemu/qemu_driver.c > +++ b/src/qemu/qemu_driver.c > @@ -3104,7 +3104,8 @@ static int qemudDomainCoreDump(virDomainPtr dom, > int ret = -1; > virDomainEventPtr event = NULL; > > - virCheckFlags(VIR_DUMP_LIVE | VIR_DUMP_CRASH | VIR_DUMP_BYPASS_CACHE, -1); > + virCheckFlags(VIR_DUMP_LIVE | VIR_DUMP_CRASH | > + VIR_DUMP_BYPASS_CACHE | VIR_DUMP_REBOOT, -1); > > qemuDriverLock(driver); > vm = virDomainFindByUUID(&driver->domains, dom->uuid); > @@ -3189,6 +3190,11 @@ cleanup: > if (event) > qemuDomainEventQueue(driver, event); > qemuDriverUnlock(driver); > + > + if ((ret == 0)&& (flags& VIR_DUMP_REBOOT)) { > + qemuDomainReboot(dom, 0); > + } > + > return ret; > } > > diff --git a/tools/virsh.c b/tools/virsh.c > index d575425..74f6a79 100644 > --- a/tools/virsh.c > +++ b/tools/virsh.c > @@ -2840,6 +2840,7 @@ static const vshCmdOptDef opts_dump[] = { > {"crash", VSH_OT_BOOL, 0, N_("crash the domain after core dump")}, > {"bypass-cache", VSH_OT_BOOL, 0, > N_("avoid file system cache when saving")}, > + {"reboot", VSH_OT_BOOL, 0, N_("reboot the domain after core dump")}, > {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, > {"file", VSH_OT_DATA, VSH_OFLAG_REQ, N_("where to dump the core")}, > {NULL, 0, 0, NULL} > @@ -2869,6 +2870,8 @@ cmdDump(vshControl *ctl, const vshCmd *cmd) > flags |= VIR_DUMP_CRASH; > if (vshCommandOptBool(cmd, "bypass-cache")) > flags |= VIR_DUMP_BYPASS_CACHE; > + if (vshCommandOptBool(cmd, "reboot")) > + flags |= VIR_DUMP_REBOOT; > > if (virDomainCoreDump(dom, to, flags)< 0) { > vshError(ctl, _("Failed to core dump domain %s to %s"), name, to); > -- > 1.7.3.4 > > -- > libvir-list mailing list > libvir-list(a)redhat.com > https://www.redhat.com/mailman/listinfo/libvir-list >

1 0

[libvirt] [PATCH] virsh: Improve virsh manual for virsh memtune command
by Peter Krempa 22 Sep '11

22 Sep '11

Commit 0a22f54 added --min-guarantee option for the memtune command. This option is supported only by the ESX hypervisor. This patch adds a statement about this fact, to prevent user confusion. This patch also adds explanation how to clear/set to unlimited the memory tunables. (documments the -1 value). --- tools/virsh.pod | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 88dee26..7f46ee4 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -959,6 +959,7 @@ Allows you to display or set the domain memory parameters. Without flags, the current settings are displayed; with a flag, the appropriate limit is adjusted if supported by the hypervisor. LXC and QEMU/KVM support I<--hard-limit>, I<--soft-limit>, and I<--swap-hard-limit>. +I<--min-guarantee> is supported only by ESX hypervisor yet. If I<--live> is specified, affect a running guest. If I<--config> is specified, affect the next boot of a persistent guest. @@ -997,6 +998,8 @@ value are kilobytes (i.e. blocks of 1024 bytes). =back +Specifying -1 as a value for these limits is interpreted as unlimited. + =item B<blkiotune> I<domain-id> [I<--weight> B<weight>] [[I<--config>] [I<--live>] | [I<--current>]] -- 1.7.3.4

2 2

[libvirt] Release of libvirt-0.9.6
by Daniel Veillard 22 Sep '11

22 Sep '11

That's what is now usually called a brown paper bag release (dixit Linus) [*] since 0.9.5 had broken shudown with the two last released versions of QEmu 0.9.6 should be available at the usual place: ftp://libvirt.org/libvirt/ and obviously only contains a few bug fixes and local improvements. People should not ship 0.9.5, and use 0.9.6 instead, thanks in advance ! Bug Fixes: - snapshot: fix logic bug in qemu undefine (Eric Blake) - sanlock: fix memory leak (Eric Blake) - virsh: fix regression in argv parsing (Eric Blake) - storage: Wait udev events are handled before removing lvm vol (Osier Yang) - qemu: avoid dereferencing a NULL pointer (Alex Jia) - qemu: Avoid loop of fake reboots (Jiri Denemark) - qemu: Fix shutdown regression with buggy qemu (Jiri Denemark) - remote: fix crash on OOM (Eric Blake) Improvements: - snapshot: also delete empty directory (Eric Blake) - snapshot: remove snapshot metadata on transient exit (Eric Blake) - snapshot: prepare to remove transient snapshot metadata (Eric Blake) - virsh: More friendly err if no pool is specified for looking up a vol (Osier Yang) - tests: improve test failure diagnosis (Oskari Saarenmaa) - API: prefer to use NULLSTR macro (Osier Yang) - xen: use typical allocations (Eric Blake) - virsh: Remove useless codes of cmdVolPath (Osier Yang) Portability: - build: silence warning on 32-bit build (Eric Blake) Thanks to all who reported and helped fix those issues quickly !!! Daniel [*] and no I won't carry one, they are non-existent where I live for context http://lwn.net/1999/0204/kernel.php3 -- 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/

2 1

[libvirt] [PATCH 0/9] Implement keepalive protocol for libvirt RPC
by Jiri Denemark 22 Sep '11

22 Sep '11

This allows us to detect broken connections between server and client without waiting for TCP timeout and dead deamon/client. By default a connection is considered broken after about 30 seconds of no messages received from remote party. After that period, the connection is automatically closed. The main reason for implementing this is that peer-to-peer migration can now be canceled when a connection between source and target breaks. Although this will really work only after qemu fixes migrate_cancel command so that it doesn't block when outgoing TCP buffers are full. Jiri Denemark (9): Define keepalive protocol Implement common keepalive handling Introduce two public APIs for keepalive protocol Implement keepalive protocol in libvirt daemon Add support for non-blocking calls in client RPC Add support for async close of client RPC socket Implement keepalive protocol in remote driver Add keepalive support into domain-events examples qemu: Add support for keepalive messages during p2p migration .gitignore | 1 + daemon/libvirtd.aug | 4 + daemon/libvirtd.c | 11 + daemon/libvirtd.conf | 15 + daemon/remote.c | 38 ++ examples/domain-events/events-c/event-test.c | 11 + examples/domain-events/events-python/event-test.py | 3 + include/libvirt/libvirt.h.in | 5 + po/POTFILES.in | 1 + src/Makefile.am | 13 +- src/driver.h | 9 + src/libvirt.c | 107 +++++ src/libvirt_internal.h | 10 +- src/libvirt_public.syms | 6 + src/qemu/libvirtd_qemu.aug | 2 + src/qemu/qemu.conf | 16 + src/qemu/qemu_conf.c | 11 + src/qemu/qemu_conf.h | 3 + src/qemu/qemu_migration.c | 10 + src/qemu/test_libvirtd_qemu.aug | 6 + src/remote/remote_driver.c | 30 ++ src/remote/remote_protocol.x | 2 +- src/rpc/virkeepalive.c | 464 ++++++++++++++++++++ src/rpc/virkeepalive.h | 58 +++ src/rpc/virkeepaliveprotocol.x | 8 + src/rpc/virnetclient.c | 321 ++++++++++++-- src/rpc/virnetclient.h | 5 + src/rpc/virnetserver.c | 10 + src/rpc/virnetserver.h | 2 + src/rpc/virnetserverclient.c | 126 +++++- src/rpc/virnetserverclient.h | 6 + 31 files changed, 1254 insertions(+), 60 deletions(-) create mode 100644 src/rpc/virkeepalive.c create mode 100644 src/rpc/virkeepalive.h create mode 100644 src/rpc/virkeepaliveprotocol.x -- 1.7.6.1

1 9

[libvirt] [PATCH] virsh: Do not ignore the specified flags for cmdSaveImageDefine
by Osier Yang 22 Sep '11

22 Sep '11

--- tools/virsh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 4b9e662..02db278 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2346,7 +2346,7 @@ cmdSaveImageDefine(vshControl *ctl, const vshCmd *cmd) if (virFileReadAll(xmlfile, 8192, &xml) < 0) goto cleanup; - if (virDomainSaveImageDefineXML(ctl->conn, file, xml, 0) < 0) { + if (virDomainSaveImageDefineXML(ctl->conn, file, xml, flags) < 0) { vshError(ctl, _("Failed to update %s"), file); goto cleanup; } -- 1.7.6

2 2

[libvirt] [PATCH] qemu: Transfer inactive XML among cookie
by Michal Privoznik 22 Sep '11

22 Sep '11

If a domain has inactive XML we want to transfer it to destination when migrating with VIR_MIGRATE_PERSIST_DEST. In order to harm the migration protocol as least as possible, a optional cookie was chosen. --- src/qemu/qemu_migration.c | 91 ++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 82 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index d9f8d93..bc98708 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -64,6 +64,7 @@ VIR_ENUM_IMPL(qemuMigrationJobPhase, QEMU_MIGRATION_PHASE_LAST, enum qemuMigrationCookieFlags { QEMU_MIGRATION_COOKIE_FLAG_GRAPHICS, QEMU_MIGRATION_COOKIE_FLAG_LOCKSTATE, + QEMU_MIGRATION_COOKIE_FLAG_PERSISTENT, QEMU_MIGRATION_COOKIE_FLAG_LAST }; @@ -71,11 +72,12 @@ enum qemuMigrationCookieFlags { VIR_ENUM_DECL(qemuMigrationCookieFlag); VIR_ENUM_IMPL(qemuMigrationCookieFlag, QEMU_MIGRATION_COOKIE_FLAG_LAST, - "graphics", "lockstate"); + "graphics", "lockstate", "persistent"); enum qemuMigrationCookieFeatures { QEMU_MIGRATION_COOKIE_GRAPHICS = (1 << QEMU_MIGRATION_COOKIE_FLAG_GRAPHICS), QEMU_MIGRATION_COOKIE_LOCKSTATE = (1 << QEMU_MIGRATION_COOKIE_FLAG_LOCKSTATE), + QEMU_MIGRATION_COOKIE_PERSISTENT = (1 << QEMU_MIGRATION_COOKIE_FLAG_PERSISTENT), }; typedef struct _qemuMigrationCookieGraphics qemuMigrationCookieGraphics; @@ -110,6 +112,9 @@ struct _qemuMigrationCookie { /* If (flags & QEMU_MIGRATION_COOKIE_GRAPHICS) */ qemuMigrationCookieGraphicsPtr graphics; + + /* If (flags & QEMU_MIGRATION_COOKIE_PERSISTENT) */ + virDomainDefPtr persistent; }; static void qemuMigrationCookieGraphicsFree(qemuMigrationCookieGraphicsPtr grap) @@ -334,6 +339,26 @@ qemuMigrationCookieAddLockstate(qemuMigrationCookiePtr mig, } +static int +qemuMigrationCookieAddPersistent(qemuMigrationCookiePtr mig, + virDomainObjPtr dom) +{ + if (mig->flags & QEMU_MIGRATION_COOKIE_PERSISTENT) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Migration persistent data already present")); + return -1; + } + + if (!dom->newDef) + return 0; + + mig->persistent = dom->newDef; + mig->flags |= QEMU_MIGRATION_COOKIE_PERSISTENT; + mig->flagsMandatory |= QEMU_MIGRATION_COOKIE_PERSISTENT; + return 0; +} + + static void qemuMigrationCookieGraphicsXMLFormat(virBufferPtr buf, qemuMigrationCookieGraphicsPtr grap) @@ -354,10 +379,12 @@ static void qemuMigrationCookieGraphicsXMLFormat(virBufferPtr buf, static void qemuMigrationCookieXMLFormat(virBufferPtr buf, - qemuMigrationCookiePtr mig) + qemuMigrationCookiePtr mig, + struct qemud_driver *driver) { char uuidstr[VIR_UUID_STRING_BUFLEN]; char hostuuidstr[VIR_UUID_STRING_BUFLEN]; + char *domXML; int i; virUUIDFormat(mig->uuid, uuidstr); @@ -388,15 +415,25 @@ static void qemuMigrationCookieXMLFormat(virBufferPtr buf, virBufferAddLit(buf, " </lockstate>\n"); } + if ((mig->flags & QEMU_MIGRATION_COOKIE_PERSISTENT) && + mig->persistent) { + domXML = qemuDomainDefFormatXML(driver, mig->persistent, + VIR_DOMAIN_XML_INACTIVE | + VIR_DOMAIN_XML_SECURE); + virBufferAdd(buf, domXML, -1); + VIR_FREE(domXML); + } + virBufferAddLit(buf, "</qemu-migration>\n"); } -static char *qemuMigrationCookieXMLFormatStr(qemuMigrationCookiePtr mig) +static char *qemuMigrationCookieXMLFormatStr(qemuMigrationCookiePtr mig, + struct qemud_driver *driver) { virBuffer buf = VIR_BUFFER_INITIALIZER; - qemuMigrationCookieXMLFormat(&buf, mig); + qemuMigrationCookieXMLFormat(&buf, mig, driver); if (virBufferError(&buf)) { virReportOOMError(); @@ -460,6 +497,8 @@ error: static int qemuMigrationCookieXMLParse(qemuMigrationCookiePtr mig, + struct qemud_driver *driver, + xmlDocPtr doc, xmlXPathContextPtr ctxt, unsigned int flags) { @@ -583,6 +622,25 @@ qemuMigrationCookieXMLParse(qemuMigrationCookiePtr mig, VIR_FREE(mig->lockState); } + if ((flags & QEMU_MIGRATION_COOKIE_PERSISTENT) && + virXPathBoolean("count(./domain) > 0", ctxt)) { + if ((n = virXPathNodeSet("./domain", ctxt, &nodes)) > 1) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("Too many domain elements in " + "migration cookie: %d"), + n); + goto error; + } + mig->persistent = virDomainDefParseNode(driver->caps, doc, nodes[0], + -1, VIR_DOMAIN_XML_INACTIVE); + if (!mig->persistent) { + /* virDomainDefParseNode already reported + * an error for us */ + goto error; + } + VIR_FREE(nodes); + } + return 0; error: @@ -594,6 +652,7 @@ error: static int qemuMigrationCookieXMLParseStr(qemuMigrationCookiePtr mig, + struct qemud_driver *driver, const char *xml, unsigned int flags) { @@ -606,7 +665,7 @@ qemuMigrationCookieXMLParseStr(qemuMigrationCookiePtr mig, if (!(doc = virXMLParseStringCtxt(xml, _("(qemu_migration_cookie)"), &ctxt))) goto cleanup; - ret = qemuMigrationCookieXMLParse(mig, ctxt, flags); + ret = qemuMigrationCookieXMLParse(mig, driver, doc, ctxt, flags); cleanup: xmlXPathFreeContext(ctxt); @@ -637,7 +696,11 @@ qemuMigrationBakeCookie(qemuMigrationCookiePtr mig, qemuMigrationCookieAddLockstate(mig, driver, dom) < 0) return -1; - if (!(*cookieout = qemuMigrationCookieXMLFormatStr(mig))) + if (flags & QEMU_MIGRATION_COOKIE_PERSISTENT && + qemuMigrationCookieAddPersistent(mig, dom) < 0) + return -1; + + if (!(*cookieout = qemuMigrationCookieXMLFormatStr(mig, driver))) return -1; *cookieoutlen = strlen(*cookieout) + 1; @@ -672,6 +735,7 @@ qemuMigrationEatCookie(struct qemud_driver *driver, if (cookiein && cookieinlen && qemuMigrationCookieXMLParseStr(mig, + driver, cookiein, flags) < 0) goto error; @@ -1575,7 +1639,8 @@ cleanup: } if (ret == 0 && - qemuMigrationBakeCookie(mig, driver, vm, cookieout, cookieoutlen, 0) < 0) + qemuMigrationBakeCookie(mig, driver, vm, cookieout, cookieoutlen, + QEMU_MIGRATION_COOKIE_PERSISTENT ) < 0) VIR_WARN("Unable to encode migration cookie"); qemuMigrationCookieFree(mig); @@ -2477,6 +2542,7 @@ qemuMigrationFinish(struct qemud_driver *driver, int newVM = 1; qemuMigrationCookiePtr mig = NULL; virErrorPtr orig_err = NULL; + int cookie_flags = 0; VIR_DEBUG("driver=%p, dconn=%p, vm=%p, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, flags=%lx, retcode=%d", @@ -2490,7 +2556,11 @@ qemuMigrationFinish(struct qemud_driver *driver, v3proto ? QEMU_MIGRATION_PHASE_FINISH3 : QEMU_MIGRATION_PHASE_FINISH2); - if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, 0))) + if (flags & VIR_MIGRATE_PERSIST_DEST) + cookie_flags |= QEMU_MIGRATION_COOKIE_PERSISTENT; + + if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, + cookieinlen, cookie_flags))) goto endjob; /* Did the migration go as planned? If yes, return the domain @@ -2510,7 +2580,10 @@ qemuMigrationFinish(struct qemud_driver *driver, if (vm->persistent) newVM = 0; vm->persistent = 1; - vmdef = virDomainObjGetPersistentDef(driver->caps, vm); + if (mig->persistent) + vm->newDef = vmdef = mig->persistent; + else + vmdef = virDomainObjGetPersistentDef(driver->caps, vm); if (virDomainSaveConfig(driver->configDir, vmdef) < 0) { /* Hmpf. Migration was successful, but making it persistent * was not. If we report successful, then when this domain -- 1.7.3.4

3 10

[libvirt] [PATCH 0/3] snapshot: auto-cleanup metadata of transient domains
by Eric Blake 22 Sep '11

22 Sep '11

I intended to do this ever since I changed the API of virDomainUndefine to reject undefine of persistent guests with snapshots, but am only now getting around to it. This missed 0.9.5, but I think it is worth including in 0.9.6 even if we have a short release cycle to work around the qemu shutdown issue. Eric Blake (3): snapshot: fix logic bug in qemu undefine snapshot: prepare to remove transient snapshot metadata snapshot: remove snapshot metadata on transient exit src/conf/domain_conf.c | 4 +- src/qemu/qemu_domain.c | 260 ++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_domain.h | 36 ++++++ src/qemu/qemu_driver.c | 291 +++----------------------------------------- src/qemu/qemu_migration.c | 8 +- src/qemu/qemu_process.c | 10 +- 6 files changed, 327 insertions(+), 282 deletions(-) -- 1.7.4.4

2 6

[libvirt] [PATCH] locking: avoid dereferencing a NULL pointer
by ajia＠redhat.com 22 Sep '11

22 Sep '11

From: Alex Jia <ajia(a)redhat.com> * src/locking/lock_driver_sanlock.c: in fact, virStrcpy calls virStrncpy(dest, src, strlen(src), destbytes) then return result, if 'path' is NULL, it means 'src' is also NULL, strlen(NULL) will dereference a NULL pointer, which probably causes a segmentation fault. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/locking/lock_driver_sanlock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 2d72510..8c6d873 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -158,7 +158,7 @@ static int virLockManagerSanlockSetupLockspace(void) memcpy(ls.name, VIR_LOCK_MANAGER_SANLOCK_AUTO_DISK_LOCKSPACE, SANLK_NAME_LEN); ls.host_id = 0; /* Doesn't matter for initialization */ ls.flags = 0; - if (!virStrcpy(ls.host_id_disk.path, path, SANLK_PATH_LEN)) { + if (!path || !virStrcpy(ls.host_id_disk.path, path, SANLK_PATH_LEN)) { virLockError(VIR_ERR_INTERNAL_ERROR, _("Lockspace path '%s' exceeded %d characters"), path, SANLK_PATH_LEN); -- 1.7.1

4 4

[libvirt] [PATCH] virsh: fix regression in argv parsing
by Eric Blake 22 Sep '11

22 Sep '11

Commit 85d2810 broke commands with mandatory argv (send-key, qemu-monitor-command). This fixes things, and enhances the test to cover it. * tools/virsh.c (vshCmddefGetOption, vshCmddefGetData) (vshCommandParse): Fix option parsing for required argv option. (vshCmddefOptParse): Check that argv option is last. * tests/virsh-optparse: Enhance test. --- tests/virsh-optparse | 9 +++++++++ tools/virsh.c | 24 +++++++++++++++--------- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/tests/virsh-optparse b/tests/virsh-optparse index 18252d2..d0d4329 100755 --- a/tests/virsh-optparse +++ b/tests/virsh-optparse @@ -118,6 +118,7 @@ for args in \ 'test name desc vda vdb' \ 'test --diskspec vda name --diskspec vdb desc' \ '--description desc --name name --domain test vda vdb' \ + '--description desc --diskspec vda --name name --domain test vdb' \ ; do virsh -q -c $test_url snapshot-create-as --print-xml $args \ >out 2>>err || fail=1 @@ -126,4 +127,12 @@ done test -s err && fail=1 +# Test a required argv +cat <<\EOF > exp-err || framework_failure +error: this function is not supported by the connection driver: virDomainQemuMonitorCommand +EOF +virsh -q -c $test_url qemu-monitor-command test a >out 2>err && fail=1 +test -s out && fail=1 +compare err exp-err || fail=1 + (exit $fail); exit $fail diff --git a/tools/virsh.c b/tools/virsh.c index 371346a..0b187bc 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -13834,6 +13834,7 @@ vshCmddefGetInfo(const vshCmdDef * cmd, const char *name) return NULL; } +/* Validate that the options associated with cmd can be parsed. */ static int vshCmddefOptParse(const vshCmdDef *cmd, uint32_t *opts_need_arg, uint32_t *opts_required) @@ -13871,13 +13872,16 @@ vshCmddefOptParse(const vshCmdDef *cmd, uint32_t *opts_need_arg, } else { optional = true; } + + if (opt->type == VSH_OT_ARGV && cmd->opts[i + 1].name) + return -1; /* argv option must be listed last */ } return 0; } static const vshCmdOptDef * vshCmddefGetOption(vshControl *ctl, const vshCmdDef *cmd, const char *name, - uint32_t *opts_seen) + uint32_t *opts_seen, int *opt_index) { int i; @@ -13885,12 +13889,12 @@ vshCmddefGetOption(vshControl *ctl, const vshCmdDef *cmd, const char *name, const vshCmdOptDef *opt = &cmd->opts[i]; if (STREQ(opt->name, name)) { - if (*opts_seen & (1 << i)) { + if ((*opts_seen & (1 << i)) && opt->type != VSH_OT_ARGV) { vshError(ctl, _("option --%s already seen"), name); return NULL; } - if (opt->type != VSH_OT_ARGV) - *opts_seen |= 1 << i; + *opts_seen |= 1 << i; + *opt_index = i; return opt; } } @@ -13913,10 +13917,9 @@ vshCmddefGetData(const vshCmdDef *cmd, uint32_t *opts_need_arg, /* Grab least-significant set bit */ i = ffs(*opts_need_arg) - 1; opt = &cmd->opts[i]; - if (opt->type != VSH_OT_ARGV) { + if (opt->type != VSH_OT_ARGV) *opts_need_arg &= ~(1 << i); - *opts_seen |= 1 << i; - } + *opts_seen |= 1 << i; return opt; } @@ -14878,12 +14881,14 @@ vshCommandParse(vshControl *ctl, vshCommandParser *parser) } else if (tkdata[0] == '-' && tkdata[1] == '-' && c_isalnum(tkdata[2])) { char *optstr = strchr(tkdata + 2, '='); + int opt_index; + if (optstr) { *optstr = '\0'; /* convert the '=' to '\0' */ optstr = vshStrdup(ctl, optstr + 1); } if (!(opt = vshCmddefGetOption(ctl, cmd, tkdata + 2, - &opts_seen))) { + &opts_seen, &opt_index))) { VIR_FREE(optstr); goto syntaxError; } @@ -14905,7 +14910,8 @@ vshCommandParse(vshControl *ctl, vshCommandParser *parser) VSH_OT_INT ? _("number") : _("string")); goto syntaxError; } - opts_need_arg &= ~opts_seen; + if (opt->type != VSH_OT_ARGV) + opts_need_arg &= ~(1 << opt_index); } else { tkdata = NULL; if (optstr) { -- 1.7.4.4

2 2

[libvirt] [PATCH] locking: remove redundant codes
by ajia＠redhat.com 22 Sep '11

22 Sep '11

From: Alex Jia <ajia(a)redhat.com> * src/locking/lock_driver_sanlock.c: remove redundant codes in error_unlink label from virLockManagerSanlockSetupLockspace, in fact, the codes make sure 'path' is non-null before getting to error_unlink label, so 'if (path)' is redundant, removing it in here and will also silence coverity. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/locking/lock_driver_sanlock.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 2d72510..c4dce4f 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -250,8 +250,7 @@ static int virLockManagerSanlockSetupLockspace(void) return 0; error_unlink: - if (path) - unlink(path); + unlink(path); error: VIR_FORCE_CLOSE(fd); VIR_FREE(path); -- 1.7.1

3 2

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

22 Sep '11

From: Alex Jia <ajia(a)redhat.com> * src/qemu/qemu_process.c: Taking if (qemuDomainObjEndJob(driver, obj) == 0) true branch then 'obj' is NULL, virDomainObjIsActive(obj) and virDomainObjUnref(obj) will dereference NULL pointer. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/qemu/qemu_process.c | 32 +++++++++++++++++--------------- 1 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index bd49b21..9fdf846 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2661,22 +2661,24 @@ error: if (qemuDomainObjEndJob(driver, obj) == 0) obj = NULL; - if (!virDomainObjIsActive(obj)) { - if (virDomainObjUnref(obj) > 0) - virDomainObjUnlock(obj); - qemuDriverUnlock(driver); - return; - } + if (obj) { + if (!virDomainObjIsActive(obj)) { + if (virDomainObjUnref(obj) > 0) + virDomainObjUnlock(obj); + qemuDriverUnlock(driver); + return; + } - if (virDomainObjUnref(obj) > 0) { - /* We can't get the monitor back, so must kill the VM - * to remove danger of it ending up running twice if - * user tries to start it again later */ - qemuProcessStop(driver, obj, 0, VIR_DOMAIN_SHUTOFF_FAILED); - if (!obj->persistent) - virDomainRemoveInactive(&driver->domains, obj); - else - virDomainObjUnlock(obj); + if (virDomainObjUnref(obj) > 0) { + /* We can't get the monitor back, so must kill the VM + * to remove danger of it ending up running twice if + * user tries to start it again later */ + qemuProcessStop(driver, obj, 0, VIR_DOMAIN_SHUTOFF_FAILED); + if (!obj->persistent) + virDomainRemoveInactive(&driver->domains, obj); + else + virDomainObjUnlock(obj); + } } qemuDriverUnlock(driver); -- 1.7.1

3 2

[libvirt] [PATCH] virsh: More friendly err if no pool is specified for looking up a vol
by Osier Yang 22 Sep '11

22 Sep '11

There are 3 ways to lookup a volume, only virStorageVolLookupByName needs pool object. So if no --pool is specified, it will tries to get the volume via virStorageVolLookupByPath/virStorageVolLookupByKey. But if all 3 ways fails, and no --pool is specified, a friendly error might help the user get right way quickly. --- tools/virsh.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 371346a..4b9e662 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -14714,8 +14714,13 @@ vshCommandOptVolBy(vshControl *ctl, const vshCmd *cmd, vol = virStorageVolLookupByPath(ctl->conn, n); } - if (!vol) - vshError(ctl, _("failed to get vol '%s'"), n); + if (!vol) { + if (pool) + vshError(ctl, _("failed to get vol '%s'"), n); + else + vshError(ctl, _("failed to get vol '%s', specifying --pool " + "might help"), n); + } if (pool) virStoragePoolFree(pool); -- 1.7.6

2 2

[libvirt] [PATCH] storage: Wait udev events are handled before removing lvm vol
by Osier Yang 21 Sep '11

21 Sep '11

Related #BZ: https://bugzilla.redhat.com/show_bug.cgi?id=702260. There are two problems described in the BZ: 1) "Can't remove open logical volume". 2) "Unable to deactivate logical volume "foo"" This patch just intends to fix 2), as 1) is expected if the vol is still used by something, and you never known if "lvchange -an" will fail or not either (sometime, it will succeed, sometimes not). We'd better not look for trouble, :-) For 2), that's caused by race between lvremove and udev event handling, the only workable way now is to wait the events handling are finished, though it might introduce latencies, as "udevadmin settle" exits after *all* events are handled, it's the only way we can fix the racing in libvirt layer. See https://bugzilla.redhat.com/show_bug.cgi?id=570359 for more details. --- src/storage/storage_backend_logical.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index 4f42047..23d80cb 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -686,6 +686,8 @@ virStorageBackendLogicalDeleteVol(virConnectPtr conn ATTRIBUTE_UNUSED, virCheckFlags(0, -1); + virFileWaitForDevices(); + if (virRun(cmdargv, NULL) < 0) return -1; -- 1.7.6

2 2

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

21 Sep '11

From: Alex Jia <ajia(a)redhat.com> * src/qemu/qemu_process.c: Taking if (qemuDomainObjEndJob(driver, obj) == 0) true branch then 'obj' is NULL, virDomainObjIsActive(obj) and virDomainObjUnref(obj) will dereference NULL pointer. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/qemu/qemu_process.c | 32 +++++++++++++++++--------------- 1 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index bd49b21..9fdf846 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2661,22 +2661,24 @@ error: if (qemuDomainObjEndJob(driver, obj) == 0) obj = NULL; - if (!virDomainObjIsActive(obj)) { - if (virDomainObjUnref(obj) > 0) - virDomainObjUnlock(obj); - qemuDriverUnlock(driver); - return; - } + if (obj) { + if (!virDomainObjIsActive(obj)) { + if (virDomainObjUnref(obj) > 0) + virDomainObjUnlock(obj); + qemuDriverUnlock(driver); + return; + } - if (virDomainObjUnref(obj) > 0) { - /* We can't get the monitor back, so must kill the VM - * to remove danger of it ending up running twice if - * user tries to start it again later */ - qemuProcessStop(driver, obj, 0, VIR_DOMAIN_SHUTOFF_FAILED); - if (!obj->persistent) - virDomainRemoveInactive(&driver->domains, obj); - else - virDomainObjUnlock(obj); + if (virDomainObjUnref(obj) > 0) { + /* We can't get the monitor back, so must kill the VM + * to remove danger of it ending up running twice if + * user tries to start it again later */ + qemuProcessStop(driver, obj, 0, VIR_DOMAIN_SHUTOFF_FAILED); + if (!obj->persistent) + virDomainRemoveInactive(&driver->domains, obj); + else + virDomainObjUnlock(obj); + } } qemuDriverUnlock(driver); -- 1.7.1

1 0

[libvirt] virsh qemu-monitor-command broken with 0.9.5
by Jason Krieg 21 Sep '11

21 Sep '11

Hi, the virsh qemu-monitor-command is not working with libvirt 0.9.5 with git commit 85d2810823a31634b12145d6c196930b40425370 *opts_seen moved into the != VSH_OT_ARGV if statement so now opts_seen is only set if not VSH_OT_ARGV see attached fix Regards Jason

4 5

[libvirt] [PATCH] qemu: Avoid loop of fake reboots
by Jiri Denemark 21 Sep '11

21 Sep '11

Once virDomainReboot is called for a domain, guest OS initiated shutdown would always result in reboot instead of shutdown. Only virDomainShutdown would actually shutd such domain down. That's because we forgot to reset fakeReboot flag once we asked the domain to reboot. --- src/qemu/qemu_process.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 3baaa19..bd49b21 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -445,6 +445,7 @@ qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE_UNUSED, priv->gotShutdown = true; if (priv->fakeReboot) { + priv->fakeReboot = false; virDomainObjRef(vm); virThread th; if (virThreadCreate(&th, -- 1.7.6.1

2 2