summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '2f7bb8780af4a007e90045b4cc97f558e956adf9' into upstream-mergeAvi Kivity2009-07-291-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | * commit '2f7bb8780af4a007e90045b4cc97f558e956adf9': rename USE_NPTL to CONFIG_USE_NPTL rename NEEDS_LIBSUNMATH to CONFIG_NEEDS_LIBSUNMATH define ENOTSUP the same that the other errors Conflicts: create_config Signed-off-by: Avi Kivity <avi@redhat.com>
| * rename USE_NPTL to CONFIG_USE_NPTLJuan Quintela2009-07-271-1/+1
| | | | | | | | | | Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit '0ba99fc6a188988f11361cb41eba7c1afce346d4' into upstream-mergeAvi Kivity2009-07-281-2/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0ba99fc6a188988f11361cb41eba7c1afce346d4': (46 commits) configure already knows what TARGET_BASE_ARCH we need, no need to put the logic in Makefile.target already defined several lines before in block-obj-y Remove unused Makefile variable use nwfpe-obj-y for consistence use block-nested-y for files inside block/ Remove duplicated definition fix sparc not solaris build fix XEN Build fix for bad macaddr of e1000 in Windows 2003 server with original MS driver qdev: es1370+ac97 description qdev/compat: virtio-net-pci 0.10 compatibility. qdev: print device id in "info pci". qdev/compat: virtio-console-pci 0.10 compatibility. qdev: add id= support for pci nics. qdev/compat: virtio-blk-pci 0.10 compatibility. qdev: add user-specified identifier to devices. qdev/compat: add pc-0.10 machine type. qdev: add no_user, alias and desc qdev/compat: compat property infrastructure. qdev: factor out driver search to qdev_find_info() ... Conflicts: Makefile.target Signed-off-by: Avi Kivity <avi@redhat.com>
| * Update to a hopefully more future proof FSF addressBlue Swirl2009-07-161-2/+1
| | | | | | | | Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* | Merge branch 'qemu-cvs'Avi Kivity2009-01-181-1/+1
|\| | | | | | | | | | | | | | | | | | | Conflicts: qemu/hw/cirrus_vga.c qemu/hw/pc.c qemu/hw/pcnet.c qemu/hw/vga.c qemu/vl.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * Remove all traces of __powerpc__malc2009-01-141-1/+1
| | | | | | | | | | | | | | | | According to $GCC/gcc/config/rs6000/rs6000-c.c _ARCH_PPC is the ubiquitous define which should be used to test whether gcc targets PowerPC, on 64bit platforms _ARCH_PPC64 will be also defined. git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6301 c046a42c-6fe2-441c-8c8c-71466251a162
* | Merge branch 'qemu-cvs'Avi Kivity2009-01-051-1/+1
|\|
| * Update FSF address in GPL/LGPL boilerplateaurel322009-01-041-1/+1
| | | | | | | | | | | | | | | | | | | | The attached patch updates the FSF address in the GPL/LGPL boilerplate in most GPL/LGPLed files, and also in COPYING.LIB. Signed-off-by: Stuart Brady <stuart.brady@gmail.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6162 c046a42c-6fe2-441c-8c8c-71466251a162
* | Merge branch 'qemu-cvs'Avi Kivity2008-11-231-4/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qemu/block-raw-posix.c qemu/configure qemu/cpu-defs.h qemu/cpu-exec.c qemu/exec.c qemu/gdbstub.c qemu/loader.c qemu/osdep.c qemu/sysemu.h qemu/target-i386/helper.c qemu/target-ppc/cpu.h qemu/target-ppc/helper.c qemu/usb-linux.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * AIX's assembler does not support local labels, use relative addressing insteadmalc2008-11-181-4/+3
| | | | | | | | | | | | (Laurent Vivier) git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5731 c046a42c-6fe2-441c-8c8c-71466251a162
* | Merge branch 'qemu-cvs'Avi Kivity2008-06-251-2/+2
|/ | | | | | | | | | | | | | | Conflicts: qemu/block.c qemu/configure qemu/cpu-defs.h qemu/cutils.c qemu/exec-all.h qemu/exec.c qemu/monitor.c qemu/target-i386/helper.c qemu/vl.c Signed-off-by: Avi Kivity <avi@qumranet.com>
* Multithreaded locking fixes.pbrook2008-06-071-0/+249
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4692 c046a42c-6fe2-441c-8c8c-71466251a162