From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-21.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 42993C4338F for ; Fri, 13 Aug 2021 13:38:24 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B0A46600CC for ; Fri, 13 Aug 2021 13:38:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B0A46600CC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:58500 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mEXOA-0003F5-Uv for qemu-devel@archiver.kernel.org; Fri, 13 Aug 2021 09:38:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51716) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mEXNE-0001V0-Cn for qemu-devel@nongnu.org; Fri, 13 Aug 2021 09:37:24 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:42734) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mEXNB-0002eO-N8 for qemu-devel@nongnu.org; Fri, 13 Aug 2021 09:37:24 -0400 Received: by mail-wm1-x32d.google.com with SMTP id w21-20020a7bc1150000b02902e69ba66ce6so6947729wmi.1 for ; Fri, 13 Aug 2021 06:37:20 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=pz8E3tBHBEc3d4oLN+SxPWKL9wotay9tz0md2XGiUlA=; b=BKpJ6+aQmpdkcEsCBxXri+/o5r3nNs6ML2w0mlEQyk1MMvx1OslSdroo1SE9NEM9OJ IKwTyaVf1wSwZ8DKsZXvoopL8l52q4GwNGnQcZeYuOkEvuNWe+TmHov0S4o1lBKfWxSj wvuQ8NAvSU3vcFqMjlbYgTyP8b/kEzXpGkv9PNRol+UE+D9g2TdUaJukQiR2AgjXLHlF sSf9ai3zl7XOMkPByCJpF5XgUZIslJJiD92fa7M777uIttk6KAeFy3uhGVWifZRyydG/ W/VmCmcO0eW5fSyrs2NI4SBU9CdhaDStPbiugEKjwBdLaSaCxu5V8tDOBpo5uJ9CVVWE HWnw== 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:mime-version:content-transfer-encoding; bh=pz8E3tBHBEc3d4oLN+SxPWKL9wotay9tz0md2XGiUlA=; b=muSlY2TNdvqFALZssDKo1xGXut8m+iVWQtpAbpV7AQtMG8IzVMZIdVnwSv89EK/RjW rpPgshyRRkxNgifR9MGHEOZmuliMaJBQOXDHWO2QFZb6yNnOzNUYFXe8MHZyr6ewIWjE QgZRrIvfefzyO3JrXnFI8HWVdd08NWnrSiRoERekxD7q/gG9qgGammpqbBK9BC5XD5E1 LhdJK6mMHQ7KwU8LhSCEYwVqafxn26JSbHvP3nSGyiebtYcaUfbNvs7ICZk5clFIgmEM n238VM1R0cVNe6kDC+E3DgpardAO3V+xTkNihTn9VOWLdVjDaAIXHD/ADnG3pfvDYH/J Kw5A== X-Gm-Message-State: AOAM531OJoql+Ou9zEBFzr41bpo71O65TaURkHABJOGoNZrwFa8Uj683 kbtwOtJHnqygki96ZQgBtx/3v7RdTP+LMA== X-Google-Smtp-Source: ABdhPJx1nkEpggx8EDK1rwJ4vujCFQtIRKpk293KQOEWSSSNGyP1hOCaJrfaU3Ao4hUQ6eecjQs4jg== X-Received: by 2002:a05:600c:4fd3:: with SMTP id o19mr2781550wmq.34.1628861839381; Fri, 13 Aug 2021 06:37:19 -0700 (PDT) Received: from avogadro.redhat.com ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id w1sm1413671wmc.19.2021.08.13.06.37.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Aug 2021 06:37:18 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 1/3] target/i386: Fixed size of constant for Windows Date: Fri, 13 Aug 2021 15:37:14 +0200 Message-Id: <20210813133716.289058-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210813133716.289058-1-pbonzini@redhat.com> References: <20210813133716.289058-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x32d.google.com X-Spam_score_int: 4 X-Spam_score: 0.4 X-Spam_bar: / X-Spam_report: (0.4 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , =?UTF-8?q?Volker=20R=C3=BCmelin?= , Lara Lazier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Lara Lazier ~0UL has 64 bits on Linux and 32 bits on Windows. Fixes: https://gitlab.com/qemu-project/qemu/-/issues/512 Reported-by: Volker Rümelin Signed-off-by: Lara Lazier Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20210812111056.26926-1-laramglazier@gmail.com> Signed-off-by: Paolo Bonzini --- target/i386/tcg/sysemu/misc_helper.c | 2 +- target/i386/tcg/sysemu/svm_helper.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target/i386/tcg/sysemu/misc_helper.c b/target/i386/tcg/sysemu/misc_helper.c index d347af2a99..e7a2ebde81 100644 --- a/target/i386/tcg/sysemu/misc_helper.c +++ b/target/i386/tcg/sysemu/misc_helper.c @@ -97,7 +97,7 @@ void helper_write_crN(CPUX86State *env, int reg, target_ulong t0) break; case 3: if ((env->efer & MSR_EFER_LMA) && - (t0 & ((~0UL) << env_archcpu(env)->phys_bits))) { + (t0 & ((~0ULL) << env_archcpu(env)->phys_bits))) { cpu_vmexit(env, SVM_EXIT_ERR, 0, GETPC()); } if (!(env->efer & MSR_EFER_LMA)) { diff --git a/target/i386/tcg/sysemu/svm_helper.c b/target/i386/tcg/sysemu/svm_helper.c index e151104b4e..0d549b3d6c 100644 --- a/target/i386/tcg/sysemu/svm_helper.c +++ b/target/i386/tcg/sysemu/svm_helper.c @@ -264,7 +264,7 @@ void helper_vmrun(CPUX86State *env, int aflag, int next_eip_addend) } new_cr3 = x86_ldq_phys(cs, env->vm_vmcb + offsetof(struct vmcb, save.cr3)); if ((env->efer & MSR_EFER_LMA) && - (new_cr3 & ((~0UL) << cpu->phys_bits))) { + (new_cr3 & ((~0ULL) << cpu->phys_bits))) { cpu_vmexit(env, SVM_EXIT_ERR, 0, GETPC()); } new_cr4 = x86_ldq_phys(cs, env->vm_vmcb + offsetof(struct vmcb, save.cr4)); -- 2.31.1