From patchwork Thu Nov 1 13:04:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 196197 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 76B152C020B for ; Fri, 2 Nov 2012 00:39:14 +1100 (EST) Received: from localhost ([::1]:50387 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTuzH-0003s3-BZ for incoming@patchwork.ozlabs.org; Thu, 01 Nov 2012 09:39:11 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59539) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTuSg-0005GR-HK for qemu-devel@nongnu.org; Thu, 01 Nov 2012 09:05:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TTuSf-0006bi-19 for qemu-devel@nongnu.org; Thu, 01 Nov 2012 09:05:30 -0400 Received: from mail-ia0-f173.google.com ([209.85.210.173]:60542) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTuSe-000627-Si for qemu-devel@nongnu.org; Thu, 01 Nov 2012 09:05:28 -0400 Received: by mail-ia0-f173.google.com with SMTP id m10so1965034iam.4 for ; Thu, 01 Nov 2012 06:05:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=XIwxtsfY3bMABC7iTH0GAFEvVCiITTBp2N7s1NuV6WQ=; b=dcT25bJj/lhQ1R4MaxbfH6B3tA2E+Ky3F5dEQjxOue83uMpgBr4BjMogLCNUOrfYf/ w12lR7dgZsuDjEZfbHmH2SbNWC0ba0FeDLkfoT2vfsUM1GtOwxxPTRO4lBfzUQnTyAsc BiiME8fF3syS5v6+R4uPB0fp5mxgXGtWunsGKDQHVNpBzdloTXUgI9w4M+QMfoQ2WdD1 8LTJHvYorF1Imbd1MiZswDmDv4ipw4CaJjFZgYdsiel8DGajxyS39mYJEQlAwesM6QUr XVwCrHg/2bpJQ698DeTguuH7Y4+w9xg7+E/xM0Bdr6DB+ak8EYcJNrIcOIZyyMjx6TTN 2lTw== Received: by 10.42.33.7 with SMTP id g7mr9720749icd.9.1351775128621; Thu, 01 Nov 2012 06:05:28 -0700 (PDT) Received: from loki.morrigu.org (cpe-72-179-62-111.austin.res.rr.com. [72.179.62.111]) by mx.google.com with ESMTPS id dq9sm5734584igc.5.2012.11.01.06.05.27 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 01 Nov 2012 06:05:28 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Thu, 1 Nov 2012 08:04:29 -0500 Message-Id: <1351775071-7644-28-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1351775071-7644-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1351775071-7644-1-git-send-email-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.210.173 Cc: kwolf@redhat.com, peter.maydell@linaro.org, aliguori@us.ibm.com, quintela@redhat.com, blauwirbel@gmail.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH 27/29] ide: add qom property for piix3/piix4-ide state X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Michael Roth --- hw/ide/pci.c | 9 +++++++-- hw/ide/pci.h | 3 +++ hw/ide/piix.c | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 2 deletions(-) diff --git a/hw/ide/pci.c b/hw/ide/pci.c index bcdd70e..6629b3a 100644 --- a/hw/ide/pci.c +++ b/hw/ide/pci.c @@ -28,9 +28,14 @@ #include #include "block.h" #include "dma.h" +#include "qidl.h" #include +QIDL_ENABLE() +QIDL_IMPLEMENT_PUBLIC(BMDMAState) +QIDL_IMPLEMENT_PUBLIC(PCIIDEState) + #define BMDMA_PAGE_SIZE 4096 static void bmdma_start_dma(IDEDMA *dma, IDEState *s, @@ -380,7 +385,7 @@ static bool ide_bmdma_status_needed(void *opaque) return ((bm->status & abused_bits) != 0); } -static void ide_bmdma_pre_save(void *opaque) +void ide_bmdma_pre_save(void *opaque) { BMDMAState *bm = opaque; uint8_t abused_bits = BM_MIGRATION_COMPAT_STATUS_BITS; @@ -458,7 +463,7 @@ static const VMStateDescription vmstate_bmdma = { } }; -static int ide_pci_post_load(void *opaque, int version_id) +int ide_pci_post_load(void *opaque, int version_id) { PCIIDEState *d = opaque; int i; diff --git a/hw/ide/pci.h b/hw/ide/pci.h index b54ea26..de9545f 100644 --- a/hw/ide/pci.h +++ b/hw/ide/pci.h @@ -4,6 +4,9 @@ #include #include "qidl.h" +void ide_bmdma_pre_save(void *opaque); +int ide_pci_post_load(void *opaque, int version_id); + typedef struct BMDMAState BMDMAState; QIDL_DECLARE_PUBLIC(BMDMAState) { diff --git a/hw/ide/piix.c b/hw/ide/piix.c index 9431bad..e65b689 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -30,9 +30,12 @@ #include "blockdev.h" #include "sysemu.h" #include "dma.h" +#include "qidl.h" #include +QIDL_ENABLE() + static uint64_t bmdma_read(void *opaque, hwaddr addr, unsigned size) { BMDMAState *bm = opaque; @@ -147,6 +150,38 @@ static void pci_piix_init_ports(PCIIDEState *d) { } } +static void pci_piix_ide_get_state(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + PCIDevice *pci = PCI_DEVICE(obj); + PCIIDEState *s = DO_UPCAST(PCIIDEState, dev, pci); + int i, j; + + for (i = 0; i < 2; i++) { + for (j = 0; j < 2; j++) { + ide_drive_pio_pre_save(&s->bus[i].ifs[j]); + } + ide_bmdma_pre_save(&s->bmdma[i]); + } + QIDL_VISIT_TYPE(PCIIDEState, v, &s, name, errp); +} + +static void pci_piix_ide_set_state(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + PCIDevice *pci = PCI_DEVICE(obj); + PCIIDEState *s = DO_UPCAST(PCIIDEState, dev, pci); + int i, j; + + QIDL_VISIT_TYPE(PCIIDEState, v, &s, name, errp); + for (i = 0; i < 2; i++) { + for (j = 0; j < 2; j++) { + ide_drive_pio_post_load(&s->bus[i].ifs[j], -1); + } + } + ide_pci_post_load(s, -1); +} + static int pci_piix_ide_initfn(PCIDevice *dev) { PCIIDEState *d = DO_UPCAST(PCIIDEState, dev, dev); @@ -162,6 +197,10 @@ static int pci_piix_ide_initfn(PCIDevice *dev) vmstate_register(&d->dev.qdev, 0, &vmstate_ide_pci, d); pci_piix_init_ports(d); + object_property_add(OBJECT(d), "state", "PCIIDEState", + pci_piix_ide_get_state, pci_piix_ide_set_state, + NULL, NULL, NULL); + QIDL_SCHEMA_ADD_LINK(PCIIDEState, OBJECT(d), "state_schema", NULL); return 0; }