Signed-off-by: Paolo Bonzini <[email protected]>
---
include/hw/{ => core}/fw-path-provider.h | 0
include/hw/virtio/vhost-scsi-common.h | 2 +-
hw/core/fw-path-provider.c | 2 +-
hw/core/qdev-fw.c | 2 +-
hw/ppc/mac_newworld.c | 2 +-
hw/ppc/mac_oldworld.c | 2 +-
hw/ppc/pegasos.c | 2 +-
hw/ppc/spapr.c | 2 +-
hw/scsi/vhost-scsi-common.c | 2 +-
hw/scsi/vhost-scsi.c | 2 +-
hw/scsi/vhost-user-scsi.c | 2 +-
hw/sparc64/sun4u.c | 2 +-
12 files changed, 11 insertions(+), 11 deletions(-)
rename include/hw/{ => core}/fw-path-provider.h (100%)
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 d54d9c916f2..7f34c7cb4fe 100644
--- 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"
diff --git a/hw/core/fw-path-provider.c b/hw/core/fw-path-provider.c
index 4840faefd1a..2a9da1aa4a2 100644
--- 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 a31958355ff..a587d2ddf90 100644
--- 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 bdc6c7ed7fe..3a6e47eb8b7 100644
--- 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 8d35080b9d1..8f9ce68b8b0 100644
--- 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 3b48a54e7a0..e7396a729f3 100644
--- 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 6f2d10330d6..7c695ac4ecc 100644
--- 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 43525ba46d3..0bb4305de61 100644
--- 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 cdf405b0f86..b356bd9762e 100644
--- 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 25f2d894e7c..0d7bbb52aba 100644
--- 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 961d599f48d..62ceb7eef4d 100644
--- 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"
--
2.51.1
