Skip to contentSkip to conversation

hw/i386: Fix 'use-legacy-x86-rom' property compatibility

PATCH Applied Cédric Le Goater 5 participants 7 messages Jul 23, 2025 – Jul 28, 2025

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hw/i386: Fix 'use-legacy-x86-rom' property compatibility

Commit 350785d41d8b ("ramfb: Add property to control if load the romfile") introduced the use-legacy-x86-rom property for the vfio-pci-nohotplug device, allowing control over VGA BIOS ROM loading. However, the property compatibility setting was incorrectly applied to the vfio-pci device instead, which causes all vfio-pci devices to fail to load. This change fixes the issue by ensuring the property is set on the correct device.

Fixes d5fcf0d960d8 ("hw/i386: Add the ramfb romfile compatibility")
Cc Gerd Hoffmann <[email protected]>
Cc Shaoqin Huang <[email protected]>
---
 hw/vfio/types.h   | 2 ++
 hw/core/machine.c | 2 +-
 hw/i386/microvm.c | 2 +-
 hw/i386/pc_piix.c | 2 +-
 hw/i386/pc_q35.c  | 2 +-
 hw/vfio/pci.c     | 2 --
 6 files changed, 6 insertions(+), 6 deletions(-)
hw/vfio/types.h +2 -0
index fa20c29b9fbbf51ddad4f6cb0535a70152224a94..c19334ff25ae2f5221f08ed863553ce7f8e3be98 100644
@@ -18,4 +18,6 @@
 #define TYPE_VFIO_PCI "vfio-pci"
 /* TYPE_VFIO_PCI shares struct VFIOPCIDevice. */
 
+#define TYPE_VFIO_PCI_NOHOTPLUG "vfio-pci-nohotplug"
+
 #endif /* HW_VFIO_VFIO_TYPES_H */
hw/core/machine.c +1 -1
index d6b2240fc250d2d1194dee62e5356c0c214f1069..bd47527479a7947ca293a47c9a6f49916d24bad3 100644
@@ -41,7 +41,7 @@ GlobalProperty hw_compat_10_0[] = {
     { "scsi-hd", "dpofua", "off" },
     { "vfio-pci", "x-migration-load-config-after-iter", "off" },
     { "ramfb", "use-legacy-x86-rom", "true"},
-    { "vfio-pci", "use-legacy-x86-rom", "true" },
+    { "vfio-pci-nohotplug", "use-legacy-x86-rom", "true" },
 };
 const size_t hw_compat_10_0_len = G_N_ELEMENTS(hw_compat_10_0);
 
hw/i386/microvm.c +1 -1
index d90b69a162007af8af1b8596be590126fb00fb59..94d22a232aca1f82590d80c2ac6cc279bb9ff808 100644
@@ -635,7 +635,7 @@ GlobalProperty microvm_properties[] = {
      */
     { "pcie-root-port", "io-reserve", "0" },
     { TYPE_RAMFB_DEVICE, "use-legacy-x86-rom", "true" },
-    { TYPE_VFIO_PCI, "use-legacy-x86-rom", "true" },
+    { TYPE_VFIO_PCI_NOHOTPLUG, "use-legacy-x86-rom", "true" },
 };
 
 static void microvm_class_init(ObjectClass *oc, const void *data)
hw/i386/pc_piix.c +1 -1
index ad5caff3a5d251671db591c68bed3b69a5e45d17..c03324281bdb356e17d434b156e4080865867f4f 100644
@@ -80,7 +80,7 @@ static const int ide_irq[MAX_IDE_BUS] = { 14, 15 };
 
 static GlobalProperty pc_piix_compat_defaults[] = {
     { TYPE_RAMFB_DEVICE, "use-legacy-x86-rom", "true" },
-    { TYPE_VFIO_PCI, "use-legacy-x86-rom", "true" },
+    { TYPE_VFIO_PCI_NOHOTPLUG, "use-legacy-x86-rom", "true" },
 };
 static const size_t pc_piix_compat_defaults_len =
     G_N_ELEMENTS(pc_piix_compat_defaults);
hw/i386/pc_q35.c +1 -1
index 9b9519fa02d506393058c085178924156e9e0d10..b309b2b378db4741b72828c1f34d2edc2e057a1d 100644
@@ -69,7 +69,7 @@
 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" },
