OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

libqtest: Introduce qtest_qmpv() and convert remaining macro 

In order to convert qmp() macro to an inline function, expose a
qtest_qmpv() function, reused by qtest_qmp().

We can't apply GCC_FMT_ATTR() since fdc-test is using zero-length format
strings, which would result in warnings treated as errors.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Message-id: 1361051043-27944-3-git-send-email-afaerber@suse.de
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Andreas Färber 2013-02-16 22:44:02 +01:00 committed by Anthony Liguori
parent 6acf801de5
commit b73cf9e93f
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/libqtest.c
View File

@ -288,16 +288,13 @@ redo:
return words;
}
void qtest_qmp(QTestState *s, const char *fmt, ...)
void qtest_qmpv(QTestState *s, const char *fmt, va_list ap)
{
va_list ap;
bool has_reply = false;
int nesting = 0;
/* Send QMP request */
va_start(ap, fmt);
socket_sendf(s->qmp_fd, fmt, ap);
va_end(ap);
/* Receive reply */
while (!has_reply || nesting > 0) {
@ -326,6 +323,15 @@ void qtest_qmp(QTestState *s, const char *fmt, ...)
}
}
void qtest_qmp(QTestState *s, const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
qtest_qmpv(s, fmt, ap);
va_end(ap);
}
const char *qtest_get_arch(void)
{
const char *qemu = getenv("QTEST_QEMU_BINARY");

20
tests/libqtest.h
View File

@ -17,6 +17,7 @@
#include <stdint.h>
#include <stdbool.h>
#include <stdarg.h>
#include <sys/types.h>
typedef struct QTestState QTestState;
@ -48,6 +49,16 @@ void qtest_quit(QTestState *s);
*/
void qtest_qmp(QTestState *s, const char *fmt, ...);
/**
* qtest_qmpv:
* @s: #QTestState instance to operate on.
* @fmt: QMP message to send to QEMU
* @ap: QMP message arguments
*
* Sends a QMP message to QEMU.
*/
void qtest_qmpv(QTestState *s, const char *fmt, va_list ap);
/**
* qtest_get_irq:
* @s: #QTestState instance to operate on.
@ -227,7 +238,14 @@ static inline QTestState *qtest_start(const char *args)
*
* Sends a QMP message to QEMU
*/
#define qmp(fmt, ...) qtest_qmp(global_qtest, fmt, ## __VA_ARGS__)
static inline void qmp(const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
qtest_qmpv(global_qtest, fmt, ap);
va_end(ap);
}
/**
* get_irq: