With "livepatch: NOP if func->new_addr is zero." that name
makes no more sense as we also NOP now.
Suggested-by: Jan Beulich
Signed-off-by: Konrad Rzeszutek Wilk
---
v7: New submission.
---
xen/arch/arm/livepatch.c| 4 ++--
xen/arch/x86/livepatch.c| 4 ++--
xen/common/livepatch.c | 4 ++--
xen/include/xen/livepatch.h | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/xen/arch/arm/livepatch.c b/xen/arch/arm/livepatch.c
index 755f596..7f067a0 100644
--- a/xen/arch/arm/livepatch.c
+++ b/xen/arch/arm/livepatch.c
@@ -21,11 +21,11 @@ int arch_livepatch_verify_func(const struct livepatch_func
*func)
return -ENOSYS;
}
-void arch_livepatch_apply_jmp(struct livepatch_func *func)
+void arch_livepatch_apply(struct livepatch_func *func)
{
}
-void arch_livepatch_revert_jmp(const struct livepatch_func *func)
+void arch_livepatch_revert(const struct livepatch_func *func)
{
}
diff --git a/xen/arch/x86/livepatch.c b/xen/arch/x86/livepatch.c
index d5e7174..b0d81d7 100644
--- a/xen/arch/x86/livepatch.c
+++ b/xen/arch/x86/livepatch.c
@@ -46,7 +46,7 @@ int arch_livepatch_verify_func(const struct livepatch_func
*func)
return 0;
}
-void arch_livepatch_apply_jmp(struct livepatch_func *func)
+void arch_livepatch_apply(struct livepatch_func *func)
{
uint8_t *old_ptr;
uint8_t insn[sizeof(func->opaque)];
@@ -75,7 +75,7 @@ void arch_livepatch_apply_jmp(struct livepatch_func *func)
memcpy(old_ptr, insn, len);
}
-void arch_livepatch_revert_jmp(const struct livepatch_func *func)
+void arch_livepatch_revert(const struct livepatch_func *func)
{
memcpy(func->old_addr, func->opaque, livepatch_insn_len(func));
}
diff --git a/xen/common/livepatch.c b/xen/common/livepatch.c
index ed41f39..9d2e86d 100644
--- a/xen/common/livepatch.c
+++ b/xen/common/livepatch.c
@@ -1033,7 +1033,7 @@ static int apply_payload(struct payload *data)
}
for ( i = 0; i < data->nfuncs; i++ )
-arch_livepatch_apply_jmp(&data->funcs[i]);
+arch_livepatch_apply(&data->funcs[i]);
arch_livepatch_revive();
@@ -1062,7 +1062,7 @@ static int revert_payload(struct payload *data)
}
for ( i = 0; i < data->nfuncs; i++ )
-arch_livepatch_revert_jmp(&data->funcs[i]);
+arch_livepatch_revert(&data->funcs[i]);
arch_livepatch_revive();
diff --git a/xen/include/xen/livepatch.h b/xen/include/xen/livepatch.h
index 174af06..b7f66d4 100644
--- a/xen/include/xen/livepatch.h
+++ b/xen/include/xen/livepatch.h
@@ -86,8 +86,8 @@ unsigned int livepatch_insn_len(const struct livepatch_func
*func)
int arch_livepatch_quiesce(void);
void arch_livepatch_revive(void);
-void arch_livepatch_apply_jmp(struct livepatch_func *func);
-void arch_livepatch_revert_jmp(const struct livepatch_func *func);
+void arch_livepatch_apply(struct livepatch_func *func);
+void arch_livepatch_revert(const struct livepatch_func *func);
void arch_livepatch_post_action(void);
void arch_livepatch_mask(void);
--
2.4.11
___
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
