From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51057) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bLFSg-0004Fr-7p for qemu-devel@nongnu.org; Thu, 07 Jul 2016 15:59:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bLFSf-0004Jy-CT for qemu-devel@nongnu.org; Thu, 07 Jul 2016 15:59:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33409) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bLFSf-0004Jc-6m for qemu-devel@nongnu.org; Thu, 07 Jul 2016 15:59:49 -0400 From: Eduardo Habkost Date: Thu, 7 Jul 2016 16:59:11 -0300 Message-Id: <1467921562-11796-6-git-send-email-ehabkost@redhat.com> In-Reply-To: <1467921562-11796-1-git-send-email-ehabkost@redhat.com> References: <1467921562-11796-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PULL 05/16] vl: Set errp to &error_abort on machine compat_props List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: Paolo Bonzini , Richard Henderson , qemu-devel@nongnu.org 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 Reviewed-by: Marcel Apfelbaum Reviewed-by: Markus Armbruster 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 052517d..2fe6ff6 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -572,6 +572,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); } } -- 2.5.5