From 7b1de98b66f91b468d9bdc9abafdb55e3276d989 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Thu, 2 Nov 2023 10:42:02 +0100 Subject: [PATCH] x86/vRTC: minor adjustment to reads from index port MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Whether to handle this shouldn't depend on the present value of the index register. Since the handling is done outside of the lock anyway, pull it out into the sole caller and drop the no longer needed function parameter. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/hvm/rtc.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/hvm/rtc.c b/xen/arch/x86/hvm/rtc.c index 206b4296e9..853ead5e80 100644 --- a/xen/arch/x86/hvm/rtc.c +++ b/xen/arch/x86/hvm/rtc.c @@ -646,14 +646,11 @@ static int update_in_progress(RTCState *s) return 0; } -static uint32_t rtc_ioport_read(RTCState *s, uint32_t addr) +static uint32_t rtc_ioport_read(RTCState *s) { int ret; struct domain *d = vrtc_domain(s); - if ( (addr & 1) == 0 ) - return 0xff; - spin_lock(&s->lock); switch ( s->hw.cmos_index ) @@ -715,9 +712,14 @@ static int cf_check handle_rtc_io( if ( rtc_ioport_write(vrtc, port, (uint8_t)*val) ) return X86EMUL_OKAY; } + else if ( !(port & 1) ) + { + *val = 0xff; + return X86EMUL_OKAY; + } else if ( vrtc->hw.cmos_index < RTC_CMOS_SIZE ) { - *val = rtc_ioport_read(vrtc, port); + *val = rtc_ioport_read(vrtc); return X86EMUL_OKAY; } -- 2.39.5