From: zhanghailiang Date: Thu, 30 Oct 2014 02:03:28 +0000 (+0800) Subject: target-tricore: check return value before using it X-Git-Tag: v2.2.0-rc0~14^2~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8ef2b256b94696a3a4bd8aa69a2b0fd7bc246f07;p=thirdparty%2Fqemu.git target-tricore: check return value before using it We reference the return value of cpu before checking whether it is NULL, The checking code is after that which violates code style. It makes no difference if the cpu is NULL, qemu process will terminate. But one will be 'Segmentation fault' and the other will report a error which is what we want. Signed-off-by: zhanghailiang Reviewed-by: Bastian Koppelmann Signed-off-by: Michael Tokarev --- diff --git a/hw/tricore/tricore_testboard.c b/hw/tricore/tricore_testboard.c index eeb4922c4c0..a059a20a30f 100644 --- a/hw/tricore/tricore_testboard.c +++ b/hw/tricore/tricore_testboard.c @@ -71,11 +71,11 @@ static void tricore_testboard_init(MachineState *machine, int board_id) machine->cpu_model = "tc1796"; } cpu = cpu_tricore_init(machine->cpu_model); - env = &cpu->env; if (!cpu) { error_report("Unable to find CPU definition"); exit(1); } + env = &cpu->env; memory_region_init_ram(ext_cram, NULL, "powerlink_ext_c.ram", 2*1024*1024, &error_abort); vmstate_register_ram_global(ext_cram); memory_region_init_ram(ext_dram, NULL, "powerlink_ext_d.ram", 4*1024*1024, &error_abort);