- Devel - libvirt List Archives

[libvirt] [PATCHv3 0/5] Virtio support for S390
by Viktor Mihajlovski 11 Jul '12

11 Jul '12

As 0.9.13 is stabilizing and I will not be available next week I am sending this reworked patch set already today, looking forward to comments. This series adds support for the s390 flavor of virtio devices. Since the s390 virtio devices are not implemented as PCI devices it is necessary to refactor some of the device address assignment code. v2 changes resent as thread v3 changes renumbered new virtio-s390 capability fixed incorrect whitespace fixed subject lines Viktor Mihajlovski (5): qemu: Extended qemuDomainAssignAddresses to be callable from everywhere. qemu: Change tests to use (modified) qemuDomainAssignAddresses S390: Add support for virtio-s390 devices. S390: Domain Schema for s390-virtio machines. S390: Adding testcases for s390 docs/schemas/domaincommon.rng | 20 +++ src/conf/domain_conf.c | 11 +- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 7 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 139 ++++++++++++++++++-- src/qemu/qemu_command.h | 6 +- src/qemu/qemu_driver.c | 14 +- src/qemu/qemu_process.c | 42 +------ .../qemuxml2argv-console-virtio-s390.args | 9 ++ .../qemuxml2argv-console-virtio-s390.xml | 24 ++++ .../qemuxml2argv-disk-virtio-s390.args | 5 + .../qemuxml2argv-disk-virtio-s390.xml | 22 +++ .../qemuxml2argv-minimal-s390.args | 5 + .../qemuxml2argvdata/qemuxml2argv-minimal-s390.xml | 21 +++ .../qemuxml2argv-net-virtio-s390.args | 5 + .../qemuxml2argv-net-virtio-s390.xml | 22 +++ tests/qemuxml2argvtest.c | 20 ++-- tests/qemuxmlnstest.c | 13 +-- tests/testutilsqemu.c | 31 +++++ 20 files changed, 332 insertions(+), 86 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.xml

2 15

[libvirt] [PATCH] fix failure when building with --disable-debug
by Hu Tao 11 Jul '12

11 Jul '12

When building with --disable-debug, VIR_DEBUG expands to a nop. But parameters to VIR_DEBUG can be variables that are passed only to VIR_DEBUG. In the case the building system complains about unused variables. --- src/libvirt_private.syms | 1 + src/util/logging.c | 15 +++++++++++++++ src/util/logging.h | 3 ++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index b173590..48c4df7 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -739,6 +739,7 @@ virLockManagerRelease; # logging.h +virEatParam; virLogDefineFilter; virLogDefineOutput; virLogEmergencyDumpAll; diff --git a/src/util/logging.c b/src/util/logging.c index f8233cd..999dd01 100644 --- a/src/util/logging.c +++ b/src/util/logging.c @@ -1262,3 +1262,18 @@ void virLogSetFromEnv(void) { if (debugEnv && *debugEnv) virLogParseOutputs(debugEnv); } + +/** + * virEatParam: + * + * Do nothing but eat parameters. See VIR_DEBUG_INT. + * + * Currently only VIR_DEBUG_INT uses this function, which could + * have been defined right before VIR_DEBUG_INT, but it makes + * `make syntax-check' unhappy about ATTRIBUTE_UNUSED appearing + * in .h file. + */ +void virEatParam(void *unused ATTRIBUTE_UNUSED, ...) +{ + /* do nothing */ +} diff --git a/src/util/logging.h b/src/util/logging.h index 70318d0..b96a115 100644 --- a/src/util/logging.h +++ b/src/util/logging.h @@ -35,7 +35,7 @@ virLogMessage(category, VIR_LOG_DEBUG, f, l, 0, __VA_ARGS__) # else # define VIR_DEBUG_INT(category, f, l, ...) \ - do { } while (0) + virEatParam((void*)category, f, l, __VA_ARGS__) # endif /* !ENABLE_DEBUG */ # define VIR_INFO_INT(category, f, l, ...) \ @@ -142,4 +142,5 @@ extern void virLogVMessage(const char *category, int priority, va_list vargs) ATTRIBUTE_FMT_PRINTF(6, 0); extern int virLogSetBufferSize(int size); extern void virLogEmergencyDumpAll(int signum); +void virEatParam(void *unused, ...); #endif -- 1.7.10.2

2 3

[libvirt] [PATCHv2] openvz: Handle domain obj hash map errors
by Guido Günther 11 Jul '12

