From nobody Sat Feb 7 08:13:52 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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=1591402525; cv=none; d=zohomail.com; s=zohoarc; b=Zwx2+phb7JphHxyR3j+aZCmThaZHw8dgyQ9JszrcNegRysNrtwxTS5jF17o5odEiWzqSyYuIJzJOIboLvJKt4A+azYUK3qDOZTARtPyzf/bzkMX3EJKh/86Xz7lHd2da+RKFIroV+f6m9oWxSKv6+ywPkmwfjCS/iNizneYpNdI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591402525; 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=bK0Acy7hB7gioZWMkqEiGSSXUA48CfwiCcgKoSoVClc=; b=FNZ2j0MGH8ZtClz2VoKwNC/0eQhrZ1NuiYX5+jJv7y/NjT/f3CLD83MVCziviFSef1WCpaKlOTvVnWFQYCoGP1awrarpJqbD0Zd+ZqnnqVchXshSPlLqp2LfUOwRjbyNFH0r7vtnbAcZ0J0GQJasJ8+mA9izbz8N2Etmr3Dlbl0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1591402525446209.86026277875237; Fri, 5 Jun 2020 17:15:25 -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-320-usZy0LgdMBeHDR7GeUsQWQ-1; Fri, 05 Jun 2020 20:15:21 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 98804107ACCD; Sat, 6 Jun 2020 00:15:16 +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 7715D78FDE; Sat, 6 Jun 2020 00:15:16 +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 4BE5314CE7; Sat, 6 Jun 2020 00:15:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 054IiFWA002436 for ; Thu, 4 Jun 2020 14:44:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8F0F510013D6; Thu, 4 Jun 2020 18:44:15 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.192.79]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0F1C8101E1C2 for ; Thu, 4 Jun 2020 18:44:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591402524; 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=bK0Acy7hB7gioZWMkqEiGSSXUA48CfwiCcgKoSoVClc=; b=cbJs9/jQpjZy9dU5gpQp3OfqjaGeIDjDL2+MZ0+N95yRsE56P9iHus07gakJGYUSEh1kmZ FT+w/QxS9eWSYYspLea0hBDhwQ6tf5y77En8oWoiUCj649s6AE6BvGLMr4GfkMrPXGpjRV n500srdP8pVOAHLjIviSwV1QdSHJBmE= X-MC-Unique: usZy0LgdMBeHDR7GeUsQWQ-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH v2 1/8] domain_conf: Format NS always last Date: Thu, 4 Jun 2020 20:44:02 +0200 Message-Id: <53b4ec415935e97cc83dabece9fd9e2a7a6aeb20.1591296169.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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.15 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 Reviewed-by: Daniel P. Berrang=C3=A9 --- 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 1cdc7971fc..e84fbe1e21 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -29877,16 +29877,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