[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/12] ui: use enum to string helpers
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 03/12] ui: use enum to string helpers |
Date: |
Mon, 27 Aug 2018 10:53:11 +0200 |
From: Marc-André Lureau <address@hidden>
Minor code simplification.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
qemu-keymap.c | 2 +-
ui/console.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/qemu-keymap.c b/qemu-keymap.c
index 6216371aa1..4d00468747 100644
--- a/qemu-keymap.c
+++ b/qemu-keymap.c
@@ -84,7 +84,7 @@ static void walk_map(struct xkb_keymap *map, xkb_keycode_t
code, void *data)
}
fprintf(outfile, "# evdev %d (0x%x), QKeyCode \"%s\", number 0x%x\n",
evdev, evdev,
- QKeyCode_lookup.array[qcode],
+ QKeyCode_str(qcode),
qcode_to_number(qcode));
/*
diff --git a/ui/console.c b/ui/console.c
index bc58458ee8..3a285bae00 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -2319,7 +2319,7 @@ bool qemu_display_find_default(DisplayOptions *opts)
for (i = 0; i < ARRAY_SIZE(prio); i++) {
if (dpys[prio[i]] == NULL) {
- ui_module_load_one(DisplayType_lookup.array[prio[i]]);
+ ui_module_load_one(DisplayType_str(prio[i]));
}
if (dpys[prio[i]] == NULL) {
continue;
@@ -2337,11 +2337,11 @@ void qemu_display_early_init(DisplayOptions *opts)
return;
}
if (dpys[opts->type] == NULL) {
- ui_module_load_one(DisplayType_lookup.array[opts->type]);
+ ui_module_load_one(DisplayType_str(opts->type));
}
if (dpys[opts->type] == NULL) {
error_report("Display '%s' is not available.",
- DisplayType_lookup.array[opts->type]);
+ DisplayType_str(opts->type));
exit(1);
}
if (dpys[opts->type]->early_init) {
--
2.9.3
- [Qemu-devel] [PULL 00/12] Ui 20180827 v4 patches, Gerd Hoffmann, 2018/08/27
- [Qemu-devel] [PULL 08/12] spice-display: fix qemu_spice_cursor_refresh_bh locking, Gerd Hoffmann, 2018/08/27
- [Qemu-devel] [PULL 10/12] ui/vnc: Remove useless parenthesis around DIV_ROUND_UP macro, Gerd Hoffmann, 2018/08/27
- [Qemu-devel] [PULL 02/12] vnc: fix memleak of the "vnc-worker-output" name, Gerd Hoffmann, 2018/08/27
- [Qemu-devel] [PULL 01/12] ui/sdl2: Remove the obsolete SDL_INIT_NOPARACHUTE flag, Gerd Hoffmann, 2018/08/27
- [Qemu-devel] [PULL 05/12] doc: switch to modern syntax for VNC TLS setup, Gerd Hoffmann, 2018/08/27
- [Qemu-devel] [PULL 03/12] ui: use enum to string helpers,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 07/12] spice-display: access ptr_x/ptr_y under Mutex, Gerd Hoffmann, 2018/08/27
- [Qemu-devel] [PULL 06/12] vnc: remove support for deprecated tls, x509, x509verify options, Gerd Hoffmann, 2018/08/27
- [Qemu-devel] [PULL 11/12] dmabuf: add y0_top, pass it to spice, Gerd Hoffmann, 2018/08/27
- [Qemu-devel] [PULL 09/12] ui/sdl2: Fix broken -full-screen CLI option, Gerd Hoffmann, 2018/08/27
- [Qemu-devel] [PULL 12/12] util: promote qemu_egl_rendernode_open() to libqemuutil, Gerd Hoffmann, 2018/08/27
- [Qemu-devel] [PULL 04/12] sdl2: redraw correctly when scanout_mode enabled., Gerd Hoffmann, 2018/08/27
- Re: [Qemu-devel] [PULL 00/12] Ui 20180827 v4 patches, Peter Maydell, 2018/08/27