Rename QEMUConsole to QemuConsole
Change-Id: I51201c25a6e2c1acf1f2ba200ab4b72afd0f3e5b
diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
index 967a56f..cb89dc7 100644
--- a/include/qemu/typedefs.h
+++ b/include/qemu/typedefs.h
@@ -37,7 +37,7 @@
typedef struct DisplayChangeListener DisplayChangeListener;
typedef struct DisplaySurface DisplaySurface;
typedef struct PixelFormat PixelFormat;
-//typedef struct QemuConsole QemuConsole; (see below)
+typedef struct QemuConsole QemuConsole;
typedef struct CharDriverState CharDriverState;
typedef struct MACAddr MACAddr;
typedef struct NetClientState NetClientState;
@@ -74,7 +74,6 @@
// NOTE(digit): Remove typedefs below when everything is upstreamed.
typedef struct DisplayAllocator DisplayAllocator;
typedef struct IRQState *qemu_irq;
-typedef struct QEMUConsole QEMUConsole;
typedef struct VLANState VLANState;
typedef struct VLANClientState VLANClientState;
diff --git a/ui/console.c b/ui/console.c
index 1b2b144..e0ca59b 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -147,7 +147,7 @@
/* ??? This is mis-named.
It is used for both text and graphical consoles. */
-struct QEMUConsole {
+struct QemuConsole {
console_type_t console_type;
DisplayState *ds;
/* Graphic console state. */
@@ -189,8 +189,8 @@
};
static DisplayState *display_state;
-static QEMUConsole *active_console;
-static QEMUConsole *consoles[MAX_CONSOLES];
+static QemuConsole *active_console;
+static QemuConsole *consoles[MAX_CONSOLES];
static int nb_consoles = 0;
#ifdef CONFIG_ANDROID
@@ -216,7 +216,7 @@
void vga_hw_screen_dump(const char *filename)
{
- QEMUConsole *previous_active_console;
+ QemuConsole *previous_active_console;
previous_active_console = active_console;
active_console = consoles[0];
@@ -545,7 +545,7 @@
}
}
-static void text_console_resize(QEMUConsole *s)
+static void text_console_resize(QemuConsole *s)
{
TextCell *cells, *c, *c1;
int w1, x, y, last_width;
@@ -577,7 +577,7 @@
s->cells = cells;
}
-static inline void text_update_xy(QEMUConsole *s, int x, int y)
+static inline void text_update_xy(QemuConsole *s, int x, int y)
{
s->text_x[0] = MIN(s->text_x[0], x);
s->text_x[1] = MAX(s->text_x[1], x);
@@ -585,7 +585,7 @@
s->text_y[1] = MAX(s->text_y[1], y);
}
-static void invalidate_xy(QEMUConsole *s, int x, int y)
+static void invalidate_xy(QemuConsole *s, int x, int y)
{
if (s->update_x0 > x * FONT_WIDTH)
s->update_x0 = x * FONT_WIDTH;
@@ -597,7 +597,7 @@
s->update_y1 = (y + 1) * FONT_HEIGHT;
}
-static void update_xy(QEMUConsole *s, int x, int y)
+static void update_xy(QemuConsole *s, int x, int y)
{
TextCell *c;
int y1, y2;
@@ -621,7 +621,7 @@
}
}
-static void console_show_cursor(QEMUConsole *s, int show)
+static void console_show_cursor(QemuConsole *s, int show)
{
TextCell *c;
int y, y1;
@@ -655,7 +655,7 @@
}
}
-static void console_refresh(QEMUConsole *s)
+static void console_refresh(QemuConsole *s)
{
TextCell *c;
int x, y, y1;
@@ -690,7 +690,7 @@
static void console_scroll(int ydelta)
{
- QEMUConsole *s;
+ QemuConsole *s;
int i, y1;
s = active_console;
@@ -722,7 +722,7 @@
console_refresh(s);
}
-static void console_put_lf(QEMUConsole *s)
+static void console_put_lf(QemuConsole *s)
{
TextCell *c;
int x, y1;
@@ -773,7 +773,7 @@
* NOTE: I know this code is not very efficient (checking every color for it
* self) but it is more readable and better maintainable.
*/
-static void console_handle_escape(QEMUConsole *s)
+static void console_handle_escape(QemuConsole *s)
{
int i;
@@ -866,7 +866,7 @@
}
}
-static void console_clear_xy(QEMUConsole *s, int x, int y)
+static void console_clear_xy(QemuConsole *s, int x, int y)
{
int y1 = (s->y_base + y) % s->total_height;
TextCell *c = &s->cells[y1 * s->width + x];
@@ -875,7 +875,7 @@
update_xy(s, x, y);
}
-static void console_putchar(QEMUConsole *s, int ch)
+static void console_putchar(QemuConsole *s, int ch)
{
TextCell *c;
int y1, i;
@@ -1099,7 +1099,7 @@
void console_select(unsigned int index)
{
- QEMUConsole *s;
+ QemuConsole *s;
if (index >= MAX_CONSOLES)
return;
@@ -1124,7 +1124,7 @@
static int console_puts(CharDriverState *chr, const uint8_t *buf, int len)
{
- QEMUConsole *s = chr->opaque;
+ QemuConsole *s = chr->opaque;
int i;
s->update_x0 = s->width * FONT_WIDTH;
@@ -1146,7 +1146,7 @@
static void console_send_event(CharDriverState *chr, int event)
{
- QEMUConsole *s = chr->opaque;
+ QemuConsole *s = chr->opaque;
int i;
if (event == CHR_EVENT_FOCUS) {
@@ -1161,7 +1161,7 @@
static void kbd_send_chars(void *opaque)
{
- QEMUConsole *s = opaque;
+ QemuConsole *s = opaque;
int len;
uint8_t buf[16];
@@ -1184,7 +1184,7 @@
/* called when an ascii key is pressed */
void kbd_put_keysym(int keysym)
{
- QEMUConsole *s;
+ QemuConsole *s;
uint8_t buf[16], *q;
int c;
@@ -1239,7 +1239,7 @@
static void text_console_invalidate(void *opaque)
{
- QEMUConsole *s = (QEMUConsole *) opaque;
+ QemuConsole *s = (QemuConsole *) opaque;
if (!ds_get_bits_per_pixel(s->ds) && s->console_type == TEXT_CONSOLE) {
s->g_width = ds_get_width(s->ds);
s->g_height = ds_get_height(s->ds);
@@ -1250,7 +1250,7 @@
static void text_console_update(void *opaque, console_ch_t *chardata)
{
- QEMUConsole *s = (QEMUConsole *) opaque;
+ QemuConsole *s = (QemuConsole *) opaque;
int i, j, src;
if (s->text_x[0] <= s->text_x[1]) {
@@ -1275,10 +1275,10 @@
}
}
-static QEMUConsole *get_graphic_console(DisplayState *ds)
+static QemuConsole *get_graphic_console(DisplayState *ds)
{
int i;
- QEMUConsole *s;
+ QemuConsole *s;
for (i = 0; i < nb_consoles; i++) {
s = consoles[i];
if (s->console_type == GRAPHIC_CONSOLE && s->ds == ds)
@@ -1287,14 +1287,14 @@
return NULL;
}
-static QEMUConsole *new_console(DisplayState *ds, console_type_t console_type)
+static QemuConsole *new_console(DisplayState *ds, console_type_t console_type)
{
- QEMUConsole *s;
+ QemuConsole *s;
int i;
if (nb_consoles >= MAX_CONSOLES)
return NULL;
- s = g_malloc0(sizeof(QEMUConsole));
+ s = g_malloc0(sizeof(QemuConsole));
if (!active_console || ((active_console->console_type != GRAPHIC_CONSOLE) &&
(console_type == GRAPHIC_CONSOLE))) {
active_console = s;
@@ -1435,7 +1435,7 @@
vga_hw_text_update_ptr text_update,
void *opaque)
{
- QEMUConsole *s;
+ QemuConsole *s;
DisplayState *ds;
ds = (DisplayState *) g_malloc0(sizeof(DisplayState));
@@ -1488,14 +1488,14 @@
static void text_console_set_echo(CharDriverState *chr, bool echo)
{
- QEMUConsole *s = chr->opaque;
+ QemuConsole *s = chr->opaque;
s->echo = echo;
}
static void text_console_do_init(CharDriverState *chr, DisplayState *ds)
{
- QEMUConsole *s;
+ QemuConsole *s;
static int color_inited;
s = chr->opaque;
@@ -1556,7 +1556,7 @@
CharDriverState *text_console_init(QemuOpts *opts)
{
CharDriverState *chr;
- QEMUConsole *s;
+ QemuConsole *s;
unsigned width;
unsigned height;
@@ -1641,7 +1641,7 @@
void qemu_console_resize(DisplayState *ds, int width, int height)
{
- QEMUConsole *s = get_graphic_console(ds);
+ QemuConsole *s = get_graphic_console(ds);
if (!s) return;
s->g_width = width;
