From patchwork Mon Dec 19 05:58:47 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: 9479683 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 9CD3660237 for ; Mon, 19 Dec 2016 06:10:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 84DCD2844C for ; Mon, 19 Dec 2016 06:10:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 773A22845A; Mon, 19 Dec 2016 06:10:12 +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 F28902844C for ; Mon, 19 Dec 2016 06:10:11 +0000 (UTC) Received: from localhost ([::1]:43503 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cIr9G-000489-7k for patchwork-qemu-devel@patchwork.kernel.org; Mon, 19 Dec 2016 01:10:10 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53677) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cIr07-00030C-VA for qemu-devel@nongnu.org; Mon, 19 Dec 2016 01:00:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cIr06-0004dd-Vl for qemu-devel@nongnu.org; Mon, 19 Dec 2016 01:00:43 -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 1cIr06-0004Vl-Lx for qemu-devel@nongnu.org; Mon, 19 Dec 2016 01:00:42 -0500 Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga104.jf.intel.com with ESMTP; 18 Dec 2016 22:00:42 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,372,1477983600"; d="scan'208";a="44549942" Received: from devel-ww.sh.intel.com ([10.239.48.105]) by fmsmga006.fm.intel.com with ESMTP; 18 Dec 2016 22:00:40 -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:58:47 +0800 Message-Id: <1482127152-84732-13-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 12/37] vhost-pci-slave/msg: VHOST_USER_SET_DEVICE_ID 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 Initialize the feature bits according to the device type. Signed-off-by: Wei Wang --- hw/virtio/vhost-pci-slave.c | 23 +++++++++++++++++++++++ include/hw/virtio/vhost-pci-slave.h | 1 + 2 files changed, 24 insertions(+) diff --git a/hw/virtio/vhost-pci-slave.c b/hw/virtio/vhost-pci-slave.c index 020e279..3f35649 100644 --- a/hw/virtio/vhost-pci-slave.c +++ b/hw/virtio/vhost-pci-slave.c @@ -18,6 +18,12 @@ #include "hw/virtio/vhost-pci-slave.h" #include "hw/virtio/vhost-user.h" +#define VHOST_PCI_FEATURE_BITS (1ULL << VIRTIO_F_VERSION_1) + +#define VHOST_PCI_NET_FEATURE_BITS ((1ULL << VIRTIO_NET_F_MRG_RXBUF) | \ + (1ULL << VIRTIO_NET_F_CTRL_VQ) | \ + (1ULL << VIRTIO_NET_F_MQ)) + VhostPCISlave *vp_slave; static int vp_slave_write(CharBackend *chr_be, VhostUserMsg *msg) @@ -72,6 +78,20 @@ static int vp_slave_get_protocol_features(CharBackend *chr_be, return vp_slave_write(chr_be, msg); } +static void vp_slave_set_device_type(VhostUserMsg *msg) +{ + vp_slave->dev_type = (uint16_t)msg->payload.u64; + + switch (vp_slave->dev_type) { + case VIRTIO_ID_NET: + vp_slave->feature_bits |= (VHOST_PCI_FEATURE_BITS + | VHOST_PCI_NET_FEATURE_BITS); + break; + default: + error_report("device type %d is not supported", vp_slave->dev_type); + } +} + static int vp_slave_can_read(void *opaque) { return VHOST_USER_HDR_SIZE; @@ -123,6 +143,9 @@ static void vp_slave_read(void *opaque, const uint8_t *buf, int size) break; case VHOST_USER_SET_PROTOCOL_FEATURES: break; + case VHOST_USER_SET_DEVICE_ID: + vp_slave_set_device_type(&msg); + break; default: error_report("vhost-pci-slave does not support msg request = %d", msg.request); diff --git a/include/hw/virtio/vhost-pci-slave.h b/include/hw/virtio/vhost-pci-slave.h index 4ec25d4..8b162dc 100644 --- a/include/hw/virtio/vhost-pci-slave.h +++ b/include/hw/virtio/vhost-pci-slave.h @@ -5,6 +5,7 @@ typedef struct VhostPCISlave { CharBackend chr_be; + uint16_t dev_type; uint64_t feature_bits; } VhostPCISlave;