11 Jul '12

This makes the driver fail with a clear error message in case of UUID collisions (for example if somebody copied a container configuration without updating the UUID) and also raises an error on other hash map failures. OpenVZ itself doesn't complain about duplicate UUIDs since this parameter is only used by libvirt. --- This version adds an extra check for hash collisions and keeps the generic failure message for all other errors in virHashAddEntry. Cheers, -- Guido src/openvz/openvz_conf.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index 503c8a0..91cd125 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -684,8 +684,18 @@ int openvzLoadDomains(struct openvz_driver *driver) { openvzReadMemConf(dom->def, veid); virUUIDFormat(dom->def->uuid, uuidstr); - if (virHashAddEntry(driver->domains.objs, uuidstr, dom) < 0) + if (virHashLookup(driver->domains.objs, uuidstr)) { + openvzError(VIR_ERR_INTERNAL_ERROR, + _("Duplicate container UUID %s detected for %d"), + uuidstr, + veid); + goto cleanup; + } + if (virHashAddEntry(driver->domains.objs, uuidstr, dom) < 0) { + openvzError(VIR_ERR_INTERNAL_ERROR, + _("Could not add UUID for container %d"), veid); goto cleanup; + } virDomainObjUnlock(dom); dom = NULL; -- 1.7.10.4

2 2

[libvirt] [PATCH] Fix /domain/features setting in qemuParseCommandLine
by Christophe Fergeau 11 Jul '12

11 Jul '12

Commit 5e6ce1 moved down detection of the ACPI feature in qemuParseCommandLine. However, when ACPI is detected, it clears all feature flags in def->features to only set ACPI. This used to be fine because this was the first place were def->features was set, but after the move this is no longer necessarily true because this block comes before the ACPI check: if (strstr(def->emulator, "kvm")) { def->virtType = VIR_DOMAIN_VIRT_KVM; def->features |= (1 << VIR_DOMAIN_FEATURE_PAE); } Since def is allocated in qemuParseCommandLine using VIR_ALLOC, we can always use |= when modifying def->features --- This is an issue I noticed while reading this code for other reasons, I have only compile-tested it and I'm not sure how to test it. Christophe src/qemu/qemu_command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6549f57..0065e83 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7547,7 +7547,7 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr caps, goto no_memory; if (STREQ(def->os.arch, "i686")||STREQ(def->os.arch, "x86_64")) - def->features = (1 << VIR_DOMAIN_FEATURE_ACPI) + def->features |= (1 << VIR_DOMAIN_FEATURE_ACPI) /*| (1 << VIR_DOMAIN_FEATURE_APIC)*/; #define WANT_VALUE() \ const char *val = progargv[++i]; \ -- 1.7.10.4

2 2

[libvirt] [glib PATCH] Add givr_domain_save_to_file() and gvir_domain_save_to_file_async
by Jovanka Gulicoska 11 Jul '12

11 Jul '12

