5:55 a.m.
changes in v2:
- fixed build error for each patch by moving all lifecycle function
rename into a single patch
Pavel Hrdina (4):
domain: Rename (Get|Set)BlkioParameters
events: Rename AgentLifecycle event
events: Rename IOErrorReason event
events: Rename all lifecycle event functions to follow the signal name
data/org.libvirt.Domain.xml | 8 +++---
src/domain.c | 32 ++++++++++-----------
src/events.c | 56 ++++++++++++++++++-------------------
3 files changed, 48 insertions(+), 48 deletions(-)
--
2.17.0
5:55 a.m.
New subject: [libvirt] [dbus PATCH v2 1/4] domain: Rename (Get|Set)BlkioParameters
Use (Get|Set)BlockIOParameters names to have the API names unified.
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
data/org.libvirt.Domain.xml | 4 ++--
src/domain.c | 32 ++++++++++++++++----------------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml
index adb93a6..2a14b8e 100644
--- a/data/org.libvirt.Domain.xml
+++ b/data/org.libvirt.Domain.xml
@@ -177,7 +177,7 @@
<arg name="minimum" type="t" direction="in"/>
<arg name="flags" type="u" direction="in"/>
</method>
- <method name="GetBlkioParameters">
+ <method name="GetBlockIOParameters">
<annotation name="org.gtk.GDBus.DocString"
value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetBlkioPar...
<arg name="flags" type="u" direction="in"/>
@@ -491,7 +491,7 @@
<arg name="sigNum" type="u" direction="in"/>
<arg name="flags" type="u" direction="in"/>
</method>
- <method name="SetBlkioParameters">
+ <method name="SetBlockIOParameters">
<annotation name="org.gtk.GDBus.DocString"
value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainSetBlkioPar...
<arg name="params" type="a{sv}"
direction="in"/>
diff --git a/src/domain.c b/src/domain.c
index caf6508..4aeb855 100644
--- a/src/domain.c
+++ b/src/domain.c
@@ -910,13 +910,13 @@ virtDBusDomainFSTrim(GVariant *inArgs,
}
static void
-virtDBusDomainGetBlkioParameters(GVariant *inArgs,
- GUnixFDList *inFDs G_GNUC_UNUSED,
- const gchar *objectPath,
- gpointer userData,
- GVariant **outArgs,
- GUnixFDList **outFDs G_GNUC_UNUSED,
- GError **error)
+virtDBusDomainGetBlockIOParameters(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;
@@ -2533,13 +2533,13 @@ virtDBusDomainSendProcessSignal(GVariant *inArgs,
}
static void
-virtDBusDomainSetBlkioParameters(GVariant *inArgs,
- GUnixFDList *inFDs G_GNUC_UNUSED,
- const gchar *objectPath,
- gpointer userData,
- GVariant **outArgs G_GNUC_UNUSED,
- GUnixFDList **outFDs G_GNUC_UNUSED,
- GError **error)
+virtDBusDomainSetBlockIOParameters(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;
@@ -3067,7 +3067,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = {
{ "FSFreeze", virtDBusDomainFSFreeze },
{ "FSThaw", virtDBusDomainFSThaw },
{ "FSTrim", virtDBusDomainFSTrim },
- { "GetBlkioParameters", virtDBusDomainGetBlkioParameters },
+ { "GetBlockIOParameters", virtDBusDomainGetBlockIOParameters },
{ "GetBlockIOTune", virtDBusDomainGetBlockIOTune },
{ "GetBlockJobInfo", virtDBusDomainGetBlockJobInfo },
{ "GetControlInfo", virtDBusDomainGetControlInfo },
@@ -3118,7 +3118,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = {
{ "Save", virtDBusDomainSave },
{ "SendKey", virtDBusDomainSendKey },
{ "SendProcessSignal", virtDBusDomainSendProcessSignal },
- { "SetBlkioParameters", virtDBusDomainSetBlkioParameters },
+ { "SetBlockIOParameters", virtDBusDomainSetBlockIOParameters },
{ "SetBlockIOTune", virtDBusDomainSetBlockIOTune },
{ "SetGuestVcpus", virtDBusDomainSetGuestVcpus },
{ "SetInterfaceParameters", virtDBusDomainSetInterfaceParameters },
--
2.17.0
5:55 a.m.
New subject: [libvirt] [dbus PATCH v2 2/4] events: Rename AgentLifecycle event
Other lifecycle events use "{object}Event" format so use the same
format for this event as well.
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
data/org.libvirt.Domain.xml | 2 +-
src/events.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml
index 2a14b8e..11dd922 100644
--- a/data/org.libvirt.Domain.xml
+++ b/data/org.libvirt.Domain.xml
@@ -604,7 +604,7 @@
<arg name="xml" type="s" direction="in"/>
<arg name="flags" type="u" direction="in"/>
</method>
- <signal name="AgentLifecycle">
+ <signal name="AgentEvent">
<annotation name="org.gtk.GDBus.DocString"
value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virConnectDomainEven...
<arg name="state" type="i"/>
diff --git a/src/events.c b/src/events.c
index 8a23ce4..a86ad20 100644
--- a/src/events.c
+++ b/src/events.c
@@ -21,7 +21,7 @@ virtDBusEventsDomainAgentLifecycle(virConnectPtr connection
G_GNUC_UNUSED,
NULL,
path,
VIRT_DBUS_DOMAIN_INTERFACE,
- "AgentLifecycle",
+ "AgentEvent",
g_variant_new("(ii)", state, reason),
NULL);
--
2.17.0
5:55 a.m.
New subject: [libvirt] [dbus PATCH v2 3/4] events: Rename IOErrorReason event
The "Reason" suffix exists in C API because there is another event
without the reason and the suffix, however, in libvirt-dbus we will
have only the version with reason.
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
data/org.libvirt.Domain.xml | 2 +-
src/events.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml
index 11dd922..b4ed495 100644
--- a/data/org.libvirt.Domain.xml
+++ b/data/org.libvirt.Domain.xml
@@ -659,7 +659,7 @@
<arg name="authScheme" type="s"/>
<arg name="identities" type="a(ss)"/>
</signal>
- <signal name="IOErrorReason">
+ <signal name="IOError">
<annotation name="org.gtk.GDBus.DocString"
value="See
https://libvirt.org/html/libvirt-libvirt-domain.html#virConnectDomainEven...
<arg name="srcPath" type="s"/>
diff --git a/src/events.c b/src/events.c
index a86ad20..b4793ba 100644
--- a/src/events.c
+++ b/src/events.c
@@ -258,7 +258,7 @@ virtDBusEventsDomainIOErrorReason(virConnectPtr connection
G_GNUC_UNUSED,
NULL,
path,
VIRT_DBUS_DOMAIN_INTERFACE,
- "IOErrorReason",
+ "IOError",
g_variant_new("(ssis)", srcPath,
VIRT_DBUS_EMPTY_STR(device),
action, reason),
--
2.17.0
5:55 a.m.
New subject: [libvirt] [dbus PATCH v2 4/4] events: Rename all lifecycle event functions to follow the signal name
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
src/events.c | 52 ++++++++++++++++++++++++++--------------------------
1 file changed, 26 insertions(+), 26 deletions(-)
diff --git a/src/events.c b/src/events.c
index b4793ba..b51664f 100644
--- a/src/events.c
+++ b/src/events.c
@@ -6,11 +6,11 @@
#include <libvirt/libvirt.h>
static gint
-virtDBusEventsDomainAgentLifecycle(virConnectPtr connection G_GNUC_UNUSED,
- virDomainPtr domain,
- gint state,
- gint reason,
- gpointer opaque)
+virtDBusEventsDomainAgentEvent(virConnectPtr connection G_GNUC_UNUSED,
+ virDomainPtr domain,
+ gint state,
+ gint reason,
+ gpointer opaque)
{
virtDBusConnect *connect = opaque;
g_autofree gchar *path = NULL;
@@ -96,11 +96,11 @@ virtDBusEventsDomainControlError(virConnectPtr connection
G_GNUC_UNUSED,
}
static gint
-virtDBusEventsDomainLifecycle(virConnectPtr connection G_GNUC_UNUSED,
- virDomainPtr domain,
- gint event,
- gint detail,
- gpointer opaque)
+virtDBusEventsDomainEvent(virConnectPtr connection G_GNUC_UNUSED,
+ virDomainPtr domain,
+ gint event,
+ gint detail,
+ gpointer opaque)
{
virtDBusConnect *connect = opaque;
g_autofree gchar *path = NULL;
@@ -241,13 +241,13 @@ virtDBusEventsDomainGraphics(virConnectPtr connection
G_GNUC_UNUSED,
}
static gint
-virtDBusEventsDomainIOErrorReason(virConnectPtr connection G_GNUC_UNUSED,
- virDomainPtr domain,
- const gchar *srcPath,
- const gchar *device,
- gint action,
- const gchar *reason,
- gpointer opaque)
+virtDBusEventsDomainIOError(virConnectPtr connection G_GNUC_UNUSED,
+ virDomainPtr domain,
+ const gchar *srcPath,
+ const gchar *device,
+ gint action,
+ const gchar *reason,
+ gpointer opaque)
{
virtDBusConnect *connect = opaque;
g_autofree gchar *path = NULL;
@@ -545,7 +545,7 @@ virtDBusEventsDomainDiskChange(virConnectPtr connection
G_GNUC_UNUSED,
}
static gint
-virtDBusEventsNetworkLifecycle(virConnectPtr connection G_GNUC_UNUSED,
+virtDBusEventsNetworkEvent(virConnectPtr connection G_GNUC_UNUSED,
virNetworkPtr network,
gint event,
gint detail G_GNUC_UNUSED,
@@ -568,7 +568,7 @@ virtDBusEventsNetworkLifecycle(virConnectPtr connection
G_GNUC_UNUSED,
}
static gint
-virtDBusEventsSecretLifecycle(virConnectPtr connection G_GNUC_UNUSED,
+virtDBusEventsSecretEvent(virConnectPtr connection G_GNUC_UNUSED,
virSecretPtr secret,
gint event,
gint detail,
@@ -591,7 +591,7 @@ virtDBusEventsSecretLifecycle(virConnectPtr connection G_GNUC_UNUSED,
}
static gint
-virtDBusEventsStoragePoolLifecycle(virConnectPtr connection G_GNUC_UNUSED,
+virtDBusEventsStoragePoolEvent(virConnectPtr connection G_GNUC_UNUSED,
virStoragePoolPtr storagePool,
gint event,
gint detail,
@@ -701,7 +701,7 @@ virtDBusEventsRegister(virtDBusConnect *connect)
{
virtDBusEventsRegisterDomainEvent(connect,
VIR_DOMAIN_EVENT_ID_AGENT_LIFECYCLE,
-
VIR_DOMAIN_EVENT_CALLBACK(virtDBusEventsDomainAgentLifecycle));
+
VIR_DOMAIN_EVENT_CALLBACK(virtDBusEventsDomainAgentEvent));
virtDBusEventsRegisterDomainEvent(connect,
VIR_DOMAIN_EVENT_ID_BALLOON_CHANGE,
@@ -717,7 +717,7 @@ virtDBusEventsRegister(virtDBusConnect *connect)
virtDBusEventsRegisterDomainEvent(connect,
VIR_DOMAIN_EVENT_ID_LIFECYCLE,
-
VIR_DOMAIN_EVENT_CALLBACK(virtDBusEventsDomainLifecycle));
+
VIR_DOMAIN_EVENT_CALLBACK(virtDBusEventsDomainEvent));
virtDBusEventsRegisterDomainEvent(connect,
VIR_DOMAIN_EVENT_ID_DEVICE_ADDED,
@@ -741,7 +741,7 @@ virtDBusEventsRegister(virtDBusConnect *connect)
virtDBusEventsRegisterDomainEvent(connect,
VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON,
-
VIR_DOMAIN_EVENT_CALLBACK(virtDBusEventsDomainIOErrorReason));
+
VIR_DOMAIN_EVENT_CALLBACK(virtDBusEventsDomainIOError));
virtDBusEventsRegisterDomainEvent(connect,
VIR_DOMAIN_EVENT_ID_JOB_COMPLETED,
@@ -789,15 +789,15 @@ virtDBusEventsRegister(virtDBusConnect *connect)
virtDBusEventsRegisterNetworkEvent(connect,
VIR_NETWORK_EVENT_ID_LIFECYCLE,
-
VIR_NETWORK_EVENT_CALLBACK(virtDBusEventsNetworkLifecycle));
+
VIR_NETWORK_EVENT_CALLBACK(virtDBusEventsNetworkEvent));
virtDBusEventsRegisterSecretEvent(connect,
VIR_SECRET_EVENT_ID_LIFECYCLE,
-
VIR_SECRET_EVENT_CALLBACK(virtDBusEventsSecretLifecycle));
+
VIR_SECRET_EVENT_CALLBACK(virtDBusEventsSecretEvent));
virtDBusEventsRegisterStoragePoolEvent(connect,
VIR_STORAGE_POOL_EVENT_ID_LIFECYCLE,
-
VIR_STORAGE_POOL_EVENT_CALLBACK(virtDBusEventsStoragePoolLifecycle));
+
VIR_STORAGE_POOL_EVENT_CALLBACK(virtDBusEventsStoragePoolEvent));
virtDBusEventsRegisterStoragePoolEvent(connect,
VIR_STORAGE_POOL_EVENT_ID_REFRESH,
--
2.17.0
8:42 a.m.
On Wed, 2018-05-16 at 12:55 +0200, Pavel Hrdina wrote:
changes in v2:
- fixed build error for each patch by moving all lifecycle
function
rename into a single patch
Pavel Hrdina (4):
domain: Rename (Get|Set)BlkioParameters
events: Rename AgentLifecycle event
events: Rename IOErrorReason event
events: Rename all lifecycle event functions to follow the signal
name
data/org.libvirt.Domain.xml | 8 +++---
src/domain.c | 32 ++++++++++-----------
src/events.c | 56 ++++++++++++++++++-----------------
--
3 files changed, 48 insertions(+), 48 deletions(-)
Reviewed-by: Katerina Koukiou <kkoukiou(a)redhat.com>
2427
days inactive
2427
days old
5 comments
2 participants
participants (2)
-
kkoukiou＠redhat.com -
Pavel Hrdina