From nobody Tue Feb 10 03:39:58 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) client-ip=209.85.221.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631379293; cv=none; d=zohomail.com; s=zohoarc; b=cPdqxPhaqVnCx30zBAj51ZsCgPm/sGaOFH08sAIrI0gTIVuPmGBvn0SJZ2tscJdNZAhLaVLvX+/E2IKJqViDV8ztn7vNFF3BvW/4CRL1voBKtwE4a4RCWlvKWMh5LrTibf4QlY5FGaaZLDcXXFlKGqc5k9VRbhzuRfMqbMqnkak= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631379293; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=NZvvlRpa8DC97DN+aH7Pj/vVpZZsHFPzTcOdAGwjWjs=; b=I0PofFlFryEci4ajjUY4eb7X1D7BBcJSpcwilTMBywvPmwnPTvV33VBEyo9ESnmrUFgQPlVSZtV5pPhy0o5UfT1I9IP9GhZo3icgPXFJTz5+SA7XQbu+nrXm3sED2blaeMcAslXpuRpKF8+ayK8lzZ64IDtK1VvhMMl4sjNcKqM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.zohomail.com with SMTPS id 1631379293004329.2093008712535; Sat, 11 Sep 2021 09:54:53 -0700 (PDT) Received: by mail-wr1-f49.google.com with SMTP id b6so7459489wrh.10 for ; Sat, 11 Sep 2021 09:54:52 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id y18sm2174002wrq.6.2021.09.11.09.54.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Sep 2021 09:54:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NZvvlRpa8DC97DN+aH7Pj/vVpZZsHFPzTcOdAGwjWjs=; b=B2cPwU6uBkt0E42CdgO+HC0TFDfX0nWohCtyQyAdOmLaWPvG85p0ybjK7XLniieQGw bF2iZ0ClIKdO9zFCtX/jgvOMGVCahRf2pwWdVVxedz3CwbZCE6aOkSX8u7xmu26dBHKp ZG+Ts4twYkoNsuBRk6Q91jZsnC/oNDHZr7VG+gGqy6CPhnaSBc7zqJYRwGt7WEMeFO8S RfL0JFRrBcmaUQzGy2av0UEODKf508xnbxOWhRPDwRW6nXogk2jgUWkiuLpH4TrdnPJ0 y41EH7SSbgf0tEnZuuiAAxGrFLNexoUpvihIIJ/nhoOecAhFVIetWBkhGWVJ8m+y2f8h vYKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=NZvvlRpa8DC97DN+aH7Pj/vVpZZsHFPzTcOdAGwjWjs=; b=uGXXN+HVnZ7ZHtxvwxgamEXl8d02HcNVzTAicK56BZYEF6wcEMCFlQy044ieP55ZKY REFfbkja6SBjvHUE7HbawpLUCIv0+YuvZfkG2D9eVnQAWE8lOnoh/0ij833lFf2O5c4z T3X0nLRXdRQb54yUwEc059O37c0/uop7p5TWMYZvi1Pc6H4HoSMG9haeflzx4myI/uaP wWmQYtr2chBio4A3qDLwNFIgopV71l5+54bmMAvToKCMItGNaHCuYEshOSNGVBJ2Nv5w rSqFYx2q2UnbCm5eJpWQcMe3UNHnJGGMFm9uo/ieoTiPXJplYKCtCvnfxRo2O2Ldb/+C WOGg== X-Gm-Message-State: AOAM532ojHH+cSK/8TIWmW3JdqF5tdqhDguD1s4bKsjxpZkFtlj9HJ0L Krh4veSQ0piE6SOE/bIYLZr9i3dU5Ms= X-Google-Smtp-Source: ABdhPJxT6i3ughafuEm8UkGbUNSWX88JY7+BJ9t4NGFnaML1XNt/KB3Wx91gTBGLZY+swQ6kz9VAvA== X-Received: by 2002:adf:de8a:: with SMTP id w10mr3802445wrl.388.1631379291288; Sat, 11 Sep 2021 09:54:51 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh Subject: [PATCH v3 03/24] target/i386: Simplify TARGET_X86_64 #ifdef'ry Date: Sat, 11 Sep 2021 18:54:13 +0200 Message-Id: <20210911165434.531552-4-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210911165434.531552-1-f4bug@amsat.org> References: <20210911165434.531552-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1631379295304100001 Merge two TARGET_X86_64 consecutive blocks. Reviewed-by: Warner Losh Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/i386/tcg/seg_helper.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/target/i386/tcg/seg_helper.c b/target/i386/tcg/seg_helper.c index 3ed20ca31d7..dee7bef68c6 100644 --- a/target/i386/tcg/seg_helper.c +++ b/target/i386/tcg/seg_helper.c @@ -929,9 +929,7 @@ static void do_interrupt64(CPUX86State *env, int intno,= int is_int, e2); env->eip =3D offset; } -#endif =20 -#ifdef TARGET_X86_64 void helper_sysret(CPUX86State *env, int dflag) { int cpl, selector; @@ -984,7 +982,7 @@ void helper_sysret(CPUX86State *env, int dflag) DESC_W_MASK | DESC_A_MASK); } } -#endif +#endif /* TARGET_X86_64 */ =20 /* real mode interrupt */ static void do_interrupt_real(CPUX86State *env, int intno, int is_int, --=20 2.31.1