Message ID | 20170116165916.8575-1-pbonzini@redhat.com |
---|---|
State | New |
Headers | show |
Hi, Your series seems to have some coding style problems. See output below for more information: Subject: [Qemu-devel] [PULL v2 00/32] Misc patches for 2017-01-11 Message-id: 20170116165916.8575-1-pbonzini@redhat.com Type: series === TEST SCRIPT BEGIN === #!/bin/bash BASE=base n=1 total=$(git log --oneline $BASE.. | wc -l) failed=0 # Useful git options git config --local diff.renamelimit 0 git config --local diff.renames True commits="$(git log --format=%H --reverse $BASE..)" for c in $commits; do echo "Checking PATCH $n/$total: $(git log -n 1 --format=%s $c)..." if ! git show $c --format=email | ./scripts/checkpatch.pl --mailback -; then failed=1 echo fi n=$((n+1)) done exit $failed === TEST SCRIPT END === Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384 Switched to a new branch 'test' 9fa6fee Revert "win32: don't run subprocess tests on Mingw32 platform" 57cb1e8 hax: add Darwin support 854318e Plumb the HAXM-based hardware acceleration support 8b5d061 target/i386: Add Intel HAX files c0f03d5 kvm: move cpu synchronization code dd5a94e ramblock-notifier: new 31df959 char: fix ctrl-a b not working a6edb6e exec: Add missing rcu_read_unlock 9d5f574 x86: ioapic: fix fail migration when irqchip=split 9f32b9d x86: ioapic: dump version for "info ioapic" 06292ef x86: ioapic: add traces for ioapic 482463e hxtool: emit Texinfo headings as @subsection 746cabc qemu-thread: fix qemu_thread_set_name() race in qemu_thread_create() 9316fcd serial: fix memory leak in serial exit af2a443 scsi-block: fix direction of BYTCHK test for VERIFY commands 5697c78 pc: fix crash in rtc_set_memory() if initial cpu is marked as hotplugged 968c706 acpi: filter based on CONFIG_ACPI_X86 rather than TARGET 5cf1c1b stubs: remove stubs/kvm.c f410666 build: remove --enable-colo/--disable-colo e2b8154 event_notifier: cleanups around event_notifier_set_handler aad3b7b stubs: move vhost stubs to stubs/vhost.o 10e9a75 stubs: group all monitor_fdset_* functions in a single file e24f7f5 stubs: group stubs for user-mode emulation da4e6c5 hw: move reset handlers from vl.c to hw/core 22d1a64 stubs: remove unused stub for serial_hd 21b3ae6 stubs: move acpi stubs to hw/acpi 3b51b10 stubs: move smbios stubs to hw/smbios 6f0af3a stubs: merge all monitor stubs in one file, remove monitor_cur_is_qmp stub 2fd2385 smbios: filter based on CONFIG_SMBIOS rather than TARGET caf9bec qom: Make all interface types abstract cf91058 megasas: fix guest-triggered memory leak b667112 bugfix: vm halt when in reset looping === OUTPUT BEGIN === Checking PATCH 1/32: bugfix: vm halt when in reset looping... Checking PATCH 2/32: megasas: fix guest-triggered memory leak... Checking PATCH 3/32: qom: Make all interface types abstract... WARNING: line over 80 characters #132: FILE: tests/device-introspect-test.c:174: + qtest_add_func("device/introspect/abstract-interfaces", test_abstract_interfaces); total: 0 errors, 1 warnings, 105 lines checked Your patch has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS. Checking PATCH 4/32: smbios: filter based on CONFIG_SMBIOS rather than TARGET... Checking PATCH 5/32: stubs: merge all monitor stubs in one file, remove monitor_cur_is_qmp stub... ERROR: do not initialise globals to 0 or NULL #76: FILE: stubs/monitor.c:6: +Monitor *cur_mon = NULL; total: 1 errors, 0 warnings, 30 lines checked Your patch has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS. Checking PATCH 6/32: stubs: move smbios stubs to hw/smbios... Checking PATCH 7/32: stubs: move acpi stubs to hw/acpi... Checking PATCH 8/32: stubs: remove unused stub for serial_hd... Checking PATCH 9/32: hw: move reset handlers from vl.c to hw/core... Checking PATCH 10/32: stubs: group stubs for user-mode emulation... Checking PATCH 11/32: stubs: group all monitor_fdset_* functions in a single file... Checking PATCH 12/32: stubs: move vhost stubs to stubs/vhost.o... Checking PATCH 13/32: event_notifier: cleanups around event_notifier_set_handler... Checking PATCH 14/32: build: remove --enable-colo/--disable-colo... Checking PATCH 15/32: stubs: remove stubs/kvm.c... Checking PATCH 16/32: acpi: filter based on CONFIG_ACPI_X86 rather than TARGET... Checking PATCH 17/32: pc: fix crash in rtc_set_memory() if initial cpu is marked as hotplugged... Checking PATCH 18/32: scsi-block: fix direction of BYTCHK test for VERIFY commands... Checking PATCH 19/32: serial: fix memory leak in serial exit... Checking PATCH 20/32: qemu-thread: fix qemu_thread_set_name() race in qemu_thread_create()... Checking PATCH 21/32: hxtool: emit Texinfo headings as @subsection... Checking PATCH 22/32: x86: ioapic: add traces for ioapic... Checking PATCH 23/32: x86: ioapic: dump version for "info ioapic"... Checking PATCH 24/32: x86: ioapic: fix fail migration when irqchip=split... Checking PATCH 25/32: exec: Add missing rcu_read_unlock... Checking PATCH 26/32: char: fix ctrl-a b not working... Checking PATCH 27/32: ramblock-notifier: new... Checking PATCH 28/32: kvm: move cpu synchronization code... Checking PATCH 29/32: target/i386: Add Intel HAX files... Checking PATCH 30/32: Plumb the HAXM-based hardware acceleration support... Checking PATCH 31/32: hax: add Darwin support... Checking PATCH 32/32: Revert "win32: don't run subprocess tests on Mingw32 platform"... === OUTPUT END === Test command exited with code: 1 --- Email generated automatically by Patchew [http://patchew.org/]. Please send your feedback to patchew-devel@freelists.org
On 16 January 2017 at 16:58, Paolo Bonzini <pbonzini@redhat.com> wrote: > The following changes since commit 2ccede18bd24fce5db83fef3674563a1f256717b: > > Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-2.9-pull-request' into staging (2017-01-16 12:41:35 +0000) > > are available in the git repository at: > > git://github.com/bonzini/qemu.git tags/for-upstream > > for you to fetch changes up to 91c7e9f6b82804c6b53ecc5057d6b305b766ba49: > > Revert "win32: don't run subprocess tests on Mingw32 platform" (2017-01-16 17:55:25 +0100) Fails to build, ppc64be host: In file included from /home/pm215/qemu/linux-headers/linux/kvm.h:13:0, from /home/pm215/qemu/include/sysemu/kvm.h:23, from /home/pm215/qemu/include/sysemu/hw_accel.h:16, from /home/pm215/qemu/target/ppc/translate_init.c:27, from /home/pm215/qemu/target/ppc/translate.c:6786: /home/pm215/qemu/build/all/linux-headers/asm/kvm.h:320:0: error: "KVM_INTERRUPT_SET" redefined [-Wer ror] #define KVM_INTERRUPT_SET -1U ^ In file included from /home/pm215/qemu/target/ppc/translate_init.c:24:0, from /home/pm215/qemu/target/ppc/translate.c:6786: /home/pm215/qemu/target/ppc/kvm_ppc.h:319:0: note: this is the location of the previous definition #define KVM_INTERRUPT_SET -1 ^ In file included from /home/pm215/qemu/linux-headers/linux/kvm.h:13:0, from /home/pm215/qemu/include/sysemu/kvm.h:23, from /home/pm215/qemu/include/sysemu/hw_accel.h:16, from /home/pm215/qemu/target/ppc/translate_init.c:27, from /home/pm215/qemu/target/ppc/translate.c:6786: /home/pm215/qemu/build/all/linux-headers/asm/kvm.h:321:0: error: "KVM_INTERRUPT_UNSET" redefined [-Werror] #define KVM_INTERRUPT_UNSET -2U ^ thanks -- PMM
diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index 6c53a6d..ec92c64 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -26,7 +26,7 @@ #include "cpu.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" -#include "sysemu/kvm.h" +#include "sysemu/hw_accel.h" #include "sysemu/numa.h" #include "kvm_ppc.h" #include "sysemu/cpus.h"