[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 9/9] tests/libqtest: Make qmp_assert_success() indepe
From: |
Thomas Huth |
Subject: |
[Qemu-devel] [PULL 9/9] tests/libqtest: Make qmp_assert_success() independent from global_qtest |
Date: |
Thu, 15 Aug 2019 19:59:22 +0200 |
The normal libqtest library functions should never depend on global_qtest.
Pass in the test state via parameter instead. And while we're at it,
also rename this function to qtest_qmp_assert_success() to make it clear
that it is part of libqtest.
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>
---
tests/libqtest.c | 4 ++--
tests/libqtest.h | 6 ++++--
tests/virtio-scsi-test.c | 10 ++++++----
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/tests/libqtest.c b/tests/libqtest.c
index 19c1fc2e97..eb971d0d11 100644
--- a/tests/libqtest.c
+++ b/tests/libqtest.c
@@ -1111,13 +1111,13 @@ QDict *qmp(const char *fmt, ...)
return response;
}
-void qmp_assert_success(const char *fmt, ...)
+void qtest_qmp_assert_success(QTestState *qts, const char *fmt, ...)
{
va_list ap;
QDict *response;
va_start(ap, fmt);
- response = qtest_vqmp(global_qtest, fmt, ap);
+ response = qtest_vqmp(qts, fmt, ap);
va_end(ap);
g_assert(response);
diff --git a/tests/libqtest.h b/tests/libqtest.h
index d93144fb74..7833148358 100644
--- a/tests/libqtest.h
+++ b/tests/libqtest.h
@@ -666,7 +666,8 @@ static inline void qtest_end(void)
QDict *qmp(const char *fmt, ...) GCC_FMT_ATTR(1, 2);
/**
- * qmp_assert_success:
+ * qtest_qmp_assert_success:
+ * @qts: QTestState instance to operate on
* @fmt...: QMP message to send to qemu, formatted like
* qobject_from_jsonf_nofail(). See parse_escape() for what's
* supported after '%'.
@@ -674,7 +675,8 @@ QDict *qmp(const char *fmt, ...) GCC_FMT_ATTR(1, 2);
* Sends a QMP message to QEMU and asserts that a 'return' key is present in
* the response.
*/
-void qmp_assert_success(const char *fmt, ...) GCC_FMT_ATTR(1, 2);
+void qtest_qmp_assert_success(QTestState *qts, const char *fmt, ...)
+ GCC_FMT_ATTR(2, 3);
/*
* qmp_eventwait:
diff --git a/tests/virtio-scsi-test.c b/tests/virtio-scsi-test.c
index 16481491e3..09348765d7 100644
--- a/tests/virtio-scsi-test.c
+++ b/tests/virtio-scsi-test.c
@@ -225,10 +225,12 @@ static void test_iothread_attach_node(void *obj, void
*data,
mkqcow2(tmp_path, 64);
/* Attach the overlay to the null0 node */
- qmp_assert_success("{'execute': 'blockdev-add', 'arguments': {"
- " 'driver': 'qcow2', 'node-name': 'overlay',"
- " 'backing': 'null0', 'file': {"
- " 'driver': 'file', 'filename': %s}}}", tmp_path);
+ qtest_qmp_assert_success(scsi_pci->pci_vdev.pdev->bus->qts,
+ "{'execute': 'blockdev-add', 'arguments': {"
+ " 'driver': 'qcow2', 'node-name': 'overlay',"
+ " 'backing': 'null0', 'file': {"
+ " 'driver': 'file', 'filename': %s}}}",
+ tmp_path);
/* Send a request to see if the AioContext is still right */
ret = virtio_scsi_do_command(vs, write_cdb, NULL, 0, buf, 512, NULL);
--
2.18.1
- [Qemu-devel] [PULL 0/9] qtest patches, Thomas Huth, 2019/08/15
- [Qemu-devel] [PULL 1/9] qtest: Rename qtest.c:qtest_init(), Thomas Huth, 2019/08/15
- [Qemu-devel] [PULL 2/9] libqos: Account for the ctrl queue in virtio-net, Thomas Huth, 2019/08/15
- [Qemu-devel] [PULL 3/9] tests: Set read-zeroes on for null-co driver, Thomas Huth, 2019/08/15
- [Qemu-devel] [PULL 5/9] tests/libqos: Make virtio-pci code independent from global_qtest, Thomas Huth, 2019/08/15
- [Qemu-devel] [PULL 4/9] tests/libqos: Make generic virtio code independent from global_qtest, Thomas Huth, 2019/08/15
- [Qemu-devel] [PULL 7/9] tests/libqtest: Clean up qtest_cb_for_every_machine() wrt global_qtest, Thomas Huth, 2019/08/15
- [Qemu-devel] [PULL 6/9] tests/libqtest: Remove unused function hmp(), Thomas Huth, 2019/08/15
- [Qemu-devel] [PULL 9/9] tests/libqtest: Make qmp_assert_success() independent from global_qtest,
Thomas Huth <=
- [Qemu-devel] [PULL 8/9] tests/libqtest: Make qtest_qmp_device_add/del independent from global_qtest, Thomas Huth, 2019/08/15
- Re: [Qemu-devel] [PULL 0/9] qtest patches, no-reply, 2019/08/15
- Re: [Qemu-devel] [PULL 0/9] qtest patches, Peter Maydell, 2019/08/16