From patchwork Sun Apr 30 23:14:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stafford Horne X-Patchwork-Id: 756931 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wGNhT6Ng2z9sCX for ; Mon, 1 May 2017 09:15:53 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="S1aVJSRV"; dkim-atps=neutral Received: from localhost ([::1]:46176 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4y4F-00020p-83 for incoming@patchwork.ozlabs.org; Sun, 30 Apr 2017 19:15:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60429) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4y3W-0001y9-JA for qemu-devel@nongnu.org; Sun, 30 Apr 2017 19:15:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d4y3V-0006Ys-RV for qemu-devel@nongnu.org; Sun, 30 Apr 2017 19:15:06 -0400 Received: from mail-pf0-x241.google.com ([2607:f8b0:400e:c00::241]:34908) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d4y3V-0006YT-LT for qemu-devel@nongnu.org; Sun, 30 Apr 2017 19:15:05 -0400 Received: by mail-pf0-x241.google.com with SMTP id o68so6703874pfj.2 for ; Sun, 30 Apr 2017 16:15:05 -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=S1aVJSRVIhAVUPegKBHVV0uTxGHmfdg/e+0/i2AK1ujRq+iU2SIgoi44emhB4ETbpN FXJ5D08HJ3IB1+hY8ciaKrSBaKP1WawvQGNiOTKkYl41mDHdnFqj0Ip5Ux3u4S9zEpJF YySKoNiRHjQjyF+pg0FR7PRyrrBnXLJ+C/DyWv4i5Ns7+j75S7Osw/BqgavXXUAIGUbU slIkHSc2XeH7QJgcUkUBpsaAlCxpSpOj7bUKameCJv8C/VdyQl+BvAKaStfkrA2jcYH4 Hy6JL0gX+6hYBEjxs23lKEf1fj0mjCM8cIZY3rCtoLibl+SXGWgxCYf1JiuJupaUPhIv A8jw== 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=iaPNIOlFZsBj/UOulyfx/ahbxNnlwycAhndn6sxDR2rV29CA6YHvOz7HGnzb+A/RdX aD9LwmudB0TdaubOhgSYf6GFlldJXzAeJDUzIjOSBTl2Kf31sXs4HOqayZ9WDuvJKp89 fdIszE/+nm2hTt9Ulz3XDlUjq+234D+rRkE2SjVUvqxuS6fXtH2fbbf3kcQcq6qbFDvs CqDH8kunwY44TOU2wMdEXECJGmle5J3TXMKKaX0GCMmt7qxQKc/V48LCBSJEwXj4GTWf 64oS8GxAmB/EL+DovriA5Qk+tPFcG4fWcXfP8aA58mjPfiWKZKKkIzVeYTb2Lcw1Nprp geKw== X-Gm-Message-State: AN3rC/52w4QvYcmz5taFILtlVKlP8ShdIDXROf3vL1qYEf1ZmsmouG+7 rnjj+H8lrsPpZg== X-Received: by 10.99.150.17 with SMTP id c17mr24230783pge.160.1493594104844; Sun, 30 Apr 2017 16:15:04 -0700 (PDT) Received: from localhost (z209.124-44-183.ppp.wakwak.ne.jp. [124.44.183.209]) by smtp.gmail.com with ESMTPSA id d82sm20223104pfl.124.2017.04.30.16.15.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 30 Apr 2017 16:15:04 -0700 (PDT) From: Stafford Horne To: peter.maydell@linaro.org Date: Mon, 1 May 2017 08:14:20 +0900 Message-Id: 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::241 Subject: [Qemu-devel] [PULL 06/11] 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 , QEMU Development Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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