From patchwork Tue Feb 24 16:26:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 443050 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 2F5F1140134 for ; Wed, 25 Feb 2015 03:27:05 +1100 (AEDT) Received: from localhost ([::1]:50084 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YQIK7-0005IA-3J for incoming@patchwork.ozlabs.org; Tue, 24 Feb 2015 11:27:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40851) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YQIJF-0003bh-EW for qemu-devel@nongnu.org; Tue, 24 Feb 2015 11:26:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YQIJE-0007p8-BW for qemu-devel@nongnu.org; Tue, 24 Feb 2015 11:26:09 -0500 Received: from mail-oi0-x22a.google.com ([2607:f8b0:4003:c06::22a]:51618) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YQIJE-0007p0-52 for qemu-devel@nongnu.org; Tue, 24 Feb 2015 11:26:08 -0500 Received: by mail-oi0-f42.google.com with SMTP id h136so20179921oig.1 for ; Tue, 24 Feb 2015 08:26:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; bh=ELkVtXHCMf/nuPayp1Sy4H3wNs0zeM26biZhGqu+0L0=; b=meRr1PcYbOlV2rvQp0uc2dIOWY8UsJ/HPHdLzmh80iHBz402Yv3NUgSe2iMeqPTFPj vgZt0Um/WiU4qkSK93f8CTKUG569YvgwCHE0c+WOI7HWothw5U3o45cPqC+Z6QbQSxBJ YB21m+Hw3l2iDkfZdbHi7Ph7dgkoKf3ZRkSTXJIDXpMzU3IP3KGcgHoX7+z8z7aTG2yx wtx/2lsUin44lduwwiR3OGHOgQb/4AjOTOYS0QIVFwyqyTHVQP9gYR2YzyAo3YK78JhW VCJi1P5b1+gk9XUDjQMmQ9ELygvj1gnCFm9Ayrlo5zlOUmZfP1HU2Z3ZLPXFjxkAlXHX ItCA== MIME-Version: 1.0 X-Received: by 10.202.65.8 with SMTP id o8mr11161136oia.113.1424795167213; Tue, 24 Feb 2015 08:26:07 -0800 (PST) Received: by 10.76.11.1 with HTTP; Tue, 24 Feb 2015 08:26:07 -0800 (PST) In-Reply-To: <1424687012-18524-12-git-send-email-kraxel@redhat.com> References: <1424687012-18524-1-git-send-email-kraxel@redhat.com> <1424687012-18524-12-git-send-email-kraxel@redhat.com> Date: Tue, 24 Feb 2015 17:26:07 +0100 Message-ID: From: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= To: Gerd Hoffmann X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4003:c06::22a Cc: Dave Airlie , "Michael S. Tsirkin" , qemu-devel@nongnu.org, Anthony Liguori , Paolo Bonzini Subject: Re: [Qemu-devel] [RfC PATCH 11/15] virtio-vga: add '-vga virtio' support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Hi Gerd I think it's missing qemu-options: On Mon, Feb 23, 2015 at 11:23 AM, Gerd Hoffmann wrote: > Some convinience fluff: Add support for '-vga virtio', also add > virtio-vga to the list of vga cards so '-device virtio-vga' will > turn off the default vga. > > Written by Dave Airlie and Gerd Hoffmann. > > Signed-off-by: Dave Airlie > Signed-off-by: Gerd Hoffmann > --- > hw/pci/pci.c | 2 ++ > include/sysemu/sysemu.h | 2 +- > vl.c | 13 +++++++++++++ > 3 files changed, 16 insertions(+), 1 deletion(-) > > diff --git a/hw/pci/pci.c b/hw/pci/pci.c > index d508930..3a2b8ad 100644 > --- a/hw/pci/pci.c > +++ b/hw/pci/pci.c > @@ -1662,6 +1662,8 @@ PCIDevice *pci_vga_init(PCIBus *bus) > return pci_create_simple(bus, -1, "VGA"); > case VGA_VMWARE: > return pci_create_simple(bus, -1, "vmware-svga"); > + case VGA_VIRTIO: > + return pci_create_simple(bus, -1, "virtio-vga"); > case VGA_NONE: > default: /* Other non-PCI types. Checking for unsupported types is already > done in vl.c. */ > diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h > index 748d059..1c0e2a6 100644 > --- a/include/sysemu/sysemu.h > +++ b/include/sysemu/sysemu.h > @@ -107,7 +107,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_TCX, VGA_CG3, VGA_DEVICE, VGA_VIRTIO, > } VGAInterfaceType; > > extern int vga_interface_type; > diff --git a/vl.c b/vl.c > index 8c8f142..27fe972 100644 > --- a/vl.c > +++ b/vl.c > @@ -234,6 +234,7 @@ static struct { > { .driver = "isa-cirrus-vga", .flag = &default_vga }, > { .driver = "vmware-svga", .flag = &default_vga }, > { .driver = "qxl-vga", .flag = &default_vga }, > + { .driver = "virtio-vga", .flag = &default_vga }, > }; > > static QemuOptsList qemu_rtc_opts = { > @@ -1870,6 +1871,11 @@ static bool cg3_vga_available(void) > return object_class_by_name("cgthree"); > } > > +static bool virtio_vga_available(void) > +{ > + return object_class_by_name("virtio-vga"); > +} > + > static void select_vgahw (const char *p) > { > const char *opts; > @@ -1896,6 +1902,13 @@ static void select_vgahw (const char *p) > fprintf(stderr, "Error: VMWare SVGA not available\n"); > exit(0); > } > + } else if (strstart(p, "virtio", &opts)) { > + if (virtio_vga_available()) { > + vga_interface_type = VGA_VIRTIO; > + } else { > + fprintf(stderr, "Error: Virtio VGA not available\n"); > + exit(0); > + } > } else if (strstart(p, "xenfb", &opts)) { > vga_interface_type = VGA_XENFB; > } else if (strstart(p, "qxl", &opts)) { > -- > 1.8.3.1 > > diff --git a/qemu-options.hx b/qemu-options.hx index 85ca3ad..9315672 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1077,7 +1077,7 @@ Rotate graphical output some deg left (only PXA LCD). ETEXI DEF("vga", HAS_ARG, QEMU_OPTION_vga, - "-vga [std|cirrus|vmware|qxl|xenfb|tcx|cg3|none]\n" + "-vga [std|cirrus|vmware|qxl|xenfb|tcx|cg3|virtio|none]\n" " select video card type\n", QEMU_ARCH_ALL) STEXI @item -vga @var{type} @@ -1110,6 +1110,8 @@ fixed resolution of 1024x768. (sun4m only) Sun cgthree framebuffer. This is a simple 8-bit framebuffer for sun4m machines available in both 1024x768 (OpenBIOS) and 1152x900 (OBP) resolutions aimed at people wishing to run older Solaris versions. +@item virtio +Virtio VGA @item none Disable VGA card. @end table