Message ID | 1354795349-2613-1-git-send-email-alevy@redhat.com |
---|---|
State | New |
Headers | show |
On 12/06/2012 02:02 PM, Alon Levy wrote: > Signed-off-by: Alon Levy <alevy@redhat.com> > --- > arch_init.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/arch_init.c b/arch_init.c > index e6effe8..84bca99 100644 > --- a/arch_init.c > +++ b/arch_init.c > @@ -808,8 +808,10 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) > QLIST_FOREACH(block, &ram_list.blocks, next) { > if (!strncmp(id, block->idstr, sizeof(id))) { > if (block->length != length) { > + fprintf(stderr, "Length mismatch: %s: %d " > + "in != %d\n", id, length, > + block->length); > ret = -EINVAL; > - goto done; > } > break; > } > Reviewed-by: Orit Wasserman <owasserm@redhat.com> But the real question is what did we break this time? can it be fixed? Orit
> On 12/06/2012 02:02 PM, Alon Levy wrote: > > Signed-off-by: Alon Levy <alevy@redhat.com> > > --- > > arch_init.c | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/arch_init.c b/arch_init.c > > index e6effe8..84bca99 100644 > > --- a/arch_init.c > > +++ b/arch_init.c > > @@ -808,8 +808,10 @@ static int ram_load(QEMUFile *f, void *opaque, > > int version_id) > > QLIST_FOREACH(block, &ram_list.blocks, next) { > > if (!strncmp(id, block->idstr, > > sizeof(id))) { > > if (block->length != length) { > > + fprintf(stderr, "Length mismatch: > > %s: %d " > > + "in != %d\n", id, length, > > + block->length); > > ret = -EINVAL; > > - goto done; > > } > > break; > > } > > > Reviewed-by: Orit Wasserman <owasserm@redhat.com> > > But the real question is what did we break this time? can it be > fixed? qxl - we changed the rom bar size for all revisions of the device. I'm checking the upstream fix and will send it when I'm happy. > > Orit > >
diff --git a/arch_init.c b/arch_init.c index e6effe8..84bca99 100644 --- a/arch_init.c +++ b/arch_init.c @@ -808,8 +808,10 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) QLIST_FOREACH(block, &ram_list.blocks, next) { if (!strncmp(id, block->idstr, sizeof(id))) { if (block->length != length) { + fprintf(stderr, "Length mismatch: %s: %d " + "in != %d\n", id, length, + block->length); ret = -EINVAL; - goto done; } break; }
Signed-off-by: Alon Levy <alevy@redhat.com> --- arch_init.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)