From nobody Mon Feb 9 09:47:20 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=1692949325; cv=none; d=zohomail.com; s=zohoarc; b=SQWDM6tLIzzmzwWOhqjyMnFJk/CeLtPOyl7+f+kO8ocy8RevJ99Jz2YMDjH+r8irW0mCS5G+CyX3DUhV1zga8CCjHAzSx+UNh6wQ3HoflqLfs3SjgeIrUhxYVghQsSuhjAhRYnhyfu2lkD3zB5l4J/+oE8+K4hdc/FxvSJ1m87w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692949325; 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=bwD7uR0xa1DPFJF4pHUP2CCPos44GjKIU242xKzbj4w=; b=AW8CVQvWOnhHx44ER4d2s3JAOMpcRHn/DVqdrqm7mW/3iGQAvF8z/gKKanq6qGbTuurnkZC9EGL7WCx6Yzrhi9gl2vGH9SajQEx6eiXibqVue5wHl0vw1TSO5kDy84oHqucPmM5PbR0v0QllBehI/JZJqGmeXscgAGrae+75a1g= 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 1692949325296289.6824970564895; Fri, 25 Aug 2023 00:42:05 -0700 (PDT) Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-149-S2G1y_uHPXmdBMtLvSa44w-1; Fri, 25 Aug 2023 03:40:46 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D07303827E05; Fri, 25 Aug 2023 07:40:32 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id AE9FD40C2079; Fri, 25 Aug 2023 07:40:31 +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 2CD8119465B5; Fri, 25 Aug 2023 07:40:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 81B591946589 for ; Fri, 25 Aug 2023 07:40:28 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 6EC892026D2B; Fri, 25 Aug 2023 07:40:28 +0000 (UTC) Received: from localhost.localdomain (unknown [10.43.2.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 163A12026D68 for ; Fri, 25 Aug 2023 07:40:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692949324; 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=bwD7uR0xa1DPFJF4pHUP2CCPos44GjKIU242xKzbj4w=; b=RHLoQMoMj/FauINzmw5F6IcoUDLRLitQyFWCpGGcVAriu5zPELwCWbofi/be5yolF9zDJr o1LegLRnmN0JLJARk7kTVztjSWyNTMWJrQeiLoMECbMhbSA1iqtMl/GUB30jeu0ZTbpCHc TD0RqXd+BJiilYwXnfEM5fE531/Mbrk= X-MC-Unique: S2G1y_uHPXmdBMtLvSa44w-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 04/27] cpu: Move error messages onto a single line Date: Fri, 25 Aug 2023 09:40:01 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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.1 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: 1692949327188100002 Content-Type: text/plain; charset="utf-8"; x-default="true" Error messages are exempt from the 80 columns rule. Move them onto one line. Signed-off-by: Michal Privoznik --- src/cpu/cpu_x86.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index b9513e24d5..7a7f3b409d 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -1899,8 +1899,7 @@ x86Compute(virCPUDef *host, result =3D x86ModelCompare(host_model, cpu_require); if (result =3D=3D SUBSET || result =3D=3D UNRELATED) { x86DataSubtract(&cpu_require->data, &host_model->data); - virX86CpuIncompatible(N_("Host CPU does not provide required " - "features"), + virX86CpuIncompatible(N_("Host CPU does not provide required featu= res"), &cpu_require->data); return VIR_CPU_COMPARE_INCOMPATIBLE; } @@ -1919,8 +1918,7 @@ x86Compute(virCPUDef *host, if (ret =3D=3D VIR_CPU_COMPARE_SUPERSET && cpu->type =3D=3D VIR_CPU_TYPE_GUEST && cpu->match =3D=3D VIR_CPU_MATCH_STRICT) { - virX86CpuIncompatible(N_("Host CPU does not strictly match guest C= PU: " - "Extra features"), + virX86CpuIncompatible(N_("Host CPU does not strictly match guest C= PU: Extra features"), &diff->data); return VIR_CPU_COMPARE_INCOMPATIBLE; } --=20 2.41.0