ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

virtio: fix the coverity warning

Browse Source 
Type: fix

Change-Id: I6c6d66ad8aa158be8d2b9d111de7d46473b9dc02
Signed-off-by: Mohsin Kazmi <sykazmi@cisco.com>
This commit is contained in:
Mohsin Kazmi
2020-08-20 17:18:56 +02:00
committed by Benoît Ganne
parent 2b79341dca
commit 133c91c1c0
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/vnet/devices/virtio/pci.c
View File

@ -727,8 +727,13 @@ virtio_pci_read_caps (vlib_main_t * vm, virtio_if_t * vif, void **bar)
"[%4x] cfg type: %u, bar: %u, offset: %04x, len: %u",
pos, cap.cfg_type, cap.bar, cap.offset, cap.length);
vif->bar = bar[cap.bar];
vif->bar_id = cap.bar;
if (cap.bar >= 1 && cap.bar <= 5)
{
vif->bar = bar[cap.bar];
vif->bar_id = cap.bar;
}
else
return clib_error_return (error, "invalid bar %u", cap.bar);
switch (cap.cfg_type)
{

11
src/vnet/devices/virtio/virtio_pci_legacy.c
View File

@ -113,8 +113,10 @@ virtio_pci_legacy_set_guest_features (vlib_main_t * vm, virtio_if_t * vif,
clib_warning ("only 32 bit features are allowed for legacy virtio!");
}
u32 features = 0;
u32 gf = (u32) guest_features;
vlib_pci_write_io_u32 (vm, vif->pci_dev_handle, VIRTIO_PCI_GUEST_FEATURES,
(u32 *) & guest_features);
&gf);
vlib_pci_read_io_u32 (vm, vif->pci_dev_handle, VIRTIO_PCI_GUEST_FEATURES,
&features);
if (features != (u32) guest_features)
@ -178,14 +180,13 @@ virtio_pci_legacy_setup_queue (vlib_main_t * vm, virtio_if_t * vif,
u16 queue_id, void *p)
{
u64 addr = vlib_physmem_get_pa (vm, p) >> VIRTIO_PCI_QUEUE_ADDR_SHIFT;
u32 addr2 = 0;
u32 addr2 = 0, a = (u32) addr;
vlib_pci_write_io_u16 (vm, vif->pci_dev_handle, VIRTIO_PCI_QUEUE_SEL,
&queue_id);
vlib_pci_write_io_u32 (vm, vif->pci_dev_handle, VIRTIO_PCI_QUEUE_PFN,
(u32 *) & addr);
vlib_pci_write_io_u32 (vm, vif->pci_dev_handle, VIRTIO_PCI_QUEUE_PFN, &a);
vlib_pci_read_io_u32 (vm, vif->pci_dev_handle, VIRTIO_PCI_QUEUE_PFN,
&addr2);
if ((u32) addr == addr2)
if (addr == addr2)
return 0;
clib_warning ("legacy queue setup failed!");