Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com&gt; --- data/org.libvirt.Domain.xml | 6 +++++ src/domain.c | 54 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index 98e2873..74b0a62 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -76,6 +76,12 @@ <arg name="flags" type="u" direction="in"/> <arg name="BlkioParameters" type="a{sv}" direction="out"/> </method> + <method name="GetControlInfo"> + <annotation name="org.gtk.GDBus.DocString" + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetControlI... + <arg name="flags" type="u" direction="in"/> + <arg name="jobInfo" type="(sst)" direction="out"/> + </method> <method name="GetJobInfo"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetJobInfo&... diff --git a/src/domain.c b/src/domain.c index 8a25ae1..5ec7686 100644 --- a/src/domain.c +++ b/src/domain.c @@ -3,6 +3,22 @@ #include <libvirt/libvirt.h> +VIRT_DBUS_ENUM_DECL(virtDBusDomainControlState) +VIRT_DBUS_ENUM_IMPL(virtDBusDomainControlState, + VIR_DOMAIN_CONTROL_LAST, + "ok", + "job", + "occupied", + "error") + +VIRT_DBUS_ENUM_DECL(virtDBusDomainControlErrorReason) +VIRT_DBUS_ENUM_IMPL(virtDBusDomainControlErrorReason, + VIR_DOMAIN_CONTROL_ERROR_REASON_LAST, + "none", + "unknown", + "monitor", + "internal") + VIRT_DBUS_ENUM_DECL(virtDBusDomainJob) VIRT_DBUS_ENUM_IMPL(virtDBusDomainJob, VIR_DOMAIN_JOB_LAST, @@ -472,6 +488,43 @@ virtDBusDomainGetBlkioParameters(GVariant *inArgs, *outArgs = g_variant_new_tuple(&grecords, 1); } +static void +virtDBusDomainGetControlInfo(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; + g_autofree virDomainControlInfoPtr controlInfo = NULL; + const gchar *stateStr; + const gchar *errorReasonStr; + guint flags; + + g_variant_get(inArgs, "(u)", &flags); + + domain = virtDBusDomainGetVirDomain(connect, objectPath, error); + if (!domain) + return; + + controlInfo = g_new0(virDomainControlInfo, 1); + if (virDomainGetControlInfo(domain, controlInfo, flags) == -1) + return virtDBusUtilSetLastVirtError(error); + + stateStr = virtDBusDomainControlStateTypeToString(controlInfo->state); + if (!stateStr) + return; + errorReasonStr = virtDBusDomainControlErrorReasonTypeToString(controlInfo->details); + if (!errorReasonStr) + return; + + *outArgs = g_variant_new("((sst))", stateStr, + errorReasonStr, controlInfo->stateTime); +} + static void virtDBusDomainGetJobInfo(GVariant *inArgs G_GNUC_UNUSED, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -1086,6 +1139,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = { { "Destroy", virtDBusDomainDestroy }, { "DetachDevice", virtDBusDomainDetachDevice }, { "GetBlkioParameters", virtDBusDomainGetBlkioParameters }, + { "GetControlInfo", virtDBusDomainGetControlInfo }, { "GetJobInfo", virtDBusDomainGetJobInfo }, { "GetMemoryParameters", virtDBusDomainGetMemoryParameters }, { "GetSchedulerParameters", virtDBusDomainGetSchedulerParameters }, -- 2.15.0

Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com&gt; --- data/org.libvirt.Domain.xml | 8 ++++++++ src/domain.c | 46 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index 74b0a62..0b23e75 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -178,6 +178,14 @@ <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainResume"... </method> + <method name="SendKey"> + <annotation name="org.gtk.GDBus.DocString" + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainSendKey&quo... + <arg name="codeset" type="u" direction="in"/> + <arg name="holdtime" type="u" direction="in"/> + <arg name="keycodes" type="au" direction="in"/> + <arg name="flags" type="u" direction="in"/> + </method> <method name="SetMemory"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainSetMemoryFl... diff --git a/src/domain.c b/src/domain.c index 5ec7686..0c8e1ce 100644 --- a/src/domain.c +++ b/src/domain.c @@ -1002,6 +1002,51 @@ virtDBusDomainResume(GVariant *inArgs G_GNUC_UNUSED, virtDBusUtilSetLastVirtError(error); } +static void +virtDBusDomainSendKey(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; + guint codeset; + guint holdtime; + const guint *keycodes; + gsize nkeycodes = 0; + gint ret; + guint flags; + GVariant *v; + + v = g_variant_get_child_value(inArgs, 0); + codeset = g_variant_get_uint32(v); + g_variant_unref(v); + + v = g_variant_get_child_value(inArgs, 1); + holdtime = g_variant_get_uint32(v); + g_variant_unref(v); + + v = g_variant_get_child_value(inArgs, 2); + keycodes = g_variant_get_fixed_array(v, &nkeycodes, sizeof(guint)); + g_variant_unref(v); + + v = g_variant_get_child_value(inArgs, 3); + flags = g_variant_get_uint32(v); + g_variant_unref(v); + + domain = virtDBusDomainGetVirDomain(connect, objectPath, error); + if (!domain) + return; + + ret = virDomainSendKey(domain, codeset, holdtime, (guint *)keycodes, nkeycodes, flags); + if (ret < 0) + virtDBusUtilSetLastVirtError(error); +} + static void virtDBusDomainSetMemory(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -1157,6 +1202,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = { { "Reboot", virtDBusDomainReboot }, { "Reset", virtDBusDomainReset }, { "Resume", virtDBusDomainResume }, + { "SendKey", virtDBusDomainSendKey }, { "SetVcpus", virtDBusDomainSetVcpus }, { "SetMemory", virtDBusDomainSetMemory }, { "Shutdown", virtDBusDomainShutdown }, -- 2.15.0

