makefile: merge GENERATED_HEADERS & GENERATED_SOURCES variables

[mirror_qemu.git] / tests / io-channel-helpers.c

diff --git a/tests/io-channel-helpers.c b/tests/io-channel-helpers.c
index 78d36dd7038b90d4b442f115d699f8f1c8af850b..05e5579cf8f8663d6c1d4226f0acefb6709754d0 100644 (file)
--- a/tests/io-channel-helpers.c
+++ b/tests/io-channel-helpers.c
@@ -18,7 +18,9 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "io-channel-helpers.h"
+#include "qapi/error.h"
 
 struct QIOChannelTest {
     QIOChannel *src;
@@ -131,7 +133,7 @@ static gpointer test_io_thread_reader(gpointer opaque)
 
         if (ret == QIO_CHANNEL_ERR_BLOCK) {
             if (data->blocking) {
-                error_setg(&data->writeerr,
+                error_setg(&data->readerr,
                            "Unexpected I/O blocking");
                 break;
             } else {
@@ -232,11 +234,11 @@ void qio_channel_test_run_reader(QIOChannelTest *test,
 
 void qio_channel_test_validate(QIOChannelTest *test)
 {
+    g_assert(test->readerr == NULL);
+    g_assert(test->writeerr == NULL);
     g_assert_cmpint(memcmp(test->input,
                            test->output,
                            test->len), ==, 0);
-    g_assert(test->readerr == NULL);
-    g_assert(test->writeerr == NULL);
 
     g_free(test->inputv);
     g_free(test->outputv);