- Devel - libvirt List Archives

[libvirt] [PATCH][libvirt-glib] Don't misuse GMainLoop for libvirt event loop
by Michal Privoznik 24 May '12

24 May '12

Since we are calling APIs within timers, those might block as any libvirt API may block. This, however, might get so critical, that server will shut us down due to timeout on keepalive. Simply, if an API called within a timer block, entire event loop is blocked and no keepalive response can be sent. Therefore, delegate separate thread for such purpose. --- For some reason LibvirtGObject-1.0.gir generation fails with this from time to time. examples/event-test.c | 4 +- libvirt-glib/libvirt-glib-event.c | 474 +++++++------------------------- libvirt-glib/libvirt-glib-event.h | 3 +- libvirt-glib/libvirt-glib.sym | 5 + libvirt-gobject/libvirt-gobject-main.c | 3 +- python/libvirt-glib.c | 23 ++- 6 files changed, 129 insertions(+), 383 deletions(-) diff --git a/examples/event-test.c b/examples/event-test.c index 7c9f4ec..ccb8f9e 100644 --- a/examples/event-test.c +++ b/examples/event-test.c @@ -166,7 +166,8 @@ int main(int argc, char **argv) } loop = g_main_loop_new(g_main_context_default(), 1); - gvir_event_register(); + if (gvir_event_register() != TRUE) + return -1; virConnectPtr dconn = NULL; dconn = virConnectOpen (argv[1] ? argv[1] : NULL); @@ -185,6 +186,7 @@ int main(int argc, char **argv) if (virConnectClose(dconn) < 0) printf("error closing\n"); + gvir_event_deregister(); printf("done\n"); return 0; diff --git a/libvirt-glib/libvirt-glib-event.c b/libvirt-glib/libvirt-glib-event.c index 94f4de8..d3cf7c3 100644 --- a/libvirt-glib/libvirt-glib-event.c +++ b/libvirt-glib/libvirt-glib-event.c @@ -33,7 +33,7 @@ /** * SECTION:libvirt-glib-event - * @short_description: Integrate libvirt with the GMain event framework + * @short_description: Implement libvirt event loop * @title: Event loop * @stability: Stable * @include: libvirt-glib/libvirt-glib.h @@ -41,22 +41,23 @@ * The libvirt API has the ability to provide applications with asynchronous * notifications of interesting events. To enable this functionality though, * applications must provide libvirt with an event loop implementation. The - * libvirt-glib API provides such an implementation, which naturally integrates - * with the GMain event loop framework. + * libvirt-glib API provides such an implementation. * - * To enable use of the GMain event loop glue, the <code>gvir_event_register()</code> - * should be invoked. Once this is done, it is mandatory to have the default - * GMain event loop run by a thread in the application, usually the primary - * thread, eg by using <code>gtk_main()</code> or <code>g_application_run()</code> + * To enable this one must call <code>gvir_event_register()</code>. This will create + * a separate thread which will run the libvirt event loop. Once the event loop is + * no longer needed, it should be joined by invoking + * <code>gvir_event_deregister()</code>. * * <example> * <title>Registering for events with a GTK application</title> * <programlisting><![CDATA[ * int main(int argc, char **argv) { * ...setup... - * gvir_event_register(); + * if (gvir_event_register() != TRUE) + * return -1; * ...more setup... * gtk_main(); + * gvir_event_deregister(); * return 0; * } * ]]></programlisting> @@ -68,9 +69,11 @@ * int main(int argc, char **argv) { * ...setup... * GApplication *app = ...create some impl of GApplication... - * gvir_event_register(); + * if (gvir_event_register() != TRUE) + * return -1; * ...more setup... * g_application_run(app); + * gvir_event_deregister(); * return 0; * } * ]]></programlisting> @@ -80,408 +83,123 @@ #if GLIB_CHECK_VERSION(2, 31, 0) #define g_mutex_new() g_new0(GMutex, 1) +#define g_mutex_free(m) g_free(m) #endif -struct gvir_event_handle +GThread *event_thread = NULL; +GMutex *event_lock = NULL; +gboolean quit = FALSE; + +static gpointer +event_loop(gpointer dummy G_GNUC_UNUSED) +{ + while (1) { + gboolean do_quit; + + g_mutex_lock(event_lock); + do_quit = quit; + g_mutex_unlock(event_lock); + + if (do_quit) + break; + + if (virEventRunDefaultImpl() < 0) + g_warn_if_reached(); + } + return NULL; +} + +static void +deinit_timer(int timer G_GNUC_UNUSED, void *dummy G_GNUC_UNUSED) { - int watch; - int fd; - int events; - int enabled; - GIOChannel *channel; - guint source; - virEventHandleCallback cb; - void *opaque; - virFreeCallback ff; -}; - -struct gvir_event_timeout + /* nothing to be done here */ +} + +static gpointer +event_deregister_once(gpointer data G_GNUC_UNUSED) { int timer; - int interval; - guint source; - virEventTimeoutCallback cb; - void *opaque; - virFreeCallback ff; -}; -GMutex *eventlock = NULL; - -static int nextwatch = 1; -static GPtrArray *handles; - -static int nexttimer = 1; -static GPtrArray *timeouts; - -static gboolean -gvir_event_handle_dispatch(GIOChannel *source G_GNUC_UNUSED, - GIOCondition condition, - gpointer opaque) -{ - struct gvir_event_handle *data = opaque; - int events = 0; - - if (condition & G_IO_IN) - events |= VIR_EVENT_HANDLE_READABLE; - if (condition & G_IO_OUT) - events |= VIR_EVENT_HANDLE_WRITABLE; - if (condition & G_IO_HUP) - events |= VIR_EVENT_HANDLE_HANGUP; - if (condition & G_IO_ERR) - events |= VIR_EVENT_HANDLE_ERROR; - - g_debug("Dispatch handler %d %d %p\n", data->fd, events, data->opaque); - - (data->cb)(data->watch, data->fd, events, data->opaque); - - return TRUE; -} - - -static int -gvir_event_handle_add(int fd, - int events, - virEventHandleCallback cb, - void *opaque, - virFreeCallback ff) -{ - struct gvir_event_handle *data; - GIOCondition cond = 0; - int ret; - - g_mutex_lock(eventlock); - - data = g_new0(struct gvir_event_handle, 1); - - if (events & VIR_EVENT_HANDLE_READABLE) - cond |= G_IO_IN; - if (events & VIR_EVENT_HANDLE_WRITABLE) - cond |= G_IO_OUT; - - data->watch = nextwatch++; - data->fd = fd; - data->events = events; - data->cb = cb; - data->opaque = opaque; - data->channel = g_io_channel_unix_new(fd); - data->ff = ff; - - g_debug("Add handle %d %d %p\n", data->fd, events, data->opaque); - - data->source = g_io_add_watch(data->channel, - cond, - gvir_event_handle_dispatch, - data); - - g_ptr_array_add(handles, data); - - ret = data->watch; - - g_mutex_unlock(eventlock); - - return ret; -} - -static struct gvir_event_handle * -gvir_event_handle_find(int watch, guint *idx) -{ - 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; -} - -static void -gvir_event_handle_update(int watch, - int events) -{ - struct gvir_event_handle *data; - - g_mutex_lock(eventlock); - - data = gvir_event_handle_find(watch, NULL); - if (!data) { - g_debug("Update for missing handle watch %d", watch); - goto cleanup; + if (!event_thread) { + g_warn_if_reached(); + return NULL; } - if (events) { - GIOCondition cond = 0; - if (events == data->events) - goto cleanup; - - if (data->source) - g_source_remove(data->source); - - cond |= G_IO_HUP; - if (events & VIR_EVENT_HANDLE_READABLE) - cond |= G_IO_IN; - if (events & VIR_EVENT_HANDLE_WRITABLE) - cond |= G_IO_OUT; - data->source = g_io_add_watch(data->channel, - cond, - gvir_event_handle_dispatch, - data); - data->events = events; - } else { - if (!data->source) - goto cleanup; - - g_source_remove(data->source); - data->source = 0; - data->events = 0; - } - -cleanup: - g_mutex_unlock(eventlock); -} + g_mutex_lock(event_lock); + quit = TRUE; + /* Add dummy timeout to break event loop */ + timer = virEventAddTimeout(0, deinit_timer, NULL, NULL); + g_mutex_unlock(event_lock); -static gboolean -_event_handle_remove(gpointer data) -{ - struct gvir_event_handle *h = data; - - if (h->ff) - (h->ff)(h->opaque); - - g_ptr_array_remove_fast(handles, h); - - return FALSE; -} - -static int -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, &idx); - if (!data) { - g_debug("Remove of missing watch %d", watch); - goto cleanup; - } - - g_debug("Remove handle %d %d\n", watch, data->fd); - - if (!data->source) - goto cleanup; + g_thread_join(event_thread); + g_mutex_free(event_lock); + event_lock = NULL; + event_thread = NULL; + quit = FALSE; - g_source_remove(data->source); - data->source = 0; - data->events = 0; - g_idle_add(_event_handle_remove, data); - - ret = 0; - -cleanup: - g_mutex_unlock(eventlock); - return ret; -} - - -static gboolean -gvir_event_timeout_dispatch(void *opaque) -{ - struct gvir_event_timeout *data = opaque; - g_debug("Dispatch timeout %p %p %d %p\n", data, data->cb, data->timer, data->opaque); - (data->cb)(data->timer, data->opaque); - - return TRUE; -} - -static int -gvir_event_timeout_add(int interval, - virEventTimeoutCallback cb, - void *opaque, - virFreeCallback ff) -{ - struct gvir_event_timeout *data; - int ret; - - g_mutex_lock(eventlock); - - data = g_new0(struct gvir_event_timeout, 1); - data->timer = nexttimer++; - data->interval = interval; - data->cb = cb; - data->opaque = opaque; - data->ff = ff; - if (interval >= 0) - data->source = g_timeout_add(interval, - gvir_event_timeout_dispatch, - data); - - g_ptr_array_add(timeouts, data); - - g_debug("Add timeout %p %d %p %p %d\n", data, interval, cb, opaque, data->timer); - - ret = data->timer; - - g_mutex_unlock(eventlock); - - return ret; -} - - -static struct gvir_event_timeout * -gvir_event_timeout_find(int timer, guint *idx) -{ - 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; - } - } + if (timer != -1) + virEventRemoveTimeout(timer); return NULL; } - -static void -gvir_event_timeout_update(int timer, - int interval) +/* + * gvir_event_deregister: + * + * De-register libvirt event loop and free allocated memory. + * If invoked more than once, this method will be no-op. + * + */ +void +gvir_event_deregister(void) { - struct gvir_event_timeout *data; - - g_mutex_lock(eventlock); + static GOnce once = G_ONCE_INIT; - data = gvir_event_timeout_find(timer, NULL); - if (!data) { - g_debug("Update of missing timer %d", timer); - goto cleanup; - } - - g_debug("Update timeout %p %d %d\n", data, timer, interval); - - if (interval >= 0) { - if (data->source) - goto cleanup; - - data->interval = interval; - data->source = g_timeout_add(data->interval, - gvir_event_timeout_dispatch, - data); - } else { - if (!data->source) - goto cleanup; - - g_source_remove(data->source); - data->source = 0; - } - -cleanup: - g_mutex_unlock(eventlock); -} - -static gboolean -_event_timeout_remove(gpointer data) -{ - struct gvir_event_timeout *t = data; - - if (t->ff) - (t->ff)(t->opaque); - - g_ptr_array_remove_fast(timeouts, t); - - return FALSE; + g_once(&once, event_deregister_once, NULL); } -static int -gvir_event_timeout_remove(int timer) +static gpointer +event_register_once(gpointer data G_GNUC_UNUSED) { - struct gvir_event_timeout *data; - guint idx; - int ret = -1; - - g_mutex_lock(eventlock); + GError *err; - data = gvir_event_timeout_find(timer, &idx); - if (!data) { - g_debug("Remove of missing timer %d", timer); + if (virEventRegisterDefaultImpl() < 0) goto cleanup; - } - - g_debug("Remove timeout %p %d\n", data, timer); - - if (!data->source) - goto cleanup; - - g_source_remove(data->source); - data->source = 0; - g_idle_add(_event_timeout_remove, data); - ret = 0; + event_lock = g_mutex_new(); + + event_thread = g_thread_create(event_loop, NULL, TRUE, &err); + if (!event_thread) { + g_warning("Libvirt event loop thread could not be created: %s", + err->message); + g_error_free(err); + g_mutex_free(event_lock); + } cleanup: - g_mutex_unlock(eventlock); - return ret; + return event_thread; } - -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, - gvir_event_timeout_add, - gvir_event_timeout_update, - gvir_event_timeout_remove); - return NULL; -} - - /** * gvir_event_register: * - * Registers a libvirt event loop implementation that is backed - * by the default <code>GMain</code> context. If invoked more - * than once this method will be a no-op. Applications should, - * however, take care not to register any another non-GLib - * event loop with libvirt. + * Registers a libvirt event loop implementation. If invoked + * more than once this method will be a no-op. If event loop + * is no longer needed, it should be free'd by invoking + * <code>gvir_event_deregister()</code>. + * Failure to run the event loop will mean no libvirt events + * get dispatched, and the libvirt keepalive timer will kill + * off libvirt connections frequently. * - * After invoking this method, it is mandatory to run the - * default GMain event loop. Typically this can be satisfied - * by invoking <code>gtk_main</code> or <code>g_application_run</code> - * in the application's main thread. Failure to run the event - * loop will mean no libvirt events get dispatched, and the - * libvirt keepalive timer will kill off libvirt connections - * frequently. + * Returns: (transfer full): #TRUE on successful init, + * #FALSE otherwise. */ -void gvir_event_register(void) +gboolean +gvir_event_register(void) { static GOnce once = G_ONCE_INIT; g_once(&once, event_register_once, NULL); + + return once.retval ? TRUE : FALSE; } diff --git a/libvirt-glib/libvirt-glib-event.h b/libvirt-glib/libvirt-glib-event.h index 57cadab..e163674 100644 --- a/libvirt-glib/libvirt-glib-event.h +++ b/libvirt-glib/libvirt-glib-event.h @@ -28,7 +28,8 @@ G_BEGIN_DECLS -void gvir_event_register(void); +gboolean gvir_event_register(void); +void gvir_event_deregister(void); G_END_DECLS diff --git a/libvirt-glib/libvirt-glib.sym b/libvirt-glib/libvirt-glib.sym index 53b8907..8f6f15f 100644 --- a/libvirt-glib/libvirt-glib.sym +++ b/libvirt-glib/libvirt-glib.sym @@ -15,4 +15,9 @@ LIBVIRT_GLIB_0.0.7 { *; }; +LIBVIRT_GLIB_0.0.9 { + global: + gvir_event_deregister; +} LIBVIRT_GLIB_0.0.7; + # .... define new API here using predicted next version number .... diff --git a/libvirt-gobject/libvirt-gobject-main.c b/libvirt-gobject/libvirt-gobject-main.c index 9dd6e3c..c7980ff 100644 --- a/libvirt-gobject/libvirt-gobject-main.c +++ b/libvirt-gobject/libvirt-gobject-main.c @@ -66,7 +66,8 @@ gboolean gvir_init_object_check(int *argc, { g_type_init(); - gvir_event_register(); + if (gvir_event_register() != TRUE) + return FALSE; if (!gvir_init_check(argc, argv, err)) return FALSE; diff --git a/python/libvirt-glib.c b/python/libvirt-glib.c index 1daca36..6b8c78c 100644 --- a/python/libvirt-glib.c +++ b/python/libvirt-glib.c @@ -24,17 +24,36 @@ extern void initcygvirtglibmod(void); #endif #define VIR_PY_NONE (Py_INCREF (Py_None), Py_None) +#define VIR_PY_INT_FAIL (libvirt_intWrap(-1)) +#define VIR_PY_INT_SUCCESS (libvirt_intWrap(0)) + +PyObject * +libvirt_intWrap(int val) +{ + PyObject *ret; + ret = PyInt_FromLong((long) val); + return ret; +} static PyObject * libvirt_gvir_event_register(PyObject *self G_GNUC_UNUSED, PyObject *args G_GNUC_UNUSED) { - gvir_event_register(); + if ( gvir_event_register() != TRUE) + return VIR_PY_INT_FAIL; + + return VIR_PY_INT_SUCCESS; +} + + +static PyObject * +libvirt_gvir_event_deregister(PyObject *self G_GNUC_UNUSED, PyObject 8args G_GNUC_UNUSED) { + gvir_event_deregister(); return VIR_PY_NONE; } - static PyMethodDef libvirtGLibMethods[] = { {(char *) "event_register", libvirt_gvir_event_register, METH_VARARGS, NULL}, + {(char *) "event_deregister", libvirt_gvir_event_deregister, METH_VARARGS, NULL}, {NULL, NULL, 0, NULL} }; -- 1.7.8.5

