Message ID | cover.1513548172.git.mjt@msgid.tls.msk.ru |
---|---|
State | New |
Headers | show |
On 17 December 2017 at 22:07, Michael Tokarev <mjt@tls.msk.ru> wrote: >> Here's a large pull request for trivial-patches queue. >> It's been quite a whie since the last request, and many >> changes has been accumulated. >> >> Also there's a large patchset by Philippe Mathieu-Daudé >> named "remove i386/pc dependency from non-PC world (part 1)" >> consisting of 42 patches which makes good portion of this >> pull request. > > I forgot to add my S-o-b lines to the large series by > Philippe Mathieu-Daudé. So here's a re-send of just the > cover letter (not all the other patches). The only difference > is the addition of 42 of my "S-o-b" line. I'm afraid this fails 'make check'. (I only tested the first pullreq but if you only changed signoffs then it'll still be the same): TEST: tests/qom-test... (pid=12208) /alpha/qom/clipper: Broken pipe FAIL GTester: last random seed: R02S26a31a16d967b2664ad714c1c7f8e7f1 (pid=12214) /alpha/qom/none: OK FAIL: tests/qom-test TEST: tests/test-hmp... (pid=12219) /alpha/hmp/clipper: Broken pipe FAIL GTester: last random seed: R02S0c5a0f7de3fc6e9885b740c77c86eef2 (pid=12225) /alpha/hmp/none: OK /alpha/hmp/none+2MB: OK FAIL: tests/test-hmp This is because qemu-system-alpha segfaults on startup: Thread 1 "qemu-system-alp" received signal SIGSEGV, Segmentation fault. 0x00005555557db414 in memory_region_update_container_subregions (subregion=0x555556ad6330) at /home/petmay01/linaro/qemu-for-merges/memory.c:2290 2290 QTAILQ_INSERT_TAIL(&mr->subregions, subregion, subregions_link); (gdb) bt #0 0x00005555557db414 in memory_region_update_container_subregions (subregion=0x555556ad6330) at /home/petmay01/linaro/qemu-for-merges/memory.c:2290 #1 0x00005555557db4da in memory_region_add_subregion_common (mr=0x5555569e2140, offset=32, subregion=0x555556ad6330) at /home/petmay01/linaro/qemu-for-merges/memory.c:2303 #2 0x00005555557db516 in memory_region_add_subregion (mr=0x5555569e2140, offset=32, subregion=0x555556ad6330) at /home/petmay01/linaro/qemu-for-merges/memory.c:2311 #3 0x000055555594e8bd in isa_register_ioport (dev=0x555556ad6270, io=0x555556ad6330, start=32) at /home/petmay01/linaro/qemu-for-merges/hw/isa/isa-bus.c:130 #4 0x000055555594b844 in pic_common_realize (dev=0x555556ad6270, errp=0x7fffffffdaf0) at /home/petmay01/linaro/qemu-for-merges/hw/intc/i8259_common.c:77 #5 0x000055555594c744 in pic_realize (dev=0x555556ad6270, errp=0x7fffffffdaf0) at /home/petmay01/linaro/qemu-for-merges/hw/intc/i8259.c:461 #6 0x00005555558f3d60 in device_set_realized (obj=0x555556ad6270, value=true, errp=0x7fffffffdc90) at /home/petmay01/linaro/qemu-for-merges/hw/core/qdev.c:914 #7 0x0000555555ac188c in property_set_bool (obj=0x555556ad6270, v= 0x555556ad6f20, name=0x555555d2271b "realized", opaque=0x555556ad66a0, errp=0x7fffffffdc90) at /home/petmay01/linaro/qemu-for-merges/qom/object.c:1906 #8 0x0000555555abfc01 in object_property_set (obj=0x555556ad6270, v= 0x555556ad6f20, name=0x555555d2271b "realized", errp=0x7fffffffdc90) at /home/petmay01/linaro/qemu-for-merges/qom/object.c:1102 #9 0x0000555555ac2bc9 in object_property_set_qobject (obj=0x555556ad6270, value=0x555556ad6520, name=0x555555d2271b "realized", errp=0x7fffffffdc90) at /home/petmay01/linaro/qemu-for-merges/qom/qom-qobject.c:27 #10 0x0000555555abfe96 in object_property_set_bool (obj=0x555556ad6270, value=true, name=0x555555d2271b "realized", errp=0x7fffffffdc90) at /home/petmay01/linaro/qemu-for-merges/qom/object.c:1171 #11 0x00005555558f27a9 in qdev_init_nofail (dev=0x555556ad6270) at /home/petmay01/linaro/qemu-for-merges/hw/core/qdev.c:338 #12 0x000055555594b984 in i8259_init_chip (name=0x555555d2c08c "isa-i8259", bus=0x555556ad5550, master=true) at /home/petmay01/linaro/qemu-for-merges/hw/intc/i8259_common.c:96 #13 0x000055555594c783 in i8259_init (bus=0x555556ad5550, parent_irq=0x555556ad6050) at /home/petmay01/linaro/qemu-for-merges/hw/intc/i8259.c:473 #14 0x0000555555851873 in typhoon_init (ram_size=134217728, isa_bus=0x7fffffffde08, p_rtc_irq=0x7fffffffde10, cpus=0x7fffffffdea0, sys_map_irq=0x55555584f22a <clipper_pci_map_irq>) at /home/petmay01/linaro/qemu-for-merges/hw/alpha/typhoon.c:925 #15 0x000055555584f3dd in clipper_init (machine=0x55555697b390) at /home/petmay01/linaro/qemu-for-merges/hw/alpha/dp264.c:77 #16 0x00005555558fba0a in machine_run_board_init (machine=0x55555697b390) at /home/petmay01/linaro/qemu-for-merges/hw/core/machine.c:792 #17 0x000055555587ac3d in main (argc=1, argv=0x7fffffffe338, envp=0x7fffffffe348) at /home/petmay01/linaro/qemu-for-merges/vl.c:4708 There was also a minor merge conflict with the tpm pullreq (both pulls change the #includes in hw/tpm/tpm_tis.c) which you might fix when you respin. thanks -- PMM
Hi Peter, On 12/17/2017 08:14 PM, Peter Maydell wrote: > On 17 December 2017 at 22:07, Michael Tokarev <mjt@tls.msk.ru> wrote: >>> Here's a large pull request for trivial-patches queue. >>> It's been quite a whie since the last request, and many >>> changes has been accumulated. >>> >>> Also there's a large patchset by Philippe Mathieu-Daudé >>> named "remove i386/pc dependency from non-PC world (part 1)" >>> consisting of 42 patches which makes good portion of this >>> pull request. >> >> I forgot to add my S-o-b lines to the large series by >> Philippe Mathieu-Daudé. So here's a re-send of just the >> cover letter (not all the other patches). The only difference >> is the addition of 42 of my "S-o-b" line. > > I'm afraid this fails 'make check'. (I only tested the > first pullreq but if you only changed signoffs then > it'll still be the same): > > TEST: tests/qom-test... (pid=12208) > /alpha/qom/clipper: > Broken pipe > FAIL > GTester: last random seed: R02S26a31a16d967b2664ad714c1c7f8e7f1 > (pid=12214) Oops > /alpha/qom/none: OK > FAIL: tests/qom-test > TEST: tests/test-hmp... (pid=12219) > /alpha/hmp/clipper: > Broken pipe > FAIL > GTester: last random seed: R02S0c5a0f7de3fc6e9885b740c77c86eef2 > (pid=12225) > /alpha/hmp/none: OK > /alpha/hmp/none+2MB: OK > FAIL: tests/test-hmp > > This is because qemu-system-alpha segfaults on startup: My bad... eede06dd70f72da489b8f968abbb7cb5445ef834 is the first bad commit Author: Philippe Mathieu-Daudé <f4bug@amsat.org> hw/alpha/typhoon: simplify using the "unimplemented" sysbus device I'm pretty sure I run the qtests, but this was 2 months ago... I'll have a look. [...] > There was also a minor merge conflict with the tpm pullreq > (both pulls change the #includes in hw/tpm/tpm_tis.c) which > you might fix when you respin. Yes, I rebased the 42 patches on /master yesterday but I see you merged the TPM tree in your /staging, so I'll rebase there and resend the offending patches fixed to Michael. Regards, Phil.
>> I'm afraid this fails 'make check'. (I only tested the >> first pullreq but if you only changed signoffs then >> it'll still be the same): >> >> TEST: tests/qom-test... (pid=12208) >> /alpha/qom/clipper: >> Broken pipe >> FAIL >> GTester: last random seed: R02S26a31a16d967b2664ad714c1c7f8e7f1 >> (pid=12214) > > Oops > >> /alpha/qom/none: OK >> FAIL: tests/qom-test >> TEST: tests/test-hmp... (pid=12219) >> /alpha/hmp/clipper: >> Broken pipe >> FAIL >> GTester: last random seed: R02S0c5a0f7de3fc6e9885b740c77c86eef2 >> (pid=12225) >> /alpha/hmp/none: OK >> /alpha/hmp/none+2MB: OK >> FAIL: tests/test-hmp >> >> This is because qemu-system-alpha segfaults on startup: > > My bad... > > eede06dd70f72da489b8f968abbb7cb5445ef834 is the first bad commit > Author: Philippe Mathieu-Daudé <f4bug@amsat.org> > > hw/alpha/typhoon: simplify using the "unimplemented" sysbus device > > I'm pretty sure I run the qtests, but this was 2 months ago... > I'll have a look. This patch is not _trivial_ :| Let's drop it from this tree, I'll have to rework it. > [...] >> There was also a minor merge conflict with the tpm pullreq >> (both pulls change the #includes in hw/tpm/tpm_tis.c) which >> you might fix when you respin. > > Yes, I rebased the 42 patches on /master yesterday but I see you merged > the TPM tree in your /staging, so I'll rebase there and resend the > offending patches fixed to Michael. Michael, I removed the "hw/alpha/typhoon" patch, and updated the "hw/tpm: remove old i386 dependency" one: no need to modify hw/tpm/tpm_tis.c, Marc-André Lureau already cleaned it, I did however clean the newly added hw/tpm/tpm_emulator.c file. The fixed tree is now available signed in the Git repository at: github.com:philmd/qemu.git tags/trivial-patches-2017-12-18 If this is OK to you I'll only resend the "hw/tpm: remove old i386 dependency" on the list, but if you/Peter prefer I can still resend the whole enchilada (which is unchanged except this unique patch). Regards, Phil.