| Message ID | 20181103154104.69228-1-liq3ea@163.com |
|---|---|
| State | New |
| Headers | show |
| Series | hw: virtio-pci: drop DO_UPCAST | expand |
On Sat, Nov 3, 2018 at 4:42 PM Li Qiang <liq3ea@163.com> wrote: > > Use VIRTIO_PCI MACRO instead. > > Signed-off-by: Li Qiang <liq3ea@163.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > 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 a954799267..277dc20c81 100644 > --- a/hw/virtio/virtio-pci.c > +++ b/hw/virtio/virtio-pci.c > @@ -597,7 +597,7 @@ virtio_address_space_read(VirtIOPCIProxy *proxy, hwaddr addr, > static void virtio_write_config(PCIDevice *pci_dev, uint32_t address, > uint32_t val, int len) > { > - VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev); > + VirtIOPCIProxy *proxy = VIRTIO_PCI(pci_dev); > VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus); > struct virtio_pci_cfg_cap *cfg; > > @@ -630,7 +630,7 @@ static void virtio_write_config(PCIDevice *pci_dev, uint32_t address, > static uint32_t virtio_read_config(PCIDevice *pci_dev, > uint32_t address, int len) > { > - VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev); > + VirtIOPCIProxy *proxy = VIRTIO_PCI(pci_dev); > struct virtio_pci_cfg_cap *cfg; > > if (proxy->config_cap && > -- > 2.17.1 > > >
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index a954799267..277dc20c81 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -597,7 +597,7 @@ virtio_address_space_read(VirtIOPCIProxy *proxy, hwaddr addr, static void virtio_write_config(PCIDevice *pci_dev, uint32_t address, uint32_t val, int len) { - VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev); + VirtIOPCIProxy *proxy = VIRTIO_PCI(pci_dev); VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus); struct virtio_pci_cfg_cap *cfg; @@ -630,7 +630,7 @@ static void virtio_write_config(PCIDevice *pci_dev, uint32_t address, static uint32_t virtio_read_config(PCIDevice *pci_dev, uint32_t address, int len) { - VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev); + VirtIOPCIProxy *proxy = VIRTIO_PCI(pci_dev); struct virtio_pci_cfg_cap *cfg; if (proxy->config_cap &&
Use VIRTIO_PCI MACRO instead. Signed-off-by: Li Qiang <liq3ea@163.com> --- hw/virtio/virtio-pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)