aboutsummaryrefslogtreecommitdiff
path: root/kqemu.h
diff options
context:
space:
mode:
authorbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2008-05-30 20:48:25 +0000
committerbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2008-05-30 20:48:25 +0000
commitda260249a4109b1ac82016b27973c50f0a74311a (patch)
tree8eee1bfd192fb400174a4a9207349e57e649817b /kqemu.h
parentda94d26390b292f2b9d90aee2936d8545364d5a2 (diff)
downloadqemu-da260249a4109b1ac82016b27973c50f0a74311a.zip
qemu-da260249a4109b1ac82016b27973c50f0a74311a.tar.gz
qemu-da260249a4109b1ac82016b27973c50f0a74311a.tar.bz2
kqemu API change - allow use of kqemu with 32 bit QEMU on a 64 bit host
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4628 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'kqemu.h')
-rw-r--r--kqemu.h118
1 files changed, 70 insertions, 48 deletions
diff --git a/kqemu.h b/kqemu.h
index 7b43057..ed25c75 100644
--- a/kqemu.h
+++ b/kqemu.h
@@ -1,8 +1,8 @@
/*
* KQEMU header
- *
- * Copyright (c) 2004-2006 Fabrice Bellard
- *
+ *
+ * Copyright (c) 2004-2008 Fabrice Bellard
+ *
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
@@ -24,25 +24,27 @@
#ifndef KQEMU_H
#define KQEMU_H
-#define KQEMU_VERSION 0x010300
+#if defined(__i386__)
+#define KQEMU_PAD32(x) x
+#else
+#define KQEMU_PAD32(x)
+#endif
+
+#define KQEMU_VERSION 0x010400
struct kqemu_segment_cache {
- uint32_t selector;
- unsigned long base;
- uint32_t limit;
+ uint16_t selector;
+ uint16_t padding1;
uint32_t flags;
+ uint64_t base;
+ uint32_t limit;
+ uint32_t padding2;
};
struct kqemu_cpu_state {
-#ifdef __x86_64__
- unsigned long regs[16];
-#else
- unsigned long regs[8];
-#endif
- unsigned long eip;
- unsigned long eflags;
-
- uint32_t dummy0, dummy1, dumm2, dummy3, dummy4;
+ uint64_t regs[16];
+ uint64_t eip;
+ uint64_t eflags;
struct kqemu_segment_cache segs[6]; /* selector values */
struct kqemu_segment_cache ldt;
@@ -50,63 +52,81 @@ struct kqemu_cpu_state {
struct kqemu_segment_cache gdt; /* only base and limit are used */
struct kqemu_segment_cache idt; /* only base and limit are used */
- unsigned long cr0;
- unsigned long dummy5;
- unsigned long cr2;
- unsigned long cr3;
- unsigned long cr4;
- uint32_t a20_mask;
+ uint64_t cr0;
+ uint64_t cr2;
+ uint64_t cr3;
+ uint64_t cr4;
+ uint64_t a20_mask;
/* sysenter registers */
- uint32_t sysenter_cs;
- uint32_t sysenter_esp;
- uint32_t sysenter_eip;
- uint64_t efer __attribute__((aligned(8)));
+ uint64_t sysenter_cs;
+ uint64_t sysenter_esp;
+ uint64_t sysenter_eip;
+ uint64_t efer;
uint64_t star;
-#ifdef __x86_64__
- unsigned long lstar;
- unsigned long cstar;
- unsigned long fmask;
- unsigned long kernelgsbase;
-#endif
+
+ uint64_t lstar;
+ uint64_t cstar;
+ uint64_t fmask;
+ uint64_t kernelgsbase;
+
uint64_t tsc_offset;
- unsigned long dr0;
- unsigned long dr1;
- unsigned long dr2;
- unsigned long dr3;
- unsigned long dr6;
- unsigned long dr7;
+ uint64_t dr0;
+ uint64_t dr1;
+ uint64_t dr2;
+ uint64_t dr3;
+ uint64_t dr6;
+ uint64_t dr7;
uint8_t cpl;
uint8_t user_only;
+ uint16_t padding1;
uint32_t error_code; /* error_code when exiting with an exception */
- unsigned long next_eip; /* next eip value when exiting with an interrupt */
- unsigned int nb_pages_to_flush; /* number of pages to flush,
+ uint64_t next_eip; /* next eip value when exiting with an interrupt */
+ uint32_t nb_pages_to_flush; /* number of pages to flush,
KQEMU_FLUSH_ALL means full flush */
#define KQEMU_MAX_PAGES_TO_FLUSH 512
#define KQEMU_FLUSH_ALL (KQEMU_MAX_PAGES_TO_FLUSH + 1)
- long retval;
+ int32_t retval;
/* number of ram_dirty entries to update */
- unsigned int nb_ram_pages_to_update;
+ uint32_t nb_ram_pages_to_update;
#define KQEMU_MAX_RAM_PAGES_TO_UPDATE 512
#define KQEMU_RAM_PAGES_UPDATE_ALL (KQEMU_MAX_RAM_PAGES_TO_UPDATE + 1)
#define KQEMU_MAX_MODIFIED_RAM_PAGES 512
- unsigned int nb_modified_ram_pages;
+ uint32_t nb_modified_ram_pages;
};
struct kqemu_init {
uint8_t *ram_base; /* must be page aligned */
- unsigned long ram_size; /* must be multiple of 4 KB */
+ KQEMU_PAD32(uint32_t padding1;)
+ uint64_t ram_size; /* must be multiple of 4 KB */
uint8_t *ram_dirty; /* must be page aligned */
- uint32_t **phys_to_ram_map; /* must be page aligned */
- unsigned long *pages_to_flush; /* must be page aligned */
- unsigned long *ram_pages_to_update; /* must be page aligned */
- unsigned long *modified_ram_pages; /* must be page aligned */
+ KQEMU_PAD32(uint32_t padding2;)
+ uint64_t *pages_to_flush; /* must be page aligned */
+ KQEMU_PAD32(uint32_t padding4;)
+ uint64_t *ram_pages_to_update; /* must be page aligned */
+ KQEMU_PAD32(uint32_t padding5;)
+ uint64_t *modified_ram_pages; /* must be page aligned */
+ KQEMU_PAD32(uint32_t padding6;)
+};
+
+#define KQEMU_IO_MEM_RAM 0
+#define KQEMU_IO_MEM_ROM 1
+#define KQEMU_IO_MEM_COMM 2 /* kqemu communication page */
+#define KQEMU_IO_MEM_UNASSIGNED 3 /* any device: return to application */
+
+struct kqemu_phys_mem {
+ uint64_t phys_addr; /* physical address range: phys_addr,
+ phys_addr + size */
+ uint64_t size;
+ uint64_t ram_addr; /* corresponding ram address */
+ uint32_t io_index; /* memory type: see KQEMU_IO_MEM_xxx */
+ uint32_t padding1;
};
#define KQEMU_RET_ABORT (-1)
@@ -122,11 +142,13 @@ struct kqemu_init {
#define KQEMU_INIT CTL_CODE(FILE_DEVICE_UNKNOWN, 2, METHOD_BUFFERED, FILE_WRITE_ACCESS)
#define KQEMU_GET_VERSION CTL_CODE(FILE_DEVICE_UNKNOWN, 3, METHOD_BUFFERED, FILE_READ_ACCESS)
#define KQEMU_MODIFY_RAM_PAGES CTL_CODE(FILE_DEVICE_UNKNOWN, 4, METHOD_BUFFERED, FILE_WRITE_ACCESS)
+#define KQEMU_SET_PHYS_MEM CTL_CODE(FILE_DEVICE_UNKNOWN, 5, METHOD_BUFFERED, FILE_WRITE_ACCESS)
#else
#define KQEMU_EXEC _IOWR('q', 1, struct kqemu_cpu_state)
#define KQEMU_INIT _IOW('q', 2, struct kqemu_init)
#define KQEMU_GET_VERSION _IOR('q', 3, int)
#define KQEMU_MODIFY_RAM_PAGES _IOW('q', 4, int)
+#define KQEMU_SET_PHYS_MEM _IOW('q', 5, struct kqemu_phys_mem)
#endif
#endif /* KQEMU_H */