From nobody Fri Dec 19 06:01:15 2025 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; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1602708276; cv=none; d=zohomail.com; s=zohoarc; b=jru903Th7kKVkydCXVCuxJhr3lZqAUst2POKBF8f2vDGm8hR5kXni9H9oSaT389bGkP+8KeZ7/Qut7BND8u4M1gdjI7a//Wgi+6X/9o6Il+IXohislhKtgzM/b287Jqwt7qT8+gf7FqiY2CcMnUSQeacgPlQknx5BSWZh59k4+s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602708276; h=Content-Type:Content-Transfer-Encoding:Cc: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=FeSq+aNBytkK2J7tLCctC9qpF1rn7o5DPBsofRprxB4=; b=IHJ+dTHxzpbBcfxwFjCNyOVLWfheOvnggUK1+H2sr58X9DPyn8uD00uGaQY0RmGKTTMVGSCONYRRWe3Rb47+kWasnCk6ur+D4rQBhL3qiQuQkHkjBCRnvUy7mHbNQVJL2qxFrfYzdPe0r2S3IqV3ET+NZilfwUxAqiqGbnx7m/8= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail 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 1602708276010650.9193819430558; Wed, 14 Oct 2020 13:44:36 -0700 (PDT) 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-155-o7RfPUayOTORQfoR4M2Jig-1; Wed, 14 Oct 2020 16:44:31 -0400 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 B904257059; Wed, 14 Oct 2020 20:44:25 +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 9304B75131; Wed, 14 Oct 2020 20:44:25 +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 5C13458116; Wed, 14 Oct 2020 20:44:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09EKhhSx028737 for ; Wed, 14 Oct 2020 16:43:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id 586E71092196; Wed, 14 Oct 2020 20:43:43 +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 544891067DB4 for ; Wed, 14 Oct 2020 20:43:43 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.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 2B77785829D for ; Wed, 14 Oct 2020 20:43:43 +0000 (UTC) Received: from mail-io1-f51.google.com (mail-io1-f51.google.com [209.85.166.51]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-456-9w8ZdSBAOmmxLakIw1QKTQ-1; Wed, 14 Oct 2020 16:43:40 -0400 Received: by mail-io1-f51.google.com with SMTP id g7so893551iov.13 for ; Wed, 14 Oct 2020 13:43:40 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:5a9b:54fc:df2a:8a5e:989b]) by smtp.gmail.com with ESMTPSA id i4sm492202ilc.27.2020.10.14.13.43.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Oct 2020 13:43:39 -0700 (PDT) X-MC-Unique: o7RfPUayOTORQfoR4M2Jig-1 X-MC-Unique: 9w8ZdSBAOmmxLakIw1QKTQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FeSq+aNBytkK2J7tLCctC9qpF1rn7o5DPBsofRprxB4=; b=j2sGuvKnkCor/cKuYwYVef/03yiqE8gCDc/LoxMuG0dWsIFdt0ocqRERSgeYxNqwIU 6csrpku4Y10GQM8CnKgFidt0JmAfXSgf4UAyKyZVPwhwKEE6X4OpZELXtAMB2JgCU4dv ywhnGfyVwDv44f8i85ZLJ3Ck/C3zKXjlJbYoX+FTAAK3HpRNRbQfPMu5ZREnq4vEWyQD aCKVSQplP7rZcbXuCEctg1dO/hcUkSXuH+9zO+wafYA/nfCdfvM7DLXdxIQBVRHNddJf ZWkis/FsErN6lplsxx20o2ZBTDNMnJpk4ll/0x4PkXcG+FIInkVdiCbLBnqM8w8Cr7Zk RkZA== X-Gm-Message-State: AOAM530mKYgsWP0oY6arS+BhMdzYPuoUOU8Y+1//K1GL9a1bMgb0MViE xYmCsvnLOLOwi/Wz78LBJJ4gd6/RZuo= X-Google-Smtp-Source: ABdhPJwF98WkCfRhvYYz0MTxAl5neg2J5eQYFSkRAFgTMF9vZkD6MJPz5iYX/s2g0s0cLbQTAh6szQ== X-Received: by 2002:a6b:7f43:: with SMTP id m3mr964094ioq.114.1602708219869; Wed, 14 Oct 2020 13:43:39 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Subject: [PATCH v1 12/24] qemu_command.c: move QEMU_CAPS_DEVICE_USB_KBD check to qemu_validate.c Date: Wed, 14 Oct 2020 17:42:55 -0300 Message-Id: <20201014204307.631746-13-danielhb413@gmail.com> In-Reply-To: <20201014204307.631746-1-danielhb413@gmail.com> References: <20201014204307.631746-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza 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 Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_command.c | 6 ------ src/qemu/qemu_validate.c | 9 +++++++++ tests/qemuhotplugtest.c | 1 + 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a4f1cbce11..f9387a65e0 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3823,12 +3823,6 @@ qemuBuildUSBInputDevStr(const virDomainDef *def, virBufferAsprintf(&buf, "usb-tablet,id=3D%s", dev->info.alias); break; case VIR_DOMAIN_INPUT_TYPE_KBD: - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_USB_KBD)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("usb keyboard is not supported by this " - "QEMU binary")); - return NULL; - } virBufferAsprintf(&buf, "usb-kbd,id=3D%s", dev->info.alias); break; } diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index ebc70aaf00..5de468af60 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -3993,6 +3993,15 @@ qemuValidateDomainDeviceDefInput(const virDomainInpu= tDef *input, return -1; } =20 + if (input->bus =3D=3D VIR_DOMAIN_INPUT_BUS_USB && + input->type =3D=3D VIR_DOMAIN_INPUT_TYPE_KBD && + !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_USB_KBD)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("usb keyboard is not supported by this " + "QEMU binary")); + return -1; + } + if (input->bus !=3D VIR_DOMAIN_INPUT_BUS_VIRTIO) return 0; =20 diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 2d12cacf28..0948c8792d 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -89,6 +89,7 @@ qemuHotplugCreateObjects(virDomainXMLOptionPtr xmlopt, virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_SPICE_FILE_XFER_DISABLE); virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_PR_MANAGER_HELPER); virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_SCSI_BLOCK); + virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_USB_KBD); =20 if (qemuTestCapsCacheInsert(driver.qemuCapsCache, priv->qemuCaps) < 0) return -1; --=20 2.26.2