From mboxrd@z Thu Jan 1 00:00:00 1970 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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 87156C433DB for ; Sun, 17 Jan 2021 19:38:25 +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 3A99F20793 for ; Sun, 17 Jan 2021 19:38:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3A99F20793 Authentication-Results: mail.kernel.org; dmarc=fail (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]:47544 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l1DsW-0004H8-Cf for qemu-devel@archiver.kernel.org; Sun, 17 Jan 2021 14:38:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58006) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1Dft-0007fD-1w; Sun, 17 Jan 2021 14:25:21 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:46918) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l1Dfr-00054R-I4; Sun, 17 Jan 2021 14:25:20 -0500 Received: by mail-wr1-x42e.google.com with SMTP id d13so14417271wrc.13; Sun, 17 Jan 2021 11:25:18 -0800 (PST) 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=qdebcebcEgAUy36pbkwOtCiC8gYa7FMBNTjw+ZgzJr8=; b=okh6rYyT8WPB0Ldi5fnznckOXxu8R9A29W7mOana5evBSJUO9M+PZ+mXlLmf12WOoE 5jGrSGADlg8sUsn4uA0vkc74lAAqe/Qo4RqoQzjoh989ikJDMP2WHAYOBZgx6olSyBW0 rEIpmWGBSK/ojnfD51oSIXJeIMvHoJYWhSE7823T+P+txI7hi33ylobdsh10L1kGJDRj 7t/rEYZ2CHvxACFy9OUpIsfexlmg/zHHRh2ReiVK/aoODvSgQL+HVhKoAmcg2BfW66RZ yFkJCS2BTSzCngRyJ+m0NoAa4xWon5eo71UfslsmaPo81qwsbR6rGMRskT2guhxyRpbB c+tw== 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=qdebcebcEgAUy36pbkwOtCiC8gYa7FMBNTjw+ZgzJr8=; b=rcqtMv1BgceMZq0tjKQy5KecbA325kZzSFcGXduq1FHzGt115FlXRdHMPxWRnh8dIe f2g/FDeEXqSnyQ9iQQ5FC2j4F/HVcw94ej8hHGJG5tZLinm/Tt/DPYVOqQVREXj+++R0 S06dpwL6Qe0Rbr7igfL8wI2hkM+gYsjfz0RnzYMB5lWf0w0/JKH1B0xuJ6rsMIGh+Dun tptFVjbHC8F6wKySY1zBgty3SXAlKQkxmAmnpcjIDK1mtFNWiW/IdgXFFLTMuz1UGH/v vZKq+fFGtLA+vlTdU2UxSZ8DuPu7ieShCCpIr9GI1NTKrocAptnuoa3CcAKwP+RtmF17 A4lg== X-Gm-Message-State: AOAM531Szrj9BSnMggIrmKNLelMsSO8j60aZbU9sh7PYl1OYMsE3qPan MGGi4Z6Ug+jCjzQ1r+JRF6k= X-Google-Smtp-Source: ABdhPJxbcsgYoEjcTophK/SL5VZkGui8pHNjy61kf97Brgh1NWMVJ2NHSLes7iCFjvWlfgu/zrgpfA== X-Received: by 2002:a05:6000:368:: with SMTP id f8mr22623971wrf.150.1610911518019; Sun, 17 Jan 2021 11:25:18 -0800 (PST) Received: from localhost.localdomain (13.red-83-57-169.dynamicip.rima-tde.net. [83.57.169.13]) by smtp.gmail.com with ESMTPSA id b13sm23004714wrt.31.2021.01.17.11.25.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Jan 2021 11:25:16 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: "Dr. David Alan Gilbert" , qemu-devel@nongnu.org Subject: [RFC PATCH v2 05/20] hw/arm/bcm283x: Mark devices with no migratable fields Date: Sun, 17 Jan 2021 20:24:31 +0100 Message-Id: <20210117192446.23753-6-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210117192446.23753-1-f4bug@amsat.org> References: <20210117192446.23753-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42e.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no 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: Peter Maydell , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , Juan Quintela , Andrew Jeffery , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Mark Cave-Ayland , Joel Stanley , Andrew Baumann , Subbaraya Sundeep , Laurent Vivier , qemu-arm@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Paolo Bonzini , Artyom Tarasenko , Gerd Hoffmann Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" These devices don'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/bcm2836.h | 5 +++-- hw/arm/bcm2835_peripherals.c | 1 + hw/arm/bcm2836.c | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/hw/arm/bcm2836.h b/include/hw/arm/bcm2836.h index 6f90cabfa3a..becb6cfd0a7 100644 --- a/include/hw/arm/bcm2836.h +++ b/include/hw/arm/bcm2836.h @@ -35,13 +35,14 @@ struct BCM283XState { DeviceState parent_obj; /*< public >*/ - uint32_t enabled_cpus; - struct { ARMCPU core; } cpu[BCM283X_NCPUS]; BCM2836ControlState control; BCM2835PeripheralState peripherals; + + /* Properties */ + uint32_t enabled_cpus; }; #endif /* BCM2836_H */ diff --git a/hw/arm/bcm2835_peripherals.c b/hw/arm/bcm2835_peripherals.c index dcff13433e5..8cf85f028fd 100644 --- a/hw/arm/bcm2835_peripherals.c +++ b/hw/arm/bcm2835_peripherals.c @@ -386,6 +386,7 @@ static void bcm2835_peripherals_class_init(ObjectClass *oc, void *data) DeviceClass *dc = DEVICE_CLASS(oc); dc->realize = bcm2835_peripherals_realize; + dc->vmsd = vmstate_qdev_no_state_to_migrate; } static const TypeInfo bcm2835_peripherals_type_info = { diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c index de7ade2878e..d2de99147cc 100644 --- a/hw/arm/bcm2836.c +++ b/hw/arm/bcm2836.c @@ -176,6 +176,7 @@ static void bcm283x_class_init(ObjectClass *oc, void *data) /* Reason: Must be wired up in code (see raspi_init() function) */ dc->user_creatable = false; + dc->vmsd = vmstate_qdev_no_state_to_migrate; } static void bcm2835_class_init(ObjectClass *oc, void *data) -- 2.26.2