Merge commit 'f487d6278f75f84378833b8c3a67443346d639dc' into upstream-merge

* commit 'f487d6278f75f84378833b8c3a67443346d639dc': (140 commits)
  Update SeaBIOS to 0.6.1.2
  vhost: force vhost off for non-MSI guests
  tap: safe sndbuf default
  Add boot index documentation.
  Add bootindex handling into usb storage device.
  fix QemuOpts leak
  remove text_console_opts
  add set_echo implementation for text consoles
  create TextConsole together with the CharDeviceState
  add set_echo implementation for qemu_chr_stdio
  move atexit(term_exit) and O_NONBLOCK to qemu_chr_open_stdio
  add qemu_chr_set_echo
  remove broken code for tty
  vnc: Fix password expiration through 'change vnc ""' (v2)
  linux-user: avoid gcc array overrun warning for sparc
  hw/slavio_intctl.c: fix gcc warning about array bounds overrun
  SPARC: Fix Leon3 cache control
  blockdev: Fix drive_add for drives without media
  blockdev: Replace drive_add()'s fmt, ... by optstr parameter
  blockdev: Reject multiple definitions for the same drive
  ...

Conflicts:
	roms/seabios

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

1 files changed, 0 insertions, 0 deletions

diff --git a/roms/seabios b/roms/seabios
-Subproject 94dc9c49c283cd576c25692d17567035557a250
+Subproject 06d0bdd9e2e20377b3180e4986b14c8549b393e