[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/26] virtio-ccw: disable ioevent bit when ioeventfd
From: |
Alexander Graf |
Subject: |
[Qemu-devel] [PULL 03/26] virtio-ccw: disable ioevent bit when ioeventfds are not enabled |
Date: |
Wed, 17 Jun 2015 12:42:46 +0200 |
From: Aurelien Jarno <address@hidden>
This remove the corresponding error messages in TCG mode, and allow to
simplify the s390_assign_subch_ioeventfd() function.
Signed-off-by: Aurelien Jarno <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>
---
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
- [Qemu-devel] [PULL 00/26] s390 patch queue 2015-06-17, Alexander Graf, 2015/06/17
- [Qemu-devel] [PULL 04/26] target-s390x: fix setcc in TCG mode, Alexander Graf, 2015/06/17
- [Qemu-devel] [PULL 06/26] target-s390x: initialize I/O interrupt queue, Alexander Graf, 2015/06/17
- [Qemu-devel] [PULL 15/26] target-s390x: add PER related constants, Alexander Graf, 2015/06/17
- [Qemu-devel] [PULL 03/26] virtio-ccw: disable ioevent bit when ioeventfds are not enabled,
Alexander Graf <=
- [Qemu-devel] [PULL 09/26] target-s390x: wire up DIAG REIPL in TCG mode, Alexander Graf, 2015/06/17
- [Qemu-devel] [PULL 05/26] target-s390x: correctly initialize ext interrupt queue, Alexander Graf, 2015/06/17
- [Qemu-devel] [PULL 01/26] s390/ioinst: fix IO_INT_WORD_ISC macro, Alexander Graf, 2015/06/17
- [Qemu-devel] [PULL 12/26] target-s390x: function to adjust the length wrt page boundary, Alexander Graf, 2015/06/17
- [Qemu-devel] [PULL 16/26] target-s390x: add get_per_atmid function, Alexander Graf, 2015/06/17
- [Qemu-devel] [PULL 11/26] softmmu: provide tlb_vaddr_to_host function for user mode, Alexander Graf, 2015/06/17
- [Qemu-devel] [PULL 26/26] s390x: Switch to s390-ccw machine as default, Alexander Graf, 2015/06/17
- [Qemu-devel] [PULL 23/26] target-s390x: PER store-using-real-address event support, Alexander Graf, 2015/06/17
- [Qemu-devel] [PULL 07/26] target-s390x: fix s390_cpu_initial_reset, Alexander Graf, 2015/06/17
- [Qemu-devel] [PULL 20/26] target-s390x: PER instruction-fetch event support, Alexander Graf, 2015/06/17