From nobody Fri Apr 19 12:11:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1575020653; cv=none; d=zohomail.com; s=zohoarc; b=acRTMmH1SwqoDRxG5v0RfwJyu+j/QhYvcwPRttvQBhR2EOkxeUcMnlSDQktsAar0TPFCQy8QxD9cf0Nr3XackGbf4O+MvA57R5Ygt602XBNRfnolMQP9cBypy+zm2ZEg5DvTjR2cr7qZ76RNauHYRcSihGCODDTW6d+ihjJGIg8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575020653; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=oGs7q2laAmZaD7LoFE39cfV0ljWcgMBQI+OV+ndL24Q=; b=FEo8KilapiWmdueDqSfM1Gwwmr6oHsZvPp8B8P8pS6LSW1ae5Z28aSU4T9hSvH3KmQTTV2P2GKZvjbskge7UtXPlccsxoacCf7BSsUbbP32b3d7HGCti8/kDCJjNkqjuHTQn6CcXgWDsAUZ4mJ1cZRckrkCwv+QMlfSe3BZSl0E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1575020652233765.8883776394756; Fri, 29 Nov 2019 01:44:12 -0800 (PST) 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-62-EncnQKvPNH2B7Gfc1BHLSA-1; Fri, 29 Nov 2019 04:44:09 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id D0E35800D53; Fri, 29 Nov 2019 09:44: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 43C8F608F8; Fri, 29 Nov 2019 09:44:03 +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 0FE9818089CD; Fri, 29 Nov 2019 09:44:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xAT9hr1i006565 for ; Fri, 29 Nov 2019 04:43:58 -0500 Received: by smtp.corp.redhat.com (Postfix) id F404B2022AC6; Fri, 29 Nov 2019 09:43:52 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EFB5E2026D69 for ; Fri, 29 Nov 2019 09:43:50 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D42AA85A31C for ; Fri, 29 Nov 2019 09:43:50 +0000 (UTC) Received: from cmccmta2.chinamobile.com (cmccmta2.chinamobile.com [221.176.66.80]) by relay.mimecast.com with ESMTP id us-mta-195-xb87bCZqOCi3MlChFdpUCg-1; Fri, 29 Nov 2019 04:43:48 -0500 Received: from spf.mail.chinamobile.com (unknown[172.16.121.13]) by rmmx-syy-dmz-app07-12007 (RichMail) with SMTP id 2ee75de0e84662c-39f3e; Fri, 29 Nov 2019 17:43:34 +0800 (CST) Received: from localhost.localdomain (unknown[223.105.0.241]) by rmsmtp-syy-appsvr07-12007 (RichMail) with SMTP id 2ee75de0e832975-90217; Fri, 29 Nov 2019 17:43:34 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575020651; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=oGs7q2laAmZaD7LoFE39cfV0ljWcgMBQI+OV+ndL24Q=; b=Yhh7EJCaSms8HRkmI43rRrH6V4I6eypNHnr7rdJs2vP1JLUyrXa3M77NXVXbE4EQYrUQpc EnNwaODcMEBK8jl/6KyhcyjOhaefAo6WRtgQuG/KN8geCPFBp8dDvDTNCzuXJDjD8qy5fC 832O5S+rr9cshI8QqiJF8NKRMEF48H0= X-RM-TRANSID: 2ee75de0e84662c-39f3e X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 X-RM-TRANSID: 2ee75de0e832975-90217 From: Jidong Xia To: libvir-list@redhat.com Date: Fri, 29 Nov 2019 17:40:46 +0800 Message-Id: <1575020447-28454-1-git-send-email-xiajidong@cmss.chinamobile.com> X-MC-Unique: xb87bCZqOCi3MlChFdpUCg-1 X-MC-Unique: EncnQKvPNH2B7Gfc1BHLSA-1 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id xAT9hr1i006565 X-loop: libvir-list@redhat.com Cc: Jidong Xia , crobinso@redhat.com Subject: [libvirt] [PATCH v2] qemu: cold-unplug of sound 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 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-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" With this patch users can cold unplug some sound devices. use "virsh detach-device vm sound.xml --config" command. Signed-off-by: Jidong Xia --- src/conf/domain_conf.c | 48 ++++++++++++++++++++++++++++++++++++++++++++= ++++ src/conf/domain_conf.h | 3 +++ src/libvirt_private.syms | 2 ++ src/qemu/qemu_driver.c | 9 ++++++++- 4 files changed, 61 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9580884..4b28502 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2753,6 +2753,14 @@ void virDomainSoundDefFree(virDomainSoundDefPtr def) VIR_FREE(def); } +virDomainSoundDefPtr +virDomainSoundDefRemove(virDomainDefPtr def, size_t idx) +{ + virDomainSoundDefPtr ret =3D def->sounds[idx]; + VIR_DELETE_ELEMENT(def->sounds, idx, def->nsounds); + return ret; +} + void virDomainMemballoonDefFree(virDomainMemballoonDefPtr def) { if (!def) @@ -14554,6 +14562,46 @@ virDomainSoundDefParseXML(virDomainXMLOptionPtr xm= lopt, } +static bool +virDomainSoundDefEquals(const virDomainSoundDef *a, + const virDomainSoundDef *b) +{ + size_t i; + + if (a->model !=3D b->model) + return false; + + if (a->ncodecs !=3D b->ncodecs) + return false; + + for (i =3D 0; i < a->ncodecs; i++) { + if (a->codecs[i]->type !=3D b->codecs[i]->type) + return false; + } + + if (a->info.type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && + !virDomainDeviceInfoAddressIsEqual(&a->info, &b->info)) + return false; + + return true; +} + + +ssize_t +virDomainSoundDefFind(const virDomainDef *def, + const virDomainSoundDef *sound) +{ + size_t i; + + for (i =3D 0; i < def->nsounds; i++) { + if (virDomainSoundDefEquals(sound, def->sounds[i])) + return i; + } + + return -1; +} + + static virDomainWatchdogDefPtr virDomainWatchdogDefParseXML(virDomainXMLOptionPtr xmlopt, xmlNodePtr node, diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 49cb697..cdb7b92 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2883,7 +2883,10 @@ void virDomainChrDefFree(virDomainChrDefPtr def); int virDomainChrSourceDefCopy(virDomainChrSourceDefPtr dest, virDomainChrSourceDefPtr src); void virDomainSoundCodecDefFree(virDomainSoundCodecDefPtr def); +ssize_t virDomainSoundDefFind(const virDomainDef *def, + const virDomainSoundDef *sound); void virDomainSoundDefFree(virDomainSoundDefPtr def); +virDomainSoundDefPtr virDomainSoundDefRemove(virDomainDefPtr def, size_t i= dx); void virDomainMemballoonDefFree(virDomainMemballoonDefPtr def); void virDomainNVRAMDefFree(virDomainNVRAMDefPtr def); void virDomainWatchdogDefFree(virDomainWatchdogDefPtr def); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 8fe0bf9..cdbd64f 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -578,7 +578,9 @@ virDomainSmartcardTypeFromString; virDomainSmartcardTypeToString; virDomainSmbiosModeTypeFromString; virDomainSmbiosModeTypeToString; +virDomainSoundDefFind; virDomainSoundDefFree; +virDomainSoundDefRemove; virDomainSoundModelTypeFromString; virDomainSoundModelTypeToString; virDomainStartupPolicyTypeFromString; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 18bd010..8d91bb2 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8302,6 +8302,7 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef, { virDomainDiskDefPtr disk, det_disk; virDomainNetDefPtr net; + virDomainSoundDefPtr sound; virDomainHostdevDefPtr hostdev, det_hostdev; virDomainLeaseDefPtr lease, det_lease; virDomainControllerDefPtr cont, det_cont; @@ -8330,6 +8331,13 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef, virDomainNetDefFree(virDomainNetRemove(vmdef, idx)); break; + case VIR_DOMAIN_DEVICE_SOUND: + sound =3D dev->data.sound; + if ((idx =3D virDomainSoundDefFind(vmdef, sound)) < 0) + return -1; + virDomainSoundDefFree(virDomainSoundDefRemove(vmdef, idx)); + break; + case VIR_DOMAIN_DEVICE_HOSTDEV: { hostdev =3D dev->data.hostdev; if ((idx =3D virDomainHostdevFind(vmdef, hostdev, &det_hostdev)) <= 0) { @@ -8460,7 +8468,6 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef, vmdef->vsock =3D NULL; break; - case VIR_DOMAIN_DEVICE_SOUND: case VIR_DOMAIN_DEVICE_VIDEO: case VIR_DOMAIN_DEVICE_GRAPHICS: case VIR_DOMAIN_DEVICE_HUB: -- 1.8.3.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list