From patchwork Mon Jun 15 15:57:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurelien Jarno X-Patchwork-Id: 484409 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 0E4FF1401F6 for ; Tue, 16 Jun 2015 02:00:10 +1000 (AEST) Received: from localhost ([::1]:35042 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4Wnw-0005wu-28 for incoming@patchwork.ozlabs.org; Mon, 15 Jun 2015 12:00:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48651) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4WlB-0000kh-S5 for qemu-devel@nongnu.org; Mon, 15 Jun 2015 11:57:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z4WlA-0003Jw-A1 for qemu-devel@nongnu.org; Mon, 15 Jun 2015 11:57:17 -0400 Received: from hall.aurel32.net ([2001:bc8:30d7:101::1]:47754) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4Wl9-0003HO-U9 for qemu-devel@nongnu.org; Mon, 15 Jun 2015 11:57:16 -0400 Received: from weber.rr44.fr ([2001:470:d4ed:0:7e05:7ff:fe0d:f152]) by hall.aurel32.net with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84) (envelope-from ) id 1Z4Wl7-0001RD-UX; Mon, 15 Jun 2015 17:57:14 +0200 Received: from aurel32 by weber.rr44.fr with local (Exim 4.85) (envelope-from ) id 1Z4Wl6-00009p-W7; Mon, 15 Jun 2015 17:57:13 +0200 From: Aurelien Jarno To: qemu-devel@nongnu.org Date: Mon, 15 Jun 2015 17:57:02 +0200 Message-Id: <1434383829-26451-4-git-send-email-aurelien@aurel32.net> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1434383829-26451-1-git-send-email-aurelien@aurel32.net> References: <1434383829-26451-1-git-send-email-aurelien@aurel32.net> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:bc8:30d7:101::1 Cc: Cornelia Huck , Christian Borntraeger , Alexander Graf , Aurelien Jarno , Richard Henderson Subject: [Qemu-devel] [PATCH 03/10] virtio-ccw: disable ioevent bit when ioeventfds are not enabled 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 This remove the corresponding error messages in TCG mode, and allow to simplify the s390_assign_subch_ioeventfd() function. CC: Cornelia Huck Cc: Christian Borntraeger Cc: Alexander Graf Signed-off-by: Aurelien Jarno --- hw/s390x/virtio-ccw.c | 4 ++++ target-s390x/cpu.h | 6 +----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index b7a88d6..e32ada9 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -1401,6 +1401,10 @@ static void virtio_ccw_device_plugged(DeviceState *d, Error **errp) return; } + if (!kvm_eventfds_enabled()) { + dev->flags &= ~VIRTIO_CCW_FLAG_USE_IOEVENTFD; + } + sch->id.cu_model = virtio_bus_get_vdev_id(&dev->bus); css_generate_sch_crws(sch->cssid, sch->ssid, sch->schid, diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h index 584e74b..08a79dd 100644 --- a/target-s390x/cpu.h +++ b/target-s390x/cpu.h @@ -1214,11 +1214,7 @@ static inline int s390_assign_subch_ioeventfd(EventNotifier *notifier, uint32_t sch_id, int vq, bool assign) { - if (kvm_enabled()) { - return kvm_s390_assign_subch_ioeventfd(notifier, sch_id, vq, assign); - } else { - return -ENOSYS; - } + return kvm_s390_assign_subch_ioeventfd(notifier, sch_id, vq, assign); } #ifdef CONFIG_KVM