From patchwork Wed Oct 14 17:35:03 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 36014 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 BF594B7B72 for ; Thu, 15 Oct 2009 04:58:53 +1100 (EST) Received: from localhost ([127.0.0.1]:46052 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1My87e-0005I4-WE for incoming@patchwork.ozlabs.org; Wed, 14 Oct 2009 13:58:51 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1My7lY-0002So-8A for qemu-devel@nongnu.org; Wed, 14 Oct 2009 13:36:00 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1My7lQ-0002Nn-9K for qemu-devel@nongnu.org; Wed, 14 Oct 2009 13:35:57 -0400 Received: from [199.232.76.173] (port=55253 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1My7lO-0002NS-Va for qemu-devel@nongnu.org; Wed, 14 Oct 2009 13:35:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:63320) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1My7lO-0008OF-DF for qemu-devel@nongnu.org; Wed, 14 Oct 2009 13:35:50 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n9EHZnws024769 for ; Wed, 14 Oct 2009 13:35:49 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n9EHZXFx001016; Wed, 14 Oct 2009 13:35:48 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 14 Oct 2009 19:35:03 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 12/16] vmware_vga: remove !EMBED_STDVGA code 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 It don't compile. And the trivial fixes (change vga.foo field to foo field don't work either. No output Signed-off-by: Juan Quintela --- hw/vmware_vga.c | 25 ------------------------- 1 files changed, 0 insertions(+), 25 deletions(-) diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c index 1fb04bf..48f3a06 100644 --- a/hw/vmware_vga.c +++ b/hw/vmware_vga.c @@ -26,20 +26,15 @@ #include "pci.h" #define VERBOSE -#define EMBED_STDVGA #undef DIRECT_VRAM #define HW_RECT_ACCEL #define HW_FILL_ACCEL #define HW_MOUSE_ACCEL -#ifdef EMBED_STDVGA # include "vga_int.h" -#endif struct vmsvga_state_s { -#ifdef EMBED_STDVGA VGACommonState vga; -#endif int width; int height; @@ -55,12 +50,6 @@ struct vmsvga_state_s { int on; } cursor; -#ifndef EMBED_STDVGA - DisplayState *ds; - int vram_size; - ram_addr_t vram_offset; - uint8_t *vram_ptr; -#endif target_phys_addr_t vram_base; int index; @@ -774,9 +763,7 @@ static void vmsvga_value_write(void *opaque, uint32_t address, uint32_t value) s->width = -1; s->height = -1; s->invalidated = 1; -#ifdef EMBED_STDVGA s->vga.invalidate(&s->vga); -#endif if (s->enable) s->fb_size = ((s->depth + 7) >> 3) * s->new_width * s->new_height; break; @@ -894,9 +881,7 @@ static void vmsvga_update_display(void *opaque) { struct vmsvga_state_s *s = opaque; if (!s->enable) { -#ifdef EMBED_STDVGA s->vga.update(&s->vga); -#endif return; } @@ -962,9 +947,7 @@ static void vmsvga_invalidate_display(void *opaque) { struct vmsvga_state_s *s = opaque; if (!s->enable) { -#ifdef EMBED_STDVGA s->vga.invalidate(&s->vga); -#endif return; } @@ -977,9 +960,7 @@ static void vmsvga_screen_dump(void *opaque, const char *filename) { struct vmsvga_state_s *s = opaque; if (!s->enable) { -#ifdef EMBED_STDVGA s->vga.screen_dump(&s->vga, filename); -#endif return; } @@ -1128,15 +1109,9 @@ static void vmsvga_init(struct vmsvga_state_s *s, int vga_ram_size) vmsvga_reset(s); -#ifdef EMBED_STDVGA vga_common_init(&s->vga, vga_ram_size); vga_init(&s->vga); vmstate_register(0, &vmstate_vga_common, &s->vga); -#else - s->vram_size = vga_ram_size; - s->vram_offset = qemu_ram_alloc(vga_ram_size); - s->vram_ptr = qemu_get_ram_ptr(s->vram_offset); -#endif s->vga.ds = graphic_console_init(vmsvga_update_display, vmsvga_invalidate_display,