Message ID | 20170228161402.25122-1-pbonzini@redhat.com |
---|---|
State | New |
Headers | show |
On 28 February 2017 at 16:13, Paolo Bonzini <pbonzini@redhat.com> wrote: > The following changes since commit d992f2f1368ceb92e6bfd8efece174110f4236ff: > > Merge remote-tracking branch 'remotes/artyom/tags/pull-sun4v-20170226' into staging (2017-02-26 22:40:23 +0000) > > are available in the git repository at: > > git://github.com/bonzini/qemu.git tags/for-upstream > > for you to fetch changes up to b9a93b6cfddd348286cd8e44d7c4d964d9553a9f: > > vl: disable default cdrom when using explicitely scsi-hd (2017-02-28 11:51:12 +0100) > > v3->v4: added two patches > > fixed #ifdef KVM_HAVE_MCE_INJECTION > > v2->v3: replace SIGPOLL with SIGIO > > another missing #ifdef KVM_HAVE_MCE_INJECTION > > v1->v2: add missing #ifdef KVM_HAVE_MCE_INJECTION > > rebase over MTTCG pull request. -icount is currently broken but > I'd like to preserve bisectability, so this pull request brings > in the icount patches through a merge commit. Fails to build, ppc64, aarch64 (and probably others): In file included from /home/pm215/qemu/include/qemu/osdep.h:36:0, from /home/pm215/qemu/kvm-all.c:16: /home/pm215/qemu/kvm-all.c: In function ‘kvm_cpu_exec’: /home/pm215/qemu/kvm-all.c:1995:22: error: ‘have_sigbus_pending’ undeclared (first use in this function) if (unlikely(have_sigbus_pending)) { ^ /home/pm215/qemu/include/qemu/compiler.h:66:43: note: in definition of macro ‘unlikely’ #define unlikely(x) __builtin_expect(!!(x), 0) ^ /home/pm215/qemu/kvm-all.c:1995:22: note: each undeclared identifier is reported only once for each function it appears in if (unlikely(have_sigbus_pending)) { ^ /home/pm215/qemu/include/qemu/compiler.h:66:43: note: in definition of macro ‘unlikely’ #define unlikely(x) __builtin_expect(!!(x), 0) ^ thanks -- PMM
On 01/03/2017 18:58, Peter Maydell wrote: > Fails to build, ppc64, aarch64 (and probably others): > > In file included from /home/pm215/qemu/include/qemu/osdep.h:36:0, > from /home/pm215/qemu/kvm-all.c:16: > /home/pm215/qemu/kvm-all.c: In function ‘kvm_cpu_exec’: > /home/pm215/qemu/kvm-all.c:1995:22: error: ‘have_sigbus_pending’ > undeclared (first use in this function) > if (unlikely(have_sigbus_pending)) { > ^ > /home/pm215/qemu/include/qemu/compiler.h:66:43: note: in definition of > macro ‘unlikely’ > #define unlikely(x) __builtin_expect(!!(x), 0) > ^ > /home/pm215/qemu/kvm-all.c:1995:22: note: each undeclared identifier > is reported only once for each function it appears in > if (unlikely(have_sigbus_pending)) { > ^ > /home/pm215/qemu/include/qemu/compiler.h:66:43: note: in definition of > macro ‘unlikely’ > #define unlikely(x) __builtin_expect(!!(x), 0) Are you sure you updated the tag? Line 1995 here is: #ifdef KVM_HAVE_MCE_INJECTION and that error would have come from v3. Paolo
On 2 March 2017 at 18:01, Paolo Bonzini <pbonzini@redhat.com> wrote: > > > On 01/03/2017 18:58, Peter Maydell wrote: >> Fails to build, ppc64, aarch64 (and probably others): >> >> In file included from /home/pm215/qemu/include/qemu/osdep.h:36:0, >> from /home/pm215/qemu/kvm-all.c:16: >> /home/pm215/qemu/kvm-all.c: In function ‘kvm_cpu_exec’: >> /home/pm215/qemu/kvm-all.c:1995:22: error: ‘have_sigbus_pending’ >> undeclared (first use in this function) >> if (unlikely(have_sigbus_pending)) { >> ^ >> /home/pm215/qemu/include/qemu/compiler.h:66:43: note: in definition of >> macro ‘unlikely’ >> #define unlikely(x) __builtin_expect(!!(x), 0) >> ^ >> /home/pm215/qemu/kvm-all.c:1995:22: note: each undeclared identifier >> is reported only once for each function it appears in >> if (unlikely(have_sigbus_pending)) { >> ^ >> /home/pm215/qemu/include/qemu/compiler.h:66:43: note: in definition of >> macro ‘unlikely’ >> #define unlikely(x) __builtin_expect(!!(x), 0) > > Are you sure you updated the tag? Your cover letter says "changes up to b9a93b6cfd" but the tag is of commit 0819248. My script always does a git fetch, so it looks to me like maybe you failed to push the new tag? thanks -- PMM