From a269ac0f62e21859296bcef6f2be527b1e0090d4 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Wed, 9 Sep 2020 15:22:57 +0200 Subject: [PATCH] virDomainHostdevSubsysSCSIiSCSIClear: Inline contents into only caller MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There's just one caller for the function. Move the code into the caller. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- src/conf/domain_conf.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 72ac4f4191..acbc3f1c1e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3011,24 +3011,15 @@ virDomainHostdevDefNew(void) } -static void -virDomainHostdevSubsysSCSIiSCSIClear(virDomainHostdevSubsysSCSIiSCSIPtr iscsisrc) -{ - if (!iscsisrc) - return; - - virObjectUnref(iscsisrc->src); - iscsisrc->src = NULL; -} - - static void virDomainHostdevSubsysSCSIClear(virDomainHostdevSubsysSCSIPtr scsisrc) { - if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI) - virDomainHostdevSubsysSCSIiSCSIClear(&scsisrc->u.iscsi); - else + if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI) { + virObjectUnref(scsisrc->u.iscsi.src); + scsisrc->u.iscsi.src = NULL; + } else { VIR_FREE(scsisrc->u.host.adapter); + } }