--- libvirt-gobject/libvirt-gobject-domain.c | 138 ++++++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-domain.h | 19 ++++ libvirt-gobject/libvirt-gobject.sym | 3 + 3 files changed, 160 insertions(+) diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index 088cd33..356b15b 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -55,6 +55,7 @@ enum { VIR_RESUMED, VIR_STOPPED, VIR_UPDATED, + VIR_SAVED_TO_FILE, LAST_SIGNAL }; @@ -225,6 +226,16 @@ static void gvir_domain_class_init(GVirDomainClass *klass) G_TYPE_NONE, 0); + signals[VIR_SAVED_TO_FILE] = g_signal_new("saved_to_file", + G_OBJECT_CLASS_TYPE(object_class), + G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE | + G_SIGNAL_NO_HOOKS | G_SIGNAL_DETAILED, + G_STRUCT_OFFSET(GVirDomainClass, saved_to_file), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + 0); + g_type_class_add_private(klass, sizeof(GVirDomainPrivate)); } @@ -556,6 +567,133 @@ gboolean gvir_domain_reboot(GVirDomain *dom, return TRUE; } +gboolean gvir_domain_save_to_file_config(GVirDomain *dom, + gchar *filename, + GVirConfigDomain *conf, + guint flags, + GError **err) +{ + GVirDomainPrivate *priv; + gchar *custom_xml; + int ret; + + g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); + g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN (conf), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); + + priv = dom->priv; + custom_xml = gvir_config_object_to_xml(GVIR_CONFIG_OBJECT(conf)); + + if (flags || custom_xml) { + ret = virDomainSaveFlags(priv->handle, filename, custom_xml, flags); + g_free (custom_xml); + } + else { + ret = virDomainSave(priv->handle, filename); + g_free (custom_xml); + } + if (ret < 0) { + gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, + 0, + "Unable to save domain to file"); + return FALSE; + } + + return TRUE; +} + +typedef struct { + gchar *filename; + gchar *custom_xml; + guint flags; +} DomainSaveToFileData; + +static void domain_save_to_file_data_free(DomainSaveToFileData *data) +{ + g_slice_free(DomainSaveToFileData, data); +} + +static void +gvir_domain_save_to_file_helper(GSimpleAsyncResult *res, + GObject *object, + GCancellable *cancellable G_GNUC_UNUSED) +{ + GVirDomain *dom = GVIR_DOMAIN(object); + DomainSaveToFileData *data; + GVirConfigDomain *conf; + GError *err = NULL; + // gchar *xml; + + data = g_simple_async_result_get_op_res_gpointer(res); + // // xml = data->filename; + conf = gvir_domain_get_config(dom, data->flags, &err); + + if (!gvir_domain_save_to_file_config(dom, data->filename, conf, data->flags, &err)) + g_simple_async_result_take_error(res, err); + } + +/** + * gvir_domain_save_to_file_async: + * @dom: the domain + * @flags: the flags + * @cancellable: cancallation object + * @callback: (scope async): completion callback + * @user_data: (closure): opaque data for callback + * + * Asynchronous variant of #gvir_domain_save_to_file. + */ + +void gvir_domain_save_to_file_async (GVirDomain *dom, + gchar *filename, + GVirConfigDomain *conf, + guint flags, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GSimpleAsyncResult *res; + DomainSaveToFileData *data; + gchar *xml; + + g_return_if_fail(GVIR_IS_DOMAIN(dom)); + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN (conf)); + g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); + + xml = gvir_config_object_to_xml(GVIR_CONFIG_OBJECT(conf)); + + data = g_slice_new0(DomainSaveToFileData); + data->filename = filename; + data->custom_xml = xml; + data->flags = flags; + + res = g_simple_async_result_new(G_OBJECT(dom), + callback, + user_data, + gvir_domain_save_to_file_async); + g_simple_async_result_set_op_res_gpointer(res, data, (GDestroyNotify)domain_save_to_file_data_free); + + g_simple_async_result_run_in_thread(res, + gvir_domain_save_to_file_helper, + G_PRIORITY_DEFAULT, + cancellable); + + g_object_unref(res); +} + +gboolean gvir_domain_save_to_file_finish(GVirDomain *dom, + GAsyncResult *result, + GError **err) +{ + g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); + g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(dom), gvir_domain_save_to_file_async), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); + + if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), err)) + return FALSE; + + return TRUE; +} + /** * gvir_domain_get_config: * @dom: the domain diff --git a/libvirt-gobject/libvirt-gobject-domain.h b/libvirt-gobject/libvirt-gobject-domain.h index 87b94f4..1df54de 100644 --- a/libvirt-gobject/libvirt-gobject-domain.h +++ b/libvirt-gobject/libvirt-gobject-domain.h @@ -65,6 +65,7 @@ struct _GVirDomainClass void (*resumed)(GVirDomain *dom); void (*updated)(GVirDomain *dom); void (*suspended)(GVirDomain *dom); + void (*saved_to_file) (GVirDomain *dom); gpointer padding[20]; }; @@ -148,6 +149,24 @@ gboolean gvir_domain_reboot(GVirDomain *dom, guint flags, GError **err); +void gvir_domain_save_to_file_async (GVirDomain *dom, + gchar *filename, + GVirConfigDomain *conf, + guint flags, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +gboolean gvir_domain_save_to_file_finish(GVirDomain *dom, + GAsyncResult *result, + GError **err); + +gboolean gvir_domain_save_to_file_config(GVirDomain *dom, + gchar *filename, + GVirConfigDomain *conf, + guint flags, + GError **err); + GVirDomainInfo *gvir_domain_get_info(GVirDomain *dom, GError **err); void gvir_domain_get_info_async(GVirDomain *dom, diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index 94e441a..8ff9e24 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -75,6 +75,9 @@ LIBVIRT_GOBJECT_0.0.8 { gvir_domain_get_persistent; gvir_domain_get_saved; gvir_domain_screenshot; + gvir_domain_save_to_file_config; + gvir_domain_save_to_file_async; + gvir_domain_save_to_file_finish; gvir_domain_snapshot_get_type; gvir_domain_snapshot_handle_get_type; -- 1.7.10.4

2 1

[libvirt] [glib PATCH] Add gvir_connection_domain_restore() and gvir_connection_domain_restore_async()
by Jovanka Gulicoska 11 Jul '12

11 Jul '12

--- libvirt-gobject/libvirt-gobject-connection.c | 136 ++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-connection.h | 19 ++++ libvirt-gobject/libvirt-gobject.sym | 3 + 3 files changed, 158 insertions(+) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index 3a99034..2302328 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -57,6 +57,7 @@ enum { VIR_CONNECTION_CLOSED, VIR_DOMAIN_ADDED, VIR_DOMAIN_REMOVED, + VIR_DOMAIN_RESTORED, LAST_SIGNAL }; @@ -228,6 +229,15 @@ static void gvir_connection_class_init(GVirConnectionClass *klass) 1, GVIR_TYPE_DOMAIN); + signals[VIR_DOMAIN_RESTORED] = g_signal_new("domain-restored", + G_OBJECT_CLASS_TYPE(object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET(GVirConnectionClass, domain_restored), + NULL, NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, + 0); + g_type_class_add_private(klass, sizeof(GVirConnectionPrivate)); } @@ -1605,3 +1615,129 @@ gvir_connection_get_capabilities_finish(GVirConnection *conn, return g_object_ref(caps); } + +/* + * gvir_connection_domain_restore + */ +gboolean gvir_connection_domain_restore(GVirConnection *conn, + gchar *filename, + GVirConfigDomain *conf, + guint flags, + GError **err) +{ + GVirConnectionPrivate *priv; + gchar *custom_xml; + int ret; + + g_return_val_if_fail(GVIR_IS_CONNECTION(conn), FALSE); + g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN (conf), FALSE); + g_return_val_if_fail((err == NULL) || (*err == NULL), FALSE); + + priv = conn->priv; + custom_xml = gvir_config_object_to_xml(GVIR_CONFIG_OBJECT(conf)); + + g_return_val_if_fail(custom_xml != NULL, FALSE); + + if(flags || custom_xml) { + ret = virDomainRestoreFlags(priv->conn, filename, custom_xml, flags); + g_free (custom_xml); + } + else { + ret = virDomainRestore(priv->conn, filename); + g_free (custom_xml); + } + + if(ret < 0) { + gvir_set_error_literal(err, GVIR_CONNECTION_ERROR, + 0, + "Unable to restore domain"); + + return FALSE; + } + + return TRUE; +} + +typedef struct { + gchar *filename; + gchar *custom_xml; + guint flags; +} DomainRestoreFromFileData; + +static void domain_restore_from_file_data_free(DomainRestoreFromFileData *data) +{ + g_slice_free(DomainRestoreFromFileData, data); +} + +static void +gvir_connection_domain_restore_helper(GSimpleAsyncResult *res, + GObject *object, + GCancellable *cancellable G_GNUC_UNUSED) +{ + GVirConnection *conn = GVIR_CONNECTION(object); + DomainRestoreFromFileData *data; + GVirConfigDomain *conf; + GError *err = NULL; + + data = g_simple_async_result_get_op_res_gpointer(res); + conf = gvir_config_domain_new_from_xml(data->custom_xml, &err); + + if(!gvir_connection_domain_restore(conn, data->filename, conf, data->flags, &err)) + g_simple_async_result_take_error(res, err); +} + +/* + * Async function of gvir_connection_domain_restore + */ +void gvir_connection_domain_restore_async(GVirConnection *conn, + gchar *filename, + GVirConfigDomain *conf, + guint flags, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GSimpleAsyncResult *res; + DomainRestoreFromFileData *data; + gchar *custom_xml; + + g_return_if_fail(GVIR_IS_CONNECTION(conn)); + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN (conf)); + g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); + + custom_xml = gvir_config_object_to_xml(GVIR_CONFIG_OBJECT(conf)); + + data = g_slice_new0(DomainRestoreFromFileData); + data->filename = filename; + data->custom_xml = custom_xml; + data->flags = flags; + + res = g_simple_async_result_new(G_OBJECT(conn), + callback, + user_data, + gvir_connection_domain_restore_async); + g_simple_async_result_set_op_res_gpointer(res, data, + (GDestroyNotify)domain_restore_from_file_data_free); + + g_simple_async_result_run_in_thread(res, + gvir_connection_domain_restore_helper, + G_PRIORITY_DEFAULT, + cancellable); + + g_object_unref(res); +} + +gboolean gvir_connection_domain_restore_finish(GVirConnection *conn, + GAsyncResult *result, + GError **err) +{ + g_return_val_if_fail(GVIR_IS_CONNECTION(conn), FALSE); + g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(conn), + gvir_connection_domain_restore_async), + FALSE); + + if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), err)) + return FALSE; + + return TRUE; +} diff --git a/libvirt-gobject/libvirt-gobject-connection.h b/libvirt-gobject/libvirt-gobject-connection.h index c80eecf..01d5d0b 100644 --- a/libvirt-gobject/libvirt-gobject-connection.h +++ b/libvirt-gobject/libvirt-gobject-connection.h @@ -75,6 +75,8 @@ struct _GVirConnectionClass void (*domain_added)(GVirConnection *conn, GVirDomain *dom); void (*domain_removed)(GVirConnection *conn, GVirDomain *dom); + void (*domain_restored)(GVirConnection *conn); + GVirStream *(*stream_new)(GVirConnection *conn, gpointer handle); gpointer padding[20]; @@ -202,6 +204,23 @@ gvir_connection_get_capabilities_finish(GVirConnection *conn, GAsyncResult *result, GError **err); +gboolean gvir_connection_domain_restore(GVirConnection *conn, + gchar *filename, + GVirConfigDomain *conf, + guint flags, + GError **err); + +void gvir_connection_domain_restore_async(GVirConnection *conn, + gchar *filename, + GVirConfigDomain *conf, + guint flags, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +gboolean gvir_connection_domain_restore_finish(GVirConnection *conn, + GAsyncResult *result, + GError **err); G_END_DECLS #endif /* __LIBVIRT_GOBJECT_CONNECTION_H__ */ diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index 8ff9e24..0aaefa2 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -31,6 +31,9 @@ LIBVIRT_GOBJECT_0.0.8 { gvir_connection_create_storage_pool; gvir_connection_start_domain; gvir_connection_get_node_info; + gvir_connection_domain_restore; + gvir_connection_domain_restore_async; + gvir_connection_domain_restore_finish; gvir_domain_device_get_type; gvir_domain_device_get_domain; -- 1.7.10.4

1 0

[libvirt] [PATCH] Fix a string format bug in qemu_cgroup.c
by tangchen 11 Jul '12

11 Jul '12

Signed-off-by: Tang Chen <tangchen(a)cn.fujitsu.com> --- src/qemu/qemu_cgroup.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index f8f375f..662d41d 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -473,8 +473,8 @@ cleanup: rc = virCgroupSetCpuCfsPeriod(cgroup, old_period); if (rc < 0) virReportSystemError(-rc, - _("%s"), - "Unable to rollback cpu bandwidth period"); + "%s", + _("Unable to rollback cpu bandwidth period")); } return -1; -- 1.7.3.1 -- Best Regards, Tang chen

