SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

memory: Let ReservedRegion use Range

Browse Source 
A reserved region is a range tagged with a type. Let's directly use
the Range type in the prospect to reuse some of the library helpers
shipped with the Range type.

Signed-off-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Reviewed-by: "Michael S. Tsirkin" <mst@redhat.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>
This commit is contained in:
Eric Auger 2023-10-19 15:45:07 +02:00 committed by Cédric Le Goater
parent d762bf9793
commit e8f433f80e
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/core/qdev-properties-system.c
View File

@ -705,7 +705,7 @@ static void get_reserved_region(Object *obj, Visitor *v, const char *name,
int rc; int rc;
rc = snprintf(buffer, sizeof(buffer), "0x%"PRIx64":0x%"PRIx64":%u", rc = snprintf(buffer, sizeof(buffer), "0x%"PRIx64":0x%"PRIx64":%u",
rr->low, rr->high, rr->type); range_lob(&rr->range), range_upb(&rr->range), rr->type);
assert(rc < sizeof(buffer)); assert(rc < sizeof(buffer));
visit_type_str(v, name, &p, errp); visit_type_str(v, name, &p, errp);
@ -717,6 +717,7 @@ static void set_reserved_region(Object *obj, Visitor *v, const char *name,
Property *prop = opaque; Property *prop = opaque;
ReservedRegion *rr = object_field_prop_ptr(obj, prop); ReservedRegion *rr = object_field_prop_ptr(obj, prop);
const char *endptr; const char *endptr;
uint64_t lob, upb;
char *str; char *str;
int ret; int ret;
@ -724,7 +725,7 @@ static void set_reserved_region(Object *obj, Visitor *v, const char *name,
return; return;
} }
ret = qemu_strtou64(str, &endptr, 16, &rr->low); ret = qemu_strtou64(str, &endptr, 16, &lob);
if (ret) { if (ret) {
error_setg(errp, "start address of '%s'" error_setg(errp, "start address of '%s'"
" must be a hexadecimal integer", name); " must be a hexadecimal integer", name);
@ -734,7 +735,7 @@ static void set_reserved_region(Object *obj, Visitor *v, const char *name,
goto separator_error; goto separator_error;
} }
ret = qemu_strtou64(endptr + 1, &endptr, 16, &rr->high); ret = qemu_strtou64(endptr + 1, &endptr, 16, &upb);
if (ret) { if (ret) {
error_setg(errp, "end address of '%s'" error_setg(errp, "end address of '%s'"
" must be a hexadecimal integer", name); " must be a hexadecimal integer", name);
@ -744,6 +745,8 @@ static void set_reserved_region(Object *obj, Visitor *v, const char *name,
goto separator_error; goto separator_error;
} }
range_set_bounds(&rr->range, lob, upb);
ret = qemu_strtoui(endptr + 1, &endptr, 10, &rr->type); ret = qemu_strtoui(endptr + 1, &endptr, 10, &rr->type);
if (ret) { if (ret) {
error_setg(errp, "type of '%s'" error_setg(errp, "type of '%s'"

6
hw/virtio/virtio-iommu.c
View File

@ -645,8 +645,8 @@ static ssize_t virtio_iommu_fill_resv_mem_prop(VirtIOIOMMU *s, uint32_t ep,
prop.head.type = cpu_to_le16(VIRTIO_IOMMU_PROBE_T_RESV_MEM); prop.head.type = cpu_to_le16(VIRTIO_IOMMU_PROBE_T_RESV_MEM);
prop.head.length = cpu_to_le16(length); prop.head.length = cpu_to_le16(length);
prop.subtype = subtype; prop.subtype = subtype;
prop.start = cpu_to_le64(s->reserved_regions[i].low); prop.start = cpu_to_le64(range_lob(&s->reserved_regions[i].range));
prop.end = cpu_to_le64(s->reserved_regions[i].high); prop.end = cpu_to_le64(range_upb(&s->reserved_regions[i].range));
memcpy(buf, &prop, size); memcpy(buf, &prop, size);
@ -897,7 +897,7 @@ static IOMMUTLBEntry virtio_iommu_translate(IOMMUMemoryRegion *mr, hwaddr addr,
for (i = 0; i < s->nb_reserved_regions; i++) { for (i = 0; i < s->nb_reserved_regions; i++) {
ReservedRegion *reg = &s->reserved_regions[i]; ReservedRegion *reg = &s->reserved_regions[i];
if (addr >= reg->low && addr <= reg->high) { if (range_contains(&reg->range, addr)) {
switch (reg->type) { switch (reg->type) {
case VIRTIO_IOMMU_RESV_MEM_T_MSI: case VIRTIO_IOMMU_RESV_MEM_T_MSI:
entry.perm = flag; entry.perm = flag;

4
include/exec/memory.h
View File

@ -24,6 +24,7 @@
#include "qemu/bswap.h" #include "qemu/bswap.h"
#include "qemu/queue.h" #include "qemu/queue.h"
#include "qemu/int128.h" #include "qemu/int128.h"
#include "qemu/range.h"
#include "qemu/notify.h" #include "qemu/notify.h"
#include "qom/object.h" #include "qom/object.h"
#include "qemu/rcu.h" #include "qemu/rcu.h"
@ -79,8 +80,7 @@ extern unsigned int global_dirty_tracking;
typedef struct MemoryRegionOps MemoryRegionOps; typedef struct MemoryRegionOps MemoryRegionOps;
struct ReservedRegion { struct ReservedRegion {
hwaddr low; Range range;
hwaddr high;
unsigned type; unsigned type;
}; };