- Devel - libvirt List Archives

[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

2 2

[libvirt] [glib PATCH] Add bindings for virDomainSnapshotCreateXML()
by Jovanka Gulicoska 11 Jul '12

11 Jul '12

--- libvirt-gobject/libvirt-gobject-domain.c | 39 ++++++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-domain.h | 4 +++ 2 files changed, 43 insertions(+) diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index eda2427..ea621ff 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -1270,3 +1270,42 @@ GList *gvir_domain_get_devices(GVirDomain *domain, return g_list_reverse (ret); } + +/** + * gvir_domain_snapshot_create_xml: + * @dom: the domain + * @conf: configuration of domain + * @flags: the flags + * @err: (allow-none):Place-holder for error or NULL + * + * Returns: snapshot of existing domain + */ +GVirConfigDomainSnapshot *gvir_domain_snapshot_create_xml(GVirDomain *dom, + GVirConfigDomain *conf, + guint flags, + GError **err) +{ + GVirDomainPrivate *priv; + virDomainSnapshot *snapshot; + gchar *xml_desc; + + 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, NULL); + + priv = dom->priv; + xml_desc = gvir_config_object_to_xml(GVIR_CONFIG_OBJECT(conf)); + + if(!(snapshot = virDomainSnapshotCreateXML(priv->handle, xml_desc, flags))) { + gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, + 0, + "Unable to create snapshot of domain"); + return NULL; + + } + + GVirConfigDomainSnapshot *conf_snapshot = gvir_config_domain_snapshot_new_from_xml(xml_desc, err); + + g_free(xml_desc); + return conf_snapshot; +} diff --git a/libvirt-gobject/libvirt-gobject-domain.h b/libvirt-gobject/libvirt-gobject-domain.h index 49516a7..6540f64 100644 --- a/libvirt-gobject/libvirt-gobject-domain.h +++ b/libvirt-gobject/libvirt-gobject-domain.h @@ -220,6 +220,10 @@ gboolean gvir_domain_get_saved(GVirDomain *dom); GList *gvir_domain_get_devices(GVirDomain *domain, GError **err); +GVirConfigDomainSnapshot *gvir_domain_snapshot_create_xml(GVirDomain *dom, + GVirConfigDomain *conf, + guint flags, + GError **err); G_END_DECLS #endif /* __LIBVIRT_GOBJECT_DOMAIN_H__ */ -- 1.7.10.4

2 1

[libvirt] [glib PATCH V2] Add bindings for virStorageVolDownload() and virStorageVolUpload()
by Jovanka Gulicoska 11 Jul '12

11 Jul '12

