[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/21] vl: Table-based select_vgahw()
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 03/21] vl: Table-based select_vgahw() |
Date: |
Fri, 20 May 2016 17:28:23 -0300 |
Instead of implementing separate check functions for each vga
interface type, add a table enumerating the possible VGA
interfaces.
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
include/sysemu/sysemu.h | 1 +
vl.c | 115 ++++++++++++++++++++++++++----------------------
2 files changed, 64 insertions(+), 52 deletions(-)
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index 38fb3ca..2033f8c 100644
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -146,6 +146,7 @@ extern int autostart;
typedef enum {
VGA_NONE, VGA_STD, VGA_CIRRUS, VGA_VMWARE, VGA_XENFB, VGA_QXL,
VGA_TCX, VGA_CG3, VGA_DEVICE, VGA_VIRTIO,
+ VGA_TYPE_MAX,
} VGAInterfaceType;
extern int vga_interface_type;
diff --git a/vl.c b/vl.c
index edfb5b9..ac5db24 100644
--- a/vl.c
+++ b/vl.c
@@ -2017,63 +2017,74 @@ static bool virtio_vga_available(void)
return object_class_by_name("virtio-vga");
}
-static void select_vgahw (const char *p)
+typedef struct VGAInterfaceInfo {
+ const char *opt_name; /* option name */
+ const char *name; /* human-readable name */
+ bool (*available)(void);
+} VGAInterfaceInfo;
+
+static VGAInterfaceInfo vga_interfaces[VGA_TYPE_MAX] = {
+ [VGA_NONE] = {
+ .opt_name = "none",
+ },
+ [VGA_STD] = {
+ .opt_name = "std",
+ .name = "standard VGA",
+ .available = vga_available,
+ },
+ [VGA_CIRRUS] = {
+ .opt_name = "cirrus",
+ .name = "Cirrus VGA",
+ .available = cirrus_vga_available,
+ },
+ [VGA_VMWARE] = {
+ .opt_name = "vmware",
+ .name = "VMWare SVGA",
+ .available = vmware_vga_available,
+ },
+ [VGA_VIRTIO] = {
+ .opt_name = "virtio",
+ .name = "Virtio VGA",
+ .available = virtio_vga_available,
+ },
+ [VGA_QXL] = {
+ .opt_name = "qxl",
+ .name = "QXL VGA",
+ .available = qxl_vga_available,
+ },
+ [VGA_TCX] = {
+ .opt_name = "tcx",
+ .name = "TCX framebuffer",
+ .available = tcx_vga_available,
+ },
+ [VGA_CG3] = {
+ .opt_name = "cg3",
+ .name = "CG3 framebuffer",
+ .available = cg3_vga_available,
+ },
+ [VGA_XENFB] = {
+ .opt_name = "xenfb",
+ },
+};
+
+static void select_vgahw(const char *p)
{
const char *opts;
+ int t;
assert(vga_interface_type == VGA_NONE);
- if (strstart(p, "std", &opts)) {
- if (vga_available()) {
- vga_interface_type = VGA_STD;
- } else {
- error_report("standard VGA not available");
- exit(1);
- }
- } else if (strstart(p, "cirrus", &opts)) {
- if (cirrus_vga_available()) {
- vga_interface_type = VGA_CIRRUS;
- } else {
- error_report("Cirrus VGA not available");
- exit(1);
- }
- } else if (strstart(p, "vmware", &opts)) {
- if (vmware_vga_available()) {
- vga_interface_type = VGA_VMWARE;
- } else {
- error_report("VMWare SVGA not available");
- exit(1);
- }
- } else if (strstart(p, "virtio", &opts)) {
- if (virtio_vga_available()) {
- vga_interface_type = VGA_VIRTIO;
- } else {
- error_report("Virtio VGA not available");
- exit(1);
- }
- } else if (strstart(p, "xenfb", &opts)) {
- vga_interface_type = VGA_XENFB;
- } else if (strstart(p, "qxl", &opts)) {
- if (qxl_vga_available()) {
- vga_interface_type = VGA_QXL;
- } else {
- error_report("QXL VGA not available");
- exit(1);
- }
- } else if (strstart(p, "tcx", &opts)) {
- if (tcx_vga_available()) {
- vga_interface_type = VGA_TCX;
- } else {
- error_report("TCX framebuffer not available");
- exit(1);
- }
- } else if (strstart(p, "cg3", &opts)) {
- if (cg3_vga_available()) {
- vga_interface_type = VGA_CG3;
- } else {
- error_report("CG3 framebuffer not available");
- exit(1);
+ for (t = 0; t < VGA_TYPE_MAX; t++) {
+ VGAInterfaceInfo *ti = &vga_interfaces[t];
+ if (ti->opt_name && strstart(p, ti->opt_name, &opts)) {
+ if (ti->available && !ti->available()) {
+ error_report("%s not available", ti->name);
+ exit(1);
+ }
+ vga_interface_type = t;
+ break;
}
- } else if (!strstart(p, "none", &opts)) {
+ }
+ if (t == VGA_TYPE_MAX) {
invalid_vga:
error_report("unknown vga type: %s", p);
exit(1);
--
2.5.5
- [Qemu-devel] [PULL 00/21] Machine Core queue, 2016-05-20, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 19/21] vl: Use &error_fatal when parsing VNC options, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 07/21] curses: curses_display_init() stub, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 09/21] cocoa: cocoa_display_init() stub, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 08/21] sdl: Initialization stubs, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 18/21] machine: add properties to compat_props incrementaly, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 21/21] Use &error_fatal when initializing crypto on qemu-{img, io, nbd}, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 02/21] vl: Use exit(1) when requested VGA interface is unavailable, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 01/21] pc-dimm: correct comment of MemoryHotplugState, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 16/21] vl: Make display_remote a local variable, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 03/21] vl: Table-based select_vgahw(),
Eduardo Habkost <=
- [Qemu-devel] [PULL 04/21] vl: Replace *_vga_available() functions with class_names field, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 12/21] milkymist: Move DT_NOGRAPHIC check outside milkymist_tmu2_create(), Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 13/21] vl: Replace DT_NOGRAPHIC with machine option, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 14/21] vl: Make display_type a local variable, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 11/21] spice: Initialization stubs on qemu-spice.h, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 05/21] vl: Add DT_COCOA DisplayType value, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 20/21] vl: Use &error_fatal when parsing monitor options, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 06/21] vnc: Initialization stubs, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 17/21] vl: Simplify global property registration, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 15/21] vl: Move DisplayType typedef to vl.c, Eduardo Habkost, 2016/05/20