Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com&gt; --- data/org.libvirt.Connect.xml | 7 +++++++ src/connect.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/data/org.libvirt.Connect.xml b/data/org.libvirt.Connect.xml index 92f74c5..0fc34e3 100644 --- a/data/org.libvirt.Connect.xml +++ b/data/org.libvirt.Connect.xml @@ -32,6 +32,13 @@ <arg name="flags" type="u" direction="in"/> <arg name="cpu" type="s" direction="out"/> </method> + <method name="CompareCPU"> + <annotation name="org.gtk.GDBus.DocString" + value="See https://libvirt.org/html/libvirt-libvirt-host.html#virConnectCompareCPU&q... + <arg name="xmlDesc" type="s" direction="in"/> + <arg name="flags" type="u" direction="in"/> + <arg name="compareResult" type="s" direction="out"/> + </method> <method name="DomainCreateXML"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainCreateXML&q... diff --git a/src/connect.c b/src/connect.c index bd959c7..86fea4f 100644 --- a/src/connect.c +++ b/src/connect.c @@ -6,6 +6,13 @@ #include <glib/gprintf.h> +VIRT_DBUS_ENUM_DECL(virtDBusConnectCPUCompareResult) +VIRT_DBUS_ENUM_IMPL(virtDBusConnectCPUCompareResult, + VIR_CPU_COMPARE_LAST, + "incompatible", + "identical", + "superset") + static gint virtDBusConnectCredType[] = { VIR_CRED_AUTHNAME, VIR_CRED_ECHOPROMPT, @@ -243,6 +250,41 @@ virtDBusConnectBaselineCPU(GVariant *inArgs, *outArgs = g_variant_new("(s)", cpu); } +static void +virtDBusConnectCompareCPU(GVariant *inArgs, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath G_GNUC_UNUSED, + gpointer userData, + GVariant **outArgs, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) +{ + virtDBusConnect *connect = userData; + const gchar *xmlDesc; + guint flags; + gint compareResult; + g_autofree const gchar* compareResultStr = NULL; + + g_variant_get(inArgs, "(&su)", &xmlDesc, &flags); + + if (!virtDBusConnectOpen(connect, error)) + return; + + compareResult = virConnectCompareCPU(connect->connection, xmlDesc, flags); + if (compareResult < 0) + return virtDBusUtilSetLastVirtError(error); + + compareResultStr = virtDBusConnectCPUCompareResultTypeToString(compareResult); + if (!compareResultStr) { + g_set_error(error, VIRT_DBUS_ERROR, VIRT_DBUS_ERROR_LIBVIRT, + "Can't format virCPUCompareResult '%d' to string.", + compareResult); + return; + } + + *outArgs = g_variant_new("(s)", compareResultStr); +} + static void virtDBusConnectDomainCreateXML(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -661,6 +703,7 @@ static virtDBusGDBusPropertyTable virtDBusConnectPropertyTable[] = { static virtDBusGDBusMethodTable virtDBusConnectMethodTable[] = { { "BaselineCPU", virtDBusConnectBaselineCPU }, + { "CompareCPU", virtDBusConnectCompareCPU }, { "DomainCreateXML", virtDBusConnectDomainCreateXML }, { "DomainDefineXML", virtDBusConnectDomainDefineXML }, { "DomainLookupByID", virtDBusConnectDomainLookupByID }, -- 2.15.0

Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com&gt; --- data/org.libvirt.Connect.xml | 9 +++++++++ src/connect.c | 30 ++++++++++++++++++++++++++++++ tests/test_connect.py | 5 +++++ 3 files changed, 44 insertions(+) diff --git a/data/org.libvirt.Connect.xml b/data/org.libvirt.Connect.xml index 0fc34e3..e5504f7 100644 --- a/data/org.libvirt.Connect.xml +++ b/data/org.libvirt.Connect.xml @@ -85,6 +85,15 @@ <arg name="xml" type="s" direction="in"/> <arg name="flags" type="u" direction="in"/> </method> + <method name="FindStoragePoolSources"> + <annotation name="org.gtk.GDBus.DocString" + value="See https://libvirt.org/html/libvirt-libvirt-storage.html#virConnectFindStora... + Empty string can be used to pass a NULL as @srcSpec argument."/> + <arg name="type" type="s" direction="in"/> + <arg name="srcSpec" type="s" direction="in"/> + <arg name="flags" type="u" direction="in"/> + <arg name="storagePoolSources" type="s" direction="out"/> + </method> <method name="GetCapabilities"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-host.html#virConnectGetCapabilit... diff --git a/src/connect.c b/src/connect.c index 86fea4f..4e64238 100644 --- a/src/connect.c +++ b/src/connect.c @@ -474,6 +474,35 @@ virtDBusConnectDomainSaveImageDefineXML(GVariant *inArgs, virtDBusUtilSetLastVirtError(error); } +static void +virtDBusConnectFindStoragePoolSources(GVariant *inArgs, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath G_GNUC_UNUSED, + gpointer userData, + GVariant **outArgs, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) +{ + virtDBusConnect *connect = userData; + const gchar *type; + const gchar *srcSpec; + guint flags; + g_autofree gchar *ret = NULL; + + g_variant_get(inArgs, "(&s&su)", &type, &srcSpec, &flags); + if (g_str_equal(srcSpec, "")) + srcSpec = NULL; + + if (!virtDBusConnectOpen(connect, error)) + return; + + ret = virConnectFindStoragePoolSources(connect->connection, type, srcSpec, flags); + if (!ret) + return virtDBusUtilSetLastVirtError(error); + + *outArgs = g_variant_new("(s)", ret); +} + static void virtDBusConnectGetSysinfo(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -711,6 +740,7 @@ static virtDBusGDBusMethodTable virtDBusConnectMethodTable[] = { { "DomainLookupByUUID", virtDBusConnectDomainLookupByUUID }, { "DomainRestore", virtDBusConnectDomainRestoreFlags }, { "DomainSaveImageDefineXML", virtDBusConnectDomainSaveImageDefineXML }, + { "FindStoragePoolSources", virtDBusConnectFindStoragePoolSources }, { "GetCapabilities", virtDBusConnectGetCapabilities }, { "GetSysinfo", virtDBusConnectGetSysinfo }, { "ListDomains", virtDBusConnectListDomains }, diff --git a/tests/test_connect.py b/tests/test_connect.py index a7b7ad6..d7ec704 100755 --- a/tests/test_connect.py +++ b/tests/test_connect.py @@ -68,6 +68,11 @@ class TestConnect(libvirttest.BaseTestClass): path = getattr(self.connect, lookup_method_name)(props[lookup_item]) assert original_path == path + def test_connect_find_storage_pool_sources(self): + storageType = "logical" + sources = self.connect.FindStoragePoolSources(storageType, "", 0) + assert isinstance(sources, dbus.String) + def test_connect_list_domains(self): domains = self.connect.ListDomains(0) assert isinstance(domains, dbus.Array) -- 2.15.0