--- libvirt-gobject/libvirt-gobject-storage-vol.c | 75 +++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-storage-vol.h | 14 +++++ libvirt-gobject/libvirt-gobject.h | 1 + libvirt-gobject/libvirt-gobject.sym | 2 + 4 files changed, 92 insertions(+) diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.c b/libvirt-gobject/libvirt-gobject-storage-vol.c index 6f60fcd..7f9aeb7 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.c +++ b/libvirt-gobject/libvirt-gobject-storage-vol.c @@ -349,3 +349,78 @@ gboolean gvir_storage_vol_resize(GVirStorageVol *vol, return TRUE; } + +/** + * gvir_storage_vol_download: + * @vol: the storage volume to download from + * @stream: stream to use as output + * @offset: position in @vol to start reading from + * @length: limit on amount of data to download + * @flags: extra flags, not used yet, pass 0 + * + * Returns: #TRUE of success, #FALSE otherwise + */ +gboolean gvir_storage_vol_download(GVirStorageVol *vol, + GVirStream *stream, + unsigned long long offset, + unsigned long long length, + guint flags, + GError **err) +{ + virStreamPtr st = NULL; + + g_object_get(stream, "handle", &st, NULL); + + g_return_val_if_fail(GVIR_IS_STORAGE_VOL(vol), FALSE); + g_return_val_if_fail(GVIR_IS_STREAM(stream), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); + + if(virStorageVolDownload(vol->priv->handle, st, offset, length, 0) < 0) { + gvir_set_error_literal(err, + GVIR_STORAGE_VOL_ERROR, + 0, + "Unable to downlaod volume storage"); + + return FALSE; + } + + return TRUE; +} + +/** + * gvir_storage_vol_upload: + * @vol: the storage volume to upload + * @stream: stream to use as input + * @offset: position in @vol to start to write to + * @length: limit on amount of data to upload + * @flags: the flags, not set yet, pass 0 + * + * Returns: #TRUE of success, #FALSE otherwise + */ +gboolean gvir_storage_vol_upload(GVirStorageVol *vol, + GVirStream *stream, + unsigned long long offset, + unsigned long long length, + guint flags, + GError **err) +{ + virStreamPtr st = NULL; + + g_object_get(stream, "handle", &st, NULL); + + g_return_val_if_fail(GVIR_IS_STORAGE_VOL(vol), FALSE); + g_return_val_if_fail(GVIR_IS_STREAM(stream), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); + + if(virStorageVolUpload(vol->priv->handle, st, offset, length, 0) < 0) { + gvir_set_error_literal(err, + GVIR_STORAGE_VOL_ERROR, + 0, + "Unable to upload to stream"); + + return FALSE; + } + + return TRUE; +} + diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.h b/libvirt-gobject/libvirt-gobject-storage-vol.h index b425f0a..e156792 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.h +++ b/libvirt-gobject/libvirt-gobject-storage-vol.h @@ -110,6 +110,20 @@ gboolean gvir_storage_vol_resize(GVirStorageVol *vol, guint flags, GError **err); +gboolean gvir_storage_vol_download(GVirStorageVol *vol, + GVirStream *stream, + unsigned long long offset, + unsigned long long length, + guint flags, + GError **err); + +gboolean gvir_storage_vol_upload(GVirStorageVol *vol, + GVirStream *stream, + unsigned long long offset, + unsigned long long length, + guint flags, + GError **err); + G_END_DECLS #endif /* __LIBVIRT_GOBJECT_STORAGE_VOL_H__ */ diff --git a/libvirt-gobject/libvirt-gobject.h b/libvirt-gobject/libvirt-gobject.h index f52cc00..b1158f7 100644 --- a/libvirt-gobject/libvirt-gobject.h +++ b/libvirt-gobject/libvirt-gobject.h @@ -44,5 +44,6 @@ #include <libvirt-gobject/libvirt-gobject-storage-pool.h> #include <libvirt-gobject/libvirt-gobject-connection.h> #include <libvirt-gobject/libvirt-gobject-manager.h> +#include <libvirt-gobject/libvirt-gobject-stream.h> #endif /* __LIBVIRT_GOBJECT_H__ */ diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index db32c7f..478881b 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -143,6 +143,8 @@ LIBVIRT_GOBJECT_0.0.8 { gvir_storage_vol_get_info; gvir_storage_vol_delete; gvir_storage_vol_resize; + gvir_storage_vol_download; + gvir_storage_vol_upload; gvir_connection_handle_get_type; -- 1.7.10.4

2 1

[libvirt] [glib PATCH V2] Add bindings for virDomainRestore*()
by Jovanka Gulicoska 11 Jul '12

11 Jul '12

--- libvirt-gobject/libvirt-gobject-connection.c | 153 ++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-connection.h | 19 ++++ libvirt-gobject/libvirt-gobject.sym | 3 + 3 files changed, 175 insertions(+) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index 3a99034..6fbf86b 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -1605,3 +1605,156 @@ gvir_connection_get_capabilities_finish(GVirConnection *conn, return g_object_ref(caps); } + +/** + * gvir_connection_domain_restore: + * @conn: a #GVirConnection + * @filename: path to input file + * @conf: configuration for domain + * @flags: the flags + * + * Returns: TRUE on success, FALSe otherwise + */ +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 != NULL)) { + 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_free(data->filename); + g_free(data->custom_xml); + 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); +} + +/** + * gvir_connection_domain_restore_async: + * @conn: a #GVirConnection + * @filename: path to input file + * @conf: configuration for domain + * @flags: the flags + * @cancellable: cancallation object + * @callback: (scope async): completion callback + * @user_data: (closure): opaque data for callback + * + * Asynchronous variant 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 = g_strdup(filename); + data->custom_xml = g_strdup(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); +} + +/** + * gvir_connection_domain_finish: + * @conn: a #GVirConnection + * @result: (transfer none): async method result + * @err: Place-holder for possible errors + * + * Finishes the operation started by #gvir_domain_restore_async. + * + * Returns: TRUE if domain was restored successfully, FALSE otherwise. + */ +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 54a093a..db32c7f 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

