Commit f2c1d54c authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

console: add & use qemu_console_lookup_by_device_name 



We have two places needing this, and a third one will come shortly.
So factor things out into a helper function to reduce code duplication.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarDaniel P. Berrange <berrange@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent 071608b5

include/ui/console.h

+2 −0
Original line number Diff line number Diff line
@@ -378,6 +378,8 @@ void graphic_hw_gl_block(QemuConsole *con, bool block); 


QemuConsole *qemu_console_lookup_by_index(unsigned int index);

QemuConsole *qemu_console_lookup_by_device(DeviceState *dev, uint32_t head);

QemuConsole *qemu_console_lookup_by_device_name(const char *device_id,

                                                uint32_t head, Error **errp);

bool qemu_console_is_visible(QemuConsole *con);

bool qemu_console_is_graphic(QemuConsole *con);

bool qemu_console_is_fixedsize(QemuConsole *con);

ui/console.c

+23 −0
Original line number Diff line number Diff line
@@ -1790,6 +1790,29 @@ QemuConsole *qemu_console_lookup_by_device(DeviceState *dev, uint32_t head) 
    return NULL;

}



QemuConsole *qemu_console_lookup_by_device_name(const char *device_id,

                                                uint32_t head, Error **errp)

{

    DeviceState *dev;

    QemuConsole *con;



    dev = qdev_find_recursive(sysbus_get_default(), device_id);

    if (dev == NULL) {

        error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,

                  "Device '%s' not found", device_id);

        return NULL;

    }



    con = qemu_console_lookup_by_device(dev, head);

    if (con == NULL) {

        error_setg(errp, "Device %s (head %d) is not bound to a QemuConsole",

                   device_id, head);

        return NULL;

    }



    return con;

}



bool qemu_console_is_visible(QemuConsole *con)

{

    return (con == active_console) || (con->dcls > 0);

ui/input.c

+4 −11
Original line number Diff line number Diff line
@@ -82,19 +82,12 @@ void qemu_input_handler_bind(QemuInputHandlerState *s, 
                             const char *device_id, int head,

                             Error **errp)

{

    DeviceState *dev;

    QemuConsole *con;

    Error *err = NULL;



    dev = qdev_find_recursive(sysbus_get_default(), device_id);

    if (dev == NULL) {

        error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,

                  "Device '%s' not found", device_id);

        return;

    }



    con = qemu_console_lookup_by_device(dev, head);

    if (con == NULL) {

        error_setg(errp, "Device %s is not bound to a QemuConsole", device_id);

    con = qemu_console_lookup_by_device_name(device_id, head, &err);

    if (err) {

        error_propagate(errp, err);

        return;

    }

ui/vnc.c

+4 −11
Original line number Diff line number Diff line
@@ -3732,19 +3732,12 @@ void vnc_display_open(const char *id, Error **errp) 


    device_id = qemu_opt_get(opts, "display");

    if (device_id) {

        DeviceState *dev;

        int head = qemu_opt_get_number(opts, "head", 0);

        Error *err = NULL;



        dev = qdev_find_recursive(sysbus_get_default(), device_id);

        if (dev == NULL) {

            error_setg(errp, "Device '%s' not found", device_id);

            goto fail;

        }



        con = qemu_console_lookup_by_device(dev, head);

        if (con == NULL) {

            error_setg(errp, "Device %s is not bound to a QemuConsole",

                       device_id);

        con = qemu_console_lookup_by_device_name(device_id, head, &err);

        if (err) {

            error_propagate(errp, err);

            goto fail;

        }

    } else {