From 8b039b383961fc00e59035b2bcdf154ba8ac53df Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Fri, 3 Mar 2023 09:46:10 +0100 Subject: [PATCH] qemu: capabilities: Remove return value from virQEMUCaps(SEV|SGX)InfoCopy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Both functions always return 0. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- src/qemu/qemu_capabilities.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 0be13e7dc4..8649434be8 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1884,7 +1884,7 @@ virQEMUCapsHostCPUDataClear(virQEMUCapsHostCPUData *cpuData) } -static int +static void virQEMUCapsSEVInfoCopy(virSEVCapability **dst, virSEVCapability *src) { @@ -1892,7 +1892,7 @@ virQEMUCapsSEVInfoCopy(virSEVCapability **dst, if (!src) { *dst = NULL; - return 0; + return; } tmp = g_new0(virSEVCapability, 1); @@ -1909,11 +1909,10 @@ virQEMUCapsSEVInfoCopy(virSEVCapability **dst, tmp->max_es_guests = src->max_es_guests; *dst = g_steal_pointer(&tmp); - return 0; } -static int +static void virQEMUCapsSGXInfoCopy(virSGXCapability **dst, virSGXCapability *src) { @@ -1921,7 +1920,7 @@ virQEMUCapsSGXInfoCopy(virSGXCapability **dst, if (!src) { *dst = NULL; - return 0; + return; } tmp = g_new0(virSGXCapability, 1); @@ -1939,7 +1938,6 @@ virQEMUCapsSGXInfoCopy(virSGXCapability **dst, } *dst = g_steal_pointer(&tmp); - return 0; } @@ -2017,16 +2015,11 @@ virQEMUCaps *virQEMUCapsNewCopy(virQEMUCaps *qemuCaps) for (i = 0; i < qemuCaps->ngicCapabilities; i++) ret->gicCapabilities[i] = qemuCaps->gicCapabilities[i]; - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SEV_GUEST) && - virQEMUCapsSEVInfoCopy(&ret->sevCapabilities, - qemuCaps->sevCapabilities) < 0) - return NULL; + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SEV_GUEST)) + virQEMUCapsSEVInfoCopy(&ret->sevCapabilities, qemuCaps->sevCapabilities); - - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SGX_EPC) && - virQEMUCapsSGXInfoCopy(&ret->sgxCapabilities, - qemuCaps->sgxCapabilities) < 0) - return NULL; + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SGX_EPC)) + virQEMUCapsSGXInfoCopy(&ret->sgxCapabilities, qemuCaps->sgxCapabilities); ret->hypervCapabilities = g_memdup(qemuCaps->hypervCapabilities, sizeof(virDomainCapsFeatureHyperv));