[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/19] hw: misc: edu: rename local vars in edu_check_range
From: |
Thomas Huth |
Subject: |
[PULL 08/19] hw: misc: edu: rename local vars in edu_check_range |
Date: |
Tue, 30 Apr 2024 09:13:29 +0200 |
From: Chris Friedt <chrisfriedt@gmail.com>
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>
---
hw/misc/edu.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/hw/misc/edu.c b/hw/misc/edu.c
index 14250e0ac3..e1cb443438 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)
--
2.44.0
- [PULL 00/19] Misc patches (s390x clean-ups, fixes for crashes, ...), Thomas Huth, 2024/04/30
- [PULL 01/19] target/s390x/cpu_model: Make check_compatibility() return boolean, Thomas Huth, 2024/04/30
- [PULL 04/19] target/s390x/cpu_models: Drop local @err in get_max_cpu_model(), Thomas Huth, 2024/04/30
- [PULL 05/19] target/s390x/cpu_models: Make kvm_s390_apply_cpu_model() return boolean, Thomas Huth, 2024/04/30
- [PULL 06/19] target/s390x/cpu_models_sysemu: Drop local @err in apply_cpu_model(), Thomas Huth, 2024/04/30
- [PULL 07/19] hw: misc: edu: fix 2 off-by-one errors, Thomas Huth, 2024/04/30
- [PULL 02/19] target/s390x/cpu_model: Drop local @err in s390_realize_cpu_model(), Thomas Huth, 2024/04/30
- [PULL 03/19] target/s390x/cpu_models: Make kvm_s390_get_host_cpu_model() return boolean, Thomas Huth, 2024/04/30
- [PULL 09/19] hw: misc: edu: use qemu_log_mask instead of hw_error, Thomas Huth, 2024/04/30
- [PULL 08/19] hw: misc: edu: rename local vars in edu_check_range,
Thomas Huth <=
- [PULL 13/19] build-environment: make some packages optional, Thomas Huth, 2024/04/30
- [PULL 14/19] gitlab: migrate the s390x custom machine to 22.04, Thomas Huth, 2024/04/30
- [PULL 12/19] hw/char/stm32l4x5_usart: Fix memory corruption by adding correct class_size, Thomas Huth, 2024/04/30
- [PULL 11/19] qga: Re-enable the qga-ssh-test when running without fuzzing, Thomas Huth, 2024/04/30
- [PULL 15/19] gitlab: remove stale s390x-all-linux-static conf hacks, Thomas Huth, 2024/04/30
- [PULL 16/19] hw/ide/core.c (cmd_read_native_max): Avoid limited device parameters, Thomas Huth, 2024/04/30
- [PULL 10/19] stubs: Add missing qga stubs, Thomas Huth, 2024/04/30
- [PULL 18/19] .gitlab-ci.d/cirrus.yml: Shorten the runtime of the macOS and FreeBSD jobs, Thomas Huth, 2024/04/30
- [PULL 17/19] tests/qtest/ide-test: Verify READ NATIVE MAX ADDRESS is not limited, Thomas Huth, 2024/04/30
- [PULL 19/19] .gitlab-ci.d/cirrus: Remove the netbsd and openbsd jobs, Thomas Huth, 2024/04/30