mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,525 Commits 50 Branches 394 Tags
Commit Graph

20525 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Liguori
6e72ae4690 Merge remote-tracking branch 'qemu-kvm/uq/master' into staging 
* qemu-kvm/uq/master:
  kvm: Fix build for non-CAP_IRQ_ROUTING targets
 2012-06-06 17:23:59 +08:00
Jan Kiszka
d3d3bef0a0 kvm: Fix build for non-CAP_IRQ_ROUTING targets 
A type definition and a KVMState field initialization escaped the
required wrapping with KVM_CAP_IRQ_ROUTING. Also, we need to provide a
dummy kvm_irqchip_release_virq as virtio-pci references (but does not
use) it.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Acked-by: Ben Collins <bcollins@ubuntu.com>
Tested-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Avi Kivity <avi@redhat.com>
 2012-06-06 11:41:33 +03:00
Anthony Liguori
721589dd74 Revert "Revert "rtl8139: do the network/host communication only in normal operating mode"" 
This reverts commit 9c92bf7f6c3f675e60b8ba8a5287bb88ea1eac36.

Per Jason's request.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
 2012-06-05 09:05:51 +08:00
Andreas Färber
b7e516ce04 Kill off cpu_state_reset() 
In commit 1bba0dc932e8826a7d030df3767daf0bc339f9a2 cpu_reset()
was renamed to cpu_state_reset(), to allow introducing a new cpu_reset()
that would operate on QOM objects.

All callers have been updated except for one in target-mips, so drop all
implementations except for the one in target-mips and move the
declaration there until MIPSCPU reset can be fully QOM'ified.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Michael Walle <michael@walle.cc> (for lm32)
Acked-by: Max Filippov <jcmvbkbc@gmail.com> (for xtensa)
Acked-by: Edgar E. Iglesias <edgar.iglesias@gmail.com> (for mb + cris)
Acked-by: Alexander Graf <agraf@suse.de> (for ppc)
Acked-by: Blue Swirl <blauwirbel@gmail.com>
 2012-06-04 23:00:45 +02:00
Andreas Färber
ff18b7625f linux-user: Use cpu_reset() after cpu_init() / cpu_copy() 
Eliminates cpu_state_reset() usage.

Signed-off-by: Andreas Färber <afaerber@suse.de>
 2012-06-04 23:00:45 +02:00
Andreas Färber
fdcb4fb685 bsd-user: Use cpu_reset() in after cpu_init() 
Eliminates cpu_state_reset() usage.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Blue Swirl <blauwirbel@gmail.com>
 2012-06-04 23:00:45 +02:00
Andreas Färber
c537d79cc5 leon3: Store SPARCCPU in ResetData 
Allows us to use cpu_reset() in place of cpu_state_reset() in
main_cpu_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Blue Swirl <blauwirbel@gmail.com>
 2012-06-04 23:00:45 +02:00
Andreas Färber
60ad073356 leon3: Use cpu_sparc_init() to obtain SPARCCPU 
Needed for main_cpu_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Blue Swirl <blauwirbel@gmail.com>
 2012-06-04 23:00:45 +02:00
Andreas Färber
403d7a2d73 sun4u: Store SPARCCPU in ResetData 
We can now use cpu_reset() in place of cpu_state_reset() in
main_cpu_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Blue Swirl <blauwirbel@gmail.com>
 2012-06-04 23:00:45 +02:00
Andreas Färber
f9d1465f5b sun4u: Let cpu_devinit() return SPARCCPU 
Needed for main_cpu_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Blue Swirl <blauwirbel@gmail.com>
 2012-06-04 23:00:45 +02:00
Andreas Färber
8ebdf9dcc6 sun4u: Use cpu_sparc_init() to obtain SPARCCPU 
This prepares using it in sun4uv_init().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Blue Swirl <blauwirbel@gmail.com>
 2012-06-04 23:00:45 +02:00
Andreas Färber
5414dec635 sun4m: Pass SPARCCPU to {main,secondary}_cpu_reset() 
We can now use cpu_reset() in place of cpu_state_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Blue Swirl <blauwirbel@gmail.com>
 2012-06-04 23:00:45 +02:00
Andreas Färber
8968f588e3 sun4m: Use cpu_sparc_init() to obtain SPARCCPU 
Needed for {main,secondary}_cpu_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Blue Swirl <blauwirbel@gmail.com>
 2012-06-04 23:00:45 +02:00
Andreas Färber
e59be77a5b target-sparc: Let cpu_sparc_init() return SPARCCPU 
Make include paths for cpu-qom.h consistent, so that SPARCCPU can be
used in cpu.h.

Turn cpu_init macro into a static inline function returning
CPUSPARCState for backwards compatibility.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Blue Swirl <blauwirbel@gmail.com>
 2012-06-04 23:00:45 +02:00
