From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:56050) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UhH6D-0007sq-ET for qemu-devel@nongnu.org; Tue, 28 May 2013 06:25:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UhH66-0007iA-D0 for qemu-devel@nongnu.org; Tue, 28 May 2013 06:25:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:23027) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UhH66-0007hr-5N for qemu-devel@nongnu.org; Tue, 28 May 2013 06:25:42 -0400 From: Amos Kong Date: Tue, 28 May 2013 18:25:34 +0800 Message-Id: <1369736734-15449-1-git-send-email-akong@redhat.com> Subject: [Qemu-devel] [PATCH] qdev: don't add typename to fw_dev_path when get_fw_dev_path isn't implemented List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, aliguori@us.ibm.com, kevin@koconnor.net, seabios@seabios.org Currently we add typename to fw_dev_path if virtio-bus doesn't have get_fw_dev_path implementation, the fw_dev_path passed to seabios is not expected, the typename is redundant. It causes that bootindex parameter of scsi device doesn't work. This patch changes the qdev_get_fw_dev_path_helper() to add nothing if device doesn't have get_fw_dev_path implementation. Signed-off-by: Paolo Bonzini Signed-off-by: Amos Kong --- hw/core/qdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 6985ad8..150255d 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -515,7 +515,7 @@ static int qdev_get_fw_dev_path_helper(DeviceState *dev, char *p, int size) l += snprintf(p + l, size - l, "%s", d); g_free(d); } else { - l += snprintf(p + l, size - l, "%s", object_get_typename(OBJECT(dev))); + return l; } } l += snprintf(p + l , size - l, "/"); -- 1.8.1.4