From nobody Mon Feb 9 23:15:06 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 1625606008438254.29472622716435; Tue, 6 Jul 2021 14:13:28 -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-222-pgKNNUg7O7ueGBfeQK2ucg-1; Tue, 06 Jul 2021 17:13:25 -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 CEDCF800050; Tue, 6 Jul 2021 21:13:20 +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 A6A295D9F0; Tue, 6 Jul 2021 21:13:19 +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 69C8D4EA2F; Tue, 6 Jul 2021 21:13:18 +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 166LDFXY014911 for ; Tue, 6 Jul 2021 17:13:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id B2F842167806; Tue, 6 Jul 2021 21:13:15 +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 AD4182166BB3 for ; Tue, 6 Jul 2021 21:13:15 +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 9643781D9FD for ; Tue, 6 Jul 2021 21:13:15 +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-212-czPnx0EUPh2CPcNY71Efkw-1; Tue, 06 Jul 2021 17:13:13 -0400 Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03lp2050.outbound.protection.outlook.com [104.47.8.50]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-17-GHPjJblcPGu4Q9UZoTXbwA-1; Tue, 06 Jul 2021 23:13:11 +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:10 +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:10 +0000 Received: from localhost (192.225.177.165) by FR3P281CA0001.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4308.8 via Frontend Transport; Tue, 6 Jul 2021 21:13:09 +0000 X-MC-Unique: pgKNNUg7O7ueGBfeQK2ucg-1 X-MC-Unique: czPnx0EUPh2CPcNY71Efkw-1 X-MC-Unique: GHPjJblcPGu4Q9UZoTXbwA-1 From: Jim Fehlig To: libvir-list@redhat.com Subject: [PATCH 3/6] libxl: Add a helper function to unprepare network devices Date: Tue, 6 Jul 2021 15:12:52 -0600 Message-ID: <20210706211255.8891-4-jfehlig@suse.com> In-Reply-To: <20210706211255.8891-1-jfehlig@suse.com> References: <20210706211255.8891-1-jfehlig@suse.com> X-ClientProxiedBy: FR3P281CA0001.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1d::10) 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: 023340c3-4002-467f-4a82-08d940c2dba5 X-MS-TrafficTypeDiagnostic: AM4PR0401MB2354: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:109 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: TkhRBgMGSRPrsL9FA7QaUenhDEjfjpwnlHrWQe2gAmbUVnDKQsRSpx6qDuqLVofDUZcG6M39qlreSys0uyoadooM7NofekxuFy2SyZGp4jAhcoMUFLUxgtUbZZBKz0RPYiEu7qoFIjKQ9bK5w/0UKohthgTwn3dfzvtPdSHQckFa4XO7i/xJKFLIJEku0dD9pyRUXKp1iDCaCrbPlJWhzuzJDxKQqUZbBIXgup33AqcGKpzdK5R5XXJJ/yHIIU1MehZvM5u8XdnWK1p69LsYkTJ1dyZpknFA8slMQ8gQ2pU5yiqy4SlkZRYD35tULgcpK+WnoZ6smuNwuCBHEPw18lQugIDZjOPwOw/FtNjaXrpd2YLsBJosS1ljPdj617S3Wy63uqEIS9vmDaSQ3k3ygG3JGZHz0cOqBbREGKPbYQ1gX9A2XUs8J5VOpRgNI+WcVaJcDJ/NpITAPeIG2QYhvgkGW1Y5VY/mNIqm729SbbLPIOKyNRI9/0HVwm/Aok8MZAdVQESXDLQ7qZ1jPpMgJ3CLxUu53UiSuVBh/JZ5+ES/JECb6nWoS7jgy12mDtekDL/Ct5Lsxvngh29FiTrKHO0yjXcDELRQtSPt94XWtJoFdDuweZBYEQ2PMPSxj7A7JRuX8nAuZf1VHFr26EVerA== 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); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?m3qET5VMK1aIAZfNltFPB5DPuDEFlQ6SugV3LO/s26DdfHH73kcwPYjBjWUO?= =?us-ascii?Q?zI2BSLr9O17Ae97Hp+h4GgMwKSBDefw0JoAt5NEJCxGInu+CXBXbkZX8Mki5?= =?us-ascii?Q?P1qwVbqXphASpzbSmCjGnN68s8nuDwuSYtPpWnU3tXYbfYXtutTnXqA4kwX7?= =?us-ascii?Q?IY0pmw4yLx6Tg+M+uAJUn1yhXTHCQkV/ctHqTo/tP27YhmP5XA6qDWnpzh9M?= =?us-ascii?Q?79fAi2zWEsyn2YQVuXphH5JZhaJ/1jfz4L9S8khDORtWkoOdDLfLd9T1Uaur?= =?us-ascii?Q?1G+u1Oz0ErJ9Ef3IjNqdT6rMQmDOtz2UAbf9FwhflQ8s0FmFaj2eNhZPsE6/?= =?us-ascii?Q?Qs5aWCeauNTIwk6ndf4GC84wwi9pdb8NgOlntd/w41u1nXeEZhujtEqL/V4N?= =?us-ascii?Q?szBRoXYzA9h793UTjAFrCl5FxOPIJVEy26C0RthQiW4Mxyoq6vuz1mQaD5y6?= =?us-ascii?Q?KnxXZcU2duuSr7TMeTv3CzoDDR2q2HXiJfWRur8VACgm1iDqdzPCKSAw7wdG?= =?us-ascii?Q?SgBcer8ah3G0ibnShizPv1I2Fl2g/4/4qhgvrGVQVFrehdTM7Bycy1zRGkMv?= =?us-ascii?Q?DYZV6oaxxNX76j3SA8hKnHyNtXRRM1kBNkCuMyDmQ+86o8hscdnNJ2AWwFAT?= =?us-ascii?Q?8C6ykDoKoc3lu5CTrrmVP+kuWAtkFTGgNAYuTanRSNJ0raL52rB6KMn2JqOQ?= =?us-ascii?Q?EK1xIowOfdaNuvwwUUn9eqv9oHoD2EQoJsoa/zDjWG2lDqbBaU/CP53ARdaD?= =?us-ascii?Q?LkbyhH7JKshNuj/fXA9iF0g/1YVRQNvWGHq9ooSe+k47yGlYgS3bwVeimrmc?= =?us-ascii?Q?2btX72E36f1HBQanTpFMfgqlKV1XwlyYwLrhK3zw3IBiePLIgSCGFnhudAPv?= =?us-ascii?Q?HzNWOcIkoInP6lP6U80ZZ3b/3M1Q4Zkm/wna3UF8m/mkIfnugG6XU/Zm501n?= =?us-ascii?Q?PkA0hsfdfaChKhSEoBwNo2U/rUOhlr1HugSeP3Amo8YNJI9FooCYZABmwL2R?= =?us-ascii?Q?0muhtpujZDzANLZBoYbDfM4lfwRFtnb2xkrsMaVXycKUslpQm/VhQveZZ5Sr?= =?us-ascii?Q?dDrukRfRXOUiC74PgmRUZfR+3KJ1v4lVeDqXaOaj63Rj8NaS+LD+89AselO4?= =?us-ascii?Q?FTmRnl0mJOKKCDbnq2tPIReEREAoCxs1uJqBKbthwOuLRTMM9lgnsUEm7zaQ?= =?us-ascii?Q?Vemv6zLWZlSv9pke9xsLEbUP6oTv4kwBDcKUHRViz7j1cM5zpEwSYzb92VLv?= =?us-ascii?Q?uTXNwbLLYqvIiJwm2mhgOwGdR+Qmmqt4uXxad1MQ7cpWJ6ru7YtzOF7E3aTZ?= =?us-ascii?Q?CrMAVmnrB4DZHHQXXN1h8q3L?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 023340c3-4002-467f-4a82-08d940c2dba5 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:10.3736 (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: 2wk3psTKGmLgBwZvNo3hMLnsVPt6xOaklJEdsbFRZe8C2EQC103PLUr2MdPzHqm/Bb7Mu86U+iNxkIBD1KbALg== 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.6 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 166LDFXY014911 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: 1625606010770100003 Content-Type: text/plain; charset="utf-8" Move network device cleanup code from libxlDomainCleanup to a helper function for use in a subsequent patch. Signed-off-by: Jim Fehlig --- src/libxl/libxl_domain.c | 49 +++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index e906495b64..f957c29d0d 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -826,6 +826,33 @@ libxlDomainSaveImageOpen(libxlDriverPrivate *driver, return -1; } =20 +static void +libxlNetworkUnwindDevices(virDomainDef *def) +{ + if (def->nnets) { + size_t i; + + for (i =3D 0; i < def->nnets; i++) { + virDomainNetDef *net =3D def->nets[i]; + + if (net->ifname && + STRPREFIX(net->ifname, LIBXL_GENERATED_PREFIX_XEN)) + VIR_FREE(net->ifname); + + /* cleanup actual device */ + virDomainNetRemoveHostdev(def, net); + if (net->type =3D=3D VIR_DOMAIN_NET_TYPE_NETWORK) { + g_autoptr(virConnect) conn =3D virGetConnectNetwork(); + + if (conn) + virDomainNetReleaseActualDevice(conn, def, net); + else + VIR_WARN("Unable to release network device '%s'", NULL= STR(net->ifname)); + } + } + } +} + /* * Internal domain destroy function. * @@ -923,29 +950,9 @@ libxlDomainCleanup(libxlDriverPrivate *driver, } } =20 - if ((vm->def->nnets)) { - size_t i; - - for (i =3D 0; i < vm->def->nnets; i++) { - virDomainNetDef *net =3D vm->def->nets[i]; - - if (net->ifname && - STRPREFIX(net->ifname, LIBXL_GENERATED_PREFIX_XEN)) - VIR_FREE(net->ifname); - - /* cleanup actual device */ - virDomainNetRemoveHostdev(vm->def, net); - if (net->type =3D=3D VIR_DOMAIN_NET_TYPE_NETWORK) { - if (conn || (conn =3D virGetConnectNetwork())) - virDomainNetReleaseActualDevice(conn, vm->def, net); - else - VIR_WARN("Unable to release network device '%s'", NULL= STR(net->ifname)); - } - } - } + libxlNetworkUnwindDevices(vm->def); =20 file =3D g_strdup_printf("%s/%s.xml", cfg->stateDir, vm->def->name); - if (unlink(file) < 0 && errno !=3D ENOENT && errno !=3D ENOTDIR) VIR_DEBUG("Failed to remove domain XML for %s", vm->def->name); VIR_FREE(file); --=20 2.31.1