commit 00b810532446b1037aa5d299f181ac4d1d65aa9c
author Peter Crosthwaite <peter.crosthwaite@xilinx.com> Wed Jan 01 18:48:43 2014 -0800
committer Luiz Capitulino <lcapitulino@redhat.com> Mon Jan 06 15:02:30 2014 -0500
tree 2a39bb119163f69f5ee76a65209f2cc95df1f7d5
parent 5433a0a89e68443c9ce1cd0c7b1af23320133983

target-i386: Remove assert_no_error usage

Replace an assert_no_error() usage with the error_abort system.

Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>

target-i386/cpu.c

diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index bb98f6d..6b7b1a9 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1600,7 +1600,6 @@
                                 const char *name)
 {
     x86_def_t *def;
-    Error *err = NULL;
     int i;
 
     if (name == NULL) {
@@ -1608,8 +1607,7 @@
     }
     if (kvm_enabled() && strcmp(name, "host") == 0) {
         kvm_cpu_fill_host(x86_cpu_def);
-        object_property_set_bool(OBJECT(cpu), true, "pmu", &err);
-        assert_no_error(err);
+        object_property_set_bool(OBJECT(cpu), true, "pmu", &error_abort);
         return 0;
     }