Skip to content

Qemu#31

Open
pkufergus wants to merge 40 commits into
masterfrom
qemu
Open

Qemu#31
pkufergus wants to merge 40 commits into
masterfrom
qemu

Conversation

@pkufergus
Copy link
Copy Markdown

No description provided.

Conflicts:
	qemu/VERSION
	qemu/configure
	qemu/cpu-all.h
	qemu/cpu-exec.c
	qemu/cpus.c
	qemu/exec.c
	qemu/hmp-commands.hx
	qemu/hw/ide/ahci.c
	qemu/hw/ide/ahci.h
	qemu/hw/ide/core.c
	qemu/hw/ide/ich.c
	qemu/hw/lsi53c895a.c
	qemu/hw/mips_fulong2e.c
	qemu/hw/mips_malta.c
	qemu/hw/pc.c
	qemu/hw/ppc_prep.c
	qemu/hw/virtio-balloon.c
	qemu/linux-user/elfload.c
	qemu/qemu-common.h
	qemu/qemu-timer.c
	qemu/qerror.c
	qemu/qerror.h
	qemu/target-arm/translate.c
	qemu/target-i386/cpu.h
	qemu/target-i386/helper.c
	qemu/ui/vnc.c
	qemu/vl.c

Signed-off-by: Avadh Patel <avadh4all@gmail.com>
Signed-off-by: Avadh Patel <avadh4all@gmail.com>
Now compilation process check for KVM_FEATURE_ASYNC_PF feature to enable KVM
in Marss.

Signed-off-by: Avadh Patel <avadh4all@gmail.com>
Conflicts:
	qemu/cpu-exec.c

Signed-off-by: Avadh Patel <avadh4all@gmail.com>
Use provided linux headers in qemu directory for KVM parameters check.

Signed-off-by: Avadh Patel <avadh4all@gmail.com>
Conflicts:
	qemu/target-i386/op_helper.c

Signed-off-by: Avadh Patel <avadh4all@gmail.com>
Signed-off-by: Avadh Patel <avadh4all@gmail.com>
Conflicts:
	qemu/cpus.c

Signed-off-by: Avadh Patel <avadh4all@gmail.com>
avadhpatel and others added 10 commits April 12, 2012 16:16
Signed-off-by: Avadh Patel <avadh4all@gmail.com>
QEMU's git commit id: b7093f294c330c4db789c077dac9d8611e4f8ee0

This huge change merges from QEMU's latest release 1.1. In order to comply with
the latest changes from QEMU, MARSS's simulation CPU Context now maintain an
'env' pointer instead of inhearting from QEMU's CPU Context structure. Other
than this change, most of the changes in this patch are related to merge
issues.

Signed-off-by: Avadh Patel <avadh4all@gmail.com>
Prevent scons from quoting the CCFLAGS, which causes the build to
fail. Also remove '-mtune=native' from the CCFLAGS, as it is
implied with '-march=native'.
Fix potential build issues.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants