| Message ID | 20211027124531.57561-11-david@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | virtio-mem: Expose device memory via multiple memslots | expand |
On 27/10/21 14:45, David Hildenbrand wrote: > It's "virtio", not "virito". > > Signed-off-by: David Hildenbrand <david@redhat.com> > --- > hw/virtio/virtio-mem.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> > diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c > index d5a578142b..0f5eae4a7e 100644 > --- a/hw/virtio/virtio-mem.c > +++ b/hw/virtio/virtio-mem.c > @@ -177,7 +177,7 @@ static int virtio_mem_for_each_unplugged_range(const VirtIOMEM *vmem, void *arg, > * > * Returns false if the intersection is empty, otherwise returns true. > */ > -static bool virito_mem_intersect_memory_section(MemoryRegionSection *s, > +static bool virtio_mem_intersect_memory_section(MemoryRegionSection *s, > uint64_t offset, uint64_t size) > { > uint64_t start = MAX(s->offset_within_region, offset); > @@ -215,7 +215,7 @@ static int virtio_mem_for_each_plugged_section(const VirtIOMEM *vmem, > first_bit + 1) - 1; > size = (last_bit - first_bit + 1) * vmem->block_size; > > - if (!virito_mem_intersect_memory_section(&tmp, offset, size)) { > + if (!virtio_mem_intersect_memory_section(&tmp, offset, size)) { > break; > } > ret = cb(&tmp, arg); > @@ -247,7 +247,7 @@ static int virtio_mem_for_each_unplugged_section(const VirtIOMEM *vmem, > first_bit + 1) - 1; > size = (last_bit - first_bit + 1) * vmem->block_size; > > - if (!virito_mem_intersect_memory_section(&tmp, offset, size)) { > + if (!virtio_mem_intersect_memory_section(&tmp, offset, size)) { > break; > } > ret = cb(&tmp, arg); > @@ -283,7 +283,7 @@ static void virtio_mem_notify_unplug(VirtIOMEM *vmem, uint64_t offset, > QLIST_FOREACH(rdl, &vmem->rdl_list, next) { > MemoryRegionSection tmp = *rdl->section; > > - if (!virito_mem_intersect_memory_section(&tmp, offset, size)) { > + if (!virtio_mem_intersect_memory_section(&tmp, offset, size)) { > continue; > } > rdl->notify_discard(rdl, &tmp); > @@ -299,7 +299,7 @@ static int virtio_mem_notify_plug(VirtIOMEM *vmem, uint64_t offset, > QLIST_FOREACH(rdl, &vmem->rdl_list, next) { > MemoryRegionSection tmp = *rdl->section; > > - if (!virito_mem_intersect_memory_section(&tmp, offset, size)) { > + if (!virtio_mem_intersect_memory_section(&tmp, offset, size)) { > continue; > } > ret = rdl->notify_populate(rdl, &tmp); > @@ -316,7 +316,7 @@ static int virtio_mem_notify_plug(VirtIOMEM *vmem, uint64_t offset, > if (rdl2 == rdl) { > break; > } > - if (!virito_mem_intersect_memory_section(&tmp, offset, size)) { > + if (!virtio_mem_intersect_memory_section(&tmp, offset, size)) { > continue; > } > rdl2->notify_discard(rdl2, &tmp);
On 28.12.22 15:05, Philippe Mathieu-Daudé wrote: > On 27/10/21 14:45, David Hildenbrand wrote: >> It's "virtio", not "virito". >> >> Signed-off-by: David Hildenbrand <david@redhat.com> >> --- >> hw/virtio/virtio-mem.c | 12 ++++++------ >> 1 file changed, 6 insertions(+), 6 deletions(-) > > Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> I already queued your patch :) https://github.com/davidhildenbrand/qemu.git mem-next
On Wed, 28 Dec 2022 at 15:06, David Hildenbrand <david@redhat.com> wrote: > On 28.12.22 15:05, Philippe Mathieu-Daudé wrote: > > On 27/10/21 14:45, David Hildenbrand wrote: > >> It's "virtio", not "virito". > >> > >> Signed-off-by: David Hildenbrand <david@redhat.com> > >> --- > >> hw/virtio/virtio-mem.c | 12 ++++++------ > >> 1 file changed, 6 insertions(+), 6 deletions(-) > > > > Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> > > I already queued your patch :) Thank you then! :)
diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c index d5a578142b..0f5eae4a7e 100644 --- a/hw/virtio/virtio-mem.c +++ b/hw/virtio/virtio-mem.c @@ -177,7 +177,7 @@ static int virtio_mem_for_each_unplugged_range(const VirtIOMEM *vmem, void *arg, * * Returns false if the intersection is empty, otherwise returns true. */ -static bool virito_mem_intersect_memory_section(MemoryRegionSection *s, +static bool virtio_mem_intersect_memory_section(MemoryRegionSection *s, uint64_t offset, uint64_t size) { uint64_t start = MAX(s->offset_within_region, offset); @@ -215,7 +215,7 @@ static int virtio_mem_for_each_plugged_section(const VirtIOMEM *vmem, first_bit + 1) - 1; size = (last_bit - first_bit + 1) * vmem->block_size; - if (!virito_mem_intersect_memory_section(&tmp, offset, size)) { + if (!virtio_mem_intersect_memory_section(&tmp, offset, size)) { break; } ret = cb(&tmp, arg); @@ -247,7 +247,7 @@ static int virtio_mem_for_each_unplugged_section(const VirtIOMEM *vmem, first_bit + 1) - 1; size = (last_bit - first_bit + 1) * vmem->block_size; - if (!virito_mem_intersect_memory_section(&tmp, offset, size)) { + if (!virtio_mem_intersect_memory_section(&tmp, offset, size)) { break; } ret = cb(&tmp, arg); @@ -283,7 +283,7 @@ static void virtio_mem_notify_unplug(VirtIOMEM *vmem, uint64_t offset, QLIST_FOREACH(rdl, &vmem->rdl_list, next) { MemoryRegionSection tmp = *rdl->section; - if (!virito_mem_intersect_memory_section(&tmp, offset, size)) { + if (!virtio_mem_intersect_memory_section(&tmp, offset, size)) { continue; } rdl->notify_discard(rdl, &tmp); @@ -299,7 +299,7 @@ static int virtio_mem_notify_plug(VirtIOMEM *vmem, uint64_t offset, QLIST_FOREACH(rdl, &vmem->rdl_list, next) { MemoryRegionSection tmp = *rdl->section; - if (!virito_mem_intersect_memory_section(&tmp, offset, size)) { + if (!virtio_mem_intersect_memory_section(&tmp, offset, size)) { continue; } ret = rdl->notify_populate(rdl, &tmp); @@ -316,7 +316,7 @@ static int virtio_mem_notify_plug(VirtIOMEM *vmem, uint64_t offset, if (rdl2 == rdl) { break; } - if (!virito_mem_intersect_memory_section(&tmp, offset, size)) { + if (!virtio_mem_intersect_memory_section(&tmp, offset, size)) { continue; } rdl2->notify_discard(rdl2, &tmp);
It's "virtio", not "virito". Signed-off-by: David Hildenbrand <david@redhat.com> --- hw/virtio/virtio-mem.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)