SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target-i386: Remove assert_no_error usage

Browse Source 
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>
This commit is contained in:
Peter Crosthwaite 2014-01-01 18:48:43 -08:00 committed by Luiz Capitulino
parent 5433a0a89e
commit 00b8105324
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target-i386/cpu.c
View File

@ -1600,7 +1600,6 @@ static int cpu_x86_find_by_name(X86CPU *cpu, x86_def_t *x86_cpu_def,
const char *name) const char *name)
{ {
x86_def_t *def; x86_def_t *def;
Error *err = NULL;
int i; int i;
if (name == NULL) { 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) { if (kvm_enabled() && strcmp(name, "host") == 0) {
kvm_cpu_fill_host(x86_cpu_def); kvm_cpu_fill_host(x86_cpu_def);
object_property_set_bool(OBJECT(cpu), true, "pmu", &err); object_property_set_bool(OBJECT(cpu), true, "pmu", &error_abort);
assert_no_error(err);
return 0; return 0;
} }