From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45932) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YfaOZ-0008Qx-KQ for qemu-devel@nongnu.org; Tue, 07 Apr 2015 16:46:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YfaOY-0002zP-Mx for qemu-devel@nongnu.org; Tue, 07 Apr 2015 16:46:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41826) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YfaOY-0002zL-IF for qemu-devel@nongnu.org; Tue, 07 Apr 2015 16:46:50 -0400 From: Eduardo Habkost Date: Tue, 7 Apr 2015 17:46:38 -0300 Message-Id: <1428439603-8549-2-git-send-email-ehabkost@redhat.com> In-Reply-To: <1428439603-8549-1-git-send-email-ehabkost@redhat.com> References: <1428439603-8549-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 1/6] target-i386: Move error handling to end of x86_cpu_parse_featurestr() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Jiri Denemark , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Igor Mammedov Signed-off-by: Eduardo Habkost --- target-i386/cpu.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 03b33cf..f83d586 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1961,8 +1961,7 @@ static void x86_cpu_parse_featurestr(CPUState *cs, char *features, object_property_parse(OBJECT(cpu), "on", featurestr, &local_err); } if (local_err) { - error_propagate(errp, local_err); - return; + goto out; } featurestr = strtok(NULL, ","); } @@ -1978,6 +1977,11 @@ static void x86_cpu_parse_featurestr(CPUState *cs, char *features, env->features[w] |= plus_features[w]; env->features[w] &= ~minus_features[w]; } + +out: + if (local_err) { + error_propagate(errp, local_err); + } } /* Print all cpuid feature names in featureset -- 2.1.0