diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2025-01-09 08:34:01 -0500 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2025-01-09 08:34:01 -0500 |
| commit | c10ed2fac295d77370c4c81091af5deb3859e35d (patch) | |
| tree | 1852464e74e5d245124598f4237dd88b97dc768f /include/hw | |
| parent | 3f8bcbba3b320c610689576fc47595f1076198dd (diff) | |
| parent | c3afa714bcea4c8b014fec99881bd0bdbe8262b8 (diff) | |
| download | focaccia-qemu-c10ed2fac295d77370c4c81091af5deb3859e35d.tar.gz focaccia-qemu-c10ed2fac295d77370c4c81091af5deb3859e35d.zip | |
Merge tag 'pull-loongarch-20250109' of https://gitlab.com/bibo-mao/qemu into staging
loongarch queue # -----BEGIN PGP SIGNATURE----- # # iHUEABYKAB0WIQQNhkKjomWfgLCz0aQfewwSUazn0QUCZ39pJgAKCRAfewwSUazn # 0YpMAQCNV9KJJ8f8EaXAw5a87mnmlcP0vRi5gZiyv1ZV9gRqPgEAhzCn/rnzpzd+ # H3B1fRlD1xmaQ8IqRugQ4vfDBd9CyQY= # =OG4d # -----END PGP SIGNATURE----- # gpg: Signature made Thu 09 Jan 2025 01:13:58 EST # gpg: using EDDSA key 0D8642A3A2659F80B0B3D1A41F7B0C1251ACE7D1 # gpg: Good signature from "bibo mao <maobibo@loongson.cn>" [unknown] # 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: 7044 3A00 19C0 E97A 31C7 13C4 8E86 8FB7 A176 9D4C # Subkey fingerprint: 0D86 42A3 A265 9F80 B0B3 D1A4 1F7B 0C12 51AC E7D1 * tag 'pull-loongarch-20250109' of https://gitlab.com/bibo-mao/qemu: hw/intc/loongarch_extioi: Add irq routing support from physical id hw/intc/loongarch_extioi: Remove num-cpu property hw/intc/loongarch_extioi: Get cpu number from possible_cpu_arch_ids target/loongarch: Only support 64bit pte width hw/loongarch/boot: Support Linux raw boot image hw/core/loader: Use ssize_t for efi zboot unpacker Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'include/hw')
| -rw-r--r-- | include/hw/intc/loongarch_extioi_common.h | 2 | ||||
| -rw-r--r-- | include/hw/loader.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/hw/intc/loongarch_extioi_common.h b/include/hw/intc/loongarch_extioi_common.h index f6bc778a85..22d7880977 100644 --- a/include/hw/intc/loongarch_extioi_common.h +++ b/include/hw/intc/loongarch_extioi_common.h @@ -65,6 +65,8 @@ typedef struct ExtIOICore { uint32_t coreisr[EXTIOI_IRQS_GROUP_COUNT]; DECLARE_BITMAP(sw_isr[LS3A_INTC_IP], EXTIOI_IRQS); qemu_irq parent_irq[LS3A_INTC_IP]; + uint64_t arch_id; + CPUState *cpu; } ExtIOICore; struct LoongArchExtIOICommonState { diff --git a/include/hw/loader.h b/include/hw/loader.h index 7f6d06b956..8985046be4 100644 --- a/include/hw/loader.h +++ b/include/hw/loader.h @@ -101,7 +101,7 @@ ssize_t load_image_gzipped_buffer(const char *filename, uint64_t max_sz, * Returns the size of the decompressed payload if decompression was performed * successfully. */ -ssize_t unpack_efi_zboot_image(uint8_t **buffer, int *size); +ssize_t unpack_efi_zboot_image(uint8_t **buffer, ssize_t *size); #define ELF_LOAD_FAILED -1 #define ELF_LOAD_NOT_ELF -2 |