From nobody Mon Feb 9 15:09:36 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 163853555365188.7328455420635; Fri, 3 Dec 2021 04:45:53 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-480-rPdD6Z89PKShIu9tCPN0LQ-1; Fri, 03 Dec 2021 07:45:49 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0D49193931; Fri, 3 Dec 2021 12:45:43 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8DA4C45D7A; Fri, 3 Dec 2021 12:45:40 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id CA99E1809CB8; Fri, 3 Dec 2021 12:45:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1B3CjYEg017035 for ; Fri, 3 Dec 2021 07:45:34 -0500 Received: by smtp.corp.redhat.com (Postfix) id 8E2F82026D4D; Fri, 3 Dec 2021 12:45:34 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 89D4A2026D46 for ; Fri, 3 Dec 2021 12:45:31 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9771C85A5B9 for ; Fri, 3 Dec 2021 12:45:31 +0000 (UTC) Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-558-QaAmtc3uMQO8Xty9VWT4jg-1; Fri, 03 Dec 2021 07:45:30 -0500 Received: by mail-pj1-f46.google.com with SMTP id y14-20020a17090a2b4e00b001a5824f4918so5062139pjc.4 for ; Fri, 03 Dec 2021 04:45:29 -0800 (PST) Received: from localhost ([2400:ddc0:1000::b373:390c]) by smtp.gmail.com with ESMTPSA id e10sm3573185pfv.140.2021.12.03.04.45.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Dec 2021 04:45:28 -0800 (PST) X-MC-Unique: rPdD6Z89PKShIu9tCPN0LQ-1 X-MC-Unique: QaAmtc3uMQO8Xty9VWT4jg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bej1AIrHyaMJVA1Fv1rbG5HwPitM8K00U6KjU8/KymE=; b=g7GJXHS7BG8E2AeNAf74y6e4SQBApJp7KmY6wz1ymfLth0nQFAIlqGuXR6mjYKTyDS 1Vx3pYP/BvAAPnP4uW3xpKVu+bU0rzNvcMMUh4lsLTnAf9RhKdGGTf5XWle4tnFRylmY ikuyZKZ9D0jNcILRTg1UQtSgZpaRe+9xHzXhGij7JnHj0DCx+CinQffmt9cVIvxvzUgv /jA+eor5L4lJtj7WwniFvk4Ea5ktIBJBFVuG12mM+Qd2ZL4f5Rutyqb1T+z/+g2J1Nj2 C/LMkmXlrOf2JqoTxYZTv366KW5FvL1twtpB2Z62Jbti9Q2218nXTKtDCLZF6ukj7Vps ViQA== X-Gm-Message-State: AOAM533mNwWyPhKTis0GPvoCs8EXxYfSYjRFpSr8rT+ATNBPq0UrKB3l c7Wx2DJgFYyOXF0eeY5X+jtWkEluVcQzaCLE X-Google-Smtp-Source: ABdhPJxwfa7eKHKytDVl8M7Pj7ilbbfeMqj4b33wAZWScz2ouFHevfyccByYvwYmLHH8oWPQvIl1GQ== X-Received: by 2002:a17:902:ced0:b0:142:189a:4284 with SMTP id d16-20020a170902ced000b00142189a4284mr22789442plg.79.1638535528685; Fri, 03 Dec 2021 04:45:28 -0800 (PST) From: Luke Yue To: libvir-list@redhat.com Subject: [PATCH v4 1/8] conf: Introduce virDomainInputDefRemove and fix memory leak Date: Fri, 3 Dec 2021 20:45:10 +0800 Message-Id: <20211203124517.571524-2-lukedyue@gmail.com> In-Reply-To: <20211203124517.571524-1-lukedyue@gmail.com> References: <20211203124517.571524-1-lukedyue@gmail.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1638535554294100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Luke Yue --- src/conf/domain_conf.c | 12 ++++++++++++ src/conf/domain_conf.h | 2 ++ src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 3 ++- 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index bdcc3dc2c1..d6f69b3ace 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -16874,6 +16874,18 @@ virDomainInputDefFind(const virDomainDef *def, } =20 =20 +virDomainInputDef * +virDomainInputDefRemove(virDomainDef *def, + size_t idx) +{ + virDomainInputDef *ret =3D def->inputs[idx]; + + VIR_DELETE_ELEMENT(def->inputs, idx, def->ninputs); + + return ret; +} + + bool virDomainVsockDefEquals(const virDomainVsockDef *a, const virDomainVsockDef *b) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index c0c07ea6ba..e4259bf890 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3852,6 +3852,8 @@ virDomainShmemDef *virDomainShmemDefRemove(virDomainD= ef *def, size_t idx) ssize_t virDomainInputDefFind(const virDomainDef *def, const virDomainInputDef *input) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; +virDomainInputDef *virDomainInputDefRemove(virDomainDef *def, size_t idx) + ATTRIBUTE_NONNULL(1); bool virDomainVsockDefEquals(const virDomainVsockDef *a, const virDomainVsockDef *b) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 7be5b51100..338207b235 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -479,6 +479,7 @@ virDomainInputBusTypeToString; virDomainInputDefFind; virDomainInputDefFree; virDomainInputDefGetPath; +virDomainInputDefRemove; virDomainInputSourceGrabToggleTypeFromString; virDomainInputSourceGrabToggleTypeToString; virDomainInputSourceGrabTypeFromString; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6333d0af36..bef2465e57 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7632,7 +7632,8 @@ qemuDomainDetachDeviceConfig(virDomainDef *vmdef, _("matching input device not found")); return -1; } - VIR_DELETE_ELEMENT(vmdef->inputs, idx, vmdef->ninputs); + + virDomainInputDefFree(virDomainInputDefRemove(vmdef, idx)); break; =20 case VIR_DOMAIN_DEVICE_VSOCK: --=20 2.34.1