[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [6365] add an init function parameter to qemu_chr_open()
From: |
Aurelien Jarno |
Subject: |
[Qemu-devel] [6365] add an init function parameter to qemu_chr_open() |
Date: |
Sun, 18 Jan 2009 14:08:05 +0000 |
Revision: 6365
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6365
Author: aurel32
Date: 2009-01-18 14:08:04 +0000 (Sun, 18 Jan 2009)
Log Message:
-----------
add an init function parameter to qemu_chr_open()
And use it for the malta emulation. Fix segfault introduced in
revision 6352.
Signed-off-by: Aurelien Jarno <address@hidden>
Revision Links:
--------------
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6352
Modified Paths:
--------------
trunk/console.c
trunk/gdbstub.c
trunk/hw/mips_malta.c
trunk/hw/omap1.c
trunk/hw/omap2.c
trunk/hw/usb-serial.c
trunk/qemu-char.c
trunk/qemu-char.h
trunk/vl.c
Modified: trunk/console.c
===================================================================
--- trunk/console.c 2009-01-18 12:16:26 UTC (rev 6364)
+++ trunk/console.c 2009-01-18 14:08:04 UTC (rev 6365)
@@ -1357,6 +1357,8 @@
text_console_resize(s);
qemu_chr_reset(chr);
+ if (chr->init)
+ chr->init(chr);
}
CharDriverState *text_console_init(const char *p)
Modified: trunk/gdbstub.c
===================================================================
--- trunk/gdbstub.c 2009-01-18 12:16:26 UTC (rev 6364)
+++ trunk/gdbstub.c 2009-01-18 14:08:04 UTC (rev 6365)
@@ -2286,7 +2286,7 @@
port = gdbstub_port_name;
}
- chr = qemu_chr_open("gdb", port);
+ chr = qemu_chr_open("gdb", port, NULL);
if (!chr)
return -1;
Modified: trunk/hw/mips_malta.c
===================================================================
--- trunk/hw/mips_malta.c 2009-01-18 12:16:26 UTC (rev 6364)
+++ trunk/hw/mips_malta.c 2009-01-18 14:08:04 UTC (rev 6365)
@@ -418,9 +418,26 @@
s->display_text[8] = '\0';
snprintf(s->display_text, 9, " ");
- malta_fpga_update_display(s);
}
+static void malta_fpga_uart_init(CharDriverState *chr)
+{
+ qemu_chr_printf(chr, "CBUS UART\r\n");
+}
+
+static void malta_fpga_led_init(CharDriverState *chr)
+{
+ qemu_chr_printf(chr, "\e[HMalta LEDBAR\r\n");
+ qemu_chr_printf(chr, "+--------+\r\n");
+ qemu_chr_printf(chr, "+ +\r\n");
+ qemu_chr_printf(chr, "+--------+\r\n");
+ qemu_chr_printf(chr, "\n");
+ qemu_chr_printf(chr, "Malta ASCII\r\n");
+ qemu_chr_printf(chr, "+--------+\r\n");
+ qemu_chr_printf(chr, "+ +\r\n");
+ qemu_chr_printf(chr, "+--------+\r\n");
+}
+
static MaltaFPGAState *malta_fpga_init(target_phys_addr_t base, CPUState *env)
{
MaltaFPGAState *s;
@@ -436,19 +453,9 @@
/* 0xa00 is less than a page, so will still get the right offsets. */
cpu_register_physical_memory(base + 0xa00, 0x100000 - 0xa00, malta);
- s->display = qemu_chr_open("fpga", "vc:320x200");
- qemu_chr_printf(s->display, "\e[HMalta LEDBAR\r\n");
- qemu_chr_printf(s->display, "+--------+\r\n");
- qemu_chr_printf(s->display, "+ +\r\n");
- qemu_chr_printf(s->display, "+--------+\r\n");
- qemu_chr_printf(s->display, "\n");
- qemu_chr_printf(s->display, "Malta ASCII\r\n");
- qemu_chr_printf(s->display, "+--------+\r\n");
- qemu_chr_printf(s->display, "+ +\r\n");
- qemu_chr_printf(s->display, "+--------+\r\n");
+ s->display = qemu_chr_open("fpga", "vc:320x200", malta_fpga_led_init);
- uart_chr = qemu_chr_open("cbus", "vc:80Cx24C");
- qemu_chr_printf(uart_chr, "CBUS UART\r\n");
+ uart_chr = qemu_chr_open("cbus", "vc:80Cx24C", malta_fpga_uart_init);
s->uart =
serial_mm_init(base + 0x900, 3, env->irq[2], 230400, uart_chr, 1);
Modified: trunk/hw/omap1.c
===================================================================
--- trunk/hw/omap1.c 2009-01-18 12:16:26 UTC (rev 6364)
+++ trunk/hw/omap1.c 2009-01-18 14:08:04 UTC (rev 6365)
@@ -1988,7 +1988,7 @@
s->fclk = fclk;
s->irq = irq;
s->serial = serial_mm_init(base, 2, irq, omap_clk_getrate(fclk)/16,
- chr ?: qemu_chr_open("null", "null"), 1);
+ chr ?: qemu_chr_open("null", "null", NULL), 1);
return s;
}
@@ -2104,7 +2104,7 @@
/* TODO: Should reuse or destroy current s->serial */
s->serial = serial_mm_init(s->base, 2, s->irq,
omap_clk_getrate(s->fclk) / 16,
- chr ?: qemu_chr_open("null", "null"), 1);
+ chr ?: qemu_chr_open("null", "null", NULL), 1);
}
/* MPU Clock/Reset/Power Mode Control */
Modified: trunk/hw/omap2.c
===================================================================
--- trunk/hw/omap2.c 2009-01-18 12:16:26 UTC (rev 6364)
+++ trunk/hw/omap2.c 2009-01-18 14:08:04 UTC (rev 6365)
@@ -2161,7 +2161,7 @@
s->irq = irq;
omap_sti_reset(s);
- s->chr = chr ?: qemu_chr_open("null", "null");
+ s->chr = chr ?: qemu_chr_open("null", "null", NULL);
iomemtype = l4_register_io_memory(0, omap_sti_readfn,
omap_sti_writefn, s);
Modified: trunk/hw/usb-serial.c
===================================================================
--- trunk/hw/usb-serial.c 2009-01-18 12:16:26 UTC (rev 6364)
+++ trunk/hw/usb-serial.c 2009-01-18 14:08:04 UTC (rev 6365)
@@ -558,7 +558,7 @@
return NULL;
snprintf(label, sizeof(label), "usbserial%d", index++);
- cdrv = qemu_chr_open(label, filename);
+ cdrv = qemu_chr_open(label, filename, NULL);
if (!cdrv)
goto fail;
s->cs = cdrv;
Modified: trunk/qemu-char.c
===================================================================
--- trunk/qemu-char.c 2009-01-18 12:16:26 UTC (rev 6364)
+++ trunk/qemu-char.c 2009-01-18 14:08:04 UTC (rev 6365)
@@ -2122,7 +2122,7 @@
static TAILQ_HEAD(CharDriverStateHead, CharDriverState) chardevs
= TAILQ_HEAD_INITIALIZER(chardevs);
-CharDriverState *qemu_chr_open(const char *label, const char *filename)
+CharDriverState *qemu_chr_open(const char *label, const char *filename, void
(*init)(struct CharDriverState *s))
{
const char *p;
CharDriverState *chr;
@@ -2146,7 +2146,7 @@
chr = qemu_chr_open_udp(p);
} else
if (strstart(filename, "mon:", &p)) {
- chr = qemu_chr_open(label, p);
+ chr = qemu_chr_open(label, p, NULL);
if (chr) {
chr = qemu_chr_open_mux(chr);
monitor_init(chr, !nographic);
@@ -2207,6 +2207,7 @@
if (chr) {
if (!chr->filename)
chr->filename = qemu_strdup(filename);
+ chr->init = init;
chr->label = qemu_strdup(label);
TAILQ_INSERT_TAIL(&chardevs, chr, next);
}
Modified: trunk/qemu-char.h
===================================================================
--- trunk/qemu-char.h 2009-01-18 12:16:26 UTC (rev 6364)
+++ trunk/qemu-char.h 2009-01-18 14:08:04 UTC (rev 6365)
@@ -43,6 +43,7 @@
typedef void IOEventHandler(void *opaque, int event);
struct CharDriverState {
+ void (*init)(struct CharDriverState *s);
int (*chr_write)(struct CharDriverState *s, const uint8_t *buf, int len);
void (*chr_update_read_handler)(struct CharDriverState *s);
int (*chr_ioctl)(struct CharDriverState *s, int cmd, void *arg);
@@ -61,7 +62,7 @@
TAILQ_ENTRY(CharDriverState) next;
};
-CharDriverState *qemu_chr_open(const char *label, const char *filename);
+CharDriverState *qemu_chr_open(const char *label, const char *filename, void
(*init)(struct CharDriverState *s));
void qemu_chr_close(CharDriverState *chr);
void qemu_chr_printf(CharDriverState *s, const char *fmt, ...);
int qemu_chr_write(CharDriverState *s, const uint8_t *buf, int len);
Modified: trunk/vl.c
===================================================================
--- trunk/vl.c 2009-01-18 12:16:26 UTC (rev 6364)
+++ trunk/vl.c 2009-01-18 14:08:04 UTC (rev 6365)
@@ -5462,7 +5462,7 @@
}
if (monitor_device) {
- monitor_hd = qemu_chr_open("monitor", monitor_device);
+ monitor_hd = qemu_chr_open("monitor", monitor_device, NULL);
if (!monitor_hd) {
fprintf(stderr, "qemu: could not open monitor device '%s'\n",
monitor_device);
exit(1);
@@ -5474,7 +5474,7 @@
if (devname && strcmp(devname, "none")) {
char label[32];
snprintf(label, sizeof(label), "serial%d", i);
- serial_hds[i] = qemu_chr_open(label, devname);
+ serial_hds[i] = qemu_chr_open(label, devname, NULL);
if (!serial_hds[i]) {
fprintf(stderr, "qemu: could not open serial device '%s'\n",
devname);
@@ -5488,7 +5488,7 @@
if (devname && strcmp(devname, "none")) {
char label[32];
snprintf(label, sizeof(label), "parallel%d", i);
- parallel_hds[i] = qemu_chr_open(label, devname);
+ parallel_hds[i] = qemu_chr_open(label, devname, NULL);
if (!parallel_hds[i]) {
fprintf(stderr, "qemu: could not open parallel device '%s'\n",
devname);
@@ -5502,7 +5502,7 @@
if (devname && strcmp(devname, "none")) {
char label[32];
snprintf(label, sizeof(label), "virtcon%d", i);
- virtcon_hds[i] = qemu_chr_open(label, devname);
+ virtcon_hds[i] = qemu_chr_open(label, devname, NULL);
if (!virtcon_hds[i]) {
fprintf(stderr, "qemu: could not open virtio console '%s'\n",
devname);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [6365] add an init function parameter to qemu_chr_open(),
Aurelien Jarno <=