From patchwork Thu Jun 19 15:08:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Nikolaev X-Patchwork-Id: 361908 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 0391914008B for ; Fri, 20 Jun 2014 01:10:36 +1000 (EST) Received: from localhost ([::1]:36185 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wxdz0-0007Fh-3m for incoming@patchwork.ozlabs.org; Thu, 19 Jun 2014 11:10:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38108) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxdxS-0004NP-P3 for qemu-devel@nongnu.org; Thu, 19 Jun 2014 11:09:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WxdxL-0004Qe-Qr for qemu-devel@nongnu.org; Thu, 19 Jun 2014 11:08:58 -0400 Received: from mail-we0-f170.google.com ([74.125.82.170]:43013) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxdxL-0004QX-Lm for qemu-devel@nongnu.org; Thu, 19 Jun 2014 11:08:51 -0400 Received: by mail-we0-f170.google.com with SMTP id w61so2542321wes.1 for ; Thu, 19 Jun 2014 08:08:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:from:to:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding; bh=IPa2smFA52ya1pcZ7GaleUo8V8QJF6VHkZnIwo66CuE=; b=P70GkJlysG4Bu0Kk/O2GZGC5tnqWCWj2oBjcwdRXB0Ki5OCNww0EJ4y0gBy129djFd a5OevG0yfH/YGR96fnvxz+ckDeGOdAnEqBGSjPSyWIb5gOF/2rSHzHFklpws5byWScel vXrrkKmOe5/UjhB0JqV/filWInitDmNZoz+bJn+HSnzlbDrcak41hfBoJrUn/vSDytsy 22w2IksBzSgJbJysdjODnkumq4i0oBIuPqumi7QLvyEfgtxFZa9feE6fJzbeoZmiCKqg xl08twFfrW/mMVPWSAQTWpvJqMWOXq1LC1cN555bFJihHYFuQFrNvsm7qJQdO9H1FkkK AOKQ== X-Gm-Message-State: ALoCoQllAHwXAgmWxgx9s4v++Met8u11O0/9POc0cZGfSqyrNwCvcKeO9tEe00Lc2jo1sWbuGOuq X-Received: by 10.180.189.44 with SMTP id gf12mr7596476wic.14.1403190530970; Thu, 19 Jun 2014 08:08:50 -0700 (PDT) Received: from [0.0.14.236] ([82.146.27.14]) by mx.google.com with ESMTPSA id d3sm12310916wiy.13.2014.06.19.08.08.49 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Jun 2014 08:08:50 -0700 (PDT) From: Nikolay Nikolaev To: snabb-devel@googlegroups.com, qemu-devel@nongnu.org, mst@redhat.com Date: Thu, 19 Jun 2014 18:08:43 +0300 Message-ID: <20140619150830.10499.78682.stgit@3820> In-Reply-To: <20140619150355.10499.53297.stgit@3820> References: <20140619150355.10499.53297.stgit@3820> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 74.125.82.170 Cc: tech@virtualopensystems.com, n.nikolaev@virtualopensystems.com Subject: [Qemu-devel] [PATCH 5/6] vhost: fix migration_blocker initialization 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 error_set expect errp to be a NULL initialized pointer. Signed-off-by: Nikolay Nikolaev --- hw/virtio/vhost.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index c44c15c..e55fe1c 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -857,12 +857,11 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opaque, .eventfd_del = vhost_eventfd_del, .priority = 10 }; + hdev->migration_blocker = NULL; if (!(hdev->features & (0x1 << VHOST_F_LOG_ALL))) { error_setg(&hdev->migration_blocker, "Migration disabled: vhost lacks VHOST_F_LOG_ALL feature."); migrate_add_blocker(hdev->migration_blocker); - } else { - hdev->migration_blocker = NULL; } hdev->mem = g_malloc0(offsetof(struct vhost_memory, regions)); hdev->n_mem_sections = 0;