From nobody Sun Feb 8 22:57:50 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=1637253268; cv=none; d=zohomail.com; s=zohoarc; b=dzqsP+AEB3biN4CQBQCJ9tHsquCvKxP6ELH7IZAz6WG3NFVp+oLqUPbuqRuZTfwgyGA0ceJa/pyZz+KOrTj1b1oKQVKcdr5jPdFTCK/KC0fgHISqwpmkk2/1NLEbsTJElGr7OlVmXNNRdQ+IgsQnlPwlJeWr6+zWWadga97b1jk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1637253268; 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=O64G2j/GZmyVmYEdKBKtumQjso8PYo9muZe3pk3Wewk=; b=gIe7M8pgx+DCCWou48fN/dRx/OoszYMnO2xZSa5qrDwctLW53VTuDFDqmjycu9p1u/uHPTKNXOb0DiSBrfYhRfoseHraKhcQ+OvCiefIZnV48NHk6c7erN2riUSg2sngRTG+cyHoQCrouL45GGc6jqkhVB2DsrGfTJc1omZR2DM= 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 1637253268152988.0378333910372; Thu, 18 Nov 2021 08:34:28 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-238--sQ0iEy-Ouy8AxLgihztiw-1; Thu, 18 Nov 2021 11:34:25 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 23618804145; Thu, 18 Nov 2021 16:34:20 +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 0419C5E274; Thu, 18 Nov 2021 16:34:20 +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 BD9761832DF0; Thu, 18 Nov 2021 16:34:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1AIGY6fP028158 for ; Thu, 18 Nov 2021 11:34:06 -0500 Received: by smtp.corp.redhat.com (Postfix) id 513245BB12; Thu, 18 Nov 2021 16:34:06 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9E6625BAE0 for ; Thu, 18 Nov 2021 16:34:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637253267; 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=O64G2j/GZmyVmYEdKBKtumQjso8PYo9muZe3pk3Wewk=; b=HNwd4+fXcIUohG1HrVjkIf0nK+bvlx46WL9vMUk+l5ZzUSLhHKP8iAVQ3nCaNjXiCkFEZp WIvpW0Eh66wtiEBtifO+8f7YoJDMl5Ky2pc/2/hIJ3XuCMiREj6OlZT3B/njmcBXDrorsu 8e+cWN4mcgpJtAEoO2ey/wDwI/f6QtQ= X-MC-Unique: -sQ0iEy-Ouy8AxLgihztiw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 11/16] qemuDomainEnsurePCIAddress: Don't pass virQEMUDriver explicitly Date: Thu, 18 Nov 2021 17:33:36 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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.79 on 10.5.11.14 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: 1637253268623100003 Content-Type: text/plain; charset="utf-8" The function is already getting 'virDomainObj' which has already the driver pointer present. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_domain_address.c | 13 +++++-------- src/qemu/qemu_domain_address.h | 8 +++----- src/qemu/qemu_hotplug.c | 21 ++++++++++----------- 3 files changed, 18 insertions(+), 24 deletions(-) diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index c43ad23cf5..9abe2b84c8 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -3034,8 +3034,7 @@ qemuAssignMemoryDeviceSlot(virDomainMemoryDef *mem, int -qemuDomainAssignMemoryDeviceSlot(virQEMUDriver *driver, - virDomainObj *vm, +qemuDomainAssignMemoryDeviceSlot(virDomainObj *vm, virDomainMemoryDef *mem) { g_autoptr(virBitmap) slotmap =3D NULL; @@ -3052,7 +3051,7 @@ qemuDomainAssignMemoryDeviceSlot(virQEMUDriver *drive= r, case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM: case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM: - return qemuDomainEnsurePCIAddress(vm, &dev, driver); + return qemuDomainEnsurePCIAddress(vm, &dev); break; case VIR_DOMAIN_MEMORY_MODEL_NONE: @@ -3232,8 +3231,7 @@ qemuDomainAssignAddresses(virDomainDef *def, */ int qemuDomainEnsurePCIAddress(virDomainObj *obj, - virDomainDeviceDef *dev, - virQEMUDriver *driver) + virDomainDeviceDef *dev) { qemuDomainObjPrivate *priv =3D obj->privateData; virDomainDeviceInfo *info =3D virDomainDeviceGetInfo(dev); @@ -3241,7 +3239,7 @@ qemuDomainEnsurePCIAddress(virDomainObj *obj, if (!info) return 0; - qemuDomainFillDevicePCIConnectFlags(obj->def, dev, priv->qemuCaps, dri= ver); + qemuDomainFillDevicePCIConnectFlags(obj->def, dev, priv->qemuCaps, pri= v->driver); qemuDomainFillDevicePCIExtensionFlags(dev, info, priv->qemuCaps); @@ -3272,7 +3270,6 @@ qemuDomainEnsureVirtioAddress(bool *releaseAddr, virDomainDeviceInfo *info =3D virDomainDeviceGetInfo(dev); qemuDomainObjPrivate *priv =3D vm->privateData; virDomainCCWAddressSet *ccwaddrs =3D NULL; - virQEMUDriver *driver =3D priv->driver; int ret =3D -1; if (!info->type) { @@ -3289,7 +3286,7 @@ qemuDomainEnsureVirtioAddress(bool *releaseAddr, goto cleanup; } else if (!info->type || info->type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { - if (qemuDomainEnsurePCIAddress(vm, dev, driver) < 0) + if (qemuDomainEnsurePCIAddress(vm, dev) < 0) goto cleanup; *releaseAddr =3D true; } diff --git a/src/qemu/qemu_domain_address.h b/src/qemu/qemu_domain_address.h index df7e7fca99..4c360a0f70 100644 --- a/src/qemu/qemu_domain_address.h +++ b/src/qemu/qemu_domain_address.h @@ -45,9 +45,8 @@ int qemuDomainAssignAddresses(virDomainDef *def, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); int qemuDomainEnsurePCIAddress(virDomainObj *obj, - virDomainDeviceDef *dev, - virQEMUDriver *driver) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); + virDomainDeviceDef *dev) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); void qemuDomainFillDeviceIsolationGroup(virDomainDef *def, virDomainDeviceDef *dev) @@ -56,8 +55,7 @@ void qemuDomainFillDeviceIsolationGroup(virDomainDef *def, void qemuDomainReleaseDeviceAddress(virDomainObj *vm, virDomainDeviceInfo *info); -int qemuDomainAssignMemoryDeviceSlot(virQEMUDriver *driver, - virDomainObj *vm, +int qemuDomainAssignMemoryDeviceSlot(virDomainObj *vm, virDomainMemoryDef *mem); void qemuDomainReleaseMemoryDeviceSlot(virDomainObj *vm, diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index c4f11edf6b..d44523fe7e 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1254,7 +1254,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, if (virDomainCCWAddressAssign(&net->info, ccwaddrs, !net->info.addr.ccw.assigned) < 0) goto cleanup; - } else if (qemuDomainEnsurePCIAddress(vm, &dev, driver) < 0) { + } else if (qemuDomainEnsurePCIAddress(vm, &dev) < 0) { goto cleanup; } @@ -1706,7 +1706,7 @@ qemuDomainAttachHostPCIDevice(virQEMUDriver *driver, /* Isolation groups are only relevant for pSeries guests */ qemuDomainFillDeviceIsolationGroup(vm->def, &dev); - if (qemuDomainEnsurePCIAddress(vm, &dev, driver) < 0) + if (qemuDomainEnsurePCIAddress(vm, &dev) < 0) goto error; releaseaddr =3D true; @@ -2131,8 +2131,7 @@ qemuDomainChrRemove(virDomainDef *vmdef, */ static int qemuDomainAttachChrDeviceAssignAddr(virDomainObj *vm, - virDomainChrDef *chr, - virQEMUDriver *driver) + virDomainChrDef *chr) { virDomainDef *def =3D vm->def; qemuDomainObjPrivate *priv =3D vm->privateData; @@ -2146,7 +2145,7 @@ qemuDomainAttachChrDeviceAssignAddr(virDomainObj *vm, } else if (chr->deviceType =3D=3D VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && chr->targetType =3D=3D VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_PC= I) { - if (qemuDomainEnsurePCIAddress(vm, &dev, driver) < 0) + if (qemuDomainEnsurePCIAddress(vm, &dev) < 0) return -1; return 1; @@ -2204,7 +2203,7 @@ int qemuDomainAttachChrDevice(virQEMUDriver *driver, if (qemuAssignDeviceChrAlias(vmdef, chr, -1) < 0) goto cleanup; - if ((rc =3D qemuDomainAttachChrDeviceAssignAddr(vm, chr, driver)) < 0) + if ((rc =3D qemuDomainAttachChrDeviceAssignAddr(vm, chr)) < 0) goto cleanup; if (rc =3D=3D 1) need_release =3D true; @@ -2442,7 +2441,7 @@ qemuDomainAttachMemory(virQEMUDriver *driver, if (qemuDomainDefValidateMemoryHotplug(vm->def, mem) < 0) goto cleanup; - if (qemuDomainAssignMemoryDeviceSlot(driver, vm, mem) < 0) + if (qemuDomainAssignMemoryDeviceSlot(vm, mem) < 0) goto cleanup; releaseaddr =3D true; @@ -2777,7 +2776,7 @@ qemuDomainAttachSCSIVHostDevice(virQEMUDriver *driver, if (hostdev->info->type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE || hostdev->info->type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { - if (qemuDomainEnsurePCIAddress(vm, &dev, driver) < 0) + if (qemuDomainEnsurePCIAddress(vm, &dev) < 0) goto cleanup; } else if (hostdev->info->type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_C= CW) { if (!(ccwaddrs =3D virDomainCCWAddressSetCreateFromDomain(vm->def)= )) @@ -2870,7 +2869,7 @@ qemuDomainAttachMediatedDevice(virQEMUDriver *driver, switch (hostdev->source.subsys.u.mdev.model) { case VIR_MDEV_MODEL_TYPE_VFIO_PCI: - if (qemuDomainEnsurePCIAddress(vm, &dev, driver) < 0) + if (qemuDomainEnsurePCIAddress(vm, &dev) < 0) return -1; break; case VIR_MDEV_MODEL_TYPE_VFIO_CCW: { @@ -3039,7 +3038,7 @@ qemuDomainAttachShmemDevice(virQEMUDriver *driver, if ((shmem->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE || shmem->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) && - (qemuDomainEnsurePCIAddress(vm, &dev, driver) < 0)) + (qemuDomainEnsurePCIAddress(vm, &dev) < 0)) return -1; if (!(devProps =3D qemuBuildShmemDevProps(vm->def, shmem))) @@ -3136,7 +3135,7 @@ qemuDomainAttachWatchdog(virQEMUDriver *driver, return -1; if (watchdog->model =3D=3D VIR_DOMAIN_WATCHDOG_MODEL_I6300ESB) { - if (qemuDomainEnsurePCIAddress(vm, &dev, driver) < 0) + if (qemuDomainEnsurePCIAddress(vm, &dev) < 0) goto cleanup; releaseAddress =3D true; } else { --=20 2.31.1