[Qemu-devel] [RFC PATCH v2 31/35] multi-process: Extend drive_add to add drive to remote device

[elena . ufimtseva]

From: Jagannathan Raman <address@hidden>

Extend drive_add HMP command to hot-plug drive to a remote device.

Signed-off-by: Jagannathan Raman <address@hidden>
Signed-off-by: John G Johnson <address@hidden>
Signed-off-by: Elena Ufimtseva <address@hidden>
---
 device-hotplug.c        |  7 +++++++
 hmp-commands.hx         |  5 +++--
 hw/proxy/monitor.c      | 35 +++++++++++++++++++++++++++++++++++
 include/io/proxy-link.h |  2 ++
 include/sysemu/sysemu.h |  1 +
 remote/machine.c        |  8 ++++++++
 remote/remote-main.c    | 31 +++++++++++++++++++++++++++++++
 7 files changed, 87 insertions(+), 2 deletions(-)

diff --git a/device-hotplug.c b/device-hotplug.c
index 6153259d71..094702ff3e 100644
--- a/device-hotplug.c
+++ b/device-hotplug.c
@@ -63,6 +63,13 @@ void hmp_drive_add(Monitor *mon, const QDict *qdict)
     const char *opts = qdict_get_str(qdict, "opts");
     bool node = qdict_get_try_bool(qdict, "node", false);
 
