motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-03 07:43:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

virtio, pc, pci: fixes, cleanups, tests

Browse source 
A bunch of fixes all over the place.
 ACPI tests will now run on more systems: might
 introduce new failure reports but that's for
 the best, isn't it?
 
 Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
 -----BEGIN PGP SIGNATURE-----
 
 iQEcBAABAgAGBQJdKJ/kAAoJECgfDbjSjVRp4dUH/A/eeIm24ul74NRnQHzsiL7F
 duiFhPcnGhMYdTFbrV/vCAenaGR5eBl10XwVHeMEFC1ltIpwc3erdFotRp3WhOzo
 P57ZpqCKr6G8MayhSSTAiNq6GJrQlQ2/eF5TSZlo6kpfP3MDYDS9W/C4Zlp52f0Y
 sxvB49zXytMOJHlM0JqtiMuOfTftn+1GdEzfylJlSX0P3mKmYZG9l2++ByLoKQWd
 8TNdTdGGV3go/xJ3rjmZTTLAS+rEuclVvfSXX6Y1RdGwUxmqZI/JxKmtt9eRRDdw
 896p5dfYbxIGk3kOatfLfCEIBu6EcpvxwKMbbULYibITn939uNZX6rn4bI6FD9I=
 =BUdh
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

virtio, pc, pci: fixes, cleanups, tests

A bunch of fixes all over the place.
ACPI tests will now run on more systems: might
introduce new failure reports but that's for
the best, isn't it?

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

# gpg: Signature made Fri 12 Jul 2019 15:57:40 BST
# gpg:                using RSA key 281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" [full]
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>" [full]
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
#      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469

* remotes/mst/tags/for_upstream:
  virtio pmem: remove transitional names
  virtio pmem: remove memdev null check
  virtio pmem: fix wrong mem region condition
  tests: acpi: do not skip tests when IASL is not installed
  tests: acpi: do not require IASL for dumping AML blobs
  virtio-balloon: fix QEMU 4.0 config size migration incompatibility
  pcie: consistent names for function args
  xio3130_downstream: typo fix

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2019-07-12 17:34:13 +01:00
commit 46cd24e7ed
8 changed files with 52 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

23
tests/bios-tables-test.c
View file

@ -389,6 +389,14 @@ static void test_acpi_asl(test_data *data)
all_tables_match = all_tables_match &&
test_acpi_find_diff_allowed(exp_sdt);
/*
* don't try to decompile if IASL isn't present, in this case user
* will just 'get binary file mismatch' warnings and test failure
*/
if (!iasl) {
continue;
}
err = load_asl(data->tables, sdt);
asl = normalize_asl(sdt->asl);
@ -431,6 +439,11 @@ static void test_acpi_asl(test_data *data)
g_string_free(asl, true);
g_string_free(exp_asl, true);
}
if (!iasl && !all_tables_match) {
fprintf(stderr, "to see ASL diff between mismatched files install IASL,"
" rebuild QEMU from scratch and re-run tests with V=1"
" environment variable set");
}
g_assert(all_tables_match);
free_test_data(&exp_data);
@ -597,12 +610,10 @@ static void test_acpi_one(const char *params, test_data *data)
test_acpi_rxsdt_table(data);
test_acpi_fadt_table(data);
if (iasl) {
if (getenv(ACPI_REBUILD_EXPECTED_AML)) {
dump_aml_files(data, true);
} else {
test_acpi_asl(data);
}
if (getenv(ACPI_REBUILD_EXPECTED_AML)) {
dump_aml_files(data, true);
} else {
test_acpi_asl(data);
}
/*