[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] 0f7803: tests/acpi: allow virt memory hotplug
|
From: |
Peter Maydell |
|
Subject: |
[Qemu-commits] [qemu/qemu] 0f7803: tests/acpi: allow virt memory hotplug changes |
|
Date: |
Tue, 15 Mar 2022 07:41:12 -0700 |
Branch: refs/heads/master
Home: https://github.com/qemu/qemu
Commit: 0f78038e8e88a3e1faa7ec54ecd362afde82524d
https://github.com/qemu/qemu/commit/0f78038e8e88a3e1faa7ec54ecd362afde82524d
Author: Gerd Hoffmann <kraxel@redhat.com>
Date: 2022-03-15 (Tue, 15 Mar 2022)
Changed paths:
M tests/qtest/bios-tables-test-allowed-diff.h
Log Message:
-----------
tests/acpi: allow virt memory hotplug changes
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Commit: e2f3137c7344d3775a8abee81434acd3c0efca76
https://github.com/qemu/qemu/commit/e2f3137c7344d3775a8abee81434acd3c0efca76
Author: Gerd Hoffmann <kraxel@redhat.com>
Date: 2022-03-15 (Tue, 15 Mar 2022)
Changed paths:
M roms/edk2
Log Message:
-----------
edk2: update submodule to stable202202
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Commit: ca26041500eb7e0f3bcd13841467a3dc23b96023
https://github.com/qemu/qemu/commit/ca26041500eb7e0f3bcd13841467a3dc23b96023
Author: Gerd Hoffmann <kraxel@redhat.com>
Date: 2022-03-15 (Tue, 15 Mar 2022)
Changed paths:
M roms/Makefile.edk2
M roms/edk2-build.sh
Log Message:
-----------
edk2: switch to release builds
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Commit: 4911df8a7a6af3e1452a7f368e543180c9efb19a
https://github.com/qemu/qemu/commit/4911df8a7a6af3e1452a7f368e543180c9efb19a
Author: Gerd Hoffmann <kraxel@redhat.com>
Date: 2022-03-15 (Tue, 15 Mar 2022)
Changed paths:
M roms/Makefile.edk2
Log Message:
-----------
edk2: .git can be a file
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Commit: 3ce48e499b96a603e16aa249ff12fbe6893a6314
https://github.com/qemu/qemu/commit/3ce48e499b96a603e16aa249ff12fbe6893a6314
Author: Gerd Hoffmann <kraxel@redhat.com>
Date: 2022-03-15 (Tue, 15 Mar 2022)
Changed paths:
M roms/Makefile.edk2
Log Message:
-----------
edk2: add microvm build
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Commit: 3891a5996fee2218bf3b53161af7ab35dbd1f070
https://github.com/qemu/qemu/commit/3891a5996fee2218bf3b53161af7ab35dbd1f070
Author: Gerd Hoffmann <kraxel@redhat.com>
Date: 2022-03-15 (Tue, 15 Mar 2022)
Changed paths:
M pc-bios/edk2-aarch64-code.fd.bz2
M pc-bios/edk2-arm-code.fd.bz2
M pc-bios/edk2-i386-code.fd.bz2
M pc-bios/edk2-i386-secure-code.fd.bz2
M pc-bios/edk2-x86_64-code.fd.bz2
A pc-bios/edk2-x86_64-microvm.fd.bz2
M pc-bios/edk2-x86_64-secure-code.fd.bz2
Log Message:
-----------
edk2: update binaries to stable202202
The switch to edk2 RELEASE builds changes the memory layout a bit,
resulting in a acpi table change.
DefinitionBlock ("", "SSDT", 1, "BOCHS ", "NVDIMM", 0x00000001)
{
Scope (\_SB)
{
Device (NVDR)
{
Name (_HID, "ACPI0012" /* NVDIMM Root Device */) // _HID:
Hardware ID
Method (NCAL, 5, Serialized)
{
Local6 = MEMA /* \MEMA */
{
Return (NCAL (Arg0, Arg1, Arg2, Arg3, 0x02))
}
}
Device (NV02)
{
Name (_ADR, 0x03) // _ADR: Address
Method (_DSM, 4, NotSerialized) // _DSM: Device-Specific
Method
{
Return (NCAL (Arg0, Arg1, Arg2, Arg3, 0x03))
}
}
}
}
- Name (MEMA, 0x43D10000)
+ Name (MEMA, 0x43F50000)
}
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Commit: ff883fb39ec5ba3189d80edd8b78bc5a670827b1
https://github.com/qemu/qemu/commit/ff883fb39ec5ba3189d80edd8b78bc5a670827b1
Author: Gerd Hoffmann <kraxel@redhat.com>
Date: 2022-03-15 (Tue, 15 Mar 2022)
Changed paths:
M tests/data/acpi/virt/SSDT.memhp
Log Message:
-----------
tests/acpi: update expected data files
The switch to edk2 RELEASE builds changes the memory layout a bit,
resulting in a acpi table change.
See commits ca26041500eb ("edk2: switch to release builds") and
3891a5996fee ("edk2: update binaries to stable202202")
DefinitionBlock ("", "SSDT", 1, "BOCHS ", "NVDIMM", 0x00000001)
{
Scope (\_SB)
{
Device (NVDR)
{
Name (_HID, "ACPI0012" /* NVDIMM Root Device */) // _HID:
Hardware ID
Method (NCAL, 5, Serialized)
{
Local6 = MEMA /* \MEMA */
{
Return (NCAL (Arg0, Arg1, Arg2, Arg3, 0x02))
}
}
Device (NV02)
{
Name (_ADR, 0x03) // _ADR: Address
Method (_DSM, 4, NotSerialized) // _DSM: Device-Specific
Method
{
Return (NCAL (Arg0, Arg1, Arg2, Arg3, 0x03))
}
}
}
}
- Name (MEMA, 0x43D10000)
+ Name (MEMA, 0x43F50000)
}
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Commit: 0e975424f8bf4403efaa08414db8c1da7f813897
https://github.com/qemu/qemu/commit/0e975424f8bf4403efaa08414db8c1da7f813897
Author: Gerd Hoffmann <kraxel@redhat.com>
Date: 2022-03-15 (Tue, 15 Mar 2022)
Changed paths:
M tests/qtest/bios-tables-test-allowed-diff.h
Log Message:
-----------
tests/acpi: disallow virt memory hotplug changes
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Commit: 392c8ac19b7d05ffee6315efed55f21cacb10a2d
https://github.com/qemu/qemu/commit/392c8ac19b7d05ffee6315efed55f21cacb10a2d
Author: Gerd Hoffmann <kraxel@redhat.com>
Date: 2022-03-15 (Tue, 15 Mar 2022)
Changed paths:
M .gitlab-ci.d/edk2/Dockerfile
Log Message:
-----------
edk2/docker: install python3
python2 is not supported any more,
so go install python3 instead.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Commit: a46eff0a35931ae2b3d091e729bd1abda267b1b1
https://github.com/qemu/qemu/commit/a46eff0a35931ae2b3d091e729bd1abda267b1b1
Author: Gerd Hoffmann <kraxel@redhat.com>
Date: 2022-03-15 (Tue, 15 Mar 2022)
Changed paths:
M .gitlab-ci.d/edk2/Dockerfile
Log Message:
-----------
edk2/docker: use ubuntu 18.04
Upstream CI uses ubuntu 18.04 too, so pick
that version (instead of something newer).
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Commit: 9b437cd0f95398198852f25d7847a605370f984d
https://github.com/qemu/qemu/commit/9b437cd0f95398198852f25d7847a605370f984d
Author: Gerd Hoffmann <kraxel@redhat.com>
Date: 2022-03-15 (Tue, 15 Mar 2022)
Changed paths:
M MAINTAINERS
Log Message:
-----------
MAINTAINERS: take edk2
Cc: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Commit: 1af26ce67082727aeb109708f2c75d5fc5364e23
https://github.com/qemu/qemu/commit/1af26ce67082727aeb109708f2c75d5fc5364e23
Author: Peter Maydell <peter.maydell@linaro.org>
Date: 2022-03-15 (Tue, 15 Mar 2022)
Changed paths:
M .gitlab-ci.d/edk2/Dockerfile
M MAINTAINERS
M pc-bios/edk2-aarch64-code.fd.bz2
M pc-bios/edk2-arm-code.fd.bz2
M pc-bios/edk2-i386-code.fd.bz2
M pc-bios/edk2-i386-secure-code.fd.bz2
M pc-bios/edk2-x86_64-code.fd.bz2
A pc-bios/edk2-x86_64-microvm.fd.bz2
M pc-bios/edk2-x86_64-secure-code.fd.bz2
M roms/Makefile.edk2
M roms/edk2
M roms/edk2-build.sh
M tests/data/acpi/virt/SSDT.memhp
Log Message:
-----------
Merge tag 'edk2-20220315-pull-request' of git://git.kraxel.org/qemu into
staging
edk2: update to stable202202
# gpg: Signature made Tue 15 Mar 2022 08:34:38 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-20220315-pull-request' of git://git.kraxel.org/qemu:
MAINTAINERS: take edk2
edk2/docker: use ubuntu 18.04
edk2/docker: install python3
tests/acpi: disallow virt memory hotplug changes
tests/acpi: update expected data files
edk2: update binaries to stable202202
edk2: add microvm build
edk2: .git can be a file
edk2: switch to release builds
edk2: update submodule to stable202202
tests/acpi: allow virt memory hotplug changes
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Compare: https://github.com/qemu/qemu/compare/ac621d40b58f...1af26ce67082