openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
qemu/tests/libqos
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
..
ahci.c ide: Clean up includes 2016-01-29 15:07:23 +00:00
ahci.h all: Clean up includes 2016-02-23 12:43:05 +00:00
fw_cfg.c tests: Clean up includes 2016-02-16 14:29:27 +00:00
fw_cfg.h all: Clean up includes 2016-02-23 12:43:05 +00:00
i2c-imx.c tests: Clean up includes 2016-02-16 14:29:27 +00:00
i2c-omap.c tests: Clean up includes 2016-02-16 14:29:27 +00:00
i2c.c tests: Clean up includes 2016-02-16 14:29:27 +00:00
i2c.h all: Clean up includes 2016-02-23 12:43:05 +00:00
libqos-pc.c tests: Clean up includes 2016-02-16 14:29:27 +00:00
libqos-pc.h qtest/ahci: Allow override of default CLI options 2015-04-28 15:27:51 -04:00
libqos.c tests: Clean up includes 2016-02-16 14:29:27 +00:00
libqos.h libqos: add qemu-img presence check 2015-11-13 14:31:42 -05:00
malloc-generic.c tests: Clean up includes 2016-02-16 14:29:27 +00:00
malloc-generic.h libqos: Add malloc generic 2015-03-10 14:02:20 +01:00
malloc-pc.c fw_cfg: Split fw_cfg_keys.h off fw_cfg.h 2016-03-22 22:20:16 +01:00
malloc-pc.h libqos: Convert malloc-pc allocator to a generic allocator 2015-01-13 11:47:57 +00:00
malloc.c tests: Clean up includes 2016-02-16 14:29:27 +00:00
malloc.h all: Clean up includes 2016-02-23 12:43:05 +00:00
pci-pc.c tests/libqos/pci-pc: Fix qpci_pc_iomap() to map BARs aligned 2016-03-21 21:28:59 +01:00
pci-pc.h libqos: Fixes a small memory leak. 2014-08-15 18:03:13 +01:00
pci.c tests: Clean up includes 2016-02-16 14:29:27 +00:00
pci.h all: Clean up includes 2016-02-23 12:43:05 +00:00
usb.c tests: Clean up includes 2016-02-16 14:29:27 +00:00
usb.h tests: usb: Generic usb device hotplug 2014-10-15 05:03:13 +02:00
virtio-mmio.c tests: Clean up includes 2016-02-16 14:29:27 +00:00
virtio-mmio.h libqos: Add virtio MMIO support 2015-03-10 14:02:20 +01:00
virtio-pci.c tests: Clean up includes 2016-02-16 14:29:27 +00:00
virtio-pci.h libqos: Remove PCI assumptions in constants of virtio driver 2015-03-10 14:02:20 +01:00
virtio.c tests: Clean up includes 2016-02-16 14:29:27 +00:00
virtio.h libqos: Complete virtio device ID definition list 2015-06-17 16:03:47 +02:00