[Qemu-devel] [PULL 3/9] firmware_abi: move to include/hw/nvram/

[Michael S. Tsirkin]

firmware_abi.h with structs for OpenBIOS landed in hw/sparc/ by mistake
- move it to hw/nvram/ alongside fw_cfg.h.  In addition to sparc it's
included from ppc mac_nvram.c and will need to include it from prep.c in
the future.

Acked-by: Andreas Färber <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
 hw/nvram/mac_nvram.c                                               | 2 +-
 hw/sparc/sun4m.c                                                   | 2 +-
 hw/sparc64/sun4u.c                                                 | 2 +-
 include/hw/{sparc/firmware_abi.h => nvram/openbios_firmware_abi.h} | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename include/hw/{sparc/firmware_abi.h => nvram/openbios_firmware_abi.h} 
(100%)

diff --git a/hw/nvram/mac_nvram.c b/hw/nvram/mac_nvram.c
index 5223330..d76a06c 100644
--- a/hw/nvram/mac_nvram.c
+++ b/hw/nvram/mac_nvram.c
@@ -23,7 +23,7 @@
  * THE SOFTWARE.
  */
 #include "hw/hw.h"
-#include "hw/sparc/firmware_abi.h"
+#include "hw/nvram/openbios_firmware_abi.h"
 #include "sysemu/sysemu.h"
 #include "hw/ppc/mac.h"
 
diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index 8840881..6e62d17 100644
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -30,7 +30,7 @@
 #include "sysemu/sysemu.h"
 #include "net/net.h"
 #include "hw/boards.h"
-#include "hw/sparc/firmware_abi.h"
+#include "hw/nvram/openbios_firmware_abi.h"
 #include "hw/scsi/esp.h"
 #include "hw/i386/pc.h"
 #include "hw/isa/isa.h"
diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index 5c2bbd4..13672de 100644
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -32,7 +32,7 @@
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"
 #include "hw/boards.h"
-#include "hw/sparc/firmware_abi.h"
+#include "hw/nvram/openbios_firmware_abi.h"
 #include "hw/nvram/fw_cfg.h"
 #include "hw/sysbus.h"
 #include "hw/ide.h"
diff --git a/include/hw/sparc/firmware_abi.h 
b/include/hw/nvram/openbios_firmware_abi.h
similarity index 100%
rename from include/hw/sparc/firmware_abi.h
rename to include/hw/nvram/openbios_firmware_abi.h
-- 
MST