[Qemu-commits] [qemu/qemu] 2397ed: Add Makefile rules to build nic rom binaries

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 2397edd7354ebbcebf3cd55dc3c0b1fe7621794b
      
https://github.com/qemu/qemu/commit/2397edd7354ebbcebf3cd55dc3c0b1fe7621794b
  Author: Gerd Hoffmann <address@hidden>
  Date:   2013-03-18 (Mon, 18 Mar 2013)

  Changed paths:
    M roms/Makefile

  Log Message:
  -----------
  Add Makefile rules to build nic rom binaries

"make -C roms pxerom" will build the ipxe roms and update
the binaries in pc-bios/, i.e. it basically documents how
the build process of our current nic roms works.

Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: c3d8dab3298c64267411fb470e3d1e18871a359b
      
https://github.com/qemu/qemu/commit/c3d8dab3298c64267411fb470e3d1e18871a359b
  Author: Gerd Hoffmann <address@hidden>
  Date:   2013-03-18 (Mon, 18 Mar 2013)

  Changed paths:
    M roms/ipxe

  Log Message:
  -----------
  Update ipxe submodule to latest master

Needed for efi support.

ipxe is grown a bit, so *not* recompiling the (non-efi) pxe roms
because that would make some pxe roms larger than 64k, which in
turn would be a guest-visible change because the rom bar size
grows from 64k to 128k.

Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 2f3f430d7cca3f67ef9b539dbc008d71eb6a3bd0
      
https://github.com/qemu/qemu/commit/2f3f430d7cca3f67ef9b539dbc008d71eb6a3bd0
  Author: Gerd Hoffmann <address@hidden>
  Date:   2013-03-18 (Mon, 18 Mar 2013)

  Changed paths:
    M roms/Makefile

  Log Message:
  -----------
  Add Makefile rules to build nic rom binaries with efi support

"make -C roms efirom" will build rom binaries with EFI support.
They are composed from three images: legacy bios, efi ia32
and efi x64.  So netbooting via SeaBIOS will continue to work
like it does today, and additionally we get network support
for EFI.  This target needs the EfiRom utility (shipped with
edk2) somewhere in the $PATH.

Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 8a24d3cb9be9bca2b77a4e9eb1a62ed735af712e
      
https://github.com/qemu/qemu/commit/8a24d3cb9be9bca2b77a4e9eb1a62ed735af712e
  Author: Gerd Hoffmann <address@hidden>
  Date:   2013-03-18 (Mon, 18 Mar 2013)

  Changed paths:
    A pc-bios/efi-e1000.rom
    A pc-bios/efi-eepro100.rom
    A pc-bios/efi-ne2k_pci.rom
    A pc-bios/efi-pcnet.rom
    A pc-bios/efi-rtl8139.rom
    A pc-bios/efi-virtio.rom

  Log Message:
  -----------
  Add efi rom binaries

Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: c45e5b5b30ac1f5505725a7b36e68cedfce4f01f
      
https://github.com/qemu/qemu/commit/c45e5b5b30ac1f5505725a7b36e68cedfce4f01f
  Author: Gerd Hoffmann <address@hidden>
  Date:   2013-03-18 (Mon, 18 Mar 2013)

  Changed paths:
    M hw/e1000.c
    M hw/ne2000.c
    M hw/pc.h
    M hw/pcnet-pci.c
    M hw/rtl8139.c
    M hw/virtio-pci.c

  Log Message:
  -----------
  Switch to efi-enabled nic roms by default

All PCI nics are switched to EFI-enabled roms by default.  They are
composed from three images (legacy, efi ia32 & efi x86), so classic
pxe booting will continue to work.

Exception: eepro100 is not switched, it uses a single rom for all
emulated eepro100 variants, then goes patch the rom header on the
fly with the correct PCI IDs.  I doubt that will work as-is with
the efi roms.

