[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/40] ivshmem-test: Clean up wait for devices to bec
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 08/40] ivshmem-test: Clean up wait for devices to become operational |
Date: |
Fri, 18 Mar 2016 18:00:55 +0100 |
test_ivshmem_server() waits until the first byte in BAR 2 contains the
0x42 we put into shared memory. Works because the byte reads zero
until the device maps the shared memory gotten from the server.
Check the IVPosition register instead: it's initially -1, and becomes
non-negative right when the device maps the share memory, so no
change, just cleaner, because it's what guest software is supposed to
do.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
---
tests/ivshmem-test.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/tests/ivshmem-test.c b/tests/ivshmem-test.c
index a48dc49..bbea8cd 100644
--- a/tests/ivshmem-test.c
+++ b/tests/ivshmem-test.c
@@ -301,7 +301,6 @@ static void test_ivshmem_server(bool msi)
int nvectors = 2;
guint64 end_time = g_get_monotonic_time() + 5 * G_TIME_SPAN_SECOND;
- memset(tmpshmem, 0x42, TMPSHMSIZE);
ret = ivshmem_server_init(&server, tmpserver, tmpshm, true,
TMPSHMSIZE, nvectors,
g_test_verbose());
@@ -315,9 +314,9 @@ static void test_ivshmem_server(bool msi)
setup_vm_with_server(&state2, nvectors, msi);
s2 = &state2;
+ /* check state before server sends stuff */
g_assert_cmpuint(in_reg(s1, IVPOSITION), ==, 0xffffffff);
g_assert_cmpuint(in_reg(s2, IVPOSITION), ==, 0xffffffff);
-
g_assert_cmpuint(qtest_readb(s1->qtest, (uintptr_t)s1->mem_base), ==,
0x00);
thread.server = &server;
@@ -326,12 +325,11 @@ static void test_ivshmem_server(bool msi)
thread.thread = g_thread_new("ivshmem-server", server_thread, &thread);
g_assert(thread.thread != NULL);
- /* waiting until mapping is done */
+ /* waiting for devices to become operational */
while (g_get_monotonic_time() < end_time) {
g_usleep(1000);
-
- if (qtest_readb(s1->qtest, (uintptr_t)s1->mem_base) == 0x42 &&
- qtest_readb(s2->qtest, (uintptr_t)s2->mem_base) == 0x42) {
+ if ((int)in_reg(s1, IVPOSITION) >= 0 &&
+ (int)in_reg(s2, IVPOSITION) >= 0) {
break;
}
}
--
2.4.3
- [Qemu-devel] [PULL 00/40] ivshmem: Fixes, cleanups, device model split, Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 12/40] ivshmem: Compile debug prints unconditionally to prevent bit-rot, Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 07/40] ivshmem-test: Improve test case /ivshmem/single, Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 09/40] ivshmem-test: Improve test cases /ivshmem/server-*, Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 06/40] tests/libqos/pci-pc: Fix qpci_pc_iomap() to map BARs aligned, Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 03/40] ivshmem-server: Don't overload POSIX shmem and file name, Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 08/40] ivshmem-test: Clean up wait for devices to become operational,
Markus Armbruster <=
- [Qemu-devel] [PULL 01/40] target-ppc: Document TOCTTOU in hugepage support, Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 05/40] event_notifier: Make event_notifier_init_fd() #ifdef CONFIG_EVENTFD, Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 15/40] ivshmem: Don't destroy the chardev on version mismatch, Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 11/40] ivshmem: Add missing newlines to debug printfs, Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 22/40] ivshmem: Simplify rejection of invalid peer ID from server, Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 18/40] ivshmem: Clean up register callbacks, Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 14/40] ivshmem: Drop ivshmem_event() stub, Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 24/40] ivshmem: Plug leaks on unplug, fix peer disconnect, Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 38/40] ivshmem: Drop ivshmem property x-memdev, Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 20/40] ivshmem: Leave INTx alone when using MSI-X, Markus Armbruster, 2016/03/18