Hello, Here's a rebased version of the series moving KVM-specific fields from CPU*State struct (CPU_COMMON macro) to QOM CPUState and avoiding use of CPU*State in KVM's API.
There was no review feedback on v1, which I'm interpreting as a don't-care. If no one objects, I will thus include it in my qom-cpu pull mid of the week. Available here: https://github.com/afaerber/qemu-cpu/commits/qom-cpu-6.v2 git://github.com/afaerber/qemu-cpu.git qom-cpu-6.v2 Regards, Andreas v1 -> v2: * Added documentation for kvm_fd field in 01/11 * Changed type of kvm_vcpu_dirty field to bool in 02/11 * Rebased 10/11 onto ppc merge that introduced use of env->mmu_model in kvm_get_fallback_smmu_info() by using PowerPCCPU instead of CPUState argument Cc: Anthony Liguori <anth...@codemonkey.ws> Cc: Marcelo Tosatti <mtosa...@redhat.com> Cc: kvm <k...@vger.kernel.org> Cc: Alexander Graf <ag...@suse.de> Cc: Peter Maydell <peter.mayd...@linaro.org> Cc: Igor Mammedov <imamm...@redhat.com> Cc: Eduardo Habkost <ehabk...@redhat.com> Andreas Färber (11): cpu: Move kvm_fd into CPUState kvm: Pass CPUState to kvm_arch_* kvm: Pass CPUState to kvm_vcpu_ioctl() ppc: Pass PowerPCCPU to ppc_set_irq() ppc: Pass PowerPCCPU to [h]decr callbacks ppc: Pass PowerPCCPU to [h]decr timer callbacks ppc_booke: Pass PowerPCCPU to {decr,fit,wdt} timer callbacks ppc4xx_devs: Return PowerPCCPU from ppc4xx_init() ppc_booke: Pass PowerPCCPU to ppc_booke_timers_init() cpu: Move kvm_state field into CPUState cpu: Move kvm_run into CPUState cpu-defs.h | 8 +- hw/kvm/apic.c | 10 +- hw/kvm/clock.c | 2 +- hw/ppc.c | 128 +++++++++++++---------- hw/ppc.h | 4 +- hw/ppc/e500.c | 2 +- hw/ppc405_uc.c | 10 +- hw/ppc440_bamboo.c | 2 +- hw/ppc4xx.h | 6 +- hw/ppc4xx_devs.c | 8 +- hw/ppc_booke.c | 44 ++++---- hw/s390-virtio-bus.c | 12 +-- hw/spapr.c | 2 +- hw/virtex_ml507.c | 2 +- include/qemu/cpu.h | 11 ++ kvm-all.c | 127 ++++++++++++----------- kvm.h | 32 +++--- target-i386/cpu.c | 7 +- target-i386/kvm.c | 240 +++++++++++++++++++++++++------------------- target-ppc/kvm.c | 124 ++++++++++++++--------- target-ppc/kvm_ppc.h | 8 +- target-s390x/cpu.h | 12 +-- target-s390x/interrupt.c | 3 +- target-s390x/kvm.c | 176 ++++++++++++++++++-------------- target-s390x/misc_helper.c | 2 +- 25 Dateien geändert, 561 Zeilen hinzugefügt(+), 421 Zeilen entfernt(-) -- 1.7.10.4