Keep old roms for 1.4+older machine types via compat properties,
needed because the efi-enabled roms are larger so the pci rom bar
size would change.

Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: fca23f0ad211e4debf80796a65165d0eea146424
      
https://github.com/qemu/qemu/commit/fca23f0ad211e4debf80796a65165d0eea146424
  Author: Liu Yuan <address@hidden>
  Date:   2013-03-19 (Tue, 19 Mar 2013)

  Changed paths:
    M block/sheepdog.c

  Log Message:
  -----------
  sheepdog: show error message for halt status

Sheepdog (neither quorum nor unsafe mode) will refuse to serve IO requests when
number of alive nodes is less than that of copies specified by users. This will
return 0x19 to QEMU client which currently doesn't recognize it.

This patch adds an error description when QEMU client receives it, other than
plainly printing 'Invalid error code'

Cc: MORITA Kazutaka <address@hidden>
Cc: Kevin Wolf <address@hidden>
Cc: Stefan Hajnoczi <address@hidden>
Signed-off-by: Liu Yuan <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: MORITA Kazutaka <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: acdfb480ba7e2779bdbffb5280cf12ff6e43669c
      
https://github.com/qemu/qemu/commit/acdfb480ba7e2779bdbffb5280cf12ff6e43669c
  Author: Kevin Wolf <address@hidden>
  Date:   2013-03-19 (Tue, 19 Mar 2013)

  Changed paths:
    M block/qcow2.c
    M block/qcow2.h

  Log Message:
  -----------
  qcow2: Fix segfault in qcow2_invalidate_cache

Need to pass an options QDict to qcow2_open() now. This fixes a segfault
on the migration target with qcow2.

Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 4d70655bcb852ea0a006d3923f0b0a9c69ff462e
      
https://github.com/qemu/qemu/commit/4d70655bcb852ea0a006d3923f0b0a9c69ff462e
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2013-03-19 (Tue, 19 Mar 2013)

  Changed paths:
    M block.c

  Log Message:
  -----------
  block: fix BDRV_O_SNAPSHOT protocol detection

realpath(3) is used to get an absolute path to the image file when
creating a -drive snapshot=on temporary qcow2.  This does not work for
protocols since their filenames ("proto:foo:...") do not correspond to
file system paths.

