From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Date: Wed, 5 Jan 2011 23:16:54 +0000 (+0000)
Subject: qemu-xen: if pirq == 0 fall back to emulated MSIs
X-Git-Tag: xen-4.1.0-rc1~3
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=6df21b765eafcae5d891d5a8092e6f8b74c93031;p=qemu-xen-4.4-testing.git

qemu-xen: if pirq == 0 fall back to emulated MSIs

If the pirq requested is 0, it probably means that the guest is
misconfigured, so fall back to the emulated code path.

This patch depends on "qemu-xen: support PV on HVM MSIX remapping".

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---

diff --git a/hw/pt-msi.c b/hw/pt-msi.c
index b01744ed5..71fa6f004 100644
--- a/hw/pt-msi.c
+++ b/hw/pt-msi.c
@@ -79,7 +79,12 @@ int pt_msi_setup(struct pt_dev *dev)
          * is passed as dest_id */
         pirq = (dev->msi->addr_hi & 0xffffff00) |
                ((dev->msi->addr_lo >> MSI_TARGET_CPU_SHIFT) & 0xff);
-        PT_LOG("pt_msi_setup requested pirq = %d\n", pirq);
+        if (!pirq)
+            /* this probably identifies an misconfiguration of the guest,
+             * try the emulated path */
+            pirq = -1;
+        else
+            PT_LOG("pt_msi_setup requested pirq = %d\n", pirq);
     }
 
     if ( xc_physdev_map_pirq_msi(xc_handle, domid, AUTO_ASSIGN, &pirq,
@@ -305,7 +310,12 @@ static int pt_msix_update_one(struct pt_dev *dev, int entry_nr)
          * is passed as dest_id */
         pirq = ((gaddr >> 32) & 0xffffff00) |
                (((gaddr & 0xffffffff) >> MSI_TARGET_CPU_SHIFT) & 0xff);
-        PT_LOG("pt_msix_update_one requested pirq = %d\n", pirq);
+        if (!pirq)
+            /* this probably identifies an misconfiguration of the guest,
+             * try the emulated path */
+            pirq = -1;
+        else
+            PT_LOG("pt_msix_update_one requested pirq = %d\n", pirq);
     }
 
     /* Check if this entry is already mapped */