From nobody Mon Feb 9 07:11:26 2026 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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=1600885299; cv=none; d=zohomail.com; s=zohoarc; b=kJ087vZG9cnrT/++9//aFqVjx01oglmce+jwEuVJn9DuXwxN2YJtBgMgMwCDcSrH9kjegcYWd+8UNDrVQtsWUkcOSCeQ3fFKr3Ya9WoQO37Jq3kdCvMg30KVVreF+Eqg3ug9dbwYDfOlNMeLarUYG/keVp245JhcANFcGe6qSVc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600885299; 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=weO2xGHWp0mGfxG0lb3GmlgqCQyayZ957d+lAJOQEaI=; b=fwo/iO0YnEBMrE8qUro+1jivX0ZJdKrdDl1o6LxCGOsLWAVaGlxjthzeS/C6CWD8x3RsjNY/XqC0qKH2W1LUMIGQgZyi+FYsK7BlBul0TtRujNho6tfzxEYkdLGf5t271WvFRcoqJOgtSicKUnQxlCm5sKh5M/rbX75240Nocko= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass 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 1600885299794113.39132410890534; Wed, 23 Sep 2020 11:21:39 -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-489-ubUD85G6ODC4bWyLsTixtA-1; Wed, 23 Sep 2020 14:21:36 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 23D2E81F00B; Wed, 23 Sep 2020 18:21:28 +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 034B173668; Wed, 23 Sep 2020 18:21:28 +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 C1EA38C7B9; Wed, 23 Sep 2020 18:21:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 08NILQ49019013 for ; Wed, 23 Sep 2020 14:21:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id 728495C22B; Wed, 23 Sep 2020 18:21:26 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id EF3E85C26B for ; Wed, 23 Sep 2020 18:21:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600885298; 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=weO2xGHWp0mGfxG0lb3GmlgqCQyayZ957d+lAJOQEaI=; b=ZMlvsAPfBPsg8CmhYAkBTknlARVgBGBsbgLbzDodjI2g+0R4W+bNotMLJKpr1ksg2NAjhJ wIG0YSLEnw0ZIomBD71Vh+50QwaHGoSKKVEOsudD70QuPDZJUl5Tc7CPwKRhiNK4DuK/hp U1GseieYF4hHnt7JbkafKpNFLFiYQ74= X-MC-Unique: ubUD85G6ODC4bWyLsTixtA-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 6/6] conf: introduce virDomainDefControllersParse Date: Wed, 23 Sep 2020 20:21:12 +0200 Message-Id: <18f4657c289468861690588bdba08701a872d9d4.1600885173.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.13 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Signed-off-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 122 +++++++++++++++++++++++------------------ 1 file changed, 70 insertions(+), 52 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ccfe32685c..680524ce08 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -21795,6 +21795,75 @@ virDomainDefClockParse(virDomainDefPtr def, return -1; } =20 +static int +virDomainDefControllersParse(virDomainDefPtr def, + xmlXPathContextPtr ctxt, + virDomainXMLOptionPtr xmlopt, + unsigned int flags, + bool *usb_none) +{ + g_autofree xmlNodePtr *nodes =3D NULL; + bool usb_other =3D false; + bool usb_master =3D false; + size_t i; + int n; + + if ((n =3D virXPathNodeSet("./devices/controller", ctxt, &nodes)) < 0) + goto error; + + if (n && VIR_ALLOC_N(def->controllers, n) < 0) + goto error; + + for (i =3D 0; i < n; i++) { + virDomainControllerDefPtr controller =3D virDomainControllerDefPar= seXML(xmlopt, + = nodes[i], + = ctxt, + = flags); + + if (!controller) + goto error; + + /* sanitize handling of "none" usb controller */ + if (controller->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_USB) { + if (controller->model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_USB_N= ONE) { + if (usb_other || *usb_none) { + virDomainControllerDefFree(controller); + virReportError(VIR_ERR_XML_DETAIL, "%s", + _("Can't add another USB controller: " + "USB is disabled for this domain")); + goto error; + } + *usb_none =3D true; + } else { + if (*usb_none) { + virDomainControllerDefFree(controller); + virReportError(VIR_ERR_XML_DETAIL, "%s", + _("Can't add another USB controller: " + "USB is disabled for this domain")); + goto error; + } + usb_other =3D true; + } + + if (controller->info.mastertype =3D=3D VIR_DOMAIN_CONTROLLER_M= ASTER_NONE) + usb_master =3D true; + } + + virDomainControllerInsertPreAlloced(def, controller); + } + VIR_FREE(nodes); + + if (usb_other && !usb_master) { + virReportError(VIR_ERR_XML_DETAIL, "%s", + _("No master USB controller specified")); + goto error; + } + + return 0; + + error: + return -1; +} =20 static virDomainDefPtr virDomainDefParseXML(xmlDocPtr xml, @@ -21808,8 +21877,6 @@ virDomainDefParseXML(xmlDocPtr xml, virDomainDefPtr def; bool uuid_generated =3D false; bool usb_none =3D false; - bool usb_other =3D false; - bool usb_master =3D false; g_autofree xmlNodePtr *nodes =3D NULL; g_autofree char *tmp =3D NULL; =20 @@ -21940,58 +22007,9 @@ virDomainDefParseXML(xmlDocPtr xml, } VIR_FREE(nodes); =20 - /* analysis of the controller devices */ - if ((n =3D virXPathNodeSet("./devices/controller", ctxt, &nodes)) < 0) + if (virDomainDefControllersParse(def, ctxt, xmlopt, flags, &usb_none) = < 0) goto error; =20 - if (n && VIR_ALLOC_N(def->controllers, n) < 0) - goto error; - - for (i =3D 0; i < n; i++) { - virDomainControllerDefPtr controller =3D virDomainControllerDefPar= seXML(xmlopt, - = nodes[i], - = ctxt, - = flags); - - if (!controller) - goto error; - - /* sanitize handling of "none" usb controller */ - if (controller->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_USB) { - if (controller->model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_USB_N= ONE) { - if (usb_other || usb_none) { - virDomainControllerDefFree(controller); - virReportError(VIR_ERR_XML_DETAIL, "%s", - _("Can't add another USB controller: " - "USB is disabled for this domain")); - goto error; - } - usb_none =3D true; - } else { - if (usb_none) { - virDomainControllerDefFree(controller); - virReportError(VIR_ERR_XML_DETAIL, "%s", - _("Can't add another USB controller: " - "USB is disabled for this domain")); - goto error; - } - usb_other =3D true; - } - - if (controller->info.mastertype =3D=3D VIR_DOMAIN_CONTROLLER_M= ASTER_NONE) - usb_master =3D true; - } - - virDomainControllerInsertPreAlloced(def, controller); - } - VIR_FREE(nodes); - - if (usb_other && !usb_master) { - virReportError(VIR_ERR_XML_DETAIL, "%s", - _("No master USB controller specified")); - goto error; - } - /* analysis of the resource leases */ if ((n =3D virXPathNodeSet("./devices/lease", ctxt, &nodes)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, --=20 2.26.2