Andreas Färber
c356a1bcc0 cpu-exec: Use cpu_reset() in cpu_exec() for TARGET_PPC 
CPUState will be needed for all targets in the future, so place it into
the main variable declaration block.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Alexander Graf <agraf@suse.de>
 2012-06-04 23:00:45 +02:00
Andreas Färber
f8031482d7 virtex_ml507: Pass PowerPCCPU to main_cpu_reset() 
Allows us to call cpu_reset() in place of cpu_state_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Alexander Graf <agraf@suse.de>
 2012-06-04 23:00:44 +02:00
Andreas Färber
68281699ac virtex_ml507: Let ppc440_init_xilinx() return PowerPCCPU 
Needed for main_cpu_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Alexander Graf <agraf@suse.de>
 2012-06-04 23:00:44 +02:00
Andreas Färber
d1d4938ba8 virtex_ml507: Use cpu_ppc_init() to obtain PowerPCCPU 
Needed to change ppc440_init_xilinx() return type.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Alexander Graf <agraf@suse.de>
 2012-06-04 23:00:44 +02:00
Andreas Färber
5c3e735f9b ppc_prep: Pass PowerPCCPU to ppc_prep_reset() 
Allows us to use cpu_reset() in place of cpu_state_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Alexander Graf <agraf@suse.de>
 2012-06-04 23:00:44 +02:00
Andreas Färber
a9bf3df021 ppc_prep: Use cpu_ppc_init() to obtain PowerPCCPU 
Needed for ppc_prep_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Alexander Graf <agraf@suse.de>
 2012-06-04 23:00:44 +02:00
Andreas Färber
cd79664f76 ppc_oldworld: Pass PowerPCCPU to ppc_heathrow_reset() 
Allows us to use cpu_reset() in place of cpu_state_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Alexander Graf <agraf@suse.de>
 2012-06-04 23:00:44 +02:00
Andreas Färber
72c33dd714 ppc_oldworld: Use cpu_ppc_init() to obtain PowerPCCPU 
Needed for ppc_heathrow_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Alexander Graf <agraf@suse.de>
 2012-06-04 23:00:44 +02:00
Andreas Färber
6680988c30 ppc_newworld: Pass PowerPCCPU to ppc_core99_reset() 
Allows us to use cpu_reset() in place of cpu_state_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Alexander Graf <agraf@suse.de>
 2012-06-04 23:00:44 +02:00
Andreas Färber
8f8204ecb7 ppc_newworld: Use cpu_ppc_init() to obtain PowerPCCPU 
Needed for ppc_core99_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Alexander Graf <agraf@suse.de>
 2012-06-04 23:00:44 +02:00
Andreas Färber
90cb09d9d3 ppc4xx_devs: Pass PowerPCCPU to ppc4xx_reset() 
Allows us to use cpu_reset() in place of cpu_state_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Alexander Graf <agraf@suse.de>
 2012-06-04 23:00:44 +02:00
Andreas Färber
572747136d ppc4xx_devs: Use cpu_ppc_init() to obtain PowerPCCPU 
Needed for ppc4xx_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Alexander Graf <agraf@suse.de>
 2012-06-04 23:00:44 +02:00
Andreas Färber
182fbbf218 ppc440_bamboo: Pass PowerPCCPU to main_cpu_reset() 
Allows us to use cpu_reset() in place of cpu_state_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Alexander Graf <agraf@suse.de>
 2012-06-04 23:00:44 +02:00
Andreas Färber
322164e0db ppc440_bamboo: Use cpu_ppc_init() to obtain PowerPCCPU 
Needed for main_cpu_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Alexander Graf <agraf@suse.de>
 2012-06-04 23:00:44 +02:00
Andreas Färber
5b2038e049 spapr: Pass PowerPCCPU to spapr_cpu_reset() 
Allows us to use cpu_reset() in place of cpu_state_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Alexander Graf <agraf@suse.de>
 2012-06-04 23:00:44 +02:00
Andreas Färber
05769733e0 spapr: Use cpu_ppc_init() to obtain PowerPCCPU 
Needed for spapr_cpu_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Alexander Graf <agraf@suse.de>
 2012-06-04 23:00:44 +02:00
Andreas Färber
38f92da6e7 ppce500_mpc8544ds: Pass PowerPCCPU to mpc8544ds_cpu_reset[_sec] 
Allows us to use cpu_reset() in place of cpu_state_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Alexander Graf <agraf@suse.de>
 2012-06-04 23:00:43 +02:00
Andreas Färber
397b457d86 target-ppc: Let cpu_ppc_init() return PowerPCCPU 
Adapt e500 mpc8544ds machine accordingly.

