From nobody Fri May 3 14:10:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1599651051; cv=none; d=zohomail.com; s=zohoarc; b=LGMDDDUG8V3ZgGBDaSLGFsC74ttXQtZcs3mkfPogMe1fMbBRAkJ8SKmBPcJVv1akYTCyzb9HDePYcs4r/g1z+Jg3qFlcWPrC+pRRacRvBhkSfmQm7Vl3696aeVVv/JdniYWdB88KkrBaMXu/GHsXp2icaOEx6nNMYnmMAYEZoXs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599651051; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Hb9hv73EPp1tw1ahzPI1+7OENb7hPI7UQgxNVfWg2Cw=; b=H01DFy8GGzzM0Csl/HkzKVFr1102s11URZ41BdRqdQ2Hw+K4J1cO4Zm35fT+qQ6/BsIvkGFAYbb+QQyPXCZu+3A/UngcJD5Oz0f8wmsqee8+kR3mBHNQEQWAd/Eq6lnCMx02TGLHNHApFa7wNbjlf+oPSRcmaythM65HnYWYcQc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1599651051451363.76868434611947; Wed, 9 Sep 2020 04:30:51 -0700 (PDT) Received: from localhost ([::1]:58308 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kFyJO-00052a-1K for importer@patchew.org; Wed, 09 Sep 2020 07:30:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60310) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kFyGS-0008OV-6K for qemu-devel@nongnu.org; Wed, 09 Sep 2020 07:27:48 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:44720) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kFyGQ-0006WS-Ft for qemu-devel@nongnu.org; Wed, 09 Sep 2020 07:27:47 -0400 Received: by mail-wr1-x42a.google.com with SMTP id s12so2517347wrw.11 for ; Wed, 09 Sep 2020 04:27:46 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f6sm3809411wro.5.2020.09.09.04.27.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Sep 2020 04:27:42 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2318B1FF87; Wed, 9 Sep 2020 12:27:42 +0100 (BST) 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=Hb9hv73EPp1tw1ahzPI1+7OENb7hPI7UQgxNVfWg2Cw=; b=shQ5SKsxA+gPp+yUihGIKLTX9NO38Y7B8ADOH9TV9AEr6rIIRQo78El1e6Ii20I8/4 a12Ik3OZQUkRnf9blRE9t3QNHUVY1/2IPx51ZDnbyXfw3+QoXkg+KFyCFRPuINU8YVbX vxjw+k7ZtQdgWFk6pFvD4C0dhdHPZWX5LY9OdZsZQ1dBN4uuJxcZJzMfe+KMyek4j5Ug CdWyndDIhgXaa8lQjHMSyaotj1S2WExxBXwOAvwfhCXZs9zgSYF2BdEhIQsNc6pCdS/y tIdaJuj3XHw4RV/h2JNUVkHZgmBeaF5b6SBOCC1OaO3870v1NU4uKacAaipKtAcUx+Bw z81w== 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=Hb9hv73EPp1tw1ahzPI1+7OENb7hPI7UQgxNVfWg2Cw=; b=DDIhfM2uQSnQTG/rBTZuHHGfUn1KqjN2JrNKt/vQYnX1WS1kieOIpEVWLNMs+I15Yk 9hF3Sl2k7XqAWL1ryJ9dqLlTBVJg/Din4zSuQh6fdWJ2BE5f4Ba8Fq0n3N+IBtrv+EX7 AQQqG1gif33n1OGONEiuXUnJJsiEq8RZ/ZxJbIg+tsFHIyKKnlUr8QYqC27Fp+E3S2Ba 24a8348Yuw3C73YwwnnmHI3KgjjgxN/5aVIySfcFNaB1EoDl7H/haENUqXtmnGUaIgsd RHQGWOKVOeSJ2xvEii0XY4qu0Smw/sa1rw7NhF2QBBIXXjuAPGc31fIpeGvfa+shnsQ0 fgyQ== X-Gm-Message-State: AOAM531CRJh0PAaYaetPBCUYValp0f2P+CNO5X2SqC97jWbrH+qA9E6H V/vJf0XpWZ/rRKYibmDjPojH6g== X-Google-Smtp-Source: ABdhPJyqNEikyN9jISy12ZHJw0dPmg9ECfLgAJBbZP5LKySFylYKhFAYrkk/eLXUxhmP/DwTzLYdvg== X-Received: by 2002:adf:f04c:: with SMTP id t12mr3461663wro.121.1599650864956; Wed, 09 Sep 2020 04:27:44 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 01/10] CODING_STYLE.rst: flesh out our naming conventions. Date: Wed, 9 Sep 2020 12:27:32 +0100 Message-Id: <20200909112742.25730-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200909112742.25730-1-alex.bennee@linaro.org> References: <20200909112742.25730-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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: fam@euphon.net, berrange@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Mention a few of the more common naming conventions we follow in the code base including common variable names and function prefix and suffix examples. Signed-off-by: Alex Benn=C3=A9e Message-Id: <20200903112107.27367-2-alex.bennee@linaro.org> Reviewed-by: Thomas Huth --- v4 - Incorporated Paolo's suggested paragraph --- CODING_STYLE.rst | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/CODING_STYLE.rst b/CODING_STYLE.rst index 427699e0e42..8b13ef0669e 100644 --- a/CODING_STYLE.rst +++ b/CODING_STYLE.rst @@ -109,8 +109,41 @@ names are lower_case_with_underscores_ending_with_a_t,= like the POSIX uint64_t and family. Note that this last convention contradicts POSIX and is therefore likely to be changed. =20 -When wrapping standard library functions, use the prefix ``qemu_`` to alert -readers that they are seeing a wrapped version; otherwise avoid this prefi= x. +Variable Naming Conventions +--------------------------- + +A number of short naming conventions exist for variables that use +common QEMU types. For example, the architecture independent CPUState +is often held as a ``cs`` pointer variable, whereas the concrete +CPUArchState is usually held in a pointer called ``env``. + +Likewise, in device emulation code the common DeviceState is usually +called ``dev``. + +Function Naming Conventions +--------------------------- + +Wrapped version of standard library or GLib functions use a ``qemu_`` +prefix to alert readers that they are seeing a wrapped version, for +example ``qemu_strtol`` or ``qemu_mutex_lock``. Other utility functions +that are widely called from across the codebase should not have any +prefix, for example ``pstrcpy`` or bit manipulation functions such as +``find_first_bit``. + +The ``qemu_`` prefix is also used for functions that modify global +emulator state, for example ``qemu_add_vm_change_state_handler``. +However, if there is an obvious subsystem-specific prefix it should be +used instead. + +Public functions from a file or subsystem (declared in headers) tend +to have a consistent prefix to show where they came from. For example, +``tlb_`` for functions from ``cputlb.c`` or ``cpu_`` for functions +from cpus.c. + +If there are two versions of a function to be called with or without a +lock held, the function that expects the lock to be already held +usually uses the suffix ``_locked``. + =20 Block structure =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --=20 2.20.1 From nobody Fri May 3 14:10:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1599650949; cv=none; d=zohomail.com; s=zohoarc; b=HGbAh0qo8G4GFybqY2r2dLDZeMnYAOZm7tv2pV5iLbJXVon1+WHjjQh2pGhx52NPYewIJz9JCeQKZ6JHqOld9eK52R18aSpirfDSBht+MeGsDI1SUY6zi8oX3tM1BNzvf++xw9kYx185I2m+4AedNxNeFnDcLXnelIjEkXIZ9DA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599650949; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BRPNz1a1sR08C7hdTMgMEJxgHmTXfMUSkTnilwnfZ1E=; b=Qxs+cXBSzoxyW0Qm5gywkwXKIkp0xiEoqP5rdGz+byaiPuhki6+pZP1yDmX8P6QeSeDuYSMxjOz2IVnG+q2O9bpJ+fD4cbyfIR9OC5y5jnpWnBkP/AjA37zhvh4r7agIKWJ1RMGGWO5paVQfO6cucgvHdx1L/tTioKCpjV6X470= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1599650949160362.40714380725854; Wed, 9 Sep 2020 04:29:09 -0700 (PDT) Received: from localhost ([::1]:50510 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kFyHj-0001ZJ-Uc for importer@patchew.org; Wed, 09 Sep 2020 07:29:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60324) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kFyGU-0008Q6-EH for qemu-devel@nongnu.org; Wed, 09 Sep 2020 07:27:50 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:55743) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kFyGS-0006Wg-LI for qemu-devel@nongnu.org; Wed, 09 Sep 2020 07:27:50 -0400 Received: by mail-wm1-x343.google.com with SMTP id a65so1910806wme.5 for ; Wed, 09 Sep 2020 04:27:48 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id d6sm3780191wrq.67.2020.09.09.04.27.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Sep 2020 04:27:42 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3CF3F1FF8C; Wed, 9 Sep 2020 12:27:42 +0100 (BST) 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=BRPNz1a1sR08C7hdTMgMEJxgHmTXfMUSkTnilwnfZ1E=; b=lQ87BerI/6IInv7C4UVMyrr/koYsPu7o6IJ/xepOPuhg6JsgkiQusgnYfIyKJOI81s UEWXUeXrTCDhIYWQQW4XhO/NyLub0eiAgHJ/UmLmsvuog9jtTqVcN8OS9E11GVL4mJHc Krj8HQip/EW7yTtor6oVQZcHu8eKtoH1oOLLN5r725Y2fL3HjD3V7MY3PjcgYi804PBo 31ba175OH+a81gI2v8VG9shuW9TKV4jjg3uP3fRWYVuoercIia7TnvLk1JdV9B8gGvOW hk86M+iSgYVjhYrXZh44wIjVbGBp4dBNzZDaUlg+LcZduc4aIGYwzr4FL99VsTD3Y1If N1vw== 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=BRPNz1a1sR08C7hdTMgMEJxgHmTXfMUSkTnilwnfZ1E=; b=uINBK+LaNoAr6LhxO8ziaZJOHq31HpH8GYxdob6ZqKDAMr8cmCJPVGXBG+zZpwZtKh QeQ5LMO5P8pFiFy/ExfD0g/atksjijMb5KGvJe0KiXn6Mp6Sh7bx3YvDt/Tf7rbzcdoY YrCibJlEo4/OzcP/6wnESCWYVkxzVbOrS+CTqQOHv5EnYafM/YTQ93d1MDfi7FyYCgLr dXom69MFwOPce1J/5VbnHgyAxI6Sm89l86LtdhB5Jx32UHqqxVThp3F++J4TcPiisam1 pEtOFXeY0/N4ndDPeH7ZjnWomS8XkFKcpFPtm5bLnraEj5IP+2RWzqJjmBDzqCb0nSXc Ipsg== X-Gm-Message-State: AOAM533JNtfXWoVU/iFm/efhtNwIyNvbI/ce7fel1lLz4aTxSBK4TaWa jUtmrupsUaioqp3ycJkRssqKog== X-Google-Smtp-Source: ABdhPJyijx1br409kH0UsPZnqg1VVv+oB7z7qVREWnV9G8hKjh3Dgc/KhTrfCc7bRHYQFY1yn7D8Wg== X-Received: by 2002:a1c:9697:: with SMTP id y145mr3052305wmd.174.1599650867099; Wed, 09 Sep 2020 04:27:47 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 02/10] usb-host: restrict workaround to new libusb versions Date: Wed, 9 Sep 2020 12:27:33 +0100 Message-Id: <20200909112742.25730-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200909112742.25730-1-alex.bennee@linaro.org> References: <20200909112742.25730-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::343; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x343.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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: fam@euphon.net, berrange@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , cota@braap.org, Gerd Hoffmann , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Gerd Hoffmann Fixes build failures with old kernels (USBDEVFS_GET_SPEED missing), on the assumtion that distros with old kernels also have old libusb. Reported-by: Alex Benn=C3=A9e Signed-off-by: Gerd Hoffmann Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20200902081445.3291-1-kraxel@redhat.com> Message-Id: <20200903112107.27367-5-alex.bennee@linaro.org> --- hw/usb/host-libusb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c index 08604f787fd..c5d38cb09c0 100644 --- a/hw/usb/host-libusb.c +++ b/hw/usb/host-libusb.c @@ -942,7 +942,7 @@ static int usb_host_open(USBHostDevice *s, libusb_devic= e *dev, int hostfd) usb_host_ep_update(s); =20 libusb_speed =3D libusb_get_device_speed(dev); -#ifdef CONFIG_LINUX +#if LIBUSB_API_VERSION >=3D 0x01000107 && defined(CONFIG_LINUX) if (hostfd && libusb_speed =3D=3D 0) { /* * Workaround libusb bug: libusb_get_device_speed() does not --=20 2.20.1 From nobody Fri May 3 14:10:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1599651057; cv=none; d=zohomail.com; s=zohoarc; b=bVZ8UqJOVlv67rLaX07DG3RGf6RpEWm+NB7B1fLfHe1dBEn/c5lTDl9i2ekY/VeejBiqusl97askZixAJF6okFHr7VOgLVvKGyW9SEAxzmZ7qDZPx6V/tpomPG1TlvH/sbZTm+JTH8vr/RE8Ovei4DpaGM/ZUW1q8leTqhOYPNA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599651057; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xYzK93R335zRMjvSDIkJPyE3RplpCsCBHGGRS+l5Oy8=; b=CItxzVW5IKB1L5UPWn5Vf83SA1AaAK+sFTMh1KK73wGo5XuEuxawA6Z/uTvgT51T6Sdja/Tr/WwkLt/iK0oUvevZzVsS33VOzxD/vbHawlEy1ulVzc3HRSwjNztboe9UE47emncn7LOvA8XUgqj2ta7vTBEb7sLKMDMt+x1yT6g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1599651057335652.875389001514; Wed, 9 Sep 2020 04:30:57 -0700 (PDT) Received: from localhost ([::1]:58616 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kFyJR-0005AR-Ph for importer@patchew.org; Wed, 09 Sep 2020 07:30:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60354) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kFyGW-0008T3-IV for qemu-devel@nongnu.org; Wed, 09 Sep 2020 07:27:52 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:34772) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kFyGU-0006Wr-J4 for qemu-devel@nongnu.org; Wed, 09 Sep 2020 07:27:52 -0400 Received: by mail-wr1-x436.google.com with SMTP id t10so2565455wrv.1 for ; Wed, 09 Sep 2020 04:27:50 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id t4sm3632061wrr.26.2020.09.09.04.27.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Sep 2020 04:27:45 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 53DDC1FF8F; Wed, 9 Sep 2020 12:27:42 +0100 (BST) 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=xYzK93R335zRMjvSDIkJPyE3RplpCsCBHGGRS+l5Oy8=; b=IfrZbKBztv82ehGSAD2BkY50l42f4zqfMvtGe3l6xDQvxvcnr5ZPWU5WOQAvC/hcQl cxM2kwP3uCHlc6qLCc72IQYkCMgZHTNE1wdRhnaCLHVRHBhGxS2dXzSAbfkNdtyG8Vah KaUUWWcr2kTmYs4kRY30md3x/eHh2td7+JUoFlQtWhIThHjIqiqSIWJEtjnX2sDqoak7 vkrR5zjf9XYRo5GmqKehUS82Fh0uqxZe11JqATRIuYZFMoj8sYpyE8Q6joO1z/pPRjV+ cviVXD/Bk5Ul/0kY/YX1nIJl242jcSG3aajqYZ/1EMNZ2bmKI+ronfeEAH3SvHSfFqc3 IzXw== 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=xYzK93R335zRMjvSDIkJPyE3RplpCsCBHGGRS+l5Oy8=; b=h9yawzNw2N8f3PeLdQn7CxHRpJbV0Z8XFsHghSEBcq+9o6a5bucaNfVLjXVRneDP0F 6FnIUYi4N7JmFz0WBBuEuhnW31vTvGP91VRbfFT0WamqcggUWeGKzWQaaMTaI9ck6ADk o+q+n+MjWYRgaRx4/X9RbBE0AlI2ChcObFcgTQVBWeM31D2aQm0oSUVFYkAolTSOnGyL RyP2MkqSOJ+QM4qCWK8dwHNDm0YT+pO6ZnAJWTEVsZIPVuvikaOqEw742Lrw0oZhBKVb FXhSxfnN+aFE27t3hBjucfxZqD2uJmLpeAr7ts74on7bmg/POo/NpC/dJrZeRMdfQtQe iYZw== X-Gm-Message-State: AOAM532Vq3UC9CfnrZTU2uSSrmFzSh1kAE5jZCss3CbxO4Y3dqaW/D9G BijnGhIvgys8T78X/E4tsynikg== X-Google-Smtp-Source: ABdhPJyrbGdqC+tD898R79MIWa51+u7QbmCDnGpCjV0kc2rtgo9VbWtNKOAgJZpVcvj/oPDp35L4hw== X-Received: by 2002:a5d:5106:: with SMTP id s6mr3787392wrt.166.1599650869147; Wed, 09 Sep 2020 04:27:49 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 03/10] tests/meson.build: fp tests don't need CONFIG_TCG Date: Wed, 9 Sep 2020 12:27:34 +0100 Message-Id: <20200909112742.25730-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200909112742.25730-1-alex.bennee@linaro.org> References: <20200909112742.25730-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x436.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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: fam@euphon.net, berrange@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) As the tests build only softfloat.c no actual TCG machinary is neede to test them (as is evidenced by GCC check-softfloat). Might as well fix the wording on Travis while at it. Signed-off-by: Alex Benn=C3=A9e Message-Id: <20200903112107.27367-7-alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- .travis.yml | 2 +- tests/meson.build | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1d0ade0a133..65341634d02 100644 --- a/.travis.yml +++ b/.travis.yml @@ -138,7 +138,7 @@ jobs: =20 =20 # Just build tools and run minimal unit and softfloat checks - - name: "GCC check-softfloat (user)" + - name: "GCC check-unit and check-softfloat" env: - BASE_CONFIG=3D"--enable-tools" - CONFIG=3D"--disable-user --disable-system" diff --git a/tests/meson.build b/tests/meson.build index 998e4c48f90..dae8a77df14 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -259,8 +259,9 @@ test('decodetree', sh, workdir: meson.current_source_dir() / 'decode', suite: 'decodetree') =20 +subdir('fp') + if 'CONFIG_TCG' in config_host - subdir('fp') if 'CONFIG_PLUGIN' in config_host subdir('plugin') endif --=20 2.20.1 From nobody Fri May 3 14:10:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1599650954; cv=none; d=zohomail.com; s=zohoarc; b=RAg4r7QDqhWKX7ABJ+gt0cp/jYrzfnrHo/vGGltNffga0BQIxNC5XeEpz1mYC+5uyZlH4cu6AOgoMoMILHk027Lxk0zicJo/yxl1I2I/qLiHpfv0r8hT9xORSI4Ij7SvPth7MakVnohYj6qP/6bY+yl6JuUGruJwN+iNn0tMscc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599650954; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZzCEYnGWgPjxCaNwaNwG2qZVWCUrnK8YFhM61o4jjX0=; b=ID6d63Z0UjXfk93FuETUsgWMPdAUyFM+e6hcMDLhaQcrFoKfARpKm4pDPBB63s7AmB7optat99HD68b6xrql1UvGhKPqG9rjBRHmGA2ula0fTeNFcpg30seWIiHsO740fczn2QNIsPDdF9V8w9Gabs3x1M2qR8GXyXtRxjwC/uw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1599650954569773.451763226092; Wed, 9 Sep 2020 04:29:14 -0700 (PDT) Received: from localhost ([::1]:51074 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kFyHp-0001no-8h for importer@patchew.org; Wed, 09 Sep 2020 07:29:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60378) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kFyGX-0008V8-O0 for qemu-devel@nongnu.org; Wed, 09 Sep 2020 07:27:53 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:45431) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kFyGV-0006X0-FA for qemu-devel@nongnu.org; Wed, 09 Sep 2020 07:27:53 -0400 Received: by mail-wr1-x444.google.com with SMTP id x14so2500908wrl.12 for ; Wed, 09 Sep 2020 04:27:51 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y1sm3882603wru.87.2020.09.09.04.27.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Sep 2020 04:27:47 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6B3AC1FF90; Wed, 9 Sep 2020 12:27:42 +0100 (BST) 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=ZzCEYnGWgPjxCaNwaNwG2qZVWCUrnK8YFhM61o4jjX0=; b=q6SDgx/IzGemaVDszgLVWJnrqv0FYZvGFWsd1ElvbftzFZs0gUsjt7cNcM6vwBVYVx 81WuF0Zuu5mFlxkvJH9lFa2eDX7+LhHshtn0wBFQUIMK0xH/G6JJ/AyM7cWbaibCJQZt ktyM56QS+pmpMdJZ1CQcKvENIpX4X7CwbyNzsWDiUX1qfyqo4aUUTk8vj/jlzoseNrpH uf8VZQ+hbsVN66nsos4fAdUy0P7Vm1z9iqWbtMFjRDkkIVtJHjpknEO+82te3Ad/7BZ7 t+UUkUHQx3O1MafFtpDlRmIqe0J6LqAqvjoui8/5uC8lGHsabg1IdhnfMspCOl26q+zD ROAw== 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=ZzCEYnGWgPjxCaNwaNwG2qZVWCUrnK8YFhM61o4jjX0=; b=WL9Qdufj2ljtEVj68Nu4PtZv4osQvXGAq7s5GCgMdU34/TbKgO7t+L+kwV78ajuiI7 JgmRH6tgPpL73g9UKd6LIl6J74esUvDNYjFym29QQems+u/nf1Htc+Jks4qoxTUobjBX NY6jqNRBtjlMvqqMSSQ5m5u/BXUp21ab6y359SLZ62n1523DQCpo/DWca3pC+DVHXnVq paaPun9g3T7dGkD8Sqvtj+HJtNZuJb6rPPKaAsTzYoe6G3NV9loXYOdTHyWPVklo1P1h 3AW5E47Q5HLvY/n+rBRz69kehXpJazZpjdV3lcI6c1n72y6hlfNM9QgIAGKDCepkkZm6 lYEQ== X-Gm-Message-State: AOAM531qfpeDQr8zYWu7EggIh5aeOCkJinkX4HD9qr0VxRqqR55puZTl ZH7cCSrAjkWjEIsLswjAPxmr/g== X-Google-Smtp-Source: ABdhPJxfRuuOh9VnRzF7JLLxkQZP1rryjmdhbhMIMqQbTUklsK/3h82Jwwlv//HTbO4IQxxzC69wNQ== X-Received: by 2002:a5d:574e:: with SMTP id q14mr3213769wrw.281.1599650870093; Wed, 09 Sep 2020 04:27:50 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 04/10] target/mips: simplify gen_compute_imm_branch logic Date: Wed, 9 Sep 2020 12:27:35 +0100 Message-Id: <20200909112742.25730-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200909112742.25730-1-alex.bennee@linaro.org> References: <20200909112742.25730-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::444; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x444.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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: fam@euphon.net, Aleksandar Rikalo , berrange@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, Jiaxun Yang , Aleksandar Markovic , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) One of the Travis builds was complaining about: qemu/include/tcg/tcg.h:437:12: error: =E2=80=98cond=E2=80=99 may be used = uninitialized in this function [-Werror=3Dmaybe-uninitialized] return (TCGCond)(c ^ 1); ../target/mips/translate.c:20031:13: note: =E2=80=98cond=E2=80=99 was dec= lared here TCGCond cond; Rather than figure out exactly which one was causing the complaint I just defaulted to TCG_COND_ALWAYS and allowed that state to double up for the now defunct bcond_compute variable. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson Message-Id: <20200903112107.27367-8-alex.bennee@linaro.org> --- target/mips/translate.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/target/mips/translate.c b/target/mips/translate.c index 899b90ae0ff..398edf72898 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -20028,8 +20028,7 @@ static void gen_pool32axf_nanomips_insn(CPUMIPSStat= e *env, DisasContext *ctx) static void gen_compute_imm_branch(DisasContext *ctx, uint32_t opc, int rt, int32_t imm, int32_t offset) { - TCGCond cond; - int bcond_compute =3D 0; + TCGCond cond =3D TCG_COND_ALWAYS; TCGv t0 =3D tcg_temp_new(); TCGv t1 =3D tcg_temp_new(); =20 @@ -20046,7 +20045,6 @@ static void gen_compute_imm_branch(DisasContext *ct= x, uint32_t opc, /* Treat as NOP */ goto out; } else { - bcond_compute =3D 1; cond =3D TCG_COND_EQ; } break; @@ -20065,7 +20063,6 @@ static void gen_compute_imm_branch(DisasContext *ct= x, uint32_t opc, tcg_gen_shri_tl(t0, t0, imm); tcg_gen_andi_tl(t0, t0, 1); tcg_gen_movi_tl(t1, 0); - bcond_compute =3D 1; if (opc =3D=3D NM_BBEQZC) { cond =3D TCG_COND_EQ; } else { @@ -20080,7 +20077,6 @@ static void gen_compute_imm_branch(DisasContext *ct= x, uint32_t opc, } else if (rt =3D=3D 0 && imm !=3D 0) { /* Unconditional branch */ } else { - bcond_compute =3D 1; cond =3D TCG_COND_NE; } break; @@ -20088,24 +20084,20 @@ static void gen_compute_imm_branch(DisasContext *= ctx, uint32_t opc, if (rt =3D=3D 0 && imm =3D=3D 0) { /* Unconditional branch */ } else { - bcond_compute =3D 1; cond =3D TCG_COND_GE; } break; case NM_BLTIC: - bcond_compute =3D 1; cond =3D TCG_COND_LT; break; case NM_BGEIUC: if (rt =3D=3D 0 && imm =3D=3D 0) { /* Unconditional branch */ } else { - bcond_compute =3D 1; cond =3D TCG_COND_GEU; } break; case NM_BLTIUC: - bcond_compute =3D 1; cond =3D TCG_COND_LTU; break; default: @@ -20118,7 +20110,7 @@ static void gen_compute_imm_branch(DisasContext *ct= x, uint32_t opc, clear_branch_hflags(ctx); ctx->base.is_jmp =3D DISAS_NORETURN; =20 - if (bcond_compute =3D=3D 0) { + if (cond =3D=3D TCG_COND_ALWAYS) { /* Uncoditional compact branch */ gen_goto_tb(ctx, 0, ctx->btarget); } else { --=20 2.20.1 From nobody Fri May 3 14:10:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1599650898; cv=none; d=zohomail.com; s=zohoarc; b=VM66tu9HZF0QGZbcw8m8mABOsZNlETtZDRWMdRAxfZnKr+FcnrJsekDxQMa1To4ukRgpJyerCbbJ5glJc4Lcswb7clYlVsXqPhwWkluLrGQivSWs76kkdK4ytnP1+dXkp88xHQ/D0+NoOAjYa2vfDafUpzNI95C9oKhpfbW1C5Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599650898; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0gAQyx4BUxAer/TPI6eyMofMbH+F+n5vgmbKXdm5rcc=; b=byt2xJ/t6tKKwLhVkK8R0VNsxZ+aLh01rzklJSnrbMgmvLrePHm9SmRvLE8tbUtawT6veveLiCDxIzNTvZrc150Y7C9wKtRGXa30Yt+IJzrhOzRIx+9CGLbGnjKFqeAkRP48GtUWFTekFys0SZUgCJiXvAXUFumE+QDUbDndrIA= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1599650898328829.4138545828635; Wed, 9 Sep 2020 04:28:18 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-29-od0YwBAnNq-N2JOwDkxRzA-1; Wed, 09 Sep 2020 07:28:14 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2AD5F1005E7B; Wed, 9 Sep 2020 11:28:09 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D1C95838C5; Wed, 9 Sep 2020 11:28:07 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id BA3E67A015; Wed, 9 Sep 2020 11:28:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 089BS2Re020006 for ; Wed, 9 Sep 2020 07:28:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3759ED0172; Wed, 9 Sep 2020 11:28:02 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 31697D016B for ; Wed, 9 Sep 2020 11:28:00 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1AF6D80096B for ; Wed, 9 Sep 2020 11:28:00 +0000 (UTC) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-398-7YQ_Ath7MPC1q25WbQ_YIQ-1; Wed, 09 Sep 2020 07:27:57 -0400 Received: by mail-wr1-f65.google.com with SMTP id a17so2539683wrn.6 for ; Wed, 09 Sep 2020 04:27:57 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q186sm3547348wma.45.2020.09.09.04.27.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Sep 2020 04:27:47 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 800F31FF91; Wed, 9 Sep 2020 12:27:42 +0100 (BST) X-MC-Unique: od0YwBAnNq-N2JOwDkxRzA-1 X-MC-Unique: 7YQ_Ath7MPC1q25WbQ_YIQ-1 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=0gAQyx4BUxAer/TPI6eyMofMbH+F+n5vgmbKXdm5rcc=; b=nodvbzukiyisr6TkkX1mgXGTjqnSvWe5k1nIRV+3kWjk2xzufnrddTxkS866PAfa6O kfuVPDQ5bHIs8TrmgqpjqqX7lfGt57rq7SCe0MhSQvc9/g+xv2Kn/uKsAJYM+31MLHkq v/5odv2rHiAyYNDqAGe6AWPVbWsrJokVasJZVei8nWTI6DwVvWZJ6zi7n4QwdXOG4Gyh yoPl1D0+YIer/OZCeVBkC8U9eGZpWylfWKzfLZgOtjH2aiZeN6VLxHF7zq+rhbpT0St7 JsDu8luT05LcXBUP5D5qBfDof2kFBgaa9RpG6+JtrVY2DCFaY7mnfhRnmyH+ihBmyF2M M5iQ== X-Gm-Message-State: AOAM531w00dkKEB5O+s/nR4lZ7uz5ojPwbOUuIJU+R0SgWYQulOeO88Y t0JHZp1XZQq23zPWBnGXCiVcgw== X-Google-Smtp-Source: ABdhPJx7eIhuRfxNQj2vqvws+oK+MInZQgoG75Id/OhtcwHHJKC7unR6ASZ2PwBWI0/ZSQEDpiGxmw== X-Received: by 2002:adf:fb87:: with SMTP id a7mr3662835wrr.390.1599650876389; Wed, 09 Sep 2020 04:27:56 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 05/10] docs/system/deprecated: mark ppc64abi32-linux-user for deprecation Date: Wed, 9 Sep 2020 12:27:36 +0100 Message-Id: <20200909112742.25730-6-alex.bennee@linaro.org> In-Reply-To: <20200909112742.25730-1-alex.bennee@linaro.org> References: <20200909112742.25730-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false; X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Cc: fam@euphon.net, "reviewer:Incompatible changes" , =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, cota@braap.org, balrogg@gmail.com, aurelien@aurel32.net, David Gibson X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable It's buggy and we are not sure anyone uses it. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson Acked-by: David Gibson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- docs/system/deprecated.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 851dbdeb8ab..a158e765c33 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -424,6 +424,13 @@ linux-user mode) is deprecated and will be removed in = a future version of QEMU. Support for this CPU was removed from the upstream Linux kernel in 2018, and has also been dropped from glibc. =20 +``ppc64abi32`` CPUs (since 5.2.0) +''''''''''''''''''''''''''''''''' + +The ``ppc64abi32`` architecture has a number of issues which regularly +trip up our CI testing and is suspected to be quite broken. For that +reason the maintainers strongly suspect no one actually uses it. + Related binaries ---------------- =20 --=20 2.20.1 From nobody Fri May 3 14:10:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1599650961; cv=none; d=zohomail.com; s=zohoarc; b=TJ8tFzTIyguImkz5rvwws4GdyOmAk0XSZzqi1CxUcu0JWDkDi/Tf60XQs7htt4F/Vk+C1bo5O08CxQY5Uqqk5fK4S4Qwka/Ag9dJ0k3Lv55GELkWpjdk6sIbT+37syGxhYPIztfm7rJ6tm4zX+vr0vgwpiDMp+HcujwvUzMBBNo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599650961; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=NDKRkKEXnbkC3JfaTHJZ5ZvrkL50opHif1TLWay2Zxk=; b=I7AtcQCoHInPvu4mRWRFbFkKvS+MrvuygcJ8k7vqaVmV/HUVt0/Ew0r+CDA5rwlCV0srlsILwB8/tDrfyinKQGZJXczX0iITH9LpsUu6teNE76s/1WBg2FxaWCBYVkpbuACBp+XQ9l9ODkgRGzqTuTab0Z/VnL89Al4eRZbSX4I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1599650961148642.1620555927299; Wed, 9 Sep 2020 04:29:21 -0700 (PDT) Received: from localhost ([::1]:51224 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kFyHv-0001rU-PB for importer@patchew.org; Wed, 09 Sep 2020 07:29:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60386) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kFyGY-00005i-QH for qemu-devel@nongnu.org; Wed, 09 Sep 2020 07:27:54 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:45431) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kFyGW-0006X6-Or for qemu-devel@nongnu.org; Wed, 09 Sep 2020 07:27:54 -0400 Received: by mail-wr1-x443.google.com with SMTP id x14so2500999wrl.12 for ; Wed, 09 Sep 2020 04:27:52 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 189sm3505363wmb.3.2020.09.09.04.27.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Sep 2020 04:27:47 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 962F31FF92; Wed, 9 Sep 2020 12:27:42 +0100 (BST) 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=NDKRkKEXnbkC3JfaTHJZ5ZvrkL50opHif1TLWay2Zxk=; b=KMog/3jEPaq58b4tiu55P1b7e0locE5mrPEGCpf0e9YQLPD644QwVlyyaDSvc0DnIp FfjjNL9YMJkKksD3Ltq0c5xzcx3ypndvgb17bxXtREfqWdN7DfpPKkRWj8CmJhHDn6Kr JX7Ig3plmxCn83iKFT3qk6sucg7FkEoPdkZWDL5R5tZSVTSFOUuQO1EaQ4t1JGvEOirC 9sfHp6LiD5RqILG3CWyUOpWUi5vYU2dUozy+pfvGe8TQZK0yaaFMz65vi33B2NBTrpxO 9qbefIF1AsbjHjugJVbL1CUj2cisa301ZrAxJSzoR870dh9+t3OY13/n9YceHtb7S6VR Pftg== 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=NDKRkKEXnbkC3JfaTHJZ5ZvrkL50opHif1TLWay2Zxk=; b=K0QbYmExqHRzJ1/VeLGtPqUQ1+7XsBXesCRJzMZtOxMjHm/ubU3KYmEvynnH61FmYe SvSjlqykEBqbXJcAmOOkEq+zMMTquLU4S7wKNfx9/f1uabnMa6tEQAza5Bw3eaGtY40P 12P/+N0DS9BR40qzJN6z05MQdWS5nqF04TytBHwiumdBFkRvLhVnao0a31SHKOcHMSYM xrzSY6OayMXmLbfxFyKTcMi7yFyjdPKImqo9PaA2uwFX8AZPCeqMFFKpUAJbUYNqGs+p CP4BecTUBjFrIR4rDM4eF+iOOZLLL9e7QNVcgqWEPO3r2fjp1gbaKxs/w9/TLJsCrBeY ubOw== X-Gm-Message-State: AOAM533P1qImZ8YC/RMB37a9/tieSySsXM2ExhDyKsY10ksAklrqoX25 pWKNvzLeZgS+wi4nJNjhGtf0Gg== X-Google-Smtp-Source: ABdhPJxdEw7/HcQV1quSfiCgsmksGvow/pIpirCvOFDk9lcJAn5M+ZlRFBgf1hr5Zy/uscF4Mstg9g== X-Received: by 2002:adf:ed12:: with SMTP id a18mr3784382wro.178.1599650871410; Wed, 09 Sep 2020 04:27:51 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 06/10] configure: don't enable ppc64abi32-linux-user by default Date: Wed, 9 Sep 2020 12:27:37 +0100 Message-Id: <20200909112742.25730-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200909112742.25730-1-alex.bennee@linaro.org> References: <20200909112742.25730-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::443; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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: fam@euphon.net, berrange@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The user can still enable this explicitly but they will get a warning at the end of configure for their troubles. This also drops any builds of ppc64abi32 from our CI tests. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- configure | 46 +++++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/configure b/configure index 4231d56bcc0..2b5492a0d63 100755 --- a/configure +++ b/configure @@ -542,6 +542,8 @@ gettext=3D"" bogus_os=3D"no" malloc_trim=3D"" =20 +deprecated_features=3D"" + # parse CC options first for opt do optarg=3D$(expr "x$opt" : 'x[^=3D]*=3D\(.*\)') @@ -1720,26 +1722,25 @@ if [ "$bsd_user" =3D "yes" ]; then mak_wilds=3D"${mak_wilds} $source_path/default-configs/*-bsd-user.mak" fi =20 -if test -z "$target_list_exclude"; then - for config in $mak_wilds; do - default_target_list=3D"${default_target_list} $(basename "$config"= .mak)" - done -else - exclude_list=3D$(echo "$target_list_exclude" | sed -e 's/,/ /g') - for config in $mak_wilds; do - target=3D"$(basename "$config" .mak)" - exclude=3D"no" - for excl in $exclude_list; do - if test "$excl" =3D "$target"; then - exclude=3D"yes" - break; - fi - done - if test "$exclude" =3D "no"; then - default_target_list=3D"${default_target_list} $target" +if test -z "$target_list_exclude" -a -z "$target_list"; then + # if the user doesn't specify anything lets skip deprecating stuff + target_list_exclude=3Dppc64abi32-linux-user +fi + +exclude_list=3D$(echo "$target_list_exclude" | sed -e 's/,/ /g') +for config in $mak_wilds; do + target=3D"$(basename "$config" .mak)" + exclude=3D"no" + for excl in $exclude_list; do + if test "$excl" =3D "$target"; then + exclude=3D"yes" + break; fi done -fi + if test "$exclude" =3D "no"; then + default_target_list=3D"${default_target_list} $target" + fi +done =20 # Enumerate public trace backends for --help output trace_backend_list=3D$(echo $(grep -le '^PUBLIC =3D True$' "$source_path"/= scripts/tracetool/backend/*.py | sed -e 's/^.*\/\(.*\)\.py$/\1/')) @@ -7557,7 +7558,7 @@ TARGET_SYSTBL=3D"" case "$target_name" in i386) mttcg=3D"yes" - gdb_xml_files=3D"i386-32bit.xml" + gdb_xml_files=3D"i386-32bit.xml" TARGET_SYSTBL_ABI=3Di386 TARGET_SYSTBL=3Dsyscall_32.tbl ;; @@ -7667,6 +7668,7 @@ case "$target_name" in TARGET_SYSTBL_ABI=3Dcommon,nospu,32 echo "TARGET_ABI32=3Dy" >> $config_target_mak gdb_xml_files=3D"power64-core.xml power-fpu.xml power-altivec.xml powe= r-spe.xml power-vsx.xml" + deprecated_features=3D"ppc64abi32 ${deprecated_features}" ;; riscv32) TARGET_BASE_ARCH=3Driscv @@ -8011,6 +8013,12 @@ fi touch ninjatool.stamp fi =20 +if test -n "${deprecated_features}"; then + echo "Warning, deprecated features enabled." + echo "Please see docs/system/deprecated.rst" + echo " features: ${deprecated_features}" +fi + # Save the configure command line for later reuse. cat <config.status #!/bin/sh --=20 2.20.1 From nobody Fri May 3 14:10:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1599651062; cv=none; d=zohomail.com; s=zohoarc; b=Dh2d4CUjbsmBBjnQZZOSVSuS/cwcaeLSBmRLg7KzKKz5H5EM+TdQnWmHQ0zG9IbCX0fOvDzWMPMK8sp5StE92WS9VsmalqUfSB9OMbqxreNJcawP/Ct9XegEs+uOuiA8nCQHaAz4nN8mVrvJLxk2SN4rKcqgn85GAoBo99TFZ/Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599651062; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=x50AKbw2C1EpufEPXDHUDVL3npAkap6GTDHFJFmIt0E=; b=CButQD7uNZyckW9Ve0BaVNVX6HEVgHJqvwVNGA43XHeUWEJ1WkJaXuuhHTxgrvcrLSfYSIXxOFjlQw/S/mX7oaD4eUbQiloElNMymsAk+phRP2cdG8fEJIXuU7UqY9RIKM1bwNI5CnZLEwywAaS56KsNoL3Vm0skwdnXl0FUZhI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1599651062220887.1560314484458; Wed, 9 Sep 2020 04:31:02 -0700 (PDT) Received: from localhost ([::1]:59318 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kFyJY-0005WJ-OI for importer@patchew.org; Wed, 09 Sep 2020 07:31:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60428) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kFyGb-0000CI-Fk for qemu-devel@nongnu.org; Wed, 09 Sep 2020 07:27:57 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:35079) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kFyGZ-0006Xe-MZ for qemu-devel@nongnu.org; Wed, 09 Sep 2020 07:27:57 -0400 Received: by mail-wr1-x443.google.com with SMTP id e16so2562999wrm.2 for ; Wed, 09 Sep 2020 04:27:55 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id t22sm4029931wmt.1.2020.09.09.04.27.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Sep 2020 04:27:47 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id AD7B71FF93; Wed, 9 Sep 2020 12:27:42 +0100 (BST) 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=x50AKbw2C1EpufEPXDHUDVL3npAkap6GTDHFJFmIt0E=; b=NesUVPWhBcQDal87ZYPspetZ9Kf56iy+WtLFgil7FzV0+Dqohpz4/7J4gCX0QxWW4i RJ+lqNGJIycrgyUSpwm5h49XaVwyRkK28YXkTl0hIiTBQ3aCQNJq2QCPmNopbtP7BEfD OqLQ0E35a1VBooxIa0hc8uJlUzDjyODg745gufMl1m5dE5vMjAvuryXQUh7PqBhkzUSX h8l4gSnHiR5hNQAsxwd8mmt4Ih+drvPej4fvSUDvLeVnw8yV6EmgUiDTE1PDl/KoLhqQ eEQ93JjpoxWcwBHLGswmkDOKQpqzO3A10xBGDcxf7BZf1lhm6X7OHHSjcIukjQjVblog jurQ== 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=x50AKbw2C1EpufEPXDHUDVL3npAkap6GTDHFJFmIt0E=; b=PhYZ0vt3RtItRDgtw9miR1INXZLjIunHqri69xUlm6/hL9F1zNubJ8y9iegXyUszlu kol/t0NiOWoZz5bKKzMQwgZ60JO0ON/d1j18/FsMc04YLfoe9UU8q/yOX1IMRySNmpXE NY3EhsXlMgbCxk2UO8qQEtEsHOTlVbD2VT2AlTrNEynH0Trn5PsQmhMDrwclGEJRbken nrdvyEisUL14tenIirX+eo1nRUixfrtWFZPVxos84Y+tmC6VDQ+mcceqccKVnRw4ZvoD Ct+5x6F7tfkJ0dVLPOWEz6QP/DP4K+jaPz63KET9L4YzJcPyIOkf6WHNW+/uMc74pIZP ehig== X-Gm-Message-State: AOAM530f48ssbi0sjJp3rE4XcEjVxF4fB8+5+MJkWvCNwlGzxUcKmx3T 2+hBf0uTenySRQuNi77HrPSgLg== X-Google-Smtp-Source: ABdhPJwFKih2UFctB1MS1kH0RmHZEJ1fUJvF0PBTrLqE/5C5p7wjXUGYE8uvHLZz8jPZD9LuS0DB/g== X-Received: by 2002:adf:efc9:: with SMTP id i9mr3546046wrp.187.1599650874411; Wed, 09 Sep 2020 04:27:54 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 07/10] hw/i386: make explicit clearing of pch_rev_id Date: Wed, 9 Sep 2020 12:27:38 +0100 Message-Id: <20200909112742.25730-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200909112742.25730-1-alex.bennee@linaro.org> References: <20200909112742.25730-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::443; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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: fam@euphon.net, berrange@redhat.com, Eduardo Habkost , "Michael S. Tsirkin" , =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, cota@braap.org, Paolo Bonzini , aurelien@aurel32.net, Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Some compilers (notably the Xenial gcc in Travis) fail to spot that this will always be set if pch_dev_id !=3D 0xffff. Given this is setup code and using _Pragma to override is equally as ugly lets just remove the doubt from the compilers mind. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/pc_piix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 32b1453e6a8..33fa035fb7f 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -930,7 +930,7 @@ void igd_passthrough_isa_bridge_create(PCIBus *bus, uin= t16_t gpu_dev_id) struct PCIDevice *bridge_dev; int i, num; uint16_t pch_dev_id =3D 0xffff; - uint8_t pch_rev_id; + uint8_t pch_rev_id =3D 0; =20 num =3D ARRAY_SIZE(igd_combo_id_infos); for (i =3D 0; i < num; i++) { --=20 2.20.1 From nobody Fri May 3 14:10:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1599651176; cv=none; d=zohomail.com; s=zohoarc; b=O2UMhyOvouRdDzZ4VN+vzMkh1PXtamfggGtEgUtqjAdw5uO4NOWruLPWw80N8G8rIR/wPvRCfZp1yB3yY+gRr5z0rR7gWtxTTHHpdHWl9kldWqZihrRSS/jLeqv9zVA1qhFhQw6NIKN6tJJJSx8tJxjeCW45VukslpkPQlRU+5o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599651176; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2wib51BYj97MEFhKwrNgtCLNnnQOCcdqhgLn/CsHDZc=; b=D9eqq3koso8/CHgm6hzVddtxdW3HHufud0YChO1qU//6RqhPRXhjVySeGyJv6dzMNZ1ePRcM0POWhPVRnHYD6GYLMbtlrj5fZSF+AcFZKQaubYBD+LSj/90MD9R7N/EPzXdfHs2nAPIMbbG0qMnMaNH+j/vIizjoMFqQ7Z9YFvQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15996511767051010.9584212481441; Wed, 9 Sep 2020 04:32:56 -0700 (PDT) Received: from localhost ([::1]:37264 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kFyLO-0008D2-Ck for importer@patchew.org; Wed, 09 Sep 2020 07:32:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60422) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kFyGa-0000AW-RV for qemu-devel@nongnu.org; Wed, 09 Sep 2020 07:27:56 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:50230) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kFyGY-0006XR-PI for qemu-devel@nongnu.org; Wed, 09 Sep 2020 07:27:56 -0400 Received: by mail-wm1-x32b.google.com with SMTP id e17so1925605wme.0 for ; Wed, 09 Sep 2020 04:27:54 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id i3sm3733647wrs.4.2020.09.09.04.27.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Sep 2020 04:27:47 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C40901FF96; Wed, 9 Sep 2020 12:27:42 +0100 (BST) 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=2wib51BYj97MEFhKwrNgtCLNnnQOCcdqhgLn/CsHDZc=; b=Em2ve5lrd9ZZKxn4Cn/JECZc1TlBb12aNYVlNoyy5J871gJakUhjiFhdmSkwh3ughZ eJEq0FmiMu0DYt8ONOrZxauJzYAdTvR5YB8hXl0YvWeYoRNFeNqXw22GhfIITXYsKl4w 6jEUEnzMyf7TcalcN24z8CCS/LLgqbtxd4lqY9SsG4VCvsX+HUQXJGsHWCcuyPF7zhBo BXp5yIGfKnzB3r2Nh27454O+d6l/dBYfgYPJKTvTN6XXfFv7P4fmbgXWdjvI64r7QetC l3xDZWPHntg0A/oOFqmx1uWHLL5tY23GrZStfUl7L/mv2Rtc3MFVd9SIfdQCyqSR3olw NICA== 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=2wib51BYj97MEFhKwrNgtCLNnnQOCcdqhgLn/CsHDZc=; b=dhcMpOczyFYuQu+OV2r7Qhbhau0GVUhBKDTtsJmGHQWT6hDcWlR0IcOiCOCnl/wInG /Ve6phKeRUSF7BF/R4bIeC1PxYTpkQbff9Rn3nwdXy0LAOMU4ycROAvDjFn8T1/klLel IrbBTXa2IIVc51DEKhQ/3FqGlCPXXIQCQVMDeyZal/eImoI24h4K9WsS4vLEzu9/HSRL B/0yUu5IuJrQ7LoMsVtyUiUDPhb3y3LWOIAbCq3PMPSCpL07GNyI2yYOguJYRgrHn5/9 C7fdb6BpS9OCYCc1Ob42rDSxTEZaG2/fehsefPeTj4zCri2IydiEATxjZti6R/Mz3hzJ 4mtQ== X-Gm-Message-State: AOAM532Tag1x2DDyy6ciXv4aUQxlyItJ/7pUnJgXvK+mu3ZkA639THlK m3PvrmbgNH4ibTMnEJ+lnjPeGQ== X-Google-Smtp-Source: ABdhPJz5vEzIU2NEWoT1UM/YOrc0BTqamn44r0OqFF1xA62SaxZHOwcH2xC8pb4F+E6dBBs6vJ3dCg== X-Received: by 2002:a1c:7907:: with SMTP id l7mr3056879wme.89.1599650873459; Wed, 09 Sep 2020 04:27:53 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 08/10] tests: bump avocado version Date: Wed, 9 Sep 2020 12:27:39 +0100 Message-Id: <20200909112742.25730-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200909112742.25730-1-alex.bennee@linaro.org> References: <20200909112742.25730-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32b.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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: fam@euphon.net, berrange@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , richard.henderson@linaro.org, f4bug@amsat.org, Willian Rampazzo , Pavel Dovgalyuk , cota@braap.org, Cleber Rosa , Pavel Dovgalyuk , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Pavel Dovgalyuk Reverse debugging test uses gdb remote client of avocado framework. This client was fixed since the currently used version 76. Therefore this patch bumps the version to 81 and fixes command line version compatibility issue. Signed-off-by: Pavel Dovgalyuk Message-Id: <159903462803.28509.16851113546106095750.stgit@pasha-ThinkPad-X= 280> Reviewed-by: Willian Rampazzo Reviewed-by: Cleber Rosa Tested-by: Cleber Rosa Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Alex Benn=C3=A9e Message-Id: <20200908202352.298506-2-philmd@redhat.com> --- tests/Makefile.include | 2 +- tests/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index f93e6112202..2baebc179e7 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -127,7 +127,7 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR) get-v= m-images --show=3D$(AVOCADO_SHOW) run --job-results-dir=3D$(TESTS_RESUL= TS_DIR) \ --filter-by-tags-include-empty --filter-by-tags-include-empty-= key \ $(AVOCADO_TAGS) \ - $(if $(GITLAB_CI),,--failfast=3Don) tests/acceptance, \ + $(if $(GITLAB_CI),,--failfast) tests/acceptance, \ "AVOCADO", "tests/acceptance") =20 # Consolidated targets diff --git a/tests/requirements.txt b/tests/requirements.txt index f9c84b4ba1a..036691c9221 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,5 +1,5 @@ # Add Python module requirements, one per line, to be installed # in the tests/venv Python virtual environment. For more info, # refer to: https://pip.pypa.io/en/stable/user_guide/#id1 -avocado-framework=3D=3D76.0 +avocado-framework=3D=3D81.0 pycdlib=3D=3D1.9.0 --=20 2.20.1 From nobody Fri May 3 14:10:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1599651179; cv=none; d=zohomail.com; s=zohoarc; b=cdj02EzNzZG2NqZUeFIFv51ZmJMeugAOMRkcIl8/XnRPP63I5EXWttSawa5lc8Fo/wL9FkwYrSM+42yKZu2VJeRPveEpjxHDMVd5s1krqIjAPhoxNg/WndYgOm7h5K7FqB2rWUnGDPGkLbAK+LrbSfEsK1LzyQu/0o0QktFaF90= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599651179; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=duRNJozNW1tzS7SluJmXwYrD3gamZ2xs+epATXTsUdQ=; b=J55uiF2aLICPPwvSyeJI8HzI+LQKKBKvcvkyR9wQos7B4EQabRNVGj2TMETy209wqaDm54Rp1np4hQOco/Pi9dt/RnPapyLsI4Uw5tcfPhoj8kZ1oikMruhZY1cnM17dCOf1JxIClF6LoOeB7atEtZTRgLHVh5PRUQbAZXuQlqg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1599651179964952.133345189476; Wed, 9 Sep 2020 04:32:59 -0700 (PDT) Received: from localhost ([::1]:37566 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kFyLS-0008Kl-Ml for importer@patchew.org; Wed, 09 Sep 2020 07:32:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60482) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kFyGg-0000PZ-Fo for qemu-devel@nongnu.org; Wed, 09 Sep 2020 07:28:02 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:51365) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kFyGe-0006YF-Kp for qemu-devel@nongnu.org; Wed, 09 Sep 2020 07:28:02 -0400 Received: by mail-wm1-x32f.google.com with SMTP id w2so1921353wmi.1 for ; Wed, 09 Sep 2020 04:28:00 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k6sm3494329wmf.30.2020.09.09.04.27.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Sep 2020 04:27:56 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DBFB51FF98; Wed, 9 Sep 2020 12:27:42 +0100 (BST) 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=duRNJozNW1tzS7SluJmXwYrD3gamZ2xs+epATXTsUdQ=; b=vv4yaHnNNpZ+ZcU74MXJffT/GQ5tPAq7GI+v3A/gj5gRl0Y0d0LoUUR1Lfb8fYYjYA C+fn+zadkmvqtEs6Ls1tKrsy0KERZ5y6YNmsXzC0QaQgSGYQzvSfjLKpDuvBGL3Plbva eYPR7Mm+0GRC1+T+hecKu1smNK6S9FArnA3Lpzr1ePwDMrSULFZH19athHT8wKiJEEsy FuxlY3hb7aVSzhnUhWHXpBEuESxxuIzrzNI4FCG1E3+Nn4Q/VscA4oBjWFbOeOA4RE1X q4HWYBTALrhO8DCfkJNBHpE8DHCJhrI2wumotmanEnosktGSp7Ufvwe8WXuJhQqmmGc1 ibvQ== 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=duRNJozNW1tzS7SluJmXwYrD3gamZ2xs+epATXTsUdQ=; b=XBf/puMLnmvfShXzlxYmhyjzGtoNs9Vwn0vy+IIOCAwRNFnwRvlXErg963WnLiEBnG rx9CXllGVj5pzUafhpip9fKoRRv0kPtxP+Tn1msuNaxem2mbv8zCRMOkcE+FLc97O+Cz xkEfgFj4eYJ3+Vh+fIYFI7K/NirqIM709UxyJjedd897cl6Qd/aoUqe5omA52HNwOI4A B/6UjKYUFwzipx6jnvqek9RB+BulUH6TcWmzPhG/zT0qdcO5E00d2Io9WrNOoajaPec5 RuqVT7grG1loRfN15oSdsBt4jFgGmgo4BKZiAE0Q0P63SvFDy56p2qLEqa+feIQ4vHLW BtUw== X-Gm-Message-State: AOAM5316ZOD4N1kuxXZsFJqiBnpAzyHGd239ZcKirdnBNvBHWZO4bo86 yR15dOC4QC3vXO8/vuJRU7Gy4w== X-Google-Smtp-Source: ABdhPJyh5BMsu8leOwUgzeU1cid1ZRg8IgowX7yGhyo3nFUPFxs8c7tRf6uFZL47wJHMgGzLO7QZIw== X-Received: by 2002:a1c:9d83:: with SMTP id g125mr3015945wme.41.1599650879214; Wed, 09 Sep 2020 04:27:59 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 09/10] tests/acceptance: Add Test.fetch_asset(cancel_on_missing=True) Date: Wed, 9 Sep 2020 12:27:40 +0100 Message-Id: <20200909112742.25730-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200909112742.25730-1-alex.bennee@linaro.org> References: <20200909112742.25730-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32f.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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: fam@euphon.net, berrange@redhat.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , richard.henderson@linaro.org, f4bug@amsat.org, Wainer dos Santos Moschetta , =?UTF-8?q?Alex=20Benn=C3=A9e?= , cota@braap.org, Cleber Rosa , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 Invert the default of avocado.Test.fetch_asset 'cancel_on_missing' keyword: accept missing artefacts by default. If a test is certain an artifact can't be missing, it will set cancel_on_missing=3DFalse. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Alex Benn=C3=A9e Message-Id: <20200908202352.298506-3-philmd@redhat.com> --- tests/acceptance/avocado_qemu/__init__.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/a= vocado_qemu/__init__.py index db9c0f5d79d..4cda0371879 100644 --- a/tests/acceptance/avocado_qemu/__init__.py +++ b/tests/acceptance/avocado_qemu/__init__.py @@ -192,3 +192,15 @@ class Test(avocado.Test): def tearDown(self): for vm in self._vms.values(): vm.shutdown() + + def fetch_asset(self, name, + asset_hash=3DNone, algorithm=3DNone, + locations=3DNone, expire=3DNone, + find_only=3DFalse, cancel_on_missing=3DTrue): + return super(Test, self).fetch_asset(name, + asset_hash=3Dasset_hash, + algorithm=3Dalgorithm, + locations=3Dlocations, + expire=3Dexpire, + find_only=3Dfind_only, + cancel_on_missing=3Dcancel_on_missing) --=20 2.20.1 From nobody Fri May 3 14:10:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1599651065; cv=none; d=zohomail.com; s=zohoarc; b=PvAbSJ1rdBNMF7y08Xei9GuQAYTApkw+pV5GkYU7T+0cKSYSjNakAB7NMkK3Nj0FYU+3oiTIvMNwlcgkPCMJWj8skQsfFNBuZ5FFZBfF9JsKBwjMmNdyp7X91hd06mA5NIVLppswjzmyzAPhJjbWn20oZ4jxaNYfSgO6ICgO19w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599651065; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=EsoZY2cKggOLWOOGCqwPvAzcGQT6NMbIsAxBlecWk8A=; b=bO2rPpTi8vlSq9PYXU/zkYVxnAjFKGpKyvSHnQDGjahHMchKqWcHJ6FrJwvTF3CcjGYa6rld+DCqrgMePmmAMEBlK1U9dt0fKF5eC08zUhtVJnN3sEj6m9ny8BxvTtw7IDAk4OzmQQO/DleQb1B9JXPTC5vwXwAsfxv6krWA4o8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1599651065173278.15907394110036; Wed, 9 Sep 2020 04:31:05 -0700 (PDT) Received: from localhost ([::1]:59502 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kFyJb-0005bM-Bb for importer@patchew.org; Wed, 09 Sep 2020 07:31:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60478) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kFyGg-0000P7-CT for qemu-devel@nongnu.org; Wed, 09 Sep 2020 07:28:02 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:43234) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kFyGd-0006Y2-8D for qemu-devel@nongnu.org; Wed, 09 Sep 2020 07:28:01 -0400 Received: by mail-wr1-x431.google.com with SMTP id k15so2509793wrn.10 for ; Wed, 09 Sep 2020 04:27:58 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 70sm3692880wme.15.2020.09.09.04.27.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Sep 2020 04:27:56 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0DA851FF99; Wed, 9 Sep 2020 12:27:43 +0100 (BST) 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=EsoZY2cKggOLWOOGCqwPvAzcGQT6NMbIsAxBlecWk8A=; b=qRzcwRMpKHy05qhb9FM+wOtu4XgO5dZnSNBYXwPpMXjTaFC6rMo5QDCqbcxlIJjF3K hUgRQ4OzUuY7cJLONnmVSfqktkfo1TiVRk/mwKKZ1JaURc8yjJwhSrDn1y9O8ofDO/Yk tehOzoT9RQlWl7dxBSn4qdl5He9OTj04wEb58g9N/XTBK+LTpy+z59MnqBRyXikFk0Jf vc0A3I4X3txeOGGtPAJkQh6r2Fq/fmRo4WSZZQuQLQE+ERABdm6rvYH4ExKFgRnH/L75 u15AVpB1OMsLxOj7ubLx8JxANI3CSUN5xbhhbUm9AW7Vq2Jw39c+8LnFQC54ermTrBwu M5sA== 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=EsoZY2cKggOLWOOGCqwPvAzcGQT6NMbIsAxBlecWk8A=; b=dbE5z13DVqg7cmmhb4RyfBLPU/oSkL2UWlAdTk0tOu0vsZ1sQ3q8SPAga9d/VtUGrc ZSjawmDbifaXG2rGG3DyQQqHHFPQpve0cq1QYt2KF65Oo4SqcOup+uHD4fXzQ/L22zhF STZBf3MJotbnliIUWMbv5gyXqNi0fYL5sLJFt4bwHFu0iibUZvhwPiXZ2+jLXVQoLMxz 8K/4aaD+30ciIFyQ8YAutjliJypQJGYeVRG8G5fc5xUVH1y9ZBRaNu34YG0n8SAiSo8i AvJLy8rgBepLpO9K9LDJ2mecxnyR/LhUuO2CN7KaiMx3t0CpgXe++4iNK4SO8z/vY7Ua yWIw== X-Gm-Message-State: AOAM531ofQJ9x7cjJLQ9Sh7BXUZEr5REYT5ulZDRBh3fRjSm3W/dQLvQ /1sIYMqy8pvVyJLoFYQUQNC1VA== X-Google-Smtp-Source: ABdhPJyIrqWJZYBZfURGwjjo4Ioqrc/uf+vrGUJzsFetk7XHNAzHwDM+2UV3IyXHVpXTKuu4i87o7Q== X-Received: by 2002:adf:f042:: with SMTP id t2mr3226912wro.385.1599650877707; Wed, 09 Sep 2020 04:27:57 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 10/10] plugins: move the more involved plugins to contrib Date: Wed, 9 Sep 2020 12:27:41 +0100 Message-Id: <20200909112742.25730-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200909112742.25730-1-alex.bennee@linaro.org> References: <20200909112742.25730-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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: fam@euphon.net, berrange@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) We have an exploding complexity problem in the testing so lets just move the more involved plugins into contrib. tests/plugins still exist for the basic plugins that exercise the API. We restore the old pre-meson style Makefile for contrib as it also doubles as a guide for out-of-tree plugin builds. While we are at it add some examples to the documentation and a specific plugins build target. Signed-off-by: Alex Benn=C3=A9e Message-Id: <20200904134007.4175-4-alex.bennee@linaro.org> --- v4 - expand MAINTAINERS --- docs/devel/tcg-plugins.rst | 142 ++++++++++++++++++ configure | 2 + Makefile | 11 ++ {tests/plugin =3D> contrib/plugins}/hotblocks.c | 0 {tests/plugin =3D> contrib/plugins}/hotpages.c | 0 {tests/plugin =3D> contrib/plugins}/howvec.c | 0 {tests/plugin =3D> contrib/plugins}/lockstep.c | 0 MAINTAINERS | 3 +- contrib/plugins/Makefile | 42 ++++++ tests/Makefile.include | 2 +- tests/plugin/meson.build | 4 +- tests/tcg/Makefile.target | 3 +- 12 files changed, 203 insertions(+), 6 deletions(-) rename {tests/plugin =3D> contrib/plugins}/hotblocks.c (100%) rename {tests/plugin =3D> contrib/plugins}/hotpages.c (100%) rename {tests/plugin =3D> contrib/plugins}/howvec.c (100%) rename {tests/plugin =3D> contrib/plugins}/lockstep.c (100%) create mode 100644 contrib/plugins/Makefile diff --git a/docs/devel/tcg-plugins.rst b/docs/devel/tcg-plugins.rst index a05990906cc..e079695caf9 100644 --- a/docs/devel/tcg-plugins.rst +++ b/docs/devel/tcg-plugins.rst @@ -134,3 +134,145 @@ longer want to instrument the code. This operation is= asynchronous which means callbacks may still occur after the uninstall operation is requested. The plugin isn't completely uninstalled until the safe work has executed while all vCPUs are quiescent. + +Example Plugins +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +There are a number of plugins included with QEMU and you are +encouraged to contribute them upstream. There is a `contrib/plugins` +directory where they can go. + +- tests/plugins + +These are some basic plugins that are used to test and exercise the +API during the `make check-tcg` target. + +- contrib/plugins/hotblocks.c + +The hotblocks plugin allows you to examine the where hot paths of +execution are in your program. Once the program has finished you will +get a sorted list of blocks reporting the starting PC, translation +count, number of instructions and execution count. This will work best +with linux-user execution as system emulation tends to generate +re-translations as blocks from different programs get swapped in and +out of system memory. + +If your program is single-threaded you can use the `inline` option for +slightly faster (but not thread safe) counters. + +Example:: + + ./aarch64-linux-user/qemu-aarch64 -plugin contrib/plugins/libhotblocks.s= o -d plugin ./tests/tcg/aarch64-linux-user/sha1 + SHA1=3D15dd99a1991e0b3826fede3deffc1feba42278e6 + collected 903 entries in the hash table + pc, tcount, icount, ecount + 0x0000000041ed10, 1, 5, 66087 + 0x000000004002b0, 1, 4, 66087 + ... + +- contrib/plugins/hotpages.c + +Similar to hotblocks but this time tracks memory accesses:: + + ./aarch64-linux-user/qemu-aarch64 -plugin contrib/plugins/libhotpages.so= -d plugin ./tests/tcg/aarch64-linux-user/sha1 + SHA1=3D15dd99a1991e0b3826fede3deffc1feba42278e6 + Addr, RCPUs, Reads, WCPUs, Writes + 0x000055007fe000, 0x0001, 31747952, 0x0001, 8835161 + 0x000055007ff000, 0x0001, 29001054, 0x0001, 8780625 + 0x00005500800000, 0x0001, 687465, 0x0001, 335857 + 0x0000000048b000, 0x0001, 130594, 0x0001, 355 + 0x0000000048a000, 0x0001, 1826, 0x0001, 11 + +- contrib/plugins/howvec.c + +This is an instruction classifier so can be used to count different +types of instructions. It has a number of options to refine which get +counted. You can give an argument for a class of instructions to break +it down fully, so for example to see all the system registers +accesses:: + + ./aarch64-softmmu/qemu-system-aarch64 $(QEMU_ARGS) \ + -append "root=3D/dev/sda2 systemd.unit=3Dbenchmark.service" \ + -smp 4 -plugin ./contrib/plugins/libhowvec.so,arg=3Dsreg -d plugin + +which will lead to a sorted list after the class breakdown:: + + Instruction Classes: + Class: UDEF not counted + Class: SVE (68 hits) + Class: PCrel addr (47789483 hits) + Class: Add/Sub (imm) (192817388 hits) + Class: Logical (imm) (93852565 hits) + Class: Move Wide (imm) (76398116 hits) + Class: Bitfield (44706084 hits) + Class: Extract (5499257 hits) + Class: Cond Branch (imm) (147202932 hits) + Class: Exception Gen (193581 hits) + Class: NOP not counted + Class: Hints (6652291 hits) + Class: Barriers (8001661 hits) + Class: PSTATE (1801695 hits) + Class: System Insn (6385349 hits) + Class: System Reg counted individually + Class: Branch (reg) (69497127 hits) + Class: Branch (imm) (84393665 hits) + Class: Cmp & Branch (110929659 hits) + Class: Tst & Branch (44681442 hits) + Class: AdvSimd ldstmult (736 hits) + Class: ldst excl (9098783 hits) + Class: Load Reg (lit) (87189424 hits) + Class: ldst noalloc pair (3264433 hits) + Class: ldst pair (412526434 hits) + Class: ldst reg (imm) (314734576 hits) + Class: Loads & Stores (2117774 hits) + Class: Data Proc Reg (223519077 hits) + Class: Scalar FP (31657954 hits) + Individual Instructions: + Instr: mrs x0, sp_el0 (2682661 hits) (op=3D0xd5384100/ Syste= m Reg) + Instr: mrs x1, tpidr_el2 (1789339 hits) (op=3D0xd53cd041/ Syste= m Reg) + Instr: mrs x2, tpidr_el2 (1513494 hits) (op=3D0xd53cd042/ Syste= m Reg) + Instr: mrs x0, tpidr_el2 (1490823 hits) (op=3D0xd53cd040/ Syste= m Reg) + Instr: mrs x1, sp_el0 (933793 hits) (op=3D0xd5384101/ Syste= m Reg) + Instr: mrs x2, sp_el0 (699516 hits) (op=3D0xd5384102/ Syste= m Reg) + Instr: mrs x4, tpidr_el2 (528437 hits) (op=3D0xd53cd044/ Syste= m Reg) + Instr: mrs x30, ttbr1_el1 (480776 hits) (op=3D0xd538203e/ Syste= m Reg) + Instr: msr ttbr1_el1, x30 (480713 hits) (op=3D0xd518203e/ Syste= m Reg) + Instr: msr vbar_el1, x30 (480671 hits) (op=3D0xd518c01e/ Syste= m Reg) + ... + +To find the argument shorthand for the class you need to examine the +source code of the plugin at the moment, specifically the `*opt` +argument in the InsnClassExecCount tables. + +- contrib/plugins/lockstep.c + +This is a debugging tool for developers who want to find out when and +where execution diverges after a subtle change to TCG code generation. +It is not an exact science and results are likely to be mixed once +asynchronous events are introduced. While the use of -icount can +introduce determinism to the execution flow it doesn't always follow +the translation sequence will be exactly the same. Typically this is +caused by a timer firing to service the GUI causing a block to end +early. However in some cases it has proved to be useful in pointing +people at roughly where execution diverges. The only argument you need +for the plugin is a path for the socket the two instances will +communicate over:: + + + ./sparc-softmmu/qemu-system-sparc -monitor none -parallel none \ + -net none -M SS-20 -m 256 -kernel day11/zImage.elf \ + -plugin ./contrib/plugins/liblockstep.so,arg=3Dlockstep-sparc.sock \ + -d plugin,nochain + +which will eventually report:: + + qemu-system-sparc: warning: nic lance.0 has no peer + @ 0x000000ffd06678 vs 0x000000ffd001e0 (2/1 since last) + @ 0x000000ffd07d9c vs 0x000000ffd06678 (3/1 since last) + =CE=94 insn_count @ 0x000000ffd07d9c (809900609) vs 0x000000ffd06678 (80= 9900612) + previously @ 0x000000ffd06678/10 (809900609 insns) + previously @ 0x000000ffd001e0/4 (809900599 insns) + previously @ 0x000000ffd080ac/2 (809900595 insns) + previously @ 0x000000ffd08098/5 (809900593 insns) + previously @ 0x000000ffd080c0/1 (809900588 insns) + diff --git a/configure b/configure index 2b5492a0d63..2b6a1196da5 100755 --- a/configure +++ b/configure @@ -7855,6 +7855,7 @@ DIRS=3D"$DIRS tests/qtest tests/qemu-iotests tests/vm= tests/fp tests/qgraph" DIRS=3D"$DIRS docs docs/interop fsdev scsi" DIRS=3D"$DIRS pc-bios/optionrom pc-bios/s390-ccw" DIRS=3D"$DIRS roms/seabios" +DIRS=3D"$DIRS contrib/plugins/" LINKS=3D"Makefile" LINKS=3D"$LINKS tests/tcg/lm32/Makefile" LINKS=3D"$LINKS tests/tcg/Makefile.target" @@ -7866,6 +7867,7 @@ LINKS=3D"$LINKS .gdbinit scripts" # scripts needed by= relative path in .gdbinit LINKS=3D"$LINKS tests/acceptance tests/data" LINKS=3D"$LINKS tests/qemu-iotests/check" LINKS=3D"$LINKS python" +LINKS=3D"$LINKS contrib/plugins/Makefile " UNLINK=3D"pc-bios/keymaps" for bios_file in \ $source_path/pc-bios/*.bin \ diff --git a/Makefile b/Makefile index d6c5c9fdef1..b63f7dce529 100644 --- a/Makefile +++ b/Makefile @@ -106,6 +106,12 @@ config-host.mak: $(SRC_PATH)/configure $(SRC_PATH)/pc-= bios $(SRC_PATH)/VERSION # Force configure to re-run if the API symbols are updated ifeq ($(CONFIG_PLUGIN),y) config-host.mak: $(SRC_PATH)/plugins/qemu-plugins.symbols + +.PHONY: plugins +plugins: + $(call quiet-command,\ + $(MAKE) $(SUBDIR_MAKEFLAGS) -C contrib/plugins V=3D"$(V)", \ + "BUILD", "example plugins") endif =20 else @@ -256,6 +262,11 @@ help: $(call print-help,cscope,Generate cscope index) $(call print-help,sparse,Run sparse on the QEMU source) @echo '' +ifeq ($(CONFIG_PLUGIN),y) + @echo 'Plugin targets:' + $(call print-help,plugins,Build the example TCG plugins) + @echo '' +endif @echo 'Cleaning targets:' $(call print-help,clean,Remove most generated files but keep the config) $(call print-help,distclean,Remove all generated files) diff --git a/tests/plugin/hotblocks.c b/contrib/plugins/hotblocks.c similarity index 100% rename from tests/plugin/hotblocks.c rename to contrib/plugins/hotblocks.c diff --git a/tests/plugin/hotpages.c b/contrib/plugins/hotpages.c similarity index 100% rename from tests/plugin/hotpages.c rename to contrib/plugins/hotpages.c diff --git a/tests/plugin/howvec.c b/contrib/plugins/howvec.c similarity index 100% rename from tests/plugin/howvec.c rename to contrib/plugins/howvec.c diff --git a/tests/plugin/lockstep.c b/contrib/plugins/lockstep.c similarity index 100% rename from tests/plugin/lockstep.c rename to contrib/plugins/lockstep.c diff --git a/MAINTAINERS b/MAINTAINERS index 7d0a5e91e4f..018c4f94a93 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2745,7 +2745,8 @@ M: Alex Benn=C3=A9e S: Maintained F: docs/devel/tcg-plugins.rst F: plugins/ -F: tests/plugin +F: tests/plugin/ +F: contrib/plugins/ =20 AArch64 TCG target M: Richard Henderson diff --git a/contrib/plugins/Makefile b/contrib/plugins/Makefile new file mode 100644 index 00000000000..7801b08b0d6 --- /dev/null +++ b/contrib/plugins/Makefile @@ -0,0 +1,42 @@ +# -*- Mode: makefile -*- +# +# This Makefile example is fairly independent from the main makefile +# so users can take and adapt it for their build. We only really +# include config-host.mak so we don't have to repeat probing for +# cflags that the main configure has already done for us. +# + +BUILD_DIR :=3D $(CURDIR)/../.. + +include $(BUILD_DIR)/config-host.mak + +VPATH +=3D $(SRC_PATH)/contrib/plugins + +NAMES :=3D +NAMES +=3D hotblocks +NAMES +=3D hotpages +NAMES +=3D howvec +NAMES +=3D lockstep + +SONAMES :=3D $(addsuffix .so,$(addprefix lib,$(NAMES))) + +# The main QEMU uses Glib extensively so it's perfectly fine to use it +# in plugins (which many example do). +CFLAGS =3D $(GLIB_CFLAGS) +CFLAGS +=3D -fPIC +CFLAGS +=3D $(if $(findstring no-psabi,$(QEMU_CFLAGS)),-Wpsabi) +CFLAGS +=3D -I$(SRC_PATH)/include/qemu + +all: $(SONAMES) + +%.o: %.c + $(CC) $(CFLAGS) -c -o $@ $< + +lib%.so: %.o + $(CC) -shared -Wl,-soname,$@ -o $@ $^ $(LDLIBS) + +clean: + rm -f *.o *.so *.d + rm -Rf .libs + +.PHONY: all clean diff --git a/tests/Makefile.include b/tests/Makefile.include index 2baebc179e7..40d909badcb 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -50,7 +50,7 @@ RUN_TCG_TARGET_RULES=3D$(patsubst %,run-tcg-tests-%, $(TA= RGET_DIRS)) $(foreach PROBE_TARGET,$(TARGET_DIRS), \ $(eval -include $(SRC_PATH)/tests/tcg/Makefile.prereqs)) =20 -build-tcg-tests-%: $(if $(CONFIG_PLUGIN),plugins) +build-tcg-tests-%: $(if $(CONFIG_PLUGIN),test-plugins) $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) \ -f $(SRC_PATH)/tests/tcg/Makefile.qemu \ SRC_PATH=3D$(SRC_PATH) \ diff --git a/tests/plugin/meson.build b/tests/plugin/meson.build index dbbdcbaa670..1eacfa6e355 100644 --- a/tests/plugin/meson.build +++ b/tests/plugin/meson.build @@ -1,7 +1,7 @@ t =3D [] -foreach i : ['bb', 'empty', 'insn', 'mem', 'hotblocks', 'howvec', 'hotpage= s', 'lockstep'] +foreach i : ['bb', 'empty', 'insn', 'mem'] t +=3D shared_module(i, files(i + '.c'), include_directories: '../../include/qemu', dependencies: glib) endforeach -alias_target('plugins', t) +alias_target('test-plugins', t) diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target index 4b2b696fcee..2ae86776cdc 100644 --- a/tests/tcg/Makefile.target +++ b/tests/tcg/Makefile.target @@ -129,8 +129,7 @@ ifeq ($(CONFIG_PLUGIN),y) PLUGIN_SRC=3D$(SRC_PATH)/tests/plugin PLUGIN_LIB=3D../../plugin VPATH+=3D$(PLUGIN_LIB) -PLUGINS=3D$(filter-out liblockstep.so,\ - $(patsubst %.c, lib%.so, $(notdir $(wildcard $(PLUGIN_SRC)/*.c)))) +PLUGINS=3D$(patsubst %.c, lib%.so, $(notdir $(wildcard $(PLUGIN_SRC)/*.c))) =20 # We need to ensure expand the run-plugin-TEST-with-PLUGIN # pre-requistes manually here as we can't use stems to handle it. We --=20 2.20.1