* [Qemu-devel] [PULL v3 00/13] Misc changes for 2016-06-06
@ 2016-06-07 17:08 Paolo Bonzini
2016-06-07 17:08 ` [Qemu-devel] [PULL 06/13] scsi: megasas: null terminate bios version buffer Paolo Bonzini
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Paolo Bonzini @ 2016-06-07 17:08 UTC (permalink / raw)
To: qemu-devel
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
^ permalink raw reply [flat|nested] 6+ messages in thread* [Qemu-devel] [PULL 06/13] scsi: megasas: null terminate bios version buffer 2016-06-07 17:08 [Qemu-devel] [PULL v3 00/13] Misc changes for 2016-06-06 Paolo Bonzini @ 2016-06-07 17:08 ` Paolo Bonzini 2016-06-07 17:08 ` [Qemu-devel] [PULL 08/13] Makefile: add dependency on scripts/create_config Paolo Bonzini ` (3 subsequent siblings) 4 siblings, 0 replies; 6+ messages in thread From: Paolo Bonzini @ 2016-06-07 17:08 UTC (permalink / raw) To: qemu-devel; +Cc: Prasad J Pandit From: Prasad J Pandit <pjp@fedoraproject.org> While reading information via 'megasas_ctrl_get_info' routine, a local bios version buffer isn't null terminated. Add the terminating null byte to avoid any OOB access. Reported-by: Li Qiang <liqiang6-s@360.cn> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- hw/scsi/megasas.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index cc66d36..a9ffc32 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -773,6 +773,7 @@ static int megasas_ctrl_get_info(MegasasState *s, MegasasCmd *cmd) ptr = memory_region_get_ram_ptr(&pci_dev->rom); memcpy(biosver, ptr + 0x41, 31); + biosver[31] = 0; memcpy(info.image_component[1].name, "BIOS", 4); memcpy(info.image_component[1].version, biosver, strlen((const char *)biosver)); -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Qemu-devel] [PULL 08/13] Makefile: add dependency on scripts/create_config 2016-06-07 17:08 [Qemu-devel] [PULL v3 00/13] Misc changes for 2016-06-06 Paolo Bonzini 2016-06-07 17:08 ` [Qemu-devel] [PULL 06/13] scsi: megasas: null terminate bios version buffer Paolo Bonzini @ 2016-06-07 17:08 ` Paolo Bonzini 2016-06-07 17:08 ` [Qemu-devel] [PULL 09/13] Makefile: add dependency on scripts/make_device_config.sh Paolo Bonzini ` (2 subsequent siblings) 4 siblings, 0 replies; 6+ messages in thread From: Paolo Bonzini @ 2016-06-07 17:08 UTC (permalink / raw) To: qemu-devel Make sure that config-host.h and config-target.h are rebuilt whenever there is a change in the scripts that generates them; add the dependency to the pattern rule as suggested by Peter. Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- rules.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules.mak b/rules.mak index 4a8f464..fae16b3 100644 --- a/rules.mak +++ b/rules.mak @@ -172,7 +172,7 @@ TRACETOOL=$(PYTHON) $(SRC_PATH)/scripts/tracetool.py config-%.h: config-%.h-timestamp @cmp $< $@ >/dev/null 2>&1 || cp $< $@ -config-%.h-timestamp: config-%.mak +config-%.h-timestamp: config-%.mak $(SRC_PATH)/scripts/create_config $(call quiet-command, sh $(SRC_PATH)/scripts/create_config < $< > $@, " GEN $(TARGET_DIR)config-$*.h") .PHONY: clean-timestamp -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Qemu-devel] [PULL 09/13] Makefile: add dependency on scripts/make_device_config.sh 2016-06-07 17:08 [Qemu-devel] [PULL v3 00/13] Misc changes for 2016-06-06 Paolo Bonzini 2016-06-07 17:08 ` [Qemu-devel] [PULL 06/13] scsi: megasas: null terminate bios version buffer Paolo Bonzini 2016-06-07 17:08 ` [Qemu-devel] [PULL 08/13] Makefile: add dependency on scripts/create_config Paolo Bonzini @ 2016-06-07 17:08 ` Paolo Bonzini 2016-06-07 17:08 ` [Qemu-devel] [PULL 10/13] Makefile: add dependency on scripts/hxtool Paolo Bonzini 2016-06-08 15:04 ` [Qemu-devel] [PULL v3 00/13] Misc changes for 2016-06-06 Peter Maydell 4 siblings, 0 replies; 6+ messages in thread From: Paolo Bonzini @ 2016-06-07 17:08 UTC (permalink / raw) To: qemu-devel Make sure that config-devices.mak is rebuilt whenever there is a change in the scripts that generates it. Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 59af636..6406847 100644 --- a/Makefile +++ b/Makefile @@ -117,7 +117,7 @@ endif -include $(SUBDIR_DEVICES_MAK_DEP) -%/config-devices.mak: default-configs/%.mak +%/config-devices.mak: default-configs/%.mak $(SRC_PATH)/scripts/make_device_config.sh $(call quiet-command, \ $(SHELL) $(SRC_PATH)/scripts/make_device_config.sh $< $*-config-devices.mak.d $@ > $@.tmp, " GEN $@.tmp") $(call quiet-command, if test -f $@; then \ -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Qemu-devel] [PULL 10/13] Makefile: add dependency on scripts/hxtool 2016-06-07 17:08 [Qemu-devel] [PULL v3 00/13] Misc changes for 2016-06-06 Paolo Bonzini ` (2 preceding siblings ...) 2016-06-07 17:08 ` [Qemu-devel] [PULL 09/13] Makefile: add dependency on scripts/make_device_config.sh Paolo Bonzini @ 2016-06-07 17:08 ` Paolo Bonzini 2016-06-08 15:04 ` [Qemu-devel] [PULL v3 00/13] Misc changes for 2016-06-06 Peter Maydell 4 siblings, 0 replies; 6+ messages in thread From: Paolo Bonzini @ 2016-06-07 17:08 UTC (permalink / raw) To: qemu-devel Make sure that the various documentation and C code files are rebuilt whenever there is a change in the script that splits them out of .hx files. Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- Makefile | 14 +++++++------- Makefile.target | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 6406847..3875192 100644 --- a/Makefile +++ b/Makefile @@ -169,7 +169,7 @@ all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all modules config-host.h: config-host.h-timestamp config-host.h-timestamp: config-host.mak -qemu-options.def: $(SRC_PATH)/qemu-options.hx +qemu-options.def: $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/scripts/hxtool $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@," GEN $@") SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS)) @@ -241,7 +241,7 @@ qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o libqemuutil.a libqemustub.a fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/9p-marshal.o fsdev/9p-iov-marshal.o libqemuutil.a libqemustub.a fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap -qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx +qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/scripts/hxtool $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@," GEN $@") qemu-ga$(EXESUF): LIBS = $(LIBS_QGA) @@ -524,19 +524,19 @@ TEXIFLAG=$(if $(V),,--quiet) %.pdf: %.texi $(call quiet-command,texi2pdf $(TEXIFLAG) -I . $<," GEN $@") -qemu-options.texi: $(SRC_PATH)/qemu-options.hx +qemu-options.texi: $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/scripts/hxtool $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@," GEN $@") -qemu-monitor.texi: $(SRC_PATH)/hmp-commands.hx +qemu-monitor.texi: $(SRC_PATH)/hmp-commands.hx $(SRC_PATH)/scripts/hxtool $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@," GEN $@") -qemu-monitor-info.texi: $(SRC_PATH)/hmp-commands-info.hx +qemu-monitor-info.texi: $(SRC_PATH)/hmp-commands-info.hx $(SRC_PATH)/scripts/hxtool $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@," GEN $@") -qmp-commands.txt: $(SRC_PATH)/qmp-commands.hx +qmp-commands.txt: $(SRC_PATH)/qmp-commands.hx $(SRC_PATH)/scripts/hxtool $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -q < $< > $@," GEN $@") -qemu-img-cmds.texi: $(SRC_PATH)/qemu-img-cmds.hx +qemu-img-cmds.texi: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/scripts/hxtool $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@," GEN $@") qemu.1: qemu-doc.texi qemu-options.texi qemu-monitor.texi qemu-monitor-info.texi diff --git a/Makefile.target b/Makefile.target index 5b80dd7..495b474 100644 --- a/Makefile.target +++ b/Makefile.target @@ -206,13 +206,13 @@ endif gdbstub-xml.c: $(TARGET_XML_FILES) $(SRC_PATH)/scripts/feature_to_c.sh $(call quiet-command,rm -f $@ && $(SHELL) $(SRC_PATH)/scripts/feature_to_c.sh $@ $(TARGET_XML_FILES)," GEN $(TARGET_DIR)$@") -hmp-commands.h: $(SRC_PATH)/hmp-commands.hx +hmp-commands.h: $(SRC_PATH)/hmp-commands.hx $(SRC_PATH)/scripts/hxtool $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@," GEN $(TARGET_DIR)$@") -hmp-commands-info.h: $(SRC_PATH)/hmp-commands-info.hx +hmp-commands-info.h: $(SRC_PATH)/hmp-commands-info.hx $(SRC_PATH)/scripts/hxtool $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@," GEN $(TARGET_DIR)$@") -qmp-commands-old.h: $(SRC_PATH)/qmp-commands.hx +qmp-commands-old.h: $(SRC_PATH)/qmp-commands.hx $(SRC_PATH)/scripts/hxtool $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@," GEN $(TARGET_DIR)$@") clean: -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PULL v3 00/13] Misc changes for 2016-06-06 2016-06-07 17:08 [Qemu-devel] [PULL v3 00/13] Misc changes for 2016-06-06 Paolo Bonzini ` (3 preceding siblings ...) 2016-06-07 17:08 ` [Qemu-devel] [PULL 10/13] Makefile: add dependency on scripts/hxtool Paolo Bonzini @ 2016-06-08 15:04 ` Peter Maydell 4 siblings, 0 replies; 6+ messages in thread From: Peter Maydell @ 2016-06-08 15:04 UTC (permalink / raw) To: Paolo Bonzini; +Cc: QEMU Developers On 7 June 2016 at 18:08, Paolo Bonzini <pbonzini@redhat.com> wrote: > 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) > > ---------------------------------------------------------------- > Applied, thanks. -- PMM ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-06-08 15:04 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-06-07 17:08 [Qemu-devel] [PULL v3 00/13] Misc changes for 2016-06-06 Paolo Bonzini 2016-06-07 17:08 ` [Qemu-devel] [PULL 06/13] scsi: megasas: null terminate bios version buffer Paolo Bonzini 2016-06-07 17:08 ` [Qemu-devel] [PULL 08/13] Makefile: add dependency on scripts/create_config Paolo Bonzini 2016-06-07 17:08 ` [Qemu-devel] [PULL 09/13] Makefile: add dependency on scripts/make_device_config.sh Paolo Bonzini 2016-06-07 17:08 ` [Qemu-devel] [PULL 10/13] Makefile: add dependency on scripts/hxtool Paolo Bonzini 2016-06-08 15:04 ` [Qemu-devel] [PULL v3 00/13] Misc changes for 2016-06-06 Peter Maydell
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).