From nobody Sun Feb 8 20:53:36 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1667314987; cv=none; d=zohomail.com; s=zohoarc; b=D7PfKcpvh0wzVIj/QKlyfh420XDQzsCz7B19EFGVFvjkdp007zEkJwAosnZzQ7QeUDhOSfIPTqx4fCl44LiCp3zLdhTwdXmHJn4ReciRU/jkaWSZw5ImROM6X4NADdrZVcHhyY1IzgauxODGyvdCjtlGzW/KttfgUYOM2R1pYB0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667314987; 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=WoH3wWtbWiVqtcabWbWyICQTnEySx5zQtqtfvrKuP44=; b=VJ4iYPAjHx8ejzaFyaiQKyg1gioHJX7cDmzbXuDfPp0FfGq1Y+6kbZVs54V86ukhRqYoVND7JK7eErnAs/C8hAzr5ZHcz9kN5FQGL6LOlzImzLOl0+ozxnv8PaVfEEuGNiN0ntYCvFNSAVZhweMOh0KZQjWfdvD6neqkiByk6xM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1667314987938378.78405976673776; Tue, 1 Nov 2022 08:03:07 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-615-2Dw3BEHoMLWaDn5zMF3kxg-1; Tue, 01 Nov 2022 11:03:01 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5802C88B7B5; Tue, 1 Nov 2022 15:02:43 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 43F67C15BB9; Tue, 1 Nov 2022 15:02:43 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 279F919465B3; Tue, 1 Nov 2022 15:02:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 243771946594 for ; Tue, 1 Nov 2022 15:02:42 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 1853D2166BB3; Tue, 1 Nov 2022 15:02:42 +0000 (UTC) Received: from speedmetal.redhat.com (ovpn-208-3.brq.redhat.com [10.40.208.3]) by smtp.corp.redhat.com (Postfix) with ESMTP id 780D52166B2D for ; Tue, 1 Nov 2022 15:02:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667314986; 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=WoH3wWtbWiVqtcabWbWyICQTnEySx5zQtqtfvrKuP44=; b=S5AIp2PYHUyrfzaq04HAHB6M7bP3l0j1vRhTq1GN3G9gZtlcCgRBT4CQeQUmvuLfh6hy1L XOm13w0xEl8qtsmoiSN+1fKuQMKAJNUbJVjcMUbryE+g3MYJtOK2gBC47f9vDYoLH0qG/b 8Fsd8QsQNSZwceeyo/e6pmb0+yf1Tlk= X-MC-Unique: 2Dw3BEHoMLWaDn5zMF3kxg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 03/11] conf: domain: Reformat XPath queries in virSysinfoSystemParseXML Date: Tue, 1 Nov 2022 16:02:17 +0100 Message-Id: <8dd50d34fda4a17502eb986f6b844046da7b1ddf.1667314911.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 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: 1667314990069100003 Content-Type: text/plain; charset="utf-8" Remove the unneeded linebreaks after assignment operator. Only one line exceeds 80 colums and just by 4 characters. Signed-off-by: Peter Krempa --- src/conf/domain_conf.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index eab2e98792..b0a978cc62 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -12198,14 +12198,10 @@ virSysinfoSystemParseXML(xmlNodePtr node, def =3D g_new0(virSysinfoSystemDef, 1); - def->manufacturer =3D - virXPathString("string(entry[@name=3D'manufacturer'])", ctxt); - def->product =3D - virXPathString("string(entry[@name=3D'product'])", ctxt); - def->version =3D - virXPathString("string(entry[@name=3D'version'])", ctxt); - def->serial =3D - virXPathString("string(entry[@name=3D'serial'])", ctxt); + def->manufacturer =3D virXPathString("string(entry[@name=3D'manufactur= er'])", ctxt); + def->product =3D virXPathString("string(entry[@name=3D'product'])", ct= xt); + def->version =3D virXPathString("string(entry[@name=3D'version'])", ct= xt); + def->serial =3D virXPathString("string(entry[@name=3D'serial'])", ctxt= ); tmpUUID =3D virXPathString("string(entry[@name=3D'uuid'])", ctxt); if (tmpUUID) { unsigned char uuidbuf[VIR_UUID_BUFLEN]; @@ -12232,10 +12228,8 @@ virSysinfoSystemParseXML(xmlNodePtr node, virUUIDFormat(uuidbuf, uuidstr); def->uuid =3D g_strdup(uuidstr); } - def->sku =3D - virXPathString("string(entry[@name=3D'sku'])", ctxt); - def->family =3D - virXPathString("string(entry[@name=3D'family'])", ctxt); + def->sku =3D virXPathString("string(entry[@name=3D'sku'])", ctxt); + def->family =3D virXPathString("string(entry[@name=3D'family'])", ctxt= ); if (!def->manufacturer && !def->product && !def->version && !def->serial && !def->uuid && !def->sku && !def->family) { --=20 2.37.3