Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6

* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (27 commits)
  PCI: Don't use dmi_name_in_vendors in quirk
  PCI: remove unused AER functions
  PCI/sysfs: move bus cpuaffinity to class dev_attrs
  PCI: add rescan to /sys/.../pci_bus/.../
  PCI: update bridge resources to get more big ranges when allocating space (again)
  KVM: Use pci_store/load_saved_state() around VM device usage
  PCI: Add interfaces to store and load the device saved state
  PCI: Track the size of each saved capability data area
  PCI/e1000e: Add and use pci_disable_link_state_locked()
  x86/PCI: derive pcibios_last_bus from ACPI MCFG
  PCI: add latency tolerance reporting enable/disable support
  PCI: add OBFF enable/disable support
  PCI: add ID-based ordering enable/disable support
  PCI hotplug: acpiphp: assume device is in state D0 after powering on a slot.
  PCI: Set PCIE maxpayload for card during hotplug insertion
  PCI/ACPI: Report _OSC control mask returned on failure to get control
  x86/PCI: irq and pci_ids patch for Intel Panther Point DeviceIDs
  PCI: handle positive error codes
  PCI: check pci_vpd_pci22_wait() return
  PCI: Use ICH6_GPIO_EN in ich6_lpc_acpi_gpio
  ...

Fix up trivial conflicts in include/linux/pci_ids.h: commit a6e5e2be4461
moved the intel SMBUS ID definitons to the i2c-i801.c driver.

1 files changed, 14 insertions, 4 deletions

diff --git a/virt/kvm/assigned-dev.c b/virt/kvm/assigned-dev.c
index ae72ae604c89..6cc4b97ec458 100644
--- a/virt/kvm/assigned-dev.c
+++ b/virt/kvm/assigned-dev.c
@@ -197,8 +197,13 @@ static void kvm_free_assigned_device(struct kvm *kvm,
 {
         kvm_free_assigned_irq(kvm, assigned_dev);
 
-        __pci_reset_function(assigned_dev->dev);
-        pci_restore_state(assigned_dev->dev);
+        pci_reset_function(assigned_dev->dev);
+        if (pci_load_and_free_saved_state(assigned_dev->dev,
+                                          &assigned_dev->pci_saved_state))
+                printk(KERN_INFO "%s: Couldn't reload %s saved state\n",
+                       __func__, dev_name(&assigned_dev->dev->dev));
+        else
+                pci_restore_state(assigned_dev->dev);
 
         pci_release_regions(assigned_dev->dev);
         pci_disable_device(assigned_dev->dev);
@@ -516,7 +521,10 @@ static int kvm_vm_ioctl_assign_device(struct kvm *kvm,
 
         pci_reset_function(dev);
         pci_save_state(dev);
-
+        match->pci_saved_state = pci_store_saved_state(dev);
+        if (!match->pci_saved_state)
+                printk(KERN_DEBUG "%s: Couldn't store %s saved state\n",
+                       __func__, dev_name(&dev->dev));
         match->assigned_dev_id = assigned_dev->assigned_dev_id;
         match->host_segnr = assigned_dev->segnr;
         match->host_busnr = assigned_dev->busnr;
@@ -546,7 +554,9 @@ out:
         mutex_unlock(&kvm->lock);
         return r;
 out_list_del:
-        pci_restore_state(dev);
+        if (pci_load_and_free_saved_state(dev, &match->pci_saved_state))
+                printk(KERN_INFO "%s: Couldn't reload %s saved state\n",
+                       __func__, dev_name(&dev->dev));
         list_del(&match->list);
         pci_release_regions(dev);
 out_disable: