From nobody Tue Dec 16 00:01:57 2025 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=1658846390; cv=none; d=zohomail.com; s=zohoarc; b=gH5tVWGAerm8MeEEV7+YCZe8qV5JPbzf7vZ2qCs7hWKJWD+T2iawboS2ISAsO1FunxcNbQJtIfx22XxT8maCHqSAx4wLzxRH1J9bl8agQwSvlDemivydrSQjWo+abVSQt+0qu/5yskWWsm+Hf/DNCuoP8ktKjURi8bOVPMekf5Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658846390; 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=X36eOBKJOcGyrf2Hd3DOM3vG6rdo+JhiIXRXfm+FMws=; b=j9DTHDt4GUi5m3RP6xsnEt69KzcY5X/gZUx/tZaoJZvceA7Ejt4uWvOzxAdr+kHPVNCaEWVzJEkSScBFcMR5FmMILij/IDbpK1VTboTuvaUAvHahq8eyHMd3utxbDr6AiYcMPydmdyCZXqsg8lxyzRH6kbMF8SRQV05eU+G6icg= 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 1658846390139658.3815879491134; Tue, 26 Jul 2022 07:39:50 -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-438-p6ho1fBxPMGNdbHctqLF7A-1; Tue, 26 Jul 2022 10:39:36 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E2DDD3C11065; Tue, 26 Jul 2022 14:39:20 +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 CC3AE404E4D3; Tue, 26 Jul 2022 14:39:20 +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 94057194F4AD; Tue, 26 Jul 2022 14:39:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id DE7D11940377 for ; Tue, 26 Jul 2022 14:39:13 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id D964B400EA8E; Tue, 26 Jul 2022 14:39:13 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 53A65400DFD7 for ; Tue, 26 Jul 2022 14:39:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658846389; 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=X36eOBKJOcGyrf2Hd3DOM3vG6rdo+JhiIXRXfm+FMws=; b=VTycZ50IOrbB49VlHHFOSniAhilD6hK67eRT2rlZ+/AMwghwcGqxdUYabNhLHC9uqSyUag UrATfa1oFC4OmvOuPJO5Oi2cvtIk04nOnfofzXELW0baF2g9NroOC8ndAfEaUABIW93VeD mdMvKWzMUX8uMrNP7NZhpQMCTfVZr1Y= X-MC-Unique: p6ho1fBxPMGNdbHctqLF7A-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 73/80] qemuDomainValidateStorageSource: Remove 'maskBlockdev' argument Date: Tue, 26 Jul 2022 16:37:51 +0200 Message-Id: <97bb325b7865dee26df5e9bfac2c73a87cae52e8.1658843187.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 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.84 on 10.11.54.2 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: 1658846392487100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- src/qemu/qemu_domain.c | 10 ++++------ src/qemu/qemu_domain.h | 3 +-- src/qemu/qemu_validate.c | 6 ++---- tests/qemublocktest.c | 4 ++-- 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 0839744660..8ac99a8cf7 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4810,8 +4810,7 @@ qemuDomainValidateActualNetDef(const virDomainNetDef = *net, int qemuDomainValidateStorageSource(virStorageSource *src, - virQEMUCaps *qemuCaps, - bool maskBlockdev G_GNUC_UNUSED) + virQEMUCaps *qemuCaps) { virStorageType actualType =3D virStorageSourceGetActualType(src); @@ -7721,8 +7720,7 @@ qemuDomainDetermineDiskChain(virQEMUDriver *driver, if (n->format =3D=3D VIR_STORAGE_FILE_ISO) n->format =3D VIR_STORAGE_FILE_RAW; - /* mask-out blockdev for 'sd' disks */ - if (qemuDomainValidateStorageSource(n, priv->qemuCaps, isSD) < 0) + if (qemuDomainValidateStorageSource(n, priv->qemuCaps) < 0) return -1; qemuDomainPrepareStorageSourceConfig(n, cfg); @@ -10782,7 +10780,7 @@ qemuDomainPrepareDiskSourceLegacy(virDomainDiskDef = *disk, qemuDomainObjPrivate *priv, virQEMUDriverConfig *cfg) { - if (qemuDomainValidateStorageSource(disk->src, priv->qemuCaps, true) <= 0) + if (qemuDomainValidateStorageSource(disk->src, priv->qemuCaps) < 0) return -1; qemuDomainPrepareStorageSourceConfig(disk->src, cfg); @@ -10820,7 +10818,7 @@ qemuDomainPrepareStorageSourceBlockdevNodename(virD= omainDiskDef *disk, if (src->encryption && src->encryption->engine =3D=3D VIR_STORAGE_ENCR= YPTION_ENGINE_DEFAULT) src->encryption->engine =3D VIR_STORAGE_ENCRYPTION_ENGINE_QEMU; - if (qemuDomainValidateStorageSource(src, priv->qemuCaps, false) < 0) + if (qemuDomainValidateStorageSource(src, priv->qemuCaps) < 0) return -1; qemuDomainPrepareStorageSourceConfig(src, cfg); diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 7dc720dcb8..abf245ec2a 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -997,8 +997,7 @@ qemuDomainPrepareDiskSourceData(virDomainDiskDef *disk, int qemuDomainValidateStorageSource(virStorageSource *src, - virQEMUCaps *qemuCaps, - bool maskBlockdev); + virQEMUCaps *qemuCaps); int diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 4ce920152f..af93588e49 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -648,7 +648,7 @@ qemuValidateDomainDefNvram(const virDomainDef *def, return -1; } - if (qemuDomainValidateStorageSource(src, qemuCaps, false) < 0) + if (qemuDomainValidateStorageSource(src, qemuCaps) < 0) return -1; return 0; @@ -3216,7 +3216,6 @@ qemuValidateDomainDeviceDefDisk(const virDomainDiskDe= f *disk, virQEMUCaps *qemuCaps) { const char *driverName =3D virDomainDiskGetDriver(disk); - bool isSD =3D qemuDiskBusIsSD(disk->bus); virStorageSource *n; int idx; int partition; @@ -3259,8 +3258,7 @@ qemuValidateDomainDeviceDefDisk(const virDomainDiskDe= f *disk, } for (n =3D disk->src; virStorageSourceIsBacking(n); n =3D n->backingSt= ore) { - /* blockdev support is masked out for 'sd' disks */ - if (qemuDomainValidateStorageSource(n, qemuCaps, isSD) < 0) + if (qemuDomainValidateStorageSource(n, qemuCaps) < 0) return -1; } diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c index 57116c930b..1c1013d4d9 100644 --- a/tests/qemublocktest.c +++ b/tests/qemublocktest.c @@ -294,7 +294,7 @@ testQemuDiskXMLToProps(const void *opaque) if (testQemuDiskXMLToJSONFakeSecrets(n) < 0) return -1; - if (qemuDomainValidateStorageSource(n, data->qemuCaps, false) < 0) + if (qemuDomainValidateStorageSource(n, data->qemuCaps) < 0) return -1; qemuDomainPrepareDiskSourceData(disk, n); @@ -519,7 +519,7 @@ testQemuImageCreate(const void *opaque) src->capacity =3D UINT_MAX * 2ULL; src->physical =3D UINT_MAX + 1ULL; - if (qemuDomainValidateStorageSource(src, data->qemuCaps, false) < 0) + if (qemuDomainValidateStorageSource(src, data->qemuCaps) < 0) return -1; if (qemuBlockStorageSourceCreateGetStorageProps(src, &protocolprops) <= 0) --=20 2.36.1