* [Qemu-devel] [PULL v2 0/9] Misc changes for 2016-06-06
@ 2016-06-06 20:25 Paolo Bonzini
2016-06-07 10:24 ` Peter Maydell
0 siblings, 1 reply; 8+ messages in thread
From: Paolo Bonzini @ 2016-06-06 20:25 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 379b954bf85e3d05e6323def1736d3bdea9b2a5c:
vnc: list the 'to' parameter of '-vnc' in the qemu man page (2016-06-06 19:00:25 +0200)
----------------------------------------------------------------
* max-ram-below-4g improvement (Gerd)
* escc fix (xiaoqiang)
* ESP fix (Prasad)
* scsi-disk tweaks/fix (me)
* PKGVERSION improvement (Fam)
* -vnc man improvement (Robert)
----------------------------------------------------------------
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 (2):
scsi: mark TYPE_SCSI_DISK_BASE as abstract
scsi-disk: add missing break
Prasad J Pandit (1):
scsi: esp: check TI buffer index before read/write
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 | 26 +++++++++++++--
hw/char/escc.c | 12 ++++---
hw/i386/pc.c | 2 +-
hw/i386/pc_piix.c | 61 +++++++++++++++++++++++-------------
hw/scsi/esp.c | 20 ++++++------
hw/scsi/scsi-disk.c | 2 ++
linux-user/main.c | 1 +
qemu-img.c | 1 +
qemu-options.hx | 7 +++++
qmp.c | 1 +
scripts/create_config | 4 ---
tests/{Makefile => Makefile.include} | 0
vl.c | 1 +
13 files changed, 92 insertions(+), 46 deletions(-)
rename tests/{Makefile => Makefile.include} (100%)
--
2.5.5
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [Qemu-devel] [PULL v2 0/9] Misc changes for 2016-06-06
2016-06-06 20:25 [Qemu-devel] [PULL v2 0/9] Misc changes for 2016-06-06 Paolo Bonzini
@ 2016-06-07 10:24 ` Peter Maydell
2016-06-07 10:39 ` Peter Maydell
0 siblings, 1 reply; 8+ messages in thread
From: Peter Maydell @ 2016-06-07 10:24 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: QEMU Developers
On 6 June 2016 at 21:25, 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 379b954bf85e3d05e6323def1736d3bdea9b2a5c:
>
> vnc: list the 'to' parameter of '-vnc' in the qemu man page (2016-06-06 19:00:25 +0200)
>
> ----------------------------------------------------------------
> * max-ram-below-4g improvement (Gerd)
> * escc fix (xiaoqiang)
> * ESP fix (Prasad)
> * scsi-disk tweaks/fix (me)
> * PKGVERSION improvement (Fam)
> * -vnc man improvement (Robert)
>
> ----------------------------------------------------------------
I'm afraid this fails to build on 32-bit ARM:
make: Entering directory `/home/petmay01/qemu/build/all-a32'
/home/petmay01/qemu/tests/docker/Makefile.include:34: *** unterminated
variable reference. Stop.
make: Leaving directory `/home/petmay01/qemu/build/all-a32'
No idea why that one's the only failure, because it doesn't seem
architecturally related. The patch on list
'docker: Don't use eval trick on Makefile' might help, but I haven't
tested that.
thanks
-- PMM
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PULL v2 0/9] Misc changes for 2016-06-06
2016-06-07 10:24 ` Peter Maydell
@ 2016-06-07 10:39 ` Peter Maydell
2016-06-07 10:54 ` Paolo Bonzini
0 siblings, 1 reply; 8+ messages in thread
From: Peter Maydell @ 2016-06-07 10:39 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: QEMU Developers
On 7 June 2016 at 11:24, Peter Maydell <peter.maydell@linaro.org> wrote:
> On 6 June 2016 at 21:25, 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 379b954bf85e3d05e6323def1736d3bdea9b2a5c:
>>
>> vnc: list the 'to' parameter of '-vnc' in the qemu man page (2016-06-06 19:00:25 +0200)
>>
>> ----------------------------------------------------------------
>> * max-ram-below-4g improvement (Gerd)
>> * escc fix (xiaoqiang)
>> * ESP fix (Prasad)
>> * scsi-disk tweaks/fix (me)
>> * PKGVERSION improvement (Fam)
>> * -vnc man improvement (Robert)
>>
>> ----------------------------------------------------------------
>
> I'm afraid this fails to build on 32-bit ARM:
>
> make: Entering directory `/home/petmay01/qemu/build/all-a32'
> /home/petmay01/qemu/tests/docker/Makefile.include:34: *** unterminated
> variable reference. Stop.
> make: Leaving directory `/home/petmay01/qemu/build/all-a32'
>
> No idea why that one's the only failure, because it doesn't seem
> architecturally related. The patch on list
> 'docker: Don't use eval trick on Makefile' might help, but I haven't
> tested that.
...and I thought I'd retry as a test, but before I applied that
patch I get a different failure mode instead:
In file included from /home/petmay01/qemu/qemu-img.c:25:0:
./qemu-version.h:1:0: error: "QEMU_PKGVERSION" redefined [-Werror]
#define QEMU_PKGVERSION " (v2.4.0-5677-g0f09cdf-dirty)"
^
In file included from /home/petmay01/qemu/include/qemu/osdep.h:30:0,
from /home/petmay01/qemu/qemu-img.c:24:
./config-host.h:31:0: note: this is the location of the previous definition
#define QEMU_PKGVERSION ""
^
Not sure what is going on there.
thanks
-- PMM
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [Qemu-devel] [PULL v2 0/9] Misc changes for 2016-06-06
2016-06-07 10:39 ` Peter Maydell
@ 2016-06-07 10:54 ` Paolo Bonzini
2016-06-07 10:58 ` Peter Maydell
0 siblings, 1 reply; 8+ messages in thread
From: Paolo Bonzini @ 2016-06-07 10:54 UTC (permalink / raw)
To: Peter Maydell; +Cc: QEMU Developers
On 07/06/2016 12:39, Peter Maydell wrote:
> On 7 June 2016 at 11:24, Peter Maydell <peter.maydell@linaro.org> wrote:
>> On 6 June 2016 at 21:25, 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 379b954bf85e3d05e6323def1736d3bdea9b2a5c:
>>>
>>> vnc: list the 'to' parameter of '-vnc' in the qemu man page (2016-06-06 19:00:25 +0200)
>>>
>>> ----------------------------------------------------------------
>>> * max-ram-below-4g improvement (Gerd)
>>> * escc fix (xiaoqiang)
>>> * ESP fix (Prasad)
>>> * scsi-disk tweaks/fix (me)
>>> * PKGVERSION improvement (Fam)
>>> * -vnc man improvement (Robert)
>>>
>>> ----------------------------------------------------------------
>>
>> I'm afraid this fails to build on 32-bit ARM:
>>
>> make: Entering directory `/home/petmay01/qemu/build/all-a32'
>> /home/petmay01/qemu/tests/docker/Makefile.include:34: *** unterminated
>> variable reference. Stop.
>> make: Leaving directory `/home/petmay01/qemu/build/all-a32'
>>
>> No idea why that one's the only failure, because it doesn't seem
>> architecturally related. The patch on list
>> 'docker: Don't use eval trick on Makefile' might help, but I haven't
>> tested that.
>
> ...and I thought I'd retry as a test, but before I applied that
> patch I get a different failure mode instead:
>
> In file included from /home/petmay01/qemu/qemu-img.c:25:0:
> ./qemu-version.h:1:0: error: "QEMU_PKGVERSION" redefined [-Werror]
> #define QEMU_PKGVERSION " (v2.4.0-5677-g0f09cdf-dirty)"
> ^
> In file included from /home/petmay01/qemu/include/qemu/osdep.h:30:0,
> from /home/petmay01/qemu/qemu-img.c:24:
> ./config-host.h:31:0: note: this is the location of the previous definition
> #define QEMU_PKGVERSION ""
> ^
>
> Not sure what is going on there.
Your config-host.h is not being regenerated for some reason. Just kill
it and it should work.
Paolo
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PULL v2 0/9] Misc changes for 2016-06-06
2016-06-07 10:54 ` Paolo Bonzini
@ 2016-06-07 10:58 ` Peter Maydell
2016-06-07 11:03 ` Paolo Bonzini
0 siblings, 1 reply; 8+ messages in thread
From: Peter Maydell @ 2016-06-07 10:58 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: QEMU Developers
On 7 June 2016 at 11:54, Paolo Bonzini <pbonzini@redhat.com> wrote:
> On 07/06/2016 12:39, Peter Maydell wrote:
>> ...and I thought I'd retry as a test, but before I applied that
>> patch I get a different failure mode instead:
>>
>> In file included from /home/petmay01/qemu/qemu-img.c:25:0:
>> ./qemu-version.h:1:0: error: "QEMU_PKGVERSION" redefined [-Werror]
>> #define QEMU_PKGVERSION " (v2.4.0-5677-g0f09cdf-dirty)"
>> ^
>> In file included from /home/petmay01/qemu/include/qemu/osdep.h:30:0,
>> from /home/petmay01/qemu/qemu-img.c:24:
>> ./config-host.h:31:0: note: this is the location of the previous definition
>> #define QEMU_PKGVERSION ""
>> ^
>>
>> Not sure what is going on there.
>
> Your config-host.h is not being regenerated for some reason. Just kill
> it and it should work.
Worse, when I revert this merge attempt and do a build on the previously
working master, it fails (all trees, all configs):
/home/pm215/qemu/qemu-img.c: In function ‘help’:
/home/pm215/qemu/qemu-img.c:43:59: error: expected ‘,’ or ‘;’ before
‘QEMU_PKGVERSION’
#define QEMU_IMG_VERSION "qemu-img version " QEMU_VERSION QEMU_PKGVERSION \
^
/home/pm215/qemu/qemu-img.c:89:12: note: in expansion of macro
‘QEMU_IMG_VERSION’
QEMU_IMG_VERSION
^
/home/pm215/qemu/qemu-img.c: In function ‘main’:
/home/pm215/qemu/qemu-img.c:43:59: error: expected ‘)’ before ‘QEMU_PKGVERSION’
#define QEMU_IMG_VERSION "qemu-img version " QEMU_VERSION QEMU_PKGVERSION \
^
/home/pm215/qemu/qemu-img.c:3520:16: note: in expansion of macro
‘QEMU_IMG_VERSION’
printf(QEMU_IMG_VERSION);
^
The change is badly broken somehow.
thanks
-- PMM
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [Qemu-devel] [PULL v2 0/9] Misc changes for 2016-06-06
2016-06-07 10:58 ` Peter Maydell
@ 2016-06-07 11:03 ` Paolo Bonzini
2016-06-07 11:13 ` Peter Maydell
0 siblings, 1 reply; 8+ messages in thread
From: Paolo Bonzini @ 2016-06-07 11:03 UTC (permalink / raw)
To: Peter Maydell; +Cc: QEMU Developers
On 07/06/2016 12:58, Peter Maydell wrote:
> Worse, when I revert this merge attempt and do a build on the previously
> working master, it fails (all trees, all configs):
>
> /home/pm215/qemu/qemu-img.c: In function ‘help’:
> /home/pm215/qemu/qemu-img.c:43:59: error: expected ‘,’ or ‘;’ before
> ‘QEMU_PKGVERSION’
> #define QEMU_IMG_VERSION "qemu-img version " QEMU_VERSION QEMU_PKGVERSION \
> ^
> /home/pm215/qemu/qemu-img.c:89:12: note: in expansion of macro
> ‘QEMU_IMG_VERSION’
> QEMU_IMG_VERSION
> ^
> /home/pm215/qemu/qemu-img.c: In function ‘main’:
> /home/pm215/qemu/qemu-img.c:43:59: error: expected ‘)’ before ‘QEMU_PKGVERSION’
> #define QEMU_IMG_VERSION "qemu-img version " QEMU_VERSION QEMU_PKGVERSION \
> ^
> /home/pm215/qemu/qemu-img.c:3520:16: note: in expansion of macro
> ‘QEMU_IMG_VERSION’
> printf(QEMU_IMG_VERSION);
> ^
>
> The change is badly broken somehow.
This is the same issue with PKGVERSION being defined twice (before) and
nowhere (now), instead of once. And I suspect this is a long-standing
issue where config-host.mak and config-host.h are not being rebuilt
correctly.
However, if you force-rebuild config-host.h it should work.
Paolo
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PULL v2 0/9] Misc changes for 2016-06-06
2016-06-07 11:03 ` Paolo Bonzini
@ 2016-06-07 11:13 ` Peter Maydell
2016-06-07 11:23 ` Paolo Bonzini
0 siblings, 1 reply; 8+ messages in thread
From: Peter Maydell @ 2016-06-07 11:13 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: QEMU Developers
On 7 June 2016 at 12:03, Paolo Bonzini <pbonzini@redhat.com> wrote:
> On 07/06/2016 12:58, Peter Maydell wrote:
>> Worse, when I revert this merge attempt and do a build on the previously
>> working master, it fails (all trees, all configs):
>>
>> /home/pm215/qemu/qemu-img.c: In function ‘help’:
>> /home/pm215/qemu/qemu-img.c:43:59: error: expected ‘,’ or ‘;’ before
>> ‘QEMU_PKGVERSION’
>> #define QEMU_IMG_VERSION "qemu-img version " QEMU_VERSION QEMU_PKGVERSION \
>> ^
>> /home/pm215/qemu/qemu-img.c:89:12: note: in expansion of macro
>> ‘QEMU_IMG_VERSION’
>> QEMU_IMG_VERSION
>> ^
>> /home/pm215/qemu/qemu-img.c: In function ‘main’:
>> /home/pm215/qemu/qemu-img.c:43:59: error: expected ‘)’ before ‘QEMU_PKGVERSION’
>> #define QEMU_IMG_VERSION "qemu-img version " QEMU_VERSION QEMU_PKGVERSION \
>> ^
>> /home/pm215/qemu/qemu-img.c:3520:16: note: in expansion of macro
>> ‘QEMU_IMG_VERSION’
>> printf(QEMU_IMG_VERSION);
>> ^
>>
>> The change is badly broken somehow.
>
> This is the same issue with PKGVERSION being defined twice (before) and
> nowhere (now), instead of once. And I suspect this is a long-standing
> issue where config-host.mak and config-host.h are not being rebuilt
> correctly.
>
> However, if you force-rebuild config-host.h it should work.
It didn't. I've just spent a bunch of time manually going around
and forcing reconfigures in all my build trees to unwedge them again :-(
thanks
-- PMM
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PULL v2 0/9] Misc changes for 2016-06-06
2016-06-07 11:13 ` Peter Maydell
@ 2016-06-07 11:23 ` Paolo Bonzini
0 siblings, 0 replies; 8+ messages in thread
From: Paolo Bonzini @ 2016-06-07 11:23 UTC (permalink / raw)
To: Peter Maydell; +Cc: QEMU Developers
On 07/06/2016 13:13, Peter Maydell wrote:
> On 7 June 2016 at 12:03, Paolo Bonzini <pbonzini@redhat.com> wrote:
>> On 07/06/2016 12:58, Peter Maydell wrote:
>>> Worse, when I revert this merge attempt and do a build on the previously
>>> working master, it fails (all trees, all configs):
>>>
>>> /home/pm215/qemu/qemu-img.c: In function ‘help’:
>>> /home/pm215/qemu/qemu-img.c:43:59: error: expected ‘,’ or ‘;’ before
>>> ‘QEMU_PKGVERSION’
>>> #define QEMU_IMG_VERSION "qemu-img version " QEMU_VERSION QEMU_PKGVERSION \
>>> ^
>>> /home/pm215/qemu/qemu-img.c:89:12: note: in expansion of macro
>>> ‘QEMU_IMG_VERSION’
>>> QEMU_IMG_VERSION
>>> ^
>>> /home/pm215/qemu/qemu-img.c: In function ‘main’:
>>> /home/pm215/qemu/qemu-img.c:43:59: error: expected ‘)’ before ‘QEMU_PKGVERSION’
>>> #define QEMU_IMG_VERSION "qemu-img version " QEMU_VERSION QEMU_PKGVERSION \
>>> ^
>>> /home/pm215/qemu/qemu-img.c:3520:16: note: in expansion of macro
>>> ‘QEMU_IMG_VERSION’
>>> printf(QEMU_IMG_VERSION);
>>> ^
>>>
>>> The change is badly broken somehow.
>>
>> This is the same issue with PKGVERSION being defined twice (before) and
>> nowhere (now), instead of once. And I suspect this is a long-standing
>> issue where config-host.mak and config-host.h are not being rebuilt
>> correctly.
>>
>> However, if you force-rebuild config-host.h it should work.
>
> It didn't. I've just spent a bunch of time manually going around
> and forcing reconfigures in all my build trees to unwedge them again :-(
This helped here:
diff --git a/Makefile b/Makefile
index 59af636..a27336d 100644
--- a/Makefile
+++ b/Makefile
@@ -168,8 +168,8 @@ endif
all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all modules
config-host.h: config-host.h-timestamp
-config-host.h-timestamp: config-host.mak
+config-host.h-timestamp: config-host.mak $(SRC_PATH)/scripts/create_config
qemu-options.def: $(SRC_PATH)/qemu-options.hx
$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@," GEN $@")
SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS))
Paolo
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2016-06-07 11:24 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-06 20:25 [Qemu-devel] [PULL v2 0/9] Misc changes for 2016-06-06 Paolo Bonzini
2016-06-07 10:24 ` Peter Maydell
2016-06-07 10:39 ` Peter Maydell
2016-06-07 10:54 ` Paolo Bonzini
2016-06-07 10:58 ` Peter Maydell
2016-06-07 11:03 ` Paolo Bonzini
2016-06-07 11:13 ` Peter Maydell
2016-06-07 11:23 ` Paolo Bonzini
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).