From patchwork Fri Jun 5 03:05:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Wang X-Patchwork-Id: 480986 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id E0ACF14016A for ; Fri, 5 Jun 2015 13:06:28 +1000 (AEST) Received: from localhost ([::1]:45096 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0hxj-0003MD-1h for incoming@patchwork.ozlabs.org; Thu, 04 Jun 2015 23:06:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35382) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0hxU-00034N-0z for qemu-devel@nongnu.org; Thu, 04 Jun 2015 23:06:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z0hxO-0007Kc-1N for qemu-devel@nongnu.org; Thu, 04 Jun 2015 23:06:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54824) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0hxN-0007KW-S6 for qemu-devel@nongnu.org; Thu, 04 Jun 2015 23:06:05 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 9499F3674B9 for ; Fri, 5 Jun 2015 03:06:05 +0000 (UTC) Received: from hp-dl380pg8-02.qe.lab.eng.nay.redhat.com (hp-dl380pg8-02.qe.lab.eng.nay.redhat.com [10.66.106.69]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t55360q5005142; Thu, 4 Jun 2015 23:06:02 -0400 From: Jason Wang To: mst@redhat.com, qemu-devel@nongnu.org Date: Thu, 4 Jun 2015 23:05:58 -0400 Message-Id: <1433473558-50835-1-git-send-email-jasowang@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Jason Wang Subject: [Qemu-devel] [PATCH] vhost: put log correctly in vhost_dev_start() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org We allocate an dummy log even if the size is zero. So we should put it unconditionally too. Signed-off-by: Jason Wang --- hw/virtio/vhost.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 01f1e04..3a52a4d 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -1111,9 +1111,7 @@ int vhost_dev_start(struct vhost_dev *hdev, VirtIODevice *vdev) return 0; fail_log: - if (hdev->log_size) { - vhost_log_put(hdev, false); - } + vhost_log_put(hdev, false); fail_vq: while (--i >= 0) { vhost_virtqueue_stop(hdev,