Anthony Liguori 0893d46014 Merge remote-tracking branch 'qemu-kvm/uq/master' into staging ...

* qemu-kvm/uq/master:
  target-i386: kvm: prevent buffer overflow if -cpu foo, [x]level is too big
  vmxcap: bit 9 of VMX_PROCBASED_CTLS2 is 'virtual interrupt delivery'

Conflicts:
	target-i386/kvm.c

Trivial merge resolution due to lack of context.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

2013-01-29 16:57:41 -06:00

..

kvm

vmxcap: bit 9 of VMX_PROCBASED_CTLS2 is 'virtual interrupt delivery'

2013-01-21 23:11:27 -02:00

qemu-guest-agent

qemu-ga: sample fsfreeze hooks

2013-01-08 16:38:12 -06:00

tracetool

build: Use separate makefile for "trace/"

2012-12-23 14:28:02 -06:00

analyse-9p-simpletrace.py

…

check-qerror.sh

…

checkpatch.pl

…

create_config

…

feature_to_c.sh

exec: move include files to include/exec/

2012-12-19 08:31:31 +01:00

get_maintainer.pl

get_maintainer.pl: update from linix 3.8

2012-12-12 23:41:03 +02:00

gtester-cat

…

hxtool

…

make_device_config.sh

make_device_config.sh: Fix target path in generated dependency file

2013-01-26 13:26:29 +00:00

make-release

…

ordereddict.py

…

qapi-commands.py

misc: move include files to include/qemu/

2012-12-19 08:32:39 +01:00

qapi-types.py

qapi: move include files to include/qobject/

2012-12-19 08:31:31 +01:00

qapi-visit.py

qapi: move include files to include/qobject/

2012-12-19 08:31:31 +01:00

qapi.py

qapi: add "unix" to the set of reserved words

2012-09-26 10:45:02 -03:00

qemu-binfmt-conf.sh

…

qemu-gdb.py

…

qtest

…

refresh-pxe-roms.sh

…

signrom.py

…

simpletrace.py

…

texi2pod.pl

…

tracetool.py

…

update-linux-headers.sh

powerpc: linux header sync script includes epapr_hcalls.h

2013-01-07 17:37:09 +01:00