From nobody Tue May 7 00:27:40 2024 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=1605279542; cv=none; d=zohomail.com; s=zohoarc; b=IMYLgwMHBWEsKgm7LWS5fGRKz9Dt/RtKcBuas3CQnzRoJRA1EdnLAJ0x5G6nSkhw+f6KSCQTiYtvfyLB0hg0DI4e6ramFE56VGoZ7aOitzO+LuFYm/wCq8/Z1wdAUPvrceL6HcPRiaRtC6qTh8Alb6iKVVTveudalKwMjVvbrfA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605279542; 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=o41w6rfBffejy5hUuYsnmzcz+dcYXFAnZD7zHnnwWRQ=; b=beT3975QNHTZYV201M05hA8BM81RCWJ9epZ56rqR1ncUhkhLl3PnH4fHIqL29HSYQ8gNeC8kKVVQvhze7CfHRb4LBLfMhrgxE66WUzsvZBT21zXlbP85bBGxhfYkOyAVExnHgY9EMxoKK1pzEzqibaXUoICjtsJ4sWQxx28uHL8= 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 1605279542987987.6696451038101; Fri, 13 Nov 2020 06:59:02 -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-549-G4TbcdpPPSiVzct73k7QTQ-1; Fri, 13 Nov 2020 09:58:59 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id E3B038030AB; Fri, 13 Nov 2020 14:58:52 +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 C148C75126; Fri, 13 Nov 2020 14:58:52 +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 662CE5810C; Fri, 13 Nov 2020 14:58:52 +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 0ADEwnQh016703 for ; Fri, 13 Nov 2020 09:58:49 -0500 Received: by smtp.corp.redhat.com (Postfix) id C68F95B4B0; Fri, 13 Nov 2020 14:58:49 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.3]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2C2E45B4A4 for ; Fri, 13 Nov 2020 14:58:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605279542; 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=o41w6rfBffejy5hUuYsnmzcz+dcYXFAnZD7zHnnwWRQ=; b=f9sm57OIsdYBQ9TPLqjs7XIQmIuEN6AgqZPUGUULEz/mjJGE+MQqwsNrBByB2FmAIvMHOD MQgLdVktqlW7P8rRuC8jo4y+RYcF0kTZECNS5ntnQICOjXJakzIuo5c6/K1TsIdTg3T86s KpU9oCZmdH0/ZwDsnbArOPy1zl/IdKE= X-MC-Unique: G4TbcdpPPSiVzct73k7QTQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 1/4] qemuDomain(Disk)ControllerIsBusy: Fix function header format Date: Fri, 13 Nov 2020 15:58:39 +0100 Message-Id: <69faea742b10640967de182a56979f90a35ddf3f.1605279469.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.79 on 10.5.11.15 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" Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_hotplug.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 81ec44ffcd..00d908912f 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -5312,8 +5312,9 @@ qemuDomainDetachPrepDisk(virDomainObjPtr vm, } -static bool qemuDomainDiskControllerIsBusy(virDomainObjPtr vm, - virDomainControllerDefPtr detac= h) +static bool +qemuDomainDiskControllerIsBusy(virDomainObjPtr vm, + virDomainControllerDefPtr detach) { size_t i; virDomainDiskDefPtr disk; @@ -5352,8 +5353,10 @@ static bool qemuDomainDiskControllerIsBusy(virDomain= ObjPtr vm, return false; } -static bool qemuDomainControllerIsBusy(virDomainObjPtr vm, - virDomainControllerDefPtr detach) + +static bool +qemuDomainControllerIsBusy(virDomainObjPtr vm, + virDomainControllerDefPtr detach) { switch (detach->type) { case VIR_DOMAIN_CONTROLLER_TYPE_IDE: @@ -5372,6 +5375,7 @@ static bool qemuDomainControllerIsBusy(virDomainObjPt= r vm, } } + static int qemuDomainDetachPrepController(virDomainObjPtr vm, virDomainControllerDefPtr match, --=20 2.28.0 From nobody Tue May 7 00:27:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1605279541; cv=none; d=zohomail.com; s=zohoarc; b=Kg/l/aq3eBUSKWKezjqUrmsMepnNjCr1NhuVHre0xNnZ8lUZLDEnXfd9Wuf4xdC/bXzGNIvpNZn5nt7Y31Q4PoNIZn7FDX6mkmWBNib+7wtAJ9XpnVhnKQnOXxfqug4kXMSxj29UPMWfq88gYWSQqONe6KbzaarKvJvSpHNF89M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605279541; 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=27fyd2Tr12G5Zw7szJOt0Am5QithiE/SDhkHBMayFdQ=; b=iuWKOaIusZd56GjT7GlXMUbjCky4I75Cmf0bsq46Ln2Bz27RyDPYqw8MKuxqItZ5ddpIg/9NLF0jwLmy6PEI3fI4/9hTXVdChJQLC5vDlJFamE4UU8ymz8wvt+N4jc1Z+JPxvPN+/QsTQMFHfWa3vhn62UVu+JrBQekdJppN0Qs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.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 [63.128.21.124]) by mx.zohomail.com with SMTPS id 1605279541575541.1439344524897; Fri, 13 Nov 2020 06:59:01 -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-354-sEHoF5nnPayHtIBY-JoBzQ-1; Fri, 13 Nov 2020 09:58:58 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B741A8030A5; Fri, 13 Nov 2020 14:58:52 +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 90C093C04; Fri, 13 Nov 2020 14:58:52 +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 53B9D181A06B; Fri, 13 Nov 2020 14:58:52 +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 0ADEwp7A016713 for ; Fri, 13 Nov 2020 09:58:51 -0500 Received: by smtp.corp.redhat.com (Postfix) id 32F4E5B4B0; Fri, 13 Nov 2020 14:58:51 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.3]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3D37B5B4A4 for ; Fri, 13 Nov 2020 14:58:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605279540; 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=27fyd2Tr12G5Zw7szJOt0Am5QithiE/SDhkHBMayFdQ=; b=EjtkFAo2oaZoDJmYUT3NriCXLrjc05zkiK1Jywc5VewPEz6Q32equqd0Q+K3LLwMh+Xv17 L17UJgrrhzd1yobkRIwwFWnaWynwK7ABacXqQinOc1733rAhva1xPvTo0Djtbq4dMAe5+/ fFV3jOUM/C9CqMldxnmrN07PArcs7xA= X-MC-Unique: sEHoF5nnPayHtIBY-JoBzQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 2/4] qemuDomainDiskControllerIsBusy: Fix logic of matching disk bus to controller type Date: Fri, 13 Nov 2020 15:58:40 +0100 Message-Id: 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.23 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" The tests which match the disk bus to the controller type were backwards in this function. This meant that any disk bus type (such as VIR_DOMAIN_DISK_BUS_SATA) would not skip the controller index comparison even if the removed controller was of a different type. Switch the internals to a switch statement with selects the controller type in the first place and a proper type so that new controller types are added in the future. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=3D1870072 Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_hotplug.c | 44 +++++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 00d908912f..90ed59a0ee 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -5327,16 +5327,48 @@ qemuDomainDiskControllerIsBusy(virDomainObjPtr vm, continue; /* check whether the disk uses this type controller */ - if (disk->bus =3D=3D VIR_DOMAIN_DISK_BUS_IDE && - detach->type !=3D VIR_DOMAIN_CONTROLLER_TYPE_IDE) + switch ((virDomainControllerType) detach->type) { + case VIR_DOMAIN_CONTROLLER_TYPE_IDE: + if (disk->bus !=3D VIR_DOMAIN_DISK_BUS_IDE) + continue; + break; + + case VIR_DOMAIN_CONTROLLER_TYPE_FDC: + if (disk->bus !=3D VIR_DOMAIN_DISK_BUS_FDC) + continue; + break; + + case VIR_DOMAIN_CONTROLLER_TYPE_SCSI: + if (disk->bus !=3D VIR_DOMAIN_DISK_BUS_SCSI) + continue; + break; + + case VIR_DOMAIN_CONTROLLER_TYPE_SATA: + if (disk->bus !=3D VIR_DOMAIN_DISK_BUS_SATA) + continue; + break; + + case VIR_DOMAIN_CONTROLLER_TYPE_XENBUS: + /* xenbus is not supported by the qemu driver */ continue; - if (disk->bus =3D=3D VIR_DOMAIN_DISK_BUS_FDC && - detach->type !=3D VIR_DOMAIN_CONTROLLER_TYPE_FDC) + + case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL: + /* virtio-serial does not host any disks */ continue; - if (disk->bus =3D=3D VIR_DOMAIN_DISK_BUS_SCSI && - detach->type !=3D VIR_DOMAIN_CONTROLLER_TYPE_SCSI) + + case VIR_DOMAIN_CONTROLLER_TYPE_CCID: + case VIR_DOMAIN_CONTROLLER_TYPE_USB: + case VIR_DOMAIN_CONTROLLER_TYPE_PCI: + case VIR_DOMAIN_CONTROLLER_TYPE_ISA: + /* These buses have (also) other device types too so they need= to + * be checked elsewhere */ continue; + case VIR_DOMAIN_CONTROLLER_TYPE_LAST: + default: + continue; + } + if (disk->info.addr.drive.controller =3D=3D detach->idx) return true; } --=20 2.28.0 From nobody Tue May 7 00:27:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1605279551; cv=none; d=zohomail.com; s=zohoarc; b=DbB6o04UGC7JSjS8L8R+gtC9uEwTZWrgzuVAHX9hlPpyhQcDTwZZSjoeEdv+p6Mn5rPhOdz556y0FxVnklMpZu/jA7C8qZ29pYY+OskVbuZLNbTZ7ks1tFWi5CYyij+Trhl5OCleG/7KQx4vjdEN02YKHGOaYHWGznryvLG9URQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605279551; 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=MyS51jffNvBtBzT4M1IEd2l64eG1cBJSoI71jGy84vU=; b=SJkPHVO5J1lx+zkrw31Q9g8zZGpGRmolZ1IEonrAl7K91O83USk/x3BQ4habC6bhkqok26IIYlxR2CRutQcMpKL6uVoKUgWq4ltl0L80mB3GEMDi1yB0TZZAYWg9/+Yg7DCHS8Eg/0G5T9UU54CjM0aP0pRmEQIorsr1WI8jRLA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.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 [63.128.21.124]) by mx.zohomail.com with SMTPS id 1605279551025125.24258559456666; Fri, 13 Nov 2020 06:59:11 -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-486-q2SmgVWiN4qxfU0tIyXzfg-1; Fri, 13 Nov 2020 09:59:07 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id DEDA71018F7B; Fri, 13 Nov 2020 14:59:01 +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 6F2D975134; Fri, 13 Nov 2020 14:59:01 +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 23B3C181A06E; Fri, 13 Nov 2020 14:59:01 +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 0ADEwqp6016723 for ; Fri, 13 Nov 2020 09:58:52 -0500 Received: by smtp.corp.redhat.com (Postfix) id BF8A95B4B2; Fri, 13 Nov 2020 14:58:52 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.3]) by smtp.corp.redhat.com (Postfix) with ESMTP id F0ACE5B4A4 for ; Fri, 13 Nov 2020 14:58:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605279549; 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=MyS51jffNvBtBzT4M1IEd2l64eG1cBJSoI71jGy84vU=; b=g4zkBLV5M+rIMckfP2aXR7GOOUvjIJO+ajHPt6CCNISyQL5IAgcA3ERaQw64QZSRRW32Bt 9xXqrQ8IhH+G8YdpvnUAIZ2kwUWtb56SpHssB6O8/uNG/VEiyypCvaNpabFc4h7eohWfpc DC0BlPmc9O/7NYCGgYO9uA1BsrrzjxQ= X-MC-Unique: q2SmgVWiN4qxfU0tIyXzfg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 3/4] qemuDomainDiskControllerIsBusy: Optimize checking for SCSI hostdevs Date: Fri, 13 Nov 2020 15:58:41 +0100 Message-Id: <541aadd4c76534e170d8ed9dbc36ebf16010966e.1605279469.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.79 on 10.5.11.15 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" Iterate through hostdevs only when the controller type is VIR_DOMAIN_CONTROLLER_TYPE_SCSI. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_hotplug.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 90ed59a0ee..124f60912f 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -5373,13 +5373,15 @@ qemuDomainDiskControllerIsBusy(virDomainObjPtr vm, return true; } - for (i =3D 0; i < vm->def->nhostdevs; i++) { - hostdev =3D vm->def->hostdevs[i]; - if (!virHostdevIsSCSIDevice(hostdev) || - detach->type !=3D VIR_DOMAIN_CONTROLLER_TYPE_SCSI) - continue; - if (hostdev->info->addr.drive.controller =3D=3D detach->idx) - return true; + if (detach->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_SCSI) { + for (i =3D 0; i < vm->def->nhostdevs; i++) { + hostdev =3D vm->def->hostdevs[i]; + if (!virHostdevIsSCSIDevice(hostdev)) + continue; + + if (hostdev->info->addr.drive.controller =3D=3D detach->idx) + return true; + } } return false; --=20 2.28.0 From nobody Tue May 7 00:27:40 2024 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=1605279551; cv=none; d=zohomail.com; s=zohoarc; b=fKxPbWdglKAqn4zHTBPnMbXXzJxOA4VUhvhPWPk4zwLxiCgTe/PtOR1mKUjQ/siuf1J9Fnwx87zLM2wQsl7XnJYR7IO751IBEc/FI9Ue3JczYc+THhuIRxw+M46buLjhccwTPyOZ49DVgu75zpzLVHQq+7tLgm7tT/f9etPSfpc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605279551; 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=CYbMJgvyNUpKHffgYON6BTl7JIgRb7ymu3wpPNiaopk=; b=l3iPXmTBMD3hCthrG9ba/o1jhUFQTD25bjDNocssQFDlhDDaXkDCJ7NuyT5uNQPmYP6+n/ayQlVXn/vgKjI8xgL8nf0tI11Iqb6C0wk1yv5VY0H96BP0q0KzHDhExXjs2/0zE9G3g05HxEXyFEPunGp1qwIeMMHiXy0adO0T5R0= 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 1605279551644130.1385848290014; Fri, 13 Nov 2020 06:59:11 -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-47-7HWaqf2mO6GA3u0b2gicDQ-1; Fri, 13 Nov 2020 09:59:08 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id C1CD76D247; Fri, 13 Nov 2020 14:59:01 +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 1D6265C5BB; Fri, 13 Nov 2020 14:59:01 +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 59B5758112; Fri, 13 Nov 2020 14:59:00 +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 0ADEwsP8016736 for ; Fri, 13 Nov 2020 09:58:54 -0500 Received: by smtp.corp.redhat.com (Postfix) id 46CCA5B4B2; Fri, 13 Nov 2020 14:58:54 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.3]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7E22D5B4A4 for ; Fri, 13 Nov 2020 14:58:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605279550; 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=CYbMJgvyNUpKHffgYON6BTl7JIgRb7ymu3wpPNiaopk=; b=f3JqrF19Reb3C/ZOZIrWdbxMmcApME8cPm3mhdAvv1xK3/0u/SSTFGXesFnriVF7zhi2TE pc4wl8vSyKjrZ3rR77CXpU/8SBVD+7ArNESFlLHMOabzqGdGVBcEt4zB/KxLcO1ec9WInd IKr5FGApTshL11Fh2iu/zpuAvdDH/Ts= X-MC-Unique: 7HWaqf2mO6GA3u0b2gicDQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 4/4] qemuDomainControllerIsBusy: Fully populate switch statement Date: Fri, 13 Nov 2020 15:58:42 +0100 Message-Id: <1dbe3f6a1cfcae4e67ed8443840f4b11da5375cc.1605279469.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.79 on 10.5.11.16 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" Typecast the controller type variable to the appropriate type and add the missing controller types for future extension. Note that we currently allow only unplug of VIR_DOMAIN_CONTROLLER_TYPE_SCSI thus the other controller types which are not implemented return false now. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_hotplug.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 124f60912f..2c12ef60af 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -5392,20 +5392,28 @@ static bool qemuDomainControllerIsBusy(virDomainObjPtr vm, virDomainControllerDefPtr detach) { - switch (detach->type) { + switch ((virDomainControllerType) detach->type) { case VIR_DOMAIN_CONTROLLER_TYPE_IDE: case VIR_DOMAIN_CONTROLLER_TYPE_FDC: case VIR_DOMAIN_CONTROLLER_TYPE_SCSI: + case VIR_DOMAIN_CONTROLLER_TYPE_SATA: return qemuDomainDiskControllerIsBusy(vm, detach); - case VIR_DOMAIN_CONTROLLER_TYPE_SATA: case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL: case VIR_DOMAIN_CONTROLLER_TYPE_CCID: + case VIR_DOMAIN_CONTROLLER_TYPE_USB: + case VIR_DOMAIN_CONTROLLER_TYPE_PCI: + case VIR_DOMAIN_CONTROLLER_TYPE_ISA: + /* detach of the controller types above is not yet supported */ + return false; + + case VIR_DOMAIN_CONTROLLER_TYPE_XENBUS: + /* qemu driver doesn't support xenbus */ + return false; + + case VIR_DOMAIN_CONTROLLER_TYPE_LAST: default: - /* libvirt does not support sata controller, and does not support = to - * detach virtio and smart card controller. - */ - return true; + return false; } } --=20 2.28.0