[win-pv-devel] [PATCH] [CA-156847] Ignore invalid devices

[Owen Smith <owen.smith@xxxxxxxxxx>]

When a floppy drive is attached, the device id string cannot be parsed
into a valid xvd, sd? or hd? format. Report the error instead of asserting
and return the invalid value to ignore the device in question.

Signed-off-by: Owen Smith <owen.smith@xxxxxxxxxx>
---
 src/xenvbd/fdo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/xenvbd/fdo.c b/src/xenvbd/fdo.c
index 2ee91b8..09ae9f9 100644
--- a/src/xenvbd/fdo.c
+++ b/src/xenvbd/fdo.c
@@ -524,8 +524,8 @@ __ParseVbd(
         case 89:    return ((DeviceId & 0xC0) >> 6) + 14;   /* hdo..p */
         default:    break;
         }
-        ASSERT3U(DeviceId, ==, ~0);
     }
+    Error("Invalid DeviceId %s (%08x)\n", DeviceIdStr, DeviceId);
     return 0xFFFFFFFF; // OBVIOUS ERROR VALUE
 }
 static FORCEINLINE XENVBD_DEVICE_TYPE
-- 
1.9.4.msysgit.1


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