Commit 7c96d46ec245d73fd76726588409f9abe4bd5dc1 ("Let snapshot work with
protocols") skipped realpath(3) for protocols.  Later on the "raw"
format was introduced and broke the check.

Use path_has_protocol(filename) to decide if this image uses a protocol
or a filename.

Reported-by: Richard Jones <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: f95e26ddf526a025aa1334bbe527739397970443
      
https://github.com/qemu/qemu/commit/f95e26ddf526a025aa1334bbe527739397970443
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2013-03-19 (Tue, 19 Mar 2013)

  Changed paths:
    A tests/qemu-iotests/052
    A tests/qemu-iotests/052.out
    M tests/qemu-iotests/group

  Log Message:
  -----------
  qemu-iotests: add 052 BDRV_O_SNAPSHOT test

Check that writes to an image opened with BDRV_O_SNAPSHOT do not modify
the underlying image file.

Signed-off-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: a8e5cc0c076a6e3a62f0e9aad88b007dccf3dd17
      
https://github.com/qemu/qemu/commit/a8e5cc0c076a6e3a62f0e9aad88b007dccf3dd17
  Author: Dunrong Huang <address@hidden>
  Date:   2013-03-19 (Tue, 19 Mar 2013)

  Changed paths:
    M hw/virtio-blk.c

  Log Message:
  -----------
  virtio-blk: Do not segfault fault if failed to initialize dataplane

$ ~/usr/bin/qemu-system-x86_64 -enable-kvm -m 1024 -drive 
if=none,id=drive0,cache=none,aio=native,format=raw,file=/root/Image/centos-6.4.raw
 -device virtio-blk-pci,drive=drive0,scsi=off,x-data-plane=on,config-wce=on # 
make dataplane fail to initialize
qemu-system-x86_64: -device 
virtio-blk-pci,drive=drive0,scsi=off,x-data-plane=on,config-wce=on: device is 
incompatible with x-data-plane, use config-wce=off
*** glibc detected *** /root/usr/bin/qemu-system-x86_64: free(): invalid 
pointer: 0x00007f001fef12f8 ***
======= Backtrace: =========
/lib64/libc.so.6(+0x7d776)[0x7f00153a5776]
/root/usr/bin/qemu-system-x86_64(+0x2c34ec)[0x7f001cf5b4ec]
/root/usr/bin/qemu-system-x86_64(+0x342f9a)[0x7f001cfdaf9a]
/root/usr/bin/qemu-system-x86_64(+0x33694e)[0x7f001cfce94e]
....................

 (gdb) bt
 #0  0x00007f3bf3a12015 in raise () from /lib64/libc.so.6
 #1  0x00007f3bf3a1348b in abort () from /lib64/libc.so.6
 #2  0x00007f3bf3a51a4e in __libc_message () from /lib64/libc.so.6
 #3  0x00007f3bf3a57776 in malloc_printerr () from /lib64/libc.so.6
 #4  0x00007f3bfb60d4ec in free_and_trace (mem=0x7f3bfe0129f8) at vl.c:2786
 #5  0x00007f3bfb68cf9a in virtio_cleanup (vdev=0x7f3bfe0129f8) at 
/root/Develop/QEMU/qemu/hw/virtio.c:900
 #6  0x00007f3bfb68094e in virtio_blk_device_init (vdev=0x7f3bfe0129f8) at 
/root/Develop/QEMU/qemu/hw/virtio-blk.c:666
 #7  0x00007f3bfb68dadf in virtio_device_init (qdev=0x7f3bfe0129f8) at 
/root/Develop/QEMU/qemu/hw/virtio.c:1092
 #8  0x00007f3bfb50da46 in device_realize (dev=0x7f3bfe0129f8, 
err=0x7fff479c9258) at hw/qdev.c:176
.............................

In virtio_blk_device_init(), the memory which vdev point to is a static
member of "struct VirtIOBlkPCI", not heap memory, and it does not
get freed. So we shoule use virtio_common_cleanup() to clean this VirtIODevice
rather than virtio_cleanup(), which attempts to free the vdev.

This error was introduced by commit 05ff686536f408ba6e8426b1b54d25bd3379fda2
recently.

Signed-off-by: Dunrong Huang <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: f628926bb423fa8a7e0b114511400ea9df38b76a
      
https://github.com/qemu/qemu/commit/f628926bb423fa8a7e0b114511400ea9df38b76a
  Author: Gerd Hoffmann <address@hidden>
  Date:   2013-03-19 (Tue, 19 Mar 2013)

  Changed paths:
    M monitor.c

  Log Message:
  -----------
  fix monitor

chardev flow control broke monitor, fix it by adding watch support.

Signed-off-by: Anthony Liguori <address@hidden>


  Commit: 2c8a59422c06fe1e37c85502d92ccdfb5e2ac987
      
https://github.com/qemu/qemu/commit/2c8a59422c06fe1e37c85502d92ccdfb5e2ac987
  Author: Kevin Wolf <address@hidden>
  Date:   2013-03-19 (Tue, 19 Mar 2013)

  Changed paths:
    M include/char/char.h
    M qemu-char.c

  Log Message:
  -----------
  char: Fix return type of qemu_chr_fe_add_watch()

qemu_chr_fe_add_watch() can return negative errors, therefore it must
not have an unsigned return type. For consistency with other
qemu_chr_fe_* functions, this uses a standard C int instead of glib
types.

In situations where qemu_chr_fe_add_watch() is falsely assumed to have
succeeded, the serial ports would go into a state where it never becomes
ready for transmitting more data; this is fixed by this patch.

Signed-off-by: Kevin Wolf <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: 277ba8a6d717abb2f36896cd9877a68d2cf03d77
      
