From nobody Tue May 14 04:18:11 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=oracle.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 170498136817463.35985996391662; Thu, 11 Jan 2024 05:56:08 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id EED211C7C; Thu, 11 Jan 2024 08:56:06 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 06F001C4D; Thu, 11 Jan 2024 08:54:58 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 247631C16; Thu, 11 Jan 2024 08:54:54 -0500 (EST) Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 5C9A91C26 for ; Thu, 11 Jan 2024 08:54:53 -0500 (EST) Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 40B8HYHZ009798 for ; Thu, 11 Jan 2024 12:58:12 GMT Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3vjcnv0gav-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 11 Jan 2024 12:58:12 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 40BBn8TM035082 for ; Thu, 11 Jan 2024 12:58:11 GMT Received: from nam04-mw2-obe.outbound.protection.outlook.com (mail-mw2nam04lp2168.outbound.protection.outlook.com [104.47.73.168]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3vfuu7kf91-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 11 Jan 2024 12:58:11 +0000 Received: from SJ0PR10MB5768.namprd10.prod.outlook.com (2603:10b6:a03:421::12) by SJ2PR10MB7582.namprd10.prod.outlook.com (2603:10b6:a03:538::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7159.23; Thu, 11 Jan 2024 12:58:09 +0000 Received: from SJ0PR10MB5768.namprd10.prod.outlook.com ([fe80::6d3b:7127:8c9e:f59b]) by SJ0PR10MB5768.namprd10.prod.outlook.com ([fe80::6d3b:7127:8c9e:f59b%7]) with mapi id 15.20.7159.020; Thu, 11 Jan 2024 12:58:09 +0000 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-Greylist: delayed 3400 seconds by postgrey-1.37 at lists.libvirt.org; Thu, 11 Jan 2024 08:54:53 EST ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BPbUGXf8iIpesPpD7tUpGldh5p1goL4j8Wrt0ScchPBa4VrDFR0Ck4bOymRdMLAxKgwZO9AYHQFmLYzhqpKhMoB8Wyr+uj1aNCl51pE1CAWbZXChYigqSBPE1YiADlfyBkUFnOMTrwDEwtpyuoCHbk+SReL/3t4E8NOGVex2y8MUe11F20Z1oJGo6e/Dz9M2R0vgk/vDjL6fdVwtNDVc14ZhQR3us2T/jJZVL9h+bC7nYVuXGfzLTdN2gb0XMF9IBicKbhOoGOM/TM/sPEE7GG+ls21WHNtZmenRQbYAmIHu17EEjMlYj1N4t5IraSq1Um91gRGXk2rjN8n2DZSQHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=7rOiFJbUVcU8kMthcZtQgWwUzyYKY5XkNWUXsMTCLu0=; b=Mx/0MfDfycY2v+FIJ5eYi1V2BO5XCbNL5EEOEe/L/Qb8NZFpp5ASBroWsnsXEa3UY0TWIEgYTTfz+ZrtRA2OYMcgaU5Wk4y0Tuptc3DLBXs1FN5vxmDF9IhnwaVh3lyblGJ1oJr5UzdmJdcHpM2WrTpiDu1tAczx+49UIh8WnR5r27L/E138gr93nMspLON1srAnKqaisUZ3EKd+jHbS/BFK0ifB0c9Z+AaPDrsX+PtCZ3RT0q/7R0h2+/cwfCy2k9/vlScBiwez1meDdU4+ttNpCxQTalGcdSgvNQdU3txtB5rDolxmSnoR02oHgetZRNqpATr3CdIRm2trlXs0Xw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none From: Shaleen Bathla To: devel@lists.libvirt.org Subject: [PATCH] conf: domain_conf: cleanup def in case of errors Date: Thu, 11 Jan 2024 18:27:54 +0530 Message-Id: <20240111125754.2873514-1-shaleen.bathla@oracle.com> X-Mailer: git-send-email 2.39.3 X-ClientProxiedBy: PH7PR17CA0022.namprd17.prod.outlook.com (2603:10b6:510:324::7) To SJ0PR10MB5768.namprd10.prod.outlook.com (2603:10b6:a03:421::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR10MB5768:EE_|SJ2PR10MB7582:EE_ X-MS-Office365-Filtering-Correlation-Id: 45c122d4-6635-4fb1-5ea5-08dc12a4f5f5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oi2H25rQN6MQ6ZL9LZnvJBZ8pTClIupwv3I1L53BBe32PYJ45NBDPl5jACpc0aOp/vuG+7UsbhA+WPSkYV69mil5R06OqWbUmL59LoFjwYvIhcODEMkCa4j+3t+iUSRc4ZzSVwRiKjfWrEzhh3f2KUXNn1FqnG6+gWLgIwO8+nQfH09hIKcyQg07Z5L99hR/JApcLpjghrBJDodCpT7mvXzuKCEInEUXxbfU/pIXukKPqkBl9PRk9w/2QEoxbLJy9reJyBzEqyFZKb9HQ1plcDia/DQPDijRV75hNC3897vJhS8nxyLbodlRvTQb5P7yJiobXBWnQb4iFPOdtpo8J2JN1eHDS22vMaBBdS2UmLliNxxq7JirUtYjIrw18qHSjvKaL4CJ7uBPm5FmRGWTRu/uYVOvKPXGuk+nw0MSAzOc+1LeKfa9lBQagWLMApXXHX6uOQSdbGZccwv9gmOgMQaU6pohM80yminhFgsqtbPgStTZtbIQjmYrQXEMPOuvbTQX70H1gusbn1fn6KWMnieo7IXTDS+2Az0AiZE76zwA36g23WMHX1R4V0pFxrzh X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR10MB5768.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(366004)(396003)(39860400002)(376002)(136003)(346002)(230922051799003)(451199024)(1800799012)(186009)(64100799003)(26005)(83380400001)(1076003)(5660300002)(38100700002)(6506007)(6512007)(2616005)(6666004)(478600001)(316002)(66476007)(6916009)(66946007)(8676002)(66556008)(8936002)(6486002)(44832011)(36756003)(41300700001)(86362001)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?AVXBFvTKwPxzeqUGIHJxq4L06F4CK5Qp+uWIzKZ+OzMFMgD3cXUMmm/4ylj9?= =?us-ascii?Q?1+Ol0Au6qQGqc+XOI6Yjf2QDGdb2E7Ubq9oSNIjBrpaMXSdf29jUOujq3Lza?= =?us-ascii?Q?1lFWgp+yML4e5FxxG+WFBNaKnteZ7/eYW0jBzSLFb4T2+kjvVbNuGQrrRwmm?= =?us-ascii?Q?zIDYwXwJIbXh/JX9xdYrv/2zR1EbjwokjlY9pUToLlee1ftBfAccpmozxZub?= =?us-ascii?Q?i14AZidtYjWEH8T/djo2ZhcEdxFkPRIyvfcpvYIyPOGCNfS7WM0hqjOsexMl?= =?us-ascii?Q?Pqq9uNj/sRPGJN0QmUvbVvpPBg2pgvb82i+mQ1ADruvaDElShujLUy4EUePJ?= =?us-ascii?Q?+dRvXkM8E4oFpuEJ93axfUDmb/vEfWZ8ukmLWBR7m4WmcRn2+dqhxXwe1ZMu?= =?us-ascii?Q?3KUPigI0NBsJyg61d5VjiTFlO0BZySYZcjA8ohACbFB/TO/Up4Itp+ZdGiXc?= =?us-ascii?Q?7Ot6EjSgdca3NUSVjgd7ZGIm7MXpa14qx5JS1Y08DehyJaT+7gf6uSng1Cyc?= =?us-ascii?Q?C6zq0aca3t8HyrI8e9D9ONe8hq9HXbzunT/lLq9T21VPmiYio9vVzqvk3Rhw?= =?us-ascii?Q?CxpDXUf0ZyqLP7dRBLzQc32ZpwvReeyoeJYfWdAGMRf8rFFPSabLlORSCZwy?= =?us-ascii?Q?LjRgDaiDf9tJVNbxGJtZ2bRDx8fzL4BvOVH1iZCB+naBH51EUrs2+x3tjvcR?= =?us-ascii?Q?ttYED34G0Q/jGtIPiH6dkaS6WPyL2zLNooOwxYfJozhRn4MWwo9Qww4v+nlN?= =?us-ascii?Q?9Ou+1r7on2qALz+xr076/JzbWyEj566PcJxTbZ937PpqsSgKOvNXDtaUJAYV?= =?us-ascii?Q?f4F4lFzyp8vEezeMi4xaHsM02nvYOJCKp0DxPDGcP/vvg/uKFND01AaPwoWJ?= =?us-ascii?Q?tPvX4J2zH8hiK7RocadqbUICn/8NCQK+cEE0VsjuemnERBjQ9AOYda2cCinY?= =?us-ascii?Q?uSR+Gk3h4Pi4pPKmtPoMUwpcEk+rN9AE7EVW1LmnZcRLHGdFbW4fewE79c7O?= =?us-ascii?Q?Y5RN3hFlYA+RCzJvYYKgykEEiuor6srYUu26aldhLdjcfuKYls7rnC8WMsAZ?= =?us-ascii?Q?2HquAIjhQC3uh98c404nsB2pyQNMX9kXZjWk3kvzkr8KQJohB3WWHfrPrqX3?= =?us-ascii?Q?AvQ3E7HmTTl3gdT2bqH/MTvK4QHVngkZQFByTPtclrxmhJg99YpjGETVgRaE?= =?us-ascii?Q?1dkZFro92vrA4qw3dd4lz+0RAOMmQgDvrp+U8Gljqsl9BWd9gNkC1LWQdl5e?= =?us-ascii?Q?PSXCLQ+DxV/rMXIbJydeiBYdZMFBmaNLjZISnqQGpZRlXcA/zDOs3LEPitML?= =?us-ascii?Q?N7tctMAx5B3QUgC9LuFln6Uo4xip2RBQq4cD44ZfsqqHfoLnBJwl+YGQcqJE?= =?us-ascii?Q?hEn+qmUD2R7vAWu1B2BbupcKrHHcvhG1QcJnpQz10LAZYnLw2CZ5sbRr3zF1?= =?us-ascii?Q?0AVzrCOEl4RNedrmjRB/QxWNxECpACj+/1XBF0M7T7YI29UMqREc3xiY0yy1?= =?us-ascii?Q?5WtVVL73EUHy9KdD3Nfj0u93CFzmCSsD5BP79WuBLsoA7fE67C/kcfRxF34n?= =?us-ascii?Q?56y6qapP5W7R1wb/oLMcHiAhDEGaeAcEMzTUv2O4/0XhnCSHKASL30TZeZUj?= =?us-ascii?Q?1A=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: BKgr6w8/PSpX1fFVPGZIOu0K8fAMWpLa42WFgD0fYLiwQItm+zbqUqR6KDwHkF1ttwMgdc+xuKPfmdhv7mu4cymas8sB4Fhyzx07SLjMP2Fa/at1+Y/Vkkbt/mprI4wv5DKxmFgfSkNdx8xkEbe/h+d7rGoldzzqZKRj4Pa600Cn3fyL8KBDCQ/WCMS3u55zmgg1Ru9N6K/eZnTFAo9AByY7SA2CHza577+EIUlK3nnN4LrKdwDhY1sh9klszjBESiPMNCCJmOwlFBKiaDaP9esv+l/1UE/ofjpvMUCoLkk8q3mx9NkTSmQhycAnsaHVyLPwgcHsedrOCSfTe6hZidQTo0JeRYhQNXyxrl+FXzPiwq70z8nxTpnoV06BhNHry/OEP2LKShD++ZaUlqQDhUToc70UQuxS0CJR3rTbwx88AD5lQCX0ciNR8vZy0rablTJmpcF7EE3NWzYdFPFkRGz+uPeNkzAR1/Yq/x9U4uJPME9uR9hlinWHyNU0qiCQTThtWVsZFV1zlIKHduO2TZu25OtC26T+cmrFf2TseKhlYmIS1j+29iLrI1TRG5X3rQ+HLNyTA24iDTjnkqQQt+ODQ4aeG3KC4ImAGI+0Hf0= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 45c122d4-6635-4fb1-5ea5-08dc12a4f5f5 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB5768.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2024 12:58:09.2507 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: VXLtWZy06iE8rIxo1+5zHzvP2/lSrhGeS2zwXKdweMjql13B9buAMGjz7hbIEErcmZ0kv+dyHKLf1hytGqrY8VVAlmML2YDa5f/LSRviGnY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR10MB7582 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-01-11_07,2024-01-11_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 phishscore=0 bulkscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 malwarescore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2401110103 X-Proofpoint-GUID: INngboJzHSNYm22r3eSujVW8FixFMSZk X-Proofpoint-ORIG-GUID: INngboJzHSNYm22r3eSujVW8FixFMSZk Message-ID-Hash: 7ONA4A55F6VLTIXQS3QSEX4B4LNCEDOG X-Message-ID-Hash: 7ONA4A55F6VLTIXQS3QSEX4B4LNCEDOG X-MailFrom: shaleen.bathla@oracle.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1704981369734100001 Just like in rest of the function virDomainFSDefParseXML, use goto error so that def will be cleaned up in error cases. Signed-off-by: Shaleen Bathla Reviewed-by: Jonathon Jongsma --- src/conf/domain_conf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index be57a1981e7d..5d55d2acdace 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8866,23 +8866,23 @@ virDomainFSDefParseXML(virDomainXMLOption *xmlopt, goto error; =20 if ((n =3D virXPathNodeSet("./idmap/uid", ctxt, &uid_nodes)) < 0) - return NULL; + goto error; =20 if (n) { def->idmap.uidmap =3D virDomainIdmapDefParseXML(ctxt, uid_node= s, n); if (!def->idmap.uidmap) - return NULL; + goto error; =20 def->idmap.nuidmap =3D n; } =20 if ((n =3D virXPathNodeSet("./idmap/gid", ctxt, &gid_nodes)) < 0) - return NULL; + goto error; =20 if (n) { def->idmap.gidmap =3D virDomainIdmapDefParseXML(ctxt, gid_node= s, n); if (!def->idmap.gidmap) - return NULL; + goto error; =20 def->idmap.ngidmap =3D n; } --=20 2.39.3 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org