From patchwork Fri May 12 08:35:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Wei W" X-Patchwork-Id: 9723777 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B5F56600CB for ; Fri, 12 May 2017 08:53:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AC32C287FE for ; Fri, 12 May 2017 08:53:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9F8A128810; Fri, 12 May 2017 08:53:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 15FFE287FE for ; Fri, 12 May 2017 08:53:11 +0000 (UTC) Received: from localhost ([::1]:52116 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d96Jy-0006S1-4w for patchwork-qemu-devel@patchwork.kernel.org; Fri, 12 May 2017 04:53:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45094) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d9697-0005xh-Aw for qemu-devel@nongnu.org; Fri, 12 May 2017 04:41:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d9693-0002BZ-UX for qemu-devel@nongnu.org; Fri, 12 May 2017 04:41:57 -0400 Received: from mga11.intel.com ([192.55.52.93]:62480) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d9693-0001je-KI for qemu-devel@nongnu.org; Fri, 12 May 2017 04:41:53 -0400 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 May 2017 01:41:53 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.38,328,1491289200"; d="scan'208";a="967616328" Received: from devel-ww.sh.intel.com ([10.239.48.105]) by orsmga003.jf.intel.com with ESMTP; 12 May 2017 01:41:51 -0700 From: Wei Wang To: stefanha@gmail.com, marcandre.lureau@gmail.com, mst@redhat.com, jasowang@redhat.com, pbonzini@redhat.com, virtio-dev@lists.oasis-open.org, qemu-devel@nongnu.org Date: Fri, 12 May 2017 16:35:48 +0800 Message-Id: <1494578148-102868-17-git-send-email-wei.w.wang@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494578148-102868-1-git-send-email-wei.w.wang@intel.com> References: <1494578148-102868-1-git-send-email-wei.w.wang@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.93 Subject: [Qemu-devel] [PATCH v2 16/16] vl: enable vhost-pci-slave X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Wei Wang Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Enable the use of vhost-pci. The init and cleanup stub functions are added for the platforms that do not support the use of virtio. Signed-off-by: Wei Wang --- hw/virtio/vhost-stub.c | 11 +++++++++++ vl.c | 24 ++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/hw/virtio/vhost-stub.c b/hw/virtio/vhost-stub.c index e130791..bfb73df 100644 --- a/hw/virtio/vhost-stub.c +++ b/hw/virtio/vhost-stub.c @@ -1,6 +1,7 @@ #include "qemu/osdep.h" #include "hw/virtio/vhost.h" #include "hw/virtio/vhost-user.h" +#include "hw/virtio/vhost-pci-slave.h" bool vhost_has_free_slot(void) { @@ -16,3 +17,13 @@ int vhost_user_can_read(void *opaque) { return 0; } + +int vhost_pci_slave_init(QemuOpts *opt) +{ + return -1; +} + +int vhost_pci_slave_cleanup(void) +{ + return -1; +} diff --git a/vl.c b/vl.c index 2ee4713..18102d7 100644 --- a/vl.c +++ b/vl.c @@ -129,6 +129,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 @@ -187,6 +188,7 @@ uint8_t *boot_splash_filedata; size_t boot_splash_filedata_size; uint8_t qemu_extra_params_fw[2]; int only_migratable; /* turn it off unless user states otherwise */ +bool vhost_pci_slave_enabled; int icount_align_option; @@ -4060,6 +4062,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); @@ -4591,6 +4594,18 @@ 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) { + error_report("vhost-pci-slave init failed"); + exit(1); + } + } + /* init USB devices */ if (machine_usb(current_machine)) { if (foreach_device_config(DEV_USB, usb_parse) < 0) @@ -4736,6 +4751,15 @@ 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) { + error_report("vhost-pci-slave init failed"); + exit(1); + } + } + /* vhost-user must be cleaned up before chardevs. */ net_cleanup(); audio_cleanup();