Message ID | 20190316223918.11917-5-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 fixes when configuring with --without-default-devices: > > $ qemu-system-mips64el -M fulong2e --nodefaults -bios /dev/null > qemu-system-mips64el: Unknown device 'ati-vga' for bus 'PCI' > Aborted (core dumped) > > (gdb) bt > #1 0x00007ffff5a11895 in __GI_abort () at abort.c:79 > #2 0x00005555558768d3 in qdev_create (bus=bus@entry=0x5555562664b0, name=name@entry=0x555555b24efb "ati-vga") at hw/core/qdev.c:131 > #3 0x00005555558d15e1 in pci_create_multifunction (bus=bus@entry=0x5555562664b0, devfn=devfn@entry=-1, multifunction=multifunction@entry=false, name=name@entry=0x555555b24efb "ati-vga") at hw/pci/pci.c:2104 > #4 0x00005555558d1a7a in pci_create (bus=bus@entry=0x5555562664b0, devfn=devfn@entry=-1, name=name@entry=0x555555b24efb "ati-vga") at hw/pci/pci.c:2121 > #5 0x0000555555763081 in mips_fulong2e_init (machine=<optimized out>) at hw/mips/mips_fulong2e.c:352 > #6 0x000055555587e23b in machine_run_board_init (machine=0x5555560b2000) at hw/core/machine.c:1030 > > Fixes: 862b4a291dc > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > default-configs/mips64el-softmmu.mak | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak > index 8b255efc54..a67c9517a2 100644 > --- a/default-configs/mips64el-softmmu.mak > +++ b/default-configs/mips64el-softmmu.mak > @@ -6,6 +6,8 @@ CONFIG_RC4030=y > CONFIG_DP8393X=y > CONFIG_DS1225Y=y > CONFIG_FULONG=y > +CONFIG_ATI_VGA=y > +CONFIG_RTL8139_PCI=y You should mention RTL8139_PCI in the patch description, too. Also, does it make sense to fix this while your other Kconfig-for-mips patches have not been merged yet? (I don't expect --without-default-devices working without those patches) Thomas
On 3/25/19 6:04 AM, Thomas Huth wrote: > On 16/03/2019 23.39, Philippe Mathieu-Daudé wrote: >> This fixes when configuring with --without-default-devices: >> >> $ qemu-system-mips64el -M fulong2e --nodefaults -bios /dev/null >> qemu-system-mips64el: Unknown device 'ati-vga' for bus 'PCI' >> Aborted (core dumped) >> >> (gdb) bt >> #1 0x00007ffff5a11895 in __GI_abort () at abort.c:79 >> #2 0x00005555558768d3 in qdev_create (bus=bus@entry=0x5555562664b0, name=name@entry=0x555555b24efb "ati-vga") at hw/core/qdev.c:131 >> #3 0x00005555558d15e1 in pci_create_multifunction (bus=bus@entry=0x5555562664b0, devfn=devfn@entry=-1, multifunction=multifunction@entry=false, name=name@entry=0x555555b24efb "ati-vga") at hw/pci/pci.c:2104 >> #4 0x00005555558d1a7a in pci_create (bus=bus@entry=0x5555562664b0, devfn=devfn@entry=-1, name=name@entry=0x555555b24efb "ati-vga") at hw/pci/pci.c:2121 >> #5 0x0000555555763081 in mips_fulong2e_init (machine=<optimized out>) at hw/mips/mips_fulong2e.c:352 >> #6 0x000055555587e23b in machine_run_board_init (machine=0x5555560b2000) at hw/core/machine.c:1030 >> >> Fixes: 862b4a291dc >> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> >> --- >> default-configs/mips64el-softmmu.mak | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak >> index 8b255efc54..a67c9517a2 100644 >> --- a/default-configs/mips64el-softmmu.mak >> +++ b/default-configs/mips64el-softmmu.mak >> @@ -6,6 +6,8 @@ CONFIG_RC4030=y >> CONFIG_DP8393X=y >> CONFIG_DS1225Y=y >> CONFIG_FULONG=y >> +CONFIG_ATI_VGA=y >> +CONFIG_RTL8139_PCI=y > > You should mention RTL8139_PCI in the patch description, too. Also, does Oops I missed that when squashing from v1 (Thanks Paolo for fixing it!). > it make sense to fix this while your other Kconfig-for-mips patches have > not been merged yet? (I don't expect --without-default-devices working > without those patches) Well this was breaking 'make check-unit'. > > Thomas >
diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak index 8b255efc54..a67c9517a2 100644 --- a/default-configs/mips64el-softmmu.mak +++ b/default-configs/mips64el-softmmu.mak @@ -6,6 +6,8 @@ CONFIG_RC4030=y CONFIG_DP8393X=y CONFIG_DS1225Y=y CONFIG_FULONG=y +CONFIG_ATI_VGA=y +CONFIG_RTL8139_PCI=y CONFIG_JAZZ=y CONFIG_G364FB=y CONFIG_JAZZ_LED=y
This fixes when configuring with --without-default-devices: $ qemu-system-mips64el -M fulong2e --nodefaults -bios /dev/null qemu-system-mips64el: Unknown device 'ati-vga' for bus 'PCI' Aborted (core dumped) (gdb) bt #1 0x00007ffff5a11895 in __GI_abort () at abort.c:79 #2 0x00005555558768d3 in qdev_create (bus=bus@entry=0x5555562664b0, name=name@entry=0x555555b24efb "ati-vga") at hw/core/qdev.c:131 #3 0x00005555558d15e1 in pci_create_multifunction (bus=bus@entry=0x5555562664b0, devfn=devfn@entry=-1, multifunction=multifunction@entry=false, name=name@entry=0x555555b24efb "ati-vga") at hw/pci/pci.c:2104 #4 0x00005555558d1a7a in pci_create (bus=bus@entry=0x5555562664b0, devfn=devfn@entry=-1, name=name@entry=0x555555b24efb "ati-vga") at hw/pci/pci.c:2121 #5 0x0000555555763081 in mips_fulong2e_init (machine=<optimized out>) at hw/mips/mips_fulong2e.c:352 #6 0x000055555587e23b in machine_run_board_init (machine=0x5555560b2000) at hw/core/machine.c:1030 Fixes: 862b4a291dc Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- default-configs/mips64el-softmmu.mak | 2 ++ 1 file changed, 2 insertions(+)