[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1 37/37] vl: enable vhost-pci-slave
From: |
Wei Wang |
Subject: |
[Qemu-devel] [PATCH v1 37/37] vl: enable vhost-pci-slave |
Date: |
Sat, 17 Dec 2016 18:43:47 +0800 |
Enable vhost-pci-slave in vl.c
Signed-off-by: Wei Wang <address@hidden>
---
vl.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/vl.c b/vl.c
index 10d7f89..6959dba 100644
--- a/vl.c
+++ b/vl.c
@@ -123,6 +123,7 @@ int main(int argc, char **argv)
#include "sysemu/replay.h"
#include "qapi/qmp/qerror.h"
#include "sysemu/iothread.h"
+#include "hw/virtio/vhost-pci-slave.h"
#define MAX_VIRTIO_CONSOLES 1
#define MAX_SCLP_CONSOLES 1
@@ -180,6 +181,7 @@ bool boot_strict;
uint8_t *boot_splash_filedata;
size_t boot_splash_filedata_size;
uint8_t qemu_extra_params_fw[2];
+bool vhost_pci_slave_enabled;
int icount_align_option;
@@ -4064,6 +4066,7 @@ int main(int argc, char **argv, char **envp)
if (!opts) {
exit(1);
}
+ vhost_pci_slave_enabled = true;
break;
default:
os_parse_cmd_args(popt->index, optarg);
@@ -4581,6 +4584,16 @@ int main(int argc, char **argv, char **envp)
exit(1);
}
+ /* check if the vhost-pci-server is enabled */
+ if (vhost_pci_slave_enabled) {
+ int ret;
+ ret = vhost_pci_slave_init(qemu_opts_find(
+ qemu_find_opts("vhost-pci-slave"),
+ NULL));
+ if (ret < 0)
+ exit(1);
+ }
+
/* init USB devices */
if (machine_usb(current_machine)) {
if (foreach_device_config(DEV_USB, usb_parse) < 0)
@@ -4710,6 +4723,13 @@ int main(int argc, char **argv, char **envp)
pause_all_vcpus();
res_free();
+ if (vhost_pci_slave_enabled) {
+ int ret;
+ ret = vhost_pci_slave_cleanup();
+ if (ret < 0)
+ exit(1);
+ }
+
/* vhost-user must be cleaned up before chardevs. */
net_cleanup();
audio_cleanup();
--
2.7.4
- [Qemu-devel] [PATCH v1 26/37] vhost-pci-slave/msg: VHOST_USER_GET_VRING_BASE, (continued)
- [Qemu-devel] [PATCH v1 26/37] vhost-pci-slave/msg: VHOST_USER_GET_VRING_BASE, Wei Wang, 2016/12/17
- [Qemu-devel] [PATCH v1 27/37] vhost-pci-net: pass the info collected by vp_slave to the device, Wei Wang, 2016/12/17
- [Qemu-devel] [PATCH v1 30/37] vhost-pci-slave/msg: VHOST_USER_SET_VHOST_PCI (stop), Wei Wang, 2016/12/17
- [Qemu-devel] [PATCH v1 28/37] vhost-pci-net: pass the mem and vring info to the driver, Wei Wang, 2016/12/17
- [Qemu-devel] [PATCH v1 29/37] vhost-pci-slave/msg: VHOST_USER_SET_VHOST_PCI (start), Wei Wang, 2016/12/17
- [Qemu-devel] [PATCH v1 31/37] vhost-user/msg: send VHOST_USER_SET_VHOST_PCI (start/stop), Wei Wang, 2016/12/17
- [Qemu-devel] [PATCH v1 33/37] vhost-pci-net: send the negotiated feature bits to the master, Wei Wang, 2016/12/17
- [Qemu-devel] [PATCH v1 32/37] vhost-user: add asynchronous read for the vhost-user master, Wei Wang, 2016/12/17
- [Qemu-devel] [PATCH v1 34/37] vhost-pci-slave: add "peer_reset", Wei Wang, 2016/12/17
- [Qemu-devel] [PATCH v1 35/37] vhost-pci-net: start the vhost-pci-net device, Wei Wang, 2016/12/17
- [Qemu-devel] [PATCH v1 37/37] vl: enable vhost-pci-slave,
Wei Wang <=
- [Qemu-devel] [PATCH v1 36/37] vhost-user/msg: handling VHOST_USER_SET_FEATURES, Wei Wang, 2016/12/17
- Re: [Qemu-devel] [PATCH v1 00/37] Implementation of vhost-pci for inter-vm commucation, no-reply, 2016/12/17
- Re: [Qemu-devel] [PATCH v1 00/37] Implementation of vhost-pci for inter-vm commucation, no-reply, 2016/12/17