summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'upstream/stable-0.12' into stable-0.12Avi Kivity2010-01-171-1/+1
|\
| * osdep.c: Fix accept4 fallbackKevin Wolf2010-01-131-1/+1
* | Merge commit '686a3c3dc235df2492e754423799d1abe4f6d9e2' into stable-0.12-mergeAvi Kivity2009-12-201-6/+12
|\ \ | |/
| * osdep: Fix runtime failure on older Linux kernelsAndre Przywara2009-12-181-6/+12
* | Merge commit '40ff6d7e8dceca227e7f8a3e8e0d58b2c66d19b4' into upstream-mergeAvi Kivity2009-12-071-1/+103
|\ \ | |/
| * Don't leak file descriptorsKevin Wolf2009-12-031-1/+103
* | Merge commit '34005a0060c176b3025a9e7c5d064615a9f80325' into upstream-mergeMarcelo Tosatti2009-09-141-2/+2
|\ \ | |/
| * Add #defines needed by OpenSolaris, fix breakage by the #definesBlue Swirl2009-09-121-2/+2
* | Merge commit '4dd75c702c96ec84db4efe24fcc80a4d7bb32df2' into upstream-mergeAvi Kivity2009-08-241-3/+0
|\ \ | |/
| * Only build osdep onceAnthony Liguori2009-08-241-3/+0
* | Merge commit '4a1418e07bdcfaa3177739e04707ecaec75d89e1' into upstream-mergeAvi Kivity2009-08-241-121/+0
|\ \ | |/
| * Unbreak large mem support by removing kqemuAnthony Liguori2009-08-241-121/+0
* | Merge commit 'eb82284f180196f911fd70ebf0cddfbfdf5af3e3' into upstream-mergeAvi Kivity2009-07-291-3/+3
|\ \ | |/
| * rename HOST_BSD to CONFIG_BSDJuan Quintela2009-07-271-3/+3
* | Merge commit 'dfe5fff3eaab1285cd1565fa0a33e5acd13b279c' into upstream-mergeAvi Kivity2009-07-291-3/+3
|\ \ | |/
| * change HOST_SOLARIS to CONFIG_SOLARIS{_VERSION}Juan Quintela2009-07-271-3/+3
* | Merge commit '94c5495dd16ca3311cbc95705e58d28a45899d1d' into upstream-mergeAvi Kivity2009-07-121-5/+25
|\ \ | |/
| * Add out of memory and zero size argument checks to be consistent withmalc2009-07-081-5/+25
* | Merge branch 'master' of git://git.sv.gnu.org/qemuAvi Kivity2009-05-201-0/+3
|\ \ | |/
| * Add tool_osdep.cPaul Brook2009-05-131-0/+3
* | Merge branch 'master' of git://git.sv.gnu.org/qemu into masterAvi Kivity2009-04-231-3/+3
|\ \ | |/
| * kqemu: merge CONFIG_KQEMU and USE_KQEMUblueswir12009-04-191-3/+3
* | Merge branch 'qemu-cvs'Avi Kivity2009-03-121-1/+0
|\ \ | |/
| * Fix windows build and clean up use of <windows.h>aliguori2009-03-081-1/+0
* | Merge branch 'qemu-cvs'Avi Kivity2009-03-081-6/+8
|\ \ | |/
| * Rename _BSD to HOST_BSD so that it's more obvious that it's defined by configureblueswir12009-03-081-3/+3
| * Support for DragonFly BSD (Hasso Tepper)blueswir12009-03-071-2/+2
| * Fix BSD breakage from r6736blueswir12009-03-071-0/+3
| * Sparse fixes: NULL use, header order, ANSI prototypes, staticblueswir12009-03-071-3/+2
* | Merge branch 'qemu-cvs'Avi Kivity2008-12-151-4/+0
|\ \ | |/
| * Remove redundant #ifdef _BSDblueswir12008-12-111-4/+0
* | Merge branch 'qemu-cvs'Avi Kivity2008-11-231-4/+7
|\ \ | |/
| * Use MAP_ANON also for FreeBSD (Juergen Lock)blueswir12008-11-221-2/+5
| * Use qemu_memalign instead of memalign in qemu_vmallocmalc2008-11-181-1/+1
* | Merge branch 'qemu-cvs'Avi Kivity2008-11-131-1/+1
|\ \ | |/
| * Fix -linux-user build by reverting r5701aliguori2008-11-111-14/+1
| * Allocate guest memory on host page boundaries (Hollis Blanchard)aliguori2008-11-111-1/+1
| * Define OS-dependent qemu_getpagesize() (Hollis Blanchard)aliguori2008-11-111-0/+13
* | Merge branch 'qemu-cvs'Avi Kivity2008-09-161-0/+27
|\ \ | |/
| * Use common objects for qemu-img and qemu-nbdaliguori2008-09-151-0/+27
* | Merge branch 'qemu-cvs'Avi Kivity2008-08-171-2/+15
|\ \ | |/
| * Preliminary OpenBSD host support (based on OpenBSD patches by Todd T. Fries)blueswir12008-08-151-2/+15
* | Merge branch 'qemu-cvs'Avi Kivity2008-07-101-1/+5
|\ \ | |/
* | Merge branch 'qemu-cvs'Avi Kivity2008-05-051-3/+1
|\ \ | |/
| * Use correct types to enable > 2G support, based on a patch fromaurel322008-04-271-1/+0
| * Revert "Use correct types to enable > 2G support" (r4238), it isaurel322008-04-221-0/+1
| * Use correct types to enable > 2G support, based on a patch fromaurel322008-04-221-1/+0
| * Use "mount -o remount" instead of "umount" and "mount /dev/shm",aurel322008-04-201-2/+1
* | Merge branch 'qemu-cvs'Avi Kivity2008-04-161-35/+0
|\ \ | |/
| * Remove osdep.c/qemu-img code duplicationaurel322008-04-111-35/+0