Merge branch 'master' of git://git.qemu.org/qemu into prep-up
Conflicts: hw/Makefile.objs hw/ppc_prep.c
Signed-off-by: Andreas Färber <andreas.faerber@web.de>
target-sparc64: disable VGA cirrus
OpenBIOS on sparc64 only support Standard VGA and not Cirrus VGA. Don'tbuild Cirrus VGA support so that it can't be selected.
This fixes the breakage introduced by commit f2898771.
Reported-by: Richard Henderson <rth@twiddle.net>...
serial: add pci variant
So we get a hot-pluggable 16550 uart.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
m25p80: Initial implementation of SPI flash device
Added device model for m25p80 style SPI flash family.
Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>
prep: Use pc87312 device instead of collection of random ISA devices
We can't however replace the built-in IDE controller, as the one inpc87312 is only single-channel and can use only IRQ 14. Therefore thepc87312's IDE function gets disabled via the config property....
prep: Include devices for ppc64 as well
Allows running qemu-system-ppc64 -M prep for consistency.
Reported-by: Markus Armbruster <armbru@redhat.com>Signed-off-by: Andreas Färber <andreas.faerber@web.de>Acked-by: Hervé Poussineau <hpoussineau@reactos.org>
arm: Move some ARM devices into libhw
Avoids some unnecessary dependencies on cpu.h and prepares fora future armeb-softmmu where most machines would not be built.
Defer touching the SoC devices since most have implicit or explicitdependencies on the CPU....
unicore32-softmmu: Add ps2 support
This patch adds ps2/keyboard support, and enables CONFIG_PCKBD.
Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
unicore32-softmmu: Add puv3 ostimer support
This patch adds puv3 ostimer support, include os timerdevice simulation and ptimer support in puv3 machine.
unicore32-softmmu: Add puv3 soc/board support
This patch only add puv3 soc/board support, which introduces puv3machine description, and specifies console type.
unicore32-softmmu: Add unicore32-softmmu build support
This patch adds unicore32-softmmu build support, include configure,makefile, arch_init, and all missing functions needed by softmmu.Although all missing functions are empty, unicore32-softmmu could...
esp: move PCI emulation to a new file esp-pci.c
sparc machines loose ability to instanciate PCI ESP SCSI adapter,which is not a big loose as they don't have PCI bus support.
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Revert "megasas: disable due to build breakage"
This reverts commit 92336855975805d88c7979f53bc05c2d47abab04.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
esp: enable for all PCI machines
target-or32: Add linux user support
Add QEMU OpenRISC linux user support.
Signed-off-by: Jia Liu <proljc@gmail.com>Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
target-or32: Add target stubs and QOM cpu
Add OpenRISC target stubs, QOM cpu and basic machine.
esp: add AMD PCscsi emulation (PCI SCSI adapter)
The PCI version is supported in lots of Operating Systems,and has been successfully tested on:- MS DOS 6.22 (using DC390 driver)- MS Windows 3.11 (using DC390 driver)- MS Windows 98 SE (using default driver)...
megasas: disable due to build breakage
The Buildbot has detected a new failure on builder default_i386_rhel61 whilebuilding qemu.
Full details are available at: http://buildbot.b1-systems.de/qemu/builders/default_i386_rhel61/builds/304
The proper fix is non-trivial so let's disable the build by default until it's...
megasas: LSI Megaraid SAS HBA emulation
This patch adds an emulation for the LSI Megaraid SAS 8708EM2 HBA.I've tested it to work with Linux, Windows Vista, and Windows7.
Signed-off-by: Hannes Reinecke <hare@suse.de>[ Squashed trivial changes from Andreas Faerber, rebased over IOMMU...
xilinx_axi*: Share devices between microblaze and microblazeel
Speeds up the build.
Signed-off-by: Andreas Färber <afaerber@suse.de>Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
hw/xilinx_*: Share Xilinx devices between ppc and microblaze
xilinx_ethlite uses tswap32() and is thus target-dependent.
Drop darwin-user
It's been orphaned, not compiling for a long time and despite Apple'sdrop of their Rosetta ppc emulation technology with Mac OS X Lion no onehas stepped up to fix it.
Testing necessary changes wrt QOM'ification thus is impossible, so we...
get rid of CONFIG_VIRTIO_SCSI
Merge remote-tracking branch 'bonzini/virtio-scsi' into staging
jazz-led: compile it only twice
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
hw/pc_sysfw: support system flash memory with pflash
Flash can be enabled by calling pc_system_firmware_initwith the system_flash_enabled parameter being non-zero.If system_flash_enabled is zero, then the older qemurom creation method will be used.
If flash is enabled and a pflash image is found, then...
virtio-scsi: Add virtio-scsi stub device
Add a useless virtio SCSI HBA device:
qemu -device virtio-scsi-pci
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
linux-user: Add default-configs for mipsn32[el]
Prepares for mipsn32[el]-linux-user targets.
Signed-off-by: Ulricht Hecht <uli@suse.de>Signed-off-by: Andreas Färber <afaerber@suse.de>Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
linux-user: Add default configs for mips64[el]
Prepares for mips64[el]-linux-user targets.
Signed-off-by: Khansa Butt <khansa@kics.edu.pk>Signed-off-by: Andreas Färber <afaerber@suse.de>Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
Merge remote-tracking branch 'afaerber/prep-up' into staging
vga: make Cirrus ISA device optional
Reviewed-by: Jan Kiszka <jan.kiszka@siemens.com>Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
prep: Add i82374 DMA emulation
Prepare Intel 82374 emulation for use by Intel 82378 PCI->ISA bridge.
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
Confine to CONFIG_I82374. Add VMState.
Signed-off-by: Andreas Färber <andreas.faerber@web.de>Reviewed-by: Alexander Graf <agraf@suse.de>
prep: Add i82378 PCI-to-ISA bridge emulation
Prepare Intel 82378 emulation for use by PReP platforms.
Create ISA bus in this device (suggested by Markus).Rebase onto Memory API, mark memory ops as Little Endian....
xhci: Initial xHCI implementation
Based on the implementation from Hector Martin <hector@marcansoft.com>
Hectors's implementation completely sidestepped the qemu usb system andused libusb directly for usb device pass through. So I've ripped outthe libusb bits (or left them in disabled, as reference for further...
xtensa_lx60: add FLASH support
LX60 carry 4 Mbyte FLASH and 128 Kbyte SRAM, LX200 carry 16 Mbyte FLASHand 32 Mbyte SRAM. Either of these memories may be mapped to the systemROM region.
Select boot from FLASH if -kernel option is not specified, otherwise...
i8259: Move to hw library
No target-specific bits remaining, let's move it over.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
target-xtensa: add Avnet LX60/LX110/LX200 boards
These boards carry similar hardware: SDRAM (48M for LX110, 64M for LX60,96M for LX200), 16 Mbyte FLASH, FPGA, 10/100 Mbps Ethernet PHY and 16550UART. FPGA may be loaded with almost any Tensilica processor. It is also...
target-alpha: Add CLIPPER emulation.
This is a DP264 variant, SMP capable, no unusual hardware present.
The emulation does not currently include any PCI IOMMU code.Hopefully the generic support for that can be merged to HEAD soon.
Signed-off-by: Richard Henderson <rth@twiddle.net>
target-xtensa: add target to the configure script
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
g364fb: compile in hwlib
Compile g364fb in hwlib. Two compilations less for the full build.
Acked-by: Hervé Poussineau <hpoussin@reactos.org>Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
target-alpha: Enable the alpha-softmmu target.
With all of the pre-existing code that would not compile gone,this is the earliest point at which the target can be enabled.
There is no machine defined yet, so this will crash on startup.Enable the target anyway, to make sure that further compilation...
usb: add ehci adapter
This patch finally merges the EHCI host adapter aka USB 2.0 support.
Based on the ehci bits collected @ git://git.kiszka.org/qemu.git ehci
EHCI has a long out-of-tree history. Project was started by MarkBurkley, with contributions by Niels de Vos. David S. Ahern continued...
s390x: build s390x by default
This patch enables building of s390x-softmmu and s390x-linux-usertargets by default.
Signed-off-by: Alexander Graf <agraf@suse.de>
unicore32: necessary modifications for other files to support unicore32
lm32: add support for the Milkymist board
This patch adds almost complete support for the Milkymist system-on-chip(http://www.milkymist.org).
Additional to running bare metal applications, booting a linux kernel withinitrd is supported.
Signed-off-by: Michael Walle <michael@walle.cc>...
lm32: add Milkymist memory card support
This patch adds support for Milkymist's memory card core.
Signed-off-by: Michael Walle <michael@walle.cc>Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
vmmouse: Fix typo preventing x86-64 build
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
microblaze: Compile uart 16550 serial driver
Upcomming little endian platform will use 16550 serial driver.
Signed-off-by: Michal Simek <monstr@monstr.eu>Signed-off-by: Edgar E. Iglesias <edgar.iglesias@petalogix.com>
lm32: EVR32 and uclinux BSP
This patch adds support for the following two BSPs: - LM32 EVR32 BSP (as used by RTEMS) - uclinux BSP by Theobroma Systems
microblaze: Correct copy+paste:o in defconfigs
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
microblaze: Allow targeting little-endian mb
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@petalogix.com>
applesmc: make optional
Based on patch by David Ahern.
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
hpet: make optional
Ignore failure with hpet device creation.
x86: make vmmouse optional
Compile vmmouse in hwlib. Ignore failure if vmmouse device can't becreated.
config: move ide core and pci to pci.mak
Every device that can do PCI should also be able to do IDE. So let's movethe IDE definitions over to pci.mak.
Signed-off-by: Alexander Graf <agraf@suse.de>Signed-off-by: Kevin Wolf <kwolf@redhat.com>
config: add ahci for pci capable machines
This patch enables AHCI for all machines supporting PCI.
Split out common pcnet code
The core pcnet emulation code is used by both the PCI "pcnet" deviceand the SPARC "lance" device. Split the common code frm the PCI code sothat that can be configures independantly.
Signed-off-by: Paul Brook <paul@codesourcery.com>
Remove PCI from sparc32 target
None of the (current) sparc32 machines have a PCI bus, so remove the PCIcode from these configs.
Fix previous commit
Fix breakage from previous commit (missing pci.mak, and incorrectinclude in default-configs/s390x-softmmu.mak).
PCI config include
Split PCI config options into a separate file
VirtIO config option
Make virtio devices optional. Selecting individual devices is not usefulas the host bindings are all in one file.
powerpc: Add a virtex5 ml507 refdesign board
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>Signed-off-by: Alexander Graf <agraf@suse.de>
piix4: compile only once
Compile piix4 in hwlib. Two compilations less for the full build.
MIPS: Initial support of VIA IDE controller used by fulong mini pc
Signed-off-by: Huacai Chen <zltjiangshi@gmail.com>Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
MIPS: Initial support of bonito north bridge used by fulong mini pc
Compile dma only once
Use a qemu_irq to request CPU exit.
7 compilations less for the full build.
Compile pckbd only once
Use a qemu_irq to indicate A20 line changes. Move I/O port 92to pckbd.c.
Compile acpi_piix4, apm and pm_smbus only once
12 compilations less for the full build.
sparc32 use empty_slot for missing RAM v1
use empty_slot device for the RAM which is not installed
Models without ECC don't trap when missing ram is accessed.
v0->v1 compile only once and fix indentation
Signed-off-by: Artyom Tarasenko <atar4qemu@gmail.com>...
sh_pci: fix memory and I/O access
Since commit 8da3ff180974732fc4272cb4433fef85c1822961 ("MMIO callbackinterface changes"), the addresses passed to the I/O functions are anoffset to the start of the area. As a consequence, there is no need tocorrect the address using the value of IOBR. This make possible the use...
hw/r2d: add flash memory
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
OHCI qdev conversion
Convert remaining OHCI devices to QDEV interface.
Compile most PPC devices only once
Make byte swapping unconditional since PPC is big endian.
Compile prep_pci only once
Compile openpic only once
Replace TARGET_PAGE_SIZE with 4096. Make byte swapping unconditionalsince PPC is big endian.
Compile ide/macio only once
Compile pflash_cfi01 only once
Push TARGET_WORDS_BIGENDIAN dependency to board level.
Compile pflash_cfi02 only once
Compile acpi only once
Use qemu_irqs to trigger CMOS S3 and SMI events.
Avoid using kvm.h, which uses CPUState.
Compile vmware_vga only once
Compile some MIPS devices only once
Move CPU specific declarations to a separate file.
Compile ide/core only once
Make win2k install hack unconditional as it is still restricted tox86 only in vl.c.
Replace TARGET_PAGE_SIZE and 4096 with PAGE_SIZE.
target-s390: Don't compile in virtio-pci
As soon as virtio-pci.c gets compiled and used on S390 the internal qdev magicgets confused and tries to give us PCI devices instead of S390 virtio devices.
Since we don't have PCI on S390, we can safely not compile virtio-pci at all....
Compile sound devices only once
Compile serial only once
Compile ne2000_isa only once
Compile fdc only once
Compile most IDE devices only once
Compile usb-uhci only once
Compile vga-isa only once
Compile i8254 only once
Compile pcspk only once
Compile parallel only once
Compile vga-pci only once
Build usb-ohci for PCs
The OHCI emulation isn't obviously broken and there are people who want to useit. Let's build it by default so that it can be enabled via -device.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
ARM defconfig fix
Tix typo in default-configs/arm-softmmu.mak
Add support for S390x system emulation
Let's enable the basics for system emulation so we can run virtual machineswith KVM!
Signed-off-by: Alexander Graf <agraf@suse.de>Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
DS1338 RTC
Implement MAXIM SD1338 RTC+NVRAM.
Built network devices once
Move some generic NICS into libhw, and build them for ARM targets.
Only compile ssi when one target uses it
Patchworks-ID: 35221Signed-off-by: Juan Quintela <quintela@redhat.com>Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>