From nobody Wed May  1 15:58:04 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1523526184917340.95504431300674;
 Thu, 12 Apr 2018 02:43:04 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com
 [10.5.11.15])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id E6AD130B96E0;
	Thu, 12 Apr 2018 09:43:02 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 397665D6A6;
	Thu, 12 Apr 2018 09:43:01 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 771661800CAB;
	Thu, 12 Apr 2018 09:42:59 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com
	[10.11.54.6])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id w3C9gwdh002639 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 12 Apr 2018 05:42:58 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 314722166BAD; Thu, 12 Apr 2018 09:42:58 +0000 (UTC)
Received: from katerina.brq.redhat.com (unknown [10.43.2.14])
	by smtp.corp.redhat.com (Postfix) with ESMTP id AE91D215CDC6
	for <libvir-list@redhat.com>; Thu, 12 Apr 2018 09:42:57 +0000 (UTC)
From: Katerina Koukiou <kkoukiou@redhat.com>
To: libvir-list@redhat.com
Date: Thu, 12 Apr 2018 11:42:49 +0200
Message-Id: <20180412094255.25388-2-kkoukiou@redhat.com>
In-Reply-To: <20180412094255.25388-1-kkoukiou@redhat.com>
References: <20180412094255.25388-1-kkoukiou@redhat.com>
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6
X-loop: libvir-list@redhat.com
Subject: [libvirt] [dbus PATCH] APIs should appear in aplhabetical order in
	all files.
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]);
 Thu, 12 Apr 2018 09:43:03 +0000 (UTC)
X-ZohoMail: RSF_0  Z_629925259 SPT_0
Content-Type: text/plain; charset="utf-8"

In C and XML files the order is:
1) properties
2) methods
3) signals
All of them sorted in their category alphabetically.

Signed-off-by: Katerina Koukiou <kkoukiou@redhat.com>
---
 data/org.libvirt.Connect.xml |  12 +--
 data/org.libvirt.Domain.xml  |  54 ++++++------
 src/connect.c                |   2 +-
 src/domain.c                 | 200 +++++++++++++++++++++------------------=
----
 4 files changed, 134 insertions(+), 134 deletions(-)

diff --git a/data/org.libvirt.Connect.xml b/data/org.libvirt.Connect.xml
index 5b49ed9..55260cc 100644
--- a/data/org.libvirt.Connect.xml
+++ b/data/org.libvirt.Connect.xml
@@ -25,12 +25,6 @@
       <annotation name=3D"org.gtk.GDBus.DocString"
         value=3D"See https://libvirt.org/html/libvirt-libvirt-host.html#vi=
rConnectGetVersion"/>
     </property>
-    <method name=3D"ListDomains">
-      <annotation name=3D"org.gtk.GDBus.DocString"
-        value=3D"See https://libvirt.org/html/libvirt-libvirt-domain.html#=
virConnectListAllDomains"/>
-      <arg name=3D"flags" type=3D"u" direction=3D"in"/>
-      <arg name=3D"domains" type=3D"ao" direction=3D"out"/>
-    </method>
     <method name=3D"DomainCreateXML">
       <annotation name=3D"org.gtk.GDBus.DocString"
         value=3D"See https://libvirt.org/html/libvirt-libvirt-domain.html#=
virDomainCreateXML"/>
@@ -73,6 +67,12 @@
       <arg name=3D"flags" type=3D"u" direction=3D"in"/>
       <arg name=3D"sysinfo" type=3D"s" direction=3D"out"/>
     </method>
+    <method name=3D"ListDomains">
+      <annotation name=3D"org.gtk.GDBus.DocString"
+        value=3D"See https://libvirt.org/html/libvirt-libvirt-domain.html#=
virConnectListAllDomains"/>
+      <arg name=3D"flags" type=3D"u" direction=3D"in"/>
+      <arg name=3D"domains" type=3D"ao" direction=3D"out"/>
+    </method>
     <method name=3D"ListNetworks">
       <annotation name=3D"org.gtk.GDBus.DocString"
         value=3D"See https://libvirt.org/html/libvirt-libvirt-network.html=
#virConnectListAllNetworks"/>
diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml
index 7679018..78378bb 100644
--- a/data/org.libvirt.Domain.xml
+++ b/data/org.libvirt.Domain.xml
@@ -3,25 +3,25 @@
=20
 <node name=3D"/org/libvirt/domain">
   <interface name=3D"org.libvirt.Domain">
-    <property name=3D"Name" type=3D"s" access=3D"read">
+    <property name=3D"Active" type=3D"b" access=3D"read">
       <annotation name=3D"org.gtk.GDBus.DocString"
-        value=3D"See https://libvirt.org/html/libvirt-libvirt-domain.html#=
virDomainGetName"/>
+        value=3D"See https://libvirt.org/html/libvirt-libvirt-domain.html#=
virDomainIsActive"/>
     </property>
-    <property name=3D"UUID" type=3D"s" access=3D"read">
+    <property name=3D"Autostart" type=3D"b" access=3D"read">
       <annotation name=3D"org.gtk.GDBus.DocString"
-        value=3D"See https://libvirt.org/html/libvirt-libvirt-domain.html#=
virDomainGetUUIDString"/>
+        value=3D"See https://libvirt.org/html/libvirt-libvirt-domain.html#=
virDomainGetAutostart"/>
     </property>
     <property name=3D"Id" type=3D"u" access=3D"read">
       <annotation name=3D"org.gtk.GDBus.DocString"
         value=3D"See https://libvirt.org/html/libvirt-libvirt-domain.html#=
virDomainGetID"/>
     </property>
-    <property name=3D"OSType" type=3D"s" access=3D"read">
+    <property name=3D"Name" type=3D"s" access=3D"read">
       <annotation name=3D"org.gtk.GDBus.DocString"
-        value=3D"See https://libvirt.org/html/libvirt-libvirt-domain.html#=
virDomainGetOSType"/>
+        value=3D"See https://libvirt.org/html/libvirt-libvirt-domain.html#=
virDomainGetName"/>
     </property>
-    <property name=3D"Active" type=3D"b" access=3D"read">
+    <property name=3D"OSType" type=3D"s" access=3D"read">
       <annotation name=3D"org.gtk.GDBus.DocString"
-        value=3D"See https://libvirt.org/html/libvirt-libvirt-domain.html#=
virDomainIsActive"/>
+        value=3D"See https://libvirt.org/html/libvirt-libvirt-domain.html#=
virDomainGetOSType"/>
     </property>
     <property name=3D"Persistent" type=3D"b" access=3D"read">
       <annotation name=3D"org.gtk.GDBus.DocString"
@@ -31,21 +31,19 @@
       <annotation name=3D"org.gtk.GDBus.DocString"
         value=3D"See https://libvirt.org/html/libvirt-libvirt-domain.html#=
virDomainGetState"/>
     </property>
-    <property name=3D"Autostart" type=3D"b" access=3D"read">
+    <property name=3D"UUID" type=3D"s" access=3D"read">
       <annotation name=3D"org.gtk.GDBus.DocString"
-        value=3D"See https://libvirt.org/html/libvirt-libvirt-domain.html#=
virDomainGetAutostart"/>
+        value=3D"See https://libvirt.org/html/libvirt-libvirt-domain.html#=
virDomainGetUUIDString"/>
     </property>
-    <method name=3D"GetVcpus">
+    <method name=3D"Create">
       <annotation name=3D"org.gtk.GDBus.DocString"
-        value=3D"See https://libvirt.org/html/libvirt-libvirt-domain.html#=
virDomainGetVcpusFlags"/>
+        value=3D"See https://libvirt.org/html/libvirt-libvirt-domain.html#=
virDomainCreateWithFlags"/>
       <arg name=3D"flags" type=3D"u" direction=3D"in"/>
-      <arg name=3D"vcpus" type=3D"u" direction=3D"out"/>
     </method>
-    <method name=3D"GetXMLDesc">
+    <method name=3D"Destroy">
       <annotation name=3D"org.gtk.GDBus.DocString"
-        value=3D"See https://libvirt.org/html/libvirt-libvirt-domain.html#=
virDomainGetXMLDesc"/>
+        value=3D"See https://libvirt.org/html/libvirt-libvirt-domain.html#=
virDomainDestroyFlags"/>
       <arg name=3D"flags" type=3D"u" direction=3D"in"/>
-      <arg name=3D"xml" type=3D"s" direction=3D"out"/>
     </method>
     <method name=3D"GetStats">
       <annotation name=3D"org.gtk.GDBus.DocString"
@@ -54,15 +52,17 @@
       <arg name=3D"flags" type=3D"u" direction=3D"in"/>
       <arg name=3D"records" type=3D"a{sv}" direction=3D"out"/>
     </method>
-    <method name=3D"Shutdown">
+    <method name=3D"GetVcpus">
       <annotation name=3D"org.gtk.GDBus.DocString"
-        value=3D"See https://libvirt.org/html/libvirt-libvirt-domain.html#=
virDomainShutdownFlags"/>
+        value=3D"See https://libvirt.org/html/libvirt-libvirt-domain.html#=
virDomainGetVcpusFlags"/>
       <arg name=3D"flags" type=3D"u" direction=3D"in"/>
+      <arg name=3D"vcpus" type=3D"u" direction=3D"out"/>
     </method>
-    <method name=3D"Destroy">
+    <method name=3D"GetXMLDesc">
       <annotation name=3D"org.gtk.GDBus.DocString"
-        value=3D"See https://libvirt.org/html/libvirt-libvirt-domain.html#=
virDomainDestroyFlags"/>
+        value=3D"See https://libvirt.org/html/libvirt-libvirt-domain.html#=
virDomainGetXMLDesc"/>
       <arg name=3D"flags" type=3D"u" direction=3D"in"/>
+      <arg name=3D"xml" type=3D"s" direction=3D"out"/>
     </method>
     <method name=3D"Reboot">
       <annotation name=3D"org.gtk.GDBus.DocString"
@@ -74,23 +74,23 @@
         value=3D"See https://libvirt.org/html/libvirt-libvirt-domain.html#=
virDomainReset"/>
       <arg name=3D"flags" type=3D"u" direction=3D"in"/>
     </method>
-    <method name=3D"Create">
+    <method name=3D"Resume">
       <annotation name=3D"org.gtk.GDBus.DocString"
-        value=3D"See https://libvirt.org/html/libvirt-libvirt-domain.html#=
virDomainCreateWithFlags"/>
-      <arg name=3D"flags" type=3D"u" direction=3D"in"/>
+        value=3D"See https://libvirt.org/html/libvirt-libvirt-domain.html#=
virDomainResume"/>
     </method>
-    <method name=3D"Undefine">
+    <method name=3D"Shutdown">
       <annotation name=3D"org.gtk.GDBus.DocString"
-        value=3D"See https://libvirt.org/html/libvirt-libvirt-domain.html#=
virDomainUndefineFlags"/>
+        value=3D"See https://libvirt.org/html/libvirt-libvirt-domain.html#=
virDomainShutdownFlags"/>
       <arg name=3D"flags" type=3D"u" direction=3D"in"/>
     </method>
     <method name=3D"Suspend">
       <annotation name=3D"org.gtk.GDBus.DocString"
         value=3D"See https://libvirt.org/html/libvirt-libvirt-domain.html#=
virDomainSuspend"/>
     </method>
-    <method name=3D"Resume">
+    <method name=3D"Undefine">
       <annotation name=3D"org.gtk.GDBus.DocString"
-        value=3D"See https://libvirt.org/html/libvirt-libvirt-domain.html#=
virDomainResume"/>
+        value=3D"See https://libvirt.org/html/libvirt-libvirt-domain.html#=
virDomainUndefineFlags"/>
+      <arg name=3D"flags" type=3D"u" direction=3D"in"/>
     </method>
     <signal name=3D"DeviceAdded">
       <annotation name=3D"org.gtk.GDBus.DocString"
