From patchwork Mon Aug 24 16:42:56 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 31987 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 DBE48B7B65 for ; Tue, 25 Aug 2009 03:43:41 +1000 (EST) Received: from localhost ([127.0.0.1]:34328 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MfdZy-0005hs-Dl for incoming@patchwork.ozlabs.org; Mon, 24 Aug 2009 13:43:38 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mfcg7-0001Jo-DE for qemu-devel@nongnu.org; Mon, 24 Aug 2009 12:45:55 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mfcg3-0001Dm-3O for qemu-devel@nongnu.org; Mon, 24 Aug 2009 12:45:54 -0400 Received: from [199.232.76.173] (port=33828 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mfcg2-0001DS-Oc for qemu-devel@nongnu.org; Mon, 24 Aug 2009 12:45:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32394) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mfcg1-00037g-VX for qemu-devel@nongnu.org; Mon, 24 Aug 2009 12:45:50 -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 n7OGjnNc022424 for ; Mon, 24 Aug 2009 12:45:49 -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 n7OGjKUE024317; Mon, 24 Aug 2009 12:45:48 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 24 Aug 2009 18:42:56 +0200 Message-Id: <6af7aacfdace3c84449d2d5ec413205b4778e898.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 22/26] Add pci_cirrus_vga_{save/load} functions, then remove vga.pci_dev use 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 | 39 +++++++++++++++++++++++++++------------ 1 files changed, 27 insertions(+), 12 deletions(-) diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index 9bcaa96..16cc054 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c @@ -3021,9 +3021,6 @@ 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); - qemu_put_be32s(f, &s->vga.latch); qemu_put_8s(f, &s->vga.sr_index); qemu_put_buffer(f, s->vga.sr, 256); @@ -3062,17 +3059,10 @@ static void cirrus_vga_save(QEMUFile *f, void *opaque) static int cirrus_vga_load(QEMUFile *f, void *opaque, int version_id) { CirrusVGAState *s = opaque; - int ret; if (version_id > 2) return -EINVAL; - if (s->vga.pci_dev && version_id >= 2) { - ret = pci_device_load(s->vga.pci_dev, f); - if (ret < 0) - return ret; - } - qemu_get_be32s(f, &s->vga.latch); qemu_get_8s(f, &s->vga.sr_index); qemu_get_buffer(f, s->vga.sr, 256); @@ -3115,6 +3105,31 @@ static int cirrus_vga_load(QEMUFile *f, void *opaque, int version_id) return 0; } +static void pci_cirrus_vga_save(QEMUFile *f, void *opaque) +{ + PCICirrusVGAState *s = opaque; + + pci_device_save(&s->dev, f); + cirrus_vga_save(f, &s->cirrus_vga); +} + +static int pci_cirrus_vga_load(QEMUFile *f, void *opaque, int version_id) +{ + PCICirrusVGAState *s = opaque; + int ret; + + if (version_id > 2) + return -EINVAL; + + if (version_id >= 2) { + ret = pci_device_load(&s->dev, f); + if (ret < 0) + return ret; + } + + return cirrus_vga_load(f, &s->cirrus_vga, version_id); +} + /*************************************** * * initialize @@ -3231,7 +3246,6 @@ static void cirrus_init_common(CirrusVGAState * s, int device_id, int is_pci) qemu_register_reset(cirrus_reset, s); cirrus_reset(s); - register_savevm("cirrus_vga", 0, 2, cirrus_vga_save, cirrus_vga_load, s); } /*************************************** @@ -3251,6 +3265,7 @@ void isa_cirrus_vga_init(void) s->vga.ds = graphic_console_init(s->vga.update, s->vga.invalidate, s->vga.screen_dump, s->vga.text_update, &s->vga); + register_savevm("cirrus_vga", 0, 2, cirrus_vga_save, cirrus_vga_load, s); /* XXX ISA-LFB support */ } @@ -3312,7 +3327,6 @@ 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->vga.ds = graphic_console_init(s->vga.update, s->vga.invalidate, s->vga.screen_dump, s->vga.text_update, &s->vga); @@ -3334,6 +3348,7 @@ static void pci_cirrus_vga_initfn(PCIDevice *dev) pci_register_bar((PCIDevice *)d, 1, CIRRUS_PNPMMIO_SIZE, PCI_ADDRESS_SPACE_MEM, cirrus_pci_mmio_map); } + register_savevm("cirrus_vga", 0, 2, pci_cirrus_vga_save, pci_cirrus_vga_load, d); /* XXX: ROM BIOS */ }