From nobody Sun Feb 8 20:59:52 2026 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 1539334261097969.881118272468; Fri, 12 Oct 2018 01:51:01 -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 10F045F732; Fri, 12 Oct 2018 08:50:59 +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 BD09D1057067; Fri, 12 Oct 2018 08:50:58 +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 61717180B5B7; Fri, 12 Oct 2018 08:50:58 +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 w9C8onDZ006119 for ; Fri, 12 Oct 2018 04:50:49 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5E0865D6B3; Fri, 12 Oct 2018 08:50:49 +0000 (UTC) Received: from hansolo.pek2.redhat.com (wlc-trust-100.pek2.redhat.com [10.72.3.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 356D06247C; Fri, 12 Oct 2018 08:50:45 +0000 (UTC) From: Han Han To: libvir-list@redhat.com Date: Fri, 12 Oct 2018 16:50:13 +0800 Message-Id: <20181012085014.15743-8-hhan@redhat.com> In-Reply-To: <20181012085014.15743-1-hhan@redhat.com> References: <20181012085014.15743-1-hhan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Han Han Subject: [libvirt] [PATCH v2 7/8] qemu: implement usb hub device hotunplug 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.39]); Fri, 12 Oct 2018 08:50:59 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" https://bugzilla.redhat.com/show_bug.cgi?id=3D1375423 Signed-off-by: Han Han --- src/qemu/qemu_driver.c | 5 ++- src/qemu/qemu_hotplug.c | 74 ++++++++++++++++++++++++++++++++++++++++- src/qemu/qemu_hotplug.h | 4 +++ 3 files changed, 81 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index de764a7f1c..c8a6d98dc0 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7822,11 +7822,14 @@ qemuDomainDetachDeviceLive(virDomainObjPtr vm, ret =3D qemuDomainDetachVsockDevice(vm, dev->data.vsock, async); break; =20 + case VIR_DOMAIN_DEVICE_HUB: + ret =3D qemuDomainDetachHubDevice(vm, dev->data.hub, async); + break; + case VIR_DOMAIN_DEVICE_FS: case VIR_DOMAIN_DEVICE_SOUND: case VIR_DOMAIN_DEVICE_VIDEO: case VIR_DOMAIN_DEVICE_GRAPHICS: - case VIR_DOMAIN_DEVICE_HUB: case VIR_DOMAIN_DEVICE_SMARTCARD: case VIR_DOMAIN_DEVICE_MEMBALLOON: case VIR_DOMAIN_DEVICE_NVRAM: diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 1b6cc36bc8..87749ec011 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -4965,6 +4965,32 @@ qemuDomainRemoveRedirdevDevice(virQEMUDriverPtr driv= er, } =20 =20 +static int +qemuDomainRemoveHubDevice(virDomainObjPtr vm, + virDomainHubDefPtr dev) +{ + qemuDomainObjPrivatePtr priv =3D vm->privateData; + virQEMUDriverPtr driver =3D priv->driver; + virObjectEventPtr event =3D NULL; + size_t i; + + VIR_DEBUG("Removing hub device %s from domain %p %s", + dev->info.alias, vm, vm->def->name); + + event =3D virDomainEventDeviceRemovedNewFromObj(vm, dev->info.alias); + virObjectEventStateQueue(driver->domainEventState, event); + for (i =3D 0; i < vm->def->nhubs; i++) { + if (vm->def->hubs[i] =3D=3D dev) + break; + } + qemuDomainReleaseDeviceAddress(vm, &dev->info, NULL); + + virDomainHubDefFree(vm->def->hubs[i]); + VIR_DELETE_ELEMENT(vm->def->hubs, i, vm->def->nhubs); + return 0; +} + + int qemuDomainRemoveDevice(virQEMUDriverPtr driver, virDomainObjPtr vm, @@ -5016,13 +5042,16 @@ qemuDomainRemoveDevice(virQEMUDriverPtr driver, ret =3D qemuDomainRemoveVsockDevice(vm, dev->data.vsock); break; =20 + case VIR_DOMAIN_DEVICE_HUB: + ret =3D qemuDomainRemoveHubDevice(vm, dev->data.hub); + break; + case VIR_DOMAIN_DEVICE_NONE: case VIR_DOMAIN_DEVICE_LEASE: case VIR_DOMAIN_DEVICE_FS: case VIR_DOMAIN_DEVICE_SOUND: case VIR_DOMAIN_DEVICE_VIDEO: case VIR_DOMAIN_DEVICE_GRAPHICS: - case VIR_DOMAIN_DEVICE_HUB: case VIR_DOMAIN_DEVICE_SMARTCARD: case VIR_DOMAIN_DEVICE_MEMBALLOON: case VIR_DOMAIN_DEVICE_NVRAM: @@ -6955,3 +6984,46 @@ qemuDomainDetachVsockDevice(virDomainObjPtr vm, qemuDomainResetDeviceRemoval(vm); return ret; } + + +int +qemuDomainDetachHubDevice(virDomainObjPtr vm, + virDomainHubDefPtr def, + bool async) +{ + qemuDomainObjPrivatePtr priv =3D vm->privateData; + virQEMUDriverPtr driver =3D priv->driver; + virDomainHubDefPtr hub; + int ret =3D -1; + int idx; + + if ((idx =3D virDomainHubDefFind(vm->def, def)) < 0) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("matching hub device not found")); + return -1; + } + hub =3D vm->def->hubs[idx]; + + if (!async) + qemuDomainMarkDeviceForRemoval(vm, &hub->info); + + qemuDomainObjEnterMonitor(driver, vm); + if (qemuMonitorDelDevice(priv->mon, hub->info.alias)) { + ignore_value(qemuDomainObjExitMonitor(driver, vm)); + goto cleanup; + } + if (qemuDomainObjExitMonitor(driver, vm) < 0) + goto cleanup; + + if (async) { + ret =3D 0; + } else { + if ((ret =3D qemuDomainWaitForDeviceRemoval(vm)) =3D=3D 1) + ret =3D qemuDomainRemoveHubDevice(vm, hub); + } + + cleanup: + if (!async) + qemuDomainResetDeviceRemoval(vm); + return ret; +} diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h index 444333c4df..0f205ff54b 100644 --- a/src/qemu/qemu_hotplug.h +++ b/src/qemu/qemu_hotplug.h @@ -208,4 +208,8 @@ int qemuDomainDetachInputDevice(virDomainObjPtr vm, int qemuDomainDetachVsockDevice(virDomainObjPtr vm, virDomainVsockDefPtr dev, bool async); + +int qemuDomainDetachHubDevice(virDomainObjPtr vm, + virDomainHubDefPtr def, + bool async); #endif /* __QEMU_HOTPLUG_H__ */ --=20 2.19.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list