From patchwork Thu May 4 00:53:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stafford Horne X-Patchwork-Id: 9710685 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 287BC60387 for ; Thu, 4 May 2017 00:57:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1C44F28678 for ; Thu, 4 May 2017 00:57:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 10F4F2867D; Thu, 4 May 2017 00:57:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AA04628678 for ; Thu, 4 May 2017 00:57:51 +0000 (UTC) Received: from localhost ([::1]:39209 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d655a-0003i9-Cm for patchwork-qemu-devel@patchwork.kernel.org; Wed, 03 May 2017 20:57:50 -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) 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) 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) 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 = vmstate_offset_array(_state, _field, _type, _num),\ } +#define VMSTATE_STRUCT_2DARRAY_TEST(_field, _state, _n1, _n2, _test, \ + _version, _vmsd, _type) { \ + .name = (stringify(_field)), \ + .num = (_n1) * (_n2), \ + .field_exists = (_test), \ + .version_id = (_version), \ + .vmsd = &(_vmsd), \ + .size = sizeof(_type), \ + .flags = VMS_STRUCT | VMS_ARRAY, \ + .offset = vmstate_offset_2darray(_state, _field, _type, \ + _n1, _n2), \ +} + #define VMSTATE_STRUCT_VARRAY_UINT8(_field, _state, _field_num, _version, _vmsd, _type) { \ .name = (stringify(_field)), \ .num_offset = 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) +#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)