On 2/26/2024 4:25 PM, isaku.yamahata@intel.com wrote: > From: Kai Huang <kai.huang@intel.com> > > TD_SYSINFO_MAP() macro actually takes the member of the 'struct > tdx_tdmr_sysinfo' as the second argument and uses the offsetof() to > calculate the offset for that member. > > Rename the macro argument _offset to _member to reflect this. > > Signed-off-by: Kai Huang <kai.huang@intel.com> > Reviewed-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> > Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com> Reviewed-by: Binbin Wu <binbin.wu@linux.intel.com> > --- > arch/x86/virt/vmx/tdx/tdx.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/x86/virt/vmx/tdx/tdx.c b/arch/x86/virt/vmx/tdx/tdx.c > index 4d6826a76f78..2aee64d2f27f 100644 > --- a/arch/x86/virt/vmx/tdx/tdx.c > +++ b/arch/x86/virt/vmx/tdx/tdx.c > @@ -297,9 +297,9 @@ struct field_mapping { > int offset; > }; > > -#define TD_SYSINFO_MAP(_field_id, _offset) \ > +#define TD_SYSINFO_MAP(_field_id, _member) \ > { .field_id = MD_FIELD_ID_##_field_id, \ > - .offset = offsetof(struct tdx_tdmr_sysinfo, _offset) } > + .offset = offsetof(struct tdx_tdmr_sysinfo, _member) } > > /* Map TD_SYSINFO fields into 'struct tdx_tdmr_sysinfo': */ > static const struct field_mapping fields[] = {
On Fri, 2024-03-08 at 15:25 +0800, Binbin Wu wrote: > > On 2/26/2024 4:25 PM, isaku.yamahata@intel.com wrote: > > From: Kai Huang <kai.huang@intel.com> > > > > TD_SYSINFO_MAP() macro actually takes the member of the 'struct > > tdx_tdmr_sysinfo' as the second argument and uses the offsetof() to > > calculate the offset for that member. > > > > Rename the macro argument _offset to _member to reflect this. > > > > Signed-off-by: Kai Huang <kai.huang@intel.com> > > Reviewed-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> > > Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com> > > Reviewed-by: Binbin Wu <binbin.wu@linux.intel.com> > > Thanks for review. I've sent out the first 5 metadata read patches as a standalone patchset separately: https://lore.kernel.org/kvm/cover.1709288433.git.kai.huang@intel.com/ I'll add your Reviewed-by in next version. (for others please comment there instead, thanks!)
diff --git a/arch/x86/virt/vmx/tdx/tdx.c b/arch/x86/virt/vmx/tdx/tdx.c index 4d6826a76f78..2aee64d2f27f 100644 --- a/arch/x86/virt/vmx/tdx/tdx.c +++ b/arch/x86/virt/vmx/tdx/tdx.c @@ -297,9 +297,9 @@ struct field_mapping { int offset; }; -#define TD_SYSINFO_MAP(_field_id, _offset) \ +#define TD_SYSINFO_MAP(_field_id, _member) \ { .field_id = MD_FIELD_ID_##_field_id, \ - .offset = offsetof(struct tdx_tdmr_sysinfo, _offset) } + .offset = offsetof(struct tdx_tdmr_sysinfo, _member) } /* Map TD_SYSINFO fields into 'struct tdx_tdmr_sysinfo': */ static const struct field_mapping fields[] = {