From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57387) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WuFyM-0007xy-0h for qemu-devel@nongnu.org; Tue, 10 Jun 2014 02:56:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WuFyF-0007yP-5q for qemu-devel@nongnu.org; Tue, 10 Jun 2014 02:55:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34246) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WuFyE-0007xN-U5 for qemu-devel@nongnu.org; Tue, 10 Jun 2014 02:55:47 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s5A6tjZQ004473 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 10 Jun 2014 02:55:45 -0400 From: Fam Zheng Date: Tue, 10 Jun 2014 14:55:58 +0800 Message-Id: <1402383358-24079-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH] scsi: Report error when lun number is in use List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , stefanha@redhat.com 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 --- hw/scsi/scsi-bus.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index 06399fa..d219da3 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; } } -- 2.0.0