diff --git a/src/connect.c b/src/connect.c
index 9820de5..d18f77d 100644
--- a/src/connect.c
+++ b/src/connect.c
@@ -575,7 +575,6 @@ static virtDBusGDBusPropertyTable virtDBusConnectProper=
tyTable[] =3D {
 };
=20
 static virtDBusGDBusMethodTable virtDBusConnectMethodTable[] =3D {
-    { "ListDomains", virtDBusConnectListDomains },
     { "DomainCreateXML", virtDBusConnectDomainCreateXML },
     { "DomainDefineXML", virtDBusConnectDomainDefineXML },
     { "DomainLookupByID", virtDBusConnectDomainLookupByID },
@@ -583,6 +582,7 @@ static virtDBusGDBusMethodTable virtDBusConnectMethodTa=
ble[] =3D {
     { "DomainLookupByUUID", virtDBusConnectDomainLookupByUUID },
     { "GetCapabilities", virtDBusConnectGetCapabilities },
     { "GetSysinfo", virtDBusConnectGetSysinfo },
+    { "ListDomains", virtDBusConnectListDomains },
     { "ListNetworks", virtDBusConnectListNetworks },
     { "NetworkCreateXML", virtDBusConnectNetworkCreateXML },
     { "NetworkDefineXML", virtDBusConnectNetworkDefineXML },
diff --git a/src/domain.c b/src/domain.c
index 0066788..b3b3630 100644
--- a/src/domain.c
+++ b/src/domain.c
@@ -25,44 +25,44 @@ virtDBusDomainGetVirDomain(virtDBusConnect *connect,
 }
=20
 static void
-virtDBusDomainGetName(const gchar *objectPath,
-                      gpointer userData,
-                      GVariant **value,
-                      GError **error)
+virtDBusDomainGetActive(const gchar *objectPath,
+                        gpointer userData,
+                        GVariant **value,
+                        GError **error)
 {
     virtDBusConnect *connect =3D userData;
     g_autoptr(virDomain) domain =3D NULL;
-    const gchar *name;
+    gint active;
=20
     domain =3D virtDBusDomainGetVirDomain(connect, objectPath, error);
     if (!domain)
         return;
=20
-    name =3D virDomainGetName(domain);
-    if (!name)
+    active =3D virDomainIsActive(domain);
+    if (active < 0)
         return virtDBusUtilSetLastVirtError(error);
=20
-    *value =3D g_variant_new("s", name);
+    *value =3D g_variant_new("b", !!active);
 }
=20
 static void
-virtDBusDomainGetUUID(const gchar *objectPath,
-                      gpointer userData,
-                      GVariant **value,
-                      GError **error)
+virtDBusDomainGetAutostart(const gchar *objectPath,
+                           gpointer userData,
+                           GVariant **value,
+                           GError **error)
 {
     virtDBusConnect *connect =3D userData;
     g_autoptr(virDomain) domain =3D NULL;
-    gchar uuid[VIR_UUID_STRING_BUFLEN] =3D "";
+    gint autostart =3D 0;
=20
     domain =3D virtDBusDomainGetVirDomain(connect, objectPath, error);
     if (!domain)
         return;
=20
-    if (virDomainGetUUIDString(domain, uuid) < 0)
+    if (virDomainGetAutostart(domain, &autostart) < 0)
         return virtDBusUtilSetLastVirtError(error);
=20
-    *value =3D g_variant_new("s", uuid);
+    *value =3D g_variant_new("b", !!autostart);
 }
=20
 static void
@@ -87,45 +87,45 @@ virtDBusDomainGetId(const gchar *objectPath,
 }
=20
 static void
-virtDBusDomainGetOsType(const gchar *objectPath,
-                        gpointer userData,
-                        GVariant **value,
-                        GError **error)
+virtDBusDomainGetName(const gchar *objectPath,
+                      gpointer userData,
+                      GVariant **value,
+                      GError **error)
 {
     virtDBusConnect *connect =3D userData;
     g_autoptr(virDomain) domain =3D NULL;
-    g_autofree gchar *osType =3D NULL;
+    const gchar *name;
=20
     domain =3D virtDBusDomainGetVirDomain(connect, objectPath, error);
     if (!domain)
         return;
=20
-    osType =3D virDomainGetOSType(domain);
-    if (!osType)
+    name =3D virDomainGetName(domain);
+    if (!name)
         return virtDBusUtilSetLastVirtError(error);
=20
-    *value =3D g_variant_new("s", osType);
+    *value =3D g_variant_new("s", name);
 }
=20
 static void
-virtDBusDomainGetActive(const gchar *objectPath,
+virtDBusDomainGetOsType(const gchar *objectPath,
                         gpointer userData,
                         GVariant **value,
                         GError **error)
 {
     virtDBusConnect *connect =3D userData;
     g_autoptr(virDomain) domain =3D NULL;
-    gint active;
+    g_autofree gchar *osType =3D NULL;
=20
     domain =3D virtDBusDomainGetVirDomain(connect, objectPath, error);
     if (!domain)
         return;
=20
-    active =3D virDomainIsActive(domain);
-    if (active < 0)
+    osType =3D virDomainGetOSType(domain);
+    if (!osType)
         return virtDBusUtilSetLastVirtError(error);
=20
-    *value =3D g_variant_new("b", !!active);
+    *value =3D g_variant_new("s", osType);
 }
=20
 static void
@@ -199,38 +199,36 @@ virtDBusDomainGetState(const gchar *objectPath,
 }
=20
 static void
-virtDBusDomainGetAutostart(const gchar *objectPath,
-                           gpointer userData,
-                           GVariant **value,
-                           GError **error)
+virtDBusDomainGetUUID(const gchar *objectPath,
+                      gpointer userData,
+                      GVariant **value,
+                      GError **error)
 {
     virtDBusConnect *connect =3D userData;
     g_autoptr(virDomain) domain =3D NULL;
-    gint autostart =3D 0;
+    gchar uuid[VIR_UUID_STRING_BUFLEN] =3D "";
=20
     domain =3D virtDBusDomainGetVirDomain(connect, objectPath, error);
     if (!domain)
         return;
=20
-    if (virDomainGetAutostart(domain, &autostart) < 0)
+    if (virDomainGetUUIDString(domain, uuid) < 0)
         return virtDBusUtilSetLastVirtError(error);
=20
-    *value =3D g_variant_new("b", !!autostart);
+    *value =3D g_variant_new("s", uuid);
 }
=20
 static void
-virtDBusDomainGetVcpus(GVariant *inArgs,
-                       GUnixFDList *inFDs G_GNUC_UNUSED,
-                       const gchar *objectPath,
-                       gpointer userData,
-                       GVariant **outArgs,
-                       GUnixFDList **outFDs G_GNUC_UNUSED,
-                       GError **error)
-
+virtDBusDomainCreate(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 =3D userData;
     g_autoptr(virDomain) domain =3D NULL;
-    gint vcpus;
     guint flags;
=20
     g_variant_get(inArgs, "(u)", &flags);
@@ -239,25 +237,21 @@ virtDBusDomainGetVcpus(GVariant *inArgs,
     if (!domain)
         return;
=20
-    vcpus =3D virDomainGetVcpusFlags(domain, flags);
-    if (vcpus < 0)
-        return virtDBusUtilSetLastVirtError(error);
-
-    *outArgs =3D g_variant_new("(u)", vcpus);
+    if (virDomainCreateWithFlags(domain, flags) < 0)
+        virtDBusUtilSetLastVirtError(error);
 }
=20
 static void
-virtDBusDomainGetXMLDesc(GVariant *inArgs,
-                         GUnixFDList *inFDs G_GNUC_UNUSED,
-                         const gchar *objectPath,
-                         gpointer userData,
-                         GVariant **outArgs,
-                         GUnixFDList **outFDs G_GNUC_UNUSED,
-                         GError **error)
+virtDBusDomainDestroy(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 =3D userData;
     g_autoptr(virDomain) domain =3D NULL;
-    g_autofree gchar *xml =3D NULL;
     guint flags;
=20
     g_variant_get(inArgs, "(u)", &flags);
@@ -266,11 +260,8 @@ virtDBusDomainGetXMLDesc(GVariant *inArgs,
     if (!domain)
         return;
=20
-    xml =3D virDomainGetXMLDesc(domain, flags);
-    if (!xml)
-        return virtDBusUtilSetLastVirtError(error);
-
-    *outArgs =3D g_variant_new("(s)", xml);
+    if (virDomainDestroyFlags(domain, flags) < 0)
+        virtDBusUtilSetLastVirtError(error);
 }
=20
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainStatsRecordPtr, virDomainStatsRecor=
dListFree);
@@ -311,16 +302,18 @@ virtDBusDomainGetStats(GVariant *inArgs,
 }
=20
 static void
-virtDBusDomainShutdown(GVariant *inArgs,
+virtDBusDomainGetVcpus(GVariant *inArgs,
                        GUnixFDList *inFDs G_GNUC_UNUSED,
                        const gchar *objectPath,
                        gpointer userData,
-                       GVariant **outArgs G_GNUC_UNUSED,
+                       GVariant **outArgs,
                        GUnixFDList **outFDs G_GNUC_UNUSED,
                        GError **error)
+
 {
     virtDBusConnect *connect =3D userData;
     g_autoptr(virDomain) domain =3D NULL;
+    gint vcpus;
     guint flags;
=20
     g_variant_get(inArgs, "(u)", &flags);
@@ -329,21 +322,25 @@ virtDBusDomainShutdown(GVariant *inArgs,
     if (!domain)
         return;
=20
-    if (virDomainShutdownFlags(domain, flags) < 0)
-        virtDBusUtilSetLastVirtError(error);
+    vcpus =3D virDomainGetVcpusFlags(domain, flags);
+    if (vcpus < 0)
+        return virtDBusUtilSetLastVirtError(error);
+
+    *outArgs =3D g_variant_new("(u)", vcpus);
 }
=20
 static void
-virtDBusDomainDestroy(GVariant *inArgs,
-                      GUnixFDList *inFDs G_GNUC_UNUSED,
-                      const gchar *objectPath,
-                      gpointer userData,
-                      GVariant **outArgs G_GNUC_UNUSED,
-                      GUnixFDList **outFDs G_GNUC_UNUSED,
-                      GError **error)
+virtDBusDomainGetXMLDesc(GVariant *inArgs,
+                         GUnixFDList *inFDs G_GNUC_UNUSED,
+                         const gchar *objectPath,
+                         gpointer userData,
+                         GVariant **outArgs,
+                         GUnixFDList **outFDs G_GNUC_UNUSED,
+                         GError **error)
 {
     virtDBusConnect *connect =3D userData;
     g_autoptr(virDomain) domain =3D NULL;
+    g_autofree gchar *xml =3D NULL;
     guint flags;
=20
     g_variant_get(inArgs, "(u)", &flags);
@@ -352,8 +349,11 @@ virtDBusDomainDestroy(GVariant *inArgs,
     if (!domain)
         return;
=20
-    if (virDomainDestroyFlags(domain, flags) < 0)
-        virtDBusUtilSetLastVirtError(error);
+    xml =3D virDomainGetXMLDesc(domain, flags);
+    if (!xml)
+        return virtDBusUtilSetLastVirtError(error);
+
+    *outArgs =3D g_variant_new("(s)", xml);
 }
=20
 static void
@@ -405,7 +405,7 @@ virtDBusDomainReset(GVariant *inArgs,
 }
=20
 static void
-virtDBusDomainCreate(GVariant *inArgs,
+virtDBusDomainResume(GVariant *inArgs G_GNUC_UNUSED,
                      GUnixFDList *inFDs G_GNUC_UNUSED,
                      const gchar *objectPath,
                      gpointer userData,
@@ -415,20 +415,17 @@ virtDBusDomainCreate(GVariant *inArgs,
 {
     virtDBusConnect *connect =3D userData;
     g_autoptr(virDomain) domain =3D NULL;
-    guint flags;
-
-    g_variant_get(inArgs, "(u)", &flags);
=20
     domain =3D virtDBusDomainGetVirDomain(connect, objectPath, error);
     if (!domain)
         return;
=20
-    if (virDomainCreateWithFlags(domain, flags) < 0)
+    if (virDomainResume(domain) < 0)
         virtDBusUtilSetLastVirtError(error);
 }
=20
 static void
-virtDBusDomainUndefine(GVariant *inArgs,
+virtDBusDomainShutdown(GVariant *inArgs,
                        GUnixFDList *inFDs G_GNUC_UNUSED,
                        const gchar *objectPath,
                        gpointer userData,
@@ -446,7 +443,7 @@ virtDBusDomainUndefine(GVariant *inArgs,
     if (!domain)
         return;
=20
-    if (virDomainUndefineFlags(domain, flags) < 0)
+    if (virDomainShutdownFlags(domain, flags) < 0)
         virtDBusUtilSetLastVirtError(error);
 }
=20
@@ -471,49 +468,52 @@ virtDBusDomainSuspend(GVariant *inArgs G_GNUC_UNUSED,
 }
=20
 static void
-virtDBusDomainResume(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)
+virtDBusDomainUndefine(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 =3D userData;
     g_autoptr(virDomain) domain =3D NULL;
+    guint flags;
+
+    g_variant_get(inArgs, "(u)", &flags);
=20
     domain =3D virtDBusDomainGetVirDomain(connect, objectPath, error);
     if (!domain)
         return;
=20
-    if (virDomainResume(domain) < 0)
+    if (virDomainUndefineFlags(domain, flags) < 0)
         virtDBusUtilSetLastVirtError(error);
 }
=20
 static virtDBusGDBusPropertyTable virtDBusDomainPropertyTable[] =3D {
-    { "Name", virtDBusDomainGetName, NULL },
-    { "UUID", virtDBusDomainGetUUID, NULL },
+    { "Active", virtDBusDomainGetActive, NULL },
+    { "Autostart", virtDBusDomainGetAutostart, NULL },
     { "Id", virtDBusDomainGetId, NULL },
+    { "Name", virtDBusDomainGetName, NULL },
     { "OSType", virtDBusDomainGetOsType, NULL },
-    { "Active", virtDBusDomainGetActive, NULL },
     { "Persistent", virtDBusDomainGetPersistent, NULL },
     { "State", virtDBusDomainGetState, NULL },
-    { "Autostart", virtDBusDomainGetAutostart, NULL },
+    { "UUID", virtDBusDomainGetUUID, NULL },
     { 0 }
 };
=20
 static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] =3D {
+    { "Create", virtDBusDomainCreate },
+    { "Destroy", virtDBusDomainDestroy },
+    { "GetStats", virtDBusDomainGetStats },
     { "GetVcpus", virtDBusDomainGetVcpus },
     { "GetXMLDesc", virtDBusDomainGetXMLDesc },
-    { "GetStats", virtDBusDomainGetStats },
-    { "Shutdown", virtDBusDomainShutdown },
-    { "Destroy", virtDBusDomainDestroy },
     { "Reboot", virtDBusDomainReboot },
     { "Reset", virtDBusDomainReset },
-    { "Create", virtDBusDomainCreate },
-    { "Undefine", virtDBusDomainUndefine },
-    { "Suspend", virtDBusDomainSuspend },
     { "Resume", virtDBusDomainResume },
+    { "Shutdown", virtDBusDomainShutdown },
+    { "Suspend", virtDBusDomainSuspend },
+    { "Undefine", virtDBusDomainUndefine },
     { 0 }
 };
=20
--=20
2.15.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list