From nobody Mon Feb 9 06:27:13 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=1649061426; cv=none; d=zohomail.com; s=zohoarc; b=EQIlan1pvyBntfHz0ii0rNcizcRJeBxBxDOfkEekPMkABx6Cr/dDpmVFDTpxiS98yyeMgA6YCdkJ9IKNAgGau/bnhGO351UjushS+rDqVlRCJtc58qDpW6rmgMMB/61/D63mqm3bbJnkHDQzYVIX5eUoa19GLXqFTE34ssELWd8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1649061426; 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=rSgHarIWFhj8bxRebtLvsO+/Q3dCk6D16ccGB1LZyZw=; b=Uj0fYwsDTqUX7vKZbNVX0zgbrwUkI1XM2cvxJVx5vtXytWobQLjB4tAYxnZxy6WWWFf8+FWpACu48ZdLmOlUOBom62XTrcrd4mS+mIAAbALjg4+bogiuUeAc2pWJPin5I3xZbPs8dIM7zfkjiLp7J2pTgEv3uI2JfRHlZFW2aGo= 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 16490614269011001.2580352844082; Mon, 4 Apr 2022 01:37:06 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [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-104-pzlFBdK6NfyaSJJjKIi1Xw-1; Mon, 04 Apr 2022 04:36:03 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AB69229DD992; Mon, 4 Apr 2022 08:35:59 +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 971CF202E4AA; Mon, 4 Apr 2022 08:35:59 +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 814F5194EB8E; Mon, 4 Apr 2022 08:35:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id EFAD6194037A for ; Mon, 4 Apr 2022 08:35:53 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id DCC4B535D3D; Mon, 4 Apr 2022 08:35:53 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 68BE5401DAC for ; Mon, 4 Apr 2022 08:35:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649061425; 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=rSgHarIWFhj8bxRebtLvsO+/Q3dCk6D16ccGB1LZyZw=; b=dpUWuIV1K/wI38uQl5Q44Bwq9QQBndIpF5yHPkVcxQgUuF/FI7DqnGuUoHL4EM0LHQuOdb w91cJHTJaQlGY/FlSfDKeMhg1A7PVfH7Xi+MhuRWyKKyFeUsNXWRgQI3AHZ2bxutZdNJCG JGeiqmc3Rjmw71HJ7aErzDcoTZjMrSs= X-MC-Unique: pzlFBdK6NfyaSJJjKIi1Xw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 16/17] qemu: Always assume QEMU_CAPS_STORAGE_WERROR Date: Mon, 4 Apr 2022 10:35:33 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 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 2.78 on 10.11.54.4 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: 1649061427467100001 Content-Type: text/plain; charset="utf-8"; x-default="true" All supported QEMUs now accept werror/rerror as argument for the frontend disk device, so we can remove the old code. Signed-off-by: Peter Krempa --- src/qemu/qemu_command.c | 34 +++++++--------------------------- src/qemu/qemu_command.h | 3 +-- src/qemu/qemu_hotplug.c | 3 +-- 3 files changed, 9 insertions(+), 31 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 5db9d6c041..fed17891af 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2036,8 +2036,7 @@ qemuBuildDiskGetErrorPolicy(virDomainDiskDef *disk, static char * -qemuBuildDriveStr(virDomainDiskDef *disk, - virQEMUCaps *qemuCaps) +qemuBuildDriveStr(virDomainDiskDef *disk) { g_auto(virBuffer) opt =3D VIR_BUFFER_INITIALIZER; int detect_zeroes =3D virDomainDiskGetDetectZeroesMode(disk->discard, @@ -2058,20 +2057,6 @@ qemuBuildDriveStr(virDomainDiskDef *disk, virDiskNameToIndex(disk->dst)); } - /* werror/rerror are really frontend attributes, but older - * qemu requires them on -drive instead of -device */ - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_STORAGE_WERROR)) { - const char *wpolicy =3D NULL; - const char *rpolicy =3D NULL; - - qemuBuildDiskGetErrorPolicy(disk, &wpolicy, &rpolicy); - - if (wpolicy) - virBufferAsprintf(&opt, ",werror=3D%s", wpolicy); - if (rpolicy) - virBufferAsprintf(&opt, ",rerror=3D%s", rpolicy); - } - if (disk->src->readonly) virBufferAddLit(&opt, ",readonly=3Don"); @@ -2307,8 +2292,7 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, serial =3D virBufferContentAndReset(&buf); } - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_STORAGE_WERROR)) - qemuBuildDiskGetErrorPolicy(disk, &wpolicy, &rpolicy); + qemuBuildDiskGetErrorPolicy(disk, &wpolicy, &rpolicy); if (virJSONValueObjectAdd(&props, "S:device_id", scsiVPDDeviceId, @@ -2588,7 +2572,7 @@ qemuBuildDiskSourceCommandLine(virCommand *cmd, !(copyOnReadProps =3D qemuBlockStorageGetCopyOnReadProps(disk)= )) return -1; } else { - if (!(data =3D qemuBuildStorageSourceChainAttachPrepareDrive(disk,= qemuCaps))) + if (!(data =3D qemuBuildStorageSourceChainAttachPrepareDrive(disk)= )) return -1; } @@ -10892,20 +10876,18 @@ qemuBuildHotpluggableCPUProps(const virDomainVcpu= Def *vcpu) /** * qemuBuildStorageSourceAttachPrepareDrive: * @disk: disk object to prepare - * @qemuCaps: qemu capabilities object * * Prepare qemuBlockStorageSourceAttachData *for use with the old approach * using -drive/drive_add. See qemuBlockStorageSourceAttachPrepareBlockdev. */ static qemuBlockStorageSourceAttachData * -qemuBuildStorageSourceAttachPrepareDrive(virDomainDiskDef *disk, - virQEMUCaps *qemuCaps) +qemuBuildStorageSourceAttachPrepareDrive(virDomainDiskDef *disk) { g_autoptr(qemuBlockStorageSourceAttachData) data =3D NULL; data =3D g_new0(qemuBlockStorageSourceAttachData, 1); - if (!(data->driveCmd =3D qemuBuildDriveStr(disk, qemuCaps)) || + if (!(data->driveCmd =3D qemuBuildDriveStr(disk)) || !(data->driveAlias =3D qemuAliasDiskDriveFromDisk(disk))) return NULL; @@ -10987,20 +10969,18 @@ qemuBuildStorageSourceAttachPrepareCommon(virStor= ageSource *src, /** * qemuBuildStorageSourceChainAttachPrepareDrive: * @disk: disk definition - * @qemuCaps: qemu capabilities object * * Prepares qemuBlockStorageSourceChainData *for attaching @disk via -driv= e. */ qemuBlockStorageSourceChainData * -qemuBuildStorageSourceChainAttachPrepareDrive(virDomainDiskDef *disk, - virQEMUCaps *qemuCaps) +qemuBuildStorageSourceChainAttachPrepareDrive(virDomainDiskDef *disk) { g_autoptr(qemuBlockStorageSourceAttachData) elem =3D NULL; g_autoptr(qemuBlockStorageSourceChainData) data =3D NULL; data =3D g_new0(qemuBlockStorageSourceChainData, 1); - if (!(elem =3D qemuBuildStorageSourceAttachPrepareDrive(disk, qemuCaps= ))) + if (!(elem =3D qemuBuildStorageSourceAttachPrepareDrive(disk))) return NULL; if (qemuBuildStorageSourceAttachPrepareCommon(disk->src, elem) < 0) diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index d84de3f093..a653ff7218 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -110,8 +110,7 @@ qemuBuildStorageSourceAttachPrepareCommon(virStorageSou= rce *src, qemuBlockStorageSourceChainData * -qemuBuildStorageSourceChainAttachPrepareDrive(virDomainDiskDef *disk, - virQEMUCaps *qemuCaps); +qemuBuildStorageSourceChainAttachPrepareDrive(virDomainDiskDef *disk); qemuBlockStorageSourceChainData * diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index d9ba0b7abe..274f47c25d 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -770,8 +770,7 @@ qemuDomainAttachDiskGeneric(virQEMUDriver *driver, } } else { - if (!(data =3D qemuBuildStorageSourceChainAttachPrepareDrive(disk, - priv->q= emuCaps))) + if (!(data =3D qemuBuildStorageSourceChainAttachPrepareDrive(disk)= )) return -1; } --=20 2.35.1