From nobody Mon May 6 19:08:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1553776857440428.77766708294223; Thu, 28 Mar 2019 05:40:57 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id E941A308FF17; Thu, 28 Mar 2019 12:40:55 +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 BC94E1001E74; Thu, 28 Mar 2019 12:40:55 +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 73AE0180338C; Thu, 28 Mar 2019 12:40:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x2SCenAf031159 for ; Thu, 28 Mar 2019 08:40:49 -0400 Received: by smtp.corp.redhat.com (Postfix) id 685CD62699; Thu, 28 Mar 2019 12:40:49 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id BC5BA62669; Thu, 28 Mar 2019 12:40:48 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 28 Mar 2019 13:40:40 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 1/3] qemu: hotplug: Don't release USB address twice when removing disk 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Thu, 28 Mar 2019 12:40:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" qemuDomainRemoveDiskDevice calls qemuDomainReleaseDeviceAddress which already calls virDomainUSBAddressRelease so we don't need to call it again. Signed-off-by: Peter Krempa --- src/qemu/qemu_hotplug.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index ee1ad05814..ae9cafa0da 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -4516,7 +4516,6 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver, dev.type =3D VIR_DOMAIN_DEVICE_DISK; dev.data.disk =3D disk; ignore_value(qemuRemoveSharedDevice(driver, &dev, vm->def->name)); - virDomainUSBAddressRelease(priv->usbaddrs, &disk->info); if (qemuHotplugRemoveManagedPR(driver, vm, QEMU_ASYNC_JOB_NONE) < 0) goto cleanup; --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 19:08:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1553776861641311.6207705804575; Thu, 28 Mar 2019 05:41:01 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 248683094276; Thu, 28 Mar 2019 12:41:00 +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 E90D16FEEA; Thu, 28 Mar 2019 12:40:59 +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 A6F0D18033A2; Thu, 28 Mar 2019 12:40:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x2SCeoPC031167 for ; Thu, 28 Mar 2019 08:40:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id 85BC61716A; Thu, 28 Mar 2019 12:40:50 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id B472462699; Thu, 28 Mar 2019 12:40:49 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 28 Mar 2019 13:40:41 +0100 Message-Id: <3c0b1cfdf618abd7535b768425509ea4313c4ed2.1553776815.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 2/3] qemu: Always use 'alias' in warning message when removing USB address 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Thu, 28 Mar 2019 12:41:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Avoid the extra parameter passing in the disk 'dst' parameter to be reported instead of the device alias. Using 'dst' instead of alias does not add much value. Signed-off-by: Peter Krempa --- src/qemu/qemu_domain_address.c | 8 ++---- src/qemu/qemu_domain_address.h | 3 +- src/qemu/qemu_hotplug.c | 52 +++++++++++++++++----------------- 3 files changed, 29 insertions(+), 34 deletions(-) diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 3eccf40eb5..f217d1599a 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -3255,21 +3255,17 @@ qemuDomainEnsurePCIAddress(virDomainObjPtr obj, void qemuDomainReleaseDeviceAddress(virDomainObjPtr vm, - virDomainDeviceInfoPtr info, - const char *devstr) + virDomainDeviceInfoPtr info) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - if (!devstr) - devstr =3D info->alias; - if (virDeviceInfoPCIAddressIsPresent(info)) { virDomainPCIAddressReleaseAddr(priv->pciaddrs, &info->addr.pci); virDomainPCIAddressExtensionReleaseAddr(priv->pciaddrs, &info->add= r.pci); } if (virDomainUSBAddressRelease(priv->usbaddrs, info) < 0) - VIR_WARN("Unable to release USB address on %s", NULLSTR(devstr)); + VIR_WARN("Unable to release USB address on %s", NULLSTR(info->alia= s)); } diff --git a/src/qemu/qemu_domain_address.h b/src/qemu/qemu_domain_address.h index 875112bf8d..2c0e33320d 100644 --- a/src/qemu/qemu_domain_address.h +++ b/src/qemu/qemu_domain_address.h @@ -55,8 +55,7 @@ int qemuDomainFillDeviceIsolationGroup(virDomainDefPtr de= f, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); void qemuDomainReleaseDeviceAddress(virDomainObjPtr vm, - virDomainDeviceInfoPtr info, - const char *devstr); + virDomainDeviceInfoPtr info); int qemuDomainAssignMemoryDeviceSlot(virDomainDefPtr def, virDomainMemoryDefPtr mem); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index ae9cafa0da..4e94d80f21 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1020,7 +1020,7 @@ qemuDomainAttachVirtioDiskDevice(virQEMUDriverPtr dri= ver, if ((rv =3D qemuDomainAttachDiskGeneric(driver, vm, disk)) < 0) { if (rv =3D=3D -1 && releaseaddr) - qemuDomainReleaseDeviceAddress(vm, &disk->info, disk->dst); + qemuDomainReleaseDeviceAddress(vm, &disk->info); return -1; } @@ -1100,7 +1100,7 @@ int qemuDomainAttachControllerDevice(virQEMUDriverPtr= driver, cleanup: if (ret !=3D 0 && releaseaddr) - qemuDomainReleaseDeviceAddress(vm, &controller->info, NULL); + qemuDomainReleaseDeviceAddress(vm, &controller->info); VIR_FREE(devstr); return ret; @@ -1666,7 +1666,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, vm->def->nets[vm->def->nnets++] =3D net; } else { if (releaseaddr) - qemuDomainReleaseDeviceAddress(vm, &net->info, NULL); + qemuDomainReleaseDeviceAddress(vm, &net->info); if (iface_connected) { virErrorPreserveLast(&originalError); @@ -1883,7 +1883,7 @@ qemuDomainAttachHostPCIDevice(virQEMUDriverPtr driver, VIR_WARN("Unable to remove host device from /dev"); if (releaseaddr) - qemuDomainReleaseDeviceAddress(vm, info, NULL); + qemuDomainReleaseDeviceAddress(vm, info); qemuHostdevReAttachPCIDevices(driver, vm->def->name, &hostdev, 1); @@ -2160,7 +2160,7 @@ int qemuDomainAttachRedirdevDevice(virQEMUDriverPtr d= river, virDomainAuditRedirdev(vm, redirdev, "attach", ret =3D=3D 0); cleanup: if (ret < 0 && need_release) - qemuDomainReleaseDeviceAddress(vm, &redirdev->info, NULL); + qemuDomainReleaseDeviceAddress(vm, &redirdev->info); VIR_FREE(tlsAlias); VIR_FREE(charAlias); VIR_FREE(devstr); @@ -2427,7 +2427,7 @@ int qemuDomainAttachChrDevice(virQEMUDriverPtr driver, if (virDomainObjIsActive(vm)) qemuDomainChrInsertPreAllocCleanup(vmdef, chr); if (need_release) - qemuDomainReleaseDeviceAddress(vm, &chr->info, NULL); + qemuDomainReleaseDeviceAddress(vm, &chr->info); if (teardowncgroup && qemuTeardownChardevCgroup(vm, chr) < 0) VIR_WARN("Unable to remove chr device cgroup ACL on hotplug fa= il"); if (teardownlabel && qemuSecurityRestoreChardevLabel(driver, vm, c= hr) < 0) @@ -2544,7 +2544,7 @@ qemuDomainAttachRNGDevice(virQEMUDriverPtr driver, virJSONValueFree(props); if (ret < 0) { if (releaseaddr) - qemuDomainReleaseDeviceAddress(vm, &rng->info, NULL); + qemuDomainReleaseDeviceAddress(vm, &rng->info); if (teardowncgroup && qemuTeardownRNGCgroup(vm, rng) < 0) VIR_WARN("Unable to remove RNG device cgroup ACL on hotplug fa= il"); if (teardowndevice && qemuDomainNamespaceTeardownRNG(vm, rng) < 0) @@ -3038,7 +3038,7 @@ qemuDomainAttachSCSIVHostDevice(virQEMUDriverPtr driv= er, qemuDomainNamespaceTeardownHostdev(vm, hostdev) < 0) VIR_WARN("Unable to remove host device from /dev"); if (releaseaddr) - qemuDomainReleaseDeviceAddress(vm, hostdev->info, NULL); + qemuDomainReleaseDeviceAddress(vm, hostdev->info); } virDomainCCWAddressSetFree(ccwaddrs); @@ -3132,7 +3132,7 @@ qemuDomainAttachMediatedDevice(virQEMUDriverPtr drive= r, vm->def->name, &hostdev, 1); - qemuDomainReleaseDeviceAddress(vm, hostdev->info, NULL); + qemuDomainReleaseDeviceAddress(vm, hostdev->info); } VIR_FREE(devstr); return ret; @@ -3287,7 +3287,7 @@ qemuDomainAttachShmemDevice(virQEMUDriverPtr driver, cleanup: if (release_address) - qemuDomainReleaseDeviceAddress(vm, &shmem->info, NULL); + qemuDomainReleaseDeviceAddress(vm, &shmem->info); virJSONValueFree(props); VIR_FREE(memAlias); @@ -3380,7 +3380,7 @@ qemuDomainAttachWatchdog(virQEMUDriverPtr driver, cleanup: if (releaseAddress) - qemuDomainReleaseDeviceAddress(vm, &watchdog->info, NULL); + qemuDomainReleaseDeviceAddress(vm, &watchdog->info); VIR_FREE(watchdogstr); return ret; } @@ -3472,7 +3472,7 @@ qemuDomainAttachInputDevice(virQEMUDriverPtr driver, if (teardowndevice) qemuDomainNamespaceTeardownInput(vm, input); if (releaseaddr) - qemuDomainReleaseDeviceAddress(vm, &input->info, NULL); + qemuDomainReleaseDeviceAddress(vm, &input->info); virErrorRestore(&originalError); } @@ -3548,7 +3548,7 @@ qemuDomainAttachVsockDevice(virQEMUDriverPtr driver, if (ret < 0) { virErrorPreserveLast(&originalError); if (releaseaddr) - qemuDomainReleaseDeviceAddress(vm, &vsock->info, NULL); + qemuDomainReleaseDeviceAddress(vm, &vsock->info); virErrorRestore(&originalError); } @@ -4508,7 +4508,7 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver, virDomainAuditDisk(vm, disk->src, NULL, "detach", true); - qemuDomainReleaseDeviceAddress(vm, &disk->info, virDomainDiskGetSource= (disk)); + qemuDomainReleaseDeviceAddress(vm, &disk->info); /* tear down disk security access */ qemuHotplugPrepareDiskSourceAccess(driver, vm, disk->src, true); @@ -4545,7 +4545,7 @@ qemuDomainRemoveControllerDevice(virDomainObjPtr vm, } } - qemuDomainReleaseDeviceAddress(vm, &controller->info, NULL); + qemuDomainReleaseDeviceAddress(vm, &controller->info); virDomainControllerDefFree(controller); return 0; } @@ -4613,7 +4613,7 @@ qemuDomainRemovePCIHostDevice(virQEMUDriverPtr driver, virDomainHostdevDefPtr hostdev) { qemuHostdevReAttachPCIDevices(driver, vm->def->name, &hostdev, 1); - qemuDomainReleaseDeviceAddress(vm, hostdev->info, NULL); + qemuDomainReleaseDeviceAddress(vm, hostdev->info); } static void @@ -4622,7 +4622,7 @@ qemuDomainRemoveUSBHostDevice(virQEMUDriverPtr driver, virDomainHostdevDefPtr hostdev) { qemuHostdevReAttachUSBDevices(driver, vm->def->name, &hostdev, 1); - qemuDomainReleaseDeviceAddress(vm, hostdev->info, NULL); + qemuDomainReleaseDeviceAddress(vm, hostdev->info); } static void @@ -4648,7 +4648,7 @@ qemuDomainRemoveMediatedDevice(virQEMUDriverPtr drive= r, virDomainHostdevDefPtr hostdev) { qemuHostdevReAttachMediatedDevices(driver, vm->def->name, &hostdev, 1); - qemuDomainReleaseDeviceAddress(vm, hostdev->info, NULL); + qemuDomainReleaseDeviceAddress(vm, hostdev->info); } @@ -4842,7 +4842,7 @@ qemuDomainRemoveNetDevice(virQEMUDriverPtr driver, } } - qemuDomainReleaseDeviceAddress(vm, &net->info, NULL); + qemuDomainReleaseDeviceAddress(vm, &net->info); virDomainConfNWFilterTeardown(net); if (cfg->macFilter && (net->ifname !=3D NULL)) { @@ -4917,7 +4917,7 @@ qemuDomainRemoveChrDevice(virQEMUDriverPtr driver, if (qemuDomainNamespaceTeardownChardev(vm, chr) < 0) VIR_WARN("Unable to remove chr device from /dev"); - qemuDomainReleaseDeviceAddress(vm, &chr->info, NULL); + qemuDomainReleaseDeviceAddress(vm, &chr->info); qemuDomainChrRemove(vm->def, chr); /* The caller does not emit the event, so we must do it here. Note @@ -4991,7 +4991,7 @@ qemuDomainRemoveRNGDevice(virQEMUDriverPtr driver, if ((idx =3D virDomainRNGFind(vm->def, rng)) >=3D 0) virDomainRNGRemove(vm->def, idx); - qemuDomainReleaseDeviceAddress(vm, &rng->info, NULL); + qemuDomainReleaseDeviceAddress(vm, &rng->info); virDomainRNGDefFree(rng); ret =3D 0; @@ -5042,7 +5042,7 @@ qemuDomainRemoveShmemDevice(virQEMUDriverPtr driver, if ((idx =3D virDomainShmemDefFind(vm->def, shmem)) >=3D 0) virDomainShmemDefRemove(vm->def, idx); - qemuDomainReleaseDeviceAddress(vm, &shmem->info, NULL); + qemuDomainReleaseDeviceAddress(vm, &shmem->info); virDomainShmemDefFree(shmem); ret =3D 0; @@ -5061,7 +5061,7 @@ qemuDomainRemoveWatchdog(virDomainObjPtr vm, VIR_DEBUG("Removing watchdog %s from domain %p %s", watchdog->info.alias, vm, vm->def->name); - qemuDomainReleaseDeviceAddress(vm, &watchdog->info, NULL); + qemuDomainReleaseDeviceAddress(vm, &watchdog->info); virDomainWatchdogDefFree(vm->def->watchdog); vm->def->watchdog =3D NULL; return 0; @@ -5081,7 +5081,7 @@ qemuDomainRemoveInputDevice(virDomainObjPtr vm, if (vm->def->inputs[i] =3D=3D dev) break; } - qemuDomainReleaseDeviceAddress(vm, &dev->info, NULL); + qemuDomainReleaseDeviceAddress(vm, &dev->info); if (qemuSecurityRestoreInputLabel(vm, dev) < 0) VIR_WARN("Unable to restore security label on input device"); @@ -5104,7 +5104,7 @@ qemuDomainRemoveVsockDevice(virDomainObjPtr vm, VIR_DEBUG("Removing vsock device %s from domain %p %s", dev->info.alias, vm, vm->def->name); - qemuDomainReleaseDeviceAddress(vm, &dev->info, NULL); + qemuDomainReleaseDeviceAddress(vm, &dev->info); virDomainVsockDefFree(vm->def->vsock); vm->def->vsock =3D NULL; return 0; @@ -5143,7 +5143,7 @@ qemuDomainRemoveRedirdevDevice(virQEMUDriverPtr drive= r, if ((idx =3D virDomainRedirdevDefFind(vm->def, dev)) >=3D 0) virDomainRedirdevDefRemove(vm->def, idx); - qemuDomainReleaseDeviceAddress(vm, &dev->info, NULL); + qemuDomainReleaseDeviceAddress(vm, &dev->info); virDomainRedirdevDefFree(dev); ret =3D 0; --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 19:08:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1553776865518127.12318275313226; Thu, 28 Mar 2019 05:41:05 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2CE7A3087948; Thu, 28 Mar 2019 12:41:04 +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 022F86FDDB; Thu, 28 Mar 2019 12:41:04 +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 B365D181A009; Thu, 28 Mar 2019 12:41:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x2SCepF0031174 for ; Thu, 28 Mar 2019 08:40:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7E55062699; Thu, 28 Mar 2019 12:40:51 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id D296F5D73F; Thu, 28 Mar 2019 12:40:50 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 28 Mar 2019 13:40:42 +0100 Message-Id: <54eb3e096b60e2231ed4e935c33772cf4da6acf8.1553776815.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 3/3] qemu: address: Stop reporting warning when USB address can't be released 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Thu, 28 Mar 2019 12:41:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" The warning is reported at a code path which already reports a proper error so it's pointless to add yet another line into logs. Signed-off-by: Peter Krempa --- src/qemu/qemu_domain_address.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index f217d1599a..28e79af7b1 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -3264,8 +3264,7 @@ qemuDomainReleaseDeviceAddress(virDomainObjPtr vm, virDomainPCIAddressExtensionReleaseAddr(priv->pciaddrs, &info->add= r.pci); } - if (virDomainUSBAddressRelease(priv->usbaddrs, info) < 0) - VIR_WARN("Unable to release USB address on %s", NULLSTR(info->alia= s)); + virDomainUSBAddressRelease(priv->usbaddrs, info); } --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list