From patchwork Thu Oct 11 12:23:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artem Pisarenko X-Patchwork-Id: 10636583 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 30CBC16B1 for ; Thu, 11 Oct 2018 12:28:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 246622B3F1 for ; Thu, 11 Oct 2018 12:28:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 177802B3F9; Thu, 11 Oct 2018 12:28:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 91E092B3F1 for ; Thu, 11 Oct 2018 12:28:38 +0000 (UTC) Received: from localhost ([::1]:34132 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAa4z-0007uS-L8 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 11 Oct 2018 08:28:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41365) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAa3h-0006X2-9V for qemu-devel@nongnu.org; Thu, 11 Oct 2018 08:27:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gAa3c-0007Wg-5H for qemu-devel@nongnu.org; Thu, 11 Oct 2018 08:27:15 -0400 Received: from mail-lf1-x12a.google.com ([2a00:1450:4864:20::12a]:43682) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gAa3b-0007Ta-QH for qemu-devel@nongnu.org; Thu, 11 Oct 2018 08:27:12 -0400 Received: by mail-lf1-x12a.google.com with SMTP id p34-v6so6519274lfg.10 for ; Thu, 11 Oct 2018 05:27:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=AwBVyk/YwtevkvfRia9eCprmQWk8hGxtTrFN2c2/fwE=; b=eB6IjwGsVle6KI2Nyb2sla/lXYxAzhcooLO2NMYh5WcbcD72sOZQ26g9srANwVvGTy ohwlgTw+5AR1SUTVFxwJDti/yjZn5UxHePUwRuL0Z7biR4SDmOwCQreDrmy8SFz/X0sR f7a1CdcbyAQVXE0h8UmH4e/z23jIMIBUZJCs00ILnJsIoNS5ls9a1wqai4hH+iTpCWfX yiKs4AoGKBD97sDBWZnFY+aLPRNV2YzHBMJS9rNTvR2dZ6JuPyM4PJUZITo9EFFv5pwH rSEHYibYKCJ/wjlIhjVsNbsn/tiZ5LKSx2ydTxgdOGIkfo+oKcIgyOr/1q6LH2G58fFl PmAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=AwBVyk/YwtevkvfRia9eCprmQWk8hGxtTrFN2c2/fwE=; b=udX2gsfTR5kvmYMLoRe4kCAwniH/7ZUI0c42+qZJQGDU6NVSkQIA0lbmkEc7xYnVX8 jd5GI9uCGPCZme+dvPTFh7oP0nOQ5HUBUVbMW6EEwC2qWKVrgPJkRQZiuEO8RO5ejU2K B4tkf9jwW/hP8IaeBexH02/0fngivy7JaxacHQlGA7rf2F1hr4S8EGCPCLTACewBEjZx lvk06QnlPvfHZU/WLyu8XrG6LfeSedC6//4iNRkSccu/OwnIHXIP7zOjNP6mI63bfgpU +OoK4JdbwMfbeabjV+IOmMuUR4MssuU2o9R7+hXMeCWvyox8wnb1Bjz9PCFVgcS/U5TC G8JA== X-Gm-Message-State: ABuFfohRa+7Cr2h51rWCQzm5WL6r92F25emPBwZBK8oFIVT0xTfgAIQQ QwtqJZtvQGXmNEYctrF0NTcn/x1H X-Google-Smtp-Source: ACcGV62ES4Z4NOIf+/pr6IiSV2PwC94Cd/NGHXXdKr5d7CBjul5Yk9YsdW1qhSOJQddRXnzKnPP04g== X-Received: by 2002:a19:4411:: with SMTP id r17-v6mr1062573lfa.87.1539260829037; Thu, 11 Oct 2018 05:27:09 -0700 (PDT) Received: from localhost.localdomain ([77.221.221.49]) by smtp.gmail.com with ESMTPSA id 33-v6sm5713890lfu.64.2018.10.11.05.27.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 11 Oct 2018 05:27:08 -0700 (PDT) From: Artem Pisarenko To: qemu-devel@nongnu.org Date: Thu, 11 Oct 2018 18:23:17 +0600 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::12a Subject: [Qemu-devel] [PATCH 2/4] vl: refactor -rtc option references X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Artem Pisarenko Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Improve code readability and prepare for fixing bug #1797033 Signed-off-by: Artem Pisarenko --- vl.c | 82 +++++++++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 49 insertions(+), 33 deletions(-) diff --git a/vl.c b/vl.c index 4e25c78..3a1346f 100644 --- a/vl.c +++ b/vl.c @@ -147,8 +147,13 @@ bool enable_cpu_pm = false; int nb_nics; NICInfo nd_table[MAX_NICS]; int autostart; -static int rtc_utc = 1; -static int rtc_date_offset = -1; /* -1 means no change */ +static enum { + RTC_BASE_UTC, + RTC_BASE_LOCALTIME, + RTC_BASE_DATETIME, +} rtc_base_type = RTC_BASE_UTC; +static int rtc_host_datetime_offset = -1; /* valid only for host rtc_clock and + rtc_base_type=RTC_BASE_DATETIME */ QEMUClockType rtc_clock; int vga_interface_type = VGA_NONE; static DisplayOptions dpy; @@ -782,26 +787,30 @@ void qemu_system_vmstop_request(RunState state) /***********************************************************/ /* real time host monotonic timer */ -static time_t qemu_time(void) +static time_t qemu_timedate(void) { return qemu_clock_get_ms(QEMU_CLOCK_HOST) / 1000; } /***********************************************************/ -/* host time/date access */ +/* RTC reference time/date access */ void qemu_get_timedate(struct tm *tm, int offset) { - time_t ti = qemu_time(); + time_t ti = qemu_timedate(); ti += offset; - if (rtc_date_offset == -1) { - if (rtc_utc) - gmtime_r(&ti, tm); - else - localtime_r(&ti, tm); - } else { - ti -= rtc_date_offset; + + switch (rtc_base_type) { + case RTC_BASE_UTC: + gmtime_r(&ti, tm); + break; + case RTC_BASE_LOCALTIME: + localtime_r(&ti, tm); + break; + case RTC_BASE_DATETIME: + ti -= rtc_host_datetime_offset; gmtime_r(&ti, tm); + break; } } @@ -809,23 +818,28 @@ int qemu_timedate_diff(struct tm *tm) { time_t seconds; - if (rtc_date_offset == -1) - if (rtc_utc) - seconds = mktimegm(tm); - else { - struct tm tmp = *tm; - tmp.tm_isdst = -1; /* use timezone to figure it out */ - seconds = mktime(&tmp); - } - else - seconds = mktimegm(tm) + rtc_date_offset; - - return seconds - qemu_time(); + switch (rtc_base_type) { + case RTC_BASE_UTC: + seconds = mktimegm(tm); + break; + case RTC_BASE_LOCALTIME: + { + struct tm tmp = *tm; + tmp.tm_isdst = -1; /* use timezone to figure it out */ + seconds = mktime(&tmp); + break; + } + case RTC_BASE_DATETIME: + seconds = mktimegm(tm) + rtc_host_datetime_offset; + break; + } + + return seconds - qemu_timedate(); } -static void configure_rtc_date_offset(const char *startdate) +static void configure_rtc_host_datetime_offset(const char *startdate) { - time_t rtc_start_date; + time_t rtc_start_datetime; struct tm tm; if (sscanf(startdate, "%d-%d-%dT%d:%d:%d", &tm.tm_year, &tm.tm_mon, @@ -841,15 +855,16 @@ static void configure_rtc_date_offset(const char *startdate) } tm.tm_year -= 1900; tm.tm_mon--; - rtc_start_date = mktimegm(&tm); - if (rtc_start_date == -1) { + rtc_start_datetime = mktimegm(&tm); + if (rtc_start_datetime == -1) { date_fail: - error_report("invalid date format"); + error_report("invalid datetime format"); error_printf("valid formats: " "'2006-06-17T16:01:21' or '2006-06-17'\n"); exit(1); } - rtc_date_offset = qemu_time() - rtc_start_date; + rtc_host_datetime_offset = (qemu_clock_get_ms(QEMU_CLOCK_HOST) / 1000) + - rtc_start_datetime; } static void configure_rtc(QemuOpts *opts) @@ -859,15 +874,16 @@ static void configure_rtc(QemuOpts *opts) value = qemu_opt_get(opts, "base"); if (value) { if (!strcmp(value, "utc")) { - rtc_utc = 1; + rtc_base_type = RTC_BASE_UTC; } else if (!strcmp(value, "localtime")) { Error *blocker = NULL; - rtc_utc = 0; + rtc_base_type = RTC_BASE_LOCALTIME; error_setg(&blocker, QERR_REPLAY_NOT_SUPPORTED, "-rtc base=localtime"); replay_add_blocker(blocker); } else { - configure_rtc_date_offset(value); + rtc_base_type = RTC_BASE_DATETIME; + configure_rtc_host_datetime_offset(value); } } value = qemu_opt_get(opts, "clock");