2 1

[libvirt] [glib PATCH V2] Add bindings for virDomainSave*()
by Jovanka Gulicoska 11 Jul '12

11 Jul '12

--- libvirt-gobject/libvirt-gobject-domain.c | 149 +++++++++++++++++++++++++++++- libvirt-gobject/libvirt-gobject-domain.h | 20 +++- libvirt-gobject/libvirt-gobject.sym | 3 + 3 files changed, 170 insertions(+), 2 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index 088cd33..eda2427 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -54,7 +54,7 @@ enum { VIR_SUSPENDED, VIR_RESUMED, VIR_STOPPED, - VIR_UPDATED, + VIR_UPDATED, LAST_SIGNAL }; @@ -557,6 +557,153 @@ gboolean gvir_domain_reboot(GVirDomain *dom, } /** + * gvir_domain_save_to_file: + * @dom: the domain + * @filename: path to the output file + * @conf: configuration for domain + * @flags: the flags + * + * Returns: TRUE on success, FALSE otherwise + */ +gboolean gvir_domain_save_to_file(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 != NULL)) { + 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_free(data->filename); + g_free(data->custom_xml); + 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; + + data = g_simple_async_result_get_op_res_gpointer(res); + conf = gvir_domain_get_config(dom, data->flags, &err); + + if (!gvir_domain_save_to_file(dom, data->filename, conf, data->flags, &err)) + g_simple_async_result_take_error(res, err); + } + +/** + * gvir_domain_save_to_file_async: + * @dom: the domain + * @filename: path to output file + * @conf: configuration for 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 = g_strdup(filename); + data->custom_xml = g_strdup(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); +} + +/** + * gvir_domain_save_to_file_finish: + * @dom: the domain to save + * @result: (transfer none): async method result + * @err: Place-holder for possible errors + * + * Finishes the operation started by #gvir_domain_save_to_file_async. + * + * Returns: TRUE if domain was saved successfully, FALSE otherwise. + */ +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 * @flags: the flags diff --git a/libvirt-gobject/libvirt-gobject-domain.h b/libvirt-gobject/libvirt-gobject-domain.h index 87b94f4..49516a7 100644 --- a/libvirt-gobject/libvirt-gobject-domain.h +++ b/libvirt-gobject/libvirt-gobject-domain.h @@ -65,7 +65,7 @@ struct _GVirDomainClass void (*resumed)(GVirDomain *dom); void (*updated)(GVirDomain *dom); void (*suspended)(GVirDomain *dom); - + gpointer padding[20]; }; @@ -148,6 +148,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(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..54a093a 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; + 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] [PATCH]POWER Hypervisor: Fix the segment fault issue for the "list" command
by Dennis Chen 11 Jul '12

11 Jul '12

