Message ID | 1426684075-27224-1-git-send-email-kraxel@redhat.com |
---|---|
State | New |
Headers | show |
On 18 March 2015 at 13:07, Gerd Hoffmann <kraxel@redhat.com> wrote: > Hi, > > Here is the usb patch queue for 2.3-rc1. Grow a bit larger than I'd > like it to be. But I've somehow missed I had patches lingering in the > usb queue while preparing the -rc0 pulls, and there also have been some > bugfixes coming in pretty late. > > please pull, > Gerd > > The following changes since commit 5a4992834daec85c3913654903fb9f4f954e585a: > > Merge remote-tracking branch 'remotes/armbru/tags/pull-cov-model-2015-03-17' into staging (2015-03-17 11:43:00 +0000) > > are available in the git repository at: > > > git://git.kraxel.org/qemu tags/pull-usb-20150318-1 > > for you to fetch changes up to ecc996143e7a52e5e348df2647ec464bd05bb46c: > > ehci: fix segfault when hot-unplugging ehci controller (2015-03-18 12:45:35 +0100) Fails to build (x86_64, Linux host): LINK aarch64-softmmu/qemu-system-aarch64 ../hw/usb/dev-wacom.o: In function `usb_wacom_handle_control': /home/petmay01/linaro/qemu-for-merges/hw/usb/dev-wacom.c:262: undefined reference to `usb_desc_handle_control' ../hw/usb/dev-wacom.o: In function `usb_wacom_realize': /home/petmay01/linaro/qemu-for-merges/hw/usb/dev-wacom.c:341: undefined reference to `usb_desc_create_serial' /home/petmay01/linaro/qemu-for-merges/hw/usb/dev-wacom.c:342: undefined reference to `usb_desc_init' ../hw/usb/dev-storage.o: In function `usb_msd_handle_control': ../hw/usb/dev-storage.o: In function `usb_msd_handle_control': /home/petmay01/linaro/qemu-for-merges/hw/usb/dev-storage.c:351: undefined reference to `usb_desc_handle_control' ../hw/usb/dev-storage.o: In function `usb_msd_realize_storage': /home/petmay01/linaro/qemu-for-merges/hw/usb/dev-storage.c:644: undefined reference to `usb_desc_create_serial' /home/petmay01/linaro/qemu-for-merges/hw/usb/dev-storage.c:645: undefined reference to `usb_desc_init' ../hw/usb/dev-storage.o: In function `usb_msd_realize_bot': /home/petmay01/linaro/qemu-for-merges/hw/usb/dev-storage.c:663: undefined reference to `usb_desc_create_serial' /home/petmay01/linaro/qemu-for-merges/hw/usb/dev-storage.c:664: undefined reference to `usb_desc_init' ../hw/usb/dev-storage.o: In function `usb_msd_class_initfn_common': /home/petmay01/linaro/qemu-for-merges/hw/usb/dev-storage.c:759: undefined reference to `usb_desc_attach' ../hw/usb/dev-uas.o: In function `usb_uas_handle_control': /home/petmay01/linaro/qemu-for-merges/hw/usb/dev-uas.c:648: undefined reference to `usb_desc_handle_control' ../hw/usb/dev-uas.o: In function `usb_uas_realize': /home/petmay01/linaro/qemu-for-merges/hw/usb/dev-uas.c:900: undefined reference to `usb_desc_create_serial' /home/petmay01/linaro/qemu-for-merges/hw/usb/dev-uas.c:901: undefined reference to `usb_desc_init' ../hw/usb/dev-uas.o: In function `usb_uas_class_initfn': /home/petmay01/linaro/qemu-for-merges/hw/usb/dev-uas.c:934: undefined reference to `usb_desc_attach' ../hw/usb/dev-audio.o: In function `usb_audio_handle_control': /home/petmay01/linaro/qemu-for-merges/hw/usb/dev-audio.c:518: undefined reference to `usb_desc_handle_control' ../hw/usb/dev-audio.o: In function `usb_audio_realize': /home/petmay01/linaro/qemu-for-merges/hw/usb/dev-audio.c:635: undefined reference to `usb_desc_create_serial' /home/petmay01/linaro/qemu-for-merges/hw/usb/dev-audio.c:636: undefined reference to `usb_desc_init' ../hw/usb/dev-serial.o: In function `usb_serial_handle_control': /home/petmay01/linaro/qemu-for-merges/hw/usb/dev-serial.c:229: undefined reference to `usb_desc_handle_control' ../hw/usb/dev-serial.o: In function `usb_serial_realize': /home/petmay01/linaro/qemu-for-merges/hw/usb/dev-serial.c:479: undefined reference to `usb_desc_create_serial' /home/petmay01/linaro/qemu-for-merges/hw/usb/dev-serial.c:480: undefined reference to `usb_desc_init' ../hw/usb/dev-network.o: In function `usb_net_handle_control': /home/petmay01/linaro/qemu-for-merges/hw/usb/dev-network.c:1064: undefined reference to `usb_desc_handle_control' ../hw/usb/dev-network.o: In function `usb_net_realize': /home/petmay01/linaro/qemu-for-merges/hw/usb/dev-network.c:1348: undefined reference to `usb_desc_create_serial' /home/petmay01/linaro/qemu-for-merges/hw/usb/dev-network.c:1349: undefined reference to `usb_desc_init' /home/petmay01/linaro/qemu-for-merges/hw/usb/dev-network.c:1373: undefined reference to `usb_desc_set_string' ../hw/usb/dev-bluetooth.o: In function `usb_bt_handle_control': /home/petmay01/linaro/qemu-for-merges/hw/usb/dev-bluetooth.c:371: undefined reference to `usb_desc_handle_control' ../hw/usb/dev-bluetooth.o: In function `usb_bt_realize': /home/petmay01/linaro/qemu-for-merges/hw/usb/dev-bluetooth.c:508: undefined reference to `usb_desc_create_serial' /home/petmay01/linaro/qemu-for-merges/hw/usb/dev-bluetooth.c:509: undefined reference to `usb_desc_init' ../hw/usb/dev-smartcard-reader.o: In function `ccid_handle_control': /home/petmay01/linaro/qemu-for-merges/hw/usb/dev-smartcard-reader.c:700: undefined reference to `usb_desc_handle_control' ../hw/usb/dev-smartcard-reader.o: In function `ccid_realize': /home/petmay01/linaro/qemu-for-merges/hw/usb/dev-smartcard-reader.c:1311: undefined reference to `usb_desc_create_serial' /home/petmay01/linaro/qemu-for-merges/hw/usb/dev-smartcard-reader.c:1312: undefined reference to `usb_desc_init' ../hw/usb/dev-mtp.o: In function `usb_mtp_handle_control': /home/petmay01/linaro/qemu-for-merges/hw/usb/dev-mtp.c:900: undefined reference to `usb_desc_handle_control' ../hw/usb/dev-mtp.o: In function `usb_mtp_realize': /home/petmay01/linaro/qemu-for-merges/hw/usb/dev-mtp.c:1067: undefined reference to `usb_desc_create_serial' /home/petmay01/linaro/qemu-for-merges/hw/usb/dev-mtp.c:1068: undefined reference to `usb_desc_init' ../hw/usb/dev-mtp.o: In function `usb_mtp_class_initfn': /home/petmay01/linaro/qemu-for-merges/hw/usb/dev-mtp.c:1106: undefined reference to `usb_desc_attach' collect2: error: ld returned 1 exit status -- PMM
On Do, 2015-03-19 at 12:11 +0000, Peter Maydell wrote: > On 18 March 2015 at 13:07, Gerd Hoffmann <kraxel@redhat.com> wrote: > > Hi, > > > > Here is the usb patch queue for 2.3-rc1. Grow a bit larger than I'd > > like it to be. But I've somehow missed I had patches lingering in the > > usb queue while preparing the -rc0 pulls, and there also have been some > > bugfixes coming in pretty late. > > > > please pull, > > Gerd > > > > The following changes since commit 5a4992834daec85c3913654903fb9f4f954e585a: > > > > Merge remote-tracking branch 'remotes/armbru/tags/pull-cov-model-2015-03-17' into staging (2015-03-17 11:43:00 +0000) > > > > are available in the git repository at: > > > > > > git://git.kraxel.org/qemu tags/pull-usb-20150318-1 > > > > for you to fetch changes up to ecc996143e7a52e5e348df2647ec464bd05bb46c: > > > > ehci: fix segfault when hot-unplugging ehci controller (2015-03-18 12:45:35 +0100) > > Fails to build (x86_64, Linux host): > > LINK aarch64-softmmu/qemu-system-aarch64 > ../hw/usb/dev-wacom.o: In function `usb_wacom_handle_control': > /home/petmay01/linaro/qemu-for-merges/hw/usb/dev-wacom.c:262: > undefined reference to `usb_desc_handle_control' Oh, right, forgot to mention in the cover letter: One of the patches introduces a new config option (CONFIG_USB), and because of that you have to do a full rebuild to make sure the new option is picked up for the targets which need usb. cheers, Gerd
On 19 March 2015 at 14:50, Gerd Hoffmann <kraxel@redhat.com> wrote: > Oh, right, forgot to mention in the cover letter: One of the patches > introduces a new config option (CONFIG_USB), and because of that you > have to do a full rebuild to make sure the new option is picked up for > the targets which need usb. I think this is the final fallout from the dependency bug fixed by Paolo in 15564d85afa. Build trees which created the config-devices.mak file prior to that commit won't have the necessary .d files to cause it to be remade, and won't rerun the script which would create the .d file because they don't have the .d files... But if you have some commit after that one, and remove the $buildtree/*/config-devices.mak files and do a full rebuild, then you can move forward to this (merge) commit and the incremental rebuild will work fine. So it's not a problem with this pull itself, but with build trees which haven't yet been cleaned up to deal with the pre-15564d mess... (I'm currently running the merge through the usual tests before pushing it out.) thanks -- PMM
On 19 March 2015 at 19:00, Peter Maydell <peter.maydell@linaro.org> wrote: > (I'm currently running the merge through the usual tests > before pushing it out.) ...the tests seem to be OK. However there are at least 3 commits here which don't have your signed-off-by as the submaintainer. Please can you respin? (I recommend adding something to your pull-request-creation script which checks for signed-off-by lines. Mine is here https://git.linaro.org/people/peter.maydell/misc-scripts.git/blob/HEAD:/make-pullreq if you want to crib from it.) thanks -- PMM