summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* qom: Introduce object_property_is_{child,link}()Andreas Färber2012-06-181-5/+15
| | | | | | | | Avoids hardcoding partial string comparisons. Signed-off-by: Alexander Barabash <alexander_barabash@mentor.com> Signed-off-by: Andreas Färber <afaerber@suse.de> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
* qom: Add object_class_get_parent()Paolo Bonzini2012-06-182-0/+21
| | | | | | | | | | This simple bit of functionality was missing and we'll need it soon, so add it. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Anthony Liguori <aliguori@us.ibm.com> [AF: Document possible NULL return value] Signed-off-by: Andreas Färber <afaerber@suse.de>
* audio/winwave: Fix typomalc2012-06-151-1/+1
| | | | Signed-off-by: malc <av1474@comtv.ru>
* Merge branch 'master' of git://git.qemu.org/qemumalc2012-06-154-10/+18
|\
| * cris: Fix NMI-flag handling on crisv10.Lars Persson2012-06-154-10/+18
| | | | | | | | | | | | | | - The M-flag is encoded in different bits on cris v10 and cris v32. Signed-off-by: Lars Persson <larper@axis.com> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
* | qcow2: Silence false warningKevin Wolf2012-06-151-0/+2
|/ | | | | | | | | | Some gcc versions seem not to be able to figure out that the switch statement covers all possible values and that c is therefore always initialised. Add a default branch for them. Reported-by: malc <av1474@comtv.ru> Signed-off-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: malc <av1474@comtv.ru>
* xilinx_axidma: changed device namePeter A. G. Crosthwaite2012-06-152-3/+3
| | | | | | | | Changed device name to xlnx,axi-dma. This is the exact name of the device in the Xilinx EDK development tools. Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
* xilinx_axienet: changed device namePeter A. G. Crosthwaite2012-06-152-3/+3
| | | | | | | | Changed device name to xlnx,axi-ethernet. This is the exact name of the device in the xilinx EDK development tools. Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
* xilinx_axienet: droped the c_ on parametersPeter A. G. Crosthwaite2012-06-152-4/+4
| | | | | | | | | Even though the xilinx tools do have C_ on all params by default, drop this for consistency with all the other xilinx IP (I.E. param names are the xilinx names without the C_ prefix) Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
* xilinx_ethlite: changed device namePeter A. G. Crosthwaite2012-06-152-4/+5
| | | | | | | | Changed device name to xlnx,xps-ethernetlite. This is the exact name of the device in the xilinx EDK development tools. Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
* xilinx_ethlite: tweaked naming of ping-pong propsPeter A. G. Crosthwaite2012-06-152-4/+4
| | | | | | | | | Changed "txpingpong" prop to "tx-ping-pong". Same for rx. This is done to make the property name exactly match what is output by the xilinx tools for this IP. Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
* xilinx_intc: changed device namePeter A. G. Crosthwaite2012-06-152-3/+3
| | | | | | | | Changed device name to xlnx,xps-intc. This is the exact name of the device in the xilinx EDK development tools. Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
* xilinx_timer: changed device namePeter A. G. Crosthwaite2012-06-152-3/+3
| | | | | | | | Changed device name to xlnx,xps-timer. This is the exact name of the device in the xilinx EDK development tools. Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
* xilinx_timer: changed nr_timers to one_timer_onlyPeter A. G. Crosthwaite2012-06-155-11/+16
| | | | | | | | | The configurable property for this IP in the Xilinx tools is a boolean switch "one-timer-only" that flicks this timer from being dual channel to single. Updated QEMU to work the same way for better match with the IP core and its TRM. Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
* xilinx_timer: added default frequencyPeter A. G. Crosthwaite2012-06-151-1/+1
| | | | | | | | Added a reasonable default frequency for the xilinx timer (the 62MHz from s3adsp machine model). Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
* xilinx_uartlite: changed device namePeter A. G. Crosthwaite2012-06-152-3/+4
| | | | | | | | Changed device name to xlnx,xps-uartlite. This is the exact name of the device in the xilinx EDK development tools. Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
* xilinx_axidma: (un)reversed irq initialisationPeter A. G. Crosthwaite2012-06-152-3/+3
| | | | | | | | | The axidma irq orders are reversed in both the device model and the instantion. Undid both reversal (for no net change). Also needs to be reversed for consistency with Xilinx tools IRQ listing. Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
* xilinx_axi*: Share devices between microblaze and microblazeelAndreas Färber2012-06-154-2/+4
| | | | | | | Speeds up the build. Signed-off-by: Andreas Färber <afaerber@suse.de> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
* qemu-log: Allow usage in libhwAndreas Färber2012-06-151-0/+2
| | | | | | | | Add #ifdef to avoid complaint about use of poisoned "env". Signed-off-by: Blue Swirl <blauwirbel@gmail.com> 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 microblazeAndreas Färber2012-06-158-6/+10
| | | | | | | | | Speeds up the build. xilinx_ethlite uses tswap32() and is thus target-dependent. Signed-off-by: Andreas Färber <afaerber@suse.de> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
* cris: Add break support for v10.Edgar E. Iglesias2012-06-143-2/+4
| | | | | | Still no retb Signed-off-by: Edgar E. Iglesias <edgar@axis.com>
* Merge remote-tracking branch 'qemu-kvm/uq/master' into stagingAnthony Liguori2012-06-112-6/+53
|\ | | | | | | | | | | * qemu-kvm/uq/master: kvm: i8254: Fix conversion of in-kernel to userspace state kvm/apic: correct short memset
| * kvm: i8254: Fix conversion of in-kernel to userspace stateJan Kiszka2012-06-111-5/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a offset between the clock used to generate the in-kernel count_load_time (CLOCK_MONOTONIC) and the clock used for processing this in userspace (vm_clock), reading back the output of PIT channel 2 via port 0x61 was broken. One use cases that suffered from it was the CPU frequency calibration of SeaBIOS, which also affected IDE/AHCI timeouts. This fixes it by calibrating the offset between both clocks on kvm_pit_get and adjusting the kernel value before saving it in the userspace state. As the calibration only works while the vm_clock is running, we cache the in-kernel state across stopped phases. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Avi Kivity <avi@redhat.com>
| * kvm/apic: correct short memsetJim Meyering2012-06-111-1/+1
| | | | | | | | | | | | | | | | | | kvm_put_apic_state's attempt to clear *kapic before setting its bits cleared sizeof(void*) bytes (no more than 8) rather than the intended 1024 (KVM_APIC_REG_SIZE) bytes. Spotted by coverity. Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com>
* | Merge remote-tracking branch 'sstabellini/for_1.1.1' into stagingAnthony Liguori2012-06-111-0/+14
|\ \ | | | | | | | | | | | | * sstabellini/for_1.1.1: qemu/xendisk: set maximum number of grants to be used
| * | qemu/xendisk: set maximum number of grants to be usedJan Beulich2012-06-111-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | Legacy (non-pvops) gntdev drivers may require this to be done when the number of grants intended to be used simultaneously exceeds a certain driver specific default limit. Signed-off-by: Jan Beulich <jbeulich@suse.com> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
* | | Merge remote-tracking branch 'afaerber-or/qom-cpu-3a' into stagingAnthony Liguori2012-06-1137-197/+223
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * afaerber-or/qom-cpu-3a: (27 commits) target-s390x: Pass S390CPU to s390_cpu_restart() s390-virtio: Let s390_cpu_addr2state() return S390CPU s390-virtio: Use cpu_s390x_init() to obtain S390CPU target-s390x: Let cpu_s390x_init() return S390CPU xen_machine_pv: Use cpu_x86_init() to obtain X86CPU arm_pic: Pass ARMCPU to arm_pic_init_cpu() arm_boot: Pass ARMCPU to arm_load_kernel() xilinx_zynq: Use cpu_arm_init() to obtain ARMCPU pxa2xx_gpio: Store ARMCPU in PXA2xxGPIOInfo pxa2xx_pic: Store ARMCPU in PXA2xxPICState pxa2xx: Pass ARMCPU to pxa2xx_pic_init() exynos4210: Use cpu_arm_init() to store ARMCPU vexpress: Use cpu_arm_init() to obtain ARMCPU realview: Use cpu_arm_init() to obtain ARMCPU arm_boot: Pass ARMCPU to arm_boot_info::secondary_cpu_reset_hook() arm_boot: Pass ARMCPU to arm_boot_info::write_secondary_boot() versatilepb: Use cpu_arm_init() to obtain ARMCPU musicpal: Use cpu_arm_init() to obtain ARMCPU integratorcp: Use cpu_arm_init() to obtain ARMCPU strongarm: Use cpu_arm_init() to store ARMCPU in StrongARMState ...
| * | | target-s390x: Pass S390CPU to s390_cpu_restart()Andreas Färber2012-06-111-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Needed for qemu_cpu_kick(). Signed-off-by: Andreas Färber <afaerber@suse.de>
| * | | s390-virtio: Let s390_cpu_addr2state() return S390CPUAndreas Färber2012-06-114-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert ipi_states to S390CPU**. Needed for s390_cpu_restart() in handle_sigp(). Signed-off-by: Andreas Färber <afaerber@suse.de>
| * | | s390-virtio: Use cpu_s390x_init() to obtain S390CPUAndreas Färber2012-06-111-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Needed to store S390CPU in ipi_states[]. Signed-off-by: Andreas Färber <afaerber@suse.de>
| * | | target-s390x: Let cpu_s390x_init() return S390CPUAndreas Färber2012-06-113-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | Let cpu_init() return CPUS390XState for backwards compatibility. Signed-off-by: Andreas Färber <afaerber@suse.de>
| * | | xen_machine_pv: Use cpu_x86_init() to obtain X86CPUAndreas Färber2012-06-111-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed for moving halted field to CPUState. Signed-off-by: Andreas Färber <afaerber@suse.de> Tested-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
| * | | arm_pic: Pass ARMCPU to arm_pic_init_cpu()Andreas Färber2012-06-1114-19/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass it through to arm_pic_cpu_handler(). Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Peter Maydell <peter.maydell@linaro.org> Acked-by: Igor Mitsyanko <i.mitsyanko@samsung.com> (for exynos)
| * | | arm_boot: Pass ARMCPU to arm_load_kernel()Andreas Färber2012-06-1118-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In particular this simplifies the &s->mpu->cpu->env expression again. first_cpu and ->next_cpu are expected to be QOM'ified later. Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Igor Mitsyanko <i.mitsyanko@samsung.com> (for exynos) Acked-by: Peter Maydell <peter.maydell@linaro.org>
| * | | xilinx_zynq: Use cpu_arm_init() to obtain ARMCPUAndreas Färber2012-06-111-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed for arm_load_kernel(). Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Peter A.G. Crosthwaite <peter.crosthwaite@petalogix.com>
| * | | pxa2xx_gpio: Store ARMCPU in PXA2xxGPIOInfoAndreas Färber2012-06-111-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepares for moving halted field into CPUState. Add missing braces. Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Peter Maydell <peter.maydell@linaro.org>
| * | | pxa2xx_pic: Store ARMCPU in PXA2xxPICStateAndreas Färber2012-06-111-13/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepares for moving halted field to CPUState. Add missing braces. Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Peter Maydell <peter.maydell@linaro.org>
| * | | pxa2xx: Pass ARMCPU to pxa2xx_pic_init()Andreas Färber2012-06-113-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleans up after storing ARMCPU in PXA2xxState. Prepares for storing ARMCPU in PXA2xxPICState. Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Peter Maydell <peter.maydell@linaro.org>
| * | | exynos4210: Use cpu_arm_init() to store ARMCPUAndreas Färber2012-06-112-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed for arm_pic_init_cpu(). Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Peter Maydell <peter.maydell@linaro.org> Acked-by: Igor Mitsyanko <i.mitsyanko@samsung.com>
| * | | vexpress: Use cpu_arm_init() to obtain ARMCPUAndreas Färber2012-06-111-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed for arm_pic_init_cpu(). Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Peter Maydell <peter.maydell@linaro.org>
| * | | realview: Use cpu_arm_init() to obtain ARMCPUAndreas Färber2012-06-111-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed for arm_pic_init_cpu(). Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Peter Maydell <peter.maydell@linaro.org>
| * | | arm_boot: Pass ARMCPU to arm_boot_info::secondary_cpu_reset_hook()Andreas Färber2012-06-113-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adapt highbank accordingly. Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Peter Maydell <peter.maydell@linaro.org>
| * | | arm_boot: Pass ARMCPU to arm_boot_info::write_secondary_boot()Andreas Färber2012-06-115-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adapt exynos4210 and highbank accordingly. The parameter itself is unused. Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Peter Maydell <peter.maydell@linaro.org> Acked-by: Igor Mitsyanko <i.mitsyanko@samsung.com> (for exynos)
| * | | versatilepb: Use cpu_arm_init() to obtain ARMCPUAndreas Färber2012-06-111-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed for arm_load_kernel(). Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Peter Maydell <peter.maydell@linaro.org>
| * | | musicpal: Use cpu_arm_init() to obtain ARMCPUAndreas Färber2012-06-111-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed for arm_load_kernel(). Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Peter Maydell <peter.maydell@linaro.org>
| * | | integratorcp: Use cpu_arm_init() to obtain ARMCPUAndreas Färber2012-06-111-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed for arm_load_kernel(). Add missing braces. Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Peter Maydell <peter.maydell@linaro.org>
| * | | strongarm: Use cpu_arm_init() to store ARMCPU in StrongARMStateAndreas Färber2012-06-113-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adapt collie accordingly. Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Peter Maydell <peter.maydell@linaro.org>
| * | | z2: Rename PXA2xxState variableAndreas Färber2012-06-111-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid cpu->cpu by using "mpu" as variable name. Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Peter Maydell <peter.maydell@linaro.org>
| * | | tosa: Rename PXA2xxState variableAndreas Färber2012-06-111-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid cpu->cpu by using "mpu" as variable name. Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Peter Maydell <peter.maydell@linaro.org>
| * | | spitz: Rename PXA2xxState variableAndreas Färber2012-06-111-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid cpu->cpu by using "mpu" as variable name. Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Peter Maydell <peter.maydell@linaro.org>
OpenPOWER on IntegriCloud