| Submitter | Anthony Liguori |
|---|---|
| Date | Aug. 13, 2009, 6:59 p.m. |
| Message ID | <4A8462A8.1020206@codemonkey.ws> |
| Download | mbox | patch |
| Permalink | /patch/31348/ |
| State | Superseded |
| Headers | show |
Comments
On Thu, Aug 13, 2009 at 01:59:52PM -0500, Anthony Liguori wrote: > Luiz Capitulino wrote: > >On Tue, 11 Aug 2009 18:39:47 +0200 > >Paolo Bonzini <bonzini@gnu.org> wrote: > > > >>Hi all, > >> > >>if I try to save and restore an image using current qemu and > >>current libvirt, the load fails. > > > > Yes, it's broken. I'm unable to loadvm and to migrate. > > > > According to git bisect the problem was introduced by: > This should fix it. > > Regards, > > Anthony Liguori > commit a536948b3805a311f274b119c5202fdc86504cf3 > Author: Anthony Liguori <aliguori@us.ibm.com> > Date: Thu Aug 13 13:58:21 2009 -0500 > > Fix migration for ide devices > > commit 93c8cfd9e67a62711b86f4c93747566885eb7928 > Author: Gleb Natapov <gleb@redhat.com> > Date: Sun Aug 2 11:36:47 2009 +0300 > > make windows notice media change > > Broke save/restore by loading a new field but not saving it. > > Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> > > diff --git a/hw/ide.c b/hw/ide.c > index bebda7c..1e38ae3 100644 > --- a/hw/ide.c > +++ b/hw/ide.c > @@ -2888,6 +2888,7 @@ static void ide_save(QEMUFile* f, IDEState *s) > > qemu_put_8s(f, &s->sense_key); > qemu_put_8s(f, &s->asc); > + qemu_put_8s(f, &s->cdrom_changed); > /* XXX: if a transfer is pending, we do not save it yet */ > } > Yap. Got lost between v3 and v4 of the patch :( -- Gleb.
On Thu, 13 Aug 2009 13:59:52 -0500 Anthony Liguori <anthony@codemonkey.ws> wrote: > Luiz Capitulino wrote: > > On Tue, 11 Aug 2009 18:39:47 +0200 > > Paolo Bonzini <bonzini@gnu.org> wrote: > > > > > >> Hi all, > >> > >> if I try to save and restore an image using current qemu and current > >> libvirt, the load fails. > >> > > > > Yes, it's broken. I'm unable to loadvm and to migrate. > > > > According to git bisect the problem was introduced by: > This should fix it. Yes it does, thanks Anthony. Tested-by: Luiz Capitulino <lcapitulino@redhat.com>
Patch
commit a536948b3805a311f274b119c5202fdc86504cf3
Author: Anthony Liguori <aliguori@us.ibm.com>
Date: Thu Aug 13 13:58:21 2009 -0500
Fix migration for ide devices
commit 93c8cfd9e67a62711b86f4c93747566885eb7928
Author: Gleb Natapov <gleb@redhat.com>
Date: Sun Aug 2 11:36:47 2009 +0300
make windows notice media change
Broke save/restore by loading a new field but not saving it.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
diff --git a/hw/ide.c b/hw/ide.c
index bebda7c..1e38ae3 100644
--- a/hw/ide.c
+++ b/hw/ide.c
@@ -2888,6 +2888,7 @@ static void ide_save(QEMUFile* f, IDEState *s)
qemu_put_8s(f, &s->sense_key);
qemu_put_8s(f, &s->asc);
+ qemu_put_8s(f, &s->cdrom_changed);
/* XXX: if a transfer is pending, we do not save it yet */
}