From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57254) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z3OyY-0006X0-AN for qemu-devel@nongnu.org; Fri, 12 Jun 2015 09:26:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z3OyX-0001Yk-8E for qemu-devel@nongnu.org; Fri, 12 Jun 2015 09:26:26 -0400 From: Peter Maydell Date: Fri, 12 Jun 2015 14:26:14 +0100 Message-Id: <1434115575-7214-4-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1434115575-7214-1-git-send-email-peter.maydell@linaro.org> References: <1434115575-7214-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH 3/4] qdev-properties-system: Improve error message for drive assignment conflict List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Markus Armbruster , qemu-block@nongnu.org, patches@linaro.org If the user forgot if=none on their drive specification they're likely to get an error message because the drive is assigned once automatically by QEMU and once by the manual id=/drive= user command line specification. Improve the error message produced in this case to explicitly guide the user towards if=none. Signed-off-by: Peter Maydell --- hw/core/qdev-properties-system.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c index 56954b4..bde9e12 100644 --- a/hw/core/qdev-properties-system.c +++ b/hw/core/qdev-properties-system.c @@ -78,8 +78,20 @@ static void parse_drive(DeviceState *dev, const char *str, void **ptr, return; } if (blk_attach_dev(blk, dev) < 0) { - error_setg(errp, "Property '%s.%s' can't take value '%s', it's in use", - object_get_typename(OBJECT(dev)), propname, str); + DriveInfo *dinfo = blk_legacy_dinfo(blk); + + if (dinfo->auto_claimed) { + error_setg(errp, "Property '%s.%s' can't be set to drive ID '%s'; " + "that drive has been automatically connected to another " + "device. Use if=none if you do not want that automatic " + "connection.", + object_get_typename(OBJECT(dev)), propname, str); + } else { + error_setg(errp, "Property '%s.%s' can't be set to drive ID '%s'; " + "that drive has already been connected to another " + "device.", + object_get_typename(OBJECT(dev)), propname, str); + } return; } *ptr = blk; -- 1.9.1