From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52810) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bEfZ4-0002s6-Ae for qemu-devel@nongnu.org; Sun, 19 Jun 2016 12:27:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bEfYy-0002kN-7f for qemu-devel@nongnu.org; Sun, 19 Jun 2016 12:27:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41602) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bEfYy-0002k0-1y for qemu-devel@nongnu.org; Sun, 19 Jun 2016 12:27:08 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id ADD7785A00 for ; Sun, 19 Jun 2016 16:27:07 +0000 (UTC) References: <1466022773-8965-1-git-send-email-ehabkost@redhat.com> <1466022773-8965-8-git-send-email-ehabkost@redhat.com> From: Marcel Apfelbaum Message-ID: <5766C7D8.2020800@redhat.com> Date: Sun, 19 Jun 2016 19:27:04 +0300 MIME-Version: 1.0 In-Reply-To: <1466022773-8965-8-git-send-email-ehabkost@redhat.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 07/10] vl: Set errp to &error_abort on machine compat_props List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost , qemu-devel@nongnu.org, Markus Armbruster Cc: Paolo Bonzini , Igor Mammedov On 06/15/2016 11:32 PM, Eduardo Habkost wrote: > Use the new GlobalProperty.errp field to handle compat_props > errors. > > Example output before this change: > (with an intentionally broken entry added to PC_COMPAT_1_3 just > for testing) > > $ qemu-system-x86_64 -machine pc-1.3 > qemu-system-x86_64: hw/core/qdev-properties.c:1091: qdev_prop_set_globals_for_type: Assertion `prop->user_provided' failed. > Aborted (core dumped) > > After: > > $ qemu-system-x86_64 -machine pc-1.3 > Unexpected error in x86_cpuid_set_vendor() at /home/ehabkost/rh/proj/virt/qemu/target-i386/cpu.c:1688: > qemu-system-x86_64: can't apply global cpu.vendor=x: Property '.vendor' doesn't take value 'x' > Aborted (core dumped) > > Suggested-by: Paolo Bonzini > Signed-off-by: Eduardo Habkost > --- > hw/core/machine.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/hw/core/machine.c b/hw/core/machine.c > index 754a054..d6f6be4 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -592,6 +592,8 @@ void machine_register_compat_props(MachineState *machine) > > for (i = 0; i < mc->compat_props->len; i++) { > p = g_array_index(mc->compat_props, GlobalProperty *, i); > + /* Machine compat_props must never cause errors: */ > + p->errp = &error_abort; > qdev_prop_register_global(p); > } > } > Reviewed-by: Marcel Apfelbaum Thanks, Marcel