Sophie

Sophie

distrib > Scientific%20Linux > 5x > x86_64 > media > main-src > by-pkgid > aadbe78a25743146bb784eee19f007c5 > files > 289

kvm-83-164.el5_5.9.src.rpm

From cc6602222198f79e6ce786fa3426cf5f7040a9f2 Mon Sep 17 00:00:00 2001
From: Juan Quintela <quintela@redhat.com>
Date: Wed, 27 Jan 2010 17:11:13 -0200
Subject: [PATCH 4/5] fix ide versioning

RH-Author: Juan Quintela <quintela@redhat.com>
Message-id: <5945680743289d9931c8b39fd427a0f914b440e6.1264610524.git.quintela@redhat.com>
Patchwork-id: 6720
O-Subject: [PATCH 1/2] fix ide versioning
Bugzilla: 559163
RH-Acked-by: Gleb Natapov <gleb@redhat.com>
RH-Acked-by: Amit Shah <amit.shah@redhat.com>
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>

cdrom_changed needs to work for all newer versions, not only 3
We have increased version_id for ide to 4.

bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=559163

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

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

diff --git a/qemu/hw/ide.c b/qemu/hw/ide.c
index 44f3526..f96db2d 100644
--- a/qemu/hw/ide.c
+++ b/qemu/hw/ide.c
@@ -3290,7 +3290,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], version_id);
-        if (version_id == 3)
+        if (version_id > 2)
             qemu_get_8s(f, &d->ide_if[i].cdrom_changed);
     }
     return 0;
-- 
1.6.3.rc4.29.g8146