[Qemu-devel] [PULL 0/3] Update seabios to 1.7.4

[Qemu-devel] [PULL 0/3] Update seabios to 1.7.4

[Gerd Hoffmann]

  Hi,

Sorry for the delay folks, totally forgot that one.
Here is the seabios update to 1.7.4 final.

please pull,
  Gerd

The following changes since commit 2f61120c10da9128357510debc8e66880cd2bfdc:

  Merge remote-tracking branch 'qmp-unstable/queue/qmp' into staging (2014-02-01 23:32:31 +0000)

are available in the git repository at:


  git://git.kraxel.org/qemu tags/pull-roms-1

for you to fetch changes up to 41419b0f11d125ad792660638eb452c767eddc28:

  Update seabios binaries to 1.7.4 (2014-02-03 15:40:01 +0100)

----------------------------------------------------------------
Update seabios to 1.7.4

----------------------------------------------------------------
Bruce Rogers (1):
      roms: remove explicit MAKEFLAGS from recursive make invocations

Gerd Hoffmann (2):
      Update seabios submodule to 1.7.4
      Update seabios binaries to 1.7.4

 pc-bios/bios-256k.bin      | Bin 262144 -> 262144 bytes
 pc-bios/bios.bin           | Bin 131072 -> 131072 bytes
 pc-bios/vgabios-cirrus.bin | Bin 36864 -> 36864 bytes
 pc-bios/vgabios-qxl.bin    | Bin 37376 -> 37376 bytes
 pc-bios/vgabios-stdvga.bin | Bin 37376 -> 37376 bytes
 pc-bios/vgabios-vmware.bin | Bin 37376 -> 37376 bytes
 pc-bios/vgabios.bin        | Bin 36864 -> 36864 bytes
 roms/Makefile              |  22 +++++++++++-----------
 roms/seabios               |   2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

[Qemu-devel] [PATCH 1/3] roms: remove explicit MAKEFLAGS from recursive make invocations

[Gerd Hoffmann]

From: Bruce Rogers <brogers@suse.com>

When using $(MAKE) within a makefile, we shouldn't be explicitly
including $(MAKEFLAGS) on the command-line. It causes problems
when that makefile is recursively invoked. When the roms/Makefile
is invoked as in make -C roms bios a spurious 'w' appears on the
sub-make invocation, due to the erroneous $(MAKEFLAGS) inclusion.

Signed-off-by: Bruce Rogers <brogers@suse.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 roms/Makefile | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/roms/Makefile b/roms/Makefile
index 1e04669..2721b02 100644
--- a/roms/Makefile
+++ b/roms/Makefile
@@ -72,11 +72,11 @@ seavgabios-%: build-seabios-config-vga-%
 build-seabios-config-%: config.%
 	mkdir -p seabios/builds/$*
 	cp $< seabios/builds/$*/.config
-	$(MAKE) $(MAKEFLAGS) -C seabios \
+	$(MAKE) -C seabios \
 		CROSS_COMPILE=$(x86_64_cross_prefix) \
 		KCONFIG_CONFIG=$(CURDIR)/seabios/builds/$*/.config \
 		OUT=$(CURDIR)/seabios/builds/$*/ oldnoconfig
-	$(MAKE) $(MAKEFLAGS) -C seabios \
+	$(MAKE) -C seabios \
 		CROSS_COMPILE=$(x86_64_cross_prefix) \
 		KCONFIG_CONFIG=$(CURDIR)/seabios/builds/$*/.config \
 		OUT=$(CURDIR)/seabios/builds/$*/ all
@@ -90,12 +90,12 @@ lgplvgabios-%: build-lgplvgabios
 	cp vgabios/VGABIOS-lgpl-latest.$*.bin ../pc-bios/vgabios-$*.bin
 
 build-lgplvgabios:
-	$(MAKE) $(MAKEFLAGS) -C vgabios $(vgabios_targets)
+	$(MAKE) -C vgabios $(vgabios_targets)
 
 
 .PHONY: sgabios
 sgabios:
