[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 19/22] cirrus_vga: change use of pci_dev for is_pci
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 19/22] cirrus_vga: change use of pci_dev for is_pci |
Date: |
Mon, 24 Aug 2009 13:03:40 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
hw/cirrus_vga.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
index a40f300..93cc1ff 100644
--- a/hw/cirrus_vga.c
+++ b/hw/cirrus_vga.c
@@ -241,6 +241,7 @@ typedef struct CirrusVGAState {
PCIDevice dev;
VGACommonState vga;
+ int is_pci;
int cirrus_linear_io_addr;
int cirrus_linear_bitblt_io_addr;
int cirrus_mmio_io_addr;
@@ -3017,8 +3018,8 @@ static void cirrus_vga_save(QEMUFile *f, void *opaque)
{
CirrusVGAState *s = opaque;
- if (s->vga.pci_dev)
- pci_device_save(s->vga.pci_dev, f);
+ if (s->is_pci)
+ pci_device_save(&s->dev, f);
qemu_put_be32s(f, &s->vga.latch);
qemu_put_8s(f, &s->vga.sr_index);
@@ -3063,8 +3064,8 @@ static int cirrus_vga_load(QEMUFile *f, void *opaque, int
version_id)
if (version_id > 2)
return -EINVAL;
- if (s->vga.pci_dev && version_id >= 2) {
- ret = pci_device_load(s->vga.pci_dev, f);
+ if (s->is_pci && version_id >= 2) {
+ ret = pci_device_load(&s->dev, f);
if (ret < 0)
return ret;
}
@@ -3306,7 +3307,7 @@ static void pci_cirrus_vga_initfn(PCIDevice *dev)
/* setup VGA */
vga_common_init(&s->vga, VGA_RAM_SIZE);
cirrus_init_common(s, device_id, 1);
- s->vga.pci_dev = dev;
+ s->is_pci = 1;
s->vga.ds = graphic_console_init(s->vga.update, s->vga.invalidate,
s->vga.screen_dump, s->vga.text_update,
&s->vga);
--
1.6.2.5
- [Qemu-devel] [PATCH 10/22] rtl8139: Remove unneeded double indirection of PCIRTL8139State, (continued)
- [Qemu-devel] [PATCH 10/22] rtl8139: Remove unneeded double indirection of PCIRTL8139State, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 12/22] lsi53c895a: remove pointless cast from void *, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 13/22] lsi53c895a: use DO_UPCAST to cast from PCIDevice, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 14/22] lsi53c895a: rename PCIDevice field from pci_dev to dev (consistence), Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 15/22] lsi53c895a: LSIState is a PCIDevice is a DeviceHost, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 16/22] usb-ohci: Remove unneeded double indirection of OHCIPCIState, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 17/22] cirrus_vga: Remove unneeded double indirection of PCICirrusVGAState, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 18/22] cirrus_vga: remove pointless cast from void *, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 19/22] cirrus_vga: change use of pci_dev for is_pci,
Juan Quintela <=
- [Qemu-devel] [PATCH 20/22] Introduce vga_common_reset() to be able to typcheck vga_reset(), Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 21/22] vga: Rename vga_state -> vga, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 22/22] Everything outside of vga.c should use VGACommonState, Juan Quintela, 2009/08/24
- Re: [Qemu-devel] [PATCH 00/22] Indirection Cleanup, Gerd Hoffmann, 2009/08/24