From patchwork Mon Aug 24 11:03:40 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 31920 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 D85EAB7B63 for ; Mon, 24 Aug 2009 21:42:12 +1000 (EST) Received: from localhost ([127.0.0.1]:39111 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MfXw6-0006Kv-M2 for incoming@patchwork.ozlabs.org; Mon, 24 Aug 2009 07:42:06 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MfXNl-0006Hn-49 for qemu-devel@nongnu.org; Mon, 24 Aug 2009 07:06:37 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MfXNf-0006Eg-HI for qemu-devel@nongnu.org; Mon, 24 Aug 2009 07:06:35 -0400 Received: from [199.232.76.173] (port=52634 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MfXNf-0006EK-D7 for qemu-devel@nongnu.org; Mon, 24 Aug 2009 07:06:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:64995) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MfXNe-0006xc-EM for qemu-devel@nongnu.org; Mon, 24 Aug 2009 07:06:30 -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 n7OB6T2j030889 for ; Mon, 24 Aug 2009 07:06:29 -0400 Received: from localhost.localdomain (vpn2-8-191.ams2.redhat.com [10.36.8.191]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n7OB63Uf030007; Mon, 24 Aug 2009 07:06:28 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 24 Aug 2009 13:03:40 +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 19/22] cirrus_vga: change use of pci_dev for is_pci 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 | 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);