On 9/8/20 2:14 PM, Laszlo Ersek wrote:
> On 09/08/20 10:27, Philippe Mathieu-Daudé wrote:
>> On 9/8/20 9:29 AM, Laszlo Ersek wrote:
>>> The NVDIMM_ACPI_MEM_ADDR dword in "virt/SSDT.memhp" needs an update due to
>>> the firmware now allocating NVDIMM_DSM_MEM_FILE at a lower address.
>>>
>>>> }
>>>> }
>>>>
>>>> - Name (MEMA, 0x43DD0000)
>>>> + Name (MEMA, 0x43D10000)
>>>> }
>>>>
>>
>> What about also adding (with adapted SHA1):
>>
>> This reverts commit 120219eef8a ('tests: acpi: tolerate
>> "virt/SSDT.memhp" mismatch temporarily').
>
> It's not a revert. The payload for this commit was generated in
> accordance with the instructions in "tests/qtest/bios-tables-test.c",
> namely:
>
>> * 5. From build directory, run:
>> * $(SRC_PATH)/tests/data/acpi/rebuild-expected-aml.sh
>> * 6. Now commit any changes to the expected binary, include diff from step 4
>> * in commit log.
>
> In particular, "rebuild-expected-aml.sh" empties
> "bios-tables-test-allowed-diff.h" automatically (I didn't have to modify
> it manually).
>
> Plus the commit contains the actual binary blob update (which is not a
> revert either).
>
> See also a similar patch from Igor (please note the
> "bios-tables-test-allowed-diff.h" hunk in it, and the fact that the
> commit message does not mention a "revert"):
>
> [PATCH v5 10/10] tests: acpi: update acpi blobs with new AML
> 20200907112348.530921-11-imammedo@redhat.com">http://mid.mail-archive.com/20200907112348.530921-11-imammedo@redhat.com
OK!
>
> Thanks!
> Laszlo
>
>>
>>>
>>> Cc: "Michael S. Tsirkin" <m...@redhat.com>
>>> Cc: Igor Mammedov <imamm...@redhat.com>
>>> Cc: Philippe Mathieu-Daudé <phi...@redhat.com>
>>> Ref: https://bugs.launchpad.net/qemu/+bug/1852196
>>> Signed-off-by: Laszlo Ersek <ler...@redhat.com>
>>> ---
>>> tests/qtest/bios-tables-test-allowed-diff.h | 1 -
>>> tests/data/acpi/virt/SSDT.memhp | Bin 736 -> 736 bytes
>>> 2 files changed, 1 deletion(-)
>>>
>>> diff --git a/tests/qtest/bios-tables-test-allowed-diff.h
>>> b/tests/qtest/bios-tables-test-allowed-diff.h
>>> index e569098abddc..dfb8523c8bf4 100644
>>> --- a/tests/qtest/bios-tables-test-allowed-diff.h
>>> +++ b/tests/qtest/bios-tables-test-allowed-diff.h
>>> @@ -1,2 +1 @@
>>> /* List of comma-separated changed AML files to ignore */
>>> -"tests/data/acpi/virt/SSDT.memhp",
>>> diff --git a/tests/data/acpi/virt/SSDT.memhp
>>> b/tests/data/acpi/virt/SSDT.memhp
>>> index db61d6733284..375d7b6fc85a 100644
>>> Binary files a/tests/data/acpi/virt/SSDT.memhp and
>>> b/tests/data/acpi/virt/SSDT.memhp differ
>>>
>>
>
