From nobody Tue Feb 10 05:45:46 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) client-ip=209.85.128.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1625233014; cv=none; d=zohomail.com; s=zohoarc; b=U0faeivk9qgJJUzQj/6oQIi4cHYGW15WeFatRJJfU+dp6jMBhFKxIf3Ssm8MrkjBsd08laXISm0yowOcc+ureGxaUuk24bLc4bNVrDLIDzg9Ze6H3z+DPV3fs/tsEuQDI/4cMLi3PLO/LqJ3V8fH3ehUBITLKoz3NUz5FIgneHU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1625233014; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=XwdyHylrd/DY/3JN/AT1x4i76a7V8lVv7L0SE4yhb+8=; b=X3d+NnKCsC8ZappKFqIq6rwADH4LD6ypXytIHRe4PEZO6eYnO7WiW/NdDs6mOxpUt1QZGl9gE/ZM8Fj33Gey++YM2VLBGvSS85Casw1y0rDUypcvO4mt1FFnMrS13DaC3uyZnKBc4bvUKAtupdXzzdotH5Rge9MZvF7H5H4uQAM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mx.zohomail.com with SMTPS id 1625233014255710.9650027158951; Fri, 2 Jul 2021 06:36:54 -0700 (PDT) Received: by mail-wm1-f50.google.com with SMTP id a5-20020a7bc1c50000b02901e3bbe0939bso6434723wmj.0 for ; Fri, 02 Jul 2021 06:36:53 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.Ascou-CH1 (pop.92-184-108-23.mobile.abo.orange.fr. [92.184.108.23]) by smtp.gmail.com with ESMTPSA id r16sm3912571wrx.63.2021.07.02.06.36.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Jul 2021 06:36:52 -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=XwdyHylrd/DY/3JN/AT1x4i76a7V8lVv7L0SE4yhb+8=; b=jl0o0fTbk8q3CAt3kGKAB9Lj9peuWAf3NZwq1Me7vOqkOqCOiStrBKAf2O9c4J3TMT NNfpHuFlzE7SPxFdLRxl+3wwnELXmabRM5k4tFmmSyS+i+mdrWuaoaI3e+/6mFyziqHL N6eX3VAKaFId3QNBjMEShvPART/ckOO9W1n4hpGGqeUN23wqAYtj61ppiR6cbhVqUcFh K8NZcBCLmXMsYaBTV5MTcnpkF3XEgW6alWfgeztUEGTcdKdu+gUPIhMnL8yTLdyievNG 8feJsb+it9KO0aZnOBCEnFSYfqBJ4lVUFNOFcuaZeBdXxYxCDhgKHBkAyK9gaUIz/mVr 0v2w== 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=XwdyHylrd/DY/3JN/AT1x4i76a7V8lVv7L0SE4yhb+8=; b=iX1PJmQK+qTkQ+nSlOu3qWH8GOaXkg+b+7BjL+UYVGCHkO20mcRbI2fg+JXjOB/d8a lV2Pe3/krVskMzeV1riQBkSKMpPdkkEgoqiQ/tbKnL8tje6PLMUFNBdLPSgNM6s8zd9Z aIvhOTgG3f5Az8I3hB5I1gk+OrD6daq2x8xAtmyPyWmu/pCjK93CJWlyXKOn2ZhRCL39 oGaet6Tp/0S7YcvVqSRisapwDznRLZ0wdFobw27jobFqrc7lLHgEuXQUioZ2IMY7WRcn s9Xmd8ha9GY+0CzA5pgGNh8iReJlYYgcHW+1o0dJzUb0IKBmGKaYQZ2uiqOG10hN7PzT CK0w== X-Gm-Message-State: AOAM5328t4jyBQ4Fv/nDGJZpp622M1FRa09f2n1cr9UNqHbNI2sua77M M/vAaUywN1Hst3hKmoQmElo= X-Google-Smtp-Source: ABdhPJysDHPTWOwBXvPfMpqRnbPOiI97Z8Vbsvf3BMYDzA402TkjIFW8qN12ZPf5RgjZOshZhSISmQ== X-Received: by 2002:a05:600c:c4:: with SMTP id u4mr5641411wmm.10.1625233012619; Fri, 02 Jul 2021 06:36:52 -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: Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 09/18] g364fb: add VMStateDescription for G364SysBusState Date: Fri, 2 Jul 2021 15:35:48 +0200 Message-Id: <20210702133557.60317-10-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210702133557.60317-1-f4bug@amsat.org> References: <20210702133557.60317-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) X-ZM-MESSAGEID: 1625233016264100001 From: Mark Cave-Ayland Currently when QEMU attempts to migrate the MIPS magnum machine it crashes = due to a mistake in the g364fb VMStateDescription configuration which expects a G364SysBusState and not a G364State. Resolve the issue by adding a new VMStateDescription for G364SysBusState and embedding the existing vmstate_g364fb VMStateDescription inside it using VMSTATE_STRUCT. Signed-off-by: Mark Cave-Ayland Fixes: 97a3f6ffbba ("g364fb: convert to qdev") Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210625163554.14879-3-mark.cave-ayland@ilande.co.uk> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/g364fb.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/hw/display/g364fb.c b/hw/display/g364fb.c index 87effbf2b0f..caca86d7738 100644 --- a/hw/display/g364fb.c +++ b/hw/display/g364fb.c @@ -517,6 +517,16 @@ static Property g364fb_sysbus_properties[] =3D { DEFINE_PROP_END_OF_LIST(), }; =20 +static const VMStateDescription vmstate_g364fb_sysbus =3D { + .name =3D "g364fb-sysbus", + .version_id =3D 2, + .minimum_version_id =3D 2, + .fields =3D (VMStateField[]) { + VMSTATE_STRUCT(g364, G364SysBusState, 2, vmstate_g364fb, G364State= ), + VMSTATE_END_OF_LIST() + } +}; + static void g364fb_sysbus_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); @@ -525,7 +535,7 @@ static void g364fb_sysbus_class_init(ObjectClass *klass= , void *data) set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories); dc->desc =3D "G364 framebuffer"; dc->reset =3D g364fb_sysbus_reset; - dc->vmsd =3D &vmstate_g364fb; + dc->vmsd =3D &vmstate_g364fb_sysbus; device_class_set_props(dc, g364fb_sysbus_properties); } =20 --=20 2.31.1