[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/16] vmware_vga: remove !EMBED_STDVGA code
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 12/16] vmware_vga: remove !EMBED_STDVGA code |
Date: |
Wed, 14 Oct 2009 19:35:03 +0200 |
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 <address@hidden>
---
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,
--
1.6.2.5
- [Qemu-devel] [PATCH 01/16] vga: create is_vbe_vmstate field, (continued)
- [Qemu-devel] [PATCH 01/16] vga: create is_vbe_vmstate field, Juan Quintela, 2009/10/14
- [Qemu-devel] [PATCH 02/16] vmstate: Add support for partial buffers transmission, Juan Quintela, 2009/10/14
- [Qemu-devel] [PATCH 03/16] vga: port vga_common_save/load to vmstate, Juan Quintela, 2009/10/14
- [Qemu-devel] [PATCH 06/16] vga: port vmware std vga to vmstate, Juan Quintela, 2009/10/14
- [Qemu-devel] [PATCH 04/16] vga: port vga-isa-mm to vmstate, Juan Quintela, 2009/10/14
- [Qemu-devel] [PATCH 05/16] vga: port vga-isa to vmstate, Juan Quintela, 2009/10/14
- [Qemu-devel] [PATCH 07/16] vga: port vga-pci to vmstate, Juan Quintela, 2009/10/14
- [Qemu-devel] [PATCH 10/16] vmware_vga: Remove uselss casts from void *, Juan Quintela, 2009/10/14
- [Qemu-devel] [PATCH 09/16] vmware_vga: Pass pci_vmsga_state_t arg no VGACommonState, Juan Quintela, 2009/10/14
- [Qemu-devel] [PATCH 08/16] vga: remove unused vga_common_save/load, Juan Quintela, 2009/10/14
- [Qemu-devel] [PATCH 12/16] vmware_vga: remove !EMBED_STDVGA code,
Juan Quintela <=
[Qemu-devel] [PATCH 11/16] vmware_vga: qemu_malloc() returns void *, Juan Quintela, 2009/10/14
[Qemu-devel] [PATCH 14/16] vmware_vga: scratch is really an array of uint32_t, Juan Quintela, 2009/10/14
[Qemu-devel] [PATCH 15/16] vmware_vga: the support to change dinamically depth is not there, Juan Quintela, 2009/10/14
[Qemu-devel] [PATCH 13/16] vmstate: Add VMSTATE_UINT32_VARRAY support, Juan Quintela, 2009/10/14
[Qemu-devel] [PATCH 16/16] vmware_vga: port to vmstate, Juan Quintela, 2009/10/14