From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH 1/2] x86/vRTC: Make rtc_mode_{strict, no_ack} a per-domain option Date: Tue, 26 Nov 2013 20:39:17 +0000 Message-ID: <1385498358-10077-2-git-send-email-andrew.cooper3@citrix.com> References: <1385498358-10077-1-git-send-email-andrew.cooper3@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1385498358-10077-1-git-send-email-andrew.cooper3@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Xen-devel Cc: Andrew Cooper , Keir Fraser , Jan Beulich , Tim Deegan List-Id: xen-devel@lists.xenproject.org Signed-off-by: Andrew Cooper CC: Keir Fraser CC: Jan Beulich CC: Tim Deegan --- xen/arch/x86/hvm/hvm.c | 4 ++++ xen/arch/x86/hvm/rtc.c | 11 ++++++----- xen/include/public/hvm/params.h | 5 ++++- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index af249f7..e56ada5 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4116,6 +4116,10 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) arg) if ( a.value > SHUTDOWN_MAX ) rc = -EINVAL; break; + case HVM_PARAM_RTC_MODE: + if ( a.value > 1 ) + rc = -EINVAL; + break; } if ( rc == 0 ) diff --git a/xen/arch/x86/hvm/rtc.c b/xen/arch/x86/hvm/rtc.c index cdedefe..4010d49 100644 --- a/xen/arch/x86/hvm/rtc.c +++ b/xen/arch/x86/hvm/rtc.c @@ -45,14 +45,15 @@ #define epoch_year 1900 #define get_year(x) (x + epoch_year) +/* This forms an ABI in HVM_PARAM_RTC_MODE */ enum rtc_mode { - rtc_mode_no_ack, - rtc_mode_strict + rtc_mode_no_ack = 0, + rtc_mode_strict = 1 }; -/* This must be in sync with how hvmloader sets the ACPI WAET flags. */ -#define mode_is(d, m) ((void)(d), rtc_mode_##m == rtc_mode_no_ack) -#define rtc_mode_is(s, m) mode_is(vrtc_domain(s), m) +#define rtc_mode_is(s, m) ( \ + vrtc_domain(s)->arch.hvm_domain.params[HVM_PARAM_RTC_MODE] \ + == rtc_mode_##m) static void rtc_copy_date(RTCState *s); static void rtc_set_time(RTCState *s); diff --git a/xen/include/public/hvm/params.h b/xen/include/public/hvm/params.h index 517a184..2849dc3 100644 --- a/xen/include/public/hvm/params.h +++ b/xen/include/public/hvm/params.h @@ -145,6 +145,9 @@ /* SHUTDOWN_* action in case of a triple fault */ #define HVM_PARAM_TRIPLE_FAULT_REASON 31 -#define HVM_NR_PARAMS 32 +/* Set to 1 if domain is expected to use RTC no-ack optimisation */ +#define HVM_PARAM_RTC_MODE 32 + +#define HVM_NR_PARAMS 33 #endif /* __XEN_PUBLIC_HVM_PARAMS_H__ */ -- 1.7.10.4