From a499973ff32bc58f2db7b88ad5597ffdbc2becd7 Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Mon, 15 Jun 2015 17:57:02 +0200 Subject: [PATCH] virtio-ccw: disable ioevent bit when ioeventfds are not enabled 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 b7a88d6d16..e32ada9bf1 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 d63eb51186..c20ef05136 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 -- 2.11.4.GIT