From nobody Mon Feb 9 16:02:17 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=1621601353; cv=none; d=zohomail.com; s=zohoarc; b=I9+kPQAOAEqXkoRXQyqjpIFOHbOy7zW0NF0F2z8SgwoiCuT3Hv/nNILDCeZ0caF9DLHpBrdg15uwAYYOhFh1c/wrN5Hf8s2wrYoMeAxBGTeRmN7B6p5kbzmjhtN47TifhxGSO+C6wcfCPnYC9ck7l5bnMlM2SA09ePiVD8nww3A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621601353; 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=PT23X4F3KwyssOpwUkLiZHxOvdQmhn+LHEJ/jDg9/MM=; b=MXM4IyfFhBCGC0tWgFnOFuq9gdtZbDNOzRXk+3UBeT0HCsPwWmLIsG86+5G9RVAREV8ed0tMBoI0niM4Sy8GK00njcgDHRXm1IZnhXbYQNbUgXQxkHOHAgWalJ20ed8zrxjP22ufVU9jXyIDf/cVk7mmYfWWMeYrESjOgERkmzM= 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 1621601353011720.2053508195572; Fri, 21 May 2021 05:49:13 -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-507-_ocTiX-nNDOSWBlrMxg65A-1; Fri, 21 May 2021 08:48:27 -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 E192D873017; Fri, 21 May 2021 12:48:19 +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 7926C105B216; Fri, 21 May 2021 12:48:19 +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 08FB044A5D; Fri, 21 May 2021 12:48:19 +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 14LCmFOw031308 for ; Fri, 21 May 2021 08:48:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5CC5A1964B; Fri, 21 May 2021 12:48:15 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id B4BDD421F for ; Fri, 21 May 2021 12:48:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621601352; 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=PT23X4F3KwyssOpwUkLiZHxOvdQmhn+LHEJ/jDg9/MM=; b=ESqTCtb6UZB7qy2ZkHPXL4uN/rB04QsYVQ89ybKu3Rvwmzk4NwFwSmrp2vFyXz41PbCVq7 k9PVxz+Xw3P9ZldclG6kBq5bfwnvF8+Ret4Pku5hbDV54HaaWumEHCOeiJ1FIrdxHpoCdk xaMUFwC2O4ozYkSRE8b+K4GPg3h5P8c= X-MC-Unique: _ocTiX-nNDOSWBlrMxg65A-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 23/35] qemu: hotplug: Move post-insertion steps of disk hotplug to qemuDomainAttachDeviceDiskLiveInternal Date: Fri, 21 May 2021 14:47:23 +0200 Message-Id: <77a92d11168e4dd57c496c75e6504d4c2ddbc2ba.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 auditing entry and insertion into the disk definition from the function which deals with qemu to 'qemuDomainAttachDeviceDiskLiveInternal' which deals with the hotplug related specifics. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_hotplug.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index fbf4a85c23..9b7067110e 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -763,9 +763,6 @@ qemuDomainAttachDiskGeneric(virQEMUDriver *driver, goto cleanup; } - virDomainAuditDisk(vm, NULL, disk->src, "attach", true); - - virDomainDiskInsert(vm->def, disk); ret =3D 0; cleanup: @@ -781,7 +778,6 @@ qemuDomainAttachDiskGeneric(virQEMUDriver *driver, qemuHotplugRemoveManagedPR(driver, vm, QEMU_ASYNC_JOB_NONE) < 0) ret =3D -2; - virDomainAuditDisk(vm, NULL, disk->src, "attach", false); goto cleanup; } @@ -1040,6 +1036,13 @@ qemuDomainAttachDeviceDiskLiveInternal(virQEMUDriver= *driver, ret =3D qemuDomainAttachDiskGeneric(driver, vm, disk); + virDomainAuditDisk(vm, NULL, disk->src, "attach", ret =3D=3D 0); + + if (ret < 0) + goto cleanup; + + virDomainDiskInsert(vm->def, disk); + cleanup: if (ret < 0) { ignore_value(qemuRemoveSharedDevice(driver, dev, vm->def->name)); --=20 2.31.1