From patchwork Mon Jan 6 22:03:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 307458 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id EF7CE2C00C9 for ; Tue, 7 Jan 2014 09:08:42 +1100 (EST) Received: from localhost ([::1]:37824 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0ILg-00056B-El for incoming@patchwork.ozlabs.org; Mon, 06 Jan 2014 17:08:40 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51779) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0IGm-0008Ra-HW for qemu-devel@nongnu.org; Mon, 06 Jan 2014 17:03:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W0IGh-00011S-Gn for qemu-devel@nongnu.org; Mon, 06 Jan 2014 17:03:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37305) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0IGh-000116-8U for qemu-devel@nongnu.org; Mon, 06 Jan 2014 17:03:31 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s06M3Shu016613 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 6 Jan 2014 17:03:29 -0500 Received: from localhost (ovpn-113-124.phx2.redhat.com [10.3.113.124]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s06M3ROj027156; Mon, 6 Jan 2014 17:03:28 -0500 From: Luiz Capitulino To: anthony@codemonkey.ws Date: Mon, 6 Jan 2014 17:03:12 -0500 Message-Id: <1389045795-18706-12-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1389045795-18706-1-git-send-email-lcapitulino@redhat.com> References: <1389045795-18706-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] [PULL 11/14] target-i386: Remove assert_no_error usage X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@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; }