[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/17] s390x: Dispatch interrupts to KVM or the real
From: |
Alexander Graf |
Subject: |
[Qemu-devel] [PATCH 08/17] s390x: Dispatch interrupts to KVM or the real CPU |
Date: |
Fri, 15 Apr 2011 17:32:49 +0200 |
The KVM interrupt injection path is non-generic for now. So we need to push
knowledge of how to inject a device interrupt using KVM into the actual device
code.
Signed-off-by: Alexander Graf <address@hidden>
---
hw/s390-virtio-bus.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/hw/s390-virtio-bus.c b/hw/s390-virtio-bus.c
index 175e5cb..bb49e39 100644
--- a/hw/s390-virtio-bus.c
+++ b/hw/s390-virtio-bus.c
@@ -43,6 +43,8 @@
do { } while (0)
#endif
+#define VIRTIO_EXT_CODE 0x2603
+
struct BusInfo s390_virtio_bus_info = {
.name = "s390-virtio",
.size = sizeof(VirtIOS390Bus),
@@ -305,9 +307,13 @@ static void virtio_s390_notify(void *opaque, uint16_t
vector)
{
VirtIOS390Device *dev = (VirtIOS390Device*)opaque;
uint64_t token = s390_virtio_device_vq_token(dev, vector);
+ CPUState *env = s390_cpu_addr2state(0);
- /* XXX kvm dependency! */
- kvm_s390_virtio_irq(s390_cpu_addr2state(0), 0, token);
+ if (kvm_enabled()) {
+ kvm_s390_virtio_irq(env, 0, token);
+ } else {
+ cpu_inject_ext(env, VIRTIO_EXT_CODE, 0, token);
+ }
}
static unsigned virtio_s390_get_features(void *opaque)
--
1.6.0.2
- [Qemu-devel] [PATCH 00/17] s390x emulation support v4, Alexander Graf, 2011/04/15
- [Qemu-devel] [PATCH 16/17] s390x: remove compatibility cc field, Alexander Graf, 2011/04/15
- [Qemu-devel] [PATCH 04/17] linux-user: add s390x to llseek list, Alexander Graf, 2011/04/15
- [Qemu-devel] [PATCH 09/17] s390x: virtio machine storage keys, Alexander Graf, 2011/04/15
- [Qemu-devel] [PATCH 03/17] linux-user: define a couple of syscalls for non-uid16 targets, Alexander Graf, 2011/04/15
- [Qemu-devel] [PATCH 05/17] kvm: add kvm stub for arch specific stuff, Alexander Graf, 2011/04/15
- [Qemu-devel] [PATCH 08/17] s390x: Dispatch interrupts to KVM or the real CPU,
Alexander Graf <=
- [Qemu-devel] [PATCH 13/17] s390x: Adjust internal kvm code, Alexander Graf, 2011/04/15
- [Qemu-devel] [PATCH 01/17] tcg: extend max tcg opcodes on 32bit, Alexander Graf, 2011/04/15
- [Qemu-devel] [PATCH 06/17] s390x: Prepare cpu.h for emulation, Alexander Graf, 2011/04/15
- [Qemu-devel] [PATCH 07/17] s390x: Enable s390x-softmmu target, Alexander Graf, 2011/04/15
- [Qemu-devel] [PATCH 10/17] s390x: keep hint on virtio managing size, Alexander Graf, 2011/04/15