mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 16:23:55 -06:00
hw/xen: Move xenstore_store_pv_console_info to xen_console.c
There's no need for this to be in the Xen accel code, and as we want to use the Xen console support with KVM-emulated Xen we'll want to have a platform-agnostic version of it. Make it use GString to build up the path while we're at it. Signed-off-by: David Woodhouse <dwmw@amazon.co.uk> Reviewed-by: Paul Durrant <paul@xen.org>
This commit is contained in:
parent
ba2a92db1f
commit
7a8a749da7
3 changed files with 43 additions and 65 deletions
|
@ -173,6 +173,48 @@ static void xencons_send(struct XenConsole *con)
|
|||
|
||||
/* -------------------------------------------------------------------- */
|
||||
|
||||
static int store_con_info(struct XenConsole *con)
|
||||
{
|
||||
Chardev *cs = qemu_chr_fe_get_driver(&con->chr);
|
||||
char *pts = NULL;
|
||||
char *dom_path;
|
||||
GString *path;
|
||||
int ret = -1;
|
||||
|
||||
/* Only continue if we're talking to a pty. */
|
||||
if (!CHARDEV_IS_PTY(cs)) {
|
||||
return 0;
|
||||
}
|
||||
pts = cs->filename + 4;
|
||||
|
||||
dom_path = qemu_xen_xs_get_domain_path(xenstore, xen_domid);
|
||||
if (!dom_path) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
path = g_string_new(dom_path);
|
||||
free(dom_path);
|
||||
|
||||
if (con->xendev.dev) {
|
||||
g_string_append_printf(path, "/device/console/%d", con->xendev.dev);
|
||||
} else {
|
||||
g_string_append(path, "/console");
|
||||
}
|
||||
g_string_append(path, "/tty");
|
||||
|
||||
if (xenstore_write_str(con->console, path->str, pts)) {
|
||||
fprintf(stderr, "xenstore_write_str for '%s' fail", path->str);
|
||||
goto out;
|
||||
}
|
||||
ret = 0;
|
||||
|
||||
out:
|
||||
g_string_free(path, true);
|
||||
free(path);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int con_init(struct XenLegacyDevice *xendev)
|
||||
{
|
||||
struct XenConsole *con = container_of(xendev, struct XenConsole, xendev);
|
||||
|
@ -215,8 +257,7 @@ static int con_init(struct XenLegacyDevice *xendev)
|
|||
&error_abort);
|
||||
}
|
||||
|
||||
xenstore_store_pv_console_info(con->xendev.dev,
|
||||
qemu_chr_fe_get_driver(&con->chr));
|
||||
store_con_info(con);
|
||||
|
||||
out:
|
||||
g_free(type);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue