From nobody Mon Feb 9 02:12:16 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1586376852; cv=none; d=zohomail.com; s=zohoarc; b=Qur/QRD4KaDMdRJK/K7R+gnFcpbOIMGHyUpLop0uyz++mKYVXkqxd6sh8xDglQxszbTguSZRmjX6Gyw+smrH3DwJdRWbjgcLGx5WoRbpAW/hs8Fgwt4bLNnfADscivapMkCirLL4Rxzin8rmy4XA/gxFLTkXqIMZfWDG9iUw9eI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586376852; 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=Su/vH40JnfklPwywEj3R1O9dUmu65KbCnrQ0ann2t/o=; b=FffyaAhKFQuW+g6TRzoiLB+HhOnPLfc2IU/vNnvj08Cr0uM526F6tGFYoajXfJbiKTL9bi8Pvjtc6g6b2f03emeaHS1LLr1ItI5CEm+XzW1TbsYID8VBAwUgYXSB0eERnPjrVlOS+Ts2kRuLoRN5h/PRsq2XvVRHNFnK4jeZuzI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1586376852898692.8853755420719; Wed, 8 Apr 2020 13:14:12 -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-432-JodJrWpXN0SSwSBTx8pwCg-1; Wed, 08 Apr 2020 16:14:06 -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 72D72801E6C; Wed, 8 Apr 2020 20:14:00 +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 3B74DC0D85; Wed, 8 Apr 2020 20:14:00 +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 C983C944DA; Wed, 8 Apr 2020 20:13:59 +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 038KDwlj002092 for ; Wed, 8 Apr 2020 16:13:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0E987105548C; Wed, 8 Apr 2020 20:13:58 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 09F1F1055470 for ; Wed, 8 Apr 2020 20:13:58 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) (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 DFA648FF67D for ; Wed, 8 Apr 2020 20:13:57 +0000 (UTC) Received: from m4a0073g.houston.softwaregrp.com (m4a0073g.houston.softwaregrp.com [15.124.2.131]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-385-GHeKFY3cPbiyrY15t76J5w-1; Wed, 08 Apr 2020 16:13:54 -0400 Received: FROM m4a0073g.houston.softwaregrp.com (15.120.17.147) BY m4a0073g.houston.softwaregrp.com WITH ESMTP FOR libvir-list@redhat.com; Wed, 8 Apr 2020 20:11:44 +0000 Received: from M4W0335.microfocus.com (2002:f78:1193::f78:1193) by M4W0335.microfocus.com (2002:f78:1193::f78:1193) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1591.10; Wed, 8 Apr 2020 20:09:24 +0000 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (15.124.8.10) by M4W0335.microfocus.com (15.120.17.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1591.10 via Frontend Transport; Wed, 8 Apr 2020 20:09:24 +0000 Received: from BY5PR18MB3315.namprd18.prod.outlook.com (2603:10b6:a03:196::12) by BY5PR18MB3121.namprd18.prod.outlook.com (2603:10b6:a03:1a5::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2878.20; Wed, 8 Apr 2020 20:09:23 +0000 Received: from BY5PR18MB3315.namprd18.prod.outlook.com ([fe80::6157:7c41:b13d:23f5]) by BY5PR18MB3315.namprd18.prod.outlook.com ([fe80::6157:7c41:b13d:23f5%3]) with mapi id 15.20.2878.021; Wed, 8 Apr 2020 20:09:23 +0000 Received: from linux-tbji.provo.novell.com (75.169.23.17) by DM3PR12CA0095.namprd12.prod.outlook.com (2603:10b6:0:55::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2900.15 via Frontend Transport; Wed, 8 Apr 2020 20:09:21 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1586376851; 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=Su/vH40JnfklPwywEj3R1O9dUmu65KbCnrQ0ann2t/o=; b=TwgzDiV/Dju2jHgUpcHxg90F7MrEaoVdMyYgdurvfalc31zo6K4nmArCA4WIOwsHBN/2F7 rBYSCNANPv+VVPR2xup8gjlIR9M6m9jcopWJenu14vJ9clJP8sWl5RofXWorn7peD/UDDA lf/jnCkuAgqDSRgn7ipXNDHO1z98oeo= X-MC-Unique: JodJrWpXN0SSwSBTx8pwCg-1 X-MC-Unique: GHeKFY3cPbiyrY15t76J5w-1 From: Jim Fehlig To: Subject: [PATCH 3/3] xenconfig: Add support for max_event_channels Date: Wed, 8 Apr 2020 14:08:55 -0600 Message-ID: <20200408200855.19806-4-jfehlig@suse.com> In-Reply-To: <20200408200855.19806-1-jfehlig@suse.com> References: <20200408200855.19806-1-jfehlig@suse.com> X-ClientProxiedBy: DM3PR12CA0095.namprd12.prod.outlook.com (2603:10b6:0:55::15) To BY5PR18MB3315.namprd18.prod.outlook.com (2603:10b6:a03:196::12) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Originating-IP: [75.169.23.17] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 97a62b4f-b0d7-4925-4de3-08d7dbf8ba3a X-MS-TrafficTypeDiagnostic: BY5PR18MB3121: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-Forefront-PRVS: 0367A50BB1 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BY5PR18MB3315.namprd18.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(10019020)(4636009)(396003)(366004)(136003)(39850400004)(346002)(376002)(6666004)(5660300002)(8936002)(26005)(2906002)(186003)(6506007)(2616005)(16526019)(956004)(1076003)(6916009)(107886003)(66476007)(86362001)(66556008)(36756003)(66946007)(6512007)(81166007)(316002)(6486002)(81156014)(52116002)(4326008)(478600001)(8676002); DIR:OUT; SFP:1102; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: U/vhoTY3pvvrM8Rp2bY4ONhFsV4fF+drqbzZ7431YpGfOyXq7VRHctLQO53BfTnelIaUqd7DARbHf3E1Nk5oHmO7UkNWYbzpbVD51ivGI+tS8V5Ja+oZuF3D6sGm+wqkCiy7eCfglo5w6hjK4LuCQI37V1zrD4XUtgbHzgU109MtB9cYjSPBQKX2CWLnetWkP7XsfgmnkNnqSvtLGjQ6pQE4OhDHCP7/rgpHYzG1CRIRJcZ3V7eMjcLI6yJ3IBeHw9hjk+quvRwN8EaS7vxgTIibAw/3wYv2V4fVILHYbMKWWBEt1e3nDa7damSv06u6H4+km68bBWoBBY7PR4Mp8k72bXhmz7iVavjYuA/qvaOYFYrb4dq2816mhfzM/CUkpWaE6ZRP3WhRcBieOVWWz//cKJDTGp5mmCYr7LMFpLzWSTGUCnBDLzymvBLJrH6l X-MS-Exchange-AntiSpam-MessageData: P1QdKkAJtRp8hwsI7huzQNtt51sKwqiWreB6WZroRP2ca7Y+OmYW2gAlnqMpEMil4/UPOhfvcp8434HCn4UuXBi08ohlPKUmfzF6b8/kX4sWn9ZZNxdjd6eHNWuy37FqT7MRKRYTh790vEPs4bgFcw== X-MS-Exchange-CrossTenant-Network-Message-Id: 97a62b4f-b0d7-4925-4de3-08d7dbf8ba3a X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2020 20:09:22.1848 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 856b813c-16e5-49a5-85ec-6f081e13b527 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Ys3VeRXjDwvfkkXgwx6vkcOMQpCJOS3vwrCai4SDp1wcSfUeGt8OFP6IiZ0QeUCCoflaAy60Ik00G0QzfMCHYA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR18MB3121 X-OriginatorOrg: suse.com X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 038KDwlj002092 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.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Add support in the domXML<->native config converter for max_event_channels. The parser and formater functions for max_grant_frames were reworked to also parse max_event_channels. In doing so the xenbus controller is added earlier in the config parsing, requiring a small adjustment to one of the existing tests. Include a new test for the event channel conversion. Signed-off-by: Jim Fehlig Reviewed-by: Daniel P. Berrang=C3=A9 --- src/libxl/xen_xl.c | 57 +++++++++++-------- tests/xlconfigdata/test-max-eventchannels.cfg | 13 +++++ tests/xlconfigdata/test-max-eventchannels.xml | 32 +++++++++++ tests/xlconfigdata/test-usbctrl.xml | 2 +- tests/xlconfigtest.c | 2 + 5 files changed, 80 insertions(+), 26 deletions(-) diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index 91b1825399..d40c2e1d8e 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -597,19 +597,12 @@ xenParseXLVnuma(virConfPtr conf, } #endif =20 -#ifdef LIBXL_HAVE_BUILDINFO_GRANT_LIMITS static int -xenParseXLGntLimits(virConfPtr conf, virDomainDefPtr def) +xenParseXLXenbusLimits(virConfPtr conf, virDomainDefPtr def) { - unsigned long max_gntframes; int ctlr_idx; virDomainControllerDefPtr xenbus_ctlr; - - if (xenConfigGetULong(conf, "max_grant_frames", &max_gntframes, 0) < 0) - return -1; - - if (max_gntframes <=3D 0) - return 0; + unsigned long limit; =20 ctlr_idx =3D virDomainControllerFindByType(def, VIR_DOMAIN_CONTROLLER_= TYPE_XENBUS); if (ctlr_idx =3D=3D -1) @@ -620,10 +613,20 @@ xenParseXLGntLimits(virConfPtr conf, virDomainDefPtr = def) if (xenbus_ctlr =3D=3D NULL) return -1; =20 - xenbus_ctlr->opts.xenbusopts.maxGrantFrames =3D max_gntframes; + if (xenConfigGetULong(conf, "max_event_channels", &limit, 0) < 0) + return -1; + if (limit > 0) + xenbus_ctlr->opts.xenbusopts.maxEventChannels =3D limit; + +#ifdef LIBXL_HAVE_BUILDINFO_GRANT_LIMITS + if (xenConfigGetULong(conf, "max_grant_frames", &limit, 0) < 0) + return -1; + if (limit > 0) + xenbus_ctlr->opts.xenbusopts.maxGrantFrames =3D limit; +#endif + return 0; } -#endif =20 static int xenParseXLDiskSrc(virDomainDiskDefPtr disk, char *srcstr) @@ -1180,10 +1183,8 @@ xenParseXL(virConfPtr conf, goto cleanup; #endif =20 -#ifdef LIBXL_HAVE_BUILDINFO_GRANT_LIMITS - if (xenParseXLGntLimits(conf, def) < 0) + if (xenParseXLXenbusLimits(conf, def) < 0) goto cleanup; -#endif =20 if (xenParseXLCPUID(conf, def) < 0) goto cleanup; @@ -1532,23 +1533,31 @@ xenFormatXLDomainVnuma(virConfPtr conf, } #endif =20 -#ifdef LIBXL_HAVE_BUILDINFO_GRANT_LIMITS static int -xenFormatXLGntLimits(virConfPtr conf, virDomainDefPtr def) +xenFormatXLXenbusLimits(virConfPtr conf, virDomainDefPtr def) { size_t i; =20 for (i =3D 0; i < def->ncontrollers; i++) { - if (def->controllers[i]->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_XE= NBUS && - def->controllers[i]->opts.xenbusopts.maxGrantFrames > 0) { - if (xenConfigSetInt(conf, "max_grant_frames", - def->controllers[i]->opts.xenbusopts.maxGr= antFrames) < 0) - return -1; + if (def->controllers[i]->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_XE= NBUS) { + if (def->controllers[i]->opts.xenbusopts.maxEventChannels > 0)= { + if (xenConfigSetInt(conf, "max_event_channels", + def->controllers[i]->opts.xenbusopts.m= axEventChannels) < 0) + return -1; + } + +#ifdef LIBXL_HAVE_BUILDINFO_GRANT_LIMITS + if (def->controllers[i]->opts.xenbusopts.maxGrantFrames > 0) { + if (xenConfigSetInt(conf, "max_grant_frames", + def->controllers[i]->opts.xenbusopts.m= axGrantFrames) < 0) + return -1; + } +#endif } } + return 0; } -#endif =20 static char * xenFormatXLDiskSrcNet(virStorageSourcePtr src) @@ -2191,10 +2200,8 @@ xenFormatXL(virDomainDefPtr def, virConnectPtr conn) return NULL; #endif =20 -#ifdef LIBXL_HAVE_BUILDINFO_GRANT_LIMITS - if (xenFormatXLGntLimits(conf, def) < 0) + if (xenFormatXLXenbusLimits(conf, def) < 0) return NULL; -#endif =20 if (xenFormatXLDomainDisks(conf, def) < 0) return NULL; diff --git a/tests/xlconfigdata/test-max-eventchannels.cfg b/tests/xlconfig= data/test-max-eventchannels.cfg new file mode 100644 index 0000000000..6794d6e318 --- /dev/null +++ b/tests/xlconfigdata/test-max-eventchannels.cfg @@ -0,0 +1,13 @@ +name =3D "XenGuest1" +uuid =3D "45b60f51-88a9-47a8-a3b3-5e66d71b2283" +maxmem =3D 512 +memory =3D 512 +vcpus =3D 1 +localtime =3D 0 +on_poweroff =3D "preserve" +on_reboot =3D "restart" +on_crash =3D "preserve" +vif =3D [ "mac=3D5a:36:0e:be:00:09" ] +bootloader =3D "/usr/bin/pygrub" +max_event_channels =3D 2047 +disk =3D [ "format=3Dqcow2,vdev=3Dxvda,access=3Drw,backendtype=3Dqdisk,tar= get=3D/var/lib/xen/images/debian/disk.qcow2" ] diff --git a/tests/xlconfigdata/test-max-eventchannels.xml b/tests/xlconfig= data/test-max-eventchannels.xml new file mode 100644 index 0000000000..3ee371a002 --- /dev/null +++ b/tests/xlconfigdata/test-max-eventchannels.xml @@ -0,0 +1,32 @@ + + XenGuest1 + 45b60f51-88a9-47a8-a3b3-5e66d71b2283 + 524288 + 524288 + 1 + /usr/bin/pygrub + + linux + + + preserve + restart + preserve + + + + + + + + + + + + + + + + + + diff --git a/tests/xlconfigdata/test-usbctrl.xml b/tests/xlconfigdata/test-= usbctrl.xml index 3fadd7a8cf..6bf8c2d1d9 100644 --- a/tests/xlconfigdata/test-usbctrl.xml +++ b/tests/xlconfigdata/test-usbctrl.xml @@ -18,8 +18,8 @@ - + diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c index 4e4b28cd34..8faef16ddf 100644 --- a/tests/xlconfigtest.c +++ b/tests/xlconfigtest.c @@ -294,6 +294,8 @@ mymain(void) DO_TEST("max-gntframes"); #endif =20 + DO_TEST("max-eventchannels"); + DO_TEST("vif-typename"); DO_TEST("vif-multi-ip"); DO_TEST("usb"); --=20 2.26.0