From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C10F0C433EF for ; Sun, 3 Oct 2021 08:14:01 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 82D5B61269 for ; Sun, 3 Oct 2021 08:14:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 82D5B61269 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:37922 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWwdE-000296-DH for qemu-devel@archiver.kernel.org; Sun, 03 Oct 2021 04:14:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36938) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWw9R-00041y-9z; Sun, 03 Oct 2021 03:43:13 -0400 Received: from mail-ed1-x532.google.com ([2a00:1450:4864:20::532]:37833) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWw9P-0000yK-PP; Sun, 03 Oct 2021 03:43:12 -0400 Received: by mail-ed1-x532.google.com with SMTP id ba1so51824131edb.4; Sun, 03 Oct 2021 00:43:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BgpdyLnyiPwHCME2fmRt2m1yxap5kM3KZz3BIBf/qMo=; b=ocxpYwH1lxNTij3aQwGMpgMXBMS+Y6N0bbdd6GJ4Ot5HM/Gjg6+NDU7TtQynLCKjCo uO8pQNjNNX0mNCBrzLpxGDrJywpUKAB3TTrjDWVz+2cSwNG8kOiOc+btkEJfCj2PKkaI MlrjWreKRRa8WT0GGWKdiApS1K+rkTbgCR10cH7yl/VvLZLFSd1yVY1MUCRuYBDGL/Bx DdRy1vxxdwVqPq/EI+8WAwblHVOSZ7+Zmx+Mp+id/t1I+OuWe/49Hhb8dcKKJs1JLRhg D/enadQPREa66FUmRBjlHeR58er4tqdjnd3081QxM92D9YL1p7zAX50iwe8M+JYms7OT ajHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=BgpdyLnyiPwHCME2fmRt2m1yxap5kM3KZz3BIBf/qMo=; b=Q9LifEGajoE73de+GqNL7spLHJy7W4zwXgT/6abzgAJwdtbsNXvB5oJIdylI83wQDo WPrJo0CWzJwrxDQgosQjnkhKEoUEoxCasIw66hEJqPFOg6Q6r1efACQClpEIn1PGL2YS nkjZ7L3W/WHZ8jiYcURpSQlQ0etVgtwOxdrZcUCwaLuPvHQcJ0wPmyqYyoMzZgRTZeul XL3zgyWoB1wAtWo170jKSi0E5YjrqJKy0crolmx2zftwZkRTzzF8cfzcoXT+QXZnmnr1 VVqGsPA38ItFezKpHMhSstu8tM5OgsOtE1krwdjg9O9Nj4gxHhhMvIvXihY9UBoNCxR8 tAyg== X-Gm-Message-State: AOAM530pCFbHx4F/YRUS+syLqDWBnRJUqI1r+rmFkGKKbvj930jiaX55 j7I0NfPQPIT1XLC5CbbXeeSv9r8vGVs= X-Google-Smtp-Source: ABdhPJxl8QQGHSGdtFiUUmQkNb8bCwfAUCeZBxt9kRoObQHKMFHR2l6Im6KuhYtlTHdW377xuFIMGA== X-Received: by 2002:a17:906:ce2c:: with SMTP id sd12mr8961198ejb.488.1633246989920; Sun, 03 Oct 2021 00:43:09 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n6sm5560856eds.10.2021.10.03.00.43.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Oct 2021 00:43:09 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 24/30] virtio-mem-pci: Fix memory leak when creating MEMORY_DEVICE_SIZE_CHANGE event Date: Sun, 3 Oct 2021 09:42:44 +0200 Message-Id: <20211003074250.60869-25-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211003074250.60869-1-pbonzini@redhat.com> References: <20211003074250.60869-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::532; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x532.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Markus Armbruster , qemu-stable@nongnu.org, David Hildenbrand Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: David Hildenbrand Apparently, we don't have to duplicate the string. Fixes: 722a3c783ef4 ("virtio-pci: Send qapi events when the virtio-mem size changes") Cc: qemu-stable@nongnu.org Signed-off-by: David Hildenbrand Reviewed-by: Markus Armbruster Message-Id: <20210929162445.64060-2-david@redhat.com> Signed-off-by: Paolo Bonzini --- hw/virtio/virtio-mem-pci.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/hw/virtio/virtio-mem-pci.c b/hw/virtio/virtio-mem-pci.c index fa5395cd88..7e384b7397 100644 --- a/hw/virtio/virtio-mem-pci.c +++ b/hw/virtio/virtio-mem-pci.c @@ -88,13 +88,8 @@ static void virtio_mem_pci_size_change_notify(Notifier *notifier, void *data) size_change_notifier); DeviceState *dev = DEVICE(pci_mem); const uint64_t * const size_p = data; - const char *id = NULL; - if (dev->id) { - id = g_strdup(dev->id); - } - - qapi_event_send_memory_device_size_change(!!id, id, *size_p); + qapi_event_send_memory_device_size_change(!!dev->id, dev->id, *size_p); } static void virtio_mem_pci_class_init(ObjectClass *klass, void *data) -- 2.31.1