+    { TYPE_VFIO_PCI_NOHOTPLUG, "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 +0 -2
index e72d514a4cb91946f7c79332492bf5d709c308f2..0c4606d9cb5e163b8c533ed9b89d4d73eafaae24 100644
@@ -49,8 +49,6 @@
 #include "vfio-migration-internal.h"
 #include "vfio-helpers.h"
 
-#define TYPE_VFIO_PCI_NOHOTPLUG "vfio-pci-nohotplug"
-
 /* Protected by BQL */
 static KVMRouteChange vfio_route_change;
 
Signature · 1 line
2.50.1
#1 lore raw

Shaoqin,

Quoted 4 lines · Cédric Le Goater

Commit 350785d41d8b ("ramfb: Add property to control if load the romfile") introduced the use-legacy-x86-rom property for the vfio-pci-nohotplug device, allowing control over VGA BIOS ROM loading.

Could you please send a patch adding a property description for use-legacy-x86-rom ?

Thanks,

C.

Acked-by on v1 1/1
#2 lore raw
In reply to Cédric Le Goater
Quoted 8 lines · Cédric Le Goater

Commit 350785d41d8b ("ramfb: Add property to control if load the romfile") introduced the use-legacy-x86-rom property for the vfio-pci-nohotplug device, allowing control over VGA BIOS ROM loading. However, the property compatibility setting was incorrectly applied to the vfio-pci device instead, which causes all vfio-pci devices to fail to load. This change fixes the issue by ensuring the property is set on the correct device.

Quoted 4 lines
Fixes d5fcf0d960d8 ("hw/i386: Add the ramfb romfile compatibility")
Cc Gerd Hoffmann <[email protected]>
Cc Shaoqin Huang <[email protected]>
Acked-by on v1 1/1
#3 lore raw
In reply to Cédric Le Goater
Quoted 8 lines · Cédric Le Goater

Commit 350785d41d8b ("ramfb: Add property to control if load the romfile") introduced the use-legacy-x86-rom property for the vfio-pci-nohotplug device, allowing control over VGA BIOS ROM loading. However, the property compatibility setting was incorrectly applied to the vfio-pci device instead, which causes all vfio-pci devices to fail to load. This change fixes the issue by ensuring the property is set on the correct device.

Quoted 4 lines
Fixes d5fcf0d960d8 ("hw/i386: Add the ramfb romfile compatibility")
Cc Gerd Hoffmann <[email protected]>
Cc Shaoqin Huang <[email protected]>
Quoted 87 lines
---
 hw/vfio/types.h   | 2 ++
 hw/core/machine.c | 2 +-
 hw/i386/microvm.c | 2 +-
 hw/i386/pc_piix.c | 2 +-
 hw/i386/pc_q35.c  | 2 +-
 hw/vfio/pci.c     | 2 --
 6 files changed, 6 insertions(+), 6 deletions(-)
hw/vfio/types.h +2 -0
index fa20c29b9fbbf51ddad4f6cb0535a70152224a94..c19334ff25ae2f5221f08ed863553ce7f8e3be98 100644
@@ -18,4 +18,6 @@
 #define TYPE_VFIO_PCI "vfio-pci"
 /* TYPE_VFIO_PCI shares struct VFIOPCIDevice. */
 
+#define TYPE_VFIO_PCI_NOHOTPLUG "vfio-pci-nohotplug"
+
 #endif /* HW_VFIO_VFIO_TYPES_H */
hw/core/machine.c +1 -1
index d6b2240fc250d2d1194dee62e5356c0c214f1069..bd47527479a7947ca293a47c9a6f49916d24bad3 100644
@@ -41,7 +41,7 @@ GlobalProperty hw_compat_10_0[] = {
     { "scsi-hd", "dpofua", "off" },
     { "vfio-pci", "x-migration-load-config-after-iter", "off" },
     { "ramfb", "use-legacy-x86-rom", "true"},
-    { "vfio-pci", "use-legacy-x86-rom", "true" },
+    { "vfio-pci-nohotplug", "use-legacy-x86-rom", "true" },
 };
 const size_t hw_compat_10_0_len = G_N_ELEMENTS(hw_compat_10_0);
 
hw/i386/microvm.c +1 -1
index d90b69a162007af8af1b8596be590126fb00fb59..94d22a232aca1f82590d80c2ac6cc279bb9ff808 100644
@@ -635,7 +635,7 @@ GlobalProperty microvm_properties[] = {
      */
     { "pcie-root-port", "io-reserve", "0" },
     { TYPE_RAMFB_DEVICE, "use-legacy-x86-rom", "true" },
-    { TYPE_VFIO_PCI, "use-legacy-x86-rom", "true" },
+    { TYPE_VFIO_PCI_NOHOTPLUG, "use-legacy-x86-rom", "true" },
 };
 
 static void microvm_class_init(ObjectClass *oc, const void *data)
hw/i386/pc_piix.c +1 -1
index ad5caff3a5d251671db591c68bed3b69a5e45d17..c03324281bdb356e17d434b156e4080865867f4f 100644
@@ -80,7 +80,7 @@ static const int ide_irq[MAX_IDE_BUS] = { 14, 15 };
 
 static GlobalProperty pc_piix_compat_defaults[] = {
     { TYPE_RAMFB_DEVICE, "use-legacy-x86-rom", "true" },
-    { TYPE_VFIO_PCI, "use-legacy-x86-rom", "true" },
+    { TYPE_VFIO_PCI_NOHOTPLUG, "use-legacy-x86-rom", "true" },
 };
 static const size_t pc_piix_compat_defaults_len =
     G_N_ELEMENTS(pc_piix_compat_defaults);
hw/i386/pc_q35.c +1 -1
index 9b9519fa02d506393058c085178924156e9e0d10..b309b2b378db4741b72828c1f34d2edc2e057a1d 100644
@@ -69,7 +69,7 @@
 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" },
+    { TYPE_VFIO_PCI_NOHOTPLUG, "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 +0 -2
index e72d514a4cb91946f7c79332492bf5d709c308f2..0c4606d9cb5e163b8c533ed9b89d4d73eafaae24 100644
@@ -49,8 +49,6 @@
 #include "vfio-migration-internal.h"
 #include "vfio-helpers.h"
 
-#define TYPE_VFIO_PCI_NOHOTPLUG "vfio-pci-nohotplug"
-
 /* Protected by BQL */
 static KVMRouteChange vfio_route_change;
 
Signature · 1 line
2.50.1
Reviewed-by on v1 1/1
#4 lore raw
In reply to Cédric Le Goater
Quoted 8 lines · Cédric Le Goater

Commit 350785d41d8b ("ramfb: Add property to control if load the romfile") introduced the use-legacy-x86-rom property for the vfio-pci-nohotplug device, allowing control over VGA BIOS ROM loading. However, the property compatibility setting was incorrectly applied to the vfio-pci device instead, which causes all vfio-pci devices to fail to load. This change fixes the issue by ensuring the property is set on the correct device.

Quoted 5 lines
Fixes d5fcf0d960d8 ("hw/i386: Add the ramfb romfile compatibility")
Cc Gerd Hoffmann <[email protected]>
Cc Shaoqin Huang <[email protected]>

---

Thanks, this looks like the right way to fix it to me:

Reviewed-by on v1 1/1
#5 lore raw
In reply to Cédric Le Goater
Quoted 16 lines · Cédric Le Goater

Date: Wed, 23 Jul 2025 08:27:14 +0200
From: Cédric Le Goater <[email protected]>
Subject: [PATCH] hw/i386: Fix 'use-legacy-x86-rom' property compatibility

Commit 350785d41d8b ("ramfb: Add property to control if load the romfile") introduced the use-legacy-x86-rom property for the vfio-pci-nohotplug device, allowing control over VGA BIOS ROM loading. However, the property compatibility setting was incorrectly applied to the vfio-pci device instead, which causes all vfio-pci devices to fail to load. This change fixes the issue by ensuring the property is set on the correct device.

Fixes d5fcf0d960d8 ("hw/i386: Add the ramfb romfile compatibility")
Cc Gerd Hoffmann <[email protected]>
Cc Shaoqin Huang <[email protected]>
Quoted 8 lines
---
 hw/vfio/types.h   | 2 ++
 hw/core/machine.c | 2 +-
 hw/i386/microvm.c | 2 +-
 hw/i386/pc_piix.c | 2 +-
 hw/i386/pc_q35.c  | 2 +-
 hw/vfio/pci.c     | 2 --
 6 files changed, 6 insertions(+), 6 deletions(-)

LGTM. Thanks!

author Applied
#6 lore raw
In reply to Cédric Le Goater
Quoted 89 lines · Cédric Le Goater

Commit 350785d41d8b ("ramfb: Add property to control if load the romfile") introduced the use-legacy-x86-rom property for the vfio-pci-nohotplug device, allowing control over VGA BIOS ROM loading. However, the property compatibility setting was incorrectly applied to the vfio-pci device instead, which causes all vfio-pci devices to fail to load. This change fixes the issue by ensuring the property is set on the correct device.

Fixes d5fcf0d960d8 ("hw/i386: Add the ramfb romfile compatibility")
Cc Gerd Hoffmann <[email protected]>
Cc Shaoqin Huang <[email protected]>
---
  hw/vfio/types.h   | 2 ++
  hw/core/machine.c | 2 +-
  hw/i386/microvm.c | 2 +-
  hw/i386/pc_piix.c | 2 +-
  hw/i386/pc_q35.c  | 2 +-
  hw/vfio/pci.c     | 2 --
  6 files changed, 6 insertions(+), 6 deletions(-)
hw/vfio/types.h +2 -0
index fa20c29b9fbbf51ddad4f6cb0535a70152224a94..c19334ff25ae2f5221f08ed863553ce7f8e3be98 100644
@@ -18,4 +18,6 @@
  #define TYPE_VFIO_PCI "vfio-pci"
  /* TYPE_VFIO_PCI shares struct VFIOPCIDevice. */
 
+#define TYPE_VFIO_PCI_NOHOTPLUG "vfio-pci-nohotplug"
+
  #endif /* HW_VFIO_VFIO_TYPES_H */
hw/core/machine.c +1 -1
index d6b2240fc250d2d1194dee62e5356c0c214f1069..bd47527479a7947ca293a47c9a6f49916d24bad3 100644
@@ -41,7 +41,7 @@ GlobalProperty hw_compat_10_0[] = {
      { "scsi-hd", "dpofua", "off" },
      { "vfio-pci", "x-migration-load-config-after-iter", "off" },
      { "ramfb", "use-legacy-x86-rom", "true"},
-    { "vfio-pci", "use-legacy-x86-rom", "true" },
+    { "vfio-pci-nohotplug", "use-legacy-x86-rom", "true" },
  };
  const size_t hw_compat_10_0_len = G_N_ELEMENTS(hw_compat_10_0);
 
hw/i386/microvm.c +1 -1
index d90b69a162007af8af1b8596be590126fb00fb59..94d22a232aca1f82590d80c2ac6cc279bb9ff808 100644
@@ -635,7 +635,7 @@ GlobalProperty microvm_properties[] = {
       */
      { "pcie-root-port", "io-reserve", "0" },
      { TYPE_RAMFB_DEVICE, "use-legacy-x86-rom", "true" },
-    { TYPE_VFIO_PCI, "use-legacy-x86-rom", "true" },
+    { TYPE_VFIO_PCI_NOHOTPLUG, "use-legacy-x86-rom", "true" },
  };
 
  static void microvm_class_init(ObjectClass *oc, const void *data)
hw/i386/pc_piix.c +1 -1
index ad5caff3a5d251671db591c68bed3b69a5e45d17..c03324281bdb356e17d434b156e4080865867f4f 100644
@@ -80,7 +80,7 @@ static const int ide_irq[MAX_IDE_BUS] = { 14, 15 };
 
  static GlobalProperty pc_piix_compat_defaults[] = {
      { TYPE_RAMFB_DEVICE, "use-legacy-x86-rom", "true" },
-    { TYPE_VFIO_PCI, "use-legacy-x86-rom", "true" },
+    { TYPE_VFIO_PCI_NOHOTPLUG, "use-legacy-x86-rom", "true" },
  };
  static const size_t pc_piix_compat_defaults_len =
      G_N_ELEMENTS(pc_piix_compat_defaults);
hw/i386/pc_q35.c +1 -1
index 9b9519fa02d506393058c085178924156e9e0d10..b309b2b378db4741b72828c1f34d2edc2e057a1d 100644
@@ -69,7 +69,7 @@
  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" },
+    { TYPE_VFIO_PCI_NOHOTPLUG, "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 +0 -0
index e72d514a4cb91946f7c79332492bf5d709c308f2..0c4606d9cb5e163b8c533ed9b89d4d73eafaae24 100644

hw/vfio/pci.c line 54

Quoted 8 lines
hw/vfio/pci.c +0 -2
@@ -49,8 +49,6 @@
  #include "vfio-migration-internal.h"
  #include "vfio-helpers.h"
 
-#define TYPE_VFIO_PCI_NOHOTPLUG "vfio-pci-nohotplug"
-
  /* Protected by BQL */
  static KVMRouteChange vfio_route_change;
 

Applied to vfio-next.

Thanks,

C.