mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2026-08-05 02:19:16 +00:00
virtio-devices: pci_device: Remove msix_num check
msix_num is guaranteed to be at least 1 so this check (and the Option) that it returns can be removed. Signed-off-by: Rob Bradford <rbradford@meta.com>
This commit is contained in:
@@ -465,7 +465,7 @@ impl VirtioPciDevice {
|
|||||||
))
|
))
|
||||||
})?;
|
})?;
|
||||||
|
|
||||||
let (msix_config, msix_config_clone) = if msix_num > 0 {
|
let (msix_config, msix_config_clone) = {
|
||||||
let interrupt_source_group: MaybeMutInterruptSourceGroup =
|
let interrupt_source_group: MaybeMutInterruptSourceGroup =
|
||||||
interrupt_source_group.clone();
|
interrupt_source_group.clone();
|
||||||
let msix_config = Arc::new(Mutex::new(
|
let msix_config = Arc::new(Mutex::new(
|
||||||
@@ -473,9 +473,7 @@ impl VirtioPciDevice {
|
|||||||
.unwrap(),
|
.unwrap(),
|
||||||
));
|
));
|
||||||
let msix_config_clone = msix_config.clone();
|
let msix_config_clone = msix_config.clone();
|
||||||
(Some(msix_config), Some(msix_config_clone))
|
(msix_config, msix_config_clone)
|
||||||
} else {
|
|
||||||
(None, None)
|
|
||||||
};
|
};
|
||||||
|
|
||||||
let (class, subclass) = match VirtioDeviceType::from(locked_device.device_type()) {
|
let (class, subclass) = match VirtioDeviceType::from(locked_device.device_type()) {
|
||||||
@@ -510,7 +508,7 @@ impl VirtioPciDevice {
|
|||||||
PciHeaderType::Device,
|
PciHeaderType::Device,
|
||||||
VIRTIO_PCI_VENDOR_ID,
|
VIRTIO_PCI_VENDOR_ID,
|
||||||
pci_device_id,
|
pci_device_id,
|
||||||
msix_config_clone,
|
Some(msix_config_clone),
|
||||||
pci_configuration_state,
|
pci_configuration_state,
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -598,7 +596,7 @@ impl VirtioPciDevice {
|
|||||||
id,
|
id,
|
||||||
configuration,
|
configuration,
|
||||||
common_config,
|
common_config,
|
||||||
msix_config,
|
msix_config: Some(msix_config),
|
||||||
msix_num,
|
msix_num,
|
||||||
device,
|
device,
|
||||||
device_activated: Arc::new(AtomicBool::new(device_activated)),
|
device_activated: Arc::new(AtomicBool::new(device_activated)),
|
||||||
|
|||||||
Reference in New Issue
Block a user