From nobody Mon Feb 9 00:56:16 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1591203790; cv=none; d=zohomail.com; s=zohoarc; b=hSMrFRWgxj2i9TiYwX0vmxN6BeCyW5JXcIpotO3p54Xya9qJNL2YRkNMkGiSFXnjXLNAnYmm4LQCCC5DHVeB7RafqpxMVY1Juy3FKlHPpSKWJ39lu3QJwkyz8mx8amA2G3h3YHe1jazGmSp9/k6tcZLzwk0YXZzg02//gDKFmZw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591203790; 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=jAlwcVgJYsZ+VPsmC0kLWiSYKXnv3Ux+x9EjMhZmrpU=; b=KvCN9aWxON5wbzUSv0hHF37yMW+gwBAHAZfdvoehEOMJCzfOuh4liREilWpPGx9Ed170zca61RU2AozgPgUR/6JQvExDOclwivsTwThHvmcgYhg5qXBPUPo4V8r09KYDRTDxs0PfOTAsVYf43A88knA+bL9aeFeVsfCQM88a8JY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1591203790298889.4860049652328; Wed, 3 Jun 2020 10:03:10 -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-376-gvaa5-paMKej5OpmZNFVdQ-1; Wed, 03 Jun 2020 13:02:19 -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 08C87107ACCA; Wed, 3 Jun 2020 17:02:06 +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 DE14D5C3FD; Wed, 3 Jun 2020 17:02:05 +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 9DBCA9702D; Wed, 3 Jun 2020 17:02:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 053H1kZS006281 for ; Wed, 3 Jun 2020 13:01:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id D301061169; Wed, 3 Jun 2020 17:01:46 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.193.222]) by smtp.corp.redhat.com (Postfix) with ESMTP id 53D8460BF4 for ; Wed, 3 Jun 2020 17:01:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591203789; 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=jAlwcVgJYsZ+VPsmC0kLWiSYKXnv3Ux+x9EjMhZmrpU=; b=EzApUx5fPtVg9GF2mGyr4dEjbj12g80qmRt3U2R3qgMHKnmok60wxuGg2bbqdkcVkW1tDo MTM1H0Xai/zMYWWWNkodOakGXr5EbXYGNEToUL20D8BZuIpuOPb/cKsWKH84N1wujY6+KM 6Dm1jDLc9jznxBR3U7i2TaDVyOgN/T0= X-MC-Unique: gvaa5-paMKej5OpmZNFVdQ-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 1/6] domain_conf: Format NS always last Date: Wed, 3 Jun 2020 19:01:33 +0200 Message-Id: <092e9bde7b699db00091224fc00ff40b07134857.1591203520.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" I think that since is kind of a hack, it doesn't deserve place in the front row. Signed-off-by: Michal Privoznik --- src/conf/domain_conf.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1406cf079e..ff0e7e9539 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -29880,16 +29880,16 @@ virDomainDefFormatInternalSetRootName(virDomainDe= fPtr def, for (n =3D 0; n < def->nseclabels; n++) virSecurityLabelDefFormat(buf, def->seclabels[n], flags); =20 - if (def->namespaceData && def->ns.format) { - if ((def->ns.format)(buf, def->namespaceData) < 0) - goto error; - } - if (def->keywrap) virDomainKeyWrapDefFormat(buf, def->keywrap); =20 virDomainSEVDefFormat(buf, def->sev); =20 + if (def->namespaceData && def->ns.format) { + if ((def->ns.format)(buf, def->namespaceData) < 0) + goto error; + } + virBufferAdjustIndent(buf, -2); virBufferAsprintf(buf, "\n", rootname); =20 --=20 2.26.2