From 27d6bf40edc346a61ade6d4c5d4f27f6b40acc81 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 28 Jan 2011 11:21:40 +0100 Subject: blockdev: Fix regression in -drive if=scsi,index=N Before commit 622b520f, index=12 meant bus=1,unit=5. Since the commit, it means bus=0,unit=12. The drive is created, but not the guest device. That's because the controllers we use with if=scsi drives (lsi53c895a and esp) support only 7 units, and scsi_bus_legacy_handle_cmdline() ignores drives with unit numbers exceeding that limit. Changing the mapping of index to bus, unit is a regression. Breaking -drive invocations that used to work just makes it worse. Revert the part of commit 622b520f that causes this, and clean up some. Note that the fix only affects if=scsi. You can still put more than 7 units on a SCSI bus with -device & friends. Signed-off-by: Markus Armbruster Signed-off-by: Kevin Wolf --- hw/scsi.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'hw/scsi.h') diff --git a/hw/scsi.h b/hw/scsi.h index 846fbba893..d3b5d56cd6 100644 --- a/hw/scsi.h +++ b/hw/scsi.h @@ -3,9 +3,10 @@ #include "qdev.h" #include "block.h" -#include "blockdev.h" #include "block_int.h" +#define MAX_SCSI_DEVS 255 + #define SCSI_CMD_BUF_SIZE 16 /* scsi-disk.c */ -- cgit v1.2.3