From patchwork Thu Jan 25 13:43:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 125833 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp1122763ljf; Thu, 25 Jan 2018 05:46:39 -0800 (PST) X-Google-Smtp-Source: AH8x226X9FCEgMK/0sT9kvPw0AW2PrqMH/qaAdFh4tV0WKfCWhLBEiBdLur8j0bQwa4LUpDAa3I7 X-Received: by 10.37.130.144 with SMTP id r16mr907177ybk.21.1516887999642; Thu, 25 Jan 2018 05:46:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516887999; cv=none; d=google.com; s=arc-20160816; b=XAOVXgRE7ZdZ/X9HJ9vA9nK6LmzAczDO5YOp4yMTOmVGcPT4DRG7EzfIZEcRvUQIEU fzZO/Yij2HfdK0TyPLSFlLQEtu0HpBbxpuXdb6SVd41cYbT8F4yN3G9aWEo6Z8EDSiT0 5OWqCGcHHwP33EoudUItePju7jW8qkhj2MT4Cik6ym9mxi73NvOHMsApUCXFHORcDV9d j9lcDjB39lN7Vk9AyojygqOsifHtT9S0QXKbgXyzakosiq7zPiOK3uKC0RlDT9eBBpVu TWJsiOsp0uFX4t+xgwVmJhA+YdPRP2ryBS0eRIFgJhEyLrgBB6OcqSVFxeEz5N/j5JDa W0cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=HG0zEGFnFHHdUiErJSJAaW36NgZ4P+DkFXzEPj+7LkU=; b=oZNERkodzxaW49lSA4qXZdMIPzT/LuzgJZwd1WGCVhSZf+rgQIOQTltBr2JHge24Ux FbWhvAbHVus9aHmAQ2hiPbCuvrapqm7t6DmYKEO2xdYaEq7vpCTpFJLuspfxdCj8r1Oa guJAKZPA3NevE66STvQ+hfCZug3e/tlU1+y4Hanmwt5IrOz/m+I/TQ2ygRFYncW8xFHG yb5SmBJnYx0d6qoJ+qTthzDgJNlHAvqYJpQOtTcMfrfzXxB6OHrjZdRYhAISigT34CMD dch09TigvV1DRMI12uNjIiF9ezpKtwK9dt+t8ubZf0Z8CX5E5FAhkYcJxPFvhJ3Wzq7W XQcw== ARC-Authentication-Results: i=1; mx.google.com; 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 q124si471989ywb.237.2018.01.25.05.46.39 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 25 Jan 2018 05:46:39 -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; 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]:41381 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eehrT-0004Q2-1W for patch@linaro.org; Thu, 25 Jan 2018 08:46:39 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33571) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eehob-0003BF-3r for qemu-devel@nongnu.org; Thu, 25 Jan 2018 08:43:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eehoa-00034g-7T for qemu-devel@nongnu.org; Thu, 25 Jan 2018 08:43:41 -0500 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:45984) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eehoa-00033y-04 for qemu-devel@nongnu.org; Thu, 25 Jan 2018 08:43:40 -0500 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1eehoY-0006tA-UL for qemu-devel@nongnu.org; Thu, 25 Jan 2018 13:43:38 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 25 Jan 2018 13:43:17 +0000 Message-Id: <1516887809-6265-10-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516887809-6265-1-git-send-email-peter.maydell@linaro.org> References: <1516887809-6265-1-git-send-email-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 09/21] 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson At the same time, move VMSTATE_UINT32_SUB_ARRAY beside the other UINT32 definitions. Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20180119045438.28582-8-richard.henderson@linaro.org Reviewed-by: Alex Bennée Signed-off-by: Peter Maydell --- include/migration/vmstate.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) -- 2.7.4 diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index 88b55df..8c38894 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)