| Message ID | 1464343604-517-1-git-send-email-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 27 May 2016 at 11:06, Paolo Bonzini <pbonzini@redhat.com> wrote: > The following changes since commit b75536c9fa742f887304769d0608557bb8e3a27f: > > blockjob: Remove BlockJob.bs (2016-05-25 19:04:21 +0200) > > are available in the git repository at: > > git://github.com/bonzini/qemu.git tags/for-upstream > > for you to fetch changes up to 7052033834d4c2d7ade147cf5b045be6eaf07113: > > exec: hide mr->ram_addr from qemu_get_ram_ptr users (2016-05-27 11:55:23 +0200) > > ---------------------------------------------------------------- > * docs/atomics fixes and atomic_rcu_* optimization (Emilio) > * NBD bugfix (Eric) > * Memory fixes and cleanups (Paolo, Paul) > * scsi-block support for SCSI status, including persistent > reservations (Paolo) > * linuxboot support for fw_cfg DMA (Marc, Richard Jones) > * kvm_stat moves to the Linux repository > * SCSI bug fixes (Peter, Prasad) > * Killing qemu_char_get_next_serial, non-ARM parts (Xiaoqiang) Hi; this fails to build for w32: CC optionrom/linuxboot_dma.o Building optionrom/linuxboot_dma.img linuxboot_dma.o:linuxboot_dma.c:(.text+0x57): undefined reference to `load_kernel' thanks -- PMM
On 27 May 2016 at 13:53, Peter Maydell <peter.maydell@linaro.org> wrote: > On 27 May 2016 at 11:06, Paolo Bonzini <pbonzini@redhat.com> wrote: >> The following changes since commit b75536c9fa742f887304769d0608557bb8e3a27f: >> >> blockjob: Remove BlockJob.bs (2016-05-25 19:04:21 +0200) >> >> are available in the git repository at: >> >> git://github.com/bonzini/qemu.git tags/for-upstream >> >> for you to fetch changes up to 7052033834d4c2d7ade147cf5b045be6eaf07113: >> >> exec: hide mr->ram_addr from qemu_get_ram_ptr users (2016-05-27 11:55:23 +0200) >> >> ---------------------------------------------------------------- >> * docs/atomics fixes and atomic_rcu_* optimization (Emilio) >> * NBD bugfix (Eric) >> * Memory fixes and cleanups (Paolo, Paul) >> * scsi-block support for SCSI status, including persistent >> reservations (Paolo) >> * linuxboot support for fw_cfg DMA (Marc, Richard Jones) >> * kvm_stat moves to the Linux repository >> * SCSI bug fixes (Peter, Prasad) >> * Killing qemu_char_get_next_serial, non-ARM parts (Xiaoqiang) > > Hi; this fails to build for w32: > > CC optionrom/linuxboot_dma.o > Building optionrom/linuxboot_dma.img > linuxboot_dma.o:linuxboot_dma.c:(.text+0x57): undefined reference to > `load_kernel' With V=1: i686-w64-mingw32-ld -m i386pe -Ttext 0 -e _start -s -o linuxboot_dma.img linuxboot_dma.o linuxboot_dma.o:linuxboot_dma.c:(.text+0x57): undefined reference to `load_kernel' Building an image for the target using our host compiler seems like an odd choice, but the makefile obviously intends to support it since it has specific ifdef CONFIG_WIN32 code to adjust the linker command line. I suspect this is a mismatch between the symbol the native asm is using and the one that the C compiler wants: $ nm build/w32-new/pc-bios/optionrom/linuxboot_dma.o |grep load_kernel 000005dd T _load_kernel U load_kernel since name mangling rules are different for Linux and Windows ABIs. thanks -- PMM
The following changes since commit b75536c9fa742f887304769d0608557bb8e3a27f: blockjob: Remove BlockJob.bs (2016-05-25 19:04:21 +0200) are available in the git repository at: git://github.com/bonzini/qemu.git tags/for-upstream for you to fetch changes up to 7052033834d4c2d7ade147cf5b045be6eaf07113: exec: hide mr->ram_addr from qemu_get_ram_ptr users (2016-05-27 11:55:23 +0200) ---------------------------------------------------------------- * docs/atomics fixes and atomic_rcu_* optimization (Emilio) * NBD bugfix (Eric) * Memory fixes and cleanups (Paolo, Paul) * scsi-block support for SCSI status, including persistent reservations (Paolo) * linuxboot support for fw_cfg DMA (Marc, Richard Jones) * kvm_stat moves to the Linux repository * SCSI bug fixes (Peter, Prasad) * Killing qemu_char_get_next_serial, non-ARM parts (Xiaoqiang) ---------------------------------------------------------------- Emilio G. Cota (3): docs/atomics: update atomic_read/set comparison with Linux atomics: emit an smp_read_barrier_depends() barrier only for Alpha and Thread Sanitizer atomics: do not emit consume barrier for atomic_rcu_read Eric Blake (1): nbd: Don't trim unrequested bytes Fam Zheng (1): scsi-generic: Merge block max xfer len in INQUIRY response Marc Marí (1): Add optionrom compatible with fw_cfg DMA version Paolo Bonzini (13): Revert "memory: Drop FlatRange.romd_mode" kvm_stat: Remove bt: rewrite csrhci_write to avoid out-of-bounds writes docs/atomics: update comparison with Linux scsi-disk: introduce a common base class scsi-disk: introduce dma_readv and dma_writev scsi-disk: add need_fua_emulation to SCSIDiskClass scsi-disk: introduce scsi_disk_req_check_error scsi-block: always use SG_IO memory: remove qemu_get_ram_fd, qemu_set_ram_fd, qemu_ram_block_host_ptr exec: remove ram_addr argument from qemu_ram_block_from_host memory: split memory_region_from_host from qemu_ram_addr_from_host exec: hide mr->ram_addr from qemu_get_ram_ptr users Paul Durrant (1): xen-hvm: ignore background I/O sections Peter Lieven (1): block/iscsi: avoid potential overflow of acb->task->cdb Prasad J Pandit (5): scsi: pvscsi: check command descriptor ring buffer size (CVE-2016-4952) scsi: mptsas: infinite loop while fetching requests scsi: megasas: use appropriate property buffer size scsi: megasas: initialise local configuration data buffer scsi: megasas: check 'read_queue_head' index value xiaoqiang zhao (5): hw/char: QOM'ify escc.c hw/char: QOM'ify etraxfs_ser.c hw/char: QOM'ify lm32_juart.c hw/char: QOM'ify lm32_uart.c hw/char: QOM'ify milkymist-uart.c .gitignore | 4 + Makefile | 11 +- block/iscsi.c | 7 + configure | 20 + cputlb.c | 3 +- docs/atomics.txt | 38 +- exec.c | 110 ++--- hw/bt/hci-csr.c | 67 +++- hw/char/escc.c | 30 +- hw/char/etraxfs_ser.c | 27 +- hw/char/lm32_juart.c | 17 +- hw/char/lm32_uart.c | 28 +- hw/char/milkymist-uart.c | 10 +- hw/cris/axis_dev88.c | 4 +- hw/i386/pc.c | 10 +- hw/lm32/lm32.h | 19 +- hw/lm32/lm32_boards.c | 9 +- hw/lm32/milkymist-hw.h | 4 +- hw/lm32/milkymist.c | 4 +- hw/misc/ivshmem.c | 5 +- hw/nvram/fw_cfg.c | 2 +- hw/scsi/megasas.c | 6 +- hw/scsi/mptsas.c | 9 +- hw/scsi/scsi-disk.c | 412 +++++++++++++------ hw/scsi/scsi-generic.c | 12 + hw/scsi/vmw_pvscsi.c | 24 +- hw/virtio/vhost-user.c | 25 +- include/exec/cpu-common.h | 4 +- include/exec/memory.h | 36 +- include/exec/ram_addr.h | 3 - include/hw/cris/etraxfs.h | 16 + include/hw/nvram/fw_cfg.h | 1 + include/qemu/atomic.h | 25 +- memory.c | 43 +- migration/postcopy-ram.c | 3 +- nbd/server.c | 20 +- pc-bios/optionrom/Makefile | 19 +- pc-bios/optionrom/code16gcc.h | 3 + pc-bios/optionrom/linuxboot_dma.c | 291 ++++++++++++++ scripts/dump-guest-memory.py | 19 +- scripts/kvm/kvm_stat | 825 -------------------------------------- scripts/kvm/kvm_stat.texi | 55 --- target-i386/kvm.c | 6 +- xen-hvm.c | 14 +- 44 files changed, 1055 insertions(+), 1245 deletions(-) create mode 100644 pc-bios/optionrom/code16gcc.h create mode 100644 pc-bios/optionrom/linuxboot_dma.c delete mode 100755 scripts/kvm/kvm_stat delete mode 100644 scripts/kvm/kvm_stat.texi