Message ID | 1541540283-45699-7-git-send-email-pbonzini@redhat.com |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="G3BcM1SY"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42qNZ7424Tz9s7W for <incoming@patchwork.ozlabs.org>; Wed, 7 Nov 2018 08:52:31 +1100 (AEDT) Received: from localhost ([::1]:43929 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1gK9Gv-0000q5-4b for incoming@patchwork.ozlabs.org; Tue, 06 Nov 2018 16:52:29 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43239) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1gK9DG-0006Xt-8I for qemu-devel@nongnu.org; Tue, 06 Nov 2018 16:48:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1gK93S-0001BX-Te for qemu-devel@nongnu.org; Tue, 06 Nov 2018 16:38:36 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:46349) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1gK93S-00008s-8S for qemu-devel@nongnu.org; Tue, 06 Nov 2018 16:38:34 -0500 Received: by mail-wr1-x436.google.com with SMTP id 74-v6so15189692wrb.13 for <qemu-devel@nongnu.org>; Tue, 06 Nov 2018 13:38:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Uw0478a/NZuYiRTAYy5+GpCx7zq4hCEZS8oy5z4+WYw=; b=G3BcM1SYUReCh9RpgMTKSJN3OawSxwZve/9abj8fXbYf88n4nJwEuWkwWftmyKRs+2 17y5rAgXuJgMN0sgKL2ZQzUC/OMYikQZkr4AZ/oGujTnCRwREPUVEEdQxy+RRrt1lyal nUTlo9++r6CKKZmJz6dSvbshCndl6cVcAIaTIK3tPI41IW2Oqa/S+F8A5FDVY6lBU1Al VqKn0MY3yOGQyUN8CHB032/RjMHXJc1nGhdOuDG2yOcq13e+QWt8xugN9e7WxfYEmLvR RcxS/oe5RU5UH/X/8NcABF9SxhntZKwOPpE0EFKb9RORzQMXmV1rphRuuCL7Z8JI4IOq HpWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=Uw0478a/NZuYiRTAYy5+GpCx7zq4hCEZS8oy5z4+WYw=; b=tMp8kRi7pDbsw0jnEY2t3GvkxT6ZIC8UMKr1lNRykcJ9KZnokeMQbFZfC7rIFlQ/sb fZYvsf8D9tNPVy1m68A7ECGWaLgIGYYikjHyTLMem51L+MFNeYQSscUEz3RAFwnPzpk5 G4KNPKpIVdwcFLKMeTKlFRjh4Wz1MVwZMW/Y8lfLKcz350La3SlQ9nfF9HOovJ2QesKb CQdTyjfcA5ePtszxhKdET0Ru3ayxAxLHb2Kz+zCjNUNQKeMphugTyKaqGhrFYHaABciz yKd1TpqVg+g5RzjsRKglTNbwcAzHO/ZuI9MSpAtVF4W/9yVqMAbP8o8qblOp2q++tSg9 y4gw== X-Gm-Message-State: AGRZ1gL2WZ4bNGPgNlEevjaYjztKrW9H0MAUSQqeaHMqiU3sh4m/3c7u +JxLVtagdXC8Jo8v8THr1GWBkYUY X-Google-Smtp-Source: AJdET5d5chU5Q8AqJ03R90Ju8JHiyVI8np9SUMFJnPj0MSxkQAd6/SRDRgN+aghG66iB0RgoNHH+Ow== X-Received: by 2002:adf:b593:: with SMTP id c19-v6mr26331133wre.223.1541540292158; Tue, 06 Nov 2018 13:38:12 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id l186-v6sm3223526wma.13.2018.11.06.13.38.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Nov 2018 13:38:11 -0800 (PST) From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Date: Tue, 6 Nov 2018 22:37:52 +0100 Message-Id: <1541540283-45699-7-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1541540283-45699-1-git-send-email-pbonzini@redhat.com> References: <1541540283-45699-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::436 Subject: [Qemu-devel] [PULL 06/17] target/i386: Clear RF on SYSCALL instruction X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: Rudolf Marek <rudolf.marek@sysgo.com>, Roman Kapl <rka@sysgo.com> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,01/17] icount: fix deadlock when all cpus are sleeping
|
expand
|
diff --git a/target/i386/seg_helper.c b/target/i386/seg_helper.c index 33714bc..63e265c 100644 --- a/target/i386/seg_helper.c +++ b/target/i386/seg_helper.c @@ -991,11 +991,11 @@ void helper_syscall(CPUX86State *env, int next_eip_addend) int code64; env->regs[R_ECX] = env->eip + next_eip_addend; - env->regs[11] = cpu_compute_eflags(env); + env->regs[11] = cpu_compute_eflags(env) & ~RF_MASK; code64 = env->hflags & HF_CS64_MASK; - env->eflags &= ~env->fmask; + env->eflags &= ~(env->fmask | RF_MASK); cpu_load_eflags(env, env->eflags, 0); cpu_x86_load_seg_cache(env, R_CS, selector & 0xfffc, 0, 0xffffffff,