From nobody Wed Feb 11 04:05:58 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) client-ip=209.85.128.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1621248767; cv=none; d=zohomail.com; s=zohoarc; b=Y9N/HJN3amCHiDFUQJSbLjLZAzrSIrANhmvpdoh6G1OdxDDPkSAhinKa2QsSJxOg68SSNWGjgFISOjc4ND9uSm18ed970RQ5h1O1FRPzG4RHdlDdjOg8VGKdq4TSwP+8tRPEueuq1Z7h1exkupHolHeAGHkYbHcbcIsCfEvK7Rs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621248767; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=73qeszPShsMKmwQ6XsHjcTezehy+lvr/7Xa8ct6h49I=; b=AWIxvOLnjcx8G8R3u1qRgtIqNhtYRtdyVKRoNB4Kr7i7xwiRdsygmh47po1ikbjjJcGXeafmb+6xdzjUjNSFiF+vJ7dFMqBaQsENzu0Wil9pcLT3p0vT0S6K0L1MTGqRDkkk1bHWtVjQPYyMYIf2vFuvOKaJAgzlqf85D9QAT2g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mx.zohomail.com with SMTPS id 1621248767479554.1019524728639; Mon, 17 May 2021 03:52:47 -0700 (PDT) Received: by mail-wm1-f53.google.com with SMTP id l18-20020a1ced120000b029014c1adff1edso4884733wmh.4 for ; Mon, 17 May 2021 03:52:46 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id c14sm16873962wrt.77.2021.05.17.03.52.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 03:52:45 -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=73qeszPShsMKmwQ6XsHjcTezehy+lvr/7Xa8ct6h49I=; b=KZdPVqTiITvdCNz5rGciJOBS/6F3QG7VJJfwgQItf76O4Kp4R0JPne0N/R+5FiLOsP o14Qz+IyZL40FAq0FLIoCjMmXMBuppqqG1Trct8uIJ7vusSKmuTKnuogCq20V+U9EIIZ 68s2gh56Hum75RkTg74qB2DaE7mhvMRv3xzrt1vAYX8xGZiMl5Cf1ieolSqXMl6mLTq4 oV3hvD+VZet7J277cUTnQ8Myj0OWbdc+7xzDorEyXjH1F12h9cscocFlYoa4bT5PEcJx EQPzIWqWa4fW2cRwvD1U/wKHmuXSs6oJvGKI7L5jzJ0ae0OXhB4u5Nb4WobZobYxWyky aTNw== 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=73qeszPShsMKmwQ6XsHjcTezehy+lvr/7Xa8ct6h49I=; b=LrwQlHxIYzK9WGzG7FB8NyYXS1JbsfaBE2pMfjV/DYKoReD4eZ1fSqJuSIqOZRdNa5 8UI3oXVQaj90VXV6j+F6EHOn6zabD7MtfA62IDb1Qp22ZNAB9Qeg0YEpPnQ2w8S33uVU N0LrtRE2udy4Erb6OgMpbS+3hzowTnypuZ2LMgk4LkClNENDnYxhXokB/omdgdWgd3la Oj5Gg0e9oo0relVWjgj30FqkoofbGQAZGDaA2peyZB+v83vIHkQ9obOR6jgUcD/XGn7f eKud8UV9PcvAD5l8WocYjlZX4tyqkTgD0MoZrchLsdifmLcN5sKhabtivB4MEJi8D9Tb iCPQ== X-Gm-Message-State: AOAM532bvRTd7iHR5I5ag0BhfZXzMmL+pAhahmlvqQyWMPDBOZlYAXDL AnTUY2bzOqZyY8crAES8I2A= X-Google-Smtp-Source: ABdhPJx74qhFgmRDEijCQeQSdLdNbgNDud+KrdpZkAtqowjjW4GBXwrKfr/LUEYasa7AC8Q+p40MGw== X-Received: by 2002:a1c:a9ca:: with SMTP id s193mr33217198wme.132.1621248765787; Mon, 17 May 2021 03:52:45 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, Richard Henderson , qemu-arm@nongnu.org, Laurent Vivier , Paolo Bonzini , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v7 13/23] cpu: Move AVR target vmsd field from CPUClass to DeviceClass Date: Mon, 17 May 2021 12:51:30 +0200 Message-Id: <20210517105140.1062037-14-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210517105140.1062037-1-f4bug@amsat.org> References: <20210517105140.1062037-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) See rationale in previous commit. Targets should use the vmsd field of DeviceClass, not CPUClass. As migration is not important on the AVR target, break the migration compatibility and set the DeviceClass vmsd field. To feel safer, increment the vmstate version. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- v7: Increment vmstate version (Richard) --- target/avr/cpu.c | 2 +- target/avr/machine.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/avr/cpu.c b/target/avr/cpu.c index 37a8ebcc86f..3353bcb9fc7 100644 --- a/target/avr/cpu.c +++ b/target/avr/cpu.c @@ -213,7 +213,7 @@ static void avr_cpu_class_init(ObjectClass *oc, void *d= ata) cc->set_pc =3D avr_cpu_set_pc; cc->memory_rw_debug =3D avr_cpu_memory_rw_debug; cc->get_phys_page_debug =3D avr_cpu_get_phys_page_debug; - cc->legacy_vmsd =3D &vms_avr_cpu; + dc->vmsd =3D &vms_avr_cpu; cc->disas_set_info =3D avr_cpu_disas_set_info; cc->gdb_read_register =3D avr_cpu_gdb_read_register; cc->gdb_write_register =3D avr_cpu_gdb_write_register; diff --git a/target/avr/machine.c b/target/avr/machine.c index de264f57c33..16f7a3e031d 100644 --- a/target/avr/machine.c +++ b/target/avr/machine.c @@ -98,8 +98,8 @@ static const VMStateInfo vms_eind =3D { =20 const VMStateDescription vms_avr_cpu =3D { .name =3D "cpu", - .version_id =3D 0, - .minimum_version_id =3D 0, + .version_id =3D 1, + .minimum_version_id =3D 1, .fields =3D (VMStateField[]) { VMSTATE_UINT32(env.pc_w, AVRCPU), VMSTATE_UINT32(env.sp, AVRCPU), --=20 2.26.3