From nobody Tue Dec 16 00:02:43 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=1658846539; cv=none; d=zohomail.com; s=zohoarc; b=Su1dnbGtJ51Xz/+C8kEtNbj8lMPh2MN5dDcKaEf5IKxKFZTUbuMPP2homkS/NP97CUiJyOursZXCRotMW+0oXxTMsMZmsa7XcK6OHWzkEfvo0/iSoRLqawh/PYBtHzY4XOUYcvkivDldXz/OY4x7odoEtVfEN/MGy+j42nAkGBQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658846539; 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=dN00WB3OWqZSs58sT4qz1k6UWjvltPkQMWWz41sOc+c=; b=RgNkMik7emE/6UsH10aEr09jDkTLUbK4aBMtjjeOUAxYHSAcxfLgs/VxpeGrDOmlZ1ZDSVKGX7EezKbbxgXNAqZo+njsN9nXhzHtXkTlOWoPCHY/iZWdt/SG0jdCY9Uh5N09ApZQqEw1XlCE/6Aawz1V8Q1/OqOK4qj3Isd/+PM= 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 1658846539692845.1847855407227; Tue, 26 Jul 2022 07:42:19 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-257-iPRra4wANgONYcenL8WXTw-1; Tue, 26 Jul 2022 10:38:49 -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 5444A806015; Tue, 26 Jul 2022 14:38:43 +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 411BA2026D2D; Tue, 26 Jul 2022 14:38:43 +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 847171945DAA; Tue, 26 Jul 2022 14:38:42 +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 5B65E1945DBF for ; Tue, 26 Jul 2022 14:38:38 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 4848440CF8EE; Tue, 26 Jul 2022 14:38:38 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id CDF2C400DFD7 for ; Tue, 26 Jul 2022 14:38:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658846537; 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=dN00WB3OWqZSs58sT4qz1k6UWjvltPkQMWWz41sOc+c=; b=hZj8iKm7d8gjDUUl3oY61T5agaGfPkdcsYOdMJhFmynvyToAypb4kyym0g4FQZyEVM49o4 DQpWhSIyAX8tZmxa9YFlkdK/kufvvyuEAdHZNCs4Tg6jZf69O34Zg2u6lvFPCB9e4nAgr2 2TY79lx+KYJugX4dmsKq4T/7i4E5Q4w= X-MC-Unique: iPRra4wANgONYcenL8WXTw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 37/80] qemu: alias: Remove check for QEMU_CAPS_BLOCKDEV Date: Tue, 26 Jul 2022 16:37:15 +0200 Message-Id: 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.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: 1658846540341100004 Content-Type: text/plain; charset="utf-8" The only instance in this file can be simplified to avoid checking the capability. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- src/qemu/qemu_alias.c | 10 ++++------ src/qemu/qemu_alias.h | 5 ++--- src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_process.c | 2 +- tests/qemuhotplugtest.c | 2 +- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index 7b91fe3141..835401dc07 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -192,8 +192,7 @@ qemuAssignDeviceControllerAlias(virDomainDef *domainDef, int qemuAssignDeviceDiskAlias(virDomainDef *def, - virDomainDiskDef *disk, - virQEMUCaps *qemuCaps) + virDomainDiskDef *disk) { qemuDomainDiskPrivate *diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); const char *prefix =3D virDomainDiskBusTypeToString(disk->bus); @@ -231,8 +230,7 @@ qemuAssignDeviceDiskAlias(virDomainDef *def, * on the alias in qemu. While certain disk types use just the alias, = some * need the full path into /machine/peripheral as a historical artifac= t. */ - if (!diskPriv->qomName && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV)) { + if (!diskPriv->qomName) { switch ((virDomainDiskBus) disk->bus) { case VIR_DOMAIN_DISK_BUS_FDC: case VIR_DOMAIN_DISK_BUS_IDE: @@ -606,12 +604,12 @@ qemuAssignDeviceIOMMUAlias(virDomainIOMMUDef *iommu) int -qemuAssignDeviceAliases(virDomainDef *def, virQEMUCaps *qemuCaps) +qemuAssignDeviceAliases(virDomainDef *def) { size_t i; for (i =3D 0; i < def->ndisks; i++) { - if (qemuAssignDeviceDiskAlias(def, def->disks[i], qemuCaps) < 0) + if (qemuAssignDeviceDiskAlias(def, def->disks[i]) < 0) return -1; } for (i =3D 0; i < def->nnets; i++) { diff --git a/src/qemu/qemu_alias.h b/src/qemu/qemu_alias.h index 1a583b8207..6433ae4cec 100644 --- a/src/qemu/qemu_alias.h +++ b/src/qemu/qemu_alias.h @@ -33,8 +33,7 @@ void qemuAssignDeviceControllerAlias(virDomainDef *domain= Def, virDomainControllerDef *controller); int qemuAssignDeviceDiskAlias(virDomainDef *def, - virDomainDiskDef *disk, - virQEMUCaps *qemuCaps); + virDomainDiskDef *disk); void qemuAssignDeviceHostdevAlias(virDomainDef *def, char **alias, @@ -71,7 +70,7 @@ void qemuAssignDeviceInputAlias(virDomainDef *def, void qemuAssignDeviceVsockAlias(virDomainVsockDef *vsock); -int qemuAssignDeviceAliases(virDomainDef *def, virQEMUCaps *qemuCaps); +int qemuAssignDeviceAliases(virDomainDef *def); int qemuDomainDeviceAliasIndex(const virDomainDeviceInfo *info, const char *prefix); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 5eb370c3df..28e4284e62 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1081,7 +1081,7 @@ qemuDomainAttachDeviceDiskLiveInternal(virQEMUDriver = *driver, releaseSeclabel =3D true; - if (qemuAssignDeviceDiskAlias(vm->def, disk, priv->qemuCaps) < 0) + if (qemuAssignDeviceDiskAlias(vm->def, disk) < 0) goto cleanup; if (qemuDomainPrepareDiskSource(disk, priv, cfg) < 0) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 6083ee10d8..f13664c7f2 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6629,7 +6629,7 @@ qemuProcessPrepareDomain(virQEMUDriver *driver, return -1; } - if (qemuAssignDeviceAliases(vm->def, priv->qemuCaps) < 0) + if (qemuAssignDeviceAliases(vm->def) < 0) return -1; qemuProcessPrepareDeviceBootorder(vm->def); diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 3c9dac241a..c938c8dc4c 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -107,7 +107,7 @@ qemuHotplugCreateObjects(virDomainXMLOption *xmlopt, return -1; } - if (qemuAssignDeviceAliases((*vm)->def, priv->qemuCaps) < 0) + if (qemuAssignDeviceAliases((*vm)->def) < 0) return -1; (*vm)->def->id =3D QEMU_HOTPLUG_TEST_DOMAIN_ID; --=20 2.36.1