summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2016-01-13' into...Peter Maydell2016-01-144-8/+66
|\
| * error: Consistently name Error * objects err, and not errpMarkus Armbruster2016-01-131-1/+1
| * error: New error_prepend(), error_reportf_err()Markus Armbruster2016-01-131-2/+29
| * error: Improve documentationMarkus Armbruster2016-01-131-2/+18
| * isa: Clean up error handling around isa_bus_new()Markus Armbruster2016-01-131-1/+1
| * hw: Inline the qdev_prop_set_drive_nofail() wrapperMarkus Armbruster2016-01-131-2/+0Star
| * error: Document how to accumulate multiple errorsMarkus Armbruster2016-01-131-0/+17
* | migration: Add state records for migration incomingzhanghailiang2016-01-131-0/+1
* | migration: Export migrate_set_state()zhanghailiang2016-01-131-0/+2
|/
* Merge remote-tracking branch 'remotes/kvaneesh/tags/for-upstream-signed' into...Peter Maydell2016-01-121-24/+0Star
|\
| * 9pfs: merge hw/virtio/virtio-9p.h into hw/9pfs/virtio-9p.hWei Liu2016-01-081-24/+0Star
* | i.MX: move i.MX31 CCM object to register arrayJean-Christophe DUBOIS2016-01-111-8/+30
* | Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2016-01-1...Peter Maydell2016-01-113-2/+3
|\ \
| * | osdep.h: Include glib-compat.h in osdep.h rather than qemu-common.hPeter Maydell2016-01-112-1/+2
| * | crypto: Fix typo in exampleEric Blake2016-01-111-1/+1
* | | Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into st...Peter Maydell2016-01-112-2/+12
|\ \ \
| * | | ether/slirp: Avoid redefinition of the same constantsDr. David Alan Gilbert2016-01-111-1/+3
| * | | vmxnet3: Introduce 'x-disable-pcie' back-compat propertyShmulik Ladkani2016-01-111-0/+4
| * | | vmxnet3: Introduce 'x-old-msi-offsets' back-compat propertyShmulik Ladkani2016-01-111-1/+5
| |/ /
* | | Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.6-20160111' into...Peter Maydell2016-01-114-10/+12
|\ \ \
| * | | spapr vio: fix to incomplete QOMifyCao jin2016-01-111-1/+1
| * | | hw/ppc/spapr: Use XHCI as host controller for new spapr machinesThomas Huth2016-01-111-1/+2
| * | | Move SET_MACHINE_COMPAT macro to boards.hDavid Gibson2016-01-112-8/+9
| |/ /
* | | ivshmem: Store file descriptor for vhost-user negotiationTetsuya Mukawa2016-01-091-0/+1
* | | Add VMSTATE_STRUCT_VARRAY_KNOWNDr. David Alan Gilbert2016-01-091-0/+13
* | | i386/pc: expose identifying the floppy controllerRoman Kagan2016-01-091-0/+2
* | | pc: acpi: move PIIX4 isa-bridge and pm devices into SSDTIgor Mammedov2016-01-091-0/+1
* | | pc: acpi: move HPET from DSDT to SSDTIgor Mammedov2016-01-091-0/+1
* | | pc: acpi: cpuhp: move \_GPE._E02() into SSDTIgor Mammedov2016-01-092-1/+1
* | | pc: acpi: cpuhp: move PRSC() method into SSDTIgor Mammedov2016-01-093-0/+4
* | | pc: acpi: cpuhp: move CPST() method into SSDTIgor Mammedov2016-01-091-0/+1
* | | pc: acpi: cpuhp: move CPMA() method into SSDTIgor Mammedov2016-01-091-0/+2
* | | pc: acpi: cpuhp: move CPEJ() method to SSDTIgor Mammedov2016-01-091-0/+5
* | | pc: acpi: memhp: drop not needed stringify(MEMORY_foo) usageIgor Mammedov2016-01-092-24/+24
* | | pc: acpi: memhp: move \_GPE._E03 into SSDTIgor Mammedov2016-01-092-2/+5
* | | pc: acpi: memhp: prepare context in SSDT for moving memhp DSDT codeIgor Mammedov2016-01-081-0/+4
|/ /
* | Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20160108-1' into st...Peter Maydell2016-01-082-1/+36
|\ \
| * | sdl2/opengl: add opengl context and scanout supportGerd Hoffmann2016-01-081-1/+21
| * | ui/curses: Fix color attribute of monitor for cursesOGAWA Hirofumi2016-01-081-0/+15
| |/
* | block: Add check on mirror targetFam Zheng2016-01-071-0/+1
* | block: Rename BLOCK_OP_TYPE_MIRROR to BLOCK_OP_TYPE_MIRROR_SOURCEFam Zheng2016-01-071-1/+1
|/
* Merge remote-tracking branch 'remotes/berrange/tags/pull-crypto-fixes-2015-12...Peter Maydell2015-12-232-23/+51
|\
| * crypto: move QCryptoCipherAlgorithm/Mode enum definitions into QAPIDaniel P. Berrange2015-12-231-15/+2Star
| * crypto: move QCryptoHashAlgorithm enum definition into QAPIDaniel P. Berrange2015-12-231-8/+1Star
| * crypto: add ability to query hash digest lenDaniel P. Berrange2015-12-231-0/+11
| * crypto: add additional query accessors for cipher instancesDaniel P. Berrange2015-12-231-0/+37
* | acpi: extend aml_and() to accept target argumentIgor Mammedov2015-12-221-1/+1
* | acpi: extend aml_or() to accept target argumentIgor Mammedov2015-12-221-1/+1
* | acpi add aml_dma()Igor Mammedov2015-12-221-0/+20
* | acpi: add aml_to_buffer()Igor Mammedov2015-12-221-0/+1