include: move hw/fw-path-provider.h to hw/core/

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/hw/core/fw-path-provider.c b/hw/core/fw-path-provider.c
index 4840faefd1af1caf8f7a79a7399cdad2f448d457..2a9da1aa4a2a56e41eac0532852af6befe351f31 100644 (file)
--- a/hw/core/fw-path-provider.c
+++ b/hw/core/fw-path-provider.c
@@ -16,7 +16,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/fw-path-provider.h"
+#include "hw/core/fw-path-provider.h"
 #include "qemu/module.h"
 
 char *fw_path_provider_get_dev_path(FWPathProvider *p, BusState *bus,

diff --git a/hw/core/qdev-fw.c b/hw/core/qdev-fw.c
index a31958355ff64b894a6e27bafd713ef47b2bc650..a587d2ddf9002af614ac8c2b5c2c8cc31dac8c07 100644 (file)
--- a/hw/core/qdev-fw.c
+++ b/hw/core/qdev-fw.c
@@ -16,7 +16,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/fw-path-provider.h"
+#include "hw/core/fw-path-provider.h"
 #include "hw/qdev-core.h"
 
 const char *qdev_fw_name(DeviceState *dev)

diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index bdc6c7ed7fe59db26931b37ef95d392499e4fee2..3a6e47eb8b7f3e87ad32f99c4cc727388ab7f19d 100644 (file)
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -66,7 +66,7 @@
 #include "hw/misc/macio/macio.h"
 #include "hw/ppc/openpic.h"
 #include "hw/loader.h"
-#include "hw/fw-path-provider.h"
+#include "hw/core/fw-path-provider.h"
 #include "elf.h"
 #include "qemu/error-report.h"
 #include "system/kvm.h"

diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
index 8d35080b9d1e32d5ffc69899b19d12635eaf6896..8f9ce68b8b0d7b366e441df97a79126b706ecbfd 100644 (file)
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -43,7 +43,7 @@
 #include "hw/char/escc.h"
 #include "hw/misc/macio/macio.h"
 #include "hw/loader.h"
-#include "hw/fw-path-provider.h"
+#include "hw/core/fw-path-provider.h"
 #include "elf.h"
 #include "qemu/error-report.h"
 #include "system/kvm.h"

diff --git a/hw/ppc/pegasos.c b/hw/ppc/pegasos.c
index 3b48a54e7a03bd41836ca432fdcc3b1bf1f781e0..e7396a729f3120b322f712d00319e1e121027d72 100644 (file)
--- a/hw/ppc/pegasos.c
+++ b/hw/ppc/pegasos.c
@@ -26,7 +26,7 @@
 #include "system/qtest.h"
 #include "hw/core/boards.h"
 #include "hw/loader.h"
-#include "hw/fw-path-provider.h"
+#include "hw/core/fw-path-provider.h"
 #include "elf.h"
 #include "qemu/log.h"
 #include "qemu/error-report.h"

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 6f2d10330d6735715aa725aa32535d2c8bf5c8ac..7c695ac4ecc5b56052d0dee2626f455b1e1c0b87 100644 (file)
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -43,7 +43,7 @@
 #include "system/reset.h"
 #include "system/runstate.h"
 #include "qemu/log.h"
-#include "hw/fw-path-provider.h"
+#include "hw/core/fw-path-provider.h"
 #include "elf.h"
 #include "net/net.h"
 #include "system/device_tree.h"

diff --git a/hw/scsi/vhost-scsi-common.c b/hw/scsi/vhost-scsi-common.c
index 43525ba46d32aa29c8ed3f5ffd8889dcd265c0f3..0bb4305de6153e5fec607cf2b9006825a877ff14 100644 (file)
--- a/hw/scsi/vhost-scsi-common.c
+++ b/hw/scsi/vhost-scsi-common.c
@@ -24,7 +24,7 @@
 #include "hw/virtio/virtio-scsi.h"
 #include "hw/virtio/virtio-bus.h"
 #include "hw/virtio/virtio-access.h"
-#include "hw/fw-path-provider.h"
+#include "hw/core/fw-path-provider.h"
 
 int vhost_scsi_common_start(VHostSCSICommon *vsc, Error **errp)
 {

diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c
index 239138c931651ce537a7565fbbf2d45d43614d2b..573a44b2b3ea225e49ecbf32ccc0d5a9d218044a 100644 (file)
--- a/hw/scsi/vhost-scsi.c
+++ b/hw/scsi/vhost-scsi.c
@@ -26,7 +26,7 @@
 #include "hw/virtio/vhost.h"
 #include "hw/virtio/virtio-scsi.h"
 #include "hw/virtio/virtio-bus.h"
-#include "hw/fw-path-provider.h"
+#include "hw/core/fw-path-provider.h"
 #include "hw/qdev-properties.h"
 #include "qemu/cutils.h"
 #include "system/system.h"

diff --git a/hw/scsi/vhost-user-scsi.c b/hw/scsi/vhost-user-scsi.c
index 25f2d894e7c827744a41302473712e7b34672536..0d7bbb52aba4a5a81f168da128b2bbdb809a8995 100644 (file)
--- a/hw/scsi/vhost-user-scsi.c
+++ b/hw/scsi/vhost-user-scsi.c
@@ -18,7 +18,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
-#include "hw/fw-path-provider.h"
+#include "hw/core/fw-path-provider.h"
 #include "hw/qdev-core.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"

diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index 961d599f48dd71eb81ea1458006215afc0a7701d..62ceb7eef4d7a24f2882020151483e42985404df 100644 (file)
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -54,7 +54,7 @@
 #include "hw/sysbus.h"
 #include "hw/ide/pci.h"
 #include "hw/loader.h"
-#include "hw/fw-path-provider.h"
+#include "hw/core/fw-path-provider.h"
 #include "elf.h"
 #include "trace.h"
 #include "qom/object.h"

diff --git a/include/hw/fw-path-provider.h b/include/hw/core/fw-path-provider.h
similarity index 100%
rename from include/hw/fw-path-provider.h
rename to include/hw/core/fw-path-provider.h

diff --git a/include/hw/virtio/vhost-scsi-common.h b/include/hw/virtio/vhost-scsi-common.h
index d54d9c916f2822c86e4a2116402f4c4cf608587d..7f34c7cb4fe19d43df82b4f6737e71a74008c7d7 100644 (file)
--- a/include/hw/virtio/vhost-scsi-common.h
+++ b/include/hw/virtio/vhost-scsi-common.h
@@ -16,7 +16,7 @@
 
 #include "hw/virtio/virtio-scsi.h"
 #include "hw/virtio/vhost.h"
-#include "hw/fw-path-provider.h"
+#include "hw/core/fw-path-provider.h"
 #include "qom/object.h"
 
 #define TYPE_VHOST_SCSI_COMMON "vhost-scsi-common"