Re: [PATCH v1] ramfb: Add property to control if load the romfile

[Philippe Mathieu-Daudé]

Hi Shaoqin,

On 5/6/25 05:03, 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.

So add a new property ramfb-romfile 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.

Signed-off-by: Shaoqin Huang <shahu...@redhat.com>
---
  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(-)

Simpler to directly pass the ROM path instead of using a boolean,
so board (or CLI) could pass path to non-x86 rom.

diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index 7f1532fbed..bfdf365978 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("ramfb-romfile", VFIOPCIDevice, ramfb_romfile, true),

        DEFINE_PROP_STRING("rom-path", ...);

      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..d567de8f10 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 ramfb_romfile;

        char *rompath;

      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);

  RAMFBState *ramfb_setup(char *rompath, Error **errp);

extern const VMStateDescription ramfb_vmstate;