ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/iommu: Fix problems reported by Coverity scan 

Signed-off-by: David Kiarie <davidkiarie4@gmail.com>
Message-Id: <1475553808-13285-2-git-send-email-davidkiarie4@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
David Kiarie 2016-10-04 07:03:28 +03:00 committed by Paolo Bonzini
parent 49540a1f65
commit 1d5b128cbe
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hw/i386/amd_iommu.c
View File

@ -143,10 +143,10 @@ static void amdvi_assign_andq(AMDVIState *s, hwaddr addr, uint64_t val)
static void amdvi_generate_msi_interrupt(AMDVIState *s) static void amdvi_generate_msi_interrupt(AMDVIState *s)
{ {
MSIMessage msg; MSIMessage msg = {};
MemTxAttrs attrs; MemTxAttrs attrs = {
.requester_id = pci_requester_id(&s->pci.dev)
attrs.requester_id = pci_requester_id(&s->pci.dev); };
if (msi_enabled(&s->pci.dev)) { if (msi_enabled(&s->pci.dev)) {
msg = msi_get_message(&s->pci.dev, 0); msg = msi_get_message(&s->pci.dev, 0);
@ -185,7 +185,7 @@ static void amdvi_setevent_bits(uint64_t *buffer, uint64_t value, int start,
int length) int length)
{ {
int index = start / 64, bitpos = start % 64; int index = start / 64, bitpos = start % 64;
uint64_t mask = ((1 << length) - 1) << bitpos; uint64_t mask = MAKE_64BIT_MASK(start, length);
buffer[index] &= ~mask; buffer[index] &= ~mask;
buffer[index] |= (value << bitpos) & mask; buffer[index] |= (value << bitpos) & mask;
} }
@ -333,8 +333,8 @@ static void amdvi_update_iotlb(AMDVIState *s, uint16_t devid,
uint64_t gpa, IOMMUTLBEntry to_cache, uint64_t gpa, IOMMUTLBEntry to_cache,
uint16_t domid) uint16_t domid)
{ {
AMDVIIOTLBEntry *entry = g_malloc(sizeof(*entry)); AMDVIIOTLBEntry *entry = g_new(AMDVIIOTLBEntry, 1);
uint64_t *key = g_malloc(sizeof(key)); uint64_t *key = g_new(uint64_t, 1);
uint64_t gfn = gpa >> AMDVI_PAGE_SHIFT_4K; uint64_t gfn = gpa >> AMDVI_PAGE_SHIFT_4K;
/* don't cache erroneous translations */ /* don't cache erroneous translations */
@ -1135,6 +1135,7 @@ static void amdvi_reset(DeviceState *dev)
static void amdvi_realize(DeviceState *dev, Error **err) static void amdvi_realize(DeviceState *dev, Error **err)
{ {
int ret = 0;
AMDVIState *s = AMD_IOMMU_DEVICE(dev); AMDVIState *s = AMD_IOMMU_DEVICE(dev);
X86IOMMUState *x86_iommu = X86_IOMMU_DEVICE(dev); X86IOMMUState *x86_iommu = X86_IOMMU_DEVICE(dev);
PCIBus *bus = PC_MACHINE(qdev_get_machine())->bus; PCIBus *bus = PC_MACHINE(qdev_get_machine())->bus;
@ -1147,8 +1148,11 @@ static void amdvi_realize(DeviceState *dev, Error **err)
object_property_set_bool(OBJECT(&s->pci), true, "realized", err); object_property_set_bool(OBJECT(&s->pci), true, "realized", err);
s->capab_offset = pci_add_capability(&s->pci.dev, AMDVI_CAPAB_ID_SEC, 0, s->capab_offset = pci_add_capability(&s->pci.dev, AMDVI_CAPAB_ID_SEC, 0,
AMDVI_CAPAB_SIZE); AMDVI_CAPAB_SIZE);
pci_add_capability(&s->pci.dev, PCI_CAP_ID_MSI, 0, AMDVI_CAPAB_REG_SIZE); assert(s->capab_offset > 0);
pci_add_capability(&s->pci.dev, PCI_CAP_ID_HT, 0, AMDVI_CAPAB_REG_SIZE); ret = pci_add_capability(&s->pci.dev, PCI_CAP_ID_MSI, 0, AMDVI_CAPAB_REG_SIZE);
assert(ret > 0);
ret = pci_add_capability(&s->pci.dev, PCI_CAP_ID_HT, 0, AMDVI_CAPAB_REG_SIZE);
assert(ret > 0);
/* set up MMIO */ /* set up MMIO */
memory_region_init_io(&s->mmio, OBJECT(s), &mmio_mem_ops, s, "amdvi-mmio", memory_region_init_io(&s->mmio, OBJECT(s), &mmio_mem_ops, s, "amdvi-mmio",