summaryrefslogtreecommitdiff
path: root/roms/seabios/src/boot.c
diff options
context:
space:
mode:
authorChanho Park <chanho61.park@samsung.com>2014-12-10 15:42:55 +0900
committerChanho Park <chanho61.park@samsung.com>2014-12-10 15:42:55 +0900
commit0d6a2f7e595218b5632ba7005128470e65138951 (patch)
tree596b09930ef1538e6606450e2d8b88ec2e296a9b /roms/seabios/src/boot.c
parent16b1353a36171ae06d63fd309f4772dbfb1da113 (diff)
downloadqemu-0d6a2f7e595218b5632ba7005128470e65138951.tar.gz
qemu-0d6a2f7e595218b5632ba7005128470e65138951.tar.bz2
qemu-0d6a2f7e595218b5632ba7005128470e65138951.zip
Imported Upstream version 2.2.0upstream/2.2.1upstream/2.2.0
Diffstat (limited to 'roms/seabios/src/boot.c')
-rw-r--r--roms/seabios/src/boot.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/roms/seabios/src/boot.c b/roms/seabios/src/boot.c
index 133e2063f..97de89cfa 100644
--- a/roms/seabios/src/boot.c
+++ b/roms/seabios/src/boot.c
@@ -145,7 +145,7 @@ int bootprio_find_scsi_device(struct pci_device *pci, int target, int lun)
// Find scsi drive - for example: /pci@i0cf8/scsi@5/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/*@%x,%x", target, lun);
return find_prio(desc);
}
@@ -189,7 +189,7 @@ int bootprio_find_pci_rom(struct pci_device *pci, int instance)
char desc[256], *p;
p = build_pci_path(desc, sizeof(desc), "*", pci);
if (instance)
- snprintf(p, desc+sizeof(desc)-p, ":rom%d", instance);
+ snprintf(p, desc+sizeof(desc)-p, ":rom%x", instance);
return find_prio(desc);
}
@@ -201,7 +201,7 @@ int bootprio_find_named_rom(const char *name, int instance)
char desc[256], *p;
p = desc + snprintf(desc, sizeof(desc), "/rom@%s", name);
if (instance)
- snprintf(p, desc+sizeof(desc)-p, ":rom%d", instance);
+ snprintf(p, desc+sizeof(desc)-p, ":rom%x", instance);
return find_prio(desc);
}
@@ -224,7 +224,7 @@ int bootprio_find_usb(struct usbdevice_s *usbdev, int lun)
char desc[256], *p;
p = build_pci_path(desc, sizeof(desc), "usb", usbdev->hub->cntl->pci);
p = build_usb_path(p, desc+sizeof(desc)-p, usbdev->hub);
- snprintf(p, desc+sizeof(desc)-p, "/storage@%x/*@0/*@0,%d"
+ snprintf(p, desc+sizeof(desc)-p, "/storage@%x/*@0/*@0,%x"
, usbdev->port+1, lun);
int ret = find_prio(desc);
if (ret >= 0)