From nobody Wed Dec 17 04:06:05 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 15262965664611020.8648986471214; Mon, 14 May 2018 04:16:06 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E4BFE3114998; Mon, 14 May 2018 11:16:04 +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 AC0D460BE7; Mon, 14 May 2018 11:16:04 +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 4F0F64CA95; Mon, 14 May 2018 11:16:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4EBFprn009808 for ; Mon, 14 May 2018 07:15:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4732F26576; Mon, 14 May 2018 11:15:51 +0000 (UTC) Received: from mx1.redhat.com (ext-mx12.extmail.prod.ext.phx2.redhat.com [10.5.110.41]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3806F26184; Mon, 14 May 2018 11:15:51 +0000 (UTC) Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1D60E317F38A; Mon, 14 May 2018 11:15:40 +0000 (UTC) Received: by mail-pg0-f68.google.com with SMTP id l2-v6so5347986pgc.7; Mon, 14 May 2018 04:15:40 -0700 (PDT) Received: from ps-f25-dev.eng.nutanix.com ([205.209.132.2]) by smtp.gmail.com with ESMTPSA id d4-v6sm13292667pgv.73.2018.05.14.04.15.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 May 2018 04:15:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zJPqtXO+FSlLL3w+r4D77DSNeclIwMnwvVofFtutSEM=; b=X2VRM1PRK+PtL118FmMc7TEy0RLDiQlpjM9Nhs/cAJUs8M+jAin/Xk9zBMmDT/bfk5 UQiiGICzmgM95XU+ubTe0l/q9fGy2M/2u2Mx8mPy32kWNbauTOUB0M/xyEu2h66A41oC 7BEylA+aY607x3MftqWnbzekSwBU3Cqj3EPAq8ldXrmUVbWgnJxIdl3JYqhP/rUUdTuU +MMw8SP1K5QaZgyT6OfWvqc6V7W7Rnm0+ydoiBlHMoP8fYlRN606xwpalJDwnFDW0UO+ 9YkeXLsiZ893VmK75/5TfAIVn5JoHxevkImY4BkIyCEvX7auaVfGyt147LoMvPywseof wI5w== 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; bh=zJPqtXO+FSlLL3w+r4D77DSNeclIwMnwvVofFtutSEM=; b=pk2e+0D+27JnAZcTop03g5IpTrDm0dnJil1rgDengIsIH5q4OVAXpVJnDgy8fotlen ZHMx8EZfjgidNifOwit2FAKAunyPLbO7RSb+qiO3TcNgQfWsTa8aB7Z6+i1giD/Lh/kN cf2LuNotggUJARShSocmy6rpoHPqD0aZgGDqUi9+/8X085i+QTAfdpcY9+X6fPzFi39x TPDrbgDTIYv+3AXUXQjZfyeM3NHlqm6n2OzFIATvLKCzLqq9FeIEeiaxnYx2INsVsLqW OfShm7YXBoOmn6qUYJnVSvQfdhlBJ/azXAoT/8jpq8/RhmYR8+U33PyU0p+LDQ+FZTHZ gmuA== X-Gm-Message-State: ALKqPwdPPLTwFfWUG0/Ooj0g854UJBz0oOT3P6oVN0+FXOI+F0kryWMd IyWGVSKhRBPDNrpdpkCylOzjjw== X-Google-Smtp-Source: AB8JxZq2NAMYxW19bFXN/xpZ2qbhB/GUKTEu221FVJ1aW/Clp1ijfPiPHtGM5uLlwJfqs+iDEhcXzQ== X-Received: by 2002:a62:b2d0:: with SMTP id z77-v6mr10071566pfl.122.1526296539292; Mon, 14 May 2018 04:15:39 -0700 (PDT) From: Prerna Saxena To: libvir-list@redhat.com Date: Mon, 14 May 2018 04:15:20 -0700 Message-Id: <20180514111522.4363-11-saxenap.ltc@gmail.com> In-Reply-To: <20180514111522.4363-1-saxenap.ltc@gmail.com> References: <20180514111522.4363-1-saxenap.ltc@gmail.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Mon, 14 May 2018 11:15:40 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Mon, 14 May 2018 11:15:40 +0000 (UTC) for IP:'74.125.83.68' DOMAIN:'mail-pg0-f68.google.com' HELO:'mail-pg0-f68.google.com' FROM:'saxenap.ltc@gmail.com' RCPT:'' X-RedHat-Spam-Score: 1.281 * (DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, NML_ADSP_CUSTOM_MED, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_PASS, T_DKIM_INVALID) 74.125.83.68 mail-pg0-f68.google.com 74.125.83.68 mail-pg0-f68.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.41 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Cc: pkrempa@redhat.com, mprivozn@redhat.com Subject: [libvirt] [PATCH 10/12] Xen: Adjust all references to loader & nvram elements given that they are now backed by virStorageSourcePtr 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Mon, 14 May 2018 11:16:05 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Prerna Saxena --- src/xenapi/xenapi_driver.c | 4 +++- src/xenconfig/xen_sxpr.c | 19 +++++++++++-------- src/xenconfig/xen_xm.c | 9 ++++++--- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index 42b305d..4070660 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -1444,10 +1444,12 @@ xenapiDomainGetXMLDesc(virDomainPtr dom, unsigned i= nt flags) char *value =3D NULL; defPtr->os.type =3D VIR_DOMAIN_OSTYPE_XEN; if (VIR_ALLOC(defPtr->os.loader) < 0 || - VIR_STRDUP(defPtr->os.loader->path, "pygrub") < 0) { + VIR_ALLOC(defPtr->os.loader->src) < 0 || + VIR_STRDUP(defPtr->os.loader->src->path, "pygrub") < 0) { VIR_FREE(boot_policy); goto error; } + defPtr->os.loader->src->type =3D VIR_STORAGE_TYPE_FILE; xen_vm_get_pv_kernel(session, &value, vm); if (STRNEQ(value, "")) { if (VIR_STRDUP(defPtr->os.kernel, value) < 0) { diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c index e868c05..fd3165c 100644 --- a/src/xenconfig/xen_sxpr.c +++ b/src/xenconfig/xen_sxpr.c @@ -87,15 +87,17 @@ xenParseSxprOS(const struct sexpr *node, int hvm) { if (hvm) { - if (VIR_ALLOC(def->os.loader) < 0) + if ((VIR_ALLOC(def->os.loader) < 0) || + (VIR_ALLOC(def->os.loader->src) < 0)) goto error; - if (sexpr_node_copy(node, "domain/image/hvm/loader", &def->os.load= er->path) < 0) + def->os.loader->src->type =3D VIR_STORAGE_TYPE_FILE; + if (sexpr_node_copy(node, "domain/image/hvm/loader", &def->os.load= er->src->path) < 0) goto error; - if (def->os.loader->path =3D=3D NULL) { - if (sexpr_node_copy(node, "domain/image/hvm/kernel", &def->os.= loader->path) < 0) + if (def->os.loader->src->path =3D=3D NULL) { + if (sexpr_node_copy(node, "domain/image/hvm/kernel", &def->os.= loader->src->path) < 0) goto error; =20 - if (def->os.loader->path =3D=3D NULL) { + if (def->os.loader->src->path =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("domain information incomplete, mis= sing HVM loader")); return -1; @@ -124,7 +126,8 @@ xenParseSxprOS(const struct sexpr *node, /* If HVM kenrel =3D=3D loader, then old xend, so kill off kernel */ if (hvm && def->os.kernel && - STREQ(def->os.kernel, def->os.loader->path)) { + def->os.loader->src && + STREQ(def->os.kernel, def->os.loader->src->path)) { VIR_FREE(def->os.kernel); } /* Drop kernel argument that has no value */ @@ -2259,9 +2262,9 @@ xenFormatSxpr(virConnectPtr conn, virDomainDefPtr def) if (hvm) { char bootorder[VIR_DOMAIN_BOOT_LAST+1]; if (def->os.kernel) - virBufferEscapeSexpr(&buf, "(loader '%s')", def->os.loader= ->path); + virBufferEscapeSexpr(&buf, "(loader '%s')", def->os.loader= ->src->path); else - virBufferEscapeSexpr(&buf, "(kernel '%s')", def->os.loader= ->path); + virBufferEscapeSexpr(&buf, "(kernel '%s')", def->os.loader= ->src->path); =20 virBufferAsprintf(&buf, "(vcpus %u)", virDomainDefGetVcpusMax(= def)); if (virDomainDefHasVcpusOffline(def)) diff --git a/src/xenconfig/xen_xm.c b/src/xenconfig/xen_xm.c index 8ef68bb..c6a1f03 100644 --- a/src/xenconfig/xen_xm.c +++ b/src/xenconfig/xen_xm.c @@ -47,8 +47,10 @@ xenParseXMOS(virConfPtr conf, virDomainDefPtr def) const char *boot; =20 if (VIR_ALLOC(def->os.loader) < 0 || - xenConfigCopyString(conf, "kernel", &def->os.loader->path) < 0) + VIR_ALLOC(def->os.loader->src) < 0 || + xenConfigCopyString(conf, "kernel", &def->os.loader->src->path= ) < 0) return -1; + def->os.loader->src->type =3D VIR_STORAGE_TYPE_FILE; =20 if (xenConfigGetString(conf, "boot", &boot, "c") < 0) return -1; @@ -481,9 +483,10 @@ xenFormatXMOS(virConfPtr conf, virDomainDefPtr def) if (xenConfigSetString(conf, "builder", "hvm") < 0) return -1; =20 - if (def->os.loader && def->os.loader->path && - xenConfigSetString(conf, "kernel", def->os.loader->path) < 0) + if (def->os.loader && def->os.loader->src && + xenConfigSetString(conf, "kernel", def->os.loader->src->path) = < 0) return -1; + def->os.loader->src->type =3D VIR_STORAGE_TYPE_FILE; =20 for (i =3D 0; i < def->os.nBootDevs; i++) { switch (def->os.bootDevs[i]) { --=20 1.8.1.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list