[patch 3/2] hotadd: lsi_scsi_init can fail

[Chris Wright <chrisw@sous-sol.org>]

During hotadd of SCSI devices lsi_scsi_init() handles failed
pci_device_register(), but qemu_system_hot_add_storage() will try and
attach a drive any way.  Handle this error case rather the generating
SEGV.

Cc: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
---
 qemu/hw/device-hotplug.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/qemu/hw/device-hotplug.c
+++ b/qemu/hw/device-hotplug.c
@@ -125,7 +125,7 @@ static PCIDevice *qemu_system_hot_add_st
     switch (type) {
     case IF_SCSI:
         opaque = lsi_scsi_init (pci_bus, -1);
-        if (drive_idx >= 0)
+        if (opaque && drive_idx >= 0)
             lsi_scsi_attach (opaque, drives_table[drive_idx].bdrv,
                              drives_table[drive_idx].unit);
         break;

-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone