diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2023-01-18 19:09:21 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2023-01-18 19:09:22 +0000 |
| commit | 701ed34833f53880ba38bde09b0846d01fc16d66 (patch) | |
| tree | 3b24ab14fd3cc2ae9f9e44b39a93aef8637f95a1 /hw/core/loader.c | |
| parent | 7ec8aeb6048018680c06fb9205c01ca6bda08846 (diff) | |
| parent | 75d7150c636569f6687f7e70a33be893be43eb5f (diff) | |
| download | focaccia-qemu-701ed34833f53880ba38bde09b0846d01fc16d66.tar.gz focaccia-qemu-701ed34833f53880ba38bde09b0846d01fc16d66.zip | |
Merge tag 'pull-request-2023-01-18' of https://gitlab.com/thuth/qemu into staging
* Fix the FreeBSD CI jobs in Gitlab by upgrading the packages in the beginning * Fix the Haiku VM test by updating it to r1beta4 * Allow "make uninstall" * Rename TARGET_FMT_plx to HWADDR_FMT_plx * Some small qtest fixes/improvements * Check for valid amount of CPUs before starting a secure execution s390x guest # -----BEGIN PGP SIGNATURE----- # # iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmPH2JIRHHRodXRoQHJl # ZGhhdC5jb20ACgkQLtnXdP5wLbUSWRAAk7C6vcVeDL066ftV75qErGcY1lpTF5GA # 6rn1EO8wxGUxdjwi5koqqcn7m4LGWJKNnbZkp+7u5h4ni1G6Wu5v5Lnemtb0I5qI # M7fTr9QUErK39eV5bPNrZ/Zr4bXRnM6BdYGrTh5d4FZoeIwhjBG/zofWNw/4p11L # HLxeG3z3xns5DHQFeMn2v8oapRVWq9h5dIFhWwmEoc0+UBT5cboDM0UnJ8iiZ0Q+ # 5AvZVn01iQK/UXGj1iT3JK47jE0P5dregm+h4sd0MUYU1/8LaOIy93YvWk1qI7ID # WPJoo9EwqYOYf2lmEfbitgxW5tlp5l/1SGtDXuvkisXmQeMMRB3Dv48nta80sFow # PVSwwXqkqbazocsBdFP1tF2cBR/mvRPpVKa+VtF2pu9szCREdfbbt6ERJ2sePUyG # MpKhqFV/dPLgcbNgvtUQbyzGBxlieoIRgndYmZwxMIb6uJKmlcJkQg2SYfRAVrri # Bdbo0/HdW0IBTn7zFmpVUgEtkpxxpiz1zjPKBA4o/vaTDh44HT1EcFCTZ1HKaUbp # iLABMtz5DRS+HJbeIsI8IiCAsIG0r8JRukRrde3k4iEzLq4gt+Df7NIXJtlSIJ+H # 8M+JO7c2N4meWuHV7x3xUFGVQxYQQG93m8bWbhgyBtdtoayaN9Fb8XpXXShblXxc # ozHrBQe3ciI= # =zfXp # -----END PGP SIGNATURE----- # gpg: Signature made Wed 18 Jan 2023 11:31:30 GMT # gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5 # gpg: issuer "thuth@redhat.com" # gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full] # gpg: aka "Thomas Huth <thuth@redhat.com>" [full] # gpg: aka "Thomas Huth <huth@tuxfamily.org>" [full] # gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown] # Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5 * tag 'pull-request-2023-01-18' of https://gitlab.com/thuth/qemu: s390x/pv: Implement a CGS check helper tests/vm/haiku.x86_64: Update the Haiku VM to Beta 4 tests/qtest/libqos/e1000e: Remove duplicate register definitions tests/qtest/e1000e-test: Fix the code style tests/qtest: Restrict bcm2835-dma-test to CONFIG_RASPI MAINTAINERS: Remove bouncing mail address from Kamil Rytarowski bulk: Rename TARGET_FMT_plx -> HWADDR_FMT_plx Makefile: allow 'make uninstall' Upgrade all packages in the FreeBSD VMs to ensure the freshness Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/core/loader.c')
| -rw-r--r-- | hw/core/loader.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/core/loader.c b/hw/core/loader.c index 55dbe2e199..173f8f67f6 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -1059,7 +1059,7 @@ ssize_t rom_add_file(const char *file, const char *fw_dir, rom->mr = mr; snprintf(devpath, sizeof(devpath), "/rom@%s", file); } else { - snprintf(devpath, sizeof(devpath), "/rom@" TARGET_FMT_plx, addr); + snprintf(devpath, sizeof(devpath), "/rom@" HWADDR_FMT_plx, addr); } } @@ -1243,10 +1243,10 @@ static void rom_print_one_overlap_error(Rom *last_rom, Rom *rom) "\nThe following two regions overlap (in the %s address space):\n", rom_as_name(rom)); error_printf( - " %s (addresses 0x" TARGET_FMT_plx " - 0x" TARGET_FMT_plx ")\n", + " %s (addresses 0x" HWADDR_FMT_plx " - 0x" HWADDR_FMT_plx ")\n", last_rom->name, last_rom->addr, last_rom->addr + last_rom->romsize); error_printf( - " %s (addresses 0x" TARGET_FMT_plx " - 0x" TARGET_FMT_plx ")\n", + " %s (addresses 0x" HWADDR_FMT_plx " - 0x" HWADDR_FMT_plx ")\n", rom->name, rom->addr, rom->addr + rom->romsize); } @@ -1600,7 +1600,7 @@ HumanReadableText *qmp_x_query_roms(Error **errp) rom->romsize, rom->name); } else if (!rom->fw_file) { - g_string_append_printf(buf, "addr=" TARGET_FMT_plx + g_string_append_printf(buf, "addr=" HWADDR_FMT_plx " size=0x%06zx mem=%s name=\"%s\"\n", rom->addr, rom->romsize, rom->isrom ? "rom" : "ram", |