On Wed, Nov 28, 2012 at 03:50:30PM +0100, Michal Privoznik wrote:
A new rule to fixup_name() in gendispatch.pl needs to be added,
otherwise we are left with remoteDomainFstrim which is not wanted.
---
src/remote/remote_driver.c | 1 +
src/remote/remote_protocol.x | 10 +++++++++-
src/remote_protocol-structs | 7 +++++++
src/rpc/gendispatch.pl | 1 +
4 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index ec33698..49d89be 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -6145,6 +6145,7 @@ static virDriver remote_driver = {
.nodeSetMemoryParameters = remoteNodeSetMemoryParameters, /* 0.10.2 */
.nodeGetMemoryParameters = remoteNodeGetMemoryParameters, /* 0.10.2 */
.nodeGetCPUMap = remoteNodeGetCPUMap, /* 1.0.0 */
+ .domainFSTrim = remoteDomainFSTrim, /* 1.0.1 */
};
static virNetworkDriver network_driver = {
diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
index d6ac3c1..31567e2 100644
--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
@@ -2682,6 +2682,13 @@ struct remote_node_get_cpu_map_ret {
int ret;
};
+struct remote_domain_fstrim_args {
+ remote_nonnull_domain dom;
+ remote_string mountPoint;
+ unsigned hyper minimum;
+ unsigned int flags;
+};
+
/*----- Protocol. -----*/
/* Define the program number, protocol version and procedure numbers here. */
@@ -3026,7 +3033,8 @@ enum remote_procedure {
REMOTE_PROC_NETWORK_UPDATE = 291, /* autogen autogen priority:high */
REMOTE_PROC_DOMAIN_EVENT_PMSUSPEND_DISK = 292, /* autogen autogen */
- REMOTE_PROC_NODE_GET_CPU_MAP = 293 /* skipgen skipgen */
+ REMOTE_PROC_NODE_GET_CPU_MAP = 293, /* skipgen skipgen */
+ REMOTE_PROC_DOMAIN_FSTRIM = 294 /* autogen autogen */
/*
* Notice how the entries are grouped in sets of 10 ?
diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs
index 6fe7213..d0d4f53 100644
--- a/src/remote_protocol-structs
+++ b/src/remote_protocol-structs
@@ -2139,6 +2139,12 @@ struct remote_node_get_cpu_map_ret {
u_int online;
int ret;
};
+struct remote_domain_fstrim_args {
+ remote_nonnull_domain dom;
+ remote_string mountPoint;
+ uint64_t minimum;
+ u_int flags;
+};
enum remote_procedure {
REMOTE_PROC_OPEN = 1,
REMOTE_PROC_CLOSE = 2,
@@ -2433,4 +2439,5 @@ enum remote_procedure {
REMOTE_PROC_NETWORK_UPDATE = 291,
REMOTE_PROC_DOMAIN_EVENT_PMSUSPEND_DISK = 292,
REMOTE_PROC_NODE_GET_CPU_MAP = 293,
+ REMOTE_PROC_DOMAIN_FSTRIM = 294,
};
diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl
index ae7ecba..899f4bc 100755
--- a/src/rpc/gendispatch.pl
+++ b/src/rpc/gendispatch.pl
@@ -44,6 +44,7 @@ sub fixup_name {
$name =~ s/Os$/OS/;
$name =~ s/Nmi$/NMI/;
$name =~ s/Pm/PM/;
+ $name =~ s/Fstrim$/FSTrim/;
return $name;
}
ACK
Daniel
--
|:
http://berrange.com -o-
http://www.flickr.com/photos/dberrange/ :|
|:
http://libvirt.org -o-
http://virt-manager.org :|
|:
http://autobuild.org -o-
http://search.cpan.org/~danberr/ :|
|:
http://entangle-photo.org -o-
http://live.gnome.org/gtk-vnc :|