From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:49202) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UhEW8-0002AC-Hj for qemu-devel@nongnu.org; Tue, 28 May 2013 03:40:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UhEW6-0004My-35 for qemu-devel@nongnu.org; Tue, 28 May 2013 03:40:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:3937) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UhEW5-0004Mo-Rn for qemu-devel@nongnu.org; Tue, 28 May 2013 03:40:22 -0400 From: Amos Kong Date: Tue, 28 May 2013 15:40:06 +0800 Message-Id: <1369726806-9715-1-git-send-email-akong@redhat.com> Subject: [Qemu-devel] [PATCH] boot: fix path pattern of scsi device List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: seabios@seabios.org Cc: pbonzini@redhat.com, kevin@koconnor.net, qemu-devel@nongnu.org bootindex parameter of scsi device doesn't work, it causes by wrong pattern in seabios. qemu passes the following firmware dev_path to seabios: /pci@i0cf8/scsi@4/virtio-scsi-device/channel@0/disk@0,0 Signed-off-by: Amos Kong --- src/boot.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/boot.c b/src/boot.c index c308602..cd9d784 100644 --- a/src/boot.c +++ b/src/boot.c @@ -138,10 +138,11 @@ int bootprio_find_scsi_device(struct pci_device *pci, int target, int lun) if (!pci) // support only pci machine for now return -1; - // Find scsi drive - for example: /pci@i0cf8/scsi@5/channel@0/disk@1,0 + /* Find scsi drive - for example: + /pci@i0cf8/scsi@5/virtio-scsi-device/channel@0/disk@1,0 */ char desc[256], *p; p = build_pci_path(desc, sizeof(desc), "*", pci); - snprintf(p, desc+sizeof(desc)-p, "/*@0/*@%d,%d", target, lun); + snprintf(p, desc+sizeof(desc)-p, "/*/*@0/*@%d,%d", target, lun); return find_prio(desc); } -- 1.8.1.4