Commit 277d44f5 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-fetch' into staging 



trivial patches for 2016-10-28

# gpg: Signature made Fri 28 Oct 2016 16:17:51 BST
# gpg:                using RSA key 0x701B4F6B1A693E59
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg:                 aka "Michael Tokarev <mjt@corpit.ru>"
# gpg:                 aka "Michael Tokarev <mjt@debian.org>"
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D  4324 457C E0A0 8044 65C5
#      Subkey fingerprint: 7B73 BAD6 8BE7 A2C2 8931  4B22 701B 4F6B 1A69 3E59

* remotes/mjt/tags/trivial-patches-fetch: (23 commits)
  Fix build for less common build directories names
  clean-up: removed duplicate #includes
  scripts/clean-includes: added duplicate #include check
  monitor: deprecate 'default' option
  qemu-ga: Remove stray 'q' in documentation
  Makefile: Fix help text for target 'installer'
  s390: avoid always-true comparison in s390_pci_generate_fid()
  migration: Remove unneeded NULL check from migrate_fd_error()
  scripts/hxtool: fix undefined behavour of echo
  qemu-options.hx: set: fix copy-paste error
  usb: Change *_exitfn return type from int to void
  MAINTAINERS: qemu-trivial information
  colo-compare: remove unused struct CompareChardevProps and 'props' variable
  milkymist-pfpu: fix potential integer overflow
  hw/block/nvme: Simplify if-statements a little bit
  target-lm32: rewrite gen_compare()
  lm32: milkymist-tmu2: fix integer overflow
  target-lm32: disable asm logging via LOG_DIS()
  target-lm32: swap operand of wcsr in LOG_DIS()
  target-lm32: fix LOG_DIS operand order
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 4178c782 630b210b

MAINTAINERS

+11 −0
Original line number Diff line number Diff line
@@ -63,6 +63,17 @@ W: http://wiki.qemu.org/SecurityProcess 
M: Michael S. Tsirkin <mst@redhat.com>

L: secalert@redhat.com



Trivial patches

---------------

Trivial patches

M: Michael Tokarev <mjt@tls.msk.ru>

M: Laurent Vivier <laurent@vivier.eu>

S: Maintained

L: qemu-trivial@nongnu.org

K: ^Subject:.*(?i)trivial

T: git git://git.corpit.ru/qemu.git trivial-patches

T: git git://github.com/vivier/qemu.git trivial-patches



Guest CPU cores (TCG):

----------------------

Overall

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -695,7 +695,7 @@ help: 
	@echo  ''

ifdef CONFIG_WIN32

	@echo  'Windows targets:'

	@echo  '  installer       - Build NSIS-based installer for qemu-ga'

	@echo  '  installer       - Build NSIS-based installer for QEMU'

ifdef QEMU_GA_MSI_ENABLED

	@echo  '  msi             - Build MSI-based installer for qemu-ga'

endif

accel.c

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
#include "sysemu/qtest.h"

#include "hw/xen/xen.h"

#include "qom/object.h"

#include "hw/boards.h"



int tcg_tb_size;

static bool tcg_allowed = true;

cputlb.c

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include "exec/cputlb.h"

#include "exec/memory-internal.h"

#include "exec/ram_addr.h"

#include "exec/exec-all.h"

#include "tcg/tcg.h"

#include "qemu/error-report.h"

#include "exec/log.h"

gdbstub.c

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 


#define MAX_PACKET_LENGTH 4096



#include "cpu.h"

#include "qemu/sockets.h"

#include "sysemu/kvm.h"

#include "exec/semihost.h"