Commit a729f9bc authored May 05, 2020 by Markus Armbruster

mips/malta: Fix create_cps() error handling



The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL.  Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second

create_cps() is wrong that way.  The last calls treats an error as
fatal.  Do that for the prior ones, too.

Fixes: bff384a4
Cc: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
Cc: "Philippe Mathieu-Daudé" <philmd@redhat.com>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20200505101908.6207-7-armbru@redhat.com>
Reviewed-by: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>

parent 5217f188

hw/mips/mips_malta.c

+6 −9

Original line number	Diff line number	Diff line
		@@ -1185,17 +1185,14 @@ static void create_cpu_without_cps(MachineState *ms,
		static void create_cps(MachineState ms, MaltaState s,
		qemu_irq cbus_irq, qemu_irq i8259_irq)
		{
		Error *err = NULL;

		sysbus_init_child_obj(OBJECT(s), "cps", OBJECT(&s->cps), sizeof(s->cps),
		TYPE_MIPS_CPS);
		object_property_set_str(OBJECT(&s->cps), ms->cpu_type, "cpu-type", &err);
		object_property_set_int(OBJECT(&s->cps), ms->smp.cpus, "num-vp", &err);
		object_property_set_bool(OBJECT(&s->cps), true, "realized", &err);
		if (err != NULL) {
		error_report("%s", error_get_pretty(err));
		exit(1);
		}
		object_property_set_str(OBJECT(&s->cps), ms->cpu_type, "cpu-type",
		&error_fatal);
		object_property_set_int(OBJECT(&s->cps), ms->smp.cpus, "num-vp",
		&error_fatal);
		object_property_set_bool(OBJECT(&s->cps), true, "realized",
		&error_fatal);

		sysbus_mmio_map_overlap(SYS_BUS_DEVICE(&s->cps), 0, 0, 1);