From nobody Mon Feb 9 14:14:42 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=suse.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1625606031032822.4392207664159; Tue, 6 Jul 2021 14:13:51 -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-366-BOcMtkehNkutNB-k28FxMw-1; Tue, 06 Jul 2021 17:13:47 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 093971084F5C; Tue, 6 Jul 2021 21:13:38 +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 DC63A5DA2D; Tue, 6 Jul 2021 21:13:37 +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 95C784EA3A; Tue, 6 Jul 2021 21:13:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 166LDLkt014927 for ; Tue, 6 Jul 2021 17:13:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id D4AC92033950; Tue, 6 Jul 2021 21:13:21 +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 CF6CB2033953 for ; Tue, 6 Jul 2021 21:13:19 +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-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DCBC189C5D7 for ; Tue, 6 Jul 2021 21:13:18 +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-418-vY8lfENAPfiez3dmhq5_pg-1; Tue, 06 Jul 2021 17:13:17 -0400 Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03lp2052.outbound.protection.outlook.com [104.47.8.52]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-15-LBJl2s7BPTCWbH2nKiSZlg-1; Tue, 06 Jul 2021 23:13:14 +0200 Received: from AM8PR04MB7970.eurprd04.prod.outlook.com (2603:10a6:20b:24f::9) by AM4PR0401MB2354.eurprd04.prod.outlook.com (2603:10a6:200:54::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.31; Tue, 6 Jul 2021 21:13:14 +0000 Received: from AM8PR04MB7970.eurprd04.prod.outlook.com ([fe80::a835:c9e1:adaf:572c]) by AM8PR04MB7970.eurprd04.prod.outlook.com ([fe80::a835:c9e1:adaf:572c%7]) with mapi id 15.20.4287.033; Tue, 6 Jul 2021 21:13:14 +0000 Received: from localhost (192.225.177.165) by FR3P281CA0004.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1d::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4308.7 via Frontend Transport; Tue, 6 Jul 2021 21:13:13 +0000 X-MC-Unique: BOcMtkehNkutNB-k28FxMw-1 X-MC-Unique: vY8lfENAPfiez3dmhq5_pg-1 X-MC-Unique: LBJl2s7BPTCWbH2nKiSZlg-1 From: Jim Fehlig To: libvir-list@redhat.com Subject: [PATCH 4/6] libxl: Introduce libxlDomainStartPrepare Date: Tue, 6 Jul 2021 15:12:53 -0600 Message-ID: <20210706211255.8891-5-jfehlig@suse.com> In-Reply-To: <20210706211255.8891-1-jfehlig@suse.com> References: <20210706211255.8891-1-jfehlig@suse.com> X-ClientProxiedBy: FR3P281CA0004.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1d::23) 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: f3697339-0cfc-4115-443c-08d940c2ddc9 X-MS-TrafficTypeDiagnostic: AM4PR0401MB2354: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:483 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: rGoYM9dizdxgVWJEBDnpYDM7czfrd9jLdVCyV0ISVYxV9g39qdRYbDrvLWqDV9uqVDb2x6uL/4aaR1nzmsxnqav2T+l43p3UUTPvkicLLsqdbVj6UPyetOPbslb2PNv4cAH9jxnIqtyRYEyWKGq+XlW6LmOcVqiWV4X6WWPy7rDfm5QDtzx3kiDa+qYL7MiOdm9ShSIk+ayG4PmZPWzcEAcO+usYtdE6havI2yNtQJcdLk7RZuaYMRtg8X4nccZH9HKBW2XQkyFG2CllXqe2hIsqVRimON9yCBfuPxyySUnOIARO2dLIS/IFIqCZWzXqkbJGF6KGIJHcLM55aPK012ZyUntcgPwoAUpjbTauUM7sZkFYwZOrdOyNyoEmN7R4Iq3zP8nQ0h5JhK6/bN9ruQn6ieKJL6eE1M4weqoIj8TU2xfyaDqsB8KgBvikL0urbWPrVCkPXWI0OUYP4ivt5SSenAFu+ZLTlnRVgCpQpeG4soavByQzTz8a7UDY+Sqd9tyZSmjCEIEVDMYD+ZF7sNIBOuPhTpYILf1uZRwbKmUdbkMy5n58b+WAQeTkp+bCaIh9iK6yUT0GDtOT0jxEo1lOc2zRFt9zmNnFIGxbLMabxkwxx95m6ve5u+3sV8jmxEpfUpSiiGSz4D4FujVCD5ilTqwD9kgH4FD6zw+tiJwJ4aZeaPHcv54V9xXLYZP62HOi0O5FTth3vbIoamY4Uk2MHHJonfxGQnId75Oz5Zs= 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:(136003)(376002)(346002)(396003)(39840400004)(366004)(478600001)(6916009)(186003)(26005)(956004)(8936002)(2616005)(6496006)(2906002)(83380400001)(5660300002)(8676002)(316002)(6486002)(1076003)(66556008)(38100700002)(66476007)(66946007)(36756003)(6666004)(86362001)(145543001)(145603002); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?kzekRV65oa+3ezLjN2+1+9WtI2xp+xg+pHpOqCHSGI3USoHZvgIf6RPthJqt?= =?us-ascii?Q?hGc12gAvaDpEPemAazt7O4RK34AyzHaN5B0wnZAZ9Alif30Ea1DMfUzF9gXh?= =?us-ascii?Q?t7Dj98W1+5JgHSbpYFrswimiQPzng0YXcm1NAFG6/2pniX9uBnk8sDG3vrRI?= =?us-ascii?Q?FVVLryZPyp4/xEDb4npHCvEBGa5u8uL5GuReMKC7qAFNTuNO+yXv1UcEggxA?= =?us-ascii?Q?oC0uh0NlrgaYlImlK6dzbUCa0I2v7sRe+7OezQ2Lej4mEHM1kNH7WA4NPvrL?= =?us-ascii?Q?Y/PHCKecycpV8ALwpJz4nggEyUOV7ekCy6EPbipF6mRqb6pISICzWROKg7EQ?= =?us-ascii?Q?uG5U5kW3STV14x+bDAZwivpnwaUBfu++X3wByyFM8FVSUlvCyBUPCEaPZsbo?= =?us-ascii?Q?418cNbgSea6E4VtI+IsZmZs8k6rPv5c4FCgl0G/OYfnuOqwwxJnSKfOvk5iI?= =?us-ascii?Q?jo3s+oXx0QByaZZwhRqmxWHHe7D3MvVtIt4Ibb9FFMzafEcKxQhvFyCAzNY+?= =?us-ascii?Q?ppKRKhxcx1VRxJR6kIEGOOiy6TWgTBd4+0i0Sx/2FVUPkGtQpTmNcSinVXB0?= =?us-ascii?Q?cw9PZLDSGZlj/QDp01CIQ4cq0zk1l1LWnTMKHjvF3lNcxuBgYZP8RBHzYOZg?= =?us-ascii?Q?jsBoaRg7/2ldtQGHpm2NJ9bvR1vLGvoQ/wYYgBDEa24eznp08s3Gko9xB82d?= =?us-ascii?Q?3Nc+QxrSQg8E5SYzz8MibfrR+Mvy/unXZHX0/mdbyVQ8XOuf95g08n8yQM8P?= =?us-ascii?Q?m2BHKYwKUUJf72TI8Ufy5FerBzXXV+T1vl9GV5+sgVaaog2L4EZVsNPV7jZY?= =?us-ascii?Q?exF2lGJ8SaKhz9aZpD2vPM9Am4kGgOH2tDibgRLfRjmqUUpZ63XVRlxDYGAG?= =?us-ascii?Q?mxUQ4Ucxn1XP543gtRbiKCRAM3sVMmdHmncF1npo4wSwvkdtykcubOVStdsv?= =?us-ascii?Q?EHcjUql2BiqoS/E6emlk1M89o36LlxH08RcZDW+BaQKGM9Rw6JVDpfo2Ft5n?= =?us-ascii?Q?gheAGIgG7oLLCytmIBxW/wZF8JjMRxkQMpQLHrAydlN0r74kgMv1WlGS/veu?= =?us-ascii?Q?/Dy5A8wKzWMjAw4wCUnyPgy2ZPDVD7dDRWaCpNp+BJSmxbOB1LkC2EQV9ayl?= =?us-ascii?Q?ZvqF/0lmXFrOox6WsZesYAQNc+3xQ3T5Onn0SLKycF4kSZhNTYJB18EwcM8M?= =?us-ascii?Q?IvKZPzZeHbXwVVloIkL0BLc7Sp4uxe8JJv26958BJlGh0iYB01bl2YSXbLCu?= =?us-ascii?Q?mLPQDmULUvXQ5TFtdm0/wgQFNAVeRqldCBvWp0y/ZS5LhszBR09c7SLj8gTZ?= =?us-ascii?Q?EL38AOghxYejaCBeMDaKQ1Rg?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: f3697339-0cfc-4115-443c-08d940c2ddc9 X-MS-Exchange-CrossTenant-AuthSource: AM8PR04MB7970.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jul 2021 21:13:14.2675 (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: Qi4VLcxwIomN6lbkT8K5VlqqjREqbq7BFu2gxJBGFwmcsxwXf5ig++atqHIWPrrBT9a0aq053f9BS9lMsQq2Kg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR0401MB2354 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-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 166LDLkt014927 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.14 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: 1625606033015100001 Content-Type: text/plain; charset="utf-8" Introduce libxlDomainStartPrepare as part of decomposing libxlDomainStart. Perform all prepratory operations such as hostdevs, network devs, etc. Also ensure all such operations are properly unwound on error. Signed-off-by: Jim Fehlig --- src/libxl/libxl_domain.c | 99 ++++++++++++++++++++++------------------ 1 file changed, 55 insertions(+), 44 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index f957c29d0d..d564165807 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -1224,6 +1224,55 @@ libxlDomainCreateChannelPTY(virDomainDef *def, libxl= _ctx *ctx) libxl_device_channel_dispose(&x_channels[i]); } =20 +static int +libxlDomainStartPrepare(libxlDriverPrivate *driver, + virDomainObj *vm) +{ + virHostdevManager *hostdev_mgr =3D driver->hostdevMgr; + unsigned int hostdev_flags =3D VIR_HOSTDEV_SP_PCI | VIR_HOSTDEV_SP_USB; + + if (virDomainObjSetDefTransient(driver->xmlopt, vm, NULL) < 0) + return -1; + + /* Run an early hook to set-up missing devices */ + if (virHookPresent(VIR_HOOK_DRIVER_LIBXL)) { + g_autofree char *xml =3D virDomainDefFormat(vm->def, driver->xmlop= t, 0); + int hookret; + + hookret =3D virHookCall(VIR_HOOK_DRIVER_LIBXL, vm->def->name, + VIR_HOOK_LIBXL_OP_PREPARE, VIR_HOOK_SUBOP_BE= GIN, + NULL, xml, NULL); + /* + * If the script raised an error abort the launch + */ + if (hookret < 0) + goto error; + } + + if (virDomainLockProcessStart(driver->lockManager, + "xen:///system", + vm, + true, + NULL) < 0) + goto error; + + if (libxlNetworkPrepareDevices(vm->def) < 0) + goto error; + + if (virHostdevPrepareDomainDevices(hostdev_mgr, LIBXL_DRIVER_INTERNAL_= NAME, + vm->def, hostdev_flags) < 0) + goto error; + + return 0; + + error: + libxlNetworkUnwindDevices(vm->def); + virHostdevReAttachDomainDevices(hostdev_mgr, LIBXL_DRIVER_INTERNAL_NAM= E, + vm->def, hostdev_flags); + virDomainObjRemoveTransientDef(vm); + return -1; +} + /* * Start a domain through libxenlight. * @@ -1243,46 +1292,15 @@ libxlDomainStart(libxlDriverPrivate *driver, g_autofree char *dom_xml =3D NULL; libxlDomainObjPrivate *priv =3D vm->privateData; g_autoptr(libxlDriverConfig) cfg =3D libxlDriverConfigGet(driver); - virHostdevManager *hostdev_mgr =3D driver->hostdevMgr; libxl_asyncprogress_how aop_console_how; libxl_domain_restore_params params; - unsigned int hostdev_flags =3D VIR_HOSTDEV_SP_PCI; g_autofree char *config_json =3D NULL; =20 - hostdev_flags |=3D VIR_HOSTDEV_SP_USB; + if (libxlDomainStartPrepare(driver, vm) < 0) + return -1; =20 libxl_domain_config_init(&d_config); =20 - if (virDomainObjSetDefTransient(driver->xmlopt, vm, NULL) < 0) - goto cleanup; - - /* Run an early hook to set-up missing devices */ - if (virHookPresent(VIR_HOOK_DRIVER_LIBXL)) { - char *xml =3D virDomainDefFormat(vm->def, driver->xmlopt, 0); - int hookret; - - hookret =3D virHookCall(VIR_HOOK_DRIVER_LIBXL, vm->def->name, - VIR_HOOK_LIBXL_OP_PREPARE, VIR_HOOK_SUBOP_BE= GIN, - NULL, xml, NULL); - VIR_FREE(xml); - - /* - * If the script raised an error abort the launch - */ - if (hookret < 0) - goto cleanup_dom; - } - - if (virDomainLockProcessStart(driver->lockManager, - "xen:///system", - vm, - true, - NULL) < 0) - goto cleanup; - - if (libxlNetworkPrepareDevices(vm->def) < 0) - goto cleanup_dom; - if (libxlBuildDomainConfig(driver->reservedGraphicsPorts, vm->def, cfg, &d_config) < 0) goto cleanup_dom; @@ -1290,10 +1308,6 @@ libxlDomainStart(libxlDriverPrivate *driver, if (cfg->autoballoon && libxlDomainFreeMem(cfg->ctx, &d_config) < 0) goto cleanup_dom; =20 - if (virHostdevPrepareDomainDevices(hostdev_mgr, LIBXL_DRIVER_INTERNAL_= NAME, - vm->def, hostdev_flags) < 0) - goto cleanup_dom; - /* now that we know it is about to start call the hook if present */ if (virHookPresent(VIR_HOOK_DRIVER_LIBXL)) { char *xml =3D virDomainDefFormat(vm->def, driver->xmlopt, 0); @@ -1415,7 +1429,7 @@ libxlDomainStart(libxlDriverPrivate *driver, * If the script raised an error abort the launch */ if (hookret < 0) - goto cleanup_dom; + goto destroy_dom; } =20 event =3D virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_START= ED, @@ -1424,21 +1438,18 @@ libxlDomainStart(libxlDriverPrivate *driver, VIR_DOMAIN_EVENT_STARTED_RESTORED= ); virObjectEventStateQueue(driver->domainEventState, event); =20 - ret =3D 0; - goto cleanup; + libxl_domain_config_dispose(&d_config); + return 0; =20 destroy_dom: - ret =3D -1; libxlDomainDestroyInternal(driver, vm); vm->def->id =3D -1; virDomainObjSetState(vm, VIR_DOMAIN_SHUTOFF, VIR_DOMAIN_SHUTOFF_FAILED= ); =20 cleanup_dom: libxlDomainCleanup(driver, vm); - - cleanup: libxl_domain_config_dispose(&d_config); - return ret; + return -1; } =20 int --=20 2.31.1