5 5

[libvirt] [PATCHv2] docs: Improve patch submission guidelines
by Michal Privoznik 11 Jul '12

11 Jul '12

We should really advise (new) developers to send rebased patches that apply cleanly and use git-send-email rather than all other obscure ways. --- HACKING | 22 +++++++++++++++++++++- docs/hacking.html.in | 33 ++++++++++++++++++++++++++++----- 2 files changed, 49 insertions(+), 6 deletions(-) diff --git a/HACKING b/HACKING index 69ea96b..def94ee 100644 --- a/HACKING +++ b/HACKING @@ -21,9 +21,29 @@ or: git diff > libvirt-myfeature.patch +However, the usual workflow of libvirt developer is: git checkout master + git pull + git checkout -b workbranch + Hack, committing any changes along the way + +Then, when you want to post your patches: git checkout master + git pull + git checkout workbranch + git rebase master + (fix any conflicts) + git send-email --compose --to=libvir-list(a)redhat.com master + +Please follow this as close as you can, especially the rebase and git +send-email part as it makes developer's, who is reviewing your patch set, life +easier. One should avoid sending patches as attachment but rather send them in +email body among with commit message. + (3) Split large changes into a series of smaller patches, self-contained if possible, with an explanation of each patch and an explanation of how the -sequence of patches fits together. +sequence of patches fits together. Moreover, please keep in mind that it's +required to be able to compile cleanly after each patch. + + (4) Make sure your patches apply against libvirt GIT. Developers only follow GIT and don't care much about released versions. diff --git a/docs/hacking.html.in b/docs/hacking.html.in index 89f9980..af852e0 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -11,19 +11,42 @@ <li>Post patches in unified diff format. A command similar to this should work: -<pre> +<del><pre> diff -urp libvirt.orig/ libvirt.modified/ > libvirt-myfeature.patch -</pre> +</pre></del> or: <pre> git diff > libvirt-myfeature.patch </pre> - </li> - <li>Split large changes into a series of smaller patches, self-contained + However, the usual workflow of libvirt developer is: +<pre> + git checkout master + git pull + git checkout -b workbranch + Hack, committing any changes along the way +</pre> + Then, when you want to post your patches: +<pre> + git checkout master + git pull + git checkout workbranch + git rebase master + (fix any conflicts) + git send-email --compose --no-chain-reply-to --to=libvir-list(a)redhat.com master +</pre> + Please follow this as close as you can, especially the rebase and git + send-email part as it makes developer's, who is reviewing your patch + set, life easier. One should avoid sending patches as attachment but + rather send them in email body among with commit message.</li> + + <li>Split large changes into a series of smaller patches, self-contained if possible, with an explanation of each patch and an explanation of how - the sequence of patches fits together.</li> + the sequence of patches fits together. Moreover, please keep in mind that + it's required to be able to compile cleanly after each patch. + </li> + <li>Make sure your patches apply against libvirt GIT. Developers only follow GIT and don't care much about released versions.</li> <li>Run the automated tests on your code before submitting any changes. -- 1.7.8.6

