mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-02 15:23:53 -06:00
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 <aurelien@aurel32.net> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6365 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
9c554c1c0b
commit
ceecf1d158
9 changed files with 36 additions and 25 deletions
|
@ -2122,7 +2122,7 @@ static CharDriverState *qemu_chr_open_tcp(const char *host_str,
|
|||
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 @@ CharDriverState *qemu_chr_open(const char *label, const char *filename)
|
|||
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 @@ CharDriverState *qemu_chr_open(const char *label, const char *filename)
|
|||
if (chr) {
|
||||
if (!chr->filename)
|
||||
chr->filename = qemu_strdup(filename);
|
||||
chr->init = init;
|
||||
chr->label = qemu_strdup(label);
|
||||
TAILQ_INSERT_TAIL(&chardevs, chr, next);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue