diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2015-06-15 17:57:02 +0200 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2015-06-17 12:40:50 +0200 |
| commit | a499973ff32bc58f2db7b88ad5597ffdbc2becd7 (patch) | |
| tree | de17a88168cddb2da128aed5f4bce6daa31564ad | |
| parent | d49f4ab48ec76e590ad72a2d6c3fba8459d3ded7 (diff) | |
| download | qemu-a499973ff32bc58f2db7b88ad5597ffdbc2becd7.zip qemu-a499973ff32bc58f2db7b88ad5597ffdbc2becd7.tar.gz qemu-a499973ff32bc58f2db7b88ad5597ffdbc2becd7.tar.bz2 | |
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 <aurelien@aurel32.net>
Signed-off-by: Alexander Graf <agraf@suse.de>
| -rw-r--r-- | hw/s390x/virtio-ccw.c | 4 | ||||
| -rw-r--r-- | 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 |