From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55481) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5AoN-0004a3-0K for qemu-devel@nongnu.org; Wed, 17 Jun 2015 06:43:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z5AoJ-0005Uv-OJ for qemu-devel@nongnu.org; Wed, 17 Jun 2015 06:43:14 -0400 Received: from cantor2.suse.de ([195.135.220.15]:52247 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5AoJ-0005Uf-Hb for qemu-devel@nongnu.org; Wed, 17 Jun 2015 06:43:11 -0400 From: Alexander Graf Date: Wed, 17 Jun 2015 12:42:46 +0200 Message-Id: <1434537789-63782-4-git-send-email-agraf@suse.de> In-Reply-To: <1434537789-63782-1-git-send-email-agraf@suse.de> References: <1434537789-63782-1-git-send-email-agraf@suse.de> Subject: [Qemu-devel] [PULL 03/26] virtio-ccw: disable ioevent bit when ioeventfds are not enabled List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Aurelien Jarno From: Aurelien Jarno This remove the corresponding error messages in TCG mode, and allow to simplify the s390_assign_subch_ioeventfd() function. Signed-off-by: Aurelien Jarno Signed-off-by: Alexander Graf --- 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 d63eb51..c20ef05 100644 --- a/target-s390x/cpu.h +++ b/target-s390x/cpu.h @@ -1215,11 +1215,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 -- 1.7.12.4