Merge commit 'f0138a63a41fe26bcef61d031ae53d872d12a992' into upstream-merge

Merge commit 'f0138a63a41fe26bcef61d031ae53d872d12a992' into upstream-merge

* commit 'f0138a63a41fe26bcef61d031ae53d872d12a992': (23 commits)
  Make sure to enable dirty tracking of VBE vram mapping
  vmware: setup PCI BAR 2 for FIFO as per vmware spec
  qdev: improve property error reporting.
  fix vga names in default_list
  usb-host: check mon before using it.
  usb-net: use qdev for -usbdevice
  Check rom_load_all() return value.
  defaults: update device_list[]
  defaults: split default_drive
  monitor: Catch printing to non-existent monitor
  monitor: Avoid readline functions in QMP
  monitor: do_balloon(): Check for errors
  monitor: Use 'device' in eject
  QDict: Fix size update
  qdev: Improve uni-north device names
  Avoid permanently disabled QEMU monitor when UNIX migration fails
  Fix loading of ELF multiboot kernels
  Revert "Rename DriveInfo.onerror to on_write_error" (fix mismerge)
  qemu-io: Fix memory leak
  Fix thinko in linuxboot.S
  ...

Conflicts:
	hw/vga.c

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