Skip to content

Commit

Permalink
tests/x86: Add 'q35' machine type to ivshmem-test
Browse files Browse the repository at this point in the history
Configure pci bridge setting to test ivshmem on 'q35'.

Signed-off-by: Michael Labiuk <michael.labiuk@virtuozzo.com>
Message-Id: <20220929223547.1429580-10-michael.labiuk@virtuozzo.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
  • Loading branch information
shanechko authored and huth committed Oct 11, 2022
1 parent eb4440e commit 46d11f9
Showing 1 changed file with 18 additions and 0 deletions.
18 changes: 18 additions & 0 deletions tests/qtest/ivshmem-test.c
Expand Up @@ -378,6 +378,20 @@ static void test_ivshmem_server(void)
close(thread.pipe[0]);
}

static void test_ivshmem_hotplug_q35(void)
{
QTestState *qts = qtest_init("-object memory-backend-ram,size=1M,id=mb1 "
"-device pcie-root-port,id=p1 "
"-device pcie-pci-bridge,bus=p1,id=b1 "
"-machine q35");

qtest_qmp_device_add(qts, "ivshmem-plain", "iv1",
"{'memdev': 'mb1', 'bus': 'b1'}");
qtest_qmp_device_del_send(qts, "iv1");

qtest_quit(qts);
}

#define PCI_SLOT_HP 0x06

static void test_ivshmem_hotplug(void)
Expand Down Expand Up @@ -469,6 +483,7 @@ int main(int argc, char **argv)
{
int ret, fd;
gchar dir[] = "/tmp/ivshmem-test.XXXXXX";
const char *arch = qtest_get_arch();

g_test_init(&argc, &argv, NULL);

Expand All @@ -494,6 +509,9 @@ int main(int argc, char **argv)
qtest_add_func("/ivshmem/pair", test_ivshmem_pair);
qtest_add_func("/ivshmem/server", test_ivshmem_server);
}
if (!strcmp(arch, "x86_64") && qtest_has_machine("q35")) {
qtest_add_func("/ivshmem/hotplug-q35", test_ivshmem_hotplug_q35);
}

out:
ret = g_test_run();
Expand Down

0 comments on commit 46d11f9

Please sign in to comment.