xen_console: fall back to qemu serial device
The new xen_console protocol changed the default xen_console output device from whatever Qemu chose to whatever xenstore choses and "pty" as fallback. This is not how Qemu works. It has its own serial redirection semantics. So it xenstore doesn't contain information on what to do, Qemu is the place to ask. Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
parent
0f51726adc
commit
25a118130f
@ -196,12 +196,15 @@ static int con_init(struct XenDevice *xendev)
|
|||||||
}
|
}
|
||||||
|
|
||||||
output = xenstore_read_str(con->console, "output");
|
output = xenstore_read_str(con->console, "output");
|
||||||
/* output is a pty by default */
|
|
||||||
|
/* no Xen override, use qemu output device */
|
||||||
if (output == NULL) {
|
if (output == NULL) {
|
||||||
output = "pty";
|
con->chr = serial_hds[con->xendev.dev];
|
||||||
|
} else {
|
||||||
|
snprintf(label, sizeof(label), "xencons%d", con->xendev.dev);
|
||||||
|
con->chr = qemu_chr_open(label, output, NULL);
|
||||||
}
|
}
|
||||||
snprintf(label, sizeof(label), "xencons%d", con->xendev.dev);
|
|
||||||
con->chr = qemu_chr_open(label, output, NULL);
|
|
||||||
xenstore_store_pv_console_info(con->xendev.dev, con->chr);
|
xenstore_store_pv_console_info(con->xendev.dev, con->chr);
|
||||||
|
|
||||||
out:
|
out:
|
||||||
|
Loading…
Reference in New Issue
Block a user