From patchwork Tue Sep 14 00:14:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 510439 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp1052464jao; Mon, 13 Sep 2021 17:37:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJysbaMgaBFLVIp2zS6sqioGTdhQYeApSh5cxXmeh0eI9TCQjGcqMMZGyHaNdCVGIgBS7tJj X-Received: by 2002:a37:a592:: with SMTP id o140mr2372516qke.220.1631579823452; Mon, 13 Sep 2021 17:37:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631579823; cv=none; d=google.com; s=arc-20160816; b=Fo3Q1CyON97D3BW9tvsb2ZYZ8Ip6WbeoyUqDAVSqHvZyiTi9TI0ozNv5xkBit65jDW FLNqPvkti9Ve2Nmvo+5WhlaK1Nhx9vEj+Z9itc4dn6PYR/Y/LXO6uhPtcPPh1Abe6K23 SRrEcX6DWXgP6PZCuTqVDrQbLXDKSJx1546OtPXelL4xOoDOJ6ePWpP1u2KQwvHry3R3 57i6Cn4Alv+KVn0Lva58ELqH8b4w97LgvZ1kCxqm5OQ85Qk8lmCPMk2ngyOpG2Ds9U6w GLoHiN5z+Awpy0LYUfnb0YDzDTHSehrD202jVLrhqIXXme6UqyloVahFi1qaC916ZBYW gnkg== 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=wr6V+HMLHJbAkFT+KuII9FEWJ5dhHoEyzENG4sNw/t0=; b=U0LspmyRytzKCKSlAF8NU6yszlOThdvSat/eHCKo99r7q9RWkp89t482uanCn5cWbC 4Dm5mQ7DMsLcZDUP4cu6ihRaBwHdURxzx5FjKgNAQ5yJ4CfTedelE29CaINzFchwV3gz 8hnojrAhBZAq+E84m+jw+p4qmHuKlq4CwP8Bn967YG5UHgm2H3s5IJYIzn7f6FF8TGq5 fnRhkeJm89SL8PvVDf7YT/D6tKXGWyVqyteRkqG3/wTd35fOq6wPF6KeOU32W7pYB6Fe sYypF+g9PEy7piyZWM41ofHaOuIQQrYPiZk0MFiGIHSxW9qEdN0J/idMRhJKE2yqLTXK 00Eg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GyNQpfct; 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 c14si5521474qvc.134.2021.09.13.17.37.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Sep 2021 17:37:03 -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=GyNQpfct; 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]:37800 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPwRa-0000CQ-Tu for patch@linaro.org; Mon, 13 Sep 2021 20:37:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53944) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPw6s-0001rt-Ej for qemu-devel@nongnu.org; Mon, 13 Sep 2021 20:15:38 -0400 Received: from mail-pg1-x531.google.com ([2607:f8b0:4864:20::531]:39850) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mPw6f-0007qs-IB for qemu-devel@nongnu.org; Mon, 13 Sep 2021 20:15:34 -0400 Received: by mail-pg1-x531.google.com with SMTP id g184so11004019pgc.6 for ; Mon, 13 Sep 2021 17:15:22 -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=wr6V+HMLHJbAkFT+KuII9FEWJ5dhHoEyzENG4sNw/t0=; b=GyNQpfctXAkMyQmn8RdJs8ONvxWCXo4MDOfPhEsEp0W5HIQtW8N9YNhXBK9/YmhQGW BP9UO5HxVeJjCjm3oEoEBoIGUkCO77roKMMUDOvKC/nOrkZRfAQsmlxKoSwMFfY1g2v9 +tskIMM/idrv9Zhl4vjHPnNvFseP1ZssB8DZ3EvVRQ4h65ZKPBvS02DeuqQ4heLsEli+ lJMOqbvJP+wN7B7tdoAKm0Q15sl3l9N/L9QJBCT1UHtF7vXPecYHEFyFBlH2hAksWSj9 JK4Sc9jenUFwLApFxRR6kggrd5krEfsvv5cY3+HGPWsevaFBEMm9XQjC8vEv363M87qC jWZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wr6V+HMLHJbAkFT+KuII9FEWJ5dhHoEyzENG4sNw/t0=; b=pzj3VFb6ttXNKRGb3lcTVzuhQxbXmzx5KNmRNDhuY3q/kw63ilSZ3SqKJAm0UdAzLZ o+iL7TUm4CjuH6ZgO4sNK9gWznGQeDtq2I7ENNSbfhKm7uaq5+xW+9MWqJViZYNVlX4c Fb5hh95JGenJJmtbhXPHIGgnAlLaiMAyghI76laLZ2rSxgMX4MfJWLzzIFQG6aPjrBIT oRyct7rb4XBGYF9w5GfUrFXxxzvpQKYmb8Q3r5QvME9uMJAqKo2lnoJ4w3knJrscJPuY D7KDR+0Oyo9Kg6POdoffJnguQE3QH5NjSDip3m9K/vlRzDrGlzawUPHz2duY5jhUTrIu mGaQ== X-Gm-Message-State: AOAM533v3WfjAg9l7rnfbco1W7gGzdISnO9yKD1KN9dTsW9j6IwNtUtY Mv9Af5teFCKAgqmxiXxlQOjjV+9oOnPDJQ== X-Received: by 2002:a63:c113:: with SMTP id w19mr13223450pgf.168.1631578521466; Mon, 13 Sep 2021 17:15:21 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id m7sm9334179pgn.32.2021.09.13.17.15.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 17:15:21 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 32/44] user: Remove cpu_get_pic_interrupt() stubs Date: Mon, 13 Sep 2021 17:14:44 -0700 Message-Id: <20210914001456.793490-33-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210914001456.793490-1-richard.henderson@linaro.org> References: <20210914001456.793490-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::531; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x531.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, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Warner Losh Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé cpu_get_pic_interrupt() is now unreachable from user-mode, delete the unnecessary stubs. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Warner Losh Reviewed-by: Richard Henderson Message-Id: <20210911165434.531552-25-f4bug@amsat.org> Signed-off-by: Richard Henderson --- target/i386/cpu.h | 2 +- bsd-user/i386/target_arch_cpu.c | 5 ----- bsd-user/x86_64/target_arch_cpu.c | 5 ----- linux-user/main.c | 7 ------- 4 files changed, 1 insertion(+), 18 deletions(-) -- 2.25.1 diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 1a36c53c18..7dd664791a 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1836,9 +1836,9 @@ int x86_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg); void x86_cpu_list(void); int cpu_x86_support_mca_broadcast(CPUX86State *env); +#ifndef CONFIG_USER_ONLY int cpu_get_pic_interrupt(CPUX86State *s); -#ifndef CONFIG_USER_ONLY /* MSDOS compatibility mode FPU exception support */ void x86_register_ferr_irq(qemu_irq irq); void fpu_check_raise_ferr_irq(CPUX86State *s); diff --git a/bsd-user/i386/target_arch_cpu.c b/bsd-user/i386/target_arch_cpu.c index 71998e5ba5..d349e45299 100644 --- a/bsd-user/i386/target_arch_cpu.c +++ b/bsd-user/i386/target_arch_cpu.c @@ -33,11 +33,6 @@ uint64_t cpu_get_tsc(CPUX86State *env) return cpu_get_host_ticks(); } -int cpu_get_pic_interrupt(CPUX86State *env) -{ - return -1; -} - void bsd_i386_write_dt(void *ptr, unsigned long addr, unsigned long limit, int flags) { diff --git a/bsd-user/x86_64/target_arch_cpu.c b/bsd-user/x86_64/target_arch_cpu.c index db822e54c6..be7bd10720 100644 --- a/bsd-user/x86_64/target_arch_cpu.c +++ b/bsd-user/x86_64/target_arch_cpu.c @@ -33,11 +33,6 @@ uint64_t cpu_get_tsc(CPUX86State *env) return cpu_get_host_ticks(); } -int cpu_get_pic_interrupt(CPUX86State *env) -{ - return -1; -} - void bsd_x86_64_write_dt(void *ptr, unsigned long addr, unsigned long limit, int flags) { diff --git a/linux-user/main.c b/linux-user/main.c index a6094563b6..45bde4598d 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -120,13 +120,6 @@ const char *qemu_uname_release; by remapping the process stack directly at the right place */ unsigned long guest_stack_size = 8 * 1024 * 1024UL; -#if defined(TARGET_I386) -int cpu_get_pic_interrupt(CPUX86State *env) -{ - return -1; -} -#endif - /***********************************************************/ /* Helper routines for implementing atomic operations. */