-	$(MAKE) $(MAKEFLAGS) -C sgabios
+	$(MAKE) -C sgabios
 	cp sgabios/sgabios.bin ../pc-bios
 
 
@@ -114,12 +114,12 @@ efi-rom-%: build-pxe-roms build-efi-roms
 		-o ../pc-bios/efi-$*.rom
 
 build-pxe-roms: ipxe/src/config/local/general.h
-	$(MAKE) $(MAKEFLAGS) -C ipxe/src GITVERSION="" \
+	$(MAKE) -C ipxe/src GITVERSION="" \
 		CROSS_COMPILE=$(x86_64_cross_prefix) \
 		$(patsubst %,bin/%.rom,$(pxerom_targets))
 
 build-efi-roms: build-pxe-roms ipxe/src/config/local/general.h
-	$(MAKE) $(MAKEFLAGS) -C ipxe/src GITVERSION="" \
+	$(MAKE) -C ipxe/src GITVERSION="" \
 		CROSS_COMPILE=$(x86_64_cross_prefix) \
 		$(patsubst %,bin-i386-efi/%.efidrv,$(pxerom_targets)) \
 		$(patsubst %,bin-x86_64-efi/%.efidrv,$(pxerom_targets))
@@ -129,15 +129,15 @@ ipxe/src/config/local/%: config.ipxe.%
 
 
 slof:
-	$(MAKE) $(MAKEFLAGS) -C SLOF CROSS=$(powerpc64_cross_prefix) qemu
+	$(MAKE) -C SLOF CROSS=$(powerpc64_cross_prefix) qemu
 	cp SLOF/boot_rom.bin ../pc-bios/slof.bin
 
 
 clean:
 	rm -rf seabios/.config seabios/out seabios/builds
-	$(MAKE) $(MAKEFLAGS) -C vgabios clean
+	$(MAKE) -C vgabios clean
 	rm -f vgabios/VGABIOS-lgpl-latest*
-	$(MAKE) $(MAKEFLAGS) -C sgabios clean
+	$(MAKE) -C sgabios clean
 	rm -f sgabios/.depend
-	$(MAKE) $(MAKEFLAGS) -C ipxe/src veryclean
-	$(MAKE) $(MAKEFLAGS) -C SLOF clean
+	$(MAKE) -C ipxe/src veryclean
+	$(MAKE) -C SLOF clean
-- 
1.8.3.1

[Qemu-devel] [PATCH 2/3] Update seabios submodule to 1.7.4

[Gerd Hoffmann]

Not that many changes as we already have a git snapshot pretty close
to final 1.7.4 in the tree.  Most notably change is the vgabios change
which fixes the windows guest regression.

Full git shortlog:

Gerd Hoffmann (2):
      run qemu_cfg_e820 only for CONFIG_QEMU=y
      change boot order load log level

Kevin O'Connor (10):
      Minor - move sgdt/lgdt macros from stacks.c to x86.h.
      Separate out sec32init sections even when not doing code relocation.
      floppy: Fix incorrect LBA to CHS translation.
      floppy: Fix accesses to DOR register.
      vgabios: Avoid memory references via %esp register in vgabios.
      Small improvements to irqentry_extrastack assembler.
      floppy: Encode command and flags into single value in floppy pio code.
      On disk format request, verify cylinders and pass to driver.
      floppy: Implement cylinder seeking when accessing a different cylinder.
      coreboot: Make sure to print the SeaBIOS version in cbmem debug output.

Kyösti Mälkki (1):
      Fix CBMEM console overflow
---
 roms/seabios | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roms/seabios b/roms/seabios
index 31b8b4e..96917a8 160000
--- a/roms/seabios
+++ b/roms/seabios
@@ -1 +1 @@
-Subproject commit 31b8b4eea9d9ad58a73b22a6060d3ac1c419c26d
+Subproject commit 96917a8ed761f017fc8c72ba3b9181fbac03ac59
-- 
1.8.3.1

