Skip to content

Commit 26dbec4

Browse files
committed
Revert "accel: kvm: Add aligment assert for kvm_log_clear_one_slot"
This reverts commit 3920552. Thomas Huth reported a failure with CentOS 6 guests: ../../devel/qemu/accel/kvm/kvm-all.c:690: kvm_log_clear_one_slot: Assertion `QEMU_IS_ALIGNED(start | size, psize)' failed. Signed-off-by: Paolo Bonzini <[email protected]>
1 parent 20cf7b8 commit 26dbec4

File tree

1 file changed

+0
-7
lines changed

1 file changed

+0
-7
lines changed

accel/kvm/kvm-all.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -673,10 +673,6 @@ static int kvm_physical_sync_dirty_bitmap(KVMMemoryListener *kml,
673673
#define KVM_CLEAR_LOG_ALIGN (qemu_real_host_page_size << KVM_CLEAR_LOG_SHIFT)
674674
#define KVM_CLEAR_LOG_MASK (-KVM_CLEAR_LOG_ALIGN)
675675

676-
/*
677-
* As the granule of kvm dirty log is qemu_real_host_page_size,
678-
* @start and @size are expected and restricted to align to it.
679-
*/
680676
static int kvm_log_clear_one_slot(KVMSlot *mem, int as_id, uint64_t start,
681677
uint64_t size)
682678
{
@@ -686,9 +682,6 @@ static int kvm_log_clear_one_slot(KVMSlot *mem, int as_id, uint64_t start,
686682
unsigned long *bmap_clear = NULL, psize = qemu_real_host_page_size;
687683
int ret;
688684

689-
/* Make sure start and size are qemu_real_host_page_size aligned */
690-
assert(QEMU_IS_ALIGNED(start | size, psize));
691-
692685
/*
693686
* We need to extend either the start or the size or both to
694687
* satisfy the KVM interface requirement. Firstly, do the start

0 commit comments

Comments
 (0)