Commit 2e6ae666 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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

# By Stefan Weil (8) and others
# Via Michael Tokarev
* mjt/trivial-patches:
  tests/.gitignore: ignore test-throttle
  exec: Fix broken build for MinGW (regression)
  kvm: Fix compiler warning (clang)
  tcg-sparc: Fix parenthesis warning
  Makefile: Remove some more files when cleaning
  target-i386: Fix segment cache dump
  iov: avoid "orig_len may be used unitialized" warning
  vscclient: remove unnecessary use of uninitialized variable
  trace-events: Clean up with scripts/cleanup-trace-events.pl again
  tci: Fix qemu-alpha on 32 bit hosts (wrong assertions)
  *-user: Improve documentation for lock_user function
  MAINTAINERS: Add missing entry to filelist for TCI target
  translate-all: Fix formatting of dump output
  *-user: Fix typo in comment (ulocking -> unlocking)
  docs: Fix IO port number for CPU present bitmap.
  q35: Fix typo in constant DEFUALT -> DEFAULT.
  configure: Undefine _FORTIFY_SOURCE prior using it

Message-id: 1379696296-32105-1-git-send-email-mjt@msgid.tls.msk.ru
parents 3e4be9c2 7a1c0d20

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -848,6 +848,7 @@ TCI target 
M: Stefan Weil <sw@weilnetz.de>

S: Maintained

F: tcg/tci/

F: tci.c



Stable branches

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

Makefile

+3 −1
Original line number Diff line number Diff line
@@ -236,7 +236,8 @@ clean: 
	find . -name '*.[oda]' -type f -exec rm -f {} +

	find . -name '*.l[oa]' -type f -exec rm -f {} +

	rm -f $(filter-out %.tlb,$(TOOLS)) $(HELPERS-y) qemu-ga TAGS cscope.* *.pod *~ */*~

	rm -Rf .libs

	rm -f fsdev/*.pod

	rm -rf .libs */.libs

	rm -f qemu-img-cmds.h

	@# May not be present in GENERATED_HEADERS

	rm -f trace/generated-tracers-dtrace.dtrace*
@@ -261,6 +262,7 @@ qemu-%.tar.bz2: 
distclean: clean

	rm -f config-host.mak config-host.h* config-host.ld $(DOCS) qemu-options.texi qemu-img-cmds.texi qemu-monitor.texi

	rm -f config-all-devices.mak config-all-disas.mak

	rm -f po/*.mo

	rm -f roms/seabios/config.mak roms/vgabios/config.mak

	rm -f qemu-doc.info qemu-doc.aux qemu-doc.cp qemu-doc.cps qemu-doc.dvi

	rm -f qemu-doc.fn qemu-doc.fns qemu-doc.info qemu-doc.ky qemu-doc.kys

bsd-user/qemu.h

+3 −3
Original line number Diff line number Diff line
@@ -323,9 +323,9 @@ abi_long copy_from_user(void *hptr, abi_ulong gaddr, size_t len); 
abi_long copy_to_user(abi_ulong gaddr, void *hptr, size_t len);



/* Functions for accessing guest memory.  The tget and tput functions

   read/write single values, byteswapping as necessary.  The lock_user

   read/write single values, byteswapping as necessary.  The lock_user function

   gets a pointer to a contiguous area of guest memory, but does not perform

   and byteswapping.  lock_user may return either a pointer to the guest

   any byteswapping.  lock_user may return either a pointer to the guest

   memory, or a temporary buffer.  */



/* Lock an area of guest memory into the host.  If copy is true then the
@@ -381,7 +381,7 @@ static inline void *lock_user_string(abi_ulong guest_addr) 
    return lock_user(VERIFY_READ, guest_addr, (long)(len + 1), 1);

}



/* Helper macros for locking/ulocking a target struct.  */

/* Helper macros for locking/unlocking a target struct.  */

#define lock_user_struct(type, host_ptr, guest_addr, copy)      \

    (host_ptr = lock_user(type, guest_addr, sizeof(*host_ptr), copy))

#define unlock_user_struct(host_ptr, guest_addr, copy)          \

configure

+1 −1
Original line number Diff line number Diff line
@@ -3515,7 +3515,7 @@ if test "$gcov" = "yes" ; then 
  CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS"

  LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS"

elif test "$debug" = "no" ; then

  CFLAGS="-O2 -D_FORTIFY_SOURCE=2 $CFLAGS"

  CFLAGS="-O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $CFLAGS"

fi

docs/specs/acpi_cpu_hotplug.txt

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ ACPI GPE block (IO ports 0xafe0-0xafe3, byte access): 
Generic ACPI GPE block. Bit 2 (GPE.2) used to notify CPU

hot-add/remove event to ACPI BIOS, via SCI interrupt.



CPU present bitmap (IO port 0xaf00-0xae1f, 1-byte access):

CPU present bitmap (IO port 0xaf00-0xaf1f, 1-byte access):

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

One bit per CPU. Bit position reflects corresponding CPU APIC ID.

Read-only.