Merge branch 'upstream-merge'

Merge branch 'upstream-merge'

* upstream-merge: (44 commits)
  Update version for 1.1.0-rc4 release
  pc-bios: Update OpenBIOS images
  block: prevent snapshot mode $TMPDIR symlink attack
  xhci: add usage info to docs
  vnc: fix segfault in vnc_display_pw_expire()
  Expose CPUID leaf 7 only for -cpu host
  qemu-ga: avoid blocking on atime update when reading /etc/mtab
  qemu-ga: Fix use of environ on Darwin
  pci: call object_unparent() before free_qdev()
  fix multiboot loading if load_end_addr == 0
  vga: fix vram double-mapping with -vga std and -M pc-0.12
  cocoa: Suppress Cocoa frontend for -qtest
  arch_init: Fix AltiVec build on Darwin/ppc
  slirp: Avoid redefining MAX_TCPOPTLEN
  slirp: Avoid statements without effect on Big Endian host
  ISCSI: Switch to using READ16/WRITE16 for I/O to the LUN
  ISCSI: Only call READCAPACITY16 for SBC devices, use READCAPACITY10 for MMC
  ISCSI: get device type at connection time
  ISCSI: change num_blocks to 64-bit
  ISCSI: redo how we set up the events
  ...

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