2 1

[libvirt] [PATCH] build: detect all improper uses of _("%s")
by Eric Blake 10 Jul '12

10 Jul '12

The only useful translation of "%s" as a format string is "%s" (I suppose you could claim "%$1s" is also valid, but why bother). So it is not worth translating; fixing this exposes some instances where we were failing to translate real error messages. * cfg.mk (sc_prohibit_useless_translation): New rule. * src/lxc/lxc_driver.c (lxcSetVcpuBWLive): Fix offender. * src/openvz/openvz_conf.c (openvzReadFSConf): Likewise. * src/qemu/qemu_cgroup.c (qemuSetupCgroupVcpuBW) (qemuSetupCgroupForVcpu): Likewise. * src/qemu/qemu_driver.c (qemuSetVcpusBWLive): Likewise. * src/xenapi/xenapi_utils.c (xenapiSessionErrorHandle): Likewise. --- This is a followup to: https://www.redhat.com/archives/libvir-list/2012-July/msg00403.html cfg.mk | 6 ++++++ src/lxc/lxc_driver.c | 5 ++--- src/openvz/openvz_conf.c | 5 ++--- src/qemu/qemu_cgroup.c | 12 +++++------- src/qemu/qemu_driver.c | 5 ++--- src/xenapi/xenapi_utils.c | 8 +++++--- 6 files changed, 22 insertions(+), 19 deletions(-) diff --git a/cfg.mk b/cfg.mk index 7664d5d..6dfe799 100644 --- a/cfg.mk +++ b/cfg.mk @@ -622,6 +622,12 @@ sc_prohibit_newline_at_end_of_diagnostic: && { echo '$(ME): newline at end of message(s)' 1>&2; \ exit 1; } || : +# The strings "" and "%s" should never be marked for translation. +sc_prohibit_useless_translation: + @prohibit='_$"(%s)?"$' \ + halt='$(ME): found useless translation' \ + $(_sc_search_regexp) + # Enforce recommended preprocessor indentation style. sc_preprocessor_indentation: @if cppi --version >/dev/null 2>&1; then \ diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index b58aeae..ae024fe 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -2965,9 +2965,8 @@ cleanup: if (period) { rc = virCgroupSetCpuCfsPeriod(cgroup, old_period); if (rc < 0) - virReportSystemError(-rc, - _("%s"), - "Unable to rollback cpu bandwidth period"); + virReportSystemError(-rc, "%s", + _("Unable to rollback cpu bandwidth period")); } return -1; diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index ad27d37..7b66299 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -457,9 +457,8 @@ openvzReadFSConf(virDomainDefPtr def, /* Ensure that we can multiply by 1024 without overflowing. */ if (barrier > ULLONG_MAX / 1024 || limit > ULLONG_MAX / 1024 ) { - virReportSystemError(VIR_ERR_OVERFLOW, - _("%s"), - "Unable to parse quota"); + virReportSystemError(VIR_ERR_OVERFLOW, "%s", + _("Unable to parse quota")); goto error; } fs->space_soft_limit = barrier * 1024; /* unit is bytes */ diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index f8f375f..e39f5e1 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -1,7 +1,7 @@ /* * qemu_cgroup.c: QEMU cgroup management * - * Copyright (C) 2006-2011 Red Hat, Inc. + * Copyright (C) 2006-2012 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -472,9 +472,8 @@ cleanup: if (period) { rc = virCgroupSetCpuCfsPeriod(cgroup, old_period); if (rc < 0) - virReportSystemError(-rc, - _("%s"), - "Unable to rollback cpu bandwidth period"); + virReportSystemError(-rc, "%s", + _("Unable to rollback cpu bandwidth period")); } return -1; @@ -507,9 +506,8 @@ int qemuSetupCgroupForVcpu(struct qemud_driver *driver, virDomainObjPtr vm) if (qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_CPU)) { /* Ensure that we can multiply by vcpus without overflowing. */ if (quota > LLONG_MAX / vm->def->vcpus) { - virReportSystemError(EINVAL, - _("%s"), - "Unable to set cpu bandwidth quota"); + virReportSystemError(EINVAL, "%s", + _("Unable to set cpu bandwidth quota")); goto cleanup; } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3410535..377be9f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7134,9 +7134,8 @@ qemuSetVcpusBWLive(virDomainObjPtr vm, virCgroupPtr cgroup, /* Ensure that we can multiply by vcpus without overflowing. */ if (quota > LLONG_MAX / vm->def->vcpus) { - virReportSystemError(EINVAL, - _("%s"), - "Unable to set cpu bandwidth quota"); + virReportSystemError(EINVAL, "%s", + _("Unable to set cpu bandwidth quota")); goto cleanup; } diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c index 3471b6a..e5a9cc5 100644 --- a/src/xenapi/xenapi_utils.c +++ b/src/xenapi/xenapi_utils.c @@ -1,6 +1,6 @@ /* * xenapi_utils.c: Xen API driver -- utils parts. - * Copyright (C) 2011 Red Hat, Inc. + * Copyright (C) 2011-2012 Red Hat, Inc. * Copyright (C) 2009, 2010 Citrix Ltd. * * This library is free software; you can redistribute it and/or @@ -372,11 +372,13 @@ xenapiSessionErrorHandle(virConnectPtr conn, virErrorNumber errNum, if (buf == NULL && priv != NULL && priv->session != NULL) { char *ret = returnErrorFromSession(priv->session); - virReportErrorHelper(VIR_FROM_XENAPI, errNum, filename, func, lineno, _("%s"), ret); + virReportErrorHelper(VIR_FROM_XENAPI, errNum, filename, func, lineno, + "%s", ret); xen_session_clear_error(priv->session); VIR_FREE(ret); } else { - virReportErrorHelper(VIR_FROM_XENAPI, errNum, filename, func, lineno, _("%s"), buf); + virReportErrorHelper(VIR_FROM_XENAPI, errNum, filename, func, lineno, + "%s", buf); } } -- 1.7.10.4

2 2

[libvirt] [PATCH] systemd: start libvirtd after network
by Jim Fehlig 10 Jul '12

10 Jul '12

Domains configured with autostart may fail to start if the host network stack has not been started. E.g. when using bridged networking autostarting a domain can fail with libvirtd[1403]: 2012-06-20 13:23:49.833+0000: 1485: error : qemuAutostartDomain:177 : Failed to autostart VM 'test': Cannot get interface MTU on 'br0': No such device --- daemon/libvirtd.service.in | 1 + 1 file changed, 1 insertion(+) diff --git a/daemon/libvirtd.service.in b/daemon/libvirtd.service.in index 33724ee..b7afadf 100644 --- a/daemon/libvirtd.service.in +++ b/daemon/libvirtd.service.in @@ -6,6 +6,7 @@ [Unit] Description=Virtualization daemon Before=libvirt-guests.service +After=network.target [Service] EnvironmentFile=-/etc/sysconfig/libvirtd -- 1.7.10.4

2 2