From patchwork Mon Dec 18 17:30:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 122308 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp3187176qgn; Mon, 18 Dec 2017 10:43:56 -0800 (PST) X-Google-Smtp-Source: ACJfBosi7eNCCay2lror2HgVaKAsOe776POuVX1JH2nIEWhpohkvXP5ZCEK1uWOUYmoyqGCNaxQr X-Received: by 10.37.186.11 with SMTP id t11mr595773ybg.487.1513622636890; Mon, 18 Dec 2017 10:43:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513622636; cv=none; d=google.com; s=arc-20160816; b=Hj98UW6h9hfbvzocYZtcQw8/KXHAF1rdoqM0d18D2uHpO40YCXxwRRwRx++r6k0Mt1 yaIzfOZ4UXTig+twWK6PrLduXyE0EgAOa/JcjOaLLimj5JKMqt8HE+XAj+G1S5UOYCCD Q6mZIqkmaPPZFf0+QvGrG0fzimMd6p77ucsRp4IpCu6gxSUs0+befpRvUlqgdJ8lYtDx a9I1WtPhDoQ20vHq5CmjTd2e7CibQ4c2kfZja7iCfZQnSerrJvQKv/uPd1o1OjaM37q5 qHgqrrf1rDnhVY1uN9EogPGubQ5S5e6SxFanWzKneyRXJ1TZ9JO0H19Tls7URCxOVDLD uSQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=ENRXS9h8V/c69uI8RDsb604KEPZbwbCQK6rOp4tGF+0=; b=qcvcPy37dau9z0nsAm+XbK10ADT4rGT00PZR+uDC8cKr9gozJ65VGif6BaYHBVJes4 RYqdgRxtLApYS70qSD9qKMkG/xuFk5jFmvQgvrfEaUXEnENDEQqsPTnM9NPoFtVziTT9 Holzp23dMHqYAUrW2ffyuti0FS/7cqimj7YYWnz4qoXvzIBgx1bMyLyz/IKkQVnxle1g AEn579GQrvK/2mUzyRGFRjltJyjIiwMO/Kr4aolBF9DmFL7YHdo5p8rxWg96A8cxsk02 bEghC1EQnc3bRWy1gXwcYx7u/gRDv8GhMoTWRWE+MJpK6w0N8Y42nHwbxCXXNmfpU5EF aIBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=GAI0lLCO; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id x15si2540051ywj.361.2017.12.18.10.43.56 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 18 Dec 2017 10:43:56 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=GAI0lLCO; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52324 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eR0OK-0008AG-Bh for patch@linaro.org; Mon, 18 Dec 2017 13:43:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44403) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQzFO-0002gU-JF for qemu-devel@nongnu.org; Mon, 18 Dec 2017 12:30:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eQzFL-0004jj-IA for qemu-devel@nongnu.org; Mon, 18 Dec 2017 12:30:38 -0500 Received: from mail-pl0-x244.google.com ([2607:f8b0:400e:c01::244]:34488) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eQzFL-0004il-BB for qemu-devel@nongnu.org; Mon, 18 Dec 2017 12:30:35 -0500 Received: by mail-pl0-x244.google.com with SMTP id d21so5210906pll.1 for ; Mon, 18 Dec 2017 09:30:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ENRXS9h8V/c69uI8RDsb604KEPZbwbCQK6rOp4tGF+0=; b=GAI0lLCOJPGQ20OkTy+kPEmjC6D0i+/r+6wETWvkL4Tnb47Mwr7tDySVTpoj9/bosB 8Ep2inBB7qL9Xl2GrR8sNyQwGnXEQ1p/8V7cfzJnCyLcJv6pX1kMKAUnzcoalvzERjhh iPMruL9kjq+zWEO4HsJ4yVhW2I3iAItHULw5s= 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; bh=ENRXS9h8V/c69uI8RDsb604KEPZbwbCQK6rOp4tGF+0=; b=o+8k08swVS9bS0fIkpEQpoWMtORhw0KF0KC0XBRwQWMz1tlR+uCCCGwpeOls7ANy6A nf/ECf+ATjhDZhIuxe9RCORXajM0tFVVI5JOVkbV1pzB2urb9xf7EQ5Ju5XWnvhGcak3 Q9KwbhFUunT4Muncjpx0tyyyiIP95zsa84K9Aj7fg3NporDZpoHxIvDNIi8zIlaO9hPP ksGLddNCJ1lJlzWlML/kbPk0TEw0NgcFvrLatlAmOYktS51Aa+Knf+M7il1TRu6dBoPl 844W1pS9IJyTB+XOEIvjyvAsb360b6ZKxre4VfNVtfukkWJTOYFmaYT5QPRPkkFbBZC3 WvMw== X-Gm-Message-State: AKGB3mKL+SwBrr9g6jsTrss2zhz04/MlaoteNbr8AzhHqvt3IZHZwPDj kMpZV1e5hz+lGzFE2DilHxCPsalE+xU= X-Received: by 10.159.196.130 with SMTP id c2mr434568plo.123.1513618234037; Mon, 18 Dec 2017 09:30:34 -0800 (PST) Received: from cloudburst.twiddle.net (174-21-7-63.tukw.qwest.net. [174.21.7.63]) by smtp.gmail.com with ESMTPSA id h69sm26553411pfe.107.2017.12.18.09.30.32 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 18 Dec 2017 09:30:33 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 18 Dec 2017 09:30:19 -0800 Message-Id: <20171218173022.18418-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171218173022.18418-1-richard.henderson@linaro.org> References: <20171218173022.18418-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::244 Subject: [Qemu-devel] [PATCH 6/9] vmstate: Add VMSTATE_UINT64_SUB_ARRAY 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: peter.maydell@linaro.org, qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" At the same time, move VMSTATE_UINT32_SUB_ARRAY beside the other UINT32 definitions. Signed-off-by: Richard Henderson --- include/migration/vmstate.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) -- 2.14.3 Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Peter Maydell diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index 88b55df5ae..8c3889433c 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -905,6 +905,9 @@ extern const VMStateInfo vmstate_info_qtailq; #define VMSTATE_UINT32_ARRAY(_f, _s, _n) \ VMSTATE_UINT32_ARRAY_V(_f, _s, _n, 0) +#define VMSTATE_UINT32_SUB_ARRAY(_f, _s, _start, _num) \ + VMSTATE_SUB_ARRAY(_f, _s, _start, _num, 0, vmstate_info_uint32, uint32_t) + #define VMSTATE_UINT32_2DARRAY(_f, _s, _n1, _n2) \ VMSTATE_UINT32_2DARRAY_V(_f, _s, _n1, _n2, 0) @@ -914,6 +917,9 @@ extern const VMStateInfo vmstate_info_qtailq; #define VMSTATE_UINT64_ARRAY(_f, _s, _n) \ VMSTATE_UINT64_ARRAY_V(_f, _s, _n, 0) +#define VMSTATE_UINT64_SUB_ARRAY(_f, _s, _start, _num) \ + VMSTATE_SUB_ARRAY(_f, _s, _start, _num, 0, vmstate_info_uint64, uint64_t) + #define VMSTATE_UINT64_2DARRAY(_f, _s, _n1, _n2) \ VMSTATE_UINT64_2DARRAY_V(_f, _s, _n1, _n2, 0) @@ -932,9 +938,6 @@ extern const VMStateInfo vmstate_info_qtailq; #define VMSTATE_INT32_ARRAY(_f, _s, _n) \ VMSTATE_INT32_ARRAY_V(_f, _s, _n, 0) -#define VMSTATE_UINT32_SUB_ARRAY(_f, _s, _start, _num) \ - VMSTATE_SUB_ARRAY(_f, _s, _start, _num, 0, vmstate_info_uint32, uint32_t) - #define VMSTATE_INT64_ARRAY_V(_f, _s, _n, _v) \ VMSTATE_ARRAY(_f, _s, _n, _v, vmstate_info_int64, int64_t)