diff options
| author | Chris Friedt <chrisfriedt@gmail.com> | 2022-10-18 08:25:50 -0400 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2024-04-30 06:21:47 +0200 |
| commit | 3e64d7d7b8761107c39cc03da2d031d1d6f6912a (patch) | |
| tree | 9e041abbcf51e3dba571cbcd626749617f8a5eaa /hw/misc | |
| parent | 69826741593644f6e9ee735cff37599c33764d67 (diff) | |
| download | qemu-3e64d7d7b8761107c39cc03da2d031d1d6f6912a.zip qemu-3e64d7d7b8761107c39cc03da2d031d1d6f6912a.tar.gz qemu-3e64d7d7b8761107c39cc03da2d031d1d6f6912a.tar.bz2 | |
hw: misc: edu: rename local vars in edu_check_range
This serves to make the local variables a bit less ambiguous.
The latter two arguments are named to match DMA_START, and
DMA_SIZE.
Signed-off-by: Chris Friedt <cfriedt@meta.com>
Message-ID: <20221018122551.94567-2-cfriedt@meta.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'hw/misc')
| -rw-r--r-- | hw/misc/edu.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/hw/misc/edu.c b/hw/misc/edu.c index 14250e0..e1cb443 100644 --- a/hw/misc/edu.c +++ b/hw/misc/edu.c @@ -103,24 +103,24 @@ static void edu_lower_irq(EduState *edu, uint32_t val) } } -static void edu_check_range(uint64_t addr, uint64_t size1, - uint64_t start, uint64_t size2) +static void edu_check_range(uint64_t xfer_start, uint64_t xfer_size, + uint64_t dma_start, uint64_t dma_size) { - uint64_t end1 = addr + size1; - uint64_t end2 = start + size2; + uint64_t xfer_end = xfer_start + xfer_size; + uint64_t dma_end = dma_start + dma_size; /* * 1. ensure we aren't overflowing - * 2. ensure that [addr, end1) is within [start, size2) + * 2. ensure that xfer is within dma address range */ - if (end2 >= start && end1 >= addr && - addr >= start && end1 <= end2) { + if (dma_end >= dma_start && xfer_end >= xfer_start && + xfer_start >= dma_start && xfer_end <= dma_end) { return; } hw_error("EDU: DMA range 0x%016"PRIx64"-0x%016"PRIx64 " out of bounds (0x%016"PRIx64"-0x%016"PRIx64")!", - addr, end1 - 1, start, end2 - 1); + xfer_start, xfer_end - 1, dma_start, dma_end - 1); } static dma_addr_t edu_clamp_addr(const EduState *edu, dma_addr_t addr) |