Message ID | 20200226090010.708934-10-mst@redhat.com |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=AwN7xygv; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 48S91N0jW6z9sNg for <incoming@patchwork.ozlabs.org>; Wed, 26 Feb 2020 20:07:36 +1100 (AEDT) Received: from localhost ([::1]:40468 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1j6sfF-00058J-Ts for incoming@patchwork.ozlabs.org; Wed, 26 Feb 2020 04:07:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58685) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <mst@redhat.com>) id 1j6se4-0003Zr-H1 for qemu-devel@nongnu.org; Wed, 26 Feb 2020 04:06:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <mst@redhat.com>) id 1j6se3-00077I-AW for qemu-devel@nongnu.org; Wed, 26 Feb 2020 04:06:20 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:37610 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <mst@redhat.com>) id 1j6se3-00076t-6L for qemu-devel@nongnu.org; Wed, 26 Feb 2020 04:06:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582707978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NjdfC5cPcTj7xCSppU7CRy3um06hUEk/RHvT4NHcJJM=; b=AwN7xygvDpzNWObnYOvVFDtcqvtCJYk4HeDwV3VRzzQRDX+39QFa/QRtslmTVRi1Wni0D+ mOnOJGuclL3yHsUiFD6j53Y8r9Ja9PCP8ZMVbBxBYwZG2KBlb2GJy7poIL2YCm8zcOpZMp 0gX/w0O8YE1ZqaFZWp8F1PbAP47k710= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-357-0cMcsbPeMF2BfRRCLZ6jWg-1; Wed, 26 Feb 2020 04:06:16 -0500 X-MC-Unique: 0cMcsbPeMF2BfRRCLZ6jWg-1 Received: by mail-wm1-f72.google.com with SMTP id f9so381566wmb.2 for <qemu-devel@nongnu.org>; Wed, 26 Feb 2020 01:06:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=yx/d9Pi1yF7zdpvYgnvi6Hx1i6BxcPVN8IeOoA2COOE=; b=jrXMsYDR5u/Fj3REWc7WsNVI5v5ngfV24rroE0bhTthKYv3Q6UmVbzGmLfoovc9x7Y KnTAdgImQx/LDvgGNkuIvLswUextUhFgD+R+UdXfgsJHmr7CWWcAT1nEg9JWSvPHIm9Y 1J7ucRsPKcEzE/6keVczqmn09xLwuc4o8tHGnD56nDvuqEkq6xbHPw3Bct9nzHsgZwzf AU8KDNIAlZCiWdaflau3L/ci83CwG6mXXF13PLvCiQ7NWHXLs9IH8idpDgvhk0hXuICI ZfDPf6sptzCzh4fVJvN15PQ51k0mM2iuh93ZAkyz1FLIDkuyhIjdg4KcyCToLoEtLNgc LKfQ== X-Gm-Message-State: APjAAAXjQgTMn+9qlbNq72PzHV5fezy6QD1RAIA+3Jdu7CSi+5H3romP qE4HHNLquINiYjl1p/yjM2QCuOoYFS2LmwOLdXQghpVRtqbDS9qdcrQi2FSUa008TbEZ6ihgGXj 8+aXHR5laZ/Th9xA= X-Received: by 2002:a05:6000:1046:: with SMTP id c6mr472005wrx.411.1582707975395; Wed, 26 Feb 2020 01:06:15 -0800 (PST) X-Google-Smtp-Source: APXvYqwcBOPUZwYDu5Z1jlTNJE8V2+fh2gTwcPKC0Dvp/M77eGbLOJnS+la66Co8BhtdPey+grHRPQ== X-Received: by 2002:a05:6000:1046:: with SMTP id c6mr471972wrx.411.1582707975165; Wed, 26 Feb 2020 01:06:15 -0800 (PST) Received: from redhat.com (bzq-79-178-2-214.red.bezeqint.net. [79.178.2.214]) by smtp.gmail.com with ESMTPSA id n3sm720576wmc.42.2020.02.26.01.06.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2020 01:06:14 -0800 (PST) Date: Wed, 26 Feb 2020 04:06:13 -0500 From: "Michael S. Tsirkin" <mst@redhat.com> To: qemu-devel@nongnu.org Subject: [PULL v2 09/30] vhost-user-blk: delete virtioqueues in unrealize to fix memleaks Message-ID: <20200226090010.708934-10-mst@redhat.com> References: <20200226090010.708934-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200226090010.708934-1-mst@redhat.com> X-Mailer: git-send-email 2.24.1.751.gd10ce2899c X-Mutt-Fcc: =sent X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Content-Disposition: inline X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: Kevin Wolf <kwolf@redhat.com>, Peter Maydell <peter.maydell@linaro.org>, qemu-block@nongnu.org, Pan Nengyuan <pannengyuan@huawei.com>, Max Reitz <mreitz@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>, Euler Robot <euler.robot@huawei.com> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,v2,01/30] bios-tables-test: tell people how to update
|
expand
|
diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c index d8c459c575..2eba8b9db0 100644 --- a/hw/block/vhost-user-blk.c +++ b/hw/block/vhost-user-blk.c @@ -460,6 +460,9 @@ reconnect: virtio_err: g_free(s->vqs); g_free(s->inflight); + for (i = 0; i < s->num_queues; i++) { + virtio_del_queue(vdev, i); + } virtio_cleanup(vdev); vhost_user_cleanup(&s->vhost_user); } @@ -468,6 +471,7 @@ static void vhost_user_blk_device_unrealize(DeviceState *dev, Error **errp) { VirtIODevice *vdev = VIRTIO_DEVICE(dev); VHostUserBlk *s = VHOST_USER_BLK(dev); + int i; virtio_set_status(vdev, 0); qemu_chr_fe_set_handlers(&s->chardev, NULL, NULL, NULL, @@ -476,6 +480,10 @@ static void vhost_user_blk_device_unrealize(DeviceState *dev, Error **errp) vhost_dev_free_inflight(s->inflight); g_free(s->vqs); g_free(s->inflight); + + for (i = 0; i < s->num_queues; i++) { + virtio_del_queue(vdev, i); + } virtio_cleanup(vdev); vhost_user_cleanup(&s->vhost_user); }