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 4B2E5C5AD49 for ; Fri, 6 Jun 2025 07:53:40 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uNRsT-00058B-Oz; Fri, 06 Jun 2025 03:52:37 -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 1uNRsS-00057p-GA for qemu-devel@nongnu.org; Fri, 06 Jun 2025 03:52:36 -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 1uNRsQ-0003Mi-A2 for qemu-devel@nongnu.org; Fri, 06 Jun 2025 03:52:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1749196352; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references; bh=DW8o9Gi6aCcNDcRX6y0xVJroXGGhGDUG/WQG1LhGrkU=; b=O5CSE3sz7W7wbXG7Ep4O7bKrGPYl/eCrWSvIq6rYJ89Huv9cnhhGh1JOQUVlzutIMR9V0r S1SWAywaJyDo+RpF/m/E8Ok9CIthQsjE14t8pJmG30jOkp6fJFMB0vXqepvbmUp2uoIcgq mtz6VKuKkzF3q73FZuUrFnuRF/GCb9Y= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-627-KyM95cI2NrK-t48OdsGZjw-1; Fri, 06 Jun 2025 03:52:29 -0400 X-MC-Unique: KyM95cI2NrK-t48OdsGZjw-1 X-Mimecast-MFC-AGG-ID: KyM95cI2NrK-t48OdsGZjw_1749196348 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 47B0F1800871; Fri, 6 Jun 2025 07:52:28 +0000 (UTC) Received: from redhat.com (unknown [10.42.28.55]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 11D4F30001BD; Fri, 6 Jun 2025 07:52:24 +0000 (UTC) Date: Fri, 6 Jun 2025 08:52:21 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Shaoqin Huang Cc: qemu-arm@nongnu.org, Eric Auger , Peter Maydell , Gerd Hoffmann , Alex Williamson , =?utf-8?Q?C=C3=A9dric?= Le Goater , qemu-devel@nongnu.org Subject: Re: [PATCH v2] ramfb: Add property to control if load the romfile Message-ID: References: <20250606070234.2063451-1-shahuang@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20250606070234.2063451-1-shahuang@redhat.com> User-Agent: Mutt/2.2.14 (2025-02-20) X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.132, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Fri, Jun 06, 2025 at 03:02:34AM -0400, Shaoqin Huang wrote: > Now the ramfb will load the vgabios-ramfb.bin unconditionally, but only > the x86 need the vgabios-ramfb.bin, this can cause that when use the > release package on arm64 it can't find the vgabios-ramfb.bin. > > Because only seabios will use the vgabios-ramfb.bin, load the rom logic > is x86-specific. For other !x86 platforms, the edk2 ships an EFI driver > for ramfb, so they don't need to load the romfile. > > So add a new property use_legacy_x86_rom in both ramfb and vfio_pci > device, because the vfio display also use the ramfb_setup() to load > the vgabios-ramfb.bin file. > > After have this property, the machine type can set the compatibility to > not load the vgabios-ramfb.bin if the arch doesn't need it. Can you make this a series, with an additional patch that updates the current in-dev machine types to use this new property, so we're clear about the proposed usage. > > Signed-off-by: Shaoqin Huang > --- > hw/display/ramfb-standalone.c | 4 +++- > hw/display/ramfb-stubs.c | 2 +- > hw/display/ramfb.c | 6 ++++-- > hw/vfio/display.c | 4 ++-- > hw/vfio/pci.c | 1 + > hw/vfio/pci.h | 1 + > include/hw/display/ramfb.h | 2 +- > 7 files changed, 13 insertions(+), 7 deletions(-) > > diff --git a/hw/display/ramfb-standalone.c b/hw/display/ramfb-standalone.c > index 1be106b57f..af1175bf96 100644 > --- a/hw/display/ramfb-standalone.c > +++ b/hw/display/ramfb-standalone.c > @@ -17,6 +17,7 @@ struct RAMFBStandaloneState { > QemuConsole *con; > RAMFBState *state; > bool migrate; > + bool use_legacy_x86_rom; > }; > > static void display_update_wrapper(void *dev) > @@ -39,7 +40,7 @@ static void ramfb_realizefn(DeviceState *dev, Error **errp) > RAMFBStandaloneState *ramfb = RAMFB(dev); > > ramfb->con = graphic_console_init(dev, 0, &wrapper_ops, dev); > - ramfb->state = ramfb_setup(errp); > + ramfb->state = ramfb_setup(ramfb->use_legacy_x86_rom, errp); > } > > static bool migrate_needed(void *opaque) > @@ -62,6 +63,7 @@ static const VMStateDescription ramfb_dev_vmstate = { > > static const Property ramfb_properties[] = { > DEFINE_PROP_BOOL("x-migrate", RAMFBStandaloneState, migrate, true), > + DEFINE_PROP_BOOL("use-legacy-x86-rom", RAMFBStandaloneState, use_legacy_x86_rom, true), > }; > > static void ramfb_class_initfn(ObjectClass *klass, void *data) > diff --git a/hw/display/ramfb-stubs.c b/hw/display/ramfb-stubs.c > index cf64733b10..b83551357b 100644 > --- a/hw/display/ramfb-stubs.c > +++ b/hw/display/ramfb-stubs.c > @@ -8,7 +8,7 @@ void ramfb_display_update(QemuConsole *con, RAMFBState *s) > { > } > > -RAMFBState *ramfb_setup(Error **errp) > +RAMFBState *ramfb_setup(bool romfile, Error **errp) > { > error_setg(errp, "ramfb support not available"); > return NULL; > diff --git a/hw/display/ramfb.c b/hw/display/ramfb.c > index 8c0f907673..9a17d97d07 100644 > --- a/hw/display/ramfb.c > +++ b/hw/display/ramfb.c > @@ -135,7 +135,7 @@ const VMStateDescription ramfb_vmstate = { > } > }; > > -RAMFBState *ramfb_setup(Error **errp) > +RAMFBState *ramfb_setup(bool romfile, Error **errp) > { > FWCfgState *fw_cfg = fw_cfg_find(); > RAMFBState *s; > @@ -147,7 +147,9 @@ RAMFBState *ramfb_setup(Error **errp) > > s = g_new0(RAMFBState, 1); > > - rom_add_vga("vgabios-ramfb.bin"); > + if (romfile) { > + rom_add_vga("vgabios-ramfb.bin"); > + } > fw_cfg_add_file_callback(fw_cfg, "etc/ramfb", > NULL, ramfb_fw_cfg_write, s, > &s->cfg, sizeof(s->cfg), false); > diff --git a/hw/vfio/display.c b/hw/vfio/display.c > index ea87830fe0..8bfd8eb1e3 100644 > --- a/hw/vfio/display.c > +++ b/hw/vfio/display.c > @@ -365,7 +365,7 @@ static bool vfio_display_dmabuf_init(VFIOPCIDevice *vdev, Error **errp) > &vfio_display_dmabuf_ops, > vdev); > if (vdev->enable_ramfb) { > - vdev->dpy->ramfb = ramfb_setup(errp); > + vdev->dpy->ramfb = ramfb_setup(vdev->use_legacy_x86_rom, errp); > if (!vdev->dpy->ramfb) { > return false; > } > @@ -494,7 +494,7 @@ static bool vfio_display_region_init(VFIOPCIDevice *vdev, Error **errp) > &vfio_display_region_ops, > vdev); > if (vdev->enable_ramfb) { > - vdev->dpy->ramfb = ramfb_setup(errp); > + vdev->dpy->ramfb = ramfb_setup(vdev->use_legacy_x86_rom, errp); > if (!vdev->dpy->ramfb) { > return false; > } > diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c > index 7f1532fbed..4e4759c954 100644 > --- a/hw/vfio/pci.c > +++ b/hw/vfio/pci.c > @@ -3564,6 +3564,7 @@ static const TypeInfo vfio_pci_dev_info = { > > static const Property vfio_pci_dev_nohotplug_properties[] = { > DEFINE_PROP_BOOL("ramfb", VFIOPCIDevice, enable_ramfb, false), > + DEFINE_PROP_BOOL("use_legacy_x86_rom", VFIOPCIDevice, use_legacy_x86_rom, true), > DEFINE_PROP_ON_OFF_AUTO("x-ramfb-migrate", VFIOPCIDevice, ramfb_migrate, > ON_OFF_AUTO_AUTO), > }; > diff --git a/hw/vfio/pci.h b/hw/vfio/pci.h > index d94ecaba68..713956157e 100644 > --- a/hw/vfio/pci.h > +++ b/hw/vfio/pci.h > @@ -177,6 +177,7 @@ struct VFIOPCIDevice { > bool no_kvm_ioeventfd; > bool no_vfio_ioeventfd; > bool enable_ramfb; > + bool use_legacy_x86_rom; > OnOffAuto ramfb_migrate; > bool defer_kvm_irq_routing; > bool clear_parent_atomics_on_exit; > diff --git a/include/hw/display/ramfb.h b/include/hw/display/ramfb.h > index a7e0019144..172aa6dc89 100644 > --- a/include/hw/display/ramfb.h > +++ b/include/hw/display/ramfb.h > @@ -6,7 +6,7 @@ > /* ramfb.c */ > typedef struct RAMFBState RAMFBState; > void ramfb_display_update(QemuConsole *con, RAMFBState *s); > -RAMFBState *ramfb_setup(Error **errp); > +RAMFBState *ramfb_setup(bool romfile, Error **errp); > > extern const VMStateDescription ramfb_vmstate; > > -- > 2.40.1 > With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|