From 505da59965a564504111dfc16ed8cf984b41d45f Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Mon, 24 Aug 2009 18:42:48 +0200 Subject: [PATCH] usb-ohci: Change casts to DO_UPCAST() for OHCIPCIState Signed-off-by: Juan Quintela Signed-off-by: Anthony Liguori --- hw/usb-ohci.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/usb-ohci.c b/hw/usb-ohci.c index 093623fc42..0c08e9fff3 100644 --- a/hw/usb-ohci.c +++ b/hw/usb-ohci.c @@ -1706,7 +1706,7 @@ typedef struct { static void ohci_mapfunc(PCIDevice *pci_dev, int i, uint32_t addr, uint32_t size, int type) { - OHCIPCIState *ohci = (OHCIPCIState *)pci_dev; + OHCIPCIState *ohci = DO_UPCAST(OHCIPCIState, pci_dev, pci_dev); cpu_register_physical_memory(addr, size, ohci->state.mem); } @@ -1714,8 +1714,9 @@ void usb_ohci_init_pci(struct PCIBus *bus, int num_ports, int devfn) { OHCIPCIState *ohci; - ohci = (OHCIPCIState *)pci_register_device(bus, "OHCI USB", sizeof(*ohci), - devfn, NULL, NULL); + ohci = DO_UPCAST(OHCIPCIState, pci_dev, + pci_register_device(bus, "OHCI USB", sizeof(*ohci), + devfn, NULL, NULL)); if (ohci == NULL) { fprintf(stderr, "usb-ohci: Failed to register PCI device\n"); return; -- 2.34.1