[Qemu-commits] [qemu/qemu] 24ade8: hw/mips/bootloader: Fix write_ulong()

[Richard Henderson]

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 24ade8c5decd092bde5e863bc542db45d924ae12
      
https://github.com/qemu/qemu/commit/24ade8c5decd092bde5e863bc542db45d924ae12
  Author: Jiaxun Yang <jiaxun.yang@flygoat.com>
  Date:   2021-12-06 (Mon, 06 Dec 2021)

  Changed paths:
    M hw/mips/bootloader.c

  Log Message:
  -----------
  hw/mips/bootloader: Fix write_ulong()

bl_gen_write_ulong uses sd for both 32 and 64 bit CPU,
while sd is illegal on 32 bit CPUs.

Replace sd with sw on 32bit CPUs.

Fixes: 3ebbf86128f ("hw/mips: Add a bootloader helper")
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20211130211729.7116-2-jiaxun.yang@flygoat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: d77c462bf25001cc2ae03824a547ed761cd0c5bc
      
https://github.com/qemu/qemu/commit/d77c462bf25001cc2ae03824a547ed761cd0c5bc
  Author: Jiaxun Yang <jiaxun.yang@flygoat.com>
  Date:   2021-12-06 (Mon, 06 Dec 2021)

  Changed paths:
    M hw/mips/boston.c

  Log Message:
  -----------
  hw/mips/boston: Fix load_elf() error detection

load_elf() gives negative return in case of error, not zero.

Fixes: 10e3f30ff73 ("hw/mips/boston: Allow loading elf kernel and dtb")
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20211130211729.7116-3-jiaxun.yang@flygoat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: ac5837e330ec33e2df2d83338713a5c4272c8cc8
      
https://github.com/qemu/qemu/commit/ac5837e330ec33e2df2d83338713a5c4272c8cc8
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2021-12-06 (Mon, 06 Dec 2021)

  Changed paths:
    M hw/display/vga-isa.c

  Log Message:
  -----------
  Revert "vga: don't abort when adding a duplicate isa-vga device"

This reverts commit 7852a77f598635a67a222b6c1463c8b46098aed2.

The check is bogus as it ends up finding itself and falling over.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/733
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20211206095209.2332376-1-alex.bennee@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: 2f8eb086732ad1875003101f5324f01c47d7408c
      
https://github.com/qemu/qemu/commit/2f8eb086732ad1875003101f5324f01c47d7408c
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2021-12-06 (Mon, 06 Dec 2021)

  Changed paths:
    M hw/display/vga-isa.c
    M hw/mips/bootloader.c
    M hw/mips/boston.c

  Log Message:
  -----------
  Merge tag 'mips-20211206' of https://github.com/philmd/qemu into staging

MIPS fixes

- Do not emit SD instruction on 32-bit CPU (Jiaxun Yang)
- Correctly catch load_elf() errors on Boston board (Jiaxun Yang)
- Revert bogus CLI fix for ISA VGA devices (Alex Bennée)

# gpg: Signature made Mon 06 Dec 2021 03:03:24 AM PST
# gpg:                using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE
# gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" 
[full]

* tag 'mips-20211206' of https://github.com/philmd/qemu:
  Revert "vga: don't abort when adding a duplicate isa-vga device"
  hw/mips/boston: Fix load_elf() error detection
  hw/mips/bootloader: Fix write_ulong()

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


Compare: https://github.com/qemu/qemu/compare/99fc08366b06...2f8eb086732a