From nobody Wed May 15 02:23:21 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; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com 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 1647696240676809.7236283203335; Sat, 19 Mar 2022 06:24:00 -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-15-dt8W1tBOM4SSwNxI1RA5Gg-1; Sat, 19 Mar 2022 09:23:58 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3BBFC3C01DAB; Sat, 19 Mar 2022 13:23:56 +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 24C68776C; Sat, 19 Mar 2022 13:23:56 +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 DC0A0194035B; Sat, 19 Mar 2022 13:23:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 69BAF1940341 for ; Sat, 19 Mar 2022 13:23:54 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 5450B2026D64; Sat, 19 Mar 2022 13:23:54 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast07.extmail.prod.ext.rdu2.redhat.com [10.11.55.23]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4F61C2026D60 for ; Sat, 19 Mar 2022 13:23:39 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 101A63C01DAA for ; Sat, 19 Mar 2022 13:23:39 +0000 (UTC) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-385-xscBqxQTNAWAV6mElnJu8g-1; Sat, 19 Mar 2022 09:23:37 -0400 Received: by mail-pf1-f172.google.com with SMTP id a5so11869216pfv.2 for ; Sat, 19 Mar 2022 06:23:37 -0700 (PDT) Received: from localhost.localdomain ([2409:4040:e25:6346:7900:a4ca:437f:4b67]) by smtp.gmail.com with ESMTPSA id f19-20020a056a00229300b004fa873f6169sm1371524pfe.54.2022.03.19.06.23.34 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Mar 2022 06:23:36 -0700 (PDT) X-MC-Unique: dt8W1tBOM4SSwNxI1RA5Gg-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: xscBqxQTNAWAV6mElnJu8g-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=SIo+maUV4x9DZttgWs9GOX8+KetfVR8ZDM/qroFb34w=; b=qjmnS5czc/2R0BhHgLco6+FU5QXtkzxcww2UHH3eEzDU1BgQw04JNGxzDFbe/pdJs2 M1NO6xU4Nijo4vqu835Pu4yByH/BlFxBuRRgNkyeYLT+hj3s1IdIo+Zn33IVvnNdDmLy I1oh0fyazNyJq1DD8mNWqoRihT5khaD5jo/gWnzL3TC1Jx6iXMNZptNtDBl9upwZ6eA0 ilzptNTeIlXPp12evrcIB3A/34ODIH33d+2vvcRg/LIZkHOH6Fg2Rhf3p57YRWBnVJ1m Q0AW7gbh2ISfdjXEvNApi1jKeBLYyrCM5TLx9mildI8e/H+q3zy5XuU2p+DyXepdMzmR GNJA== X-Gm-Message-State: AOAM5329hZ+rj/vhZBjeusPLgMjx4g3jA4lR7+ZRCt3HGTYimpmRjiof y2WbHPFkOwC3gC/OfqXPegarzeXpSbQ= X-Google-Smtp-Source: ABdhPJzfXfg9gm4veBRiDm8EAJTGQzO2BkrGW3enGTYv8+5yvs8+Mk++mjiiRimpLiTrEJEaZSfzpw== X-Received: by 2002:a65:6b95:0:b0:380:85c1:98e3 with SMTP id d21-20020a656b95000000b0038085c198e3mr11700461pgw.511.1647696216437; Sat, 19 Mar 2022 06:23:36 -0700 (PDT) From: Jamm02 X-Google-Original-From: Jamm02 To: libvir-list@redhat.com Subject: [PATCH] domain_conf: include checks against dom->os.type and dom->virtType Date: Sat, 19 Mar 2022 18:53:29 +0530 Message-Id: <20220319132329.87041-1-codeguy.moteen@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.4 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: , Cc: Jamm02 Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 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-ZM-MESSAGEID: 1647696242030100001 Content-Type: text/plain; charset="utf-8" All the checks against dom->os.type and dom->virtType in virDomainInputDefParseXML shifted to virDomainInputDefValidate function Signed-off-by: Jamm02 --- src/conf/domain_conf.c | 49 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e0dfc9e45f..b237fd9ab1 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11837,6 +11837,55 @@ virDomainPanicDefParseXML(virDomainXMLOption *xmlo= pt, return NULL; } =20 +static virDomainInputDef * +virDomainInputDefValidate(const virDomainDef *dom, + xmlNodePtr node, + xmlXPathContextPtr ctxt) +{ + VIR_XPATH_NODE_AUTORESTORE(ctxt) + virDomainInputDef *def; + g_autofree char *bus =3D NULL; + + def =3D g_new0(virDomainInputDef, 1); + + ctxt->node =3D node; + bus =3D virXMLPropString(node, "bus"); + + if (bus) { + if ((def->bus =3D virDomainInputBusTypeFromString(bus)) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown input bus type '%s'"), bus); + goto error; + } + + } else { + if (dom->os.type =3D=3D VIR_DOMAIN_OSTYPE_HVM) { + if ((def->type =3D=3D VIR_DOMAIN_INPUT_TYPE_MOUSE || + def->type =3D=3D VIR_DOMAIN_INPUT_TYPE_KBD) && + (ARCH_IS_X86(dom->os.arch) || dom->os.arch =3D=3D VIR_ARCH= _NONE)) { + def->bus =3D VIR_DOMAIN_INPUT_BUS_PS2; + } else if (ARCH_IS_S390(dom->os.arch) || + def->type =3D=3D VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH)= { + def->bus =3D VIR_DOMAIN_INPUT_BUS_VIRTIO; + } else if (def->type =3D=3D VIR_DOMAIN_INPUT_TYPE_EVDEV) { + def->bus =3D VIR_DOMAIN_INPUT_BUS_NONE; + } else { + def->bus =3D VIR_DOMAIN_INPUT_BUS_USB; + } + } else if (dom->os.type =3D=3D VIR_DOMAIN_OSTYPE_XEN || + dom->os.type =3D=3D VIR_DOMAIN_OSTYPE_XENPVH) { + def->bus =3D VIR_DOMAIN_INPUT_BUS_XEN; + } else { + if ((dom->virtType =3D=3D VIR_DOMAIN_VIRT_VZ || + dom->virtType =3D=3D VIR_DOMAIN_VIRT_PARALLELS)) + def->bus =3D VIR_DOMAIN_INPUT_BUS_PARALLELS; + } + } + + error: + virDomainInputDefFree(def); + return NULL; +} /* Parse the XML definition for an input device */ static virDomainInputDef * virDomainInputDefParseXML(virDomainXMLOption *xmlopt, --=20 2.35.1