From: Fam Zheng <famz@redhat.com>
Date: Tue, 10 Jun 2014 06:55:58 +0000 (+0800)
Subject: scsi: Report error when lun number is in use
X-Git-Tag: v2.1.0-rc2~6^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2039511b8f573165420c86380762ae829dc398d9;p=thirdparty%2Fqemu.git

scsi: Report error when lun number is in use

In the case that the lun number is taken by another scsi device, don't
release the existing device siliently, but report an error to user.

Signed-off-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
index ea1ac09c8aa..43417542536 100644
--- a/hw/scsi/scsi-bus.c
+++ b/hw/scsi/scsi-bus.c
@@ -177,7 +177,8 @@ static int scsi_qdev_init(DeviceState *qdev)
         d = scsi_device_find(bus, dev->channel, dev->id, dev->lun);
         assert(d);
         if (d->lun == dev->lun && dev != d) {
-            object_unparent(OBJECT(d));
+            error_report("lun already used by '%s'", d->qdev.id);
+            goto err;
         }
     }