Commit 0150cd81 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi Committed by Kevin Wolf
Browse files

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: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent c60bf339

Makefile.objs

+0 −1
Original line number Diff line number Diff line
@@ -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

include/monitor/monitor.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

include/monitor/readline.h→include/qemu/readline.h

+0 −0

File moved.

View file

monitor.c

+1 −1
Original line number Diff line number Diff line
@@ -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"

util/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -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