Turn cpu_init() into a static inline function returning CPUPPCState for
backwards compatibility.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Alexander Graf <agraf@suse.de>
 2012-06-04 23:00:43 +02:00
Andreas Färber
fa156e5127 mips_r4k: Store MIPSCPU in ResetData 
Allows us to use cpu_reset() in place of cpu_state_reset() in
main_cpu_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
 2012-06-04 23:00:43 +02:00
Andreas Färber
9ac67e2168 mips_r4k: Use cpu_mips_init() to obtain MIPSCPU 
Needed for main_cpu_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
 2012-06-04 23:00:43 +02:00
Andreas Färber
2d44fc8e2e mips_mipssim: Store MIPSCPU in ResetData 
Allows us to use cpu_reset() in place of cpu_state_reset() in
main_cpu_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
 2012-06-04 23:00:43 +02:00
Andreas Färber
7ee274c193 mips_mipssim: Use cpu_mips_init() to obtain MIPSCPU 
Needed for main_cpu_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
 2012-06-04 23:00:43 +02:00
Andreas Färber
1004ee8d26 mips_malta: Pass MIPSCPU to main_cpu_reset() 
Allows us to use cpu_reset() in place of cpu_state_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
 2012-06-04 23:00:43 +02:00
Andreas Färber
7688b134b8 mips_malta: Use cpu_mips_init() to obtain MIPSCPU 
Needed for main_cpu_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
 2012-06-04 23:00:43 +02:00
Andreas Färber
f37f435a3e mips_jazz: Pass MIPSCPU to main_cpu_reset() 
Allows us to use cpu_reset() in place of cpu_state_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Hervé Poussineau <hpoussin@reactos.org>
 2012-06-04 23:00:43 +02:00
Andreas Färber
6bd8da655a mips_jazz: Use cpu_mips_init() to obtain MIPSCPU 
Needed for main_cpu_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Hervé Poussineau <hpoussin@reactos.org>
 2012-06-04 23:00:43 +02:00
Andreas Färber
800cf598f9 mips_fulong2e: Pass MIPSCPU to main_cpu_reset() 
Allows us to use cpu_reset() in place of cpu_state_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
 2012-06-04 23:00:43 +02:00
Andreas Färber
f0f8036697 mips_fulong2e: Use cpu_mips_cpu() to obtain MIPSCPU 
Needed for main_cpu_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
 2012-06-04 23:00:43 +02:00
Andreas Färber
30bf942d8c target-mips: Let cpu_mips_init() return MIPSCPU 
Turn cpu_init macro into a static inline function returning CPUMIPSState
for backwards compatibility.

Signed-off-by: Andreas Färber <afaerber@suse.de>
 2012-06-04 23:00:43 +02:00
Andreas Färber
fca1be7cbc target-mips: Use cpu_reset() in do_interrupt() 
Signed-off-by: Andreas Färber <afaerber@suse.de>
 2012-06-04 23:00:43 +02:00
Andreas Färber
3bd4122ef6 target-mips: Use cpu_reset() in cpu_mips_init() 
Commit 0f71a7095db6bc055bc5bb520d85ea650cca8a33 (target-mips: QOM'ify
CPU) hooked up cpu_state_reset() to CPUClass::reset(). Dropping the
introduction of subclasses for 1.1, due to mips_def_t the reset code
could not be QOM'ified yet, i.e. cpu_state_reset() will not forward to
CPUClass::reset().

Update cpu_mips_init() with cpu_reset() nontheless, indirectly calling
cpu_state_reset(), so that generic code can be converted to call
cpu_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
 2012-06-04 23:00:43 +02:00
Andreas Färber
868bac81d7 r2d: Store SuperHCPU in ResetData 
Allows us to use cpu_reset() in place of cpu_state_reset() in
main_cpu_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
 2012-06-04 23:00:43 +02:00
Andreas Färber
fd2f410b37 r2d: Use cpu_sh4_init() to obtain SuperHCPU 
Needed for main_cpu_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
 2012-06-04 23:00:43 +02:00
Andreas Färber
445e957194 target-sh4: Let cpu_sh4_init() return SuperHCPU 
Turn cpu_init macro into a static inline function returning
CPUSH4State for backwards compatibility.

Signed-off-by: Andreas Färber <afaerber@suse.de>
 2012-06-04 23:00:42 +02:00
Andreas Färber
e5fe7a34d4 pc: Pass X86CPU to pc_cpu_reset() 
Allows us to use cpu_reset() in place of cpu_state_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
 2012-06-04 23:00:42 +02:00
Andreas Färber
608911acac pc: Use cpu_x86_init() to obtain X86CPU 
Needed for pc_cpu_reset().

Also change return type to X86CPU.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
 2012-06-04 23:00:42 +02:00