aboutsummaryrefslogtreecommitdiff
path: root/vl.h
diff options
context:
space:
mode:
authorbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2006-04-23 17:12:42 +0000
committerbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2006-04-23 17:12:42 +0000
commit5fe141fd30d35516eac3674f7b62be51ba34543f (patch)
tree731317581b49ea6baa75544180a38bcfb64dc7fe /vl.h
parentce2f4b3cb9c1c542a6de6f0cdcd4771fe03a8bb6 (diff)
generic ELF loader
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1831 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'vl.h')
-rw-r--r--vl.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/vl.h b/vl.h
index 16d7e29937..72381ec8f6 100644
--- a/vl.h
+++ b/vl.h
@@ -87,8 +87,6 @@ uint64_t muldiv64(uint64_t a, uint32_t b, uint32_t c);
void hw_error(const char *fmt, ...);
-int get_image_size(const char *filename);
-int load_image(const char *filename, uint8_t *addr);
extern const char *bios_dir;
void pstrcpy(char *buf, int buf_size, const char *str);
@@ -871,8 +869,10 @@ void slavio_irq_info(void *opaque);
void slavio_pic_set_irq(void *opaque, int irq, int level);
void slavio_pic_set_irq_cpu(void *opaque, int irq, int level, unsigned int cpu);
-/* magic-load.c */
-int load_elf(const char *filename, uint8_t *addr);
+/* loader.c */
+int get_image_size(const char *filename);
+int load_image(const char *filename, uint8_t *addr);
+int load_elf(const char *filename, int64_t virt_to_phys_addend);
int load_aout(const char *filename, uint8_t *addr);
/* slavio_timer.c */