Received: by 2002:ac2:5042:0:0:0:0:0 with SMTP id a2csp2779979lfm; Fri, 3 Jul 2020 13:21:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxW7/GZxZp+YMkPwrbqFaFhCxvW41IqTboF6pjXsMy9HS2epAJanFBS/KCodztXx+mLutmg X-Received: by 2002:a25:808a:: with SMTP id n10mr44478144ybk.434.1593807674515; Fri, 03 Jul 2020 13:21:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593807674; cv=none; d=google.com; s=arc-20160816; b=ReAIMQZkImTkxZdAoUsgcW8JQ+wiWjZAAB+ss6Uet7bocsJDTKhIXl1TzPfxicOBbN 3C3vI+K0rXOfzcUWzU0ff9VbbNsZmBOLz3cpIdB+ToDe65FHTtqTT2/KnAQx03Hv2+1i kpDc5ENolSGHck8DyBcYDkEB2ro7xSfrgNEct8zkrxZRGxj13Trg88Su6UlclKjBJP/O dJey232TtwzKD/k2Lt8LvXbIyErwi2qqmtWZmWenmpol0SncdXMzuUMMrnHtj8osHsjy CUcktO2ohEAJtRYPSPtYyNsgObMVT6S3g0y9g1gpEn/nBxbiISbXnOmxGPBueZqWKy3N wDEw== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=4dCqkHJumkeBEkkock7OzqH4CRnyFrOofj4WDwKTygk=; b=Phum32/aK9Nf1p4ZrwU5SIwcNwY+6vO9MlRaOz5QyRpHcc/AcrwOKpUZy4aB1Eqsei MW9rjZn3vKOL5ifSif0qmEeu1lxMo8haKvHEmhSyOHRAEfkvDUUD0O9jUKTolyFqO2X0 /J+S+vNiWtEnPLU8xWraX1rGNjq8EQmPHb8hhXFlq8cVNJw7xkEeFDEJzFn4cXcnC89u KokFVU2EKz5ifzaqQMkfLk7UhoHuSLDtGFhuxjk+W+DyK1ekuciL40d4B6f8eJm9bK/K Wy34YL/9TKhtS5uhTEPPsmCDWCro1VWyiW0Dfg097e28z0P36K/YHDU37ZR7eFIYt5ff uBvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=TPwyELxk; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=amsat.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r14si12630548ybd.85.2020.07.03.13.21.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 Jul 2020 13:21:14 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=TPwyELxk; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=amsat.org Received: from localhost ([::1]:47952 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jrSBN-0003Ce-Qk for alex.bennee@linaro.org; Fri, 03 Jul 2020 16:21:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35274) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jrS9d-00084W-Mq; Fri, 03 Jul 2020 16:19:25 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:39807) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jrS9c-0001VG-79; Fri, 03 Jul 2020 16:19:25 -0400 Received: by mail-wr1-x42b.google.com with SMTP id q5so33921631wru.6; Fri, 03 Jul 2020 13:19:23 -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=4dCqkHJumkeBEkkock7OzqH4CRnyFrOofj4WDwKTygk=; b=TPwyELxkzqXteWDD8dRjWlY3Fcmpax+cDByBHyaXGNbLhSvmbO8oTDMp8juaPo/cLG m6pIB6b/Kc9dOvxA4TSCgWhlW67yyuGPg4baH/unRGPohy3ujHyX9GwYA1GM1mvBMle4 224InrZ1erE6XWKnb2/+hWUo7pk7kP0sYrtKhVzFH8dSrbGCTSEGBwS0qlFGIr9S/g9d pCoJmxIsgwR4qUTrQCdo18WDw8fhoN8Ja+hAbUovRGaU/Z2zIL6cB4pwsBZ2tOA+q2NH gRLt5byYfm4lwVerYB5D4AcOVwQEP7mRKNrzi3ArA6+8KV4Rsql5hyNm0G/tvV2R1E4c ZSzg== 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=4dCqkHJumkeBEkkock7OzqH4CRnyFrOofj4WDwKTygk=; b=CGn1IPgewilDjuM/XioyHDP1UDuRAH6umZKbTyfKKi2onF1L8HfzYmatDTfZpGE/NY XiK+mtnPw4JYX6MqW3ShEogchC4Q8jK6eZTwEiUSpPTHr0axNz71GHq926jlJ5BGToP9 wpjZT9eKgq0ddi3H4sUrXJTLCLyhLrDJuIvmRxP5qIIIMjdVvmMKXELAK0B4mVV0r6O4 GHxeppefgQOzTE55g8iNlqnhefffRk3vmf1nBXlCiYSOVcOyDdLk1vblQr8W3hhPgKfM YYRKfcjDoxKPX6eympY5NRXTdjloAE0KsI/86GV0nbEcpmipqQ0NODtpac1G4g9GxWmJ 6mVA== X-Gm-Message-State: AOAM5335UbajCzu1TEhwF0RY8lDJWBg+55h2LHeXBX7oHxaffuanUNpT Bw23e+Kp8LaQI0xpc37EvtXoDM4T2Tk= X-Received: by 2002:a5d:6b8c:: with SMTP id n12mr38589422wrx.352.1593807562362; Fri, 03 Jul 2020 13:19:22 -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.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jul 2020 13:19:21 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Peter Maydell Subject: [PATCH 06/18] hw/arm/bcm283x: Mark devices with no migratable fields Date: Fri, 3 Jul 2020 22:18:59 +0200 Message-Id: <20200703201911.26573-7-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 Content-Type: text/plain; charset=UTF-8 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42b.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-arm@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=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , Juan Quintela , Andrew Jeffery , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Mark Cave-Ayland , "Dr . David Alan Gilbert" , Andrew Baumann , Subbaraya Sundeep , qemu-arm@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Marcel Apfelbaum , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Artyom Tarasenko , Joel Stanley Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: SjZH0hzojKKa 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 | 7 ++++--- hw/arm/bcm2835_peripherals.c | 1 + hw/arm/bcm2836.c | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/hw/arm/bcm2836.h b/include/hw/arm/bcm2836.h index 024af8aae4..66e3621bb9 100644 --- a/include/hw/arm/bcm2836.h +++ b/include/hw/arm/bcm2836.h @@ -33,14 +33,15 @@ typedef struct BCM283XState { DeviceState parent_obj; /*< public >*/ - char *cpu_type; - uint32_t enabled_cpus; - struct { ARMCPU core; } cpu[BCM283X_NCPUS]; BCM2836ControlState control; BCM2835PeripheralState peripherals; + + /* Properties */ + char *cpu_type; + uint32_t enabled_cpus; } BCM283XState; typedef struct BCM283XInfo BCM283XInfo; diff --git a/hw/arm/bcm2835_peripherals.c b/hw/arm/bcm2835_peripherals.c index 7ffdf62067..f33500dc27 100644 --- a/hw/arm/bcm2835_peripherals.c +++ b/hw/arm/bcm2835_peripherals.c @@ -401,6 +401,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 ed1793f7b7..5fc67b6777 100644 --- a/hw/arm/bcm2836.c +++ b/hw/arm/bcm2836.c @@ -173,6 +173,7 @@ static void bcm283x_class_init(ObjectClass *oc, void *data) device_class_set_props(dc, bcm2836_props); /* Reason: Must be wired up in code (see raspi_init() function) */ dc->user_creatable = false; + dc->vmsd = vmstate_qdev_no_state_to_migrate; } static const TypeInfo bcm283x_type_info = { -- 2.21.3