From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48751) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gMHZq-0005Jb-HX for qemu-devel@nongnu.org; Mon, 12 Nov 2018 14:08:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gMHZn-000493-O4 for qemu-devel@nongnu.org; Mon, 12 Nov 2018 14:08:50 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53346) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gMHZn-0003wI-DA for qemu-devel@nongnu.org; Mon, 12 Nov 2018 14:08:47 -0500 From: Thomas Huth Date: Mon, 12 Nov 2018 20:08:04 +0100 Message-Id: <1542049690-12826-2-git-send-email-thuth@redhat.com> In-Reply-To: <1542049690-12826-1-git-send-email-thuth@redhat.com> References: <1542049690-12826-1-git-send-email-thuth@redhat.com> Subject: [Qemu-devel] [PATCH for-3.2 1/7] tests/pvpanic: Make the pvpanic test independent of global_qtest List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eric Blake , qemu-devel@nongnu.org Cc: Igor Mammedov , John Snow , Laurent Vivier , Paolo Bonzini , Ben Warren We want to get rid of global_qtest in the long run, thus do not use the wrappers like inb() and outb() here anymore. Signed-off-by: Thomas Huth --- tests/pvpanic-test.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/pvpanic-test.c b/tests/pvpanic-test.c index 7461a72..ff9176a 100644 --- a/tests/pvpanic-test.c +++ b/tests/pvpanic-test.c @@ -15,13 +15,16 @@ static void test_panic(void) { uint8_t val; QDict *response, *data; + QTestState *qts; - val = inb(0x505); + qts = qtest_init("-device pvpanic"); + + val = qtest_inb(qts, 0x505); g_assert_cmpuint(val, ==, 1); - outb(0x505, 0x1); + qtest_outb(qts, 0x505, 0x1); - response = qmp_receive(); + response = qtest_qmp_receive(qts); g_assert(qdict_haskey(response, "event")); g_assert_cmpstr(qdict_get_str(response, "event"), ==, "GUEST_PANICKED"); g_assert(qdict_haskey(response, "data")); @@ -29,6 +32,8 @@ static void test_panic(void) g_assert(qdict_haskey(data, "action")); g_assert_cmpstr(qdict_get_str(data, "action"), ==, "pause"); qobject_unref(response); + + qtest_quit(qts); } int main(int argc, char **argv) @@ -38,10 +43,7 @@ int main(int argc, char **argv) g_test_init(&argc, &argv, NULL); qtest_add_func("/pvpanic/panic", test_panic); - qtest_start("-device pvpanic"); ret = g_test_run(); - qtest_end(); - return ret; } -- 1.8.3.1