Merge branch 'upstream-merge'

Merge branch 'upstream-merge'

* upstream-merge: (53 commits)
  add sparc64-softmmu to default configure targets list
  sparc64 follow pci_nic_init change
  microblaze: Support the latest mmu-kernel stat64 ABI.
  target-ppc: permit linux-user to read PVR
  cris: Remove unused internal flag.
  Win32: Reduce section alignment for Windows.
  virtio-net: implement async packet sending
  net: add '-net tap,sndbuf=nbytes'
  net: return TAPState from net_tap_init()
  net: handle EAGAIN from tapfd write()
  net: add tap_read_poll() helper
  Win: Install keymaps for Windows, too (needed for VNC).
  net: add packet length to NetPacketSent callback
  net: purge queued packets in tap_cleanup()
  Win32: Fix compilation with SDL.
  net: add qemu_purge_queued_packets()
  Don't register cpu reset handler for cpu with APIC.
  Support addr=... in option argument of -drive if=virtio
  Make first argument of monitor command pci_add work
  Support addr=... in option argument of -net nic
  ...

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