From patchwork Fri Jul 3 20:19:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 278621 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4CA4EC433DF for ; Fri, 3 Jul 2020 20:22:10 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 17F9020782 for ; Fri, 3 Jul 2020 20:22:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="b6vLir8M" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 17F9020782 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52826 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jrSCH-0005Bl-9c for qemu-devel@archiver.kernel.org; Fri, 03 Jul 2020 16:22:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35286) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jrS9f-00088B-AY; Fri, 03 Jul 2020 16:19:27 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:35692) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jrS9d-0001VR-Mj; Fri, 03 Jul 2020 16:19:26 -0400 Received: by mail-wm1-x331.google.com with SMTP id l2so33765615wmf.0; Fri, 03 Jul 2020 13:19:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LbmmUu3oTl3Y5tkkh/O3TvS1Wej2jrXggK29/7bCPIY=; b=b6vLir8Mpy1ePg9hSMhI7tz2E8EdrIDjmZwBI0l8SYVQulKjyKHRYaMmhSL/xpJZv7 48aXdO4cQh8paBc+Uv9yZB5XfR2o2rgMyDIo9mqAZCOfC3g7uxhYeKY2A1A6toJ2Eoim dB3/6eN5WarW21jmMpBVHg3lXVz2eFzOjWFrNjHGNGsPJJzckhfZiBePCLlaD3RPkqtU bzcXWyF8u7omK+SQSUnva6EOACMThqvcU2dn4YL18hHRqSuUapQ4DHkAs+gOW7GsV9rw 4SwPaTUIEJ4NB6Kb5K++E31J08ZavGjWiwD4NsP2I5zYfCnWoKGY1bBildpI6Ozfm54k tc3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=LbmmUu3oTl3Y5tkkh/O3TvS1Wej2jrXggK29/7bCPIY=; b=kDOd1V7BEiANhNtL+Rjw9Q1sbBG7le/BmdHq/AgLGLEjbogjahC2hg7GWpPDlWIonL j2aeo7Zth/gGvz2omatacRcCUo0ZzpH8z1p3MonVN5IeJ1SY582tIPzscVdYSIKard+s 1boPK++8/0sW08HD3AbRLWhzg+A9ztb2w5tgn120ASE0WisThIYxrHJK4x/ZneURFA8z COQfwUzWODL4KKR+tnGu6qyQW90B5njtmqRhvZSl64I8zsWAwRLrcCewApSUPWI3wnpC hTiatx/UL84Q461XybUTFV+5i/IK6SHyp/IdrC6LSXyi3Aet9Es7lBYA9nlmo3oYEHgW 6sSg== X-Gm-Message-State: AOAM532Vq4H94FE6dE7ZA4HFIF8uyaL00fLyHCUTdUclUtna0wXcQ+E3 mrHlCWTX0xlAluTLFOrLMPz+xdFrdHU= X-Google-Smtp-Source: ABdhPJxdotZFm/xvg/UQHeirSOM8fYxMN0EkIp7qLlk4RnZLF5kbfISsVM8xVvyI9qATbzGRkYOdeA== X-Received: by 2002:a1c:5a41:: with SMTP id o62mr23588378wmb.16.1593807563814; Fri, 03 Jul 2020 13:19:23 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id u65sm14229625wmg.5.2020.07.03.13.19.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jul 2020 13:19:23 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Peter Maydell Subject: [PATCH 07/18] hw/arm/msf2-soc: Mark the device with no migratable fields Date: Fri, 3 Jul 2020 22:19:00 +0200 Message-Id: <20200703201911.26573-8-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200703201911.26573-1-f4bug@amsat.org> References: <20200703201911.26573-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x331.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Gerd Hoffmann , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Juan Quintela , Andrew Jeffery , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Mark Cave-Ayland , "Dr . David Alan Gilbert" , Andrew Baumann , Subbaraya Sundeep , qemu-arm@nongnu.org, =?utf-8?b?Q8OpZHJpYyBM?= =?utf-8?q?e_Goater?= , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Artyom Tarasenko , Joel Stanley Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This device doesn't have fields to migrate. Be explicit by using vmstate_qdev_no_state_to_migrate. Add a more descriptive comment to keep a clear separation between static property vs runtime changeable. Signed-off-by: Philippe Mathieu-Daudé --- include/hw/arm/msf2-soc.h | 11 ++++++----- hw/arm/msf2-soc.c | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/hw/arm/msf2-soc.h b/include/hw/arm/msf2-soc.h index c9cb214aa6..8f85ff8295 100644 --- a/include/hw/arm/msf2-soc.h +++ b/include/hw/arm/msf2-soc.h @@ -51,6 +51,12 @@ typedef struct MSF2State { ARMv7MState armv7m; + MSF2SysregState sysreg; + MSSTimerState timer; + MSSSpiState spi[MSF2_NUM_SPIS]; + MSF2EmacState emac; + + /* Properties */ char *cpu_type; char *part_name; uint64_t envm_size; @@ -59,11 +65,6 @@ typedef struct MSF2State { uint32_t m3clk; uint8_t apb0div; uint8_t apb1div; - - MSF2SysregState sysreg; - MSSTimerState timer; - MSSSpiState spi[MSF2_NUM_SPIS]; - MSF2EmacState emac; } MSF2State; #endif diff --git a/hw/arm/msf2-soc.c b/hw/arm/msf2-soc.c index 3235c76194..bcec389a01 100644 --- a/hw/arm/msf2-soc.c +++ b/hw/arm/msf2-soc.c @@ -245,6 +245,7 @@ static void m2sxxx_soc_class_init(ObjectClass *klass, void *data) DeviceClass *dc = DEVICE_CLASS(klass); dc->realize = m2sxxx_soc_realize; + dc->vmsd = vmstate_qdev_no_state_to_migrate; device_class_set_props(dc, m2sxxx_soc_properties); }