From nobody Fri Dec 19 20:54:42 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=1588767007; cv=none; d=zohomail.com; s=zohoarc; b=L7WPmZQqP6zfAOoEvZoyUtmKEfIRVPo0OJC6T8X/1yEos7ndIhu105+WBTTl+h6lAGHuC8M8SUlT5Xt+rKhYgIDEBGIWcM9irKmSs5Vpf5MwSDkYjU/X/v8ZdZmkcA6I+T0iOXn2W2wT8s491CGH+C2IKSDVIVIcMUrUB07sKvg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588767007; 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=tFzM5mr55d1g99JDFC8mgeSjJYo21ntbofxXOMjA3t8=; b=mnEOb4Jo7B+PyY9OZHRDrWXOeAaBPYaDmX31HDLOOt4H1a56/XWcil9yBG4sd/NHI+iQ+hLtt8dJg7Eu2EUCodP85tvu+Fm/QxHxKkt2bTOM7UyWNpo0guDXEJCYzowvfJqQRA8cuiLAtNYAfp4Y0Mr2MYlxwPqtzk59kYKChjs= 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-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1588767007151134.83794237112295; Wed, 6 May 2020 05:10:07 -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-73-4MNYDKBeOMq8BovToXZpTA-1; Wed, 06 May 2020 08:09:09 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 717B61899525; Wed, 6 May 2020 12:09:03 +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 48D161000079; Wed, 6 May 2020 12:09:03 +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 EBCA554D04; Wed, 6 May 2020 12:09:02 +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 046C8otx029627 for ; Wed, 6 May 2020 08:08:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id BC2C65C241; Wed, 6 May 2020 12:08:50 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.40.208.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2EE665C1BD for ; Wed, 6 May 2020 12:08:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588767005; 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=tFzM5mr55d1g99JDFC8mgeSjJYo21ntbofxXOMjA3t8=; b=FMs9wCmzg3l5oTL5sM5bcPypfJPmw3C6ndsYJhpxucc7SD56OuKhl/IevdPxjS9+L4x65D rsRIeWNiJTHa6td0j460YPC9v0B+MYvVZ2oH7NuyUl2qkHBunYrxfxiuFpW8vSQ52k0P4D 8cC0kuD+M/hemoCfucIC+B1f02Ctn5A= X-MC-Unique: 4MNYDKBeOMq8BovToXZpTA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 06/20] qemuCheckDiskConfig: Remove and untangle callers Date: Wed, 6 May 2020 14:08:21 +0200 Message-Id: <5af25423828d10f2879c5174db003818648b65bb.1588766791.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.84 on 10.5.11.22 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" Remove the function and passing of 'def' through the callers. Signed-off-by: Peter Krempa --- src/qemu/qemu_command.c | 36 ++++-------------------------------- src/qemu/qemu_command.h | 5 ----- src/qemu/qemu_driver.c | 2 -- src/qemu/qemu_hotplug.c | 2 +- tests/qemublocktest.c | 3 +-- 5 files changed, 6 insertions(+), 42 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 2dfd17ad40..d9c3a7a52e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1114,23 +1114,6 @@ qemuDiskConfigBlkdeviotuneEnabled(virDomainDiskDefPt= r disk) } -/** - * qemuCheckDiskConfig: - * @disk: disk definition - * @qemuCaps: qemu capabilities, may be NULL for cold-plug check - * - * Perform disk definition config validity checks. Returns -1 on error with - * error reported. - */ -int -qemuCheckDiskConfig(virDomainDiskDefPtr disk G_GNUC_UNUSED, - const virDomainDef *def G_GNUC_UNUSED, - virQEMUCapsPtr qemuCaps G_GNUC_UNUSED) -{ - return 0; -} - - /* QEMU 1.2 and later have a binary flag -enable-fips that must be * used for VNC auth to obey FIPS settings; but the flag only * exists on Linux, and with no way to probe for it via QMP. Our @@ -1449,7 +1432,6 @@ qemuBuildDiskFrontendAttributes(virDomainDiskDefPtr d= isk, static char * qemuBuildDriveStr(virDomainDiskDefPtr disk, - const virDomainDef *def, virQEMUCapsPtr qemuCaps) { g_auto(virBuffer) opt =3D VIR_BUFFER_INITIALIZER; @@ -1475,10 +1457,6 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, return NULL; } - /* if we are using -device this will be checked elsewhere */ - if (qemuCheckDiskConfig(disk, def, qemuCaps) < 0) - return NULL; - virBufferAsprintf(&opt, "if=3D%s", virDomainDiskQEMUBusTypeToString(disk->bus)); virBufferAsprintf(&opt, ",index=3D%d", idx); @@ -1618,9 +1596,6 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, g_autofree char *scsiVPDDeviceId =3D NULL; int controllerModel; - if (qemuCheckDiskConfig(disk, def, qemuCaps) < 0) - return NULL; - if (!qemuDomainCheckCCWS390AddressSupport(def, &disk->info, qemuCaps, = disk->dst)) return NULL; @@ -2131,7 +2106,6 @@ qemuBuildBlockStorageSourceAttachDataCommandline(virC= ommandPtr cmd, static int qemuBuildDiskSourceCommandLine(virCommandPtr cmd, virDomainDiskDefPtr disk, - const virDomainDef *def, virQEMUCapsPtr qemuCaps) { g_autoptr(qemuBlockStorageSourceChainData) data =3D NULL; @@ -2151,7 +2125,7 @@ qemuBuildDiskSourceCommandLine(virCommandPtr cmd, !(copyOnReadProps =3D qemuBlockStorageGetCopyOnReadProps(disk)= )) return -1; } else { - if (!(data =3D qemuBuildStorageSourceChainAttachPrepareDrive(disk,= def, qemuCaps))) + if (!(data =3D qemuBuildStorageSourceChainAttachPrepareDrive(disk,= qemuCaps))) return -1; } @@ -2181,7 +2155,7 @@ qemuBuildDiskCommandLine(virCommandPtr cmd, { g_autofree char *optstr =3D NULL; - if (qemuBuildDiskSourceCommandLine(cmd, disk, def, qemuCaps) < 0) + if (qemuBuildDiskSourceCommandLine(cmd, disk, qemuCaps) < 0) return -1; if (!qemuDiskBusNeedsDriveArg(disk->bus)) { @@ -9979,7 +9953,6 @@ qemuBuildHotpluggableCPUProps(const virDomainVcpuDef = *vcpu) */ qemuBlockStorageSourceAttachDataPtr qemuBuildStorageSourceAttachPrepareDrive(virDomainDiskDefPtr disk, - const virDomainDef *def, virQEMUCapsPtr qemuCaps) { g_autoptr(qemuBlockStorageSourceAttachData) data =3D NULL; @@ -9987,7 +9960,7 @@ qemuBuildStorageSourceAttachPrepareDrive(virDomainDis= kDefPtr disk, if (VIR_ALLOC(data) < 0) return NULL; - if (!(data->driveCmd =3D qemuBuildDriveStr(disk, def, qemuCaps)) || + if (!(data->driveCmd =3D qemuBuildDriveStr(disk, qemuCaps)) || !(data->driveAlias =3D qemuAliasDiskDriveFromDisk(disk))) return NULL; @@ -10049,7 +10022,6 @@ qemuBuildStorageSourceAttachPrepareCommon(virStorag= eSourcePtr src, */ qemuBlockStorageSourceChainDataPtr qemuBuildStorageSourceChainAttachPrepareDrive(virDomainDiskDefPtr disk, - const virDomainDef *def, virQEMUCapsPtr qemuCaps) { g_autoptr(qemuBlockStorageSourceAttachData) elem =3D NULL; @@ -10058,7 +10030,7 @@ qemuBuildStorageSourceChainAttachPrepareDrive(virDo= mainDiskDefPtr disk, if (VIR_ALLOC(data) < 0) return NULL; - if (!(elem =3D qemuBuildStorageSourceAttachPrepareDrive(disk, def, qem= uCaps))) + if (!(elem =3D qemuBuildStorageSourceAttachPrepareDrive(disk, qemuCaps= ))) return NULL; if (qemuBuildStorageSourceAttachPrepareCommon(disk->src, elem, qemuCap= s) < 0) diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index bc3ba44fb3..0bb66c3f0b 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -105,7 +105,6 @@ bool qemuDiskBusNeedsDriveArg(int bus); qemuBlockStorageSourceAttachDataPtr qemuBuildStorageSourceAttachPrepareDrive(virDomainDiskDefPtr disk, - const virDomainDef *def, virQEMUCapsPtr qemuCaps); int qemuBuildStorageSourceAttachPrepareCommon(virStorageSourcePtr src, @@ -115,7 +114,6 @@ qemuBuildStorageSourceAttachPrepareCommon(virStorageSou= rcePtr src, qemuBlockStorageSourceChainDataPtr qemuBuildStorageSourceChainAttachPrepareDrive(virDomainDiskDefPtr disk, - const virDomainDef *def, virQEMUCapsPtr qemuCaps); @@ -200,9 +198,6 @@ int qemuGetDriveSourceString(virStorageSourcePtr src, bool qemuDiskConfigBlkdeviotuneEnabled(virDomainDiskDefPtr disk); -int qemuCheckDiskConfig(virDomainDiskDefPtr disk, - const virDomainDef *def, - virQEMUCapsPtr qemuCaps); bool qemuCheckFips(void); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1c7c87128d..c5e6cab817 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8143,8 +8143,6 @@ qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef, } if (virDomainDiskTranslateSourcePool(disk) < 0) return -1; - if (qemuCheckDiskConfig(disk, vmdef, NULL) < 0) - return -1; if (qemuCheckDiskConfigAgainstDomain(vmdef, disk) < 0) return -1; if (virDomainDiskInsert(vmdef, disk) < 0) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 60d0729f1e..641b6f1fe1 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -713,7 +713,7 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, priv= ->qemuCaps))) goto cleanup; } else { - if (!(data =3D qemuBuildStorageSourceChainAttachPrepareDrive(disk,= vm->def, + if (!(data =3D qemuBuildStorageSourceChainAttachPrepareDrive(disk, priv->q= emuCaps))) goto cleanup; } diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c index fbe4972981..b80ee2ae6c 100644 --- a/tests/qemublocktest.c +++ b/tests/qemublocktest.c @@ -283,8 +283,7 @@ testQemuDiskXMLToProps(const void *opaque) virDomainDiskInsert(vmdef, disk) < 0) return -1; - if (qemuCheckDiskConfig(disk, vmdef, data->qemuCaps) < 0 || - qemuValidateDomainDeviceDefDisk(disk, vmdef, data->qemuCaps) < 0) { + if (qemuValidateDomainDeviceDefDisk(disk, vmdef, data->qemuCaps) < 0) { VIR_TEST_VERBOSE("invalid configuration for disk"); return -1; } --=20 2.26.2