- Devel - libvirt List Archives

[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 01 Oct '11

01 Oct '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