[Qemu-devel] [PATCH 3/6] tests/libqtest: Remove unused function hmp()

Thomas Huth posted 6 patches 6 years, 5 months ago
Maintainers: Greg Kurz <groug@kaod.org>, Laurent Vivier <lvivier@redhat.com>, Fam Zheng <fam@euphon.net>, Gerd Hoffmann <kraxel@redhat.com>, Amit Shah <amit@kernel.org>, Paolo Bonzini <pbonzini@redhat.com>, Thomas Huth <thuth@redhat.com>, Jason Wang <jasowang@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>
[Qemu-devel] [PATCH 3/6] tests/libqtest: Remove unused function hmp()
Posted by Thomas Huth 6 years, 5 months ago
No test is using hmp() anymore, and since this function uses the disliked
global_qtest variable, we should also make sure that nobody adds new code
with this function again. qtest_hmp() should be used instead.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/libqtest.c | 11 -----------
 tests/libqtest.h | 10 ----------
 2 files changed, 21 deletions(-)

diff --git a/tests/libqtest.c b/tests/libqtest.c
index 3c5c3f49d8..3e9245d4c9 100644
--- a/tests/libqtest.c
+++ b/tests/libqtest.c
@@ -1130,17 +1130,6 @@ void qmp_assert_success(const char *fmt, ...)
     qobject_unref(response);
 }
 
-char *hmp(const char *fmt, ...)
-{
-    va_list ap;
-    char *ret;
-
-    va_start(ap, fmt);
-    ret = qtest_vhmp(global_qtest, fmt, ap);
-    va_end(ap);
-    return ret;
-}
-
 bool qtest_big_endian(QTestState *s)
 {
     return s->big_endian;
diff --git a/tests/libqtest.h b/tests/libqtest.h
index cadf1d4a03..0009b65791 100644
--- a/tests/libqtest.h
+++ b/tests/libqtest.h
@@ -687,16 +687,6 @@ static inline void qmp_eventwait(const char *event)
     return qtest_qmp_eventwait(global_qtest, event);
 }
 
-/**
- * hmp:
- * @fmt...: HMP command to send to QEMU, formats arguments like sprintf().
- *
- * Send HMP command to QEMU via QMP's human-monitor-command.
- *
- * Returns: the command's output.  The caller should g_free() it.
- */
-char *hmp(const char *fmt, ...) GCC_FMT_ATTR(1, 2);
-
 /**
  * get_irq:
  * @num: Interrupt to observe.
-- 
2.18.1


Re: [Qemu-devel] [PATCH 3/6] tests/libqtest: Remove unused function hmp()
Posted by Eric Blake 6 years, 5 months ago
On 8/13/19 4:30 AM, Thomas Huth wrote:
> No test is using hmp() anymore, and since this function uses the disliked
> global_qtest variable, we should also make sure that nobody adds new code
> with this function again. qtest_hmp() should be used instead.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  tests/libqtest.c | 11 -----------
>  tests/libqtest.h | 10 ----------
>  2 files changed, 21 deletions(-)

Yay.

We could, at a later time, introduce a patch to do s/qtest_hmp/hmp/ if
it was deemed worthwhile, but I'm not sure it's worth the churn.

Reviewed-by: Eric Blake <eblake@redhat.com>

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org

Re: [Qemu-devel] [PATCH 3/6] tests/libqtest: Remove unused function hmp()
Posted by Thomas Huth 6 years, 5 months ago
On 8/13/19 5:20 PM, Eric Blake wrote:
> On 8/13/19 4:30 AM, Thomas Huth wrote:
>> No test is using hmp() anymore, and since this function uses the disliked
>> global_qtest variable, we should also make sure that nobody adds new code
>> with this function again. qtest_hmp() should be used instead.
>>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>>  tests/libqtest.c | 11 -----------
>>  tests/libqtest.h | 10 ----------
>>  2 files changed, 21 deletions(-)
> 
> Yay.
> 
> We could, at a later time, introduce a patch to do s/qtest_hmp/hmp/ if
> it was deemed worthwhile, but I'm not sure it's worth the churn.

Actually, I like the qtest_* prefix for the libqtest functions - so it
is clear at the first sight that a function is part of libqtest or
rather the test itself.

> Reviewed-by: Eric Blake <eblake@redhat.com>

Thanks a lot!

 Thomas