remote: Wire up the remote protocol

Like virNodeDeviceCreateXML, virNodeDeviceLookupSCSIHostByWWN
has to be treated specially when generating the RPC codes. Also
new rules are added in fixup_name to keep the name SCSIHostByWWN.

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 341321b5a9bfcbf5c782870754cf8e018deec167..feb372e155cf0ede9e18ef7bd11ac5cbb7fc176b 100644 (file)
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -6359,6 +6359,7 @@ static virDeviceMonitor dev_monitor = {
     .listDevices = remoteNodeListDevices, /* 0.5.0 */
     .listAllNodeDevices  = remoteConnectListAllNodeDevices, /* 0.10.2 */
     .deviceLookupByName = remoteNodeDeviceLookupByName, /* 0.5.0 */
+    .deviceLookupSCSIHostByWWN = remoteNodeDeviceLookupSCSIHostByWWN, /* 1.0.2 */
     .deviceGetXMLDesc = remoteNodeDeviceGetXMLDesc, /* 0.5.0 */
     .deviceGetParent = remoteNodeDeviceGetParent, /* 0.5.0 */
     .deviceNumOfCaps = remoteNodeDeviceNumOfCaps, /* 0.5.0 */

diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
index 90357765d93b9d34f761af092668135a004f6578..5ace31f48480871cfb2279bbd9d81cce33f8f1eb 100644 (file)
--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
@@ -1852,6 +1852,16 @@ struct remote_node_device_lookup_by_name_ret {
     remote_nonnull_node_device dev;
 };
 
+struct remote_node_device_lookup_scsi_host_by_wwn_args {
+    remote_nonnull_string wwnn;
+    remote_nonnull_string wwpn;
+    unsigned int flags;
+};
+
+struct remote_node_device_lookup_scsi_host_by_wwn_ret {
+    remote_nonnull_node_device dev;
+};
+
 struct remote_node_device_get_xml_desc_args {
     remote_nonnull_string name;
     unsigned int flags;
@@ -3049,7 +3059,8 @@ enum remote_procedure {
     REMOTE_PROC_NODE_GET_CPU_MAP = 293, /* skipgen skipgen */
     REMOTE_PROC_DOMAIN_FSTRIM = 294, /* autogen autogen */
     REMOTE_PROC_DOMAIN_SEND_PROCESS_SIGNAL = 295, /* autogen autogen */
-    REMOTE_PROC_DOMAIN_OPEN_CHANNEL = 296 /* autogen autogen | readstream@2 */
+    REMOTE_PROC_DOMAIN_OPEN_CHANNEL = 296, /* autogen autogen | readstream@2 */
+    REMOTE_PROC_NODE_DEVICE_LOOKUP_SCSI_HOST_BY_WWN = 297 /* autogen autogen priority:high */
 
     /*
      * Notice how the entries are grouped in sets of 10 ?

diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs
index 91414d4b93eda029ad1576cd6da0ba043352be25..b8ca88b9d13035be93adab00a6b2544380e3b165 100644 (file)
--- a/src/remote_protocol-structs
+++ b/src/remote_protocol-structs
@@ -1400,6 +1400,14 @@ struct remote_node_device_lookup_by_name_args {
 struct remote_node_device_lookup_by_name_ret {
         remote_nonnull_node_device dev;
 };
+struct remote_node_device_lookup_scsi_host_by_wwn_args {
+        remote_nonull_string wwnn;
+        remote_nonull_string wwpn;
+        unsigned int flags;
+};
+struct remote_node_device_lookup_scsi_host_by_wwn_ret {
+        remote_nonnull_node_device dev;
+};
 struct remote_node_device_get_xml_desc_args {
         remote_nonnull_string      name;
         u_int                      flags;
@@ -2453,4 +2461,5 @@ enum remote_procedure {
         REMOTE_PROC_DOMAIN_FSTRIM = 294,
         REMOTE_PROC_DOMAIN_SEND_PROCESS_SIGNAL = 295,
         REMOTE_PROC_DOMAIN_OPEN_CHANNEL = 296,
+        REMOTE_PROC_NODE_DEVICE_LOOKUP_SCSI_HOST_BY_WWN = 297,
 };

diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl
index f00ed7c68bf5bec93bb43a67ca68fe350fcfa814..1da28a471e0e7107e35308a90e5c286bf87d62e4 100755 (executable)
--- a/src/rpc/gendispatch.pl
+++ b/src/rpc/gendispatch.pl
@@ -45,6 +45,8 @@ sub fixup_name {
     $name =~ s/Nmi$/NMI/;
     $name =~ s/Pm/PM/;
     $name =~ s/Fstrim$/FSTrim/;
+    $name =~ s/Scsi/SCSI/;
+    $name =~ s/Wwn$/WWN/;
 
     return $name;
 }
@@ -402,7 +404,8 @@ elsif ($opt_b) {
             # node device is special, as it's identified by name
             if ($argtype =~ m/^remote_node_device_/ and
                 !($argtype =~ m/^remote_node_device_lookup_by_name_/) and
-                !($argtype =~ m/^remote_node_device_create_xml_/)) {
+                !($argtype =~ m/^remote_node_device_create_xml_/) and
+                !($argtype =~ m/^remote_node_device_lookup_scsi_host_by_wwn_/)) {
                 $has_node_device = 1;
                 push(@vars_list, "virNodeDevicePtr dev = NULL");
                 push(@getters_list,