summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2009-03-05 23:01:23 +0000
committeraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2009-03-05 23:01:23 +0000
commit376253ece484b7dc86f215641dca47c3c88f38d1 (patch)
treecbbcd578628422d88cc6326012f59e7081d3c77e /usb-stub.c
parentmonitor: Rework modal password input (Jan Kiszka) (diff)
downloadqemu-kvm-376253ece484b7dc86f215641dca47c3c88f38d1.tar.gz
qemu-kvm-376253ece484b7dc86f215641dca47c3c88f38d1.tar.bz2
qemu-kvm-376253ece484b7dc86f215641dca47c3c88f38d1.zip
monitor: Rework API (Jan Kiszka)
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
Diffstat (limited to 'usb-stub.c')
-rw-r--r--usb-stub.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/usb-stub.c b/usb-stub.c
index 52105c395..9c3fceab1 100644
--- a/usb-stub.c
+++ b/usb-stub.c
@@ -33,10 +33,11 @@
#include "qemu-common.h"
#include "console.h"
#include "hw/usb.h"
+#include "monitor.h"
-void usb_host_info(void)
+void usb_host_info(Monitor *mon)
{
- term_printf("USB host devices not supported\n");
+ monitor_printf(mon, "USB host devices not supported\n");
}
/* XXX: modify configure to compile the right host driver */