Skip to contentSkip to conversation

hw/core: Restrict 'fw-path-provider.c' to system mode emulation

PATCH Applied Philippe Mathieu-Daudé 2 participants 2 messages Dec 7, 2020 – Dec 11, 2020 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 hw/core: Restrict 'fw-path-provider.c' to system mode emulation

fw-path-provider.c is only consumed by qdev-fw.c, which itself is in softmmu_ss[], so we can restrict fw-path-provider.c to softmmu too.

---
v2: Fix author email.

---
 hw/core/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/core/meson.build +1 -1
index 4a744f3b5e7..032576f5717 100644
@@ -1,7 +1,6 @@
 # core qdev-related obj files, also used by *-user and unit tests
 hwcore_files = files(
   'bus.c',
-  'fw-path-provider.c',
   'hotplug.c',
   'qdev-properties.c',
   'qdev.c',
@@ -25,6 +24,7 @@
 common_ss.add(when: 'CONFIG_XILINX_AXI', if_true: files('stream.c'))
 
 softmmu_ss.add(files(
+  'fw-path-provider.c',
   'loader.c',
   'machine-hmp-cmds.c',
   'machine.c',
Signature · 1 line
2.26.2
#1 lore raw
Quoted 25 lines · Philippe Mathieu-Daudé

fw-path-provider.c is only consumed by qdev-fw.c, which itself is in softmmu_ss[], so we can restrict fw-path-provider.c to softmmu too.

---
v2: Fix author email.

---
  hw/core/meson.build | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
hw/core/meson.build +0 -1
index 4a744f3b5e7..032576f5717 100644
@@ -1,7 +1,6 @@
  # core qdev-related obj files, also used by *-user and unit tests
  hwcore_files = files(
    'bus.c',
-  'fw-path-provider.c',
    'hotplug.c',
    'qdev-properties.c',
    'qdev.c',

hw/core/meson.build line 30

Quoted 7 lines
hw/core/meson.build +1 -0
@@ -25,6 +24,7 @@
  common_ss.add(when: 'CONFIG_XILINX_AXI', if_true: files('stream.c'))
 
  softmmu_ss.add(files(
+  'fw-path-provider.c',
    'loader.c',
    'machine-hmp-cmds.c',
    'machine.c',

Queued, thanks.

paolo