Commit 40fda982 authored by Laurent Vivier's avatar Laurent Vivier Committed by Markus Armbruster
Browse files

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 4c315c27
"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 771a13e9 "i386: Unset
cannot_destroy_with_object_finalize_yet on "host" model" and
e4356010 "target-i386: Remove assert(kvm_enabled()) from
host_x86_cpu_initfn()")

Signed-off-by: default avatarLaurent Vivier <lvivier@redhat.com>
Message-Id: <20170414083717.13641-3-lvivier@redhat.com>
Acked-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Acked-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent 53d6e531

target/ppc/kvm.c

+0 −10
Original line number Diff line number Diff line
@@ -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;