From dd1987268b419144f72f1c0e7aff8ae793bdf9d6 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Tue, 28 Mar 2023 14:37:40 +0200 Subject: [PATCH] virDomainPCIAddressSetExtensionAlloc: Remove return value MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The function always returns 0. Remove the return value and refactor caller. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- src/conf/domain_addr.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 27ce4a61ca..23c06ff6a4 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -962,21 +962,19 @@ virDomainPCIAddressSetExtensionFree(virDomainZPCIAddressIds *zpciIds) } -static int +static void virDomainPCIAddressSetExtensionAlloc(virDomainPCIAddressSet *addrs, virPCIDeviceAddressExtensionFlags extFlags) { if (extFlags & VIR_PCI_ADDRESS_EXTENSION_ZPCI) { if (addrs->zpciIds) - return 0; + return; addrs->zpciIds = g_new0(virDomainZPCIAddressIds, 1); addrs->zpciIds->uids = g_hash_table_new_full(g_int_hash, g_int_equal, g_free, NULL); addrs->zpciIds->fids = g_hash_table_new_full(g_int_hash, g_int_equal, g_free, NULL); } - - return 0; } @@ -990,14 +988,9 @@ virDomainPCIAddressSetAlloc(unsigned int nbuses, addrs->buses = g_new0(virDomainPCIAddressBus, nbuses); addrs->nbuses = nbuses; - if (virDomainPCIAddressSetExtensionAlloc(addrs, extFlags) < 0) - goto error; + virDomainPCIAddressSetExtensionAlloc(addrs, extFlags); return addrs; - - error: - virDomainPCIAddressSetFree(addrs); - return NULL; }