gwj / at91sam9263 · Commits

Commit c7cd6a3742aad0c609fd95f09a267046fdfcc5f2

Authored by blueswir1
1 parent be7fb97f

Make CPULogItem tables const 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5397 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 4 changed files with 5 additions and 5 deletions
cpu-all.h
  View file @c7cd6a3
... ... @@ -797,7 +797,7 @@ typedef struct CPULogItem {
797 797 const char *help;
798 798 } CPULogItem;
799 799  
800   -extern CPULogItem cpu_log_items[];
  800 +extern const CPULogItem cpu_log_items[];
801 801  
802 802 void cpu_set_log(int log_flags);
803 803 void cpu_set_log_filename(const char *filename);
... ...
... ... @@ -1511,7 +1511,7 @@ void cpu_reset_interrupt(CPUState *env, int mask)
1511 1511 env->interrupt_request &= ~mask;
1512 1512 }
1513 1513  
1514   -CPULogItem cpu_log_items[] = {
  1514 +const CPULogItem cpu_log_items[] = {
1515 1515 { CPU_LOG_TB_OUT_ASM, "out_asm",
1516 1516 "show generated host assembly code for each compiled TB" },
1517 1517 { CPU_LOG_TB_IN_ASM, "in_asm",
... ... @@ -1551,7 +1551,7 @@ static int cmp1(const char *s1, int n, const char *s2)
1551 1551 /* takes a comma separated list of log masks. Return 0 if error. */
1552 1552 int cpu_str_to_log_mask(const char *str)
1553 1553 {
1554   - CPULogItem *item;
  1554 + const CPULogItem *item;
1555 1555 int mask;
1556 1556 const char *p, *p1;
1557 1557  
... ...
linux-user/main.c
  View file @c7cd6a3
... ... @@ -2252,7 +2252,7 @@ int main(int argc, char **argv)
2252 2252 break;
2253 2253 } else if (!strcmp(r, "d")) {
2254 2254 int mask;
2255   - CPULogItem *item;
  2255 + const CPULogItem *item;
2256 2256  
2257 2257 if (optind >= argc)
2258 2258 break;
... ...
... ... @@ -8845,7 +8845,7 @@ int main(int argc, char **argv)
8845 8845 case QEMU_OPTION_d:
8846 8846 {
8847 8847 int mask;
8848   - CPULogItem *item;
  8848 + const CPULogItem *item;
8849 8849  
8850 8850 mask = cpu_str_to_log_mask(optarg);
8851 8851 if (!mask) {
... ...