aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'e61ab1da7e98357da47c54d8f893b9bd6ff2f7f9' into upstream-mergeAvi Kivity2012-05-061-39/+2
|\
| * cputlb: move TLB handling to a separate fileBlue Swirl2012-05-011-1/+1
| * Merge branch 'cocoa-for-upstream' of git://repo.or.cz/qemu/afaerberBlue Swirl2012-05-011-28/+0
| |\
| | * Drop darwin-userAndreas Färber2012-05-011-28/+0
| * | Merge branch 'qom-cpu-rest.v1' of git://github.com/afaerber/qemu-cpuBlue Swirl2012-05-011-10/+1
| |\ \ | | |/ | |/|
| | * Makefile: Simplify compilation of target-*/cpu.cAndreas Färber2012-04-301-15/+1
| | * target-mips: QOM'ify CPUAndreas Färber2012-04-301-0/+3
| | * target-m68k: QOM'ify CPUAndreas Färber2012-04-301-0/+1
| | * target-sh4: QOM'ify CPUAndreas Färber2012-04-301-0/+1
* | | Merge commit 'a75bfc5fdda8b87ff969d68e020ffdf1008751b1' into upstream-mergeAvi Kivity2012-05-061-9/+18
|\| |
| * | Beautify makefile commands for generation of files with tracetoolLluís Vilanova2012-04-251-2/+2
| |/
| * config-host.mak: rename datadir to qemu_datadirEduardo Habkost2012-04-241-2/+2
| * target-microblaze: QOM'ify CPUAndreas Färber2012-04-241-0/+1
| * target-cris: QOM'ify CPUAndreas Färber2012-04-241-0/+1
| * Merge remote-tracking branch 'origin/master' into stagingAnthony Liguori2012-04-231-0/+1
| |\
| | * realview: break out versatile i2c controller codeOskar Andero2012-04-201-0/+1
| * | tracetool: Rewrite infrastructure as python modulesLluís Vilanova2012-04-181-6/+7
| |/
| * Merge remote-tracking branch 'sstabellini/for_anthony' into stagingAnthony Liguori2012-04-161-1/+1
| |\
| | * Xen: Add xen-apic support and hook it up.Wei Liu2012-04-131-1/+1
| * | target-alpha: QOM'ify CPUAndreas Färber2012-04-151-0/+1
| * | target-xtensa: add dc233c coreMax Filippov2012-04-151-0/+1
| * | Merge branch 'xtensa' of git://jcmvbkbc.spb.ru/dumb/qemu-xtensaBlue Swirl2012-04-141-0/+1
| |\ \
| | * | target-xtensa: QOM'ify CPUAndreas Färber2012-04-141-0/+1
| | |/
| * | Merge branch 'arm-devs.for-upstream' of git://git.linaro.org/people/pmaydell/...Blue Swirl2012-04-141-0/+1
| |\ \ | | |/ | |/|
| | * hw/arm_gic: Make the GIC its own sysbus devicePeter Maydell2012-04-131-0/+1
| * | target-lm32: QOM'ify CPUAndreas Färber2012-04-121-0/+1
| |/
* | Merge commit 'b3c09bde4842f1b157bc4431135aad4f2031e312' into upstream-mergeAvi Kivity2012-05-061-1/+1
|\|
| * target-i386: Rename cpuid.cAndreas Färber2012-04-101-1/+1
* | Merge commit '56f9107e439c32aa00d58d117a9b664551328f1e' into upstream-mergeAvi Kivity2012-05-061-1/+1
|\|
| * target-sparc: Rename cpu_init.cAndreas Färber2012-04-071-1/+1
* | Merge commit '12bde0eed6b740787bca2c998a838b20c556d0ec' into upstream-mergeAvi Kivity2012-05-061-1/+4
|\|
| * target-s390x: QOM'ify CPUAndreas Färber2012-04-041-0/+1
| * Merge remote-tracking branch 'stefanha/tracing' into stagingAnthony Liguori2012-04-021-1/+1
| |\
| | * Makefile.target: code stp dependency on trace-eventsAlon Levy2012-03-301-1/+1
| * | Merge branch 'qom-cpu-unicore32.v3' of git://github.com/afaerber/qemu-cpuBlue Swirl2012-03-311-0/+1
| |\ \
| | * | target-unicore32: QOM'ify CPUAndreas Färber2012-03-301-0/+1
| | |/
| * / target-arm: Minimalistic CPU QOM'ificationAndreas Färber2012-03-291-0/+1
| |/
* | Merge commit 'c7f0f3b1c826901358a0656f80a5fabb88f73c61' into upstream-mergeAvi Kivity2012-05-061-4/+13
|\|
| * target-alpha: Move memory helpers to mem_helper.c.Richard Henderson2012-03-241-1/+3
| * target-alpha: Move palcode support helpers to sys_helper.c.Richard Henderson2012-03-241-1/+1
| * target-alpha: Move floating-point helpers to fpu_helper.c.Richard Henderson2012-03-241-1/+1
| * target-alpha: Move integer helpers to int_helper.c.Richard Henderson2012-03-241-0/+1
| * get rid of CONFIG_VIRTIO_SCSIPaolo Bonzini2012-03-191-1/+1
| * Sparc: avoid AREG0 wrappers for memory access helpersBlue Swirl2012-03-181-3/+9
| * Sparc: avoid AREG0 for memory access helpersBlue Swirl2012-03-181-1/+1
* | qemu-kvm: Switch to upstream in-kernel KVM PITJan Kiszka2012-04-241-2/+0
* | Merge commit '9e4dd565b46749d5e6d5cf87bfd84f1917c68319' into queues/qemu-mergeJan Kiszka2012-04-101-1/+5
|\|
| * Merge remote-tracking branch 'kraxel/usb.44' into stagingAnthony Liguori2012-03-131-1/+1
| |\
| | * usb: the big renameGerd Hoffmann2012-03-131-1/+1
| * | qom: Add QOM support to user emulatorsAndreas Färber2012-03-131-0/+4
| |/