[Qemu-devel] [PATCH 3/3] Update seabios binaries to 1.7.4

[Gerd Hoffmann]

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 pc-bios/bios-256k.bin      | Bin 262144 -> 262144 bytes
 pc-bios/bios.bin           | Bin 131072 -> 131072 bytes
 pc-bios/vgabios-cirrus.bin | Bin 36864 -> 36864 bytes
 pc-bios/vgabios-qxl.bin    | Bin 37376 -> 37376 bytes
 pc-bios/vgabios-stdvga.bin | Bin 37376 -> 37376 bytes
 pc-bios/vgabios-vmware.bin | Bin 37376 -> 37376 bytes
 pc-bios/vgabios.bin        | Bin 36864 -> 36864 bytes
 7 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/pc-bios/bios-256k.bin b/pc-bios/bios-256k.bin

[ ... huge binary patches snipped ... ]

Re: [Qemu-devel] [PULL 0/3] Update seabios to 1.7.4

[Michael Tokarev]

03.02.2014 18:45, Gerd Hoffmann wrote:
>   Hi,
> 
> Sorry for the delay folks, totally forgot that one.
> Here is the seabios update to 1.7.4 final.

FWIW, we updated seabios in Debian testing (with qemu 1.7), and
now there are several bugs filed in Debian BTS, at least:

 http://bugs.debian.org/737142
 http://bugs.debian.org/736902

