From patchwork Mon Nov 15 19:41:45 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 326092 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oAFJfxOB015305 for ; Mon, 15 Nov 2010 19:42:00 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758172Ab0KOTlr (ORCPT ); Mon, 15 Nov 2010 14:41:47 -0500 Received: from mx1.redhat.com ([209.132.183.28]:32990 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758057Ab0KOTlr (ORCPT ); Mon, 15 Nov 2010 14:41:47 -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 (8.13.8/8.13.8) with ESMTP id oAFJfliF001471 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 15 Nov 2010 14:41:47 -0500 Received: from s20.home (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id oAFJfjpI018055; Mon, 15 Nov 2010 14:41:46 -0500 From: Alex Williamson Subject: [PATCH] device-assignment: Register as un-migratable To: kvm@vger.kernel.org Cc: alex.williamson@redhat.com, mst@redhat.com Date: Mon, 15 Nov 2010 12:41:45 -0700 Message-ID: <20101115194103.15991.41060.stgit@s20.home> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 15 Nov 2010 19:42:00 +0000 (UTC) diff --git a/hw/device-assignment.c b/hw/device-assignment.c index bde231d..cd93941 100644 --- a/hw/device-assignment.c +++ b/hw/device-assignment.c @@ -1434,6 +1434,13 @@ static void assigned_dev_unregister_msix_mmio(AssignedDevice *dev) dev->msix_table_page = NULL; } +/* This should never get called, but we're required to create a save_state + * handler or else the no_migrate flag will never be checked. */ +static void assigned_save(QEMUFile* f, void *opaque) +{ + abort(); +} + static int assigned_initfn(struct PCIDevice *pci_dev) { AssignedDevice *dev = DO_UPCAST(AssignedDevice, dev, pci_dev); @@ -1490,6 +1497,13 @@ static int assigned_initfn(struct PCIDevice *pci_dev) assigned_dev_load_option_rom(dev); QLIST_INSERT_HEAD(&devs, dev, next); + + /* Assigned devices are not migratable, register a save + * state entry so that we can mark it unmigratable. */ + register_savevm(&dev->dev.qdev, "pci-assign", 0, 0, + assigned_save, NULL, dev); + register_device_unmigratable(&dev->dev.qdev, "pci-assign", dev); + return 0; assigned_out: @@ -1503,6 +1517,7 @@ static int assigned_exitfn(struct PCIDevice *pci_dev) { AssignedDevice *dev = DO_UPCAST(AssignedDevice, dev, pci_dev); + unregister_savevm(&dev->dev.qdev, "pci-assign", dev); QLIST_REMOVE(dev, next); deassign_device(dev); free_assigned_device(dev);