[Xen-changelog] [xen-unstable] VTd: Ignore HPET/IOAPIC decls in DRHD scopes

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1268294912 0
# Node ID 594142f8c0bbc8dcc47074f5a4a679a14df9117c
# Parent  132ac04cbdba207a36ebcc790ad231b108126939
VTd: Ignore HPET/IOAPIC decls in DRHD scopes

Signed-off-by: Alex Williamson <alex.williamson@xxxxxx>
---
 xen/drivers/passthrough/vtd/dmar.c |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff -r 132ac04cbdba -r 594142f8c0bb xen/drivers/passthrough/vtd/dmar.c
--- a/xen/drivers/passthrough/vtd/dmar.c        Tue Mar 09 18:18:19 2010 +0000
+++ b/xen/drivers/passthrough/vtd/dmar.c        Thu Mar 11 08:08:32 2010 +0000
@@ -407,9 +407,15 @@ acpi_parse_one_drhd(struct acpi_dmar_ent
     {
         u8 b, d, f;
         int i, invalid_cnt = 0;
-
-        for ( i = 0; i < dmaru->scope.devices_cnt; i++ )
-        {
+        void *p;
+
+        for ( i = 0, p = dev_scope_start; i < dmaru->scope.devices_cnt;
+              i++, p += ((struct acpi_dev_scope *)p)->length )
+        {
+            if ( ((struct acpi_dev_scope *)p)->dev_type == ACPI_DEV_IOAPIC ||
+                 ((struct acpi_dev_scope *)p)->dev_type == ACPI_DEV_MSI_HPET )
+                continue;
+
             b = PCI_BUS(dmaru->scope.devices[i]);
             d = PCI_SLOT(dmaru->scope.devices[i]);
             f = PCI_FUNC(dmaru->scope.devices[i]);

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog