[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/10] virtio-ccw: disable ioevent bit when ioeventf
From: |
Aurelien Jarno |
Subject: |
[Qemu-devel] [PATCH 03/10] virtio-ccw: disable ioevent bit when ioeventfds are not enabled |
Date: |
Mon, 15 Jun 2015 17:57:02 +0200 |
This remove the corresponding error messages in TCG mode, and allow to
simplify the s390_assign_subch_ioeventfd() function.
CC: Cornelia Huck <address@hidden>
Cc: Christian Borntraeger <address@hidden>
Cc: Alexander Graf <address@hidden>
Signed-off-by: Aurelien Jarno <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 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
--
2.1.4
- [Qemu-devel] [PATCH 00/10] target-s390x: add support for CCW in TCG mode, Aurelien Jarno, 2015/06/15
- [Qemu-devel] [PATCH 02/10] s390/ioinst: fix endianness in ioinst_schib_valid, Aurelien Jarno, 2015/06/15
- [Qemu-devel] [PATCH 07/10] target-s390x: fix s390_cpu_initial_reset, Aurelien Jarno, 2015/06/15
- [Qemu-devel] [PATCH 06/10] target-s390x: initialize I/O interrupt queue, Aurelien Jarno, 2015/06/15
- [Qemu-devel] [PATCH 05/10] target-s390x: correctly initialize ext interrupt queue, Aurelien Jarno, 2015/06/15
- [Qemu-devel] [PATCH 01/10] s390/ioinst: fix IO_INT_WORD_ISC macro, Aurelien Jarno, 2015/06/15
- [Qemu-devel] [PATCH 08/10] target-s390x: wire up DIAG IPL in TCG mode, Aurelien Jarno, 2015/06/15
- [Qemu-devel] [PATCH 03/10] virtio-ccw: disable ioevent bit when ioeventfds are not enabled,
Aurelien Jarno <=
- [Qemu-devel] [PATCH 10/10] target-s390x: wire up I/O instructions in TCG mode, Aurelien Jarno, 2015/06/15
- [Qemu-devel] [PATCH 04/10] target-s390x: fix setcc in TCG mode, Aurelien Jarno, 2015/06/15
- [Qemu-devel] [PATCH 09/10] target-s390x: wire up DIAG REIPL in TCG mode, Aurelien Jarno, 2015/06/15
- Re: [Qemu-devel] [PATCH 00/10] target-s390x: add support for CCW in TCG mode, Alexander Graf, 2015/06/16