From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34401) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VtKqI-0001kf-8m for qemu-devel@nongnu.org; Wed, 18 Dec 2013 12:23:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VtKqD-0000Gb-95 for qemu-devel@nongnu.org; Wed, 18 Dec 2013 12:23:30 -0500 Received: from mx1.redhat.com ([209.132.183.28]:26558) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VtKqD-0000GK-16 for qemu-devel@nongnu.org; Wed, 18 Dec 2013 12:23:25 -0500 From: Luiz Capitulino Date: Wed, 18 Dec 2013 11:59:55 -0500 Message-Id: <1387386003-8949-6-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1387386003-8949-1-git-send-email-lcapitulino@redhat.com> References: <1387386003-8949-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PULL 05/13] target-i386: Remove assert_no_error usage List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: qemu-devel@nongnu.org From: Peter Crosthwaite Replace an assert_no_error() usage with the error_abort system. Signed-off-by: Peter Crosthwaite Reviewed-by: Markus Armbruster Signed-off-by: Luiz Capitulino --- target-i386/cpu.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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 @@ 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; } -- 1.8.1.4