From 16f52914e0f11ff022692f7fa46a5d7aa81204f9 Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Mon, 23 Aug 2021 16:10:59 +0000 Subject: [PATCH] devices: cmos: suppress deprecation warnings on time_t on musl The type is to change from 32-bit to 64-bit. See https://github.com/rust-lang/libc/issues/1848. The change is announced via a deprecation warning. Cloud Hypervisor's code does not need changing. Simply suppress these warnings. Signed-off-by: Wei Liu --- devices/src/legacy/cmos.rs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/devices/src/legacy/cmos.rs b/devices/src/legacy/cmos.rs index 3138c5a92..ad9f53cca 100644 --- a/devices/src/legacy/cmos.rs +++ b/devices/src/legacy/cmos.rs @@ -2,12 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -use libc::{clock_gettime, gmtime_r, time_t, timespec, tm, CLOCK_REALTIME}; +use libc::{clock_gettime, gmtime_r, timespec, tm, CLOCK_REALTIME}; use std::cmp::min; use std::mem; use std::sync::{Arc, Barrier}; use vm_device::BusDevice; +// https://github.com/rust-lang/libc/issues/1848 +#[cfg_attr(target_env = "musl", allow(deprecated))] +use libc::time_t; + const INDEX_MASK: u8 = 0x7f; const INDEX_OFFSET: u64 = 0x0; const DATA_OFFSET: u64 = 0x1; @@ -85,6 +89,8 @@ impl BusDevice for Cmos { let mut timespec: timespec = mem::zeroed(); clock_gettime(CLOCK_REALTIME, &mut timespec as *mut _); + // https://github.com/rust-lang/libc/issues/1848 + #[cfg_attr(target_env = "musl", allow(deprecated))] let now: time_t = timespec.tv_sec; let mut tm: tm = mem::zeroed(); gmtime_r(&now, &mut tm as *mut _);