- Devel - libvirt List Archives

[libvirt] [PATCH] Fix incorrect symbols for virtime.h module breaking Mingw32
by Daniel P. Berrange 05 Dec '11

05 Dec '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> The Mingw32 linker highlighted that the symbols for virtime.h declared in libvirt_private.syms were incorrect * src/libvirt_private.syms: Fix virtime.h symbols --- src/libvirt_private.syms | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) Pushing as a build-breaker fix diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 3a6ab07..99a1099 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1387,13 +1387,16 @@ virKeycodeValueTranslate; # virtime.h -virTimeMillisNow; virTimeFieldsNow; +virTimeFieldsNowRaw; virTimeFieldsThen; +virTimeFieldsThenRaw; +virTimeMillisNow; +virTimeMillisNowRaw; virTimeStringNow; +virTimeStringNowRaw; virTimeStringThen; -virTimeStringNewNow; -virTimeStringNewThen; +virTimeStringThenRaw; # xml.h -- 1.7.6.4

1 0

[libvirt] [PATCH] qemu: Rework handling of shutdown event
by Jiri Denemark 05 Dec '11

05 Dec '11

When QEMU guest finishes its shutdown sequence, qemu stops virtual CPUs and when started with -no-shutdown waits for us to kill it using SGITERM. Since QEMU is flushing its internal buffers, some time may pass before QEMU actually dies. We mistakenly used "paused" state (and events) for this which is quite confusing since users may see a domain going to pause while they expect it to shutdown. Since we already have "shutdown" state with "the domain is being shut down" semantics, we should use it for this state. However, the state didn't have a corresponding event so I created one and called its detail as VIR_DOMAIN_EVENT_SHUTDOWN_FINISHED (guest OS finished its shutdown sequence) with the intent to add VIR_DOMAIN_EVENT_SHUTDOWN_STARTED in the future if we have a sufficiently capable guest agent that can notify us when guest OS starts to shutdown. --- include/libvirt/libvirt.h.in | 10 +++ src/qemu/qemu_process.c | 126 ++++++++++++++++++++++++++++++------------ 2 files changed, 100 insertions(+), 36 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index d01d1bc..8d4a049 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -2288,6 +2288,7 @@ typedef enum { VIR_DOMAIN_EVENT_SUSPENDED = 3, VIR_DOMAIN_EVENT_RESUMED = 4, VIR_DOMAIN_EVENT_STOPPED = 5, + VIR_DOMAIN_EVENT_SHUTDOWN = 6, } virDomainEventType; /** @@ -2363,6 +2364,15 @@ typedef enum { /** + * virDomainEventShutdownDetailType: + * + * Details about the 'shutdown' lifecycle event + */ +typedef enum { + VIR_DOMAIN_EVENT_SHUTDOWN_FINISHED = 0, /* Guest finished shutdown sequence */ +} virDomainEventShutdownDetailType; + +/** * virConnectDomainEventCallback: * @conn: virConnect connection * @dom: The domain on which the event occurred diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index ab0cb2b..5e8a20a 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -431,19 +431,13 @@ cleanup: static void -qemuProcessShutdownOrReboot(virDomainObjPtr vm) +qemuProcessShutdownOrReboot(struct qemud_driver *driver, + virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv = vm->privateData; - if (priv->gotShutdown) { - VIR_DEBUG("Ignoring repeated SHUTDOWN event from domain %s", - vm->def->name); - return; - } - - priv->gotShutdown = true; if (priv->fakeReboot) { - qemuDomainSetFakeReboot(qemu_driver, vm, false); + qemuDomainSetFakeReboot(driver, vm, false); virDomainObjRef(vm); virThread th; if (virThreadCreate(&th, @@ -464,11 +458,47 @@ static int qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virDomainObjPtr vm) { + struct qemud_driver *driver = qemu_driver; + qemuDomainObjPrivatePtr priv; + virDomainEventPtr event = NULL; + VIR_DEBUG("vm=%p", vm); virDomainObjLock(vm); - qemuProcessShutdownOrReboot(vm); + + priv = vm->privateData; + if (priv->gotShutdown) { + VIR_DEBUG("Ignoring repeated SHUTDOWN event from domain %s", + vm->def->name); + goto unlock; + } + priv->gotShutdown = true; + + VIR_DEBUG("Transitioned guest %s to shutdown state", + vm->def->name); + virDomainObjSetState(vm, + VIR_DOMAIN_SHUTDOWN, + VIR_DOMAIN_SHUTDOWN_UNKNOWN); + event = virDomainEventNewFromObj(vm, + VIR_DOMAIN_EVENT_SHUTDOWN, + VIR_DOMAIN_EVENT_SHUTDOWN_FINISHED); + + if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) { + VIR_WARN("Unable to save status on vm %s after state change", + vm->def->name); + } + + qemuProcessShutdownOrReboot(driver, vm); + +unlock: virDomainObjUnlock(vm); + + if (event) { + qemuDriverLock(driver); + qemuDomainEventQueue(driver, event); + qemuDriverUnlock(driver); + } + return 0; } @@ -479,22 +509,20 @@ qemuProcessHandleStop(qemuMonitorPtr mon ATTRIBUTE_UNUSED, { struct qemud_driver *driver = qemu_driver; virDomainEventPtr event = NULL; - virDomainPausedReason reason = VIR_DOMAIN_PAUSED_UNKNOWN; virDomainObjLock(vm); if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING) { qemuDomainObjPrivatePtr priv = vm->privateData; if (priv->gotShutdown) { - VIR_DEBUG("Got STOP event after SHUTDOWN, assuming we are stopping" - " for shutdown"); - reason = VIR_DOMAIN_PAUSED_SHUTTING_DOWN; + VIR_DEBUG("Ignoring STOP event after SHUTDOWN"); + goto unlock; } - VIR_DEBUG("Transitioned guest %s to paused state, reason=%s", - vm->def->name, virDomainPausedReasonTypeToString(reason)); + VIR_DEBUG("Transitioned guest %s to paused state", + vm->def->name); - virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, reason); + virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_UNKNOWN); event = virDomainEventNewFromObj(vm, VIR_DOMAIN_EVENT_SUSPENDED, VIR_DOMAIN_EVENT_SUSPENDED_PAUSED); @@ -509,12 +537,13 @@ qemuProcessHandleStop(qemuMonitorPtr mon ATTRIBUTE_UNUSED, vm->def->name); } } + +unlock: virDomainObjUnlock(vm); if (event) { qemuDriverLock(driver); - if (event) - qemuDomainEventQueue(driver, event); + qemuDomainEventQueue(driver, event); qemuDriverUnlock(driver); } @@ -2338,7 +2367,10 @@ qemuProcessUpdateState(struct qemud_driver *driver, virDomainObjPtr vm) qemuDomainObjPrivatePtr priv = vm->privateData; virDomainState state; virDomainPausedReason reason; + virDomainState newState = VIR_DOMAIN_NOSTATE; + int newReason; bool running; + char *msg = NULL; int ret; qemuDomainObjEnterMonitorWithDriver(driver, vm); @@ -2351,19 +2383,40 @@ qemuProcessUpdateState(struct qemud_driver *driver, virDomainObjPtr vm) state = virDomainObjGetState(vm, NULL); if (state == VIR_DOMAIN_PAUSED && running) { - VIR_DEBUG("Domain %s was unpaused while its monitor was disconnected;" - " changing state to running", vm->def->name); - virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, - VIR_DOMAIN_RUNNING_UNPAUSED); + newState = VIR_DOMAIN_RUNNING; + newReason = VIR_DOMAIN_RUNNING_UNPAUSED; + msg = strdup("was unpaused"); } else if (state == VIR_DOMAIN_RUNNING && !running) { - VIR_DEBUG("Domain %s was paused (%s) while its monitor was" - " disconnected; changing state to paused", - vm->def->name, virDomainPausedReasonTypeToString(reason)); - virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, reason); + if (reason == VIR_DOMAIN_PAUSED_SHUTTING_DOWN) { + newState = VIR_DOMAIN_SHUTDOWN; + newReason = VIR_DOMAIN_SHUTDOWN_UNKNOWN; + msg = strdup("shutdown"); + } else { + newState = VIR_DOMAIN_PAUSED; + newReason = reason; + virAsprintf(&msg, "was paused (%s)", + virDomainPausedReasonTypeToString(reason)); + } } else if (state == VIR_DOMAIN_SHUTOFF && running) { - VIR_DEBUG("Domain %s finished booting; changing state to running", - vm->def->name); - virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, VIR_DOMAIN_RUNNING_BOOTED); + newState = VIR_DOMAIN_RUNNING; + newReason = VIR_DOMAIN_RUNNING_BOOTED; + msg = strdup("finished booting"); + } + + if (newState != VIR_DOMAIN_NOSTATE) { + if (!msg) { + virReportOOMError(); + return -1; + } + + VIR_DEBUG("Domain %s %s while its monitor was disconnected;" + " changing state to %s (%s)", + vm->def->name, + msg, + virDomainStateTypeToString(newState), + virDomainStateReasonToString(newState, newReason)); + VIR_FREE(msg); + virDomainObjSetState(vm, newState, newReason); } return 0; @@ -2637,15 +2690,16 @@ qemuProcessReconnect(void *opaque) &priv->qemuCaps) < 0) goto error; - /* In case the domain was paused for shutdown while we were not running, + /* In case the domain shutdown while we were not running, * we need to finish the shutdown process. And we need to do it after * we have qemuCaps filled in. */ - if (state == VIR_DOMAIN_PAUSED - && reason == VIR_DOMAIN_PAUSED_SHUTTING_DOWN) { - VIR_DEBUG("Domain %s shut down while we were not running;" - " finishing shutdown sequence", obj->def->name); - qemuProcessShutdownOrReboot(obj); + if (state == VIR_DOMAIN_SHUTDOWN || + (state == VIR_DOMAIN_PAUSED && + reason == VIR_DOMAIN_PAUSED_SHUTTING_DOWN)) { + VIR_DEBUG("Finishing shutdown sequence for domain %s", + obj->def->name); + qemuProcessShutdownOrReboot(driver, obj); goto endjob; } -- 1.7.8.rc4

3 3

[libvirt] [libvirt-glib] Add wrapper for volume deletion API
by Zeeshan Ali (Khattak) 05 Dec '11

