summaryrefslogtreecommitdiff
path: root/Makefile
AgeCommit message (Collapse)AuthorFilesLines
2011-05-03Merge commit '5ee8ad71e159e724e2fa1af6b2c502668179502a' into upstream-mergeMarcelo Tosatti1-8/+8
* commit '5ee8ad71e159e724e2fa1af6b2c502668179502a': PXE: Use consistent naming for PXE ROMs Add ipxe submodule Conflicts: Makefile Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2011-05-03Merge commit '3110e2925489c571901e945e315942ce84fe696f' into upstream-mergeMarcelo Tosatti1-1/+4
* commit '3110e2925489c571901e945e315942ce84fe696f': (41 commits) s390x: Enable s390x-softmmu target s390x: Prepare cpu.h for emulation move helpers.h to helper.h libcacard: fix opposite usage of isspace target-mips: clear softfpu exception state for comparison instructions target-mips: fix c.ps.* instructions target-mips: don't hardcode softfloat exception bits target-mips: simplify FP comparisons target-ppc: fix SPE comparison functions softfloat: improve description of comparison functions softfloat: move float*_eq and float*_eq_quiet softfloat: rename float*_eq_signaling() into float*_eq() softfloat: rename float*_eq() into float*_eq_quiet() target-i386: fix CMPUNORDPS/D and CMPORDPS/D instructions target-mips: use new float*_unordered*() functions target-alpha: use new float64_unordered_quiet() function softfloat-native: add float*_unordered_quiet() functions softfloat: add float*_unordered_{,quiet}() functions target-i386: add floatx_{add,mul,sub} and use them target-i386: use float unions from cpu-all.h ... Conflicts: cpu-exec.c Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2011-04-18PXE: Use consistent naming for PXE ROMsAlex Williamson1-8/+8
And add missing ROMs to tarbin build target. Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
2011-04-16Makefile: Clean up after "make pdf"Brad Hards1-1/+4
Signed-off-by: Brad Hards <bradh@frogmouth.net> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
2011-04-15Merge commit '23910d3f669d46073b403876e30a7314599633af' into upstream-mergeMarcelo Tosatti1-34/+4
* commit '23910d3f669d46073b403876e30a7314599633af': (109 commits) acpi, acpi_piix: factor out GPE logic arm: basic support for ARMv4/ARMv4T emulation Fix conversions from pointer to tcg_target_long vnc: tight: Fix crash after 2GB of output smbus_eeprom: consolidate smbus eeprom creation oc pc_piix, mips_mapta, mips_fulong lan9118: Ignore write to MAC_VLAN1 register acpi, acpi_piix, vt82c686: factor out PM1_CNT logic acpi, acpi_piix, vt82c686: factor out PM1a EVT logic acpi, acpi_piix, vt82c686: factor out PM_TMR logic hw/pflash_cfi02: Fix lazy reset of ROMD mode configure: avoid basename usage message mpc85xx_pci_map_irq: change "unknow" to "unknown" event: trivial coding style fixes multiboot: Quote filename in error message ppce500_mpc8544ds: Fix compile with --enable-debug and --disable-kvm Use existing helper function to implement popcntd instruction Delay creation of pseries device tree until reset pseries: Abolish envs array spapr_vscsi: Set uninitialized variable Don't call cpu_synchronize_state() from machine init. ... Conflicts: hw/acpi_piix4.c Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2011-04-14Merge commit 'a9f8ad8f2acdb2398da5d32a5efc19cb0196d79f' into upstream-mergeMarcelo Tosatti1-1/+1
* commit 'a9f8ad8f2acdb2398da5d32a5efc19cb0196d79f': Add SLOF-based partition firmware for pSeries machine, allowing more boot options Implement PAPR VPA functions for pSeries shared processor partitions Add a PAPR TCE-bypass mechanism for the pSeries machine Implement PAPR virtual SCSI interface (ibmvscsi) Implement PAPR CRQ hypercalls Implement sPAPR Virtual LAN (ibmveth) Implement TCE translation for sPAPR VIO Add (virtual) interrupt to PAPR virtual tty device Add PAPR H_VIO_SIGNAL hypercall and infrastructure for VIO interrupts Implement the PAPR (pSeries) virtualized interrupt controller (xics) Implement assorted pSeries hcalls and RTAS methods Conflicts: Makefile Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2011-04-14Merge commit '39ac8455106af1ed669b8e10223420cf1ac5b190' into upstream-mergeMarcelo Tosatti1-1/+2
* commit '39ac8455106af1ed669b8e10223420cf1ac5b190': Implement hcall based RTAS for pSeries machines Virtual hash page table handling on pSeries machine Implement the bus structure for PAPR virtual IO Start implementing pSeries logical partition machine Add POWER7 support for ppc Support 1T segments on ppc Better factor the ppc hash translation path Use "hash" more consistently in ppc mmu code Parse SDR1 on mtspr instead of at translate time Clean up slb_lookup() function Correct ppc popcntb logic, implement popcntw and popcntd Implement missing parts of the logic for the POWER PURR Implement PowerPC slbmfee and slbmfev instructions Conflicts: Makefile Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2011-04-14Merge commit 'ca22a3a3758ee7ab14166058d4ce36bc6cdfdfd8' into upstream-mergeMarcelo Tosatti1-1/+1
* commit 'ca22a3a3758ee7ab14166058d4ce36bc6cdfdfd8': i8254: Fix migration from older versions microblaze: Add PetaLogix ml605 MMU little-endian ref design xilinx: Add AXIENET & DMA models microblaze: Compile uart 16550 serial driver win32: implement missing timersub simpletrace: Move st_init() error reporting Conflicts: hw/i8254.c Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2011-04-01libcacard: initial commitRobert Relyea1-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
2011-04-01trace: move trace objects from Makefile to Makefile.objsAlon Levy1-32/+0
2011-04-01Add SLOF-based partition firmware for pSeries machine, allowing more boot ↵David Gibson1-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>
2011-04-01Implement hcall based RTAS for pSeries machinesDavid Gibson1-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>
2011-03-16microblaze: Add PetaLogix ml605 MMU little-endian ref designMichal Simek1-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>
2011-01-21Merge commit 'b947c12c0bb217fe09968e652873e0d22b269d68' into upstream-mergeMarcelo Tosatti1-13/+13
* commit 'b947c12c0bb217fe09968e652873e0d22b269d68': (130 commits) sm501: fix screen redraw checkpatch: adjust to QEMUisms Add checkpatch.pl from Linux kernel Add scripts directory gt64xxx: set isa_mem_base during registration hw/pl190.c: Fix writing of default vector address target-ppc: fix wrong NaN tests target-ppc: fix sNaN propagation pci: use qemu_malloc() in pcibus_get_dev_path() msix: simplify write config msi: simplify write config a bit. pci: deassert intx on reset. pxa2xx_lcd: restore updating of display pxa2xx: fix vmstate_pxa2xx_i2c scoop: fix access to registers from second instance mainstone: fix name of the allocated memory for roms add bepo (french dvorak) keyboard layout stc91c111: Implement save/restore pl080: Implement save/restore pl110: Implement save/restore ... Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2011-01-20Add scripts directoryBlue Swirl1-13/+13
Move build and user scripts into scripts directory. Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
2011-01-06Merge commit 'a19cbfb346425cc760ed19b4e746417df636b761' into upstream-mergeMarcelo Tosatti1-1/+1
* commit 'a19cbfb346425cc760ed19b4e746417df636b761': spice: add qxl device spice: add qxl vgabios binary. Conflicts: Makefile.target Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2011-01-06Merge commit '2507c12ab026b2286b0a47035c629f3d568c96f4' into upstream-mergeMarcelo Tosatti1-1/+0
* commit '2507c12ab026b2286b0a47035c629f3d568c96f4': (89 commits) Add endianness as io mem parameter exec: introduce endianness swapped mmio noaudio: fix return value for read() ppc: kvm: fix signedness warning Speedup 'tb_find_slow' by using the same heuristic as during memory page lookup Remove unused spin_trylock() function darwin-user: Use GCC_FMT_ATTR (format checking) audio: Use GCC_FMT_ATTR (format checking) target-sparc: Use fprintf_function (format checking) *-dis: Replace fprintf_ftype by fprintf_function (format checking) Fix mingw32 and OpenBSD warnings exec: Remove debugging fprintf() that slipped into qemu_ram_alloc_from_ptr() linux-user: fix mips and ppc to use UID16 update binfmt conf linux-user: fix compiler error on nptl ARM: linux-user: Restore iWMMXT state from ucontext on sigreturn ARM: linux-user: Expose iWMMXT registers to signal handlers ARM: linux-user: Restore VFP state from ucontext on sigreturn ARM: linux-user: Expose VFP registers to signal handlers ARM: Expose vfp_get_fpscr() and vfp_set_fpscr() to C code ... Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2011-01-06Merge commit '661a1799ba6544a54888283db19dd51469da01e5' into upstream-mergeMarcelo Tosatti1-6/+7
* commit '661a1799ba6544a54888283db19dd51469da01e5': Add pcnet-pci.c Split out common pcnet code Remove PCI from sparc32 target Detect missing config includes Fix previous commit VirtIO config option PCI config include Include directives in default configs Add missing dependency. Conflicts: Makefile.objs Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2010-12-09spice: add qxl vgabios binary.Gerd Hoffmann1-1/+1
Just compiled from vgabios git repo @ git.qemu.org, copyed over and committed. Also added to the list of blobs in the Makefile. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2010-12-02Merge commit 'f711df67d611e4762966a249742a5f7499e19f99' into upstream-mergeMarcelo Tosatti1-6/+31
* commit 'f711df67d611e4762966a249742a5f7499e19f99': (41 commits) microblaze: target-ify target_ucontext virtio-pci: Convert fprintf() to error_report() virtio-net: Convert fprintf() to error_report() virtio: Convert fprintf() to error_report() virtio-blk: Convert fprintf() to error_report() vgabios update: handle compatibility with older qemu versions pcnet: Do not receive external frames in loopback mode piix4 acpi: convert io BAR to type-safe ioport callbacks Type-safe ioport callbacks trace: Trace vm_start()/vm_stop() virtfs: enable MSI-X pc: add 0.13 pc machine type trace: Use fprintf_function (format checking) slirp: Remove unused code for bad sprintf pc: disable the BOCHS BIOS panic port optionrom: fix bugs in signrom.sh Makefile: Fix check dependency breakage block migration: do not submit multiple AIOs for same sector block: set sector dirty on AIO write completion block: fix shift in dirty bitmap calculation ... Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2010-12-02Merge commit '3b3d448e01ccfc6fdcb6e3d4ebf47418075e3bb4' into upstream-mergeMarcelo Tosatti1-2/+3
* commit '3b3d448e01ccfc6fdcb6e3d4ebf47418075e3bb4': Add new vgabios binaries to blobs list. Conflicts: pc-bios/vgabios-cirrus.bin pc-bios/vgabios.bin Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2010-12-01Merge remote branch 'origin/master' into pciMichael S. Tsirkin1-14/+41
Conflicts: Makefile.objs hw/virtio.c
2010-11-26Include directives in default configsPaul Brook1-5/+6
Allow default configs to be split into several files. Signed-off-by: Paul Brook <paul@codesourcery.com>
2010-11-26Add missing dependency.Paul Brook1-1/+1
Teach Makefile that cmd.o depends on a generated header (specifically config-host.h). Signed-off-by: Paul Brook <paul@codesourcery.com>
2010-11-22eepro100: Use a single rom file for all i825xx devicesStefan Weil1-1/+0
Patching the rom data during load (in qemu) now also supports i82801 (which had no rom file). We only need a single rom file for the whole device family, so remove the second one which is no longer needed. Cc: Markus Armbruster <armbru@redhat.com> Cc: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
2010-11-21Makefile: Fix check dependency breakageLuiz Capitulino1-6/+8
Commit b152aa84d52882bb1846485a89baf13aa07c86bc broke the unit-tests build, fix it. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2010-11-21Add a DTrace tracing backend targetted for SystemTAP compatabilityDaniel P. Berrange1-0/+23
This introduces a new tracing backend that targets the SystemTAP implementation of DTrace userspace tracing. The core functionality should be applicable and standard across any DTrace implementation on Solaris, OS-X, *BSD, but the Makefile rules will likely need some small additional changes to cope with OS specific build requirements. This backend builds a little differently from the other tracing backends. Specifically there is no 'trace.c' file, because the 'dtrace' command line tool generates a '.o' file directly from the dtrace probe definition file. The probe definition is usually named with a '.d' extension but QEMU uses '.d' files for its external makefile dependancy tracking, so this uses '.dtrace' as the extension for the probe definition file. The 'tracetool' program gains the ability to generate a trace.h file for DTrace, and also to generate the trace.d file containing the dtrace probe definition. Example usage of a dtrace probe in systemtap looks like: probe process("qemu").mark("qemu_malloc") { printf("Malloc %d %p\n", $arg1, $arg2); } * .gitignore: Ignore trace-dtrace.* * Makefile: Extra rules for generating DTrace files * Makefile.obj: Don't build trace.o for DTrace, use trace-dtrace.o generated by 'dtrace' instead * tracetool: Support for generating DTrace data files Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> Signed-off-by: Daniel P. Berrange <berrange@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2010-11-21Revert "Add a DTrace tracing backend targetted for SystemTAP compatability"Anthony Liguori1-23/+0
This reverts commit 4addb1127f6327c7ebcbd150a6b589e7677adc92.
2010-11-16Add a DTrace tracing backend targetted for SystemTAP compatabilityDaniel P. Berrange1-0/+23
This introduces a new tracing backend that targets the SystemTAP implementation of DTrace userspace tracing. The core functionality should be applicable and standard across any DTrace implementation on Solaris, OS-X, *BSD, but the Makefile rules will likely need some small additional changes to cope with OS specific build requirements. This backend builds a little differently from the other tracing backends. Specifically there is no 'trace.c' file, because the 'dtrace' command line tool generates a '.o' file directly from the dtrace probe definition file. The probe definition is usually named with a '.d' extension but QEMU uses '.d' files for its external makefile dependancy tracking, so this uses '.dtrace' as the extension for the probe definition file. The 'tracetool' program gains the ability to generate a trace.h file for DTrace, and also to generate the trace.d file containing the dtrace probe definition. Example usage of a dtrace probe in systemtap looks like: probe process("qemu").mark("qemu_malloc") { printf("Malloc %d %p\n", $arg1, $arg2); } * .gitignore: Ignore trace-dtrace.* * Makefile: Extra rules for generating DTrace files * Makefile.obj: Don't build trace.o for DTrace, use trace-dtrace.o generated by 'dtrace' instead * tracetool: Support for generating DTrace data files Signed-off-by: Daniel P. Berrange <berrange@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2010-11-16Add new vgabios binaries to blobs list.Gerd Hoffmann1-2/+3
aliguori: update VGA BIOS Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2010-11-14Merge remote branch 'upstream' into upstream-mergeAvi Kivity1-1/+1
* upstream: (46 commits) add copyright to spiceaudio spice: add audio intel-hda: fix codec addressing. Revert "intel-hda: fix codec addressing." intel-hda: fix codec addressing. intel-hda: add msi support intel-hda: update irq status on WAKEEN changes. intel-hda: Honor WAKEEN bits. hda-audio: exit cleanup intel-hda: exit cleanup Fix win32 build scsi-disk: Fix immediate failure of bdrv_aio_* virtio-blk: Handle immediate flush failure properly ide: Handle immediate bdrv_aio_flush failure block: avoid a warning on 64 bit hosts with long as int64_t qcow2: Invalidate cache after failed read vpc: Implement bdrv_flush scsi-disk: Implement werror for flushes scsi-disk: Complete failed requests in scsi_disk_emulate_command block: Allow bdrv_flush to return errors ... Signed-off-by: Avi Kivity <avi@redhat.com>
2010-11-14Merge commit 'c1b0b93b06ab026ef45ae02d0ee7557741910637' into upstream-mergeAvi Kivity1-3/+3
* commit 'c1b0b93b06ab026ef45ae02d0ee7557741910637': Move QEMU OS dependant library functions to OS specific files target-xxx: Use fprintf_function (format checking) Conflicts: osdep.c Signed-off-by: Avi Kivity <avi@redhat.com>
2010-11-14Merge commit 'b907b69dd75415bc28349d1dd1e9a598ddace463' into upstream-mergeAvi Kivity1-2/+5
* commit 'b907b69dd75415bc28349d1dd1e9a598ddace463': (24 commits) pcie: update satus on reset msi: minor cleanups msi: simplify range checks pci: improve w1c mask handling pcie: clean up hot plug notification pcie: simplify range check Introduce range.h qemu-options.def: add to generated header list net: properly handle illegal fd/vhostfd from command line virtio: sanity-check available index migration: don't segfault on invalid input x3130: pcie downstream port x3130: pcie upstream port ioh3420: pcie root port in X58 ioh pcie port: define struct PCIEPort/PCIESlot and helper functions pci/bridge: fix pci_bridge_reset() pcie: comment on hpev_intx pcie: helper functions for pcie capability and extended capability pcie: add pcie constants to pcie_regs.h msi: implements msi ... Conflicts: Makefile.objs hw/pci.c Signed-off-by: Avi Kivity <avi@redhat.com>
2010-11-01Fix out of tree buildBlue Swirl1-1/+1
df2943ba3c73ca21dbda063f15fa3e80064af864 broke out of tree build. Fix breakage by adding $(SRC_PATH). Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
2010-11-01Merge remote branch 'mst/for_anthony' into stagingAnthony Liguori1-2/+5
2010-10-30Move QEMU OS dependant library functions to OS specific filesJes Sorensen1-3/+3
This moves library functions used by both QEMU and the QEMU tools, such as qemu-img, qemu-nbd etc. from osdep.c to oslib-{posix,win32}.c In addition it introduces oslib-obj.y to the Makefile set to be included by the various targets, instead of relying on these library functions magically getting included via block-obj-y. Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
2010-10-28Merge branch 'master' of git://git.sv.gnu.org/qemu into nextAvi Kivity1-9/+9
* 'master' of git://git.sv.gnu.org/qemu: (26 commits) seabios: Update to 0.6.1 qemu-timer: move commonly used timer code to qemu-timer-common rewrite i386 tests Makefile fix test_path make runcom compile on recent distributions disable test_enter on i386, it is broken unbreak "make" from vpath-built tests directory unbreak "make" from tests directory mips_fulong2e: fix ram allocation Replace remaining gcc format attributes by macro GCC_FMT_ATTR (format checking) Remove special handling of system include files (no longer needed) virtio-blk: Respect werror option for flushes ide: Handle flush failure ide: Factor ide_flush_cache out qemu-img: Fix qemu-img convert -obacking_file block: Use GCC_FMT_ATTR and fix a format error qemu-io: New command map Copy snapshots out of QCOW2 disk ide: set WCACHE supported in IDENTIFY data qcow2: Remove old image creation function ... Signed-off-by: Avi Kivity <avi@redhat.com>
2010-10-27qemu-options.def: add to generated header listMichael S. Tsirkin1-2/+5
All files include qemu-options.h which pulls in qemu-options.def from the root directory. Thus generating qemu-options.def from Makefile.objs under the target directory is not effective. Further, people expect .def file to get cleaned with make clean: it does not have state so no reason to defer removing it until distclean. Also add a rule to remove old files that might be around. This fixes the error: ‘QEMU_OPTION_spice’ undeclared (first use in this function) error that some people reported which is really down to an out of date .def file. Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
2010-10-26Merge remote branch 'qmp/for-anthony' into stagingAnthony Liguori1-6/+6
2010-10-23qemu-timer: move commonly used timer code to qemu-timer-commonBlue Swirl1-3/+3
Move timer init functions to a new file, qemu-timer-common.c. Make other critical timer functions inlined to preserve performance in qemu-timer.c, also move muldiv64() (used by the inline functions) to qemu-timer.h. Adjust block/raw-posix.c and simpletrace.c to use get_clock() directly. Remove a similar/duplicate definition in qemu-tool.c. Adjust hw/omap_clk.c to include qemu-timer.h because muldiv64() is used there. After this change, tracing can be used also for user code and simpletrace on Win32. Cc: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> Acked-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
2010-10-22Fix test suite build with tracing enabledJan Kiszka1-6/+6
qemu_malloc instrumentations require linking against the trace objects. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Acked-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
2010-10-18Merge commit '38cc9b607f85017b095793cab6c129bc9844f441' into upstream-mergeMarcelo Tosatti1-4/+3
* commit '38cc9b607f85017b095793cab6c129bc9844f441': (44 commits) issue snd_pcm_start() when capturing audio fix 100% CPU load when idle with ALSA trace: print a warning if user tries to enable an unknown trace event mips: avoid write only variables ppc: avoid write only variables i386: avoid a write only variable vnc: avoid write only variables cris: avoid a write only variable Delete write only variables ppc: remove video.x lsi53c895a: avoid a write only variable eepro100: initialize a variable in all cases cirrus: avoid write only variables block: avoid a write only variable trace: remove timestamp files when cleaning up configure: Send error message from spice check to /dev/null win32: Set unbuffered stdout .gitignore: Ignore *-timestamp acpi: Fix an infinite loop in acpi_table_add configure: Remove unneeded defines from checks ... Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2010-10-18Merge commit 'afbaa7b4382faced3c364606a5e5d5389462147b' into upstream-mergeMarcelo Tosatti1-7/+13
* commit 'afbaa7b4382faced3c364606a5e5d5389462147b': (24 commits) virtio-net: unify vhost-net start/stop virtio: invoke set_status callback on reset net: delay freeing peer host device console: Avoid dereferencing NULL active_console exec: Fix compilation error for debug code rc4030: Fix compilation error in debug code mipsnet: Fix compiler warning in debug code block/vvfat: Fix compiler warning in debug code virtio-9p: Use GCC_FMT_ATTR and fix a format warning blockdev: Use GCC_FMT_ATTR (format checking) Use GCC_FMT_ATTR (format checking) Replace most gcc format attributes by macro GCC_FMT_ATTR (format checking) slirp: Silence warning on Haiku tap: Add stub for Haiku nbd: Haiku has _IO() in its BSD compatibility layer Haiku doesn't have libm configure: Don't rely on special pthreads library configure: Add basic support for Haiku trace: avoid unnecessary recompilation if nothing changed Makefile: fix config-devices.mak generation ... Conflicts: hw/virtio-net.c Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2010-10-18Merge commit '30f5041ef1ba534af9308d840bf359a50597ba5d' into upstream-mergeMarcelo Tosatti1-4/+8
* commit '30f5041ef1ba534af9308d840bf359a50597ba5d': (23 commits) Monitor: Drop QMP info from the qemu-monitor.hx file QMP: Small cleanup in handle_qmp_command() QMP: Simplify do_info_commands() QMP: Introduce query commands dispatch table QMP: Introduce command dispatch table QMP: Introduce qmp_find_cmd() Monitor: Introduce the qmp-commands.hx file Monitor: Convert do_info() back to HMP Monitor: Drop is_async_return() Monitor: Drop QMP bits from do_info() QMP: Don't use do_info() QMP: handle_qmp_command(): Move 'cmd' sanity check Monitor: Introduce search_dispatch_table() disable guest-provided stats on "info balloon" command Add option to turn on JSON pretty printing in monitor Add support for JSON pretty printing powerpc: Add a virtex5 ml507 refdesign board powerpc: Add a ppc-440x5 Xilinx model tap: Remove double include of util.h pulse-audio: fix bug on updating rpos ... Conflicts: qemu-monitor.hx Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2010-10-13ppc: remove video.xBlue Swirl1-2/+1
Only Mac-on-Linux stuff used video.x, OpenBIOS does not need it. Remove video.x MoL hacks. Signed-off-by: Alexander Graf <agraf@suse.de> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
2010-10-09trace: remove timestamp files when cleaning upBlue Swirl1-1/+1
'make clean' did not remove trace.[ch]-timestamp files, only trace.[ch]. But 'make' did not know how to make trace.[ch] files if the timestamp files were present. Fix by removing the timestamp files along with trace.[ch]. Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
2010-10-05Merge remote branch 'qmp/for-anthony' into stagingAnthony Liguori1-2/+2
2010-10-02trace: avoid unnecessary recompilation if nothing changedBlue Swirl1-5/+9
Add logic to detect changes in generated files. If the old and new files are identical, don't touch the generated file. This avoids a lot of churn since many files depend on trace.h. Based on suggestion by Paolo Bonzini. Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
2010-10-02Makefile: fix config-devices.mak generationBlue Swirl1-3/+5
The logic of detecting changes in default-configs/*.mak is flawed as can be demonstrated by 'touch default-configs/*.mak' followed by make. This results in a message claiming that user made changes to the */config-devices.mak files. Fix by separating the detection of changes made by the user and changes in the default-configs. Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
2010-10-01Monitor: Rename the qemu-monitor.hx fileLuiz Capitulino1-1/+1
Let's be consistent and call it hmp-commands.hx, so that we have qmp-commands.hx for QMP and hmp-commands.hx for HMP. Please, note that this commit doesn't touch qemu-monitor.texi. All texi files have the qemu- prefix and I don't think it's worth changing that. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-05 13:55:14 +0000