From patchwork Fri Jan 19 04:54:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 125074 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp130530ljf; Thu, 18 Jan 2018 20:57:47 -0800 (PST) X-Google-Smtp-Source: ACJfBot5zayQ3mmPk2DV3ZjDSXymOdXp4cATo67cgvs50xrzK8eRrUlLOZXIiLGk+z+21aKOuLVm X-Received: by 10.37.219.133 with SMTP id g127mr13562485ybf.425.1516337867707; Thu, 18 Jan 2018 20:57:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516337867; cv=none; d=google.com; s=arc-20160816; b=wKcTrfNm//7HlMKb0T+FwVdBJ/Q6UcfPap5sUhcV6raPmbL7wZ3ohZRWtUU8bg6xIt QaVirLsJC7H9pSMDRcWl6t27c7nY+/toesQjY3f6K3DWbT0bJ55yZhl9J8+8q5l8OOaO Rf8vJN1ViJwnv3JnuuBYm29/XQ5AwLPoY37Y1fshrahqSDNAo30e0Fi2YOHPBQ03+sur cLXFfnOoPyiqGNZgksq4Bt3fJUAB22ZtnnQj5h0EiupUCsfVutP1Awg8QPKyeifWazU7 c2XVNdRYcKuOcgP1/D9NWwClKu4zEpsrX8kW1Yavv1RIhOQadmhjo+fPP1w+9Zq/XBiY b6Hg== 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 :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=x9PA8yjdEe9Kvb1NLwDZCFpm0U0h6iWdOQkgNTDHrIg=; b=CNfe7IrdfXND6dXKpDHkFMdxwsTRVBzHp83jzDdOTTFoLXKVjcCuSXPupS2Z8z6LgD WqUcsv6vsNGjptukqJyg2JZBrsGE7zzuelpskQZuot57nL90lXr22+zTvKpAwalwI159 5g+L2vLfuUAECzHmirngpkqww587jljM8E94aXSksFi0Y4RBJsyAb42hlmknDxJe8J5i vCwIKvSac2QRoQ5gEzYPmb2McghrRF4PzUl9QOL2vRAmrUtVaHvaSb8geKRkvgP4dA7P AQTs2g1fOnYk6AkkN6aHIhGPqHXJrqwZ2vM0YcV7a4xjpMSI+nMlz73Uu9BY7B2w+Snl GzMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=OMy+5GPM; 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 x66si457570yba.276.2018.01.18.20.57.47 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 18 Jan 2018 20:57:47 -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=OMy+5GPM; 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]:52266 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecOkN-0003aU-2s for patch@linaro.org; Thu, 18 Jan 2018 23:57:47 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58664) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecOhe-0002Dn-FJ for qemu-devel@nongnu.org; Thu, 18 Jan 2018 23:54:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ecOhc-0000C1-KU for qemu-devel@nongnu.org; Thu, 18 Jan 2018 23:54:58 -0500 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]:45122) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ecOhc-0000Aw-Ea for qemu-devel@nongnu.org; Thu, 18 Jan 2018 23:54:56 -0500 Received: by mail-pf0-x242.google.com with SMTP id a88so515686pfe.12 for ; Thu, 18 Jan 2018 20:54:56 -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 :mime-version:content-transfer-encoding; bh=x9PA8yjdEe9Kvb1NLwDZCFpm0U0h6iWdOQkgNTDHrIg=; b=OMy+5GPMpcPjniyJX3YLuejtVarh4MjwfU26uXYdyvh1SKSmRwqviejT6zn88dI8vj eTBGzFyzkYiD7j8zsYwWDLj08E6U3lNvUBAz/XXfzQw2yEn7OAH3+6ank2fNg34PAxzl JhHmFMdNRD/sGwyriSPUqnmhioqOSuyDIyk1Q= 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:mime-version:content-transfer-encoding; bh=x9PA8yjdEe9Kvb1NLwDZCFpm0U0h6iWdOQkgNTDHrIg=; b=gr6DjnkG3HGXqTxPZYhHDQOMkTH3a4FtzSs4LLJcLpVfg44n9cVgPtH7xfrXFoU44d gqml25/Er22V9hGiTQa2UZQR6+kj8/S6dUbUOWsxt98Cz4tM7POQ3kwSD5Qw5j7+exZf XzLxAyfWaaRGYpW8AX5Ar7nSshmLUc7Dw8k8BIgbhBKaeWSAxPo1Calby5L8ETDZ6VAu w3RkgASzERWF3ZebaqFeDFnexeeo0VaAWPiLpurTzHDmxavRxx6rpmzWzceGnFxOXgBl 45I3iLdjGf1WTD/PAYTtn5CH9rLKpR2JNMi+rDbXLLpGuxD0K2tIXsqlJeIZeE25BTDa h19w== X-Gm-Message-State: AKwxytfYt2/WR62F2frpPhHjaAKpLI5M5+04F81mFTRSv09QKbqkaFGj kBoxXkKt0CqtXSOFFgAb69fScQ8OGk0= X-Received: by 10.101.65.205 with SMTP id b13mr5856533pgq.280.1516337694962; Thu, 18 Jan 2018 20:54:54 -0800 (PST) Received: from cloudburst.twiddle.net (97-113-183-164.tukw.qwest.net. [97.113.183.164]) by smtp.gmail.com with ESMTPSA id m12sm13690022pga.68.2018.01.18.20.54.53 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 Jan 2018 20:54:54 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 18 Jan 2018 20:54:29 -0800 Message-Id: <20180119045438.28582-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180119045438.28582-1-richard.henderson@linaro.org> References: <20180119045438.28582-1-richard.henderson@linaro.org> MIME-Version: 1.0 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 v2 07/16] 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 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. Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- include/migration/vmstate.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) -- 2.14.3 Reviewed-by: Alex Bennée 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)