05 Dec '11

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gobject/libvirt-gobject-storage-vol.c | 25 +++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-storage-vol.h | 4 ++++ libvirt-gobject/libvirt-gobject.sym | 1 + 3 files changed, 30 insertions(+), 0 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.c b/libvirt-gobject/libvirt-gobject-storage-vol.c index 15ae404..0470b4d 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.c +++ b/libvirt-gobject/libvirt-gobject-storage-vol.c @@ -252,3 +252,28 @@ GVirStorageVolInfo *gvir_storage_vol_get_info(GVirStorageVol *vol, return ret; } + +/** + * gvir_storage_vol_delete: + * @vol: the storage volume to delete + * @flags: the flags + * @err: Return location for errors, or NULL + * + * Deletes the storage volume @vol. + * + * Returns: %TRUE on success, %FALSE otherwise + */ +gboolean gvir_storage_vol_delete(GVirStorageVol *vol, + guint flags, + GError **err) +{ + if (virStorageVolDelete(vol->priv->handle, flags) < 0) { + if (err) + *err = gvir_error_new_literal(GVIR_STORAGE_VOL_ERROR, + 0, + "Unable to delete storage volume"); + return FALSE; + } + + return TRUE; +} diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.h b/libvirt-gobject/libvirt-gobject-storage-vol.h index 717ef4a..db63865 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.h +++ b/libvirt-gobject/libvirt-gobject-storage-vol.h @@ -80,6 +80,10 @@ GType gvir_storage_vol_handle_get_type(void); const gchar *gvir_storage_vol_get_name(GVirStorageVol *vol); const gchar *gvir_storage_vol_get_path(GVirStorageVol *vol); +gboolean gvir_storage_vol_delete(GVirStorageVol *vol, + guint flags, + GError **err); + GVirConfigStorageVol *gvir_storage_vol_get_config(GVirStorageVol *vol, guint flags, GError **err); diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index c0d2e19..3727fb7 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -117,6 +117,7 @@ LIBVIRT_GOBJECT_0.0.1 { gvir_storage_vol_get_path; gvir_storage_vol_get_config; gvir_storage_vol_get_info; + gvir_storage_vol_delete; gvir_connection_handle_get_type; -- 1.7.7.3

2 1

[libvirt] [PATCH] Introduce gvir_set_error (and friends) & convert all code
by Daniel P. Berrange 05 Dec '11

05 Dec '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> The pattern GError **error; .... *err = gvir_error_new(...) is dangerous because 'err' could be NULL, and it is tedious to expect everyone to check. Introduce a new set of APIs for setting errors gvir_set_error(err, ...) and convert all callers to this new pattern --- libvirt-gconfig/libvirt-gconfig-helpers-private.h | 7 +- libvirt-gconfig/libvirt-gconfig-helpers.c | 48 +++++++--- libvirt-gconfig/libvirt-gconfig-object.c | 15 ++- libvirt-glib/libvirt-glib-error.c | 91 +++++++++++++++++++ libvirt-glib/libvirt-glib-error.h | 18 ++++ libvirt-glib/libvirt-glib.sym | 3 + libvirt-gobject/libvirt-gobject-connection.c | 88 ++++++++---------- libvirt-gobject/libvirt-gobject-domain-disk.c | 7 +- libvirt-gobject/libvirt-gobject-domain-interface.c | 7 +- libvirt-gobject/libvirt-gobject-domain-snapshot.c | 6 +- libvirt-gobject/libvirt-gobject-domain.c | 95 +++++++++----------- libvirt-gobject/libvirt-gobject-interface.c | 7 +- libvirt-gobject/libvirt-gobject-network-filter.c | 7 +- libvirt-gobject/libvirt-gobject-network.c | 7 +- libvirt-gobject/libvirt-gobject-node-device.c | 7 +- libvirt-gobject/libvirt-gobject-secret.c | 7 +- libvirt-gobject/libvirt-gobject-storage-pool.c | 47 +++++------ libvirt-gobject/libvirt-gobject-storage-vol.c | 7 +- libvirt-gobject/libvirt-gobject-stream.c | 14 ++-- 19 files changed, 295 insertions(+), 193 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-helpers-private.h b/libvirt-gconfig/libvirt-gconfig-helpers-private.h index 6277cbd..087085e 100644 --- a/libvirt-gconfig/libvirt-gconfig-helpers-private.h +++ b/libvirt-gconfig/libvirt-gconfig-helpers-private.h @@ -30,8 +30,11 @@ G_BEGIN_DECLS -GError *gvir_xml_error_new(GQuark domain, gint code, - const gchar *format, ...); +GError *gvir_config_xml_error_new(GQuark domain, gint code, + const gchar *format, ...); +void gvir_config_set_xml_error(GError **err, + GQuark domain, gint code, + const gchar *format, ...); xmlNodePtr gvir_config_xml_parse(const char *xml, const char *root_node, GError **err); diff --git a/libvirt-gconfig/libvirt-gconfig-helpers.c b/libvirt-gconfig/libvirt-gconfig-helpers.c index 7bba594..f4f82e9 100644 --- a/libvirt-gconfig/libvirt-gconfig-helpers.c +++ b/libvirt-gconfig/libvirt-gconfig-helpers.c @@ -36,9 +36,9 @@ gvir_config_object_error_quark(void) return g_quark_from_static_string("gvir-config-object"); } -static GError *gvir_xml_error_new_literal(GQuark domain, - gint code, - const gchar *message) +static GError *gvir_config_xml_error_new_literal(GQuark domain, + gint code, + const gchar *message) { xmlErrorPtr xerr = xmlGetLastError(); @@ -59,10 +59,10 @@ static GError *gvir_xml_error_new_literal(GQuark domain, } -GError *gvir_xml_error_new(GQuark domain, - gint code, - const gchar *format, - ...) +GError *gvir_config_xml_error_new(GQuark domain, + gint code, + const gchar *format, + ...) { GError *err; va_list args; @@ -72,13 +72,34 @@ GError *gvir_xml_error_new(GQuark domain, message = g_strdup_vprintf(format, args); va_end(args); - err = gvir_xml_error_new_literal(domain, code, message); + err = gvir_config_xml_error_new_literal(domain, code, message); g_free(message); return err; } + +void gvir_config_set_xml_error(GError **err, + GQuark domain, gint code, + const gchar *format, ...) +{ + va_list args; + gchar *message; + + if (!err) + return; + + va_start(args, format); + message = g_strdup_vprintf(format, args); + va_end(args); + + *err = gvir_config_xml_error_new_literal(domain, code, message); + + g_free(message); +} + + xmlNodePtr gvir_config_xml_parse(const char *xml, const char *root_node, GError **err) { @@ -94,17 +115,18 @@ gvir_config_xml_parse(const char *xml, const char *root_node, GError **err) doc = xmlParseMemory(xml, strlen(xml)); if (!doc) { - *err = gvir_xml_error_new(GVIR_CONFIG_OBJECT_ERROR, + gvir_config_set_xml_error(err, GVIR_CONFIG_OBJECT_ERROR, 0, "%s", "Unable to parse configuration"); return NULL; } if ((!doc->children) || (strcmp((char *)doc->children->name, root_node) != 0)) { - *err = g_error_new(GVIR_CONFIG_OBJECT_ERROR, - 0, - "XML data has no '%s' node", - root_node); + g_set_error(err, + GVIR_CONFIG_OBJECT_ERROR, + 0, + "XML data has no '%s' node", + root_node); xmlFreeDoc(doc); return NULL; } diff --git a/libvirt-gconfig/libvirt-gconfig-object.c b/libvirt-gconfig/libvirt-gconfig-object.c index 5e973d5..3a55387 100644 --- a/libvirt-gconfig/libvirt-gconfig-object.c +++ b/libvirt-gconfig/libvirt-gconfig-object.c @@ -202,7 +202,8 @@ void gvir_config_object_validate(GVirConfigObject *config, xmlSetStructuredErrorFunc(NULL, gvir_xml_structured_error_nop); if (!priv->node) { - *err = gvir_xml_error_new(GVIR_CONFIG_OBJECT_ERROR, + gvir_config_set_xml_error(err, + GVIR_CONFIG_OBJECT_ERROR, 0, "%s", "No XML document associated with this config object"); @@ -211,7 +212,8 @@ void gvir_config_object_validate(GVirConfigObject *config, rngParser = xmlRelaxNGNewParserCtxt(priv->schema); if (!rngParser) { - *err = gvir_xml_error_new(GVIR_CONFIG_OBJECT_ERROR, + gvir_config_set_xml_error(err, + GVIR_CONFIG_OBJECT_ERROR, 0, "Unable to create RNG parser for %s", priv->schema); @@ -220,7 +222,8 @@ void gvir_config_object_validate(GVirConfigObject *config, rng = xmlRelaxNGParse(rngParser); if (!rng) { - *err = gvir_xml_error_new(GVIR_CONFIG_OBJECT_ERROR, + gvir_config_set_xml_error(err, + GVIR_CONFIG_OBJECT_ERROR, 0, "Unable to parse RNG %s", priv->schema); @@ -231,7 +234,8 @@ void gvir_config_object_validate(GVirConfigObject *config, rngValid = xmlRelaxNGNewValidCtxt(rng); if (!rngValid) { - *err = gvir_xml_error_new(GVIR_CONFIG_OBJECT_ERROR, + gvir_config_set_xml_error(err, + GVIR_CONFIG_OBJECT_ERROR, 0, "Unable to create RNG validation context %s", priv->schema); @@ -240,7 +244,8 @@ void gvir_config_object_validate(GVirConfigObject *config, } if (xmlRelaxNGValidateDoc(rngValid, priv->node->doc) != 0) { - *err = gvir_xml_error_new(GVIR_CONFIG_OBJECT_ERROR, + gvir_config_set_xml_error(err, + GVIR_CONFIG_OBJECT_ERROR, 0, "%s", "Unable to validate doc"); diff --git a/libvirt-glib/libvirt-glib-error.c b/libvirt-glib/libvirt-glib-error.c index b4d1f93..4a44216 100644 --- a/libvirt-glib/libvirt-glib-error.c +++ b/libvirt-glib/libvirt-glib-error.c @@ -126,3 +126,94 @@ GError *gvir_error_new_valist(GQuark domain, return err; } + + +/** + * gvir_set_error: (skip) + * @error: pointer to error location + * @domain: error domain + * @code: error code + * @format: printf()-style format for error message + * @Varargs: parameters for message format + * + * If @error is NULL this does nothing. Otherwise it + * creates a new #GError with the given @domain and @code, + * and a message formatted with @format, and stores it + * in @error. + */ +void gvir_set_error(GError **error, + GQuark domain, + gint code, + const gchar *format, + ...) +{ + va_list args; + gchar *message; + + if (!error) + return; + + va_start(args, format); + message = g_strdup_vprintf(format, args); + va_end(args); + + *error = gvir_error_new_literal(domain, code, message); + + g_free(message); +} + + +/** + * gvir_set_error_literal: (skip) + * @error: pointer to error location + * @domain: error domain + * @code: error code + * @message: error message + * + * If @error is NULL this does nothing. Otherwise it + * creates a new #GError and stores it in @error; unlike + * gvir_set_error(), @message is not a printf()-style + * format string. Use this function if @message contains + * text you don't have control over, that could include + * printf() escape sequences. + */ +void gvir_set_error_literal(GError **error, + GQuark domain, + gint code, + const gchar *message) +{ + if (!error) + return; + + *error = gvir_error_new_literal(domain, code, message); +} + + +/** + * gvir_set_error_valist: (skip) + * @error: pointer to error location + * @domain: error domain + * @code: error code + * @format: printf()-style format for error message + * @args: #va_list of parameters for the message format + * + * If @error is NULL this does nothing. Otherwise it + * creates a new #GError with the given @domain and @code, + * and a message formatted with @format, and stores it + * in @error. + */ +void gvir_set_error_valist(GError **error, + GQuark domain, + gint code, + const gchar *format, + va_list args) +{ + gchar *message; + if (!error) + return; + + message = g_strdup_vprintf(format, args); + *error = gvir_error_new_literal(domain, code, message); + + g_free(message); +} diff --git a/libvirt-glib/libvirt-glib-error.h b/libvirt-glib/libvirt-glib-error.h index cfb5b95..9e44383 100644 --- a/libvirt-glib/libvirt-glib-error.h +++ b/libvirt-glib/libvirt-glib-error.h @@ -42,6 +42,24 @@ GError *gvir_error_new_valist(GQuark domain, const gchar *format, va_list args); +void gvir_set_error(GError **error, + GQuark domain, + gint code, + const gchar *format, + ...); + +void gvir_set_error_literal(GError **error, + GQuark domain, + gint code, + const gchar *message); + +void gvir_set_error_valist(GError **error, + GQuark domain, + gint code, + const gchar *format, + va_list args); + + G_END_DECLS #endif /* __LIBVIRT_GLIB_ERROR_H__ */ diff --git a/libvirt-glib/libvirt-glib.sym b/libvirt-glib/libvirt-glib.sym index cd41cb9..289dbee 100644 --- a/libvirt-glib/libvirt-glib.sym +++ b/libvirt-glib/libvirt-glib.sym @@ -7,6 +7,9 @@ LIBVIRT_GLIB_0.0.1 { gvir_error_new; gvir_error_new_valist; gvir_error_new_literal; + gvir_set_error; + gvir_set_error_valist; + gvir_set_error_literal; local: *; diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index 9d3ab10..50cd860 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -401,21 +401,19 @@ gboolean gvir_connection_open(GVirConnection *conn, g_mutex_lock(priv->lock); if (priv->conn) { - if (err) - *err = g_error_new(GVIR_CONNECTION_ERROR, - 0, - "Connection %s is already open", - priv->uri); + g_set_error(err, GVIR_CONNECTION_ERROR, + 0, + "Connection %s is already open", + priv->uri); g_mutex_unlock(priv->lock); return FALSE; } if (!(priv->conn = virConnectOpen(priv->uri))) { - if (err) - *err = gvir_error_new(GVIR_CONNECTION_ERROR, - 0, - "Unable to open %s", - priv->uri); + gvir_set_error(err, GVIR_CONNECTION_ERROR, + 0, + "Unable to open %s", + priv->uri); g_mutex_unlock(priv->lock); return FALSE; } @@ -423,10 +421,9 @@ gboolean gvir_connection_open(GVirConnection *conn, if (!priv->uri) { char *uri = virConnectGetURI(priv->conn); if (!uri) { - if (err) - *err = gvir_error_new(GVIR_CONNECTION_ERROR, - 0, - "%s", "Unable to get connection URI"); + gvir_set_error(err, GVIR_CONNECTION_ERROR, + 0, + "%s", "Unable to get connection URI"); virConnectClose(priv->conn); priv->conn = NULL; g_mutex_unlock(priv->lock); @@ -570,10 +567,9 @@ static gchar ** fetch_list(virConnectPtr vconn, gint i; if ((n = count_func(vconn)) < 0) { - if (err) - *err = gvir_error_new(GVIR_CONNECTION_ERROR, - 0, - "Unable to count %s", name); + gvir_set_error(err, GVIR_CONNECTION_ERROR, + 0, + "Unable to count %s", name); goto error; } @@ -583,10 +579,9 @@ static gchar ** fetch_list(virConnectPtr vconn, lst = g_new(gchar *, n); if ((n = list_func(vconn, lst, n)) < 0) { - if (err) - *err = gvir_error_new(GVIR_CONNECTION_ERROR, - 0, - "Unable to list %s %d", name, n); + gvir_set_error(err, GVIR_CONNECTION_ERROR, + 0, + "Unable to list %s %d", name, n); goto error; } } @@ -623,10 +618,9 @@ gboolean gvir_connection_fetch_domains(GVirConnection *conn, g_mutex_lock(priv->lock); if (!priv->conn) { - if (err) - *err = g_error_new(GVIR_CONNECTION_ERROR, - 0, - "Connection is not open"); + g_set_error(err, GVIR_CONNECTION_ERROR, + 0, + "Connection is not open"); g_mutex_unlock(priv->lock); goto cleanup; } @@ -639,10 +633,9 @@ gboolean gvir_connection_fetch_domains(GVirConnection *conn, goto cleanup; if ((nactive = virConnectNumOfDomains(vconn)) < 0) { - if (err) - *err = gvir_error_new(GVIR_CONNECTION_ERROR, - 0, - "Unable to count domains"); + gvir_set_error(err, GVIR_CONNECTION_ERROR, + 0, + "Unable to count domains"); goto cleanup; } if (nactive) { @@ -651,10 +644,9 @@ gboolean gvir_connection_fetch_domains(GVirConnection *conn, active = g_new(gint, nactive); if ((nactive = virConnectListDomains(vconn, active, nactive)) < 0) { - if (err) - *err = gvir_error_new(GVIR_CONNECTION_ERROR, - 0, - "Unable to list domains"); + gvir_set_error(err, GVIR_CONNECTION_ERROR, + 0, + "Unable to list domains"); goto cleanup; } } @@ -755,10 +747,9 @@ gboolean gvir_connection_fetch_storage_pools(GVirConnection *conn, g_mutex_lock(priv->lock); if (!priv->conn) { - if (err) - *err = g_error_new(GVIR_CONNECTION_ERROR, - 0, - "Connection is not open"); + g_set_error(err, GVIR_CONNECTION_ERROR, + 0, + "Connection is not open"); g_mutex_unlock(priv->lock); goto cleanup; } @@ -1238,10 +1229,9 @@ GVirDomain *gvir_connection_create_domain(GVirConnection *conn, handle = virDomainDefineXML(priv->conn, xml); g_free(xml); if (!handle) { - if (err) - *err = gvir_error_new_literal(GVIR_CONNECTION_ERROR, - 0, - "Failed to create domain"); + gvir_set_error_literal(err, GVIR_CONNECTION_ERROR, + 0, + "Failed to create domain"); return NULL; } @@ -1286,10 +1276,9 @@ GVirDomain *gvir_connection_start_domain(GVirConnection *conn, handle = virDomainCreateXML(priv->conn, xml, flags); g_free(xml); if (!handle) { - if (err) - *err = gvir_error_new_literal(GVIR_CONNECTION_ERROR, - 0, - "Failed to create domain"); + gvir_set_error_literal(err, GVIR_CONNECTION_ERROR, + 0, + "Failed to create domain"); return NULL; } @@ -1331,10 +1320,9 @@ GVirStoragePool *gvir_connection_create_storage_pool g_return_val_if_fail(xml != NULL, NULL); if (!(handle = virStoragePoolDefineXML(priv->conn, xml, flags))) { - if (err) - *err = gvir_error_new_literal(GVIR_CONNECTION_ERROR, - flags, - "Failed to create storage pool"); + gvir_set_error_literal(err, GVIR_CONNECTION_ERROR, + flags, + "Failed to create storage pool"); return NULL; } diff --git a/libvirt-gobject/libvirt-gobject-domain-disk.c b/libvirt-gobject/libvirt-gobject-domain-disk.c index ab9b29f..f98d816 100644 --- a/libvirt-gobject/libvirt-gobject-domain-disk.c +++ b/libvirt-gobject/libvirt-gobject-domain-disk.c @@ -175,10 +175,9 @@ GVirDomainDiskStats *gvir_domain_disk_get_stats(GVirDomainDisk *self, GError **e handle = gvir_domain_device_get_domain_handle(GVIR_DOMAIN_DEVICE(self)); if (virDomainBlockStats(handle, priv->path, &stats, sizeof (stats)) < 0) { - if (err) - *err = gvir_error_new_literal(GVIR_DOMAIN_DISK_ERROR, - 0, - "Unable to get domain disk stats"); + gvir_set_error_literal(err, GVIR_DOMAIN_DISK_ERROR, + 0, + "Unable to get domain disk stats"); goto end; } diff --git a/libvirt-gobject/libvirt-gobject-domain-interface.c b/libvirt-gobject/libvirt-gobject-domain-interface.c index 223a663..0917e03 100644 --- a/libvirt-gobject/libvirt-gobject-domain-interface.c +++ b/libvirt-gobject/libvirt-gobject-domain-interface.c @@ -175,10 +175,9 @@ GVirDomainInterfaceStats *gvir_domain_interface_get_stats(GVirDomainInterface *s handle = gvir_domain_device_get_domain_handle(GVIR_DOMAIN_DEVICE(self)); if (virDomainInterfaceStats(handle, priv->path, &stats, sizeof (stats)) < 0) { - if (err) - *err = gvir_error_new_literal(GVIR_DOMAIN_INTERFACE_ERROR, - 0, - "Unable to get domain interface stats"); + gvir_set_error_literal(err, GVIR_DOMAIN_INTERFACE_ERROR, + 0, + "Unable to get domain interface stats"); goto end; } diff --git a/libvirt-gobject/libvirt-gobject-domain-snapshot.c b/libvirt-gobject/libvirt-gobject-domain-snapshot.c index 36dd15b..e68321d 100644 --- a/libvirt-gobject/libvirt-gobject-domain-snapshot.c +++ b/libvirt-gobject/libvirt-gobject-domain-snapshot.c @@ -196,9 +196,9 @@ GVirConfigDomainSnapshot *gvir_domain_snapshot_get_config gchar *xml; if (!(xml = virDomainSnapshotGetXMLDesc(priv->handle, flags))) { - *err = gvir_error_new_literal(GVIR_DOMAIN_SNAPSHOT_ERROR, - 0, - "Unable to get domain_snapshot XML config"); + gvir_set_error_literal(err, GVIR_DOMAIN_SNAPSHOT_ERROR, + 0, + "Unable to get domain_snapshot XML config"); return NULL; } diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index 56694a8..7bfb0ae 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -279,10 +279,9 @@ gint gvir_domain_get_id(GVirDomain *dom, gint ret; if ((ret = virDomainGetID(priv->handle)) < 0) { - if (err) - *err = gvir_error_new_literal(GVIR_DOMAIN_ERROR, - 0, - "Unable to get ID for domain"); + gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, + 0, + "Unable to get ID for domain"); } return ret; } @@ -305,10 +304,9 @@ gboolean gvir_domain_start(GVirDomain *dom, else ret = virDomainCreate(priv->handle); if (ret < 0) { - if (err) - *err = gvir_error_new_literal(GVIR_DOMAIN_ERROR, - 0, - "Unable to start domain"); + gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, + 0, + "Unable to start domain"); return FALSE; } @@ -327,10 +325,9 @@ gboolean gvir_domain_resume(GVirDomain *dom, GVirDomainPrivate *priv = dom->priv; if (virDomainResume(priv->handle) < 0) { - if (err) - *err = gvir_error_new_literal(GVIR_DOMAIN_ERROR, - 0, - "Unable to resume domain"); + gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, + 0, + "Unable to resume domain"); return FALSE; } @@ -354,10 +351,9 @@ gboolean gvir_domain_stop(GVirDomain *dom, else ret = virDomainDestroy(priv->handle); if (ret < 0) { - if (err) - *err = gvir_error_new_literal(GVIR_DOMAIN_ERROR, - 0, - "Unable to stop domain"); + gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, + 0, + "Unable to stop domain"); return FALSE; } @@ -381,10 +377,9 @@ gboolean gvir_domain_delete(GVirDomain *dom, else ret = virDomainUndefine(priv->handle); if (ret < 0) { - if (err) - *err = gvir_error_new_literal(GVIR_DOMAIN_ERROR, - 0, - "Unable to delete domain"); + gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, + 0, + "Unable to delete domain"); return FALSE; } @@ -403,10 +398,9 @@ gboolean gvir_domain_shutdown(GVirDomain *dom, GVirDomainPrivate *priv = dom->priv; if (virDomainShutdown(priv->handle) < 0) { - if (err) - *err = gvir_error_new_literal(GVIR_DOMAIN_ERROR, - 0, - "Unable to shutdown domain"); + gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, + 0, + "Unable to shutdown domain"); return FALSE; } @@ -425,10 +419,9 @@ gboolean gvir_domain_reboot(GVirDomain *dom, GVirDomainPrivate *priv = dom->priv; if (virDomainReboot(priv->handle, flags) < 0) { - if (err) - *err = gvir_error_new_literal(GVIR_DOMAIN_ERROR, - 0, - "Unable to reboot domain"); + gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, + 0, + "Unable to reboot domain"); return FALSE; } @@ -449,10 +442,9 @@ GVirConfigDomain *gvir_domain_get_config(GVirDomain *dom, gchar *xml; if (!(xml = virDomainGetXMLDesc(priv->handle, flags))) { - if (err) - *err = gvir_error_new_literal(GVIR_DOMAIN_ERROR, - 0, - "Unable to get domain XML config"); + gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, + 0, + "Unable to get domain XML config"); return NULL; } @@ -496,10 +488,9 @@ gboolean gvir_domain_set_config(GVirDomain *domain, g_return_val_if_fail(xml != NULL, FALSE); if ((conn = virDomainGetConnect(priv->handle)) == NULL) { - if (err != NULL) - *err = gvir_error_new_literal(GVIR_DOMAIN_ERROR, - 0, - "Failed to get domain connection"); + gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, + 0, + "Failed to get domain connection"); g_free (xml); return FALSE; @@ -509,11 +500,10 @@ gboolean gvir_domain_set_config(GVirDomain *domain, g_free (xml); if (handle == NULL) { - if (err != NULL) - *err = gvir_error_new_literal(GVIR_DOMAIN_ERROR, - 0, - "Failed to set " - "domain configuration"); + gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, + 0, + "Failed to set " + "domain configuration"); return FALSE; } @@ -521,11 +511,10 @@ gboolean gvir_domain_set_config(GVirDomain *domain, virDomainFree(handle); if (g_strcmp0 (uuid, priv->uuid) != 0) { - if (err != NULL) - *err = gvir_error_new_literal(GVIR_DOMAIN_ERROR, - 0, - "Failed to set " - "domain configuration"); + gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, + 0, + "Failed to set " + "domain configuration"); return FALSE; } @@ -546,10 +535,9 @@ GVirDomainInfo *gvir_domain_get_info(GVirDomain *dom, GVirDomainInfo *ret; if (virDomainGetInfo(priv->handle, &info) < 0) { - if (err) - *err = gvir_error_new_literal(GVIR_DOMAIN_ERROR, - 0, - "Unable to get domain info"); + gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, + 0, + "Unable to get domain info"); return NULL; } @@ -591,10 +579,9 @@ gchar *gvir_domain_screenshot(GVirDomain *dom, st, monitor_id, flags))) { - if (err) - *err = gvir_error_new_literal(GVIR_DOMAIN_ERROR, - 0, - "Unable to take a screenshot"); + gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, + 0, + "Unable to take a screenshot"); goto end; } end: diff --git a/libvirt-gobject/libvirt-gobject-interface.c b/libvirt-gobject/libvirt-gobject-interface.c index 1413abf..7e6e9b0 100644 --- a/libvirt-gobject/libvirt-gobject-interface.c +++ b/libvirt-gobject/libvirt-gobject-interface.c @@ -185,10 +185,9 @@ GVirConfigInterface *gvir_interface_get_config(GVirInterface *iface, gchar *xml; if (!(xml = virInterfaceGetXMLDesc(priv->handle, flags))) { - if (err) - *err = gvir_error_new_literal(GVIR_INTERFACE_ERROR, - 0, - "Unable to get interface XML config"); + gvir_set_error_literal(err, GVIR_INTERFACE_ERROR, + 0, + "Unable to get interface XML config"); return NULL; } diff --git a/libvirt-gobject/libvirt-gobject-network-filter.c b/libvirt-gobject/libvirt-gobject-network-filter.c index 2ac8236..f0fd024 100644 --- a/libvirt-gobject/libvirt-gobject-network-filter.c +++ b/libvirt-gobject/libvirt-gobject-network-filter.c @@ -211,10 +211,9 @@ GVirConfigNetworkFilter *gvir_network_filter_get_config gchar *xml; if (!(xml = virNWFilterGetXMLDesc(priv->handle, flags))) { - if (err) - *err = gvir_error_new_literal(GVIR_NETWORK_FILTER_ERROR, - 0, - "Unable to get network_filter XML config"); + gvir_set_error_literal(err, GVIR_NETWORK_FILTER_ERROR, + 0, + "Unable to get network_filter XML config"); return NULL; } diff --git a/libvirt-gobject/libvirt-gobject-network.c b/libvirt-gobject/libvirt-gobject-network.c index 5f40a77..847c236 100644 --- a/libvirt-gobject/libvirt-gobject-network.c +++ b/libvirt-gobject/libvirt-gobject-network.c @@ -207,10 +207,9 @@ GVirConfigNetwork *gvir_network_get_config(GVirNetwork *network, gchar *xml; if (!(xml = virNetworkGetXMLDesc(priv->handle, flags))) { - if (err) - *err = gvir_error_new_literal(GVIR_NETWORK_ERROR, - 0, - "Unable to get network XML config"); + gvir_set_error_literal(err, GVIR_NETWORK_ERROR, + 0, + "Unable to get network XML config"); return NULL; } diff --git a/libvirt-gobject/libvirt-gobject-node-device.c b/libvirt-gobject/libvirt-gobject-node-device.c index e21d1db..59fe84b 100644 --- a/libvirt-gobject/libvirt-gobject-node-device.c +++ b/libvirt-gobject/libvirt-gobject-node-device.c @@ -186,10 +186,9 @@ GVirConfigNodeDevice *gvir_node_device_get_config(GVirNodeDevice *device, gchar *xml; if (!(xml = virNodeDeviceGetXMLDesc(priv->handle, flags))) { - if (err) - *err = gvir_error_new_literal(GVIR_NODE_DEVICE_ERROR, - 0, - "Unable to get node_device XML config"); + gvir_set_error_literal(err, GVIR_NODE_DEVICE_ERROR, + 0, + "Unable to get node_device XML config"); return NULL; } diff --git a/libvirt-gobject/libvirt-gobject-secret.c b/libvirt-gobject/libvirt-gobject-secret.c index 7521b73..0c81921 100644 --- a/libvirt-gobject/libvirt-gobject-secret.c +++ b/libvirt-gobject/libvirt-gobject-secret.c @@ -197,10 +197,9 @@ GVirConfigSecret *gvir_secret_get_config(GVirSecret *secret, gchar *xml; if (!(xml = virSecretGetXMLDesc(priv->handle, flags))) { - if (err) - *err = gvir_error_new_literal(GVIR_SECRET_ERROR, - 0, - "Unable to get secret XML config"); + gvir_set_error_literal(err, GVIR_SECRET_ERROR, + 0, + "Unable to get secret XML config"); return NULL; } diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.c b/libvirt-gobject/libvirt-gobject-storage-pool.c index e267dff..76970db 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.c +++ b/libvirt-gobject/libvirt-gobject-storage-pool.c @@ -239,10 +239,9 @@ GVirConfigStoragePool *gvir_storage_pool_get_config(GVirStoragePool *pool, gchar *xml; if (!(xml = virStoragePoolGetXMLDesc(priv->handle, flags))) { - if (err) - *err = gvir_error_new_literal(GVIR_STORAGE_POOL_ERROR, - 0, - "Unable to get storage_pool XML config"); + gvir_set_error_literal(err, GVIR_STORAGE_POOL_ERROR, + 0, + "Unable to get storage_pool XML config"); return NULL; } @@ -297,9 +296,9 @@ static gchar ** fetch_list(virStoragePoolPtr vpool, gint i; if ((n = count_func(vpool)) < 0) { - *err = gvir_error_new(GVIR_STORAGE_POOL_ERROR, - 0, - "Unable to count %s", name); + gvir_set_error(err, GVIR_STORAGE_POOL_ERROR, + 0, + "Unable to count %s", name); goto error; } @@ -309,9 +308,9 @@ static gchar ** fetch_list(virStoragePoolPtr vpool, lst = g_new(gchar *, n); if ((n = list_func(vpool, lst, n)) < 0) { - *err = gvir_error_new(GVIR_STORAGE_POOL_ERROR, - 0, - "Unable to list %s %d", name, n); + gvir_set_error(err, GVIR_STORAGE_POOL_ERROR, + 0, + "Unable to list %s %d", name, n); goto error; } } @@ -347,10 +346,9 @@ gboolean gvir_storage_pool_refresh(GVirStoragePool *pool, vpool = priv->handle; if (virStoragePoolRefresh(vpool, 0) < 0) { - if (err) - *err = gvir_error_new_literal(GVIR_STORAGE_POOL_ERROR, - 0, - "Unable to refresh storage pool"); + gvir_set_error_literal(err, GVIR_STORAGE_POOL_ERROR, + 0, + "Unable to refresh storage pool"); goto cleanup; } @@ -539,10 +537,9 @@ GVirStorageVol *gvir_storage_pool_create_volume g_return_val_if_fail(xml != NULL, NULL); if (!(handle = virStorageVolCreateXML(priv->handle, xml, 0))) { - if (err) - *err = gvir_error_new_literal(GVIR_STORAGE_POOL_ERROR, - 0, - "Failed to create volume"); + gvir_set_error_literal(err, GVIR_STORAGE_POOL_ERROR, + 0, + "Failed to create volume"); return NULL; } @@ -574,10 +571,9 @@ gboolean gvir_storage_pool_build (GVirStoragePool *pool, GError **err) { if (virStoragePoolBuild(pool->priv->handle, flags)) { - if (err) - *err = gvir_error_new_literal(GVIR_STORAGE_POOL_ERROR, - 0, - "Failed to build storage pool"); + gvir_set_error_literal(err, GVIR_STORAGE_POOL_ERROR, + 0, + "Failed to build storage pool"); return FALSE; } @@ -679,10 +675,9 @@ gboolean gvir_storage_pool_start (GVirStoragePool *pool, GError **err) { if (virStoragePoolCreate(pool->priv->handle, flags)) { - if (err) - *err = gvir_error_new_literal(GVIR_STORAGE_POOL_ERROR, - 0, - "Failed to start storage pool"); + gvir_set_error_literal(err, GVIR_STORAGE_POOL_ERROR, + 0, + "Failed to start storage pool"); return FALSE; } diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.c b/libvirt-gobject/libvirt-gobject-storage-vol.c index 15ae404..103d402 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.c +++ b/libvirt-gobject/libvirt-gobject-storage-vol.c @@ -212,10 +212,9 @@ GVirConfigStorageVol *gvir_storage_vol_get_config(GVirStorageVol *vol, gchar *xml; if (!(xml = virStorageVolGetXMLDesc(priv->handle, flags))) { - if (err) - *err = gvir_error_new_literal(GVIR_STORAGE_VOL_ERROR, - 0, - "Unable to get storage_vol XML config"); + gvir_set_error_literal(err, GVIR_STORAGE_VOL_ERROR, + 0, + "Unable to get storage_vol XML config"); return NULL; } diff --git a/libvirt-gobject/libvirt-gobject-stream.c b/libvirt-gobject/libvirt-gobject-stream.c index 7baf515..c1ae765 100644 --- a/libvirt-gobject/libvirt-gobject-stream.c +++ b/libvirt-gobject/libvirt-gobject-stream.c @@ -372,10 +372,9 @@ gvir_stream_receive_all(GVirStream *self, r = virStreamRecvAll(self->priv->handle, stream_sink, &helper); if (r < 0) { - if (err != NULL) - *err = gvir_error_new_literal(GVIR_STREAM_ERROR, - 0, - "Unable to perform RecvAll"); + gvir_set_error_literal(err, GVIR_STREAM_ERROR, + 0, + "Unable to perform RecvAll"); } return r; @@ -476,10 +475,9 @@ gvir_stream_send_all(GVirStream *self, r = virStreamSendAll(self->priv->handle, stream_source, &helper); if (r < 0) { - if (err != NULL) - *err = gvir_error_new_literal(GVIR_STREAM_ERROR, - 0, - "Unable to perform SendAll"); + gvir_set_error_literal(err, GVIR_STREAM_ERROR, + 0, + "Unable to perform SendAll"); } return r; -- 1.7.6.4

2 2

[libvirt] [libvirt-glib] Add wrapper for volume deletion API
by Zeeshan Ali (Khattak) 05 Dec '11

05 Dec '11

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gobject/libvirt-gobject-storage-vol.c | 25 +++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-storage-vol.h | 4 ++++ libvirt-gobject/libvirt-gobject.sym | 1 + 3 files changed, 30 insertions(+), 0 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.c b/libvirt-gobject/libvirt-gobject-storage-vol.c index 15ae404..e7a7581 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.c +++ b/libvirt-gobject/libvirt-gobject-storage-vol.c @@ -252,3 +252,28 @@ GVirStorageVolInfo *gvir_storage_vol_get_info(GVirStorageVol *vol, return ret; } + +/** + * gvir_storage_vol_delete: + * @vol: the storage volume to delete + * @flags: the flags + * @err: Return location for errors, or NULL + * + * Deletes the storage volume @vol. + * + * Returns: %TRUE on success, %FALSE otherwise + */ +gboolean gvir_storage_vol_delete(GVirStorageVol *vol, + guint flags, + GError **err) +{ + if (virStorageVolDelete(vol->priv->handle, flags) < 0) { + g_set_error (err, + GVIR_STORAGE_VOL_ERROR, + 0, + "Unable to delete storage volume"); + return FALSE; + } + + return TRUE; +} diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.h b/libvirt-gobject/libvirt-gobject-storage-vol.h index 717ef4a..db63865 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.h +++ b/libvirt-gobject/libvirt-gobject-storage-vol.h @@ -80,6 +80,10 @@ GType gvir_storage_vol_handle_get_type(void); const gchar *gvir_storage_vol_get_name(GVirStorageVol *vol); const gchar *gvir_storage_vol_get_path(GVirStorageVol *vol); +gboolean gvir_storage_vol_delete(GVirStorageVol *vol, + guint flags, + GError **err); + GVirConfigStorageVol *gvir_storage_vol_get_config(GVirStorageVol *vol, guint flags, GError **err); diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index c0d2e19..3727fb7 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -117,6 +117,7 @@ LIBVIRT_GOBJECT_0.0.1 { gvir_storage_vol_get_path; gvir_storage_vol_get_config; gvir_storage_vol_get_info; + gvir_storage_vol_delete; gvir_connection_handle_get_type; -- 1.7.7.3

2 2

[libvirt] [PATCH] Adapt libvirt's Qemu version parser for Qemu 1.0
by Stefan Berger 05 Dec '11

05 Dec '11

Qemu 1.0 does not show a micro version like 0.15.50 did. Adapt the Qemu version parser to handle this. --- src/qemu/qemu_capabilities.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) Index: libvirt-tpm/src/qemu/qemu_capabilities.c =================================================================== --- libvirt-tpm.orig/src/qemu/qemu_capabilities.c +++ libvirt-tpm/src/qemu/qemu_capabilities.c @@ -1147,15 +1147,24 @@ int qemuCapsParseHelpStr(const char *qem ++p; minor = virParseNumber(&p); - if (minor == -1 || *p != '.') + if (minor == -1) goto fail; + if (major == 0 && *p != '.') + goto fail; + + if (major > 0 && *p != '.') { + micro = 0; + goto skip_micro; + } + ++p; micro = virParseNumber(&p); if (micro == -1) goto fail; +skip_micro: SKIP_BLANKS(p); if (STRPREFIX(p, QEMU_KVM_VER_PREFIX)) {

3 5

[libvirt] [PATCH] remote_driver: don't fail if keepalive check fails
by Guido Günther 05 Dec '11

05 Dec '11

Otherwise connections to older libvirt abort with: $ virsh -c qemu+ssh://host.example.com/system list error: invalid connection pointer in virDrvSupportsFeature error: failed to connect to the hypervisor Tested against 0.8.3 and 0.9.8. --- src/remote/remote_driver.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) Cheers, -- Guido diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 556c90c..1fb0eca 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -678,10 +678,8 @@ doRemoteOpen (virConnectPtr conn, rc = call(conn, priv, 0, REMOTE_PROC_SUPPORTS_FEATURE, (xdrproc_t)xdr_remote_supports_feature_args, (char *) &args, (xdrproc_t)xdr_remote_supports_feature_ret, (char *) &ret); - if (rc == -1) - goto failed; - if (ret.supported) { + if (rc != -1 && ret.supported) { priv->serverKeepAlive = true; } else { VIR_INFO("Disabling keepalive protocol since it is not supported" -- 1.7.7.3

2 2

[libvirt] [libvirt-glib] Add gvir_xml_set_error
by Christophe Fergeau 05 Dec '11

05 Dec '11

This mirrors g_set_error, but uses gvir_xml_error_new. The main benefit of using gvxr_xml_set_error over gvir_xml_error_new is that it handles NULL GError **. --- libvirt-gconfig/libvirt-gconfig-helpers-private.h | 2 + libvirt-gconfig/libvirt-gconfig-helpers.c | 40 ++++++++++++++++----- libvirt-gconfig/libvirt-gconfig-object.c | 32 ++++++---------- 3 files changed, 45 insertions(+), 29 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-helpers-private.h b/libvirt-gconfig/libvirt-gconfig-helpers-private.h index 0a35595..b5b4878 100644 --- a/libvirt-gconfig/libvirt-gconfig-helpers-private.h +++ b/libvirt-gconfig/libvirt-gconfig-helpers-private.h @@ -32,6 +32,8 @@ G_BEGIN_DECLS GError *gvir_xml_error_new(GQuark domain, gint code, const gchar *format, ...); +void gvir_xml_set_error(GError **error, GQuark domain, gint code, + const gchar *format, ...); xmlNodePtr gvir_config_xml_parse(const char *xml, const char *root_node, GError **err); diff --git a/libvirt-gconfig/libvirt-gconfig-helpers.c b/libvirt-gconfig/libvirt-gconfig-helpers.c index 722fe3d..bfdcfc3 100644 --- a/libvirt-gconfig/libvirt-gconfig-helpers.c +++ b/libvirt-gconfig/libvirt-gconfig-helpers.c @@ -59,6 +59,22 @@ static GError *gvir_xml_error_new_literal(GQuark domain, } +static GError *gvir_xml_error_new_va(GQuark domain, + gint code, + const gchar *format, + va_list args) +{ + GError *err; + gchar *message; + + message = g_strdup_vprintf(format, args); + err = gvir_xml_error_new_literal(domain, code, message); + + g_free(message); + + return err; +} + GError *gvir_xml_error_new(GQuark domain, gint code, const gchar *format, @@ -66,17 +82,25 @@ GError *gvir_xml_error_new(GQuark domain, { GError *err; va_list args; - gchar *message; va_start(args, format); - message = g_strdup_vprintf(format, args); + err = gvir_xml_error_new_va(domain, code, format, args); va_end(args); - err = gvir_xml_error_new_literal(domain, code, message); + return err; +} - g_free(message); +void gvir_xml_set_error(GError **error, GQuark domain, gint code, + const gchar *format, ...) +{ + va_list args; - return err; + if (error == NULL) + return; + + va_start(args, format); + *error = gvir_xml_error_new_va(domain, code, format, args); + va_end(args); } xmlNodePtr @@ -94,10 +118,8 @@ gvir_config_xml_parse(const char *xml, const char *root_node, GError **err) doc = xmlParseMemory(xml, strlen(xml)); if (!doc) { - *err = gvir_xml_error_new(GVIR_CONFIG_OBJECT_ERROR, - 0, - "%s", - "Unable to parse configuration"); + gvir_xml_set_error(err, GVIR_CONFIG_OBJECT_ERROR, + 0, "%s", "Unable to parse configuration"); return NULL; } if ((!doc->children) || (strcmp((char *)doc->children->name, root_node) != 0)) { diff --git a/libvirt-gconfig/libvirt-gconfig-object.c b/libvirt-gconfig/libvirt-gconfig-object.c index 03c7d5a..e2597f5 100644 --- a/libvirt-gconfig/libvirt-gconfig-object.c +++ b/libvirt-gconfig/libvirt-gconfig-object.c @@ -202,28 +202,23 @@ void gvir_config_object_validate(GVirConfigObject *config, xmlSetStructuredErrorFunc(NULL, gvir_xml_structured_error_nop); if (!priv->node) { - *err = gvir_xml_error_new(GVIR_CONFIG_OBJECT_ERROR, - 0, - "%s", - "No XML document associated with this config object"); + gvir_xml_set_error(err, GVIR_CONFIG_OBJECT_ERROR, 0, "%s", + "No XML document associated with this config object"); return; } rngParser = xmlRelaxNGNewParserCtxt(priv->schema); if (!rngParser) { - *err = gvir_xml_error_new(GVIR_CONFIG_OBJECT_ERROR, - 0, - "Unable to create RNG parser for %s", - priv->schema); + gvir_xml_set_error(err, GVIR_CONFIG_OBJECT_ERROR, 0, + "Unable to create RNG parser for %s", + priv->schema); return; } rng = xmlRelaxNGParse(rngParser); if (!rng) { - *err = gvir_xml_error_new(GVIR_CONFIG_OBJECT_ERROR, - 0, - "Unable to parse RNG %s", - priv->schema); + gvir_xml_set_error(err, GVIR_CONFIG_OBJECT_ERROR, 0, + "Unable to parse RNG %s", priv->schema); xmlRelaxNGFreeParserCtxt(rngParser); return; } @@ -231,19 +226,16 @@ void gvir_config_object_validate(GVirConfigObject *config, rngValid = xmlRelaxNGNewValidCtxt(rng); if (!rngValid) { - *err = gvir_xml_error_new(GVIR_CONFIG_OBJECT_ERROR, - 0, - "Unable to create RNG validation context %s", - priv->schema); + gvir_xml_set_error(err, GVIR_CONFIG_OBJECT_ERROR, 0, + "Unable to create RNG validation context %s", + priv->schema); xmlRelaxNGFree(rng); return; } if (xmlRelaxNGValidateDoc(rngValid, priv->node->doc) != 0) { - *err = gvir_xml_error_new(GVIR_CONFIG_OBJECT_ERROR, - 0, - "%s", - "Unable to validate doc"); + gvir_xml_set_error(err, GVIR_CONFIG_OBJECT_ERROR, 0, + "%s", "Unable to validate doc"); xmlRelaxNGFreeValidCtxt(rngValid); xmlRelaxNGFree(rng); return; -- 1.7.7.3

2 2

[libvirt] [PATCH 0/2] Expose virNodeGetCPUStats and virNodeGetMemoryStats in python
by Peter Krempa 05 Dec '11

05 Dec '11

These patches add two API functions to the libvirt python bindings, that were missing. The constants denoting a summary stat value instead of a separate per-node values was declared using a preprocessor macro: ... #define VIR_NODE_MEMORY_STATS_ALL_CELLS (-1) #define VIR_NODE_CPU_STATS_ALL_CPUS (-1) ... This inhibits automatic generation of these constants in the automaticaly generated python library code. If this change is too controversial, there's another option: Including these constants in the python library (using libvirt-override.py). Please let me know which of those options you prefer. Thanks Peter Peter Krempa (2): python: Expose binding for virNodeGetCPUStats() python: Expose binding for virNodeGetMemoryStats() include/libvirt/libvirt.h.in | 12 +++-- - change macro definitions to enums python/libvirt-override-api.xml | 14 ++++++ - add doc's about newly added functions python/libvirt-override.c | 95 +++++++++++++++++++++++++++++++++++++++ - add code for calling those functions and reclaiming return values. 3 files changed, 117 insertions(+), 4 deletions(-) -- 1.7.3.4

2 8

[libvirt] [libvirt-glib 1/2] Add gvir_set_error[_literal]
by Christophe Fergeau 05 Dec '11

05 Dec '11

They mirror g_set_error[_literal] functionality but append the error reported by libvirt to the error message. --- libvirt-glib/libvirt-glib-error.c | 49 +++++++++++++++++++++++++++++++++++++ libvirt-glib/libvirt-glib-error.h | 11 ++++++++ libvirt-glib/libvirt-glib.sym | 2 + 3 files changed, 62 insertions(+), 0 deletions(-) diff --git a/libvirt-glib/libvirt-glib-error.c b/libvirt-glib/libvirt-glib-error.c index b4d1f93..1fd32f0 100644 --- a/libvirt-glib/libvirt-glib-error.c +++ b/libvirt-glib/libvirt-glib-error.c @@ -126,3 +126,52 @@ GError *gvir_error_new_valist(GQuark domain, return err; } + +/** + * gvir_set_error: (skip) + * @error: a return location for a #GError, or #NULL + * @domain: error domain + * @code: error code + * @format: printf()-style format for error message + * @Varargs: parameters for message format + * + * Does nothing if @error is #NULL; if @error is non-#NULL, then *@error + * must be #NULL. A new #GError is created and assigned to *@error. + */ +void gvir_set_error(GError **error, GQuark domain, gint code, + const gchar *format, ...) +{ + va_list args; + + if (error == NULL) { + return; + } + + va_start(args, format); + *error = gvir_error_new_valist(domain, code, format, args); + va_end(args); +} + +/** + * gvir_set_error_literal: (skip) + * @error: a return location for a #GError, or #NULL + * @domain: error domain + * @code: error code + * @message: error message + * + * Does nothing if @error is #NULL; if @error is non-#NULL, then *@error + * must be #NULL. A new #GError is created and assigned to *@error. + * Unlike g_set_error(), message is not a printf()-style format string. Use + * this function if message contains text you don't have control over, that + * could include printf() escape sequences. + */ + +void gvir_set_error_literal(GError **error, GQuark domain, gint code, + const gchar *message) +{ + if (error == NULL) { + return; + } + + *error = gvir_error_new_literal(domain, code, message); +} diff --git a/libvirt-glib/libvirt-glib-error.h b/libvirt-glib/libvirt-glib-error.h index cfb5b95..aa581e5 100644 --- a/libvirt-glib/libvirt-glib-error.h +++ b/libvirt-glib/libvirt-glib-error.h @@ -42,6 +42,17 @@ GError *gvir_error_new_valist(GQuark domain, const gchar *format, va_list args); +void gvir_set_error(GError **error, + GQuark domain, + gint code, + const gchar *format, + ...); + +void gvir_set_error_literal(GError **error, + GQuark domain, + gint code, + const gchar *message); + G_END_DECLS #endif /* __LIBVIRT_GLIB_ERROR_H__ */ diff --git a/libvirt-glib/libvirt-glib.sym b/libvirt-glib/libvirt-glib.sym index cd41cb9..dca7dbb 100644 --- a/libvirt-glib/libvirt-glib.sym +++ b/libvirt-glib/libvirt-glib.sym @@ -7,6 +7,8 @@ LIBVIRT_GLIB_0.0.1 { gvir_error_new; gvir_error_new_valist; gvir_error_new_literal; + gvir_set_error; + gvir_set_error_literal; local: *; -- 1.7.7.3

2 2

[libvirt] [libvirt-glib] Add gvir_config_domain_set_lifecycle
by Christophe Fergeau 05 Dec '11

05 Dec '11

This is used to control what happens (restart, stop, ...) to the VM when it crashes, shuts down, ... --- libvirt-gconfig/libvirt-gconfig-domain.c | 20 ++++++++++++++++++++ libvirt-gconfig/libvirt-gconfig-domain.h | 18 ++++++++++++++++++ libvirt-gconfig/libvirt-gconfig.sym | 3 +++ libvirt-gconfig/tests/test-domain-create.c | 4 ++++ 4 files changed, 45 insertions(+), 0 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain.c b/libvirt-gconfig/libvirt-gconfig-domain.c index 2f34c1b..9a723cb 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.c +++ b/libvirt-gconfig/libvirt-gconfig-domain.c @@ -300,6 +300,26 @@ void gvir_config_domain_set_seclabel(GVirConfigDomain *domain, GVIR_CONFIG_OBJECT(seclabel)); } +void gvir_config_domain_set_lifecycle(GVirConfigDomain *domain, + GVirConfigDomainLifecycleEvent event, + GVirConfigDomainLifecycleAction action) +{ + const char *event_str; + const char *action_str; + + g_return_if_fail((event == GVIR_CONFIG_DOMAIN_LIFECYCLE_ON_CRASH) || + ((action != GVIR_CONFIG_DOMAIN_LIFECYCLE_COREDUMP_DESTROY) && + (action != GVIR_CONFIG_DOMAIN_LIFECYCLE_COREDUMP_RESTART))); + + event_str = gvir_config_genum_get_nick(GVIR_TYPE_CONFIG_DOMAIN_LIFECYCLE_EVENT, event); + g_return_if_fail(event_str != NULL); + action_str = gvir_config_genum_get_nick(GVIR_TYPE_CONFIG_DOMAIN_LIFECYCLE_ACTION, action); + g_return_if_fail(action_str != NULL); + + gvir_config_object_set_node_content(GVIR_CONFIG_OBJECT(domain), + event_str, action_str); +} + /** * gvir_config_domain_set_devices: * @devices: (in) (element-type LibvirtGConfig.DomainDevice): diff --git a/libvirt-gconfig/libvirt-gconfig-domain.h b/libvirt-gconfig/libvirt-gconfig-domain.h index 7b40f99..b96aae0 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.h +++ b/libvirt-gconfig/libvirt-gconfig-domain.h @@ -69,6 +69,21 @@ typedef enum { GVIR_CONFIG_DOMAIN_VIRT_LXC, } GVirConfigDomainVirtType; +typedef enum { + GVIR_CONFIG_DOMAIN_LIFECYCLE_ON_POWEROFF, /*< nick=on_poweroff >*/ + GVIR_CONFIG_DOMAIN_LIFECYCLE_ON_REBOOT, /*< nick=on_reboot >*/ + GVIR_CONFIG_DOMAIN_LIFECYCLE_ON_CRASH /*< nick=on_crash >*/ +} GVirConfigDomainLifecycleEvent; + +typedef enum { + GVIR_CONFIG_DOMAIN_LIFECYCLE_DESTROY, + GVIR_CONFIG_DOMAIN_LIFECYCLE_RESTART, + GVIR_CONFIG_DOMAIN_LIFECYCLE_PRESERVE, + GVIR_CONFIG_DOMAIN_LIFECYCLE_RENAME_RESTART, + GVIR_CONFIG_DOMAIN_LIFECYCLE_COREDUMP_DESTROY, + GVIR_CONFIG_DOMAIN_LIFECYCLE_COREDUMP_RESTART +} GVirConfigDomainLifecycleAction; + GType gvir_config_domain_get_type(void); GVirConfigDomain *gvir_config_domain_new_from_xml(const gchar *xml, GError **error); @@ -95,6 +110,9 @@ void gvir_config_domain_set_devices(GVirConfigDomain *domain, GList *devices); void gvir_config_domain_add_device(GVirConfigDomain *domain, GVirConfigDomainDevice *device); +void gvir_config_domain_set_lifecycle(GVirConfigDomain *domain, + GVirConfigDomainLifecycleEvent event, + GVirConfigDomainLifecycleAction action); G_END_DECLS diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index 9b6d420..c5726b9 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -9,12 +9,15 @@ LIBVIRT_GCONFIG_0.0.1 { gvir_config_domain_add_device; gvir_config_domain_get_type; + gvir_config_domain_lifecycle_action_get_type; + gvir_config_domain_lifecycle_event_get_type; gvir_config_domain_new; gvir_config_domain_new_from_xml; gvir_config_domain_set_clock; gvir_config_domain_set_devices; gvir_config_domain_get_features; gvir_config_domain_set_features; + gvir_config_domain_set_lifecycle; gvir_config_domain_get_memory; gvir_config_domain_set_memory; gvir_config_domain_get_name; diff --git a/libvirt-gconfig/tests/test-domain-create.c b/libvirt-gconfig/tests/test-domain-create.c index 0e52e9e..59aa5b0 100644 --- a/libvirt-gconfig/tests/test-domain-create.c +++ b/libvirt-gconfig/tests/test-domain-create.c @@ -60,6 +60,10 @@ int main(void) } g_strfreev(feat); + gvir_config_domain_set_lifecycle(domain, + GVIR_CONFIG_DOMAIN_LIFECYCLE_ON_POWEROFF, + GVIR_CONFIG_DOMAIN_LIFECYCLE_RESTART); + /* clock node */ GVirConfigDomainClock *klock; -- 1.7.7.3

2 1

[libvirt] [libvirt-glib] Add wrapper for volume deletion API
by Zeeshan Ali (Khattak) 05 Dec '11

05 Dec '11

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gobject/libvirt-gobject-storage-vol.c | 25 +++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-storage-vol.h | 4 ++++ libvirt-gobject/libvirt-gobject.sym | 1 + 3 files changed, 30 insertions(+), 0 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.c b/libvirt-gobject/libvirt-gobject-storage-vol.c index 15ae404..e7a7581 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.c +++ b/libvirt-gobject/libvirt-gobject-storage-vol.c @@ -252,3 +252,28 @@ GVirStorageVolInfo *gvir_storage_vol_get_info(GVirStorageVol *vol, return ret; } + +/** + * gvir_storage_vol_delete: + * @vol: the storage volume to delete + * @flags: the flags + * @err: Return location for errors, or NULL + * + * Deletes the storage volume @vol. + * + * Returns: %TRUE on success, %FALSE otherwise + */ +gboolean gvir_storage_vol_delete(GVirStorageVol *vol, + guint flags, + GError **err) +{ + if (virStorageVolDelete(vol->priv->handle, flags) < 0) { + g_set_error (err, + GVIR_STORAGE_VOL_ERROR, + 0, + "Unable to delete storage volume"); + return FALSE; + } + + return TRUE; +} diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.h b/libvirt-gobject/libvirt-gobject-storage-vol.h index 717ef4a..db63865 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.h +++ b/libvirt-gobject/libvirt-gobject-storage-vol.h @@ -80,6 +80,10 @@ GType gvir_storage_vol_handle_get_type(void); const gchar *gvir_storage_vol_get_name(GVirStorageVol *vol); const gchar *gvir_storage_vol_get_path(GVirStorageVol *vol); +gboolean gvir_storage_vol_delete(GVirStorageVol *vol, + guint flags, + GError **err); + GVirConfigStorageVol *gvir_storage_vol_get_config(GVirStorageVol *vol, guint flags, GError **err); diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index c0d2e19..3727fb7 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -117,6 +117,7 @@ LIBVIRT_GOBJECT_0.0.1 { gvir_storage_vol_get_path; gvir_storage_vol_get_config; gvir_storage_vol_get_info; + gvir_storage_vol_delete; gvir_connection_handle_get_type; -- 1.7.7.3

3 4

[libvirt] [FW: [Qemu-devel] [ANNOUNCE] QEMU 1.0 release]
by Daniel P. Berrange 05 Dec '11

05 Dec '11

----- Forwarded message from Anthony Liguori <aliguori(a)us.ibm.com> ----- > Date: Thu, 01 Dec 2011 15:23:37 -0600 > From: Anthony Liguori <aliguori(a)us.ibm.com> > To: qemu-devel <qemu-devel(a)nongnu.org> > Subject: [Qemu-devel] [ANNOUNCE] QEMU 1.0 release > On behalf of the QEMU Team, I'd like to announce the availability of > QEMU 1.0! > ChangeLog: > > == General == > * i386-softmmu is no longer named ''qemu'' but instead referred to as > ''qemu-system-i386'' for better consistency with other targets. A new tool is > likely to be introduced that uses the ''qemu'' name so distributions are advised > to not undo this change. We need to update libvirt to look for qemu-system-i386. We don't want to stop lookiing for 'qemu', but to cope with the scenario where QEMU guys introduce a new binary called 'qemu', we need to make sure we prefer the 'qemu-system-i386' binary. Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] domjobabort return the same error in distinct cases
by Shahar Havivi 05 Dec '11

05 Dec '11

Hi, I am using the python api: domain.abortjob(), if there is no job I get exception with error code: VIR_ERR_OPERATION_INVALID with the error message: 'Requested operation is not valid: no job is active on the domain' when there is a job I get the same exception code with the same error message, in addition I get another exception: libvirtError ('virDomainMigrateToURI2() failed', dom=self) libvirtError: operation failed: migration job: canceled by client the migration thread is throwing as well: libvirtError ('virDomainMigrateToURI2() failed', dom=self) libvirtError: operation failed: migration job: canceled by client Should the same error should be for this two cases?

1 1

[libvirt] implementing locking with libvirt on ubuntu
by Upendra Moturi 05 Dec '11

05 Dec '11

Hi I am trying to implement locking i,e two vms are not started with same disk on ubuntu. Using libvirt 0.9.7 (Installed it from source) qemu-kvm 0.14.1 kernel 3.0.0-13-server Steps followed while installing from source cd libvirt-0.9.7 ./configure make make install I found that sanlock or virtlockd (fcntl) daemons can do that,but not able implement it. I dont find virtlockd daemon running. >From below link http://www.redhat.com/archives/libvir-list/2011-July/msg00337.html it is said to create lockd directory under /var/lib/libvirt I dont find this directory after installation from source Am i missing something ? Please guide me in implementing locking on ubuntu. -- Thanks and Regards, Upendra.M

2 2

[libvirt] [PATCH] maint: fix improper use of 'an'
by Eric Blake 04 Dec '11

04 Dec '11

https://bugzilla.redhat.com/show_bug.cgi?id=648855 mentioned a misuse of 'an' where 'a' is proper; that has since been fixed, but a search found other problems (some were a spelling error for 'and', while most were fixed by 'a'). * daemon/stream.c: Fix grammar. * src/conf/domain_conf.c: Likewise. * src/conf/domain_event.c: Likewise. * src/esx/esx_driver.c: Likewise. * src/esx/esx_vi.c: Likewise. * src/rpc/virnetclient.c: Likewise. * src/rpc/virnetserverprogram.c: Likewise. * src/storage/storage_backend_fs.c: Likewise. * src/util/conf.c: Likewise. * src/util/dnsmasq.c: Likewise. * src/util/iptables.c: Likewise. * src/xen/xen_hypervisor.c: Likewise. * src/xen/xend_internal.c: Likewise. * src/xen/xs_internal.c: Likewise. * tools/virsh.c: Likewise. --- Pushing under the trivial rule. daemon/stream.c | 4 ++-- src/conf/domain_conf.c | 2 +- src/conf/domain_event.c | 2 +- src/esx/esx_driver.c | 2 +- src/esx/esx_vi.c | 2 +- src/rpc/virnetclient.c | 2 +- src/rpc/virnetserverprogram.c | 2 +- src/storage/storage_backend_fs.c | 2 +- src/util/conf.c | 6 +++--- src/util/dnsmasq.c | 4 ++-- src/util/iptables.c | 4 ++-- src/xen/xen_hypervisor.c | 32 ++++++++++++++++---------------- src/xen/xend_internal.c | 2 +- src/xen/xs_internal.c | 2 +- tools/virsh.c | 2 +- 15 files changed, 35 insertions(+), 35 deletions(-) diff --git a/daemon/stream.c b/daemon/stream.c index 50f8fd4..bb66f75 100644 --- a/daemon/stream.c +++ b/daemon/stream.c @@ -1,7 +1,7 @@ /* * stream.c: APIs for managing client streams * - * Copyright (C) 2009 Red Hat, Inc. + * Copyright (C) 2009, 2011 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -556,7 +556,7 @@ daemonStreamHandleWriteData(virNetServerClientPtr client, /* - * Process an finish handshake from the client. + * Process a finish handshake from the client. * * Returns a VIR_NET_OK confirmation if successful, or a VIR_NET_ERROR * if there was a stream error diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 75f21dc..75e51a0 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4555,7 +4555,7 @@ error: } -/* Parse the XML definition for an hub device */ +/* Parse the XML definition for a hub device */ static virDomainHubDefPtr virDomainHubDefParseXML(xmlNodePtr node, unsigned int flags) { diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index a04b9d0..614ab97 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -1070,7 +1070,7 @@ virDomainEventQueuePop(virDomainEventQueuePtr evtQueue) * @evtQueue: the dom event queue * @event: the event to add * - * Internal function to push onto the back of an virDomainEventQueue + * Internal function to push onto the back of a virDomainEventQueue * * Returns: 0 on success, -1 on failure */ diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index f8b3c7a..1e424eb 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -267,7 +267,7 @@ esxParseVMXFileName(const char *fileName, void *opaque) /* - * This function does the inverse of esxParseVMXFileName. It takes an file name + * This function does the inverse of esxParseVMXFileName. It takes a file name * in datastore path format or in absolute format and converts it to a file * name that can be used in a .vmx file. * diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 80f337b..99f25f8 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -1800,7 +1800,7 @@ esxVI_EnsureSession(esxVI_Context *ctx) if (ctx->hasSessionIsActive) { /* * Use SessionIsActive to check if there is an active session for this - * connection an re-login in there isn't. + * connection and re-login in there isn't. */ if (esxVI_SessionIsActive(ctx, ctx->session->key, ctx->session->userName, &active) < 0) { diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index ec06f45..7f9a332 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -1701,7 +1701,7 @@ static int virNetClientSendInternal(virNetClientPtr client, if (expectReply && nonBlock) { virNetError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Attempt to send an non-blocking message with a synchronous reply")); + _("Attempt to send a non-blocking message with a synchronous reply")); return -1; } diff --git a/src/rpc/virnetserverprogram.c b/src/rpc/virnetserverprogram.c index bbd2d65..d2ede6b 100644 --- a/src/rpc/virnetserverprogram.c +++ b/src/rpc/virnetserverprogram.c @@ -340,7 +340,7 @@ cleanup: * @client: the unlocked client object * @msg: the complete incoming method call, with header already decoded * - * This method is used to dispatch an message representing an + * This method is used to dispatch a message representing an * incoming method call from a client. It decodes the payload * to obtain method call arguments, invokves the method and * then sends a reply packet with the return values diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index b5acd20..d8dc29c 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -880,7 +880,7 @@ virStorageBackendFileSystemRefresh(virConnectPtr conn ATTRIBUTE_UNUSED, VIR_STORAGE_VOL_OPEN_DEFAULT) < 0) { /* The backing file is currently unavailable, the capacity, * allocation, owner, group and mode are unknown. Just log the - * error an continue. + * error and continue. * Unfortunately virStorageBackendProbeTarget() might already * have logged a similar message for the same problem, but only * if AUTO format detection was used. */ diff --git a/src/util/conf.c b/src/util/conf.c index c8dcc7f..502dafb 100644 --- a/src/util/conf.c +++ b/src/util/conf.c @@ -698,7 +698,7 @@ virConfParseStatement(virConfParserCtxtPtr ctxt) * Parse the subset of the Python language needed to handle simple * Xen configuration files. * - * Returns an handle to lookup settings or NULL if it failed to + * Returns a handle to lookup settings or NULL if it failed to * read or parse the file, use virConfFree() to free the data. */ static virConfPtr @@ -745,7 +745,7 @@ error: * * Reads a configuration file. * - * Returns an handle to lookup settings or NULL if it failed to + * Returns a handle to lookup settings or NULL if it failed to * read or parse the file, use virConfFree() to free the data. */ virConfPtr @@ -780,7 +780,7 @@ virConfReadFile(const char *filename, unsigned int flags) * Reads a configuration file loaded in memory. The string can be * zero terminated in which case @len can be 0 * - * Returns an handle to lookup settings or NULL if it failed to + * Returns a handle to lookup settings or NULL if it failed to * parse the content, use virConfFree() to free the data. */ virConfPtr diff --git a/src/util/dnsmasq.c b/src/util/dnsmasq.c index b5f90a6..dcb7195 100644 --- a/src/util/dnsmasq.c +++ b/src/util/dnsmasq.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2010 Red Hat, Inc. + * Copyright (C) 2007-2011 Red Hat, Inc. * Copyright (C) 2010 Satoru SATOH <satoru.satoh(a)gmail.com> * * This library is free software; you can redistribute it and/or @@ -461,7 +461,7 @@ dnsmasqContextNew(const char *network_name, * dnsmasqContextFree: * @ctx: pointer to the dnsmasq context * - * Free the resources associated with an dnsmasq context + * Free the resources associated with a dnsmasq context */ void dnsmasqContextFree(dnsmasqContext *ctx) diff --git a/src/util/iptables.c b/src/util/iptables.c index 452d717..3023900 100644 --- a/src/util/iptables.c +++ b/src/util/iptables.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2010 Red Hat, Inc. + * Copyright (C) 2007-2011 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -891,7 +891,7 @@ iptablesOutputFixUdpChecksum(iptablesContext *ctx, * @iface: the interface name * @port: the UDP port to match * - * Add an rule to the mangle table's POSTROUTING chain that fixes up the + * Add a rule to the mangle table's POSTROUTING chain that fixes up the * checksum of packets with the given destination @port. * the given @iface interface for TCP packets. * diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index 6c71b65..941686f 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -556,7 +556,7 @@ typedef struct xen_v0_domainop xen_v0_domainop; #define XEN_V2_OP_UNPAUSEDOMAIN 4 /* - * The information for an setmaxmem system hypercall + * The information for a setmaxmem system hypercall */ #define XEN_V0_OP_SETMAXMEM 28 #define XEN_V1_OP_SETMAXMEM 28 @@ -580,7 +580,7 @@ struct xen_v2d5_setmaxmem { typedef struct xen_v2d5_setmaxmem xen_v2d5_setmaxmem; /* - * The information for an setmaxvcpu system hypercall + * The information for a setmaxvcpu system hypercall */ #define XEN_V0_OP_SETMAXVCPU 41 #define XEN_V1_OP_SETMAXVCPU 41 @@ -599,7 +599,7 @@ struct xen_v2_setmaxvcpu { typedef struct xen_v2_setmaxvcpu xen_v2_setmaxvcpu; /* - * The information for an setvcpumap system hypercall + * The information for a setvcpumap system hypercall * Note that between 1 and 2 the limitation to 64 physical CPU was lifted * hence the difference in structures */ @@ -647,7 +647,7 @@ struct xen_v2d5_setvcpumap { typedef struct xen_v2d5_setvcpumap xen_v2d5_setvcpumap; /* - * The information for an vcpuinfo system hypercall + * The information for a vcpuinfo system hypercall */ #define XEN_V0_OP_GETVCPUINFO 43 #define XEN_V1_OP_GETVCPUINFO 43 @@ -866,8 +866,8 @@ virXenErrorFunc(virErrorNumber error, const char *func, const char *info, * @handle: the handle to the Xen hypervisor * @op: pointer to the hypervisor operation structure * - * Do an hypervisor operation though the old interface, - * this leads to an hypervisor call through ioctl. + * Do a hypervisor operation though the old interface, + * this leads to a hypervisor call through ioctl. * * Returns 0 in case of success and -1 in case of error. */ @@ -908,7 +908,7 @@ xenHypervisorDoV0Op(int handle, xen_op_v0 * op) * @handle: the handle to the Xen hypervisor * @op: pointer to the hypervisor operation structure * - * Do an hypervisor v1 operation, this leads to an hypervisor call through + * Do a hypervisor v1 operation, this leads to a hypervisor call through * ioctl. * * Returns 0 in case of success and -1 in case of error. @@ -951,7 +951,7 @@ xenHypervisorDoV1Op(int handle, xen_op_v1* op) * @handle: the handle to the Xen hypervisor * @op: pointer to the hypervisor operation structure * - * Do an hypervisor v2 system operation, this leads to an hypervisor + * Do a hypervisor v2 system operation, this leads to a hypervisor * call through ioctl. * * Returns 0 in case of success and -1 in case of error. @@ -994,7 +994,7 @@ xenHypervisorDoV2Sys(int handle, xen_op_v2_sys* op) * @handle: the handle to the Xen hypervisor * @op: pointer to the hypervisor domain operation structure * - * Do an hypervisor v2 domain operation, this leads to an hypervisor + * Do a hypervisor v2 domain operation, this leads to a hypervisor * call through ioctl. * * Returns 0 in case of success and -1 in case of error. @@ -3155,7 +3155,7 @@ xenHypervisorGetMaxMemory(virDomainPtr domain) * @id: the domain ID * @info: the place where information should be stored * - * Do an hypervisor call to get the related set of domain information. + * Do a hypervisor call to get the related set of domain information. * * Returns 0 in case of success, -1 in case of error. */ @@ -3238,7 +3238,7 @@ xenHypervisorGetDomInfo(virConnectPtr conn, int id, virDomainInfoPtr info) * @domain: pointer to the domain block * @info: the place where information should be stored * - * Do an hypervisor call to get the related set of domain information. + * Do a hypervisor call to get the related set of domain information. * * Returns 0 in case of success, -1 in case of error. */ @@ -3382,7 +3382,7 @@ xenHypervisorNodeGetCellsFreeMemory(virConnectPtr conn, unsigned long long *free * xenHypervisorPauseDomain: * @domain: pointer to the domain block * - * Do an hypervisor call to pause the given domain + * Do a hypervisor call to pause the given domain * * Returns 0 in case of success, -1 in case of error. */ @@ -3409,7 +3409,7 @@ xenHypervisorPauseDomain(virDomainPtr domain) * xenHypervisorResumeDomain: * @domain: pointer to the domain block * - * Do an hypervisor call to resume the given domain + * Do a hypervisor call to resume the given domain * * Returns 0 in case of success, -1 in case of error. */ @@ -3437,7 +3437,7 @@ xenHypervisorResumeDomain(virDomainPtr domain) * @domain: pointer to the domain block * @flags: an OR'ed set of virDomainDestroyFlagsValues * - * Do an hypervisor call to destroy the given domain + * Do a hypervisor call to destroy the given domain * * Calling this function with no @flags set (equal to zero) * is equivalent to calling xenHypervisorDestroyDomain. @@ -3471,7 +3471,7 @@ xenHypervisorDestroyDomainFlags(virDomainPtr domain, * @domain: pointer to the domain block * @memory: the max memory size in kilobytes. * - * Do an hypervisor call to change the maximum amount of memory used + * Do a hypervisor call to change the maximum amount of memory used * * Returns 0 in case of success, -1 in case of error. */ @@ -3563,7 +3563,7 @@ xenHypervisorPinVcpu(virDomainPtr domain, unsigned int vcpu, * @domain: pointer to domain object, or NULL for Domain0 * @info: pointer to an array of virVcpuInfo structures (OUT) * @maxinfo: number of structures in info array - * @cpumaps: pointer to an bit map of real CPUs for all vcpus of this domain (in 8-bit bytes) (OUT) + * @cpumaps: pointer to a bit map of real CPUs for all vcpus of this domain (in 8-bit bytes) (OUT) * If cpumaps is NULL, then no cpumap information is returned by the API. * It's assumed there is <maxinfo> cpumap in cpumaps array. * The memory allocated to cpumaps must be (maxinfo * maplen) bytes diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index 16165fe..0c0b6cb 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -2369,7 +2369,7 @@ xenDaemonDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags) * @domain: pointer to domain object, or NULL for Domain0 * @info: pointer to an array of virVcpuInfo structures (OUT) * @maxinfo: number of structures in info array - * @cpumaps: pointer to an bit map of real CPUs for all vcpus of this domain (in 8-bit bytes) (OUT) + * @cpumaps: pointer to a bit map of real CPUs for all vcpus of this domain (in 8-bit bytes) (OUT) * If cpumaps is NULL, then no cpumap information is returned by the API. * It's assumed there is <maxinfo> cpumap in cpumaps array. * The memory allocated to cpumaps must be (maxinfo * maplen) bytes diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c index 21018fd..a28e6cc 100644 --- a/src/xen/xs_internal.c +++ b/src/xen/xs_internal.c @@ -355,7 +355,7 @@ xenStoreClose(virConnectPtr conn) * @domain: pointer to the domain block * @info: the place where information should be stored * - * Do an hypervisor call to get the related set of domain information. + * Do a hypervisor call to get the related set of domain information. * * Returns 0 in case of success, -1 in case of error. */ diff --git a/tools/virsh.c b/tools/virsh.c index be4df58..d02be5c 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -13233,7 +13233,7 @@ cmdCPUBaseline(vshControl *ctl, const vshCmd *cmd) if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) return false; - /* add an separate container around the xml */ + /* add a separate container around the xml */ virBufferStrcat(&buf, "<container>", buffer, "</container>", NULL); if (virBufferError(&buf)) goto no_memory; -- 1.7.7.3

1 0

[libvirt] [PATCH 0/2] patch pings
by Eric Blake 04 Dec '11

04 Dec '11

These are random patches in my tree that I've previously posted with no review, but which I think are useful for inclusion in 0.9.8. Eric Blake (2): command: handle empty buffer argument correctly build: require more tools from maintainers bootstrap.conf | 15 +++++++++++++++ src/util/command.c | 13 ++++++++++++- tests/commanddata/test9.log | 4 +++- tests/commandtest.c | 13 ++++++++++++- 4 files changed, 42 insertions(+), 3 deletions(-) -- 1.7.7.3

2 6

[libvirt] [PATCH] build: fix build at -O2 on rawhide
by Eric Blake 02 Dec '11

02 Dec '11

I had previously tested commit 059d746 with -O intentionally omitted from my CFLAGS; but that means that I missed out on this warning from gcc 4.6.2 when optimizations are enabled: util/buf.c: In function 'virBufferGetIndent': util/buf.c:86:1: error: function might be candidate for attribute 'pure' [-Werror=suggest-attribute=pure] While it is probably a good idea to add the attributes and silence this warning, it's also invasive; 'make -k' found more than 75 such complaints. And it doesn't help that gcc 4.6.2 is still buggy (coreutils reported a case where gcc 4.6.2 incorrectly suggested marking a function pure that incremented a global variable; fixed in gcc 4.7). So the best fix for now is to disable the warning. It also doesn't help that I stumbled across another problem - gcc documents that -Wsuggest-attribute=pure only warns if you use -O, or if you use -fipa-pure-const. But in practice, when I omitted -O but added -fipa-pure-const, the warnings are fickle - I got warnings for simple compilation that disappeared when I also added -fPIC. And the way libtool compiles things is with -fPIC first, then without -fPIC but with errors sent to /dev/null - which meant that without disabling -Wsuggest-attribute=pure, I got a compile error with no message. :( See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=10197 * m4/virt-compile-warnings.m4 (LIBVIRT_COMPILE_WARNINGS): Silence -Wsuggest-attribute warnings for now. --- Pushing under the build-breaker rule. m4/virt-compile-warnings.m4 | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index 213b3db..34a89c9 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -116,2 +116,2 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ gl_WARN_ADD([-fdiagnostics-show-option]) gl_WARN_ADD([-funit-at-a-time]) + # Need -fipa-pure-const in order to make -Wsuggest-attribute=pure + # fire even without -O. + gl_WARN_ADD([-fipa-pure-const]) + # We should eventually enable this, but right now there are at + # least 75 functions triggering warnings. + gl_WARN_ADD([-Wno-suggest-attribute=pure]) + gl_WARN_ADD([-Wno-suggest-attribute=const]) + if test "$enable_compile_warnings" = "error" then gl_WARN_ADD([-Werror]) -- 1.7.7.3

1 0

[libvirt] [PATCH 1/1] apparmor: allow tunnelled migrations.
by Serge Hallyn 02 Dec '11

02 Dec '11

The pathname for the pipe for tunnelled migration is unresolvable. The libvirt apparmor driver therefore refuses access, causing migration to fail. If we can't resolve the path, the worst that can happen is that we should have given permission to the file but didn't. Otherwise (especially since this is a /proc/$$/fd/N file) the file is already open and libvirt won't be refused access by apparmor anyway. Also adjust virt-aa-helper to allow access to the *.tunnelmigrate.dest.name files. Changelog: Dec 2: per jdstrand comment, also change the Error to a VIR_WARN. For more information, see https://launchpad.net/bugs/869553. Signed-off-by: Serge Hallyn <serge.hallyn(a)canonical.com> --- src/security/security_apparmor.c | 6 +++--- src/security/virt-aa-helper.c | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index 299dcc6..5e68da8 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -791,9 +791,9 @@ AppArmorSetImageFDLabel(virSecurityManagerPtr mgr, } if (virFileResolveLink(proc, &fd_path) < 0) { - virSecurityReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("could not find path for descriptor")); - return rc; + /* it's a deleted file, presumably. Ignore? */ + VIR_WARN("could not find path for descriptor %s, skipping", proc); + return 0; } return reload_profile(mgr, vm, fd_path, true); diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 14399cc..4561bb9 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -1220,6 +1220,10 @@ main(int argc, char **argv) LOCALSTATEDIR, ctl->def->name); virBufferAsprintf(&buf, " \"/run/libvirt/**/%s.pid\" rwk,\n", ctl->def->name); + virBufferAsprintf(&buf, " \"%s/run/libvirt/**/*.tunnelmigrate.dest.%s\" rw,\n", + LOCALSTATEDIR, ctl->def->name); + virBufferAsprintf(&buf, " \"/run/libvirt/**/*.tunnelmigrate.dest.%s\" rw,\n", + ctl->def->name); if (ctl->files) virBufferAdd(&buf, ctl->files, -1); } -- 1.7.5.4

3 2

[libvirt] [PATCH] [TCK] nwfilter:Follow changes to clean-traffic filter
by Stefan Berger 02 Dec '11

02 Dec '11

Follow the changes to the clean-traffic filter to pass the nwfilter tests. --- scripts/nwfilter/nwfilterxml2fwallout/testvm.fwall.dat | 33 +++++++---------- 1 file changed, 15 insertions(+), 18 deletions(-) Index: libvirt-tck/scripts/nwfilter/nwfilterxml2fwallout/testvm.fwall.dat =================================================================== --- libvirt-tck.orig/scripts/nwfilter/nwfilterxml2fwallout/testvm.fwall.dat +++ libvirt-tck/scripts/nwfilter/nwfilterxml2fwallout/testvm.fwall.dat @@ -3,34 +3,31 @@ #ebtables -t nat -L POSTROUTING | grep vnet0 | grep -v "^Bridge" | grep -v "^$" -o vnet0 -j libvirt-O-vnet0 #ebtables -t nat -L libvirt-I-vnet0 | grep -v "^Bridge" | grep -v "^$" --p IPv4 -j I-vnet0-ipv4 --p ARP -j I-vnet0-arp +-j I-vnet0-mac +-p IPv4 -j I-vnet0-ipv4-ip +-p IPv4 -j ACCEPT +-p ARP -j I-vnet0-arp-mac +-p ARP -j I-vnet0-arp-ip +-p ARP -j ACCEPT -p 0x8035 -j I-vnet0-rarp -p 0x835 -j ACCEPT -j DROP #ebtables -t nat -L libvirt-O-vnet0 | grep -v "^Bridge" | grep -v "^$" -p IPv4 -j O-vnet0-ipv4 --p ARP -j O-vnet0-arp +-p ARP -j ACCEPT -p 0x8035 -j O-vnet0-rarp -j DROP -#ebtables -t nat -L I-vnet0-ipv4 | grep -v "^Bridge" | grep -v "^$" --s ! 52:54:0:9f:33:da -j DROP --p IPv4 --ip-src ! 10.1.1.1 -j DROP +#ebtables -t nat -L I-vnet0-ipv4-ip | grep -v "^Bridge" | grep -v "^$" +-p IPv4 --ip-src 0.0.0.0 --ip-proto udp --ip-sport 68 -j ACCEPT +-p IPv4 --ip-src 10.1.1.1 -j RETURN +-j DROP #ebtables -t nat -L O-vnet0-ipv4 | grep -v "^Bridge" | grep -v "^$" -j ACCEPT -#ebtables -t nat -L I-vnet0-arp | grep -v "^Bridge" | grep -v "^$" --s ! 52:54:0:9f:33:da -j DROP --p ARP --arp-mac-src ! 52:54:0:9f:33:da -j DROP --p ARP --arp-ip-src ! 10.1.1.1 -j DROP --p ARP --arp-op Request -j ACCEPT --p ARP --arp-op Reply -j ACCEPT +#ebtables -t nat -L I-vnet0-arp-mac | grep -v "^Bridge" | grep -v "^$" +-p ARP --arp-mac-src 52:54:0:9f:33:da -j RETURN -j DROP -#ebtables -t nat -L O-vnet0-arp | grep -v "^Bridge" | grep -v "^$" --p ARP --arp-gratuitous -j ACCEPT --p ARP --arp-op Reply --arp-mac-dst ! 52:54:0:9f:33:da -j DROP --p ARP --arp-ip-dst ! 10.1.1.1 -j DROP --p ARP --arp-op Request -j ACCEPT --p ARP --arp-op Reply -j ACCEPT +#ebtables -t nat -L I-vnet0-arp-ip | grep -v "^Bridge" | grep -v "^$" +-p ARP --arp-ip-src 10.1.1.1 -j RETURN -j DROP #ip6tables -L FI-vnet0 -n Chain FI-vnet0 (1 references)

2 2

[libvirt] [PATCH] client: Check if other thread claims it has the buck before claiming it.
by Peter Krempa 02 Dec '11

02 Dec '11

Originaly, the code checked if another client is the queue and infered ownership of the buck from that. Commit fa9595003d043df9f2efe95521c008 added a separate variable to track the buck. That caused, that a new call might enter claiming it has the buck, while another thread was signalled to take the buck. This ends in two threads claiming they hold the buck and entering poll(). This happens due to a race on waking up threads on the client lock mutex. This caused multi-threaded clients to hang, most prominently visible and reproducible on python based clients, like virt-manager. This patch causes threads, that have been signalled to take the buck to re-check if buck is held by another thread. --- src/rpc/virnetclient.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 5165c8d..07d8a60 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -1545,6 +1545,7 @@ static int virNetClientIO(virNetClientPtr client, virNetClientCallQueue(&client->waitDispatch, thiscall); /* Check to see if another thread is dispatching */ +recheck: if (client->haveTheBuck) { char ignore = 1; @@ -1592,7 +1593,13 @@ static int virNetClientIO(virNetClientPtr client, goto cleanup; } - /* Grr, someone passed the buck onto us ... */ + /* Grr, someone might have passed the buck onto us ... */ + + /* We need to re-check if the buck has been passed to this thread + * as this thread might have been signalled to wake up, but the another + * call might acquire the lock before this thread manages to wake up. + * This could cause that two threads claim they have the buck */ + goto recheck; } VIR_DEBUG("We have the buck %p %p", client->waitDispatch, thiscall); -- 1.7.3.4

2 2

[libvirt] [RFC v3 PATCH 0/5] PowerPC : Extend libvirt for the PowerPC-KVM platform
by Prerna Saxena 02 Dec '11

02 Dec '11

Recent development in KVM for 64-bit Power ISA Book3S machines, allows users to run multiple KVM guest instances on POWER7 and PPC970 processor based systems. Also qemu-system-ppc64 has been enhanced to support a new machine type "pseries" suitable for Power Book3S machines. This addition effectively brings the KVM+qemu combination to run multiple guest instances on a Power Book3S machine. Libvirt continues to be the key interface to configure and manage the KVM guest instances on x86. This patch set is an effort to enable libvirt to support KVM guest configuration and management on Power Book3S machines. Based on community discussion around the earlier version, this patch series augments the present 'kvm' driver to support PowerPC-KVM based guests.Since some of the supported devices vary between architectures, libvirt must be capable of choosing supported device backends and defaults for each architecture in qemu. To check if qemu supports a certain feature, libvirt at present parses the -help string which is generated by running the qemu binary with the '-h' argument. This approach is gated by QEMU's inherent limitation. When generating the list of allowed options with the '-h' flags, qemu today blindly lists all options defined for any architecture/platform instead of doing any arch-specific checking. This tricks libvirt into assuming a much bigger set of host capabilities than is actually available. Ideally, it would be good to have qemu specify a list of devices for a given architecture and platform which libvirt can parse to understand supported capabilities for that guest. As a part of this patchset, there is an attempt to cleanly bifurcate libvirt code and to remove x86-specific assumptions from generic qemu commandline code. Series Description: ------------------- This patch series consists of 5 patches : Patch 1/5 : Use sysfs to gather host topology in place of /proc/cpuinfo. Patch 2/5 : Add PowerPC CPU Driver Patch 3/5 : Add support for qemu-system-ppc64 Patch 4/5 : Clean up x86-specific assumptions from generic qemu code. Patch 5/5 : Add address family "spapr-vio" Changelog: --------- ** v1->v2 : * Patches 1,2,3 unchanged ; The hacks in Patch 4 of v1 replaced by a new patch to neatly select arch-specific features. ** v2->v3 : * Patches 1,2,3 have minor cleanups ; Patch 4 no longer has an arch-specific handler routine. It is now replaced by a much simpler patch that merely removes x86/pc-specific assumptions from libvirt. ** v3->v4 : * Patches 1,2,3,4 unchanged ; patch 5 is a new addition from Michael Ellerman that adds a new device-tree based addressing mechanism for the 'pseries' guest. -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India

5 24

[libvirt] [RFC v4 PATCH 0/5] PowerPC : Extend libvirt to use PowerPC-KVM platform
by Prerna Saxena 02 Dec '11

02 Dec '11

Libvirt continues to be the key interface to configure and manage the KVM guest instances on x86. This patch set is an effort to enable libvirt to support KVM guest configuration and management on Power Book3S machines. Based on community discussion around the earlier version, this patch series augments the present 'kvm' driver to support PowerPC-KVM based guests. With the CPU driver for PowerPC already merged, this patch series adds on clean-ups, and some test cases as suggested. This series mostly focuses on cleanup and addition of testcases for base- powerpc patches. The patches for enabling spapr-vio based addressing would be sent out shortly, with the right domain schema additions. Series description: ------------------- Patch 1/5 : Use sysfs to decipher cpu topology information. Patch 2/5 : Modify the tests/nodeinfotest.c to use sysfs in addition to proc/cpuinfo. Patch 3/5 : Add support for ppc64 qemu Patch 4/5 : Clean up qemuBuildCommandLine to remove x86-specific assumptions. Patch 5/5 : Add ppc64 specific definitions to domain.rng Changelog: ---------- ** v1->v2 : * Patches 1,2,3 unchanged ; The hacks in Patch 4 of v1 replaced by a new patch to neatly select arch-specific features. ** v2->v3 : * Patches 1,2,3 have minor cleanups ; Patch 4 no longer has an arch-specific handler routine. It is now replaced by a much simpler patch that merely removes x86/pc-specific assumptions from libvirt. Patch 5 is a new addition from Michael Ellerman that adds a new device-tree based addressing mechanism for the 'pseries' guest. ** v3->v4 : * Patch 1 has minor cleanups, Patch 2 is a new addition that introduces test cases for patch 1. Patch 3,4 also have minor cleanups Patch 5 is a new addition, it contains ppc64 specific definitions to domain.rng -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India

3 13

[libvirt] [PATCH] nwfilter: Update of filters to handle multiple IP addresses
by Stefan Berger 02 Dec '11

02 Dec '11

With fragments borrowed from David Steven's previous submission and some further modifications: A set of modifications to existing filters to handle multiple IP addresses (and MAC addresses) per interface. Also: - enable DHCP traffic from VM to any DHCP server - will require an update to a libvirt-tck data file Signed-off-by: David L Stevens <dlstevens(a)us.ibm.com> Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- examples/xml/nwfilter/Makefile.am | 2 + examples/xml/nwfilter/clean-traffic.xml | 12 +++++++- examples/xml/nwfilter/no-arp-ip-spoofing.xml | 9 ++++++ examples/xml/nwfilter/no-arp-mac-spoofing.xml | 7 ++++ examples/xml/nwfilter/no-arp-spoofing.xml | 38 ++------------------------ examples/xml/nwfilter/no-ip-spoofing.xml | 17 ++++++++--- examples/xml/nwfilter/no-mac-spoofing.xml | 11 +++++-- 7 files changed, 52 insertions(+), 44 deletions(-) Index: libvirt-acl/examples/xml/nwfilter/Makefile.am =================================================================== --- libvirt-acl.orig/examples/xml/nwfilter/Makefile.am +++ libvirt-acl/examples/xml/nwfilter/Makefile.am @@ -9,6 +9,8 @@ FILTERS = \ allow-ipv4.xml \ clean-traffic.xml \ no-arp-spoofing.xml \ + no-arp-ip-spoofing.xml \ + no-arp-mac-spoofing.xml \ no-ip-multicast.xml \ no-ip-spoofing.xml \ no-mac-broadcast.xml \ Index: libvirt-acl/examples/xml/nwfilter/no-arp-ip-spoofing.xml =================================================================== --- /dev/null +++ libvirt-acl/examples/xml/nwfilter/no-arp-ip-spoofing.xml @@ -0,0 +1,9 @@ +<filter name='no-arp-ip-spoofing' chain='arp-ip' priority='-510'> +  +  + <rule action='return' direction='out' priority='400' > + <arp match='yes' arpsrcipaddr='$IP' /> + </rule> +  + <rule action='drop' direction='out' priority='1000' /> +</filter> Index: libvirt-acl/examples/xml/nwfilter/no-arp-mac-spoofing.xml =================================================================== --- /dev/null +++ libvirt-acl/examples/xml/nwfilter/no-arp-mac-spoofing.xml @@ -0,0 +1,7 @@ +<filter name='no-arp-mac-spoofing' chain='arp-mac' priority='-520'> + <rule action='return' direction='out' priority='350' > + <arp match='yes' arpsrcmacaddr='$MAC'/> + </rule> +  + <rule action='drop' direction='out' priority='1000' /> +</filter> Index: libvirt-acl/examples/xml/nwfilter/clean-traffic.xml =================================================================== --- libvirt-acl.orig/examples/xml/nwfilter/clean-traffic.xml +++ libvirt-acl/examples/xml/nwfilter/clean-traffic.xml @@ -1,4 +1,4 @@ -<filter name='clean-traffic'> +<filter name='clean-traffic' chain='root'>  @@ -6,11 +6,21 @@  <filterref filter='no-ip-spoofing'/> + + <rule direction='out' action='accept' priority='-650'> + <mac protocolid='ipv4'/> + </rule> + <filterref filter='allow-incoming-ipv4'/>  <filterref filter='no-arp-spoofing'/> +  + <rule action='accept' direction='inout' priority='-500'> + <mac protocolid='arp'/> + </rule> +  <filterref filter='no-other-l2-traffic'/> Index: libvirt-acl/examples/xml/nwfilter/no-mac-spoofing.xml =================================================================== --- libvirt-acl.orig/examples/xml/nwfilter/no-mac-spoofing.xml +++ libvirt-acl/examples/xml/nwfilter/no-mac-spoofing.xml @@ -1,5 +1,10 @@ -<filter name='no-mac-spoofing' chain='ipv4'> - <rule action='drop' direction='out' priority='10'> - <mac match='no' srcmacaddr='$MAC' /> +<filter name='no-mac-spoofing' chain='mac' priority='-800'> +  + <rule direction='out' action='return'> + <mac srcmacaddr='$MAC'/> + </rule> +  + <rule direction='out' action='drop'> + <mac/> </rule> </filter> Index: libvirt-acl/examples/xml/nwfilter/no-arp-spoofing.xml =================================================================== --- libvirt-acl.orig/examples/xml/nwfilter/no-arp-spoofing.xml +++ libvirt-acl/examples/xml/nwfilter/no-arp-spoofing.xml @@ -1,36 +1,4 @@ -<filter name='no-arp-spoofing' chain='arp'> - <uuid>f88f1932-debf-4aa1-9fbe-f10d3aa4bc95</uuid> - <rule action='drop' direction='out' priority='300' > - <mac match='no' srcmacaddr='$MAC'/> - </rule> - -  -  - <rule action='drop' direction='out' priority='350' > - <arp match='no' arpsrcmacaddr='$MAC'/> - </rule> - <rule action='drop' direction='out' priority='400' > - <arp match='no' arpsrcipaddr='$IP' /> - </rule> -  - <rule action='accept' direction='in' priority='425'> - <arp gratuitous='true'/> - </rule> -  - <rule action='drop' direction='in' priority='450' > - <arp match='no' arpdstmacaddr='$MAC'/> - <arp opcode='reply'/> - </rule> - <rule action='drop' direction='in' priority='500' > - <arp match='no' arpdstipaddr='$IP' /> - </rule> -  - <rule action='accept' direction='inout' priority='600' > - <arp opcode='request'/> - </rule> - <rule action='accept' direction='inout' priority='650' > - <arp opcode='reply'/> - </rule> -  - <rule action='drop' direction='inout' priority='1000' /> +<filter name='no-arp-spoofing' chain='root'> + <filterref filter='no-arp-mac-spoofing'/> + <filterref filter='no-arp-ip-spoofing'/> </filter> Index: libvirt-acl/examples/xml/nwfilter/no-ip-spoofing.xml =================================================================== --- libvirt-acl.orig/examples/xml/nwfilter/no-ip-spoofing.xml +++ libvirt-acl/examples/xml/nwfilter/no-ip-spoofing.xml @@ -1,7 +1,14 @@ -<filter name='no-ip-spoofing' chain='ipv4'> +<filter name='no-ip-spoofing' chain='ipv4-ip' priority='-710'> +  + <rule action='accept' direction='out' priority='100'> + <ip srcipaddr='0.0.0.0' protocol='udp' srcportstart='68' srcportend='68'/> + </rule> -  - <rule action='drop' direction='out'> - <ip match='no' srcipaddr='$IP' /> - </rule> +  + <rule direction='out' action='return' priority='500'> + <ip srcipaddr='$IP'/> + </rule> + +  + <rule direction='out' action='drop' priority='1000'/> </filter>

2 3

[libvirt] [PATCH] virsh: translate net-info help
by Eric Blake 02 Dec '11

02 Dec '11

Reported by kato.tomoyuki(a)jp.fujitsu.com at https://bugzilla.redhat.com/show_bug.cgi?id=749564 * tools/virsh.c (info_network_info): Mark string for translation. --- Pushing under the trivial rule. tools/virsh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index ff9cc42..be4df58 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -6650,7 +6650,7 @@ cmdNetworkDumpXML(vshControl *ctl, const vshCmd *cmd) */ static const vshCmdInfo info_network_info[] = { {"help", N_("network information")}, - {"desc", "Returns basic information about the network"}, + {"desc", N_("Returns basic information about the network")}, {NULL, NULL} }; -- 1.7.7.3

1 0