From 53a2f725adda6d69753a707d1f444ab682c78d7f Mon Sep 17 00:00:00 2001 From: Matthias Bolte Date: Thu, 30 Sep 2010 21:13:29 +0200 Subject: [PATCH] phyp: Verify that domain XML contains at least one disk element phypBuildLpar expects that at least one disk element is provided. --- src/phyp/phyp_driver.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index ab12392f27..0a7d6f93b5 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -3715,13 +3715,17 @@ phypBuildLpar(virConnectPtr conn, virDomainDefPtr def) goto err; } - if (def->ndisks > 0) { - if (!def->disks[0]->src) { - PHYP_ERROR(VIR_ERR_XML_ERROR,"%s", - _("Field \"\" under \"\" on the domain XML file is " - "missing.")); - goto err; - } + if (def->ndisks < 1) { + PHYP_ERROR(VIR_ERR_XML_ERROR, "%s", + _("Domain XML must contain at least one \"\" element.")); + goto err; + } + + if (!def->disks[0]->src) { + PHYP_ERROR(VIR_ERR_XML_ERROR,"%s", + _("Field \"\" under \"\" on the domain XML file is " + "missing.")); + goto err; } virBufferAddLit(&buf, "mksyscfg"); -- 2.47.2