From: Peter Crosthwaite <peter.crosthwa...@xilinx.com> Use standard QOM cast macro. Remove usages of container_of() and direct -> style upcasting.
Signed-off-by: Peter Crosthwaite <peter.crosthwa...@xilinx.com> --- hw/virtio/virtio-pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 444b71a..a6cad0d 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -98,7 +98,7 @@ static void virtio_pci_bus_new(VirtioBusState *bus, VirtIOPCIProxy *dev); /* DeviceState to VirtIOPCIProxy. For use off data-path. TODO: use QOM. */ static inline VirtIOPCIProxy *to_virtio_pci_proxy(DeviceState *d) { - return container_of(d, VirtIOPCIProxy, pci_dev.qdev); + return VIRTIO_PCI(d); } /* DeviceState to VirtIOPCIProxy. Note: used on datapath, @@ -106,7 +106,7 @@ static inline VirtIOPCIProxy *to_virtio_pci_proxy(DeviceState *d) */ static inline VirtIOPCIProxy *to_virtio_pci_proxy_fast(DeviceState *d) { - return container_of(d, VirtIOPCIProxy, pci_dev.qdev); + return VIRTIO_PCI(d); } static void virtio_pci_notify(DeviceState *d, uint16_t vector) -- 1.8.3.rc1.44.gb387c77.dirty