[libvirt] [dbus PATCH 0/5] remaining domain APIs for libvirt up to 3.0.0
The only one left are APIs that require virStream. Pavel Hrdina (5): domain: Implement MigrateToURI3 method domain: Implement GetEmulatorPinInfo method domain: Implement GetSecurityLabelList method domain: Implement GetVcpuPinInfo method connect: Implement SaveImageGetXMLDesc method data/org.libvirt.Connect.xml | 7 ++ data/org.libvirt.Domain.xml | 24 +++++ src/connect.c | 28 ++++++ src/domain.c | 173 +++++++++++++++++++++++++++++++++++ tests/test_domain.py | 9 ++ 5 files changed, 241 insertions(+) -- 2.17.0
Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- data/org.libvirt.Domain.xml | 7 +++++++ src/domain.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index bcd0779..221bccb 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -390,6 +390,13 @@ value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainMigrateStartPostCopy"/> <arg name="flags" type="u" direction="in"/> </method> + <method name="MigrateToURI3"> + <annotation name="org.gtk.GDBus.DocString" + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainMigrateToURI3"/> + <arg name="dconuri" type="s" direction="in"/> + <arg name="params" type="a{sv}" direction="in"/> + <arg name="flags" type="u" direction="in"/> + </method> <method name="OpenGraphicsFD"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainOpenGraphicsFD"/> diff --git a/src/domain.c b/src/domain.c index eaef68c..1a57621 100644 --- a/src/domain.c +++ b/src/domain.c @@ -2033,6 +2033,39 @@ virtDBusDomainMigrateStartPostCopy(GVariant *inArgs, virtDBusUtilSetLastVirtError(error); } +static void +virtDBusDomainMigrateToURI3(GVariant *inArgs, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath, + gpointer userData, + GVariant **outArgs G_GNUC_UNUSED, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) + +{ + virtDBusConnect *connect = userData; + g_autoptr(virDomain) domain = NULL; + g_autoptr(GVariantIter) iter = NULL; + const gchar* dconuri; + g_auto(virtDBusUtilTypedParams) params = { 0 }; + guint flags; + + g_variant_get(inArgs, "(&sa{sv}u)", &dconuri, &iter, &flags); + + if (!virtDBusUtilGVariantToTypedParams(iter, ¶ms.params, + ¶ms.nparams, error)) { + return; + } + + domain = virtDBusDomainGetVirDomain(connect, objectPath, error); + if (!domain) + return; + + if (virDomainMigrateToURI3(domain, dconuri, params.params, + params.nparams, flags) < 0) + virtDBusUtilSetLastVirtError(error); +} + static void virtDBusDomainOpenGraphicsFD(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -2926,6 +2959,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = { { "MigrateSetMaxDowntime", virtDBusDomainMigrateSetMaxDowntime }, { "MigrateSetMaxSpeed", virtDBusDomainMigrateSetMaxSpeed }, { "MigrateStartPostCopy", virtDBusDomainMigrateStartPostCopy }, + { "MigrateToURI3", virtDBusDomainMigrateToURI3 }, { "OpenGraphicsFD", virtDBusDomainOpenGraphicsFD }, { "PinEmulator", virtDBusDomainPinEmulator }, { "PinIOThread", virtDBusDomainPinIOThread }, -- 2.17.0
Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- data/org.libvirt.Domain.xml | 6 +++++ src/domain.c | 45 +++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index 221bccb..b0b7678 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -213,6 +213,12 @@ <arg name="flags" type="u" direction="in"/> <arg name="diskErrors" type="a(su)" direction="out"/> </method> + <method name="GetEmulatorPinInfo"> + <annotation name="org.gtk.GDBus.DocString" + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetEmulatorPinInfo"/> + <arg name="flags" type="u" direction="in"/> + <arg name="cpumap" type="ab" direction="out"/> + </method> <method name="GetFSInfo"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetFSInfo"/> diff --git a/src/domain.c b/src/domain.c index 1a57621..bbf2759 100644 --- a/src/domain.c +++ b/src/domain.c @@ -1110,6 +1110,50 @@ virtDBusDomainGetDiskErrors(GVariant *inArgs, *outArgs = g_variant_new_tuple(&res, 1); } +static void +virtDBusDomainGetEmulatorPinInfo(GVariant *inArgs, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath, + gpointer userData, + GVariant **outArgs, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) +{ + virtDBusConnect *connect = userData; + g_autoptr(virDomain) domain = NULL; + guint flags; + gint cpuCount; + g_autofree guchar *cpumap = NULL; + gint cpumaplen; + GVariantBuilder builder; + GVariant *gret; + + g_variant_get(inArgs, "(u)", &flags); + + domain = virtDBusDomainGetVirDomain(connect, objectPath, error); + if (!domain) + return; + + cpuCount = virNodeGetCPUMap(connect->connection, NULL, NULL, 0); + if (cpuCount < 0) + return virtDBusUtilSetLastVirtError(error); + + cpumaplen = VIR_CPU_MAPLEN(cpuCount); + cpumap = g_new0(guchar, cpumaplen); + + if (virDomainGetEmulatorPinInfo(domain, cpumap, cpumaplen, flags) < 0) + return virtDBusUtilSetLastVirtError(error); + + g_variant_builder_init(&builder, G_VARIANT_TYPE("ab")); + + for (gint i = 0; i < cpuCount; i++) + g_variant_builder_add(&builder, "b", VIR_CPU_USED(cpumap, i)); + + gret = g_variant_builder_end(&builder); + + *outArgs = g_variant_new_tuple(&gret, 1); +} + static void virtDBusDomainGetFSInfo(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -2930,6 +2974,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = { { "GetBlockJobInfo", virtDBusDomainGetBlockJobInfo }, { "GetControlInfo", virtDBusDomainGetControlInfo }, { "GetDiskErrors", virtDBusDomainGetDiskErrors }, + { "GetEmulatorPinInfo", virtDBusDomainGetEmulatorPinInfo }, { "GetFSInfo", virtDBusDomainGetFSInfo }, { "GetGuestVcpus", virtDBusDomainGetGuestVcpus }, { "GetHostname", virtDBusDomainGetHostname }, -- 2.17.0
Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- data/org.libvirt.Domain.xml | 5 +++++ src/domain.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index b0b7678..6c48e9d 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -294,6 +294,11 @@ <arg name="flags" type="u" direction="in"/> <arg name="SchedulerParameters" type="a{sv}" direction="out"/> </method> + <method name="GetSecurityLabelList"> + <annotation name="org.gtk.GDBus.DocString" + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetSecurityLabelList"/> + <arg name="securityLabels" type="a(sb)" direction="out"/> + </method> <method name="GetStats"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainListGetStats"/> diff --git a/src/domain.c b/src/domain.c index bbf2759..d07e0a7 100644 --- a/src/domain.c +++ b/src/domain.c @@ -1590,6 +1590,40 @@ virtDBusDomainGetSchedulerParameters(GVariant *inArgs, *outArgs = g_variant_new_tuple(&grecords, 1); } +static void +virtDBusDomainGetSecurityLabelList(GVariant *inArgs G_GNUC_UNUSED, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath, + gpointer userData, + GVariant **outArgs, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) +{ + virtDBusConnect *connect = userData; + g_autoptr(virDomain) domain = NULL; + g_autofree virSecurityLabelPtr seclabels = NULL; + gint nseclabels; + GVariantBuilder builder; + GVariant *gret; + + domain = virtDBusDomainGetVirDomain(connect, objectPath, error); + if (!domain) + return; + + nseclabels = virDomainGetSecurityLabelList(domain, &seclabels); + if (nseclabels < 0) + return virtDBusUtilSetLastVirtError(error); + + g_variant_builder_init(&builder, G_VARIANT_TYPE("a(sb)")); + for (gint i = 0; i < nseclabels; i++) { + g_variant_builder_add(&builder, "(sb)", seclabels[i].label, + !!seclabels[i].enforcing); + } + gret = g_variant_builder_end(&builder); + + *outArgs = g_variant_new_tuple(&gret, 1); +} + static void virtDBusDomainGetStats(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -2987,6 +3021,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = { { "GetNumaParameters", virtDBusDomainGetNumaParameters }, { "GetPerfEvents", virtDBusDomainGetPerfEvents }, { "GetSchedulerParameters", virtDBusDomainGetSchedulerParameters }, + { "GetSecurityLabelList", virtDBusDomainGetSecurityLabelList }, { "GetStats", virtDBusDomainGetStats }, { "GetTime", virtDBusDomainGetTime }, { "GetVcpus", virtDBusDomainGetVcpus }, -- 2.17.0
Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- data/org.libvirt.Domain.xml | 6 ++++ src/domain.c | 59 +++++++++++++++++++++++++++++++++++++ tests/test_domain.py | 9 ++++++ 3 files changed, 74 insertions(+) diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index 6c48e9d..3f6e8d8 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -312,6 +312,12 @@ <arg name="flags" type="u" direction="in"/> <arg name="time" type="(tu)" direction="out"/> </method> + <method name="GetVcpuPinInfo"> + <annotation name="org.gtk.GDBus.DocString" + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetVcpuPinInfo"/> + <arg name="flags" type="u" direction="in"/> + <arg name="vcpuPinInfo" type="aab" direction="out"/> + </method> <method name="GetVcpus"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetVcpusFlags"/> diff --git a/src/domain.c b/src/domain.c index d07e0a7..274d385 100644 --- a/src/domain.c +++ b/src/domain.c @@ -1686,6 +1686,64 @@ virtDBusDomainGetTime(GVariant *inArgs, *outArgs = g_variant_new("((tu))", seconds, nseconds); } +static void +virtDBusDomainGetVcpuPinInfo(GVariant *inArgs, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath, + gpointer userData, + GVariant **outArgs, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) + +{ + virtDBusConnect *connect = userData; + g_autoptr(virDomain) domain = NULL; + guint flags; + virDomainInfo domInfo; + gint vcpuCount; + gint cpuCount; + g_autofree guchar *cpumaps = NULL; + gint cpumaplen; + GVariantBuilder builder; + GVariant *gret; + + g_variant_get(inArgs, "(u)", &flags); + + domain = virtDBusDomainGetVirDomain(connect, objectPath, error); + if (!domain) + return; + + if (virDomainGetInfo(domain, &domInfo) < 0) + return virtDBusUtilSetLastVirtError(error); + + vcpuCount = domInfo.nrVirtCpu; + + cpuCount = virNodeGetCPUMap(connect->connection, NULL, NULL, 0); + if (cpuCount < 0) + return virtDBusUtilSetLastVirtError(error); + + cpumaplen = VIR_CPU_MAPLEN(cpuCount); + cpumaps = g_new0(guchar, cpumaplen * vcpuCount); + + if (virDomainGetVcpuPinInfo(domain, vcpuCount, cpumaps, + cpumaplen, flags) < 0) { + return virtDBusUtilSetLastVirtError(error); + } + + g_variant_builder_init(&builder, G_VARIANT_TYPE("aab")); + for (gint i = 0; i < vcpuCount; i++) { + g_variant_builder_open(&builder, G_VARIANT_TYPE("ab")); + for (gint j = 0; j < cpuCount; j++) { + g_variant_builder_add(&builder, "b", + VIR_CPU_USABLE(cpumaps, cpumaplen, i, j)); + } + g_variant_builder_close(&builder); + } + gret = g_variant_builder_end(&builder); + + *outArgs = g_variant_new_tuple(&gret, 1); +} + static void virtDBusDomainGetVcpus(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -3024,6 +3082,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = { { "GetSecurityLabelList", virtDBusDomainGetSecurityLabelList }, { "GetStats", virtDBusDomainGetStats }, { "GetTime", virtDBusDomainGetTime }, + { "GetVcpuPinInfo", virtDBusDomainGetVcpuPinInfo }, { "GetVcpus", virtDBusDomainGetVcpus }, { "GetXMLDesc", virtDBusDomainGetXMLDesc }, { "HasManagedSaveImage", virtDBusDomainHasManagedSaveImage }, diff --git a/tests/test_domain.py b/tests/test_domain.py index dfa19ed..00f282f 100755 --- a/tests/test_domain.py +++ b/tests/test_domain.py @@ -151,6 +151,15 @@ class TestDomain(libvirttest.BaseTestClass): domain.SetVcpus(vcpus_expected, 0) assert domain.GetVcpus(0) == dbus.Int32(vcpus_expected) + def test_domain_vcpu_pin_info(self): + obj, domain = self.domain() + pinInfo_expected = [ + [ True, True, True, True, True, True, True, True ], + [ True, True, True, True, True, True, True, True ] + ] + pinInfo = domain.GetVcpuPinInfo(0) + assert pinInfo == pinInfo_expected + if __name__ == '__main__': libvirttest.run() -- 2.17.0
Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- data/org.libvirt.Connect.xml | 7 +++++++ src/connect.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/data/org.libvirt.Connect.xml b/data/org.libvirt.Connect.xml index 243ef35..e262c45 100644 --- a/data/org.libvirt.Connect.xml +++ b/data/org.libvirt.Connect.xml @@ -96,6 +96,13 @@ <arg name="xml" type="s" direction="in"/> <arg name="flags" type="u" direction="in"/> </method> + <method name="DomainSaveImageGetXMLDesc"> + <annotation name="org.gtk.GDBus.DocString" + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainSaveImageGetXMLDesc"/> + <arg name="file" type="s" direction="in"/> + <arg name="flags" type="u" direction="in"/> + <arg name="xml" type="s" direction="out"/> + </method> <method name="FindStoragePoolSources"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-storage.html#virConnectFindStorageP... diff --git a/src/connect.c b/src/connect.c index 0b33bc5..bb2836b 100644 --- a/src/connect.c +++ b/src/connect.c @@ -519,6 +519,33 @@ virtDBusConnectDomainSaveImageDefineXML(GVariant *inArgs, virtDBusUtilSetLastVirtError(error); } +static void +virtDBusConnectDomainSaveImageGetXMLDesc(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; + g_autoptr(virDomain) domain = NULL; + const gchar *file; + guint flags; + g_autofree gchar *xml = NULL; + + g_variant_get(inArgs, "(&su)", &file, &flags); + + if (!virtDBusConnectOpen(connect, error)) + return; + + xml = virDomainSaveImageGetXMLDesc(connect->connection, file, flags); + if (!xml) + return virtDBusUtilSetLastVirtError(error); + + *outArgs = g_variant_new("(s)", xml); +} + static void virtDBusConnectFindStoragePoolSources(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -1355,6 +1382,7 @@ static virtDBusGDBusMethodTable virtDBusConnectMethodTable[] = { { "DomainLookupByUUID", virtDBusConnectDomainLookupByUUID }, { "DomainRestore", virtDBusConnectDomainRestoreFlags }, { "DomainSaveImageDefineXML", virtDBusConnectDomainSaveImageDefineXML }, + { "DomainSaveImageGetXMLDesc", virtDBusConnectDomainSaveImageGetXMLDesc }, { "FindStoragePoolSources", virtDBusConnectFindStoragePoolSources }, { "GetAllDomainStats", virtDBusConnectGetAllDomainStats }, { "GetCapabilities", virtDBusConnectGetCapabilities }, -- 2.17.0
On Fri, 2018-05-11 at 09:46 +0200, Pavel Hrdina wrote:
The only one left are APIs that require virStream.
Pavel Hrdina (5): domain: Implement MigrateToURI3 method domain: Implement GetEmulatorPinInfo method domain: Implement GetSecurityLabelList method domain: Implement GetVcpuPinInfo method connect: Implement SaveImageGetXMLDesc method
data/org.libvirt.Connect.xml | 7 ++ data/org.libvirt.Domain.xml | 24 +++++ src/connect.c | 28 ++++++ src/domain.c | 173 +++++++++++++++++++++++++++++++++++ tests/test_domain.py | 9 ++ 5 files changed, 241 insertions(+)
Reviewed-by: Katerina Koukiou <kkoukiou@redhat.com>
participants (2)
-
Katerina Koukiou -
Pavel Hrdina