From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:51296)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1TAKLF-0007rR-7x
	for qemu-devel@nongnu.org; Sat, 08 Sep 2012 08:40:54 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1TAKLE-0005fT-8M
	for qemu-devel@nongnu.org; Sat, 08 Sep 2012 08:40:53 -0400
Received: from cantor2.suse.de ([195.135.220.15]:42494 helo=mx2.suse.de)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1TAKLE-0005fN-1W
	for qemu-devel@nongnu.org; Sat, 08 Sep 2012 08:40:52 -0400
Message-ID: <504B3CCE.8060301@suse.de>
Date: Sat, 08 Sep 2012 14:40:46 +0200
From: =?ISO-8859-15?Q?Andreas_F=E4rber?= <afaerber@suse.de>
MIME-Version: 1.0
References: <1347103584-20598-1-git-send-email-aurelien@aurel32.net>
	<1347103584-20598-3-git-send-email-aurelien@aurel32.net>
In-Reply-To: <1347103584-20598-3-git-send-email-aurelien@aurel32.net>
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH 02/12] vl.c: check for qxl availability
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Aurelien Jarno <aurelien@aurel32.net>
Cc: Anthony Liguori <aliguori@us.ibm.com>, qemu-devel@nongnu.org, Gerd Hoffmann <kraxel@redhat.com>

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
>=20
> 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(-)
>=20
> 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");
>  }
> =20
> +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 =3D VGA_XENFB;
>      } else if (strstart(p, "qxl", &opts)) {
> -        vga_interface_type =3D VGA_QXL;
> +        if (qxl_vga_available()) {
> +            vga_interface_type =3D 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);
>=20


--=20
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe=
rg