| Message ID | 1459266923-5243-1-git-send-email-paul.durrant@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Mar 29, 2016 at 04:55:23PM +0100, Paul Durrant wrote: > Commit 78c5f59e "x86/hvm/viridian: save APIC assist vector" changed > the name of a field in the viridian vcpu save record. Unfortunately this > record has a decode function in xen-hvmctx and so it no longer builds. > > This patch fixes the field name in xen-hvmctx and also adds a decode of > the additional field that was added to the save record. > > Signed-off-by: Paul Durrant <paul.durrant@citrix.com> > Cc: Ian Jackson <ian.jackson@eu.citrix.com> > Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com> > Cc: Wei Liu <wei.liu2@citrix.com> Acked-by: Wei Liu <wei.liu2@citrix.com> > --- > tools/misc/xen-hvmctx.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/tools/misc/xen-hvmctx.c b/tools/misc/xen-hvmctx.c > index 5a69245..32be120 100644 > --- a/tools/misc/xen-hvmctx.c > +++ b/tools/misc/xen-hvmctx.c > @@ -379,8 +379,9 @@ static void dump_viridian_vcpu(void) > { > HVM_SAVE_TYPE(VIRIDIAN_VCPU) p; > READ(p); > - printf(" VIRIDIAN_VCPU: apic_assist 0x%llx\n", > - (unsigned long long) p.apic_assist); > + printf(" VIRIDIAN_VCPU: apic_assist_msr 0x%llx, apic_assist_vector 0x%x\n", > + (unsigned long long) p.apic_assist_msr, > + p.apic_assist_vector); > } > > static void dump_vmce_vcpu(void) > -- > 2.1.4 >
On Tue, Mar 29, 2016 at 05:14:42PM +0100, Wei Liu wrote: > On Tue, Mar 29, 2016 at 04:55:23PM +0100, Paul Durrant wrote: > > Commit 78c5f59e "x86/hvm/viridian: save APIC assist vector" changed > > the name of a field in the viridian vcpu save record. Unfortunately this > > record has a decode function in xen-hvmctx and so it no longer builds. > > > > This patch fixes the field name in xen-hvmctx and also adds a decode of > > the additional field that was added to the save record. > > > > Signed-off-by: Paul Durrant <paul.durrant@citrix.com> > > Cc: Ian Jackson <ian.jackson@eu.citrix.com> > > Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com> > > Cc: Wei Liu <wei.liu2@citrix.com> > > Acked-by: Wei Liu <wei.liu2@citrix.com> And applied.
diff --git a/tools/misc/xen-hvmctx.c b/tools/misc/xen-hvmctx.c index 5a69245..32be120 100644 --- a/tools/misc/xen-hvmctx.c +++ b/tools/misc/xen-hvmctx.c @@ -379,8 +379,9 @@ static void dump_viridian_vcpu(void) { HVM_SAVE_TYPE(VIRIDIAN_VCPU) p; READ(p); - printf(" VIRIDIAN_VCPU: apic_assist 0x%llx\n", - (unsigned long long) p.apic_assist); + printf(" VIRIDIAN_VCPU: apic_assist_msr 0x%llx, apic_assist_vector 0x%x\n", + (unsigned long long) p.apic_assist_msr, + p.apic_assist_vector); } static void dump_vmce_vcpu(void)
Commit 78c5f59e "x86/hvm/viridian: save APIC assist vector" changed the name of a field in the viridian vcpu save record. Unfortunately this record has a decode function in xen-hvmctx and so it no longer builds. This patch fixes the field name in xen-hvmctx and also adds a decode of the additional field that was added to the save record. Signed-off-by: Paul Durrant <paul.durrant@citrix.com> Cc: Ian Jackson <ian.jackson@eu.citrix.com> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Cc: Wei Liu <wei.liu2@citrix.com> --- tools/misc/xen-hvmctx.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)