summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into stagingPeter Maydell2014-08-1518-89/+113
|\
| * pc: Get rid of pci-info leftoversMarkus Armbruster2014-08-144-38/+0Star
| * e1000: use symbolic constants to init phy ctrl & status registersGabriel L. Somlo2014-08-141-6/+23
| * e1000: correctly handle phy_ctrl reserved & self-clearing bitsGabriel L. Somlo2014-08-141-14/+17
| * ivshmem: fix building when debug mode is enabledLevente Kurusa2014-08-141-2/+2
| * acpi: align RSDPMichael S. Tsirkin2014-08-141-1/+1
| * numa: show hex number in error message for consistency and prefix them with 0xHu Tao2014-08-141-2/+2
| * pc-dimm: fix up error messageMichael S. Tsirkin2014-08-141-2/+3
| * pc-dimm: validate node propertyHu Tao2014-08-141-0/+5
| * hw:i386: typo fix: MEMORY_HOPTLUG_DEVICE -> MEMORY_HOTPLUG_DEVICEHu Tao2014-08-146-18/+18
| * hw/audio/intel-hda: Fix MSI capability addressJan Kiszka2014-08-142-2/+9
| * pc: Create 2.2 machine typeJan Kiszka2014-08-143-5/+34
| * pci: Use bus master address space for delivering MSI/MSI-X messagesJan Kiszka2014-08-142-2/+2
* | Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' int...Peter Maydell2014-08-1542-28/+808
|\ \
| * | virtio-rng: add some trace eventsAmit Shah2014-08-122-0/+11
| * | trace: add some tcg tracing supportAlex Bennée2014-08-123-0/+18
| * | trace: teach lttng backend to use format stringsAlex Bennée2014-08-122-6/+21
| * | trace: [tcg] Include TCG-tracing header on all targetsLluís Vilanova2014-08-1216-0/+46
| * | trace: [tcg] Include event definitions in "trace.h"Lluís Vilanova2014-08-121-0/+1
| * | trace: [tcg] Generate TCG tracing routinesLluís Vilanova2014-08-125-0/+76
| * | trace: [tcg] Include TCG-tracing helpersLluís Vilanova2014-08-123-0/+4
| * | trace: [tcg] Define TCG tracing helper routine wrappersLluís Vilanova2014-08-124-0/+80
| * | trace: [tcg] Define TCG tracing helper routinesLluís Vilanova2014-08-126-1/+75
| * | trace: [tcg] Declare TCG tracing helper routinesLluís Vilanova2014-08-125-5/+73
| * | trace: [tcg] Add 'tcg' event propertyLluís Vilanova2014-08-122-5/+64
| * | trace: [tcg] Argument type transformation machineryLluís Vilanova2014-08-121-1/+29
| * | trace: [tcg] Argument type transformation rulesLluís Vilanova2014-08-121-0/+166
| * | trace: [tcg] Add documentationLluís Vilanova2014-08-121-0/+40
| * | trace: install simpletrace SystemTap tapsetStefan Hajnoczi2014-08-121-1/+9
| * | simpletrace: add simpletrace.py --no-header optionStefan Hajnoczi2014-08-121-7/+17
| * | trace: add tracetool simpletrace_stap formatStefan Hajnoczi2014-08-121-0/+71
| * | trace: extract stap_escape() function for reuseStefan Hajnoczi2014-08-121-3/+8
| |/
* | Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into stagingPeter Maydell2014-08-1557-478/+2507
|\ \
| * | block: Catch !bs->drv in bdrv_check()Max Reitz2014-08-151-0/+3
| * | iotests: Add test for image header overlapMax Reitz2014-08-152-0/+17
| * | qcow2: Catch !*host_offset for data allocationMax Reitz2014-08-151-0/+11
| * | qcow2: Return useful error code in refcount_init()Max Reitz2014-08-151-2/+4
| * | mirror: Handle failure for potentially large allocationsKevin Wolf2014-08-151-1/+6
| * | vpc: Handle failure for potentially large allocationsKevin Wolf2014-08-151-1/+5
| * | vmdk: Handle failure for potentially large allocationsKevin Wolf2014-08-151-2/+10
| * | vhdx: Handle failure for potentially large allocationsKevin Wolf2014-08-152-3/+17
| * | vdi: Handle failure for potentially large allocationsKevin Wolf2014-08-151-5/+20
| * | rbd: Handle failure for potentially large allocationsKevin Wolf2014-08-151-2/+5
| * | raw-win32: Handle failure for potentially large allocationsKevin Wolf2014-08-151-1/+5
| * | raw-posix: Handle failure for potentially large allocationsKevin Wolf2014-08-151-1/+5
| * | qed: Handle failure for potentially large allocationsKevin Wolf2014-08-152-3/+10
| * | qcow2: Handle failure for potentially large allocationsKevin Wolf2014-08-155-32/+130
| * | qcow1: Handle failure for potentially large allocationsKevin Wolf2014-08-151-7/+26
| * | parallels: Handle failure for potentially large allocationsKevin Wolf2014-08-151-1/+5
| * | nfs: Handle failure for potentially large allocationsKevin Wolf2014-08-151-1/+5