From nobody Fri Oct 18 08:29:12 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=1693924039; cv=none; d=zohomail.com; s=zohoarc; b=CoXBsTbzpkoUVVwmUrZsZPWH7l5Hp6nJ755Mt2EnRjGP4hF2DrycEcZS/5fZndRnC4icEabNBA2HQvHZtT7iSDkDP1OA21KQSbeCrd8pMtePSLEf/dJmhUSP5GOveS63Tu+WCoc6DKT+oOkfyYxQD28lurL4Xyp99/r01MicSxk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693924039; 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=+KeuU9ZvxbWD6yj4/G/c8d2VU54eURRyM8bETPbe2so=; b=nI+0h+KgK4O2sXmy3V5vDDV8Bc8WYbzvVWZ3AeP+11udSiH/z4q8g7V8JrP5go1BDbyNrJD8KqpAUt/PnGPR6ws7uq8i+9BrOLbFkUvZN2RNCklCZrfgZgAFOgDkR4oij80RKcST1NTpqSP6EVsTmOhL/Yf6XG2Z06FmPx6Nh1c= 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 1693924039531580.1184940083227; Tue, 5 Sep 2023 07:27:19 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-400-c_ZXPNoMOMOI4nTvBhXmDg-1; Tue, 05 Sep 2023 10:25:26 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D772938149B3; Tue, 5 Sep 2023 14:24:33 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id A19B81121319; Tue, 5 Sep 2023 14:24:33 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3E5B61946597; Tue, 5 Sep 2023 14:24:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 736A51946595 for ; Tue, 5 Sep 2023 14:24:32 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 5EB01101328D; Tue, 5 Sep 2023 14:24:32 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id ADBF0101328A for ; Tue, 5 Sep 2023 14:24:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693924038; 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=+KeuU9ZvxbWD6yj4/G/c8d2VU54eURRyM8bETPbe2so=; b=PmaVdHXS1SodlYF1zAqr+CmEEoEMv5UV7CPM2hwiqHnsLXHkZTsDc49L3o/ImtIEzmuOOY 8/VxrRnCTNG+wwVy0atQTizWqRMDzRH+ZlYZi0+Av9SHaYlYdPGFnFThqyiTpBzMw+Rvfb lFqfeBcQU3fUR6E14j+NBILLApo2HfI= X-MC-Unique: c_ZXPNoMOMOI4nTvBhXmDg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 09/51] qemu: Always assume support for QEMU_CAPS_DEVICE_VFIO_PCI Date: Tue, 5 Sep 2023 16:23:36 +0200 Message-ID: <6678b6e77a7ae152396c83ce151ecb090ef81bfb.1693923601.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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: 1693924040161100001 Content-Type: text/plain; charset="utf-8" The 'display' option for the 'vfio-pci' device was added in qemu-2.12 and can't be compiled out. Assume support for the flag. Signed-off-by: Peter Krempa --- src/qemu/qemu_domain.c | 11 ++++------- src/qemu/qemu_validate.c | 6 ------ tests/qemuxml2argvdata/hostdev-mdev-precreated.args | 2 +- tests/qemuxml2argvtest.c | 3 +-- 4 files changed, 6 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 9781df1355..c7d64e1b5c 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6034,13 +6034,11 @@ qemuDomainDeviceHostdevDefPostParseRestoreBackendAl= ias(virDomainHostdevDef *host static int -qemuDomainHostdevDefMdevPostParse(virDomainHostdevSubsysMediatedDev *mdevs= rc, - virQEMUCaps *qemuCaps) +qemuDomainHostdevDefMdevPostParse(virDomainHostdevSubsysMediatedDev *mdevs= rc) { /* QEMU 2.12 added support for vfio-pci display type, we default to * 'display=3Doff' to stay safe from future changes */ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VFIO_PCI_DISPLAY) && - mdevsrc->model =3D=3D VIR_MDEV_MODEL_TYPE_VFIO_PCI && + if (mdevsrc->model =3D=3D VIR_MDEV_MODEL_TYPE_VFIO_PCI && mdevsrc->display =3D=3D VIR_TRISTATE_SWITCH_ABSENT) mdevsrc->display =3D VIR_TRISTATE_SWITCH_OFF; @@ -6050,7 +6048,6 @@ qemuDomainHostdevDefMdevPostParse(virDomainHostdevSub= sysMediatedDev *mdevsrc, static int qemuDomainHostdevDefPostParse(virDomainHostdevDef *hostdev, - virQEMUCaps *qemuCaps, unsigned int parseFlags) { virDomainHostdevSubsys *subsys =3D &hostdev->source.subsys; @@ -6063,7 +6060,7 @@ qemuDomainHostdevDefPostParse(virDomainHostdevDef *ho= stdev, if (hostdev->mode =3D=3D VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && hostdev->source.subsys.type =3D=3D VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_= MDEV && - qemuDomainHostdevDefMdevPostParse(&subsys->u.mdev, qemuCaps) < 0) + qemuDomainHostdevDefMdevPostParse(&subsys->u.mdev) < 0) return -1; return 0; @@ -6213,7 +6210,7 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDef *dev, break; case VIR_DOMAIN_DEVICE_HOSTDEV: - ret =3D qemuDomainHostdevDefPostParse(dev->data.hostdev, qemuCaps,= parseFlags); + ret =3D qemuDomainHostdevDefPostParse(dev->data.hostdev, parseFlag= s); break; case VIR_DOMAIN_DEVICE_TPM: diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index d5fe1cbd73..1346bbfb44 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -2341,12 +2341,6 @@ qemuValidateDomainMdevDefVFIOPCI(const virDomainHost= devDef *hostdev, if (dev->display =3D=3D VIR_TRISTATE_SWITCH_ABSENT) return 0; - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VFIO_PCI_DISPLAY)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("display property of device vfio-pci is not suppo= rted by this version of QEMU")); - return -1; - } - if (dev->model !=3D VIR_MDEV_MODEL_TYPE_VFIO_PCI) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _(" attribute 'display' is only supported = with model=3D'vfio-pci'")); diff --git a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args b/tests/qe= muxml2argvdata/hostdev-mdev-precreated.args index 2e49cff0e2..7c76cd5d15 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args @@ -27,5 +27,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -boot strict=3Don \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device vfio-pci,id=3Dhostdev0,sysfsdev=3D/sys/bus/mdev/devices/53764d0e-8= 5a0-42b4-af5c-2046b460b1dc,bus=3Dpci.0,addr=3D0x2 \ +-device vfio-pci,id=3Dhostdev0,sysfsdev=3D/sys/bus/mdev/devices/53764d0e-8= 5a0-42b4-af5c-2046b460b1dc,display=3Doff,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 8afb2bf2be..1fe2fafeab 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1714,8 +1714,7 @@ mymain(void) DO_TEST_CAPS_LATEST("hostdev-mdev-display-vnc"); DO_TEST_CAPS_LATEST("hostdev-mdev-display-vnc-egl-headless"); DO_TEST_PARSE_ERROR("hostdev-mdev-display-missing-graphics", - QEMU_CAPS_DEVICE_VFIO_PCI, - QEMU_CAPS_VFIO_PCI_DISPLAY); + QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST_CAPS_LATEST("hostdev-mdev-display-ramfb"); DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdev-mdev-display-ramfb-multiple"); DO_TEST_PARSE_ERROR("hostdev-vfio-zpci-wrong-arch", --=20 2.41.0