4 3

[libvirt] [PATCH] security: Switch to C99-style struct initialization
by Michal Privoznik 24 May '12

24 May '12

--- src/security/security_apparmor.c | 50 ++++++++++++++++++------------------ src/security/security_dac.c | 53 ++++++++++++++++++------------------- src/security/security_nop.c | 52 ++++++++++++++++++------------------ src/security/security_selinux.c | 52 ++++++++++++++++++------------------ src/security/security_stack.c | 52 ++++++++++++++++++------------------ 5 files changed, 129 insertions(+), 130 deletions(-) diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index 2d05fd0..62af3c6 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -809,39 +809,39 @@ AppArmorSetImageFDLabel(virSecurityManagerPtr mgr, } virSecurityDriver virAppArmorSecurityDriver = { - 0, - SECURITY_APPARMOR_NAME, - AppArmorSecurityManagerProbe, - AppArmorSecurityManagerOpen, - AppArmorSecurityManagerClose, + .privateDataLen = 0, + .name = SECURITY_APPARMOR_NAME, + .probe = AppArmorSecurityManagerProbe, + .open = AppArmorSecurityManagerOpen, + .close = AppArmorSecurityManagerClose, - AppArmorSecurityManagerGetModel, - AppArmorSecurityManagerGetDOI, + .getModel = AppArmorSecurityManagerGetModel, + .getDOI = AppArmorSecurityManagerGetDOI, - AppArmorSecurityVerify, + .domainSecurityVerify = AppArmorSecurityVerify, - AppArmorSetSecurityImageLabel, - AppArmorRestoreSecurityImageLabel, + .domainSetSecurityImageLabel = AppArmorSetSecurityImageLabel, + .domainRestoreSecurityImageLabel = AppArmorRestoreSecurityImageLabel, - AppArmorSetSecurityDaemonSocketLabel, - AppArmorSetSecuritySocketLabel, - AppArmorClearSecuritySocketLabel, + .domainSetSecurityDaemonSocketLabel = AppArmorSetSecurityDaemonSocketLabel, + .domainSetSecuritySocketLabel = AppArmorSetSecuritySocketLabel, + .domainClearSecuritySocketLabel = AppArmorClearSecuritySocketLabel, - AppArmorGenSecurityLabel, - AppArmorReserveSecurityLabel, - AppArmorReleaseSecurityLabel, + .domainGenSecurityLabel = AppArmorGenSecurityLabel, + .domainReserveSecurityLabel = AppArmorReserveSecurityLabel, + .domainReleaseSecurityLabel = AppArmorReleaseSecurityLabel, - AppArmorGetSecurityProcessLabel, - AppArmorSetSecurityProcessLabel, + .domainGetSecurityProcessLabel = AppArmorGetSecurityProcessLabel, + .domainSetSecurityProcessLabel = AppArmorSetSecurityProcessLabel, - AppArmorSetSecurityAllLabel, - AppArmorRestoreSecurityAllLabel, + .domainSetSecurityAllLabel = AppArmorSetSecurityAllLabel, + .domainRestoreSecurityAllLabel = AppArmorRestoreSecurityAllLabel, - AppArmorSetSecurityHostdevLabel, - AppArmorRestoreSecurityHostdevLabel, + .domainSetSecurityHostdevLabel = AppArmorSetSecurityHostdevLabel, + .domainRestoreSecurityHostdevLabel = AppArmorRestoreSecurityHostdevLabel, - AppArmorSetSavedStateLabel, - AppArmorRestoreSavedStateLabel, + .domainSetSavedStateLabel = AppArmorSetSavedStateLabel, + .domainRestoreSavedStateLabel = AppArmorRestoreSavedStateLabel, - AppArmorSetImageFDLabel, + .domainSetSecurityImageFDLabel = AppArmorSetImageFDLabel, }; diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 470861d..9182b39 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -723,42 +723,41 @@ static char *virSecurityDACGetMountOptions(virSecurityManagerPtr mgr ATTRIBUTE_U } virSecurityDriver virSecurityDriverDAC = { - sizeof(virSecurityDACData), - "virDAC", + .privateDataLen = sizeof(virSecurityDACData), + .name = "virDAC", + .probe = virSecurityDACProbe, + .open = virSecurityDACOpen, + .close = virSecurityDACClose, - virSecurityDACProbe, - virSecurityDACOpen, - virSecurityDACClose, + .getModel = virSecurityDACGetModel, + .getDOI = virSecurityDACGetDOI, - virSecurityDACGetModel, - virSecurityDACGetDOI, + .domainSecurityVerify = virSecurityDACVerify, - virSecurityDACVerify, + .domainSetSecurityImageLabel = virSecurityDACSetSecurityImageLabel, + .domainRestoreSecurityImageLabel = virSecurityDACRestoreSecurityImageLabel, - virSecurityDACSetSecurityImageLabel, - virSecurityDACRestoreSecurityImageLabel, + .domainSetSecurityDaemonSocketLabel = virSecurityDACSetDaemonSocketLabel, + .domainSetSecuritySocketLabel = virSecurityDACSetSocketLabel, + .domainClearSecuritySocketLabel = virSecurityDACClearSocketLabel, - virSecurityDACSetDaemonSocketLabel, - virSecurityDACSetSocketLabel, - virSecurityDACClearSocketLabel, + .domainGenSecurityLabel = virSecurityDACGenLabel, + .domainReserveSecurityLabel = virSecurityDACReserveLabel, + .domainReleaseSecurityLabel = virSecurityDACReleaseLabel, - virSecurityDACGenLabel, - virSecurityDACReserveLabel, - virSecurityDACReleaseLabel, + .domainGetSecurityProcessLabel = virSecurityDACGetProcessLabel, + .domainSetSecurityProcessLabel = virSecurityDACSetProcessLabel, - virSecurityDACGetProcessLabel, - virSecurityDACSetProcessLabel, + .domainSetSecurityAllLabel = virSecurityDACSetSecurityAllLabel, + .domainRestoreSecurityAllLabel = virSecurityDACRestoreSecurityAllLabel, - virSecurityDACSetSecurityAllLabel, - virSecurityDACRestoreSecurityAllLabel, + .domainSetSecurityHostdevLabel = virSecurityDACSetSecurityHostdevLabel, + .domainRestoreSecurityHostdevLabel = virSecurityDACRestoreSecurityHostdevLabel, - virSecurityDACSetSecurityHostdevLabel, - virSecurityDACRestoreSecurityHostdevLabel, + .domainSetSavedStateLabel = virSecurityDACSetSavedStateLabel, + .domainRestoreSavedStateLabel = virSecurityDACRestoreSavedStateLabel, - virSecurityDACSetSavedStateLabel, - virSecurityDACRestoreSavedStateLabel, + .domainSetSecurityImageFDLabel = virSecurityDACSetImageFDLabel, - virSecurityDACSetImageFDLabel, - - virSecurityDACGetMountOptions, + .domainGetSecurityMountOptions = virSecurityDACGetMountOptions, }; diff --git a/src/security/security_nop.c b/src/security/security_nop.c index b62daf5..5f90df3 100644 --- a/src/security/security_nop.c +++ b/src/security/security_nop.c @@ -170,41 +170,41 @@ static char *virSecurityDomainGetMountOptionsNop(virSecurityManagerPtr mgr ATTRI } virSecurityDriver virSecurityDriverNop = { - 0, - "none", - virSecurityDriverProbeNop, - virSecurityDriverOpenNop, - virSecurityDriverCloseNop, + .privateDataLen = 0, + .name = "none", + .probe = virSecurityDriverProbeNop, + .open = virSecurityDriverOpenNop, + .close = virSecurityDriverCloseNop, - virSecurityDriverGetModelNop, - virSecurityDriverGetDOINop, + .getModel = virSecurityDriverGetModelNop, + .getDOI = virSecurityDriverGetDOINop, - virSecurityDomainVerifyNop, + .domainSecurityVerify = virSecurityDomainVerifyNop, - virSecurityDomainSetImageLabelNop, - virSecurityDomainRestoreImageLabelNop, + .domainSetSecurityImageLabel = virSecurityDomainSetImageLabelNop, + .domainRestoreSecurityImageLabel = virSecurityDomainRestoreImageLabelNop, - virSecurityDomainSetDaemonSocketLabelNop, - virSecurityDomainSetSocketLabelNop, - virSecurityDomainClearSocketLabelNop, + .domainSetSecurityDaemonSocketLabel = virSecurityDomainSetDaemonSocketLabelNop, + .domainSetSecuritySocketLabel = virSecurityDomainSetSocketLabelNop, + .domainClearSecuritySocketLabel = virSecurityDomainClearSocketLabelNop, - virSecurityDomainGenLabelNop, - virSecurityDomainReserveLabelNop, - virSecurityDomainReleaseLabelNop, + .domainGenSecurityLabel = virSecurityDomainGenLabelNop, + .domainReserveSecurityLabel = virSecurityDomainReserveLabelNop, + .domainReleaseSecurityLabel = virSecurityDomainReleaseLabelNop, - virSecurityDomainGetProcessLabelNop, - virSecurityDomainSetProcessLabelNop, + .domainGetSecurityProcessLabel = virSecurityDomainGetProcessLabelNop, + .domainSetSecurityProcessLabel = virSecurityDomainSetProcessLabelNop, - virSecurityDomainSetAllLabelNop, - virSecurityDomainRestoreAllLabelNop, + .domainSetSecurityAllLabel = virSecurityDomainSetAllLabelNop, + .domainRestoreSecurityAllLabel = virSecurityDomainRestoreAllLabelNop, - virSecurityDomainSetHostdevLabelNop, - virSecurityDomainRestoreHostdevLabelNop, + .domainSetSecurityHostdevLabel = virSecurityDomainSetHostdevLabelNop, + .domainRestoreSecurityHostdevLabel = virSecurityDomainRestoreHostdevLabelNop, - virSecurityDomainSetSavedStateLabelNop, - virSecurityDomainRestoreSavedStateLabelNop, + .domainSetSavedStateLabel = virSecurityDomainSetSavedStateLabelNop, + .domainRestoreSavedStateLabel = virSecurityDomainRestoreSavedStateLabelNop, - virSecurityDomainSetFDLabelNop, + .domainSetSecurityImageFDLabel = virSecurityDomainSetFDLabelNop, - virSecurityDomainGetMountOptionsNop, + .domainGetSecurityMountOptions = virSecurityDomainGetMountOptionsNop, }; diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 2b8ff19..ffa65fb 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -1591,41 +1591,41 @@ static char *SELinuxGetSecurityMountOptions(virSecurityManagerPtr mgr, } virSecurityDriver virSecurityDriverSELinux = { - sizeof(virSecuritySELinuxData), - SECURITY_SELINUX_NAME, - SELinuxSecurityDriverProbe, - SELinuxSecurityDriverOpen, - SELinuxSecurityDriverClose, + .privateDataLen = sizeof(virSecuritySELinuxData), + .name = SECURITY_SELINUX_NAME, + .probe = SELinuxSecurityDriverProbe, + .open = SELinuxSecurityDriverOpen, + .close = SELinuxSecurityDriverClose, - SELinuxSecurityGetModel, - SELinuxSecurityGetDOI, + .getModel = SELinuxSecurityGetModel, + .getDOI = SELinuxSecurityGetDOI, - SELinuxSecurityVerify, + .domainSecurityVerify = SELinuxSecurityVerify, - SELinuxSetSecurityImageLabel, - SELinuxRestoreSecurityImageLabel, + .domainSetSecurityImageLabel = SELinuxSetSecurityImageLabel, + .domainRestoreSecurityImageLabel = SELinuxRestoreSecurityImageLabel, - SELinuxSetSecurityDaemonSocketLabel, - SELinuxSetSecuritySocketLabel, - SELinuxClearSecuritySocketLabel, + .domainSetSecurityDaemonSocketLabel = SELinuxSetSecurityDaemonSocketLabel, + .domainSetSecuritySocketLabel = SELinuxSetSecuritySocketLabel, + .domainClearSecuritySocketLabel = SELinuxClearSecuritySocketLabel, - SELinuxGenSecurityLabel, - SELinuxReserveSecurityLabel, - SELinuxReleaseSecurityLabel, + .domainGenSecurityLabel = SELinuxGenSecurityLabel, + .domainReserveSecurityLabel = SELinuxReserveSecurityLabel, + .domainReleaseSecurityLabel = SELinuxReleaseSecurityLabel, - SELinuxGetSecurityProcessLabel, - SELinuxSetSecurityProcessLabel, + .domainGetSecurityProcessLabel = SELinuxGetSecurityProcessLabel, + .domainSetSecurityProcessLabel = SELinuxSetSecurityProcessLabel, - SELinuxSetSecurityAllLabel, - SELinuxRestoreSecurityAllLabel, + .domainSetSecurityAllLabel = SELinuxSetSecurityAllLabel, + .domainRestoreSecurityAllLabel = SELinuxRestoreSecurityAllLabel, - SELinuxSetSecurityHostdevLabel, - SELinuxRestoreSecurityHostdevLabel, + .domainSetSecurityHostdevLabel = SELinuxSetSecurityHostdevLabel, + .domainRestoreSecurityHostdevLabel = SELinuxRestoreSecurityHostdevLabel, - SELinuxSetSavedStateLabel, - SELinuxRestoreSavedStateLabel, + .domainSetSavedStateLabel = SELinuxSetSavedStateLabel, + .domainRestoreSavedStateLabel = SELinuxRestoreSavedStateLabel, - SELinuxSetImageFDLabel, + .domainSetSecurityImageFDLabel = SELinuxSetImageFDLabel, - SELinuxGetSecurityMountOptions, + .domainGetSecurityMountOptions = SELinuxGetSecurityMountOptions, }; diff --git a/src/security/security_stack.c b/src/security/security_stack.c index 6ecd099..65d30d6 100644 --- a/src/security/security_stack.c +++ b/src/security/security_stack.c @@ -409,41 +409,41 @@ static char *virSecurityStackGetMountOptions(virSecurityManagerPtr mgr ATTRIBUTE } virSecurityDriver virSecurityDriverStack = { - sizeof(virSecurityStackData), - "stack", - virSecurityStackProbe, - virSecurityStackOpen, - virSecurityStackClose, + .privateDataLen = sizeof(virSecurityStackData), + .name = "stack", + .probe = virSecurityStackProbe, + .open = virSecurityStackOpen, + .close = virSecurityStackClose, - virSecurityStackGetModel, - virSecurityStackGetDOI, + .getModel = virSecurityStackGetModel, + .getDOI = virSecurityStackGetDOI, - virSecurityStackVerify, + .domainSecurityVerify = virSecurityStackVerify, - virSecurityStackSetSecurityImageLabel, - virSecurityStackRestoreSecurityImageLabel, + .domainSetSecurityImageLabel = virSecurityStackSetSecurityImageLabel, + .domainRestoreSecurityImageLabel = virSecurityStackRestoreSecurityImageLabel, - virSecurityStackSetDaemonSocketLabel, - virSecurityStackSetSocketLabel, - virSecurityStackClearSocketLabel, + .domainSetSecurityDaemonSocketLabel = virSecurityStackSetDaemonSocketLabel, + .domainSetSecuritySocketLabel = virSecurityStackSetSocketLabel, + .domainClearSecuritySocketLabel = virSecurityStackClearSocketLabel, - virSecurityStackGenLabel, - virSecurityStackReserveLabel, - virSecurityStackReleaseLabel, + .domainGenSecurityLabel = virSecurityStackGenLabel, + .domainReserveSecurityLabel = virSecurityStackReserveLabel, + .domainReleaseSecurityLabel = virSecurityStackReleaseLabel, - virSecurityStackGetProcessLabel, - virSecurityStackSetProcessLabel, + .domainGetSecurityProcessLabel = virSecurityStackGetProcessLabel, + .domainSetSecurityProcessLabel = virSecurityStackSetProcessLabel, - virSecurityStackSetSecurityAllLabel, - virSecurityStackRestoreSecurityAllLabel, + .domainSetSecurityAllLabel = virSecurityStackSetSecurityAllLabel, + .domainRestoreSecurityAllLabel = virSecurityStackRestoreSecurityAllLabel, - virSecurityStackSetSecurityHostdevLabel, - virSecurityStackRestoreSecurityHostdevLabel, + .domainSetSecurityHostdevLabel = virSecurityStackSetSecurityHostdevLabel, + .domainRestoreSecurityHostdevLabel = virSecurityStackRestoreSecurityHostdevLabel, - virSecurityStackSetSavedStateLabel, - virSecurityStackRestoreSavedStateLabel, + .domainSetSavedStateLabel = virSecurityStackSetSavedStateLabel, + .domainRestoreSavedStateLabel = virSecurityStackRestoreSavedStateLabel, - virSecurityStackSetImageFDLabel, + .domainSetSecurityImageFDLabel = virSecurityStackSetImageFDLabel, - virSecurityStackGetMountOptions, + .domainGetSecurityMountOptions = virSecurityStackGetMountOptions, }; -- 1.7.8.5

