From patchwork Thu Jan 7 20:14:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 358252 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp779821jai; Thu, 7 Jan 2021 12:20:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJx9XiXS+ADasItpGqqL5sxzmi8BKM4ykywMeY4exPP1a7F8dhPmRPMVX+fwBmohyP0PG92g X-Received: by 2002:a25:d452:: with SMTP id m79mr713574ybf.417.1610050805883; Thu, 07 Jan 2021 12:20:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1610050805; cv=none; d=google.com; s=arc-20160816; b=DUEmbWQvvge86ukBF5gpOMcuZwrBBz75o4h2tqDXHcHLAQUQfro0eGY6coCSuekyvL v08sFeda1/IGOqBeowtqJBoB2d6Rvm2cBRfQDohJab3A0P3MtsRst4zgcbK+qI1sNUm6 VyN0Blxfu587RmyQpXv+CtR5koh8GaGXy84V48tpl9lGTA2NLNx2KjJU0Qr2Big5pJhW 4UTxbL7oifWBO/hkGnfi3JbmlHNFAGGZOTVmK24oOIk315QS8oBPMTq/6HQsGwlmHcu2 O64k8x0z4zgQ8c5AhvKmGLX7GyDFofHUSYryxenQdwG63vXv69MmcHXIpJuSwz4h73PC 9m0Q== 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=pzbu+QPuB679ppIoaOkuQ2FKi4FxaEhDCtC4QBl00dw=; b=pjGeADtP6GxE63SZVjPBAtQF3cexG5zm33DHPFa6e0CU/ygJPT6oukNGUJ9FhKXlGk C4DZLEB48rhsU2Jm++hWPRSjZQJVGtg70bj50RvdlVdPRnOK4cZ8PJg6/IgjcY8s4IGe TU8wz9cMVBTx6Tnr97v2z+fhIo0uSROnioF79vBkKjD7gPFMhSPHkimGlap3TP6cfH1t goBwUgoqMEQNAjVygblgiCVvtCpiLGSyMYDoMNkYWURKFKFBcCSViS3SP/IJk09ntNTF UVqV7wp1ZuFPX76UyJKbNaFJcXzuqEI83QcMnQL+CqmJ6AMYAyJ273cFupUAq7urztk3 ZRcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=udoZJtvY; 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 r38si7859970ybd.19.2021.01.07.12.20.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Jan 2021 12:20:05 -0800 (PST) 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=udoZJtvY; 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]:57468 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kxblN-0005Ua-D2 for patch@linaro.org; Thu, 07 Jan 2021 15:20:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47876) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kxbgP-0000Yf-IB for qemu-devel@nongnu.org; Thu, 07 Jan 2021 15:14:57 -0500 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]:40975) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kxbgO-0001MU-37 for qemu-devel@nongnu.org; Thu, 07 Jan 2021 15:14:57 -0500 Received: by mail-pf1-x42f.google.com with SMTP id q20so1281563pfu.8 for ; Thu, 07 Jan 2021 12:14:55 -0800 (PST) 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=pzbu+QPuB679ppIoaOkuQ2FKi4FxaEhDCtC4QBl00dw=; b=udoZJtvYcBWNKXUJd+vhh7jaZKtOtltKaBtxuHUM4G/eYB7ZEVVoNEY9i+r9T/sh8s yCSso2igULau4xcYztMHmrLjwCr9AAvTHrxZpSjA5BjhiC/VFeJMilAnFIpdVS11/eHj cHn5+TfC8qiv+bH6TMOo/zDgI7pgt5pJc19bylUjBkBfnK9iBye7VowJ0UrcJybVqTLL WFWspdRZmsJoS2x5/3vdY9zdQ5xEGkuKoWycMHmGQdE7iKQlTBW6RRgBp3Ye17ghYkyB mOSFpVJ9TNjSDkhqgmJ5Sddcvh4ZQoQzEaLHk7MmB8WTqa0QabMz/ylbY31qJ8FQRwyz YXHQ== 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=pzbu+QPuB679ppIoaOkuQ2FKi4FxaEhDCtC4QBl00dw=; b=GJ3eKn8vhPN1k5BNILB3MVbAFZnNpuTE/BJWL8hEZN/CeKzUGhRf2pi51HWCBoLHdw fxNQa5DfCfM8dlVGlkUKVZBgKTidU8RvoP0NOKDmMqHGLSDXABBc1fADGyYJbdp0Pard JEs7lFkg1sX0esZbtB6JgqOAGw2hP64bToMMxk6KQC9o8y1KZ1gwTUd/fWASGzEAHANV wN+cri5+yRXcd8Hf9oUP9womn2D/MO8l0AtPZtAwKIavZ/1BJteIRaYBFjFJhf4eRzqt haRuh+KOU0iiXkSE0dHIFrjVSPOEeVFiRUHFkVM+gryDrVkbGJ+bZX7bSkMsEgggAvwu nIcg== X-Gm-Message-State: AOAM533P7sGIyrAfDL9c+PosiVqfbInCJpzmJ3Y91KG01/oSeeiexQIy CWsEeAdi1aPSr6LwGOGk4I4lJDqyfSpFeQ== X-Received: by 2002:a62:384b:0:b029:19d:a5c6:d76 with SMTP id f72-20020a62384b0000b029019da5c60d76mr453568pfa.16.1610050494226; Thu, 07 Jan 2021 12:14:54 -0800 (PST) Received: from localhost.localdomain (rrcs-173-197-107-21.west.biz.rr.com. [173.197.107.21]) by smtp.gmail.com with ESMTPSA id v6sm6516265pfi.31.2021.01.07.12.14.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jan 2021 12:14:53 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 01/47] linux-user: Conditionalize TUNSETVNETLE Date: Thu, 7 Jan 2021 10:14:02 -1000 Message-Id: <20210107201448.1152301-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210107201448.1152301-1-richard.henderson@linaro.org> References: <20210107201448.1152301-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42f; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42f.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, Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This fixes the build for older ppc64 kernel headers. Fixes: 6addf06a3c4 Reviewed-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- linux-user/ioctls.h | 2 ++ 1 file changed, 2 insertions(+) -- 2.25.1 diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h index 661b5daa9f..7193c3b226 100644 --- a/linux-user/ioctls.h +++ b/linux-user/ioctls.h @@ -748,8 +748,10 @@ IOCTL(TUNSETQUEUE, IOC_W, MK_PTR(MK_STRUCT(STRUCT_short_ifreq))) IOCTL(TUNSETIFINDEX , IOC_W, MK_PTR(TYPE_INT)) /* TUNGETFILTER is not supported: see TUNATTACHFILTER. */ +#ifdef TUNSETVNETLE IOCTL(TUNSETVNETLE, IOC_W, MK_PTR(TYPE_INT)) IOCTL(TUNGETVNETLE, IOC_R, MK_PTR(TYPE_INT)) +#endif #ifdef TUNSETVNETBE IOCTL(TUNSETVNETBE, IOC_W, MK_PTR(TYPE_INT)) IOCTL(TUNGETVNETBE, IOC_R, MK_PTR(TYPE_INT))