Merge remote branch 'upstream/stable-0.12' into stable-0.12

* upstream/stable-0.12: (27 commits)
  Update version and changelog for release
  Update SeaBIOS to 0.5.1
  Qemu's internal TFTP server breaks lock-step-iness of TFTP
  osdep.c: Fix accept4 fallback
  pc: add rombar to compat properties for pc-0.10 and pc-0.11
  pci: allow loading roms via fw_cfg.
  roms: rework rom loading via fw
  fw_cfg: rom loader tweaks.
  roms: minor fixes and cleanups.
  pc: add machine type for 0.12
  loader: more ignores for rom intended to be loaded by the bios
  vnc_refresh: return if vd->timer is NULL
  QMP: Don't free async event's 'data'
  Handle TFTP ERROR from client
  dmg: fix ->open failure
  virtio-pci: thinko fix
  pc-bios: Update README (SeaBIOS)
  vmware_vga: Check cursor dimensions passed from guest to avoid buffer overflow
  remove pending exception on vcpu reset.
  Fix CPU topology initialization
  ...

Conflicts:
	hw/pc.c
	hw/pci.h
	qemu-options.hx

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

1 files changed, 1 insertions, 1 deletions

diff --git a/osdep.c b/osdep.c
index b7b441107..d8efd0e74 100644
--- a/osdep.c
+++ b/osdep.c
@@ -310,7 +310,7 @@ int qemu_accept(int s, struct sockaddr *addr, socklen_t *addrlen)
 
 #ifdef CONFIG_ACCEPT4
     ret = accept4(s, addr, addrlen, SOCK_CLOEXEC);
-    if (ret != -1 || errno != EINVAL) {
+    if (ret != -1 || errno != ENOSYS) {
         return ret;
     }
 #endif