From patchwork Mon Nov 2 22:11:50 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 37457 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C14CD1007D3 for ; Tue, 3 Nov 2009 09:13:17 +1100 (EST) Received: from localhost ([127.0.0.1]:60340 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N559F-0003L0-AP for incoming@patchwork.ozlabs.org; Mon, 02 Nov 2009 17:13:13 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N5587-0002yW-Cl for qemu-devel@nongnu.org; Mon, 02 Nov 2009 17:12:03 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N5582-0002wA-2p for qemu-devel@nongnu.org; Mon, 02 Nov 2009 17:12:02 -0500 Received: from [199.232.76.173] (port=57249 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N5581-0002w4-E8 for qemu-devel@nongnu.org; Mon, 02 Nov 2009 17:11:57 -0500 Received: from cantor.suse.de ([195.135.220.2]:49110 helo=mx1.suse.de) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1N5580-0001Ol-Fn for qemu-devel@nongnu.org; Mon, 02 Nov 2009 17:11:57 -0500 Received: from relay2.suse.de (relay-ext.suse.de [195.135.221.8]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.suse.de (Postfix) with ESMTP id 642858D893; Mon, 2 Nov 2009 23:11:51 +0100 (CET) From: Alexander Graf To: kvm@vger.kernel.org Date: Mon, 2 Nov 2009 23:11:50 +0100 Message-Id: <1257199910-3197-2-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1257199910-3197-1-git-send-email-agraf@suse.de> References: <1257199910-3197-1-git-send-email-agraf@suse.de> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.4-2.6 Cc: linux-fbdev-devel@lists.sourceforge.net, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 2/2] Add PCI virtio support for frame buffer X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org We now know how to use a frame buffer on VirtIO, but we still can't use it on x86. In order to leverage the power of VirtIO FB, we need to wrap it through virtio-pci. So let's add all the shiny wrappers and add a -vga option. Signed-off-by: Alexander Graf --- hw/pc.c | 5 +++++ hw/pci.h | 1 + hw/virtio-pci.c | 29 +++++++++++++++++++++++++++++ sysemu.h | 3 ++- vl.c | 2 ++ 5 files changed, 39 insertions(+), 1 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index bf4718e..4b0d019 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1190,6 +1190,11 @@ static void pc_init1(ram_addr_t ram_size, } else { isa_vga_init(); } + } else if (virtio_fb_enabled) { + if (pci_enabled) + pci_create_simple(pci_bus, -1, "virtio-fb-pci"); + else + fprintf(stderr, "%s: virtio_fb: no PCI bus\n", __FUNCTION__); } rtc_state = rtc_init(2000); diff --git a/hw/pci.h b/hw/pci.h index 93f93fb..b65a6df 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -70,6 +70,7 @@ extern target_phys_addr_t pci_mem_base; #define PCI_DEVICE_ID_VIRTIO_BLOCK 0x1001 #define PCI_DEVICE_ID_VIRTIO_BALLOON 0x1002 #define PCI_DEVICE_ID_VIRTIO_CONSOLE 0x1003 +#define PCI_DEVICE_ID_VIRTIO_FB 0x1004 typedef void PCIConfigWriteFunc(PCIDevice *pci_dev, uint32_t address, uint32_t data, int len); diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index 1665b59..34937de 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -490,6 +490,25 @@ static int virtio_console_init_pci(PCIDevice *pci_dev) return 0; } +static int virtio_fb_init_pci(PCIDevice *pci_dev) +{ + VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev); + VirtIODevice *vdev; + + if (proxy->class_code != PCI_CLASS_DISPLAY_OTHER) + proxy->class_code = PCI_CLASS_DISPLAY_OTHER; + + vdev = virtio_fb_init(&pci_dev->qdev); + if (!vdev) { + return -1; + } + virtio_init_pci(proxy, vdev, + PCI_VENDOR_ID_REDHAT_QUMRANET, + PCI_DEVICE_ID_VIRTIO_FB, + proxy->class_code, 0x00); + return 0; +} + static int virtio_net_init_pci(PCIDevice *pci_dev) { VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev); @@ -574,6 +593,16 @@ static PCIDeviceInfo virtio_info[] = { }, .qdev.reset = virtio_pci_reset, },{ + .qdev.name = "virtio-fb-pci", + .qdev.size = sizeof(VirtIOPCIProxy), + .init = virtio_fb_init_pci, + .exit = virtio_exit_pci, + .qdev.props = (Property[]) { + DEFINE_PROP_HEX32("class", VirtIOPCIProxy, class_code, 0), + DEFINE_PROP_END_OF_LIST(), + }, + .qdev.reset = virtio_pci_reset, + },{ .qdev.name = "virtio-balloon-pci", .qdev.size = sizeof(VirtIOPCIProxy), .init = virtio_balloon_init_pci, diff --git a/sysemu.h b/sysemu.h index 96804b4..c1bc5a3 100644 --- a/sysemu.h +++ b/sysemu.h @@ -104,13 +104,14 @@ extern int autostart; extern int bios_size; typedef enum { - VGA_NONE, VGA_STD, VGA_CIRRUS, VGA_VMWARE, VGA_XENFB + VGA_NONE, VGA_STD, VGA_CIRRUS, VGA_VMWARE, VGA_XENFB, VGA_VIRTIO } VGAInterfaceType; extern int vga_interface_type; #define cirrus_vga_enabled (vga_interface_type == VGA_CIRRUS) #define std_vga_enabled (vga_interface_type == VGA_STD) #define xenfb_enabled (vga_interface_type == VGA_XENFB) +#define virtio_fb_enabled (vga_interface_type == VGA_VIRTIO) #define vmsvga_enabled (vga_interface_type == VGA_VMWARE) extern int graphic_width; diff --git a/vl.c b/vl.c index e57f58f..f999514 100644 --- a/vl.c +++ b/vl.c @@ -4297,6 +4297,8 @@ static void select_vgahw (const char *p) vga_interface_type = VGA_VMWARE; } else if (strstart(p, "xenfb", &opts)) { vga_interface_type = VGA_XENFB; + } else if (strstart(p, "virtio", &opts)) { + vga_interface_type = VGA_VIRTIO; } else if (!strstart(p, "none", &opts)) { invalid_vga: fprintf(stderr, "Unknown vga type: %s\n", p);