| Message ID | 1347103584-20598-3-git-send-email-aurelien@aurel32.net |
|---|---|
| State | New |
| Headers | show |
Am 08.09.2012 13:26, schrieb Aurelien Jarno: > Check for qxl availability in vl.c. This will allow to remove #ifdef > CONFIG_SPICE .. #endif later in this series > > Cc: Anthony Liguori <aliguori@us.ibm.com> > Cc: Gerd Hoffmann <kraxel@redhat.com> > Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> > --- > vl.c | 12 +++++++++++- > 1 file changed, 11 insertions(+), 1 deletion(-) > > diff --git a/vl.c b/vl.c > index 7c577fa..6363915 100644 > --- a/vl.c > +++ b/vl.c > @@ -1703,6 +1703,11 @@ static bool vmware_vga_available(void) > return qdev_exists("vmware-svga"); > } > > +static bool qxl_vga_available(void) > +{ > + return qdev_exists("qxl-vga"); I'd suggest to use the QOM equivalent: object_class_by_name("qxl-vga") Andreas > +} > + > static void select_vgahw (const char *p) > { > const char *opts; > @@ -1732,7 +1737,12 @@ static void select_vgahw (const char *p) > } else if (strstart(p, "xenfb", &opts)) { > vga_interface_type = VGA_XENFB; > } else if (strstart(p, "qxl", &opts)) { > - vga_interface_type = VGA_QXL; > + if (qxl_vga_available()) { > + vga_interface_type = VGA_QXL; > + } else { > + fprintf(stderr, "Error: QXL VGA not available\n"); > + exit(0); > + } > } else if (!strstart(p, "none", &opts)) { > invalid_vga: > fprintf(stderr, "Unknown vga type: %s\n", p); >
diff --git a/vl.c b/vl.c index 7c577fa..6363915 100644 --- a/vl.c +++ b/vl.c @@ -1703,6 +1703,11 @@ static bool vmware_vga_available(void) return qdev_exists("vmware-svga"); } +static bool qxl_vga_available(void) +{ + return qdev_exists("qxl-vga"); +} + static void select_vgahw (const char *p) { const char *opts; @@ -1732,7 +1737,12 @@ static void select_vgahw (const char *p) } else if (strstart(p, "xenfb", &opts)) { vga_interface_type = VGA_XENFB; } else if (strstart(p, "qxl", &opts)) { - vga_interface_type = VGA_QXL; + if (qxl_vga_available()) { + vga_interface_type = VGA_QXL; + } else { + fprintf(stderr, "Error: QXL VGA not available\n"); + exit(0); + } } else if (!strstart(p, "none", &opts)) { invalid_vga: fprintf(stderr, "Unknown vga type: %s\n", p);
Check for qxl availability in vl.c. This will allow to remove #ifdef CONFIG_SPICE .. #endif later in this series Cc: Anthony Liguori <aliguori@us.ibm.com> Cc: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> --- vl.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)