On Tue, Apr 17, 2018 at 02:04:21PM +0200, Katerina Koukiou wrote: This can be simplified into: + g_variant_get(inArgs, "(uu@auu)", &codeset, &holdtime, &v, &flags); + + keycodes = g_variant_get_fixed_array(v, &nkeycodes, sizeof(guint)); + g_variant_unref(v); Long line, it should not be longer than 80 chars. Reviewed-by: Pavel Hrdina <phrdina(a)redhat.com&gt;

On Tue, Apr 17, 2018 at 02:04:23PM +0200, Katerina Koukiou wrote: https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainBlockPeek Even though size_t is (usually) 64 bits, unsigned should be enough given the documented RPC limits. With the doc link fixed: Reviewed-by: Ján Tomko <jtomko(a)redhat.com&gt; Jano

On Tue, Apr 17, 2018 at 02:04:23PM +0200, Katerina Koukiou wrote: I agree with Jano that this should be "t" type and therefore gsize in the code. We need to return from the function if error is set. Reviewed-by: Pavel Hrdina <phrdina(a)redhat.com&gt;

Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com&gt; --- data/org.libvirt.Domain.xml | 6 ++++++ src/domain.c | 25 +++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index bd30ad4..10ce15a 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -48,6 +48,12 @@ <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainAbortJob&qu... </method> + <method name="AddIOThread"> + <annotation name="org.gtk.GDBus.DocString" + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainAddIOThread... + <arg name="iothreadId" type="u" direction="in"/> + <arg name="flags" type="u" direction="in"/> + </method> <method name="AttachDevice"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainAttachDevic... diff --git a/src/domain.c b/src/domain.c index 01f120d..1edad05 100644 --- a/src/domain.c +++ b/src/domain.c @@ -359,6 +359,30 @@ virtDBusDomainAbortJob(GVariant *inArgs G_GNUC_UNUSED, virtDBusUtilSetLastVirtError(error); } +static void +virtDBusDomainAddIOThread(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; + guint iothreadId; + guint flags; + + g_variant_get(inArgs, "(uu)", &iothreadId, &flags); + + domain = virtDBusDomainGetVirDomain(connect, objectPath, error); + if (!domain) + return; + + if (virDomainAddIOThread(domain, iothreadId, flags) < 0) + virtDBusUtilSetLastVirtError(error); +} + static void virtDBusDomainAttachDevice(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -1277,6 +1301,7 @@ static virtDBusGDBusPropertyTable virtDBusDomainPropertyTable[] = { static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = { { "AbortJob", virtDBusDomainAbortJob }, + { "AddIOThread", virtDBusDomainAddIOThread }, { "AttachDevice", virtDBusDomainAttachDevice }, { "BlockPeek", virtDBusDomainBlockPeek }, { "Create", virtDBusDomainCreate }, -- 2.15.0

Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com&gt; --- data/org.libvirt.Domain.xml | 9 +++++++++ src/domain.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index 10ce15a..3d8e7b1 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -60,6 +60,15 @@ <arg name="xml" type="s" direction="in"/> <arg name="flags" type="u" direction="in"/> </method> + <method name="BlockCommit"> + <annotation name="org.gtk.GDBus.DocString" + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainBlockCommit... + <arg name="disk" type="s" direction="in"/> + <arg name="base" type="s" direction="in"/> + <arg name="top" type="s" direction="in"/> + <arg name="bandwidth" type="t" direction="in"/> + <arg name="flags" type="u" direction="in"/> + </method> <method name="BlockPeek"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainCreateWithF... diff --git a/src/domain.c b/src/domain.c index 1edad05..f482bb9 100644 --- a/src/domain.c +++ b/src/domain.c @@ -407,6 +407,33 @@ virtDBusDomainAttachDevice(GVariant *inArgs, virtDBusUtilSetLastVirtError(error); } +static void +virtDBusDomainBlockCommit(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; + const gchar *disk; + const gchar *base; + const gchar *top; + gulong bandwidth; + guint flags; + + g_variant_get(inArgs, "(&s&s&stu)", &disk, &base, &top, &bandwidth, &flags); + + domain = virtDBusDomainGetVirDomain(connect, objectPath, error); + if (!domain) + return; + + if (virDomainBlockCommit(domain, disk, base, top, bandwidth, flags) < 0) + virtDBusUtilSetLastVirtError(error); +} + static void virtDBusDomainBlockPeek(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -1303,6 +1330,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = { { "AbortJob", virtDBusDomainAbortJob }, { "AddIOThread", virtDBusDomainAddIOThread }, { "AttachDevice", virtDBusDomainAttachDevice }, + { "BlockCommit", virtDBusDomainBlockCommit }, { "BlockPeek", virtDBusDomainBlockPeek }, { "Create", virtDBusDomainCreate }, { "Destroy", virtDBusDomainDestroy }, -- 2.15.0

Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com&gt; --- data/org.libvirt.Domain.xml | 6 ++++++ src/domain.c | 25 +++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index 3d8e7b1..480499c 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -69,6 +69,12 @@ <arg name="bandwidth" type="t" direction="in"/> <arg name="flags" type="u" direction="in"/> </method> + <method name="BlockJobAbort"> + <annotation name="org.gtk.GDBus.DocString" + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainBlockJobAbo... + <arg name="disk" type="s" direction="in"/> + <arg name="flags" type="u" direction="in"/> + </method> <method name="BlockPeek"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainCreateWithF... diff --git a/src/domain.c b/src/domain.c index f482bb9..fee4a2c 100644 --- a/src/domain.c +++ b/src/domain.c @@ -434,6 +434,30 @@ virtDBusDomainBlockCommit(GVariant *inArgs, virtDBusUtilSetLastVirtError(error); } +static void +virtDBusDomainBlockJobAbort(GVariant *inArgs G_GNUC_UNUSED, + 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; + const gchar *disk; + guint flags; + + g_variant_get(inArgs, "(&su)", &disk, &flags); + + domain = virtDBusDomainGetVirDomain(connect, objectPath, error); + if (!domain) + return; + + if (virDomainBlockJobAbort(domain, disk, flags) < 0) + virtDBusUtilSetLastVirtError(error); +} + static void virtDBusDomainBlockPeek(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -1331,6 +1355,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = { { "AddIOThread", virtDBusDomainAddIOThread }, { "AttachDevice", virtDBusDomainAttachDevice }, { "BlockCommit", virtDBusDomainBlockCommit }, + { "BlockJobAbort", virtDBusDomainBlockJobAbort }, { "BlockPeek", virtDBusDomainBlockPeek }, { "Create", virtDBusDomainCreate }, { "Destroy", virtDBusDomainDestroy }, -- 2.15.0

On Tue, Apr 17, 2018 at 02:04:27PM +0200, Katerina Koukiou wrote: inArgs is used so remove G_GNUC_UNUSED. Reviewed-by: Pavel Hrdina <phrdina(a)redhat.com&gt;

On Tue, Apr 17, 2018 at 02:04:29PM +0200, Katerina Koukiou wrote: You can use g_str_equal(). Reviewed-by: Pavel Hrdina <phrdina(a)redhat.com&gt;

Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com&gt; --- data/org.libvirt.Domain.xml | 7 +++++++ src/domain.c | 26 ++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index f5c7fb0..c7fb637 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -99,6 +99,13 @@ <arg name="bandwidth" type="t" direction="in"/> <arg name="flags" type="u" direction="in"/> </method> + <method name="BlockResize"> + <annotation name="org.gtk.GDBus.DocString" + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainBlockResize... + <arg name="disk" type="s" direction="in"/> + <arg name="size" type="t" direction="in"/> + <arg name="flags" type="u" direction="in"/> + </method> <method name="Create"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainCreateWithF... diff --git a/src/domain.c b/src/domain.c index 107355e..191d9e8 100644 --- a/src/domain.c +++ b/src/domain.c @@ -549,6 +549,31 @@ virtDBusDomainBlockRebase(GVariant *inArgs, virtDBusUtilSetLastVirtError(error); } +static void +virtDBusDomainBlockResize(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; + const gchar *disk; + gulong size; + guint flags; + + g_variant_get(inArgs, "(&stu)", &disk, &size, &flags); + + domain = virtDBusDomainGetVirDomain(connect, objectPath, error); + if (!domain) + return; + + if (virDomainBlockResize(domain, disk, size, flags) < 0) + virtDBusUtilSetLastVirtError(error); +} + static void virtDBusDomainCreate(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -1412,6 +1437,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = { { "BlockPeek", virtDBusDomainBlockPeek }, { "BlockPull", virtDBusDomainBlockPull }, { "BlockRebase", virtDBusDomainBlockRebase }, + { "BlockResize", virtDBusDomainBlockResize }, { "Create", virtDBusDomainCreate }, { "Destroy", virtDBusDomainDestroy }, { "DetachDevice", virtDBusDomainDetachDevice }, -- 2.15.0

Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com&gt; --- data/org.libvirt.Domain.xml | 7 +++++++ src/domain.c | 26 ++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index c7fb637..05f4da9 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -106,6 +106,13 @@ <arg name="size" type="t" direction="in"/> <arg name="flags" type="u" direction="in"/> </method> + <method name="CoreDumpWithFormat"> + <annotation name="org.gtk.GDBus.DocString" + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainCoreDumpWit... + <arg name="to" type="s" direction="in"/> + <arg name="dumpformat" type="u" direction="in"/> + <arg name="flags" type="u" direction="in"/> + </method> <method name="Create"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainCreateWithF... diff --git a/src/domain.c b/src/domain.c index 191d9e8..7c87133 100644 --- a/src/domain.c +++ b/src/domain.c @@ -574,6 +574,31 @@ virtDBusDomainBlockResize(GVariant *inArgs, virtDBusUtilSetLastVirtError(error); } +static void +virtDBusDomainCoreDumpWithFormat(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; + const gchar *to; + guint dumpformat; + guint flags; + + g_variant_get(inArgs, "(&suu)", &to, &dumpformat, &flags); + + domain = virtDBusDomainGetVirDomain(connect, objectPath, error); + if (!domain) + return; + + if (virDomainCoreDumpWithFormat(domain, to, dumpformat, flags) < 0) + virtDBusUtilSetLastVirtError(error); +} + static void virtDBusDomainCreate(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -1438,6 +1463,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = { { "BlockPull", virtDBusDomainBlockPull }, { "BlockRebase", virtDBusDomainBlockRebase }, { "BlockResize", virtDBusDomainBlockResize }, + { "CoreDumpWithFormat", virtDBusDomainCoreDumpWithFormat }, { "Create", virtDBusDomainCreate }, { "Destroy", virtDBusDomainDestroy }, { "DetachDevice", virtDBusDomainDetachDevice }, -- 2.15.0

Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com&gt; --- data/org.libvirt.Domain.xml | 6 ++++++ src/domain.c | 25 +++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index 05f4da9..fb2bcce 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -118,6 +118,12 @@ value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainCreateWithF... <arg name="flags" type="u" direction="in"/> </method> + <method name="DelIOThread"> + <annotation name="org.gtk.GDBus.DocString" + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainDelIOThread... + <arg name="iothreadId" type="u" direction="in"/> + <arg name="flags" type="u" direction="in"/> + </method> <method name="Destroy"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainDestroyFlag... diff --git a/src/domain.c b/src/domain.c index 7c87133..2fd8343 100644 --- a/src/domain.c +++ b/src/domain.c @@ -622,6 +622,30 @@ virtDBusDomainCreate(GVariant *inArgs, virtDBusUtilSetLastVirtError(error); } +static void +virtDBusDomainDelIOThread(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; + guint iothreadId; + guint flags; + + g_variant_get(inArgs, "(uu)", &iothreadId, &flags); + + domain = virtDBusDomainGetVirDomain(connect, objectPath, error); + if (!domain) + return; + + if (virDomainDelIOThread(domain, iothreadId, flags) < 0) + virtDBusUtilSetLastVirtError(error); +} + static void virtDBusDomainDestroy(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -1465,6 +1489,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = { { "BlockResize", virtDBusDomainBlockResize }, { "CoreDumpWithFormat", virtDBusDomainCoreDumpWithFormat }, { "Create", virtDBusDomainCreate }, + { "DelIOThread", virtDBusDomainDelIOThread }, { "Destroy", virtDBusDomainDestroy }, { "DetachDevice", virtDBusDomainDetachDevice }, { "GetBlkioParameters", virtDBusDomainGetBlkioParameters }, -- 2.15.0

Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com&gt; --- data/org.libvirt.Domain.xml | 7 +++++++ src/domain.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index fb2bcce..66cf5e2 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -135,6 +135,13 @@ <arg name="xml" type="s" direction="in"/> <arg name="flags" type="u" direction="in"/> </method> + <method name="FSFreeze"> + <annotation name="org.gtk.GDBus.DocString" + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainFSFreeze&qu... + <arg name="mountpoints" type="as" direction="in"/> + <arg name="flags" type="u" direction="in"/> + <arg name="frozenFilesystems" type="u" direction="out"/> + </method> <method name="GetBlkioParameters"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetBlkioPar... diff --git a/src/domain.c b/src/domain.c index 2fd8343..04115d1 100644 --- a/src/domain.c +++ b/src/domain.c @@ -693,6 +693,45 @@ virtDBusDomainDetachDevice(GVariant *inArgs, virtDBusUtilSetLastVirtError(error); } +static void +virtDBusDomainFSFreeze(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; + g_autofree const gchar **mountpoints = NULL; + GVariantIter *iter; + gsize nmountpoints = 0; + guint flags; + gint ret; + + g_variant_get(inArgs, "(asu)", &iter, &flags); + + nmountpoints = g_variant_iter_n_children(iter); + if (nmountpoints) { + mountpoints = g_new0(const gchar*, nmountpoints + 1); + while (g_variant_iter_loop(iter, "s", &mountpoints[nmountpoints-1])) + nmountpoints++; + nmountpoints--; + g_variant_iter_free(iter); + } + + domain = virtDBusDomainGetVirDomain(connect, objectPath, error); + if (!domain) + return; + + ret = virDomainFSFreeze(domain, (const gchar **)mountpoints, nmountpoints, flags); + if (ret < 0) + virtDBusUtilSetLastVirtError(error); + + *outArgs = g_variant_new("(u)", ret); +} + static void virtDBusDomainGetBlkioParameters(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -1492,6 +1531,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = { { "DelIOThread", virtDBusDomainDelIOThread }, { "Destroy", virtDBusDomainDestroy }, { "DetachDevice", virtDBusDomainDetachDevice }, + { "FSFreeze", virtDBusDomainFSFreeze }, { "GetBlkioParameters", virtDBusDomainGetBlkioParameters }, { "GetControlInfo", virtDBusDomainGetControlInfo }, { "GetJobInfo", virtDBusDomainGetJobInfo }, -- 2.15.0

On Wed, 2018-04-18 at 09:42 +0200, Pavel Hrdina wrote: I 'll need slight modification here: I 'll have to allocate nmountpoints + 1 because else I am getting the following Error after the last iteration. free(): invalid next size (fast) Thanks, Katerina

On Tue, Apr 17, 2018 at 02:04:35PM +0200, Katerina Koukiou wrote: You can use g_str_equal() here, at this point mountpoint will be always allocated. Reviewed-by: Pavel Hrdina <phrdina(a)redhat.com&gt;

On Tue, Apr 17, 2018 at 02:04:37PM +0200, Katerina Koukiou wrote: We need to figure out a better way how to represent the CPU map in libvirt-dbus. IMHO using an array of unsigned char is not the best from for D-Bus. There are two possible forms, using the string representation as we have in virsh, so for example "0,3-7,^5" which is 10011011. The second form is the one that libvirt-python uses, a tuple of boolean values, which in case of D-Bus would be represented as array of boolean values. The first form is better suited for humans so I guess we should go with the second form in D-Bus. Pavel

On Wed, Apr 18, 2018 at 02:41:19PM +0100, Daniel P. Berrangé wrote: I completely agree, that's why I suggested using an array of boolean. Thanks, Pavel

Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com&gt; --- data/org.libvirt.Domain.xml | 7 +++++++ src/domain.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index 97c5471..9490654 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -274,6 +274,13 @@ <arg name="cpumap" type="ay" direction="in"/> <arg name="flags" type="u" direction="in"/> </method> + <method name="PinIOThread"> + <annotation name="org.gtk.GDBus.DocString" + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainPinIOThread... + <arg name="iothreadId" type="u" direction="in"/> + <arg name="cpumap" type="ay" direction="in"/> + <arg name="flags" type="u" direction="in"/> + </method> <method name="Reboot"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainReboot"... diff --git a/src/domain.c b/src/domain.c index 92799ac..60dab7e 100644 --- a/src/domain.c +++ b/src/domain.c @@ -1396,6 +1396,44 @@ virtDBusDomainPinEmulator(GVariant *inArgs, virtDBusUtilSetLastVirtError(error); } +static void +virtDBusDomainPinIOThread(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; + guint iothreadId; + g_autofree const guchar *cpumap = NULL; + gsize maplen; + guint flags; + GVariant *v; + + v = g_variant_get_child_value(inArgs, 0); + iothreadId = g_variant_get_uint32(v); + g_variant_unref(v); + + v = g_variant_get_child_value(inArgs, 1); + cpumap = g_variant_get_fixed_array(v, &maplen, sizeof(guchar)); + g_variant_unref(v); + + v = g_variant_get_child_value(inArgs, 2); + flags = g_variant_get_uint32(v); + g_variant_unref(v); + + domain = virtDBusDomainGetVirDomain(connect, objectPath, error); + if (!domain) + return; + + if (virDomainPinIOThread(domain, iothreadId, (guchar *)cpumap, maplen, flags) < 0) + virtDBusUtilSetLastVirtError(error); +} + static void virtDBusDomainReboot(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -1677,6 +1715,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = { { "MigrateSetMaxSpeed", virtDBusDomainMigrateSetMaxSpeed }, { "MigrateStartPostCopy", virtDBusDomainMigrateStartPostCopy }, { "PinEmulator", virtDBusDomainPinEmulator }, + { "PinIOThread", virtDBusDomainPinIOThread }, { "Reboot", virtDBusDomainReboot }, { "Reset", virtDBusDomainReset }, { "Resume", virtDBusDomainResume }, -- 2.15.0

On Tue, Apr 17, 2018 at 02:04:40PM +0200, Katerina Koukiou wrote: You can use g_str_equal(). Reviewed-by: Pavel Hrdina <phrdina(a)redhat.com&gt;

On Tue, Apr 17, 2018 at 02:04:41PM +0200, Katerina Koukiou wrote: It should point to virDomainSaveFlags. g_str_equal() Reviewed-by: Pavel Hrdina <phrdina(a)redhat.com&gt;