From 59c1567f80c519503d9a839e03790b891f235aeb Mon Sep 17 00:00:00 2001 From: Emanuel Lima Date: Mon, 29 Apr 2024 14:12:07 -0300 Subject: [PATCH] runtime-rs: Fix constructing the RTC struct RTC was being built in a wrong fashion on commit #2bc5e3c6e2ab0145fa9e8be95df0d5086c07a517 RTC was being constructed inside the QemuCmdLine struct, but it should've been built inside the devices vector. Signed-off-by: Emanuel Lima --- .../crates/hypervisor/src/qemu/cmdline_generator.rs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/runtime-rs/crates/hypervisor/src/qemu/cmdline_generator.rs b/src/runtime-rs/crates/hypervisor/src/qemu/cmdline_generator.rs index 15ec2e4498e1..3abebbee9202 100644 --- a/src/runtime-rs/crates/hypervisor/src/qemu/cmdline_generator.rs +++ b/src/runtime-rs/crates/hypervisor/src/qemu/cmdline_generator.rs @@ -1212,7 +1212,6 @@ pub struct QemuCmdLine<'a> { smp: Smp, machine: Machine, cpu: Cpu, - rtc: Rtc, knobs: Knobs, @@ -1229,7 +1228,6 @@ impl<'a> QemuCmdLine<'a> { smp: Smp::new(config), machine: Machine::new(config), cpu: Cpu::new(config), - rtc: Rtc::new(), knobs: Knobs::new(config), devices: Vec::new(), }; @@ -1238,9 +1236,16 @@ impl<'a> QemuCmdLine<'a> { qemu_cmd_line.add_iommu(); } + qemu_cmd_line.add_rtc(); + Ok(qemu_cmd_line) } + fn add_rtc(&mut self) { + let rtc = Rtc::new(); + self.devices.push(Box::new(rtc)); + } + fn bus_type(&self) -> VirtioBusType { if self.config.machine_info.machine_type.contains("-ccw-") { VirtioBusType::Ccw @@ -1432,7 +1437,6 @@ impl<'a> QemuCmdLine<'a> { result.append(&mut self.machine.qemu_params().await?); result.append(&mut self.cpu.qemu_params().await?); result.append(&mut self.memory.qemu_params().await?); - result.append(&mut self.rtc.qemu_params().await?); for device in &self.devices { result.append(&mut device.qemu_params().await?);