summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * Fix user targets broken by 96e132e24ee5a693069e83b6a981693588b088c1Blue Swirl2009-09-211-3/+3
| | | | | | | | Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* | Merge commit 'c2b023b62707f5dc73497dc03f3764f145a29785' into upstream-mergeAvi Kivity2009-09-211-3/+4
|\| | | | | | | | | | | | | | | | | | | * commit 'c2b023b62707f5dc73497dc03f3764f145a29785': Compile host-utils only once Conflicts: Makefile.target Signed-off-by: Avi Kivity <avi@redhat.com>
| * Compile host-utils only onceBlue Swirl2009-09-201-4/+4
| | | | | | | | | | | | | | See also facd2857783d58387885ad7cb1e4a8386f241738 and 34005a0060c176b3025a9e7c5d064615a9f80325. Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* | Merge commit '96e132e24ee5a693069e83b6a981693588b088c1' into upstream-mergeAvi Kivity2009-09-211-2/+4
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '96e132e24ee5a693069e83b6a981693588b088c1': Compile TCG runtime library only once Fix spelling in comment Compile ne2000 only once Conflicts: Makefile.target Signed-off-by: Avi Kivity <avi@redhat.com>
| * Compile TCG runtime library only onceBlue Swirl2009-09-201-1/+4
| | | | | | | | Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
| * Compile ne2000 only onceBlue Swirl2009-09-201-1/+0
| | | | | | | | Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* | Merge commit 'afcea8cbdea8180b42093377b2c700d1b7f20b7c' into upstream-mergeAvi Kivity2009-09-211-1/+1
|\| | | | | | | | | | | | | * commit 'afcea8cbdea8180b42093377b2c700d1b7f20b7c': ioports: remove unused env parameter and compile only once Signed-off-by: Avi Kivity <avi@redhat.com>
| * ioports: remove unused env parameter and compile only onceBlue Swirl2009-09-201-1/+1
| | | | | | | | | | | | | | The CPU state parameter is not used, remove it and adjust callers. Now we can compile ioport.c once for all targets. Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* | Merge commit '5e520a7d500ec2569d22d80f9ef4272a34cb3c80' into upstream-mergeAvi Kivity2009-09-211-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5e520a7d500ec2569d22d80f9ef4272a34cb3c80': Compile msix only once Conflicts: hw/msix.c hw/pci.h Add horrible hack in qemu-kvm.h to allow it to compile on target-independent files. Signed-off-by: Avi Kivity <avi@redhat.com>
| * Compile msix only onceBlue Swirl2009-09-201-1/+1
| | | | | | | | | | | | Get page size in device init. Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* | Merge commit 'ca20cf32ab3d945155141ef737f5d08ebb373e1d' into upstream-mergeAvi Kivity2009-09-211-5/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ca20cf32ab3d945155141ef737f5d08ebb373e1d': Compile loader only once Compile qemu-config only once Compile wdt_i6300esb only once Fix mingw32 compile Conflicts: hw/pc.c hw/ppc440_bamboo.c hw/ppce500_mpc8544ds.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * Compile loader only onceBlue Swirl2009-09-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Callers must pass ELF machine, byte swapping and symbol LSB clearing information to ELF loader. A.out loader needs page size information, pass that too as a parameter. Extract prototypes to a separate file. Move loader.[ch] and elf_ops.h under hw. Adjust callers. Also use target_phys_addr_t instead of target_ulong for addresses: loader addresses aren't virtual. Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
| * Compile qemu-config only onceBlue Swirl2009-09-201-1/+1
| | | | | | | | Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
| * Compile wdt_i6300esb only onceBlue Swirl2009-09-201-3/+0
| | | | | | | | Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* | Merge commit '5f6b9e8fd5b9516170e582d9b6c27c98519a8031' into upstream-mergeAvi Kivity2009-09-211-4/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5f6b9e8fd5b9516170e582d9b6c27c98519a8031': (29 commits) Probe for fdatasync() PPC: make system bus parent of PCI bus Fix indentation ESP: convert to VMState target-alpha: fix extlh instruction target-ppc: optimize slw/srw/sld/srd audio: use correct email address audio: internal API change sdlaudio: use correct function names in sdl_XXX calls oss: use audio_pcm_hw_clip_out alsa: use audio_pcm_hw_clip_out audio: introduce audio_pcm_hw_clip_out helper function audio: use muldiv64 where it makes sense coreaudio: fix sloppy "posixification" by 1ea879e5580f63414693655fcf0328559cdce138 tcg: fix size of local variables in tcg_gen_bswap64_i64 qemu serial: lost tx irqs (affecting FreeBSD's new uart(4) driver) fix typo in configure --help escc: fix IRQ routing, broken by 6c319c82223a1766c5d64a20051e5c6ab7b53951 ide/isa: convert to qdev. ide/pci: convert to qdev. ... Conflicts: configure Signed-off-by: Avi Kivity <avi@redhat.com>
| * ide/pci: convert to qdev.Gerd Hoffmann2009-09-151-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this patch applied ide drives (when attached to a pci adapter) can be created via -device, like this: -drive if=none,id=mydisk,file=/path/to/disk.img -device ide-drive,drive=mydisk,bus=ide.0,unit=0 Note that creating a master on ide1 doesn't work that way. That is a side effect of qemu creating a cdrom automagically even if you don't ask for it. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* | Merge commit '5c637a20e9d13433feb05b804b946690287ffe72' into upstream-mergeAvi Kivity2009-09-211-7/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5c637a20e9d13433feb05b804b946690287ffe72': Fix breakage by f80237d45032fbc429aba3b597175fb544a11378 for ISA-less targets Open chr device for all serial ports target-mips: fix single-stepping unbreak ppc/prep Add an ISA bus version of m48t59 Conflicts: Makefile.target Signed-off-by: Avi Kivity <avi@redhat.com>
| * Fix breakage by f80237d45032fbc429aba3b597175fb544a11378 for ISA-less targetsBlue Swirl2009-09-141-7/+7
| | | | | | | | | | | | Move ISA bus to HW library. Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* | piix4_dev is not used for pc'sJuan Quintela2009-09-211-1/+0
| | | | | | | | | | | | | | | | And mips still don't have pci assignment support. piix4.c isn't built for i386 so this could cause a compile problem. Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com>
* | Get CONFIG_CPU_EMULATION back to lifeJuan Quintela2009-09-211-2/+4
| | | | | | | | | | | | | | | | Code compile with --disable-cpu-emulation, and that don't compile tcg. This is the minimal set of changes to get it working Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com>
* | Rename USE_KVM_* to CONFIG_KVM_*Juan Quintela2009-09-181-10/+4
| | | | | | | | | | | | | | Once there, simplify Makefile.target with new syntax Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* | Introduce libs_softmmu to device assignment codeJuan Quintela2009-09-181-2/+0
| | | | | | | | | | Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* | Remove merge artifactsJuan Quintela2009-09-181-8/+0
| | | | | | | | | | | | | | | | | | CFLAGS and LDFLAGS are defined on config.mak LDFLAGS_BASE is not used anywhere DEPLIBS are not defined anywhere Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* | Add test deviceGerd Hoffmann2009-09-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a test device which supports the kvmctl ioports, for running the test suite. Usage: qemu -chardev file,path=/log/file/some/where,id=testlog -device testdev,chardev=testlog Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* | Merge commit '34005a0060c176b3025a9e7c5d064615a9f80325' into upstream-mergeMarcelo Tosatti2009-09-141-11/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '34005a0060c176b3025a9e7c5d064615a9f80325': Add configure option to compile user targets as PIE Fix text relocations in linux-user targets Do not link usermode targets with libhw*.a Work around OpenSolaris sys/regset.h namespace pollution Fix signedness warnings on OpenSolaris Add #defines needed by OpenSolaris, fix breakage by the #defines Fix OpenSolaris build breaking typos Add 'static' Conflicts: Makefile.target Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| * Add configure option to compile user targets as PIEKirill A. Shutemov2009-09-121-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build uset targers as true PIE if user want to keep qemu self-virtualizable. v5: - Split into to patches: drop link hack and add PIE support - do not build PIE by default and drop toolchain check v4: - Add test for toolchain if it has proper PIE support v3: - One more pice of the hack was removed - Description updated v2: - Add configure options do enable/disable PIE for usermode targets. Disabling can be useful if you build uswing toolchain which has broken PIE support. PIE for usermode targets enabled by default. Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* | Merge commit '9453c5bc2634fdbdd05450034c21a58806d366a4' into upstream-mergeMarcelo Tosatti2009-09-141-2/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9453c5bc2634fdbdd05450034c21a58806d366a4': qdev/isa: convert ne2000 qdev/isa: convert gravis ultrasound qdev/isa: convert cs4231a sound card qdev/isa: convert soundblaster qdev: add isa_create() function qdev: tag isabus-bridge as no-user qdev: simplify isa irq assignments qdev: drop iobase properties from isa bus qdev: add property type for 32bit signed integers. isapc: pick a more sane default cpu for such old hardware. isapc: Fix irq routing Allow to unscale the output window with a Ctrl-Alt-u hotkey Conflicts: Makefile.target Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| * qdev/isa: convert ne2000Gerd Hoffmann2009-09-101-2/+3
| | | | | | | | | | | | | | Also split the isa bits into a separate source file, so we don't drag in a dependency for isa-bus.o for machines which want ne2k_pci only. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
* | Merge commit 'e09a5267adf0af25b55d2abaf06e288b2d9537ea' into upstream-mergeAvi Kivity2009-09-101-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e09a5267adf0af25b55d2abaf06e288b2d9537ea': (51 commits) qemu-kvm: fix segfault when running kvm without /dev/kvm, falling back to non-accelerated mode configure: fix Linux AIO detection Fix compilation warnings when DEBUG_BUFFERED_FILE is defined qcow2: Order concurrent AIO requests on the same unallocated cluster qcow2: Fix metadata preallocation fix VNC SASL detection optionrom: make clean should remove raw and .d otionrom: Use local CFLAGS no global one Remove CFLAGS parameter in cc-option Fix for commit 3f9cb1c14dc368f41447db5f78d6248c4f100ad4 mv from strdup to qemu_strdup in qemu-option.c mv strdup to qemu_strdup in vl.c fix vl.c compilation if CONFIG_KVM is not defined fix PATH_MAX conditional compilation eepro100: Clean code which sets the PCI device id qemu-io: Improve portability (win32 now supported). Fix spelling in comment. qdev: convert tcx to reset + vmsd qdev: integrate vmstate qdev: convert rtl8139 to reset ... Conflicts: vl.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * vga: split vga-isa-mm.oJuan Quintela2009-09-091-1/+1
| | | | | | | | | | | | | | | | | | It is only used in mips softmmu, compile only there. it_shift field was only used for vga_isa_mm, move it from VGACommonState to ISAVGAMMstate. Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * vga: split isa bits inco vga-isa.cJuan Quintela2009-09-091-2/+2
| | | | | | | | | | | | | | | | Adjust all the VGAState in VGACommonState Compile vga-isa.o in the targets that use it Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit '47d37dd9c87951e43768edce52c70b9c66315ca4' into upstream-mergeAvi Kivity2009-09-101-3/+6
|\| | | | | | | | | | | | | | | | | | | | | * commit '47d37dd9c87951e43768edce52c70b9c66315ca4': vga: split pci bits into vga-pci.c Conflicts: Makefile.target hw/vga.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * vga: split pci bits into vga-pci.cJuan Quintela2009-09-091-3/+6
| | | | | | | | | | | | | | | | Adjust all the VGAState in VGACommonState Compile vga-pci.o only for targets that use it. Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Use proper way to compile with HELPER_CFLAGSJuan Quintela2009-09-091-3/+1
| | | | | | | | | | | | | | This makes the build quiet. Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com>
* | Merge commit '823e675a073be146a119bb9056ca9f02eb951448' into upstream-mergeAvi Kivity2009-09-091-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '823e675a073be146a119bb9056ca9f02eb951448': Split piix4 support from piix_pci.c piix4 don't use pci_irq_levels at all microblaze: Trap on illegal load/store sizes. microblaze: Correct FPU decoding masks. Add piix4.o to i386 target. Signed-off-by: Avi Kivity <avi@redhat.com>
| * Split piix4 support from piix_pci.cJuan Quintela2009-09-041-1/+1
| | | | | | | | | | | | | | Now mips_malta uses piix4 and pc's use piix_pci definitions Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit '382f074371f7dc32a34c944c845b1698e83d8c36' into upstream-mergeAvi Kivity2009-08-301-5/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '382f074371f7dc32a34c944c845b1698e83d8c36': switch balloon initialization to -device. ide: move code to hw/ide/ ide: add save/restore support for mmio ide: add save/restore support for isa ide: split away ide-microdrive.c ide: split away ide-mmio.c ide: split away ide-macio.c Conflicts: hw/pc.c vl.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * ide: move code to hw/ide/Gerd Hoffmann2009-08-271-5/+5
| | | | | | | | | | Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * ide: split away ide-microdrive.cGerd Hoffmann2009-08-271-1/+1
| | | | | | | | | | | | | | | | create ide-microdrive.c and place microdrive support there. only build ide-microdrive support for platforms using it. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * ide: split away ide-mmio.cGerd Hoffmann2009-08-271-1/+1
| | | | | | | | | | | | | | | | create ide-mmio.c and place mmio support there. only build ide-mmio support for platforms using it. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit '977e1244e8eeb22640143a8885eb672296f93210' into upstream-mergeAvi Kivity2009-08-301-4/+5
|\| | | | | | | | | | | | | | | | | | | * commit '977e1244e8eeb22640143a8885eb672296f93210': ide: split away ide-pci.c Conflicts: Makefile.target Signed-off-by: Avi Kivity <avi@redhat.com>
| * ide: split away ide-pci.cGerd Hoffmann2009-08-271-4/+5
| | | | | | | | | | | | | | | | | | | | create ide-pci.c and place pci bus support there. only build ide-pci support for platforms using it. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> Fix build (merge with isa mmio split)
* | Merge commit 'ec82026c97975e1e327aab76653ff7edeeb27967' into upstream-mergeAvi Kivity2009-08-301-3/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ec82026c97975e1e327aab76653ff7edeeb27967': ide: split away ide-isa.c ide: split away ide-internal.h ide: add IDEBus struct, cleanups qdev error logging virtio-pci error logging add qemu_error() + friends qdev: add return value to init() callbacks. fix stack buffer overflows in eepro100.c tx Check block driver read error in pflash_cfi0x Conflicts: Makefile.target hw/pc.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * ide: split away ide-isa.cGerd Hoffmann2009-08-271-3/+4
| | | | | | | | | | | | | | | | | | create ide-isa.c and place isa bus support there. only build ide-isa support for platforms using it. also create ide.h header file. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit '09aaa1602f9381c0e0fb539390b1793e51bdfc7b' into upstream-mergeAvi Kivity2009-08-301-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '09aaa1602f9381c0e0fb539390b1793e51bdfc7b': qdev: convert watchdogs Clean up upcast from PCIDevice to I6300State Move watchdog, watchdog_action, give them internal linkage virtio-blk: handle NULL returns from bdrv_aio_{read, write} Conflicts: Makefile.target Signed-off-by: Avi Kivity <avi@redhat.com>
| * qdev: convert watchdogsMarkus Armbruster2009-08-271-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -watchdog NAME is now equivalent to -device NAME, except it treats option argument '?' specially, and supports only one watchdog. A side effect is that a device created with -watchdog may now receive a different PCI address. i6300esb is now available on any machine with a PCI bus, not just PCs. ib700 is still PC only, but that could be changed easily. The only remaining use of struct WatchdogTimerModel and watchdog_add_model() is supporting '-watchdog ?'. Should be replaced by searching device_info_list for watchdog devices when we can identify them there. Also fixes ib700 not to use vm_clock before it is initialized: in wdt_ib700_init(), called from register_watchdogs(), which runs before init_timers(). The bug made ib700_write_enable_reg() crash in qemu_del_timer(). Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit '3a38d437ca60ce19ee92dbabbe6e672e9ba3c529' into upstream-mergeAvi Kivity2009-08-291-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3a38d437ca60ce19ee92dbabbe6e672e9ba3c529': Add isa_reserve_irq(). isa bus irq changes and fixes. hw/eepro100.c: Use extended TBD only where applicable pci-hotplug: initialize dinfo to NULL in pci_device_hot_add block/vdi.c: Fix several bugs introduce kvm64 CPU allow overriding of CPUID level on command line set CPUID bits to present cores and threads topology push CPUID level to 4 to allow Intel multicore decoding extend -smp parsing to include cores= and threads= options add file descriptor migration Add sparse to new feature convention Conflicts: hw/pc.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * Add isa_reserve_irq().Jes Sorensen2009-08-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce isa_reserve_irq() which marks an irq reserved and returns the appropriate qemu_irq entry from the i8259 table. isa_reserve_irq() is a temporary interface to be used to allocate ISA IRQs for devices which have not yet been converted to qdev, and for special cases which are not suited for qdev conversions, such as the 'ferr'. This patch goes on top of Gerd Hoffmann's which makes isa-bus.c own the ISA irq table. [ added isa-bus.o to some targets to fix build failures -- kraxel ] Signed-off-by: Jes Sorensen <jes@sgi.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit 'e2d52ad32abb158f272f120dc1ba06c74abe4824' into upstream-mergeAvi Kivity2009-08-291-4/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e2d52ad32abb158f272f120dc1ba06c74abe4824': Add feature configure help Use the same structure for list of libs in curses and pthread Make vnc configure options less verbose. Remove a hack introduced by d19076faca944c31bb051b95d285e75ec67902f7 Fix dsound typos Remove kqemu.c accidentally added by d60efc6b0d3d4e90cbbb86e21451e55263c29416 Sparc32: improve interrupt handling Make CPURead/WriteFunc structure 'const' target-mips: fix conditional moves off fp condition codes ARM back-end: Fix encode_imm Conflicts: configure Signed-off-by: Avi Kivity <avi@redhat.com>
| * Remove a hack introduced by d19076faca944c31bb051b95d285e75ec67902f7malc2009-08-271-4/+0
| | | | | | | | | | Work by Blue Swirl culminating with 5c55ff99fa88158871d5b9f619c485deae5f3d5b made it unnecessary.