10:32 a.m.
which is basically a wrapper for virConnectGetType().
---
The list is sad as it hasn't delivered previous version.
examples/conn-test.c | 12 +++++++
libvirt-gobject/libvirt-gobject-connection.c | 45 ++++++++++++++++++++++++++
libvirt-gobject/libvirt-gobject-connection.h | 3 ++
libvirt-gobject/libvirt-gobject.sym | 5 +++
4 files changed, 65 insertions(+), 0 deletions(-)
diff --git a/examples/conn-test.c b/examples/conn-test.c
index 8c70997..b90d2b0 100644
--- a/examples/conn-test.c
+++ b/examples/conn-test.c
@@ -31,11 +31,23 @@ do_connection_open(GObject *source,
{
GVirConnection *conn = GVIR_CONNECTION(source);
GError *err = NULL;
+ gchar *hv_name = NULL;
if (!gvir_connection_open_finish(conn, res, &err)) {
g_error("%s", err->message);
+ goto cleanup;
}
g_print("Connected to libvirt\n");
+
+ if (!(hv_name = gvir_connection_get_hypervisor_name(conn, &err))) {
+ g_error("%s", err->message);
+ goto cleanup;
+ }
+
+ g_print("Hypervisor name: %s\n", hv_name);
+
+cleanup:
+ g_free(hv_name);
g_object_unref(conn);
}
diff --git a/libvirt-gobject/libvirt-gobject-connection.c
b/libvirt-gobject/libvirt-gobject-connection.c
index d826905..75bf041 100644
--- a/libvirt-gobject/libvirt-gobject-connection.c
+++ b/libvirt-gobject/libvirt-gobject-connection.c
@@ -1025,6 +1025,51 @@ const gchar *gvir_connection_get_uri(GVirConnection *conn)
return conn->priv->uri;
}
+/**
+ * gvir_connection_get_hypervisor_name:
+ * @conn: a #GVirConnection
+ * @err: return location for any #GError
+ *
+ * Get name of current hypervisor used.
+ *
+ * Return value: new string that should be freed when no longer needed,
+ * or NULL upon error.
+ */
+gchar *
+gvir_connection_get_hypervisor_name(GVirConnection *conn,
+ GError **err)
+{
+ GVirConnectionPrivate *priv;
+ gchar *ret = NULL;
+ const char *type;
+
+ g_return_val_if_fail(GVIR_IS_CONNECTION(conn), NULL);
+ g_return_val_if_fail(err == NULL || *err == NULL, NULL);
+
+ priv = conn->priv;
+ /* Stop another thread closing the connection just at the minute */
+ virConnectRef(priv->conn);
+ if (!priv->conn) {
+ g_set_error_literal(err, GVIR_CONNECTION_ERROR, 0,
+ "Connection is not open");
+ goto cleanup;
+ }
+
+ type = virConnectGetType(priv->conn);
+ if (!type) {
+ gvir_set_error_literal(err, GVIR_CONNECTION_ERROR, 0,
+ "Unable to get hypervisor name");
+ goto cleanup;
+ }
+
+ ret = g_strdup(type);
+
+cleanup:
+ if (priv->conn)
+ virConnectClose(priv->conn);
+ return ret;
+}
+
static void gvir_domain_ref(gpointer obj, gpointer ignore G_GNUC_UNUSED)
{
g_object_ref(obj);
diff --git a/libvirt-gobject/libvirt-gobject-connection.h
b/libvirt-gobject/libvirt-gobject-connection.h
index d658b01..62eb024 100644
--- a/libvirt-gobject/libvirt-gobject-connection.h
+++ b/libvirt-gobject/libvirt-gobject-connection.h
@@ -112,6 +112,9 @@ gboolean gvir_connection_fetch_domains_finish(GVirConnection *conn,
const gchar *gvir_connection_get_uri(GVirConnection *conn);
+gchar *gvir_connection_get_hypervisor_name(GVirConnection *conn,
+ GError **err);
+
GList *gvir_connection_get_domains(GVirConnection *conn);
GVirDomain *gvir_connection_get_domain(GVirConnection *conn,
diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym
index 67e5a4f..2c2f1f4 100644
--- a/libvirt-gobject/libvirt-gobject.sym
+++ b/libvirt-gobject/libvirt-gobject.sym
@@ -194,4 +194,9 @@ LIBVIRT_GOBJECT_0.1.2 {
gvir_domain_resume_finish;
} LIBVIRT_GOBJECT_0.1.1;
+LIBVIRT_GOBJECT_0.1.3 {
+ global:
+ gvir_connection_get_hypervisor_name;
+} LIBVIRT_GOBJECT_0.1.2;
+
# .... define new API here using predicted next version number ....
--
1.7.8.6
10:32 a.m.
New subject: [libvirt] [libvirt-glib][PATCH v3 2/2] gobject: Introduce gvir_connection_get_version
which is basically a wrapper for virConnectGetVersion().
---
examples/conn-test.c | 13 ++++++++
libvirt-gobject/libvirt-gobject-connection.c | 40 ++++++++++++++++++++++++++
libvirt-gobject/libvirt-gobject-connection.h | 3 +-
libvirt-gobject/libvirt-gobject.sym | 1 +
4 files changed, 56 insertions(+), 1 deletions(-)
diff --git a/examples/conn-test.c b/examples/conn-test.c
index b90d2b0..051f96a 100644
--- a/examples/conn-test.c
+++ b/examples/conn-test.c
@@ -32,6 +32,8 @@ do_connection_open(GObject *source,
GVirConnection *conn = GVIR_CONNECTION(source);
GError *err = NULL;
gchar *hv_name = NULL;
+ gulong hv_version = 0;
+ guint major, minor, micro;
if (!gvir_connection_open_finish(conn, res, &err)) {
g_error("%s", err->message);
@@ -46,6 +48,17 @@ do_connection_open(GObject *source,
g_print("Hypervisor name: %s\n", hv_name);
+ if (!(hv_version = gvir_connection_get_version(conn, &err))) {
+ g_error("%s", err->message);
+ goto cleanup;
+ }
+
+ major = hv_version / 1000000;
+ hv_version %= 1000000;
+ minor = hv_version / 1000;
+ micro = hv_version % 1000;
+ g_print("Hypervisor version: %u.%u.%u\n", major, minor, micro);
+
cleanup:
g_free(hv_name);
g_object_unref(conn);
diff --git a/libvirt-gobject/libvirt-gobject-connection.c
b/libvirt-gobject/libvirt-gobject-connection.c
index 75bf041..e1b765d 100644
--- a/libvirt-gobject/libvirt-gobject-connection.c
+++ b/libvirt-gobject/libvirt-gobject-connection.c
@@ -1070,6 +1070,46 @@ cleanup:
return ret;
}
+/**
+ * gvir_connection_get_version:
+ * @conn: a #GVirConnection
+ * @err: return location for any #GError
+ *
+ * Get version of current hypervisor used.
+ *
+ * Return value: version on success, 0 otherwise and @err set.
+ */
+gulong
+gvir_connection_get_version(GVirConnection *conn,
+ GError **err)
+{
+ GVirConnectionPrivate *priv;
+ gulong ret = 0;
+
+ g_return_val_if_fail(GVIR_IS_CONNECTION(conn), FALSE);
+ g_return_val_if_fail(err == NULL || *err == NULL, 0);
+
+ priv = conn->priv;
+ /* Stop another thread closing the connection just at the minute */
+ virConnectRef(priv->conn);
+ if (!priv->conn) {
+ g_set_error_literal(err, GVIR_CONNECTION_ERROR, 0,
+ "Connection is not open");
+ goto cleanup;
+ }
+
+ if (virConnectGetVersion(priv->conn, &ret) < 0) {
+ gvir_set_error_literal(err, GVIR_CONNECTION_ERROR, 0,
+ "Unable to get hypervisor version");
+ goto cleanup;
+ }
+
+cleanup:
+ if (priv->conn)
+ virConnectClose(priv->conn);
+ return ret;
+}
+
static void gvir_domain_ref(gpointer obj, gpointer ignore G_GNUC_UNUSED)
{
g_object_ref(obj);
diff --git a/libvirt-gobject/libvirt-gobject-connection.h
b/libvirt-gobject/libvirt-gobject-connection.h
index 62eb024..f91ca05 100644
--- a/libvirt-gobject/libvirt-gobject-connection.h
+++ b/libvirt-gobject/libvirt-gobject-connection.h
@@ -114,7 +114,8 @@ const gchar *gvir_connection_get_uri(GVirConnection *conn);
gchar *gvir_connection_get_hypervisor_name(GVirConnection *conn,
GError **err);
-
+gulong gvir_connection_get_version(GVirConnection *conn,
+ GError **err);
GList *gvir_connection_get_domains(GVirConnection *conn);
GVirDomain *gvir_connection_get_domain(GVirConnection *conn,
diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym
index 2c2f1f4..c496540 100644
--- a/libvirt-gobject/libvirt-gobject.sym
+++ b/libvirt-gobject/libvirt-gobject.sym
@@ -197,6 +197,7 @@ LIBVIRT_GOBJECT_0.1.2 {
LIBVIRT_GOBJECT_0.1.3 {
global:
gvir_connection_get_hypervisor_name;
+ gvir_connection_get_version;
} LIBVIRT_GOBJECT_0.1.2;
# .... define new API here using predicted next version number ....
--
1.7.8.6
10:54 a.m.
On Wed, Sep 12, 2012 at 05:32:00PM +0200, Michal Privoznik wrote:
which is basically a wrapper for virConnectGetType().
---
The list is sad as it hasn't delivered previous version.
examples/conn-test.c | 12 +++++++
libvirt-gobject/libvirt-gobject-connection.c | 45 ++++++++++++++++++++++++++
libvirt-gobject/libvirt-gobject-connection.h | 3 ++
libvirt-gobject/libvirt-gobject.sym | 5 +++
4 files changed, 65 insertions(+), 0 deletions(-)
diff --git a/examples/conn-test.c b/examples/conn-test.c
index 8c70997..b90d2b0 100644
--- a/examples/conn-test.c
+++ b/examples/conn-test.c
@@ -31,11 +31,23 @@ do_connection_open(GObject *source,
{
GVirConnection *conn = GVIR_CONNECTION(source);
GError *err = NULL;
+ gchar *hv_name = NULL;
if (!gvir_connection_open_finish(conn, res, &err)) {
g_error("%s", err->message);
+ goto cleanup;
g_error() calls abort(), so this goto cleanup; is not really useful
}
g_print("Connected to libvirt\n");
+
+ if (!(hv_name = gvir_connection_get_hypervisor_name(conn, &err))) {
+ g_error("%s", err->message);
+ goto cleanup;
+ }
+
+ g_print("Hypervisor name: %s\n", hv_name);
+
+cleanup:
+ g_free(hv_name);
g_object_unref(conn);
}
diff --git a/libvirt-gobject/libvirt-gobject-connection.c
b/libvirt-gobject/libvirt-gobject-connection.c
index d826905..75bf041 100644
--- a/libvirt-gobject/libvirt-gobject-connection.c
+++ b/libvirt-gobject/libvirt-gobject-connection.c
@@ -1025,6 +1025,51 @@ const gchar *gvir_connection_get_uri(GVirConnection *conn)
return conn->priv->uri;
}
+/**
+ * gvir_connection_get_hypervisor_name:
+ * @conn: a #GVirConnection
+ * @err: return location for any #GError
+ *
+ * Get name of current hypervisor used.
+ *
+ * Return value: new string that should be freed when no longer needed,
+ * or NULL upon error.
+ */
+gchar *
+gvir_connection_get_hypervisor_name(GVirConnection *conn,
+ GError **err)
+{
+ GVirConnectionPrivate *priv;
+ gchar *ret = NULL;
+ const char *type;
+
+ g_return_val_if_fail(GVIR_IS_CONNECTION(conn), NULL);
+ g_return_val_if_fail(err == NULL || *err == NULL, NULL);
+
+ priv = conn->priv;
+ /* Stop another thread closing the connection just at the minute */
+ virConnectRef(priv->conn);
I'm not sure what this achieves? Another thread could close priv->conn
right before this call, so why ref it just now? Do calls to
virConnectGetType need to be protected with a ref?
+ if (!priv->conn) {
+ g_set_error_literal(err, GVIR_CONNECTION_ERROR, 0,
+ "Connection is not open");
opened
Christophe
11:53 a.m.
On 12.09.2012 17:54, Christophe Fergeau wrote:
On Wed, Sep 12, 2012 at 05:32:00PM +0200, Michal Privoznik wrote:
> which is basically a wrapper for virConnectGetType().
> ---
>
> The list is sad as it hasn't delivered previous version.
>
> examples/conn-test.c | 12 +++++++
> libvirt-gobject/libvirt-gobject-connection.c | 45 ++++++++++++++++++++++++++
> libvirt-gobject/libvirt-gobject-connection.h | 3 ++
> libvirt-gobject/libvirt-gobject.sym | 5 +++
> 4 files changed, 65 insertions(+), 0 deletions(-)
>
> diff --git a/examples/conn-test.c b/examples/conn-test.c
> index 8c70997..b90d2b0 100644
> --- a/examples/conn-test.c
> +++ b/examples/conn-test.c
> @@ -31,11 +31,23 @@ do_connection_open(GObject *source,
> {
> GVirConnection *conn = GVIR_CONNECTION(source);
> GError *err = NULL;
> + gchar *hv_name = NULL;
>
> if (!gvir_connection_open_finish(conn, res, &err)) {
> g_error("%s", err->message);
> + goto cleanup;
g_error() calls abort(), so this goto cleanup; is not really useful
> }
> g_print("Connected to libvirt\n");
> +
> + if (!(hv_name = gvir_connection_get_hypervisor_name(conn, &err))) {
> + g_error("%s", err->message);
> + goto cleanup;
> + }
> +
> + g_print("Hypervisor name: %s\n", hv_name);
> +
> +cleanup:
> + g_free(hv_name);
> g_object_unref(conn);
> }
>
> diff --git a/libvirt-gobject/libvirt-gobject-connection.c
b/libvirt-gobject/libvirt-gobject-connection.c
> index d826905..75bf041 100644
> --- a/libvirt-gobject/libvirt-gobject-connection.c
> +++ b/libvirt-gobject/libvirt-gobject-connection.c
> @@ -1025,6 +1025,51 @@ const gchar *gvir_connection_get_uri(GVirConnection *conn)
> return conn->priv->uri;
> }
>
> +/**
> + * gvir_connection_get_hypervisor_name:
> + * @conn: a #GVirConnection
> + * @err: return location for any #GError
> + *
> + * Get name of current hypervisor used.
> + *
> + * Return value: new string that should be freed when no longer needed,
> + * or NULL upon error.
> + */
> +gchar *
> +gvir_connection_get_hypervisor_name(GVirConnection *conn,
> + GError **err)
> +{
> + GVirConnectionPrivate *priv;
> + gchar *ret = NULL;
> + const char *type;
> +
> + g_return_val_if_fail(GVIR_IS_CONNECTION(conn), NULL);
> + g_return_val_if_fail(err == NULL || *err == NULL, NULL);
> +
> + priv = conn->priv;
> + /* Stop another thread closing the connection just at the minute */
> + virConnectRef(priv->conn);
I'm not sure what this achieves? Another thread could close priv->conn
right before this call, so why ref it just now? Do calls to
virConnectGetType need to be protected with a ref?
I though it would be nice to have a reference counter increased through
this API so other thread don't close it right in the middle.
But now as I am rethinking this again - it is already done on libvirt level.
IOW in a racy situation it just make this API more probable to fetch
result. It depends if the last virConnectClose() is scheduled before of
after virConnectRef().
So yeah, I should have dropped it. Fixed on my local branch now.
Michal
> + if (!priv->conn) {
> + g_set_error_literal(err, GVIR_CONNECTION_ERROR, 0,
> + "Connection is not open");
opened
Christophe
4490
days inactive
4490
days old
3 comments
2 participants
participants (2)
-
Christophe Fergeau -
Michal Privoznik