[Xen-changelog] [xen-unstable] hvm ioemu: Do not initialise the LSI SCSI interface if no SCSI discs

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

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1177521123 -3600
# Node ID 2b09108f365ee98a033c4894a14fdcfda79128fd
# Parent  189efb0b27f930e2fe9fd7b115394c729d56f93a
hvm ioemu: Do not initialise the LSI SCSI interface if no SCSI discs
are attached to the guest.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
 tools/ioemu/hw/pc.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff -r 189efb0b27f9 -r 2b09108f365e tools/ioemu/hw/pc.c
--- a/tools/ioemu/hw/pc.c       Wed Apr 25 16:18:34 2007 +0100
+++ b/tools/ioemu/hw/pc.c       Wed Apr 25 18:12:03 2007 +0100
@@ -923,11 +923,12 @@ static void pc_init1(uint64_t ram_size, 
 #else
     if (pci_enabled) {
         void *scsi;
-
-        scsi = lsi_scsi_init(pci_bus, -1);
         for (i = 0; i < MAX_SCSI_DISKS ; i++) {
-            if (bs_table[i + MAX_DISKS]) 
-                lsi_scsi_attach(scsi, bs_table[i + MAX_DISKS], -1);
+            if (!bs_table[i + MAX_DISKS])
+                continue;
+            if (!scsi)
+                scsi = lsi_scsi_init(pci_bus, -1);
+            lsi_scsi_attach(scsi, bs_table[i + MAX_DISKS], -1);
         }
     }
 #endif /* !CONFIG_DM */

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