From patchwork Tue Nov 4 12:47:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 406599 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id A2D22140079 for ; Tue, 4 Nov 2014 23:49:50 +1100 (AEDT) Received: from localhost ([::1]:40260 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XldYS-0005Jv-IJ for incoming@patchwork.ozlabs.org; Tue, 04 Nov 2014 07:49:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54026) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XldXp-0004Jl-8E for qemu-devel@nongnu.org; Tue, 04 Nov 2014 07:49:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XldXj-0002M0-IV for qemu-devel@nongnu.org; Tue, 04 Nov 2014 07:49:09 -0500 Received: from szxga01-in.huawei.com ([119.145.14.64]:25756) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XldXi-0002Lg-MH for qemu-devel@nongnu.org; Tue, 04 Nov 2014 07:49:03 -0500 Received: from 172.24.2.119 (EHLO szxeml420-hub.china.huawei.com) ([172.24.2.119]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CDX79444; Tue, 04 Nov 2014 20:48:55 +0800 (CST) Received: from HGHY1Z002260041.china.huawei.com (10.177.16.142) by szxeml420-hub.china.huawei.com (10.82.67.159) with Microsoft SMTP Server id 14.3.158.1; Tue, 4 Nov 2014 20:48:48 +0800 From: Shannon Zhao To: Date: Tue, 4 Nov 2014 20:47:32 +0800 Message-ID: <1415105252-14600-5-git-send-email-zhaoshenglong@huawei.com> X-Mailer: git-send-email 1.9.0.msysgit.0 In-Reply-To: <1415105252-14600-1-git-send-email-zhaoshenglong@huawei.com> References: <1415105252-14600-1-git-send-email-zhaoshenglong@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.177.16.142] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 119.145.14.64 Cc: peter.maydell@linaro.org, hangaohuai@huawei.com, yingshiuan.pan@gmail.com, mst@redhat.com, john.liuli@huawei.com, peter.huangpeng@huawei.com, n.nikolaev@virtualopensystems.com Subject: [Qemu-devel] [PATCH 4/4] virtio-mmio: add a new property for ioeventfd X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Make ioeventfd could be enabled or disabled (default). Since ioeventfd is not yet ready in kvm-arm, without this option, qemu will get a problem if it attempts to initialize ioeventfd. Signed-off-by: Ying-Shiuan Pan Signed-off-by: Li Liu Signed-off-by: Shannon Zhao --- hw/net/virtio-net.c | 1 + hw/virtio/virtio-mmio.c | 3 ++- include/hw/virtio/virtio.h | 1 + 3 files changed, 4 insertions(+), 1 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 9b88775..d89d4a6 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -1723,6 +1723,7 @@ static Property virtio_net_properties[] = { TX_TIMER_INTERVAL), DEFINE_PROP_INT32("x-txburst", VirtIONet, net_conf.txburst, TX_BURST), DEFINE_PROP_STRING("tx", VirtIONet, net_conf.tx), + DEFINE_PROP_BOOL("ioeventfd", VirtIONet, parent_obj.use_ioeventfd, false), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c index c543e71..16697ed 100644 --- a/hw/virtio/virtio-mmio.c +++ b/hw/virtio/virtio-mmio.c @@ -124,7 +124,8 @@ static void virtio_mmio_start_ioeventfd(VirtIOMMIOProxy *proxy) VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus); int n, r; - if (proxy->ioeventfd_disabled || + if (!vdev->use_ioeventfd || + proxy->ioeventfd_disabled || proxy->ioeventfd_started) { return; } diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h index 0726d76..e4bc8ad 100644 --- a/include/hw/virtio/virtio.h +++ b/include/hw/virtio/virtio.h @@ -127,6 +127,7 @@ struct VirtIODevice bool vm_running; VMChangeStateEntry *vmstate; char *bus_name; + bool use_ioeventfd; uint8_t device_endian; };