From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Williamson Subject: [PATCH v2] device-assignment: Register as un-migratable Date: Mon, 15 Nov 2010 16:06:37 -0700 Message-ID: <20101115230552.3872.96887.stgit@s20.home> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Cc: alex.williamson@redhat.com, mst@redhat.com, jan.kiszka@web.de To: kvm@vger.kernel.org Return-path: 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 Sender: kvm-owner@vger.kernel.org List-ID: Use register_device_unmigratable() to declare ourselves as non-migratable. Signed-off-by: Alex Williamson --- v2: Use dummy vmsd instead of dummy save_state hw/device-assignment.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) 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);