From nobody Fri Dec 19 19:09:36 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1588767133; cv=none; d=zohomail.com; s=zohoarc; b=lAQZ55E7MyOCb5nRCOS46qG6c+VPqafD2Sg3EvSrqIVTYDGcxWl0N3uwmPVQLR+WWEy6tgWkVJj/qd7iaNJ8uoEq65quWJrDW/I/TfyfpQCepfaF4yutV604gMPjMb8H9UuyuZTa4NVGFhpFTgaFxhtywV9ew0DvDGDLWMOjCUk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588767133; 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=aO9P7CIAo8yptMUb4eBvo0eyVQ8fPgHKM4eZrQ8EwLw=; b=bC3TYuGFF07SpYI5V47ubkxlIMwjnRdAEAsxHVg652qci1DsWJIfwgKK+sxTsYBkAVTQT7C5RIDOjaIJdfs+gAbM4kwrdQTX3i/jOsPnJl/FF0UBqghMN08BIVmcOmL+cy6TF1R9W5/PKHH/qlR4vOrpfmFHyNE1YH6ZXSGUaCg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1588767133895974.2844613945189; Wed, 6 May 2020 05:12:13 -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-301-bZeymAKBN3ekVEpABE4l_w-1; Wed, 06 May 2020 08:09:20 -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 15A91107ACF3; Wed, 6 May 2020 12:09:15 +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 DC8B519C4F; Wed, 6 May 2020 12:09:14 +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 8DFA71809543; Wed, 6 May 2020 12:09:14 +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 046C8sFQ029670 for ; Wed, 6 May 2020 08:08:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id 911255C541; Wed, 6 May 2020 12:08:54 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.40.208.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0872E5C1D4 for ; Wed, 6 May 2020 12:08:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588767132; 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=aO9P7CIAo8yptMUb4eBvo0eyVQ8fPgHKM4eZrQ8EwLw=; b=JmBAZz/ZxSAswmvocGJrsaX60WUovf9nUO3WGGPnOLu0hA/imb1/BRD/FRwkAEUKnT4N9f mvhWz7o0pJdyPbs54Py6oDrxBZZ8WBfnkamOYCzAl80rTr9CKLY4VQD0hOpY0iv8UTgk7h LpXKlqhp/kBiPUIlNCWpudU8hDaYzIw= X-MC-Unique: bZeymAKBN3ekVEpABE4l_w-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 10/20] qemuBuildDiskDeviceStr: Use XML disk bus type names in error message Date: Wed, 6 May 2020 14:08:25 +0200 Message-Id: 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.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" There's no point using the qemu-specific disk bus names in the error message. Signed-off-by: Peter Krempa --- src/qemu/qemu_command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9836972234..77f0d83054 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1581,7 +1581,6 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, virQEMUCapsPtr qemuCaps) { g_auto(virBuffer) opt =3D VIR_BUFFER_INITIALIZER; - const char *bus =3D virDomainDiskQEMUBusTypeToString(disk->bus); const char *contAlias; g_autofree char *backendAlias =3D NULL; g_autofree char *scsiVPDDeviceId =3D NULL; @@ -1838,7 +1837,8 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, case VIR_DOMAIN_DISK_BUS_LAST: default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("unsupported disk bus '%s' with device setup"), b= us); + _("unsupported disk bus '%s' with device setup"), + NULLSTR(virDomainDiskBusTypeToString(disk->bus))); return NULL; } --=20 2.26.2