(this last one is a bit messy, all branches/combinations produce
different results, and it isn't exactly stable).

I had not much time to dig into this.

Thanks,

/mjt

Re: [Qemu-devel] [PULL 0/3] Update seabios to 1.7.4

[Gerd Hoffmann]

On Di, 2014-02-04 at 11:39 +0400, Michael Tokarev wrote:
> 03.02.2014 18:45, Gerd Hoffmann wrote:
> >   Hi,
> > 
> > Sorry for the delay folks, totally forgot that one.
> > Here is the seabios update to 1.7.4 final.
> 
> FWIW, we updated seabios in Debian testing (with qemu 1.7), and
> now there are several bugs filed in Debian BTS, at least:
> 
>  http://bugs.debian.org/737142
>  http://bugs.debian.org/736902
> 
> (this last one is a bit messy, all branches/combinations produce
> different results, and it isn't exactly stable).

Dunno what 737142 is.  736902 looks like something with ram detection.

Would be interesting to know whenever the blobs from this pull request
are failing too.  If so a seabios log would be helpful.

cheers,
  Gerd

Re: [Qemu-devel] [PULL 0/3] Update seabios to 1.7.4

[Michael Tokarev]

04.02.2014 12:17, Gerd Hoffmann wrote:
> On Di, 2014-02-04 at 11:39 +0400, Michael Tokarev wrote:
>> FWIW, we updated seabios in Debian testing (with qemu 1.7), and
>> now there are several bugs filed in Debian BTS, at least:
>>
>>  http://bugs.debian.org/737142
>>  http://bugs.debian.org/736902

> Dunno what 737142 is.  736902 looks like something with ram detection.
> 
> Would be interesting to know whenever the blobs from this pull request
> are failing too.  If so a seabios log would be helpful.

It looks like this mess is entirely due to my brown-paper-bag error.
I updated multiboot.S (which we have to carry in seabios source for
debian, a long story) from a wrong qemu branch (but at the same time
stating in the README that it is from the right commit).  Hence it
broke.

I'm now trying to verify 737142 (PC-BSD is unable to boot), but since
it also uses multiboot, it is highly likely that it is the same issue.

I'm sorry for the noize.

Thanks,

/mjt

Re: [Qemu-devel] [PULL 0/3] Update seabios to 1.7.4

[Michael Tokarev]

03.02.2014 18:45, Gerd Hoffmann wrote:
> are available in the git repository at:
> 
>   git://git.kraxel.org/qemu tags/pull-roms-1

Hmm. Did you forgot to push the tag?

> for you to fetch changes up to 41419b0f11d125ad792660638eb452c767eddc28:

or the commits?

Thanks,

/mjt

Re: [Qemu-devel] [PULL 0/3] Update seabios to 1.7.4

[Gerd Hoffmann]

On Di, 2014-02-04 at 14:21 +0400, Michael Tokarev wrote:
> 03.02.2014 18:45, Gerd Hoffmann wrote:
> > are available in the git repository at:
> > 
> >   git://git.kraxel.org/qemu tags/pull-roms-1
> 
> Hmm. Did you forgot to push the tag?

It's there: http://www.kraxel.org/cgit/qemu/tag/?id=pull-roms-1

It is a signed tag not a branch though.  "git fetch --tags" ?

cheers,
  Gerd

Re: [Qemu-devel] [PULL 0/3] Update seabios to 1.7.4

[Michael Tokarev]

04.02.2014 15:03, Gerd Hoffmann wrote:
> On Di, 2014-02-04 at 14:21 +0400, Michael Tokarev wrote:
>> Hmm. Did you forgot to push the tag?
> 
> It's there: http://www.kraxel.org/cgit/qemu/tag/?id=pull-roms-1
> 
> It is a signed tag not a branch though.  "git fetch --tags" ?

Interesting.  I always used `git remote update', and it usually
fetches all tags too, and it fetched quite a few of your tags
and branches, but not the tag in question.  I had to explicitly
run `git fetch <remote> --tags' to get this one tag (together with
the branch which leads to it).  Wonder what's going on...

But ok.

Thanks,

/mjt

Re: [Qemu-devel] [PULL 0/3] Update seabios to 1.7.4

[Peter Maydell]

On 3 February 2014 14:45, Gerd Hoffmann <kraxel@redhat.com> wrote:
>   Hi,
>
> Sorry for the delay folks, totally forgot that one.
> Here is the seabios update to 1.7.4 final.
>
> please pull,
>   Gerd
>
> The following changes since commit 2f61120c10da9128357510debc8e66880cd2bfdc:
>
>   Merge remote-tracking branch 'qmp-unstable/queue/qmp' into staging (2014-02-01 23:32:31 +0000)
>
> are available in the git repository at:
>
>
>   git://git.kraxel.org/qemu tags/pull-roms-1

Applied, thanks.

-- PMM

Re: [Qemu-devel] [PULL 0/3] Update seabios to 1.7.4

[Peter Maydell]

On 8 February 2014 13:12, Peter Maydell <peter.maydell@linaro.org> wrote:
> On 3 February 2014 14:45, Gerd Hoffmann <kraxel@redhat.com> wrote:
>>   Hi,
>>
>> Sorry for the delay folks, totally forgot that one.
>> Here is the seabios update to 1.7.4 final.
>>
>> please pull,
>>   Gerd
>>
>> The following changes since commit 2f61120c10da9128357510debc8e66880cd2bfdc:
>>
>>   Merge remote-tracking branch 'qmp-unstable/queue/qmp' into staging (2014-02-01 23:32:31 +0000)
>>
>> are available in the git repository at:
>>
>>
>>   git://git.kraxel.org/qemu tags/pull-roms-1
>
> Applied, thanks.

It looks like this pull request updates our seabios
module to a revision that isn't actually present in
git://git.qemu-project.org/seabios.git/. Gerd, do you
have a fix for that or should I just revert this?

thanks
-- PMM

Re: [Qemu-devel] [PULL 0/3] Update seabios to 1.7.4

[Gerd Hoffmann]

On Mo, 2014-02-17 at 11:56 +0000, Peter Maydell wrote:
> On 8 February 2014 13:12, Peter Maydell <peter.maydell@linaro.org> wrote:
> > On 3 February 2014 14:45, Gerd Hoffmann <kraxel@redhat.com> wrote:
> >>   Hi,
> >>
> >> Sorry for the delay folks, totally forgot that one.
> >> Here is the seabios update to 1.7.4 final.
> >>
> >> please pull,
> >>   Gerd
> >>
> >> The following changes since commit 2f61120c10da9128357510debc8e66880cd2bfdc:
> >>
> >>   Merge remote-tracking branch 'qmp-unstable/queue/qmp' into staging (2014-02-01 23:32:31 +0000)
> >>
> >> are available in the git repository at:
> >>
> >>
> >>   git://git.kraxel.org/qemu tags/pull-roms-1
> >
> > Applied, thanks.
> 
> It looks like this pull request updates our seabios
> module to a revision that isn't actually present in
> git://git.qemu-project.org/seabios.git/. Gerd, do you
> have a fix for that or should I just revert this?

The seabios mirroring doesn't seem to be automatic (or the automatic
mirroring is broken).  Usually Anthony updates the seabios.git tree
manually.

