mbox

[PULL,0/6] ipxe: update submodule from 4e03af8ec to 041863191

Message ID 1467194704-28047-1-git-send-email-kraxel@redhat.com
State New
Headers show

Pull-request

git://git.kraxel.org/qemu tags/pull-ipxe-20160629-1

Message

Gerd Hoffmann June 29, 2016, 10:04 a.m. UTC 
Hi,

Here comes the ipxe update for 2.7, rebasing the ipxe module to latest
master and also adding boot roms for e1000e and vmxnet3.

please pull,
  Gerd

The following changes since commit c7288767523f6510cf557707d3eb5e78e519b90d:

  Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.7-20160623' into staging (2016-06-23 11:53:14 +0100)

are available in the git repository at:


  git://git.kraxel.org/qemu tags/pull-ipxe-20160629-1

for you to fetch changes up to c52125ab9280733b8d265195f6ffe9c76772b0a5:

  ipxe: update prebuilt binaries (2016-06-24 14:18:19 +0200)

----------------------------------------------------------------
ipxe: update submodule from 4e03af8ec to 041863191
e1000e+vmxnet3: add boot rom

----------------------------------------------------------------
Gerd Hoffmann (6):
      ipxe: update submodule from 4e03af8ec to 041863191
      ipxe: add e1000e rom
      ipxe: add vmxnet3 rom
      e1000e: add boot rom
      vmxnet3: add boot rom
      ipxe: update prebuilt binaries

 hw/net/e1000e.c          |   1 +
 hw/net/vmxnet3.c         |   1 +
 include/hw/i386/pc.h     |   4 ++++
 pc-bios/efi-e1000.rom    | Bin 196608 -> 209408 bytes
 pc-bios/efi-e1000e.rom   | Bin 0 -> 209408 bytes
 pc-bios/efi-eepro100.rom | Bin 197120 -> 209920 bytes
 pc-bios/efi-ne2k_pci.rom | Bin 195584 -> 208384 bytes
 pc-bios/efi-pcnet.rom    | Bin 195584 -> 208384 bytes
 pc-bios/efi-rtl8139.rom  | Bin 199168 -> 211456 bytes
 pc-bios/efi-virtio.rom   | Bin 193024 -> 211456 bytes
 pc-bios/efi-vmxnet3.rom  | Bin 0 -> 205312 bytes
 roms/Makefile            |   8 ++++++--
 roms/ipxe                |   2 +-
 13 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 pc-bios/efi-e1000e.rom
 create mode 100644 pc-bios/efi-vmxnet3.rom

Comments

Gerd Hoffmann June 29, 2016, 10:05 a.m. UTC | #1 
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 pc-bios/efi-e1000.rom    | Bin 196608 -> 209408 bytes
 pc-bios/efi-e1000e.rom   | Bin 0 -> 209408 bytes
 pc-bios/efi-eepro100.rom | Bin 197120 -> 209920 bytes
 pc-bios/efi-ne2k_pci.rom | Bin 195584 -> 208384 bytes
 pc-bios/efi-pcnet.rom    | Bin 195584 -> 208384 bytes
 pc-bios/efi-rtl8139.rom  | Bin 199168 -> 211456 bytes
 pc-bios/efi-virtio.rom   | Bin 193024 -> 211456 bytes
 pc-bios/efi-vmxnet3.rom  | Bin 0 -> 205312 bytes
 8 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 pc-bios/efi-e1000e.rom
 create mode 100644 pc-bios/efi-vmxnet3.rom

