Hi On Wed, Nov 13, 2019 at 6:39 PM Paolo Bonzini <pbonz...@redhat.com> wrote: > > "info mtree" prints the wrong accelerator name if used with for example > "-machine accel=kvm:tcg". The right thing to do is to fetch the name > from the AccelClass, which will also work nicely once > current_machine->accel stops existing. > > Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> > --- > memory.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/memory.c b/memory.c > index c952eab..1764af8 100644 > --- a/memory.c > +++ b/memory.c > @@ -2986,7 +2986,6 @@ struct FlatViewInfo { > bool dispatch_tree; > bool owner; > AccelClass *ac; > - const char *ac_name; > }; > > static void mtree_print_flatview(gpointer key, gpointer value, > @@ -3056,7 +3055,7 @@ static void mtree_print_flatview(gpointer key, gpointer > value, > if (fvi->ac->has_memory(current_machine, as, > int128_get64(range->addr.start), > MR_SIZE(range->addr.size) + 1)) { > - qemu_printf(" %s", fvi->ac_name); > + qemu_printf(" %s", fvi->ac->name);
There was a discussion on the original patch that this will have -accel appended. I don't think that's a big issue, someone can submit another patch later if it's important. Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com> > } > } > } > @@ -3104,8 +3103,6 @@ void mtree_info(bool flatview, bool dispatch_tree, bool > owner) > > if (ac->has_memory) { > fvi.ac = ac; > - fvi.ac_name = current_machine->accel ? current_machine->accel : > - object_class_get_name(OBJECT_CLASS(ac)); > } > > /* Gather all FVs in one table */ > -- > 1.8.3.1 > > > -- Marc-André Lureau