Upstream git repo is git://git.seabios.org/seabios.git

If you have write access to the seabios repo you can just pull latest
master from seabios.org and push it to qemu-project.org.  If not bug
anthony about it.

Or we can update the git submodule url to point the upstream repo
directly.  Not fully sure this is a good idea from the gpl point of view
(we ship blobs, so we should ship the source for them too, even if all
we provide is just a mirror of upstream ...).

cheers,
  Gerd

Re: [Qemu-devel] [PULL 0/3] Update seabios to 1.7.4

[Peter Maydell]

On 17 February 2014 13:17, Gerd Hoffmann <kraxel@redhat.com> wrote:
> On Mo, 2014-02-17 at 11:56 +0000, Peter Maydell wrote:
>> It looks like this pull request updates our seabios
>> module to a revision that isn't actually present in
>> git://git.qemu-project.org/seabios.git/. Gerd, do you
>> have a fix for that or should I just revert this?
>
> The seabios mirroring doesn't seem to be automatic (or the automatic
> mirroring is broken).  Usually Anthony updates the seabios.git tree
> manually.
>
> Upstream git repo is git://git.seabios.org/seabios.git
>
> If you have write access to the seabios repo you can just pull latest
> master from seabios.org and push it to qemu-project.org.  If not bug
> anthony about it.

I do have write access, but I'm not completely confident
what the right command line rune to do this is. (It looks
like our mirror of seabios has all its branches and
maybe also tags, so a simple 'push one branch' is probably
wrong). Anthony?

> Or we can update the git submodule url to point the upstream repo
> directly.  Not fully sure this is a good idea from the gpl point of view
> (we ship blobs, so we should ship the source for them too, even if all
> we provide is just a mirror of upstream ...).

Yep, not pointing straight at the upstream repo is deliberate
and for this reason AIUI.

thanks
-- PMM

Re: [Qemu-devel] [PULL 0/3] Update seabios to 1.7.4

[Peter Maydell]

On 17 February 2014 13:23, Peter Maydell <peter.maydell@linaro.org> wrote:
> On 17 February 2014 13:17, Gerd Hoffmann <kraxel@redhat.com> wrote:
>> The seabios mirroring doesn't seem to be automatic (or the automatic
>> mirroring is broken).  Usually Anthony updates the seabios.git tree
>> manually.
>>
>> Upstream git repo is git://git.seabios.org/seabios.git
>>
>> If you have write access to the seabios repo you can just pull latest
>> master from seabios.org and push it to qemu-project.org.  If not bug
>> anthony about it.
>
> I do have write access, but I'm not completely confident
> what the right command line rune to do this is. (It looks
> like our mirror of seabios has all its branches and
> maybe also tags, so a simple 'push one branch' is probably
> wrong). Anthony?

With some assistance from Stefan I found the correct runes
to do this:
 git clone --mirror git://git.seabios.org/seabios.git
 cd seabios
 git push --mirror [git+ssh url for mirror]

so I've updated our mirror.

thanks
-- PMM