[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PATCH v2 27/30] vfio/pci: use the BYTE-based definitions
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-trivial] [PATCH v2 27/30] vfio/pci: use the BYTE-based definitions |
Date: |
Mon, 5 Mar 2018 08:27:29 -0300 |
It eases code review, unit is explicit.
Patch generated using:
$ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/
and modified manually.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/vfio/pci-quirks.c | 8 ++++----
hw/vfio/pci.c | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c
index e5779a7ad3..3c091106dd 100644
--- a/hw/vfio/pci-quirks.c
+++ b/hw/vfio/pci-quirks.c
@@ -1255,9 +1255,9 @@ static int vfio_igd_gtt_max(VFIOPCIDevice *vdev)
ggms = 1 << ggms;
}
- ggms *= 1024 * 1024;
+ ggms *= M_BYTE;
- return (ggms / (4 * 1024)) * (gen < 8 ? 4 : 8);
+ return (ggms / (4 * K_BYTE)) * (gen < 8 ? 4 : 8);
}
/*
@@ -1514,7 +1514,7 @@ static void vfio_probe_igd_bar4_quirk(VFIOPCIDevice
*vdev, int nr)
igd->vdev = vdev;
igd->index = ~0;
igd->bdsm = vfio_pci_read_config(&vdev->pdev, IGD_BDSM, 4);
- igd->bdsm &= ~((1 << 20) - 1); /* 1MB aligned */
+ igd->bdsm &= ~((1 * M_BYTE) - 1); /* 1MB aligned */
memory_region_init_io(&quirk->mem[0], OBJECT(vdev), &vfio_igd_index_quirk,
igd, "vfio-igd-index-quirk", 4);
@@ -1561,7 +1561,7 @@ static void vfio_probe_igd_bar4_quirk(VFIOPCIDevice
*vdev, int nr)
* config offset 0x5C.
*/
bdsm_size = g_malloc(sizeof(*bdsm_size));
- *bdsm_size = cpu_to_le64((ggms_mb + gms_mb) * 1024 * 1024);
+ *bdsm_size = cpu_to_le64((ggms_mb + gms_mb) * M_BYTE);
fw_cfg_add_file(fw_cfg_find(), "etc/igd-bdsm-size",
bdsm_size, sizeof(*bdsm_size));
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index 033cc8dea1..db337476ef 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -1408,7 +1408,7 @@ static void vfio_pci_relocate_msix(VFIOPCIDevice *vdev,
Error **errp)
}
/* 2GB max size for 32-bit BARs, cannot double if already > 1G */
- if (vdev->bars[target_bar].size > (1 * 1024 * 1024 * 1024) &&
+ if (vdev->bars[target_bar].size > 1 * G_BYTE &&
!vdev->bars[target_bar].mem64) {
error_setg(errp, "Invalid MSI-X relocation BAR %d, "
"no space to extend 32-bit BAR", target_bar);
--
2.16.2
- [Qemu-trivial] [PATCH v2 19/30] hw/nios2: use the BYTE-based definitions, (continued)
- [Qemu-trivial] [PATCH v2 19/30] hw/nios2: use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/03/05
- [Qemu-trivial] [PATCH v2 20/30] hw/cris: use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/03/05
- [Qemu-trivial] [PATCH v2 21/30] hw/misc: use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/03/05
- [Qemu-trivial] [PATCH v2 25/30] hw/scsi: use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/03/05
- [Qemu-trivial] [PATCH v2 23/30] hw/net: use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/03/05
- [Qemu-trivial] [PATCH v2 24/30] hw/ipack: use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/03/05
- [Qemu-trivial] [PATCH v2 28/30] ivshmem: use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/03/05
- [Qemu-trivial] [PATCH v2 26/30] hw/smbios: use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/03/05
- [Qemu-trivial] [PATCH v2 27/30] vfio/pci: use the BYTE-based definitions,
Philippe Mathieu-Daudé <=
- [Qemu-trivial] [PATCH v2 29/30] tpm: use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/03/05
- [Qemu-trivial] [PATCH v2 30/30] xen: use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/03/05
- Message not available