Skip to content

Commit 3a9002e

Browse files
committed
vmm: fix riscv64 legacy serial MMIO setup
Signed-off-by: Zewei Yang <yangzewei@loongson.cn>
1 parent 788cf91 commit 3a9002e

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

src/vmm/src/builder.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -943,7 +943,8 @@ pub fn build_microvm(
943943
&vm,
944944
&mut mmio_device_manager,
945945
&mut kernel_cmdline,
946-
serial_device,
946+
intc.clone(),
947+
serial_devices,
947948
)?;
948949
}
949950

src/vmm/src/device_manager/kvm/mmio.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,10 @@ impl MMIODeviceManager {
199199
vm.register_irqfd(serial.lock().unwrap().interrupt_evt(), self.irq)
200200
.map_err(Error::RegisterIrqFd)?;
201201

202+
#[cfg(target_arch = "aarch64")]
202203
serial.lock().unwrap().set_intc(intc);
204+
#[cfg(target_arch = "riscv64")]
205+
let _ = intc;
203206

204207
self.bus
205208
.insert(serial, self.mmio_base, MMIO_LEN)

0 commit comments

Comments
 (0)