On Thu, 23 Jul 2020 16:12:19 +0530 Ravi Bangoria <ravi.bangoria@xxxxxxxxxxxxx> wrote: > Power10 is introducing second DAWR. Use real register names (with > suffix 0) from ISA for current macros. > > Signed-off-by: Ravi Bangoria <ravi.bangoria@xxxxxxxxxxxxx> > --- > include/hw/ppc/spapr.h | 2 +- > linux-headers/asm-powerpc/kvm.h | 4 ++-- > target/ppc/cpu.h | 4 ++-- > target/ppc/translate_init.inc.c | 8 ++++---- > 4 files changed, 9 insertions(+), 9 deletions(-) > (...) > diff --git a/linux-headers/asm-powerpc/kvm.h b/linux-headers/asm-powerpc/kvm.h > index 264e266a85..38d61b73f5 100644 > --- a/linux-headers/asm-powerpc/kvm.h > +++ b/linux-headers/asm-powerpc/kvm.h > @@ -608,8 +608,8 @@ struct kvm_ppc_cpu_char { > #define KVM_REG_PPC_BESCR (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xa7) > #define KVM_REG_PPC_TAR (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xa8) > #define KVM_REG_PPC_DPDES (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xa9) > -#define KVM_REG_PPC_DAWR (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xaa) > -#define KVM_REG_PPC_DAWRX (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xab) > +#define KVM_REG_PPC_DAWR0 (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xaa) > +#define KVM_REG_PPC_DAWRX0 (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xab) > #define KVM_REG_PPC_CIABR (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xac) > #define KVM_REG_PPC_IC (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xad) > #define KVM_REG_PPC_VTB (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xae) Changes here need to come in via a proper headers sync, so this needs to be split out into a separate patch (either one doing a headers sync, or a placeholder if the Linux changes are not upstream yet.)