summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* tcg: Increase the highwater reservationRichard Henderson2015-12-011-1/+5
* Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.5-20151130' into...Peter Maydell2015-11-306-79/+41
|\
| * target-ppc/fpu_helper: fix FPSCR_FX bit shift operationMadhavan Srinivasan2015-11-301-11/+11
| * target-ppc: Move the FPSCR bit update macros to cpu.hMadhavan Srinivasan2015-11-302-21/+21
| * hw/ppc/ppc405_boards: Fix infinite recursion by converting taihu_cpld from ol...Peter Maydell2015-11-301-44/+8
| * hw/ppc/spapr: Remove duplicated "pseries" aliasThomas Huth2015-11-301-2/+0
| * mac_dbdma: always initialize channel field in DBDMA_channelHervé Poussineau2015-11-301-1/+1
* | Merge remote-tracking branch 'remotes/weil/tags/pull-wxx-20151130' into stagingPeter Maydell2015-11-304-3/+6
|\ \ | |/ |/|
| * w32: Use gcc option -mthreadsStefan Weil2015-11-301-0/+2
| * oslib-win32: Change return type of function getpagesizeStefan Weil2015-11-302-2/+2
| * trace/simple: Fix warning and wrong trace file name for MinGWStefan Weil2015-11-301-1/+2
|/
* Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into st...Peter Maydell2015-11-272-11/+54
|\
| * tap-win32: disable broken async write pathAndrew Baumann2015-11-271-10/+36
| * tap-win32: skip unexpected nodes during registry enumerationAndrew Baumann2015-11-271-1/+2
| * eepro100: Prevent two endless loopsStefan Weil2015-11-271-0/+16
|/
* Update version for v2.5.0-rc2 releasePeter Maydell2015-11-261-1/+1
* Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into stagingPeter Maydell2015-11-2612-41/+155
|\
| * vhost-user-test: fix migration overlap testMichael S. Tsirkin2015-11-261-5/+8
| * Fix memory leak on errorStefano Dong (董兴水)2015-11-262-0/+2
| * Revert "vhost: send SET_VRING_ENABLE at start/stop"Michael S. Tsirkin2015-11-261-9/+0
| * tests/vhost-user-bridge: read command line argumentsVictor Kaplansky2015-11-251-18/+111
| * tests/vhost-user-bridge: propose GUEST_ANNOUNCE featureVictor Kaplansky2015-11-251-0/+1
| * vhost-user: clarify start and enableMichael S. Tsirkin2015-11-251-5/+15
| * vhost-user: set link down when the char device is closedWen Congyang2015-11-251-1/+1
| * pc: Don't set hw_version on pc-*-2.5Eduardo Habkost2015-11-252-2/+0
| * osdep: Change default value of qemu_hw_version() to "2.5+"Eduardo Habkost2015-11-253-1/+17
* | Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2015-11-26' in...Peter Maydell2015-11-2611-314/+225
|\ \
| * | qjson: Limit number of tokens in addition to total sizeMarkus Armbruster2015-11-261-0/+2
| * | qjson: surprise, allocating 6 QObjects per token is expensivePaolo Bonzini2015-11-263-78/+63
| * | qjson: store tokens in a GQueuePaolo Bonzini2015-11-268-65/+45
| * | qjson: Convert to parser to recursive descentMarkus Armbruster2015-11-261-118/+47
| * | qjson: replace QString in JSONLexer with GStringPaolo Bonzini2015-11-264-22/+18
| * | qjson: Inline token_is_escape() and simplifyMarkus Armbruster2015-11-261-17/+15
| * | qjson: Inline token_is_keyword() and simplifyMarkus Armbruster2015-11-261-13/+7
| * | qjson: Give each of the six structural chars its own token typeMarkus Armbruster2015-11-264-47/+42
| * | qjson: Spell out some silent assumptionsMarkus Armbruster2015-11-262-2/+8
| * | check-qjson: Add test for JSON nesting depth limitMarkus Armbruster2015-11-261-0/+25
| * | qjson: Don't crash when input exceeds nesting limitMarkus Armbruster2015-11-261-2/+3
| * | qjson: Apply nesting limit more sanelyMarkus Armbruster2015-11-261-2/+1
| * | monitor: Plug memory leak on QMP errorMarkus Armbruster2015-11-261-0/+1
* | | Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into stagingPeter Maydell2015-11-268-34/+47
|\ \ \
| * | | target-i386: kvm: Print warning when clearing mcg_cap bitsEduardo Habkost2015-11-261-1/+7
| * | | target-i386: kvm: Use env->mcg_cap when setting up MCEEduardo Habkost2015-11-262-7/+6
| * | | target-i386: kvm: Abort if MCE bank count is not supported by hostEduardo Habkost2015-11-261-3/+6
| * | | virtio-scsi: don't crash without a valid deviceEugene (jno) Dvurechenski2015-11-261-1/+1
| * | | target-sparc: fix 32-bit truncation in fpackfixPaolo Bonzini2015-11-261-1/+1
| * | | exec: remove warning about mempath and hugetlbfsDaniel P. Berrange2015-11-261-3/+0
| * | | Revert "exec: silence hugetlbfs warning under qtest"Daniel P. Berrange2015-11-262-18/+15
| * | | call bdrv_drain_all() even if the vm is stoppedWen Congyang2015-11-261-0/+2
| * | | MAINTAINERS: Update TCG CPU cores sectionPaolo Bonzini2015-11-251-4/+13
OpenPOWER on IntegriCloud