Re: [PATCH 1/3] x86/svm: Make vmcb_struct private to svm/

[Andrew Cooper <andrew.cooper3@xxxxxxxxxx>]

On 08/12/2025 9:05 am, Jan Beulich wrote:
> On 28.11.2025 21:19, Andrew Cooper wrote:
>> The rest of Xen has no buisness knowing this structure, and it is currently
>> included via xen/sched.h into most code.  Create a new private svm/vmcb.h.
>>
>> No functional change.
>>
>> Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
>> ---
>> CC: Jan Beulich <JBeulich@xxxxxxxx>
>> CC: Roger Pau Monné <roger.pau@xxxxxxxxxx>
>> ---
>>  xen/arch/x86/hvm/svm/asid.c             |   1 +
>>  xen/arch/x86/hvm/svm/emulate.c          |   1 +
>>  xen/arch/x86/hvm/svm/intr.c             |   1 +
>>  xen/arch/x86/hvm/svm/nestedsvm.c        |   1 +
>>  xen/arch/x86/hvm/svm/svm.c              |   1 +
>>  xen/arch/x86/hvm/svm/svmdebug.c         |   2 +
>>  xen/arch/x86/hvm/svm/vmcb.c             |   2 +
>>  xen/arch/x86/hvm/svm/vmcb.h             | 617 ++++++++++++++++++++++++
>>  xen/arch/x86/include/asm/hvm/svm/vmcb.h | 606 -----------------------
>>  9 files changed, 626 insertions(+), 606 deletions(-)
>>  create mode 100644 xen/arch/x86/hvm/svm/vmcb.h
> I was actually hoping for the file to be moved. I notice that a few things are
> left in the original file, and I wonder if they couldn't be moved elsewhere up
> front.

No, they can't be moved yet.  There's other cleanup on the list, and
more header dis-entangling needed first.

But I do agree the name is wrong and wants to go.

I intend to end up with svm-structs.h and svm.h only, dropping the subdir.

>> --- a/xen/arch/x86/hvm/svm/asid.c
>> +++ b/xen/arch/x86/hvm/svm/asid.c
>> @@ -9,6 +9,7 @@
>>  #include <asm/hvm/svm/svm.h>
>>  
>>  #include "svm.h"
>> +#include "vmcb.h"
> Instead of repeating this in every .c file, couldn't svm.h include the new 
> file?
> Or are you foreseeing some of the .c files requiring svm.h to (later) not need
> this include anymore?

The other option is to merge all the current header files into one
private.h first, before moving this.

~Andrew