refresh all quilt patches

[pve-qemu-kvm.git] / debian / patches / ahci-add_migration-support.patch

diff --git a/debian/patches/ahci-add_migration-support.patch b/debian/patches/ahci-add_migration-support.patch
index 5b24f1fec692f5ffdf223e9d114c329aa7fd7168..a5791f70931ce6f886eab011736987403264cc50 100644 (file)
--- a/debian/patches/ahci-add_migration-support.patch
+++ b/debian/patches/ahci-add_migration-support.patch
@@ -19,11 +19,11 @@ Signed-off-by: Jason Baron <address@hidden>
  hw/ide/ich.c  |   11 +++++++--
  3 files changed, 81 insertions(+), 4 deletions(-)
 
-diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
-index b53c757..e94509b 100644
---- a/hw/ide/ahci.c
-+++ b/hw/ide/ahci.c
-@@ -1204,6 +1204,65 @@ void ahci_reset(AHCIState *s)
+Index: new/hw/ide/ahci.c
+===================================================================
+--- new.orig/hw/ide/ahci.c     2012-09-24 07:15:00.000000000 +0200
++++ new/hw/ide/ahci.c  2012-09-24 07:15:28.000000000 +0200
+@@ -1203,6 +1203,65 @@
      }
  }
  
@@ -89,7 +89,7 @@ index b53c757..e94509b 100644
  typedef struct SysbusAHCIState {
      SysBusDevice busdev;
      AHCIState ahci;
-@@ -1212,7 +1271,10 @@ typedef struct SysbusAHCIState {
+@@ -1211,7 +1270,10 @@
  
  static const VMStateDescription vmstate_sysbus_ahci = {
      .name = "sysbus-ahci",
@@ -101,11 +101,11 @@ index b53c757..e94509b 100644
  };
  
  static void sysbus_ahci_reset(DeviceState *dev)
-diff --git a/hw/ide/ahci.h b/hw/ide/ahci.h
-index 1200a56..7719dbf 100644
---- a/hw/ide/ahci.h
-+++ b/hw/ide/ahci.h
-@@ -307,6 +307,16 @@ typedef struct AHCIPCIState {
+Index: new/hw/ide/ahci.h
+===================================================================
+--- new.orig/hw/ide/ahci.h     2012-09-24 07:15:00.000000000 +0200
++++ new/hw/ide/ahci.h  2012-09-24 07:15:28.000000000 +0200
+@@ -307,6 +307,16 @@
      AHCIState ahci;
  } AHCIPCIState;
  
@@ -122,10 +122,10 @@ index 1200a56..7719dbf 100644
  typedef struct NCQFrame {
      uint8_t fis_type;
      uint8_t c;
-diff --git a/hw/ide/ich.c b/hw/ide/ich.c
-index 272b773..ae6f56f 100644
---- a/hw/ide/ich.c
-+++ b/hw/ide/ich.c
+Index: new/hw/ide/ich.c
+===================================================================
+--- new.orig/hw/ide/ich.c      2012-09-24 07:15:00.000000000 +0200
++++ new/hw/ide/ich.c   2012-09-24 07:15:28.000000000 +0200
 @@ -79,9 +79,14 @@
  #define ICH9_IDP_INDEX          0x10
  #define ICH9_IDP_INDEX_LOG2     0x04
@@ -143,7 +143,7 @@ index 272b773..ae6f56f 100644
  };
  
  static void pci_ich9_reset(DeviceState *dev)
-@@ -152,7 +157,7 @@ static void ich_ahci_class_init(ObjectClass *klass, void *data)
+@@ -152,7 +157,7 @@
      k->device_id = PCI_DEVICE_ID_INTEL_82801IR;
      k->revision = 0x02;
      k->class_id = PCI_CLASS_STORAGE_SATA;
@@ -152,5 +152,3 @@ index 272b773..ae6f56f 100644
      dc->reset = pci_ich9_reset;
  }
  
--- 
-1.7.1