https://github.com/qemu/qemu/commit/277ba8a6d717abb2f36896cd9877a68d2cf03d77
  Author: Anthony Liguori <address@hidden>
  Date:   2013-03-19 (Tue, 19 Mar 2013)

  Changed paths:
    M block.c
    M block/qcow2.c
    M block/qcow2.h
    M block/sheepdog.c
    M hw/virtio-blk.c
    A tests/qemu-iotests/052
    A tests/qemu-iotests/052.out
    M tests/qemu-iotests/group

  Log Message:
  -----------
  Merge remote-tracking branch 'kwolf/for-anthony' into staging

# By Stefan Hajnoczi (2) and others
# Via Kevin Wolf
* kwolf/for-anthony:
  virtio-blk: Do not segfault fault if failed to initialize dataplane
  qemu-iotests: add 052 BDRV_O_SNAPSHOT test
  block: fix BDRV_O_SNAPSHOT protocol detection
  qcow2: Fix segfault in qcow2_invalidate_cache
  sheepdog: show error message for halt status


  Commit: 8510d91ebad522685bc1a29e7bbc1f5050af0d2c
      
https://github.com/qemu/qemu/commit/8510d91ebad522685bc1a29e7bbc1f5050af0d2c
  Author: Peter Maydell <address@hidden>
  Date:   2013-03-19 (Tue, 19 Mar 2013)

  Changed paths:
    M ui/cocoa.m

  Log Message:
  -----------
  ui/cocoa.m: Fix compile failures introduced by recent console changes

Fix various compilation failures introduced by the recent console
changes.

Signed-off-by: Peter Maydell <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: c8a6ae8bb95477d5ac11d9b491b603b2d190a96e
      
https://github.com/qemu/qemu/commit/c8a6ae8bb95477d5ac11d9b491b603b2d190a96e
  Author: Amos Kong <address@hidden>
  Date:   2013-03-19 (Tue, 19 Mar 2013)

  Changed paths:
    M qemu-options.hx
    M vl.c

  Log Message:
  -----------
  add a boot option to do strict boot

Seabios already added a new device type to halt booting.
Qemu can add "HALT" at the end of bootindex string, then
seabios will halt booting after trying to boot from all
selected devices.

This patch added a new boot option to configure if boot
from un-selected devices.

This option only effects when boot priority is changed by
bootindex options, the old style(-boot order=..) will still
try to boot from un-selected devices.

v2: add HALT entry in get_boot_devices_list()
v3: rebase to latest qemu upstream

Signed-off-by: Amos Kong <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: f7d42093a5e54d48cab62695a374806d4303bd6b
      
https://github.com/qemu/qemu/commit/f7d42093a5e54d48cab62695a374806d4303bd6b
  Author: Anthony Liguori <address@hidden>
  Date:   2013-03-19 (Tue, 19 Mar 2013)

  Changed paths:
    M hw/e1000.c
    M hw/ne2000.c
    M hw/pc.h
    M hw/pcnet-pci.c
    M hw/rtl8139.c
    M hw/virtio-pci.c
    A pc-bios/efi-e1000.rom
    A pc-bios/efi-eepro100.rom
    A pc-bios/efi-ne2k_pci.rom
    A pc-bios/efi-pcnet.rom
    A pc-bios/efi-rtl8139.rom
    A pc-bios/efi-virtio.rom
    M roms/Makefile
    M roms/ipxe

  Log Message:
  -----------
  Merge remote-tracking branch 'kraxel/ipxe.2' into staging

# By Gerd Hoffmann
# Via Gerd Hoffmann
* kraxel/ipxe.2:
  Switch to efi-enabled nic roms by default
  Add efi rom binaries
  Add Makefile rules to build nic rom binaries with efi support
  Update ipxe submodule to latest master
  Add Makefile rules to build nic rom binaries


Compare: https://github.com/qemu/qemu/compare/2d62a9576602...f7d42093a5e5