readline: move readline to a generic location

Now that the monitor and readline are decoupled, readline.h no longer
belongs in include/monitor/.  Put the header into include/qemu/.

Move the source file into util/ so it can be linked as part of
libqemuutil.a.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>

diff --git a/Makefile.objs b/Makefile.objs
index 857bb53ae4bfd3fb7f196c686874f999f7b7313d..ac1d0e1c285073e1dc881061a3395189074289d0 100644 (file)
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -43,7 +43,6 @@ libcacard-y += libcacard/vcardt.o
 ifeq ($(CONFIG_SOFTMMU),y)
 common-obj-y = $(block-obj-y) blockdev.o blockdev-nbd.o block/
 common-obj-y += net/
-common-obj-y += readline.o
 common-obj-y += qdev-monitor.o device-hotplug.o
 common-obj-$(CONFIG_WIN32) += os-win32.o
 common-obj-$(CONFIG_POSIX) += os-posix.o

diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h
index 22d8b8f3e0e1e9e42760495b893288ea3b3eca89..7e5f752b7a14b456bf00680d679840aaeaff72dc 100644 (file)
--- a/include/monitor/monitor.h
+++ b/include/monitor/monitor.h
@@ -5,7 +5,7 @@
 #include "qapi/qmp/qerror.h"
 #include "qapi/qmp/qdict.h"
 #include "block/block.h"
-#include "monitor/readline.h"
+#include "qemu/readline.h"
 
 extern Monitor *cur_mon;
 extern Monitor *default_mon;

diff --git a/include/monitor/readline.h b/include/qemu/readline.h
similarity index 100%
rename from include/monitor/readline.h
rename to include/qemu/readline.h

diff --git a/monitor.c b/monitor.c
index 32d02640a0f1fa7c886a5aaeadcd953dc5c291a6..80456fbe5b01f8633e4a43ce21ec7183ce5572d6 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -37,7 +37,7 @@
 #include "ui/qemu-spice.h"
 #include "sysemu/sysemu.h"
 #include "monitor/monitor.h"
-#include "monitor/readline.h"
+#include "qemu/readline.h"
 #include "ui/console.h"
 #include "sysemu/blockdev.h"
 #include "audio/audio.h"

diff --git a/util/Makefile.objs b/util/Makefile.objs
index af3e5cb15722fef2004745b70dcfdc5b1da61b44..937376b082d5920b9aed69f843132ac375104c98 100644 (file)
--- a/util/Makefile.objs
+++ b/util/Makefile.objs
@@ -13,3 +13,4 @@ util-obj-y += hexdump.o
 util-obj-y += crc32c.o
 util-obj-y += throttle.o
 util-obj-y += getauxval.o
+util-obj-y += readline.o

diff --git a/readline.c b/util/readline.c
similarity index 99%
rename from readline.c
rename to util/readline.c
index ca894d1854547c1035361096765c38c38c3eb6ec..8441be484c7b0ab0f63f71f9a2b272cd79b2f54f 100644 (file)
--- a/readline.c
+++ b/util/readline.c
@@ -23,7 +23,7 @@
  */
 
 #include "qemu-common.h"
-#include "monitor/readline.h"
+#include "qemu/readline.h"
 
 #define IS_NORM 0
 #define IS_ESC  1