Move the declarations in svmdebug.h to private vmcb.h because are vmcb specific and are used only by internal svm code, and delete svmdebug.h.
No functional change intended. Signed-off-by: Xenia Ragiadakou <burzalod...@gmail.com> --- Changes in v3: - new patch, suggested by Andrew xen/arch/x86/hvm/svm/nestedsvm.c | 1 - xen/arch/x86/hvm/svm/svm.c | 1 - xen/arch/x86/hvm/svm/svmdebug.c | 1 - xen/arch/x86/hvm/svm/vmcb.c | 1 - xen/arch/x86/hvm/svm/vmcb.h | 6 +++++ xen/arch/x86/include/asm/hvm/svm/svmdebug.h | 30 --------------------- 6 files changed, 6 insertions(+), 34 deletions(-) delete mode 100644 xen/arch/x86/include/asm/hvm/svm/svmdebug.h diff --git a/xen/arch/x86/hvm/svm/nestedsvm.c b/xen/arch/x86/hvm/svm/nestedsvm.c index efbd9bbb77..201da7d531 100644 --- a/xen/arch/x86/hvm/svm/nestedsvm.c +++ b/xen/arch/x86/hvm/svm/nestedsvm.c @@ -20,7 +20,6 @@ #include <asm/hvm/svm/svm.h> #include <asm/hvm/svm/vmcb.h> #include <asm/hvm/nestedhvm.h> -#include <asm/hvm/svm/svmdebug.h> #include <asm/paging.h> /* paging_mode_hap */ #include <asm/event.h> /* for local_event_delivery_(en|dis)able */ #include <asm/p2m.h> /* p2m_get_pagetable, p2m_get_nestedp2m */ diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 86b1bf3242..0a1b447e36 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -38,7 +38,6 @@ #include <asm/hvm/nestedhvm.h> #include <asm/hvm/support.h> #include <asm/hvm/svm/svm.h> -#include <asm/hvm/svm/svmdebug.h> #include <asm/hvm/svm/vmcb.h> #include <asm/hvm/trace.h> #include <asm/iocap.h> diff --git a/xen/arch/x86/hvm/svm/svmdebug.c b/xen/arch/x86/hvm/svm/svmdebug.c index ade74dfd8f..7fd0753116 100644 --- a/xen/arch/x86/hvm/svm/svmdebug.c +++ b/xen/arch/x86/hvm/svm/svmdebug.c @@ -19,7 +19,6 @@ #include <xen/sched.h> #include <asm/processor.h> #include <asm/msr-index.h> -#include <asm/hvm/svm/svmdebug.h> #include "vmcb.h" diff --git a/xen/arch/x86/hvm/svm/vmcb.c b/xen/arch/x86/hvm/svm/vmcb.c index 1d512fedb0..657b4b1670 100644 --- a/xen/arch/x86/hvm/svm/vmcb.c +++ b/xen/arch/x86/hvm/svm/vmcb.c @@ -27,7 +27,6 @@ #include <asm/msr-index.h> #include <asm/p2m.h> #include <asm/hvm/svm/svm.h> -#include <asm/hvm/svm/svmdebug.h> #include <asm/spec_ctrl.h> #include "vmcb.h" diff --git a/xen/arch/x86/hvm/svm/vmcb.h b/xen/arch/x86/hvm/svm/vmcb.h index c58625fd80..80143164e5 100644 --- a/xen/arch/x86/hvm/svm/vmcb.h +++ b/xen/arch/x86/hvm/svm/vmcb.h @@ -11,6 +11,7 @@ #include <xen/types.h> +#include <asm/hvm/svm/vmcb.h> #include <asm/x86_emulate.h> /* general 1 intercepts */ @@ -518,6 +519,11 @@ void svm_destroy_vmcb(struct vcpu *v); void setup_vmcb_dump(void); +void svm_sync_vmcb(struct vcpu *v, enum vmcb_sync_state new_state); +void svm_vmcb_dump(const char *from, const struct vmcb_struct *vmcb); +bool svm_vmcb_isvalid(const char *from, const struct vmcb_struct *vmcb, + const struct vcpu *v, bool verbose); + /* * VMCB accessor functions. */ diff --git a/xen/arch/x86/include/asm/hvm/svm/svmdebug.h b/xen/arch/x86/include/asm/hvm/svm/svmdebug.h deleted file mode 100644 index 330c1d91aa..0000000000 --- a/xen/arch/x86/include/asm/hvm/svm/svmdebug.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * svmdebug.h: SVM related debug defintions - * Copyright (c) 2011, AMD Corporation. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; If not, see <http://www.gnu.org/licenses/>. - * - */ - -#ifndef __ASM_X86_HVM_SVM_SVMDEBUG_H__ -#define __ASM_X86_HVM_SVM_SVMDEBUG_H__ - -#include <asm/types.h> -#include <asm/hvm/svm/vmcb.h> - -void svm_sync_vmcb(struct vcpu *v, enum vmcb_sync_state new_state); -void svm_vmcb_dump(const char *from, const struct vmcb_struct *vmcb); -bool svm_vmcb_isvalid(const char *from, const struct vmcb_struct *vmcb, - const struct vcpu *v, bool verbose); - -#endif /* __ASM_X86_HVM_SVM_SVMDEBUG_H__ */ -- 2.37.2
