From patchwork Mon Aug 24 16:42:55 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 31991 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 420B3B7B68 for ; Tue, 25 Aug 2009 03:49:29 +1000 (EST) Received: from localhost ([127.0.0.1]:50792 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mfdfa-0001xC-1m for incoming@patchwork.ozlabs.org; Mon, 24 Aug 2009 13:49:26 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mfcg9-0001N1-FM for qemu-devel@nongnu.org; Mon, 24 Aug 2009 12:45:57 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mfcg2-0001Cy-Kw for qemu-devel@nongnu.org; Mon, 24 Aug 2009 12:45:55 -0400 Received: from [199.232.76.173] (port=33827 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mfcg2-0001Cd-78 for qemu-devel@nongnu.org; Mon, 24 Aug 2009 12:45:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:62200) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mfcg1-00037R-9z for qemu-devel@nongnu.org; Mon, 24 Aug 2009 12:45:49 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n7OGjli2020815 for ; Mon, 24 Aug 2009 12:45:48 -0400 Received: from localhost.localdomain (vpn1-4-157.ams2.redhat.com [10.36.4.157]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n7OGjKUD024317; Mon, 24 Aug 2009 12:45:46 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 24 Aug 2009 18:42:55 +0200 Message-Id: <1ccc4ae5c9f928bb178ef97fb10a2a8d1c5a65af.1251131364.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 21/26] cirrus_vga: Change casts to DO_UPCAST() for PCICirrusVGAState 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 Signed-off-by: Juan Quintela --- hw/cirrus_vga.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index 5bfacb2..9bcaa96 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c @@ -3263,7 +3263,7 @@ void isa_cirrus_vga_init(void) static void cirrus_pci_lfb_map(PCIDevice *d, int region_num, uint32_t addr, uint32_t size, int type) { - CirrusVGAState *s = &((PCICirrusVGAState *)d)->cirrus_vga; + CirrusVGAState *s = &DO_UPCAST(PCICirrusVGAState, dev, d)->cirrus_vga; /* XXX: add byte swapping apertures */ cpu_register_physical_memory(addr, s->vga.vram_size, @@ -3284,7 +3284,7 @@ static void cirrus_pci_lfb_map(PCIDevice *d, int region_num, static void cirrus_pci_mmio_map(PCIDevice *d, int region_num, uint32_t addr, uint32_t size, int type) { - CirrusVGAState *s = &((PCICirrusVGAState *)d)->cirrus_vga; + CirrusVGAState *s = &DO_UPCAST(PCICirrusVGAState, dev, d)->cirrus_vga; cpu_register_physical_memory(addr, CIRRUS_PNPMMIO_SIZE, s->cirrus_mmio_io_addr); @@ -3293,11 +3293,11 @@ static void cirrus_pci_mmio_map(PCIDevice *d, int region_num, static void pci_cirrus_write_config(PCIDevice *d, uint32_t address, uint32_t val, int len) { - PCICirrusVGAState *pvs = container_of(d, PCICirrusVGAState, dev); + PCICirrusVGAState *pvs = DO_UPCAST(PCICirrusVGAState, dev, d); CirrusVGAState *s = &pvs->cirrus_vga; pci_default_write_config(d, address, val, len); - if (s->vga.map_addr && pvs->dev.io_regions[0].addr == -1) + if (s->vga.map_addr && d->io_regions[0].addr == -1) s->vga.map_addr = 0; cirrus_update_memory_access(s); } @@ -3312,7 +3312,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 = (PCIDevice *)d; + s->vga.pci_dev = dev; s->vga.ds = graphic_console_init(s->vga.update, s->vga.invalidate, s->vga.screen_dump, s->vga.text_update, &s->vga);