From nobody Tue Feb 10 01:20:04 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=1621601415; cv=none; d=zohomail.com; s=zohoarc; b=eImlZ1NeSa9emsyHUfu7G3xbhynERHWEp3j5JFt3h2OkjwpYwC3s32ek54gq9OJzfcQJfT3q8u3sQOirRGhXn8cfF6KzsHHZZ7AZRR6FMDFG+mXTaG6kRfVB12ygY46iR0qPi5UqH06/hAVm/pULE9QDdqhErAW18OIkYtG/ggU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621601415; 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=aLrW546v7e1fEdSC815hYj8L/Pm5GleP/wvfaqaNoMQ=; b=UF75vHHA/J0RwaqGqWsa9cuXI+13GcC0K5kEyC3yAz6n4xP7gbQNU/NzThkupAtA5AZc2IclPGKn/jWqPqW+DrHX0KjqsHT9rY17x+CDVKwAoutdSop+JjxN5RJuUUlU2Abj/S73EMIrxaLowE8ezIJsVxPEfkuv8hD9foRUvnk= 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) header.from= 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 1621601415988478.0485094750826; Fri, 21 May 2021 05:50:15 -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-28-y4QRYk7pNwyvS68JaGDXrg-1; Fri, 21 May 2021 08:48:23 -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 5A843802B4F; Fri, 21 May 2021 12:48:17 +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 F0F7D100AE4E; Fri, 21 May 2021 12:48:16 +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 AF8ED180B465; Fri, 21 May 2021 12:48:16 +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 14LCmD4I031268 for ; Fri, 21 May 2021 08:48:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id 44EB7421F; Fri, 21 May 2021 12:48:13 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9004B6E6F9 for ; Fri, 21 May 2021 12:48:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621601415; 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=aLrW546v7e1fEdSC815hYj8L/Pm5GleP/wvfaqaNoMQ=; b=h7igdSLjGGw7VrdT7iy01rlf6hHqBpDkf8sbPTqdBBlsJZi8fnYiNQD2WMBds+nlesvE0M YtxxCv8YDHuwucSpuj8hPHxGssIcyKsxU+uF3K/DEvp2BYyhi/oMXPIOl64n9bS8lLeitx TkzXNWfSfeS58pkSylvHXd6HWY57h/M= X-MC-Unique: y4QRYk7pNwyvS68JaGDXrg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 21/35] qemuDomainAttachDeviceDiskLiveInternal: Simplify call to qemuDomainAttachDiskGeneric Date: Fri, 21 May 2021 14:47:21 +0200 Message-Id: <2ceccf8f7e3ec52b03bcc8cd8a4fef74ee170584.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" We can call it in one place as all per-device-type subcases use the same code. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_hotplug.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 8d0ee1c659..33c6feea3e 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -986,15 +986,11 @@ qemuDomainAttachDeviceDiskLiveInternal(virQEMUDriver = *driver, goto cleanup; releaseUSB =3D true; - - ret =3D qemuDomainAttachDiskGeneric(driver, vm, disk); break; case VIR_DOMAIN_DISK_BUS_VIRTIO: if (qemuDomainEnsureVirtioAddress(&releaseVirtio, vm, dev, disk->d= st) < 0) goto cleanup; - - ret =3D qemuDomainAttachDiskGeneric(driver, vm, disk); break; case VIR_DOMAIN_DISK_BUS_SCSI: @@ -1023,8 +1019,6 @@ qemuDomainAttachDeviceDiskLiveInternal(virQEMUDriver = *driver, if (!qemuDomainFindOrCreateSCSIDiskController(driver, vm, i)) goto cleanup; } - - ret =3D qemuDomainAttachDiskGeneric(driver, vm, disk); break; case VIR_DOMAIN_DISK_BUS_IDE: @@ -1043,6 +1037,8 @@ qemuDomainAttachDeviceDiskLiveInternal(virQEMUDriver = *driver, virDomainDiskBusTypeToString(disk->bus)); } + ret =3D qemuDomainAttachDiskGeneric(driver, vm, disk); + cleanup: if (ret < 0) { ignore_value(qemuRemoveSharedDevice(driver, dev, vm->def->name)); --=20 2.31.1