diff --git a/pc-bios/efi-e1000.rom b/pc-bios/efi-e1000.rom
index 4bc89a3..4e61f9b 100644
Binary files a/pc-bios/efi-e1000.rom and b/pc-bios/efi-e1000.rom differ
diff --git a/pc-bios/efi-e1000e.rom b/pc-bios/efi-e1000e.rom
new file mode 100644
index 0000000..192a437
Binary files /dev/null and b/pc-bios/efi-e1000e.rom differ
diff --git a/pc-bios/efi-eepro100.rom b/pc-bios/efi-eepro100.rom
index 85b7f9b..66c5226 100644
Binary files a/pc-bios/efi-eepro100.rom and b/pc-bios/efi-eepro100.rom differ
diff --git a/pc-bios/efi-ne2k_pci.rom b/pc-bios/efi-ne2k_pci.rom
index ebafd84..8c3e5fd 100644
Binary files a/pc-bios/efi-ne2k_pci.rom and b/pc-bios/efi-ne2k_pci.rom differ
diff --git a/pc-bios/efi-pcnet.rom b/pc-bios/efi-pcnet.rom
index 6f19723..802e225 100644
Binary files a/pc-bios/efi-pcnet.rom and b/pc-bios/efi-pcnet.rom differ
diff --git a/pc-bios/efi-rtl8139.rom b/pc-bios/efi-rtl8139.rom
index 086551b..8827181 100644
Binary files a/pc-bios/efi-rtl8139.rom and b/pc-bios/efi-rtl8139.rom differ
diff --git a/pc-bios/efi-virtio.rom b/pc-bios/efi-virtio.rom
index 140c680..2fc0497 100644
Binary files a/pc-bios/efi-virtio.rom and b/pc-bios/efi-virtio.rom differ
diff --git a/pc-bios/efi-vmxnet3.rom b/pc-bios/efi-vmxnet3.rom
new file mode 100644
index 0000000..3d42635
Binary files /dev/null and b/pc-bios/efi-vmxnet3.rom differ
Peter Maydell June 30, 2016, 9:49 a.m. UTC | #2 
On 29 June 2016 at 11:04, Gerd Hoffmann <kraxel@redhat.com> wrote:
>   Hi,
>
> Here comes the ipxe update for 2.7, rebasing the ipxe module to latest
> master and also adding boot roms for e1000e and vmxnet3.
>
> please pull,
>   Gerd
>
> The following changes since commit c7288767523f6510cf557707d3eb5e78e519b90d:
>
>   Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.7-20160623' into staging (2016-06-23 11:53:14 +0100)
>
> are available in the git repository at:
>
>
>   git://git.kraxel.org/qemu tags/pull-ipxe-20160629-1
>
> for you to fetch changes up to c52125ab9280733b8d265195f6ffe9c76772b0a5:
>
>   ipxe: update prebuilt binaries (2016-06-24 14:18:19 +0200)
>
> ----------------------------------------------------------------
> ipxe: update submodule from 4e03af8ec to 041863191
> e1000e+vmxnet3: add boot rom
>
> ----------------------------------------------------------------

Hi. I'm afraid this fails 'make check':
TEST: tests/vmxnet3-test... (pid=19181)
qemu-system-i386: -device vmxnet3: failed to find romfile "efi-vmxnet3.rom"
Broken pipe

Looks like you forgot to add the new rom images to
the BLOBS list in Makefile.

thanks
-- PMM
Gerd Hoffmann June 30, 2016, 4:21 p.m. UTC | #3 
Hi,
 
> Hi. I'm afraid this fails 'make check':
> TEST: tests/vmxnet3-test... (pid=19181)
> qemu-system-i386: -device vmxnet3: failed to find romfile "efi-vmxnet3.rom"
> Broken pipe

> Looks like you forgot to add the new rom images to
> the BLOBS list in Makefile.

Forgot that indeed.  But I think this isn't the reason for this failure.
configure creates symlinks for *.rom in case src and build dir are not
the same.  So you need to re-run configure to get the new roms symlinked
in the build dir so "make check" finds them.

cheers,
  Gerd
Peter Maydell June 30, 2016, 4:37 p.m. UTC | #4 
On 30 June 2016 at 17:21, Gerd Hoffmann <kraxel@redhat.com> wrote:
>   Hi,
>
>> Hi. I'm afraid this fails 'make check':
>> TEST: tests/vmxnet3-test... (pid=19181)
>> qemu-system-i386: -device vmxnet3: failed to find romfile "efi-vmxnet3.rom"
>> Broken pipe
>
>> Looks like you forgot to add the new rom images to
>> the BLOBS list in Makefile.
>
> Forgot that indeed.  But I think this isn't the reason for this failure.
> configure creates symlinks for *.rom in case src and build dir are not
> the same.  So you need to re-run configure to get the new roms symlinked
> in the build dir so "make check" finds them.

Awkward. I guess you need to do something to arrange that
configure is run.

thanks
-- PMM
Gerd Hoffmann July 1, 2016, 8:30 a.m. UTC | #5 
On Do, 2016-06-30 at 17:37 +0100, Peter Maydell wrote:
> On 30 June 2016 at 17:21, Gerd Hoffmann <kraxel@redhat.com> wrote:
> >   Hi,
> >
> >> Hi. I'm afraid this fails 'make check':
> >> TEST: tests/vmxnet3-test... (pid=19181)
> >> qemu-system-i386: -device vmxnet3: failed to find romfile "efi-vmxnet3.rom"
> >> Broken pipe
> >
> >> Looks like you forgot to add the new rom images to
> >> the BLOBS list in Makefile.
> >
> > Forgot that indeed.  But I think this isn't the reason for this failure.
> > configure creates symlinks for *.rom in case src and build dir are not
> > the same.  So you need to re-run configure to get the new roms symlinked
> > in the build dir so "make check" finds them.
> 
> Awkward. I guess you need to do something to arrange that
> configure is run.

Hmm.

I could apply a pointless whitespace change to configure so make re-runs
it automatically ...

Better ideas?

cheers,
  Gerd