From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=58577 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q6kpR-0003Wd-Rx for qemu-devel@nongnu.org; Mon, 04 Apr 2011 10:32:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q6kpO-00036f-Lu for qemu-devel@nongnu.org; Mon, 04 Apr 2011 10:32:28 -0400 Received: from cantor2.suse.de ([195.135.220.15]:37648 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q6kpO-000367-EB for qemu-devel@nongnu.org; Mon, 04 Apr 2011 10:32:26 -0400 From: Alexander Graf Date: Mon, 4 Apr 2011 16:32:15 +0200 Message-Id: <1301927544-32767-7-git-send-email-agraf@suse.de> In-Reply-To: <1301927544-32767-1-git-send-email-agraf@suse.de> References: <1301927544-32767-1-git-send-email-agraf@suse.de> Subject: [Qemu-devel] [PATCH 06/15] s390x: Dispatch interrupts to KVM or the real CPU List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU-devel Developers Cc: peter.maydell@linaro.org, Aurelien Jarno , Richard Henderson 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 --- 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 60e0135..35acf53 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), @@ -304,9 +306,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