diff mbox

[PULL,v2,00/32] Misc patches for 2017-01-11

Message ID 20170116165916.8575-1-pbonzini@redhat.com
State New
Headers show

Pull-request

git://github.com/bonzini/qemu.git tags/for-upstream

Commit Message

Paolo Bonzini Jan. 16, 2017, 4:58 p.m. UTC
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)

----------------------------------------------------------------
* QOM interface fix (Eduardo)
* RTC fixes (Gaohuai, Igor)
* Memory leak fixes (Li Qiang, me)
* Ctrl-a b regression (Marc-André)
* Stubs cleanups and fixes (Leif, me)
* hxtool tweak (me)
* HAX support (Vincent)
* QemuThread, exec.c and SCSI fixes (Roman, Xinhua, me)

----------------------------------------------------------------
Caoxinhua (1):
      qemu-thread: fix qemu_thread_set_name() race in qemu_thread_create()

Eduardo Habkost (1):
      qom: Make all interface types abstract

Igor Mammedov (1):
      pc: fix crash in rtc_set_memory() if initial cpu is marked as hotplugged

Leif Lindholm (1):
      smbios: filter based on CONFIG_SMBIOS rather than TARGET

Li Qiang (1):
      serial: fix memory leak in serial exit

Marc-André Lureau (2):
      char: fix ctrl-a b not working
      Revert "win32: don't run subprocess tests on Mingw32 platform"

Paolo Bonzini (16):
      megasas: fix guest-triggered memory leak
      stubs: merge all monitor stubs in one file, remove monitor_cur_is_qmp stub
      stubs: move smbios stubs to hw/smbios
      stubs: move acpi stubs to hw/acpi
      stubs: remove unused stub for serial_hd
      hw: move reset handlers from vl.c to hw/core
      stubs: group stubs for user-mode emulation
      stubs: group all monitor_fdset_* functions in a single file
      stubs: move vhost stubs to stubs/vhost.o
      event_notifier: cleanups around event_notifier_set_handler
      build: remove --enable-colo/--disable-colo
      stubs: remove stubs/kvm.c
      acpi: filter based on CONFIG_ACPI_X86 rather than TARGET
      scsi-block: fix direction of BYTCHK test for VERIFY commands
      hxtool: emit Texinfo headings as @subsection
      ramblock-notifier: new

Peter Xu (3):
      x86: ioapic: add traces for ioapic
      x86: ioapic: dump version for "info ioapic"
      x86: ioapic: fix fail migration when irqchip=split

Roman Kapl (1):
      exec: Add missing rcu_read_unlock

Vincent Palatin (4):
      kvm: move cpu synchronization code
      target/i386: Add Intel HAX files
      Plumb the HAXM-based hardware acceleration support
      hax: add Darwin support

