From nobody Fri Apr 26 03:10:44 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
207.211.31.120 as permitted sender) client-ip=207.211.31.120;
envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com;
Authentication-Results: mx.zohomail.com;
spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as
permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com;
dmarc=fail(p=none dis=none) header.from=gmail.com
ARC-Seal: i=1; a=rsa-sha256; t=1596138581; cv=none;
d=zohomail.com; s=zohoarc;
b=EoqGbDiD4rbrSSlHQG1OcRW3PXUHCoWTR5DJYwTNZuqAAPA3+EKmSmKZ2PT7v97HgcVHEHjNsRRzk8Uz8dWNQmzriugqquG7/ydp6l842u1yObMCxkriuFtbgFlT25kptbuPK7Agj4jitfpAkRaRXLbNDJXCKCunBQv23Rvipl4=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1596138581;
h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
bh=d2jvmNlzVsPGlDJilCmYcj3gD4/HSK0J67UQ1HlQzYk=;
b=IPEzGqcOq/16PRKZm6jD2jYKWgL81xdEeKAR2exiOZZ9C06cdVLXeeJdPfbozuMxSh0oAe+5hKJcO4NpXZaxHxjIoYIzz8Kw4WC6e/sW1sgnNy2JUw896HD0C78ITHWiDBrJHuXzlHlGy/Uf/Ecr9mQFzltcOQfxNSoFQAGH9Ok=
ARC-Authentication-Results: i=1; mx.zohomail.com;
spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as
permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com;
dmarc=fail header.from= (p=none dis=none)
header.from=
Return-Path:
Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com
[207.211.31.120]) by mx.zohomail.com
with SMTPS id 1596138581019476.6262512014954;
Thu, 30 Jul 2020 12:49:41 -0700 (PDT)
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
[209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
us-mta-191-gsRmyA7QMta3E7SnkRsxTw-1; Thu, 30 Jul 2020 15:49:37 -0400
Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com
[10.5.11.14])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 91F5B57;
Thu, 30 Jul 2020 19:49:31 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
(colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
by smtp.corp.redhat.com (Postfix) with ESMTPS id 71DC35DA72;
Thu, 30 Jul 2020 19:49:31 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
(lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
by colo-mx.corp.redhat.com (Postfix) with ESMTP id 329479A0F2;
Thu, 30 Jul 2020 19:49:31 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com
[10.11.54.5])
by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
id 06UJmOMY002974 for ;
Thu, 30 Jul 2020 15:48:24 -0400
Received: by smtp.corp.redhat.com (Postfix)
id 03DC810328B; Thu, 30 Jul 2020 19:48:24 +0000 (UTC)
Received: from mimecast-mx02.redhat.com
(mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19])
by smtp.corp.redhat.com (Postfix) with ESMTPS id F3203FED3C
for ; Thu, 30 Jul 2020 19:48:21 +0000 (UTC)
Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com
[205.139.110.61])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits))
(No client certificate requested)
by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C21578007CB
for ; Thu, 30 Jul 2020 19:48:21 +0000 (UTC)
Received: from mail-qk1-f196.google.com (mail-qk1-f196.google.com
[209.85.222.196]) (Using TLS) by relay.mimecast.com with ESMTP id
us-mta-508-X97PJ0v8OeOtPHvVSE1e1w-1; Thu, 30 Jul 2020 15:48:18 -0400
Received: by mail-qk1-f196.google.com with SMTP id u64so26719034qka.12
for ; Thu, 30 Jul 2020 12:48:17 -0700 (PDT)
Received: from rekt.ibmuc.com ([2804:431:c7c7:fea0:f34f:387b:ebfa:f155])
by smtp.gmail.com with ESMTPSA id
d20sm3301823qkk.84.2020.07.30.12.48.15
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 30 Jul 2020 12:48:16 -0700 (PDT)
X-MC-Unique: gsRmyA7QMta3E7SnkRsxTw-1
X-MC-Unique: X97PJ0v8OeOtPHvVSE1e1w-1
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=d2jvmNlzVsPGlDJilCmYcj3gD4/HSK0J67UQ1HlQzYk=;
b=ojWPE1d45Opo6cGHhAQlN8Ykfh3hAUZCh4qZYUEr3wd4KovjP1tF5/YGZeUHrle/Da
4y+V7nVRSZjAgugMz+1g4GMeVqTa10kV0+C7qXQlsgg9RBQmbJo0lDnlu6ZJLSucPFiu
6G5UN545HyIpxM2nlfiEJ4JUn5V3MG7DQEG9sbQMEa5EuSPEbGOR29u3KbqIZOR7TRfb
s2Y5q+nFNgsexUfgLTZTYNczv+KKuyT8i5Wokykxzlf9yoiVKlsmAlNnm9+21C5bEDOA
9/8kyLxvX+Ok/iGd/ZE19xlaipSGYkA45x/TJiUKmXxNnGLFl5joGUCxJ5PVb8ucQleb
/fAA==
X-Gm-Message-State: AOAM532HUJdgGueSexk52tpGpxYAiHMlkjPAttTFno80qvC9Fj1oiiAG
5LSdxz0/QGAMj8wkI6cDv4VUUB0N
X-Google-Smtp-Source:
ABdhPJx1BbqEQA+48ostSkSC/F4bddPzaRb8ufjMqhpkgDxqrwQQX4ktv/VVNAH7vqzMUyrxbTzmbA==
X-Received: by 2002:a05:620a:20d1:: with SMTP id
f17mr756796qka.428.1596138497226;
Thu, 30 Jul 2020 12:48:17 -0700 (PDT)
From: Daniel Henrique Barboza
To: libvir-list@redhat.com
Subject: [PATCH 1/5] qemu_domain.c: make qemuDomainGetMemorySizeAlignment()
public
Date: Thu, 30 Jul 2020 16:48:00 -0300
Message-Id: <20200730194804.491732-2-danielhb413@gmail.com>
In-Reply-To: <20200730194804.491732-1-danielhb413@gmail.com>
References: <20200730194804.491732-1-danielhb413@gmail.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5
X-loop: libvir-list@redhat.com
Cc: Daniel Henrique Barboza
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset="utf-8"
Next patch will use it outside of qemu_domain.c.
Signed-off-by: Daniel Henrique Barboza
Reviewed-by: Michal Privoznik
---
src/qemu/qemu_domain.c | 2 +-
src/qemu/qemu_domain.h | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 2058290870..dfe3c3b64b 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -7939,7 +7939,7 @@ qemuDomainAgentAvailable(virDomainObjPtr vm,
}
=20
=20
-static unsigned long long
+unsigned long long
qemuDomainGetMemorySizeAlignment(virDomainDefPtr def)
{
/* PPC requires the memory sizes to be rounded to 256MiB increments, so
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 29849a7313..cbd56861da 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -989,6 +989,9 @@ qemuDomainFixupCPUs(virDomainObjPtr vm,
char *
qemuDomainGetMachineName(virDomainObjPtr vm);
=20
+unsigned long long
+qemuDomainGetMemorySizeAlignment(virDomainDefPtr def);
+
void
qemuDomainObjPrivateXMLFormatAllowReboot(virBufferPtr buf,
virTristateBool allowReboot);
--=20
2.26.2
From nobody Fri Apr 26 03:10:44 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
205.139.110.61 as permitted sender) client-ip=205.139.110.61;
envelope-from=libvir-list-bounces@redhat.com;
helo=us-smtp-delivery-1.mimecast.com;
Authentication-Results: mx.zohomail.com;
spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as
permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com;
dmarc=fail(p=none dis=none) header.from=gmail.com
ARC-Seal: i=1; a=rsa-sha256; t=1596138526; cv=none;
d=zohomail.com; s=zohoarc;
b=ODJnFUCe/vdHKI0j6lSsdPmfu2MfjggA7RqTLhmCkciupC/qyGihUC+vpOhSSNICjf3btNvTfWkh9T1M3x+k6qNsxGY6ageZPKwMyY/MdU429pbVZ1wr1cFZ07gxxgNQSTh2uFzoR1d+1brJKP5ePTm9LD7LZZCBGVNHZXST5Xw=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1596138526;
h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
bh=pGNZWeQFQA6hY/0KSRYQbwEtwyiuZIm+JaQGIy/g+gc=;
b=OfE1lNKrwhlfEDJbddYhf6GxUv4A2zwhs9MaEgLCiVBB+biMmuvdSTQHwnyP/SM5glPcUJyDBNheRD8YoTFAQ6khwsuio4+aWFyLDsa9UFcfO3sE3xGTswXtqsbDRVHMNOO3CIaAZfq8AEacSF0BRCWw3sSpSmrN5q4AxXZKc+E=
ARC-Authentication-Results: i=1; mx.zohomail.com;
spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as
permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com;
dmarc=fail header.from= (p=none dis=none)
header.from=
Return-Path:
Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com
[205.139.110.61]) by mx.zohomail.com
with SMTPS id 159613852620120.48344774067766;
Thu, 30 Jul 2020 12:48:46 -0700 (PDT)
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
[209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
us-mta-350-mHPsj7VdNO-_uphPQwPquw-1; Thu, 30 Jul 2020 15:48:42 -0400
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
[10.5.11.22])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 34641107BF00;
Thu, 30 Jul 2020 19:48:37 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
(colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
by smtp.corp.redhat.com (Postfix) with ESMTPS id 117F6101E67B;
Thu, 30 Jul 2020 19:48:37 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
(lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
by colo-mx.corp.redhat.com (Postfix) with ESMTP id A07E41809561;
Thu, 30 Jul 2020 19:48:36 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com
[10.11.54.3])
by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
id 06UJmUJZ003001 for ;
Thu, 30 Jul 2020 15:48:30 -0400
Received: by smtp.corp.redhat.com (Postfix)
id E6DF010CD2C8; Thu, 30 Jul 2020 19:48:29 +0000 (UTC)
Received: from mimecast-mx02.redhat.com
(mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20])
by smtp.corp.redhat.com (Postfix) with ESMTPS id D413010CD623
for ; Thu, 30 Jul 2020 19:48:23 +0000 (UTC)
Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com
[205.139.110.61])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits))
(No client certificate requested)
by mimecast-mx02.redhat.com (Postfix) with ESMTPS id ED0D0101A525
for ; Thu, 30 Jul 2020 19:48:22 +0000 (UTC)
Received: from mail-qt1-f179.google.com (mail-qt1-f179.google.com
[209.85.160.179]) (Using TLS) by relay.mimecast.com with ESMTP id
us-mta-286-uG6seshzOdeG1Y1p5f5jug-1; Thu, 30 Jul 2020 15:48:19 -0400
Received: by mail-qt1-f179.google.com with SMTP id s16so21271173qtn.7;
Thu, 30 Jul 2020 12:48:19 -0700 (PDT)
Received: from rekt.ibmuc.com ([2804:431:c7c7:fea0:f34f:387b:ebfa:f155])
by smtp.gmail.com with ESMTPSA id
d20sm3301823qkk.84.2020.07.30.12.48.17
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 30 Jul 2020 12:48:18 -0700 (PDT)
X-MC-Unique: mHPsj7VdNO-_uphPQwPquw-1
X-MC-Unique: uG6seshzOdeG1Y1p5f5jug-1
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=pGNZWeQFQA6hY/0KSRYQbwEtwyiuZIm+JaQGIy/g+gc=;
b=Mp5IuW3rozxrpB5EVMwipmt0azF60OGSUBUW0JsdpblJbFXu4VMmosl8BdNrbr+8Dy
9IlSQzI4fbQOfcAmlf0GIMxMmctmrOroZ8RGBgWWWRw8qnV4ykckbTP62suF0B4QiMQB
W1PfYXRwAFFIuJGXKEij9WBGOS66RHNgO5+UC0dZlvTs2CZeg5nSw0dSjTlHL2sNPjSK
K9qD+zVsrodgPtbqIkK+syd7LG43q1iRDxcbn4pCW4QT6lvASlmxgs2h4X7vTSPRVRnc
25kp50vNXL0nmdNjjGQhDZmBQ8yV+AgO5Qh++LpwG56rhEYrjf1WfULkOQsJpf85gYkB
dmsQ==
X-Gm-Message-State: AOAM53347v5Vge+qqPzfCXbTEZpH7k4sUBRGglpVyA/5w5f/BBTeC1wt
UHLezhKDKTatGYFrChRXzChMzetP
X-Google-Smtp-Source:
ABdhPJy2q9HCycz/nid/mnuiX521rsTrb3zD6L7wXEjKEKqL+zTsiJ9DyL3QzKU1PkLHjvBgiR4xvg==
X-Received: by 2002:ac8:548b:: with SMTP id h11mr277410qtq.209.1596138498919;
Thu, 30 Jul 2020 12:48:18 -0700 (PDT)
From: Daniel Henrique Barboza
To: libvir-list@redhat.com
Subject: [PATCH 2/5] qemu_validate.c: add pSeries NVDIMM size alignment
validation
Date: Thu, 30 Jul 2020 16:48:01 -0300
Message-Id: <20200730194804.491732-3-danielhb413@gmail.com>
In-Reply-To: <20200730194804.491732-1-danielhb413@gmail.com>
References: <20200730194804.491732-1-danielhb413@gmail.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3
X-loop: libvir-list@redhat.com
Cc: Daniel Henrique Barboza ,
Andrea Bolognani
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset="utf-8"
The existing auto-align behavior for pSeries has the idea to
alleviate user configuration of the NVDIMM size, given that the
alignment calculation is not trivial to do (256MiB alignment
of mem->size - mem->label_size value, a.k.a guest area). We
align mem->size down to avoid end of file problems.
The end result is not ideal though. We do not touch the domain
XML, meaning that the XML can report a NVDIMM size 255MiB smaller
than the actual size the guest is seeing. It also adds one more
thing to consider in case the guest is reporting less memory
than declared, since the auto-align is transparent to the
user.
Following Andrea's suggestion in [1], let's instead do an
size alignment validation. If the NVDIMM is unaligned, error out
and suggest a rounded up value. This can be bothersome to users,
but will bring consistency of NVDIMM size between the domain XML
and the guest.
This approach will force existing non-running pSeries guests to
readjust the NVDIMM value in their XMLs, if necessary. No changes
were made for x86 NVDIMM support.
[1] https://www.redhat.com/archives/libvir-list/2020-July/msg01471.html
Suggested-by: Andrea Bolognani
Signed-off-by: Daniel Henrique Barboza
Reviewed-by: Michal Privoznik
---
src/qemu/qemu_validate.c | 43 ++++++++++++++++---
...ory-hotplug-nvdimm-ppc64.ppc64-latest.args | 2 +-
.../memory-hotplug-nvdimm-ppc64.xml | 2 +-
.../memory-hotplug-nvdimm-ppc64.xml | 2 +-
4 files changed, 40 insertions(+), 9 deletions(-)
diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index 488f258d00..241139e268 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -4012,15 +4012,46 @@ qemuValidateDomainDeviceDefHub(virDomainHubDefPtr h=
ub,
}
=20
=20
+static unsigned long long
+qemuValidateGetNVDIMMAlignedSizePseries(virDomainMemoryDefPtr mem,
+ const virDomainDef *def)
+{
+ unsigned long long ppc64AlignSize =3D
+ qemuDomainGetMemorySizeAlignment((virDomainDefPtr)def);
+ unsigned long long guestArea =3D mem->size - mem->labelsize;
+
+ // NVDIMM is already aligned
+ if (guestArea % ppc64AlignSize =3D=3D 0)
+ return mem->size;
+
+ // Suggested aligned size is rounded up
+ guestArea =3D (guestArea/ppc64AlignSize + 1) * ppc64AlignSize;
+ return guestArea + mem->labelsize;
+}
+
static int
qemuValidateDomainDeviceDefMemory(virDomainMemoryDefPtr mem,
+ const virDomainDef *def,
virQEMUCapsPtr qemuCaps)
{
- if (mem->model =3D=3D VIR_DOMAIN_MEMORY_MODEL_NVDIMM &&
- !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_NVDIMM)) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("nvdimm isn't supported by this QEMU binary"));
- return -1;
+ if (mem->model =3D=3D VIR_DOMAIN_MEMORY_MODEL_NVDIMM) {
+ if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_NVDIMM)) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+ _("nvdimm isn't supported by this QEMU binary")=
);
+ return -1;
+ }
+
+ if (qemuDomainIsPSeries(def)) {
+ unsigned long long alignedNVDIMMSize =3D
+ qemuValidateGetNVDIMMAlignedSizePseries(mem, def);
+
+ if (mem->size !=3D alignedNVDIMMSize) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("nvdimm size is not aligned. Suggested al=
igned "
+ "size: %llu KiB"), alignedNVDIMMSize);
+ return -1;
+ }
+ }
}
=20
return 0;
@@ -4138,7 +4169,7 @@ qemuValidateDomainDeviceDef(const virDomainDeviceDef =
*dev,
break;
=20
case VIR_DOMAIN_DEVICE_MEMORY:
- ret =3D qemuValidateDomainDeviceDefMemory(dev->data.memory, qemuCa=
ps);
+ ret =3D qemuValidateDomainDeviceDefMemory(dev->data.memory, def, q=
emuCaps);
break;
=20
case VIR_DOMAIN_DEVICE_LEASE:
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.ppc64-lates=
t.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.ar=
gs
index eff80dcf80..58e3f9e161 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.args
@@ -19,7 +19,7 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \
-numa node,nodeid=3D0,cpus=3D0-1,mem=3D1024 \
-object memory-backend-file,id=3Dmemnvdimm0,prealloc=3Dyes,mem-path=3D/tmp=
/nvdimm,\
-size=3D537001984 \
+size=3D805437440 \
-device nvdimm,node=3D0,label-size=3D131072,\
uuid=3D49545eb3-75e1-2d0a-acdd-f0294406c99e,memdev=3Dmemnvdimm0,id=3Dnvdim=
m0,slot=3D0 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.xml b/tests=
/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.xml
index ae5a17d3c8..10c146e8cf 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.xml
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.xml
@@ -38,7 +38,7 @@
/tmp/nvdimm
- 550000
+ 7865600
the minimum label size is 128KiB,
-
the remaining size (total-size - label-size), also calle=
d guest
- area, will be aligned to 4KiB as default. For pSeries gues=
ts, the
- guest area will be aligned down to 256MiB, and the minimum=
size
- of the guest area must be at least 256MiB.
+
the remaining size (total-size - label-size) will be ali=
gned
+ to 4KiB as default.