From patchwork Mon Dec 19 05:59:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Wei W" X-Patchwork-Id: 9479723 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 89EC4601C0 for ; Mon, 19 Dec 2016 06:32:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7BCD728339 for ; Mon, 19 Dec 2016 06:32:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 702452845C; Mon, 19 Dec 2016 06:32:06 +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 BD27628339 for ; Mon, 19 Dec 2016 06:32:05 +0000 (UTC) Received: from localhost ([::1]:43621 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cIrUQ-0006P1-K7 for patchwork-qemu-devel@patchwork.kernel.org; Mon, 19 Dec 2016 01:32:02 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53961) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cIr0b-0003Pf-5x for qemu-devel@nongnu.org; Mon, 19 Dec 2016 01:01:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cIr0a-0004nc-92 for qemu-devel@nongnu.org; Mon, 19 Dec 2016 01:01:13 -0500 Received: from mga06.intel.com ([134.134.136.31]:33815) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cIr0Z-0004Vl-W6 for qemu-devel@nongnu.org; Mon, 19 Dec 2016 01:01:12 -0500 Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga104.jf.intel.com with ESMTP; 18 Dec 2016 22:01:11 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,372,1477983600"; d="scan'208";a="44550174" Received: from devel-ww.sh.intel.com ([10.239.48.105]) by fmsmga006.fm.intel.com with ESMTP; 18 Dec 2016 22:01:09 -0800 From: Wei Wang To: marcandre.lureau@gmail.com, mst@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, qemu-devel@nongnu.org, virtio-dev@lists.oasis-open.org Date: Mon, 19 Dec 2016 13:59:04 +0800 Message-Id: <1482127152-84732-30-git-send-email-wei.w.wang@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1482127152-84732-1-git-send-email-wei.w.wang@intel.com> References: <1482127152-84732-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: 134.134.136.31 Subject: [Qemu-devel] [RESEND Patch v1 29/37] vhost-pci-slave/msg: VHOST_USER_SET_VHOST_PCI (start) 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 The VHOST_USER_SET_VHOST_PCI msg is used to request the start or stop of the vhost-pci device. This patch handles the start commandin the slave. When receiving the SET_VHOST_PCI request with the start command, the slave creates a vhost-pci device based on the previously received virtio_id. Signed-off-by: Wei Wang --- hw/virtio/vhost-pci-slave.c | 53 ++++++++++++++++++++++++++++++++++++++++++ include/hw/virtio/vhost-user.h | 5 ++++ 2 files changed, 58 insertions(+) diff --git a/hw/virtio/vhost-pci-slave.c b/hw/virtio/vhost-pci-slave.c index ff9a251..5c16365 100644 --- a/hw/virtio/vhost-pci-slave.c +++ b/hw/virtio/vhost-pci-slave.c @@ -13,6 +13,7 @@ #include #include +#include "monitor/qdev.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "hw/virtio/virtio-pci.h" @@ -267,6 +268,52 @@ static void vp_slave_set_vring_enable(VhostUserMsg *msg) } } +static int vp_slave_device_create(uint16_t virtio_id) +{ + Error *local_err = NULL; + QemuOpts *opts; + DeviceState *dev; + char params[50]; + + switch (virtio_id) { + case VIRTIO_ID_NET: + strcpy(params, "driver=vhost-pci-net-pci,id=vhost-pci-0"); + break; + default: + error_report("vhost-pci device create: device type %d not supported", + virtio_id); + } + + opts = qemu_opts_parse_noisily(qemu_find_opts("device"), params, true); + dev = qdev_device_add(opts, &local_err); + if (!dev) { + qemu_opts_del(opts); + return -1; + } + object_unref(OBJECT(dev)); + return 0; +} + +static int vp_slave_set_vhost_pci(CharBackend *chr_be, VhostUserMsg *msg) +{ + int ret; + uint8_t cmd = (uint8_t)msg->payload.u64; + + switch (cmd) { + case VHOST_USER_SET_VHOST_PCI_start: + ret = vp_slave_device_create(vp_slave->dev_type); + if (ret < 0) { + return ret; + } + break; + default: + error_report("slave pconnection: cmd %d not supported yet", cmd); + return -1; + } + + return ret; +} + static int vp_slave_can_read(void *opaque) { return VHOST_USER_HDR_SIZE; @@ -382,6 +429,12 @@ static void vp_slave_read(void *opaque, const uint8_t *buf, int size) break; case VHOST_USER_SEND_RARP: break; + case VHOST_USER_SET_VHOST_PCI: + ret = vp_slave_set_vhost_pci(chr_be, &msg); + if (ret < 0) { + goto err_handling; + } + break; default: error_report("vhost-pci-slave does not support msg request = %d", msg.request); diff --git a/include/hw/virtio/vhost-user.h b/include/hw/virtio/vhost-user.h index e79a2ec..bf8c6ee 100644 --- a/include/hw/virtio/vhost-user.h +++ b/include/hw/virtio/vhost-user.h @@ -25,6 +25,10 @@ enum VhostUserProtocolFeature { (1ULL << VHOST_USER_PROTOCOL_F_VHOST_PCI) | \ (1ULL << VHOST_USER_PROTOCOL_F_SET_DEVICE_ID)) +/* control/status of the vhost-pci device */ +#define VHOST_USER_SET_VHOST_PCI_start 0 +#define VHOST_USER_SET_VHOST_PCI_stop 1 + typedef enum VhostUserRequest { VHOST_USER_NONE = 0, VHOST_USER_GET_FEATURES = 1, @@ -47,6 +51,7 @@ typedef enum VhostUserRequest { VHOST_USER_SET_VRING_ENABLE = 18, VHOST_USER_SEND_RARP = 19, VHOST_USER_SET_DEVICE_ID = 20, + VHOST_USER_SET_VHOST_PCI = 21, VHOST_USER_MAX } VhostUserRequest;