summaryrefslogtreecommitdiffstats
path: root/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* make: fix clean rule by removing build file in qom/Anthony PERARD2012-04-031-0/+1
| | | | | | | | Make clean does not clean the 'qom' directory, leaving *.o and *.d files. This patch fixes this. Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
* buildfix: check for old pod2man versionsGerd Hoffmann2012-03-311-1/+0
| | | | | | | | Older pod2man don't have a --utf8 switch, check for this in conffigure and use it only when present. Fixes build on RHEL-5. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* test: remove qemu-ga referenceMichael Roth2012-03-261-0/+1
| | | | | | | This was added by mistake a while back. Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* Support utf8 chars in pod docsMichael Tokarev2012-03-241-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We've at least one UTF8 char in the qemu texi doc: $ grep Tibor qemu-doc.texi by Tibor "TS" Schütz. $ man ./qemu.1 | grep Tibor by Tibor "TS" SchA~Xtz. This patch allows utf8 in man/pod docs. Initially it was split into two parts and sent on 2012-02-02. Resending it again (3rd time) now in merged form. If any other generalizations of $(POD2MAN) are needed it can be done in a separate patch. Current form of $(POD2MAN) is choosen to be able to easily change it if some implementation does not support utf8 or resulting output has issues with local man(1) program/macros. First, add @documentencoding in scripts/texi2pod.pl: Currently our texi2pod ignores @documentencoding even if it is set properly in *.texi files. This results in a mojibake in documents generated from qemu.pod (which is generated from qemu-doc.texi by texi2pod), because the rest of the tools assumes ASCII encoding. This patch recognizes first @documentencoding in input and places it at the beginning of output as =encoding directive. Second, run pod2man with --utf8 option to enable utf8 in manpages: This option makes no difference for manpages which contains only ascii chars. But for manpages with actual UTF8 characters (qemu docs contains these), this change allows to see real characters instead of mojibakes or substitutes. Signed-off-By: Michael Tokarev <mjt@tls.msk.ru> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* qom: Add QOM support to user emulatorsAndreas Färber2012-03-131-3/+3
| | | | | | | | | | | | Link the Object base class and the module infrastructure for class registration. Introduce $(universal-obj-y) for objects that are more common than $(common-obj-y), so that those only get built once. Call QOM module init for type registration. Signed-off-by: Andreas Färber <afaerber@suse.de> Cc: Anthony Liguori <anthony@codemonkey.ws> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* build: Include config-host.mak as soon as possibleLluís Vilanova2012-03-111-7/+8
| | | | | | | | | | | Current code depends on variables defined in config-host.mak before it is actually included. Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu> Cc: Anthony Liguori <aliguori@us.ibm.com> Cc: Paul Brook <paul@codesourcery.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* Merge remote-tracking branch 'qemu-kvm/uq/master' into stagingAnthony Liguori2012-03-011-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qemu-kvm/uq/master: pc-bios: update kvmvapic.bin kvmvapic: Use optionrom helpers optionsrom: Reserve space for checksum kvmvapic: Simplify mp/up_set_tpr kvmvapic: Introduce TPR access optimization for Windows guests kvmvapic: Add option ROM target-i386: Add infrastructure for reporting TPR MMIO accesses Allow to use pause_all_vcpus from VCPU context Process pending work while waiting for initial kick-off in TCG mode Remove useless casts from cpu iterators kvm: Set cpu_single_env only once kvm: Synchronize cpu state in kvm_arch_stop_on_emulation_error()
| * kvmvapic: Add option ROMJan Kiszka2012-02-181-1/+1
| | | | | | | | | | | | | | | | | | This imports and builds the original VAPIC option ROM of qemu-kvm. Its interaction with QEMU is described in the commit that introduces the corresponding device model. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Avi Kivity <avi@redhat.com>
* | Merge remote-tracking branch 'aneesh/for-upstream' into stagingAnthony Liguori2012-02-271-0/+2
|\ \ | | | | | | | | | | | | | | | * aneesh/for-upstream: hw/9pfs: Endian fixes for virtfs ./configure: add option for disabling VirtFS
| * | ./configure: add option for disabling VirtFSMeador Inge2012-02-241-0/+2
| | | | | | | | | | | | | | | Signed-off-by: Meador Inge <meadori@codesourcery.com> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
* | | qemu-ga: fixes for win32 build of qemu-gaMichael Roth2012-02-231-1/+1
|/ / | | | | | | | | | | Various stubs and #ifdefs to compile for Windows using mingw cross-build. Still has 1 linker error due to a dependency on the forthcoming win32 versions of the GAChannel/transport class.
* | Makefile: Add dependency to fix linux-user-only buildPeter Maydell2012-02-221-0/+1
|/ | | | | | | | | Make qemu-bridge-helper explicitly depend on $(GENERATED_HEADERS) so that it doesn't fail to build when we configured for linux-user targets only. (Build breakage introduced in commit 7b93fad.) Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* make: Remove duplicate use of GLIB_CFLAGSStefan Weil2012-02-091-2/+0
| | | | | | | | | | | Makefile, Makefile.hw, Makefile.target and libcacard/Makefile added GLIB_CFLAGS to QEMU_CFLAGS. Makefile.objs does this, too, and is included by all other Makefiles, so GLIB_CFLAGS were added twice (reported by malc). Signed-off-by: Stefan Weil <sw@weilnetz.de> Signed-off-by: malc <av1474@comtv.ru>
* Add basic version of bridge helperCorey Bryant2012-02-011-2/+10
| | | | | | | | | | | | | | | | | | | This patch adds a helper that can be used to create a tap device attached to a bridge device. Since this helper is minimal in what it does, it can be given CAP_NET_ADMIN which allows qemu to avoid running as root while still satisfying the majority of what users tend to want to do with tap devices. The way this all works is that qemu launches this helper passing a bridge name and the name of an inherited file descriptor. The descriptor is one end of a socketpair() of domain sockets. This domain socket is used to transmit a file descriptor of the opened tap device from the helper to qemu. The helper can then exit and let qemu use the tap device. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> Signed-off-by: Richa Marwaha <rmarwah@linux.vnet.ibm.com> Signed-off-by: Corey Bryant <coreyb@linux.vnet.ibm.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* Makefile: Remove linux-headers/asm symlink on distcleanPeter Maydell2012-02-011-0/+1
| | | | | | | | configure creates a linux-headers/asm symlink. Remove this when doing a distclean. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* qom: add the base Object class (v2)Anthony Liguori2012-01-271-0/+2
| | | | | | | | | | | | | | | | | | | | This class provides the main building block for QEMU Object Model and is extensively documented in the header file. It is largely inspired by GObject. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> --- v1 -> v2 - remove printf() in type registration - fix typo in comment (Paolo) - make Interface private - move object into a new directory and move header into include/qemu/ - don't make object.h depend on qemu-common.h - remove Type and replace it with TypeImpl * (Paolo) - use hash table to store types (Paolo) - aggressively cache parent type (Paolo) - make a type_register and use it with interfaces (Paolo) - fix interface cast comment (Paolo) - add a few more functions required in later series
* Makefile: Remove generated headers on cleanAndreas Färber2012-01-191-0/+1
| | | | | | | | | | | | | | | | | | Running `make distclean' followed by a new out-of-tree build would fail due to stale generated QMP headers in the tree. Commit 611b727374ad76fb0078ea65bc1387194913980e (Makefile: remove more generated files on clean) made sure generated sources are removed. Also remove generated headers introduced in commit e3193601c84558c303b1773379da76fce80c0a56 (qapi: use middle mode in QMP server). Signed-off-by: Andreas Färber <andreas.faerber@web.de> Cc: Michael S. Tsirkin <mst@redhat.com> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
* Makefile: Exclude tests/Makefile in unconfigured treeAndreas Färber2012-01-191-0/+2
| | | | | | | | | | | | | Since commit dbfe06c62ccedc5b64e1c6466445133dd50f6de1 (build: split unit test builds to a separate makefile fragment), in absence of config-host.mak an undefined $(SRC_PATH) breaks `make distclean' due to /tests/Makefile not being include'able. Fix by only including when config-host.mak is present. Signed-off-by: Andreas Färber <andreas.faerber@web.de> Cc: Anthony Liguori <aliguori@us.ibm.com> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
* test: eliminate libcheck tests and have make check use gtesterAnthony Liguori2012-01-121-2/+2
| | | | Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* build: split unit test builds to a separate makefile fragmentAnthony Liguori2012-01-121-35/+1
| | | | Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* tests: mv tests/* -> tests/tcgAnthony Liguori2012-01-121-2/+2
| | | | | Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* Fix qapi code generation fixAvi Kivity2012-01-121-1/+1
| | | | | | | | | | | | | | The fixes to qapi code generation had multiple bugs: - the Null class used to drop output was missing some methods - in some scripts it was never instantiated, leading to a None return, which is missing even more methods - the --source and --header options were swapped Luckily, all those bugs were hidden by a makefile bug which caused the old behaviour (with the race) to be invoked. Signed-off-by: Avi Kivity <avi@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* hw/9pfs: man page for proxy helperM. Mohan Kumar2012-01-041-1/+11
| | | | | Signed-off-by: M. Mohan Kumar <mohan@in.ibm.com> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
* hw/9pfs: File ownership and othersM. Mohan Kumar2012-01-041-1/+1
| | | | | | | | Add file ownership interfaces like chmod/chown, utime update, rename, remove and truncating files for proxy FS Signed-off-by: M. Mohan Kumar <mohan@in.ibm.com> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
* hw/9pfs: File system helper process for qemu 9p proxy FSM. Mohan Kumar2012-01-041-0/+3
| | | | | | | | | | | Provide root privilege access to QEMU 9p proxy filesystem using socket communication. Proxy helper is started by root user as: ~ # virtfs-proxy-helper -f|--fd <socket descriptor> -p|--path <path-to-share> Signed-off-by: M. Mohan Kumar <mohan@in.ibm.com> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
* Fix qapi code generation wrt parallel buildAvi Kivity2011-12-271-9/+11
| | | | | | | | | | | | | | | | | | Make's multiple output syntax x.c x.h: x.template gen < x.template actually invokes the command once for x.c and once for x.h (with differing $@ in each invocation). During a parallel build, the two commands may be invoked in parallel; this opens up a race, where the second invocation trashes a file supposedly produced during the first, and now in use by a dependent command. The various qapi code generators are susceptible to this; fix by making them generate just one file per invocation. Signed-off-by: Avi Kivity <avi@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* link the main loop and its dependencies into the toolsPaolo Bonzini2011-12-221-2/+3
| | | | | | | | Using the main loop code from QEMU enables tools to operate fully asynchronously. Advantages include better Windows portability (for some definition of portability) over glib's. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
* Drop test-visitorLuiz Capitulino2011-12-061-4/+1
| | | | | | | It has been superseded by the two previous commits, which introduced the test-qmp-output-visitor and test-qmp-input-visitor tests. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
* Introduce test-qmp-input-visitorLuiz Capitulino2011-12-061-1/+4
| | | | | | Contains unit-tests for the QMP input visitor implementation. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
* Introduce test-qmp-output-visitorLuiz Capitulino2011-12-061-1/+4
| | | | | | Contains unit-tests for the QMP output visitor implementation. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
* Makefile: use full path for qapi-generated directoryMichael Roth2011-11-301-1/+1
| | | | | | | | | Generally $(BUILD_DIR) == $(CURDIR), but that isn't necessarilly the case, so use $(BUILD_DIR)/qapi-generated for generated files to avoid potentionally sticking generating files in odd places outside the build's include paths. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* Revert "fix out of tree build"Anthony Liguori2011-11-281-1/+1
| | | | | | | | This reverts commit be85c90b74f56dca51782fa3080fcdf88593e045. This patch is incorrect and breaks the build with a freshly cloned git tree. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* fix out of tree buildStefano Stabellini2011-11-231-1/+1
| | | | | Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
* Makefile: fix qga dependenciesMichael S. Tsirkin2011-11-171-4/+5
| | | | | | | | | | .c files include .h files, so .o depends on .h, and the linked result depends on .o. We got it wrong for qga rules, fix it up. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
* Makefile: dependency fixMichael S. Tsirkin2011-11-171-1/+1
| | | | | | | | | qga/guest-agent-commands.c includes qga-qmp-commands.h, but it was missing in its dependencies. Add it in QGALIB_GEN. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
* Makefile: fix dependencies for generated .h, .cMichael S. Tsirkin2011-11-171-18/+18
| | | | | | | | | | | | | | | We have a single rule generating .c and .h files, so .h doesn't depend on .c: both depend on the source schema. Fix Makefile to reflect that - without this, if .c is there and .h is missing, Makefile does not know how to remake .h and assumes it's a dummy target, triggering endless rebuilds. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
* Makefile: remove more generated files on cleanMichael S. Tsirkin2011-11-171-0/+2
| | | | | | | | | make clean missed the source qmp files generated by python. Fix that. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
* add sgabios blob and submodulePaolo Bonzini2011-11-071-1/+1
| | | | | | | | The rom was not added together with the sgabios device and is not installed. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* add "make check" targetGerd Hoffmann2011-11-011-0/+6
| | | | | | | | Add some Makefile glue so we have a simple "make check" to run the unit tests. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* move checks to separate variableGerd Hoffmann2011-11-011-2/+2
| | | | | | | | Create a new CHECKS variable. Put the checks there instead of adding them to the TOOLS variable. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* tools: reorganize Makefile variablesPaolo Bonzini2011-10-261-17/+15
| | | | | | | | | | | | | - Add all dependencies of the block layer to block-obj-y, and all dependencies of QObject to qobject-obj-y - Remove the block layer from tools-obj-y, add it to qemu-img, qemu-nbd, qemu-io - Add qobject-obj-y and tools-obj-y wherever useful, remove duplicates Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
* Merge remote-tracking branch 'qmp/queue/qmp' into stagingAnthony Liguori2011-10-101-0/+12
|\
| * qapi: use middle mode in QMP serverAnthony Liguori2011-10-041-0/+12
| | | | | | | | | | | | | | Use the new middle mode within the existing QMP server. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
* | Merge remote-tracking branch 'stefanha/trivial-patches' into stagingAnthony Liguori2011-10-101-4/+5
|\ \
| * | makefile: extract tools-obj-yPaolo Bonzini2011-10-051-4/+5
| |/ | | | | | | | | Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
* | target-alpha: Add custom PALcode image for CLIPPER emulation.Richard Henderson2011-10-081-1/+2
|/ | | | Signed-off-by: Richard Henderson <rth@twiddle.net>
* Makefile: Remove 'tarbin' targetPeter Maydell2011-09-231-36/+0
| | | | | | | | | | | | | | | Remove the 'tarbin' target -- it isn't used as part of the official QEMU release process, and it's out of date (various new bios files were never added to its list of files). It's better not to provide it at all than to have a broken makefile target we never use or test. (Creating a tarball by just pulling in binaries that have been installed directly to the system you're running the build on is a bad idea anyway: the better way to create a binary tarball would be just to install to a temporary DESTDIR and then tar up that.) Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* Makefile: Fix broken buildStefan Weil2011-09-171-2/+2
| | | | | | | | | | | | | | | | make -C mybuilddir no longer works (regression caused by commit) 388d475815c23901010a25c845eb078d47ee0740. PWD is the directory of the caller (not mybuilddir), so BUILD_DIR is set to the wrong value. GNU make sets CURDIR to the correct value. Use this macro instead of PWD. Cc: Lluís Vilanova <vilanova@ac.upc.edu> Cc: Anthony Liguori <aliguori@us.ibm.com> Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* build: Always have 'BUILD_DIR' variable pointing to the root of the build treeLluís Vilanova2011-09-161-1/+4
| | | | | | Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu> Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* win32: improve version.o dependencyBlue Swirl2011-09-101-1/+1
| | | | | | Actually, version.rc doesn't need config-host.mak but config-host.h, fix it. Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
OpenPOWER on IntegriCloud