diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2013-11-14 11:54:15 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2014-01-22 12:07:17 +0100 |
| commit | 0150cd81cf608b93778a067189829f354fe27e4b (patch) | |
| tree | b37e2c71249f04c0a1053d58f940d0b120bc4a23 | |
| parent | c60bf3391bf4cb79b7adc6650094e21671ddaabd (diff) | |
| download | hqemu-0150cd81cf608b93778a067189829f354fe27e4b.zip hqemu-0150cd81cf608b93778a067189829f354fe27e4b.tar.gz | |
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>
| -rw-r--r-- | Makefile.objs | 1 | ||||
| -rw-r--r-- | include/monitor/monitor.h | 2 | ||||
| -rw-r--r-- | include/qemu/readline.h (renamed from include/monitor/readline.h) | 0 | ||||
| -rw-r--r-- | monitor.c | 2 | ||||
| -rw-r--r-- | util/Makefile.objs | 1 | ||||
| -rw-r--r-- | util/readline.c (renamed from readline.c) | 2 |
6 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.objs b/Makefile.objs index 857bb53..ac1d0e1 100644 --- 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 22d8b8f..7e5f752 100644 --- 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 index a89fe4a..a89fe4a 100644 --- a/include/monitor/readline.h +++ b/include/qemu/readline.h @@ -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 af3e5cb..937376b 100644 --- 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 index ca894d1..8441be4 100644 --- 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 |
