From patchwork Sun Apr 16 23:23:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stafford Horne X-Patchwork-Id: 9683261 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C721660138 for ; Sun, 16 Apr 2017 23:28:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B8F8B27BA5 for ; Sun, 16 Apr 2017 23:28:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ADB5327CF3; Sun, 16 Apr 2017 23:28:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 64CA727BA5 for ; Sun, 16 Apr 2017 23:28:08 +0000 (UTC) Received: from localhost ([::1]:33923 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cztaR-0005wc-Lw for patchwork-qemu-devel@patchwork.kernel.org; Sun, 16 Apr 2017 19:28:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37979) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cztWk-0003nZ-Q3 for qemu-devel@nongnu.org; Sun, 16 Apr 2017 19:24:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cztWj-0007zG-U0 for qemu-devel@nongnu.org; Sun, 16 Apr 2017 19:24:18 -0400 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]:33400) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cztWj-0007yk-OZ for qemu-devel@nongnu.org; Sun, 16 Apr 2017 19:24:17 -0400 Received: by mail-pf0-x242.google.com with SMTP id c198so22067249pfc.0 for ; Sun, 16 Apr 2017 16:24:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=+4Icp+M0RQj6v24329W16eXLptpcG7P4F8rWNRb6XDQ=; b=IzBRjXaaoJStS3KrkDSdtF5N5KeYLK7V00DrJVPUJd91MEgbqMS5pexoYQ7yS/R1iZ HUUU7ubvopjaeOWufBDJnKQLGasetsOFQyV2UlsP7seQpiyYUtLxycmjMiho5weFSh8y R8VG9s3nQwGLG9GJ3xxgAabxNMlPBsIV9BxrXpBIWC9cH8SEQ7lrCTwEaU1023aomD3g u1Cq8uBtzVGv1wZAMlKGaISO7Eyjyg4qcZzvRxJP546VEgHHhn8X8HX4yKJJ92rEWuvd VuJAZesFL2qeWZNE7FwqVK2b4GbufMCUN6vqvF4/60jAUnjKhxXBzZgyW4U2KMfTxNnd JhoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=+4Icp+M0RQj6v24329W16eXLptpcG7P4F8rWNRb6XDQ=; b=XF7Ue/XKZ4ofZ+0yRoo8IQc04IPhkc6stgfvWaoopcX2GoqUdsKaNfTIXjr/NjCXtp wpL/IrK2GEe20QDKYyQDLVheuPt4lJ7X9nbEFAOnsqGvxL+/ZQGLbX8bxVvLM9yGGLsN ZVJyfktTg/ctKJLzgtIrMYL5tu76ps837bcJrpkrkF93ipIbzVdc3oMiqb/OGk2VGpb+ 8HtaXjsrvy+jtMOkuzhgV72Pfr9sMV5b2g9xo2tED3FDEpFo5qJU/iNkKbN8O9CgYN5X Ax6A7OC4jozE8O0idIJc2oDdc4E8o+enkdIPCxap8wv6T6AR6hNa/RDGxyBPfui/1UKi kLPw== X-Gm-Message-State: AN3rC/6mwCJ5QQEL/aNQl3pOgRP09CInfd+CPzFBp83CcgrWHxKbKI9d MiGR5rGd+RJTjw== X-Received: by 10.99.2.72 with SMTP id 69mr8996434pgc.23.1492385056948; Sun, 16 Apr 2017 16:24:16 -0700 (PDT) Received: from localhost (z24.124-44-184.ppp.wakwak.ne.jp. [124.44.184.24]) by smtp.gmail.com with ESMTPSA id d83sm8856129pfe.40.2017.04.16.16.24.16 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 16 Apr 2017 16:24:16 -0700 (PDT) From: Stafford Horne To: qemu-devel@nongnu.org Date: Mon, 17 Apr 2017 08:23:54 +0900 Message-Id: <319fd7910ccc8ab543e2396f3d757f76084eac88.1492384862.git.shorne@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::242 Subject: [Qemu-devel] [PATCH 5/7] migration: Add VMSTATE_UINTTL_2DARRAY() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stafford Horne , openrisc@lists.librecores.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP In openRISC we are implementing the shadow registers as a 2d array. Using this target long method rather than direct 32-bit alternatives is consistent with the rest of our vm state serialization logic. Signed-off-by: Stafford Horne --- include/migration/cpu.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/migration/cpu.h b/include/migration/cpu.h index f3d5dfc..a40bd35 100644 --- a/include/migration/cpu.h +++ b/include/migration/cpu.h @@ -18,6 +18,8 @@ VMSTATE_UINT64_EQUAL_V(_f, _s, _v) #define VMSTATE_UINTTL_ARRAY_V(_f, _s, _n, _v) \ VMSTATE_UINT64_ARRAY_V(_f, _s, _n, _v) +#define VMSTATE_UINTTL_2DARRAY_V(_f, _s, _n1, _n2, _v) \ + VMSTATE_UINT64_2DARRAY_V(_f, _s, _n1, _n2, _v) #define VMSTATE_UINTTL_TEST(_f, _s, _t) \ VMSTATE_UINT64_TEST(_f, _s, _t) #define vmstate_info_uinttl vmstate_info_uint64 @@ -37,6 +39,8 @@ VMSTATE_UINT32_EQUAL_V(_f, _s, _v) #define VMSTATE_UINTTL_ARRAY_V(_f, _s, _n, _v) \ VMSTATE_UINT32_ARRAY_V(_f, _s, _n, _v) +#define VMSTATE_UINTTL_2DARRAY_V(_f, _s, _n1, _n2, _v) \ + VMSTATE_UINT32_2DARRAY_V(_f, _s, _n1, _n2, _v) #define VMSTATE_UINTTL_TEST(_f, _s, _t) \ VMSTATE_UINT32_TEST(_f, _s, _t) #define vmstate_info_uinttl vmstate_info_uint32 @@ -48,5 +52,8 @@ VMSTATE_UINTTL_EQUAL_V(_f, _s, 0) #define VMSTATE_UINTTL_ARRAY(_f, _s, _n) \ VMSTATE_UINTTL_ARRAY_V(_f, _s, _n, 0) +#define VMSTATE_UINTTL_2DARRAY(_f, _s, _n1, _n2) \ + VMSTATE_UINTTL_2DARRAY_V(_f, _s, _n1, _n2, 0) + #endif