summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' int...Peter Maydell2016-01-072-26/+36
|\ \ | |/ |/|
| * trace: add make dependencies on tracetool sourceStefan Hajnoczi2016-01-071-11/+19
| * trace: fix make foo-timestamp rulesStefan Hajnoczi2016-01-071-9/+9
| * trace: fix PRIx64 constants in trace-eventsMark Cave-Ayland2016-01-071-5/+5
| * trace: reflect the file name changeQinghua Jin2016-01-071-1/+3
|/
* Merge remote-tracking branch 'remotes/berrange/tags/pull-crypto-fixes-2015-12...Peter Maydell2015-12-238-28/+180
|\
| * crypto: fix transposed arguments in cipher error messageDaniel P. Berrange2015-12-231-1/+1
| * crypto: ensure qapi/crypto.json is listed in qapi-modulesDaniel P. Berrange2015-12-231-1/+2
| * crypto: move QCryptoCipherAlgorithm/Mode enum definitions into QAPIDaniel P. Berrange2015-12-233-19/+36
| * crypto: move QCryptoHashAlgorithm enum definition into QAPIDaniel P. Berrange2015-12-233-10/+18
| * crypto: add ability to query hash digest lenDaniel P. Berrange2015-12-233-0/+31
| * crypto: add additional query accessors for cipher instancesDaniel P. Berrange2015-12-233-0/+95
* | Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into stagingPeter Maydell2015-12-231-1/+1
|\ \
| * | virtio-9p: use accessor to get thread_poolGreg Kurz2015-12-231-1/+1
| |/
* | Merge remote-tracking branch 'remotes/berrange/tags/pull-io-fixes-2015-12-23-...Peter Maydell2015-12-232-12/+134
|\ \
| * | io: fix stack allocation when sending of file descriptorsDaniel P. Berrange2015-12-232-4/+99
| * | io: fix setting of QIO_CHANNEL_FEATURE_FD_PASS on server connectionsDaniel P. Berrange2015-12-222-6/+33
| * | io: bind to loopback IP addrs in test suiteDaniel P. Berrange2015-12-221-2/+2
| |/
* | Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into stagingPeter Maydell2015-12-2339-837/+6306
|\ \
| * | acpi: extend aml_and() to accept target argumentIgor Mammedov2015-12-224-7/+9
| * | acpi: extend aml_or() to accept target argumentIgor Mammedov2015-12-224-7/+8
| * | acpi add aml_dma()Igor Mammedov2015-12-222-0/+34
| * | acpi: add aml_to_buffer()Igor Mammedov2015-12-222-0/+14
| * | acpi: add aml_to_hexstring()Igor Mammedov2015-12-222-0/+14
| * | acpi: extend aml_field() to support LockRuleIgor Mammedov2015-12-223-7/+16
| * | acpi: add aml_lgreater()Igor Mammedov2015-12-222-0/+10
| * | acpi: add aml_lor()Igor Mammedov2015-12-222-0/+10
| * | acpi: add aml_sleep()Igor Mammedov2015-12-222-0/+11
| * | acpi: add aml_alias()Igor Mammedov2015-12-222-0/+10
| * | acpi: extend aml_shiftright() to accept target argumentIgor Mammedov2015-12-223-4/+4
| * | acpi: add aml_to_integer()Igor Mammedov2015-12-222-0/+10
| * | acpi: add aml_call0() helperIgor Mammedov2015-12-222-0/+9
| * | acpi: add aml_decrement() and aml_subtract()Igor Mammedov2015-12-222-0/+16
| * | acpi: extend aml_add() to accept target argumentIgor Mammedov2015-12-223-4/+4
| * | acpi: aml: add helper for Opcode Arg2 Arg2 [Dst] AML patternIgor Mammedov2015-12-221-29/+32
| * | acpi: add aml_create_qword_field()Igor Mammedov2015-12-222-4/+18
| * | acpi: add aml_mutex(), aml_acquire(), aml_release()Xiao Guangrong2015-12-222-0/+36
| * | acpi: add aml_lgreater_equal()Igor Mammedov2015-12-222-0/+12
| * | acpi: add aml_sizeofXiao Guangrong2015-12-222-0/+9
| * | acpi: add aml_derefofXiao Guangrong2015-12-222-0/+9
| * | nvdimm: add maintain infoXiao Guangrong2015-12-221-0/+7
| * | nvdimm acpi: build ACPI nvdimm devicesXiao Guangrong2015-12-221-0/+106
| * | nvdimm acpi: build ACPI NFIT tableXiao Guangrong2015-12-229-1/+425
| * | acpi: support specified oem table id for build_headerXiao Guangrong2015-12-224-21/+30
| * | nvdimm: implement NVDIMM device abstractXiao Guangrong2015-12-226-0/+83
| * | docs/pci_expander_bridge: fix typoCao jin2015-12-221-3/+3
| * | hw/compat.h: Change indentation of HW_COMPAT_* to 4 spacesEduardo Habkost2015-12-221-76/+76
| * | pc: Change indentation of PC_COMPAT_* to 4 spacesEduardo Habkost2015-12-221-462/+462
| * | pc: Add pc-*-2.6 machine classesEduardo Habkost2015-12-224-5/+31
| * | pc: Remove redundant code from pc-*-2.3 machine classesEduardo Habkost2015-12-222-3/+0Star