diff options
| author | Peter Crosthwaite <peter.crosthwaite@xilinx.com> | 2014-01-01 18:48:43 -0800 |
|---|---|---|
| committer | Luiz Capitulino <lcapitulino@redhat.com> | 2014-01-06 15:02:30 -0500 |
| commit | 00b810532446b1037aa5d299f181ac4d1d65aa9c (patch) | |
| tree | 2a39bb119163f69f5ee76a65209f2cc95df1f7d5 | |
| parent | 5433a0a89e68443c9ce1cd0c7b1af23320133983 (diff) | |
| download | focaccia-qemu-00b810532446b1037aa5d299f181ac4d1d65aa9c.tar.gz focaccia-qemu-00b810532446b1037aa5d299f181ac4d1d65aa9c.zip | |
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>
| -rw-r--r-- | target-i386/cpu.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index bb98f6defc..6b7b1a9e23 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -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; } |