[Qemu-devel] [SeaBIOS PATCH] usb: fix boot paths

[Qemu-devel] [SeaBIOS PATCH] usb: fix boot paths

[Paolo Bonzini]

The fw paths for USB devices that SeaBIOS computes are off-by-one,
because QEMU builds those paths with a numbering that starts from one
(see usb_fill_port and usb_hub_initfn in QEMU).  Fix that so that
the numbering agrees.
---
 src/boot.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/boot.c b/src/boot.c
index 946850d..434bf80 100644
--- a/src/boot.c
+++ b/src/boot.c
@@ -205,9 +205,9 @@ int bootprio_find_usb(struct pci_device *pci, u64 path)
     for (i=56; i>0; i-=8) {
         int port = (path >> i) & 0xff;
         if (port != 0xff)
-            p += snprintf(p, desc+sizeof(desc)-p, "/hub@%x", port);
+            p += snprintf(p, desc+sizeof(desc)-p, "/hub@%x", port+1);
     }
-    snprintf(p, desc+sizeof(desc)-p, "/*@%x", (u32)(path & 0xff));
+    snprintf(p, desc+sizeof(desc)-p, "/*@%x", (u32)(path & 0xff)+1);
     return find_prio(desc);
 }
 
-- 
1.7.7.1

Re: [Qemu-devel] [SeaBIOS PATCH] usb: fix boot paths

[Paolo Bonzini]

On 11/18/2011 03:59 PM, Paolo Bonzini wrote:
> The fw paths for USB devices that SeaBIOS computes are off-by-one,
> because QEMU builds those paths with a numbering that starts from one
> (see usb_fill_port and usb_hub_initfn in QEMU).  Fix that so that
> the numbering agrees.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

/me goes to configure the seabios repo...

Paolo

Re: [Qemu-devel] [SeaBIOS PATCH] usb: fix boot paths

[Paolo Bonzini]

On 11/18/2011 04:36 PM, Paolo Bonzini wrote:
> On 11/18/2011 03:59 PM, Paolo Bonzini wrote:
>> The fw paths for USB devices that SeaBIOS computes are off-by-one,
>> because QEMU builds those paths with a numbering that starts from one
>> (see usb_fill_port and usb_hub_initfn in QEMU). Fix that so that
>> the numbering agrees.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Hi Kevin,

a very early ping, because we would like this patch to be upstream 
before including it in QEMU 1.0.

Thanks!

Paolo

Re: [Qemu-devel] [SeaBIOS PATCH] usb: fix boot paths

[Kevin O'Connor]

On Tue, Nov 22, 2011 at 08:32:56AM +0100, Paolo Bonzini wrote:
> On 11/18/2011 04:36 PM, Paolo Bonzini wrote:
> >On 11/18/2011 03:59 PM, Paolo Bonzini wrote:
> >>The fw paths for USB devices that SeaBIOS computes are off-by-one,
> >>because QEMU builds those paths with a numbering that starts from one
> >>(see usb_fill_port and usb_hub_initfn in QEMU). Fix that so that
> >>the numbering agrees.
> >
> >Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> 
> Hi Kevin,
> 
> a very early ping, because we would like this patch to be upstream
> before including it in QEMU 1.0.

I just pushed the change (to git.seabios.org -- linuxtogo seems to be
having issues).

-Kevin