diff options
| author | Laurent Vivier | 2017-04-14 10:37:15 +0200 |
|---|---|---|
| committer | Markus Armbruster | 2017-04-21 07:18:23 +0200 |
| commit | 40fda982f2e887f7d5cc36b8a7e3b5a07a1e6704 (patch) | |
| tree | d80c622982d48ff5d94015409181d432ac691c8c /target | |
| parent | arm: remove remaining cannot_destroy_with_object_finalize_yet (diff) | |
| download | qemu-40fda982f2e887f7d5cc36b8a7e3b5a07a1e6704.tar.gz qemu-40fda982f2e887f7d5cc36b8a7e3b5a07a1e6704.tar.xz qemu-40fda982f2e887f7d5cc36b8a7e3b5a07a1e6704.zip | |
ppc: remove cannot_destroy_with_object_finalize_yet
This removes the assert(kvm_enabled()) from kvmppc_host_cpu_initfn()
This assert can never be triggered as the function is only registered
when KVM is available (see also 4c315c2
"qdev: Protect device-list-properties against broken devices").
So we can remove the cannot_destroy_with_object_finalize_yet from
kvmppc_host_cpu_class_init() without fear and beyond reproach.
(as it has already be done for i386 with 771a13e "i386: Unset
cannot_destroy_with_object_finalize_yet on "host" model" and
e435601 "target-i386: Remove assert(kvm_enabled()) from
host_x86_cpu_initfn()")
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Message-Id: <20170414083717.13641-3-lvivier@redhat.com>
Acked-by: Peter Maydell <peter.maydell@linaro.org>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'target')
| -rw-r--r-- | target/ppc/kvm.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index 9f1f132cef..64017acfad 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -2245,14 +2245,8 @@ static void alter_insns(uint64_t *word, uint64_t flags, bool on) } } -static void kvmppc_host_cpu_initfn(Object *obj) -{ - assert(kvm_enabled()); -} - static void kvmppc_host_cpu_class_init(ObjectClass *oc, void *data) { - DeviceClass *dc = DEVICE_CLASS(oc); PowerPCCPUClass *pcc = POWERPC_CPU_CLASS(oc); uint32_t vmx = kvmppc_get_vmx(); uint32_t dfp = kvmppc_get_dfp(); @@ -2279,9 +2273,6 @@ static void kvmppc_host_cpu_class_init(ObjectClass *oc, void *data) if (icache_size != -1) { pcc->l1_icache_size = icache_size; } - - /* Reason: kvmppc_host_cpu_initfn() dies when !kvm_enabled() */ - dc->cannot_destroy_with_object_finalize_yet = true; } bool kvmppc_has_cap_epr(void) @@ -2333,7 +2324,6 @@ static int kvm_ppc_register_host_cpu_type(void) { TypeInfo type_info = { .name = TYPE_HOST_POWERPC_CPU, - .instance_init = kvmppc_host_cpu_initfn, .class_init = kvmppc_host_cpu_class_init, }; PowerPCCPUClass *pvr_pcc; |