From: Kevin O'Connor <kevin@koconnor.net>
Date: Fri, 15 Aug 2014 13:52:43 +0000 (-0400)
Subject: boot: Change ":rom%d" boot order rom instance to ":rom%x"
X-Git-Tag: rel-1.7.5.1~5
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=be16c16ab3cc9319590a68239acb240c758dfffb;p=seabios.git

boot: Change ":rom%d" boot order rom instance to ":rom%x"

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)
---

diff --git a/src/boot.c b/src/boot.c
index e60ed3e..97de89c 100644
--- a/src/boot.c
+++ b/src/boot.c
@@ -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);
 }