diff options
| author | Richard Henderson | 2022-08-05 21:55:53 +0200 |
|---|---|---|
| committer | Richard Henderson | 2022-08-05 21:55:53 +0200 |
| commit | c669f22f1a47897e8d1d595d6b8a59a572f9158c (patch) | |
| tree | 78402680f5053c93b025b65302b774a0bc4a169c /hw/loongarch/acpi-build.c | |
| parent | Merge tag 'misc-next-pull-request' of https://gitlab.com/berrange/qemu into s... (diff) | |
| parent | target/loongarch: Update gdb_set_fpu() and gdb_get_fpu() (diff) | |
| download | qemu-c669f22f1a47897e8d1d595d6b8a59a572f9158c.tar.gz qemu-c669f22f1a47897e8d1d595d6b8a59a572f9158c.tar.xz qemu-c669f22f1a47897e8d1d595d6b8a59a572f9158c.zip | |
Merge tag 'pull-la-20220805' of https://gitlab.com/rth7680/qemu into staging
LoongArch updates:
Store value in SET_FPU_* macros.
Fix unused variable Werrors in acpi-build.c
Update xml to match upstream gdb.
# -----BEGIN PGP SIGNATURE-----
#
# iQFRBAABCgA7FiEEekgeeIaLTbaoWgXAZN846K9+IV8FAmLtdTodHHJpY2hhcmQu
# aGVuZGVyc29uQGxpbmFyby5vcmcACgkQZN846K9+IV/u3Qf/XON//wiT054wyL3a
# wCZ7c4A96zA0Zu+S1FSo4CZ81wCUpAF5b76fhIU5GrLuWrs/UzOcn+akS8LNLLcM
# nQHqbYNQbkTGOj6DwlZfts8Ul/Ki/Yimjh0gBLFGepzYrsahJ4dCVwQR/KZNkMKf
# xwBn3+yq96DzEmIqjqEQtlet3Wmsow/zDU+RuHbtdrFiSx6MwhLo/e+dHVEEPkEL
# EBmFNETcmAzIg+oFfifkP1ZHgL/Nt2yjElwFZM2pKLMgANVpHOpCTap03KAO/xTt
# LzX5nmJ+4MYPyoEchRaNuq5sB5GqicDGuwGPdhu6qOV589duZ64M4dfm9ErTKEFA
# eE27rA==
# =fcsy
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri 05 Aug 2022 12:53:30 PM PDT
# gpg: using RSA key 7A481E78868B4DB6A85A05C064DF38E8AF7E215F
# gpg: issuer "richard.henderson@linaro.org"
# gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>" [ultimate]
* tag 'pull-la-20220805' of https://gitlab.com/rth7680/qemu:
target/loongarch: Update gdb_set_fpu() and gdb_get_fpu()
target/loongarch: Update loongarch-fpu.xml
target/loongarch: update loongarch-base64.xml
target/loongarch: add gdb_arch_name()
target/loongarch: Fix GDB get the wrong pc
hw/loongarch: remove acpi-build.c unused variable 'aml_len'
target/loongarch: Fix macros SET_FPU_* in cpu.h
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'hw/loongarch/acpi-build.c')
| -rw-r--r-- | hw/loongarch/acpi-build.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/hw/loongarch/acpi-build.c b/hw/loongarch/acpi-build.c index 4b4529a3fb..d0f01a6485 100644 --- a/hw/loongarch/acpi-build.c +++ b/hw/loongarch/acpi-build.c @@ -411,9 +411,8 @@ static void acpi_build(AcpiBuildTables *tables, MachineState *machine) LoongArchMachineState *lams = LOONGARCH_MACHINE(machine); GArray *table_offsets; AcpiFadtData fadt_data; - unsigned facs, rsdt, fadt, dsdt; + unsigned facs, rsdt, dsdt; uint8_t *u; - size_t aml_len = 0; GArray *tables_blob = tables->table_data; init_common_fadt_data(&fadt_data); @@ -437,21 +436,13 @@ static void acpi_build(AcpiBuildTables *tables, MachineState *machine) dsdt = tables_blob->len; build_dsdt(tables_blob, tables->linker, machine); - /* - * Count the size of the DSDT, we will need it for - * legacy sizing of ACPI tables. - */ - aml_len += tables_blob->len - dsdt; - /* ACPI tables pointed to by RSDT */ - fadt = tables_blob->len; acpi_add_table(table_offsets, tables_blob); fadt_data.facs_tbl_offset = &facs; fadt_data.dsdt_tbl_offset = &dsdt; fadt_data.xdsdt_tbl_offset = &dsdt; build_fadt(tables_blob, tables->linker, &fadt_data, lams->oem_id, lams->oem_table_id); - aml_len += tables_blob->len - fadt; acpi_add_table(table_offsets, tables_blob); build_madt(tables_blob, tables->linker, lams); |