From 76f657aea9f168ca617f98d513540bb3587c974b Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Mon, 28 Jul 2014 16:55:32 +0200 Subject: [PATCH] x86/hvm: alter hpet_init() to take a domain rather than vcpu There is nothing vcpu-specific about hpet_init(); all it does is follow the vcpu's domain pointer to get at the domain vhpet state. Signed-off-by: Andrew Cooper --- xen/arch/x86/hvm/hpet.c | 6 +++--- xen/arch/x86/hvm/hvm.c | 2 +- xen/include/asm-x86/hvm/vpt.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/hvm/hpet.c b/xen/arch/x86/hvm/hpet.c index 167994ed33..81ad0d614a 100644 --- a/xen/arch/x86/hvm/hpet.c +++ b/xen/arch/x86/hvm/hpet.c @@ -611,9 +611,9 @@ static int hpet_load(struct domain *d, hvm_domain_context_t *h) HVM_REGISTER_SAVE_RESTORE(HPET, hpet_save, hpet_load, 1, HVMSR_PER_DOM); -void hpet_init(struct vcpu *v) +void hpet_init(struct domain *d) { - HPETState *h = vcpu_vhpet(v); + HPETState *h = domain_vhpet(d); int i; memset(h, 0, sizeof(HPETState)); @@ -665,7 +665,7 @@ void hpet_deinit(struct domain *d) void hpet_reset(struct domain *d) { hpet_deinit(d); - hpet_init(d->vcpu[0]); + hpet_init(d); } /* diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index fba13e07eb..e834406676 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2300,7 +2300,7 @@ int hvm_vcpu_initialise(struct vcpu *v) { /* NB. All these really belong in hvm_domain_initialise(). */ pmtimer_init(v); - hpet_init(v); + hpet_init(d); /* Init guest TSC to start from zero. */ hvm_set_guest_tsc(v, 0); diff --git a/xen/include/asm-x86/hvm/vpt.h b/xen/include/asm-x86/hvm/vpt.h index 41159d8351..105fbdba58 100644 --- a/xen/include/asm-x86/hvm/vpt.h +++ b/xen/include/asm-x86/hvm/vpt.h @@ -190,7 +190,7 @@ void pmtimer_deinit(struct domain *d); void pmtimer_reset(struct domain *d); int pmtimer_change_ioport(struct domain *d, unsigned int version); -void hpet_init(struct vcpu *v); +void hpet_init(struct domain *d); void hpet_deinit(struct domain *d); void hpet_reset(struct domain *d); -- 2.30.2