From patchwork Tue Nov 20 13:31:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 12997 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id DC28123FC0 for ; Tue, 20 Nov 2012 13:54:54 +0000 (UTC) Received: from mail-ia0-f180.google.com (mail-ia0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 831E2A18FC9 for ; Tue, 20 Nov 2012 13:54:54 +0000 (UTC) Received: by mail-ia0-f180.google.com with SMTP id t4so1710131iag.11 for ; Tue, 20 Nov 2012 05:54:54 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding :x-gm-message-state; bh=ZdLKVVv2nnvjqZcDfwmUjSac/T+K3uIk9NKsmjrC9+M=; b=YSuAZP0JIEhQQnvWpiJ9999cOjoXlssvl5AtTJv9GT/GaAnEJKFCYNMh+q27K7qpP8 9bNwZwJT1lQd/nHWd/V0H0WeAEpje/oN/LAlFmsQUPZUU98QsnEDPOaspHm/X5F+NL/N wjZtQ4X5iz+cNsmwgY8qUQLoRu5yX1o60jkWH9WmF3UI0pDh/xo1EaEx3HRVDV6/4WEb dH5LWfzlWCIfG4VH7cWbtNs4carhJhRISVLQXC0lXj6WLVmAN88TXlbR+EIhdpyJtv9/ Omtw3CDfzKFsjkSuPP7Z/2mxhBm9JUilUCJl49ZckaA6yanVA7LrS9XW2unzKXHKOgOQ wLKA== Received: by 10.50.91.195 with SMTP id cg3mr9985187igb.57.1353419694298; Tue, 20 Nov 2012 05:54:54 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp320866igt; Tue, 20 Nov 2012 05:54:53 -0800 (PST) Received: by 10.180.24.193 with SMTP id w1mr14585270wif.22.1353419693080; Tue, 20 Nov 2012 05:54:53 -0800 (PST) Received: from mnementh.archaic.org.uk (1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id c9si6320081wix.20.2012.11.20.05.54.52 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 20 Nov 2012 05:54:53 -0800 (PST) Received-SPF: neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) client-ip=2001:8b0:1d0::1; Authentication-Results: mx.google.com; spf=neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1Tanuw-0006Dk-SB; Tue, 20 Nov 2012 13:31:10 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, patches@linaro.org, Blue Swirl , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Avi Kivity , Marcelo Tosatti Subject: [RFC v4 4/8] hw/arm_gic: Add presave/postload hooks Date: Tue, 20 Nov 2012 13:31:06 +0000 Message-Id: <1353418270-23881-5-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1353418270-23881-1-git-send-email-peter.maydell@linaro.org> References: <1353418270-23881-1-git-send-email-peter.maydell@linaro.org> MIME-Version: 1.0 X-Gm-Message-State: ALoCoQlCi+WwtbzVRBmIeMhMOhdH7DTWdp4wp1mZlKuc//HtdvCTmWLtN+wPWabax10KpT6EkTPZ Add presave/postload hooks to the ARM GIC common base class. These will be used by the KVM in-kernel GIC subclass to sync state between kernel and userspace when migrating. Signed-off-by: Peter Maydell Reviewed-by: Andreas Färber --- hw/arm_gic_common.c | 10 ++++++++++ hw/arm_gic_internal.h | 2 ++ 2 files changed, 12 insertions(+) diff --git a/hw/arm_gic_common.c b/hw/arm_gic_common.c index 8369309..961b44c 100644 --- a/hw/arm_gic_common.c +++ b/hw/arm_gic_common.c @@ -23,9 +23,14 @@ static void gic_save(QEMUFile *f, void *opaque) { GICState *s = (GICState *)opaque; + ARMGICCommonClass *c = ARM_GIC_COMMON_GET_CLASS(s); int i; int j; + if (c->pre_save) { + c->pre_save(s); + } + qemu_put_be32(f, s->enabled); for (i = 0; i < s->num_cpu; i++) { qemu_put_be32(f, s->cpu_enabled[i]); @@ -57,6 +62,7 @@ static void gic_save(QEMUFile *f, void *opaque) static int gic_load(QEMUFile *f, void *opaque, int version_id) { GICState *s = (GICState *)opaque; + ARMGICCommonClass *c = ARM_GIC_COMMON_GET_CLASS(s); int i; int j; @@ -91,6 +97,10 @@ static int gic_load(QEMUFile *f, void *opaque, int version_id) s->irq_state[i].trigger = qemu_get_byte(f); } + if (c->post_load) { + c->post_load(s); + } + return 0; } diff --git a/hw/arm_gic_internal.h b/hw/arm_gic_internal.h index 699352c..3640be0 100644 --- a/hw/arm_gic_internal.h +++ b/hw/arm_gic_internal.h @@ -118,6 +118,8 @@ void gic_init_irqs_and_distributor(GICState *s, int num_irq); typedef struct ARMGICCommonClass { SysBusDeviceClass parent_class; + void (*pre_save)(GICState *s); + void (*post_load)(GICState *s); } ARMGICCommonClass; #define TYPE_ARM_GIC "arm_gic"