From nobody Thu May 15 12:42:13 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; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1508510902810990.8076436488084; Fri, 20 Oct 2017 07:48:22 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 46092BDE1; Fri, 20 Oct 2017 13:49:39 +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 E175C60479; Fri, 20 Oct 2017 13:49:38 +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 A0F1B260; Fri, 20 Oct 2017 13:49:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v9KDmFbM020378 for ; Fri, 20 Oct 2017 09:48:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id 57FE25D763; Fri, 20 Oct 2017 13:48:15 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id A7EBC5D762; Fri, 20 Oct 2017 13:48:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 46092BDE1 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: Peter Krempa To: libvir-list@redhat.com Date: Fri, 20 Oct 2017 15:47:35 +0200 Message-Id: <1253bff78ac230d361431a38d3ef63a1f0bec583.1508507145.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 10/12] qemu: domain: Remove pointless alias check 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 20 Oct 2017 13:49:39 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" When attaching the disks, aliases are always generated. Reviewed-by: John Ferlan --- src/qemu/qemu_domain.c | 8 -------- src/qemu/qemu_domain.h | 3 +-- src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_process.c | 2 +- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index c689911c4..aebe24e7b 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -7833,7 +7833,6 @@ qemuDomainPrepareChardevSource(virDomainDefPtr def, /* qemuProcessPrepareDiskSourceTLS: * @source: pointer to host interface data for disk device - * @diskAlias: alias use for the disk device * @cfg: driver configuration * * Updates host interface TLS encryption setting based on qemu.conf @@ -7844,7 +7843,6 @@ qemuDomainPrepareChardevSource(virDomainDefPtr def, */ int qemuDomainPrepareDiskSourceTLS(virStorageSourcePtr src, - const char *diskAlias, virQEMUDriverConfigPtr cfg) { @@ -7863,12 +7861,6 @@ qemuDomainPrepareDiskSourceTLS(virStorageSourcePtr s= rc, } if (src->haveTLS =3D=3D VIR_TRISTATE_BOOL_YES) { - if (!diskAlias) { - virReportError(VIR_ERR_INVALID_ARG, "%s", - _("disk does not have an alias")); - return -1; - } - /* Grab the vxhsTLSx509certdir and set the verify/listen value= s. * NB: tlsAlias filled in during qemuDomainGetTLSObjects. */ if (VIR_STRDUP(src->tlsCertdir, cfg->vxhsTLSx509certdir) < 0) diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index a8ad59d20..6615dabf9 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -882,9 +882,8 @@ void qemuDomainPrepareChardevSource(virDomainDefPtr def, int qemuDomainPrepareDiskSourceTLS(virStorageSourcePtr src, - const char *diskAlias, virQEMUDriverConfigPtr cfg) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3); + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); int qemuDomainPrepareShmemChardev(virDomainShmemDefPtr shmem) ATTRIBUTE_NONNULL(1); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 91f7f9ed6..e4157f631 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -394,7 +394,7 @@ qemuDomainAttachDiskGeneric(virConnectPtr conn, if (encinfo && qemuBuildSecretInfoProps(encinfo, &encobjProps) < 0) goto error; - if (qemuDomainPrepareDiskSourceTLS(disk->src, disk->info.alias, cfg) <= 0) + if (qemuDomainPrepareDiskSourceTLS(disk->src, cfg) < 0) goto error; if (disk->src->haveTLS && diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 66e81bbe5..9bbfabcde 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5301,7 +5301,7 @@ qemuProcessPrepareDomainStorage(virConnectPtr conn, continue; } - if (qemuDomainPrepareDiskSourceTLS(disk->src, disk->info.alias, cf= g) < 0) + if (qemuDomainPrepareDiskSourceTLS(disk->src, cfg) < 0) return -1; } --=20 2.14.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list