diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-03-18 17:36:02 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-04-08 18:13:16 +0200 |
| commit | 47b43a1f414c5b3eb9eb7502d0b0be0d134259ba (patch) | |
| tree | 9acfd03f458083a077ac79bd462d5360916f445f /hw/i386 | |
| parent | 8d8b636d28a97af7bf43c3267d07f87b9530939a (diff) | |
| download | qemu-47b43a1f414c5b3eb9eb7502d0b0be0d134259ba.zip qemu-47b43a1f414c5b3eb9eb7502d0b0be0d134259ba.tar.gz qemu-47b43a1f414c5b3eb9eb7502d0b0be0d134259ba.tar.bz2 | |
hw: move private headers to hw/ subdirectories.
Many headers are used only in a single directory. These can be
kept in hw/.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/i386')
| -rw-r--r-- | hw/i386/multiboot.c | 2 | ||||
| -rw-r--r-- | hw/i386/multiboot.h | 12 | ||||
| -rw-r--r-- | hw/i386/pc.c | 2 | ||||
| -rw-r--r-- | hw/i386/xen_domainbuild.c | 2 | ||||
| -rw-r--r-- | hw/i386/xen_domainbuild.h | 13 | ||||
| -rw-r--r-- | hw/i386/xen_machine_pv.c | 2 |
6 files changed, 29 insertions, 4 deletions
diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c index c7f01df..d696507 100644 --- a/hw/i386/multiboot.c +++ b/hw/i386/multiboot.c @@ -24,7 +24,7 @@ #include "hw/hw.h" #include "hw/nvram/fw_cfg.h" -#include "hw/multiboot.h" +#include "multiboot.h" #include "hw/loader.h" #include "elf.h" #include "sysemu/sysemu.h" diff --git a/hw/i386/multiboot.h b/hw/i386/multiboot.h new file mode 100644 index 0000000..98fb1b7 --- /dev/null +++ b/hw/i386/multiboot.h @@ -0,0 +1,12 @@ +#ifndef QEMU_MULTIBOOT_H +#define QEMU_MULTIBOOT_H + +int load_multiboot(void *fw_cfg, + FILE *f, + const char *kernel_filename, + const char *initrd_filename, + const char *kernel_cmdline, + int kernel_file_size, + uint8_t *header); + +#endif diff --git a/hw/i386/pc.c b/hw/i386/pc.c index a38fc95..8d75b34 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -34,7 +34,7 @@ #include "hw/i386/smbios.h" #include "hw/loader.h" #include "elf.h" -#include "hw/multiboot.h" +#include "multiboot.h" #include "hw/timer/mc146818rtc.h" #include "hw/timer/i8254.h" #include "hw/audio/pcspk.h" diff --git a/hw/i386/xen_domainbuild.c b/hw/i386/xen_domainbuild.c index ed90b4b..4e2cf95 100644 --- a/hw/i386/xen_domainbuild.c +++ b/hw/i386/xen_domainbuild.c @@ -1,6 +1,6 @@ #include <signal.h> #include "hw/xen/xen_backend.h" -#include "hw/xen_domainbuild.h" +#include "xen_domainbuild.h" #include "qemu/timer.h" #include "qemu/log.h" diff --git a/hw/i386/xen_domainbuild.h b/hw/i386/xen_domainbuild.h new file mode 100644 index 0000000..29a91ea --- /dev/null +++ b/hw/i386/xen_domainbuild.h @@ -0,0 +1,13 @@ +#ifndef QEMU_HW_XEN_DOMAINBUILD_H +#define QEMU_HW_XEN_DOMAINBUILD_H 1 + +#include "hw/xen/xen_common.h" + +int xenstore_domain_init1(const char *kernel, const char *ramdisk, + const char *cmdline); +int xenstore_domain_init2(int xenstore_port, int xenstore_mfn, + int console_port, int console_mfn); +int xen_domain_build_pv(const char *kernel, const char *ramdisk, + const char *cmdline); + +#endif /* QEMU_HW_XEN_DOMAINBUILD_H */ diff --git a/hw/i386/xen_machine_pv.c b/hw/i386/xen_machine_pv.c index fdd9374..f829a52 100644 --- a/hw/i386/xen_machine_pv.c +++ b/hw/i386/xen_machine_pv.c @@ -26,7 +26,7 @@ #include "hw/i386/pc.h" #include "hw/boards.h" #include "hw/xen/xen_backend.h" -#include "hw/xen_domainbuild.h" +#include "xen_domainbuild.h" #include "sysemu/blockdev.h" static void xen_init_pv(QEMUMachineInitArgs *args) |