From nobody Mon May 6 04:32:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1643112821; cv=none; d=zohomail.com; s=zohoarc; b=SaXUW2xkh6jl2QCfKyOjdMcnzA+fIKvHDl0kghFhQ/JIJkkE2kygJ0OYiwM8ATVuAsw4COUtZv6ANH4s7AJWKdNuNvsamQYNllfZRdXqQ85TLLSZ6UeyJcrSDguRmE/awKmixec+yCvUD3Xeltt6DtAxOF2Cx7ruBrtbuCu12p4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1643112821; 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=y3cipQDpPlJwkS09RU8sd3m6Gw0TLQ9PEepCnst6SjU=; b=OqsqqIRszHWblYugFYM4IFg7Zr7XrO98crn/jVjlapKil0k9zdD8xyhNjv0TF/mn5clUrNce4AsQk/xJBC+EYUix+TzYXrg5t4zhJwaIkyiTnwSmbaaUCzusRFT3GEsiFLHsCpxZoOMVf2XZFjEW9swb8lM/B6ScARtv/8grGL0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 164311282160322.859203960764717; Tue, 25 Jan 2022 04:13:41 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-320-BJAetbXGPvSrhh_2xM7ozQ-1; Tue, 25 Jan 2022 07:13:35 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5C1461083F68; Tue, 25 Jan 2022 12:13:30 +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 1DB15752BC; Tue, 25 Jan 2022 12:13:30 +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 711621809CB8; Tue, 25 Jan 2022 12:13:28 +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 20PCDNVC014240 for ; Tue, 25 Jan 2022 07:13:23 -0500 Received: by smtp.corp.redhat.com (Postfix) id D5C3E66E2E; Tue, 25 Jan 2022 12:13:23 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5EF7D66E25 for ; Tue, 25 Jan 2022 12:13:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643112820; 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=y3cipQDpPlJwkS09RU8sd3m6Gw0TLQ9PEepCnst6SjU=; b=WI8AMyMUVnVr69Sj/YOBxN2fqyJadAbKUvqu6ocYv1PeIYcas03xPn/cN6JH4Saa7neYCC GGnP208Q29/1Jn0Bht3k91WGb08RbvElBnqEAwNfiagmLceny+MfNwUSdWMQr5y4RvuHI9 f5wq9PxTcgvTANsCCTZasTaXGBs8Ifo= X-MC-Unique: BJAetbXGPvSrhh_2xM7ozQ-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 1/3] domain_validate: Refuse VIR_DOMAIN_DEVICE_ADDRESS_TYPE_UNASSIGNED Date: Tue, 25 Jan 2022 13:13:19 +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.79 on 10.5.11.14 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) X-ZM-MESSAGEID: 1643112822658100005 Content-Type: text/plain; charset="utf-8" We document that
can be used only for -s. However, corresponding validation rule is missing. Let's put the rule into hypervisor agnostic part of validation process so that all drivers can benefit. Signed-off-by: Michal Privoznik --- src/conf/domain_validate.c | 45 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index e9baf1d41a..d5e74db243 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -2257,10 +2257,55 @@ virDomainGraphicsDefValidate(const virDomainDef *de= f, return 0; } =20 +static int +virDomainDeviceInfoValidate(const virDomainDeviceDef *dev) +{ + virDomainDeviceInfo *info; + + if (!(info =3D virDomainDeviceGetInfo(dev))) + return 0; + + switch ((virDomainDeviceAddressType) info->type) { + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCID: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_ISA: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DIMM: + /* No validation for these address types yet */ + break; + + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_UNASSIGNED: + if (dev->type !=3D VIR_DOMAIN_DEVICE_HOSTDEV) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("address of type '%s' is supported only for h= ostdevs"), + virDomainDeviceAddressTypeToString(info->type)); + return -1; + } + break; + + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_LAST: + default: + virReportEnumRangeError(virDomainDeviceAddressType, info->type); + return -1; + } + + return 0; +} + static int virDomainDeviceDefValidateInternal(const virDomainDeviceDef *dev, const virDomainDef *def) { + if (virDomainDeviceInfoValidate(dev) < 0) + return -1; + switch ((virDomainDeviceType) dev->type) { case VIR_DOMAIN_DEVICE_DISK: return virDomainDiskDefValidate(def, dev->data.disk); --=20 2.34.1 From nobody Mon May 6 04:32:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1643112819; cv=none; d=zohomail.com; s=zohoarc; b=lFnsJf6FnAlBf+7X3hE3JmVqTXWaQJ5XCu2BhWm61fkRpx7YUMiSHlbxBrhMHaVHVo1pmsT+1Z4D+7HZWSu3rP/yxbQMbzsvuhcpZ9XoXyTsiV/T/jE+2eEITvcOeuqQ2Hmrx+0hRLAiXywJQVQhZpaDeB2BE0Mj6QSm1Bbzlhw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1643112819; 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=MB3YuOr6QfJHu30NM+fpY/jtdys+AvXz2aESoneuziw=; b=RWzoXBcYMHWII9ufQERVPex4bo5WVQd2Fj9AdKagZ8s6zRsJbrlD1gR/fPisFSQfrAdWIbdzkcb4i5qmiD5m3Uf/Pw31tNJUuptaJXZOpYCeQk1wZ/9C3o4K8ZpUTMIr5VWnSwxjqJtUfG6VlP+zQSfFNpManxkivCx9dYEVeGo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 16431128196346.0654007622573545; Tue, 25 Jan 2022 04:13:39 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-640-PXCrWW9aP2ClAt27Zeyldw-1; Tue, 25 Jan 2022 07:13:35 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6C87F18C89DF; Tue, 25 Jan 2022 12:13:30 +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 262D466E35; Tue, 25 Jan 2022 12:13:30 +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 186234CA9B; Tue, 25 Jan 2022 12:13:28 +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 20PCDOmj014245 for ; Tue, 25 Jan 2022 07:13:24 -0500 Received: by smtp.corp.redhat.com (Postfix) id A398A66E2E; Tue, 25 Jan 2022 12:13:24 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2D0A366E25 for ; Tue, 25 Jan 2022 12:13:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643112818; 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=MB3YuOr6QfJHu30NM+fpY/jtdys+AvXz2aESoneuziw=; b=CIQXu/BPwgwCuWExBHTQ7a59qrnfh1d0Gjtv6HUAGB4XgR5J7j8eRP89RRT4McaabseuvT EPGJ0uG+F94j0Ag3qR0MdlXCfh4ynCS1Qdt5MWaOlhX6tyAyg29ox+0ynhwOGXCGtzxMM5 bRlIm5MlIBRNRStTQZIvjwZ4BbpQJLo= X-MC-Unique: PXCrWW9aP2ClAt27Zeyldw-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 2/3] qemuDomainAttachHostPCIDevice: Handle hostevs with unassigned type of address Date: Tue, 25 Jan 2022 13:13:20 +0100 Message-Id: <3c7efe0ca74fbe32126569ccfce8221321cecf04.1643112560.git.mprivozn@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.11 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) X-ZM-MESSAGEID: 1643112822185100001 Content-Type: text/plain; charset="utf-8" A can have
which means libvirt manages the device detach from/reattach to the host but the device is never exposed to the guest. This means that we have to take a shortcut during hotplug, similar to the one we are taking when constructing the command line (see qemuBuildHostdevCommandLine()). Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=3D2040548 Signed-off-by: Michal Privoznik --- src/qemu/qemu_hotplug.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index f36de2385a..b998b51f5a 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1668,6 +1668,12 @@ qemuDomainAttachHostPCIDevice(virQEMUDriver *driver, qemuDomainFillDeviceIsolationGroup(vm->def, &dev); } =20 + if (info->type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_UNASSIGNED) { + /* Unassigned devices are not exposed to QEMU. Our job is done her= e. */ + ret =3D 0; + goto done; + } + if (qemuDomainEnsurePCIAddress(vm, &dev) < 0) goto error; releaseaddr =3D true; @@ -1692,6 +1698,7 @@ qemuDomainAttachHostPCIDevice(virQEMUDriver *driver, exit_monitor: qemuDomainObjExitMonitor(driver, vm); =20 + done: virDomainAuditHostdev(vm, hostdev, "attach", ret =3D=3D 0); if (ret < 0) goto error; --=20 2.34.1 From nobody Mon May 6 04:32:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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 170.10.129.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=1643112842; cv=none; d=zohomail.com; s=zohoarc; b=JhzsV4KWixQ32j8ImzVZZXioTaDiYxZHBCqxZk7G04Q9EagNr1oswAA4rXLFtaLSdgRFwkzB0QFafbjuiA3HG67eManv9Q9sDbyiGQjX/dh5IivPwswuzIhHFP/saEQFKwwjkypeM2biQj4KbWOp2Oatxbqaw83ofaRsMzhiuVE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1643112842; 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=YjDhZgTiIM7mmHxh7jvhGua+dOYDW6B8PERbHWAmmjE=; b=GeGcRZWqX8dru6THemf6agCkqEToZtQiikT7u6tHvPSE+uVu/3nJBK2bg2sx58P/4kmABoKP+/Vj01FoM8xFzCJywmXS6fo4pKRDbltDNVCqsC5XqFZNqPKg96DtAMpix51rbirvZzmefa30bHAjlkY3M9xsJ9HQousduZizYcY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1643112842515924.5662675321905; Tue, 25 Jan 2022 04:14:02 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-401-a8v_SwUuMta9GenbI4dsqw-1; Tue, 25 Jan 2022 07:13:53 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AA8A81083F6C; Tue, 25 Jan 2022 12:13:47 +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 837CA66E2E; Tue, 25 Jan 2022 12:13:47 +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 54A681809CB9; Tue, 25 Jan 2022 12:13:47 +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 20PCDPi9014251 for ; Tue, 25 Jan 2022 07:13:25 -0500 Received: by smtp.corp.redhat.com (Postfix) id 727F766E25; Tue, 25 Jan 2022 12:13:25 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id EFFFB66E34 for ; Tue, 25 Jan 2022 12:13:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643112841; 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=YjDhZgTiIM7mmHxh7jvhGua+dOYDW6B8PERbHWAmmjE=; b=Q0I+FAVa4y6qbja/q+hbbVCy0UVouIUS1+TxCNQ2tGfnSzbD1NaAkYdVrHccvDSIyZVWd5 sH+vsHTodsXFh0CVeajxk7BKWvWvumnCvzx1cvEggz7fdXaooIy7MIMyQjy+jdcn7igpjz ZgO6HpkgaRmivFNmGwbX2NWUEJ83zNc= X-MC-Unique: a8v_SwUuMta9GenbI4dsqw-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 3/3] qemuDomainDetachDeviceLive: Handle hostevs with unassigned type of address Date: Tue, 25 Jan 2022 13:13:21 +0100 Message-Id: <55a58df51943d587a870b0d607bdae7c84dd0e00.1643112560.git.mprivozn@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.11 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) X-ZM-MESSAGEID: 1643112845112100001 Content-Type: text/plain; charset="utf-8" A can have
which means libvirt manages the device detach from/reattach to the host but the device is never exposed to the guest. This means that we have to take a shortcut during hotunplug (e.g. never ask QEMU on the monitor to detach the device, or never wait for DEVICE_DELETED event). Signed-off-by: Michal Privoznik --- src/qemu/qemu_hotplug.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index b998b51f5a..bde5f683d8 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -6043,6 +6043,7 @@ qemuDomainDetachDeviceLive(virDomainObj *vm, { virDomainDeviceDef detach =3D { .type =3D match->type }; virDomainDeviceInfo *info =3D NULL; + bool unassigned =3D false; int ret =3D -1; =20 switch ((virDomainDeviceType)match->type) { @@ -6181,6 +6182,8 @@ qemuDomainDetachDeviceLive(virDomainObj *vm, return -1; } =20 + unassigned =3D info->type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_UNASSI= GNED; + if (qemuIsMultiFunctionDevice(vm->def, info)) { virReportError(VIR_ERR_OPERATION_FAILED, _("cannot hot unplug %s device with multifunction P= CI guest address: " @@ -6225,8 +6228,10 @@ qemuDomainDetachDeviceLive(virDomainObj *vm, * Issue the qemu monitor command to delete the device (based on * its alias), and optionally wait a short time in case the * DEVICE_DELETED event arrives from qemu right away. + * Unassigned devices are not exposed to QEMU, so mimic + * !async case. */ - if (!async) + if (!async || unassigned) qemuDomainMarkDeviceForRemoval(vm, info); =20 if (qemuDomainDeleteDevice(vm, info->alias) < 0) { @@ -6235,11 +6240,13 @@ qemuDomainDetachDeviceLive(virDomainObj *vm, goto cleanup; } =20 - if (async) { + if (async && !unassigned) { ret =3D 0; } else { - if ((ret =3D qemuDomainWaitForDeviceRemoval(vm)) =3D=3D 1) + if (unassigned || + (ret =3D qemuDomainWaitForDeviceRemoval(vm)) =3D=3D 1) { ret =3D qemuDomainRemoveDevice(driver, vm, &detach); + } } =20 cleanup: --=20 2.34.1