From patchwork Fri May 12 08:35:34 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: 9723747 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 E8C3B600CB for ; Fri, 12 May 2017 08:42:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DD99E2880B for ; Fri, 12 May 2017 08:42:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D245528810; Fri, 12 May 2017 08:42:45 +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 505082880B for ; Fri, 12 May 2017 08:42:45 +0000 (UTC) Received: from localhost ([::1]:52054 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d969s-0005bI-8q for patchwork-qemu-devel@patchwork.kernel.org; Fri, 12 May 2017 04:42:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44820) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d968f-0005Yp-NG for qemu-devel@nongnu.org; Fri, 12 May 2017 04:41:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d968e-0001ks-Qj for qemu-devel@nongnu.org; Fri, 12 May 2017 04:41:29 -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 1d968e-0001je-Hr for qemu-devel@nongnu.org; Fri, 12 May 2017 04:41:28 -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:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.38,328,1491289200"; d="scan'208";a="967616186" Received: from devel-ww.sh.intel.com ([10.239.48.105]) by orsmga003.jf.intel.com with ESMTP; 12 May 2017 01:41:25 -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:34 +0800 Message-Id: <1494578148-102868-3-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 02/16] vl: add the vhost-pci-slave command line option 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 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 --- qemu-options.hx | 4 ++++ vl.c | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+) 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); }