mirror of
https://github.com/xemu-project/xemu.git
synced 2024-11-24 03:59:52 +00:00
376253ece4
Refactor the monitor API and prepare it for decoupled terminals: term_print functions are renamed to monitor_* and all monitor services gain a new parameter (mon) that will once refer to the monitor instance the output is supposed to appear on. However, the argument remains unused for now. All monitor command callbacks are also extended by a mon parameter so that command handlers are able to pass an appropriate reference to monitor output services. For the case that monitor outputs so far happen without clearly identifiable context, the global variable cur_mon is introduced that shall once provide a pointer either to the current active monitor (while processing commands) or to the default one. On the mid or long term, those use case will be obsoleted so that this variable can be removed again. Due to the broad usage of the monitor interface, this patch mostly deals with converting users of the monitor API. A few of them are already extended to pass 'mon' from the command handler further down to internal functions that invoke monitor_printf. At this chance, monitor-related prototypes are moved from console.h to a new monitor.h. The same is done for the readline API. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6711 c046a42c-6fe2-441c-8c8c-71466251a162
88 lines
1.4 KiB
C
88 lines
1.4 KiB
C
/*
|
|
* Compatibility for qemu-img/qemu-nbd
|
|
*
|
|
* Copyright IBM, Corp. 2008
|
|
*
|
|
* Authors:
|
|
* Anthony Liguori <aliguori@us.ibm.com>
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2. See
|
|
* the COPYING file in the top-level directory.
|
|
*
|
|
*/
|
|
|
|
#include "qemu-common.h"
|
|
#include "monitor.h"
|
|
#include "sysemu.h"
|
|
#include "qemu-timer.h"
|
|
|
|
#include <sys/time.h>
|
|
|
|
QEMUClock *rt_clock;
|
|
|
|
struct QEMUBH
|
|
{
|
|
QEMUBHFunc *cb;
|
|
void *opaque;
|
|
};
|
|
|
|
void qemu_service_io(void)
|
|
{
|
|
}
|
|
|
|
Monitor *cur_mon;
|
|
|
|
void monitor_printf(Monitor *mon, const char *fmt, ...)
|
|
{
|
|
}
|
|
|
|
void monitor_print_filename(Monitor *mon, const char *filename)
|
|
{
|
|
}
|
|
|
|
QEMUBH *qemu_bh_new(QEMUBHFunc *cb, void *opaque)
|
|
{
|
|
QEMUBH *bh;
|
|
|
|
bh = qemu_malloc(sizeof(*bh));
|
|
bh->cb = cb;
|
|
bh->opaque = opaque;
|
|
|
|
return bh;
|
|
}
|
|
|
|
int qemu_bh_poll(void)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
void qemu_bh_schedule(QEMUBH *bh)
|
|
{
|
|
bh->cb(bh->opaque);
|
|
}
|
|
|
|
void qemu_bh_cancel(QEMUBH *bh)
|
|
{
|
|
}
|
|
|
|
void qemu_bh_delete(QEMUBH *bh)
|
|
{
|
|
qemu_free(bh);
|
|
}
|
|
|
|
int qemu_set_fd_handler2(int fd,
|
|
IOCanRWHandler *fd_read_poll,
|
|
IOHandler *fd_read,
|
|
IOHandler *fd_write,
|
|
void *opaque)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
int64_t qemu_get_clock(QEMUClock *clock)
|
|
{
|
|
qemu_timeval tv;
|
|
qemu_gettimeofday(&tv);
|
|
return (tv.tv_sec * 1000000000LL + (tv.tv_usec * 1000)) / 1000000;
|
|
}
|