Re: [Qemu-devel] [RFT PATCH v1 12/30] virtio/virtio-pci: QOM casting sweep

[Frederic Konrad]

Hi,

On 11/06/2013 08:49, peter.crosthwa...@xilinx.com wrote:

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>

[...]

  static inline VirtIOPCIProxy *to_virtio_pci_proxy(DeviceState *d)
  {
-    return container_of(d, VirtIOPCIProxy, pci_dev.qdev);
+    return VIRTIO_PCI(d);
  }

Maybe you can replace each to_virtio_pci_proxy directly with VIRTIO_PCI?

/* 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)