From mboxrd@z Thu Jan 1 00:00:00 1970 From: Asias He Subject: [PATCH v2 3/4] kvm tools: Use virt_queue__trigger_irq() to trigger IRQ for virtio rng Date: Sun, 8 May 2011 21:09:24 +0800 Message-ID: <1304860165-28810-4-git-send-email-asias.hejun@gmail.com> References: <1304860165-28810-1-git-send-email-asias.hejun@gmail.com> Cc: kvm@vger.kernel.org, Asias He To: Pekka Enberg , Cyrill Gorcunov , Ingo Molnar , Sasha Levin , Prasad Joshi Return-path: Received: from mail-pz0-f46.google.com ([209.85.210.46]:53843 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753084Ab1EHNLW (ORCPT ); Sun, 8 May 2011 09:11:22 -0400 Received: by mail-pz0-f46.google.com with SMTP id 9so2015354pzk.19 for ; Sun, 08 May 2011 06:11:22 -0700 (PDT) In-Reply-To: <1304860165-28810-1-git-send-email-asias.hejun@gmail.com> Sender: kvm-owner@vger.kernel.org List-ID: This patch uses IRQ injection mechanism introduced by virt_queue__trigger_irq() which respect virtio IRQ status and VRING_AVAIL_F_NO_INTERRUPT. Signed-off-by: Asias He --- tools/kvm/virtio/rng.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/kvm/virtio/rng.c b/tools/kvm/virtio/rng.c index d355cf8..f692dfd 100644 --- a/tools/kvm/virtio/rng.c +++ b/tools/kvm/virtio/rng.c @@ -37,6 +37,7 @@ static struct pci_device_header virtio_rng_pci_device = { struct rng_dev { u8 status; + u8 isr; u16 config_vector; int fd; @@ -72,8 +73,9 @@ static bool virtio_rng_pci_io_in(struct kvm *kvm, u16 port, void *data, int size ioport__write8(data, rdev.status); break; case VIRTIO_PCI_ISR: - ioport__write8(data, 0x1); - kvm__irq_line(kvm, virtio_rng_pci_device.irq_line, 0); + ioport__write8(data, rdev.isr); + kvm__irq_line(kvm, virtio_rng_pci_device.irq_line, VIRTIO_IRQ_LOW); + rdev.isr = VIRTIO_IRQ_LOW; break; case VIRTIO_MSI_CONFIG_VECTOR: ioport__write16(data, rdev.config_vector); @@ -106,7 +108,7 @@ static void virtio_rng_do_io(struct kvm *kvm, void *param) while (virt_queue__available(vq)) { virtio_rng_do_io_request(kvm, vq); - kvm__irq_line(kvm, virtio_rng_pci_device.irq_line, 1); + virt_queue__trigger_irq(vq, virtio_rng_pci_device.irq_line, &rdev.isr, kvm); } } -- 1.7.5.1