From nobody Mon Feb 9 05:42:54 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1621601304; cv=none; d=zohomail.com; s=zohoarc; b=lA1VfkQk/JJdmtickS15OVv8qVaOQnwRxnwC5MBodDSaRnnUrOCkbYITSF6LJSYzB1YCfTHC6/DPjHtvnLMotVHRv3KJULjOECj6lOQk502o7DouuVvS8B6VHddc6bPyZ8538hud2YMUkyKqyGWTHFGaFJ70sscW2mWXAfOxLm0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621601304; 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=fUYuMPWdFqfqF/YDgkDMadg2pZyKrxzrw+gr5roOrVM=; b=Q44zoevXevV8otoeG7Coi7FUacV+dv1k9JF1c4hkvgcu9uj/QifPok6uOp1qUhBfzpCRKQfYs9OJiJ0qs3ADKwqWTNsJws44EYY9vS0qHcbVhjbIz2zM7MYDdkBVmqVCkwiOQrUy3Nrcj6iDMHRsIgPiXGls7zqIrXai7SipaJY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 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-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1621601304910302.7730715452909; Fri, 21 May 2021 05:48:24 -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-191-KGnVd0fkOT2eYOcsvtAxNg-1; Fri, 21 May 2021 08:48:21 -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 BBA949127D; Fri, 21 May 2021 12:48:13 +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 73D33100AE43; Fri, 21 May 2021 12:48:13 +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 395D444A62; Fri, 21 May 2021 12:48:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 14LCmBTK031232 for ; Fri, 21 May 2021 08:48:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id 17207421F; Fri, 21 May 2021 12:48:11 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7955559472 for ; Fri, 21 May 2021 12:48:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621601303; 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=fUYuMPWdFqfqF/YDgkDMadg2pZyKrxzrw+gr5roOrVM=; b=a9bNpNNUy7VEJkLbd80l1O7dELXdbA1iHXcyQTLMwMJ6SZALi1fcJSzde1Q/c8VIKIVbAb tSSPRUxaKERE2UkD0yU4ggAWHZ7AfoDluNU4yehy17pvtAmuEbhcJwGSF0riUXOnVj9XNp VHGKiw2qSosQGAQ8oioaif+It6uj4VU= X-MC-Unique: KGnVd0fkOT2eYOcsvtAxNg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 19/35] qemuDomainAttachDeviceDiskLiveInternal: Absorb qemuDomainAttachVirtioDiskDevice Date: Fri, 21 May 2021 14:47:19 +0200 Message-Id: <8c9da2daf97945a78d87417e89c7f9a5e50e8405.1621601161.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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 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) Content-Type: text/plain; charset="utf-8" Move the specific device setup and address reservation code into the main hotplug helper as it's just one extra function call. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_hotplug.c | 32 ++++++++------------------------ 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 0e3d256fbb..da13d84d56 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -798,29 +798,6 @@ qemuDomainAttachDiskGeneric(virQEMUDriver *driver, } -static int -qemuDomainAttachVirtioDiskDevice(virQEMUDriver *driver, - virDomainObj *vm, - virDomainDiskDef *disk) -{ - virDomainDeviceDef dev =3D { VIR_DOMAIN_DEVICE_DISK, { .disk =3D disk = } }; - bool releaseaddr =3D false; - int rv; - - if (qemuDomainEnsureVirtioAddress(&releaseaddr, vm, &dev, disk->dst) <= 0) - return -1; - - if ((rv =3D qemuDomainAttachDiskGeneric(driver, vm, disk)) < 0) { - if (rv =3D=3D -1 && releaseaddr) - qemuDomainReleaseDeviceAddress(vm, &disk->info); - - return -1; - } - - return 0; -} - - int qemuDomainAttachControllerDevice(virQEMUDriver *driver, virDomainObj *vm, virDomainControllerDef *controller) @@ -1005,6 +982,7 @@ qemuDomainAttachDeviceDiskLiveInternal(virQEMUDriver *= driver, size_t i; virDomainDiskDef *disk =3D dev->data.disk; bool releaseUSB =3D false; + bool releaseVirtio =3D false; int ret =3D -1; if (disk->device =3D=3D VIR_DOMAIN_DISK_DEVICE_CDROM || @@ -1054,7 +1032,10 @@ qemuDomainAttachDeviceDiskLiveInternal(virQEMUDriver= *driver, break; case VIR_DOMAIN_DISK_BUS_VIRTIO: - ret =3D qemuDomainAttachVirtioDiskDevice(driver, vm, disk); + if (qemuDomainEnsureVirtioAddress(&releaseVirtio, vm, dev, disk->d= st) < 0) + goto cleanup; + + ret =3D qemuDomainAttachDiskGeneric(driver, vm, disk); break; case VIR_DOMAIN_DISK_BUS_SCSI: @@ -1083,6 +1064,9 @@ qemuDomainAttachDeviceDiskLiveInternal(virQEMUDriver = *driver, if (releaseUSB) virDomainUSBAddressRelease(priv->usbaddrs, &disk->info); + + if (releaseVirtio && ret =3D=3D -1) + qemuDomainReleaseDeviceAddress(vm, &disk->info); } return ret; --=20 2.31.1