From 1d6caae1e14c71ab67d5c81d3c1d726d44980216 Mon Sep 17 00:00:00 2001
From: Juan Quintela <quintela@redhat.com>
Date: Sat, 19 Dec 2009 02:24:38 -0200
Subject: [PATCH 04/16] ide: propagate version_id to all *save/load functions

RH-Author: Juan Quintela <quintela@redhat.com>
Message-id: <3d0cae1818d1c290890fe66fceab94cfd870671b.1261190612.git.quintela@redhat.com>
Patchwork-id: 5816
O-Subject: [PATCH] ide: propagate version_id to all *save/load functions
Bugzilla: 549938
RH-Acked-by: Dor Laor <dlaor@redhat.com>
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
RH-Acked-by: Glauber Costa <glommer@redhat.com>
RH-Acked-by: Marcelo Tosatti <mtosatti@redhat.com>

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 qemu/hw/ide.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 qemu/hw/ide.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/qemu/hw/ide.c b/qemu/hw/ide.c
index d002b01..9a030b0 100644
--- a/qemu/hw/ide.c
+++ b/qemu/hw/ide.c
@@ -2844,7 +2844,7 @@ static void ide_init_ioport(IDEState *ide_state, int iobase, int iobase2)
 }
 
 /* save per IDE drive data */
-static void ide_save(QEMUFile* f, IDEState *s)
+static void ide_save(QEMUFile* f, IDEState *s, int version_id)
 {
     qemu_put_be32(f, s->mult_sectors);
     qemu_put_be32(f, s->identify_set);
@@ -2872,7 +2872,7 @@ static void ide_save(QEMUFile* f, IDEState *s)
 }
 
 /* load per IDE drive data */
-static void ide_load(QEMUFile* f, IDEState *s)
+static void ide_load(QEMUFile* f, IDEState *s, int version_id)
 {
     s->mult_sectors=qemu_get_be32(f);
     s->identify_set=qemu_get_be32(f);
@@ -3233,7 +3233,7 @@ static void pci_ide_save(QEMUFile* f, void *opaque)
 
     /* per IDE drive data */
     for(i = 0; i < 4; i++) {
-        ide_save(f, &d->ide_if[i]);
+        ide_save(f, &d->ide_if[i], version_id);
 	qemu_put_8s(f, &d->ide_if[i].cdrom_changed);
     }
 }
@@ -3273,7 +3273,7 @@ static int pci_ide_load(QEMUFile* f, void *opaque, int version_id)
 
     /* per IDE drive data */
     for(i = 0; i < 4; i++) {
-        ide_load(f, &d->ide_if[i]);
+        ide_load(f, &d->ide_if[i], version_id);
         if (version_id == 3)
             qemu_get_8s(f, &d->ide_if[i].cdrom_changed);
     }
@@ -3596,7 +3596,7 @@ static void pmac_ide_save(QEMUFile *f, void *opaque)
 
     /* per IDE drive data */
     for(i = 0; i < 2; i++) {
-        ide_save(f, &s[i]);
+        ide_save(f, &s[i], version_id);
     }
 }
 
@@ -3616,7 +3616,7 @@ static int pmac_ide_load(QEMUFile *f, void *opaque, int version_id)
 
     /* per IDE drive data */
     for(i = 0; i < 2; i++) {
-        ide_load(f, &s[i]);
+        ide_load(f, &s[i], version_id);
     }
     return 0;
 }
@@ -4024,7 +4024,7 @@ static void md_save(QEMUFile *f, void *opaque)
     qemu_put_8s(f, &drive1_selected);
 
     for (i = 0; i < 2; i ++)
-        ide_save(f, &s->ide[i]);
+        ide_save(f, &s->ide[i], version_id);
 }
 
 static int md_load(QEMUFile *f, void *opaque, int version_id)
@@ -4046,7 +4046,7 @@ static int md_load(QEMUFile *f, void *opaque, int version_id)
     s->ide->cur_drive = &s->ide[(drive1_selected != 0)];
 
     for (i = 0; i < 2; i ++)
-        ide_load(f, &s->ide[i]);
+        ide_load(f, &s->ide[i], version_id);
 
     return 0;
 }
-- 
1.6.3.rc4.29.g8146