inject-nmi: Implementing the remote protocol

diff --git a/daemon/remote_generator.pl b/daemon/remote_generator.pl
index 062ccc15ce416025ffd694a2379b732abfbdc496..74fa7691459a9cae3ddadd61ffe439ee6292e2cd 100755 (executable)
--- a/daemon/remote_generator.pl
+++ b/daemon/remote_generator.pl
@@ -35,7 +35,7 @@ sub name_to_ProcName {
     @elems = map { $_ =~ s/Nwfilter/NWFilter/; $_ =~ s/Xml/XML/;
                    $_ =~ s/Uri/URI/; $_ =~ s/Uuid/UUID/; $_ =~ s/Id/ID/;
                    $_ =~ s/Mac/MAC/; $_ =~ s/Cpu/CPU/; $_ =~ s/Os/OS/;
-                   $_ } @elems;
+                   $_ =~ s/Nmi/NMI/; $_ } @elems;
     join "", @elems
 }
 

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index c6beb3d234b61e97333c74ef068a100f5b0776fa..0a1afde9c73ee7330d16ff73d540e301afd10ab8 100644 (file)
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -6493,7 +6493,7 @@ static virDriver remote_driver = {
     remoteDomainSnapshotDelete, /* domainSnapshotDelete */
     remoteQemuDomainMonitorCommand, /* qemuDomainMonitorCommand */
     remoteDomainOpenConsole, /* domainOpenConsole */
-    NULL, /* domainInjectNMI */
+    remoteDomainInjectNMI, /* domainInjectNMI */
 };
 
 static virNetworkDriver network_driver = {

diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
index c706c36cf9893b68984cbc887782854cd4f0b733..cdb8369986c9e436e28492fe47c33761be022919 100644 (file)
--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
@@ -817,6 +817,11 @@ struct remote_domain_undefine_args {
     remote_nonnull_domain dom;
 };
 
+struct remote_domain_inject_nmi_args {
+    remote_nonnull_domain dom;
+    unsigned int flags;
+};
+
 struct remote_domain_set_vcpus_args {
     remote_nonnull_domain dom;
     int nvcpus;
@@ -2176,7 +2181,8 @@ enum remote_procedure {
     REMOTE_PROC_DOMAIN_GET_BLKIO_PARAMETERS = 206,
     REMOTE_PROC_DOMAIN_MIGRATE_SET_MAX_SPEED = 207,
     REMOTE_PROC_STORAGE_VOL_UPLOAD = 208,
-    REMOTE_PROC_STORAGE_VOL_DOWNLOAD = 209
+    REMOTE_PROC_STORAGE_VOL_DOWNLOAD = 209,
+    REMOTE_PROC_DOMAIN_INJECT_NMI = 210
 
     /*
      * Notice how the entries are grouped in sets of 10 ?

diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs
index f904c4dbafbded1dcdbfd483867c3a708e1d39de..c68974634821d379c969b754753490db90a871b2 100644 (file)
--- a/src/remote_protocol-structs
+++ b/src/remote_protocol-structs
@@ -504,6 +504,10 @@ struct remote_domain_define_xml_ret {
 struct remote_domain_undefine_args {
         remote_nonnull_domain      dom;
 };
+struct remote_domain_inject_nmi_args {
+        remote_nonnull_domain      dom;
+        u_int                      flags;
+};
 struct remote_domain_set_vcpus_args {
         remote_nonnull_domain      dom;
         int                        nvcpus;