From patchwork Fri Oct 19 05:20:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Qiang X-Patchwork-Id: 10648679 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 63BE214E2 for ; Fri, 19 Oct 2018 05:27:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 506A428A3D for ; Fri, 19 Oct 2018 05:27:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 43B8328B54; Fri, 19 Oct 2018 05:27:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DD51E28A3D for ; Fri, 19 Oct 2018 05:27:06 +0000 (UTC) Received: from localhost ([::1]:47079 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDNJS-00016Z-6E for patchwork-qemu-devel@patchwork.kernel.org; Fri, 19 Oct 2018 01:27:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43045) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDNDG-0003mh-9w for qemu-devel@nongnu.org; Fri, 19 Oct 2018 01:20:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gDNDF-0000Jb-DY for qemu-devel@nongnu.org; Fri, 19 Oct 2018 01:20:42 -0400 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]:46574) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gDNDF-0000Go-0T for qemu-devel@nongnu.org; Fri, 19 Oct 2018 01:20:41 -0400 Received: by mail-pf1-x442.google.com with SMTP id r64-v6so15939904pfb.13 for ; Thu, 18 Oct 2018 22:20:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=P5I5yDi0F4ETJbyDNMwViQBBsC/Sq9RTgNeWgLfZkH8=; b=DwT30R+xb5FyBASu0lZhILN3p+B8btLOxTv27zxoO+60iPGPCvW0qxBlHzWSy2C2Sv o94LbzgxpnOBT1Dr0Og3hpBp65pPLA+OToN/XKaUhset3Caim7qh7tHgdVEoqf+J4R/m k9MgK/RyhoI8KiqvrjP/8FNiXtXz5OKYGQPlpQVa0kuyIlOVvKzKcVaUMEXEaR2bUc4J Nt1ykQ8hb8XygrXjG7Uhy3fREWT3HuYqlZFgCwBP+wWHW73F9gD8TpPoIDI//Zb7JmC9 51j/v3/wJzQeFb7vRuQEaLI7TqxQBKN0V5hvGd66vl/cGvlhYZV9p8v2blRtWMzZkJtW j1WA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=P5I5yDi0F4ETJbyDNMwViQBBsC/Sq9RTgNeWgLfZkH8=; b=q58tP28teFRy0QrwFi/Fsg/G6mbV7FkgyUdiF24WcyQXG6hGCdmJt2X96nIIo2m/t5 rsVUuVmAfg5M/CFanpiRtuxM4zfys9Ta3sFt7/SLEJQ2e7JLnO3s2dB2TJi8EYBk7gS8 dzbQ3csKxanGP2NDIlpSdCq7nLi3YUgZCmW30hU5aZwJWSvrjeUz8f5c3ZbxScKfpQVh Arztc5kY0+IpmRvYXmdpmi8KLJkdaC5mZ3xzlRWezT4qWCcsf9qE1St5dnYS88wmW4yY ob9rvBkoRf0ITWUy5US3w/2LA6pLUcMpYymv/phdE9JofX1Bk7FW0IPsdxMzkFhBPO9b 4PHQ== X-Gm-Message-State: ABuFfogHB+yGXyBjacF+JDqKgtNJs72auK83T4Sdl1niqu/MgTkG9nAC w6lpQLGPGscv/5skgnM5Nyk= X-Google-Smtp-Source: ACcGV62sTvnBrivcXkp5DARjDuYbtfeKopIduHxzxGBrYFEIqaZn+5Bjl7RoUKvODVEdGT+IuxvccQ== X-Received: by 2002:a65:664e:: with SMTP id z14-v6mr30124318pgv.347.1539926440121; Thu, 18 Oct 2018 22:20:40 -0700 (PDT) Received: from localhost.localdomain.localdomain ([103.65.40.100]) by smtp.gmail.com with ESMTPSA id p1-v6sm25075191pff.128.2018.10.18.22.20.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Oct 2018 22:20:39 -0700 (PDT) From: Li Qiang To: alex.williamson@redhat.com Date: Thu, 18 Oct 2018 22:20:11 -0700 Message-Id: <1539926412-21831-7-git-send-email-liq3ea@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1539926412-21831-1-git-send-email-liq3ea@gmail.com> References: <1539926412-21831-1-git-send-email-liq3ea@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::442 Subject: [Qemu-devel] [PATCH 6/7] vfio: platform: free timer in error path X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Li Qiang , philmd@redhat.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Li Qiang --- hw/vfio/platform.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c index 6a4fd7b..ba19143 100644 --- a/hw/vfio/platform.c +++ b/hw/vfio/platform.c @@ -518,6 +518,7 @@ static int vfio_populate_device(VFIODevice *vbasedev, Error **errp) return 0; irq_err: timer_del(vdev->mmap_timer); + timer_free(vdev->mmap_timer); QLIST_FOREACH_SAFE(intp, &vdev->intp_list, next, tmp) { QLIST_REMOVE(intp, next); g_free(intp);