]> xenbits.xensource.com Git - seabios.git/commitdiff
boot: Change ":rom%d" boot order rom instance to ":rom%x"
authorKevin O'Connor <kevin@koconnor.net>
Fri, 15 Aug 2014 13:52:43 +0000 (09:52 -0400)
committerGerd Hoffmann <kraxel@redhat.com>
Tue, 26 Aug 2014 08:16:19 +0000 (10:16 +0200)
Use hex numbers for the rom instance count in boot order open firmware
device naming.  The ":rom" suffix isn't part of a standard and it's
highly unlikely any rom would have 10 or more drives on it, but this
change makes the code more similar to the numbering of other boot
order devices.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
(cherry picked from commit e710447ef1d2bd4e61e12b210039c00fbeacf624)

src/boot.c

index e60ed3e6f2e63a6d1b0ee45346904e0badcc6ce1..97de89cfa24f532d24a3b53a801e183c9f7f50bb 100644 (file)
@@ -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);
 }