summaryrefslogtreecommitdiffstats
path: root/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Rename qemu -> qemu-system-i386Anthony Liguori2011-09-021-3/+2
| | | | | | | This has been discussed before in the past. The special casing really makes no sense anymore. This seems like a good change to make for 1.0. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* trace: move backend-specific code into the trace/ directoryLluís2011-09-011-0/+1
| | | | Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu>
* guest agent: remove uneeded dependenciesMichael Roth2011-08-211-4/+4
| | | | | | | | | | | | This patch tries to cull any uneeded library dependencies from the guest agent to improve portability across various distros. We do so by being as explicit as possible about in-tree dependencies rather than relying on existing *-obj-y targets, and by manually setting LIBS for the qemu-ga target to avoid pulling in LIBS_TOOLS libraries discovered by configure. Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* Remove remenants of qemu_mallocAnthony Liguori2011-08-211-4/+4
| | | | | | This covers the various check commands Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* Remove qemu_malloc/qemu_freeAnthony Liguori2011-08-201-1/+1
| | | | Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* Merge remote-tracking branch 'stefanha/trivial-patches' into stagingAnthony Liguori2011-08-041-0/+1
|\
| * Makefile: delete config.log in distcleanAlexandre Raymond2011-08-031-0/+1
| | | | | | | | | | | | | | Distclean should remove anything created by the configure script. Signed-off-by: Alexandre Raymond <cerbere@gmail.com> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
* | coroutine: add test-coroutine automated testsStefan Hajnoczi2011-08-021-1/+2
|/ | | | | | | | | | | | | To run automated tests for coroutines: make test-coroutine ./test-coroutine On success the program terminates with exit status 0. On failure an error message is written to stderr and the program exits with exit status 1. Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
* Makefile: add missing deps on $(GENERATED_HEADERS)Michael Roth2011-07-271-1/+3
| | | | | | | | | This fixes a build issue with make -j6+ due to qapi-generated files being built before $(GENERATED_HEADERS) have been created. Tested-by: Stefan Berger <stefanb@linux.vnet.ibm.com> Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
* Makefile: Minor cscope fixupsAlexandre Raymond2011-07-271-1/+1
| | | | | | | | | Create cscope symbols for assembly files in addition to .c/.h files. Create cscope database with full path instead of relative path so cscope can be used with CSCOPE_DB in any directory. Signed-off-by: Alexandre Raymond <cerbere@gmail.com> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
* Let users select their pythonsBlue Swirl2011-07-251-6/+6
| | | | | | | Add configure check for python, exit if not found. Add switches for specifying the path to python, use the path in Makefile. Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* guest agent: add guest agent RPCs/commandsMichael Roth2011-07-211-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the initial set of QMP/QAPI commands provided by the guest agent: guest-sync guest-ping guest-info guest-shutdown guest-file-open guest-file-read guest-file-write guest-file-seek guest-file-flush guest-file-close guest-fsfreeze-freeze guest-fsfreeze-thaw guest-fsfreeze-status The input/output specification for these commands are documented in the schema. Example usage: host: qemu -device virtio-serial \ -chardev socket,path=/tmp/vs0.sock,server,nowait,id=qga0 \ -device virtserialport,chardev=qga0,name=org.qemu.quest_agent.0 ... echo "{'execute':'guest-info'}" | socat stdio unix-connect:/tmp/qga0.sock guest: qemu-ga -m virtio-serial -p /dev/virtio-ports/org.qemu.guest_agent.0 \ -p /var/run/qemu-guest-agent.pid -d Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> Signed-off-by: Luiz Capitulino <lcapitulino@gmail.com>
* guest agent: qemu-ga daemonMichael Roth2011-07-211-3/+5
| | | | | | | | | | | | | | | | | | | This is the actual guest daemon, it listens for requests over a virtio-serial/isa-serial/unix socket channel and routes them through to dispatch routines, and writes the results back to the channel in a manner similar to QMP. A shorthand invocation: qemu-ga -d Is equivalent to: qemu-ga -m virtio-serial -p /dev/virtio-ports/org.qemu.guest_agent.0 \ -f /var/run/qemu-ga.pid -d Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> Signed-off-by: Luiz Capitulino <lcapitulino@gmail.com>
* guest agent: command state classMichael Roth2011-07-211-1/+3
| | | | | Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> Signed-off-by: Luiz Capitulino <lcapitulino@gmail.com>
* qapi: add test-qmp-commands, tests for gen. marshalling/dispatch codeMichael Roth2011-07-211-1/+7
| | | | | Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> Signed-off-by: Luiz Capitulino <lcapitulino@gmail.com>
* qapi: add test-visitor, tests for gen. visitor codeMichael Roth2011-07-211-2/+17
| | | | | Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> Signed-off-by: Luiz Capitulino <lcapitulino@gmail.com>
* Add hard build dependency on glibAnthony Liguori2011-07-211-0/+2
| | | | | | | | | | | | | | | | GLib is an extremely common library that has a portable thread implementation along with tons of other goodies. GLib and GObject have a fantastic amount of infrastructure we can leverage in QEMU including an object oriented programming infrastructure. Short term, it has a very nice thread pool implementation that we could leverage in something like virtio-9p. It also has a test harness implementation that this series will use. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> Signed-off-by: Luiz Capitulino <lcapitulino@gmail.com>
* libcacard: add libcacard.la targetAlon Levy2011-06-141-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No flag to configure is required. Instead, added a libcacard.la target that is not built by default, only when requested explicitly via: mkdir build cd build ../configure make libcacard.la make install-libcacard Uses libtool to do actual linking of object files and shared library, and installing. Tested only under linux, but supposed to work on other systems as well. If libtool isn't found you get a message complaining about that, only at build time (since it is not a default target I did not add a message at configure time). New build artifacts: .libs subdirectories (at <buildroot> and <buildroot>/libcacard) *.lo files (at same locations as the respective o files) Added %.lo : %.c rule that uses libtool. Updated clean rule to clean up those artifacts. Added specific rule to call dtrace with libtool wrapper (note that because of a current upstream dtrace bug fixed by systemtap b1568fd85 commit the -fPIC flag isn't actually passed on. still current dtrace+libtool produced object links fine). If libtool is missing any of the following targets will complain and exit 1: any subdir: *.lo root and libcacard: libcacard.la, libcacard-instsall Tested to link and load with all tracing backends.
* json-parser: propagate error from parserAnthony Liguori2011-06-071-2/+2
| | | | | Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* PPC: install mpc8544ds.dtbAlexander Graf2011-06-031-0/+1
| | | | | | | We don't install mpc8544ds.dtb, which means that -M mpc8544ds doesn't work when installed. Fix it by installing the file. Signed-off-by: Alexander Graf <agraf@suse.de>
* libcacard: add correct subdirectory dependenciesPaolo Bonzini2011-05-081-0/+2
| | | | | | Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Cc: qemu-trivial@nongnu.org Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
* Merge remote-tracking branch 'awilliam/ipxe' into stagingAnthony Liguori2011-04-251-8/+8
|\
| * PXE: Use consistent naming for PXE ROMsAlex Williamson2011-04-181-8/+8
| | | | | | | | | | | | And add missing ROMs to tarbin build target. Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
* | Makefile: Clean up after "make pdf"Brad Hards2011-04-161-1/+4
|/ | | | | Signed-off-by: Brad Hards <bradh@frogmouth.net> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
* libcacard: initial commitRobert Relyea2011-04-011-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libcacard emulates a Common Access Card (CAC) which is a standard for smartcards. It is used by the emulated ccid card introduced in a following patch. Docs are available in docs/libcacard.txt Signed-off-by: Alon Levy <alevy@redhat.com> --- changes from v24->v25: * Fix out of tree builds. * Fix build with linux-user targets. changes from v23->v24: (Jes Sorensen review 2) * Makefile.target: use obj-$(CONFIG_*) += * remove unrequired includes, include qemu-common before qemu-thread * required adding #define NO_NSPR_10_SUPPORT (harmless) changes from v22->v23: * configure fixes: (reported by Stefan Hajnoczi) * test a = b, not a == b (second isn't portable) * quote $source_path in case it contains spaces - this doesn't really help since there are many other places that need similar fixes, not introduced by this patch. changes from v21->v22: * fix configure to not link libcacard if nss not found (reported by Stefan Hajnoczi) * fix vscclient linkage with simpletrace backend (reported by Stefan Hajnoczi) * card_7816.c: add missing break in ERROR_DATA_NOT_FOUND (reported by William van de Velde) changes from v20->v21: (Jes Sorensen review) * use qemu infrastructure: qemu-thread, qemu-common (qemu_malloc and qemu_free), error_report * assert instead of ASSERT * cosmetic fixes * use strpbrk and isspace * add --disable-nss --enable-nss here, instead of in the final patch. * split vscclient, passthru and docs to following patches. changes from v19->v20: * checkpatch.pl changes from v15->v16: Build: * don't erase self with distclean * fix make clean after make distclean * Makefile: make vscclient link quiet Behavioral: * vcard_emul_nss: load coolkey in more situations * vscclient: * use hton,ntoh * send init on connect, only start vevent thread on response * read payload after header check, before type switch * remove Reconnect * update for vscard_common changes, empty Flush implementation Style/Whitespace: * fix wrong variable usage * remove unused variable * use only C style comments * add copyright header * fix tabulation Signed-off-by: Alon Levy <alevy@redhat.com> libcacard: fix out of tree builds
* trace: move trace objects from Makefile to Makefile.objsAlon Levy2011-04-011-32/+0
|
* Add SLOF-based partition firmware for pSeries machine, allowing more boot ↵David Gibson2011-04-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | options Currently, the emulated pSeries machine requires the use of the -kernel parameter in order to explicitly load a guest kernel. This means booting from the virtual disk, cdrom or network is not possible. This patch addresses this limitation by inserting a within-partition firmware image (derived from the "SLOF" free Open Firmware project). If -kernel is not specified, qemu will now load the SLOF image, which has access to the qemu boot device list through the device tree, and can boot from any of the usual virtual devices. In order to support the new firmware, an extension to the emulated machine/hypervisor is necessary. Unlike Linux, which expects multi-CPU entry to be handled kexec() style, the SLOF firmware expects only one CPU to be active at entry, and to use a hypervisor RTAS method to enable the other CPUs one by one. This patch also implements this 'start-cpu' method, so that SLOF can start the secondary CPUs and marshal them into the kexec() holding pattern ready for entry into the guest OS. Linux should, and in the future might directly use the start-cpu method to enable initially disabled CPUs, but for now it does require kexec() entry. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org> Signed-off-by: David Gibson <dwg@au1.ibm.com> Signed-off-by: Alexander Graf <agraf@suse.de>
* Implement hcall based RTAS for pSeries machinesDavid Gibson2011-04-011-1/+2
| | | | | | | | | | | | | | | | | On pSeries machines, operating systems can instantiate "RTAS" (Run-Time Abstraction Services), a runtime component of the firmware which implements a number of low-level, infrequently used operations. On logical partitions under a hypervisor, many of the RTAS functions require hypervisor privilege. For simplicity, therefore, hypervisor systems typically implement the in-partition RTAS as just a tiny wrapper around a hypercall which actually implements the various RTAS functions. This patch implements such a hypercall based RTAS for our emulated pSeries machine. A tiny in-partition "firmware" calls a new hypercall, which looks up available RTAS services in a table. Signed-off-by: David Gibson <dwg@au1.ibm.com> Signed-off-by: Alexander Graf <agraf@suse.de>
* microblaze: Add PetaLogix ml605 MMU little-endian ref designMichal Simek2011-03-161-1/+1
| | | | | | | | Add the first Microblaze little endian platform. Platform uses uart16550, axi ethernet, timer, intc. Signed-off-by: Michal Simek <monstr@monstr.eu> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@petalogix.com>
* Add scripts directoryBlue Swirl2011-01-201-13/+13
| | | | | | Move build and user scripts into scripts directory. Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
OpenPOWER on IntegriCloud