From patchwork Tue Jul 30 09:59:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 815299 Delivered-To: patch@linaro.org Received: by 2002:a5d:4acf:0:b0:367:895a:4699 with SMTP id y15csp219541wrs; Tue, 30 Jul 2024 02:59:55 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUDn6CdmoOIERJjKwT3/stsI+rIXem3HD09R8mmvzNM7muxNgRK9uzjVkdDVrrANCr/pFR3i5eKQmlTYusiqZUe X-Google-Smtp-Source: AGHT+IG/6zAlwRtdJv/MOQufx04bNeJcXXWb23/tuyZhisPkXXk9W7ES/+T485SI6wvlgGwF74x0 X-Received: by 2002:a05:620a:4156:b0:79f:1873:5463 with SMTP id af79cd13be357-7a1e5229ee4mr1339042385a.6.1722333595705; Tue, 30 Jul 2024 02:59:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1722333595; cv=none; d=google.com; s=arc-20160816; b=ruHFOAPc+Li1ydm6XIDszvfnsDngoQxd8Y151qORG0P6CqZa3jpAqmA0YhlReorHYM RJYymuu4eARb/gnYzuRTGdayDkhrV/iflPymI/wSXvEC4IzU9u/uo+h8rILPv8IiLFLq ywGD0KnLAG3lqvqGEzvpT7R1c3HV7CNaPnwcNG5S2WDZligy1hmp0R7Exb78/h3JhoCo AtJp9dE+J1cdO9gn/jLNFj4vh5QtUdLtuSctbJb7zMZhNQiWfSlG0530mmye5EehCY/w 7nMjt3tQIoLV+T2Zp0RrPRbV8JDFS2WHf8wvkBLLA3MmKpELAGtdbSW2xCEpWMCXFZ2j HQRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:dkim-signature; bh=1gxlSql/jvVtYT0aRUJJ4TNUP3dRmkRFYomfT7w2uNg=; fh=kcov7vl7xxOd84pcsL/vu8Npa8ekHQuOCdhbB2+Xkxw=; b=ZIzXyMttr9CNj54cB+ym/YSMIWjiDJKmxA10OaTfFJws8S/RAOr7GCh/R1dicESgHg U+db1qzYyWEXYCqCO97AoXM6ExpurcyK3GaUxQ/R3F3tr/MvxHZaJIMfDc/rL1ib9b+R wnUqL2yD4KHpieb+BOZFMgIE90hh37FBRl1NDpYd0dXTEi0bqGy9z+Q6ET1eRCt3C0CM 03Tpv82vnOd+mCsSLroFeM9Q5l5jPWDnUcrh11/PjvNlZe3YJ45nUhSqday1pNck/jFz usyUMDc2HStttTCKFS0Iq2H7VPiMtggXFosQIULeBzXiNDtu/fHasuZWOlqDj1z4E8Ov 18Zg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hOEk35TY; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7a1dddbef4esi1049268085a.407.2024.07.30.02.59.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 30 Jul 2024 02:59:55 -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=hOEk35TY; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sYjdx-00074f-1T; Tue, 30 Jul 2024 05:59:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sYjdw-00071d-6R for qemu-devel@nongnu.org; Tue, 30 Jul 2024 05:59:44 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sYjdu-0003ch-Ii for qemu-devel@nongnu.org; Tue, 30 Jul 2024 05:59:43 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-3684bea9728so2302965f8f.3 for ; Tue, 30 Jul 2024 02:59:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1722333581; x=1722938381; darn=nongnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=1gxlSql/jvVtYT0aRUJJ4TNUP3dRmkRFYomfT7w2uNg=; b=hOEk35TYr/S71hWKLhloROXb9KJ4yMFEib5OiIdwqIh5vi51SYAG++0CDyRW8ntiLf ik18gsojF09zTFMrYZsH3F0ZKi5R0Px2KcGST9wgUlBUCiEYKl1QvBdsWinkrg29pZJE sO0LRtTt7lvT7DWNlkDt33AwVe/SqnDMvo+8/nEgHtsDMz1pTsz156rUalJLj3+QmJme OSDuxAsM+qF5Z2JOfSosl8lCYFkG8G6E9XjEuK0HXbdAEvQ33D9PKyT1hlHJ1b3QQwaW 6b92rQIQHK08PUQ5ZfhKeF2Maq9c+iDov8+hmQWerxkRXr39u+gv9PLzuDmSDjpa/PcI n++w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722333581; x=1722938381; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=1gxlSql/jvVtYT0aRUJJ4TNUP3dRmkRFYomfT7w2uNg=; b=d7eotLaSYt64DcDub7qaSjoqL2XpNEpcRbQ60NiunrCSH3C22p3WS9Q+hSltRjpRel k96gJkeU3WtEASEVb3ljJvKAsvgYSebHrPuSoDtJuLjfXc0qSpUJAFBNrHHZCUwXhlCU gp83Q2CGP9UUbZnWHJbfmh1F8Z/Lj336yir0jnW3tO5e6AxH7kg+aggm9hpjDCSD0OWZ Jrs1jTmsDw/AmOD9kcQjOpIW8sVdd899HGlSmmznClBEAwyIUv3W1TbMwSCK+UPUYJmV gTOqrtFkKIaAspe46Rs2iiJWY4O3wAYodL0lDeAtRE7hdLF53U9RGz5T7K1ev6ZFZ995 5NSg== X-Gm-Message-State: AOJu0YyE4tjWCczfRi7lSCoaxPqpmM/eYA20WwwFz5RhaslJljsKKKVa j32aLob8N8C0jcwIs8omGXW6BQUgvjENNfDkqlYkzG9lRS50Yy0YnERSw9MQ5MmgKkpmfTsbOQe j X-Received: by 2002:a5d:6891:0:b0:368:6f19:cbf5 with SMTP id ffacd0b85a97d-36b5d03cb72mr6353539f8f.31.1722333580788; Tue, 30 Jul 2024 02:59:40 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42805730d92sm209679985e9.3.2024.07.30.02.59.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jul 2024 02:59:40 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org Subject: [PATCH] osdep.h: Clean up no-longer-needed back-compat for macOS 10 Date: Tue, 30 Jul 2024 10:59:39 +0100 Message-Id: <20240730095939.2781172-1-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42b.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Our official support policy only supports the most recent two versions of macOS (currently macOS 13 Ventura and macOS 14 Sonoma), and we already have code that assumes at least macOS 12 Monterey or better. In commit 2d27c91e2b72ac7 we dropped some of the back-compat code for older macOS versions, but missed the guard in osdep.h that is providing a fallback for macOS 10 and earlier. Simplify the ifdef to the "ifdef __APPLE__" that we use elsewhere for "is this macOS?". Signed-off-by: Peter Maydell Reviewed-by: Daniel P. Berrangé Reviewed-by: Philippe Mathieu-Daudé --- include/qemu/osdep.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 191916f38e6..720ed21a7e4 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -786,8 +786,7 @@ size_t qemu_get_host_physmem(void); * Toggle write/execute on the pages marked MAP_JIT * for the current thread. */ -#if defined(MAC_OS_VERSION_11_0) && \ - MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_VERSION_11_0 +#ifdef __APPLE__ static inline void qemu_thread_jit_execute(void) { pthread_jit_write_protect_np(true);