From: Daniel Henrique Barboza <danielhb413@gmail.com>
Date: Wed, 25 Mar 2020 14:15:14 +0000 (-0300)
Subject: qemu_domain.c: remove unneeded size check in NVDIMM alignment
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=a6d2ae9b4d9fbb0f5be6f78f90a9dd4687ed0d88;p=libvirt.git

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 <danielhb413@gmail.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

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;