| Message ID | 20190316223918.11917-6-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw/Kconfig: Fixes when running ./configure --without-default-devices | expand |
On 16/03/2019 23.39, Philippe Mathieu-Daudé wrote: > This is the default display device used in sun4m_hw_init(): > > /* If no display specified, default to TCX */ > > This fixes when configuring with --without-default-devices: > > $ sparc-softmmu/qemu-system-sparc --nodefaults > qemu-system-sparc: Unknown device 'SUNW,tcx' for default sysbus > Aborted (core dumped) > > (gdb) bt > #0 0x00007fc78d19353f in __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:50 > #1 0x00007fc78d17d895 in __GI_abort () at abort.c:79 > #2 0x0000560beaf637f3 in qdev_create (bus=bus@entry=0x0, name=name@entry=0x560beb1be36b "SUNW,tcx") at hw/core/qdev.c:131 > #3 0x0000560beaf1392d in tcx_init (vram_size=1048576, width=1024, height=768, depth=8, irq=0x560bed1a0230, addr=1342177280) at hw/sparc/sun4m.c:477 > #4 0x0000560beaf1392d in sun4m_hw_init (hwdef=0x560beb1be780 <sun4m_hwdefs>, machine=0x560becf65f00) at hw/sparc/sun4m.c:943 > #5 0x0000560beaf6b15b in machine_run_board_init (machine=0x560becf65f00) at hw/core/machine.c:1030 > > Fixes: 8c75eec06d4 > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > default-configs/sparc-softmmu.mak | 1 - > hw/sparc/Kconfig | 2 +- > 2 files changed, 1 insertion(+), 2 deletions(-) > > diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak > index ee85218115..56509bf263 100644 > --- a/default-configs/sparc-softmmu.mak > +++ b/default-configs/sparc-softmmu.mak > @@ -2,7 +2,6 @@ > > # Uncomment the following lines to disable these optional devices: > # > -#CONFIG_TCX=n > #CONFIG_CG3=n > > # Boards: > diff --git a/hw/sparc/Kconfig b/hw/sparc/Kconfig > index 2a83a8010e..5383dbd910 100644 > --- a/hw/sparc/Kconfig > +++ b/hw/sparc/Kconfig > @@ -1,6 +1,6 @@ > config SUN4M > bool > - imply TCX > + select TCX > imply CG3 > select CS4231 > select ECCMEMCTL > Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak index ee85218115..56509bf263 100644 --- a/default-configs/sparc-softmmu.mak +++ b/default-configs/sparc-softmmu.mak @@ -2,7 +2,6 @@ # Uncomment the following lines to disable these optional devices: # -#CONFIG_TCX=n #CONFIG_CG3=n # Boards: diff --git a/hw/sparc/Kconfig b/hw/sparc/Kconfig index 2a83a8010e..5383dbd910 100644 --- a/hw/sparc/Kconfig +++ b/hw/sparc/Kconfig @@ -1,6 +1,6 @@ config SUN4M bool - imply TCX + select TCX imply CG3 select CS4231 select ECCMEMCTL
This is the default display device used in sun4m_hw_init(): /* If no display specified, default to TCX */ This fixes when configuring with --without-default-devices: $ sparc-softmmu/qemu-system-sparc --nodefaults qemu-system-sparc: Unknown device 'SUNW,tcx' for default sysbus Aborted (core dumped) (gdb) bt #0 0x00007fc78d19353f in __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:50 #1 0x00007fc78d17d895 in __GI_abort () at abort.c:79 #2 0x0000560beaf637f3 in qdev_create (bus=bus@entry=0x0, name=name@entry=0x560beb1be36b "SUNW,tcx") at hw/core/qdev.c:131 #3 0x0000560beaf1392d in tcx_init (vram_size=1048576, width=1024, height=768, depth=8, irq=0x560bed1a0230, addr=1342177280) at hw/sparc/sun4m.c:477 #4 0x0000560beaf1392d in sun4m_hw_init (hwdef=0x560beb1be780 <sun4m_hwdefs>, machine=0x560becf65f00) at hw/sparc/sun4m.c:943 #5 0x0000560beaf6b15b in machine_run_board_init (machine=0x560becf65f00) at hw/core/machine.c:1030 Fixes: 8c75eec06d4 Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- default-configs/sparc-softmmu.mak | 1 - hw/sparc/Kconfig | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)