OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity
qemu-e2k/hw/misc
History
Peter Maydell 84a5a80148 * Log filtering from Alex and Peter 
* Chardev fix from Marc-André
 * config.status tweak from David
 * Header file tweaks from Markus, myself and Veronia (Outreachy candidate)
 * get_ticks_per_sec() removal from Rutuja (Outreachy candidate)
 * Coverity fix from myself
 * PKE implementation from myself, based on rth's XSAVE support
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQEcBAABCAAGBQJW9ErPAAoJEL/70l94x66DJfEH/A/QkMpAhrgNdyVsahzsGrzE
 wx5gHFIc1nBYxyr62w4apUb5jPB7zaXu0LA7EAWDeAe0pyP8hZzLT9kJyOEDsuJu
 zwKN2QeLSNMtPbnbKN0I/YQ2za2xX1V5ruhSeOJoVslUI214hgnAURaGshhQNzuZ
 2CluDT9KgL5cQifAnKs5kJrwhIYShYNQB+1eDC/7wk28dd/EH+sPALIoF+rqrSmt
 Zu4Mdqd+9Ns+oKOjA6br9ULq/Hzg0aDfY82J+XLVVqfF3PXQe8rTDmuMf/7jTn+M
 Un7ZOcei9oZF2/9vfAfKQpDCcgD9HvOUSbgqV/ubmkPPmN/LNJzeKj0fBhrRN+Y=
 =K12D
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging

* Log filtering from Alex and Peter
* Chardev fix from Marc-André
* config.status tweak from David
* Header file tweaks from Markus, myself and Veronia (Outreachy candidate)
* get_ticks_per_sec() removal from Rutuja (Outreachy candidate)
* Coverity fix from myself
* PKE implementation from myself, based on rth's XSAVE support

# gpg: Signature made Thu 24 Mar 2016 20:15:11 GMT using RSA key ID 78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"

* remotes/bonzini/tags/for-upstream: (28 commits)
  target-i386: implement PKE for TCG
  config.status: Pass extra parameters
  char: translate from QIOChannel error to errno
  exec: fix error handling in file_ram_alloc
  cputlb: modernise the debug support
  qemu-log: support simple pid substitution for logs
  target-arm: dfilter support for in_asm
  qemu-log: dfilter-ise exec, out_asm, op and opt_op
  qemu-log: new option -dfilter to limit output
  qemu-log: Improve the "exec" TB execution logging
  qemu-log: Avoid function call for disabled qemu_log_mask logging
  qemu-log: correct help text for -d cpu
  tcg: pass down TranslationBlock to tcg_code_gen
  util: move declarations out of qemu-common.h
  Replaced get_tick_per_sec() by NANOSECONDS_PER_SECOND
  hw: explicitly include qemu-common.h and cpu.h
  include/crypto: Include qapi-types.h or qemu/bswap.h instead of qemu-common.h
  isa: Move DMA_transfer_handler from qemu-common.h to hw/isa/isa.h
  Move ParallelIOArg from qemu-common.h to sysemu/char.h
  Move QEMU_ALIGN_*() from qemu-common.h to qemu/osdep.h
  ...

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Conflicts:
	scripts/clean-includes
 		2016-03-24 21:42:40 +00:00
..
macio util: move declarations out of qemu-common.h 2016-03-22 22:20:17 +01:00
Makefile.objs i.MX: Add i.MX6 CCM and ANALOG device. 2016-03-16 17:42:18 +00:00
a9scu.c arm: Clean up includes 2016-01-29 15:07:23 +00:00
applesmc.c hw/misc: Clean up includes 2016-01-29 15:07:24 +00:00
arm11scu.c arm: Clean up includes 2016-01-29 15:07:23 +00:00
arm_integrator_debug.c hw/misc: Clean up includes 2016-01-29 15:07:24 +00:00
arm_l2x0.c hw/misc: Clean up includes 2016-01-29 15:07:24 +00:00
arm_sysctl.c Replaced get_tick_per_sec() by NANOSECONDS_PER_SECOND 2016-03-22 22:20:17 +01:00
bcm2835_mbox.c include/qemu/osdep.h: Don't include qapi/error.h 2016-03-22 22:20:15 +01:00
bcm2835_property.c include/qemu/osdep.h: Don't include qapi/error.h 2016-03-22 22:20:15 +01:00
cbus.c include/hw/hw.h: Don't include qemu-common.h 2016-03-22 22:20:16 +01:00
debugexit.c x86: Clean up includes 2016-01-29 15:07:22 +00:00
eccmemctl.c hw/misc: Clean up includes 2016-01-29 15:07:24 +00:00
edu.c qom: Swap 'name' next to visitor in ObjectPropertyAccessor 2016-02-08 17:29:56 +01:00
exynos4210_pmu.c arm: Clean up includes 2016-01-29 15:07:23 +00:00
hyperv_testdev.c hw/misc: Clean up includes 2016-01-29 15:07:24 +00:00
imx6_ccm.c i.MX: Add i.MX6 CCM and ANALOG device. 2016-03-16 17:42:18 +00:00
imx25_ccm.c i.MX: Add the CLK_IPG_HIGH clock 2016-03-16 17:42:18 +00:00
imx31_ccm.c i.MX: Add the CLK_IPG_HIGH clock 2016-03-16 17:42:18 +00:00
imx_ccm.c arm: Clean up includes 2016-01-29 15:07:23 +00:00
ivshmem.c * Log filtering from Alex and Peter 2016-03-24 21:42:40 +00:00
max111x.c hw/misc: Clean up includes 2016-01-29 15:07:24 +00:00
milkymist-hpdmc.c lm32: Clean up includes 2016-01-29 15:07:22 +00:00
milkymist-pfpu.c lm32: Clean up includes 2016-01-29 15:07:22 +00:00
mst_fpga.c hw/misc: Clean up includes 2016-01-29 15:07:24 +00:00
omap_clk.c hw/misc: Clean up includes 2016-01-29 15:07:24 +00:00
omap_gpmc.c hw/misc: Clean up includes 2016-01-29 15:07:24 +00:00
omap_l4.c hw/misc: Clean up includes 2016-01-29 15:07:24 +00:00
omap_sdrc.c hw/misc: Clean up includes 2016-01-29 15:07:24 +00:00
omap_tap.c hw/misc: Clean up includes 2016-01-29 15:07:24 +00:00
pc-testdev.c x86: Clean up includes 2016-01-29 15:07:22 +00:00
pci-testdev.c pci: Clean up includes 2016-01-29 15:07:24 +00:00
puv3_pm.c unicore: Clean up includes 2016-01-29 15:07:22 +00:00
pvpanic.c hw/misc: Clean up includes 2016-01-29 15:07:24 +00:00
sga.c x86: Clean up includes 2016-01-29 15:07:22 +00:00
slavio_misc.c hw/misc: Clean up includes 2016-01-29 15:07:24 +00:00
stm32f2xx_syscfg.c hw/misc: Clean up includes 2016-01-29 15:07:24 +00:00
tmp105.c include/qemu/osdep.h: Don't include qapi/error.h 2016-03-22 22:20:15 +01:00
tmp105.h
…
vmport.c hw/misc: Clean up includes 2016-01-29 15:07:24 +00:00
zynq-xadc.c hw/misc: Clean up includes 2016-01-29 15:07:24 +00:00
zynq_slcr.c arm: Clean up includes 2016-01-29 15:07:23 +00:00