From patchwork Sat Dec 17 10:43:15 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: 9478937 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 E7E0260827 for ; Sat, 17 Dec 2016 10:51:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E60AA28546 for ; Sat, 17 Dec 2016 10:51:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DAAF228587; Sat, 17 Dec 2016 10:51:01 +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 8160C28546 for ; Sat, 17 Dec 2016 10:51:01 +0000 (UTC) Received: from localhost ([::1]:35994 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cICZw-0003dv-Hd for patchwork-qemu-devel@patchwork.kernel.org; Sat, 17 Dec 2016 05:51:00 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53144) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cICUF-0007CF-Jk for qemu-devel@nongnu.org; Sat, 17 Dec 2016 05:45:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cICUE-0007wb-LA for qemu-devel@nongnu.org; Sat, 17 Dec 2016 05:45:07 -0500 Received: from mga05.intel.com ([192.55.52.43]:21540) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cICUE-0007ss-CR for qemu-devel@nongnu.org; Sat, 17 Dec 2016 05:45:06 -0500 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga105.fm.intel.com with ESMTP; 17 Dec 2016 02:45:05 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.33,363,1477983600"; d="scan'208"; a="1073174367" Received: from devel-ww.sh.intel.com ([10.239.48.105]) by orsmga001.jf.intel.com with ESMTP; 17 Dec 2016 02:45:04 -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: Sat, 17 Dec 2016 18:43:15 +0800 Message-Id: <1481971427-11094-6-git-send-email-wei.w.wang@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1481971427-11094-1-git-send-email-wei.w.wang@intel.com> References: <1481971427-11094-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.43 Subject: [Qemu-devel] [PATCH v1 05/37] vhost-pci-slave: start the implementation of 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 Vhost-pci-slave uses a QEMU socket to talk to the master. This patch associates the slave with the qemu sever socket. Signed-off-by: Wei Wang --- hw/virtio/Makefile.objs | 1 + hw/virtio/vhost-pci-slave.c | 53 +++++++++++++++++++++++++++++++++++++ include/hw/virtio/vhost-pci-slave.h | 16 +++++++++++ 3 files changed, 70 insertions(+) create mode 100644 hw/virtio/vhost-pci-slave.c create mode 100644 include/hw/virtio/vhost-pci-slave.h diff --git a/hw/virtio/Makefile.objs b/hw/virtio/Makefile.objs index 95c4c30..3af6787 100644 --- a/hw/virtio/Makefile.objs +++ b/hw/virtio/Makefile.objs @@ -2,6 +2,7 @@ common-obj-y += virtio-rng.o common-obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o common-obj-y += virtio-bus.o common-obj-y += virtio-mmio.o +common-obj-y += vhost-pci-slave.o obj-y += virtio.o virtio-balloon.o obj-$(CONFIG_LINUX) += vhost.o vhost-backend.o vhost-user.o diff --git a/hw/virtio/vhost-pci-slave.c b/hw/virtio/vhost-pci-slave.c new file mode 100644 index 0000000..5ff9a09 --- /dev/null +++ b/hw/virtio/vhost-pci-slave.c @@ -0,0 +1,53 @@ +/* + * Vhost-pci Slave + * + * Copyright Intel Corp. 2016 + * + * Authors: + * Wei Wang + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ + +#include + +#include "qapi/error.h" +#include "qemu/error-report.h" +#include "hw/virtio/vhost-pci-slave.h" + +VhostPCISlave *vp_slave; + +static CharDriverState *vp_slave_parse_chardev(const char *id) +{ + CharDriverState *chr = qemu_chr_find(id); + if (chr == NULL) { + error_report("chardev \"%s\" not found", id); + return NULL; + } + + return chr; +} + +int vhost_pci_slave_init(QemuOpts *opts) +{ + CharDriverState *chr; + const char *chardev_id = qemu_opt_get(opts, "chardev"); + + vp_slave = (VhostPCISlave *)g_malloc(sizeof(VhostPCISlave)); + chr = vp_slave_parse_chardev(chardev_id); + if (!chr) { + return -1; + } + qemu_chr_fe_init(&vp_slave->chr_be, chr, &error_abort); + + return 0; +} + +int vhost_pci_slave_cleanup(void) +{ + qemu_chr_fe_deinit(&vp_slave->chr_be); + g_free(vp_slave); + + return 0; +} diff --git a/include/hw/virtio/vhost-pci-slave.h b/include/hw/virtio/vhost-pci-slave.h new file mode 100644 index 0000000..c82c775 --- /dev/null +++ b/include/hw/virtio/vhost-pci-slave.h @@ -0,0 +1,16 @@ +#ifndef QEMU_VHOST_PCI_SLAVE_H +#define QEMU_VHOST_PCI_SLAVE_H + +#include "sysemu/char.h" + +typedef struct VhostPCISlave { + CharBackend chr_be; +} VhostPCISlave; + +extern VhostPCISlave *vp_slave; + +extern int vhost_pci_slave_init(QemuOpts *opts); + +extern int vhost_pci_slave_cleanup(void); + +#endif