Message ID | 1480433602-13290-15-git-send-email-boris.ostrovsky@oracle.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
diff --git a/xen/arch/x86/hvm/pmtimer.c b/xen/arch/x86/hvm/pmtimer.c index 5144928..a810f2b 100644 --- a/xen/arch/x86/hvm/pmtimer.c +++ b/xen/arch/x86/hvm/pmtimer.c @@ -257,7 +257,11 @@ static int acpi_save(struct domain *d, hvm_domain_context_t *h) int rc; if ( !has_vpm(d) ) + { + if ( !has_acpi_dm_ff(d) ) + return hvm_save_entry(ACPI, 0, h, acpi); return 0; + } spin_lock(&s->lock); @@ -286,7 +290,11 @@ static int acpi_load(struct domain *d, hvm_domain_context_t *h) PMTState *s = &d->arch.hvm_domain.pl_time->vpmt; if ( !has_vpm(d) ) + { + if ( !has_acpi_dm_ff(d) ) + return hvm_load_entry(ACPI, h, acpi); return -ENODEV; + } spin_lock(&s->lock);
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> --- Changes in v4: * New patch (This should eventually be moved in acpi.c) xen/arch/x86/hvm/pmtimer.c | 8 ++++++++ 1 file changed, 8 insertions(+)