[Qemu-commits] [qemu/qemu] 98bc3a: loader: rename in_ram/has_mr

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 98bc3ab0f256cb983700089770db0823e59c7ceb
      
https://github.com/qemu/qemu/commit/98bc3ab0f256cb983700089770db0823e59c7ceb
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2014-03-09 (Sun, 09 Mar 2014)

  Changed paths:
    M hw/core/loader.c
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M include/hw/loader.h

  Log Message:
  -----------
  loader: rename in_ram/has_mr

we put copy of ROMs in MR for migration.
but the name rom_in_ram makes one think we
load it in guest RAM.
Rename has_mr to make intent clearer.

Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: ac41881b48858b279960a17c07f0b159af91e75a
      
https://github.com/qemu/qemu/commit/ac41881b48858b279960a17c07f0b159af91e75a
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2014-03-11 (Tue, 11 Mar 2014)

  Changed paths:
    M hw/core/loader.c
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M include/hw/loader.h

  Log Message:
  -----------
  pc: avoid duplicate names for ROM MRs

Since
commit 04920fc0faa4760f9c4fc0e73b992b768099be70
    loader: store FW CFG ROM files in RAM
RAM MRs including ROM files in FW CFGs are created
and named using the file basename.

This becomes problematic if these names are
supplied by user, since the basename might not
be unique.

There are two cases we care about:
- option-rom flag.
- option ROM for devices. This triggers e.g. when
  using rombar=0.

At the moment we get an assert. E.g
qemu -option-rom /usr/share/ipxe/8086100e.rom -option-rom
/usr/share/ipxe.efi/8086100e.rom
RAMBlock "/address@hidden/8086100e.rom" already registered, abort!

This is a regression from 1.6.

For now let's keep it simple and just avoid creating the
MRs in case of option ROMs.

when using 1.7 machine types, enable
option ROMs in RAM to match that version.

Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: dc655404659def26fbcd66583ca61575af9da8b9
      
https://github.com/qemu/qemu/commit/dc655404659def26fbcd66583ca61575af9da8b9
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2014-03-11 (Tue, 11 Mar 2014)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: don't modify .status on error

./configure --help
make

will try to re-run configure with --help
which isn't what was intended.

The reason is that config.status was written
even on configure error.
Defer writing config.status until configure
has completed successfully.

Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>


  Commit: 263cf4367fd86dc0e15beebe65919cd50501844d
      
https://github.com/qemu/qemu/commit/263cf4367fd86dc0e15beebe65919cd50501844d
  Author: BALATON Zoltan <address@hidden>
  Date:   2014-03-11 (Tue, 11 Mar 2014)

  Changed paths:
    M hw/pci-host/q35.c
    M include/hw/i386/ich9.h
    M include/hw/pci-host/q35.h

  Log Message:
  -----------
  q35: Correct typo BRDIGE -> BRIDGE

Signed-off-by: BALATON Zoltan <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: b4e5a4bffda0d5dd79c87c66f28a5fac87182e30
      
https://github.com/qemu/qemu/commit/b4e5a4bffda0d5dd79c87c66f28a5fac87182e30
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2014-03-11 (Tue, 11 Mar 2014)

  Changed paths:
    M hw/i386/acpi-build.c

  Log Message:
  -----------
  acpi-build: don't access unaligned addresses

casting an unaligned address to e.g.
uint32_t can trigger undefined behaviour in C.
Replace cast + assignment with memcpy.

Reported-by: Peter Maydell <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 13f65b2e1073cf7e2c8fb3880c77d8a53fa2f95e
      
https://github.com/qemu/qemu/commit/13f65b2e1073cf7e2c8fb3880c77d8a53fa2f95e
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2014-03-11 (Tue, 11 Mar 2014)

  Changed paths:
    M tests/acpi-test-data/pc/SSDT
    M tests/acpi-test-data/q35/SSDT

  Log Message:
  -----------
  acpi-test: update expected SSDT files

SSDT doesn't have _SUN for non hotpluggable slots
anymore.

Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: be813ef02d18ba58e1ff32f1706bcacb88f1f764
      
https://github.com/qemu/qemu/commit/be813ef02d18ba58e1ff32f1706bcacb88f1f764
  Author: Peter Maydell <address@hidden>
  Date:   2014-03-11 (Tue, 11 Mar 2014)

  Changed paths:
    M configure
    M hw/core/loader.c
    M hw/i386/acpi-build.c
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M hw/pci-host/q35.c
    M include/hw/i386/ich9.h
    M include/hw/loader.h
    M include/hw/pci-host/q35.h
    M tests/acpi-test-data/pc/SSDT
    M tests/acpi-test-data/q35/SSDT

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

acpi,pc,test bug fixes

More small fixes: the issues annoy developers so
I thought they are worth fixing quickly.

Signed-off-by: Michael S. Tsirkin <address@hidden>

# gpg: Signature made Tue 11 Mar 2014 11:27:44 GMT using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <address@hidden>"
# gpg:                 aka "Michael S. Tsirkin <address@hidden>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
#      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469

* remotes/mst/tags/for_upstream:
  acpi-test: update expected SSDT files
  acpi-build: don't access unaligned addresses
  q35: Correct typo BRDIGE -> BRIDGE
  configure: don't modify .status on error
  pc: avoid duplicate names for ROM MRs
  loader: rename in_ram/has_mr

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/239618707637...be813ef02d18