diff options
| author | Stefan Weil <weil@mail.berlios.de> | 2011-06-23 17:53:48 +0200 |
|---|---|---|
| committer | Andrzej Zaborowski <andrew.zaborowski@intel.com> | 2011-07-04 21:58:25 +0200 |
| commit | 462a8bc6468912b79629f20f18798558342ce315 (patch) | |
| tree | ebfadf060ddb6b47b9e1e17a24a85b666fd779e1 | |
| parent | 75ef849696830fc2ddeff8bb90eea5887ff50df6 (diff) | |
| download | focaccia-qemu-462a8bc6468912b79629f20f18798558342ce315.tar.gz focaccia-qemu-462a8bc6468912b79629f20f18798558342ce315.zip | |
arm: Add const attribute to some arm_boot_info pointers
Parameter 'info' is const, so add the missing attribute. v2: Add 'const' to the local variable info in do_cpu_reset() and to the boot_info field in CPUARMState (suggested by Peter Maydell). Cc: Andrzej Zaborowski <balrogg@gmail.com> Cc: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Andrzej Zaborowski <andrew.zaborowski@intel.com>
| -rw-r--r-- | hw/arm-misc.h | 2 | ||||
| -rw-r--r-- | hw/arm_boot.c | 6 | ||||
| -rw-r--r-- | hw/nseries.c | 4 | ||||
| -rw-r--r-- | target-arm/cpu.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/hw/arm-misc.h b/hw/arm-misc.h index 010acb4cf9..9aeeaea759 100644 --- a/hw/arm-misc.h +++ b/hw/arm-misc.h @@ -31,7 +31,7 @@ struct arm_boot_info { target_phys_addr_t smp_priv_base; int nb_cpus; int board_id; - int (*atag_board)(struct arm_boot_info *info, void *p); + int (*atag_board)(const struct arm_boot_info *info, void *p); /* Used internally by arm_boot.c */ int is_linux; target_phys_addr_t initrd_size; diff --git a/hw/arm_boot.c b/hw/arm_boot.c index bfac982e65..e0215768b1 100644 --- a/hw/arm_boot.c +++ b/hw/arm_boot.c @@ -49,7 +49,7 @@ static uint32_t smpboot[] = { p += 4; \ } while (0) -static void set_kernel_args(struct arm_boot_info *info, +static void set_kernel_args(const struct arm_boot_info *info, int initrd_size, target_phys_addr_t base) { target_phys_addr_t p; @@ -102,7 +102,7 @@ static void set_kernel_args(struct arm_boot_info *info, WRITE_WORD(p, 0); } -static void set_kernel_args_old(struct arm_boot_info *info, +static void set_kernel_args_old(const struct arm_boot_info *info, int initrd_size, target_phys_addr_t base) { target_phys_addr_t p; @@ -178,7 +178,7 @@ static void set_kernel_args_old(struct arm_boot_info *info, static void do_cpu_reset(void *opaque) { CPUState *env = opaque; - struct arm_boot_info *info = env->boot_info; + const struct arm_boot_info *info = env->boot_info; cpu_reset(env); if (info) { diff --git a/hw/nseries.c b/hw/nseries.c index 2f6f473d64..2f84f5305b 100644 --- a/hw/nseries.c +++ b/hw/nseries.c @@ -1254,12 +1254,12 @@ static int n8x0_atag_setup(void *p, int model) return (void *) w - p; } -static int n800_atag_setup(struct arm_boot_info *info, void *p) +static int n800_atag_setup(const struct arm_boot_info *info, void *p) { return n8x0_atag_setup(p, 800); } -static int n810_atag_setup(struct arm_boot_info *info, void *p) +static int n810_atag_setup(const struct arm_boot_info *info, void *p) { return n8x0_atag_setup(p, 810); } diff --git a/target-arm/cpu.h b/target-arm/cpu.h index 116131eef8..1022a03753 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -221,7 +221,7 @@ typedef struct CPUARMState { void *opaque; } cp[15]; void *nvic; - struct arm_boot_info *boot_info; + const struct arm_boot_info *boot_info; } CPUARMState; CPUARMState *cpu_arm_init(const char *cpu_model); |