2 2

[libvirt] [PATCH 0/5] Atomic api to list all domains
by Peter Krempa 24 May '12

24 May '12

This patchset adds a atomic way to list guests. A more detailed description is in patch 1. Peter Krempa (5): lib: Add public api to enable atomic listing of guest python: add API exports for virConnectListAllDomains() remote: implement remote protocol for virConnectListAllDomains() qemu: implement virConnectListAllDomains() for qemu driver virsh: add support for virConnectListAllDomains and clean up cmdList daemon/remote.c | 50 ++++ include/libvirt/libvirt.h.in | 8 +- python/generator.py | 1 + python/libvirt-override-api.xml | 12 +- python/libvirt-override-virConnect.py | 12 + python/libvirt-override.c | 49 ++++- src/driver.h | 12 +- src/libvirt.c | 46 ++++ src/libvirt_public.syms | 5 + src/qemu/qemu_driver.c | 97 ++++++++ src/remote/remote_driver.c | 66 +++++ src/remote/remote_protocol.x | 14 +- src/remote_protocol-structs | 12 + tools/virsh.c | 423 +++++++++++++++++++++------------ 14 files changed, 647 insertions(+), 160 deletions(-) -- 1.7.3.4

4 20

[libvirt] [PATCH] fix building error on non fedora system
by Wen Congyang 24 May '12

24 May '12

We forget to define with_storage_rbd if the system is not fedora, or the version is less than 16. --- libvirt.spec.in | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 8c4a2fd..0b83969 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -75,6 +75,8 @@ %define with_storage_mpath 0%{!?_without_storage_mpath:%{server_drivers}} %if 0%{?fedora} >= 16 %define with_storage_rbd 0%{!?_without_storage_rbd:%{server_drivers}} +%else +%define with_storage_rbd 0 %endif %define with_numactl 0%{!?_without_numactl:%{server_drivers}} %define with_selinux 0%{!?_without_selinux:%{server_drivers}} -- 1.7.1

3 2

[libvirt] [PATCH] Add stub impl of virNetlinkEventServiceLocalPid for Win32
by Daniel P. Berrange 24 May '12

24 May '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Pushed the following under build-breaker fix rule (Win32) The libvirt_private.syms file exports virNetlinkEventServiceLocalPid so there needs to be a no-op stub for Win32 to avoid linker errors Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/util/virnetlink.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index e316137..9539694 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -669,6 +669,12 @@ bool virNetlinkEventServiceIsRunning(void) return 0; } +int virNetlinkEventServiceLocalPid(void) +{ + netlinkError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); + return -1; +} + /** * virNetlinkEventAddClient: register a callback for handling of * netlink messages -- 1.7.7.6

1 0

[libvirt] [PATCHv3 4/4] openvz: add quota argument when creating container
by Guido Günther 24 May '12

24 May '12

