From a6d2ae9b4d9fbb0f5be6f78f90a9dd4687ed0d88 Mon Sep 17 00:00:00 2001 From: Daniel Henrique Barboza Date: Wed, 25 Mar 2020 11:15:14 -0300 Subject: [PATCH] qemu_domain.c: remove unneeded size check in NVDIMM alignment Commit 5540acb9a2b added a minimum size verification for the target size of ppc64 NVDIMMs but forgot to remove a MAX() size check that was being used in earlier reviews of that commit. The size verification makes this check unneeded since we're making sure that guestArea will always be at least equal to ppc64AlignSize. Fixes: 5540acb9a2bd33fb97a7446a610b602c9e8629a3 Signed-off-by: Daniel Henrique Barboza Reviewed-by: Michal Privoznik --- src/qemu/qemu_domain.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 7d29f3f114..adda17a49f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -12686,8 +12686,6 @@ qemuDomainNVDimmAlignSizePseries(virDomainDefPtr def, } guestArea = (guestArea/ppc64AlignSize) * ppc64AlignSize; - guestArea = MAX(guestArea, ppc64AlignSize); - mem->size = guestArea + mem->labelsize; return 0; -- GitLab