Skip to content

Commit

Permalink
devices: cmos: suppress deprecation warnings on time_t on musl
Browse files Browse the repository at this point in the history
The type is to change from 32-bit to 64-bit. See
rust-lang/libc#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 <liuwe@microsoft.com>
  • Loading branch information
liuw committed Aug 23, 2021
1 parent ddf5a84 commit d2b41d4
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion devices/src/legacy/cmos.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 _);
Expand Down

0 comments on commit d2b41d4

Please sign in to comment.