Patchwork usb-ohci: return USBBus in usb_ohci_init_pci

login
register
mail settings
Submitter Anthony Liguori
Date Dec. 15, 2011, 12:10 a.m.
Message ID <1323907817-27342-1-git-send-email-aliguori@us.ibm.com>
Download mbox | patch
Permalink /patch/131507/
State New
Headers show

Comments

Anthony Liguori - Dec. 15, 2011, 12:10 a.m.
Untested, but seemingly obvious and hard to screw up..

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---
 hw/usb-ohci.c |    7 +++++--
 hw/usb-ohci.h |    3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)
Stefan Hajnoczi - Dec. 15, 2011, 8:17 a.m.
On Wed, Dec 14, 2011 at 06:10:17PM -0600, Anthony Liguori wrote:
> Untested, but seemingly obvious and hard to screw up..

Sounds like a challenge so let's take a look...

> -void usb_ohci_init_pci(struct PCIBus *bus, int devfn)
> +USBBus *usb_ohci_init_pci(struct PCIBus *bus, int devfn)
>  {
> -    pci_create_simple(bus, devfn, "pci-ohci");
> +    PCIDevice *dev = pci_create_simple(bus, devfn, "pci-ohci");
> +    OHCIPCIState *ohci = DO_UPCAST(OHCIPCIState, pci_dev, dev);
> +
> +    return &ohci->state.bus

Missing semicolon.

Stefan
Anthony Liguori - Dec. 15, 2011, 3:10 p.m.
On 12/15/2011 02:17 AM, Stefan Hajnoczi wrote:
> On Wed, Dec 14, 2011 at 06:10:17PM -0600, Anthony Liguori wrote:
>> Untested, but seemingly obvious and hard to screw up..
>
> Sounds like a challenge so let's take a look...
>
>> -void usb_ohci_init_pci(struct PCIBus *bus, int devfn)
>> +USBBus *usb_ohci_init_pci(struct PCIBus *bus, int devfn)
>>   {
>> -    pci_create_simple(bus, devfn, "pci-ohci");
>> +    PCIDevice *dev = pci_create_simple(bus, devfn, "pci-ohci");
>> +    OHCIPCIState *ohci = DO_UPCAST(OHCIPCIState, pci_dev, dev);
>> +
>> +    return&ohci->state.bus
>
> Missing semicolon.

Heh, awesome :-)  Okay, I'll actually test it next time.

Regards,

Anthony Liguori

>
> Stefan
>
>
Gerd Hoffmann - Dec. 15, 2011, 4:36 p.m.
Hi,

> Heh, awesome :-)  Okay, I'll actually test it next time.

Could you also add some justification for the change to the commit
message please?  Just for itself the change looks somewhat odd as there
is no obvious reason for it ...

thanks,
  Gerd
Anthony Liguori - Dec. 15, 2011, 4:49 p.m.
On 12/15/2011 10:36 AM, Gerd Hoffmann wrote:
>    Hi,
>
>> Heh, awesome :-)  Okay, I'll actually test it next time.
>
> Could you also add some justification for the change to the commit
> message please?  Just for itself the change looks somewhat odd as there
> is no obvious reason for it ...

Yup.

Regards,

Anthony Liguori

>
> thanks,
>    Gerd
>

Patch

diff --git a/hw/usb-ohci.c b/hw/usb-ohci.c
index e68be70..4c56548 100644
--- a/hw/usb-ohci.c
+++ b/hw/usb-ohci.c
@@ -1810,9 +1810,12 @@  static int usb_ohci_initfn_pci(struct PCIDevice *dev)
     return 0;
 }
 
-void usb_ohci_init_pci(struct PCIBus *bus, int devfn)
+USBBus *usb_ohci_init_pci(struct PCIBus *bus, int devfn)
 {
-    pci_create_simple(bus, devfn, "pci-ohci");
+    PCIDevice *dev = pci_create_simple(bus, devfn, "pci-ohci");
+    OHCIPCIState *ohci = DO_UPCAST(OHCIPCIState, pci_dev, dev);
+
+    return &ohci->state.bus
 }
 
 typedef struct {
diff --git a/hw/usb-ohci.h b/hw/usb-ohci.h
index eefcef3..2a63ca9 100644
--- a/hw/usb-ohci.h
+++ b/hw/usb-ohci.h
@@ -2,8 +2,9 @@ 
 #define QEMU_USB_OHCI_H
 
 #include "qemu-common.h"
+#include "usb.h"
 
-void usb_ohci_init_pci(struct PCIBus *bus, int devfn);
+USBBus *usb_ohci_init_pci(struct PCIBus *bus, int devfn);
 
 #endif