When connect to the remote IBM HMC/IVM server, the remoteNetworkOpen() called after the phypOpen() in do_open function will re-assign a NULL pointer to the virConnectPtr conn->networkPrivateData which is allocated in phypOpen(), this will result in a segment fault issue when execute the following commands, eg, "virsh# list --all" Signed-off-by: Dennis Chen<dennis.chen(a)tnsoft.com.cn> --- src/remote/remote_driver.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index eac50e6..22ef129 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -2504,7 +2504,8 @@ static virDrvOpenStatus ATTRIBUTE_NONNULL (1) remoteGenericOpen(virConnectPtr conn, virConnectAuthPtr auth, unsigned int flags, void **genericPrivateData) { - if (inside_daemon) + if (inside_daemon || + STREQ (conn->driver->name, "PHYP")) return VIR_DRV_OPEN_DECLINED; if (conn->driver&& BRs, Dennis

2 2

[libvirt] [PATCH] storage: Default pool permission mode to 0711
by Osier Yang 11 Jul '12

11 Jul '12

Per the typical use of libvirt is to fork the qemu process with qemu:qemu. Setting the pool permission mode as 0700 by default will prevent the guest start with permission reason. Define macro for the default pool and vol permission modes incidentally. --- src/conf/storage_conf.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index bf4567f..6d4987b 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -47,6 +47,8 @@ #define VIR_FROM_THIS VIR_FROM_STORAGE +#define DEFAULT_POOL_PERM_MODE 0711 +#define DEFAULT_VOL_PERM_MODE 0600 VIR_ENUM_IMPL(virStoragePool, VIR_STORAGE_POOL_LAST, @@ -812,7 +814,8 @@ virStoragePoolDefParseXML(xmlXPathContextPtr ctxt) { goto cleanup; if (virStorageDefParsePerms(ctxt, &ret->target.perms, - "./target/permissions", 0700) < 0) + "./target/permissions", + DEFAULT_POOL_PERM_MODE) < 0) goto cleanup; } @@ -1137,7 +1140,8 @@ virStorageVolDefParseXML(virStoragePoolDefPtr pool, } if (virStorageDefParsePerms(ctxt, &ret->target.perms, - "./target/permissions", 0600) < 0) + "./target/permissions", + DEFAULT_VOL_PERM_MODE) < 0) goto cleanup; node = virXPathNode("./target/encryption", ctxt); @@ -1168,7 +1172,8 @@ virStorageVolDefParseXML(virStoragePoolDefPtr pool, } if (virStorageDefParsePerms(ctxt, &ret->backingStore.perms, - "./backingStore/permissions", 0600) < 0) + "./backingStore/permissions", + DEFAULT_VOL_PERM_MODE) < 0) goto cleanup; return ret; -- 1.7.7.3

3 5

[libvirt] [PATCHv3 0/4] Fix filling of nodeinfo structure and add test cases
by Peter Krempa 11 Jul '12

11 Jul '12

For explanation why this is needed see 2/4. Patch 1/4 are test data split out from 1/3 of the previous version to ease reviewing of 2/4. Peter Krempa (4): nodeinfo_test: Enhance test data before changing nodeinfo gathering nodeinfo: Fix gathering of nodeinfo data structure test: Add new test case for nodeinfotest test: Add test case for nodeinfotest if host machine doesn't have NUMA src/nodeinfo.c | 311 +++++++++------- .../linux-nodeinfo-sysfs-test-2/node/node0/cpu0 | 1 + .../linux-nodeinfo-sysfs-test-2/node/node0/cpu1 | 1 + .../linux-nodeinfo-sysfs-test-3-cpu-x86-output.txt | 2 +- .../linux-nodeinfo-sysfs-test-3/node/node0/cpu0 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node0/cpu12 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node0/cpu16 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node0/cpu20 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node0/cpu4 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node0/cpu8 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node1/cpu24 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node1/cpu28 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node1/cpu32 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node1/cpu36 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node1/cpu40 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node1/cpu44 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node2/cpu11 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node2/cpu15 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node2/cpu19 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node2/cpu23 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node2/cpu3 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node2/cpu7 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node3/cpu27 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node3/cpu31 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node3/cpu35 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node3/cpu39 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node3/cpu43 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node3/cpu47 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node4/cpu10 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node4/cpu14 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node4/cpu18 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node4/cpu2 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node4/cpu22 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node4/cpu6 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node5/cpu26 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node5/cpu30 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node5/cpu34 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node5/cpu38 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node5/cpu42 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node5/cpu46 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node6/cpu1 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node6/cpu13 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node6/cpu17 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node6/cpu21 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node6/cpu5 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node6/cpu9 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node7/cpu25 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node7/cpu29 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node7/cpu33 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node7/cpu37 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node7/cpu41 | 1 + .../linux-nodeinfo-sysfs-test-3/node/node7/cpu45 | 1 + .../linux-nodeinfo-sysfs-test-3/node/possible | Bin 4 -> 5 bytes .../linux-nodeinfo-sysfs-test-4-cpu-x86-output.txt | 1 + .../linux-nodeinfo-sysfs-test-4-x86.cpuinfo | 400 ++++++++++++++++++++ .../cpu/cpu0/topology/core_id | 1 + .../cpu/cpu0/topology/physical_package_id | 1 + .../cpu/cpu0/topology/thread_siblings | 1 + .../linux-nodeinfo-sysfs-test-4/cpu/cpu1/online | 1 + .../cpu/cpu1/topology/core_id | 1 + .../cpu/cpu1/topology/physical_package_id | 1 + .../cpu/cpu1/topology/thread_siblings | 1 + .../linux-nodeinfo-sysfs-test-4/cpu/cpu10/online | 1 + .../cpu/cpu10/topology/core_id | 1 + .../cpu/cpu10/topology/physical_package_id | 1 + .../cpu/cpu10/topology/thread_siblings | 1 + .../linux-nodeinfo-sysfs-test-4/cpu/cpu11/online | 1 + .../cpu/cpu11/topology/core_id | 1 + .../cpu/cpu11/topology/physical_package_id | 1 + .../cpu/cpu11/topology/thread_siblings | 1 + .../linux-nodeinfo-sysfs-test-4/cpu/cpu12/online | 1 + .../cpu/cpu12/topology/core_id | 1 + .../cpu/cpu12/topology/physical_package_id | 1 + .../cpu/cpu12/topology/thread_siblings | 1 + .../linux-nodeinfo-sysfs-test-4/cpu/cpu13/online | 1 + .../cpu/cpu13/topology/core_id | 1 + .../cpu/cpu13/topology/physical_package_id | 1 + .../cpu/cpu13/topology/thread_siblings | 1 + .../linux-nodeinfo-sysfs-test-4/cpu/cpu14/online | 1 + .../cpu/cpu14/topology/core_id | 1 + .../cpu/cpu14/topology/physical_package_id | 1 + .../cpu/cpu14/topology/thread_siblings | 1 + .../linux-nodeinfo-sysfs-test-4/cpu/cpu15/online | 1 + .../cpu/cpu15/topology/core_id | 1 + .../cpu/cpu15/topology/physical_package_id | 1 + .../cpu/cpu15/topology/thread_siblings | 1 + .../linux-nodeinfo-sysfs-test-4/cpu/cpu2/online | 1 + .../cpu/cpu2/topology/core_id | 1 + .../cpu/cpu2/topology/physical_package_id | 1 + .../cpu/cpu2/topology/thread_siblings | 1 + .../linux-nodeinfo-sysfs-test-4/cpu/cpu3/online | 1 + .../cpu/cpu3/topology/core_id | 1 + .../cpu/cpu3/topology/physical_package_id | 1 + .../cpu/cpu3/topology/thread_siblings | 1 + .../linux-nodeinfo-sysfs-test-4/cpu/cpu4/online | 1 + .../cpu/cpu4/topology/core_id | 1 + .../cpu/cpu4/topology/physical_package_id | 1 + .../cpu/cpu4/topology/thread_siblings | 1 + .../linux-nodeinfo-sysfs-test-4/cpu/cpu5/online | 1 + .../cpu/cpu5/topology/core_id | 1 + .../cpu/cpu5/topology/physical_package_id | 1 + .../cpu/cpu5/topology/thread_siblings | 1 + .../linux-nodeinfo-sysfs-test-4/cpu/cpu6/online | 1 + .../cpu/cpu6/topology/core_id | 1 + .../cpu/cpu6/topology/physical_package_id | 1 + .../cpu/cpu6/topology/thread_siblings | 1 + .../linux-nodeinfo-sysfs-test-4/cpu/cpu7/online | 1 + .../cpu/cpu7/topology/core_id | 1 + .../cpu/cpu7/topology/physical_package_id | 1 + .../cpu/cpu7/topology/thread_siblings | 1 + .../linux-nodeinfo-sysfs-test-4/cpu/cpu8/online | 1 + .../cpu/cpu8/topology/core_id | 1 + .../cpu/cpu8/topology/physical_package_id | 1 + .../cpu/cpu8/topology/thread_siblings | 1 + .../linux-nodeinfo-sysfs-test-4/cpu/cpu9/online | 1 + .../cpu/cpu9/topology/core_id | 1 + .../cpu/cpu9/topology/physical_package_id | 1 + .../cpu/cpu9/topology/thread_siblings | 1 + .../linux-nodeinfo-sysfs-test-4/node/node0/cpu0 | 1 + .../linux-nodeinfo-sysfs-test-4/node/node0/cpu1 | 1 + .../linux-nodeinfo-sysfs-test-4/node/node0/cpu2 | 1 + .../linux-nodeinfo-sysfs-test-4/node/node0/cpu3 | 1 + .../linux-nodeinfo-sysfs-test-4/node/node0/cpu4 | 1 + .../linux-nodeinfo-sysfs-test-4/node/node0/cpu5 | 1 + .../linux-nodeinfo-sysfs-test-4/node/node0/cpu6 | 1 + .../linux-nodeinfo-sysfs-test-4/node/node0/cpu7 | 1 + .../linux-nodeinfo-sysfs-test-4/node/node0/meminfo | 29 ++ .../linux-nodeinfo-sysfs-test-4/node/node1/cpu10 | 1 + .../linux-nodeinfo-sysfs-test-4/node/node1/cpu11 | 1 + .../linux-nodeinfo-sysfs-test-4/node/node1/cpu12 | 1 + .../linux-nodeinfo-sysfs-test-4/node/node1/cpu13 | 1 + .../linux-nodeinfo-sysfs-test-4/node/node1/cpu14 | 1 + .../linux-nodeinfo-sysfs-test-4/node/node1/cpu15 | 1 + .../linux-nodeinfo-sysfs-test-4/node/node1/cpu8 | 1 + .../linux-nodeinfo-sysfs-test-4/node/node1/cpu9 | 1 + .../linux-nodeinfo-sysfs-test-4/node/node1/meminfo | 29 ++ .../linux-nodeinfo-sysfs-test-4/node/possible | Bin 0 -> 5 bytes .../linux-nodeinfo-sysfs-test-5-cpu-x86-output.txt | 1 + .../linux-nodeinfo-sysfs-test-5-x86.cpuinfo | 100 +++++ .../cpu/cpu0/topology/core_id | 1 + .../cpu/cpu0/topology/core_siblings | 1 + .../cpu/cpu0/topology/core_siblings_list | 1 + .../cpu/cpu0/topology/physical_package_id | 1 + .../cpu/cpu0/topology/thread_siblings | 1 + .../cpu/cpu0/topology/thread_siblings_list | 1 + .../linux-nodeinfo-sysfs-test-5/cpu/cpu1/online | 1 + .../cpu/cpu1/topology/core_id | 1 + .../cpu/cpu1/topology/core_siblings | 1 + .../cpu/cpu1/topology/core_siblings_list | 1 + .../cpu/cpu1/topology/physical_package_id | 1 + .../cpu/cpu1/topology/thread_siblings | 1 + .../cpu/cpu1/topology/thread_siblings_list | 1 + .../linux-nodeinfo-sysfs-test-5/cpu/cpu2/online | 1 + .../cpu/cpu2/topology/core_id | 1 + .../cpu/cpu2/topology/core_siblings | 1 + .../cpu/cpu2/topology/core_siblings_list | 1 + .../cpu/cpu2/topology/physical_package_id | 1 + .../cpu/cpu2/topology/thread_siblings | 1 + .../cpu/cpu2/topology/thread_siblings_list | 1 + .../linux-nodeinfo-sysfs-test-5/cpu/cpu3/online | 1 + .../cpu/cpu3/topology/core_id | 1 + .../cpu/cpu3/topology/core_siblings | 1 + .../cpu/cpu3/topology/core_siblings_list | 1 + .../cpu/cpu3/topology/physical_package_id | 1 + .../cpu/cpu3/topology/thread_siblings | 1 + .../cpu/cpu3/topology/thread_siblings_list | 1 + tests/nodeinfotest.c | 2 + 167 files changed, 903 insertions(+), 128 deletions(-) create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/node/node0/cpu0 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/node/node0/cpu1 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node0/cpu0 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node0/cpu12 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node0/cpu16 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node0/cpu20 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node0/cpu4 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node0/cpu8 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node1/cpu24 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node1/cpu28 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node1/cpu32 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node1/cpu36 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node1/cpu40 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node1/cpu44 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node2/cpu11 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node2/cpu15 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node2/cpu19 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node2/cpu23 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node2/cpu3 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node2/cpu7 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node3/cpu27 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node3/cpu31 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node3/cpu35 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node3/cpu39 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node3/cpu43 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node3/cpu47 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node4/cpu10 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node4/cpu14 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node4/cpu18 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node4/cpu2 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node4/cpu22 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node4/cpu6 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node5/cpu26 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node5/cpu30 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node5/cpu34 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node5/cpu38 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node5/cpu42 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node5/cpu46 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node6/cpu1 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node6/cpu13 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node6/cpu17 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node6/cpu21 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node6/cpu5 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node6/cpu9 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node7/cpu25 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node7/cpu29 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node7/cpu33 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node7/cpu37 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node7/cpu41 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node7/cpu45 create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4-cpu-x86-output.txt create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4-x86.cpuinfo create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu0/topology/core_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu0/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu0/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu1/online create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu1/topology/core_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu1/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu1/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu10/online create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu10/topology/core_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu10/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu10/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu11/online create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu11/topology/core_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu11/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu11/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu12/online create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu12/topology/core_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu12/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu12/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu13/online create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu13/topology/core_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu13/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu13/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu14/online create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu14/topology/core_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu14/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu14/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu15/online create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu15/topology/core_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu15/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu15/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu2/online create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu2/topology/core_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu2/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu2/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu3/online create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu3/topology/core_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu3/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu3/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu4/online create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu4/topology/core_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu4/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu4/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu5/online create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu5/topology/core_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu5/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu5/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu6/online create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu6/topology/core_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu6/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu6/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu7/online create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu7/topology/core_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu7/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu7/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu8/online create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu8/topology/core_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu8/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu8/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu9/online create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu9/topology/core_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu9/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu9/topology/thread_siblings create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node0/cpu0 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node0/cpu1 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node0/cpu2 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node0/cpu3 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node0/cpu4 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node0/cpu5 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node0/cpu6 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node0/cpu7 create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node0/meminfo create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node1/cpu10 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node1/cpu11 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node1/cpu12 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node1/cpu13 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node1/cpu14 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node1/cpu15 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node1/cpu8 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node1/cpu9 create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node1/meminfo create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/possible create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-5-cpu-x86-output.txt create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-5-x86.cpuinfo create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu0/topology/core_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu0/topology/core_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu0/topology/core_siblings_list create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu0/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu0/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu0/topology/thread_siblings_list create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu1/online create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu1/topology/core_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu1/topology/core_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu1/topology/core_siblings_list create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu1/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu1/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu1/topology/thread_siblings_list create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu2/online create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu2/topology/core_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu2/topology/core_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu2/topology/core_siblings_list create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu2/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu2/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu2/topology/thread_siblings_list create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu3/online create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu3/topology/core_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu3/topology/core_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu3/topology/core_siblings_list create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu3/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu3/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu3/topology/thread_siblings_list -- 1.7.8.6

3 14

[libvirt] [PATCH] docs: added description of the vendor_id attribute
by Hendrik Schwartke 11 Jul '12

11 Jul '12

--- docs/formatdomain.html.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 94c555f..b6e0d5d 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -779,7 +779,11 @@ in which case an attempt to start a domain requesting an unsupported CPU model will fail. Supported values for <code>fallback</code> attribute are: <code>allow</code> (this is the default), and - <code>forbid</code>.</dd> + <code>forbid</code>. The optional <code>vendor_id</code> attribute + (<span class="since">Since 0.9.14</span>) can be used to set the + vendor id seen by the guest. It must be exactly 12 characters long. + If not set the vendor id of the host is used. Typical possible + values are "AuthenticAMD" and "GenuineIntel".</dd> <dt><code>vendor</code></dt> <dd><span class="since">Since 0.8.3</span> the content of the -- 1.7.9.5

4 6

[libvirt] Problem setting CPU topology
by Zeeshan Ali (Khattak) 11 Jul '12

11 Jul '12

Hi, I'm trying to set exact CPU topology to qemu-kvm domains to match host's topology. In my case, host topology is: 1 socket, 2 cores and 2 threads. If I set the XML like this: <domain type='kvm'> .. <vcpu placement='static'>4</vcpu> <os> <type arch='i686' machine='pc-0.15'>hvm</type> <boot dev='hd'/> </os> <cpu mode='host-model'> <model fallback='allow'/> <topology sockets='1' cores='2' threads='2'/> </cpu> .. The qemu commandline launched for this domain looks like this: /usr/bin/qemu-kvm -name fedora17-2 -S -M pc-0.15 -cpu core2duo,+lahf_lm,+rdtscp,+aes,+popcnt,+sse4.2,+sse4.1,+pdcm,+xtpr,+cx16,+tm2,+est,+smx,+vmx,+ds_cpl,+dtes64,+pclmuldq,+pbe,+tm,+ht,+ss,+acpi,+ds -enable-kvm -m 1152 -smp 4,sockets=1,cores=2,threads=2 -uuid c573342b-2876-05b8-098e-6d5314cab062 -nodefconfig -nodefaults -chardev socket,id=charmonitor,path=/home/zeenix/.config/libvirt/qemu/lib/fedora17-2.monitor,server,nowait -mon chardev=charmonitor,id=monitor,mode=control -rtc base=utc,driftfix=slew -no-kvm-pit-reinjection -no-shutdown -no-acpi -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x5 -drive file=/home/zeenix/.local/share/gnome-boxes/images/fedora17-2,if=none,id=drive-virtio-disk0,format=qcow2,cache=none -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 -drive file=/extra-data/ISOs/Fedora-17-i686-Live-Desktop.iso,if=none,id=drive-ide0-1-0,readonly=on,format=raw -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 -netdev user,id=hostnet0 -device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:21:6f:6e,bus=pci.0,addr=0x3 -chardev pty,id=charserial0 -device isa-serial,chardev=charserial0,id=serial0 -chardev spicevmc,id=charchannel0,name=vdagent -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=com.redhat.spice.0 -device usb-tablet,id=input0 -spice port=5900,addr=127.0.0.1,disable-ticketing -vga qxl -global qxl-vga.vram_size=67108864 -device AC97,id=sound0,bus=pci.0,addr=0x4 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x7 Despite the '-smp 4,sockets=1,cores=2,threads=2', I see only 1 CPU reported by '/proc/cpuinfo' in the guest F17 live. However, when I manually launch a very similar commandline,': /usr/bin/qemu-kvm -name fedora17-2 -M pc-0.15 -cpu core2duo,+lahf_lm,+rdtscp,+aes,+popcnt,+sse4.2,+sse4.1,+pdcm,+xtpr,+cx16,+tm2,+est,+smx,+vmx,+ds_cpl,+dtes64,+pclmuldq,+pbe,+tm,+ht,+ss,+acpi,+ds -m 1G -smp 4,cores=2,threads=2,sockets=1 -uuid c573342b-2876-05b8-098e-6d5314cab062 -nodefconfig -enable-kvm -cdrom /home/zeenix/ISOs/Fedora-17-i686-Live-Desktop.iso I see 4 CPUs reported by '/proc/cpuinfo in the guest. Any clues? -- Regards, Zeeshan Ali (Khattak) FSF member#5124

4 6