aboutsummaryrefslogtreecommitdiff
path: root/accel/kvm
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2021-03-09 14:46:11 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2021-03-16 14:30:30 -0400
commit26dbec410e9f5194767d17fd19cb64fc1f487e1b (patch)
tree57a06194091cd2d8e80a00d51d737844abee24fd /accel/kvm
parent20cf7b8e13670b66939e92a211dc48edddb0ec53 (diff)
downloadqemu-26dbec410e9f5194767d17fd19cb64fc1f487e1b.zip
qemu-26dbec410e9f5194767d17fd19cb64fc1f487e1b.tar.gz
qemu-26dbec410e9f5194767d17fd19cb64fc1f487e1b.tar.bz2
Revert "accel: kvm: Add aligment assert for kvm_log_clear_one_slot"
This reverts commit 3920552846e881bafa9f9aad0bb1a6eef874d7fb. 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 <pbonzini@redhat.com>
Diffstat (limited to 'accel/kvm')
-rw-r--r--accel/kvm/kvm-all.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 37b0a18..b6d9f92 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -673,10 +673,6 @@ out:
#define KVM_CLEAR_LOG_ALIGN (qemu_real_host_page_size << KVM_CLEAR_LOG_SHIFT)
#define KVM_CLEAR_LOG_MASK (-KVM_CLEAR_LOG_ALIGN)
-/*
- * As the granule of kvm dirty log is qemu_real_host_page_size,
- * @start and @size are expected and restricted to align to it.
- */
static int kvm_log_clear_one_slot(KVMSlot *mem, int as_id, uint64_t start,
uint64_t size)
{
@@ -686,9 +682,6 @@ static int kvm_log_clear_one_slot(KVMSlot *mem, int as_id, uint64_t start,
unsigned long *bmap_clear = NULL, psize = qemu_real_host_page_size;
int ret;
- /* Make sure start and size are qemu_real_host_page_size aligned */
- assert(QEMU_IS_ALIGNED(start | size, psize));
-
/*
* We need to extend either the start or the size or both to
* satisfy the KVM interface requirement. Firstly, do the start