From ce4bf5680b6e66260f188256188ee4d3a8e668bc Mon Sep 17 00:00:00 2001
From: Anthony Liguori <aliguori@us.ibm.com>
Date: Sat, 6 Aug 2011 09:16:12 -0500
Subject: [PATCH] needs to be folded into send_event zapping

---
 console.c   | 18 ++++++++++++------
 qemu-char.h |  1 -
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/console.c b/console.c
index 36d10f0244..8fcc7cbcd0 100644
--- a/console.c
+++ b/console.c
@@ -1102,19 +1102,25 @@ static int console_puts(CharDriverState *chr, const uint8_t *buf, int len)
     return len;
 }
 
-static void console_send_event(CharDriverState *chr, int event)
+static int console_ioctl(void *opaque, int event, void *data)
 {
-    TextConsole *s = chr->opaque;
+    TextConsole *s = opaque;
     int i;
 
-    if (event == CHR_EVENT_FOCUS) {
-        for(i = 0; i < nb_consoles; i++) {
+    switch (event) {
+    case CHR_EVENT_FOCUS:
+        for (i = 0; i < nb_consoles; i++) {
             if (consoles[i] == s) {
                 console_select(i);
                 break;
             }
         }
+        return 0;
+    default:
+        break;
     }
+
+    return -ENOTSUP;
 }
 
 static void kbd_send_chars(void *opaque)
@@ -1453,7 +1459,7 @@ static int text_console_ioctl(void *opaque, int cmd, void *data)
     bool *pecho = data;
 
     if (cmd != CHR_SET_ECHO) {
-        return -ENOTSUP;
+        return console_ioctl(opaque, cmd, data);
     }
 
     s->echo = *pecho;
@@ -1468,7 +1474,7 @@ static void text_console_do_init(CharDriverState *chr, DisplayState *ds)
     s = chr->opaque;
 
     chr->chr_write = console_puts;
-    chr->chr_send_event = console_send_event;
+    chr->chr_ioctl = console_ioctl;
 
     s->out_fifo.buf = s->out_fifo_buf;
     s->out_fifo.buf_size = sizeof(s->out_fifo_buf);
diff --git a/qemu-char.h b/qemu-char.h
index 57ffd2989a..3d1e88cb39 100644
--- a/qemu-char.h
+++ b/qemu-char.h
@@ -73,7 +73,6 @@ struct CharDriverState {
     IOHandler *fe_read;
     IOHandler *fe_write;
     void *handler_opaque;
-    void (*chr_send_event)(struct CharDriverState *chr, int event);
     void (*chr_close)(struct CharDriverState *chr);
     void (*chr_guest_open)(struct CharDriverState *chr);
     void (*chr_guest_close)(struct CharDriverState *chr);
-- 
2.11.4.GIT