|
@@ -70,7 +70,7 @@ static bool pcie_has_upstream_port(PCIDevice *dev);
|
|
static Property pci_props[] = {
|
|
static Property pci_props[] = {
|
|
DEFINE_PROP_PCI_DEVFN("addr", PCIDevice, devfn, -1),
|
|
DEFINE_PROP_PCI_DEVFN("addr", PCIDevice, devfn, -1),
|
|
DEFINE_PROP_STRING("romfile", PCIDevice, romfile),
|
|
DEFINE_PROP_STRING("romfile", PCIDevice, romfile),
|
|
- DEFINE_PROP_UINT32("romsize", PCIDevice, romsize, -1),
|
|
|
|
|
|
+ DEFINE_PROP_UINT32("romsize", PCIDevice, romsize, UINT32_MAX),
|
|
DEFINE_PROP_UINT32("rombar", PCIDevice, rom_bar, 1),
|
|
DEFINE_PROP_UINT32("rombar", PCIDevice, rom_bar, 1),
|
|
DEFINE_PROP_BIT("multifunction", PCIDevice, cap_present,
|
|
DEFINE_PROP_BIT("multifunction", PCIDevice, cap_present,
|
|
QEMU_PCI_CAP_MULTIFUNCTION_BITNR, false),
|
|
QEMU_PCI_CAP_MULTIFUNCTION_BITNR, false),
|
|
@@ -2073,7 +2073,7 @@ static void pci_qdev_realize(DeviceState *qdev, Error **errp)
|
|
g_cmp_uint32, NULL);
|
|
g_cmp_uint32, NULL);
|
|
}
|
|
}
|
|
|
|
|
|
- if (pci_dev->romsize != -1 && !is_power_of_2(pci_dev->romsize)) {
|
|
|
|
|
|
+ if (pci_dev->romsize != UINT32_MAX && !is_power_of_2(pci_dev->romsize)) {
|
|
error_setg(errp, "ROM size %u is not a power of two", pci_dev->romsize);
|
|
error_setg(errp, "ROM size %u is not a power of two", pci_dev->romsize);
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
@@ -2359,7 +2359,7 @@ static void pci_add_option_rom(PCIDevice *pdev, bool is_default_rom,
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
- if (load_file || pdev->romsize == -1) {
|
|
|
|
|
|
+ if (load_file || pdev->romsize == UINT32_MAX) {
|
|
path = qemu_find_file(QEMU_FILE_TYPE_BIOS, pdev->romfile);
|
|
path = qemu_find_file(QEMU_FILE_TYPE_BIOS, pdev->romfile);
|
|
if (path == NULL) {
|
|
if (path == NULL) {
|
|
path = g_strdup(pdev->romfile);
|
|
path = g_strdup(pdev->romfile);
|
|
@@ -2378,7 +2378,7 @@ static void pci_add_option_rom(PCIDevice *pdev, bool is_default_rom,
|
|
pdev->romfile);
|
|
pdev->romfile);
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
- if (pdev->romsize != -1) {
|
|
|
|
|
|
+ if (pdev->romsize != UINT_MAX) {
|
|
if (size > pdev->romsize) {
|
|
if (size > pdev->romsize) {
|
|
error_setg(errp, "romfile \"%s\" (%u bytes) "
|
|
error_setg(errp, "romfile \"%s\" (%u bytes) "
|
|
"is too large for ROM size %u",
|
|
"is too large for ROM size %u",
|