Merge remote-tracking branch 'stefanha/net' into staging

[qemu.git] / tests / libqtest.h

diff --git a/tests/libqtest.h b/tests/libqtest.h
index 0f6aade0929faabae2094956618afa561ff3ee8e..9deebdcdfa4068e4f2cc4d3286c036aba3e29088 100644 (file)
--- a/tests/libqtest.h
+++ b/tests/libqtest.h
@@ -22,6 +22,7 @@
 #include <stdbool.h>
 #include <stdarg.h>
 #include <sys/types.h>
 #include <stdbool.h>
 #include <stdarg.h>
 #include <sys/types.h>

+#include "qapi/qmp/qdict.h"

 
 typedef struct QTestState QTestState;
 
 
 typedef struct QTestState QTestState;
 


@@ -43,14 +44,33 @@ QTestState *qtest_init(const char *extra_args);
  */
 void qtest_quit(QTestState *s);
 
  */
 void qtest_quit(QTestState *s);
 

+/**
+ * qtest_qmp_discard_response:
+ * @s: #QTestState instance to operate on.
+ * @fmt...: QMP message to send to qemu
+ *
+ * Sends a QMP message to QEMU and consumes the response.
+ */
+void qtest_qmp_discard_response(QTestState *s, const char *fmt, ...);
+

 /**
  * qtest_qmp:
  * @s: #QTestState instance to operate on.
  * @fmt...: QMP message to send to qemu
  *
 /**
  * qtest_qmp:
  * @s: #QTestState instance to operate on.
  * @fmt...: QMP message to send to qemu
  *

- * Sends a QMP message to QEMU
+ * Sends a QMP message to QEMU and returns the response.
+ */
+QDict *qtest_qmp(QTestState *s, const char *fmt, ...);
+
+/**
+ * qtest_qmpv_discard_response:
+ * @s: #QTestState instance to operate on.
+ * @fmt: QMP message to send to QEMU
+ * @ap: QMP message arguments
+ *
+ * Sends a QMP message to QEMU and consumes the response.

  */
  */

-void qtest_qmp(QTestState *s, const char *fmt, ...);
+void qtest_qmpv_discard_response(QTestState *s, const char *fmt, va_list ap);

 
 /**
  * qtest_qmpv:
 
 /**
  * qtest_qmpv:


@@ -58,9 +78,9 @@ void qtest_qmp(QTestState *s, const char *fmt, ...);
  * @fmt: QMP message to send to QEMU
  * @ap: QMP message arguments
  *
  * @fmt: QMP message to send to QEMU
  * @ap: QMP message arguments
  *

- * Sends a QMP message to QEMU.
+ * Sends a QMP message to QEMU and returns the response.

  */
  */

-void qtest_qmpv(QTestState *s, const char *fmt, va_list ap);
+QDict *qtest_qmpv(QTestState *s, const char *fmt, va_list ap);

 
 /**
  * qtest_get_irq:
 
 /**
  * qtest_get_irq:


@@ -258,9 +278,9 @@ void qtest_memwrite(QTestState *s, uint64_t addr, const void *data, size_t size)
  * qtest_clock_step_next:
  * @s: #QTestState instance to operate on.
  *
  * qtest_clock_step_next:
  * @s: #QTestState instance to operate on.
  *

- * Advance the vm_clock to the next deadline.
+ * Advance the QEMU_CLOCK_VIRTUAL to the next deadline.

  *
  *

- * Returns: The current value of the vm_clock in nanoseconds.
+ * Returns: The current value of the QEMU_CLOCK_VIRTUAL in nanoseconds.

  */
 int64_t qtest_clock_step_next(QTestState *s);
 
  */
 int64_t qtest_clock_step_next(QTestState *s);
 


@@ -269,9 +289,9 @@ int64_t qtest_clock_step_next(QTestState *s);
  * @s: QTestState instance to operate on.
  * @step: Number of nanoseconds to advance the clock by.
  *
  * @s: QTestState instance to operate on.
  * @step: Number of nanoseconds to advance the clock by.
  *

- * Advance the vm_clock by @step nanoseconds.
+ * Advance the QEMU_CLOCK_VIRTUAL by @step nanoseconds.

  *
  *

