提交 0150cd81 编写于 作者: S Stefan Hajnoczi 提交者: Kevin Wolf

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: NStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: NKevin Wolf <kwolf@redhat.com>
上级 c60bf339
...@@ -43,7 +43,6 @@ libcacard-y += libcacard/vcardt.o ...@@ -43,7 +43,6 @@ libcacard-y += libcacard/vcardt.o
ifeq ($(CONFIG_SOFTMMU),y) ifeq ($(CONFIG_SOFTMMU),y)
common-obj-y = $(block-obj-y) blockdev.o blockdev-nbd.o block/ common-obj-y = $(block-obj-y) blockdev.o blockdev-nbd.o block/
common-obj-y += net/ common-obj-y += net/
common-obj-y += readline.o
common-obj-y += qdev-monitor.o device-hotplug.o common-obj-y += qdev-monitor.o device-hotplug.o
common-obj-$(CONFIG_WIN32) += os-win32.o common-obj-$(CONFIG_WIN32) += os-win32.o
common-obj-$(CONFIG_POSIX) += os-posix.o common-obj-$(CONFIG_POSIX) += os-posix.o
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include "qapi/qmp/qerror.h" #include "qapi/qmp/qerror.h"
#include "qapi/qmp/qdict.h" #include "qapi/qmp/qdict.h"
#include "block/block.h" #include "block/block.h"
#include "monitor/readline.h" #include "qemu/readline.h"
extern Monitor *cur_mon; extern Monitor *cur_mon;
extern Monitor *default_mon; extern Monitor *default_mon;
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include "ui/qemu-spice.h" #include "ui/qemu-spice.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#include "monitor/monitor.h" #include "monitor/monitor.h"
#include "monitor/readline.h" #include "qemu/readline.h"
#include "ui/console.h" #include "ui/console.h"
#include "sysemu/blockdev.h" #include "sysemu/blockdev.h"
#include "audio/audio.h" #include "audio/audio.h"
......
...@@ -13,3 +13,4 @@ util-obj-y += hexdump.o ...@@ -13,3 +13,4 @@ util-obj-y += hexdump.o
util-obj-y += crc32c.o util-obj-y += crc32c.o
util-obj-y += throttle.o util-obj-y += throttle.o
util-obj-y += getauxval.o util-obj-y += getauxval.o
util-obj-y += readline.o
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
*/ */
#include "qemu-common.h" #include "qemu-common.h"
#include "monitor/readline.h" #include "qemu/readline.h"
#define IS_NORM 0 #define IS_NORM 0
#define IS_ESC 1 #define IS_ESC 1
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册