From patchwork Thu Nov 8 11:54:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 197827 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6719B2C0134 for ; Thu, 8 Nov 2012 22:53:48 +1100 (EST) Received: from localhost ([::1]:56260 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TWQg3-0001Zf-Mm for incoming@patchwork.ozlabs.org; Thu, 08 Nov 2012 06:53:43 -0500 Received: from eggs.gnu.org ([208.118.235.92]:41350) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TWQfs-0001ZE-Ht for qemu-devel@nongnu.org; Thu, 08 Nov 2012 06:53:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TWQfr-0002u8-PF for qemu-devel@nongnu.org; Thu, 08 Nov 2012 06:53:32 -0500 Received: from mx1.redhat.com ([209.132.183.28]:1901) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TWQfr-0002u2-H4 for qemu-devel@nongnu.org; Thu, 08 Nov 2012 06:53:31 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qA8BrUnI014258 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 8 Nov 2012 06:53:30 -0500 Received: from localhost.localdomain.com (ovpn-112-27.ams2.redhat.com [10.36.112.27]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qA8BrQoj024478; Thu, 8 Nov 2012 06:53:29 -0500 From: Hans de Goede To: Gerd Hoffmann Date: Thu, 8 Nov 2012 12:54:27 +0100 Message-Id: <1352375667-5077-2-git-send-email-hdegoede@redhat.com> In-Reply-To: <1352375667-5077-1-git-send-email-hdegoede@redhat.com> References: <1352374173-4919-1-git-send-email-hdegoede@redhat.com> <1352375667-5077-1-git-send-email-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Hans de Goede , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 2/2] pci: Restore bus-master memory mapping state after migration 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 This fixes dma reads / writes from pci-devices no longer working after migration. Signed-off-by: Hans de Goede --- hw/pci.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/pci.c b/hw/pci.c index dceda0b..6666651 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -367,6 +367,10 @@ static int get_pci_config_device(QEMUFile *f, void *pv, size_t size) pci_update_mappings(s); + memory_region_set_enabled(&s->bus_master_enable_region, + pci_get_word(s->config + PCI_COMMAND) + & PCI_COMMAND_MASTER); + g_free(config); return 0; }