--- src/openvz/openvz_driver.c | 58 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 57 insertions(+), 1 deletion(-) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index c6d25d7..fb72cde 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -189,6 +189,48 @@ cleanup: } +static int +openvzSetDiskQuota(virDomainDefPtr vmdef, + virDomainFSDefPtr fss) +{ + int ret = -1; + unsigned long long sl, hl; + virCommandPtr cmd = virCommandNewArgList(VZCTL, + "--quiet", + "set", + vmdef->name, + "--save", + NULL); + + if (fss->type == VIR_DOMAIN_FS_TYPE_TEMPLATE) { + if (fss->space_hard_limit) { + hl = VIR_DIV_UP(fss->space_hard_limit, 1024); + virCommandAddArg(cmd, "--diskspace"); + + if (fss->space_soft_limit) { + sl = VIR_DIV_UP(fss->space_soft_limit, 1024); + virCommandAddArgFormat(cmd, "%lld:%lld", sl, hl); + } else { + virCommandAddArgFormat(cmd, "%lld", hl); + } + } else if (fss->space_soft_limit) { + openvzError(VIR_ERR_INVALID_ARG, "%s", + _("Can't set soft limit without hard limit")); + goto cleanup; + } + + if (virCommandRun(cmd, NULL) < 0) + goto cleanup; + } + + ret = 0; +cleanup: + virCommandFree(cmd); + + return ret; +} + + static virDomainPtr openvzDomainLookupByID(virConnectPtr conn, int id) { struct openvz_driver *driver = conn->privateData; @@ -895,7 +937,13 @@ openvzDomainDefineXML(virConnectPtr conn, const char *xml) goto cleanup; } - /* TODO: set quota */ + if (vm->def->nfss == 1) { + if (openvzSetDiskQuota(vm->def, vm->def->fss[0]) < 0) { + openvzError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not set disk quota")); + goto cleanup; + } + } if (openvzSetDefinedUUID(strtoI(vm->def->name), vm->def->uuid) < 0) { openvzError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -977,6 +1025,14 @@ openvzDomainCreateXML(virConnectPtr conn, const char *xml, goto cleanup; } + if (vm->def->nfss == 1) { + if (openvzSetDiskQuota(vm->def, vm->def->fss[0]) < 0) { + openvzError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not set disk quota")); + goto cleanup; + } + } + if (openvzSetDefinedUUID(strtoI(vm->def->name), vm->def->uuid) < 0) { openvzError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not set UUID")); -- 1.7.10

2 2

[libvirt] [PATCHv3 2/4] Introduce filesystem limits to virDomainFSDef
by Guido Günther 24 May '12

24 May '12

--- docs/formatdomain.html.in | 14 ++++++++++++++ docs/schemas/domaincommon.rng | 12 ++++++++++++ src/conf/domain_conf.c | 30 +++++++++++++++++++++++++++--- src/conf/domain_conf.h | 2 ++ 4 files changed, 55 insertions(+), 3 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 3875167..c56a793 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1686,6 +1686,20 @@ default read-write access is given (currently only works for QEMU/KVM driver). </dd> + + <dt><code>space_hard_limit</code></dt> + <dd> + Maximum space available to this guest's filesystem. + <span class="since">Since 0.9.13</span> + </dd> + + <dt><code>space_soft_limit</code></dt> + <dd> + Maximum space available to this guest's filesystem. The container is + permitted to exceed its soft limits for a grace period of time. Afterwards the + hard limit is enforced. + <span class="since">Since 0.9.13</span> + </dd> </dl> <h4><a name="elementsAddress">Device Addresses</a></h4> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 34f63c3..62c28c8 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1316,6 +1316,18 @@ <ref name="address"/> </optional> </interleave> + <interleave> + <optional> + <element name="space_hard_limit"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="space_soft_limit"> + <ref name='scaledInteger'/> + </element> + </optional> + </interleave> </element> </define> <!-- diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 5ac911e..a75e7e8 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4200,9 +4200,10 @@ cleanup: */ static virDomainFSDefPtr virDomainFSDefParseXML(xmlNodePtr node, + xmlXPathContextPtr ctxt, unsigned int flags) { virDomainFSDefPtr def; - xmlNodePtr cur; + xmlNodePtr cur, save_node = ctxt->node; char *type = NULL; char *fsdriver = NULL; char *source = NULL; @@ -4210,6 +4211,8 @@ virDomainFSDefParseXML(xmlNodePtr node, char *accessmode = NULL; char *wrpolicy = NULL; + ctxt->node = node; + if (VIR_ALLOC(def) < 0) { virReportOOMError(); return NULL; @@ -4237,6 +4240,18 @@ virDomainFSDefParseXML(xmlNodePtr node, def->accessmode = VIR_DOMAIN_FS_ACCESSMODE_PASSTHROUGH; } + if (virDomainParseScaledValue("./space_hard_limit[1]", ctxt, + &def->space_hard_limit, 1, + ULONG_LONG_MAX, + false) < 0) + goto error; + + if (virDomainParseScaledValue("./space_soft_limit[1]", ctxt, + &def->space_soft_limit, 1, + ULONG_LONG_MAX, + false) < 0) + goto error; + cur = node->children; while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE) { @@ -4303,6 +4318,7 @@ virDomainFSDefParseXML(xmlNodePtr node, goto error; cleanup: + ctxt->node = save_node; VIR_FREE(type); VIR_FREE(fsdriver); VIR_FREE(target); @@ -7076,7 +7092,7 @@ virDomainDeviceDefPtr virDomainDeviceDefParse(virCapsPtr caps, goto error; } else if (xmlStrEqual(node->name, BAD_CAST "filesystem")) { dev->type = VIR_DOMAIN_DEVICE_FS; - if (!(dev->data.fs = virDomainFSDefParseXML(node, flags))) + if (!(dev->data.fs = virDomainFSDefParseXML(node, ctxt, flags))) goto error; } else if (xmlStrEqual(node->name, BAD_CAST "interface")) { dev->type = VIR_DOMAIN_DEVICE_NET; @@ -8621,7 +8637,7 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, if (n && VIR_ALLOC_N(def->fss, n) < 0) goto no_memory; for (i = 0 ; i < n ; i++) { - virDomainFSDefPtr fs = virDomainFSDefParseXML(nodes[i], + virDomainFSDefPtr fs = virDomainFSDefParseXML(nodes[i], ctxt, flags); if (!fs) goto error; @@ -11319,6 +11335,14 @@ virDomainFSDefFormat(virBufferPtr buf, if (virDomainDeviceInfoFormat(buf, &def->info, flags) < 0) return -1; + + if (def->space_hard_limit) + virBufferAsprintf(buf, " <space_hard_limit unit='B'>" + "%llu</space_hard_limit>\n", def->space_hard_limit); + if (def->space_soft_limit) { + virBufferAsprintf(buf, " <space_soft_limit unit='B'>" + "%llu</space_soft_limit>\n", def->space_soft_limit); + } virBufferAddLit(buf, " </filesystem>\n"); return 0; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 4c56902..8d5b35a 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -699,6 +699,8 @@ struct _virDomainFSDef { char *dst; unsigned int readonly : 1; virDomainDeviceInfo info; + unsigned long long space_hard_limit; /* in bytes */ + unsigned long long space_soft_limit; /* in bytes */ }; -- 1.7.10

2 2

[libvirt] [PATCHv3 3/4] openvz: support file system quota reporting
by Guido Günther 23 May '12

23 May '12

--- src/conf/domain_conf.c | 4 ++-- src/openvz/openvz_conf.c | 24 +++++++++++++++++++++++ tests/domainschemadata/domain-openvz-simple.xml | 2 ++ 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a75e7e8..357929b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11337,10 +11337,10 @@ virDomainFSDefFormat(virBufferPtr buf, if (def->space_hard_limit) - virBufferAsprintf(buf, " <space_hard_limit unit='B'>" + virBufferAsprintf(buf, " <space_hard_limit unit='bytes'>" "%llu</space_hard_limit>\n", def->space_hard_limit); if (def->space_soft_limit) { - virBufferAsprintf(buf, " <space_soft_limit unit='B'>" + virBufferAsprintf(buf, " <space_soft_limit unit='bytes'>" "%llu</space_soft_limit>\n", def->space_soft_limit); } virBufferAddLit(buf, " </filesystem>\n"); diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index 5f107ed..363cd1e 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -407,6 +407,8 @@ openvzReadFSConf(virDomainDefPtr def, virDomainFSDefPtr fs = NULL; char *veid_str = NULL; char *temp = NULL; + const char *param; + unsigned long long barrier, limit; ret = openvzReadVPSConfigParam(veid, "OSTEMPLATE", &temp); if (ret < 0) { @@ -444,6 +446,28 @@ openvzReadFSConf(virDomainDefPtr def, fs->dst = strdup("/"); + param = "DISKSPACE"; + ret = openvzReadVPSConfigParam(veid, param, &temp); + if (ret > 0) { + if (openvzParseBarrierLimit(temp, &barrier, &limit)) { + openvzError(VIR_ERR_INTERNAL_ERROR, + _("Could not read '%s' from config for container %d"), + param, veid); + goto error; + } else { + /* Ensure that we can multiply by 1024 without overflowing. */ + if (barrier > ULONG_LONG_MAX / 1024 || + limit > ULONG_LONG_MAX / 1024 ) { + virReportSystemError(EINVAL, + _("%s"), + "Unable to parse quota"); + goto error; + } + fs->space_soft_limit = barrier * 1024; /* unit is bytes */ + fs->space_hard_limit = limit * 1024; /* unit is bytes */ + } + } + if (fs->src == NULL || fs->dst == NULL) goto no_memory; diff --git a/tests/domainschemadata/domain-openvz-simple.xml b/tests/domainschemadata/domain-openvz-simple.xml index a121d39..949e96d 100644 --- a/tests/domainschemadata/domain-openvz-simple.xml +++ b/tests/domainschemadata/domain-openvz-simple.xml @@ -21,6 +21,8 @@ <filesystem type='template' accessmode='passthrough'> <source name='debian'/> <target dir='/'/> + <space_hard_limit>1153024</space_hard_limit> + <space_soft_limit>1048576</space_soft_limit> </filesystem> </devices> </domain> -- 1.7.10

2 1

[libvirt] [PATCHv3 1/4] Introduce virDomainParseScaledValue
by Guido Günther 23 May '12

23 May '12

and use it for virDomainParseMemory. This allows to parse arbitrary scaled value, not only memory related values as needed for the filesystem limits code following later in this series. --- src/conf/domain_conf.c | 94 +++++++++++++++++++++++++++++++----------------- 1 file changed, 61 insertions(+), 33 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9def71d..5ac911e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4138,6 +4138,63 @@ cleanup: goto cleanup; } + +/* Parse a value located at XPATH within CTXT, and store the + * result into val. If REQUIRED, then the value must exist; + * otherwise, the value is optional. The value is in bytes. + * Return 0 on success, -1 on failure after issuing error. */ +static int +virDomainParseScaledValue(const char *xpath, + xmlXPathContextPtr ctxt, + unsigned long long *val, + unsigned long long scale, + unsigned long long max, + bool required) +{ + char *xpath_full = NULL; + char *unit = NULL; + int ret = -1; + unsigned long long bytes; + + *val = 0; + if (virAsprintf(&xpath_full, "string(%s)", xpath) < 0) { + virReportOOMError(); + goto cleanup; + } + ret = virXPathULongLong(xpath_full, ctxt, &bytes); + if (ret < 0) { + if (ret == -2) + virDomainReportError(VIR_ERR_XML_ERROR, + _("could not parse memory element %s"), + xpath); + else if (required) + virDomainReportError(VIR_ERR_XML_ERROR, + _("missing element %s"), + xpath); + else + ret = 0; + goto cleanup; + } + VIR_FREE(xpath_full); + + if (virAsprintf(&xpath_full, "string(%s/@unit)", xpath) < 0) { + virReportOOMError(); + goto cleanup; + } + unit = virXPathString(xpath_full, ctxt); + + if (virScaleInteger(&bytes, unit, scale, max) < 0) + goto cleanup; + + *val = bytes; + ret = 0; +cleanup: + VIR_FREE(xpath_full); + VIR_FREE(unit); + return ret; +} + + /* Parse the XML definition for a disk * @param node XML nodeset to parse for disk definition */ @@ -7768,53 +7825,24 @@ static int virDomainParseMemory(const char *xpath, xmlXPathContextPtr ctxt, unsigned long long *mem, bool required) { - char *xpath_full = NULL; - char *unit = NULL; int ret = -1; - unsigned long long bytes; - unsigned long long max; + unsigned long long bytes, max; - *mem = 0; - if (virAsprintf(&xpath_full, "string(%s)", xpath) < 0) { - virReportOOMError(); - goto cleanup; - } - ret = virXPathULongLong(xpath_full, ctxt, &bytes); - if (ret < 0) { - if (ret == -2) - virDomainReportError(VIR_ERR_XML_ERROR, - _("could not parse memory element %s"), - xpath); - else if (required) - virDomainReportError(VIR_ERR_XML_ERROR, - _("missing memory element %s"), - xpath); - else - ret = 0; - goto cleanup; - } - VIR_FREE(xpath_full); - - if (virAsprintf(&xpath_full, "string(%s/@unit)", xpath) < 0) { - virReportOOMError(); - goto cleanup; - } - unit = virXPathString(xpath_full, ctxt); /* On 32-bit machines, our bound is 0xffffffff * KiB. On 64-bit * machines, our bound is off_t (2^63). */ if (sizeof(unsigned long) < sizeof(long long)) max = 1024ull * ULONG_MAX; else max = LLONG_MAX; - if (virScaleInteger(&bytes, unit, 1024, max) < 0) + + ret = virDomainParseScaledValue(xpath, ctxt, &bytes, 1024, max, required); + if (ret < 0) goto cleanup; /* Yes, we really do use kibibytes for our internal sizing. */ *mem = VIR_DIV_UP(bytes, 1024); ret = 0; cleanup: - VIR_FREE(xpath_full); - VIR_FREE(unit); return ret; } -- 1.7.10

2 1

[libvirt] [PATCHv3 0/4] Support filesystem limits for containers
by Guido Günther 23 May '12

23 May '12

Hi, the following patches are a third stab at filesystem limits for containers. With these patches space limits in openvz containers are printed in the domain config as: <filesystem type='template' accessmode='passthrough'> <source name='debian'/> <target dir='/'/> <space_hard_limit unit="MiB">1153024</space_hard_limit> <space_soft_limit unit="MiB">1048576</space_soft_limit> </filesystem> The can also be set from the domain xml. I left out inode limits for now since the unit "Bytes" wouldn't fit there well and I didnt' get around to update the unit parsing code yet. Changes since last time: * Add the version we introduced this feature to formatdomain.html.in * Move the patch that makes virDomainParseMemory use virDomainParseScaledValue to the front of the queue * Fix safe_node -> save_node typo * Make output format consistent with what's used in storage_conf.c ('bytes' not 'B') * openvz: Check for overflow when parsing DISKSPACE out of the container config * openvz: Fix logic that only sets the hard limit when no soft limit is given and rejects config that only specify a soft limit Cheers, -- Guido Guido Günther (4): Introduce virDomainParseScaledValue Introduce filesystem limits to virDomainFSDef openvz: support file system quota reporting openvz: add quota argument when creating container docs/formatdomain.html.in | 14 +++ docs/schemas/domaincommon.rng | 12 +++ src/conf/domain_conf.c | 124 ++++++++++++++++------- src/conf/domain_conf.h | 2 + src/openvz/openvz_conf.c | 24 +++++ src/openvz/openvz_driver.c | 58 ++++++++++- tests/domainschemadata/domain-openvz-simple.xml | 2 + 7 files changed, 199 insertions(+), 37 deletions(-) -- 1.7.10

1 0

[libvirt] Providing custom arguments/environment to network scripts
by Tore Anderson 23 May '12

23 May '12

I'm trying to build a setup where the VMs only have point-to-point Ethernet connections to the hypervisor, which will then act as a layer-3 router. When the VM starts, the hypervisor needs to UP the assigned tap interface and configure an IP/mask on it (that will be the VMs default gateway). So I'm currently looking at a config looking like this: <interface type='ethernet'> <script path='/sbin/vm-ifup'/> </interface> The problem I'm facing is that there appears to be no way supply information to the script by way of command-line arguments or custom environment variables. So something like: <script path='/sbin/vm-ifup 2001:db8::/64'/> ...fails because it tries to execute the whole string, space included, as the script file. The only information I have available in the script is the assigned tap device in the hypervisor (which is automatically passed in as the first argument to the script). As the device name is automatically assigned on VM start, it is useless as a lookup key of sorts for finding more information. One workaround would be to have one network script per VM that hard-codes all the necessary information, but if you have a large number of hypervisors with an even larger number of VMs, this quickly becomes impractical. So my question is, is there some other way to pass configuration information to the network script or to accomplish what I'm trying to do? Best regards, -- Tore Anderson Redpill Linpro AS - http://www.redpill-linpro.com

2 1

[libvirt] [RFC PATCH 0/4] block: file descriptor passing using -filefd and getfd_file
by Corey Bryant 23 May '12

23 May '12

libvirt's sVirt security driver provides SELinux MAC isolation for Qemu guest processes and their corresponding image files. In other words, sVirt uses SELinux to prevent a QEMU process from opening files that do not belong to it. sVirt provides this support by labeling guests and resources with security labels that are stored in file system extended attributes. Some file systems, such as NFS, do not support the extended attribute security namespace, and therefore cannot support sVirt isolation. A solution to this problem is to provide fd passing support, where libvirt opens files and passes file descriptors to QEMU. This, along with SELinux policy to prevent QEMU from opening files, can provide image file isolation for NFS files. This patch series adds the -filefd command-line option and the getfd_file monitor command. This will enable libvirt to open a file and push the corresponding filename and file descriptor to QEMU. When QEMU needs to "open" a file, it will first check if the file descriptor was passed by either of these methods before attempting to actually open the file. This series reuses the file_open function that Anthony Liguori <aliguori(a)us.ibm.com> created for the most recent fd passing prototype. It also reuses the test driver that Stefan Hajnoczi <stefanha(a)linux.vnet.ibm.com> created for that prototype, with several modifications. Corey Bryant (4): qemu-options: Add -filefd command line option qmp/hmp: Add getfd_file monitor command block: Enable QEMU to retrieve passed fd before attempting open Example -filefd and getfd_file server block.c | 31 +++++++ block/raw-posix.c | 20 +++--- block/raw-win32.c | 4 +- block/vdi.c | 4 +- block/vmdk.c | 21 ++--- block/vpc.c | 2 +- block/vvfat.c | 4 +- block_int.h | 12 +++ hmp-commands.hx | 17 ++++ monitor.c | 70 +++++++++++++++++ monitor.h | 3 + qemu-config.c | 17 ++++ qemu-config.h | 1 + qemu-options.hx | 17 ++++ qemu-tool.c | 5 + qmp-commands.hx | 30 +++++++ test-fd-passing.c | 224 +++++++++++++++++++++++++++++++++++++++++++++++++++++ vl.c | 6 ++ 18 files changed, 459 insertions(+), 29 deletions(-) create mode 100644 test-fd-passing.c -- 1.7.7.6

5 33

[libvirt] suggestions on snapshotting testing
by Kashyap Chamarthy 23 May '12

23 May '12

Hi, I'm willing to test/understand snapshotting in libivrt/qemu in a much better way. I can spend 10-ish hours or so a week. I see a lot of work going on the snapshot front, upstream qemu/libvirt. I'm currently following/reading: ---------- http://wiki.qemu.org/Features/SnapshotsMultipleDevices http://wiki.qemu.org/Features/LiveBlockMigration http://wiki.libvirt.org/page/Snapshots http://libvirt.org/formatsnapshot.html ------------ Am I going the right way? Once I get a decent hang of things, I was wondering I could start writing some tests. What do you advice? -- /kashyap

2 4

[libvirt] [libvirt-glib 1/2] Add gvir_config_object_get_attribute_uint64()
by Zeeshan Ali (Khattak) 23 May '12

23 May '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> Another internal libvirt-gconfig helper to get unint64 XML attributes. --- libvirt-gconfig/libvirt-gconfig-object-private.h | 4 ++++ libvirt-gconfig/libvirt-gconfig-object.c | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-object-private.h b/libvirt-gconfig/libvirt-gconfig-object-private.h index b3798c0..830517c 100644 --- a/libvirt-gconfig/libvirt-gconfig-object-private.h +++ b/libvirt-gconfig/libvirt-gconfig-object-private.h @@ -42,6 +42,10 @@ gint gvir_config_object_get_node_content_genum(GVirConfigObject *object, const char *gvir_config_object_get_attribute(GVirConfigObject *object, const char *node_name, const char *attr_name); +guint64 gvir_config_object_get_attribute_uint64(GVirConfigObject *object, + const char *node_name, + const char *attr_name, + guint64 default_value); gint gvir_config_object_get_attribute_genum(GVirConfigObject *object, const char *node_name, const char *attr_name, diff --git a/libvirt-gconfig/libvirt-gconfig-object.c b/libvirt-gconfig/libvirt-gconfig-object.c index 1474393..a7352a5 100644 --- a/libvirt-gconfig/libvirt-gconfig-object.c +++ b/libvirt-gconfig/libvirt-gconfig-object.c @@ -644,6 +644,21 @@ gvir_config_object_get_attribute_genum(GVirConfigObject *object, return value; } +G_GNUC_INTERNAL guint64 +gvir_config_object_get_attribute_uint64(GVirConfigObject *object, + const char *node_name, + const char *attr_name, + guint64 default_value) +{ + const char *str; + + str = gvir_config_object_get_attribute(object, node_name, attr_name); + if (str == NULL) + return default_value; + + return g_ascii_strtoull(str, NULL, 0); +} + GVirConfigObject *gvir_config_object_new_from_xml(GType type, const char *root_name, const char *schema, -- 1.7.7.6

2 3

[libvirt] [PATCH] Remove more bogus systemd service dependencies
by Daniel P. Berrange 23 May '12

23 May '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Adding syslog.target is obsolete, avahi.target does not exist and dbus.target is also obsolete --- daemon/libvirtd.service.in | 3 --- 1 file changed, 3 deletions(-) diff --git a/daemon/libvirtd.service.in b/daemon/libvirtd.service.in index 64dbd27..33724ee 100644 --- a/daemon/libvirtd.service.in +++ b/daemon/libvirtd.service.in @@ -5,9 +5,6 @@ [Unit] Description=Virtualization daemon -After=syslog.target -After=avahi.target -After=dbus.target Before=libvirt-guests.service [Service] -- 1.7.10.1

2 1

[libvirt] [PATCH 0/3 v4] use qemu's dump-guest-meory when vm uses host device
by Wen Congyang 23 May '12

23 May '12

Currently, we use migrate to dump guest's memory. There is one restriction in migrate command: the device's status should be stored in qemu because the device's status should be passed to target machine. If we passthrough a host device to guest, the device's status is stored in the real device. So migrate command will fail. We usually use dump when guest is panicked. So there is no need to store device's status in the vmcore. qemu will have a new monitor command dump-guest-memory to dump guest memory, but it doesn't support async now(it will support later when the common async API is implemented). So I use dump-guest-memory only when the guest uses host device in this patchset. Note: the patchset for qemu is still queued. Luiz has acked, but he said he does not wait an ACK from Jan and/or Anthony. Changes from v3 to v4: 1. allow the user to specify the core file's format Changes from v2 to v3: 1. qemu supports the fd that is associated with a pipe, socket, or FIFO. So pass a pipe fd to qemu and O_DIRECT can work now. Change from v1 to v2: 1. remove the implemention for text mode. Wen Congyang (3): qemu: implement qemu's dump-guest-memory qemu: allow the client to choose the vmcore's format virsh: allow the user to specify vmcore's format include/libvirt/libvirt.h.in | 1 + src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 54 +++++++++++++++++++++++++++++++---------- src/qemu/qemu_monitor.c | 38 +++++++++++++++++++++++++++++ src/qemu/qemu_monitor.h | 12 +++++++++ src/qemu/qemu_monitor_json.c | 35 +++++++++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 6 ++++ tools/virsh.c | 3 ++ tools/virsh.pod | 5 +++- 10 files changed, 142 insertions(+), 14 deletions(-)

2 7

[libvirt] [libvirt-glib] Check arguments to public libvirt-gobject methods
by Christophe Fergeau 23 May '12

23 May '12

Some public methods in libvirt-gobject don't have g_return_if_fail checks on their arguments. It happens that GNOME Boxes tries to call gvir_connection_find_storage_pool_by_name with a NULL GVirConnection causing a crash https://bugzilla.gnome.org/show_bug.cgi?id=676216 While GNOME Boxes needs to be fixed not to pass an invalid value to this function, it's better if libvirt-object sanity checks the argument it is passed by the caller before using them. In this commit, I've went over all libvirt-gobject public functions to add g_return_if_fail checks where needed. --- libvirt-gobject/libvirt-gobject-connection.c | 122 +++++++++++++++++--- libvirt-gobject/libvirt-gobject-domain-device.c | 4 + libvirt-gobject/libvirt-gobject-domain-disk.c | 1 + libvirt-gobject/libvirt-gobject-domain-interface.c | 1 + libvirt-gobject/libvirt-gobject-domain-snapshot.c | 7 +- libvirt-gobject/libvirt-gobject-domain.c | 70 +++++++++-- libvirt-gobject/libvirt-gobject-interface.c | 13 ++- libvirt-gobject/libvirt-gobject-manager.c | 27 +++-- libvirt-gobject/libvirt-gobject-network-filter.c | 14 ++- libvirt-gobject/libvirt-gobject-network.c | 13 ++- libvirt-gobject/libvirt-gobject-node-device.c | 14 ++- libvirt-gobject/libvirt-gobject-secret.c | 6 +- libvirt-gobject/libvirt-gobject-storage-pool.c | 61 ++++++++-- libvirt-gobject/libvirt-gobject-storage-vol.c | 33 ++++-- libvirt-gobject/libvirt-gobject-stream.c | 6 + 15 files changed, 321 insertions(+), 71 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index b12669d..3a99034 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -407,7 +407,14 @@ gboolean gvir_connection_open(GVirConnection *conn, GCancellable *cancellable, GError **err) { - GVirConnectionPrivate *priv = conn->priv; + GVirConnectionPrivate *priv; + + g_return_val_if_fail(GVIR_IS_CONNECTION(conn), FALSE); + g_return_val_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable), + FALSE); + g_return_val_if_fail((err == NULL) || (*err == NULL), FALSE); + + priv = conn->priv; if (g_cancellable_set_error_if_cancelled(cancellable, err)) return FALSE; @@ -486,6 +493,9 @@ void gvir_connection_open_async(GVirConnection *conn, { GSimpleAsyncResult *res; + g_return_if_fail(GVIR_IS_CONNECTION(conn)); + g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); + res = g_simple_async_result_new(G_OBJECT(conn), callback, user_data, @@ -521,8 +531,12 @@ gboolean gvir_connection_open_finish(GVirConnection *conn, gboolean gvir_connection_is_open(GVirConnection *conn) { - GVirConnectionPrivate *priv = conn->priv; + GVirConnectionPrivate *priv; gboolean open = TRUE; + + g_return_val_if_fail(GVIR_IS_CONNECTION(conn), FALSE); + + priv = conn->priv; g_mutex_lock(priv->lock); if (!priv->conn) open = FALSE; @@ -532,7 +546,12 @@ gboolean gvir_connection_is_open(GVirConnection *conn) void gvir_connection_close(GVirConnection *conn) { - GVirConnectionPrivate *priv = conn->priv; + GVirConnectionPrivate *priv; + + g_return_if_fail(GVIR_IS_CONNECTION(conn)); + + priv = conn->priv; + g_debug("Close GVirConnection=%p", conn); g_mutex_lock(priv->lock); @@ -613,7 +632,7 @@ gboolean gvir_connection_fetch_domains(GVirConnection *conn, GCancellable *cancellable, GError **err) { - GVirConnectionPrivate *priv = conn->priv; + GVirConnectionPrivate *priv; GHashTable *doms; gchar **inactive = NULL; gint ninactive = 0; @@ -624,6 +643,12 @@ gboolean gvir_connection_fetch_domains(GVirConnection *conn, virConnectPtr vconn = NULL; GError *lerr = NULL; + g_return_val_if_fail(GVIR_IS_CONNECTION(conn), FALSE); + g_return_val_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable), + FALSE); + g_return_val_if_fail((err == NULL) || (*err == NULL), FALSE); + + priv = conn->priv; g_mutex_lock(priv->lock); if (!priv->conn) { g_set_error_literal(err, GVIR_CONNECTION_ERROR, @@ -742,7 +767,7 @@ gboolean gvir_connection_fetch_storage_pools(GVirConnection *conn, GCancellable *cancellable, GError **err) { - GVirConnectionPrivate *priv = conn->priv; + GVirConnectionPrivate *priv; GHashTable *pools; gchar **inactive = NULL; gint ninactive = 0; @@ -753,6 +778,12 @@ gboolean gvir_connection_fetch_storage_pools(GVirConnection *conn, virConnectPtr vconn = NULL; GError *lerr = NULL; + g_return_val_if_fail(GVIR_IS_CONNECTION(conn), FALSE); + g_return_val_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable), + FALSE); + g_return_val_if_fail((err == NULL) || (*err == NULL), FALSE); + + priv = conn->priv; g_mutex_lock(priv->lock); if (!priv->conn) { g_set_error_literal(err, GVIR_CONNECTION_ERROR, @@ -891,6 +922,9 @@ void gvir_connection_fetch_domains_async(GVirConnection *conn, { GSimpleAsyncResult *res; + g_return_if_fail(GVIR_IS_CONNECTION(conn)); + g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); + res = g_simple_async_result_new(G_OBJECT(conn), callback, user_data, @@ -950,6 +984,9 @@ void gvir_connection_fetch_storage_pools_async(GVirConnection *conn, { GSimpleAsyncResult *res; + g_return_if_fail(GVIR_IS_CONNECTION(conn)); + g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); + res = g_simple_async_result_new(G_OBJECT(conn), callback, user_data, @@ -983,8 +1020,9 @@ gboolean gvir_connection_fetch_storage_pools_finish(GVirConnection *conn, const gchar *gvir_connection_get_uri(GVirConnection *conn) { - GVirConnectionPrivate *priv = conn->priv; - return priv->uri; + g_return_val_if_fail(GVIR_IS_CONNECTION(conn), NULL); + + return conn->priv->uri; } static void gvir_domain_ref(gpointer obj, gpointer ignore G_GNUC_UNUSED) @@ -1004,9 +1042,12 @@ static void gvir_domain_ref(gpointer obj, gpointer ignore G_GNUC_UNUSED) */ GList *gvir_connection_get_domains(GVirConnection *conn) { - GVirConnectionPrivate *priv = conn->priv; + GVirConnectionPrivate *priv; GList *domains = NULL; + g_return_val_if_fail(GVIR_IS_CONNECTION(conn), NULL); + + priv = conn->priv; g_mutex_lock(priv->lock); if (priv->domains != NULL) { domains = g_hash_table_get_values(priv->domains); @@ -1030,9 +1071,12 @@ GList *gvir_connection_get_domains(GVirConnection *conn) */ GList *gvir_connection_get_storage_pools(GVirConnection *conn) { - GVirConnectionPrivate *priv = conn->priv; + GVirConnectionPrivate *priv; GList *pools = NULL; + g_return_val_if_fail(GVIR_IS_CONNECTION(conn), NULL); + + priv = conn->priv; g_mutex_lock(priv->lock); if (priv->pools != NULL) { pools = g_hash_table_get_values(priv->pools); @@ -1054,8 +1098,13 @@ GList *gvir_connection_get_storage_pools(GVirConnection *conn) GVirDomain *gvir_connection_get_domain(GVirConnection *conn, const gchar *uuid) { - GVirConnectionPrivate *priv = conn->priv; + GVirConnectionPrivate *priv; GVirDomain *dom; + + g_return_val_if_fail(GVIR_IS_CONNECTION(conn), NULL); + g_return_val_if_fail(uuid != NULL, NULL); + + priv = conn->priv; g_mutex_lock(priv->lock); dom = g_hash_table_lookup(priv->domains, uuid); if (dom) @@ -1075,9 +1124,13 @@ GVirDomain *gvir_connection_get_domain(GVirConnection *conn, GVirStoragePool *gvir_connection_get_storage_pool(GVirConnection *conn, const gchar *uuid) { - GVirConnectionPrivate *priv = conn->priv; + GVirConnectionPrivate *priv; GVirStoragePool *pool; + g_return_val_if_fail(GVIR_IS_CONNECTION(conn), NULL); + g_return_val_if_fail(uuid != NULL, NULL); + + priv = conn->priv; g_mutex_lock(priv->lock); pool = g_hash_table_lookup(priv->pools, uuid); if (pool) @@ -1098,10 +1151,13 @@ GVirStoragePool *gvir_connection_get_storage_pool(GVirConnection *conn, GVirDomain *gvir_connection_find_domain_by_id(GVirConnection *conn, gint id) { - GVirConnectionPrivate *priv = conn->priv; + GVirConnectionPrivate *priv; GHashTableIter iter; gpointer key, value; + g_return_val_if_fail(GVIR_IS_CONNECTION(conn), NULL); + + priv = conn->priv; g_mutex_lock(priv->lock); g_hash_table_iter_init(&iter, priv->domains); @@ -1132,10 +1188,14 @@ GVirDomain *gvir_connection_find_domain_by_id(GVirConnection *conn, GVirDomain *gvir_connection_find_domain_by_name(GVirConnection *conn, const gchar *name) { - GVirConnectionPrivate *priv = conn->priv; + GVirConnectionPrivate *priv; GHashTableIter iter; gpointer key, value; + g_return_val_if_fail(GVIR_IS_CONNECTION(conn), NULL); + g_return_val_if_fail(name != NULL, NULL); + + priv = conn->priv; g_mutex_lock(priv->lock); g_hash_table_iter_init(&iter, priv->domains); @@ -1168,10 +1228,14 @@ GVirDomain *gvir_connection_find_domain_by_name(GVirConnection *conn, GVirStoragePool *gvir_connection_find_storage_pool_by_name(GVirConnection *conn, const gchar *name) { - GVirConnectionPrivate *priv = conn->priv; + GVirConnectionPrivate *priv; GHashTableIter iter; gpointer key, value; + g_return_val_if_fail(GVIR_IS_CONNECTION(conn), NULL); + g_return_val_if_fail(name != NULL, NULL); + + priv = conn->priv; g_mutex_lock(priv->lock); g_hash_table_iter_init(&iter, priv->pools); @@ -1253,12 +1317,17 @@ GVirDomain *gvir_connection_create_domain(GVirConnection *conn, { gchar *xml; virDomainPtr handle; - GVirConnectionPrivate *priv = conn->priv; + GVirConnectionPrivate *priv; + + g_return_val_if_fail(GVIR_IS_CONNECTION(conn), NULL); + g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN(conf), NULL); + g_return_val_if_fail((err == NULL) || (*err == NULL), NULL); xml = gvir_config_object_to_xml(GVIR_CONFIG_OBJECT(conf)); g_return_val_if_fail(xml != NULL, NULL); + priv = conn->priv; handle = virDomainDefineXML(priv->conn, xml); g_free(xml); if (!handle) { @@ -1302,12 +1371,17 @@ GVirDomain *gvir_connection_start_domain(GVirConnection *conn, { gchar *xml; virDomainPtr handle; - GVirConnectionPrivate *priv = conn->priv; + GVirConnectionPrivate *priv; + + g_return_val_if_fail(GVIR_IS_CONNECTION(conn), NULL); + g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN(conf), NULL); + g_return_val_if_fail((err == NULL) || (*err == NULL), NULL); xml = gvir_config_object_to_xml(GVIR_CONFIG_OBJECT(conf)); g_return_val_if_fail(xml != NULL, NULL); + priv = conn->priv; handle = virDomainCreateXML(priv->conn, xml, flags); g_free(xml); if (!handle) { @@ -1350,12 +1424,17 @@ GVirStoragePool *gvir_connection_create_storage_pool GError **err) { const gchar *xml; virStoragePoolPtr handle; - GVirConnectionPrivate *priv = conn->priv; + GVirConnectionPrivate *priv; + + g_return_val_if_fail(GVIR_IS_CONNECTION(conn), NULL); + g_return_val_if_fail(GVIR_CONFIG_IS_STORAGE_POOL(conf), NULL); + g_return_val_if_fail((err == NULL) || (*err == NULL), NULL); xml = gvir_config_object_to_xml(GVIR_CONFIG_OBJECT(conf)); g_return_val_if_fail(xml != NULL, NULL); + priv = conn->priv; if (!(handle = virStoragePoolDefineXML(priv->conn, xml, flags))) { gvir_set_error_literal(err, GVIR_CONNECTION_ERROR, flags, @@ -1390,10 +1469,14 @@ GVirStoragePool *gvir_connection_create_storage_pool GVirNodeInfo *gvir_connection_get_node_info(GVirConnection *conn, GError **err) { - GVirConnectionPrivate *priv = conn->priv; + GVirConnectionPrivate *priv; virNodeInfo info; GVirNodeInfo *ret; + g_return_val_if_fail(GVIR_IS_CONNECTION(conn), NULL); + g_return_val_if_fail((err == NULL) || (*err == NULL), NULL); + + priv = conn->priv; if (virNodeGetInfo(priv->conn, &info) < 0) { gvir_set_error_literal(err, GVIR_CONNECTION_ERROR, 0, @@ -1480,6 +1563,9 @@ void gvir_connection_get_capabilities_async(GVirConnection *conn, { GSimpleAsyncResult *res; + g_return_if_fail(GVIR_IS_CONNECTION(conn)); + g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); + res = g_simple_async_result_new(G_OBJECT(conn), callback, user_data, diff --git a/libvirt-gobject/libvirt-gobject-domain-device.c b/libvirt-gobject/libvirt-gobject-domain-device.c index 9a65468..f2f3dfc 100644 --- a/libvirt-gobject/libvirt-gobject-domain-device.c +++ b/libvirt-gobject/libvirt-gobject-domain-device.c @@ -167,6 +167,8 @@ virDomainPtr gvir_domain_device_get_domain_handle(GVirDomainDevice *self) */ GVirDomain *gvir_domain_device_get_domain(GVirDomainDevice *device) { + g_return_val_if_fail(GVIR_IS_DOMAIN_DEVICE(device), NULL); + return g_object_ref (device->priv->domain); } @@ -180,6 +182,8 @@ GVirDomain *gvir_domain_device_get_domain(GVirDomainDevice *device) */ GVirConfigDomainDevice *gvir_domain_device_get_config(GVirDomainDevice *device) { + g_return_val_if_fail(GVIR_IS_DOMAIN_DEVICE(device), NULL); + return g_object_ref (device->priv->config); } diff --git a/libvirt-gobject/libvirt-gobject-domain-disk.c b/libvirt-gobject/libvirt-gobject-domain-disk.c index 607e26c..46b47fd 100644 --- a/libvirt-gobject/libvirt-gobject-domain-disk.c +++ b/libvirt-gobject/libvirt-gobject-domain-disk.c @@ -124,6 +124,7 @@ GVirDomainDiskStats *gvir_domain_disk_get_stats(GVirDomainDisk *self, GError **e const gchar *path; g_return_val_if_fail(GVIR_IS_DOMAIN_DISK(self), NULL); + g_return_val_if_fail((err == NULL) || (*err == NULL), NULL); handle = gvir_domain_device_get_domain_handle(GVIR_DOMAIN_DEVICE(self)); path = gvir_domain_disk_get_path (self); diff --git a/libvirt-gobject/libvirt-gobject-domain-interface.c b/libvirt-gobject/libvirt-gobject-domain-interface.c index 7087cbc..3ae9a46 100644 --- a/libvirt-gobject/libvirt-gobject-domain-interface.c +++ b/libvirt-gobject/libvirt-gobject-domain-interface.c @@ -126,6 +126,7 @@ GVirDomainInterfaceStats *gvir_domain_interface_get_stats(GVirDomainInterface *s const gchar *path; g_return_val_if_fail(GVIR_IS_DOMAIN_INTERFACE(self), NULL); + g_return_val_if_fail(err == NULL || *err == NULL, NULL); handle = gvir_domain_device_get_domain_handle(GVIR_DOMAIN_DEVICE(self)); path = gvir_domain_interface_get_path (self); diff --git a/libvirt-gobject/libvirt-gobject-domain-snapshot.c b/libvirt-gobject/libvirt-gobject-domain-snapshot.c index d06d4d5..11a073c 100644 --- a/libvirt-gobject/libvirt-gobject-domain-snapshot.c +++ b/libvirt-gobject/libvirt-gobject-domain-snapshot.c @@ -161,6 +161,7 @@ G_DEFINE_BOXED_TYPE(GVirDomainSnapshotHandle, gvir_domain_snapshot_handle, const gchar *gvir_domain_snapshot_get_name(GVirDomainSnapshot *snapshot) { + g_return_val_if_fail(GVIR_IS_DOMAIN_SNAPSHOT(snapshot), NULL); #if 0 GVirDomainSnapshotPrivate *priv = snapshot->priv; const char *name; @@ -194,9 +195,13 @@ GVirConfigDomainSnapshot *gvir_domain_snapshot_get_config guint flags, GError **err) { - GVirDomainSnapshotPrivate *priv = snapshot->priv; + GVirDomainSnapshotPrivate *priv; gchar *xml; + g_return_val_if_fail(GVIR_IS_DOMAIN_SNAPSHOT(snapshot), NULL); + g_return_val_if_fail(err == NULL || *err == NULL, NULL); + + priv = snapshot->priv; if (!(xml = virDomainSnapshotGetXMLDesc(priv->handle, flags))) { gvir_set_error_literal(err, GVIR_DOMAIN_SNAPSHOT_ERROR, 0, diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index 9be568a..59af63f 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -274,9 +274,12 @@ G_DEFINE_BOXED_TYPE(GVirDomainInfo, gvir_domain_info, const gchar *gvir_domain_get_name(GVirDomain *dom) { - GVirDomainPrivate *priv = dom->priv; + GVirDomainPrivate *priv; const char *name; + g_return_val_if_fail(GVIR_IS_DOMAIN(dom), NULL); + + priv = dom->priv; if (!(name = virDomainGetName(priv->handle))) { g_warning("Failed to get domain name on %p", priv->handle); return NULL; @@ -296,9 +299,13 @@ const gchar *gvir_domain_get_uuid(GVirDomain *dom) gint gvir_domain_get_id(GVirDomain *dom, GError **err) { - GVirDomainPrivate *priv = dom->priv; + GVirDomainPrivate *priv; gint ret; + g_return_val_if_fail(GVIR_IS_DOMAIN(dom), -1); + g_return_val_if_fail(err == NULL || *err == NULL, -1); + + priv = dom->priv; if ((ret = virDomainGetID(priv->handle)) < 0) { gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, 0, @@ -317,9 +324,13 @@ gboolean gvir_domain_start(GVirDomain *dom, guint flags, GError **err) { - GVirDomainPrivate *priv = dom->priv; + GVirDomainPrivate *priv; int ret; + g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); + + priv = dom->priv; if (flags) ret = virDomainCreateWithFlags(priv->handle, flags); else @@ -344,8 +355,12 @@ gboolean gvir_domain_start(GVirDomain *dom, gboolean gvir_domain_resume(GVirDomain *dom, GError **err) { - GVirDomainPrivate *priv = dom->priv; + GVirDomainPrivate *priv; + g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); + + priv = dom->priv; if (virDomainResume(priv->handle) < 0) { gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, 0, @@ -365,9 +380,13 @@ gboolean gvir_domain_stop(GVirDomain *dom, guint flags, GError **err) { - GVirDomainPrivate *priv = dom->priv; + GVirDomainPrivate *priv; int ret; + g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); + + priv = dom->priv; if (flags) ret = virDomainDestroyFlags(priv->handle, flags); else @@ -391,9 +410,13 @@ gboolean gvir_domain_delete(GVirDomain *dom, guint flags, GError **err) { - GVirDomainPrivate *priv = dom->priv; + GVirDomainPrivate *priv; int ret; + g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); + + priv = dom->priv; if (flags) ret = virDomainUndefineFlags(priv->handle, flags); else @@ -417,8 +440,12 @@ gboolean gvir_domain_shutdown(GVirDomain *dom, guint flags G_GNUC_UNUSED, GError **err) { - GVirDomainPrivate *priv = dom->priv; + GVirDomainPrivate *priv; + + g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); + priv = dom->priv; if (virDomainShutdown(priv->handle) < 0) { gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, 0, @@ -438,8 +465,12 @@ gboolean gvir_domain_reboot(GVirDomain *dom, guint flags, GError **err) { - GVirDomainPrivate *priv = dom->priv; + GVirDomainPrivate *priv; + + g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); + priv = dom->priv; if (virDomainReboot(priv->handle, flags) < 0) { gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, 0, @@ -462,9 +493,13 @@ GVirConfigDomain *gvir_domain_get_config(GVirDomain *dom, guint flags, GError **err) { - GVirDomainPrivate *priv = dom->priv; + GVirDomainPrivate *priv; gchar *xml; + g_return_val_if_fail(GVIR_IS_DOMAIN(dom), NULL); + g_return_val_if_fail(err == NULL || *err == NULL, NULL); + + priv = dom->priv; if (!(xml = virDomainGetXMLDesc(priv->handle, flags))) { gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, 0, @@ -501,12 +536,13 @@ gboolean gvir_domain_set_config(GVirDomain *domain, virConnectPtr conn; virDomainPtr handle; gchar uuid[VIR_UUID_STRING_BUFLEN]; - GVirDomainPrivate *priv = domain->priv; + GVirDomainPrivate *priv; g_return_val_if_fail(GVIR_IS_DOMAIN (domain), FALSE); g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN (conf), FALSE); g_return_val_if_fail(err == NULL || *err == NULL, FALSE); + priv = domain->priv; xml = gvir_config_object_to_xml(GVIR_CONFIG_OBJECT(conf)); g_return_val_if_fail(xml != NULL, FALSE); @@ -556,10 +592,14 @@ gboolean gvir_domain_set_config(GVirDomain *domain, GVirDomainInfo *gvir_domain_get_info(GVirDomain *dom, GError **err) { - GVirDomainPrivate *priv = dom->priv; + GVirDomainPrivate *priv; virDomainInfo info; GVirDomainInfo *ret; + g_return_val_if_fail(GVIR_IS_DOMAIN(dom), NULL); + g_return_val_if_fail(err == NULL || *err == NULL, NULL); + + priv = dom->priv; if (virDomainGetInfo(priv->handle, &info) < 0) { gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, 0, @@ -613,6 +653,7 @@ void gvir_domain_get_info_async(GVirDomain *dom, GSimpleAsyncResult *res; g_return_if_fail(GVIR_IS_DOMAIN(dom)); + g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); res = g_simple_async_result_new(G_OBJECT(dom), callback, @@ -679,6 +720,7 @@ gchar *gvir_domain_screenshot(GVirDomain *dom, g_return_val_if_fail(GVIR_IS_DOMAIN(dom), NULL); g_return_val_if_fail(GVIR_IS_STREAM(stream), NULL); + g_return_val_if_fail(err == NULL || *err == NULL, NULL); priv = dom->priv; g_object_get(stream, "handle", &st, NULL); @@ -725,6 +767,7 @@ gboolean gvir_domain_open_console(GVirDomain *dom, g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); g_return_val_if_fail(GVIR_IS_STREAM(stream), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); priv = dom->priv; g_object_get(stream, "handle", &st, NULL); @@ -769,6 +812,7 @@ gboolean gvir_domain_open_graphics(GVirDomain *dom, gboolean ret = FALSE; g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); priv = dom->priv; @@ -804,6 +848,7 @@ gboolean gvir_domain_suspend (GVirDomain *dom, gboolean ret = FALSE; g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); if (virDomainSuspend(dom->priv->handle) < 0) { gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, @@ -834,6 +879,7 @@ gboolean gvir_domain_save (GVirDomain *dom, GError **err) { g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); if (virDomainManagedSave(dom->priv->handle, flags) < 0) { gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, @@ -889,6 +935,7 @@ void gvir_domain_save_async (GVirDomain *dom, DomainSaveData *data; g_return_if_fail(GVIR_IS_DOMAIN(dom)); + g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); data = g_slice_new0(DomainSaveData); data->flags = flags; @@ -923,6 +970,7 @@ gboolean gvir_domain_save_finish (GVirDomain *dom, g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(dom), gvir_domain_save_async), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), err)) return FALSE; diff --git a/libvirt-gobject/libvirt-gobject-interface.c b/libvirt-gobject/libvirt-gobject-interface.c index 883cf92..ecabb41 100644 --- a/libvirt-gobject/libvirt-gobject-interface.c +++ b/libvirt-gobject/libvirt-gobject-interface.c @@ -159,11 +159,12 @@ G_DEFINE_BOXED_TYPE(GVirInterfaceHandle, gvir_interface_handle, const gchar *gvir_interface_get_name(GVirInterface *iface) { - GVirInterfacePrivate *priv = iface->priv; const char *name; - if (!(name = virInterfaceGetName(priv->handle))) { - g_warning("Failed to get interface name on %p", priv->handle); + g_return_val_if_fail(GVIR_IS_INTERFACE(iface), NULL); + + if (!(name = virInterfaceGetName(iface->priv->handle))) { + g_warning("Failed to get interface name on %p", iface->priv->handle); return NULL; } @@ -184,9 +185,13 @@ GVirConfigInterface *gvir_interface_get_config(GVirInterface *iface, guint flags, GError **err) { - GVirInterfacePrivate *priv = iface->priv; + GVirInterfacePrivate *priv; gchar *xml; + g_return_val_if_fail(GVIR_IS_INTERFACE(iface), NULL); + g_return_val_if_fail(err == NULL || *err == NULL, NULL); + + priv = iface->priv; if (!(xml = virInterfaceGetXMLDesc(priv->handle, flags))) { gvir_set_error_literal(err, GVIR_INTERFACE_ERROR, 0, diff --git a/libvirt-gobject/libvirt-gobject-manager.c b/libvirt-gobject/libvirt-gobject-manager.c index c44e711..d0a2839 100644 --- a/libvirt-gobject/libvirt-gobject-manager.c +++ b/libvirt-gobject/libvirt-gobject-manager.c @@ -131,8 +131,12 @@ GVirManager *gvir_manager_new(void) void gvir_manager_add_connection(GVirManager *man, GVirConnection *conn) { - GVirManagerPrivate *priv = man->priv; + GVirManagerPrivate *priv; + + g_return_if_fail(GVIR_IS_MANAGER(man)); + g_return_if_fail(GVIR_IS_CONNECTION(conn)); + priv = man->priv; g_mutex_lock(priv->lock); g_object_ref(conn); priv->connections = g_list_append(priv->connections, conn); @@ -147,8 +151,12 @@ void gvir_manager_add_connection(GVirManager *man, void gvir_manager_remove_connection(GVirManager *man, GVirConnection *conn) { - GVirManagerPrivate *priv = man->priv; + GVirManagerPrivate *priv; + + g_return_if_fail(GVIR_IS_MANAGER(man)); + g_return_if_fail(GVIR_IS_CONNECTION(conn)); + priv = man->priv; g_mutex_lock(priv->lock); priv->connections = g_list_remove(priv->connections, conn); g_mutex_unlock(priv->lock); @@ -167,16 +175,18 @@ void gvir_manager_remove_connection(GVirManager *man, */ GList *gvir_manager_get_connections(GVirManager *man) { - GVirManagerPrivate *priv = man->priv; + GList *tmp; - GList *tmp = priv->connections; + g_return_val_if_fail(GVIR_IS_MANAGER(man), NULL); + + tmp = man->priv->connections; while (tmp) { GVirConnection *conn = tmp->data; g_object_ref(conn); tmp = tmp->next; } - return g_list_copy(priv->connections); + return g_list_copy(man->priv->connections); } @@ -190,9 +200,12 @@ GList *gvir_manager_get_connections(GVirManager *man) GVirConnection *gvir_manager_find_connection_by_uri(GVirManager *man, const gchar *uri) { - GVirManagerPrivate *priv = man->priv; + GList *tmp; - GList *tmp = priv->connections; + g_return_val_if_fail(GVIR_IS_MANAGER(man), NULL); + g_return_val_if_fail(uri != NULL, NULL); + + tmp = man->priv->connections; while (tmp) { GVirConnection *conn = tmp->data; if (g_strcmp0(gvir_connection_get_uri(conn), uri) == 0) diff --git a/libvirt-gobject/libvirt-gobject-network-filter.c b/libvirt-gobject/libvirt-gobject-network-filter.c index b3db236..00b1ed2 100644 --- a/libvirt-gobject/libvirt-gobject-network-filter.c +++ b/libvirt-gobject/libvirt-gobject-network-filter.c @@ -182,11 +182,13 @@ G_DEFINE_BOXED_TYPE(GVirNetworkFilterHandle, gvir_network_filter_handle, const gchar *gvir_network_filter_get_name(GVirNetworkFilter *filter) { - GVirNetworkFilterPrivate *priv = filter->priv; const char *name; - if (!(name = virNWFilterGetName(priv->handle))) { - g_warning("Failed to get network_filter name on %p", priv->handle); + g_return_val_if_fail(GVIR_IS_NETWORK_FILTER(filter), NULL); + + if (!(name = virNWFilterGetName(filter->priv->handle))) { + g_warning("Failed to get network_filter name on %p", + filter->priv->handle); return NULL; } @@ -217,9 +219,13 @@ GVirConfigNetworkFilter *gvir_network_filter_get_config guint flags, GError **err) { - GVirNetworkFilterPrivate *priv = filter->priv; + GVirNetworkFilterPrivate *priv; gchar *xml; + g_return_val_if_fail(GVIR_IS_NETWORK_FILTER(filter), NULL); + g_return_val_if_fail(err == NULL || *err == NULL, NULL); + + priv = filter->priv; if (!(xml = virNWFilterGetXMLDesc(priv->handle, flags))) { gvir_set_error_literal(err, GVIR_NETWORK_FILTER_ERROR, 0, diff --git a/libvirt-gobject/libvirt-gobject-network.c b/libvirt-gobject/libvirt-gobject-network.c index 17378ec..9625ece 100644 --- a/libvirt-gobject/libvirt-gobject-network.c +++ b/libvirt-gobject/libvirt-gobject-network.c @@ -180,11 +180,12 @@ G_DEFINE_BOXED_TYPE(GVirNetworkHandle, gvir_network_handle, const gchar *gvir_network_get_name(GVirNetwork *network) { - GVirNetworkPrivate *priv = network->priv; const char *name; - if (!(name = virNetworkGetName(priv->handle))) { - g_warning("Failed to get network name on %p", priv->handle); + g_return_val_if_fail(GVIR_IS_NETWORK(network), NULL); + + if (!(name = virNetworkGetName(network->priv->handle))) { + g_warning("Failed to get network name on %p", network->priv->handle); return NULL; } @@ -212,9 +213,13 @@ GVirConfigNetwork *gvir_network_get_config(GVirNetwork *network, guint flags, GError **err) { - GVirNetworkPrivate *priv = network->priv; + GVirNetworkPrivate *priv; gchar *xml; + g_return_val_if_fail(GVIR_IS_NETWORK(network), NULL); + g_return_val_if_fail(err == NULL || *err == NULL, NULL); + + priv = network->priv; if (!(xml = virNetworkGetXMLDesc(priv->handle, flags))) { gvir_set_error_literal(err, GVIR_NETWORK_ERROR, 0, diff --git a/libvirt-gobject/libvirt-gobject-node-device.c b/libvirt-gobject/libvirt-gobject-node-device.c index 0a4b6a6..eb314ed 100644 --- a/libvirt-gobject/libvirt-gobject-node-device.c +++ b/libvirt-gobject/libvirt-gobject-node-device.c @@ -159,11 +159,13 @@ G_DEFINE_BOXED_TYPE(GVirNodeDeviceHandle, gvir_node_device_handle, const gchar *gvir_node_device_get_name(GVirNodeDevice *device) { - GVirNodeDevicePrivate *priv = device->priv; const char *name; - if (!(name = virNodeDeviceGetName(priv->handle))) { - g_warning("Failed to get node_device name on %p", priv->handle); + g_return_val_if_fail(GVIR_IS_NODE_DEVICE(device), NULL); + + if (!(name = virNodeDeviceGetName(device->priv->handle))) { + g_warning("Failed to get node_device name on %p", + device->priv->handle); return NULL; } @@ -185,9 +187,13 @@ GVirConfigNodeDevice *gvir_node_device_get_config(GVirNodeDevice *device, guint flags, GError **err) { - GVirNodeDevicePrivate *priv = device->priv; + GVirNodeDevicePrivate *priv; gchar *xml; + g_return_val_if_fail(GVIR_IS_NODE_DEVICE(device), NULL); + g_return_val_if_fail(err == NULL || *err == NULL, NULL); + + priv = device->priv; if (!(xml = virNodeDeviceGetXMLDesc(priv->handle, flags))) { gvir_set_error_literal(err, GVIR_NODE_DEVICE_ERROR, 0, diff --git a/libvirt-gobject/libvirt-gobject-secret.c b/libvirt-gobject/libvirt-gobject-secret.c index b0aff13..8bfee88 100644 --- a/libvirt-gobject/libvirt-gobject-secret.c +++ b/libvirt-gobject/libvirt-gobject-secret.c @@ -201,9 +201,13 @@ GVirConfigSecret *gvir_secret_get_config(GVirSecret *secret, guint flags, GError **err) { - GVirSecretPrivate *priv = secret->priv; + GVirSecretPrivate *priv; gchar *xml; + g_return_val_if_fail(GVIR_IS_SECRET(secret), NULL); + g_return_val_if_fail(err == NULL || *err == NULL, NULL); + + priv = secret->priv; if (!(xml = virSecretGetXMLDesc(priv->handle, flags))) { gvir_set_error_literal(err, GVIR_SECRET_ERROR, 0, diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.c b/libvirt-gobject/libvirt-gobject-storage-pool.c index e79c8e5..7f50037 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.c +++ b/libvirt-gobject/libvirt-gobject-storage-pool.c @@ -211,11 +211,12 @@ G_DEFINE_BOXED_TYPE(GVirStoragePoolInfo, gvir_storage_pool_info, const gchar *gvir_storage_pool_get_name(GVirStoragePool *pool) { - GVirStoragePoolPrivate *priv = pool->priv; const char *name; - if (!(name = virStoragePoolGetName(priv->handle))) { - g_warning("Failed to get storage_pool name on %p", priv->handle); + g_return_val_if_fail(GVIR_IS_STORAGE_POOL(pool), NULL); + + if (!(name = virStoragePoolGetName(pool->priv->handle))) { + g_warning("Failed to get storage_pool name on %p", pool->priv->handle); return NULL; } @@ -244,9 +245,13 @@ GVirConfigStoragePool *gvir_storage_pool_get_config(GVirStoragePool *pool, guint flags, GError **err) { - GVirStoragePoolPrivate *priv = pool->priv; + GVirStoragePoolPrivate *priv; gchar *xml; + g_return_val_if_fail(GVIR_IS_STORAGE_POOL(pool), NULL); + g_return_val_if_fail(err == NULL || *err == NULL, NULL); + + priv = pool->priv; if (!(xml = virStoragePoolGetXMLDesc(priv->handle, flags))) { gvir_set_error_literal(err, GVIR_STORAGE_POOL_ERROR, 0, @@ -271,10 +276,14 @@ GVirConfigStoragePool *gvir_storage_pool_get_config(GVirStoragePool *pool, GVirStoragePoolInfo *gvir_storage_pool_get_info(GVirStoragePool *pool, GError **err) { - GVirStoragePoolPrivate *priv = pool->priv; + GVirStoragePoolPrivate *priv; virStoragePoolInfo info; GVirStoragePoolInfo *ret; + g_return_val_if_fail(GVIR_IS_STORAGE_POOL(pool), NULL); + g_return_val_if_fail(err == NULL || *err == NULL, NULL); + + priv = pool->priv; if (virStoragePoolGetInfo(priv->handle, &info) < 0) { if (err) *err = gvir_error_new_literal(GVIR_STORAGE_POOL_ERROR, @@ -346,7 +355,7 @@ gboolean gvir_storage_pool_refresh(GVirStoragePool *pool, GCancellable *cancellable, GError **err) { - GVirStoragePoolPrivate *priv = pool->priv; + GVirStoragePoolPrivate *priv; GHashTable *vol_hash; gchar **volumes = NULL; gint nvolumes = 0; @@ -355,6 +364,12 @@ gboolean gvir_storage_pool_refresh(GVirStoragePool *pool, virStoragePoolPtr vpool = NULL; GError *lerr = NULL; + g_return_val_if_fail(GVIR_IS_STORAGE_POOL(pool), FALSE); + g_return_val_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable), + FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); + + priv = pool->priv; vpool = priv->handle; if (virStoragePoolRefresh(vpool, 0) < 0) { @@ -447,6 +462,9 @@ void gvir_storage_pool_refresh_async(GVirStoragePool *pool, { GSimpleAsyncResult *res; + g_return_if_fail(GVIR_IS_STORAGE_POOL(pool)); + g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); + res = g_simple_async_result_new(G_OBJECT(pool), callback, user_data, @@ -495,9 +513,12 @@ static void gvir_storage_vol_ref(gpointer obj, gpointer ignore G_GNUC_UNUSED) */ GList *gvir_storage_pool_get_volumes(GVirStoragePool *pool) { - GVirStoragePoolPrivate *priv = pool->priv; + GVirStoragePoolPrivate *priv; GList *volumes = NULL; + g_return_val_if_fail(GVIR_IS_STORAGE_POOL(pool), NULL); + + priv = pool->priv; g_mutex_lock(priv->lock); if (priv->volumes != NULL) { volumes = g_hash_table_get_values(priv->volumes); @@ -520,9 +541,12 @@ GList *gvir_storage_pool_get_volumes(GVirStoragePool *pool) GVirStorageVol *gvir_storage_pool_get_volume(GVirStoragePool *pool, const gchar *name) { - GVirStoragePoolPrivate *priv = pool->priv; + GVirStoragePoolPrivate *priv; GVirStorageVol *volume; + g_return_val_if_fail(GVIR_IS_STORAGE_POOL(pool), NULL); + + priv = pool->priv; g_mutex_lock(priv->lock); volume = g_hash_table_lookup(priv->volumes, name); if (volume) @@ -548,12 +572,17 @@ GVirStorageVol *gvir_storage_pool_create_volume { const gchar *xml; virStorageVolPtr handle; - GVirStoragePoolPrivate *priv = pool->priv; + GVirStoragePoolPrivate *priv; + + g_return_val_if_fail(GVIR_IS_STORAGE_POOL(pool), NULL); + g_return_val_if_fail(GVIR_CONFIG_IS_STORAGE_VOL(conf), NULL); + g_return_val_if_fail(err == NULL || *err == NULL, NULL); xml = gvir_config_object_to_xml(GVIR_CONFIG_OBJECT(conf)); g_return_val_if_fail(xml != NULL, NULL); + priv = pool->priv; if (!(handle = virStorageVolCreateXML(priv->handle, xml, 0))) { gvir_set_error_literal(err, GVIR_STORAGE_POOL_ERROR, 0, @@ -593,6 +622,9 @@ gboolean gvir_storage_pool_build (GVirStoragePool *pool, guint flags, GError **err) { + g_return_val_if_fail(GVIR_IS_STORAGE_POOL(pool), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); + if (virStoragePoolBuild(pool->priv->handle, flags)) { gvir_set_error_literal(err, GVIR_STORAGE_POOL_ERROR, 0, @@ -644,6 +676,9 @@ void gvir_storage_pool_build_async (GVirStoragePool *pool, GSimpleAsyncResult *res; StoragePoolBuildData *data; + g_return_if_fail(GVIR_IS_STORAGE_POOL(pool)); + g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); + data = g_slice_new0(StoragePoolBuildData); data->flags = flags; @@ -675,6 +710,7 @@ gboolean gvir_storage_pool_build_finish(GVirStoragePool *pool, g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(pool), gvir_storage_pool_build_async), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), err)) @@ -695,6 +731,9 @@ gboolean gvir_storage_pool_start (GVirStoragePool *pool, guint flags, GError **err) { + g_return_val_if_fail(GVIR_IS_STORAGE_POOL(pool), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); + if (virStoragePoolCreate(pool->priv->handle, flags)) { gvir_set_error_literal(err, GVIR_STORAGE_POOL_ERROR, 0, @@ -742,6 +781,9 @@ void gvir_storage_pool_start_async (GVirStoragePool *pool, GSimpleAsyncResult *res; StoragePoolBuildData *data; + g_return_if_fail(GVIR_IS_STORAGE_POOL(pool)); + g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); + data = g_slice_new0(StoragePoolBuildData); data->flags = flags; @@ -773,6 +815,7 @@ gboolean gvir_storage_pool_start_finish(GVirStoragePool *pool, g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(pool), gvir_storage_pool_start_async), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), err)) diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.c b/libvirt-gobject/libvirt-gobject-storage-vol.c index 9e59576..6f60fcd 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.c +++ b/libvirt-gobject/libvirt-gobject-storage-vol.c @@ -195,11 +195,12 @@ G_DEFINE_BOXED_TYPE(GVirStorageVolInfo, gvir_storage_vol_info, const gchar *gvir_storage_vol_get_name(GVirStorageVol *vol) { - GVirStorageVolPrivate *priv = vol->priv; const char *name; - if (!(name = virStorageVolGetName(priv->handle))) { - g_warning("Failed to get storage_vol name on %p", priv->handle); + g_return_val_if_fail(GVIR_IS_STORAGE_VOL(vol), NULL); + + if (!(name = virStorageVolGetName(vol->priv->handle))) { + g_warning("Failed to get storage_vol name on %p", vol->priv->handle); return NULL; } @@ -208,13 +209,15 @@ const gchar *gvir_storage_vol_get_name(GVirStorageVol *vol) const gchar *gvir_storage_vol_get_path(GVirStorageVol *vol, GError **error) { - GVirStorageVolPrivate *priv = vol->priv; const char *path; - if (!(path = virStorageVolGetPath(priv->handle))) { + g_return_val_if_fail(GVIR_IS_STORAGE_VOL(vol), NULL); + g_return_val_if_fail(error == NULL || *error == NULL, NULL); + + if (!(path = virStorageVolGetPath(vol->priv->handle))) { gvir_set_error(error, GVIR_STORAGE_VOL_ERROR, 0, "Failed to get storage_vol path on %p", - priv->handle); + vol->priv->handle); return NULL; } @@ -234,9 +237,13 @@ GVirConfigStorageVol *gvir_storage_vol_get_config(GVirStorageVol *vol, guint flags, GError **err) { - GVirStorageVolPrivate *priv = vol->priv; + GVirStorageVolPrivate *priv; gchar *xml; + g_return_val_if_fail(GVIR_IS_STORAGE_VOL(vol), NULL); + g_return_val_if_fail(err == NULL || *err == NULL, NULL); + + priv = vol->priv; if (!(xml = virStorageVolGetXMLDesc(priv->handle, flags))) { gvir_set_error_literal(err, GVIR_STORAGE_VOL_ERROR, 0, @@ -261,10 +268,14 @@ GVirConfigStorageVol *gvir_storage_vol_get_config(GVirStorageVol *vol, GVirStorageVolInfo *gvir_storage_vol_get_info(GVirStorageVol *vol, GError **err) { - GVirStorageVolPrivate *priv = vol->priv; + GVirStorageVolPrivate *priv; virStorageVolInfo info; GVirStorageVolInfo *ret; + g_return_val_if_fail(GVIR_IS_STORAGE_VOL(vol), NULL); + g_return_val_if_fail(err == NULL || *err == NULL, NULL); + + priv = vol->priv; if (virStorageVolGetInfo(priv->handle, &info) < 0) { if (err) *err = gvir_error_new_literal(GVIR_STORAGE_VOL_ERROR, @@ -295,6 +306,9 @@ gboolean gvir_storage_vol_delete(GVirStorageVol *vol, guint flags, GError **err) { + g_return_val_if_fail(GVIR_IS_STORAGE_VOL(vol), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); + if (virStorageVolDelete(vol->priv->handle, flags) < 0) { gvir_set_error_literal(err, GVIR_STORAGE_VOL_ERROR, @@ -322,6 +336,9 @@ gboolean gvir_storage_vol_resize(GVirStorageVol *vol, guint flags, GError **err) { + g_return_val_if_fail(GVIR_IS_STORAGE_VOL(vol), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); + if (virStorageVolResize(vol->priv->handle, capacity, flags) < 0) { gvir_set_error_literal(err, GVIR_STORAGE_VOL_ERROR, diff --git a/libvirt-gobject/libvirt-gobject-stream.c b/libvirt-gobject/libvirt-gobject-stream.c index 60da4bc..3b98023 100644 --- a/libvirt-gobject/libvirt-gobject-stream.c +++ b/libvirt-gobject/libvirt-gobject-stream.c @@ -379,7 +379,9 @@ gvir_stream_receive_all(GVirStream *self, int r; g_return_val_if_fail(GVIR_IS_STREAM(self), -1); + g_return_val_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable), -1); g_return_val_if_fail(func != NULL, -1); + g_return_val_if_fail(error == NULL || *error == NULL, -1); r = virStreamRecvAll(self->priv->handle, stream_sink, &helper); if (r < 0) { @@ -424,6 +426,8 @@ gssize gvir_stream_send(GVirStream *self, g_return_val_if_fail(GVIR_IS_STREAM(self), -1); g_return_val_if_fail(buffer != NULL, -1); + g_return_val_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable), -1); + g_return_val_if_fail(error == NULL || *error == NULL, -1); if (g_cancellable_set_error_if_cancelled (cancellable, error)) return -1; @@ -491,7 +495,9 @@ gvir_stream_send_all(GVirStream *self, int r; g_return_val_if_fail(GVIR_IS_STREAM(self), -1); + g_return_val_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable), -1); g_return_val_if_fail(func != NULL, -1); + g_return_val_if_fail(error == NULL || *error == NULL, -1); r = virStreamSendAll(self->priv->handle, stream_source, &helper); if (r < 0) { -- 1.7.10.1

2 1

[libvirt] [PATCH v2 0/2] Rework RPC message buffer
by Michal Privoznik 23 May '12

23 May '12

This patch set tries to fix corner cases where libvirt runs on huge system, e.g. 4K CPU monster. In these cases, capabilities XML is enormously big, as we are transferring info about each singe CPU core (to which NUMA node it belongs, etc.). This XML is bigger than our RPC limit, therefore users cannot get it as it is dropped on server, leaving them with inability to connect. Therefore we need to increase those limits (whole RPC message and RPC string). However, simple lifting up will work, but increase mem usage. Therefore I've reworked RPC buffer handling: changed it from 'statically' to dynamically allocated. So in most cases - when small messages are sent - this will even decrease our memory consumption. Leaving us flexible for corner cases described above. On the other hand, I realize we've had our history with RPC breakage. So I think I'll require more than 1 ACK before pushing. diff to v1: -couple of fixes (1/2) -increased other limits as well (2/2) Michal Privoznik (2): rpc: Switch to dynamically allocated message buffer rpc: Size up RPC limits src/remote/remote_protocol.x | 20 +- src/rpc/virnetclient.c | 16 ++- src/rpc/virnetmessage.c | 12 ++- src/rpc/virnetmessage.h | 5 +- src/rpc/virnetprotocol.x | 6 +- src/rpc/virnetserverclient.c | 24 +++- tests/virnetmessagetest.c | 393 +++++++++++++++++++++++------------------- 7 files changed, 279 insertions(+), 197 deletions(-) -- 1.7.8.5

2 8

[libvirt] [PATCH v2] [TCK] nwfilter: Add test cases for ipset
by Stefan Berger 23 May '12

23 May '12

Add test cases for ipset support. Since ipset may not be available on all system, the first line of the XML file containing the test filter has been extended with a specially formatted XML comment containing a command line test for whether the test case can be run at all. The format of that line is:  If the tests in this line don't succeed, the test case is skipped. Also add a test case cleaning up the created ipset. Run this test after all other tests using alphabetical ordering. --- v2: - addressed Eric Blake's comments --- scripts/nwfilter/nwfilter2vmtest.sh | 36 +++++++-- scripts/nwfilter/nwfilterxml2fwallout/ipset-test.fwall | 39 ++++++++++ scripts/nwfilter/nwfilterxml2fwallout/zzz-ipset-cleanup.fwall | 1 scripts/nwfilter/nwfilterxml2xmlin/ipset-test.xml | 25 ++++++ scripts/nwfilter/nwfilterxml2xmlin/zzz-ipset-cleanup.xml | 5 + 5 files changed, 99 insertions(+), 7 deletions(-) Index: libvirt-tck/scripts/nwfilter/nwfilterxml2xmlin/ipset-test.xml =================================================================== --- /dev/null +++ libvirt-tck/scripts/nwfilter/nwfilterxml2xmlin/ipset-test.xml @@ -0,0 +1,25 @@ + +<filter name='tck-testcase' chain='root'> + <uuid>5c6d49af-b071-6127-b4ec-6f8ed4b55335</uuid> + <rule action='accept' direction='out'> + <all ipset='tck_test' ipsetflags='src,dst' /> + </rule> + <rule action='accept' direction='in'> + <all state='NONE' ipset='tck_test' ipsetflags='src,dst' comment='in+NONE'/> + </rule> + <rule action='accept' direction='out'> + <all state='NONE' ipset='tck_test' ipsetflags='src,dst' comment='out+NONE'/> + </rule> + <rule action='accept' direction='in'> + <all ipset='tck_test' ipsetflags='SRC,DST,SRC' /> + </rule> + <rule action='accept' direction='in'> + <all ipset='tck_test' ipsetflags='SRC,dSt,SRC' /> + </rule> + <rule action='accept' direction='in'> + <all ipset='$IPSETNAME' ipsetflags='src,dst' /> + </rule> + <rule action='accept' direction='inout'> + <all ipset='$IPSETNAME' ipsetflags='src,dst' comment='inout'/> + </rule> +</filter> Index: libvirt-tck/scripts/nwfilter/nwfilter2vmtest.sh =================================================================== --- libvirt-tck.orig/scripts/nwfilter/nwfilter2vmtest.sh +++ libvirt-tck/scripts/nwfilter/nwfilter2vmtest.sh @@ -107,6 +107,7 @@ checkExpectedOutput() { ifname="$3" flags="$4" skipregex="$5" + skiptest="$6" regex="s/${ORIG_IFNAME}/${ifname}/g" tmpdir=$(mktmpdir) @@ -147,6 +148,18 @@ checkExpectedOutput() { break fi + if [ -n "${skiptest}" ]; then + # treat all skips as passes + passctr=$(($passctr + 1)) + [ $(($flags & $FLAG_VERBOSE)) -ne 0 ] && \ + echo "SKIP ${xmlfile} : ${cmd}" + [ $(($flags & $FLAG_LIBVIRT_TEST)) -ne 0 ] && \ + test_result $(($passctr + $failctr)) "" 0 + [ $(($flags & $FLAG_TAP_TEST)) -ne 0 ] && \ + tap_pass $(($passctr + $failctr)) "SKIP: ${xmlfile} : ${skiptest}" + break + fi + diff -w ${tmpfile} ${tmpfile2} >/dev/null if [ $? -ne 0 ]; then @@ -197,19 +210,27 @@ doTest() { flags="$5" testnum="$6" ctr=0 + skiptest="" if [ ! -r "${xmlfile}" ]; then echo "FAIL : Cannot access filter XML file ${xmlfile}." return 1 fi - ${VIRSH} nwfilter-define "${xmlfile}" > /dev/null + # Check whether we can run this test at all + cmd=$(sed -n '1 s/^<\!--[ ]*#$.*$#[ ]*-->/\1/p' ${xmlfile}) + if [ -n "${cmd}" ]; then + eval "${cmd}" 2>/dev/null 1>/dev/null + [ $? -ne 0 ] && skiptest="${cmd}" + fi + + [ -z "${skiptest}" ] && ${VIRSH} nwfilter-define "${xmlfile}" > /dev/null checkExpectedOutput "${xmlfile}" "${fwallfile}" "${vm1name}" "${flags}" \ - "" + "" "${skiptest}" checkExpectedOutput "${TESTFILTERNAME}" "${TESTVM2FWALLDATA}" \ - "${vm2name}" "${flags}" "" + "${vm2name}" "${flags}" "" "${skiptest}" if [ $(($flags & $FLAG_ATTACH)) -ne 0 ]; then @@ -234,9 +255,9 @@ EOF if [ $rc -eq 0 ]; then checkExpectedOutput "${xmlfile}" "${fwallfile}" "${ATTACH_IFNAME}" \ - "${flags}" "(PRE|POST)ROUTING" + "${flags}" "(PRE|POST)ROUTING" "${skiptest}" checkExpectedOutput "${TESTFILTERNAME}" "${TESTVM2FWALLDATA}" \ - "${vm2name}" "${flags}" "(PRE|POST)ROUTING" + "${vm2name}" "${flags}" "(PRE|POST)ROUTING" "${skiptest}" msg=`${VIRSH} detach-device "${vm1name}" "${tmpfile}"` if [ $? -ne 0 ]; then echo "FAIL: Detach of interface failed." @@ -246,9 +267,9 @@ EOF # In case of TAP, run the test anyway so we get to the full number # of tests checkExpectedOutput "${xmlfile}" "${fwallfile}" "${ATTACH_IFNAME}" \ - "${flags}" "" #"(PRE|POST)ROUTING" + "${flags}" "" "${skiptest}" #"(PRE|POST)ROUTING" checkExpectedOutput "${TESTFILTERNAME}" "${TESTVM2FWALLDATA}" \ - "${vm2name}" "${flags}" #"(PRE|POST)ROUTING" + "${vm2name}" "${flags}" "${skiptest}" #"(PRE|POST)ROUTING" fi attachfailctr=$(($attachfailctr + 1)) @@ -357,6 +378,7 @@ createVM() { <parameter name='C' value='1090'/> <parameter name='C' value='1100'/> <parameter name='C' value='1110'/> + <parameter name='IPSETNAME' value='tck_test'/> </filterref> <target dev='${vmname}'/> </interface> Index: libvirt-tck/scripts/nwfilter/nwfilterxml2fwallout/ipset-test.fwall =================================================================== --- /dev/null +++ libvirt-tck/scripts/nwfilter/nwfilterxml2fwallout/ipset-test.fwall @@ -0,0 +1,39 @@ +#iptables -L FI-vnet0 -n +Chain FI-vnet0 (1 references) +target prot opt source destination +RETURN all -- 0.0.0.0/0 0.0.0.0/0 state NEW,ESTABLISHED ctdir REPLY match-set tck_test src,dst +RETURN all -- 0.0.0.0/0 0.0.0.0/0 match-set tck_test src,dst /* out+NONE */ +RETURN all -- 0.0.0.0/0 0.0.0.0/0 state ESTABLISHED ctdir ORIGINAL match-set tck_test dst,src,dst +RETURN all -- 0.0.0.0/0 0.0.0.0/0 state ESTABLISHED ctdir ORIGINAL match-set tck_test dst,src,dst +RETURN all -- 0.0.0.0/0 0.0.0.0/0 state ESTABLISHED ctdir ORIGINAL match-set tck_test dst,src +RETURN all -- 0.0.0.0/0 0.0.0.0/0 match-set tck_test dst,src /* inout */ +#iptables -L FO-vnet0 -n +Chain FO-vnet0 (1 references) +target prot opt source destination +ACCEPT all -- 0.0.0.0/0 0.0.0.0/0 state ESTABLISHED ctdir ORIGINAL match-set tck_test dst,src +ACCEPT all -- 0.0.0.0/0 0.0.0.0/0 match-set tck_test src,dst /* in+NONE */ +ACCEPT all -- 0.0.0.0/0 0.0.0.0/0 state NEW,ESTABLISHED ctdir REPLY match-set tck_test src,dst,src +ACCEPT all -- 0.0.0.0/0 0.0.0.0/0 state NEW,ESTABLISHED ctdir REPLY match-set tck_test src,dst,src +ACCEPT all -- 0.0.0.0/0 0.0.0.0/0 state NEW,ESTABLISHED ctdir REPLY match-set tck_test src,dst +ACCEPT all -- 0.0.0.0/0 0.0.0.0/0 match-set tck_test src,dst /* inout */ +#iptables -L HI-vnet0 -n +Chain HI-vnet0 (1 references) +target prot opt source destination +RETURN all -- 0.0.0.0/0 0.0.0.0/0 state NEW,ESTABLISHED ctdir REPLY match-set tck_test src,dst +RETURN all -- 0.0.0.0/0 0.0.0.0/0 match-set tck_test src,dst /* out+NONE */ +RETURN all -- 0.0.0.0/0 0.0.0.0/0 state ESTABLISHED ctdir ORIGINAL match-set tck_test dst,src,dst +RETURN all -- 0.0.0.0/0 0.0.0.0/0 state ESTABLISHED ctdir ORIGINAL match-set tck_test dst,src,dst +RETURN all -- 0.0.0.0/0 0.0.0.0/0 state ESTABLISHED ctdir ORIGINAL match-set tck_test dst,src +RETURN all -- 0.0.0.0/0 0.0.0.0/0 match-set tck_test dst,src /* inout */ +#iptables -L libvirt-host-in -n | grep vnet0 | tr -s " " +HI-vnet0 all -- 0.0.0.0/0 0.0.0.0/0 [goto] PHYSDEV match --physdev-in vnet0 +#iptables -L libvirt-in -n | grep vnet0 | tr -s " " +FI-vnet0 all -- 0.0.0.0/0 0.0.0.0/0 [goto] PHYSDEV match --physdev-in vnet0 +#iptables -L libvirt-in-post -n | grep vnet0 +ACCEPT all -- 0.0.0.0/0 0.0.0.0/0 PHYSDEV match --physdev-in vnet0 +#iptables -L libvirt-out -n | grep vnet0 | tr -s " " +FO-vnet0 all -- 0.0.0.0/0 0.0.0.0/0 [goto] PHYSDEV match --physdev-out vnet0 +#ebtables -t nat -L libvirt-O-vnet0 2>/dev/null | grep -v "table:" | grep -v "^$" +#ebtables -t nat -L libvirt-I-vnet0 2>/dev/null | grep -v "table:" | grep -v "^$" +#ebtables -t nat -L PREROUTING | grep vnet0 +#ebtables -t nat -L POSTROUTING | grep vnet0 Index: libvirt-tck/scripts/nwfilter/nwfilterxml2fwallout/zzz-ipset-cleanup.fwall =================================================================== --- /dev/null +++ libvirt-tck/scripts/nwfilter/nwfilterxml2fwallout/zzz-ipset-cleanup.fwall @@ -0,0 +1 @@ +#ipset destroy tck_test 2>&1 1>/dev/null Index: libvirt-tck/scripts/nwfilter/nwfilterxml2xmlin/zzz-ipset-cleanup.xml =================================================================== --- /dev/null +++ libvirt-tck/scripts/nwfilter/nwfilterxml2xmlin/zzz-ipset-cleanup.xml @@ -0,0 +1,5 @@ + +<filter name='tck-testcase' chain='root'> + <uuid>5c6d49af-b071-6127-b4ec-6f8ed4b55335</uuid> +  +</filter>

2 2

[libvirt] [PATCH] Revert "rpc: Discard non-blocking calls only when necessary"
by Jiri Denemark 22 May '12

22 May '12

This reverts commit b1e374a7ac56927cfe62435179bf0bba1e08b372, which was rather bad since I failed to consider all sides of the issue. Thus, the reverted patch actually breaks more than what it fixes and clients (which may even be libvirtd during p2p migrations) will likely end up with a corrupted dispatch queue. --- I will send proper replacement for the reverted patch later once I'm convinced it's correct (more than I was convinced the original one was correct) :-P src/rpc/virnetclient.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 3a60db6..d88288d 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -1265,13 +1265,6 @@ static void virNetClientIOEventLoopPassTheBuck(virNetClientPtr client, virNetCli } client->haveTheBuck = false; - /* Remove non-blocking calls from the dispatch list since there is no - * call with a thread in the list which could take care of them. - */ - virNetClientCallRemovePredicate(&client->waitDispatch, - virNetClientIOEventLoopRemoveNonBlocking, - thiscall); - VIR_DEBUG("No thread to pass the buck to"); if (client->wantClose) { virNetClientCloseLocked(client); @@ -1315,9 +1308,12 @@ static int virNetClientIOEventLoop(virNetClientPtr client, if (virNetSocketHasCachedData(client->sock) || client->wantClose) timeout = 0; - /* If we are non-blocking, we don't want to sleep in poll() + /* If there are any non-blocking calls in the queue, + * then we don't want to sleep in poll() */ - if (thiscall->nonBlock) + if (virNetClientCallMatchPredicate(client->waitDispatch, + virNetClientIOEventLoopWantNonBlock, + NULL)) timeout = 0; fds[0].events = fds[0].revents = 0; @@ -1422,6 +1418,13 @@ static int virNetClientIOEventLoop(virNetClientPtr client, virNetClientIOEventLoopRemoveDone, thiscall); + /* Iterate through waiting calls and if any are + * non-blocking, remove them from the dispatch list... + */ + virNetClientCallRemovePredicate(&client->waitDispatch, + virNetClientIOEventLoopRemoveNonBlocking, + thiscall); + /* Now see if *we* are done */ if (thiscall->mode == VIR_NET_CLIENT_MODE_COMPLETE) { virNetClientCallRemove(&client->waitDispatch, thiscall); -- 1.7.10.2

2 2

[libvirt] JSON license is non-free - how are we affected?
by Eric Blake 22 May '12

22 May '12

The QMP monitor uses JSON as its underlying base. However, when you read the license of JSON [1], you will note that it has a pretty severe limitation ("The Software shall be used for Good, not Evil"). In fact, this limitation is severe enough that the FSF has declared that the JSON license is non-free (even if the limitation is unenforceable), and therefore cannot be combined with GPL code: [1] http://www.json.org/license.html [2] https://www.gnu.org/licenses/license-list.html#JSON How do we reconcile this? Obviously, qemu must remain GPL, because it has files that are licensed GPLv2, and the overall license is the restrictive union of all source licenses. But that implies that we cannot include any source code or libraries provided by json.org, if such code is under the incompatible JSON license. Is the JSON license only applicable to code downloaded from json.org, but not to the actual JSON language specification? If so, does that mean that a clean-room implementation of JSON (the language specification) can be written with different license than JSON (the license), and that such alternate code could then be linked into qemu? Is this already the case? It would be a shame to have to reinvent QMP to use a different language specification if the entire JSON language is deemed poisoned. Thoughts? Do we need to seek legal guidance from FSF, Red Hat, or any other organization on how to proceed? -- Eric Blake eblake(a)redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

3 3

[libvirt] [PATCH] qemu_hotplug: Don't free the PCI device structure after hot-unplug
by Peter Krempa 22 May '12

22 May '12

The pciDevice structure corresponding to the device being hot-unplugged was freed after it was "stolen" from activeList. The pointer was still used for eg-inactive list. This patch removes the free of the structure and frees it only if reset fails on the device. --- src/qemu/qemu_hotplug.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index dfca7e2..ee5a9ba 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2005,12 +2005,14 @@ qemuDomainDetachHostPciDevice(struct qemud_driver *driver, if (pci) { activePci = pciDeviceListSteal(driver->activePciHostdevs, pci); if (pciResetDevice(activePci, driver->activePciHostdevs, - driver->inactivePciHostdevs) == 0) + driver->inactivePciHostdevs) == 0) { qemuReattachPciDevice(activePci, driver); - else + } else { + /* reset of the device failed, treat it as if it was returned */ + pciFreeDevice(activePci); ret = -1; + } pciFreeDevice(pci); - pciFreeDevice(activePci); } else { ret = -1; } -- 1.7.3.4

2 4

[libvirt] [PATCH 0/2] Make virsh *edit more bearable
by Michal Privoznik 22 May '12

22 May '12

If there's an error in XML, all changes made by user are lost. Users (read /me) tends to get angry with this. Allow them to get back and re-edit. Michal Privoznik (2): virsh: Switch from generated cmd*Edit commands to nongenerated virsh: Allow users to reedit rejected XML cfg.mk | 4 +- po/POTFILES.in | 1 + tools/Makefile.am | 36 +---- tools/console.c | 40 +++-- tools/console.h | 2 + tools/virsh-edit.c | 75 +++++++++ tools/virsh.c | 439 ++++++++++++++++++++-------------------------------- 7 files changed, 277 insertions(+), 320 deletions(-) create mode 100644 tools/virsh-edit.c -- 1.7.8.5

2 9

[libvirt] [PATCH][libvirt-glib] glib-events: Allow zero timeouts for timer
by Michal Privoznik 22 May '12

22 May '12

In libvirt, it's perfectly possible and widely used to have disabled timers (timeout=-1) and fire them up 'randomly' with timeout=0. However, with current mapping into glib mainloop it's not possible and causing troubles. --- libvirt-glib/libvirt-glib-event.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libvirt-glib/libvirt-glib-event.c b/libvirt-glib/libvirt-glib-event.c index 94f4de8..c3eb3c8 100644 --- a/libvirt-glib/libvirt-glib-event.c +++ b/libvirt-glib/libvirt-glib-event.c @@ -384,7 +384,7 @@ gvir_event_timeout_update(int timer, if (interval >= 0) { if (data->source) - goto cleanup; + g_source_remove(data->source); data->interval = interval; data->source = g_timeout_add(data->interval, -- 1.7.8.5

2 1

[libvirt] [PATCH] util: export virBufferTrim
by Laine Stump 22 May '12

22 May '12

This was forgotten in commit cdb87b1c4b3c325c61e2a6a7d8edcca3ca73a765. Pushed under build-breaker rule (broke builds with modules turned on) --- src/libvirt_private.syms | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 6c907c4..f30219d 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -28,6 +28,7 @@ virBufferEscapeString; virBufferFreeAndReset; virBufferGetIndent; virBufferStrcat; +virBufferTrim; virBufferURIEncodeString; virBufferUse; virBufferVasprintf; -- 1.7.10.1

1 0