From 5d850a73ddd31af5775b925e6ad4849cfadb310e Mon Sep 17 00:00:00 2001 From: imxcc Date: Thu, 17 Feb 2022 15:19:13 +0800 Subject: [PATCH] bios-tables-test: Update expected q35/SSDT.dimmpxm file and add BinDir Signed-off-by: imxcc --- BinDir.tar.gz | Bin 0 -> 792 bytes ...-Update-expected-q35-SSDT.dimmpxm-fi.patch | 79 ++++++++++++++++++ qemu.spec | 14 +++- 3 files changed, 92 insertions(+), 1 deletion(-) create mode 100644 BinDir.tar.gz create mode 100644 bios-tables-test-Update-expected-q35-SSDT.dimmpxm-fi.patch diff --git a/BinDir.tar.gz b/BinDir.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..8871e65e7210a81648b066bfb5560c4f6e9a6f0e GIT binary patch literal 792 zcmV+z1Lyo7iwFP!000001MQSeXcIvc$7hq!Y&R)n)A&g(d+xz*z6B4GueE_DDcQ6L zTgdLFCQZ}YF-buYp&y6V3PQW|A|jiTqu^ce=GBuYFXEx#-HYHsoww0LTU)6%5pjNp zndSXw-@G^f*^O6kC9CyO)J;S}G#s{O!ok^k_J;yuFc=N_{ZS%t{Cx&J{3QU80u zVgI!fuAc5C_znM~{t)%Q7aZaL?O^!y?!d|Y4+R6%|DJG+|FWDcT%M^eEZ{o}f3yb} z90`Sv^4}i}Mh^HN35$Lth^N%!vHa)$gURn~2r*~lxx|<(WT%qpOhynGqQ!4aBw+UB zMy88$yr`^7BSg=$#j$j9AeNX&6Y~PdmpPM7#Ks43CY6bmmF4V2I>)%qbDV=b=VKXE zb|H_l;)1w6TaeO%vN8mMeJnYi67s1jS&$~P2|D$-|k}Yj0xnZTi*oz)M|i zowMTNv;G7>u*Yw0u}E+~F01B+`$idU8?!1h`;9r&=Ix9%FnAs+!&N8^&p~bG&^_Z( zjdK|5HL}e{4Iv$`=_Oo(nsFJrYC^r7Lo*{g8pmR!vxWGi1UWHpLzUf2JGzF~HlQIL zZGeVQqXKhfNpDy1U5&FNO&Np*NXwCU8wQ`Jn3OY)HXQM6b*_fkyj+NpLwDw-bfKTk zNpb<!;>M&9Lmde?D{C=6Ub@V_-w;$5&EL=o4djHk=x4$k5g+ifFC=?2XLZMJ7 W6bgkxp-?E4-t!IA3Kt9jC;$LZD}!4A literal 0 HcmV?d00001 diff --git a/bios-tables-test-Update-expected-q35-SSDT.dimmpxm-fi.patch b/bios-tables-test-Update-expected-q35-SSDT.dimmpxm-fi.patch new file mode 100644 index 0000000..6cfa1f2 --- /dev/null +++ b/bios-tables-test-Update-expected-q35-SSDT.dimmpxm-fi.patch @@ -0,0 +1,79 @@ +From 8940f11a055da0a744d10b53cf999dea7967be25 Mon Sep 17 00:00:00 2001 +From: Yan Wang +Date: Thu, 10 Feb 2022 17:12:35 +0800 +Subject: [PATCH] bios-tables-test: Update expected q35/SSDT.dimmpxm file + +Run ./tests/data/acpi/rebuild-expected-aml.sh from build directory +to update q35/SSDT.dimmpxm file. Also empty bios-tables-test-allowed-diff.h. + +The disassembled differences between actual and expected SSDT.dimmpxm: + + /* + * Intel ACPI Component Architecture + * AML/ASL+ Disassembler version 20210604 (64-bit version) + * Copyright (c) 2000 - 2021 Intel Corporation + * + * Disassembling to symbolic ASL+ operators + * +- * Disassembly of tests/data/acpi/q35/SSDT.dimmpxm, Thu Feb 10 15:03:52 2022 ++ * Disassembly of /tmp/aml-CK68G1, Thu Feb 10 15:03:52 2022 + * + * Original Table Header: + * Signature "SSDT" + * Length 0x000002DE (734) + * Revision 0x01 +- * Checksum 0x06 ++ * Checksum 0x16 + * OEM ID "BOCHS " + * OEM Table ID "NVDIMM " + * OEM Revision 0x00000001 (1) + * Compiler ID "BXPC" + * Compiler Version 0x00000001 (1) + */ + 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 */ +@@ -187,19 +187,19 @@ + { + 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, 0x07FFF000) ++ Name (MEMA, 0x07FFE000) + } + +Signed-off-by: Yan Wang +--- + tests/data/acpi/q35/SSDT.dimmpxm | Bin 734 -> 734 bytes + tests/qtest/bios-tables-test-allowed-diff.h | 1 - + 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 81148a604f..dfb8523c8b 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/q35/SSDT.dimmpxm", +-- +2.27.0 + diff --git a/qemu.spec b/qemu.spec index 8ccf5c9..5b29255 100644 --- a/qemu.spec +++ b/qemu.spec @@ -1,6 +1,6 @@ Name: qemu Version: 6.2.0 -Release: 17 +Release: 18 Epoch: 2 Summary: QEMU is a generic and open source machine emulator and virtualizer License: GPLv2 and BSD and MIT and CC-BY-SA-4.0 @@ -9,6 +9,7 @@ Source0: https://www.qemu.org/download/%{name}-%{version}%{?rcstr}.tar.xz Source1: 80-kvm.rules Source2: 99-qemu-guest-agent.rules Source3: bridge.conf +Source4: BinDir.tar.gz Patch0001: net-dump.c-Suppress-spurious-compiler-warning.patch Patch0002: cpu-parse-feature-to-avoid-failure.patch @@ -171,6 +172,7 @@ Patch0158: bugfix-irq-Avoid-covering-object-refcount-of-qemu_ir.patch Patch0159: seabios-add-check-to-avoid-dereference-NULL-pointer.patch Patch0160: qemu-img-add-qemu-img-direct-create.patch Patch0161: log-Delete-redudant-qemu_log.patch +Patch0162: bios-tables-test-Update-expected-q35-SSDT.dimmpxm-fi.patch BuildRequires: flex BuildRequires: gcc @@ -311,6 +313,12 @@ buildarch="aarch64-softmmu" buildldflags="VL_LDFLAGS=-Wl,--build-id" qemubuilddir="build" +tar xf %{SOURCE4} +cd BinDir/ +\cp -r -a * ../ +cd ../ + + ./configure \ --prefix=%{_prefix} \ --target-list=${buildarch} \ @@ -612,6 +620,10 @@ getent passwd qemu >/dev/null || \ %endif %changelog +* Thu Feb 17 2022 imxcc +- bios-tables-test: Update expected q35/SSDT.dimmpxm file +- spec: add BinDir + * Tue Feb 15 2022 Liuxiangdong - feature: disable spice protocol -- Gitee