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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 58263E92707 for ; Thu, 5 Oct 2023 15:05:47 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoPth-0004vF-DA; Thu, 05 Oct 2023 11:04:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoPtS-0004uM-VL for qemu-devel@nongnu.org; Thu, 05 Oct 2023 11:04:03 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoPtR-0006GR-2z for qemu-devel@nongnu.org; Thu, 05 Oct 2023 11:04:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696518239; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gMKn7i9qM7C3cEbxOdg8BYdLRudiIyc0a2rDuzeYSrw=; b=RkcyKxBZNNvRs9BeSQhAdgpImOXkokvv8w/0mlubpEnEM4GZWfD+e+WrI/00Hsf+fCaaIh VXHLapuOGlMnhR+MxannJft/AJkd0lD1ULtA3L+5eeHdtdDskM5xqJMlzgljYf8/ykj9yL MThb6Tyr1Vh2PcNcn7BMqiEs/3j8wsc= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-549-0MHYsJKNOAyPq4dXc-7rpQ-1; Thu, 05 Oct 2023 11:03:58 -0400 X-MC-Unique: 0MHYsJKNOAyPq4dXc-7rpQ-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 880AD2812951 for ; Thu, 5 Oct 2023 15:03:37 +0000 (UTC) Received: from [10.39.194.153] (unknown [10.39.194.153]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C4CF5100650B; Thu, 5 Oct 2023 15:03:36 +0000 (UTC) Message-ID: <901cd817-536f-cd9d-1f48-b1269cd30667@redhat.com> Date: Thu, 5 Oct 2023 17:03:35 +0200 MIME-Version: 1.0 Subject: Re: [PATCH v4 1/3] ramfb: add migration support Content-Language: en-US To: marcandre.lureau@redhat.com, qemu-devel@nongnu.org Cc: =?UTF-8?Q?C=c3=a9dric_Le_Goater?= , kraxel@redhat.com References: <20231005113027.1827078-1-marcandre.lureau@redhat.com> <20231005113027.1827078-2-marcandre.lureau@redhat.com> From: Laszlo Ersek In-Reply-To: <20231005113027.1827078-2-marcandre.lureau@redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 Received-SPF: pass client-ip=170.10.129.124; envelope-from=lersek@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 10/5/23 13:30, marcandre.lureau@redhat.com wrote: > From: Marc-André Lureau > > Implementing RAMFB migration is quite straightforward. One caveat is to > treat the whole RAMFBCfg as a blob, since that's what is exposed to the > guest directly. This avoid having to fiddle with endianness issues if we > were to migrate fields individually as integers. > > The devices using RAMFB will have to include ramfb_vmstate in their > migration description. > > Signed-off-by: Marc-André Lureau > --- > include/hw/display/ramfb.h | 4 ++++ > hw/display/ramfb.c | 19 +++++++++++++++++++ > 2 files changed, 23 insertions(+) > > diff --git a/include/hw/display/ramfb.h b/include/hw/display/ramfb.h > index b33a2c467b..a7e0019144 100644 > --- a/include/hw/display/ramfb.h > +++ b/include/hw/display/ramfb.h > @@ -1,11 +1,15 @@ > #ifndef RAMFB_H > #define RAMFB_H > > +#include "migration/vmstate.h" > + > /* ramfb.c */ > typedef struct RAMFBState RAMFBState; > void ramfb_display_update(QemuConsole *con, RAMFBState *s); > RAMFBState *ramfb_setup(Error **errp); > > +extern const VMStateDescription ramfb_vmstate; > + > /* ramfb-standalone.c */ > #define TYPE_RAMFB_DEVICE "ramfb" > > diff --git a/hw/display/ramfb.c b/hw/display/ramfb.c > index c2b002d534..477ef7272a 100644 > --- a/hw/display/ramfb.c > +++ b/hw/display/ramfb.c > @@ -28,6 +28,8 @@ struct QEMU_PACKED RAMFBCfg { > uint32_t stride; > }; > > +typedef struct RAMFBCfg RAMFBCfg; > + > struct RAMFBState { > DisplaySurface *ds; > uint32_t width, height; > @@ -116,6 +118,23 @@ void ramfb_display_update(QemuConsole *con, RAMFBState *s) > dpy_gfx_update_full(con); > } > > +static int ramfb_post_load(void *opaque, int version_id) > +{ > + ramfb_fw_cfg_write(opaque, 0, 0); > + return 0; > +} > + > +const VMStateDescription ramfb_vmstate = { > + .name = "ramfb", > + .version_id = 1, > + .minimum_version_id = 1, > + .post_load = ramfb_post_load, > + .fields = (VMStateField[]) { > + VMSTATE_BUFFER_UNSAFE(cfg, RAMFBState, 0, sizeof(RAMFBCfg)), > + VMSTATE_END_OF_LIST() > + } > +}; > + > RAMFBState *ramfb_setup(Error **errp) > { > FWCfgState *fw_cfg = fw_cfg_find(); Identical to v3, which I reviewed, so: Reviewed-by: Laszlo Ersek