Merge branch 'upstream-merge'

Merge branch 'upstream-merge'

* upstream-merge: (107 commits)
  virtio-console: Prevent abort()s in case of host chardev close
  virtio-serial-bus: Fix trailing \n in error_report string
  virtio-console: Add some trace events
  virtio-serial-bus: Add trace events
  virtio: fix indirect descriptor buffer overflow
  xen: move to new pci initializers
  hw/piix_pci.c: Fix PIIX3-xen to initialize ids
  pci_ids: tweak names to match linux/pci_ids.h
  vhost: fix double free on device stop
  xen_console: fall back to qemu serial device
  xen_console: support the new extended xenstore protocol
  checkpatch: don't error out on },{ lines
  xen_disk: treat "aio" as "raw"
  qemu_ram_ptr_length: take ram_addr_t as arguments
  xen_disk: cope with missing xenstore "params" node
  xen: add vkbd support for PV on HVM guests
  xen_console: fix memory leak
  xen: enable console and disk backend in HVM mode
  xen: Fold CONFIG_XEN_MAPCACHE into CONFIG_XEN
  xen: Clean up map cache API naming
  ...

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