+#ifdef CONFIG_MPQEMU
+    if (qdict_get_try_str(qdict, "rid")) {
+        hmp_rdrive_add(mon, qdict);
+        return;
+    }
+#endif
+
     if (node) {
         hmp_drive_add_node(mon, opts);
         return;
diff --git a/hmp-commands.hx b/hmp-commands.hx
index 605d18be85..2757b07ecf 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -1341,12 +1341,13 @@ ETEXI
 
     {
         .name       = "drive_add",
-        .args_type  = "node:-n,pci_addr:s,opts:s",
+        .args_type  = "node:-n,pci_addr:s,opts:s,rid:s?",
         .params     = "[-n] [[<domain>:]<bus>:]<slot>\n"
                       "[file=file][,if=type][,bus=n]\n"
                       "[,unit=m][,media=d][,index=i]\n"
                       "[,snapshot=on|off][,cache=on|off]\n"
-                      "[,readonly=on|off][,copy-on-read=on|off]",
+                      "[,readonly=on|off][,copy-on-read=on|off]\n",
+                      "[rid=rid]",
         .help       = "add drive to PCI storage controller",
         .cmd        = hmp_drive_add,
     },
diff --git a/hw/proxy/monitor.c b/hw/proxy/monitor.c
index c4d0ff1213..e3f368aa94 100644
--- a/hw/proxy/monitor.c
+++ b/hw/proxy/monitor.c
@@ -40,6 +40,7 @@
 #include "qapi/qmp/qstring.h"
 #include "qapi/error.h"
 #include "io/proxy-link.h"
+#include "sysemu/sysemu.h"
 
 /*
  * TODO: Is there a callback where the allocated memory for QMP could be free'd
@@ -194,3 +195,37 @@ void qmp_rdevice_del(const char *id, Error **errp)
 
     qobject_unref(qdict);
 }
+
+void hmp_rdrive_add(Monitor *mon, const QDict *qdict)
+{
+    MachineState *ms = MACHINE(current_machine);
+    Error *local_err = NULL;
+    PCIProxyDev *pdev = NULL;
+    const char *id, *optstr;
+    QemuOpts *opts;
+    char *data;
+    int ret;
+
+    pdev = get_proxy_device((QDict *)qdict, "rid", &local_err);
+    if (local_err) {
+        monitor_printf(mon, "rdrive_add error: %s\n",
+                       error_get_pretty(local_err));
+        error_free(local_err);
+        return;
+    }
+
+    optstr = qdict_get_str(qdict, "opts");
+    opts = drive_def(optstr);
+
+    id = g_strdup(qemu_opts_id(opts));
+    data = g_strdup(optstr);
+
+    ret = send_monitor_msg(pdev, DRIVE_ADD, strlen(data), (uint8_t *)data);
+
+    if (!ret) {
+        (void)g_hash_table_insert(ms->remote_devs, (gpointer)g_strdup(id),
+                                  (gpointer)pdev);
+    }
+
+    g_free(data);
+}
diff --git a/include/io/proxy-link.h b/include/io/proxy-link.h
index 2ba3e614f0..e102bcc8f5 100644
--- a/include/io/proxy-link.h
+++ b/include/io/proxy-link.h
@@ -62,6 +62,7 @@ typedef struct ProxyLinkState ProxyLinkState;
  *                  from remote device
  * DEVICE_ADD       QMP/HMP command to hotplug device
  * DEVICE_DEL       QMP/HMP command to hot-unplug device
+ * DRIVE_ADD        HMP command to hotplug drive
  *
  */
 typedef enum {
@@ -76,6 +77,7 @@ typedef enum {
     DRIVE_OPTS,
     DEVICE_ADD,
     DEVICE_DEL,
+    DRIVE_ADD,
     PROXY_PING,
     MAX,
 } proc_cmd_t;
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index 5f133cae83..be2c533b9a 100644
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -138,6 +138,7 @@ extern unsigned int nb_prom_envs;
 
 /* generic hotplug */
 void hmp_drive_add(Monitor *mon, const QDict *qdict);
+void hmp_rdrive_add(Monitor *mon, const QDict *qdict);
 
 /* pcie aer error injection */
 void hmp_pcie_aer_inject_error(Monitor *mon, const QDict *qdict);
diff --git a/remote/machine.c b/remote/machine.c
index 5b03167dd5..3c9a53010e 100644
--- a/remote/machine.c
+++ b/remote/machine.c
@@ -74,6 +74,8 @@ static void remote_machine_init(Object *obj)
     MemoryRegion *system_memory, *system_io, *pci_memory;
     PCIHostState *pci_host;
     PCIDevice *pci_dev;
+    MachineState *ms;
+    MachineClass *mc;
 
     Error *error_abort = NULL;
 
@@ -116,6 +118,12 @@ static void remote_machine_init(Object *obj)
 
     pci_bus_irqs(pci_host->bus, remote_iohub_set_irq, remote_iohub_map_irq,
                  s->iohub, REMOTE_IOHUB_NB_PIRQS);
+
+    ms = MACHINE(s);
+
+    mc = MACHINE_GET_CLASS(ms);
+
+    mc->block_default_type = IF_IDE;
 }
 
 static const TypeInfo remote_machine = {
diff --git a/remote/remote-main.c b/remote/remote-main.c
index 43134762bc..860b5e30f9 100644
--- a/remote/remote-main.c
+++ b/remote/remote-main.c
@@ -234,6 +234,29 @@ fail:
     PUT_REMOTE_WAIT(wait);
 }
 
+static void process_drive_add_msg(ProcMsg *msg)
+{
+    Error *local_err = NULL;
+    const char *optstr = (const char *)msg->data2;
+    int wait = msg->fds[0];
+    QemuOpts *opts;
+    MachineClass *mc;
+
+    opts = drive_def(optstr);
+    assert(opts);
+
+    mc = MACHINE_GET_CLASS(current_machine);
+    (void)drive_new(opts, mc->block_default_type, &local_err);
+
+    if (local_err) {
+        error_report_err(local_err);
+    }
+
+    notify_proxy(wait, 1);
+
+    PUT_REMOTE_WAIT(wait);
+}
+
 static int init_drive(QDict *rqdict, Error **errp)
 {
     QemuOpts *opts;
@@ -433,6 +456,9 @@ static void process_msg(GIOCondition cond)
     case DEVICE_DEL:
         process_device_del_msg(msg);
         break;
+    case DRIVE_ADD:
+        process_drive_add_msg(msg);
+        break;
     case PROXY_PING:
         wait = msg->fds[0];
         notify_proxy(wait, (uint32_t)getpid());
@@ -464,6 +490,11 @@ int main(int argc, char *argv[])
     bdrv_init_with_whitelist();
 
     qemu_add_opts(&qemu_device_opts);
+    qemu_add_opts(&qemu_drive_opts);
+    qemu_add_drive_opts(&qemu_legacy_drive_opts);
+    qemu_add_drive_opts(&qemu_common_drive_opts);
+    qemu_add_drive_opts(&qemu_drive_opts);
+    qemu_add_drive_opts(&bdrv_runtime_opts);
 
     if (qemu_init_main_loop(&err)) {
         error_report_err(err);
-- 
2.17.1