aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbalrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>2008-04-14 20:27:51 +0000
committerbalrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>2008-04-14 20:27:51 +0000
commitf93eb9ff66868df42f8433d16f2dc48a4af2490f (patch)
tree37838f60ac8b497ccb4a879dacbde19cde5ef5c4 /target-arm
parentCorrectly restore pc after an exception occured in Thumb mode. (diff)
downloadqemu-kvm-f93eb9ff66868df42f8433d16f2dc48a4af2490f.tar.gz
qemu-kvm-f93eb9ff66868df42f8433d16f2dc48a4af2490f.tar.bz2
qemu-kvm-f93eb9ff66868df42f8433d16f2dc48a4af2490f.zip
Move the excess of arm_load_kernel() parameters into a struct.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4212 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'target-arm')
-rw-r--r--target-arm/cpu.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/target-arm/cpu.h b/target-arm/cpu.h
index 9e93c24a9..8bf0fcdce 100644
--- a/target-arm/cpu.h
+++ b/target-arm/cpu.h
@@ -55,6 +55,8 @@ typedef void ARMWriteCPFunc(void *opaque, int cp_info,
typedef uint32_t ARMReadCPFunc(void *opaque, int cp_info,
int dstreg, int operand);
+struct arm_boot_info;
+
#define NB_MMU_MODES 2
/* We currently assume float and double are IEEE single and double
@@ -196,12 +198,7 @@ typedef struct CPUARMState {
CPU_COMMON
/* These fields after the common ones so they are preserved on reset. */
- int ram_size;
- const char *kernel_filename;
- const char *kernel_cmdline;
- const char *initrd_filename;
- int board_id;
- target_phys_addr_t loader_start;
+ struct arm_boot_info *boot_info;
} CPUARMState;
CPUARMState *cpu_arm_init(const char *cpu_model);