[win-pv-devel] [PATCH 1/2] Continue checking for emulated type if not PCI or IDE

[Owen Smith <owen.smith@xxxxxxxxxx>]

When determining the XENFILT_EMULATED_OBJECT_TYPE, keep trying all
supplied HardwareIDs/CompatibleIDs until an exact match is made. If an
early match is made that is not a valid type, ignore the match and
continue checking for either "PCI" or "IDE".
This covers situations where XenFilt's Parameters key contains stale
strings from previous (v8.x) versions, and fixes an upgrade failure when
upgrading v8.x to v9.x

Signed-off-by: Owen Smith <owen.smith@xxxxxxxxxx>
---
 src/xenfilt/driver.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/xenfilt/driver.c b/src/xenfilt/driver.c
index 0167c21..53df169 100644
--- a/src/xenfilt/driver.c
+++ b/src/xenfilt/driver.c
@@ -760,7 +760,8 @@ DriverGetEmulatedType(
                 Type = XENFILT_EMULATED_OBJECT_TYPE_IDE;
 
             RegistryFreeSzValue(Ansi);
-            break;
+            if (Type != XENFILT_EMULATED_OBJECT_TYPE_UNKNOWN)
+                break;
         } else {
             Trace("NO MATCH: %s\n", &Id[Index]);
         }
-- 
2.16.2.windows.1


_______________________________________________
win-pv-devel mailing list
win-pv-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/win-pv-devel