External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-12-22 21:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

virtio-devices: pci_device: Deserialise section directly to state

Browse Source 
Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2021-04-14 16:49:49 +01:00 committed by Sebastien Boeuf
parent 08c4e5031f
commit 85f7913bb3
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
virtio-devices/src/transport/pci_device.rs
View File

@ -1117,24 +1117,14 @@ impl Snapshottable for VirtioPciDevice {
self.configuration.restore(*pci_config_snapshot.clone())?;
}
let virtio_pci_dev_state =
match serde_json::from_slice(&virtio_pci_dev_section.snapshot) {
Ok(state) => state,
Err(error) => {
return Err(MigratableError::Restore(anyhow!(
"Could not deserialize VIRTIO_PCI_DEVICE {}",
error
)))
}
};
// First restore the status of the virtqueues.
self.set_state(&virtio_pci_dev_state).map_err(|e| {
MigratableError::Restore(anyhow!(
"Could not restore VIRTIO_PCI_DEVICE state {:?}",
e
))
})?;
self.set_state(&virtio_pci_dev_section.to_state()?)
.map_err(|e| {
MigratableError::Restore(anyhow!(
"Could not restore VIRTIO_PCI_DEVICE state {:?}",
e
))
})?;
// Then we can activate the device, as we know at this point that
// the virtqueues are in the right state and the device is ready