hangaohuai (1):
      bugfix: vm halt when in reset looping

 MAINTAINERS                                        |    1 +
 Makefile.target                                    |    5 +-
 arch_init.c                                        |   21 -
 configure                                          |   27 +-
 cpus.c                                             |   79 +-
 exec.c                                             |    6 +
 gdbstub.c                                          |    1 +
 hax-stub.c                                         |   34 +
 hw/Makefile.objs                                   |    6 +-
 hw/acpi/Makefile.objs                              |   17 +-
 hw/acpi/acpi-stub.c                                |   29 +
 stubs/ipmi.c => hw/acpi/ipmi-stub.c                |    0
 hw/char/serial.c                                   |   10 +
 hw/core/Makefile.objs                              |    2 +-
 hw/core/reset.c                                    |   72 ++
 hw/i386/kvm/apic.c                                 |    1 +
 hw/i386/kvmvapic.c                                 |    1 +
 hw/i386/pc.c                                       |    4 +-
 hw/intc/apic_common.c                              |    3 +-
 hw/intc/ioapic.c                                   |   22 +-
 hw/intc/ioapic_common.c                            |    3 +-
 hw/intc/trace-events                               |    7 +
 hw/misc/vmport.c                                   |    2 +-
 hw/ppc/pnv_xscom.c                                 |    2 +-
 hw/ppc/ppce500_spin.c                              |    4 +-
 hw/ppc/spapr.c                                     |    2 +-
 hw/ppc/spapr_hcall.c                               |    2 +-
 hw/s390x/s390-pci-inst.c                           |    1 +
 hw/scsi/megasas.c                                  |   11 +-
 hw/scsi/scsi-disk.c                                |    2 +-
 hw/smbios/Makefile.objs                            |   12 +-
 hw/smbios/smbios-stub.c                            |   31 +
 hw/smbios/smbios.c                                 |    2 +-
 .../smbios/smbios_type_38-stub.c                   |    0
 hw/timer/mc146818rtc.c                             |   12 +
 hw/usb/ccid-card-emulated.c                        |    2 +-
 hw/virtio/Makefile.objs                            |    6 +-
 stubs/vhost.c => hw/virtio/vhost-stub.c            |    0
 hw/virtio/virtio.c                                 |   10 +-
 include/exec/memory.h                              |    6 +-
 include/exec/ram_addr.h                            |   46 +-
 include/exec/ramlist.h                             |   72 ++
 include/hw/hw.h                                    |    6 +-
 include/hw/smbios/smbios.h                         |    2 +-
 include/qemu/event_notifier.h                      |    3 -
 include/qemu/main-loop.h                           |   15 +
 include/qom/cpu.h                                  |    5 +
 include/sysemu/arch_init.h                         |    2 -
 include/sysemu/hax.h                               |   56 +
 include/sysemu/hw_accel.h                          |   48 +
 include/sysemu/kvm.h                               |   23 -
 include/sysemu/reset.h                             |   10 +
 include/sysemu/sysemu.h                            |    1 -
 iohandler.c                                        |    8 +
 migration/Makefile.objs                            |    3 +-
 monitor.c                                          |    2 +-
 numa.c                                             |   29 +
 qemu-char.c                                        |   15 +-
 qemu-options-wrapper.h                             |    2 +-
 qemu-options.hx                                    |   42 +-
 qom/cpu.c                                          |    2 +-
 qom/object.c                                       |    6 +
 scripts/hxtool                                     |   11 +-
 stubs/Makefile.objs                                |   19 +-
 stubs/cpus.c                                       |   11 -
 stubs/fdset-add-fd.c                               |    8 -
 stubs/fdset-find-fd.c                              |    8 -
 stubs/fdset-get-fd.c                               |    8 -
 stubs/fdset-remove-fd.c                            |    7 -
 stubs/fdset.c                                      |   22 +
 stubs/get-next-serial.c                            |    4 -
 stubs/iohandler.c                                  |    8 -
 stubs/kvm.c                                        |    8 -
 stubs/migration-colo.c                             |   46 -
 stubs/mon-is-qmp.c                                 |   10 -
 stubs/monitor-init.c                               |    7 -
 stubs/{get-fd.c => monitor.c}                      |    6 +
 stubs/replay-user.c                                |   33 -
 stubs/reset.c                                      |   14 -
 target/arm/cpu.c                                   |    2 +-
 target/i386/Makefile.objs                          |    7 +
 target/i386/hax-all.c                              | 1155 ++++++++++++++++++++
 target/i386/hax-darwin.c                           |  316 ++++++
 target/i386/hax-darwin.h                           |   63 ++
 target/i386/hax-i386.h                             |   94 ++
 target/i386/hax-interface.h                        |  361 ++++++
 target/i386/hax-mem.c                              |  289 +++++
 target/i386/hax-windows.c                          |  479 ++++++++
 target/i386/hax-windows.h                          |   89 ++
 target/i386/helper.c                               |    1 +
 target/i386/hyperv.c                               |    7 +-
 target/i386/kvm.c                                  |    1 +
 target/mips/kvm.c                                  |    5 +
 target/ppc/kvm.c                                   |    7 +-
 target/ppc/mmu-hash64.c                            |    2 +-
 target/ppc/translate_init.c                        |    2 +-
 target/s390x/gdbstub.c                             |    1 +
 target/s390x/kvm.c                                 |    5 +
 tests/Makefile.include                             |    1 +
 tests/device-introspect-test.c                     |   60 +-
 user-exec-stub.c                                   |   34 +
 util/event_notifier-posix.c                        |    9 -
 util/event_notifier-win32.c                        |   12 -
 util/qemu-thread-posix.c                           |   12 +-
 util/qemu-thread-win32.c                           |    4 +-
 vl.c                                               |   62 +-
 xen-mapcache.c                                     |    3 +
 107 files changed, 3717 insertions(+), 452 deletions(-)
 create mode 100644 hax-stub.c
 create mode 100644 hw/acpi/acpi-stub.c
 rename stubs/ipmi.c => hw/acpi/ipmi-stub.c (100%)
 create mode 100644 hw/core/reset.c
 create mode 100644 hw/smbios/smbios-stub.c
 rename stubs/smbios_type_38.c => hw/smbios/smbios_type_38-stub.c (100%)
 rename stubs/vhost.c => hw/virtio/vhost-stub.c (100%)
 create mode 100644 include/exec/ramlist.h
 create mode 100644 include/sysemu/hax.h
 create mode 100644 include/sysemu/hw_accel.h
 create mode 100644 include/sysemu/reset.h
 delete mode 100644 stubs/cpus.c
 delete mode 100644 stubs/fdset-add-fd.c
 delete mode 100644 stubs/fdset-find-fd.c
 delete mode 100644 stubs/fdset-get-fd.c
 delete mode 100644 stubs/fdset-remove-fd.c
 create mode 100644 stubs/fdset.c
 delete mode 100644 stubs/get-next-serial.c
 delete mode 100644 stubs/iohandler.c
 delete mode 100644 stubs/kvm.c
 delete mode 100644 stubs/migration-colo.c
 delete mode 100644 stubs/mon-is-qmp.c
 delete mode 100644 stubs/monitor-init.c
 rename stubs/{get-fd.c => monitor.c} (75%)
 delete mode 100644 stubs/replay-user.c
 delete mode 100644 stubs/reset.c
 create mode 100644 target/i386/hax-all.c
 create mode 100644 target/i386/hax-darwin.c
 create mode 100644 target/i386/hax-darwin.h
 create mode 100644 target/i386/hax-i386.h
 create mode 100644 target/i386/hax-interface.h
 create mode 100644 target/i386/hax-mem.c
 create mode 100644 target/i386/hax-windows.c
 create mode 100644 target/i386/hax-windows.h
 create mode 100644 user-exec-stub.c

Comments

no-reply@patchew.org Jan. 16, 2017, 5:49 p.m. UTC | #1
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
Peter Maydell Jan. 19, 2017, 1:35 p.m. UTC | #2
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 mbox

Patch

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"