| Message ID | 1455020031-8268-1-git-send-email-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 9 February 2016 at 12:13, Paolo Bonzini <pbonzini@redhat.com> wrote: > The following changes since commit e4a096b1cd4350eeca5dcdc391ab333d2083d7fd: > > ui/cocoa.m: Include qemu/osdep.h (2016-02-08 13:14:40 +0000) > > are available in the git repository at: > > git://github.com/bonzini/qemu.git tags/for-upstream > > for you to fetch changes up to 91eb5e5293fda2127ae33594715b47ff7e4eb985: > > qemu-char, io: fix ordering of arguments for UDP socket creation (2016-02-09 13:06:00 +0100) > > ---------------------------------------------------------------- > * switch to C11 atomics (Alex) > * Coverity fixes for IPMI (Corey), i386 (Paolo), qemu-char (Paolo) > * at long last, fail on wrong .pc files if -m32 is in use (Daniel) > * qemu-char regression fix (Daniel) > * SAS1068 device (Paolo) > * memory region docs improvements (Peter) > * target-i386 cleanups (Richard) > * qemu-nbd docs improvements (Sitsofe) > * thread-safe memory hotplug (Stefan) Compilation failure I'm afraid (all hosts): /home/pm215/qemu/target-i386/translate.c: In function ‘tcg_x86_init’: /home/pm215/qemu/target-i386/translate.c:7724:34: error: passing argument 1 of ‘tcg_global_mem_new_i32’ makes pointer from integer without a cast [-Werror] seg_base_names[i]); ^ In file included from /home/pm215/qemu/tcg/tcg-op.h:25:0, from /home/pm215/qemu/target-i386/translate.c:24: /home/pm215/qemu/tcg/tcg.h:644:24: note: expected ‘TCGv_ptr’ but argument is of type ‘int’ static inline TCGv_i32 tcg_global_mem_new_i32(TCGv_ptr reg, intptr_t offset, ^ thanks -- PMM
On 09/02/2016 15:20, Peter Maydell wrote: > Compilation failure I'm afraid (all hosts): > > /home/pm215/qemu/target-i386/translate.c: In function ‘tcg_x86_init’: > /home/pm215/qemu/target-i386/translate.c:7724:34: error: passing > argument 1 of ‘tcg_global_mem_new_i32’ makes pointer from integer > without a cast [-Werror] > seg_base_names[i]); > ^ > In file included from /home/pm215/qemu/tcg/tcg-op.h:25:0, > from /home/pm215/qemu/target-i386/translate.c:24: > /home/pm215/qemu/tcg/tcg.h:644:24: note: expected ‘TCGv_ptr’ but > argument is of type ‘int’ > static inline TCGv_i32 tcg_global_mem_new_i32(TCGv_ptr reg, intptr_t offset, > ^ Hmm, not on my host and I don't see what's going on: static const char seg_base_names[6][8] = { [R_CS] = "cs_base", [R_DS] = "ds_base", [R_ES] = "es_base", [R_FS] = "fs_base", [R_GS] = "gs_base", [R_SS] = "ss_base", }; cpu_seg_base[i] = tcg_global_mem_new(TCG_AREG0, offsetof(CPUX86State, segs[i].base), seg_base_names[i]); There's no difference between that and e.g. cpu_cc_src2 = tcg_global_mem_new(TCG_AREG0, offsetof(CPUX86State, cc_src2), "cc_src2"); Paolo
On 02/10/2016 01:41 AM, Paolo Bonzini wrote: > > > On 09/02/2016 15:20, Peter Maydell wrote: >> Compilation failure I'm afraid (all hosts): >> >> /home/pm215/qemu/target-i386/translate.c: In function ‘tcg_x86_init’: >> /home/pm215/qemu/target-i386/translate.c:7724:34: error: passing >> argument 1 of ‘tcg_global_mem_new_i32’ makes pointer from integer >> without a cast [-Werror] >> seg_base_names[i]); >> ^ >> In file included from /home/pm215/qemu/tcg/tcg-op.h:25:0, >> from /home/pm215/qemu/target-i386/translate.c:24: >> /home/pm215/qemu/tcg/tcg.h:644:24: note: expected ‘TCGv_ptr’ but >> argument is of type ‘int’ >> static inline TCGv_i32 tcg_global_mem_new_i32(TCGv_ptr reg, intptr_t offset, >> ^ > > Hmm, not on my host and I don't see what's going on: > > static const char seg_base_names[6][8] = { > [R_CS] = "cs_base", > [R_DS] = "ds_base", > [R_ES] = "es_base", > [R_FS] = "fs_base", > [R_GS] = "gs_base", > [R_SS] = "ss_base", > }; > > cpu_seg_base[i] > = tcg_global_mem_new(TCG_AREG0, > offsetof(CPUX86State, segs[i].base), > seg_base_names[i]); > > > There's no difference between that and e.g. > > cpu_cc_src2 = tcg_global_mem_new(TCG_AREG0, > offsetof(CPUX86State, cc_src2), > "cc_src2"); Merge conflict. s/TCG_AREG0/cpu_env/ after my latest tcg patch set. r~
The following changes since commit e4a096b1cd4350eeca5dcdc391ab333d2083d7fd: ui/cocoa.m: Include qemu/osdep.h (2016-02-08 13:14:40 +0000) are available in the git repository at: git://github.com/bonzini/qemu.git tags/for-upstream for you to fetch changes up to 91eb5e5293fda2127ae33594715b47ff7e4eb985: qemu-char, io: fix ordering of arguments for UDP socket creation (2016-02-09 13:06:00 +0100) ---------------------------------------------------------------- * switch to C11 atomics (Alex) * Coverity fixes for IPMI (Corey), i386 (Paolo), qemu-char (Paolo) * at long last, fail on wrong .pc files if -m32 is in use (Daniel) * qemu-char regression fix (Daniel) * SAS1068 device (Paolo) * memory region docs improvements (Peter) * target-i386 cleanups (Richard) * qemu-nbd docs improvements (Sitsofe) * thread-safe memory hotplug (Stefan) ---------------------------------------------------------------- Alex Bennée (1): include/qemu/atomic.h: default to __atomic functions Andrew Jones (1): kvm-all: trace: strerror fixup Corey Minyard (2): ipmi_bmc_sim: Fix off by one in check. ipmi_bmc_sim: Add break to correct watchdog NMI check Daniel P. Berrange (2): configure: sanity check the glib library that pkg-config finds char: fix repeated registration of tcp chardev I/O handlers Janosch Frank (1): scripts/kvm/kvm_stat: Fix tracefs access checking John Snow (1): nbd: avoid unaligned uint64_t store Paolo Bonzini (8): memory: add early bail out from cpu_physical_memory_set_dirty_range qemu-char: Keep pty slave file descriptor open until the master is closed scsi: push WWN fields up to SCSIDevice scsi-generic: grab device and port SAS addresses from backend hw: Add support for LSI SAS1068 (mptsas) device ipmi: do not take/drop iothread lock target-i386: fix PSE36 mode qemu-char, io: fix ordering of arguments for UDP socket creation Peter Maydell (1): docs/memory.txt: Improve list of different memory regions Richard Henderson (10): target-i386: Create gen_lea_v_seg target-i386: Introduce mo_stacksize target-i386: Use gen_lea_v_seg in gen_lea_modrm target-i386: Use gen_lea_v_seg in stack subroutines target-i386: Access segs via TCG registers target-i386: Use gen_lea_v_seg in pusha/popa target-i386: Rewrite gen_enter inline target-i386: Rewrite leave target-i386: Tidy gen_add_A0_im target-i386: Deconstruct the cpu_T array Sitsofe Wheeler (3): qemu-nbd: Fix unintended texi verbatim formatting qemu-nbd: Minor texi updates qemu-nbd: Fix texi sentence capitalisation Stefan Hajnoczi (1): memory: RCU ram_list.dirty_memory[] for safe RAM hotplug Stephen Warren (1): MAINTAINERS: add all-match entry for qemu-devel@ MAINTAINERS | 5 + configure | 24 + default-configs/pci.mak | 1 + docs/memory.txt | 26 +- exec.c | 75 +- hw/ipmi/ipmi.c | 2 - hw/ipmi/ipmi_bmc_sim.c | 4 +- hw/scsi/Makefile.objs | 1 + hw/scsi/mpi.h | 1153 ++++++++++++++++++++++++++++++ hw/scsi/mptconfig.c | 904 ++++++++++++++++++++++++ hw/scsi/mptendian.c | 204 ++++++ hw/scsi/mptsas.c | 1441 +++++++++++++++++++++++++++++++++++++ hw/scsi/mptsas.h | 100 +++ hw/scsi/scsi-disk.c | 23 +- hw/scsi/scsi-generic.c | 92 +++ include/exec/ram_addr.h | 193 ++++- include/hw/pci/pci_ids.h | 1 + include/hw/scsi/scsi.h | 3 + include/qemu/atomic.h | 192 +++-- io/channel-socket.c | 2 +- kvm-all.c | 4 +- migration/ram.c | 4 - nbd/server.c | 20 +- qemu-char.c | 10 +- qemu-nbd.texi | 80 ++- scripts/get_maintainer.pl | 2 +- scripts/kvm/kvm_stat | 23 +- target-i386/helper.c | 4 +- target-i386/helper.h | 4 - target-i386/seg_helper.c | 74 -- target-i386/translate.c | 1725 +++++++++++++++++++++------------------------ trace-events | 22 + 32 files changed, 5223 insertions(+), 1195 deletions(-) create mode 100644 hw/scsi/mpi.h create mode 100644 hw/scsi/mptconfig.c create mode 100644 hw/scsi/mptendian.c create mode 100644 hw/scsi/mptsas.c create mode 100644 hw/scsi/mptsas.h