Merge commit 'fdba9594df8eb2e2ac16bba95308e4159ffbb9e4' into upstream-merge

Merge commit 'fdba9594df8eb2e2ac16bba95308e4159ffbb9e4' into upstream-merge

* commit 'fdba9594df8eb2e2ac16bba95308e4159ffbb9e4':
  cmd: fix operator precedence
  Fix typo in cpus.c
  lsi: Fix unused-but-set-variable warning
  xen: Add the Xen platform pci device
  xen: fix interrupt routing
  xen: only track the linear framebuffer
  cirrus_vga: reset lfb_addr after a pci config write if the BAR is unmapped
  wdt: remove unused variables
  alpha: remove unused variable
  alpha/translate: remve unused variables
  get_maintainer: update to match qemu tree
  get_maintainer.pl: copy utility from Linux
  usb-ehci: move device/vendor/class id to qdev
  ppce500: move device/vendor/class id to qdev
  pci: don't call qdev pci init method
  print meaningful error message in case of --disable-vhost-net
  virtio: compat event idx support
  virtio: event index support

Conflicts:
	hw/piix_pci.c
	hw/virtio-pci.c
	hw/virtio-pci.h

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