diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2023-03-20 13:43:35 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2023-03-20 13:43:35 +0000 |
| commit | aa9e7fa4689d1becb2faf67f65aafcbcf664f1ce (patch) | |
| tree | 27e1fe03aaae7041a7cdb2a09bbce72fc2e9f555 /tests | |
| parent | 4c6f44644d08f6f712474288d61deba601421988 (diff) | |
| parent | 86305e864191123dcf87c3af639fddfc59352ac6 (diff) | |
Merge tag 'edk2-stable202302-20230320-pull-request' of https://gitlab.com/kraxel/qemu into staging
update edk2 to 202302 stable tag
# -----BEGIN PGP SIGNATURE-----
#
# iQIzBAABCgAdFiEEoDKM/7k6F6eZAf59TLbY7tPocTgFAmQYKWwACgkQTLbY7tPo
# cTinlA/9EVWaAyb7UV56My5Zbo41okXev8xmZV8R0G2xAbGaM22v/mPZaifA9Iqn
# JG19Go4xzTmX12Ttg/Def30Bu2RcjHfHccYycUQ7brd40rS8Gc2QYZX4p9NltUda
# dJOMB4e+7MKkavCrqfiHB6LWGMk27cT5puvMkmt65+/WsoBV1gcc0SmFK8tWIM3N
# dZqGdPr9ml72+fv7Cf7crShGEfwV/d3LkJ30Zccq0mbS08QcLm1SbyIB2+SdCyrE
# 35okXRJePACdh7rOWQgWrYAy1CTb54Vup7Fraq0a9NjfknKoQBxWt0w1L95d3p0d
# i8j0Yl1G5rD+Ybqvz/KgDLVNpKddttpkD1CECfZynOioHvwXWODrcJCKF9xsXcRR
# 9Lmeq090ottEbrYXln/clAjwNnF5ALNMEdvmOBZnFBG1H1bxTMI7VwWZEwRBQ5nu
# qtJf11oxuF9Lsi8OzIFcWx0hHkUmIrjCvnyNrVdxoMVPHcXXz1yD8MVV8vgg4jcL
# Fs/s9h62ymv0n3L0OYbgCfXgVWgomcgAkWfHcv+k8sEyzRa2v2wQ9zyVMnjelNkJ
# i/YEn+dupaZ20a6cLoYGQGBOACJ3iHyd1wZ0XzwSYYMq50X/ESRXAo5XofCAhzuz
# 5LQ3VgzQevFOuRwwqjnAwaZHt5M6Ysj0V28iYpMBJDsk+sMP5nM=
# =7oxT
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon 20 Mar 2023 09:37:48 GMT
# gpg: using RSA key A0328CFFB93A17A79901FE7D4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* tag 'edk2-stable202302-20230320-pull-request' of https://gitlab.com/kraxel/qemu:
edk2: update firmware binaries
edk2: replace build scripts
edk2: update submodule to edk2-stable202302
acpi: disable tests/data/acpi updates
bios-tables-test: use 128M numa nodes on aarch64
acpi: enable tests/data/acpi updates
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/data/acpi/virt/SRAT.acpihmatvirt | bin | 240 -> 240 bytes | |||
| -rw-r--r-- | tests/data/acpi/virt/SSDT.memhp | bin | 1817 -> 1817 bytes | |||
| -rw-r--r-- | tests/qtest/bios-tables-test.c | 6 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/data/acpi/virt/SRAT.acpihmatvirt b/tests/data/acpi/virt/SRAT.acpihmatvirt Binary files differindex 691ef56e34..6fe55dd7d0 100644 --- a/tests/data/acpi/virt/SRAT.acpihmatvirt +++ b/tests/data/acpi/virt/SRAT.acpihmatvirt diff --git a/tests/data/acpi/virt/SSDT.memhp b/tests/data/acpi/virt/SSDT.memhp Binary files differindex 2fcfc5fda9..ef93c44464 100644 --- a/tests/data/acpi/virt/SSDT.memhp +++ b/tests/data/acpi/virt/SSDT.memhp diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 76d5100911..8733589437 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -1679,9 +1679,9 @@ static void test_acpi_virt_tcg_acpi_hmat(void) test_acpi_one(" -machine hmat=on" " -cpu cortex-a57" " -smp 4,sockets=2" - " -m 256M" - " -object memory-backend-ram,size=64M,id=ram0" - " -object memory-backend-ram,size=64M,id=ram1" + " -m 384M" + " -object memory-backend-ram,size=128M,id=ram0" + " -object memory-backend-ram,size=128M,id=ram1" " -object memory-backend-ram,size=128M,id=ram2" " -numa node,nodeid=0,memdev=ram0" " -numa node,nodeid=1,memdev=ram1" |