Merge commit 'e75ccf2c033fb0503d6cb7ddd0fd1dfa0aa4fc16' into upstream-merge

Merge commit 'e75ccf2c033fb0503d6cb7ddd0fd1dfa0aa4fc16' into upstream-merge

* commit 'e75ccf2c033fb0503d6cb7ddd0fd1dfa0aa4fc16': (38 commits)
  virtio-pci.c: convert to PCIDEviceInfo to initialize ids
  hw/xio3130_upstream.c: convert to PCIDeviceInfo to initialize ids
  hw/xio3130_downstream.c: convert to PCIDeviceInfo to initialize ids
  hw/wdt_i6300esb.c: convert to PCIDeviceInfo to initialize ids
  hw/vt82c686.c: convert to PCIDeviceInfo to initialize ids
  hw/vga-pci.c: convert to PCIDeviceInfo to initialize ids
  hw/versatile_pci.c: convert to PCIDeviceInfo to initialize ids
  hw/usb-ohci.c: convert to PCIDeviceInfo to initialize ids
  hw/unin_pci.c: convert to PCIDeviceInfo to initialize ids
  hw/sun4u.c: convert to PCIDeviceInfo to initialize ids
  hw/sh_pci.c: convert to PCIDeviceInfo to initialize ids
  hw/rtl8139.c: convert to PCIDeviceInfo to initialize ids
  hw/qxl.c: convert to PCIDeviceInfo to initialize ids
  hw/piix_pci.c: convert to PCIDeviceInfo to initialize ids
  hw/piix4.c: convert to PCIDeviceInfo to initialize ids
  hw/pcnet-pci.c: convert to PCIDeviceInfo to initialize ids
  hw/ne2000.c: convert to PCIDeviceInfo to initialize ids
  hw/lsi53c895a.c: convert to PCIDeviceInfo to initialize ids
  hw/ivshmem.c: convert to PCIDeviceInfo to initialize ids
  hw/ioh3420.c: convert to PCIDeviceInfo to initialize ids
  ...

Conflicts:
	hw/virtio-pci.c

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>