From nobody Tue Apr 30 00:39:12 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; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 151392997483613.648800679220926; Fri, 22 Dec 2017 00:06:14 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 278E425787; Fri, 22 Dec 2017 08:06:13 +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 DC6C62C7B6; Fri, 22 Dec 2017 08:06:12 +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 74EB8180121B; Fri, 22 Dec 2017 08:06:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id vBM86BFd028423 for ; Fri, 22 Dec 2017 03:06:11 -0500 Received: by smtp.corp.redhat.com (Postfix) id 5F6AA18201; Fri, 22 Dec 2017 08:06:11 +0000 (UTC) Received: from mx1.redhat.com (ext-mx08.extmail.prod.ext.phx2.redhat.com [10.5.110.32]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7D99E18034; Fri, 22 Dec 2017 08:06:08 +0000 (UTC) Received: from m15-114.126.com (m15-114.126.com [220.181.15.114]) by mx1.redhat.com (Postfix) with ESMTP id 1E702C058ECC; Fri, 22 Dec 2017 08:06:06 +0000 (UTC) Received: from localhost.localdomain (unknown [58.213.111.46]) by smtp7 (Coremail) with SMTP id DsmowACnYezWvDxavtXOAw--.10579S3; Fri, 22 Dec 2017 16:06:00 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=M/V5tjpnV+fKQLy4Hz YwCqZmHm5FFQGqPIIVso4gxsw=; b=cJtv0hYrW4017Ml18EsqOM5TCmjjTIgxNQ gvU2RgzRjsyYQVduwclmoJfhxrHxDXvB6PPARnMy/c65fMRVQa8n/YcavgTqOpWN VqYY6BQJw+WXYxV9NIudLjs9nqicdU1ovOZC6ZpZ4S/X8MB5hxrLBQAfnvD5//fv 5HYOWZARk= From: Chen Hanxiao To: libvir-list@redhat.com Date: Fri, 22 Dec 2017 16:04:03 +0800 Message-Id: <20171222080404.10683-2-chen_han_xiao@126.com> In-Reply-To: <20171222080404.10683-1-chen_han_xiao@126.com> References: <20171222080404.10683-1-chen_han_xiao@126.com> X-CM-TRANSID: DsmowACnYezWvDxavtXOAw--.10579S3 X-Coremail-Antispam: 1Uf129KBjvJXoW3Jr1DAw1UCr48Zr43Kry3urg_yoW7GF18pF WrAa4YyrW5Xw429ws3WayUZF1rCa4vgr4DKw43Wr4Iqw13Jr4kWF1Svryjvry5KF9xJF42 9342v3yDuFsxKFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07j8YFAUUUUU= X-Originating-IP: [58.213.111.46] X-CM-SenderInfo: xfkh0spkdqs5xldrqiyswou0bp/1tbitAi2rlUJfD55HQAAse X-Greylist: Delayed for 46:34:17 by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 22 Dec 2017 08:06:07 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 22 Dec 2017 08:06:07 +0000 (UTC) for IP:'220.181.15.114' DOMAIN:'m15-114.126.com' HELO:'m15-114.126.com' FROM:'chen_han_xiao@126.com' RCPT:'' X-RedHat-Blacklist-Warning: Relay 220.181.15.114 is blacklisted by a RBL system X-RedHat-Spam-Score: 2 ** (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_PSBL, RCVD_IN_SBL_CSS, SPF_PASS, T_RP_MATCHES_RCVD) 220.181.15.114 m15-114.126.com 220.181.15.114 m15-114.126.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.32 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Chen Hanxiao Subject: [libvirt] [PATCH v3 1/2] qemu: Add support for hot unplugging redirdev device which can use the detach-device --live 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: , MIME-Version: 1.0 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Fri, 22 Dec 2017 08:06:13 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Chen Hanxiao We lacked of hot unplugging redirdev device. This patch add support for it. We could use detach-device --live now. Signed-off-by: Chen Hanxiao Reviewed-by: John Ferlan --- v3: use helper qemuDomainDelChardevTLSObjects address John's comments v2: rebase on master src/qemu/qemu_driver.c | 4 ++- src/qemu/qemu_hotplug.c | 91 +++++++++++++++++++++++++++++++++++++++++++++= ++++ src/qemu/qemu_hotplug.h | 4 +++ 3 files changed, 98 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 97b194b05..a91288d4b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7787,6 +7787,9 @@ qemuDomainDetachDeviceLive(virDomainObjPtr vm, case VIR_DOMAIN_DEVICE_INPUT: ret =3D qemuDomainDetachInputDevice(vm, dev->data.input); break; + case VIR_DOMAIN_DEVICE_REDIRDEV: + ret =3D qemuDomainDetachRedirdevDevice(driver, vm, dev->data.redir= dev); + break; =20 case VIR_DOMAIN_DEVICE_FS: case VIR_DOMAIN_DEVICE_SOUND: @@ -7796,7 +7799,6 @@ qemuDomainDetachDeviceLive(virDomainObjPtr vm, case VIR_DOMAIN_DEVICE_SMARTCARD: case VIR_DOMAIN_DEVICE_MEMBALLOON: case VIR_DOMAIN_DEVICE_NVRAM: - case VIR_DOMAIN_DEVICE_REDIRDEV: case VIR_DOMAIN_DEVICE_NONE: case VIR_DOMAIN_DEVICE_TPM: case VIR_DOMAIN_DEVICE_PANIC: diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index b79807300..724ee4f3f 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -4388,6 +4388,54 @@ qemuDomainRemoveInputDevice(virDomainObjPtr vm, } =20 =20 +static int +qemuDomainRemoveRedirdevDevice(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virDomainRedirdevDefPtr dev) +{ + qemuDomainObjPrivatePtr priv =3D vm->privateData; + virObjectEventPtr event; + char *charAlias =3D NULL; + ssize_t idx; + int ret =3D -1; + + VIR_DEBUG("Removing redirdev device %s from domain %p %s", + dev->info.alias, vm, vm->def->name); + + if (!(charAlias =3D qemuAliasChardevFromDevAlias(dev->info.alias))) + goto cleanup; + + qemuDomainObjEnterMonitor(driver, vm); + /* DeviceDel from Detach may remove chardev, + * so we cannot rely on return status to delete TLS chardevs. + */ + ignore_value(qemuMonitorDetachCharDev(priv->mon, charAlias)); + + if (qemuDomainObjExitMonitor(driver, vm) < 0) + goto cleanup; + + if (qemuDomainDelChardevTLSObjects(driver, vm, + dev->source, charAlias) < 0) + goto cleanup; + + virDomainAuditRedirdev(vm, dev, "detach", true); + + event =3D virDomainEventDeviceRemovedNewFromObj(vm, dev->info.alias); + qemuDomainEventQueue(driver, event); + + if ((idx =3D virDomainRedirdevDefFind(vm->def, dev)) >=3D 0) + virDomainRedirdevDefRemove(vm->def, idx); + qemuDomainReleaseDeviceAddress(vm, &dev->info, NULL); + virDomainRedirdevDefFree(dev); + + ret =3D 0; + + cleanup: + VIR_FREE(charAlias); + return ret; +} + + int qemuDomainRemoveDevice(virQEMUDriverPtr driver, virDomainObjPtr vm, @@ -5128,6 +5176,49 @@ qemuDomainDetachWatchdog(virQEMUDriverPtr driver, } =20 =20 +int +qemuDomainDetachRedirdevDevice(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virDomainRedirdevDefPtr dev) +{ + int ret =3D -1; + qemuDomainObjPrivatePtr priv =3D vm->privateData; + virDomainRedirdevDefPtr tmpRedirdevDef; + ssize_t idx; + + if ((idx =3D virDomainRedirdevDefFind(vm->def, dev)) < 0) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("no matching redirdev was not found")); + return -1; + } + + tmpRedirdevDef =3D vm->def->redirdevs[idx]; + + if (!tmpRedirdevDef->info.alias) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("alias not set for redirdev device")); + return -1; + } + + qemuDomainMarkDeviceForRemoval(vm, &tmpRedirdevDef->info); + + qemuDomainObjEnterMonitor(driver, vm); + if (qemuMonitorDelDevice(priv->mon, tmpRedirdevDef->info.alias) < 0) { + ignore_value(qemuDomainObjExitMonitor(driver, vm)); + goto cleanup; + } + if (qemuDomainObjExitMonitor(driver, vm) < 0) + goto cleanup; + + if ((ret =3D qemuDomainWaitForDeviceRemoval(vm)) =3D=3D 1) + ret =3D qemuDomainRemoveRedirdevDevice(driver, vm, tmpRedirdevDef); + + cleanup: + qemuDomainResetDeviceRemoval(vm); + return ret; +} + + int qemuDomainDetachNetDevice(virQEMUDriverPtr driver, virDomainObjPtr vm, diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h index 3e0d618e0..9a0c057f1 100644 --- a/src/qemu/qemu_hotplug.h +++ b/src/qemu/qemu_hotplug.h @@ -126,6 +126,10 @@ int qemuDomainDetachWatchdog(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainWatchdogDefPtr watchdog); =20 +int qemuDomainDetachRedirdevDevice(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virDomainRedirdevDefPtr dev); + int qemuDomainAttachInputDevice(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainInputDefPtr input); --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue Apr 30 00:39:12 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; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1513929972633127.8593450341059; Fri, 22 Dec 2017 00:06:12 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8157D2BF05; Fri, 22 Dec 2017 08:06:10 +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 0715B63768; Fri, 22 Dec 2017 08:06:10 +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 127D71801218; Fri, 22 Dec 2017 08:06:09 +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 vBM868V4028253 for ; Fri, 22 Dec 2017 03:06:08 -0500 Received: by smtp.corp.redhat.com (Postfix) id 208A860569; Fri, 22 Dec 2017 08:06:08 +0000 (UTC) Received: from mx1.redhat.com (ext-mx09.extmail.prod.ext.phx2.redhat.com [10.5.110.38]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 28709600D4; Fri, 22 Dec 2017 08:06:05 +0000 (UTC) Received: from m15-114.126.com (m15-114.126.com [220.181.15.114]) by mx1.redhat.com (Postfix) with ESMTP id 18F9549032; Fri, 22 Dec 2017 08:06:03 +0000 (UTC) Received: from localhost.localdomain (unknown [58.213.111.46]) by smtp7 (Coremail) with SMTP id DsmowACnYezWvDxavtXOAw--.10579S4; Fri, 22 Dec 2017 16:06:00 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=C++kaHHhcPeGhWk46G 4A7yhc0psSwdxyX/yZKtmWChI=; b=UOm5SOJhw44aOz9C+thxCWkDlFNiWVT8eU Zci+U387LmVL4i463Ph8L2DkpdANFWDrXCL3rwV2u0Q9p2oM6K/CImaVQkRUKMJD w19jD8Ct+KnIBOjhiRtdaYUC9pC/bKGFAOWH8eaAkdS97jxEtwTfYKCgfmKHRNri 8dPEqHTpA= From: Chen Hanxiao To: libvir-list@redhat.com Date: Fri, 22 Dec 2017 16:04:04 +0800 Message-Id: <20171222080404.10683-3-chen_han_xiao@126.com> In-Reply-To: <20171222080404.10683-1-chen_han_xiao@126.com> References: <20171222080404.10683-1-chen_han_xiao@126.com> X-CM-TRANSID: DsmowACnYezWvDxavtXOAw--.10579S4 X-Coremail-Antispam: 1Uf129KBjvdXoWruw1xWr47Kr4UCw45Ww47XFb_yoWfGwc_u3 s7Z3WkX3y5Jr1Sy3yYgr4rXry8uw48Gr4jkwnxKFy5t348Zrs5Z3s2q393try7WFW2kFya 93sxGa18KrW2kjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU8XtxDUUUUU== X-Originating-IP: [58.213.111.46] X-CM-SenderInfo: xfkh0spkdqs5xldrqiyswou0bp/1tbitAi2rlUJfD55HwAAsc X-Greylist: Delayed for 46:34:14 by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 22 Dec 2017 08:06:04 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 22 Dec 2017 08:06:04 +0000 (UTC) for IP:'220.181.15.114' DOMAIN:'m15-114.126.com' HELO:'m15-114.126.com' FROM:'chen_han_xiao@126.com' RCPT:'' X-RedHat-Blacklist-Warning: Relay 220.181.15.114 is blacklisted by a RBL system X-RedHat-Spam-Score: 2 ** (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_PSBL, RCVD_IN_SBL_CSS, SPF_PASS, T_RP_MATCHES_RCVD) 220.181.15.114 m15-114.126.com 220.181.15.114 m15-114.126.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.38 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Chen Hanxiao Subject: [libvirt] [PATCH v3 2/2] news: add change of hot unplug redirdev 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: , MIME-Version: 1.0 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Fri, 22 Dec 2017 08:06:11 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Chen Hanxiao Add hot unplug redirdev in news 'Improvements' section Signed-off-by: Chen Hanxiao Reviewed-by: John Ferlan --- v3: move it into 'Improvements' section docs/news.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index bb611b7ba..513728d09 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -42,6 +42,17 @@ Xen: Add support for multiple IP addresses on interface devices + + + qemu: Add support for hot unplugging redirdev device + which can use the detach-device --live + + + We've supported hotplug redirdev device, but lacked of + hot unplug redirdev feature. + Now we can do it by libvirt. + +
--=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list