[v2,02/16] vl: add the vhost-pci-slave command line option

Commit Message

Wang, Wei W May 12, 2017, 8:35 a.m. UTC

An example of the QEMU command to create a vhost-pci-slave is:
-chardev socket,id=slave1,server,wait=off,path=${PATH_SLAVE1}
-vhost-pci-slave socket,chardev=slave1

The master can connect to the slave as usual:
-chardev socket,id=sock2,path=${PATH_SLAVE1}
-netdev type=vhost-user,id=net2,chardev=sock2,vhostforce
-device virtio-net-pci,mac=52:54:00:00:00:02,netdev=net2

Signed-off-by: Wei Wang <[e-mail]>
---
 qemu-options.hx |  4 ++++
 vl.c            | 22 ++++++++++++++++++++++
 2 files changed, 26 insertions(+)

Patch

diff --git a/qemu-options.hx b/qemu-options.hx
index 99af8ed..a795850 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -4152,6 +4152,10 @@  contents of @code{iv.b64} to the second secret
 
 ETEXI
 
+DEF("vhost-pci-slave", HAS_ARG, QEMU_OPTION_vhost_pci_slave,
+    "-vhost-pci-slave socket,chrdev={id}\n"
+    "                  creates a vhost-pci-slave",
+    QEMU_ARCH_I386)
 
 HXCOMM This is the last statement. Insert new options before this line!
 STEXI
diff --git a/vl.c b/vl.c
index 0b4ed52..2ee4713 100644
--- a/vl.c
+++ b/vl.c
@@ -540,6 +540,20 @@  static QemuOptsList qemu_fw_cfg_opts = {
     },
 };
 
+static QemuOptsList qemu_vhost_pci_slave_opts = {
+    .name = "vhost-pci-slave",
+    .implied_opt_name = "chardev",
+    .head = QTAILQ_HEAD_INITIALIZER(qemu_vhost_pci_slave_opts.head),
+    .desc = {
+        /*
+         * no elements => accept any
+         * sanity checking will happen later
+         * when setting device properties
+         */
+        { /* end of list */ }
+    },
+};
+
 /**
  * Get machine options
  *
@@ -3027,6 +3041,7 @@  int main(int argc, char **argv, char **envp)
     qemu_add_opts(&qemu_icount_opts);
     qemu_add_opts(&qemu_semihosting_config_opts);
     qemu_add_opts(&qemu_fw_cfg_opts);
+    qemu_add_opts(&qemu_vhost_pci_slave_opts);
     module_call_init(MODULE_INIT_OPTS);
 
     runstate_init();
@@ -4039,6 +4054,13 @@  int main(int argc, char **argv, char **envp)
                     exit(1);
                 }
                 break;
+            case QEMU_OPTION_vhost_pci_slave:
+                opts = qemu_opts_parse_noisily(
+                           qemu_find_opts("vhost-pci-slave"), optarg, false);
+                if (!opts) {
+                    exit(1);
+                }
+                break;
             default:
                 os_parse_cmd_args(popt->index, optarg);
             }