From: Eduardo Habkost <ehabkost@redhat.com>
Date: Wed, 15 Jun 2016 19:00:01 +0000 (-0300)
Subject: vl: Set errp to &error_abort on machine compat_props
X-Git-Tag: v2.7.0-rc0~48^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=adae837d40dea7100040136647e3de44898994df;p=thirdparty%2Fqemu.git

vl: Set errp to &error_abort on machine compat_props

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 <pbonzini@redhat.com>
Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---

diff --git a/hw/core/machine.c b/hw/core/machine.c
index 052517d38d6..2fe6ff6f300 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);
     }
 }