On Thu, Apr 19, 2018 at 03:58:04PM +0200, Katerina Koukiou wrote: This one is documented in https://libvirt.org/html/libvirt-libvirt-domain.html#virConnectGetAllDoma... Given that our API names are set in stone but our website URLs are not, maybe we need some stable link that would redirect to the correct doc page when given an API name. Jano

On Thu, Apr 19, 2018 at 03:58:04PM +0200, Katerina Koukiou wrote: The return type should be "a(sa{sv})" because it returns stats for multiple domains. For example: [ ( "centos6", { "state.state": 1, "state.reason": 1 } ), ( "centos7", { "state.state": 5, "state.reason": 1 } ) ] and the code needs to be updated accordingly. Pavel

On Thu, Apr 19, 2018 at 03:58:05PM +0200, Katerina Koukiou wrote: i++, please This is the naming convention used by glib, custom types should use the virtDBus prefix. Jano

On Thu, Apr 19, 2018 at 03:58:06PM +0200, Katerina Koukiou wrote: This will need to be changed. The API documentation also states: Pass NULL if only the list length is needed. But that does not seem like useful functionality. Reviewed-by: Ján Tomko <jtomko(a)redhat.com&gt; Jano

Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com&gt; --- data/org.libvirt.Connect.xml | 10 ++++++++++ src/connect.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/data/org.libvirt.Connect.xml b/data/org.libvirt.Connect.xml index 43a6241..6f90822 100644 --- a/data/org.libvirt.Connect.xml +++ b/data/org.libvirt.Connect.xml @@ -113,6 +113,16 @@ <arg name="flags" type="u" direction="in"/> <arg name="models" type="as" direction="out"/> </method> + <method name="GetDomainCapabilities"> + <annotation name="org.gtk.GDBus.DocString" + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virConnectGetDomainC... + <arg name="emulatorbin" type="s" direction="in"/> + <arg name="arch" type="s" direction="in"/> + <arg name="machine" type="s" direction="in"/> + <arg name="virttype" type="s" direction="in"/> + <arg name="flags" type="u" direction="in"/> + <arg name="domCapabilities" type="s" direction="out"/> + </method> <method name="GetSysinfo"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-host.html#virConnectGetSysinfo&q... diff --git a/src/connect.c b/src/connect.c index 169a070..1ce6b86 100644 --- a/src/connect.c +++ b/src/connect.c @@ -576,6 +576,39 @@ virtDBusConnectGetCPUModelNames(GVariant *inArgs, *outArgs = g_variant_new_tuple(&gret, 1); } +static void +virtDBusConnectGetDomainCapabilities(GVariant *inArgs, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath G_GNUC_UNUSED, + gpointer userData, + GVariant **outArgs, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) +{ + virtDBusConnect *connect = userData; + const gchar *emulatorbin; + const gchar *arch; + const gchar *machine; + const gchar *virttype; + guint flags; + g_autofree gchar* domCapabilities = NULL; + + g_variant_get(inArgs, "(&s&s&s&su)", &emulatorbin, &arch, &machine, + &virttype, &flags); + + if (!virtDBusConnectOpen(connect, error)) + return; + + domCapabilities = virConnectGetDomainCapabilities(connect->connection, + emulatorbin, arch, + machine, virttype, + flags); + if (!domCapabilities) + return virtDBusUtilSetLastVirtError(error); + + *outArgs = g_variant_new("(s)", domCapabilities); +} + static void virtDBusConnectGetSysinfo(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -817,6 +850,7 @@ static virtDBusGDBusMethodTable virtDBusConnectMethodTable[] = { { "GetAllDomainStats", virtDBusConnectGetAllDomainStats }, { "GetCapabilities", virtDBusConnectGetCapabilities }, { "GetCPUModelNames", virtDBusConnectGetCPUModelNames }, + { "GetDomainCapabilities", virtDBusConnectGetDomainCapabilities }, { "GetSysinfo", virtDBusConnectGetSysinfo }, { "ListDomains", virtDBusConnectListDomains }, { "ListNetworks", virtDBusConnectListNetworks }, -- 2.15.0

On Thu, Apr 19, 2018 at 03:58:07PM +0200, Katerina Koukiou wrote: s/GetDomainCapabilties/GetDomainCapabilities/ in $subject It's not documented but all of the for strings can be NULL/empty. Pavel