Merge branch 'upstream-merge'

Merge branch 'upstream-merge'

* upstream-merge: (63 commits)
  qapi: add 'query-target' command to return target arch
  pci: Tidy up PCI host bridges
  pci: Derive PCI host bridges from TYPE_PCI_HOST_BRIDGE
  pci_host: Turn into SysBus-derived QOM type
  unin_pci: QOM'ify UniNorth PCI host bridges
  spapr_pci: QOM'ify sPAPR PCI host bridge
  prep_pci: QOM'ify Raven PCI host bridge
  ppce500_pci: QOM'ify e500 PCI host bridge
  ppc4xx_pci: QOM'ify ppc4xx PCI host bridge
  gt64xxx: QOM'ify GT64120 PCI host bridge
  grackle_pci: QOM'ify Grackle PCI host bridge
  dec_pci: QOM'ify DEC 21154 PCI-PCI bridge
  bonito: QOM'ify Bonito PCI host bridge
  alpha_typhoon: QOM'ify Typhoon PCI host bridge
  pci: Make host bridge TypeInfos const
  virtio-blk: hide VIRTIO_BLK_F_CONFIG_WCE from old machine types
  softmmu-semi: fix lock_user* functions not to deref NULL upon OOM
  arm-semi: don't leak 1KB user string lock buffer upon TARGET_SYS_OPEN
  sheepdog: don't leak socket file descriptor upon connection failure
  linux-user: do_msgrcv: don't leak host_mb upon TARGET_EFAULT failure
  ...

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