From patchwork Mon Jan 25 13:33:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 8108681 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id AC539BEEE5 for ; Mon, 25 Jan 2016 13:33:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2BE0A202AE for ; Mon, 25 Jan 2016 13:33:44 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id 7700420220 for ; Mon, 25 Jan 2016 13:33:40 +0000 (UTC) Received: from localhost ([::1]:38640 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aNhH1-00041c-OD for patchwork-qemu-devel@patchwork.kernel.org; Mon, 25 Jan 2016 08:33:39 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56995) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aNhGs-000419-L8 for qemu-devel@nongnu.org; Mon, 25 Jan 2016 08:33:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aNhGr-0008Sr-Ob for qemu-devel@nongnu.org; Mon, 25 Jan 2016 08:33:30 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39328) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aNhGr-0008SY-Jr for qemu-devel@nongnu.org; Mon, 25 Jan 2016 08:33:29 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 47A55C0A5248 for ; Mon, 25 Jan 2016 13:33:29 +0000 (UTC) Received: from localhost (ovpn-112-44.ams2.redhat.com [10.36.112.44]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0PDXR01024242; Mon, 25 Jan 2016 08:33:28 -0500 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Date: Mon, 25 Jan 2016 13:33:21 +0000 Message-Id: <1453728801-5398-3-git-send-email-stefanha@redhat.com> In-Reply-To: <1453728801-5398-1-git-send-email-stefanha@redhat.com> References: <1453728801-5398-1-git-send-email-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Paolo Bonzini , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 2/2] virtio-blk: drop unused migration.h include 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The migration blocker functionality is no longer necessary since dataplane is now compatible with live migration. Drop the unused header include. Signed-off-by: Stefan Hajnoczi --- This patch can be squashed into "virtio-blk: do not use vring in dataplane". --- hw/block/virtio-blk.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index 1106d13..3e34d35 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -20,7 +20,6 @@ #include "sysemu/blockdev.h" #include "hw/virtio/virtio-blk.h" #include "dataplane/virtio-blk.h" -#include "migration/migration.h" #include "block/scsi.h" #ifdef __linux__ # include