[libvirt] [PATCH 7/8] UndefineFlags: Implement the remote protocol

[Osier Yang]

With small typo fixes (s/remote_generator/gendispatch/, and
s/remote_internal/remote_driver/)
---
 src/remote/qemu_protocol.x   |    2 +-
 src/remote/remote_driver.c   |    5 +++--
 src/remote/remote_protocol.x |   14 ++++++++++----
 src/remote_protocol-structs  |    4 ++++
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/remote/qemu_protocol.x b/src/remote/qemu_protocol.x
index fa453f4..9381f7c 100644
--- a/src/remote/qemu_protocol.x
+++ b/src/remote/qemu_protocol.x
@@ -43,7 +43,7 @@ const QEMU_PROTOCOL_VERSION = 1;
 
 enum qemu_procedure {
     /* Each function must have a two-word comment.  The first word is
-     * whether remote_generator.pl handles daemon, the second whether
+     * whether gendispatch.pl handles daemon, the second whether
      * it handles src/remote.  */
     QEMU_PROC_MONITOR_COMMAND = 1 /* skipgen skipgen */
 };
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 5c0457e..dafb04a 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -1,5 +1,5 @@
 /*
- * remote_internal.c: driver to provide access to libvirtd running
+ * remote_driver.c: driver to provide access to libvirtd running
  *   on a remote machine
  *
  * Copyright (C) 2007-2011 Red Hat, Inc.
@@ -4177,6 +4177,7 @@ static virDriver remote_driver = {
     .domainCreateWithFlags = remoteDomainCreateWithFlags, /* 0.8.2 */
     .domainDefineXML = remoteDomainDefineXML, /* 0.3.0 */
     .domainUndefine = remoteDomainUndefine, /* 0.3.0 */
+    .domainUndefineWithFlags = remoteDomainUndefineWithFlags, /* 0.9.4 */
     .domainAttachDevice = remoteDomainAttachDevice, /* 0.3.0 */
     .domainAttachDeviceFlags = remoteDomainAttachDeviceFlags, /* 0.7.7 */
     .domainDetachDevice = remoteDomainDetachDevice, /* 0.3.0 */
@@ -4244,7 +4245,7 @@ static virDriver remote_driver = {
     .domainMigratePerform3 = remoteDomainMigratePerform3, /* 0.9.2 */
     .domainMigrateFinish3 = remoteDomainMigrateFinish3, /* 0.9.2 */
     .domainMigrateConfirm3 = remoteDomainMigrateConfirm3, /* 0.9.2 */
-    .domainSendKey = remoteDomainSendKey, /* 0.9.3 */
+    .domainSendKey = remoteDomainSendKey /* 0.9.3 */
 };
 
 static virNetworkDriver network_driver = {
diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
index ee169fd..3adaca8 100644
--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
@@ -339,7 +339,7 @@ struct remote_node_get_memory_stats {
  * connection).  Errors are returned implicitly in the RPC protocol.
  *
  * Please follow the naming convention carefully - this file is
- * parsed by 'remote_generator.pl'.
+ * parsed by 'gendispatch.pl'.
  *
  * 'remote_CALL_ret' members that are filled via call-by-reference must be
  * annotated with a insert@<offset> comment to indicate the offset in the
@@ -848,6 +848,11 @@ struct remote_domain_undefine_args {
     remote_nonnull_domain dom;
 };
 
+struct remote_domain_undefine_with_flags_args {
+    remote_nonnull_domain dom;
+    unsigned int flags;
+};
+
 struct remote_domain_inject_nmi_args {
     remote_nonnull_domain dom;
     unsigned int flags;
@@ -2123,7 +2128,7 @@ const REMOTE_PROTOCOL_VERSION = 1;
 
 enum remote_procedure {
     /* Each function must have a two-word comment.  The first word is
-     * whether remote_generator.pl handles daemon, the second whether
+     * whether gendispatch.pl handles daemon, the second whether
      * it handles src/remote.  Additional flags can be specified after a
      * pipe.
      *
@@ -2383,14 +2388,15 @@ enum remote_procedure {
     REMOTE_PROC_NODE_GET_CPU_STATS = 227, /* skipgen skipgen */
     REMOTE_PROC_NODE_GET_MEMORY_STATS = 228, /* skipgen skipgen */
     REMOTE_PROC_DOMAIN_GET_CONTROL_INFO = 229, /* autogen autogen */
-    REMOTE_PROC_DOMAIN_GET_VCPU_PIN_INFO = 230  /* skipgen skipgen */
+    REMOTE_PROC_DOMAIN_GET_VCPU_PIN_INFO = 230,  /* skipgen skipgen */
+    REMOTE_PROC_DOMAIN_UNDEFINE_WITH_FLAGS = 231  /* autogen autogen */
 
     /*
      * Notice how the entries are grouped in sets of 10 ?
      * Nice isn't it. Please keep it this way when adding more.
      *
      * Each function must have a two-word comment.  The first word is
-     * whether remote_generator.pl handles daemon, the second whether
+     * whether gendispatch.pl handles daemon, the second whether
      * it handles src/remote.  Additional flags can be specified after a
      * pipe.
      *
diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs
index b2de8e9..c8fed2c 100644
--- a/src/remote_protocol-structs
+++ b/src/remote_protocol-structs
@@ -533,6 +533,10 @@ struct remote_domain_define_xml_ret {
 struct remote_domain_undefine_args {
         remote_nonnull_domain      dom;
 };
+struct remote_domain_undefine_with_flags_args {
+        remote_nonnull_domain      dom;
+        u_int                      flags;
+};
 struct remote_domain_inject_nmi_args {
         remote_nonnull_domain      dom;
         u_int                      flags;
-- 
1.7.6