From nobody Mon Feb 9 10:32:29 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1631021028; cv=none; d=zohomail.com; s=zohoarc; b=UVWMoLWRiUvgdpyP+Nwg/23xHjYCbFx9KCcE1SsuID3GZjEZN0rHyCuqMF7twHF/N/tksX2ANo3b02J6z1yqPerqatFPAX3HC3085HyfxdqRIXMyettV2baoSWRfr6vl9DRIOB10lVIJ+JVOljbzlmpc7ZtElJq/bnqL5iki5ho= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631021028; h=Content-Type:Content-Transfer-Encoding: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=z7AAODcj9DtnHNUoFhze5RzN7v6+ylmj9bmu55zoqf0=; b=PzAc4Z30maVOFpCFveP7OCYKY5dN60LuNfq5FJRnSx5IuN9/9MgOkIQsmmExUm+bxrgHy5MW0XEh31pXM245dzdS0yAhkXR4Z3QQEUBrCmEdvtrgZQ25MhVlxAnpo2j5/jYKnP3ZCba6u6WAqYmwasMEn8IEb7zyzmapIyOQ7k4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1631021028150355.0042528177976; Tue, 7 Sep 2021 06:23:48 -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-310-ZFzF9RZ5Pk6f8mWeHqUk3Q-1; Tue, 07 Sep 2021 09:23:45 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 98E5E801A92; Tue, 7 Sep 2021 13:23:40 +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 790C36788C; Tue, 7 Sep 2021 13:23:40 +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 48C0644A5E; Tue, 7 Sep 2021 13:23:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 187DNXSc013653 for ; Tue, 7 Sep 2021 09:23:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id 525B86788C; Tue, 7 Sep 2021 13:23:33 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id A76A75C1B4 for ; Tue, 7 Sep 2021 13:23:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631021027; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=z7AAODcj9DtnHNUoFhze5RzN7v6+ylmj9bmu55zoqf0=; b=e1jpEUeU9L/5h5ASSwPeKPBk+RIqqP3XT8gOn3Cv5siqiCrzAb21dkHatz8567xztQHsVx PMjMe1sZgkaaP4RVtWKJQUAUl/d5nPKe8wn8MieyTP4NvZvyTM4e5SMq/RinfhlBhAIJB4 Mrbs04MjorBvElBHIEEg4MQVvKmgxDU= X-MC-Unique: ZFzF9RZ5Pk6f8mWeHqUk3Q-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 5/6] virDomainDiskDefValidate: Move validation of disk target Date: Tue, 7 Sep 2021 15:23:01 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com 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.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1631021029512100001 Content-Type: text/plain; charset="utf-8" The disk target is mandatory and used as a designator in error messages of other validation steps, so we must validate it first. Signed-off-by: Peter Krempa --- src/conf/domain_validate.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 9069b60e37..1bc62c364d 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -597,6 +597,20 @@ virDomainDiskDefValidate(const virDomainDef *def, { virStorageSource *next; + /* disk target is used widely in other code so it must be validated fi= rst */ + if (!disk->dst) { + if (disk->src->srcpool) { + virReportError(VIR_ERR_NO_TARGET, _("pool =3D '%s', volume =3D= '%s'"), + disk->src->srcpool->pool, + disk->src->srcpool->volume); + } else { + virReportError(VIR_ERR_NO_TARGET, + disk->src->path ? "%s" : NULL, disk->src->path); + } + + return -1; + } + if (virDomainDiskDefValidateSource(disk->src) < 0) return -1; @@ -776,19 +790,6 @@ virDomainDiskDefValidate(const virDomainDef *def, if (disk->wwn && !virValidateWWN(disk->wwn)) return -1; - if (!disk->dst) { - if (disk->src->srcpool) { - virReportError(VIR_ERR_NO_TARGET, _("pool =3D '%s', volume =3D= '%s'"), - disk->src->srcpool->pool, - disk->src->srcpool->volume); - } else { - virReportError(VIR_ERR_NO_TARGET, - disk->src->path ? "%s" : NULL, disk->src->path); - } - - return -1; - } - if ((disk->device =3D=3D VIR_DOMAIN_DISK_DEVICE_DISK || disk->device =3D=3D VIR_DOMAIN_DISK_DEVICE_LUN) && !STRPREFIX(disk->dst, "hd") && --=20 2.31.1