From nobody Sun Feb 8 16:05:39 2026 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=1661443265; cv=none; d=zohomail.com; s=zohoarc; b=Qm7TRywvPiFu/TC5+yornXC/H9zAFv2IBLrGcyn5oGqbhjLuBZ1QmKPBXxDWoKOjmIVqt8lgKUUCvhcvyKrpIKmut9peOU1VwPxFlp95ycsvioSRbfx/YCz5i5IR+gchyxlMjMV3FV0wt6cv3KlBzw9PC9/eYVdWBmLZc2xsLqY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661443265; 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=Dchxh10Bty3IGdoq4TM5S1tdgRISLAkpspiWCv9+nj4=; b=K6OTYl2hQz6vhzc8qOgv3cfhDkqWa9JBxqvMa9R8qD5Z5YYKnlixBDzXJ6T25vI9afrqHwx4vTr4hiw+hPRapG1HKsveLTZdzrUD6NBlVOWkVexcL9XKOF4w9mc9RdkM+l9wlMvj7c8jsP+D5Wtb1oq4jjyPxBuXYhhVhfRnThw= 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 1661443265756558.6013622174504; Thu, 25 Aug 2022 09:01:05 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.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-626-UkOP-mAqPBaieqAIcyuK5g-1; Thu, 25 Aug 2022 11:59:58 -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 CF15C1C13959; Thu, 25 Aug 2022 15:59:48 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id BD9FE1121314; Thu, 25 Aug 2022 15:59:48 +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 AE1661946A5A; Thu, 25 Aug 2022 15:59:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 50DCC1946A65 for ; Thu, 25 Aug 2022 15:59:44 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 35D3040D2833; Thu, 25 Aug 2022 15:59:44 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id D1A1F40D2830 for ; Thu, 25 Aug 2022 15:59:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661443264; 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=Dchxh10Bty3IGdoq4TM5S1tdgRISLAkpspiWCv9+nj4=; b=KDMWKLRTdbAC/WYSRrgQ6OEqLiHC8P4El5DW6AIDgDjHu7Y9wHv3UJJFODdcRj+2iWJEVJ SiuqicqaRvgAbznWDtXPKAPvML2HKvDWNJ8c7Gc8G8HZYAcdnu3JcnS97H2zEUmDiPYRH3 5NhTGningSXs8S9MFWUGnp0zP6q6JRU= X-MC-Unique: UkOP-mAqPBaieqAIcyuK5g-1 X-Original-To: libvir-list@listman.corp.redhat.com From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 11/12] qemu: remove qemuValidateDomainVirtioOptions Date: Thu, 25 Aug 2022 17:59:34 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 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 2.78 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1661443268212100002 Now that we assume all the virtio capabilities, this function does not check anything. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_validate.c | 54 +++------------------------------------- 1 file changed, 4 insertions(+), 50 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index b12a873bc8..a672450ddd 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1769,17 +1769,6 @@ qemuValidateNetSupportsCoalesce(virDomainNetType typ= e) } =20 =20 -static int -qemuValidateDomainVirtioOptions(const virDomainVirtioOptions *virtio, - virQEMUCaps *qemuCaps G_GNUC_UNUSED) -{ - if (!virtio) - return 0; - - return 0; -} - - /** * qemuValidateDomainDefVhostUserRequireSharedMemory: * @def: VM definition @@ -1970,9 +1959,6 @@ qemuValidateDomainDeviceDefNetwork(const virDomainNet= Def *net, "QEMU binary")); return -1; } - - if (qemuValidateDomainVirtioOptions(net->virtio, qemuCaps) < 0) - return -1; } =20 if (net->mtu && @@ -2391,9 +2377,6 @@ qemuValidateDomainRNGDef(const virDomainRNGDef *def, return -1; } =20 - if (qemuValidateDomainVirtioOptions(def->virtio, qemuCaps) < 0) - return -1; - return 0; } =20 @@ -2804,9 +2787,6 @@ qemuValidateDomainDeviceDefVideo(const virDomainVideo= Def *video, } } =20 - if (qemuValidateDomainVirtioOptions(video->virtio, qemuCaps) < 0) - return -1; - if (video->type =3D=3D VIR_DOMAIN_VIDEO_TYPE_RAMFB && video->info.type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -3364,11 +3344,6 @@ qemuValidateDomainDeviceDefDisk(const virDomainDiskD= ef *disk, return -1; } =20 - if (disk->bus =3D=3D VIR_DOMAIN_DISK_BUS_VIRTIO && - qemuValidateDomainVirtioOptions(disk->virtio, qemuCaps) < 0) { - return -1; - } - if (disk->src->type =3D=3D VIR_STORAGE_TYPE_VHOST_USER) { if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VHOST_USER_BLK)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -3655,8 +3630,7 @@ virValidateControllerPCIModelNameToQEMUCaps(int model= Name) =20 =20 static int -qemuValidateDomainDeviceDefControllerAttributes(const virDomainControllerD= ef *controller, - virQEMUCaps *qemuCaps) +qemuValidateDomainDeviceDefControllerAttributes(const virDomainControllerD= ef *controller) { if (!(controller->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_SCSI && (controller->model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTI= O_SCSI || @@ -3687,13 +3661,6 @@ qemuValidateDomainDeviceDefControllerAttributes(cons= t virDomainControllerDef *co _("'iothread' is only supported for virtio-scsi= controller")); return -1; } - if (qemuValidateDomainVirtioOptions(controller->virtio, qemuCaps) = < 0) - return -1; - } - - if (controller->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL && - qemuValidateDomainVirtioOptions(controller->virtio, qemuCaps) < 0)= { - return -1; } =20 return 0; @@ -4225,7 +4192,7 @@ qemuValidateDomainDeviceDefController(const virDomain= ControllerDef *controller, !qemuValidateCheckSCSIControllerModel(qemuCaps, controller->model)) return -1; =20 - if (qemuValidateDomainDeviceDefControllerAttributes(controller, qemuCa= ps) < 0) + if (qemuValidateDomainDeviceDefControllerAttributes(controller) < 0) return -1; =20 switch ((virDomainControllerType)controller->type) { @@ -4569,9 +4536,6 @@ qemuValidateDomainDeviceDefFS(virDomainFSDef *fs, return -1; } =20 - if (qemuValidateDomainVirtioOptions(fs->virtio, qemuCaps) < 0) - return -1; - return 0; } =20 @@ -4694,8 +4658,7 @@ qemuValidateDomainDeviceDefSound(virDomainSoundDef *s= ound, =20 =20 static int -qemuValidateDomainDeviceDefVsock(const virDomainVsockDef *vsock, - virQEMUCaps *qemuCaps) +qemuValidateDomainDeviceDefVsock(virQEMUCaps *qemuCaps) { if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VHOST_VSOCK)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -4704,9 +4667,6 @@ qemuValidateDomainDeviceDefVsock(const virDomainVsock= Def *vsock, return -1; } =20 - if (qemuValidateDomainVirtioOptions(vsock->virtio, qemuCaps) < 0) - return -1; - return 0; } =20 @@ -4881,9 +4841,6 @@ qemuValidateDomainDeviceDefInput(const virDomainInput= Def *input, return -1; } =20 - if (qemuValidateDomainVirtioOptions(input->virtio, qemuCaps) < 0) - return -1; - return 0; } =20 @@ -4920,9 +4877,6 @@ qemuValidateDomainDeviceDefMemballoon(const virDomain= MemballoonDef *memballoon, return -1; } =20 - if (qemuValidateDomainVirtioOptions(memballoon->virtio, qemuCaps) < 0) - return -1; - return 0; } =20 @@ -5256,7 +5210,7 @@ qemuValidateDomainDeviceDef(const virDomainDeviceDef = *dev, qemuCaps); =20 case VIR_DOMAIN_DEVICE_VSOCK: - return qemuValidateDomainDeviceDefVsock(dev->data.vsock, qemuCaps); + return qemuValidateDomainDeviceDefVsock(qemuCaps); =20 case VIR_DOMAIN_DEVICE_TPM: return qemuValidateDomainDeviceDefTPM(dev->data.tpm, def, qemuCaps= ); --=20 2.37.1