Thomas Huth <th...@redhat.com> writes:
> From: Thomas Huth <th...@redhat.com>
>
> With the release of QEMU 10.1, the pc-q35-4.1 machine will be older
> than 6 years and thus will get disabled automatically by the
> MACHINE_VER_DELETION() macro. Remove the related test to avoid
> that the q35-test is failing when the machine is not available anymore.
>
> Signed-off-by: Thomas Huth <th...@redhat.com>
> ---
> tests/qtest/q35-test.c | 37 +------------------------------------
> 1 file changed, 1 insertion(+), 36 deletions(-)
>
> diff --git a/tests/qtest/q35-test.c b/tests/qtest/q35-test.c
> index 75d4078b790..62fff49fc89 100644
> --- a/tests/qtest/q35-test.c
> +++ b/tests/qtest/q35-test.c
> @@ -246,41 +246,6 @@ static void test_smram_smbase_lock(void)
> qtest_quit(qts);
> }
>
> -static void test_without_smram_base(void)
> -{
> - QPCIBus *pcibus;
> - QPCIDevice *pcidev;
> - QTestState *qts;
> - int i;
> -
> - qts = qtest_init("-M pc-q35-4.1");
> -
> - pcibus = qpci_new_pc(qts, NULL);
> - g_assert(pcibus != NULL);
> -
> - pcidev = qpci_device_find(pcibus, 0);
> - g_assert(pcidev != NULL);
> -
> - /* check that RAM is accessible */
> - qtest_writeb(qts, SMBASE, SMRAM_TEST_PATTERN);
> - g_assert_cmpint(qtest_readb(qts, SMBASE), ==, SMRAM_TEST_PATTERN);
> -
> - /* check that writing to 0x9c succeeds */
> - for (i = 0; i <= 0xff; i++) {
> - qpci_config_writeb(pcidev, MCH_HOST_BRIDGE_F_SMBASE, i);
> - g_assert(qpci_config_readb(pcidev, MCH_HOST_BRIDGE_F_SMBASE) == i);
> - }
> -
> - /* check that RAM is still accessible */
> - qtest_writeb(qts, SMBASE, SMRAM_TEST_PATTERN + 1);
> - g_assert_cmpint(qtest_readb(qts, SMBASE), ==, (SMRAM_TEST_PATTERN + 1));
> -
> - g_free(pcidev);
> - qpci_free_pc(pcibus);
> -
> - qtest_quit(qts);
> -}
> -
> int main(int argc, char **argv)
> {
> g_test_init(&argc, &argv, NULL);
> @@ -293,6 +258,6 @@ int main(int argc, char **argv)
> qtest_add_data_func("/q35/tseg-size/ext/16mb", &tseg_ext_16mb,
> test_tseg_size);
> qtest_add_func("/q35/smram/smbase_lock", test_smram_smbase_lock);
> - qtest_add_func("/q35/smram/legacy_smbase", test_without_smram_base);
> +
> return g_test_run();
> }
Queued, thanks!
