From patchwork Wed May 19 18:30:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 442501 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp1599015jac; Wed, 19 May 2021 11:58:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwgWVPuIAOnchQ79OYZJddmqKq+MbUuFT8FWEzDfzstoMe+93kN84LBvv1qXD+5yWSobpTT X-Received: by 2002:a05:6e02:1067:: with SMTP id q7mr501849ilj.75.1621450725376; Wed, 19 May 2021 11:58:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621450725; cv=none; d=google.com; s=arc-20160816; b=ZmGtdC1Uz/AhgY1U/Qa1S1WFVG20dJJfQ/lOlo3Qv/o64yFnHmz3GoL5hmfcfhjIcS ScVPcD7u1Kck6gle/xu74cJZ//OxqHhA4RJIUMJqm8If866e9ipXE1dyv+lW0uIBdksV qe4mH3ePPskjDYUG1e4T/nbOPFYgNfL/+FMU3kg9TjqGjSQe+ymz2iHxx1vfLmsFgZEE O4BD06zmDiZb3dsyfj9txYVOmgpsj/G3GB+Gbj4IP96oZ+mmGj/ONuqUW1ns+t7zTQFH qITeeN6KsNDfoFGheKuXJAHrPPnYdSSWfg/Mx2wednTUiEcex2vi/SehYMAXnGKaGLFb 3JoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=iPj+icuYk1Db82ELWhN0FuTsJx+Xd+A4Cv7yhnX7+A8=; b=T1jGNt2aFh/iPoGzxZduQ5jrz0GvWbpdMHm4ElmVgVc9DTnwIcYMXQ+c1YjsCCTozD P0jXlbtusw9+NjntRh0t4EAWhl4a2YmQUWf4XCbNde1WUbeRuqyFW9CDlc6MPnao1ZL+ /vO6/h9NzH09HRPPb0KSlwxsUH5B8StQkos3rWO6bKQ6QB0Q4gQDp4lvJKg5P0PTUm6V epVS7iAwTepwRPvR/1GpbP1K7SLzh9jx1JeUxLZoCdl/PZvaWeQ8bUd7McMSdGJrRGjx RgIao0ayPFmJl6SHyJ2OsqlmUEfR73YtoPSmA+LH3yn3ADrI8jucD807mvzfgkjpBop/ CMhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=X2b32TWZ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id g11si550605ilf.108.2021.05.19.11.58.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 19 May 2021 11:58:45 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=X2b32TWZ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:36780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ljRP2-0004NQ-Qz for patch@linaro.org; Wed, 19 May 2021 14:58:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51844) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljQyw-0004f6-Ih for qemu-devel@nongnu.org; Wed, 19 May 2021 14:31:46 -0400 Received: from mail-ot1-x32e.google.com ([2607:f8b0:4864:20::32e]:42738) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ljQyh-0005qb-4k for qemu-devel@nongnu.org; Wed, 19 May 2021 14:31:46 -0400 Received: by mail-ot1-x32e.google.com with SMTP id g7-20020a9d12870000b0290328b1342b73so4776826otg.9 for ; Wed, 19 May 2021 11:31:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iPj+icuYk1Db82ELWhN0FuTsJx+Xd+A4Cv7yhnX7+A8=; b=X2b32TWZOWujfKRu9u11k3kJKGad/2wEHUu30Y8D5LkyLX4DnD9yefPsnbJyMq2jyz Ipz9yBM5v+39pQeXWF53Sf+XMLMSDkPajJMPB1gxmD+HqbwXKGVLSy70CvsYzUfrk1vb ckv1M+V0uJK7R3B77Ii9p1HrUBWSQmixlVAJEU/MtUX6kue1GpHTNZVMjSeIWzlTfM58 ip1Pczf4w1gKiuigjQJqG33o2aZ/adbHChtaZyW4gq01YHkxwhZvUYWCzzxXjFs2xv/L YU6E6DvRbb3qvo3FIct2QZToUwkJGQYEYTHDssiXkd0lMecTX7ypGTphqyns9zE7wvml l0PQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iPj+icuYk1Db82ELWhN0FuTsJx+Xd+A4Cv7yhnX7+A8=; b=oC4Wnoczn8dDFOcRfHapWJmXyvrEolZa+ky6SjhKkFvD/zN2or/AuqywhAoDmDMtwE r6Uq+S0CIa2vgsA0+gY1c7kSazsZ/hit4IDBy1vX7s6lQNsJbFIwFJ7+aY2FjkD57ePt av8y5N9xOpRAPIRj8hcF0xU/tuWa2ienNzAXOqSKztlT4al8Ir6GIcNYyGegfPI9Yh7x 31Dk6YAQmbi6HhPZWVbcJ8LzCb0xuzChoQMlPX+JS5J5wmovmTNDbxBY8IaCx+uYWVh2 YG+HuCEklgeNg6c8XE6YuYQb65vZujuVpEMCrJ27dxTovXt+AkPrTdAkTISjeSXNT9wY uKMA== X-Gm-Message-State: AOAM53097wpkcK9tyj4VWl53ooiBnd6PBEJg/5ZS+M7qxRC039zaCh/h 8RPmjl6S9a+vh8PY0f+QsWtuCXoB5l5To5Nl X-Received: by 2002:a9d:5a12:: with SMTP id v18mr636651oth.306.1621449089699; Wed, 19 May 2021 11:31:29 -0700 (PDT) Received: from localhost.localdomain ([45.235.253.15]) by smtp.gmail.com with ESMTPSA id l9sm28428oou.43.2021.05.19.11.31.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 May 2021 11:31:29 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 38/50] target/i386: Remove user stub for cpu_vmexit Date: Wed, 19 May 2021 13:30:38 -0500 Message-Id: <20210519183050.875453-39-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210519183050.875453-1-richard.henderson@linaro.org> References: <20210519183050.875453-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::32e; envelope-from=richard.henderson@linaro.org; helo=mail-ot1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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@linaro.org, Paolo Bonzini Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This function is only called from tcg/sysemu/. There is no need for a stub in tcg/user/. Signed-off-by: Richard Henderson Reviewed-by: Paolo Bonzini Message-Id: <20210514151342.384376-39-richard.henderson@linaro.org> --- target/i386/tcg/helper-tcg.h | 4 +++- target/i386/tcg/user/svm_stubs.c | 6 ------ 2 files changed, 3 insertions(+), 7 deletions(-) -- 2.25.1 diff --git a/target/i386/tcg/helper-tcg.h b/target/i386/tcg/helper-tcg.h index 97fb7a226a..85a8b0ebd6 100644 --- a/target/i386/tcg/helper-tcg.h +++ b/target/i386/tcg/helper-tcg.h @@ -77,10 +77,12 @@ extern const uint8_t parity_table[256]; /* misc_helper.c */ void cpu_load_eflags(CPUX86State *env, int eflags, int update_mask); -/* svm_helper.c */ +/* sysemu/svm_helper.c */ +#ifndef CONFIG_USER_ONLY void QEMU_NORETURN cpu_vmexit(CPUX86State *nenv, uint32_t exit_code, uint64_t exit_info_1, uintptr_t retaddr); void do_vmexit(CPUX86State *env); +#endif /* seg_helper.c */ void do_interrupt_x86_hardirq(CPUX86State *env, int intno, int is_hw); diff --git a/target/i386/tcg/user/svm_stubs.c b/target/i386/tcg/user/svm_stubs.c index 48a43bdcea..db818f89a8 100644 --- a/target/i386/tcg/user/svm_stubs.c +++ b/target/i386/tcg/user/svm_stubs.c @@ -22,12 +22,6 @@ #include "exec/helper-proto.h" #include "tcg/helper-tcg.h" -void cpu_vmexit(CPUX86State *nenv, uint32_t exit_code, uint64_t exit_info_1, - uintptr_t retaddr) -{ - assert(0); -} - void cpu_svm_check_intercept_param(CPUX86State *env, uint32_t type, uint64_t param, uintptr_t retaddr) {