From nobody Mon Apr 29 15:06:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.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 207.211.31.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=1596544254; cv=none; d=zohomail.com; s=zohoarc; b=gvZ5rps8cS8hdcTTrEBSj93XdQKRIVMuks4Brof0gVgqzf0TDuaxMQY+Btk2upRsIm/0Tc4/bZPXLgf7EC0OnYI03qG6tzp9j6eKwJTQjtWpQBYWqz12FU0VMG09W3rmLwWIuIHqsOweDt3tefuaXAhm9MFiHM/H4J2RqWdx45c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596544254; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=UlWPUN5XcqyQLV+yGdaa2o22H/rNf3a39lMvQ+y7AYQ=; b=FzpoCDXHe72gtzc16p6SRgImsP4bdGTWMCkAT+b/hDdY6Y5nV6BfNX1UGoL2QDyMSBa8341UdvGSDoB30ls/YY3XOwf+KGV7iKVJf5oJRGNSpCzNmT9ow6ANYRxhBIscM7CoesOE994rcJDFWLVJ9kOeYrISakUTDwWJ+q3od0o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.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 [207.211.31.120]) by mx.zohomail.com with SMTPS id 1596544254370965.9917645403004; Tue, 4 Aug 2020 05:30:54 -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-255-jJpgwxiNPli_LjdS8_iNtg-1; Tue, 04 Aug 2020 08:30:50 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9998210059C4; Tue, 4 Aug 2020 12:30:45 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EFE5119C58; Tue, 4 Aug 2020 12:30:44 +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 A0CF41809554; Tue, 4 Aug 2020 12:30:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 074CUFWP026854 for ; Tue, 4 Aug 2020 08:30:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2FF8D90E96; Tue, 4 Aug 2020 12:30:15 +0000 (UTC) Received: from kinshicho.usersys.redhat.com (unknown [10.40.195.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6A27F90E91 for ; Tue, 4 Aug 2020 12:30:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596544253; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=UlWPUN5XcqyQLV+yGdaa2o22H/rNf3a39lMvQ+y7AYQ=; b=GoyDz4Lx5szsJK1C6kF2Y1GDLh06kb1m+/d0jXxsSiyB1ut7stc23O+GcO/Qje4+hH/ZUu DvE1BA1ZjiWZqHXSEAb/tli2/x0qvYtHOppvI73AjLwH8JaCD2spRj5ganvtPDB2xSQfMr 2j8W8tBfu4tWE7yy7ti/zC1UE0laxPw= X-MC-Unique: jJpgwxiNPli_LjdS8_iNtg-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH] network: Use single quotes in default network configuration Date: Tue, 4 Aug 2020 14:30:07 +0200 Message-Id: <20200804123007.1031353-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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.84 on 10.5.11.23 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" Whenever libvirt is upgraded on a Debian system, the user will be prompted along the lines of Configuration file '/etc/libvirt/qemu/networks/default.xml' =3D=3D> Modified (by you or by a script) since installation. =3D=3D> Package distributor has shipped an updated version. What would you like to do about it ? Your options are: Y or I : install the package maintainer's version N or O : keep your currently-installed version D : show the differences between the versions Z : start a shell to examine the situation The default action is to keep your current version. *** default.xml (Y/I/N/O/D/Z) [default=3DN] ? d --- /etc/libvirt/qemu/networks/default.xml 2020-08-04 12:57:25.45091= 1143 +0200 +++ /etc/libvirt/qemu/networks/default.xml.dpkg-new 2020-08-03 22:47:= 15.000000000 +0200 @@ -1,19 +1,11 @@ - - default - 612a2cab-72fb-416d-92bc-4d9e597bfb63 - - - - + d020b839-4379-492c-aa74-eab7365076e6 + + + - + The UUID situation should probably be handled the same way it is in the spec file by stripping it, and in general we could behave much better towards users, but one part of the diff that immediately stands out is that some lines are highlighted not because they are semantically different, but simply because they use different types of quotes around attributes. Since the canonical version of all libvirt XML documents (as returned by the various vir*GetXMLDesc() APIs) as well as the on-disk representations use single quotes, let's use the same for configuration files we install as well. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/network/default.xml.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/network/default.xml.in b/src/network/default.xml.in index d7241d0c16..08a3632eb6 100644 --- a/src/network/default.xml.in +++ b/src/network/default.xml.in @@ -1,10 +1,10 @@ default - + - + - + --=20 2.25.4