Merge commit 'b907b69dd75415bc28349d1dd1e9a598ddace463' into upstream-merge

Merge commit 'b907b69dd75415bc28349d1dd1e9a598ddace463' into upstream-merge

* commit 'b907b69dd75415bc28349d1dd1e9a598ddace463': (24 commits)
  pcie: update satus on reset
  msi: minor cleanups
  msi: simplify range checks
  pci: improve w1c mask handling
  pcie: clean up hot plug notification
  pcie: simplify range check
  Introduce range.h
  qemu-options.def: add to generated header list
  net: properly handle illegal fd/vhostfd from command line
  virtio: sanity-check available index
  migration: don't segfault on invalid input
  x3130: pcie downstream port
  x3130: pcie upstream port
  ioh3420: pcie root port in X58 ioh
  pcie port: define struct PCIEPort/PCIESlot and helper functions
  pci/bridge: fix pci_bridge_reset()
  pcie: comment on hpev_intx
  pcie: helper functions for pcie capability and extended capability
  pcie: add pcie constants to pcie_regs.h
  msi: implements msi
  ...

Conflicts:
	Makefile.objs
	hw/pci.c

Signed-off-by: Avi Kivity <avi@redhat.com>