From: Julien Grall
literal strings are not meant to be modified. So we should use const
char * rather than char * when we want to store a pointer to them.
Signed-off-by: Julien Grall
---
tools/xentrace/xenalyze.c | 71 ---
tools/xentrace/xenctx.c | 4 +--
2 files changed, 39 insertions(+), 36 deletions(-)
diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c
index b7f4e2bea83d..5de167031e01 100644
--- a/tools/xentrace/xenalyze.c
+++ b/tools/xentrace/xenalyze.c
@@ -356,7 +356,7 @@ void parse_symbol_file(char *fn) {
char * find_symbol(unsigned long long addr) {
struct symbol_struct * p=G.symbols;
int i;
-char * lastname="ZERO";
+const char * lastname="ZERO";
unsigned long long offset=addr;
static char name[144];
@@ -495,7 +495,7 @@ struct {
#define HVM_VMX_EXIT_REASON_MAX (EXIT_REASON_XSETBV+1)
-char * hvm_vmx_exit_reason_name[HVM_VMX_EXIT_REASON_MAX] = {
+const char * hvm_vmx_exit_reason_name[HVM_VMX_EXIT_REASON_MAX] = {
[EXIT_REASON_EXCEPTION_NMI]="EXCEPTION_NMI",
[EXIT_REASON_EXTERNAL_INTERRUPT]="EXTERNAL_INTERRUPT",
[EXIT_REASON_TRIPLE_FAULT]="TRIPLE_FAULT",
@@ -698,7 +698,7 @@ enum VMEXIT_EXITCODE
};
#define HVM_SVM_EXIT_REASON_MAX 1025
-char * hvm_svm_exit_reason_name[HVM_SVM_EXIT_REASON_MAX] = {
+const char * hvm_svm_exit_reason_name[HVM_SVM_EXIT_REASON_MAX] = {
/* 0-15 */
"VMEXIT_CR0_READ",
"VMEXIT_CR1_READ",
@@ -875,7 +875,7 @@ char * hvm_svm_exit_reason_name[HVM_SVM_EXIT_REASON_MAX] = {
#define EXTERNAL_INTERRUPT_MAX 256
/* Stringify numbers */
-char * hvm_extint_vector_name[EXTERNAL_INTERRUPT_MAX] = {
+const char * hvm_extint_vector_name[EXTERNAL_INTERRUPT_MAX] = {
[SPURIOUS_APIC_VECTOR] = "SPURIOS_APIC",
[ERROR_APIC_VECTOR] ="ERROR_APIC",
[INVALIDATE_TLB_VECTOR]= "INVALIDATE_TLB",
@@ -887,7 +887,7 @@ char * hvm_extint_vector_name[EXTERNAL_INTERRUPT_MAX] = {
#define HVM_TRAP_MAX 20
-char * hvm_trap_name[HVM_TRAP_MAX] = {
+const char * hvm_trap_name[HVM_TRAP_MAX] = {
[0] = "Divide",
[1] = "RESERVED",
[2] = "NMI",
@@ -947,7 +947,7 @@ enum {
HVM_EVENT_VLAPIC,
HVM_EVENT_HANDLER_MAX
};
-char * hvm_event_handler_name[HVM_EVENT_HANDLER_MAX] = {
+const char * hvm_event_handler_name[HVM_EVENT_HANDLER_MAX] = {
"(no handler)",
"pf_xen",
"pf_inject",
@@ -1001,7 +1001,7 @@ enum {
GUEST_INTERRUPT_CASE_MAX,
};
-char *guest_interrupt_case_name[] = {
+const char *guest_interrupt_case_name[] = {
[GUEST_INTERRUPT_CASE_WAKE_TO_HALT_ALONE]="wake to halt alone",
/* This interrupt woke, maybe another interrupt before halt */
[GUEST_INTERRUPT_CASE_WAKE_TO_HALT_ANY] ="wake to halt any ",
@@ -1009,7 +1009,7 @@ char *guest_interrupt_case_name[] = {
[GUEST_INTERRUPT_CASE_INTERRUPT_TO_HALT] ="intr to halt ",
};
-char *hvm_vol_name[HVM_VOL_MAX] = {
+const char *hvm_vol_name[HVM_VOL_MAX] = {
[HVM_VOL_VMENTRY]="vmentry",
[HVM_VOL_VMEXIT] ="vmexit",
[HVM_VOL_HANDLER]="handler",
@@ -1056,7 +1056,7 @@ enum {
HYPERCALL_MAX
};
-char *hypercall_name[HYPERCALL_MAX] = {
+const char *hypercall_name[HYPERCALL_MAX] = {
[HYPERCALL_set_trap_table]="set_trap_table",
[HYPERCALL_mmu_update]="mmu_update",
[HYPERCALL_set_gdt]="set_gdt",
@@ -1114,7 +1114,7 @@ enum {
PF_XEN_EMUL_MAX,
};
-char * pf_xen_emul_name[PF_XEN_EMUL_MAX] = {
+const char * pf_xen_emul_name[PF_XEN_EMUL_MAX] = {
[PF_XEN_EMUL_LVL_0]="non-linmap",
[PF_XEN_EMUL_LVL_1]="linmap l1",
[PF_XEN_EMUL_LVL_2]="linmap l2",
@@ -1140,7 +1140,7 @@ enum {
PF_XEN_NON_EMUL_MAX,
};
-char * pf_xen_non_emul_name[PF_XEN_NON_EMUL_MAX] = {
+const char * pf_xen_non_emul_name[PF_XEN_NON_EMUL_MAX] = {
[PF_XEN_NON_EMUL_VA_USER]="va user",
[PF_XEN_NON_EMUL_VA_KERNEL]="va kernel",
[PF_XEN_NON_EMUL_EIP_USER]="eip user",
@@ -1160,7 +1160,7 @@ enum {
PF_XEN_FIXUP_MAX,
};
-char * pf_xen_fixup_name[PF_XEN_FIXUP_MAX] = {
+const char * pf_xen_fixup_name[PF_XEN_FIXUP_MAX] = {
[PF_XEN_FIXUP_PREALLOC_UNPIN] = "unpin",
[PF_XEN_FIXUP_PREALLOC_UNHOOK] = "unhook",
[PF_XEN_FIXUP_UNSYNC] = "unsync",
@@ -1195,7 +1195,7 @@ enum {
#define SHADOW_RESYNC_FULL14
#define SHADOW_RESYNC_ONLY15
-char * pf_xen_name[PF_XEN_MAX] = {
+const char * pf_xen_name[PF_XEN_MAX] = {
[PF_XEN_NOT_SHADOW]="propagate",
[PF_XEN_FAST_PROPAGATE]="fast propagate",
[PF_XEN_FAST_MMIO]="fast mmio",
@@ -1304,7 +1304,7 @@ struct hvm_data {
struct vcpu_data *v; /* up-pointer */
/* SVM / VMX compatibility. FIXME - should be global */
-char ** exit_reason_name;
+const char ** exit_reason_name;
int exit_reason_max;
struct hvm_summary_handler_node
*exit_reason_summary_handler_list[HVM_EXIT_REASON_MAX];
@@ -1408,7 +1408,7 @@ enum {
HVM_SHORT_SUMMARY_MAX,
};
-char *hvm_short_summary_name[HVM_SHORT_SUMMARY_MAX] = {
+const char *hvm_short_summary_name[HVM_SHORT_
