|
@@ -100,7 +100,6 @@ static inline void write_mem(IVState *s, uint64_t off,
|
|
|
|
|
|
static void cleanup_vm(IVState *s)
|
|
static void cleanup_vm(IVState *s)
|
|
{
|
|
{
|
|
- assert(!global_qtest);
|
|
|
|
g_free(s->dev);
|
|
g_free(s->dev);
|
|
qtest_shutdown(s->qs);
|
|
qtest_shutdown(s->qs);
|
|
}
|
|
}
|
|
@@ -388,7 +387,6 @@ static void test_ivshmem_hotplug(void)
|
|
|
|
|
|
qts = qtest_init("-object memory-backend-ram,size=1M,id=mb1");
|
|
qts = qtest_init("-object memory-backend-ram,size=1M,id=mb1");
|
|
|
|
|
|
- global_qtest = qts; /* TODO: Get rid of global_qtest here */
|
|
|
|
qtest_qmp_device_add(qts, "ivshmem-plain", "iv1",
|
|
qtest_qmp_device_add(qts, "ivshmem-plain", "iv1",
|
|
"{'addr': %s, 'memdev': 'mb1'}",
|
|
"{'addr': %s, 'memdev': 'mb1'}",
|
|
stringify(PCI_SLOT_HP));
|
|
stringify(PCI_SLOT_HP));
|
|
@@ -397,7 +395,6 @@ static void test_ivshmem_hotplug(void)
|
|
}
|
|
}
|
|
|
|
|
|
qtest_quit(qts);
|
|
qtest_quit(qts);
|
|
- global_qtest = NULL;
|
|
|
|
}
|
|
}
|
|
|
|
|
|
static void test_ivshmem_memdev(void)
|
|
static void test_ivshmem_memdev(void)
|