diff options
| author | David Hildenbrand | 2017-10-16 16:43:01 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2017-10-18 10:15:00 +0200 |
| commit | a6ffc4232ab649ea91bd951f8c4f9cc598a66fd6 (patch) | |
| tree | 20167f7507eabdc6ac72ade1ccfa8d042328c1ec /accel/kvm/kvm-all.c | |
| parent | kvm: region_add and region_del is not called on updates (diff) | |
| download | qemu-a6ffc4232ab649ea91bd951f8c4f9cc598a66fd6.tar.gz qemu-a6ffc4232ab649ea91bd951f8c4f9cc598a66fd6.tar.xz qemu-a6ffc4232ab649ea91bd951f8c4f9cc598a66fd6.zip | |
kvm: simplify kvm_align_section()
Use ROUND_UP and simplify the code a bit.
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20171016144302.24284-7-david@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'accel/kvm/kvm-all.c')
| -rw-r--r-- | accel/kvm/kvm-all.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 2835bb3801..f290f487a5 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -197,26 +197,20 @@ static hwaddr kvm_align_section(MemoryRegionSection *section, hwaddr *start) { hwaddr size = int128_get64(section->size); - hwaddr delta; - - *start = section->offset_within_address_space; + hwaddr delta, aligned; /* kvm works in page size chunks, but the function may be called with sub-page size and unaligned start address. Pad the start address to next and truncate size to previous page boundary. */ - delta = qemu_real_host_page_size - (*start & ~qemu_real_host_page_mask); - delta &= ~qemu_real_host_page_mask; - *start += delta; + aligned = ROUND_UP(section->offset_within_address_space, + qemu_real_host_page_size); + delta = aligned - section->offset_within_address_space; + *start = aligned; if (delta > size) { return 0; } - size -= delta; - size &= qemu_real_host_page_mask; - if (*start & ~qemu_real_host_page_mask) { - return 0; - } - return size; + return (size - delta) & qemu_real_host_page_mask; } int kvm_physical_memory_addr_from_host(KVMState *s, void *ram, |