From patchwork Mon Nov 15 23:06:37 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 326552 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 oAFN6jTi004914 for ; Mon, 15 Nov 2010 23:06:45 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756821Ab0KOXGl (ORCPT ); Mon, 15 Nov 2010 18:06:41 -0500 Received: from mx1.redhat.com ([209.132.183.28]:1977 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755365Ab0KOXGk (ORCPT ); Mon, 15 Nov 2010 18:06:40 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oAFN6eVq002846 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 15 Nov 2010 18:06:40 -0500 Received: from s20.home (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id oAFN6bdD018436; Mon, 15 Nov 2010 18:06:38 -0500 From: Alex Williamson Subject: [PATCH v2] device-assignment: Register as un-migratable To: kvm@vger.kernel.org Cc: alex.williamson@redhat.com, mst@redhat.com, jan.kiszka@web.de Date: Mon, 15 Nov 2010 16:06:37 -0700 Message-ID: <20101115230552.3872.96887.stgit@s20.home> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 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 23:06:45 +0000 (UTC) diff --git a/hw/device-assignment.c b/hw/device-assignment.c index bde231d..154bb1a 100644 --- a/hw/device-assignment.c +++ b/hw/device-assignment.c @@ -1434,6 +1434,10 @@ static void assigned_dev_unregister_msix_mmio(AssignedDevice *dev) dev->msix_table_page = NULL; } +static const VMStateDescription vmstate_assigned_device = { + .name = "pci-assign" +}; + static int assigned_initfn(struct PCIDevice *pci_dev) { AssignedDevice *dev = DO_UPCAST(AssignedDevice, dev, pci_dev); @@ -1490,6 +1494,11 @@ static int assigned_initfn(struct PCIDevice *pci_dev) assigned_dev_load_option_rom(dev); QLIST_INSERT_HEAD(&devs, dev, next); + + /* Register a vmsd so that we can mark it unmigratable. */ + vmstate_register(&dev->dev.qdev, 0, &vmstate_assigned_device, dev); + register_device_unmigratable(&dev->dev.qdev, "pci-assign", dev); + return 0; assigned_out: @@ -1503,6 +1512,7 @@ static int assigned_exitfn(struct PCIDevice *pci_dev) { AssignedDevice *dev = DO_UPCAST(AssignedDevice, dev, pci_dev); + vmstate_unregister(&dev->dev.qdev, &vmstate_assigned_device, dev); QLIST_REMOVE(dev, next); deassign_device(dev); free_assigned_device(dev);