summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'stefanha/trivial-patches' into stagingAnthony Liguori2012-08-1510-13/+20
|\
| * ivshmem, qdev-monitor: fix order of qerror parametersAlberto Garcia2012-08-152-2/+3
| * iov_send_recv(): Handle zero bytes case even if OS does notPeter Maydell2012-08-151-0/+7
| * framebuffer: Fix spelling in comment (leight -> height)Stefan Weil2012-08-151-1/+1
| * Spelling fix in comment (peripherans -> peripherals)Stefan Weil2012-08-151-1/+1
| * docs: Fix spelling (propery -> property)Stefan Weil2012-08-151-1/+1
| * trace: Fix "Qemu" -> "QEMU"Stefan Weil2012-08-151-1/+1
| * cputlb.c: Fix out of date commentPeter Maydell2012-08-151-1/+3
| * ehci: fix assertion typoAlejandro Martinez Ruiz2012-08-151-1/+1
| * Makefile: Avoid explicit list of directories in clean targetPeter Maydell2012-08-151-5/+2
* | Merge remote-tracking branch 'kwolf/for-anthony' into stagingAnthony Liguori2012-08-1522-96/+776
|\ \
| * | qemu-iotests: Fix 030 after switch to GenericErrorKevin Wolf2012-08-151-4/+2
| * | block: Flush parent to OS with cache=unsafeKevin Wolf2012-08-151-1/+2
| * | iscsi: Fix NULL dereferences / races between task completion and abortStefan Priebe2012-08-151-32/+23
| * | monitor: Clean up fd sets on monitor disconnectCorey Bryant2012-08-151-1/+22
| * | block: Enable qemu_open/close to work with fd setsCorey Bryant2012-08-159-5/+251
| * | block: Convert close calls to qemu_closeCorey Bryant2012-08-158-24/+30
| * | block: Convert open calls to qemu_openCorey Bryant2012-08-156-28/+26
| * | block: Prevent detection of /dev/fdset/ as floppyCorey Bryant2012-08-151-1/+3
| * | qapi: Introduce add-fd, remove-fd, query-fdsetsCorey Bryant2012-08-153-0/+409
| * | qemu-char: Add MSG_CMSG_CLOEXEC flag to recvmsgCorey Bryant2012-08-151-2/+10
| |/
* | Merge remote-tracking branch 'qemu-kvm/uq/master' into stagingAnthony Liguori2012-08-153-19/+42
|\ \
| * | update-linux-headers.sh: Pull in asm-generic/kvm_para.hPeter Maydell2012-08-141-0/+5
| * | kvmvapic: Disable if there is insufficient memoryJan Kiszka2012-08-141-1/+3
| * | kvm: i8254: Finish time conversion fixJan Kiszka2012-08-141-4/+10
| * | kvm: i8254: Cache kernel clock offset in KVMPITStateJan Kiszka2012-08-141-14/+24
* | | Merge remote-tracking branch 'stefanha/tracing' into stagingAnthony Liguori2012-08-153-24/+14
|\ \ \ | |_|/ |/| |
| * | trace/simple: Replace asprintf by g_strdup_printfStefan Weil2012-08-141-10/+4
| * | trace/simple: Fix compiler warning for 32 bit hostsStefan Weil2012-08-141-1/+1
| * | trace: avoid pointer aliasing in trace_record_finish()Harsh Prateek Bora2012-08-141-5/+4
| * | trace: drop unused TraceBufferRecord->next_tbuf_idx fieldHarsh Prateek Bora2012-08-142-3/+0
| * | trace: remove unnecessary write_to_buffer() typecastingHarsh Prateek Bora2012-08-141-3/+3
| * | trace: rename TraceRecordHeader to TraceLogHeaderHarsh Prateek Bora2012-08-141-2/+2
* | | Merge remote-tracking branch 'origin/master' into stagingAnthony Liguori2012-08-1425-1792/+1978
|\ \ \ | | |/ | |/|
| * | Merge branch 'linux-user.next' of git://git.linaro.org/people/pmaydell/qemu-armBlue Swirl2012-08-148-92/+206
| |\ \
| | * | linux-user: ARM: Ignore immediate value for svc in thumb modeAlexander Graf2012-08-141-2/+1
| | * | linux-user: Use init_guest_space when -R and -B are specifiedMeador Inge2012-08-143-44/+56
| | * | linux-user: Factor out guest space probing into a functionMeador Inge2012-08-142-33/+90
| | * | flatload: fix bss clearingMike Frysinger2012-08-141-1/+1
| | * | linux-user: make host_to_target_cmsg support SO_TIMESTAMP cmsg_typeJing Huang2012-08-141-4/+16
| | * | linux-user: make do_setsockopt support SOL_RAW ICMP_FILTER socket optionJing Huang2012-08-141-0/+20
| | * | linux-user: pass sockaddr from host to targetJing Huang2012-08-141-3/+13
| | * | linux-user: Move target_to_host_errno_table[] setup out of ioctl loopPeter Maydell2012-08-131-5/+6
| | * | linux-user: Fix SNDCTL_DSP_MAP{IN, OUT}BUF ioctl definitionsPeter Maydell2012-08-133-4/+7
| | * | linux-user: Fix incorrect TARGET_BLKBSZGET, TARGET_BLKBSZSETPeter Maydell2012-08-131-2/+2
| * | | x86: switch to AREG0 free modeBlue Swirl2012-08-1411-200/+151
| * | | x86: avoid AREG0 in segmentation helpersBlue Swirl2012-08-144-160/+150
| * | | x86: avoid AREG0 for misc helpersBlue Swirl2012-08-144-83/+84
| * | | x86: use wrappers for memory access helpersBlue Swirl2012-08-143-103/+126
| * | | x86: avoid AREG0 for SMM helpersBlue Swirl2012-08-144-13/+6
OpenPOWER on IntegriCloud