From nobody Sun Feb 8 20:17:50 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1493859501754554.0175357004142; Wed, 3 May 2017 17:58:21 -0700 (PDT) Received: from localhost ([::1]:39213 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d6564-00051X-E5 for importer@patchew.org; Wed, 03 May 2017 20:58:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56865) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d651x-0001WX-Bs for qemu-devel@nongnu.org; Wed, 03 May 2017 20:54:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d651w-00061e-Ms for qemu-devel@nongnu.org; Wed, 03 May 2017 20:54:05 -0400 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]:34722) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d651w-00061G-Gy for qemu-devel@nongnu.org; Wed, 03 May 2017 20:54:04 -0400 Received: by mail-pf0-x242.google.com with SMTP id d1so720583pfe.1 for ; Wed, 03 May 2017 17:54: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 p90sm487849pfa.119.2017.05.03.17.54.02 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 May 2017 17:54:03 -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=hU1jGZmFTTYIW7x4xlhS9QjPIudVQLVMDBIoTvmEol0=; b=Fe8owwuZo4YeuxK700SVhviWTQiBbACRUjnH4/M5FRnG/zlOa62nqeu3WYUz/Kk0cw l6qL4oh1VtyLHrFpsruPXMQO4u7cYDnICiydjuvLBVi/ao8hfxJ4v1+RO8NwNhlOxjPP 1NaArVVAXrWgckBIgy6XTyzADXypZ7Rx39O1pyBsdVRYd/pbvCCluq0/Phho+1KZMg9I uapLagLYpgRm7IMEB+AuvLm3MfdjMZilDgADncsNH8D3a3mvQJNjyeRe9cq5eImVJfjF aBGOCcjdKeUxcaIWQMZfqgkoqBBdec48zLX83w62AruYt5AR2U6ZcHvYqlvRaxz3yCP7 pNqg== 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=hU1jGZmFTTYIW7x4xlhS9QjPIudVQLVMDBIoTvmEol0=; b=V5NlZzfExKfM1oU32orbsXQ7dwqO7RsoEaQRMVlltxxOT8C0Yp9v74cFGdemZWia3/ M1qBK4qgdasecmUjhIDXkj789Lr4jBYOifzwdRiGtHN1phloc7ppT02ZYEez92OYUXkg u72y41+BZWj0+s0shSbOy6ZQgnohagA7rX4Bv3KXDzO9FSGX2eQN7IyeSSHEY8qgzdTC JznGjY5j0nCZyiIxcCqe304AwjmbeXeUGpM5Y3bP3U5eIXx1OJATROISKKsllA12RsAs PDpSZZwd1i65emSyfSvFWfzm/qUI+G3f6s044CW6RXy1OTBgX4csbgn56stTqsHSrH87 TIPQ== X-Gm-Message-State: AN3rC/50L1eGC80IDdXzPG0WdiQcGFe8/2BLGzJcC2hLFw/46sWIgYyv BRaI1Y2Hn1NggA== X-Received: by 10.99.127.89 with SMTP id p25mr13334221pgn.92.1493859243632; Wed, 03 May 2017 17:54:03 -0700 (PDT) From: Stafford Horne To: QEMU Development Date: Thu, 4 May 2017 09:53:23 +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::242 Subject: [Qemu-devel] [PULL v2 08/11] migration: Add VMSTATE_STRUCT_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: Stefan Hajnoczi , Stafford Horne Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" For openrisc we implement tlb state as a 2d array of tlb entry structs. This is added to allow easy storing of state of 2d arrays. Signed-off-by: Stafford Horne --- include/migration/vmstate.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index f2dbf84..4834e55 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -499,6 +499,19 @@ extern const VMStateInfo vmstate_info_qtailq; .offset =3D vmstate_offset_array(_state, _field, _type, _num),\ } =20 +#define VMSTATE_STRUCT_2DARRAY_TEST(_field, _state, _n1, _n2, _test, \ + _version, _vmsd, _type) { \ + .name =3D (stringify(_field)), \ + .num =3D (_n1) * (_n2), \ + .field_exists =3D (_test), \ + .version_id =3D (_version), \ + .vmsd =3D &(_vmsd), \ + .size =3D sizeof(_type), \ + .flags =3D VMS_STRUCT | VMS_ARRAY, \ + .offset =3D vmstate_offset_2darray(_state, _field, _type, \ + _n1, _n2), \ +} + #define VMSTATE_STRUCT_VARRAY_UINT8(_field, _state, _field_num, _version, = _vmsd, _type) { \ .name =3D (stringify(_field)), \ .num_offset =3D vmstate_offset_value(_state, _field_num, uint8_t), \ @@ -746,6 +759,11 @@ extern const VMStateInfo vmstate_info_qtailq; VMSTATE_STRUCT_ARRAY_TEST(_field, _state, _num, NULL, _version, \ _vmsd, _type) =20 +#define VMSTATE_STRUCT_2DARRAY(_field, _state, _n1, _n2, _version, \ + _vmsd, _type) \ + VMSTATE_STRUCT_2DARRAY_TEST(_field, _state, _n1, _n2, NULL, \ + _version, _vmsd, _type) + #define VMSTATE_BUFFER_UNSAFE_INFO(_field, _state, _version, _info, _size)= \ VMSTATE_BUFFER_UNSAFE_INFO_TEST(_field, _state, NULL, _version, _info,= \ _size) --=20 2.9.3