From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Date: Mon, 4 May 2020 11:56:55 +0000 (+0200)
Subject: io/task: Move 'qom/object.h' header to source
X-Git-Tag: v5.1.0-rc0~78^2~101
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=78f8d4975c5d035e2e2447e6e499629b96142db0;p=thirdparty%2Fqemu.git

io/task: Move 'qom/object.h' header to source

We need "qom/object.h" to call object_ref()/object_unref(),
and to test the TYPE_DUMMY.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20200504115656.6045-3-f4bug@amsat.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/include/io/task.h b/include/io/task.h
index 1abbfb8b654..6818dfedd00 100644
--- a/include/io/task.h
+++ b/include/io/task.h
@@ -21,8 +21,6 @@
 #ifndef QIO_TASK_H
 #define QIO_TASK_H
 
-#include "qom/object.h"
-
 typedef struct QIOTask QIOTask;
 
 typedef void (*QIOTaskFunc)(QIOTask *task,
diff --git a/io/task.c b/io/task.c
index 1ae7b864881..53c0bed6867 100644
--- a/io/task.c
+++ b/io/task.c
@@ -22,6 +22,7 @@
 #include "io/task.h"
 #include "qapi/error.h"
 #include "qemu/thread.h"
+#include "qom/object.h"
 #include "trace.h"
 
 struct QIOTaskThreadData {
diff --git a/tests/test-io-task.c b/tests/test-io-task.c
index aa8b653bfac..c8a3813d494 100644
--- a/tests/test-io-task.c
+++ b/tests/test-io-task.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 
+#include "qom/object.h"
 #include "io/task.h"
 #include "qapi/error.h"
 #include "qemu/module.h"