- * Returns: The current value of the vm_clock in nanoseconds.
+ * Returns: The current value of the QEMU_CLOCK_VIRTUAL in nanoseconds.

  */
 int64_t qtest_clock_step(QTestState *s, int64_t step);
 
  */
 int64_t qtest_clock_step(QTestState *s, int64_t step);
 


@@ -280,9 +300,9 @@ int64_t qtest_clock_step(QTestState *s, int64_t step);
  * @s: QTestState instance to operate on.
  * @val: Nanoseconds value to advance the clock to.
  *
  * @s: QTestState instance to operate on.
  * @val: Nanoseconds value to advance the clock to.
  *

- * Advance the vm_clock to @val nanoseconds since the VM was launched.
+ * Advance the QEMU_CLOCK_VIRTUAL to @val nanoseconds since the VM was launched.

  *
  *

- * Returns: The current value of the vm_clock in nanoseconds.
+ * Returns: The current value of the QEMU_CLOCK_VIRTUAL in nanoseconds.

  */
 int64_t qtest_clock_set(QTestState *s, int64_t val);
 
  */
 int64_t qtest_clock_set(QTestState *s, int64_t val);
 


@@ -334,14 +354,31 @@ static inline void qtest_end(void)
  * qmp:
  * @fmt...: QMP message to send to qemu
  *
  * qmp:
  * @fmt...: QMP message to send to qemu
  *

- * Sends a QMP message to QEMU
+ * Sends a QMP message to QEMU and returns the response.
+ */
+static inline QDict *qmp(const char *fmt, ...)
+{
+    va_list ap;
+    QDict *response;
+
+    va_start(ap, fmt);
+    response = qtest_qmpv(global_qtest, fmt, ap);
+    va_end(ap);
+    return response;
+}
+
+/**
+ * qmp_discard_response:
+ * @fmt...: QMP message to send to qemu
+ *
+ * Sends a QMP message to QEMU and consumes the response.

  */
  */

-static inline void qmp(const char *fmt, ...)
+static inline void qmp_discard_response(const char *fmt, ...)

 {
     va_list ap;
 
     va_start(ap, fmt);
 {
     va_list ap;
 
     va_start(ap, fmt);

-    qtest_qmpv(global_qtest, fmt, ap);
+    qtest_qmpv_discard_response(global_qtest, fmt, ap);

     va_end(ap);
 }
 
     va_end(ap);
 }
 


@@ -584,9 +621,9 @@ static inline void memwrite(uint64_t addr, const void *data, size_t size)
 /**
  * clock_step_next:
  *
 /**
  * clock_step_next:
  *

- * Advance the vm_clock to the next deadline.
+ * Advance the QEMU_CLOCK_VIRTUAL to the next deadline.

  *
  *

- * Returns: The current value of the vm_clock in nanoseconds.
+ * Returns: The current value of the QEMU_CLOCK_VIRTUAL in nanoseconds.

  */
 static inline int64_t clock_step_next(void)
 {
  */
 static inline int64_t clock_step_next(void)
 {


@@ -597,9 +634,9 @@ static inline int64_t clock_step_next(void)
  * clock_step:
  * @step: Number of nanoseconds to advance the clock by.
  *
  * clock_step:
  * @step: Number of nanoseconds to advance the clock by.
  *

- * Advance the vm_clock by @step nanoseconds.
+ * Advance the QEMU_CLOCK_VIRTUAL by @step nanoseconds.

  *
  *

- * Returns: The current value of the vm_clock in nanoseconds.
+ * Returns: The current value of the QEMU_CLOCK_VIRTUAL in nanoseconds.

  */
 static inline int64_t clock_step(int64_t step)
 {
  */
 static inline int64_t clock_step(int64_t step)
 {


@@ -610,9 +647,9 @@ static inline int64_t clock_step(int64_t step)
  * clock_set:
  * @val: Nanoseconds value to advance the clock to.
  *
  * clock_set:
  * @val: Nanoseconds value to advance the clock to.
  *

- * Advance the vm_clock to @val nanoseconds since the VM was launched.
+ * Advance the QEMU_CLOCK_VIRTUAL to @val nanoseconds since the VM was launched.

  *
  *

- * Returns: The current value of the vm_clock in nanoseconds.
+ * Returns: The current value of the QEMU_CLOCK_VIRTUAL in nanoseconds.

  */
 static inline int64_t clock_set(int64_t val)
 {
  */
 static inline int64_t clock_set(int64_t val)
 {