Mailing List Archive

commit dd22a64de7e02b48312839a15179528c8f7db5c6
Author: Andrew Cooper <andrew.cooper3@citrix.com>
AuthorDate: Thu Apr 15 13:27:45 2021 +0100
Commit: Andrew Cooper <andrew.cooper3@citrix.com>
CommitDate: Fri Apr 16 14:52:06 2021 +0100

x86/pv: Rename hypercall_table_t to pv_hypercall_table_t

The type is no longer appropriate for anything other than PV, and therefore
should not retain its generic name.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
---
xen/arch/x86/pv/hypercall.c | 2 +-
xen/arch/x86/pv/shim.c | 2 +-
xen/include/asm-x86/hypercall.h | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/xen/arch/x86/pv/hypercall.c b/xen/arch/x86/pv/hypercall.c
index 5d02eebc8d..e30c59b628 100644
--- a/xen/arch/x86/pv/hypercall.c
+++ b/xen/arch/x86/pv/hypercall.c
@@ -40,7 +40,7 @@

#define do_arch_1 paging_domctl_continuation

-const hypercall_table_t pv_hypercall_table[] = {
+const pv_hypercall_table_t pv_hypercall_table[] = {
COMPAT_CALL(set_trap_table),
HYPERCALL(mmu_update),
COMPAT_CALL(set_gdt),
diff --git a/xen/arch/x86/pv/shim.c b/xen/arch/x86/pv/shim.c
index 1b86fc247e..d16c0048c0 100644
--- a/xen/arch/x86/pv/shim.c
+++ b/xen/arch/x86/pv/shim.c
@@ -205,7 +205,7 @@ void __init pv_shim_setup_dom(struct domain *d, l4_pgentry_t *l4start,
start_info_t *si)
{
bool compat = is_pv_32bit_domain(d);
- hypercall_table_t *rw_pv_hypercall_table;
+ pv_hypercall_table_t *rw_pv_hypercall_table;
uint64_t param = 0;
long rc;

diff --git a/xen/include/asm-x86/hypercall.h b/xen/include/asm-x86/hypercall.h
index 39e7ab7022..0ae3b8b043 100644
--- a/xen/include/asm-x86/hypercall.h
+++ b/xen/include/asm-x86/hypercall.h
@@ -20,7 +20,7 @@ typedef struct {
#ifdef CONFIG_PV32
hypercall_fn_t *compat;
#endif
-} hypercall_table_t;
+} pv_hypercall_table_t;

typedef struct {
uint8_t native;
@@ -32,7 +32,7 @@ typedef struct {
extern const hypercall_args_t hypercall_args_table[NR_hypercalls];

#ifdef CONFIG_PV
-extern const hypercall_table_t pv_hypercall_table[];
+extern const pv_hypercall_table_t pv_hypercall_table[];
void pv_hypercall(struct cpu_user_regs *regs);
#endif

--
generated by git-patchbot for /home/xen/git/xen.git#master