9:32 a.m.
Changes from v1:
Added some more APIs.
Katerina Koukiou (22):
Implement Setter for Autostart property for Domain interface
Implement SchedulerType property for Domain Interface
Introduce virtDBusDomainMemoryStatTypeToString helper function
Implement MemoryStats for Domain Interface
Implement AttachDevice method for Domain Interface
Implement DetachDevice method for Domain Interface
Introduce virtDBusDomainJobTypeToString function
Implement GetJobInfo method for Domain interface
Implement AbortJob for Domain interface
Implement MigrateSetMaxDowntime method for Domain interface
Implement MigrateGetMaxDowntime method for Domain Interface
Implement ManagedSave method for Domain Interface
Implement HasManagedSaveImage method for Domain Interface
Implement ManagedSaveRemove method for Domain Interface
Implement SetVcpus method for Domain Interface
Implement GetMemoryParameters method for Domain Interface
Implement GetBlkioParameters method for domain Interface
Implement Updated property for Domain Interface
Implement MigrateGetMaxSpeed method for Domain Interface
Implement MigrateSetMaxSpeed method for Domain Interface
Implement SetMemory method for Domain Interface
Implement GetSchedulerParameters method for Domain Interface
data/org.libvirt.Domain.xml | 111 +++++++-
src/domain.c | 599 +++++++++++++++++++++++++++++++++++++++++++-
test/test_domain.py | 37 ++-
3 files changed, 742 insertions(+), 5 deletions(-)
--
2.15.0
9:32 a.m.
New subject: [libvirt] [dbus PATCH v2 01/22] Implement Setter for Autostart property for Domain interface
Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com>
---
data/org.libvirt.Domain.xml | 5 +++--
src/domain.c | 22 +++++++++++++++++++++-
test/test_domain.py | 7 +++++++
3 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml
index 78378bb..b8ee5b8 100644
--- a/data/org.libvirt.Domain.xml
+++ b/data/org.libvirt.Domain.xml
@@ -7,9 +7,10 @@
<annotation name="org.gtk.GDBus.DocString"
value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainIsActive&qu...
</property>
- <property name="Autostart" type="b"
access="read">
+ <property name="Autostart" type="b"
access="readwrite">
<annotation name="org.gtk.GDBus.DocString"
- value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetAutostar...
+ value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetAutostart and
+
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainSetAutostar...
</property>
<property name="Id" type="u" access="read">
<annotation name="org.gtk.GDBus.DocString"
diff --git a/src/domain.c b/src/domain.c
index 14f07fc..82682ef 100644
--- a/src/domain.c
+++ b/src/domain.c
@@ -218,6 +218,26 @@ virtDBusDomainGetUUID(const gchar *objectPath,
*value = g_variant_new("s", uuid);
}
+static void
+virtDBusDomainSetAutostart(GVariant *value,
+ const gchar *objectPath,
+ gpointer userData,
+ GError **error)
+{
+ virtDBusConnect *connect = userData;
+ g_autoptr(virDomain) domain = NULL;
+ gboolean autostart;
+
+ g_variant_get(value, "b", &autostart);
+
+ domain = virtDBusDomainGetVirDomain(connect, objectPath, error);
+ if (!domain)
+ return;
+
+ if (virDomainSetAutostart(domain, autostart) < 0)
+ return virtDBusUtilSetLastVirtError(error);
+}
+
static void
virtDBusDomainCreate(GVariant *inArgs,
GUnixFDList *inFDs G_GNUC_UNUSED,
@@ -492,7 +512,7 @@ virtDBusDomainUndefine(GVariant *inArgs,
static virtDBusGDBusPropertyTable virtDBusDomainPropertyTable[] = {
{ "Active", virtDBusDomainGetActive, NULL },
- { "Autostart", virtDBusDomainGetAutostart, NULL },
+ { "Autostart", virtDBusDomainGetAutostart, virtDBusDomainSetAutostart },
{ "Id", virtDBusDomainGetId, NULL },
{ "Name", virtDBusDomainGetName, NULL },
{ "OSType", virtDBusDomainGetOsType, NULL },
diff --git a/test/test_domain.py b/test/test_domain.py
index 952bf59..7fa9aad 100755
--- a/test/test_domain.py
+++ b/test/test_domain.py
@@ -37,6 +37,13 @@ class TestDomain(libvirttest.BaseTestClass):
raise e
domain.Undefine(0)
+ def test_domain_autostart(self):
+ _, domain = self.domain()
+ autostart_expected = True
+ domain.Set('org.libvirt.Domain', 'Autostart', autostart_expected,
dbus_interface=dbus.PROPERTIES_IFACE)
+ autostart_current = domain.Get('org.libvirt.Domain', 'Autostart',
dbus_interface=dbus.PROPERTIES_IFACE)
+ assert autostart_current == dbus.Boolean(autostart_expected)
+
def test_resume(self):
def domain_resumed(path, _event):
assert isinstance(path, dbus.ObjectPath)
--
2.15.0
9:32 a.m.
New subject: [libvirt] [dbus PATCH v2 02/22] Implement SchedulerType property for Domain Interface
Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com>
---
data/org.libvirt.Domain.xml | 4 ++++
src/domain.c | 23 +++++++++++++++++++++++
test/test_domain.py | 3 +++
3 files changed, 30 insertions(+)
diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml
index b8ee5b8..dbeafce 100644
--- a/data/org.libvirt.Domain.xml
+++ b/data/org.libvirt.Domain.xml
@@ -28,6 +28,10 @@
<annotation name="org.gtk.GDBus.DocString"
value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainIsPersisten...
</property>
+ <property name="SchedulerType" type="si"
access="read">
+ <annotation name="org.gtk.GDBus.DocString"
+ value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetSchedule...
+ </property>
<property name="State" type="s" access="read">
<annotation name="org.gtk.GDBus.DocString"
value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetState&qu...
diff --git a/src/domain.c b/src/domain.c
index 82682ef..f775fd4 100644
--- a/src/domain.c
+++ b/src/domain.c
@@ -149,6 +149,28 @@ virtDBusDomainGetPersistent(const gchar *objectPath,
*value = g_variant_new("b", !!persistent);
}
+static void
+virtDBusDomainGetSchedulerType(const gchar *objectPath,
+ gpointer userData,
+ GVariant **value,
+ GError **error)
+{
+ virtDBusConnect *connect = userData;
+ g_autoptr(virDomain) domain = NULL;
+ g_autofree gchar *schedtype = NULL;
+ gint nparams;
+
+ domain = virtDBusDomainGetVirDomain(connect, objectPath, error);
+ if (!domain)
+ return;
+
+ schedtype = virDomainGetSchedulerType(domain, &nparams);
+ if (!schedtype)
+ return virtDBusUtilSetLastVirtError(error);
+
+ *value = g_variant_new("(si)", schedtype, nparams);
+}
+
static void
virtDBusDomainGetState(const gchar *objectPath,
gpointer userData,
@@ -517,6 +539,7 @@ static virtDBusGDBusPropertyTable virtDBusDomainPropertyTable[] = {
{ "Name", virtDBusDomainGetName, NULL },
{ "OSType", virtDBusDomainGetOsType, NULL },
{ "Persistent", virtDBusDomainGetPersistent, NULL },
+ { "SchedulerType", virtDBusDomainGetSchedulerType, NULL},
{ "State", virtDBusDomainGetState, NULL },
{ "UUID", virtDBusDomainGetUUID, NULL },
{ 0 }
diff --git a/test/test_domain.py b/test/test_domain.py
index 7fa9aad..a7cf962 100755
--- a/test/test_domain.py
+++ b/test/test_domain.py
@@ -16,6 +16,9 @@ class TestDomain(libvirttest.BaseTestClass):
assert isinstance(props['Name'], dbus.String)
assert isinstance(props['OSType'], dbus.String)
assert isinstance(props['Persistent'], dbus.Boolean)
+ assert any([isinstance(props['SchedulerType'], dbus.Struct),
+ isinstance(props['SchedulerType'][0], dbus.String),
+ isinstance(props['SchedulerType'][1], dbus.Int32)])
assert isinstance(props['State'], dbus.String)
assert isinstance(props['UUID'], dbus.String)
--
2.15.0
2:33 a.m.
New subject: [libvirt] [dbus PATCH v2 02/22] Implement SchedulerType property for Domain Interface
On Thu, Apr 12, 2018 at 04:32:41PM +0200, Katerina Koukiou wrote:
Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com>
---
data/org.libvirt.Domain.xml | 4 ++++
src/domain.c | 23 +++++++++++++++++++++++
test/test_domain.py | 3 +++
3 files changed, 30 insertions(+)
diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml
index b8ee5b8..dbeafce 100644
--- a/data/org.libvirt.Domain.xml
+++ b/data/org.libvirt.Domain.xml
@@ -28,6 +28,10 @@
<annotation name="org.gtk.GDBus.DocString"
value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainIsPersisten...
</property>
+ <property name="SchedulerType" type="si"
access="read">
s/si/(si)/
+ <annotation name="org.gtk.GDBus.DocString"
+ value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetSchedule...
+ </property>
<property name="State" type="s" access="read">
<annotation name="org.gtk.GDBus.DocString"
value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetState&qu...
Pavel
9:32 a.m.
New subject: [libvirt] [dbus PATCH v2 03/22] Introduce virtDBusDomainMemoryStatTypeToString helper function
Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com>
---
src/domain.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/src/domain.c b/src/domain.c
index f775fd4..9b3de57 100644
--- a/src/domain.c
+++ b/src/domain.c
@@ -3,6 +3,20 @@
#include <libvirt/libvirt.h>
+VIRT_DBUS_ENUM_DECL(virtDBusDomainMemoryStat)
+VIRT_DBUS_ENUM_IMPL(virtDBusDomainMemoryStat,
+ VIR_DOMAIN_MEMORY_STAT_LAST,
+ "swap_in",
+ "swap_out",
+ "major_fault",
+ "minor_fault",
+ "unused",
+ "available",
+ "actual_baloon",
+ "rss",
+ "usable",
+ "last_update")
+
static virDomainPtr
virtDBusDomainGetVirDomain(virtDBusConnect *connect,
const gchar *objectPath,
--
2.15.0
2:34 a.m.
New subject: [libvirt] [dbus PATCH v2 03/22] Introduce virtDBusDomainMemoryStatTypeToString helper function
On Thu, Apr 12, 2018 at 04:32:42PM +0200, Katerina Koukiou wrote:
Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com>
---
src/domain.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
This patch can be squashed into the following one.
Pavel
9:32 a.m.
New subject: [libvirt] [dbus PATCH v2 04/22] Implement MemoryStats for Domain Interface
This method is not tested for now since the test driver
doesn't support this API.
Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com>
---
data/org.libvirt.Domain.xml | 7 ++++++
src/domain.c | 52 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 59 insertions(+)
diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml
index dbeafce..6795d30 100644
--- a/data/org.libvirt.Domain.xml
+++ b/data/org.libvirt.Domain.xml
@@ -69,6 +69,13 @@
<arg name="flags" type="u" direction="in"/>
<arg name="xml" type="s" direction="out"/>
</method>
+ <method name="MemoryStats">
+ <annotation name="org.gtk.GDBus.DocString"
+ value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainMemoryStats...
+ <arg name="nr_stats" type="u" direction="in"/>
+ <arg name="flags" type="u" direction="in"/>
+ <arg name="stats" type="a{st}"
direction="out"/>
+ </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 9b3de57..59118b9 100644
--- a/src/domain.c
+++ b/src/domain.c
@@ -17,6 +17,24 @@ VIRT_DBUS_ENUM_IMPL(virtDBusDomainMemoryStat,
"usable",
"last_update")
+static GVariant *
+virtDBusDomainMemoryStatsToGVariant(virDomainMemoryStatPtr stats,
+ gint nr_stats)
+{
+ GVariantBuilder builder;
+
+ g_variant_builder_init(&builder, G_VARIANT_TYPE("a{st}"));
+
+ for (gint i = 0; i < nr_stats; i++) {
+ const gchar *memoryStat = virtDBusDomainMemoryStatTypeToString(stats[i].tag);
+ if (!memoryStat)
+ return 0;
+ g_variant_builder_add(&builder, "{st}", memoryStat, stats[i].val);
+ }
+
+ return g_variant_builder_end(&builder);
+}
+
static virDomainPtr
virtDBusDomainGetVirDomain(virtDBusConnect *connect,
const gchar *objectPath,
@@ -412,6 +430,39 @@ virtDBusDomainGetXMLDesc(GVariant *inArgs,
*outArgs = g_variant_new("(s)", xml);
}
+static void
+virtDBusDomainMemoryStats(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 virDomainMemoryStatPtr stats = NULL;
+ guint max_stats;
+ gint nr_stats;
+ guint flags;
+ GVariant *gstats;
+
+ g_variant_get(inArgs, "(uu)", &max_stats, &flags);
+
+ domain = virtDBusDomainGetVirDomain(connect, objectPath, error);
+ if (!domain)
+ return;
+
+ stats = g_new0(virDomainMemoryStatStruct, max_stats);
+ nr_stats = virDomainMemoryStats(domain, stats, max_stats, flags);
+ if (nr_stats == -1)
+ return virtDBusUtilSetLastVirtError(error);
+
+ gstats = virtDBusDomainMemoryStatsToGVariant(stats, nr_stats);
+
+ *outArgs = g_variant_new_tuple(&gstats, 1);
+}
+
static void
virtDBusDomainReboot(GVariant *inArgs,
GUnixFDList *inFDs G_GNUC_UNUSED,
@@ -565,6 +616,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = {
{ "GetStats", virtDBusDomainGetStats },
{ "GetVcpus", virtDBusDomainGetVcpus },
{ "GetXMLDesc", virtDBusDomainGetXMLDesc },
+ { "MemoryStats", virtDBusDomainMemoryStats },
{ "Reboot", virtDBusDomainReboot },
{ "Reset", virtDBusDomainReset },
{ "Resume", virtDBusDomainResume },
--
2.15.0
2:59 a.m.
New subject: [libvirt] [dbus PATCH v2 04/22] Implement MemoryStats for Domain Interface
On Thu, Apr 12, 2018 at 04:32:43PM +0200, Katerina Koukiou wrote:
This method is not tested for now since the test driver
doesn't support this API.
Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com>
---
data/org.libvirt.Domain.xml | 7 ++++++
src/domain.c | 52 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 59 insertions(+)
diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml
index dbeafce..6795d30 100644
--- a/data/org.libvirt.Domain.xml
+++ b/data/org.libvirt.Domain.xml
@@ -69,6 +69,13 @@
<arg name="flags" type="u" direction="in"/>
<arg name="xml" type="s" direction="out"/>
</method>
+ <method name="MemoryStats">
+ <annotation name="org.gtk.GDBus.DocString"
+ value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainMemoryStats...
+ <arg name="nr_stats" type="u"
direction="in"/>
+ <arg name="flags" type="u" direction="in"/>
+ <arg name="stats" type="a{st}"
direction="out"/>
+ </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 9b3de57..59118b9 100644
--- a/src/domain.c
+++ b/src/domain.c
@@ -17,6 +17,24 @@ VIRT_DBUS_ENUM_IMPL(virtDBusDomainMemoryStat,
"usable",
"last_update")
+static GVariant *
+virtDBusDomainMemoryStatsToGVariant(virDomainMemoryStatPtr stats,
+ gint nr_stats)
+{
+ GVariantBuilder builder;
+
+ g_variant_builder_init(&builder, G_VARIANT_TYPE("a{st}"));
+
+ for (gint i = 0; i < nr_stats; i++) {
+ const gchar *memoryStat = virtDBusDomainMemoryStatTypeToString(stats[i].tag);
+ if (!memoryStat)
+ return 0;
+ g_variant_builder_add(&builder, "{st}", memoryStat,
stats[i].val);
+ }
+
+ return g_variant_builder_end(&builder);
+}
+
static virDomainPtr
virtDBusDomainGetVirDomain(virtDBusConnect *connect,
const gchar *objectPath,
@@ -412,6 +430,39 @@ virtDBusDomainGetXMLDesc(GVariant *inArgs,
*outArgs = g_variant_new("(s)", xml);
}
+static void
+virtDBusDomainMemoryStats(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 virDomainMemoryStatPtr stats = NULL;
+ guint max_stats;
+ gint nr_stats;
+ guint flags;
+ GVariant *gstats;
+
+ g_variant_get(inArgs, "(uu)", &max_stats, &flags);
+
+ domain = virtDBusDomainGetVirDomain(connect, objectPath, error);
+ if (!domain)
+ return;
+
+ stats = g_new0(virDomainMemoryStatStruct, max_stats);
I think that we can make the life of libvirt-dbus users easier like
libvirt-python does and don't ask for the 'max_stats' at all. The only
input arg would be 'flags'.
There we can allocate stats to VIR_DOMAIN_MEMORY_STAT_NR size which
would always request all possible stats.
Pavel
3:09 a.m.
New subject: [libvirt] [dbus PATCH v2 04/22] Implement MemoryStats for Domain Interface
On Thu, Apr 12, 2018 at 04:32:43PM +0200, Katerina Koukiou wrote:
This method is not tested for now since the test driver
doesn't support this API.
Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com>
---
data/org.libvirt.Domain.xml | 7 ++++++
src/domain.c | 52 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 59 insertions(+)
[...]
+static void
+virtDBusDomainMemoryStats(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 virDomainMemoryStatPtr stats = NULL;
+ guint max_stats;
+ gint nr_stats;
+ guint flags;
+ GVariant *gstats;
+
+ g_variant_get(inArgs, "(uu)", &max_stats, &flags);
+
+ domain = virtDBusDomainGetVirDomain(connect, objectPath, error);
+ if (!domain)
+ return;
+
+ stats = g_new0(virDomainMemoryStatStruct, max_stats);
+ nr_stats = virDomainMemoryStats(domain, stats, max_stats, flags);
+ if (nr_stats == -1)
One more thing, 'nr_stats < 0' is preferred form.
Pavel
3:32 a.m.
New subject: [libvirt] [dbus PATCH v2 04/22] Implement MemoryStats for Domain Interface
On Thu, Apr 12, 2018 at 04:32:43PM +0200, Katerina Koukiou wrote:
This method is not tested for now since the test driver
doesn't support this API.
Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com>
---
data/org.libvirt.Domain.xml | 7 ++++++
src/domain.c | 52 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 59 insertions(+)
diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml
index dbeafce..6795d30 100644
--- a/data/org.libvirt.Domain.xml
+++ b/data/org.libvirt.Domain.xml
@@ -69,6 +69,13 @@
<arg name="flags" type="u" direction="in"/>
<arg name="xml" type="s" direction="out"/>
</method>
+ <method name="MemoryStats">
+ <annotation name="org.gtk.GDBus.DocString"
+ value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainMemoryStats...
+ <arg name="nr_stats" type="u"
direction="in"/>
+ <arg name="flags" type="u" direction="in"/>
+ <arg name="stats" type="a{st}"
direction="out"/>
+ </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 9b3de57..59118b9 100644
--- a/src/domain.c
+++ b/src/domain.c
@@ -17,6 +17,24 @@ VIRT_DBUS_ENUM_IMPL(virtDBusDomainMemoryStat,
"usable",
"last_update")
+static GVariant *
+virtDBusDomainMemoryStatsToGVariant(virDomainMemoryStatPtr stats,
+ gint nr_stats)
+{
+ GVariantBuilder builder;
+
+ g_variant_builder_init(&builder, G_VARIANT_TYPE("a{st}"));
+
+ for (gint i = 0; i < nr_stats; i++) {
+ const gchar *memoryStat = virtDBusDomainMemoryStatTypeToString(stats[i].tag);
+ if (!memoryStat)
+ return 0;
The return value is pointer so it should be NULL.
+ g_variant_builder_add(&builder, "{st}",
memoryStat, stats[i].val);
+ }
+
+ return g_variant_builder_end(&builder);
+}
+
static virDomainPtr
virtDBusDomainGetVirDomain(virtDBusConnect *connect,
const gchar *objectPath,
@@ -412,6 +430,39 @@ virtDBusDomainGetXMLDesc(GVariant *inArgs,
*outArgs = g_variant_new("(s)", xml);
}
+static void
+virtDBusDomainMemoryStats(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 virDomainMemoryStatPtr stats = NULL;
+ guint max_stats;
+ gint nr_stats;
+ guint flags;
+ GVariant *gstats;
+
+ g_variant_get(inArgs, "(uu)", &max_stats, &flags);
+
+ domain = virtDBusDomainGetVirDomain(connect, objectPath, error);
+ if (!domain)
+ return;
+
+ stats = g_new0(virDomainMemoryStatStruct, max_stats);
+ nr_stats = virDomainMemoryStats(domain, stats, max_stats, flags);
+ if (nr_stats == -1)
+ return virtDBusUtilSetLastVirtError(error);
+
+ gstats = virtDBusDomainMemoryStatsToGVariant(stats, nr_stats);
This can be NULL, I think that virtDBusDomainMemoryStatsToGVariant needs
to take one more parameter, 'GError **error' and in case of error it
should return NULL and set an error message.
Pavel
9:32 a.m.
New subject: [libvirt] [dbus PATCH v2 05/22] Implement AttachDevice method for Domain Interface
This method is not tested for now since the test driver
doesn't suport this API.
Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com>
---
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 6795d30..b620939 100644
--- a/data/org.libvirt.Domain.xml
+++ b/data/org.libvirt.Domain.xml
@@ -40,6 +40,12 @@
<annotation name="org.gtk.GDBus.DocString"
value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetUUIDStri...
</property>
+ <method name="AttachDevice">
+ <annotation name="org.gtk.GDBus.DocString"
+ value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainAttachDevic...
+ <arg name="xml" type="s" 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 59118b9..cfdd820 100644
--- a/src/domain.c
+++ b/src/domain.c
@@ -292,6 +292,30 @@ virtDBusDomainSetAutostart(GVariant *value,
return virtDBusUtilSetLastVirtError(error);
}
+static void
+virtDBusDomainAttachDevice(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 *xml;
+ guint flags;
+
+ g_variant_get(inArgs, "(&su)", &xml, &flags);
+
+ domain = virtDBusDomainGetVirDomain(connect, objectPath, error);
+ if (!domain)
+ return;
+
+ if (virDomainAttachDeviceFlags(domain, xml, flags) == -1)
+ return virtDBusUtilSetLastVirtError(error);
+}
+
static void
virtDBusDomainCreate(GVariant *inArgs,
GUnixFDList *inFDs G_GNUC_UNUSED,
@@ -611,6 +635,7 @@ static virtDBusGDBusPropertyTable virtDBusDomainPropertyTable[] = {
};
static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = {
+ { "AttachDevice", virtDBusDomainAttachDevice },
{ "Create", virtDBusDomainCreate },
{ "Destroy", virtDBusDomainDestroy },
{ "GetStats", virtDBusDomainGetStats },
--
2.15.0
3:19 a.m.
New subject: [libvirt] [dbus PATCH v2 05/22] Implement AttachDevice method for Domain Interface
On Thu, Apr 12, 2018 at 04:32:44PM +0200, Katerina Koukiou wrote:
This method is not tested for now since the test driver
doesn't suport this API.
Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com>
---
data/org.libvirt.Domain.xml | 6 ++++++
src/domain.c | 25 +++++++++++++++++++++++++
2 files changed, 31 insertions(+)
[...]
+static void
+virtDBusDomainAttachDevice(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 *xml;
+ guint flags;
+
+ g_variant_get(inArgs, "(&su)", &xml, &flags);
+
+ domain = virtDBusDomainGetVirDomain(connect, objectPath, error);
+ if (!domain)
+ return;
+
+ if (virDomainAttachDeviceFlags(domain, xml, flags) == -1)
+ return virtDBusUtilSetLastVirtError(error);
There is no need to use 'return'.
Pavel
9:32 a.m.
New subject: [libvirt] [dbus PATCH v2 06/22] Implement DetachDevice method for Domain Interface
This method is not tested for now since the test driver
doesn't suport this API.
Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com>
---
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 b620939..83e37bc 100644
--- a/data/org.libvirt.Domain.xml
+++ b/data/org.libvirt.Domain.xml
@@ -56,6 +56,12 @@
value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainDestroyFlag...
<arg name="flags" type="u" direction="in"/>
</method>
+ <method name="DetachDevice">
+ <annotation name="org.gtk.GDBus.DocString"
+ value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainDetachDevic...
+ <arg name="xml" type="s" direction="in"/>
+ <arg name="flags" type="u" direction="in"/>
+ </method>
<method name="GetStats">
<annotation name="org.gtk.GDBus.DocString"
value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainListGetStat...
diff --git a/src/domain.c b/src/domain.c
index cfdd820..cd44d6b 100644
--- a/src/domain.c
+++ b/src/domain.c
@@ -362,6 +362,30 @@ virtDBusDomainDestroy(GVariant *inArgs,
virtDBusUtilSetLastVirtError(error);
}
+static void
+virtDBusDomainDetachDevice(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 *xml;
+ guint flags;
+
+ g_variant_get(inArgs, "(&su)", &xml, &flags);
+
+ domain = virtDBusDomainGetVirDomain(connect, objectPath, error);
+ if (!domain)
+ return;
+
+ if (virDomainDetachDeviceFlags(domain, xml, flags) == -1)
+ return virtDBusUtilSetLastVirtError(error);
+}
+
G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainStatsRecordPtr, virDomainStatsRecordListFree);
static void
@@ -638,6 +662,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = {
{ "AttachDevice", virtDBusDomainAttachDevice },
{ "Create", virtDBusDomainCreate },
{ "Destroy", virtDBusDomainDestroy },
+ { "DetachDevice", virtDBusDomainDetachDevice },
{ "GetStats", virtDBusDomainGetStats },
{ "GetVcpus", virtDBusDomainGetVcpus },
{ "GetXMLDesc", virtDBusDomainGetXMLDesc },
--
2.15.0
3:22 a.m.
New subject: [libvirt] [dbus PATCH v2 06/22] Implement DetachDevice method for Domain Interface
On Thu, Apr 12, 2018 at 04:32:45PM +0200, Katerina Koukiou wrote:
This method is not tested for now since the test driver
doesn't suport this API.
Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com>
---
data/org.libvirt.Domain.xml | 6 ++++++
src/domain.c | 25 +++++++++++++++++++++++++
2 files changed, 31 insertions(+)
[...]
+static void
+virtDBusDomainDetachDevice(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 *xml;
+ guint flags;
+
+ g_variant_get(inArgs, "(&su)", &xml, &flags);
+
+ domain = virtDBusDomainGetVirDomain(connect, objectPath, error);
+ if (!domain)
+ return;
+
+ if (virDomainDetachDeviceFlags(domain, xml, flags) == -1)
+ return virtDBusUtilSetLastVirtError(error);
Same here, no need for 'return' and I forgot to mention it for the
previous patch, '< 0' is the preferred form.
Pavel
9:32 a.m.
New subject: [libvirt] [dbus PATCH v2 07/22] Introduce virtDBusDomainJobTypeToString function
Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com>
---
src/domain.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/src/domain.c b/src/domain.c
index cd44d6b..bf352a7 100644
--- a/src/domain.c
+++ b/src/domain.c
@@ -3,6 +3,16 @@
#include <libvirt/libvirt.h>
+VIRT_DBUS_ENUM_DECL(virtDBusDomainJob)
+VIRT_DBUS_ENUM_IMPL(virtDBusDomainJob,
+ VIR_DOMAIN_JOB_LAST,
+ "none",
+ "bounded",
+ "unbounded",
+ "completed",
+ "failed",
+ "canceled")
+
VIRT_DBUS_ENUM_DECL(virtDBusDomainMemoryStat)
VIRT_DBUS_ENUM_IMPL(virtDBusDomainMemoryStat,
VIR_DOMAIN_MEMORY_STAT_LAST,
--
2.15.0
3:23 a.m.
New subject: [libvirt] [dbus PATCH v2 07/22] Introduce virtDBusDomainJobTypeToString function
On Thu, Apr 12, 2018 at 04:32:46PM +0200, Katerina Koukiou wrote:
Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com>
---
src/domain.c | 10 ++++++++++
1 file changed, 10 insertions(+)
This can be squashed into the following patch.
Pavel
9:32 a.m.
New subject: [libvirt] [dbus PATCH v2 08/22] Implement GetJobInfo method for Domain interface
Signed-off-by: Katerina Koukiou <kkoukiou(a)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 83e37bc..2e0339b 100644
--- a/data/org.libvirt.Domain.xml
+++ b/data/org.libvirt.Domain.xml
@@ -62,6 +62,11 @@
<arg name="xml" type="s" direction="in"/>
<arg name="flags" type="u" direction="in"/>
</method>
+ <method name="GetJobInfo">
+ <annotation name="org.gtk.GDBus.DocString"
+ value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetJobInfo&...
+ <arg name="jobInfo" type="(sttttttttttt)"
direction="out"/>
+ </method>
<method name="GetStats">
<annotation name="org.gtk.GDBus.DocString"
value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainListGetStat...
diff --git a/src/domain.c b/src/domain.c
index bf352a7..e80749b 100644
--- a/src/domain.c
+++ b/src/domain.c
@@ -396,6 +396,40 @@ virtDBusDomainDetachDevice(GVariant *inArgs,
return virtDBusUtilSetLastVirtError(error);
}
+static void
+virtDBusDomainGetJobInfo(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 virDomainJobInfoPtr jobInfo = NULL;
+ const gchar *jobTypeStr;
+
+ domain = virtDBusDomainGetVirDomain(connect, objectPath, error);
+ if (!domain)
+ return;
+
+ jobInfo = g_new0(virDomainJobInfo, 1);
+ if (virDomainGetJobInfo(domain, jobInfo) == -1)
+ return virtDBusUtilSetLastVirtError(error);
+
+ jobTypeStr = virtDBusDomainJobTypeToString(jobInfo->type);
+ if (!jobTypeStr)
+ return;
+ *outArgs = g_variant_new("((sttttttttttt))", jobTypeStr,
+ jobInfo->timeElapsed, jobInfo->timeRemaining,
+ jobInfo->dataTotal, jobInfo->dataProcessed,
+ jobInfo->dataRemaining, jobInfo->memTotal,
+ jobInfo->memProcessed, jobInfo->memRemaining,
+ jobInfo->fileTotal, jobInfo->fileProcessed,
+ jobInfo->fileRemaining);
+}
+
G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainStatsRecordPtr, virDomainStatsRecordListFree);
static void
@@ -673,6 +707,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = {
{ "Create", virtDBusDomainCreate },
{ "Destroy", virtDBusDomainDestroy },
{ "DetachDevice", virtDBusDomainDetachDevice },
+ { "GetJobInfo", virtDBusDomainGetJobInfo },
{ "GetStats", virtDBusDomainGetStats },
{ "GetVcpus", virtDBusDomainGetVcpus },
{ "GetXMLDesc", virtDBusDomainGetXMLDesc },
--
2.15.0
3:34 a.m.
New subject: [libvirt] [dbus PATCH v2 08/22] Implement GetJobInfo method for Domain interface
On Thu, Apr 12, 2018 at 04:32:47PM +0200, Katerina Koukiou wrote:
Signed-off-by: Katerina Koukiou <kkoukiou(a)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 83e37bc..2e0339b 100644
--- a/data/org.libvirt.Domain.xml
+++ b/data/org.libvirt.Domain.xml
@@ -62,6 +62,11 @@
<arg name="xml" type="s" direction="in"/>
<arg name="flags" type="u" direction="in"/>
</method>
+ <method name="GetJobInfo">
+ <annotation name="org.gtk.GDBus.DocString"
+ value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetJobInfo&...
+ <arg name="jobInfo" type="(sttttttttttt)"
direction="out"/>
+ </method>
<method name="GetStats">
<annotation name="org.gtk.GDBus.DocString"
value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainListGetStat...
diff --git a/src/domain.c b/src/domain.c
index bf352a7..e80749b 100644
--- a/src/domain.c
+++ b/src/domain.c
@@ -396,6 +396,40 @@ virtDBusDomainDetachDevice(GVariant *inArgs,
return virtDBusUtilSetLastVirtError(error);
}
+static void
+virtDBusDomainGetJobInfo(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 virDomainJobInfoPtr jobInfo = NULL;
+ const gchar *jobTypeStr;
+
+ domain = virtDBusDomainGetVirDomain(connect, objectPath, error);
+ if (!domain)
+ return;
+
+ jobInfo = g_new0(virDomainJobInfo, 1);
+ if (virDomainGetJobInfo(domain, jobInfo) == -1)
'< 0'
+ return virtDBusUtilSetLastVirtError(error);
+
+ jobTypeStr = virtDBusDomainJobTypeToString(jobInfo->type);
+ if (!jobTypeStr)
+ return;
We need to set an error message before returning.
Pavel
9:32 a.m.
New subject: [libvirt] [dbus PATCH v2 09/22] Implement AbortJob for Domain interface
Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com>
---
data/org.libvirt.Domain.xml | 4 ++++
src/domain.c | 21 +++++++++++++++++++++
2 files changed, 25 insertions(+)
diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml
index 2e0339b..152ed4b 100644
--- a/data/org.libvirt.Domain.xml
+++ b/data/org.libvirt.Domain.xml
@@ -40,6 +40,10 @@
<annotation name="org.gtk.GDBus.DocString"
value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetUUIDStri...
</property>
+ <method name="AbortJob">
+ <annotation name="org.gtk.GDBus.DocString"
+ value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainAbortJob&qu...
+ </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 e80749b..d1be665 100644
--- a/src/domain.c
+++ b/src/domain.c
@@ -302,6 +302,26 @@ virtDBusDomainSetAutostart(GVariant *value,
return virtDBusUtilSetLastVirtError(error);
}
+static void
+virtDBusDomainAbortJob(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;
+
+ domain = virtDBusDomainGetVirDomain(connect, objectPath, error);
+ if (!domain)
+ return;
+
+ if (virDomainAbortJob(domain) < 0)
+ virtDBusUtilSetLastVirtError(error);
+}
+
static void
virtDBusDomainAttachDevice(GVariant *inArgs,
GUnixFDList *inFDs G_GNUC_UNUSED,
@@ -703,6 +723,7 @@ static virtDBusGDBusPropertyTable virtDBusDomainPropertyTable[] = {
};
static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = {
+ { "AbortJob", virtDBusDomainAbortJob },
{ "AttachDevice", virtDBusDomainAttachDevice },
{ "Create", virtDBusDomainCreate },
{ "Destroy", virtDBusDomainDestroy },
--
2.15.0
9:32 a.m.
New subject: [libvirt] [dbus PATCH v2 10/22] Implement MigrateSetMaxDowntime method for Domain interface
Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com>
---
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 152ed4b..c509b4e 100644
--- a/data/org.libvirt.Domain.xml
+++ b/data/org.libvirt.Domain.xml
@@ -97,6 +97,12 @@
<arg name="flags" type="u" direction="in"/>
<arg name="stats" type="a{st}"
direction="out"/>
</method>
+ <method name="MigrateSetMaxDowntime">
+ <annotation name="org.gtk.GDBus.DocString"
+ value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainMigrateSetM...
+ <arg name="downtime" type="t" 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 d1be665..c42e1c6 100644
--- a/src/domain.c
+++ b/src/domain.c
@@ -575,6 +575,30 @@ virtDBusDomainMemoryStats(GVariant *inArgs,
*outArgs = g_variant_new_tuple(&gstats, 1);
}
+static void
+virtDBusDomainMigrateSetMaxDowntime(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;
+ guint64 downtime;
+ guint flags;
+
+ g_variant_get(inArgs, "(tu)", &downtime, &flags);
+
+ domain = virtDBusDomainGetVirDomain(connect, objectPath, error);
+ if (!domain)
+ return;
+
+ if (virDomainMigrateSetMaxDowntime(domain, downtime, flags) < 0)
+ return virtDBusUtilSetLastVirtError(error);
+}
+
static void
virtDBusDomainReboot(GVariant *inArgs,
GUnixFDList *inFDs G_GNUC_UNUSED,
@@ -733,6 +757,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = {
{ "GetVcpus", virtDBusDomainGetVcpus },
{ "GetXMLDesc", virtDBusDomainGetXMLDesc },
{ "MemoryStats", virtDBusDomainMemoryStats },
+ { "MigrateSetMaxDowntime", virtDBusDomainMigrateSetMaxDowntime },
{ "Reboot", virtDBusDomainReboot },
{ "Reset", virtDBusDomainReset },
{ "Resume", virtDBusDomainResume },
--
2.15.0
3:38 a.m.
New subject: [libvirt] [dbus PATCH v2 10/22] Implement MigrateSetMaxDowntime method for Domain interface
On Thu, Apr 12, 2018 at 04:32:49PM +0200, Katerina Koukiou wrote:
Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com>
---
data/org.libvirt.Domain.xml | 6 ++++++
src/domain.c | 25 +++++++++++++++++++++++++
2 files changed, 31 insertions(+)
[...]
+static void
+virtDBusDomainMigrateSetMaxDowntime(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;
+ guint64 downtime;
+ guint flags;
+
+ g_variant_get(inArgs, "(tu)", &downtime, &flags);
+
+ domain = virtDBusDomainGetVirDomain(connect, objectPath, error);
+ if (!domain)
+ return;
+
+ if (virDomainMigrateSetMaxDowntime(domain, downtime, flags) < 0)
+ return virtDBusUtilSetLastVirtError(error);
No need for 'return'.
Pavel
9:32 a.m.
New subject: [libvirt] [dbus PATCH v2 11/22] Implement MigrateGetMaxDowntime method for Domain Interface
Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com>
---
data/org.libvirt.Domain.xml | 6 ++++++
src/domain.c | 31 +++++++++++++++++++++++++++++++
2 files changed, 37 insertions(+)
diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml
index c509b4e..3903689 100644
--- a/data/org.libvirt.Domain.xml
+++ b/data/org.libvirt.Domain.xml
@@ -97,6 +97,12 @@
<arg name="flags" type="u" direction="in"/>
<arg name="stats" type="a{st}"
direction="out"/>
</method>
+ <method name="MigrateGetMaxDowntime">
+ <annotation name="org.gtk.GDBus.DocString"
+ value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainMigrateGetM...
+ <arg name="flags" type="u" direction="in"/>
+ <arg name="downtime" type="t"
direction="out"/>
+ </method>
<method name="MigrateSetMaxDowntime">
<annotation name="org.gtk.GDBus.DocString"
value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainMigrateSetM...
diff --git a/src/domain.c b/src/domain.c
index c42e1c6..e1b2d72 100644
--- a/src/domain.c
+++ b/src/domain.c
@@ -575,6 +575,36 @@ virtDBusDomainMemoryStats(GVariant *inArgs,
*outArgs = g_variant_new_tuple(&gstats, 1);
}
+static void
+virtDBusDomainMigrateGetMaxDowntime(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;
+ guint64 downtime;
+ guint flags;
+ gint ret;
+
+ g_variant_get(inArgs, "(u)", &flags);
+
+ domain = virtDBusDomainGetVirDomain(connect, objectPath, error);
+ if (!domain)
+ return;
+
+ ret = virDomainMigrateGetMaxDowntime(domain,
+ (long long unsigned int *)&downtime,
+ flags);
+ if (ret < 0)
+ return virtDBusUtilSetLastVirtError(error);
+
+ *outArgs = g_variant_new("(t)", downtime);
+}
+
static void
virtDBusDomainMigrateSetMaxDowntime(GVariant *inArgs,
GUnixFDList *inFDs G_GNUC_UNUSED,
@@ -757,6 +787,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = {
{ "GetVcpus", virtDBusDomainGetVcpus },
{ "GetXMLDesc", virtDBusDomainGetXMLDesc },
{ "MemoryStats", virtDBusDomainMemoryStats },
+ { "MigrateGetMaxDowntime", virtDBusDomainMigrateGetMaxDowntime },
{ "MigrateSetMaxDowntime", virtDBusDomainMigrateSetMaxDowntime },
{ "Reboot", virtDBusDomainReboot },
{ "Reset", virtDBusDomainReset },
--
2.15.0
5:01 a.m.
New subject: [libvirt] [dbus PATCH v2 11/22] Implement MigrateGetMaxDowntime method for Domain Interface
On Thu, Apr 12, 2018 at 04:32:50PM +0200, Katerina Koukiou wrote:
Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com>
---
data/org.libvirt.Domain.xml | 6 ++++++
src/domain.c | 31 +++++++++++++++++++++++++++++++
2 files changed, 37 insertions(+)
[...]
+static void
+virtDBusDomainMigrateGetMaxDowntime(GVariant *inArgs,
+ GUnixFDList *inFDs G_GNUC_UNUSED,
+ const gchar *objectPath,
+ gpointer userData,
+ GVariant **outArgs G_GNUC_UNUSED,
outArgs is used so remove G_GNUC_UNUSED
+ GUnixFDList **outFDs
G_GNUC_UNUSED,
+ GError **error)
+{
+ virtDBusConnect *connect = userData;
+ g_autoptr(virDomain) domain = NULL;
+ guint64 downtime;
For consistency this could be gulong and also in the previous patch.
Both are 'unsigned long'.
+ guint flags;
+ gint ret;
+
+ g_variant_get(inArgs, "(u)", &flags);
+
+ domain = virtDBusDomainGetVirDomain(connect, objectPath, error);
+ if (!domain)
+ return;
+
+ ret = virDomainMigrateGetMaxDowntime(domain,
+ (long long unsigned int *)&downtime,
The 'int' is redundant, you can remove it, and usually we put the
'unsigned' keyword as first one.
Pavel
9:32 a.m.
New subject: [libvirt] [dbus PATCH v2 12/22] Implement ManagedSave method for Domain Interface
Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com>
---
data/org.libvirt.Domain.xml | 5 +++++
src/domain.c | 24 ++++++++++++++++++++++++
test/test_domain.py | 15 +++++++++++++++
3 files changed, 44 insertions(+)
diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml
index 3903689..382b062 100644
--- a/data/org.libvirt.Domain.xml
+++ b/data/org.libvirt.Domain.xml
@@ -90,6 +90,11 @@
<arg name="flags" type="u" direction="in"/>
<arg name="xml" type="s" direction="out"/>
</method>
+ <method name="ManagedSave">
+ <annotation name="org.gtk.GDBus.DocString"
+ value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainManagedSave...
+ <arg name="flags" type="u" direction="in"/>
+ </method>
<method name="MemoryStats">
<annotation name="org.gtk.GDBus.DocString"
value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainMemoryStats...
diff --git a/src/domain.c b/src/domain.c
index e1b2d72..53f8798 100644
--- a/src/domain.c
+++ b/src/domain.c
@@ -542,6 +542,29 @@ virtDBusDomainGetXMLDesc(GVariant *inArgs,
*outArgs = g_variant_new("(s)", xml);
}
+static void
+virtDBusDomainManagedSave(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 flags;
+
+ g_variant_get(inArgs, "(u)", &flags);
+
+ domain = virtDBusDomainGetVirDomain(connect, objectPath, error);
+ if (!domain)
+ return;
+
+ if (virDomainManagedSave(domain, flags) < 0)
+ virtDBusUtilSetLastVirtError(error);
+}
+
static void
virtDBusDomainMemoryStats(GVariant *inArgs,
GUnixFDList *inFDs G_GNUC_UNUSED,
@@ -786,6 +809,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = {
{ "GetStats", virtDBusDomainGetStats },
{ "GetVcpus", virtDBusDomainGetVcpus },
{ "GetXMLDesc", virtDBusDomainGetXMLDesc },
+ { "ManagedSave", virtDBusDomainManagedSave },
{ "MemoryStats", virtDBusDomainMemoryStats },
{ "MigrateGetMaxDowntime", virtDBusDomainMigrateGetMaxDowntime },
{ "MigrateSetMaxDowntime", virtDBusDomainMigrateSetMaxDowntime },
diff --git a/test/test_domain.py b/test/test_domain.py
index a7cf962..31348ce 100755
--- a/test/test_domain.py
+++ b/test/test_domain.py
@@ -47,6 +47,21 @@ class TestDomain(libvirttest.BaseTestClass):
autostart_current = domain.Get('org.libvirt.Domain', 'Autostart',
dbus_interface=dbus.PROPERTIES_IFACE)
assert autostart_current == dbus.Boolean(autostart_expected)
+ def test_domain_managed_save(self):
+ def domain_stopped(path, _event):
+ assert isinstance(path, dbus.ObjectPath)
+ self.loop.quit()
+
+ self.connect.connect_to_signal('DomainEvent', domain_stopped,
arg1='Stopped')
+
+ obj, domain = self.domain()
+ domain.ManagedSave(0)
+
+ state = obj.Get('org.libvirt.Domain', 'State',
dbus_interface=dbus.PROPERTIES_IFACE)
+ assert state == 'shutoff'
+
+ self.main_loop()
+
def test_resume(self):
def domain_resumed(path, _event):
assert isinstance(path, dbus.ObjectPath)
--
2.15.0
9:32 a.m.
New subject: [libvirt] [dbus PATCH v2 13/22] Implement HasManagedSaveImage method for Domain Interface
Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com>
---
data/org.libvirt.Domain.xml | 6 ++++++
src/domain.c | 29 +++++++++++++++++++++++++++++
test/test_domain.py | 2 +-
3 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml
index 382b062..57e5ea4 100644
--- a/data/org.libvirt.Domain.xml
+++ b/data/org.libvirt.Domain.xml
@@ -90,6 +90,12 @@
<arg name="flags" type="u" direction="in"/>
<arg name="xml" type="s" direction="out"/>
</method>
+ <method name="HasManagedSaveImage">
+ <annotation name="org.gtk.GDBus.DocString"
+ value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainHasManagedS...
+ <arg name="flags" type="u" direction="in"/>
+ <arg name="managedSaveImage" type="u"
direction="out"/>
+ </method>
<method name="ManagedSave">
<annotation name="org.gtk.GDBus.DocString"
value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainManagedSave...
diff --git a/src/domain.c b/src/domain.c
index 53f8798..26f6bbf 100644
--- a/src/domain.c
+++ b/src/domain.c
@@ -542,6 +542,34 @@ virtDBusDomainGetXMLDesc(GVariant *inArgs,
*outArgs = g_variant_new("(s)", xml);
}
+static void
+virtDBusDomainHasManagedSaveImage(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;
+ gint managedSaveImage;
+ guint flags;
+
+ g_variant_get(inArgs, "(u)", &flags);
+
+ domain = virtDBusDomainGetVirDomain(connect, objectPath, error);
+ if (!domain)
+ return;
+
+ managedSaveImage = virDomainHasManagedSaveImage(domain, flags);
+ if (managedSaveImage < 0)
+ return virtDBusUtilSetLastVirtError(error);
+
+ *outArgs = g_variant_new("(u)", managedSaveImage);
+}
+
static void
virtDBusDomainManagedSave(GVariant *inArgs,
GUnixFDList *inFDs G_GNUC_UNUSED,
@@ -809,6 +837,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = {
{ "GetStats", virtDBusDomainGetStats },
{ "GetVcpus", virtDBusDomainGetVcpus },
{ "GetXMLDesc", virtDBusDomainGetXMLDesc },
+ { "HasManagedSaveImage", virtDBusDomainHasManagedSaveImage },
{ "ManagedSave", virtDBusDomainManagedSave },
{ "MemoryStats", virtDBusDomainMemoryStats },
{ "MigrateGetMaxDowntime", virtDBusDomainMigrateGetMaxDowntime },
diff --git a/test/test_domain.py b/test/test_domain.py
index 31348ce..13f27f7 100755
--- a/test/test_domain.py
+++ b/test/test_domain.py
@@ -56,7 +56,7 @@ class TestDomain(libvirttest.BaseTestClass):
obj, domain = self.domain()
domain.ManagedSave(0)
-
+ assert domain.HasManagedSaveImage(0) == dbus.Boolean(True)
state = obj.Get('org.libvirt.Domain', 'State',
dbus_interface=dbus.PROPERTIES_IFACE)
assert state == 'shutoff'
--
2.15.0
5:06 a.m.
New subject: [libvirt] [dbus PATCH v2 13/22] Implement HasManagedSaveImage method for Domain Interface
On Thu, Apr 12, 2018 at 04:32:52PM +0200, Katerina Koukiou wrote:
Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com>
---
data/org.libvirt.Domain.xml | 6 ++++++
src/domain.c | 29 +++++++++++++++++++++++++++++
test/test_domain.py | 2 +-
3 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml
index 382b062..57e5ea4 100644
--- a/data/org.libvirt.Domain.xml
+++ b/data/org.libvirt.Domain.xml
@@ -90,6 +90,12 @@
<arg name="flags" type="u" direction="in"/>
<arg name="xml" type="s" direction="out"/>
</method>
+ <method name="HasManagedSaveImage">
+ <annotation name="org.gtk.GDBus.DocString"
+ value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainHasManagedS...
+ <arg name="flags" type="u" direction="in"/>
+ <arg name="managedSaveImage" type="u"
direction="out"/>
I would change the type to 'b', the return value is 0 or 1.
Pavel
9:32 a.m.
New subject: [libvirt] [dbus PATCH v2 14/22] Implement ManagedSaveRemove method for Domain Interface
Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com>
---
data/org.libvirt.Domain.xml | 5 +++++
src/domain.c | 24 ++++++++++++++++++++++++
test/test_domain.py | 2 ++
3 files changed, 31 insertions(+)
diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml
index 57e5ea4..087b64e 100644
--- a/data/org.libvirt.Domain.xml
+++ b/data/org.libvirt.Domain.xml
@@ -101,6 +101,11 @@
value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainManagedSave...
<arg name="flags" type="u" direction="in"/>
</method>
+ <method name="ManagedSaveRemove">
+ <annotation name="org.gtk.GDBus.DocString"
+ value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainManagedSave...
+ <arg name="flags" type="u" direction="in"/>
+ </method>
<method name="MemoryStats">
<annotation name="org.gtk.GDBus.DocString"
value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainMemoryStats...
diff --git a/src/domain.c b/src/domain.c
index 26f6bbf..336128e 100644
--- a/src/domain.c
+++ b/src/domain.c
@@ -593,6 +593,29 @@ virtDBusDomainManagedSave(GVariant *inArgs,
virtDBusUtilSetLastVirtError(error);
}
+static void
+virtDBusDomainManagedSaveRemove(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 flags;
+
+ g_variant_get(inArgs, "(u)", &flags);
+
+ domain = virtDBusDomainGetVirDomain(connect, objectPath, error);
+ if (!domain)
+ return;
+
+ if (virDomainManagedSaveRemove(domain, flags) < 0)
+ virtDBusUtilSetLastVirtError(error);
+}
+
static void
virtDBusDomainMemoryStats(GVariant *inArgs,
GUnixFDList *inFDs G_GNUC_UNUSED,
@@ -839,6 +862,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = {
{ "GetXMLDesc", virtDBusDomainGetXMLDesc },
{ "HasManagedSaveImage", virtDBusDomainHasManagedSaveImage },
{ "ManagedSave", virtDBusDomainManagedSave },
+ { "ManagedSaveRemove", virtDBusDomainManagedSaveRemove },
{ "MemoryStats", virtDBusDomainMemoryStats },
{ "MigrateGetMaxDowntime", virtDBusDomainMigrateGetMaxDowntime },
{ "MigrateSetMaxDowntime", virtDBusDomainMigrateSetMaxDowntime },
diff --git a/test/test_domain.py b/test/test_domain.py
index 13f27f7..45a99f9 100755
--- a/test/test_domain.py
+++ b/test/test_domain.py
@@ -59,6 +59,8 @@ class TestDomain(libvirttest.BaseTestClass):
assert domain.HasManagedSaveImage(0) == dbus.Boolean(True)
state = obj.Get('org.libvirt.Domain', 'State',
dbus_interface=dbus.PROPERTIES_IFACE)
assert state == 'shutoff'
+ domain.ManagedSaveRemove(0)
+ assert domain.HasManagedSaveImage(0) == dbus.Boolean(False)
self.main_loop()
--
2.15.0
9:32 a.m.
New subject: [libvirt] [dbus PATCH v2 15/22] Implement SetVcpus method for Domain Interface
Move testing of [Get,Set]Vcpus to seperate test.
Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com>
---
data/org.libvirt.Domain.xml | 6 ++++++
src/domain.c | 26 ++++++++++++++++++++++++++
test/test_domain.py | 9 +++++++--
3 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml
index 087b64e..7f58cbd 100644
--- a/data/org.libvirt.Domain.xml
+++ b/data/org.libvirt.Domain.xml
@@ -139,6 +139,12 @@
<annotation name="org.gtk.GDBus.DocString"
value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainResume"...
</method>
+ <method name="SetVcpus">
+ <annotation name="org.gtk.GDBus.DocString"
+ value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainSetVcpusFla...
+ <arg name="vcpus" type="u" direction="in"/>
+ <arg name="flags" type="u" direction="in"/>
+ </method>
<method name="Shutdown">
<annotation name="org.gtk.GDBus.DocString"
value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainShutdownFla...
diff --git a/src/domain.c b/src/domain.c
index 336128e..1896590 100644
--- a/src/domain.c
+++ b/src/domain.c
@@ -771,6 +771,31 @@ virtDBusDomainResume(GVariant *inArgs G_GNUC_UNUSED,
virtDBusUtilSetLastVirtError(error);
}
+static void
+virtDBusDomainSetVcpus(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 vcpus;
+ guint flags;
+
+ g_variant_get(inArgs, "(uu)", &vcpus, &flags);
+
+ domain = virtDBusDomainGetVirDomain(connect, objectPath, error);
+ if (!domain)
+ return;
+
+ if (virDomainSetVcpusFlags(domain, vcpus, flags) < 0)
+ return virtDBusUtilSetLastVirtError(error);
+}
+
static void
virtDBusDomainShutdown(GVariant *inArgs,
GUnixFDList *inFDs G_GNUC_UNUSED,
@@ -869,6 +894,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = {
{ "Reboot", virtDBusDomainReboot },
{ "Reset", virtDBusDomainReset },
{ "Resume", virtDBusDomainResume },
+ { "SetVcpus", virtDBusDomainSetVcpus },
{ "Shutdown", virtDBusDomainShutdown },
{ "Suspend", virtDBusDomainSuspend },
{ "Undefine", virtDBusDomainUndefine },
diff --git a/test/test_domain.py b/test/test_domain.py
index 45a99f9..31e09bf 100755
--- a/test/test_domain.py
+++ b/test/test_domain.py
@@ -27,8 +27,6 @@ class TestDomain(libvirttest.BaseTestClass):
xml = domain.GetXMLDesc(0)
assert isinstance(xml, dbus.String)
- vcpus = domain.GetVcpus(0)
- assert isinstance(vcpus, dbus.UInt32)
domain.Reboot(0)
domain.Shutdown(0)
@@ -123,5 +121,12 @@ class TestDomain(libvirttest.BaseTestClass):
self.main_loop()
+ def test_domain_vcpus(self):
+ obj, domain = self.domain()
+ vcpus_expected = 2
+ domain.SetVcpus(vcpus_expected, 0)
+ assert domain.GetVcpus(0) == dbus.Int32(vcpus_expected)
+
+
if __name__ == '__main__':
libvirttest.run()
--
2.15.0
5:12 a.m.
New subject: [libvirt] [dbus PATCH v2 15/22] Implement SetVcpus method for Domain Interface
On Thu, Apr 12, 2018 at 04:32:54PM +0200, Katerina Koukiou wrote:
Move testing of [Get,Set]Vcpus to seperate test.
Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com>
---
data/org.libvirt.Domain.xml | 6 ++++++
src/domain.c | 26 ++++++++++++++++++++++++++
test/test_domain.py | 9 +++++++--
3 files changed, 39 insertions(+), 2 deletions(-)
[...]
+static void
+virtDBusDomainSetVcpus(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 vcpus;
+ guint flags;
+
+ g_variant_get(inArgs, "(uu)", &vcpus, &flags);
+
+ domain = virtDBusDomainGetVirDomain(connect, objectPath, error);
+ if (!domain)
+ return;
+
+ if (virDomainSetVcpusFlags(domain, vcpus, flags) < 0)
+ return virtDBusUtilSetLastVirtError(error);
No need to use 'return'.
Pavel
9:32 a.m.
New subject: [libvirt] [dbus PATCH v2 16/22] Implement GetMemoryParameters method for Domain Interface
Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com>
---
data/org.libvirt.Domain.xml | 6 ++++++
src/domain.c | 37 +++++++++++++++++++++++++++++++++++++
2 files changed, 43 insertions(+)
diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml
index 7f58cbd..db9a93e 100644
--- a/data/org.libvirt.Domain.xml
+++ b/data/org.libvirt.Domain.xml
@@ -71,6 +71,12 @@
value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetJobInfo&...
<arg name="jobInfo" type="(sttttttttttt)"
direction="out"/>
</method>
+ <method name="GetMemoryParameters">
+ <annotation name="org.gtk.GDBus.DocString"
+ value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetMemoryPa...
+ <arg name="flags" type="u" direction="in"/>
+ <arg name="memoryParameters" type="a{sv}"
direction="out"/>
+ </method>
<method name="GetStats">
<annotation name="org.gtk.GDBus.DocString"
value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainListGetStat...
diff --git a/src/domain.c b/src/domain.c
index 1896590..1f907e0 100644
--- a/src/domain.c
+++ b/src/domain.c
@@ -450,6 +450,42 @@ virtDBusDomainGetJobInfo(GVariant *inArgs G_GNUC_UNUSED,
jobInfo->fileRemaining);
}
+static void
+virtDBusDomainGetMemoryParameters(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 virTypedParameterPtr params = NULL;
+ gint nparams = 0;
+ guint flags;
+ GVariant *grecords;
+
+ g_variant_get(inArgs, "(u)", &flags);
+
+ domain = virtDBusDomainGetVirDomain(connect, objectPath, error);
+ if (!domain)
+ return;
+
+ if (virDomainGetMemoryParameters(domain, NULL, &nparams, flags) == 0 &&
+ nparams != 0) {
+ if ((params = g_new0(virTypedParameter, nparams)) == NULL)
+ return;
+ if (virDomainGetMemoryParameters(domain, params, &nparams, flags))
+ return virtDBusUtilSetLastVirtError(error);
+ }
+
+ grecords = virtDBusUtilTypedParamsToGVariant(params,
+ nparams);
+
+ *outArgs = g_variant_new_tuple(&grecords, 1);
+}
+
G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainStatsRecordPtr, virDomainStatsRecordListFree);
static void
@@ -882,6 +918,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = {
{ "Destroy", virtDBusDomainDestroy },
{ "DetachDevice", virtDBusDomainDetachDevice },
{ "GetJobInfo", virtDBusDomainGetJobInfo },
+ { "GetMemoryParameters", virtDBusDomainGetMemoryParameters },
{ "GetStats", virtDBusDomainGetStats },
{ "GetVcpus", virtDBusDomainGetVcpus },
{ "GetXMLDesc", virtDBusDomainGetXMLDesc },
--
2.15.0
5:41 a.m.
New subject: [libvirt] [dbus PATCH v2 16/22] Implement GetMemoryParameters method for Domain Interface
On Thu, Apr 12, 2018 at 04:32:55PM +0200, Katerina Koukiou wrote:
Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com>
---
data/org.libvirt.Domain.xml | 6 ++++++
src/domain.c | 37 +++++++++++++++++++++++++++++++++++++
2 files changed, 43 insertions(+)
diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml
index 7f58cbd..db9a93e 100644
--- a/data/org.libvirt.Domain.xml
+++ b/data/org.libvirt.Domain.xml
@@ -71,6 +71,12 @@
value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetJobInfo&...
<arg name="jobInfo" type="(sttttttttttt)"
direction="out"/>
</method>
+ <method name="GetMemoryParameters">
+ <annotation name="org.gtk.GDBus.DocString"
+ value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetMemoryPa...
+ <arg name="flags" type="u" direction="in"/>
+ <arg name="memoryParameters" type="a{sv}"
direction="out"/>
+ </method>
<method name="GetStats">
<annotation name="org.gtk.GDBus.DocString"
value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainListGetStat...
diff --git a/src/domain.c b/src/domain.c
index 1896590..1f907e0 100644
--- a/src/domain.c
+++ b/src/domain.c
@@ -450,6 +450,42 @@ virtDBusDomainGetJobInfo(GVariant *inArgs G_GNUC_UNUSED,
jobInfo->fileRemaining);
}
+static void
+virtDBusDomainGetMemoryParameters(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 virTypedParameterPtr params = NULL;
+ gint nparams = 0;
+ guint flags;
+ GVariant *grecords;
+
+ g_variant_get(inArgs, "(u)", &flags);
+
+ domain = virtDBusDomainGetVirDomain(connect, objectPath, error);
+ if (!domain)
+ return;
+
+ if (virDomainGetMemoryParameters(domain, NULL, &nparams, flags) == 0 &&
+ nparams != 0) {
Using temporary 'ret' variable for virDomainGetMemoryParameters will
make the code nicer:
ret = virDomainGetMemoryParameters(domain, NULL, &nparams, flags);
if (ret == 0 && nparams != 0) {
...
}
+ if ((params = g_new0(virTypedParameter, nparams)) == NULL)
+ return;
There is no need to check 'params == NULL', g_new0 aborts a program if
the allocation fails.
+ if (virDomainGetMemoryParameters(domain, params,
&nparams, flags))
Explicit check for return value ' < 0' is preferred.
+ return virtDBusUtilSetLastVirtError(error);
+ }
+
+ grecords = virtDBusUtilTypedParamsToGVariant(params,
+ nparams);
This can be on a single line.
Pavel
9:32 a.m.
New subject: [libvirt] [dbus PATCH v2 17/22] Implement GetBlkioParameters method for domain Interface
Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com>
---
data/org.libvirt.Domain.xml | 6 ++++++
src/domain.c | 37 +++++++++++++++++++++++++++++++++++++
2 files changed, 43 insertions(+)
diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml
index db9a93e..576f415 100644
--- a/data/org.libvirt.Domain.xml
+++ b/data/org.libvirt.Domain.xml
@@ -66,6 +66,12 @@
<arg name="xml" type="s" direction="in"/>
<arg name="flags" type="u" direction="in"/>
</method>
+ <method name="GetBlkioParameters">
+ <annotation name="org.gtk.GDBus.DocString"
+ value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetBlkioPar...
+ <arg name="flags" type="u" direction="in"/>
+ <arg name="BlkioParameters" type="a{sv}"
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 1f907e0..0ae093a 100644
--- a/src/domain.c
+++ b/src/domain.c
@@ -416,6 +416,42 @@ virtDBusDomainDetachDevice(GVariant *inArgs,
return virtDBusUtilSetLastVirtError(error);
}
+static void
+virtDBusDomainGetBlkioParameters(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 virTypedParameterPtr params = NULL;
+ gint nparams = 0;
+ guint flags;
+ GVariant *grecords;
+
+ g_variant_get(inArgs, "(u)", &flags);
+
+ domain = virtDBusDomainGetVirDomain(connect, objectPath, error);
+ if (!domain)
+ return;
+
+ if (virDomainGetBlkioParameters(domain, NULL, &nparams, flags) == 0 &&
+ nparams != 0) {
+ if ((params = g_new0(virTypedParameter, nparams)) == NULL)
+ return;
+ if (virDomainGetBlkioParameters(domain, params, &nparams, flags))
+ return virtDBusUtilSetLastVirtError(error);
+ }
+
+ grecords = virtDBusUtilTypedParamsToGVariant(params,
+ nparams);
+
+ *outArgs = g_variant_new_tuple(&grecords, 1);
+}
+
static void
virtDBusDomainGetJobInfo(GVariant *inArgs G_GNUC_UNUSED,
GUnixFDList *inFDs G_GNUC_UNUSED,
@@ -917,6 +953,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = {
{ "Create", virtDBusDomainCreate },
{ "Destroy", virtDBusDomainDestroy },
{ "DetachDevice", virtDBusDomainDetachDevice },
+ { "GetBlkioParameters", virtDBusDomainGetBlkioParameters },
{ "GetJobInfo", virtDBusDomainGetJobInfo },
{ "GetMemoryParameters", virtDBusDomainGetMemoryParameters },
{ "GetStats", virtDBusDomainGetStats },
--
2.15.0
6 a.m.
New subject: [libvirt] [dbus PATCH v2 17/22] Implement GetBlkioParameters method for domain Interface
On Thu, Apr 12, 2018 at 04:32:56PM +0200, Katerina Koukiou wrote:
Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com>
---
data/org.libvirt.Domain.xml | 6 ++++++
src/domain.c | 37 +++++++++++++++++++++++++++++++++++++
2 files changed, 43 insertions(+)
[...]
+static void
+virtDBusDomainGetBlkioParameters(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 virTypedParameterPtr params = NULL;
+ gint nparams = 0;
+ guint flags;
+ GVariant *grecords;
+
+ g_variant_get(inArgs, "(u)", &flags);
+
+ domain = virtDBusDomainGetVirDomain(connect, objectPath, error);
+ if (!domain)
+ return;
+
+ if (virDomainGetBlkioParameters(domain, NULL, &nparams, flags) == 0 &&
+ nparams != 0) {
+ if ((params = g_new0(virTypedParameter, nparams)) == NULL)
+ return;
+ if (virDomainGetBlkioParameters(domain, params, &nparams, flags))
+ return virtDBusUtilSetLastVirtError(error);
+ }
+
+ grecords = virtDBusUtilTypedParamsToGVariant(params,
+ nparams);
Same comments as for the previous patch.
Pavel
9:32 a.m.
New subject: [libvirt] [dbus PATCH v2 18/22] Implement Updated property for Domain Interface
Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com>
---
data/org.libvirt.Domain.xml | 4 ++++
src/domain.c | 22 ++++++++++++++++++++++
test/test_domain.py | 1 +
3 files changed, 27 insertions(+)
diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml
index 576f415..4b0d02f 100644
--- a/data/org.libvirt.Domain.xml
+++ b/data/org.libvirt.Domain.xml
@@ -36,6 +36,10 @@
<annotation name="org.gtk.GDBus.DocString"
value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetState&qu...
</property>
+ <property name="Updated" type="b" access="read">
+ <annotation name="org.gtk.GDBus.DocString"
+ value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainIsUpdated&q...
+ </property>
<property name="UUID" type="s" access="read">
<annotation name="org.gtk.GDBus.DocString"
value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetUUIDStri...
diff --git a/src/domain.c b/src/domain.c
index 0ae093a..4e93c2e 100644
--- a/src/domain.c
+++ b/src/domain.c
@@ -262,6 +262,27 @@ virtDBusDomainGetState(const gchar *objectPath,
*value = g_variant_new("s", string);
}
+static void
+virtDBusDomainGetUpdated(const gchar *objectPath,
+ gpointer userData,
+ GVariant **value,
+ GError **error)
+{
+ virtDBusConnect *connect = userData;
+ g_autoptr(virDomain) domain = NULL;
+ gint updated;
+
+ domain = virtDBusDomainGetVirDomain(connect, objectPath, error);
+ if (!domain)
+ return;
+
+ updated = virDomainIsUpdated(domain);
+ if (updated < 0)
+ return virtDBusUtilSetLastVirtError(error);
+
+ *value = g_variant_new("b", !!updated);
+}
+
static void
virtDBusDomainGetUUID(const gchar *objectPath,
gpointer userData,
@@ -943,6 +964,7 @@ static virtDBusGDBusPropertyTable virtDBusDomainPropertyTable[] = {
{ "Persistent", virtDBusDomainGetPersistent, NULL },
{ "SchedulerType", virtDBusDomainGetSchedulerType, NULL},
{ "State", virtDBusDomainGetState, NULL },
+ { "Updated", virtDBusDomainGetUpdated, NULL },
{ "UUID", virtDBusDomainGetUUID, NULL },
{ 0 }
};
diff --git a/test/test_domain.py b/test/test_domain.py
index 31e09bf..f2ae215 100755
--- a/test/test_domain.py
+++ b/test/test_domain.py
@@ -20,6 +20,7 @@ class TestDomain(libvirttest.BaseTestClass):
isinstance(props['SchedulerType'][0], dbus.String),
isinstance(props['SchedulerType'][1], dbus.Int32)])
assert isinstance(props['State'], dbus.String)
+ assert isinstance(props['Updated'], dbus.Boolean)
assert isinstance(props['UUID'], dbus.String)
# Call all methods except Reset and GetStats, because the test backend
--
2.15.0
9:32 a.m.
New subject: [libvirt] [dbus PATCH v2 19/22] Implement MigrateGetMaxSpeed method for Domain Interface
Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com>
---
data/org.libvirt.Domain.xml | 6 ++++++
src/domain.c | 28 ++++++++++++++++++++++++++++
2 files changed, 34 insertions(+)
diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml
index 4b0d02f..1ce1918 100644
--- a/data/org.libvirt.Domain.xml
+++ b/data/org.libvirt.Domain.xml
@@ -135,6 +135,12 @@
<arg name="flags" type="u" direction="in"/>
<arg name="downtime" type="t"
direction="out"/>
</method>
+ <method name="MigrateGetMaxSpeed">
+ <annotation name="org.gtk.GDBus.DocString"
+ value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainMigrateGetM...
+ <arg name="flags" type="u" direction="in"/>
+ <arg name="bandwidth" type="t"
direction="out"/>
+ </method>
<method name="MigrateSetMaxDowntime">
<annotation name="org.gtk.GDBus.DocString"
value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainMigrateSetM...
diff --git a/src/domain.c b/src/domain.c
index 4e93c2e..2383870 100644
--- a/src/domain.c
+++ b/src/domain.c
@@ -772,6 +772,33 @@ virtDBusDomainMigrateGetMaxDowntime(GVariant *inArgs,
*outArgs = g_variant_new("(t)", downtime);
}
+static void
+virtDBusDomainMigrateGetMaxSpeed(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;
+ guint64 bandwidth;
+ guint flags;
+
+ g_variant_get(inArgs, "(u)", &flags);
+
+ domain = virtDBusDomainGetVirDomain(connect, objectPath, error);
+ if (!domain)
+ return;
+
+ if (virDomainMigrateGetMaxSpeed(domain, &bandwidth, flags) < 0)
+ return virtDBusUtilSetLastVirtError(error);
+
+ *outArgs = g_variant_new("(t)", bandwidth);
+}
+
static void
virtDBusDomainMigrateSetMaxDowntime(GVariant *inArgs,
GUnixFDList *inFDs G_GNUC_UNUSED,
@@ -986,6 +1013,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = {
{ "ManagedSaveRemove", virtDBusDomainManagedSaveRemove },
{ "MemoryStats", virtDBusDomainMemoryStats },
{ "MigrateGetMaxDowntime", virtDBusDomainMigrateGetMaxDowntime },
+ { "MigrateGetMaxSpeed", virtDBusDomainMigrateGetMaxSpeed },
{ "MigrateSetMaxDowntime", virtDBusDomainMigrateSetMaxDowntime },
{ "Reboot", virtDBusDomainReboot },
{ "Reset", virtDBusDomainReset },
--
2.15.0
6:11 a.m.
New subject: [libvirt] [dbus PATCH v2 19/22] Implement MigrateGetMaxSpeed method for Domain Interface
On Thu, Apr 12, 2018 at 04:32:58PM +0200, Katerina Koukiou wrote:
Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com>
---
data/org.libvirt.Domain.xml | 6 ++++++
src/domain.c | 28 ++++++++++++++++++++++++++++
2 files changed, 34 insertions(+)
[...]
+static void
+virtDBusDomainMigrateGetMaxSpeed(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;
+ guint64 bandwidth;
gulong
Pavel
9:32 a.m.
New subject: [libvirt] [dbus PATCH v2 20/22] Implement MigrateSetMaxSpeed method for Domain Interface
Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com>
---
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 1ce1918..5d4323b 100644
--- a/data/org.libvirt.Domain.xml
+++ b/data/org.libvirt.Domain.xml
@@ -147,6 +147,12 @@
<arg name="downtime" type="t" direction="in"/>
<arg name="flags" type="u" direction="in"/>
</method>
+ <method name="MigrateSetMaxSpeed">
+ <annotation name="org.gtk.GDBus.DocString"
+ value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainMigrateSetM...
+ <arg name="bandwidth" type="t"
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 2383870..85395aa 100644
--- a/src/domain.c
+++ b/src/domain.c
@@ -823,6 +823,30 @@ virtDBusDomainMigrateSetMaxDowntime(GVariant *inArgs,
return virtDBusUtilSetLastVirtError(error);
}
+static void
+virtDBusDomainMigrateSetMaxSpeed(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;
+ guint64 bandwidth;
+ guint flags;
+
+ g_variant_get(inArgs, "(tu)", &bandwidth, &flags);
+
+ domain = virtDBusDomainGetVirDomain(connect, objectPath, error);
+ if (!domain)
+ return;
+
+ if (virDomainMigrateSetMaxSpeed(domain, bandwidth, flags) < 0)
+ return virtDBusUtilSetLastVirtError(error);
+}
+
static void
virtDBusDomainReboot(GVariant *inArgs,
GUnixFDList *inFDs G_GNUC_UNUSED,
@@ -1015,6 +1039,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = {
{ "MigrateGetMaxDowntime", virtDBusDomainMigrateGetMaxDowntime },
{ "MigrateGetMaxSpeed", virtDBusDomainMigrateGetMaxSpeed },
{ "MigrateSetMaxDowntime", virtDBusDomainMigrateSetMaxDowntime },
+ { "MigrateSetMaxSpeed", virtDBusDomainMigrateSetMaxSpeed },
{ "Reboot", virtDBusDomainReboot },
{ "Reset", virtDBusDomainReset },
{ "Resume", virtDBusDomainResume },
--
2.15.0
6:12 a.m.
New subject: [libvirt] [dbus PATCH v2 20/22] Implement MigrateSetMaxSpeed method for Domain Interface
On Thu, Apr 12, 2018 at 04:32:59PM +0200, Katerina Koukiou wrote:
Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com>
---
data/org.libvirt.Domain.xml | 6 ++++++
src/domain.c | 25 +++++++++++++++++++++++++
2 files changed, 31 insertions(+)
[...]
+static void
+virtDBusDomainMigrateSetMaxSpeed(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;
+ guint64 bandwidth;
gulong
+ guint flags;
+
+ g_variant_get(inArgs, "(tu)", &bandwidth, &flags);
+
+ domain = virtDBusDomainGetVirDomain(connect, objectPath, error);
+ if (!domain)
+ return;
+
+ if (virDomainMigrateSetMaxSpeed(domain, bandwidth, flags) < 0)
+ return virtDBusUtilSetLastVirtError(error);
No need to use 'return'.
Pavel
9:33 a.m.
New subject: [libvirt] [dbus PATCH v2 21/22] Implement SetMemory method for Domain Interface
Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com>
---
data/org.libvirt.Domain.xml | 6 ++++++
src/domain.c | 26 ++++++++++++++++++++++++++
2 files changed, 32 insertions(+)
diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml
index 5d4323b..0937cbb 100644
--- a/data/org.libvirt.Domain.xml
+++ b/data/org.libvirt.Domain.xml
@@ -167,6 +167,12 @@
<annotation name="org.gtk.GDBus.DocString"
value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainResume"...
</method>
+ <method name="SetMemory">
+ <annotation name="org.gtk.GDBus.DocString"
+ value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainSetMemoryFl...
+ <arg name="memory" type="t" direction="in"/>
+ <arg name="flags" type="u" direction="in"/>
+ </method>
<method name="SetVcpus">
<annotation name="org.gtk.GDBus.DocString"
value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainSetVcpusFla...
diff --git a/src/domain.c b/src/domain.c
index 85395aa..a8d3e6c 100644
--- a/src/domain.c
+++ b/src/domain.c
@@ -915,6 +915,31 @@ virtDBusDomainResume(GVariant *inArgs G_GNUC_UNUSED,
virtDBusUtilSetLastVirtError(error);
}
+static void
+virtDBusDomainSetMemory(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;
+ gulong memory;
+ guint flags;
+
+ g_variant_get(inArgs, "(tu)", &memory, &flags);
+
+ domain = virtDBusDomainGetVirDomain(connect, objectPath, error);
+ if (!domain)
+ return;
+
+ if (virDomainSetMemoryFlags(domain, memory, flags) < 0)
+ return virtDBusUtilSetLastVirtError(error);
+}
+
static void
virtDBusDomainSetVcpus(GVariant *inArgs,
GUnixFDList *inFDs G_GNUC_UNUSED,
@@ -1044,6 +1069,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = {
{ "Reset", virtDBusDomainReset },
{ "Resume", virtDBusDomainResume },
{ "SetVcpus", virtDBusDomainSetVcpus },
+ { "SetMemory", virtDBusDomainSetMemory },
{ "Shutdown", virtDBusDomainShutdown },
{ "Suspend", virtDBusDomainSuspend },
{ "Undefine", virtDBusDomainUndefine },
--
2.15.0
6:14 a.m.
New subject: [libvirt] [dbus PATCH v2 21/22] Implement SetMemory method for Domain Interface
On Thu, Apr 12, 2018 at 04:33:00PM +0200, Katerina Koukiou wrote:
Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com>
---
data/org.libvirt.Domain.xml | 6 ++++++
src/domain.c | 26 ++++++++++++++++++++++++++
2 files changed, 32 insertions(+)
[...]
+static void
+virtDBusDomainSetMemory(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;
+ gulong memory;
+ guint flags;
+
+ g_variant_get(inArgs, "(tu)", &memory, &flags);
+
+ domain = virtDBusDomainGetVirDomain(connect, objectPath, error);
+ if (!domain)
+ return;
+
+ if (virDomainSetMemoryFlags(domain, memory, flags) < 0)
+ return virtDBusUtilSetLastVirtError(error);
No need to use 'return'.
Pavel
9:33 a.m.
New subject: [libvirt] [dbus PATCH v2 22/22] Implement GetSchedulerParameters method for Domain Interface
Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com>
---
data/org.libvirt.Domain.xml | 6 ++++++
src/domain.c | 38 ++++++++++++++++++++++++++++++++++++++
2 files changed, 44 insertions(+)
diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml
index 0937cbb..5763a8a 100644
--- a/data/org.libvirt.Domain.xml
+++ b/data/org.libvirt.Domain.xml
@@ -87,6 +87,12 @@
<arg name="flags" type="u" direction="in"/>
<arg name="memoryParameters" type="a{sv}"
direction="out"/>
</method>
+ <method name="GetSchedulerParameters">
+ <annotation name="org.gtk.GDBus.DocString"
+ value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetSchedule...
+ <arg name="flags" type="u" direction="in"/>
+ <arg name="SchedulerParameters" type="a{sv}"
direction="out"/>
+ </method>
<method name="GetStats">
<annotation name="org.gtk.GDBus.DocString"
value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainListGetStat...
diff --git a/src/domain.c b/src/domain.c
index a8d3e6c..0eda7cf 100644
--- a/src/domain.c
+++ b/src/domain.c
@@ -543,6 +543,43 @@ virtDBusDomainGetMemoryParameters(GVariant *inArgs,
*outArgs = g_variant_new_tuple(&grecords, 1);
}
+static void
+virtDBusDomainGetSchedulerParameters(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 virTypedParameterPtr params = NULL;
+ gint nparams;
+ guint flags;
+ GVariant *grecords;
+ g_autofree gchar *ret = NULL;
+
+ g_variant_get(inArgs, "(u)", &flags);
+
+ domain = virtDBusDomainGetVirDomain(connect, objectPath, error);
+ if (!domain)
+ return;
+
+ ret = virDomainGetSchedulerType(domain, &nparams);
+ if (ret && nparams != 0) {
+ if ((params = g_new0(virTypedParameter, nparams)) == NULL)
+ return;
+ if (virDomainGetSchedulerParametersFlags(domain, params, &nparams, 0))
+ return virtDBusUtilSetLastVirtError(error);
+ }
+
+ grecords = virtDBusUtilTypedParamsToGVariant(params,
+ nparams);
+
+ *outArgs = g_variant_new_tuple(&grecords, 1);
+}
+
G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainStatsRecordPtr, virDomainStatsRecordListFree);
static void
@@ -1054,6 +1091,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = {
{ "GetBlkioParameters", virtDBusDomainGetBlkioParameters },
{ "GetJobInfo", virtDBusDomainGetJobInfo },
{ "GetMemoryParameters", virtDBusDomainGetMemoryParameters },
+ { "GetSchedulerParameters", virtDBusDomainGetSchedulerParameters },
{ "GetStats", virtDBusDomainGetStats },
{ "GetVcpus", virtDBusDomainGetVcpus },
{ "GetXMLDesc", virtDBusDomainGetXMLDesc },
--
2.15.0
2415
days inactive
2416
days old
40 comments
2 participants
participants (2)
-
Katerina Koukiou -
Pavel Hrdina