The following changes since commit 76462405809d29bab65a3699686998ba124ab942:
Merge remote-tracking branch
'remotes/pmaydell/tags/pull-target-arm-20160606-1' into staging (2016-06-06
17:02:42 +0100)
are available in the git repository at:
git://github.com/bonzini/qemu.git tags/for-upstream
for you to fetch changes up to 99a9a52a23bd9c256a783b4509990c21c6635c7d:
vnc: list the 'to' parameter of '-vnc' in the qemu man page (2016-06-07
14:14:39 +0200)
----------------------------------------------------------------
* max-ram-below-4g improvement (Gerd)
* escc fix (xiaoqiang)
* ESP and Megasas fix (Prasad)
* scsi-disk tweaks/fix (me)
* Makefile dependency fixes (me)
* PKGVERSION improvement (Fam)
* -vnc man improvement (Robert)
----------------------------------------------------------------
This fixes the missing depedency issues and adds another of Prasad's
fixes.
Fam Zheng (3):
tests: Rename tests/Makefile to tests/Makefile.include
Makefile: Add a "FORCE" target
Makefile: Derive "PKGVERSION" from "git describe" by default
Gerd Hoffmann (1):
pc: allow raising low memory via max-ram-below-4g option
Paolo Bonzini (5):
scsi: mark TYPE_SCSI_DISK_BASE as abstract
Makefile: add dependency on scripts/create_config
Makefile: add dependency on scripts/make_device_config.sh
Makefile: add dependency on scripts/hxtool
scsi-disk: add missing break
Prasad J Pandit (2):
scsi: esp: check TI buffer index before read/write
scsi: megasas: null terminate bios version buffer
Robert Ho (1):
vnc: list the 'to' parameter of '-vnc' in the qemu man page
xiaoqiang zhao (1):
hw/char: QOM'ify escc.c (fix)
Makefile | 42 ++++++++++++++++++-------
Makefile.target | 6 ++--
hw/char/escc.c | 12 ++++---
hw/i386/pc.c | 2 +-
hw/i386/pc_piix.c | 61 +++++++++++++++++++++++-------------
hw/scsi/esp.c | 20 ++++++------
hw/scsi/megasas.c | 1 +
hw/scsi/scsi-disk.c | 2 ++
linux-user/main.c | 1 +
qemu-img.c | 1 +
qemu-options.hx | 7 +++++
qmp.c | 1 +
rules.mak | 2 +-
scripts/create_config | 4 ---
tests/{Makefile => Makefile.include} | 0
vl.c | 1 +
16 files changed, 105 insertions(+), 58 deletions(-)
rename tests/{Makefile => Makefile.include} (100%)
--
1.8.3.1
