refactor: use setup_serial_device() on aarch64 restoration path

Have teh aarch64 serial device restoration path use the common serial
device initialization code in setup_serial_device(). The only functional
change here is that now we do set_stdou_nonblocking() on the restore
path, although I would wager that not doing so in the past was actually
an oversight, because we do it for all booted VMs, and for restored VMs
on x86.

Signed-off-by: Patrick Roy <[email protected]>

Author: roypat

src/vmm/src/device_manager/persist.rs

@@ -16,9 +16,7 @@ use super::mmio::*;
 use crate::arch::DeviceType;
 use crate::devices::acpi::vmgenid::{VMGenIDState, VMGenIdConstructorArgs, VmGenId, VmGenIdError};
 #[cfg(target_arch = "aarch64")]
-use crate::devices::legacy::serial::SerialOut;
-#[cfg(target_arch = "aarch64")]
-use crate::devices::legacy::{RTCDevice, SerialDevice};
+use crate::devices::legacy::RTCDevice;
 use crate::devices::virtio::balloon::persist::{BalloonConstructorArgs, BalloonState};
 use crate::devices::virtio::balloon::{Balloon, BalloonError};
 use crate::devices::virtio::block::BlockError;
@@ -358,13 +356,8 @@ impl<'a> Persist<'a> for MMIODeviceManager {
         {
             for state in &state.legacy_devices {
                 if state.type_ == DeviceType::Serial {
-                    let serial = Arc::new(Mutex::new(SerialDevice::new(
-                        Some(std::io::stdin()),
-                        SerialOut::Stdout(std::io::stdout()),
-                    )?));
-                    constructor_args
-                        .event_manager
-                        .add_subscriber(serial.clone());
+                    let serial =
+                        crate::DeviceManager::setup_serial_device(constructor_args.event_manager)?;
 
                     dev_manager.register_mmio_serial(vm, serial, Some(state.device_info))?;
                 }