diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2013-05-30 12:13:06 +0300 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2013-06-02 18:13:54 +0300 |
| commit | ec0503b4f0a37b55fedc164185369bf5f0030f7b (patch) | |
| tree | 6905ba387ee6be84f2cc60ea54072002644daf14 | |
| parent | cbef02f819b05112cb626a955d8c86e30afe6a9f (diff) | |
firmware_abi: move to include/hw/nvram/
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 <afaerber@suse.de>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| -rw-r--r-- | hw/nvram/mac_nvram.c | 2 | ||||
| -rw-r--r-- | hw/sparc/sun4m.c | 2 | ||||
| -rw-r--r-- | hw/sparc64/sun4u.c | 2 | ||||
| -rw-r--r-- | include/hw/nvram/openbios_firmware_abi.h (renamed from include/hw/sparc/firmware_abi.h) | 0 |
4 files changed, 3 insertions, 3 deletions
diff --git a/hw/nvram/mac_nvram.c b/hw/nvram/mac_nvram.c index 5223330838..d76a06c486 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 884088150b..6e62d17c9a 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 5c2bbd44f5..13672de496 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 index 5e6e5d4d34..5e6e5d4d34 100644 --- a/include/hw/sparc/firmware_abi.h +++ b/include/hw/nvram/openbios_firmware_abi.h |