summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2015-02-26' into...Peter Maydell2015-03-0321-240/+284
|\
| * qtest: Use qemu_opt_set() instead of qemu_opts_parse()Markus Armbruster2015-02-261-7/+4
| * pc: Use qemu_opt_set() instead of qemu_opts_parse()Markus Armbruster2015-02-261-8/+3
| * qemu-sockets: Simplify setting numeric and boolean optionsMarkus Armbruster2015-02-261-9/+7
| * block: Simplify setting numeric optionsMarkus Armbruster2015-02-262-10/+7
| * qemu-img: Suppress unhelpful extra errors in convert, amendMarkus Armbruster2015-02-265-22/+40
| * QemuOpts: Propagate errors through opts_parse()Markus Armbruster2015-02-261-9/+20
| * QemuOpts: Propagate errors through opts_do_parse()Markus Armbruster2015-02-261-8/+17
| * QemuOpts: Drop qemu_opt_set(), rename qemu_opt_set_err(), fix useMarkus Armbruster2015-02-2618-131/+131
| * block: Suppress unhelpful extra errors in bdrv_img_create()Markus Armbruster2015-02-261-2/+5
| * qemu-img: Suppress unhelpful extra errors in convert, resizeMarkus Armbruster2015-02-261-4/+12
| * QemuOpts: Convert qemu_opts_set() to Error, fix its useMarkus Armbruster2015-02-265-18/+22
| * QemuOpts: Convert qemu_opt_set_number() to Error, fix its useMarkus Armbruster2015-02-269-22/+25
| * QemuOpts: Convert qemu_opt_set_bool() to Error, fix its useMarkus Armbruster2015-02-266-18/+19
* | Revert "Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request'...Peter Maydell2015-03-039-103/+113
* | Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into st...Peter Maydell2015-03-029-113/+103
|\ \
| * | target-i386: Move APIC ID compatibility code to pc.cEduardo Habkost2015-02-252-34/+35
| * | target-i386: Require APIC ID to be explicitly set before CPU realizeEduardo Habkost2015-02-252-2/+7
| * | target-i386: Set APIC ID using cpu_index on CONFIG_USEREduardo Habkost2015-02-251-0/+6
| * | linux-user: Check for cpu_init() errorsEduardo Habkost2015-02-251-1/+8
| * | target-i386: Move CPUX86State.cpuid_apic_id to X86CPU.apic_idEduardo Habkost2015-02-254-11/+10
| * | target-i386: Simplify error handling on cpu_x86_init_user()Eduardo Habkost2015-02-251-9/+11
| * | target-i386: Eliminate cpu_init() functionEduardo Habkost2015-02-252-12/+6
| * | target-i386: Rename cpu_x86_init() to cpu_x86_init_user()Eduardo Habkost2015-02-252-3/+3
| * | target-i386: Move topology.h to include/hw/i386Eduardo Habkost2015-02-254-7/+5
| * | target-i386: Eliminate unnecessary get_cpuid_vendor() functionEduardo Habkost2015-02-251-14/+6
| * | target-i386: Simplify listflags() functionEduardo Habkost2015-02-251-28/+14
* | | Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter' in...Peter Maydell2015-03-0215-91/+73
|\ \ \
| * | | parallel: parallel_hds_isa_init() shouldn't failMarkus Armbruster2015-02-241-9/+3
| * | | parallel: Factor out common parallel_hds_isa_init()Markus Armbruster2015-02-246-34/+37
| * | | serial: serial_hds_isa_init() shouldn't failMarkus Armbruster2015-02-241-9/+3
| * | | serial: Factor out common serial_hds_isa_init()Markus Armbruster2015-02-248-30/+22
| * | | etsec: Replace qdev_init() by qdev_init_nofail()Markus Armbruster2015-02-241-4/+1
| * | | leon3: Replace unchecked qdev_init() by qdev_init_nofail()Markus Armbruster2015-02-241-9/+3
| * | | ide/isa: Replace unchecked qdev_init() by qdev_init_nofail()Markus Armbruster2015-02-241-3/+1
| * | | qdev: Improve qdev_init_nofail()'s error reportingMarkus Armbruster2015-02-161-3/+8
| * | | qom: Fix typo, 'my_class_init' -> 'derived_class_init'Zhoujian2015-02-161-1/+1
| * | | qdev: Avoid type assertion in qdev_build_hotpluggable_device_list()Jun Li2015-02-161-1/+6
* | | | Merge remote-tracking branch 'remotes/ehabkost/tags/numa-pull-request' into s...Peter Maydell2015-03-028-41/+47
|\ \ \ \
| * | | | numa: Rename set_numa_modes() to numa_post_machine_init()Eduardo Habkost2015-02-233-3/+3
| * | | | numa: Rename option parsing functionsEduardo Habkost2015-02-233-5/+5
| * | | | numa: Move QemuOpts parsing to set_numa_nodes()Eduardo Habkost2015-02-233-7/+8
| * | | | numa: Make max_numa_nodeid staticEduardo Habkost2015-02-232-4/+3
| * | | | numa: Move NUMA globals to numa.cEduardo Habkost2015-02-232-4/+3
| * | | | vl.c: Remove unnecessary zero-initialization of NUMA globalsEduardo Habkost2015-02-231-8/+0
| * | | | numa: Move NUMA declarations from sysemu.h to numa.hEduardo Habkost2015-02-238-19/+34
| |/ / /
* | | | Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into stagingPeter Maydell2015-02-264-9/+13
|\ \ \ \
| * | | | qapi-types: add C99 index names to arraysMichael S. Tsirkin2015-02-231-4/+7
| * | | | monitor: Fix missing err = NULL in client_migrate_info()Gonglei2015-02-231-1/+2
| * | | | balloon: Fix typoEric Blake2015-02-231-3/+3
OpenPOWER on IntegriCloud