target-i386: Remove assert_no_error usage
authorPeter Crosthwaite <peter.crosthwaite@xilinx.com>
Thu, 2 Jan 2014 02:48:43 +0000 (18:48 -0800)
committerLuiz Capitulino <lcapitulino@redhat.com>
Mon, 6 Jan 2014 20:02:30 +0000 (15:02 -0500)
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

index bb98f6defc4a01d3ff2e9d7b8f075fab33afee85..6b7b1a9e23d7664f15892a81d3a184810012e7c9 100644 (file)
@@ -1600,7 +1600,6 @@ static int cpu_x86_find_by_name(X86CPU *cpu, x86_def_t *x86_cpu_def,
                                 const char *name)
 {
     x86_def_t *def;
-    Error *err = NULL;
     int i;
 
     if (name == NULL) {
@@ -1608,8 +1607,7 @@ static int cpu_x86_find_by_name(X86CPU *cpu, x86_def_t *x86_cpu_def,
     }
     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;
     }