From nobody Mon Feb 9 01:48:11 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=1631021028; cv=none; d=zohomail.com; s=zohoarc; b=BiqnGc8z2J+Ifop9qnxUJFpsATqfQnstfSr5PYhLfFGNie22QlvBVStaf0j8+Prr9ZZr38oqg+WJyRF3aRuNHuU/n4qAhd4G33AgKtiqXdlzdeDjgTpoBXtKiTbbrmAuJ5cjkbw0Eex51aYIEBzTEaiXVf/2WXcrnl4GijMahIA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631021028; 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=XNTco2movuHRpQuAlNeWyL2qG+fmitv2BAMkUJN70Cs=; b=ReLh7mAEAIOydBpHaBx6ulniSiIA8dD7Kin8z/sWLnp2SpPgCSmzXMp2ihuukYTVml+ayPsv6cA6QxwqJuufFlMvGgIIKXeZvtGfwzCJtD67jiWqRaUqnpYNZSp7BdfDEwNX/ulHIEGAOEBzjKbBDOYJ557D/qlzbuMx7vEnfZ0= 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 1631021028816885.5710232421777; Tue, 7 Sep 2021 06:23:48 -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-324-yMl7dFTpM5GUH9Y4vgfyFQ-1; Tue, 07 Sep 2021 09:23:45 -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 A32201034AF2; Tue, 7 Sep 2021 13:23:40 +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 85ADB18649; Tue, 7 Sep 2021 13:23:40 +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 47E8544A5D; Tue, 7 Sep 2021 13:23:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 187DNMAZ013610 for ; Tue, 7 Sep 2021 09:23:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3C8B96789A; Tue, 7 Sep 2021 13:23:22 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9A34A5C3DF for ; Tue, 7 Sep 2021 13:23:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631021027; 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=XNTco2movuHRpQuAlNeWyL2qG+fmitv2BAMkUJN70Cs=; b=UlBUZNJwUKf6Aqfd2M/29qbNdRPevHWLj4hxe6QHjtR7lNvKvnde6f1ODYifnkUgaUSTLL +LYBQSXSjoJXrLHldOX3ZztLckS2e2F/vVwjJAAkUqkmBC+51AiMKTAZHVq6Gzh7pujwGr glJszZCyVopVpzBqLriicKvp1mw4Aws= X-MC-Unique: yMl7dFTpM5GUH9Y4vgfyFQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 1/6] qemuDomainDefValidateDiskLunSource: Unbreak error messages Date: Tue, 7 Sep 2021 15:22:57 +0200 Message-Id: <3c2587bc4b0614106d53ec1a7a99f7bd6b7253c1.1631020910.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com 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: 1631021029588100002 Content-Type: text/plain; charset="utf-8" Simplify looking for the error messages. Signed-off-by: Peter Krempa --- src/qemu/qemu_domain.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 25b7f03204..7f7d6dcfcc 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9840,15 +9840,13 @@ qemuDomainDefValidateDiskLunSource(const virStorage= Source *src) if (virStorageSourceGetActualType(src) =3D=3D VIR_STORAGE_TYPE_NETWORK= ) { if (src->protocol !=3D VIR_STORAGE_NET_PROTOCOL_ISCSI) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("disk device=3D'lun' is not supported " - "for protocol=3D'%s'"), + _("disk device=3D'lun' is not supported for pro= tocol=3D'%s'"), virStorageNetProtocolTypeToString(src->protocol= )); return -1; } } else if (!virStorageSourceIsBlockLocal(src)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("disk device=3D'lun' is only valid for block " - "type disk source")); + _("disk device=3D'lun' is only valid for block type= disk source")); return -1; } --=20 2.31.1