Another attempt at SLIC bug fix
https://bugzilla.redhat.com/show_bug.cgi?id=2020186 Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson
parent
d1ec89a9b6
commit
bc9be573e5
|
|
@ -0,0 +1,65 @@
|
|||
From 06e277d27dae489dcd3d70cc8c84b20015777978 Mon Sep 17 00:00:00 2001
|
||||
From: Igor Mammedov <imammedo@redhat.com>
|
||||
Date: Wed, 12 Jan 2022 08:03:29 -0500
|
||||
Subject: [PATCH] tests: acpi: manually pad OEM_ID/OEM_TABLE_ID for
|
||||
test_oem_fields() test
|
||||
Content-type: text/plain
|
||||
|
||||
The next commit will revert OEM fields padding with whitespace to
|
||||
padding with '\0' as it was before [1]. As result test_oem_fields() will
|
||||
fail due to unexpectedly smaller ID sizes read from QEMU ACPI tables.
|
||||
|
||||
Pad OEM_ID/OEM_TABLE_ID manually with spaces so that values the test
|
||||
puts on QEMU CLI and expected values match.
|
||||
|
||||
1) 602b458201 ("acpi: Permit OEM ID and OEM table ID fields to be changed")
|
||||
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
|
||||
Message-Id: <20220112130332.1648664-2-imammedo@redhat.com>
|
||||
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
||||
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
||||
(cherry picked from commit a849522f726767022203ef2b6c395ea19facb866)
|
||||
---
|
||||
tests/qtest/bios-tables-test.c | 15 ++++++---------
|
||||
1 file changed, 6 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
|
||||
index 258874167e..f5ae719b96 100644
|
||||
--- a/tests/qtest/bios-tables-test.c
|
||||
+++ b/tests/qtest/bios-tables-test.c
|
||||
@@ -71,9 +71,10 @@
|
||||
|
||||
#define ACPI_REBUILD_EXPECTED_AML "TEST_ACPI_REBUILD_AML"
|
||||
|
||||
-#define OEM_ID "TEST"
|
||||
-#define OEM_TABLE_ID "OEM"
|
||||
-#define OEM_TEST_ARGS "-machine x-oem-id="OEM_ID",x-oem-table-id="OEM_TABLE_ID
|
||||
+#define OEM_ID "TEST "
|
||||
+#define OEM_TABLE_ID "OEM "
|
||||
+#define OEM_TEST_ARGS "-machine x-oem-id='" OEM_ID "',x-oem-table-id='" \
|
||||
+ OEM_TABLE_ID "'"
|
||||
|
||||
typedef struct {
|
||||
bool tcg_only;
|
||||
@@ -1468,11 +1469,7 @@ static void test_acpi_virt_tcg(void)
|
||||
static void test_oem_fields(test_data *data)
|
||||
{
|
||||
int i;
|
||||
- char oem_id[6];
|
||||
- char oem_table_id[8];
|
||||
|
||||
- strpadcpy(oem_id, sizeof oem_id, OEM_ID, ' ');
|
||||
- strpadcpy(oem_table_id, sizeof oem_table_id, OEM_TABLE_ID, ' ');
|
||||
for (i = 0; i < data->tables->len; ++i) {
|
||||
AcpiSdtTable *sdt;
|
||||
|
||||
@@ -1482,8 +1479,8 @@ static void test_oem_fields(test_data *data)
|
||||
continue;
|
||||
}
|
||||
|
||||
- g_assert(memcmp(sdt->aml + 10, oem_id, 6) == 0);
|
||||
- g_assert(memcmp(sdt->aml + 16, oem_table_id, 8) == 0);
|
||||
+ g_assert(memcmp(sdt->aml + 10, OEM_ID, 6) == 0);
|
||||
+ g_assert(memcmp(sdt->aml + 16, OEM_TABLE_ID, 8) == 0);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,38 @@
|
|||
From 83a99be0e3ae93df84f7cd20ac9f6495cc9d0c63 Mon Sep 17 00:00:00 2001
|
||||
From: Igor Mammedov <imammedo@redhat.com>
|
||||
Date: Wed, 12 Jan 2022 08:03:30 -0500
|
||||
Subject: [PATCH] tests: acpi: whitelist nvdimm's SSDT and FACP.slic expected
|
||||
blobs
|
||||
Content-type: text/plain
|
||||
|
||||
The next commit will revert OEM fields whitespace padding to
|
||||
padding with '\0' as it was before [1]. That will change OEM
|
||||
Table ID for:
|
||||
* SSDT.*: where it was padded from 6 characters to 8
|
||||
* FACP.slic: where it was padded from 2 characters to 8
|
||||
after reverting whitespace padding, it will be replaced with
|
||||
'\0' which effectively will shorten OEM table ID to 6 and 2
|
||||
characters.
|
||||
|
||||
Whitelist affected tables before introducing the change.
|
||||
|
||||
1) 602b458201 ("acpi: Permit OEM ID and OEM table ID fields to be changed")
|
||||
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
|
||||
Message-Id: <20220112130332.1648664-3-imammedo@redhat.com>
|
||||
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
||||
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
||||
(cherry picked from commit d1e4a4654154925eddf0fc449fa9c92b806b9c8c)
|
||||
---
|
||||
tests/qtest/bios-tables-test-allowed-diff.h | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
|
||||
index dfb8523c8b..7faa8f53be 100644
|
||||
--- a/tests/qtest/bios-tables-test-allowed-diff.h
|
||||
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
|
||||
@@ -1 +1,5 @@
|
||||
/* List of comma-separated changed AML files to ignore */
|
||||
+"tests/data/acpi/virt/SSDT.memhp",
|
||||
+"tests/data/acpi/pc/SSDT.dimmpxm",
|
||||
+"tests/data/acpi/q35/SSDT.dimmpxm",
|
||||
+"tests/data/acpi/q35/FACP.slic",
|
||||
|
|
@ -0,0 +1,59 @@
|
|||
From b1e3d3ee5ab5be89257075201ecfeab93ec8dd5e Mon Sep 17 00:00:00 2001
|
||||
From: Igor Mammedov <imammedo@redhat.com>
|
||||
Date: Wed, 12 Jan 2022 08:03:31 -0500
|
||||
Subject: [PATCH] acpi: fix OEM ID/OEM Table ID padding
|
||||
Content-type: text/plain
|
||||
|
||||
Commit [2] broke original '\0' padding of OEM ID and OEM Table ID
|
||||
fields in headers of ACPI tables. While it doesn't have impact on
|
||||
default values since QEMU uses 6 and 8 characters long values
|
||||
respectively, it broke usecase where IDs are provided on QEMU CLI.
|
||||
It shouldn't affect guest (but may cause licensing verification
|
||||
issues in guest OS).
|
||||
One of the broken usecases is user supplied SLIC table with IDs
|
||||
shorter than max possible length, where [2] mangles IDs with extra
|
||||
spaces in RSDT and FADT tables whereas guest OS expects those to
|
||||
mirror the respective values of the used SLIC table.
|
||||
|
||||
Fix it by replacing whitespace padding with '\0' padding in
|
||||
accordance with [1] and expectations of guest OS
|
||||
|
||||
1) ACPI spec, v2.0b
|
||||
17.2 AML Grammar Definition
|
||||
...
|
||||
//OEM ID of up to 6 characters. If the OEM ID is
|
||||
//shorter than 6 characters, it can be terminated
|
||||
//with a NULL character.
|
||||
|
||||
2)
|
||||
Fixes: 602b458201 ("acpi: Permit OEM ID and OEM table ID fields to be changed")
|
||||
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/707
|
||||
Reported-by: Dmitry V. Orekhov <dima.orekhov@gmail.com>
|
||||
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
|
||||
Cc: qemu-stable@nongnu.org
|
||||
Message-Id: <20220112130332.1648664-4-imammedo@redhat.com>
|
||||
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
||||
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
||||
Reviewed-by: Ani Sinha <ani@anisinha.ca>
|
||||
Tested-by: Dmitry V. Orekhov dima.orekhov@gmail.com
|
||||
(cherry picked from commit 748c030f360a940fe0c9382c8ca1649096c3a80d)
|
||||
---
|
||||
hw/acpi/aml-build.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
|
||||
index b3b3310df3..65148d5b9d 100644
|
||||
--- a/hw/acpi/aml-build.c
|
||||
+++ b/hw/acpi/aml-build.c
|
||||
@@ -1724,9 +1724,9 @@ void acpi_table_begin(AcpiTable *desc, GArray *array)
|
||||
build_append_int_noprefix(array, 0, 4); /* Length */
|
||||
build_append_int_noprefix(array, desc->rev, 1); /* Revision */
|
||||
build_append_int_noprefix(array, 0, 1); /* Checksum */
|
||||
- build_append_padded_str(array, desc->oem_id, 6, ' '); /* OEMID */
|
||||
+ build_append_padded_str(array, desc->oem_id, 6, '\0'); /* OEMID */
|
||||
/* OEM Table ID */
|
||||
- build_append_padded_str(array, desc->oem_table_id, 8, ' ');
|
||||
+ build_append_padded_str(array, desc->oem_table_id, 8, '\0');
|
||||
build_append_int_noprefix(array, 1, 4); /* OEM Revision */
|
||||
g_array_append_vals(array, ACPI_BUILD_APPNAME8, 4); /* Creator ID */
|
||||
build_append_int_noprefix(array, 1, 4); /* Creator Revision */
|
||||
|
|
@ -0,0 +1,58 @@
|
|||
From 153f39dc6eec56092cc2b44b5690c9cdd77927b4 Mon Sep 17 00:00:00 2001
|
||||
From: Igor Mammedov <imammedo@redhat.com>
|
||||
Date: Fri, 14 Jan 2022 09:26:41 -0500
|
||||
Subject: [PATCH] tests: acpi: test short OEM_ID/OEM_TABLE_ID values in
|
||||
test_oem_fields()
|
||||
Content-type: text/plain
|
||||
|
||||
Previous patch [1] added explicit whitespace padding to OEM_ID/OEM_TABLE_ID
|
||||
values used in test_oem_fields() testcase to avoid false positive and
|
||||
bisection issues when QEMU is switched to \0' padding. As result
|
||||
testcase ceased to test values that were shorter than max possible
|
||||
length values.
|
||||
|
||||
Update testcase to make sure that it's testing shorter IDs like it
|
||||
used to before [2].
|
||||
|
||||
1) "tests: acpi: manually pad OEM_ID/OEM_TABLE_ID for test_oem_fields() test"
|
||||
2) 602b458201 ("acpi: Permit OEM ID and OEM table ID fields to be changed")
|
||||
|
||||
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
|
||||
Message-Id: <20220114142641.1727679-1-imammedo@redhat.com>
|
||||
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
||||
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
||||
(cherry picked from commit 408ca92634770de5eac7965ed97c6260e770f2e7)
|
||||
---
|
||||
tests/qtest/bios-tables-test.c | 12 ++++++------
|
||||
1 file changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
|
||||
index f5ae719b96..5c497aa0ae 100644
|
||||
--- a/tests/qtest/bios-tables-test.c
|
||||
+++ b/tests/qtest/bios-tables-test.c
|
||||
@@ -71,10 +71,10 @@
|
||||
|
||||
#define ACPI_REBUILD_EXPECTED_AML "TEST_ACPI_REBUILD_AML"
|
||||
|
||||
-#define OEM_ID "TEST "
|
||||
-#define OEM_TABLE_ID "OEM "
|
||||
-#define OEM_TEST_ARGS "-machine x-oem-id='" OEM_ID "',x-oem-table-id='" \
|
||||
- OEM_TABLE_ID "'"
|
||||
+#define OEM_ID "TEST"
|
||||
+#define OEM_TABLE_ID "OEM"
|
||||
+#define OEM_TEST_ARGS "-machine x-oem-id=" OEM_ID ",x-oem-table-id=" \
|
||||
+ OEM_TABLE_ID
|
||||
|
||||
typedef struct {
|
||||
bool tcg_only;
|
||||
@@ -1479,8 +1479,8 @@ static void test_oem_fields(test_data *data)
|
||||
continue;
|
||||
}
|
||||
|
||||
- g_assert(memcmp(sdt->aml + 10, OEM_ID, 6) == 0);
|
||||
- g_assert(memcmp(sdt->aml + 16, OEM_TABLE_ID, 8) == 0);
|
||||
+ g_assert(strncmp((char *)sdt->aml + 10, OEM_ID, 6) == 0);
|
||||
+ g_assert(strncmp((char *)sdt->aml + 16, OEM_TABLE_ID, 8) == 0);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,63 @@
|
|||
From 1bf4552b6faded64ac89c6a25bcff9f912f2667d Mon Sep 17 00:00:00 2001
|
||||
From: Murilo Opsfelder Araujo <muriloo@linux.ibm.com>
|
||||
Date: Fri, 11 Mar 2022 19:16:34 -0300
|
||||
Subject: [PATCH] block-qdict: Fix -Werror=maybe-uninitialized build failure
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
Content-type: text/plain
|
||||
|
||||
Building QEMU on Fedora 37 (Rawhide Prerelease) ppc64le failed with the
|
||||
following error:
|
||||
|
||||
$ ../configure --prefix=/usr/local/qemu-disabletcg --target-list=ppc-softmmu,ppc64-softmmu --disable-tcg --disable-linux-user
|
||||
...
|
||||
$ make -j$(nproc)
|
||||
...
|
||||
In file included from /root/qemu/include/qapi/qmp/qdict.h:16,
|
||||
from /root/qemu/include/block/qdict.h:13,
|
||||
from ../qobject/block-qdict.c:11:
|
||||
/root/qemu/include/qapi/qmp/qobject.h: In function ‘qdict_array_split’:
|
||||
/root/qemu/include/qapi/qmp/qobject.h:49:17: error: ‘subqdict’ may be used uninitialized [-Werror=maybe-uninitialized]
|
||||
49 | typeof(obj) _obj = (obj); \
|
||||
| ^~~~
|
||||
../qobject/block-qdict.c:227:16: note: ‘subqdict’ declared here
|
||||
227 | QDict *subqdict;
|
||||
| ^~~~~~~~
|
||||
cc1: all warnings being treated as errors
|
||||
|
||||
Fix build failure by expanding the ternary operation.
|
||||
Tested with `make check-unit` (the check-block-qdict test passed).
|
||||
|
||||
Signed-off-by: Murilo Opsfelder Araujo <muriloo@linux.ibm.com>
|
||||
Cc: Kevin Wolf <kwolf@redhat.com>
|
||||
Cc: Hanna Reitz <hreitz@redhat.com>
|
||||
Cc: Markus Armbruster <armbru@redhat.com>
|
||||
Message-Id: <20220311221634.58288-1-muriloo@linux.ibm.com>
|
||||
Reviewed-by: Markus Armbruster <armbru@redhat.com>
|
||||
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
||||
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
|
||||
(cherry picked from commit 79854b95446396c8e7f397800c5d86c3d9a7540d)
|
||||
---
|
||||
qobject/block-qdict.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/qobject/block-qdict.c b/qobject/block-qdict.c
|
||||
index 1487cc5dd8..4a83bda2c3 100644
|
||||
--- a/qobject/block-qdict.c
|
||||
+++ b/qobject/block-qdict.c
|
||||
@@ -251,12 +251,12 @@ void qdict_array_split(QDict *src, QList **dst)
|
||||
if (is_subqdict) {
|
||||
qdict_extract_subqdict(src, &subqdict, prefix);
|
||||
assert(qdict_size(subqdict) > 0);
|
||||
+ qlist_append_obj(*dst, QOBJECT(subqdict));
|
||||
} else {
|
||||
qobject_ref(subqobj);
|
||||
qdict_del(src, indexstr);
|
||||
+ qlist_append_obj(*dst, subqobj);
|
||||
}
|
||||
-
|
||||
- qlist_append_obj(*dst, subqobj ?: QOBJECT(subqdict));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,63 @@
|
|||
From bab0144328d7a9c9c8659da264fbaeb6c1dfdbb6 Mon Sep 17 00:00:00 2001
|
||||
From: Paolo Bonzini <pbonzini@redhat.com>
|
||||
Date: Mon, 21 Mar 2022 15:30:18 +0100
|
||||
Subject: [PATCH] hw/i386/amd_iommu: Fix maybe-uninitialized error with GCC 12
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
Content-type: text/plain
|
||||
|
||||
Be more explicit that the loop must roll at least once. Avoids the
|
||||
following warning:
|
||||
|
||||
FAILED: libqemu-x86_64-softmmu.fa.p/hw_i386_amd_iommu.c.o
|
||||
In function 'pte_get_page_mask',
|
||||
inlined from 'amdvi_page_walk' at hw/i386/amd_iommu.c:945:25,
|
||||
inlined from 'amdvi_do_translate' at hw/i386/amd_iommu.c:989:5,
|
||||
inlined from 'amdvi_translate' at hw/i386/amd_iommu.c:1038:5:
|
||||
hw/i386/amd_iommu.c:877:38: error: 'oldlevel' may be used uninitialized [-Werror=maybe-uninitialized]
|
||||
877 | return ~((1UL << ((oldlevel * 9) + 3)) - 1);
|
||||
| ~~~~~~~~~~~~~~~~^~~~
|
||||
hw/i386/amd_iommu.c: In function 'amdvi_translate':
|
||||
hw/i386/amd_iommu.c:906:41: note: 'oldlevel' was declared here
|
||||
906 | unsigned level, present, pte_perms, oldlevel;
|
||||
| ^~~~~~~~
|
||||
cc1: all warnings being treated as errors
|
||||
|
||||
Having:
|
||||
|
||||
$ gcc --version
|
||||
gcc (Debian 12-20220313-1) 12.0.1 20220314 (experimental)
|
||||
|
||||
Reported-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
|
||||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
(cherry picked from commit 17e6ffa6a5d2674cb2ebfd967d28b1048261d977)
|
||||
---
|
||||
hw/i386/amd_iommu.c | 7 ++-----
|
||||
1 file changed, 2 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c
|
||||
index 91fe34ae58..f2960a0f38 100644
|
||||
--- a/hw/i386/amd_iommu.c
|
||||
+++ b/hw/i386/amd_iommu.c
|
||||
@@ -911,7 +911,7 @@ static void amdvi_page_walk(AMDVIAddressSpace *as, uint64_t *dte,
|
||||
}
|
||||
|
||||
/* we are at the leaf page table or page table encodes a huge page */
|
||||
- while (level > 0) {
|
||||
+ do {
|
||||
pte_perms = amdvi_get_perms(pte);
|
||||
present = pte & 1;
|
||||
if (!present || perms != (perms & pte_perms)) {
|
||||
@@ -930,10 +930,7 @@ static void amdvi_page_walk(AMDVIAddressSpace *as, uint64_t *dte,
|
||||
}
|
||||
oldlevel = level;
|
||||
level = get_pte_translation_mode(pte);
|
||||
- if (level == 0x7) {
|
||||
- break;
|
||||
- }
|
||||
- }
|
||||
+ } while (level > 0 && level < 7);
|
||||
|
||||
if (level == 0x7) {
|
||||
page_mask = pte_override_page_mask(pte);
|
||||
|
|
@ -0,0 +1,51 @@
|
|||
From 11902ed45f0ca9643f656dba4d630d276080ead2 Mon Sep 17 00:00:00 2001
|
||||
From: Cole Robinson <crobinso@redhat.com>
|
||||
Date: Tue, 17 May 2022 15:19:02 -0400
|
||||
Subject: [PATCH] Update bios-table-test blobs after bugfix backports
|
||||
Content-type: text/plain
|
||||
|
||||
Signed-off-by: Cole Robinson <crobinso@redhat.com>
|
||||
---
|
||||
tests/data/acpi/pc/SSDT.dimmpxm | Bin 734 -> 734 bytes
|
||||
tests/data/acpi/q35/SSDT.dimmpxm | Bin 734 -> 734 bytes
|
||||
tests/data/acpi/virt/SSDT.memhp | Bin 736 -> 736 bytes
|
||||
tests/qtest/bios-tables-test-allowed-diff.h | 4 ----
|
||||
4 files changed, 4 deletions(-)
|
||||
|
||||
diff --git a/tests/data/acpi/pc/SSDT.dimmpxm b/tests/data/acpi/pc/SSDT.dimmpxm
|
||||
index a50a961fa1d9b0dd8ea4096d652c83bcf04db20b..ac55387d57e48adb99eb738a102308688a262fb8 100644
|
||||
GIT binary patch
|
||||
delta 33
|
||||
ocmcb|dXH5iIM^lR9uortW0;e_vq!LkUzm%huP+0`Mu}rg0HzrUKL7v#
|
||||
|
||||
delta 33
|
||||
ocmcb|dXH5iIM^lR9uortqnMMwvq!LkUzm%hudjl_Mu}rg0HV1GKL7v#
|
||||
|
||||
diff --git a/tests/data/acpi/q35/SSDT.dimmpxm b/tests/data/acpi/q35/SSDT.dimmpxm
|
||||
index 617a1c911c7d6753bcedc8ecc52e3027a5259ad6..98e6f0e3f3bb02dd419e36bdd1db9b94c728c406 100644
|
||||
GIT binary patch
|
||||
delta 33
|
||||
ocmcb|dXH5iIM^lR9uortqnnezvq!LkUzm%huP+0`Mu}rg0Ho;&F8}}l
|
||||
|
||||
delta 33
|
||||
ocmcb|dXH5iIM^lR9uortBb$@Ivq!LkUzm%hudjl_Mu}rg0HKKqF8}}l
|
||||
|
||||
diff --git a/tests/data/acpi/virt/SSDT.memhp b/tests/data/acpi/virt/SSDT.memhp
|
||||
index e8b850ae2239d8f496b12de672c2a1268e2f269d..375d7b6fc85a484f492a26ccd355c205f2c34473 100644
|
||||
GIT binary patch
|
||||
delta 33
|
||||
ocmaFB`hZm;IM^lR0TTlQqrH>Avq!LkUzm%huP+0`Mu`(l0HqiSFaQ7m
|
||||
|
||||
delta 33
|
||||
ocmaFB`hZm;IM^lR0TTlQ<9{cAXOCb7zc3e1Uta}<jS?rA0JOLYFaQ7m
|
||||
|
||||
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
|
||||
index 7faa8f53be..dfb8523c8b 100644
|
||||
--- a/tests/qtest/bios-tables-test-allowed-diff.h
|
||||
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
|
||||
@@ -1,5 +1 @@
|
||||
/* List of comma-separated changed AML files to ignore */
|
||||
-"tests/data/acpi/virt/SSDT.memhp",
|
||||
-"tests/data/acpi/pc/SSDT.dimmpxm",
|
||||
-"tests/data/acpi/q35/SSDT.dimmpxm",
|
||||
-"tests/data/acpi/q35/FACP.slic",
|
||||
15
qemu.spec
15
qemu.spec
|
|
@ -348,6 +348,17 @@ Patch0005: 0001-acpi-fix-QEMU-crash-when-started-with-SLIC-table.patch
|
|||
# https://bugzilla.redhat.com/show_bug.cgi?id=2080519
|
||||
Patch0006: 0001-accel-tcg-Fix-cpu_ldq_be_mmu-typo.patch
|
||||
|
||||
# Fix slic table usage
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2020186
|
||||
Patch0010: 0010-tests-acpi-manually-pad-OEM_ID-OEM_TABLE_ID-for-test.patch
|
||||
Patch0011: 0011-tests-acpi-whitelist-nvdimm-s-SSDT-and-FACP.slic-exp.patch
|
||||
Patch0012: 0012-acpi-fix-OEM-ID-OEM-Table-ID-padding.patch
|
||||
Patch0013: 0013-tests-acpi-test-short-OEM_ID-OEM_TABLE_ID-values-in-.patch
|
||||
Patch0014: 0014-block-qdict-Fix-Werror-maybe-uninitialized-build-fai.patch
|
||||
Patch0015: 0015-hw-i386-amd_iommu-Fix-maybe-uninitialized-error-with.patch
|
||||
Patch0016: 0016-Update-bios-table-test-blobs-after-bugfix-backports.patch
|
||||
|
||||
|
||||
BuildRequires: meson >= %{meson_version}
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: glib2-devel
|
||||
|
|
@ -419,6 +430,8 @@ BuildRequires: clang
|
|||
BuildRequires: gcc
|
||||
%endif
|
||||
BuildRequires: make
|
||||
# For autosetup git_am
|
||||
BuildRequires: git
|
||||
# -display sdl support
|
||||
BuildRequires: SDL2-devel
|
||||
# pulseaudio audio output
|
||||
|
|
@ -1236,7 +1249,7 @@ This package provides the QEMU system emulator for Xtensa boards.
|
|||
|
||||
%prep
|
||||
%setup -q -n qemu-%{version}%{?rcstr}
|
||||
%autopatch -p1
|
||||
%autosetup -S git_am
|
||||
|
||||
%global qemu_kvm_build qemu_kvm_build
|
||||
mkdir -p %{qemu_kvm_build}
|
||||
|
|
|
|||
Loading…
Reference in New Issue