From nobody Mon Feb 9 04:14:04 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; 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=quarantine dis=quarantine) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1622827694; cv=none; d=zohomail.com; s=zohoarc; b=YeTJL36wj/kHAIqZCyHeN1Sy69xjyVW0PA13CxKG2P6on21LpCwBQjjjKW5Ay+dWU3F7yyjqHNcCPBruxG8B5RlUXGLbWIqAF3ZDxCzHvmdhEtuQmBjCJW73okq5g+K/xqt8RB1MCGk1Jniq99iwVrAXeSuZ2TcwK/7lGSJ1U88= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622827694; 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=GOa4e8uDe/rndkR04MndL8m11Ycq5flKcohZMQ86ur8=; b=MH9QkwZie1Wl1MV6+LLsYLFUuxi4AK3HQStCLAdZBtWxDLI09HuUXIsJrVvnraZ/XM632J1EV3xkUUi5p/dJppPECRloflLb0gBBJkT5LvCo2yKMjl9wUJumEJuFi4keGKBKk5qbfJAaX6YtEurftlUKP7MXAnGC0OAaH5Whxk4= 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=quarantine dis=quarantine) 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 1622827694847557.8148524872031; Fri, 4 Jun 2021 10:28:14 -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-449-HRH8cswIMPuD6aRIwrJBdA-1; Fri, 04 Jun 2021 13:28:11 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4626B10082ED; Fri, 4 Jun 2021 17:28:04 +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 D56A25C239; Fri, 4 Jun 2021 17:28:03 +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 8AC7144A58; Fri, 4 Jun 2021 17:28:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 154HS1sf019553 for ; Fri, 4 Jun 2021 13:28:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1EF6420149A2; Fri, 4 Jun 2021 17:28:01 +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 17F6B20877D7 for ; Fri, 4 Jun 2021 17:27:59 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (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 C392B80D0E1 for ; Fri, 4 Jun 2021 17:27:59 +0000 (UTC) Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-346-PqkAlbBhN2mv28HDvdPmkg-1; Fri, 04 Jun 2021 13:27:57 -0400 Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02lp2051.outbound.protection.outlook.com [104.47.6.51]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-31-kCU9KG1TNZm_-E6qINCimA-1; Fri, 04 Jun 2021 19:27:55 +0200 Received: from AM8PR04MB7970.eurprd04.prod.outlook.com (2603:10a6:20b:24f::9) by AM0PR0402MB3764.eurprd04.prod.outlook.com (2603:10a6:208:9::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.20; Fri, 4 Jun 2021 17:27:55 +0000 Received: from AM8PR04MB7970.eurprd04.prod.outlook.com ([fe80::44f9:5a6e:fe98:1718]) by AM8PR04MB7970.eurprd04.prod.outlook.com ([fe80::44f9:5a6e:fe98:1718%7]) with mapi id 15.20.4195.024; Fri, 4 Jun 2021 17:27:55 +0000 Received: from localhost (192.225.191.61) by AM8P189CA0004.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:218::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.20 via Frontend Transport; Fri, 4 Jun 2021 17:27:54 +0000 X-MC-Unique: HRH8cswIMPuD6aRIwrJBdA-1 X-MC-Unique: PqkAlbBhN2mv28HDvdPmkg-1 X-MC-Unique: kCU9KG1TNZm_-E6qINCimA-1 From: Jim Fehlig To: libvir-list@redhat.com Subject: [PATCH 1/3] libxl: Introduce domain def validate callback Date: Fri, 4 Jun 2021 11:27:46 -0600 Message-ID: <20210604172748.681-2-jfehlig@suse.com> In-Reply-To: <20210604172748.681-1-jfehlig@suse.com> References: <20210604172748.681-1-jfehlig@suse.com> X-Originating-IP: [192.225.191.61] X-ClientProxiedBy: AM8P189CA0004.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:218::9) To AM8PR04MB7970.eurprd04.prod.outlook.com (2603:10a6:20b:24f::9) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 048640a0-6ce4-4a0a-6d3e-08d9277e1696 X-MS-TrafficTypeDiagnostic: AM0PR0402MB3764: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: eTb7DuDAnasKQfoex2VgdWpmk51GG8B+CuBP5QI79HUuKRFkd6HDH4Pac14Hu5LnvHEc+V47oGHzGrbVVM6MJ4eH19yyIlC2lNg8xcD79//qK67umjLURPpormqV4uBS1o8Tn4NnJoWVGFLGMzfUkUnByiVjAvC2BLUSfb48J4D+N43X8+4AcSMaSO8R9RniNAQqns4Ppkov0QEja9a3+61Ghb77+FlUVgnhCSECtLUFw/hUj1A8Vf1/8m/F71mTirW0R2XEnGXmGOurNbbcbJeF2c2+5humKNxBTmS2gtZe/9YgcKCdtmHoQ+mIQG84BGIOuFcvjLpv2Qf0if3jfnYz8c3uVjsV2GqQg0/rrcKealN4wVDQ8Zs7sB8ZSlifajJPcsQ7bYge+fPpEEaMVzDaZSBL9cw93/Afy467dBv9FHduzPr7KVKp/7VSiWLVB2rT7P4WIegp9yfrhnlRHlUsV/qzpIZU0xI+USa2B/xiBuYjo5fa5+aewJc2zS5PHbIQe7lXT7oxROICGJ8czENGzMFoXsV1kM7HRaPwyo742OtNqtClwGMPr80+VXX2u9KKGZGa/uFpZotmd4vxh1VEjVrDeOuVNi9NwoZdwFc= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM8PR04MB7970.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(396003)(136003)(346002)(376002)(39860400002)(366004)(6496006)(6666004)(4326008)(107886003)(36756003)(86362001)(8676002)(38100700002)(16526019)(8936002)(186003)(478600001)(26005)(6486002)(2906002)(83380400001)(1076003)(316002)(5660300002)(956004)(66556008)(66946007)(2616005)(66476007)(6916009); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?0Y2hnWNbvULnrEJLQzGbqqRbEVD6yZ4a/vXDgp5diJsrY6tHw2UhMiEqKuVd?= =?us-ascii?Q?ppKDCto2a7Kw2LjO4eUYLoO8Wq8mupWysDpvfW/Jarxn3lmzlSrCyZ/H1j4j?= =?us-ascii?Q?u+14bgzWkODnVUCSHIgA448MnzRdnRRiez0zvxVOrN/qXNdPPHAgN6TdTWQn?= =?us-ascii?Q?UIj95sFLmtPjbEa9DMGP3Fl37ItKIz2eChj2rtJSLvmmzgq/qQcdnwfEFhgv?= =?us-ascii?Q?wBPqH5N5jfOUbhmggsjlW1c/QWSbMgxOxzHUPtIq+mlKl6VlFMaUvUSvoQ81?= =?us-ascii?Q?X0Ewpuqe+086sNyyb1HBjppTn4Z0R9qUMVnxBc3X6pop9+fvePgQOSZe3ch8?= =?us-ascii?Q?9152QmcmbQpqXV2XoOD48UB6O2zrXpiRSIT2Vd5oveSn+iosY4fjHtmx6FK4?= =?us-ascii?Q?BF/FmnNRq9J4X4LJTCZ3s8U2Rd7SUV46XlBX5V/HLrlIq6u7BBXmY9MRwajN?= =?us-ascii?Q?cVyN5mOcwNwVNd5eCrBuE8oSrgby19FMmieIQOe+172a231cfqZ3/7EBxC0P?= =?us-ascii?Q?wPaXgepI4t3S98gZISn8oIfyS/WocsNuffjxI7L/m7RnbLwIDPZoIenbV44K?= =?us-ascii?Q?RF62LfHrJls2it7bxPEmXBD4Z2xYcHK8FHmQR46HN6qJcpFG24UosoInBAgi?= =?us-ascii?Q?LuFeVveCLvdZTrhb8NsvHZSSWi09/fYh1J1O+die+Fj5N5IJ7ESVKOwW32hN?= =?us-ascii?Q?FZ36NOaSnnD86utDBL/8WpQFf9QJO9hMmt+TN1OzwCmB9axfAPGYs2BxAjK0?= =?us-ascii?Q?WpyI5fJockDMrO45QB6njkSa5iWmTnX4/FxFOQhUtyQKkb+uv957UHA8bsWF?= =?us-ascii?Q?TxJBtb7nW0zLz33R1dnjgAyju8CQPBTrf8r6q3uX20mxmuWI8XwiBym5j5SB?= =?us-ascii?Q?qeP9BtLNlfa7aRe31Y2n+sIcxXX59/0dT8AuV8jlOq2u5Bo6o3hyU5Zx6rUK?= =?us-ascii?Q?0+SOBJYIZWKkWz4YtLLvu2Q/JxFaorrcPvCSukt0reS/IqMhis0GWXUKk6AZ?= =?us-ascii?Q?rtB2dytIlciNjVRO+blPx6WO6fynDBorASjatZsJR19tXWpAaVNBe+siMnFi?= =?us-ascii?Q?apUH6Jci5u/xi78Ri7/H6oza9u+ZoyexdVQyD4kY4HfR8OTIiy4HZF+ZBUpN?= =?us-ascii?Q?cNTD3281TeKYQYyW1sBcdrWOTVZswoVhzJQ0HRA976tB/RgXic13d7I1T0+B?= =?us-ascii?Q?njJbmrmI4yYfn0ur0pTAWlc1G1GJpQE1tIoXUU5nIReNxU8TxqcwjENeFFdH?= =?us-ascii?Q?AXs8ZgkAiRH5JuYwzzbTefEANGSwEUu8bjn1/Ssz4oYLZ3IxWK/6/eiSm1v9?= =?us-ascii?Q?XW4WtYyOXJGCgcHmeAcQBCQf?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 048640a0-6ce4-4a0a-6d3e-08d9277e1696 X-MS-Exchange-CrossTenant-AuthSource: AM8PR04MB7970.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jun 2021 17:27:54.9468 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: kc/cTTjqcrGZ/GfECOMszrYBABnlvg13wogm2v0ZGOEnEVQ4nWYvwwSI5YqDeP0J+eaEZRNpvf1+CehNp9xZwQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0402MB3764 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.6 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 154HS1sf019553 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.16 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" Introduce libxlDomainDefValidate and move the existing validation check from libxlDomainDefPostParse. Additional validation will be introduced in subsequent patches. Signed-off-by: Jim Fehlig --- src/libxl/libxl_domain.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 625e04a9b0..9630f12568 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -379,17 +379,9 @@ libxlDomainDeviceDefPostParse(virDomainDeviceDef *dev, static int libxlDomainDefPostParse(virDomainDef *def, unsigned int parseFlags G_GNUC_UNUSED, - void *opaque, + void *opaque G_GNUC_UNUSED, void *parseOpaque G_GNUC_UNUSED) { - libxlDriverPrivate *driver =3D opaque; - g_autoptr(libxlDriverConfig) cfg =3D libxlDriverConfigGet(driver); - - if (!virCapabilitiesDomainSupported(cfg->caps, def->os.type, - def->os.arch, - def->virtType)) - return -1; - /* Xen PV domains always have a PV console, so add one to the domain c= onfig * via post-parse callback if not explicitly specified in the XML. */ if (def->os.type !=3D VIR_DOMAIN_OSTYPE_HVM && def->nconsoles =3D=3D 0= ) { @@ -441,11 +433,28 @@ libxlDomainDefPostParse(virDomainDef *def, return 0; } =20 +static int +libxlDomainDefValidate(const virDomainDef *def, + void *opaque, + void *parseOpaque G_GNUC_UNUSED) +{ + libxlDriverPrivate *driver =3D opaque; + g_autoptr(libxlDriverConfig) cfg =3D libxlDriverConfigGet(driver); + + if (!virCapabilitiesDomainSupported(cfg->caps, def->os.type, + def->os.arch, + def->virtType)) + return -1; + + return 0; +} + virDomainDefParserConfig libxlDomainDefParserConfig =3D { .macPrefix =3D { 0x00, 0x16, 0x3e }, .netPrefix =3D LIBXL_GENERATED_PREFIX_XEN, .devicesPostParseCallback =3D libxlDomainDeviceDefPostParse, .domainPostParseCallback =3D libxlDomainDefPostParse, + .domainValidateCallback =3D libxlDomainDefValidate, .features =3D VIR_DOMAIN_DEF_FEATURE_NET_MODEL_STRING, }; =20 --=20 2.31.1