ramfb: Add property to control if load the romfile
v10 cover ramfb: Add property to control if load the romfile
Currently the ramfb device loads 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.
Then I set the use_legacy_x86_rom property to false by default, and only set it to true on x86 since only x86 will need it.
At the same time, set the "use-legacy-x86-rom" property to true on those historical versioned machine types in order to avoid the memory layout being changed.
Changelog:
---------
v9 -> v10:
- Fix the long line.
- Add the reviewed-by and ack.
v8 -> v9:
- Improve the commit message.
v7 -> v8:
- Set the property in microvm machine type.
v6 -> v7:
- Set the property into hw_compat_10_0 instead of hw_compat_9_2.
v5 -> v6:
- Set the property to true on those historical versioned machine types.
v4 -> v5:
- Fix some typo error.
- Set the property in piix machine type.
v3 -> v4:
- Set the new property to false by default, only set it to true on x86.
v2 -> v3:
- Fix the underscore error.
- Add a new patch to set the property in arm compatibility.
v1 -> v2:
- Change the property name.
v9: https://lore.kernel.org/all/[email protected]/
v7: https://lore.kernel.org/all/[email protected]/
v6: https://lore.kernel.org/all/[email protected]/
v5: https://lore.kernel.org/all/[email protected]/
v4: https://lore.kernel.org/all/[email protected]/
v3: https://lore.kernel.org/all/[email protected]/
v2: https://lore.kernel.org/all/[email protected]/
v1: https://lore.kernel.org/all/[email protected]/
Shaoqin Huang (2):
ramfb: Add property to control if load the romfile hw/i386: Add the ramfb romfile compatibility
hw/core/machine.c | 2 ++ hw/display/ramfb-standalone.c | 5 ++++- hw/display/ramfb-stubs.c | 2 +- hw/display/ramfb.c | 6 ++++-- hw/i386/microvm.c | 3 +++ hw/i386/pc_piix.c | 10 ++++++++++ hw/i386/pc_q35.c | 3 +++ hw/vfio/display.c | 4 ++-- hw/vfio/pci.c | 2 ++ hw/vfio/pci.h | 1 + include/hw/display/ramfb.h | 2 +- 11 files changed, 33 insertions(+), 7 deletions(-)
Signature · 1 line
2.40.1
PATCH v10 1/2 ramfb: Add property to control if load the romfile
Currently the ramfb device loads 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.
For now the default value is true but it will be turned off by default in subsequent patch when compats get properly handled.
--- hw/display/ramfb-standalone.c | 5 ++++- hw/display/ramfb-stubs.c | 2 +- hw/display/ramfb.c | 6 ++++-- hw/vfio/display.c | 4 ++-- hw/vfio/pci.c | 2 ++ hw/vfio/pci.h | 1 + include/hw/display/ramfb.h | 2 +- 7 files changed, 15 insertions(+), 7 deletions(-)
hw/display/ramfb-standalone.c +4 -1
@@ -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,8 @@ 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,const void *data)
hw/display/ramfb-stubs.c +1 -1
@@ -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 ;
hw/display/ramfb.c +4 -2
@@ -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);
hw/vfio/display.c +2 -2
@@ -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; }
hw/vfio/pci.c +2 -0
@@ -3710,6 +3710,8 @@ 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 ), };
hw/vfio/pci.h +1 -0
@@ -188,6 +188,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;
include/hw/display/ramfb.h +1 -1
@@ -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;
Signature · 1 line
2.40.1
PATCH v10 2/2 hw/i386: Add the ramfb romfile compatibility
In reply to Shaoqin Huangramfb is a sysbus device so it can only used for machine types where it is explicitly enabled:
# git grep machine_class_allow_dynamic_sysbus_dev.*TYPE_RAMFB_DEVICE hw/arm/virt.c: machine_class_allow_dynamic_sysbus_dev(mc, TYPE_RAMFB_DEVICE); hw/i386/microvm.c: machine_class_allow_dynamic_sysbus_dev(mc, TYPE_RAMFB_DEVICE); hw/i386/pc_piix.c: machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE); hw/i386/pc_q35.c: machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE); hw/loongarch/virt.c: machine_class_allow_dynamic_sysbus_dev(mc, TYPE_RAMFB_DEVICE); hw/riscv/virt.c: machine_class_allow_dynamic_sysbus_dev(mc, TYPE_RAMFB_DEVICE);
So these six are the only machine types we have to worry about.
The three x86 machine types (pc, q35, microvm) will actually use the rom (when booting with seabios).
For arm/riscv/loongarch virt we want to disable the rom.
This patch sets ramfb romfile option to false by default, except for x86 machines types (pc, q35, microvm) which need the rom file when booting with seabios and machine types <= 10.0 (handling the case of arm virt, for compat reasons).
At the same time, set the "use-legacy-x86-rom" property to true on those historical versioned machine types in order to avoid the memory layout being changed.
--- hw/core/machine.c | 2 ++ hw/display/ramfb-standalone.c | 2 +- hw/i386/microvm.c | 3 +++ hw/i386/pc_piix.c | 10 ++++++++++ hw/i386/pc_q35.c | 3 +++ hw/vfio/pci.c | 2 +- 6 files changed, 20 insertions(+), 2 deletions(-)
hw/core/machine.c +2 -0
@@ -39,6 +39,8 @@GlobalProperty hw_compat_10_0[] = { {"scsi-hd" ,"dpofua" ,"off" }, + {"ramfb" ,"use-legacy-x86-rom" ,"true" }, + {"vfio-pci" ,"use-legacy-x86-rom" ,"true" }, };const size_t hw_compat_10_0_len =G_N_ELEMENTS (hw_compat_10_0);
hw/display/ramfb-standalone.c +1 -1
@@ -64,7 +64,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), + use_legacy_x86_rom, false), };static void ramfb_class_initfn (ObjectClass *klass,const void *data)
hw/i386/microvm.c +3 -0
@@ -49,6 +49,7 @@#include "hw/acpi/generic_event_device.h" #include "hw/pci-host/gpex.h" #include "hw/usb/xhci.h" +#include "hw/vfio/pci.h" #include "elf.h" #include "kvm/kvm_i386.h"
@@ -633,6 +634,8 @@ GlobalProperty microvm_properties[] = {* so reserving io space is not going to work. Turn it off. */ { "pcie-root-port", "io-reserve", "0" }, + { TYPE_RAMFB_DEVICE, "use-legacy-x86-rom", "true" }, + { TYPE_VFIO_PCI, "use-legacy-x86-rom", "true" }, };static void microvm_class_init (ObjectClass *oc,const void *data)
hw/i386/pc_piix.c +10 -0
@@ -49,6 +49,7 @@#include "hw/i2c/smbus_eeprom.h" #include "system/memory.h" #include "hw/acpi/acpi.h" +#include "hw/vfio/pci.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "system/xen.h"
@@ -77,6 +78,13 @@ static const int ide_iobase2[MAX_IDE_BUS] = { 0x3f6, 0x376 };static const int ide_irq[MAX_IDE_BUS ] = {14 ,15 };#endif +static GlobalProperty pc_piix_compat_defaults[] = { + {TYPE_RAMFB_DEVICE ,"use-legacy-x86-rom" ,"true" }, + {TYPE_VFIO_PCI ,"use-legacy-x86-rom" ,"true" }, +}; +static const size_t pc_piix_compat_defaults_len = +G_N_ELEMENTS (pc_piix_compat_defaults); +/* * Return the global irq number corresponding to a given device irq * pin. We could also use the bus number to have a more precise mapping.
@@ -482,6 +490,8 @@ static void pc_i440fx_machine_options(MachineClass *m) pc_set_south_bridge);object_class_property_set_description (oc,"x-south-bridge" ,"Use a different south bridge than PIIX3" ); +compat_props_add (m->compat_props, + pc_piix_compat_defaults, pc_piix_compat_defaults_len); }static void pc_i440fx_machine_10_1_options (MachineClass *m)
hw/i386/pc_q35.c +3 -0
@@ -45,6 +45,7 @@#include "hw/i386/pc.h" #include "hw/i386/amd_iommu.h" #include "hw/i386/intel_iommu.h" +#include "hw/vfio/pci.h" #include "hw/virtio/virtio-iommu.h" #include "hw/display/ramfb.h" #include "hw/ide/pci.h"
@@ -67,6 +68,8 @@static GlobalProperty pc_q35_compat_defaults[] = { {TYPE_VIRTIO_IOMMU_PCI ,"aw-bits" ,"39" }, + {TYPE_RAMFB_DEVICE ,"use-legacy-x86-rom" ,"true" }, + {TYPE_VFIO_PCI ,"use-legacy-x86-rom" ,"true" }, };static const size_t pc_q35_compat_defaults_len =G_N_ELEMENTS (pc_q35_compat_defaults);
hw/vfio/pci.c +1 -1
@@ -3711,7 +3711,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), + use_legacy_x86_rom, false),DEFINE_PROP_ON_OFF_AUTO ("x-ramfb-migrate" , VFIOPCIDevice, ramfb_migrate,ON_OFF_AUTO_AUTO ), };
Signature · 1 line
2.40.1