[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen master] tools/libs: guest: Use const whenever we point to literal strings
commit 8fc4916daf2aac34088ebd5ec3d6fd707ac4221d Author: Julien Grall <jgrall@xxxxxxxxxx> AuthorDate: Tue May 18 14:34:22 2021 +0100 Commit: Julien Grall <jgrall@xxxxxxxxxx> CommitDate: Tue May 18 14:54:05 2021 +0100 tools/libs: guest: Use const whenever we point to literal strings 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 <jgrall@xxxxxxxxxx> Reviewed-by: Anthony PERARD <anthony.perard@xxxxxxxxxx> Acked-by: Wei Liu <wl@xxxxxxx> --- tools/include/xenguest.h | 10 +++++----- tools/libs/guest/xg_dom_core.c | 8 ++++---- tools/libs/guest/xg_dom_elfloader.c | 4 ++-- tools/libs/guest/xg_dom_hvmloader.c | 2 +- tools/libs/guest/xg_dom_x86.c | 7 ++++--- tools/libs/guest/xg_private.h | 2 +- 6 files changed, 17 insertions(+), 16 deletions(-) diff --git a/tools/include/xenguest.h b/tools/include/xenguest.h index 217022b6e7..a4492038cf 100644 --- a/tools/include/xenguest.h +++ b/tools/include/xenguest.h @@ -108,7 +108,7 @@ struct xc_dom_image { /* info from (elf) kernel image */ struct elf_dom_parms *parms; - char *guest_type; + const char *guest_type; /* memory layout */ struct xc_dom_seg kernel_seg; @@ -266,8 +266,8 @@ struct xc_dom_arch { /* arch-specific memory initialization. */ int (*meminit) (struct xc_dom_image * dom); - char *guest_type; - char *native_protocol; + const char *guest_type; + const char *native_protocol; int page_shift; int sizeof_pfn; int p2m_base_supported; @@ -374,9 +374,9 @@ char *xc_dom_strdup(struct xc_dom_image *dom, const char *str); /* --- alloc memory pool ------------------------------------------- */ -xen_pfn_t xc_dom_alloc_page(struct xc_dom_image *dom, char *name); +xen_pfn_t xc_dom_alloc_page(struct xc_dom_image *dom, const char *name); int xc_dom_alloc_segment(struct xc_dom_image *dom, - struct xc_dom_seg *seg, char *name, + struct xc_dom_seg *seg, const char *name, xen_vaddr_t start, xen_vaddr_t size); /* --- misc bits --------------------------------------------------- */ diff --git a/tools/libs/guest/xg_dom_core.c b/tools/libs/guest/xg_dom_core.c index 98ef8e8fc9..4918ee517b 100644 --- a/tools/libs/guest/xg_dom_core.c +++ b/tools/libs/guest/xg_dom_core.c @@ -422,7 +422,7 @@ void *xc_dom_pfn_to_ptr_retcount(struct xc_dom_image *dom, xen_pfn_t pfn, struct xc_dom_phys *phys; xen_pfn_t offset; unsigned int page_shift = XC_DOM_PAGE_SHIFT(dom); - char *mode = "unset"; + const char *mode = "unset"; *count_out = 0; @@ -525,7 +525,7 @@ void *xc_dom_pfn_to_ptr_retcount(struct xc_dom_image *dom, xen_pfn_t pfn, return phys->ptr; } -static int xc_dom_chk_alloc_pages(struct xc_dom_image *dom, char *name, +static int xc_dom_chk_alloc_pages(struct xc_dom_image *dom, const char *name, xen_pfn_t pages) { unsigned int page_size = XC_DOM_PAGE_SIZE(dom); @@ -576,7 +576,7 @@ static int xc_dom_alloc_pad(struct xc_dom_image *dom, xen_vaddr_t boundary) } int xc_dom_alloc_segment(struct xc_dom_image *dom, - struct xc_dom_seg *seg, char *name, + struct xc_dom_seg *seg, const char *name, xen_vaddr_t start, xen_vaddr_t size) { unsigned int page_size = XC_DOM_PAGE_SIZE(dom); @@ -611,7 +611,7 @@ int xc_dom_alloc_segment(struct xc_dom_image *dom, return 0; } -xen_pfn_t xc_dom_alloc_page(struct xc_dom_image *dom, char *name) +xen_pfn_t xc_dom_alloc_page(struct xc_dom_image *dom, const char *name) { xen_vaddr_t start; xen_pfn_t pfn; diff --git a/tools/libs/guest/xg_dom_elfloader.c b/tools/libs/guest/xg_dom_elfloader.c index 06e713fe11..0d6247db5d 100644 --- a/tools/libs/guest/xg_dom_elfloader.c +++ b/tools/libs/guest/xg_dom_elfloader.c @@ -50,8 +50,8 @@ void xc_elf_set_logfile(xc_interface *xch, struct elf_binary *elf, /* ------------------------------------------------------------------------ */ -static char *xc_dom_guest_type(struct xc_dom_image *dom, - struct elf_binary *elf) +static const char *xc_dom_guest_type(struct xc_dom_image *dom, + struct elf_binary *elf) { uint64_t machine = elf_uval(elf, elf->ehdr, e_machine); diff --git a/tools/libs/guest/xg_dom_hvmloader.c b/tools/libs/guest/xg_dom_hvmloader.c index ec6ebad7fd..4e6f30858a 100644 --- a/tools/libs/guest/xg_dom_hvmloader.c +++ b/tools/libs/guest/xg_dom_hvmloader.c @@ -130,7 +130,7 @@ static elf_errorstatus xc_dom_parse_hvm_kernel(struct xc_dom_image *dom) static int module_init_one(struct xc_dom_image *dom, struct xc_hvm_firmware_module *module, - char *name) + const char *name) { struct xc_dom_seg seg; void *dest; diff --git a/tools/libs/guest/xg_dom_x86.c b/tools/libs/guest/xg_dom_x86.c index 2953aeb90b..d2eb89ce01 100644 --- a/tools/libs/guest/xg_dom_x86.c +++ b/tools/libs/guest/xg_dom_x86.c @@ -1148,10 +1148,11 @@ static int vcpu_hvm(struct xc_dom_image *dom) /* ------------------------------------------------------------------------ */ -static int x86_compat(xc_interface *xch, uint32_t domid, char *guest_type) +static int x86_compat(xc_interface *xch, uint32_t domid, + const char *guest_type) { static const struct { - char *guest; + const char *guest; uint32_t size; } types[] = { { "xen-3.0-x86_32p", 32 }, @@ -1664,7 +1665,7 @@ static int bootearly(struct xc_dom_image *dom) static int bootlate_pv(struct xc_dom_image *dom) { static const struct { - char *guest; + const char *guest; unsigned long pgd_type; } types[] = { { "xen-3.0-x86_32", MMUEXT_PIN_L2_TABLE}, diff --git a/tools/libs/guest/xg_private.h b/tools/libs/guest/xg_private.h index 8f9b257a2f..25e46d7ce1 100644 --- a/tools/libs/guest/xg_private.h +++ b/tools/libs/guest/xg_private.h @@ -43,7 +43,7 @@ #endif struct xc_dom_loader { - char *name; + const char *name; /* Sadly the error returns from these functions are not consistent: */ elf_negerrnoval (*probe) (struct xc_dom_image * dom); elf_negerrnoval (*parser) (struct xc_dom_image * dom); -- generated by git-patchbot for /home/xen/git/xen.git#master
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |