diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-03-19 18:01:17 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-03-19 18:01:17 +0000 |
| commit | bdee969c0e65d4d509932b1d70e3a3b2ffbff6d5 (patch) | |
| tree | 188cc6a895d8775cfc80467bce7590a9da408755 /tests | |
| parent | 2e1293cbaac75e84f541f9acfa8e26749f4c3562 (diff) | |
| parent | af05ffffd7fa28010d4df9f5744514b16e71055d (diff) | |
| download | focaccia-qemu-bdee969c0e65d4d509932b1d70e3a3b2ffbff6d5.tar.gz focaccia-qemu-bdee969c0e65d4d509932b1d70e3a3b2ffbff6d5.zip | |
Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging
* fixes for i386 TCG paging * fixes for Hyper-V enlightenments * avoid uninitialized variable warning # gpg: Signature made Fri 19 Mar 2021 14:38:12 GMT # gpg: using RSA key F13338574B662389866C7682BFFBD25F78C7AE83 # gpg: issuer "pbonzini@redhat.com" # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full] # gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" [full] # Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1 # Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83 * remotes/bonzini-gitlab/tags/for-upstream: tests/qtest: cleanup the testcase for bug 1878642 hw/intc/i8259: Refactor pic_read_irq() to avoid uninitialized variable i386: Make migration fail when Hyper-V reenlightenment was enabled but 'user_tsc_khz' is unset i386: Fix 'hypercall_hypercall' typo target/i386: svm: do not discard high 32 bits of EXITINFO1 target/i386: fail if toggling LA57 in 64-bit mode target/i386: allow modifying TCG phys-addr-bits qom: use qemu_printf to print help for user-creatable objects Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/qtest/lpc-ich9-test.c (renamed from tests/qtest/fuzz-test.c) | 12 | ||||
| -rw-r--r-- | tests/qtest/meson.build | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/tests/qtest/fuzz-test.c b/tests/qtest/lpc-ich9-test.c index 00149abec7..fe0bef9980 100644 --- a/tests/qtest/fuzz-test.c +++ b/tests/qtest/lpc-ich9-test.c @@ -1,5 +1,5 @@ /* - * QTest testcase for fuzz case + * QTest testcases for ich9 case * * Copyright (c) 2020 Li Qiang <liq3ea@gmail.com> * @@ -18,9 +18,11 @@ static void test_lp1878642_pci_bus_get_irq_level_assert(void) s = qtest_init("-M pc-q35-5.0 " "-nographic -monitor none -serial none"); - qtest_outl(s, 0xcf8, 0x8400f841); - qtest_outl(s, 0xcfc, 0xebed205d); - qtest_outl(s, 0x5d02, 0xebed205d); + qtest_outl(s, 0xcf8, 0x8000f840); /* PMBASE */ + qtest_outl(s, 0xcfc, 0x5d00); + qtest_outl(s, 0xcf8, 0x8000f844); /* ACPI_CTRL */ + qtest_outl(s, 0xcfc, 0xeb); + qtest_outw(s, 0x5d02, 0x205d); qtest_quit(s); } @@ -31,7 +33,7 @@ int main(int argc, char **argv) g_test_init(&argc, &argv, NULL); if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) { - qtest_add_func("fuzz/test_lp1878642_pci_bus_get_irq_level_assert", + qtest_add_func("ich9/test_lp1878642_pci_bus_get_irq_level_assert", test_lp1878642_pci_bus_get_irq_level_assert); } diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 6e871077c1..9731606c31 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -57,6 +57,7 @@ qtests_i386 = \ (config_all_devices.has_key('CONFIG_HDA') ? ['intel-hda-test'] : []) + \ (config_all_devices.has_key('CONFIG_I82801B11') ? ['i82801b11-test'] : []) + \ (config_all_devices.has_key('CONFIG_IOH3420') ? ['ioh3420-test'] : []) + \ + (config_all_devices.has_key('CONFIG_LPC_ICH9') ? ['lpc-ich9-test'] : []) + \ (config_all_devices.has_key('CONFIG_USB_UHCI') ? ['usb-hcd-uhci-test'] : []) + \ (config_all_devices.has_key('CONFIG_USB_UHCI') and \ config_all_devices.has_key('CONFIG_USB_EHCI') ? ['usb-hcd-ehci-test'] : []) + \ @@ -74,7 +75,6 @@ qtests_i386 = \ 'bios-tables-test', 'rtc-test', 'i440fx-test', - 'fuzz-test', 'fw_cfg-test', 'device-plug-test', 'drive_del-test', |