External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-10 14:57:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: make QEMU_PCI_ADDRESS_(SLOT|FUNCTION)_LAST less misleading

Browse Source 
Although these two enums are named ..._LAST, they really had the value
of ..._SIZE. This patch changes their values so that, e.g.,
QEMU_PCI_ADDRESS_SLOT_LAST really is the slot number of the last slot
on a PCI bus.
This commit is contained in:
Laine Stump 2013-07-11 00:53:16 -04:00
parent fcbfd58429
commit 9adafa08e6
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/qemu/qemu_command.c
View File

@ -1408,12 +1408,12 @@ cleanup:
return ret; return ret;
} }
#define QEMU_PCI_ADDRESS_SLOT_LAST 32 #define QEMU_PCI_ADDRESS_SLOT_LAST 31
#define QEMU_PCI_ADDRESS_FUNCTION_LAST 8 #define QEMU_PCI_ADDRESS_FUNCTION_LAST 7
typedef struct { typedef struct {
/* Each bit in a slot represents one function on that slot */ /* Each bit in a slot represents one function on that slot */
uint8_t slots[QEMU_PCI_ADDRESS_SLOT_LAST]; uint8_t slots[QEMU_PCI_ADDRESS_SLOT_LAST + 1];
} qemuDomainPCIAddressBus; } qemuDomainPCIAddressBus;
typedef qemuDomainPCIAddressBus *qemuDomainPCIAddressBusPtr; typedef qemuDomainPCIAddressBus *qemuDomainPCIAddressBusPtr;
@ -1448,15 +1448,15 @@ static bool qemuPCIAddressValidate(qemuDomainPCIAddressSetPtr addrs ATTRIBUTE_UN
addrs->nbuses - 1); addrs->nbuses - 1);
return false; return false;
} }
if (addr->function >= QEMU_PCI_ADDRESS_FUNCTION_LAST) { if (addr->function > QEMU_PCI_ADDRESS_FUNCTION_LAST) {
virReportError(VIR_ERR_XML_ERROR, virReportError(VIR_ERR_XML_ERROR,
_("Invalid PCI address: function must be < %u"), _("Invalid PCI address: function must be <= %u"),
QEMU_PCI_ADDRESS_FUNCTION_LAST); QEMU_PCI_ADDRESS_FUNCTION_LAST);
return false; return false;
} }
if (addr->slot >= QEMU_PCI_ADDRESS_SLOT_LAST) { if (addr->slot > QEMU_PCI_ADDRESS_SLOT_LAST) {
virReportError(VIR_ERR_XML_ERROR, virReportError(VIR_ERR_XML_ERROR,
_("Invalid PCI address: slot must be < %u"), _("Invalid PCI address: slot must be <= %u"),
QEMU_PCI_ADDRESS_SLOT_LAST); QEMU_PCI_ADDRESS_SLOT_LAST);
return false; return false;
} }
@ -1859,7 +1859,7 @@ qemuDomainPCIAddressGetNextSlot(qemuDomainPCIAddressSetPtr addrs,
/* Start the search at the last used bus and slot */ /* Start the search at the last used bus and slot */
for (a.slot++; a.bus < addrs->nbuses; a.bus++) { for (a.slot++; a.bus < addrs->nbuses; a.bus++) {
for (; a.slot < QEMU_PCI_ADDRESS_SLOT_LAST; a.slot++) { for (; a.slot <= QEMU_PCI_ADDRESS_SLOT_LAST; a.slot++) {
if (!qemuDomainPCIAddressSlotInUse(addrs, &a)) if (!qemuDomainPCIAddressSlotInUse(addrs, &a))
goto success; goto success;
@ -1878,7 +1878,7 @@ qemuDomainPCIAddressGetNextSlot(qemuDomainPCIAddressSetPtr addrs,
} else { } else {
/* Check the buses from 0 up to the last used one */ /* Check the buses from 0 up to the last used one */
for (a.bus = 0; a.bus <= addrs->lastaddr.bus; a.bus++) { for (a.bus = 0; a.bus <= addrs->lastaddr.bus; a.bus++) {
for (a.slot = 1; a.slot < QEMU_PCI_ADDRESS_SLOT_LAST; a.slot++) { for (a.slot = 1; a.slot <= QEMU_PCI_ADDRESS_SLOT_LAST; a.slot++) {
if (!qemuDomainPCIAddressSlotInUse(addrs, &a)) if (!qemuDomainPCIAddressSlotInUse(addrs, &a))
goto success; goto success;