[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 1/6] vmware-vga: Register reset service
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH v2 1/6] vmware-vga: Register reset service |
Date: |
Wed, 17 Aug 2011 15:40:58 -0700 |
From: Jan Kiszka <address@hidden>
Fixes cold reset in vmware graphic modes.
Reviewed-by: Andrzej Zaborowski <address@hidden>
Signed-off-by: Jan Kiszka <address@hidden>
---
hw/vmware_vga.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c
index d5cfa70..3626bb0 100644
--- a/hw/vmware_vga.c
+++ b/hw/vmware_vga.c
@@ -998,8 +998,12 @@ static void vmsvga_update_display(void *opaque)
}
}
-static void vmsvga_reset(struct vmsvga_state_s *s)
+static void vmsvga_reset(DeviceState *dev)
{
+ struct pci_vmsvga_state_s *pci =
+ DO_UPCAST(struct pci_vmsvga_state_s, card.qdev, dev);
+ struct vmsvga_state_s *s = &pci->chip;
+
s->index = 0;
s->enable = 0;
s->config = 0;
@@ -1225,8 +1229,6 @@ static void vmsvga_init(struct vmsvga_state_s *s, int
vga_ram_size)
vga_common_init(&s->vga, vga_ram_size);
vga_init(&s->vga);
vmstate_register(NULL, 0, &vmstate_vga_common, &s->vga);
-
- vmsvga_reset(s);
}
static uint64_t vmsvga_io_read(void *opaque, target_phys_addr_t addr,
@@ -1311,6 +1313,7 @@ static PCIDeviceInfo vmsvga_info = {
.qdev.name = "vmware-svga",
.qdev.size = sizeof(struct pci_vmsvga_state_s),
.qdev.vmsd = &vmstate_vmware_vga,
+ .qdev.reset = vmsvga_reset,
.no_hotplug = 1,
.init = pci_vmsvga_initfn,
.romfile = "vgabios-vmware.bin",
--
1.7.3.4
[Qemu-devel] [PATCH v2 6/6] vga: Drop some unused fields, Jan Kiszka, 2011/08/17
[Qemu-devel] [PATCH v2 3/6] vmware-vga: Remove dead DIRECT_VRAM mode, Jan Kiszka, 2011/08/17