[Qemu-commits] [qemu/qemu] ca316c: loader: don't perform overlapping address check fo...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: ca316c11526a1bc221fb542bdce6bac7238dde69
      
https://github.com/qemu/qemu/commit/ca316c11526a1bc221fb542bdce6bac7238dde69
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2018-02-27 (Tue, 27 Feb 2018)

  Changed paths:
    M hw/core/loader.c

  Log Message:
  -----------
  loader: don't perform overlapping address check for memory region ROM images

All memory region ROM images have a base address of 0 which causes the 
overlapping
address check to fail if more than one memory region ROM image is present, or an
existing ROM image is loaded at address 0.

Make sure that we ignore the overlapping address check in
rom_check_and_register_reset() if this is a memory region ROM image. In 
particular
this fixes the "rom: requested regions overlap" error on startup when trying to
run qemu-system-sparc with a -kernel image since commit 7497638642: "tcx: 
switch to
load_image_mr() and remove prom_addr hack".

Suggested-by: Peter Maydell <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Mark Cave-Ayland <address@hidden>


  Commit: 2963d78204b4bb4eb5a6b6cb3035f3c1548fbbc8
      
https://github.com/qemu/qemu/commit/2963d78204b4bb4eb5a6b6cb3035f3c1548fbbc8
  Author: Peter Maydell <address@hidden>
  Date:   2018-03-01 (Thu, 01 Mar 2018)

  Changed paths:
    M hw/core/loader.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-signed' into 
staging

qemu-sparc update

# gpg: Signature made Tue 27 Feb 2018 19:03:28 GMT
# gpg:                using RSA key 5BC2C56FAE0F321F
# gpg: Good signature from "Mark Cave-Ayland <address@hidden>"
# Primary key fingerprint: CC62 1AB9 8E82 200D 915C  C9C4 5BC2 C56F AE0F 321F

* remotes/mcayland/tags/qemu-sparc-signed:
  loader: don't perform overlapping address check for memory region ROM images

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


Compare: https://github.com/qemu/qemu/compare/5116c331c618...2963d78204b4