Merge commit 'ea776abca628d855e03c4929da3864985afd8aae' into upstream-merge

Merge commit 'ea776abca628d855e03c4929da3864985afd8aae' into upstream-merge

* commit 'ea776abca628d855e03c4929da3864985afd8aae': (30 commits)
  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
  qemu-ga: don't leak a file descriptor upon failed lockf
  i82378: Remove bogus MMIO coalescing
  eventfd: making it thread safe
  Update OpenBIOS images
  pc: Fix RTC CMOS info on RAM for ram_size < 1MiB
  vl: Round argument of -m up to multiple of 8KiB
  scsi: fix warning
  Avoid asprintf() which is not available on mingw
  Update version to 1.2.0-rc0
  qemu-char: (Re-)connect for tcp_chr_write() unconnected writing
  Allow QEMUMachine to override reset sequencing
  pseries: Instantiate USB interface when required
  osdep: Fix compilation failure on BSD systems
  Command line support for seccomp with -sandbox (v8)
  Adding seccomp calls to vl.c (v8)
  ...

Conflicts:
	hw/pc_piix.c

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