aboutsummaryrefslogtreecommitdiff
path: root/ui/input.c
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2016-01-12 11:45:43 +0100
committerGerd Hoffmann <kraxel@redhat.com>2016-03-01 07:51:34 +0100
commitf2c1d54c186c400ec676ec4d29ea4b8bf440c054 (patch)
tree577d745cad7ac0a433b02a8a964438fa966076ae /ui/input.c
parent071608b519adf62bc29c914343a21c5407ab1ac9 (diff)
downloadqemu-f2c1d54c186c400ec676ec4d29ea4b8bf440c054.zip
qemu-f2c1d54c186c400ec676ec4d29ea4b8bf440c054.tar.gz
qemu-f2c1d54c186c400ec676ec4d29ea4b8bf440c054.tar.bz2
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: Gerd Hoffmann <kraxel@redhat.com> Reviewed-by: Daniel P. Berrange <berrange@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'ui/input.c')
-rw-r--r--ui/input.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/ui/input.c b/ui/input.c
index bdcb974..fce99ba 100644
--- a/ui/input.c
+++ b/ui/input.c
@@ -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;
}