From 7e57285eec1ad024c6b23674e41cc2acdf1a864b Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Mon, 24 Jan 2022 08:55:52 +0100 Subject: [PATCH] virDomainChrSourceDefCopy: Don't check arguments against NULL MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The only caller of this function (qemuProcessFindCharDevicePTYsMonitor()) doesn't pass NULL. Remove corresponding check from virDomainChrSourceDefCopy(). Signed-off-by: Michal Privoznik Reviewed-by: Ján Tomko --- src/conf/domain_conf.c | 3 --- src/conf/domain_conf.h | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 5d3604c085..d2206085fd 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2739,9 +2739,6 @@ int virDomainChrSourceDefCopy(virDomainChrSourceDef *dest, virDomainChrSourceDef *src) { - if (!dest || !src) - return -1; - virDomainChrSourceDefClear(dest); dest->type = src->type; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index d7352b60e6..8f47adfc8f 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3349,7 +3349,8 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainSmartcardDef, virDomainSmartcardDefFree); void virDomainChrDefFree(virDomainChrDef *def); G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainChrDef, virDomainChrDefFree); int virDomainChrSourceDefCopy(virDomainChrSourceDef *dest, - virDomainChrSourceDef *src); + virDomainChrSourceDef *src) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); void virDomainSoundCodecDefFree(virDomainSoundCodecDef *def); ssize_t virDomainSoundDefFind(const virDomainDef *def, const virDomainSoundDef *sound); -- 2.47.3