summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'a75bfc5fdda8b87ff969d68e020ffdf1008751b1' into upstream-mergeAvi Kivity2012-05-061-7/+15
|\
| * Beautify makefile commands for generation of files with tracetoolLluís Vilanova2012-04-251-7/+15
| * tracetool: Rewrite infrastructure as python modulesLluís Vilanova2012-04-181-3/+3
| * Merge commit 'ff71f2e8cacefae99179993204172bc65e4303df' into stagingAnthony Liguori2012-04-101-1/+3
| |\
* | \ Merge commit '4eb812f7603f57dc63f6b74e3c464a60ed5bc91b' into upstream-mergeAvi Kivity2012-05-061-1/+3
|\ \ \ | | |/ | |/|
| * | pci: add standard bridge deviceMichael S. Tsirkin2012-03-161-1/+1
| * | slotid: add slot id capabilityMichael S. Tsirkin2012-03-161-0/+1
| * | shpc: standard hot plug controllerMichael S. Tsirkin2012-03-161-0/+1
* | | Merge commit '12bde0eed6b740787bca2c998a838b20c556d0ec' into upstream-mergeAvi Kivity2012-05-061-0/+1
|\ \ \ | | |/ | |/|
| * | target-lm32: add simple disassemblerMichael Walle2012-04-011-0/+1
* | | Merge commit 'c7f0f3b1c826901358a0656f80a5fabb88f73c61' into upstream-mergeAvi Kivity2012-05-061-0/+2
|\| |
| * | qtest: add test frameworkAnthony Liguori2012-03-301-0/+2
| |/
* | Merge commit '92e4b519e0808948ae4bc710fb1db7d3cc2245a1' into upstream-mergeAvi Kivity2012-05-061-0/+3
|\|
| * qom: Introduce CPU classAndreas Färber2012-03-141-0/+3
* | qemu-kvm: Switch to upstream in-kernel KVM PITJan Kiszka2012-04-241-2/+1
* | Merge commit '9e4dd565b46749d5e6d5cf87bfd84f1917c68319' into queues/qemu-mergeJan Kiszka2012-04-101-16/+35
|\|
| * Merge remote-tracking branch 'kraxel/usb.44' into stagingAnthony Liguori2012-03-131-11/+13
| |\
| | * usb: the big renameGerd Hoffmann2012-03-131-11/+13
| * | qom: Add QOM support to user emulatorsAndreas Färber2012-03-131-5/+18
| |/
| * coroutine: adding configure option for sigaltstack coroutine backendAlex Barcelo2012-03-121-0/+4
* | Merge commit 'd11e859e4afe9b8b12f4478ab4ae3204d2d665ce' into queues/qemu-mergeJan Kiszka2012-04-101-1/+1
|\|
| * i8254: Factor out base class for KVM reuseJan Kiszka2012-03-071-1/+1
* | qemu-kvm: i8254/pcspk: Remove unused bits to make PC speaker kvm-awareJan Kiszka2012-03-211-1/+1
* | qemu-kvm: Use upstream kvm-i8259Jan Kiszka2012-03-071-1/+1
* | Merge commit '355bf2e5bac7be1b7516e88307f5507e74e8ce79' into upstream-mergeAvi Kivity2012-02-291-3/+5
|\|
| * qemu-ga: add Windows service integrationMichael Roth2012-02-231-1/+1
| * qemu-ga: add initial win32 supportMichael Roth2012-02-231-1/+1
| * qemu-ga: fixes for win32 build of qemu-gaMichael Roth2012-02-231-4/+5
| * qemu-ga: rename guest-agent-commands.c -> commands-posix.cMichael Roth2012-02-231-1/+1
| * qemu-ga: separate out common commands from posix-specific onesMichael Roth2012-02-231-1/+1
| * qemu-ga: move channel/transport functionality into wrapper classMichael Roth2012-02-231-0/+1
* | Merge commit '78207d80a3d4ed80bca57a67a195a18cc70153bb' into upstream-mergeAvi Kivity2012-02-291-0/+1
|\|
| * jazz-led: compile it only twiceHervé Poussineau2012-02-221-0/+1
* | Merge commit 'cbc5b5f3aabb2579dd1aa88612dd6842de485079' into upstream-mergeAvi Kivity2012-02-291-2/+3
|\|
| * qapi: add string-based visitorsPaolo Bonzini2012-02-211-2/+3
* | Merge commit '57c83dacfe179bf061b8fa79d9553ebabe4d2ff4' into upstream-mergeMarcelo Tosatti2012-02-111-2/+0
|\|
| * make: Remove duplicate use of GLIB_CFLAGSStefan Weil2012-02-091-2/+0
* | Merge commit 'a3d4a1b0479414fc4d59368a0635640979a9e4d2' into upstream-mergeMarcelo Tosatti2012-02-111-2/+2
|\|
| * container: make a decendent of ObjectAnthony Liguori2012-02-031-1/+1
| * qdev: split out UI portions into a new functionAnthony Liguori2012-02-031-1/+1
* | Merge commit '32fea4025bfb80f2dbc5c3ce415703af28d85f63' into queues/qemu-mergeJan Kiszka2012-01-271-0/+6
|\|
| * qom: add the base Object class (v2)Anthony Liguori2012-01-271-0/+3
| * block: add image streaming block jobStefan Hajnoczi2012-01-261-0/+1
| * coroutine: add co_sleep_ns() coroutine sleep functionStefan Hajnoczi2012-01-261-0/+1
| * vga: compile cirrus_vga in hwlibBlue Swirl2012-01-251-0/+1
* | Merge commit '5b4448d27d7c6ff6e18a1edc8245cb1db783e37c' into queues/qemu-mergeJan Kiszka2012-01-271-0/+2
|\|
| * Merge remote-tracking branch 'qemu-kvm/uq/master' into stagingAnthony Liguori2012-01-231-1/+1
| |\
| * | prep: Add i82378 PCI-to-ISA bridge emulationAndreas Färber2012-01-201-0/+1
| * | prep: Add i82374 DMA emulationAndreas Färber2012-01-201-0/+1
* | | Merge commit '512709f559dce1690fa89fe2a67a8e1984cd3895' into queues/qemu-mergeJan Kiszka2012-01-271-1/+1
|\ \ \ | | |/ | |/|