From nobody Fri May 3 05:11:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1499068312255587.28199596244; Mon, 3 Jul 2017 00:51:52 -0700 (PDT) Received: from localhost ([::1]:60953 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dRw98-0007sO-RD for importer@patchew.org; Mon, 03 Jul 2017 03:51:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47900) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dRvxB-0006JI-R8 for qemu-devel@nongnu.org; Mon, 03 Jul 2017 03:39:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dRvx8-00012L-OP for qemu-devel@nongnu.org; Mon, 03 Jul 2017 03:39:29 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:44681 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dRvx8-000122-IN for qemu-devel@nongnu.org; Mon, 03 Jul 2017 03:39:26 -0400 Received: from pps.filterd (m0098414.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v637dNi2052128 for ; Mon, 3 Jul 2017 03:39:25 -0400 Received: from e06smtp15.uk.ibm.com (e06smtp15.uk.ibm.com [195.75.94.111]) by mx0b-001b2d01.pphosted.com with ESMTP id 2bf13v4fm3-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Mon, 03 Jul 2017 03:39:24 -0400 Received: from localhost by e06smtp15.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 3 Jul 2017 08:38:50 +0100 Received: from b06cxnps3075.portsmouth.uk.ibm.com (9.149.109.195) by e06smtp15.uk.ibm.com (192.168.101.145) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 3 Jul 2017 08:38:47 +0100 Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v637cljg19792264; Mon, 3 Jul 2017 07:38:47 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3C89E52047; Mon, 3 Jul 2017 07:35:15 +0100 (BST) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTPS id 2ACAD52045; Mon, 3 Jul 2017 07:35:15 +0100 (BST) Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 5569) id 27A6C20F67C; Mon, 3 Jul 2017 09:38:47 +0200 (CEST) From: QingFeng Hao To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Mon, 3 Jul 2017 09:38:36 +0200 X-Mailer: git-send-email 2.11.2 In-Reply-To: <20170703073836.72092-1-haoqf@linux.vnet.ibm.com> References: <20170703073836.72092-1-haoqf@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 17070307-0020-0000-0000-0000039795E9 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17070307-0021-0000-0000-0000421AFAA9 Message-Id: <20170703073836.72092-2-haoqf@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-07-03_04:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1703280000 definitions=main-1707030126 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.158.5 Subject: [Qemu-devel] [PATCH 1/1] virtio-scsi-ccw: use ioeventfd even when KVM is disabled 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: kwolf@redhat.com, zyimin@linux.vnet.ibm.com, famz@redhat.com, QingFeng Hao , peterx@redhat.com, borntraeger@de.ibm.com, stefanha@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Do not check kvm_eventfds_enabled() when KVM is disabled since it always returns 0. Since commit 8c56c1a592b5092d91da8d8943c17777d6462a6f ("memory: emulate ioeventfd") it has been possible to use ioeventfds in qtest or TCG mode. This patch makes -device virtio-scsi-ccw,iothread=3Diothread0 work even when KVM is disabled. I have tested that virtio-scsi-ccw works under tcg both with and without iothread. This patch fixes qemu-iotests 068, which was accidentally merged early despite the dependency on ioeventfd. Signed-off-by: QingFeng Hao Signed-off-by: Stefan Hajnoczi --- hw/s390x/virtio-ccw.c | 2 +- target/s390x/kvm.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 90d37cb9ff..35896eb007 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -711,7 +711,7 @@ static void virtio_ccw_device_realize(VirtioCcwDevice *= dev, Error **errp) sch->cssid, sch->ssid, sch->schid, sch->devno, ccw_dev->devno.valid ? "user-configured" : "auto-configured"); =20 - if (!kvm_eventfds_enabled()) { + if (kvm_enabled() && !kvm_eventfds_enabled()) { dev->flags &=3D ~VIRTIO_CCW_FLAG_USE_IOEVENTFD; } =20 diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c index a3d00196f4..c37f9c3b9e 100644 --- a/target/s390x/kvm.c +++ b/target/s390x/kvm.c @@ -2220,6 +2220,9 @@ int kvm_s390_assign_subch_ioeventfd(EventNotifier *no= tifier, uint32_t sch, .addr =3D sch, .len =3D 8, }; + if (!kvm_enabled()) { + return 0; + } if (!kvm_check_extension(kvm_state, KVM_CAP_IOEVENTFD)) { return -ENOSYS; } --=20 2.11.2