summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into stagingPeter Maydell2015-03-031-2/+1
|\
| * block: Forbid bdrv_set_aio_context outside BQLFam Zheng2015-02-271-2/+1
* | Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2015-02-26' into...Peter Maydell2015-03-031-8/+10
|\ \
| * | qemu-img: Suppress unhelpful extra errors in convert, amendMarkus Armbruster2015-02-261-1/+2
| * | QemuOpts: Drop qemu_opt_set(), rename qemu_opt_set_err(), fix useMarkus Armbruster2015-02-261-3/+2
| * | QemuOpts: Convert qemu_opts_set() to Error, fix its useMarkus Armbruster2015-02-261-2/+2
| * | QemuOpts: Convert qemu_opt_set_number() to Error, fix its useMarkus Armbruster2015-02-261-1/+2
| * | QemuOpts: Convert qemu_opt_set_bool() to Error, fix its useMarkus Armbruster2015-02-261-1/+2
| |/
* | Revert "Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request'...Peter Maydell2015-03-031-134/+0
* | Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into st...Peter Maydell2015-03-021-0/+134
|\ \
| * | target-i386: Move topology.h to include/hw/i386Eduardo Habkost2015-02-251-0/+134
* | | Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter' in...Peter Maydell2015-03-024-27/+6
|\ \ \
| * | | parallel: Factor out common parallel_hds_isa_init()Markus Armbruster2015-02-241-16/+1
| * | | serial: Factor out common serial_hds_isa_init()Markus Armbruster2015-02-241-1/+1
| * | | leon3: Replace unchecked qdev_init() by qdev_init_nofail()Markus Armbruster2015-02-241-9/+3
| * | | qom: Fix typo, 'my_class_init' -> 'derived_class_init'Zhoujian2015-02-161-1/+1
* | | | Merge remote-tracking branch 'remotes/ehabkost/tags/numa-pull-request' into s...Peter Maydell2015-03-022-18/+24
|\ \ \ \ | |_|_|/ |/| | |
| * | | numa: Rename set_numa_modes() to numa_post_machine_init()Eduardo Habkost2015-02-231-1/+1
| * | | numa: Rename option parsing functionsEduardo Habkost2015-02-231-1/+1
| * | | numa: Move QemuOpts parsing to set_numa_nodes()Eduardo Habkost2015-02-231-1/+0
| * | | numa: Make max_numa_nodeid staticEduardo Habkost2015-02-231-3/+0
| * | | numa: Move NUMA declarations from sysemu.h to numa.hEduardo Habkost2015-02-232-18/+28
| |/ /
* | | Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2015-02-18' into...Peter Maydell2015-02-262-2/+6
|\ \ \
| * | | monitor: Clean up around monitor_handle_fd_param()Markus Armbruster2015-02-181-2/+1
| * | | error: New convenience function error_report_err()Markus Armbruster2015-02-181-0/+5
| |/ /
* | | Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2015-02-18' in...Peter Maydell2015-02-2514-40/+30
|\ \ \ | |_|/ |/| |
| * | hmp: Name HMP info handler functions hmp_info_SUBCOMMAND()Markus Armbruster2015-02-189-14/+14
| * | hmp: Name HMP command handler functions hmp_COMMAND()Markus Armbruster2015-02-186-16/+16
| * | hmp: Clean up declarations for long-gone info handlersMarkus Armbruster2015-02-183-10/+0
| |/
* | Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2015-02-16-v2-tag'...Peter Maydell2015-02-251-1/+0
|\ \
| * | utils: drop strtok_r from envlist_parseOlga Krishtal2015-02-161-1/+0
| |/
* | Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into stagingPeter Maydell2015-02-2411-19/+163
|\ \
| * | Convert ram_list to RCUMike Day2015-02-161-4/+2
| * | exec: convert ram_list to QLISTMike Day2015-02-161-2/+2
| * | cosmetic changes preparing for the following patchesMike Day2015-02-161-0/+1
| * | exec: protect mru_block with RCUPaolo Bonzini2015-02-161-0/+2
| * | rcu: add g_free_rcuPaolo Bonzini2015-02-161-0/+8
| * | rcu: introduce RCU-enabled QLISTMike Day2015-02-162-11/+134
| * | exec: RCUify AddressSpaceDispatchPaolo Bonzini2015-02-161-0/+1
| * | exec: make iotlb RCU-friendlyPaolo Bonzini2015-02-163-2/+4
| * | exec: introduce cpu_reload_memory_mapPaolo Bonzini2015-02-161-0/+1
| * | pci: split shpc_cleanup and shpc_freePaolo Bonzini2015-02-161-0/+1
| * | vhost-scsi: add a property for bootingGonglei2015-02-112-0/+2
| * | vhost-scsi: expose the TYPE_FW_PATH_PROVIDER interfaceGonglei2015-02-111-0/+3
| * | vhost-scsi: add bootindex propertyGonglei2015-02-111-0/+1
| * | qdev: support to get a device firmware path directlyGonglei2015-02-111-0/+1
* | | Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into ...Peter Maydell2015-02-247-19/+94
|\ \ \
| * | | block: Remove "growable" from BDSMax Reitz2015-02-161-3/+0
| * | | qemu-io: Use BlockBackendMax Reitz2015-02-161-2/+2
| * | | block: Add Error parameter to bdrv_find_protocol()Max Reitz2015-02-161-1/+2
OpenPOWER on IntegriCloud