From nobody Tue Nov 18 15:26:29 2025 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1611155997; cv=none; d=zohomail.com; s=zohoarc; b=NoJftsJnW6gMkNUoIp/YIQud9AqE6RNS/WmPFUjI/A930+hxcVkB+tiu4+k8U/CwzN4BCU7jy14vI+6CtIV411zmsxlkTN4Guj9SYLHm01u85kXYZOXkL1k+jvMsu9nsyspfrxvPeYOt3rZXvW9W2Qvsmj8OvIGW1Mk+goAEuVM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611155997; 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=jJCgtbFIWVTjbRJVM6jGRVUbEeOAJsAV/UEZoiikXjw=; b=kXnVRkf8yXztky8As7grKSKyUKV3+3DRA5ZuKgCjAOgnOZ4wQhP7Dhvkpi3nvOecgoLLc21ZsiV6MOlG9TDsOcNi23UnhAN/+lW+s9TUWm15sNTr97cNjjQVwlsyn16Qt1CjPyk0lJo9liqtZhnjdZOiuWZ1MJ804rviLSRlnuU= 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 1611155997396773.0211581850366; Wed, 20 Jan 2021 07:19:57 -0800 (PST) Received: from localhost ([::1]:41950 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2FH2-0001ht-KX for importer@patchew.org; Wed, 20 Jan 2021 10:19:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43732) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2FFG-0000FP-I8 for qemu-devel@nongnu.org; Wed, 20 Jan 2021 10:18:12 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:31371) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l2FFA-0007gV-EQ for qemu-devel@nongnu.org; Wed, 20 Jan 2021 10:18:06 -0500 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-235-hivR_ZsFMqWn7x08FVj8fA-1; Wed, 20 Jan 2021 10:17:57 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4882810054FF; Wed, 20 Jan 2021 15:17:56 +0000 (UTC) Received: from thuth.com (ovpn-114-135.ams2.redhat.com [10.36.114.135]) by smtp.corp.redhat.com (Postfix) with ESMTP id B3E0A60C6A; Wed, 20 Jan 2021 15:17:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611155879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jJCgtbFIWVTjbRJVM6jGRVUbEeOAJsAV/UEZoiikXjw=; b=GijjNMu8RcK+RVgml3VA4oKMkHGuI6PSRibznfaZbpmX6CBOcPVo82BIT+AsCMxipuLdej heP2wxhRrAHSVErvavfM0qk/gZfQyx6bT5ovsXDYhwgghhnDcnnmcNgKrBrTPWMqVatevh HRuWFNFugIHmTDRI1+tbHftjJErGn+I= X-MC-Unique: hivR_ZsFMqWn7x08FVj8fA-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 01/14] osdep.h: Remove include Date: Wed, 20 Jan 2021 16:17:38 +0100 Message-Id: <20210120151751.520597-2-thuth@redhat.com> In-Reply-To: <20210120151751.520597-1-thuth@redhat.com> References: <20210120151751.520597-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=216.205.24.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.167, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: John Snow , Michael Forney Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Michael Forney Prior to 2a4b472c3c, sys/signal.h was only included on OpenBSD (apart from two .c files). The POSIX standard location for this header is just and in fact, OpenBSD's signal.h includes sys/signal.h itself. Unconditionally including on musl causes warnings for just about every source file: /usr/include/sys/signal.h:1:2: warning: #warning redirecting incorrect #i= nclude to [-Wcpp] 1 | #warning redirecting incorrect #include to | ^~~~~~~ Since there don't seem to be any platforms which require including in addition to , and some platforms like Haiku lack it completely, just remove it. Tested building on OpenBSD after removing this include. Signed-off-by: Michael Forney Tested-by: John Snow Reviewed-by: Eric Blake Reviewed-by: Thomas Huth Message-Id: <20210113215600.16100-1-mforney@mforney.org> Signed-off-by: Thomas Huth --- include/qemu/osdep.h | 4 ---- meson.build | 1 - 2 files changed, 5 deletions(-) diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index f9ec8c84e9..a434382c58 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -104,10 +104,6 @@ extern int daemon(int, int); #include #include =20 -#ifdef HAVE_SYS_SIGNAL_H -#include -#endif - #ifndef _WIN32 #include #else diff --git a/meson.build b/meson.build index 3d889857a0..af2bc89741 100644 --- a/meson.build +++ b/meson.build @@ -1113,7 +1113,6 @@ config_host_data.set('HAVE_DRM_H', cc.has_header('lib= drm/drm.h')) config_host_data.set('HAVE_PTY_H', cc.has_header('pty.h')) config_host_data.set('HAVE_SYS_IOCCOM_H', cc.has_header('sys/ioccom.h')) config_host_data.set('HAVE_SYS_KCOV_H', cc.has_header('sys/kcov.h')) -config_host_data.set('HAVE_SYS_SIGNAL_H', cc.has_header('sys/signal.h')) =20 ignored =3D ['CONFIG_QEMU_INTERP_PREFIX'] # actually per-target arrays =3D ['CONFIG_AUDIO_DRIVERS', 'CONFIG_BDRV_RW_WHITELIST', 'CONFIG_BD= RV_RO_WHITELIST'] --=20 2.27.0 From nobody Tue Nov 18 15:26:29 2025 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1611156188; cv=none; d=zohomail.com; s=zohoarc; b=gdQexq84Q1tJ2p/QKmVExc5OGN65ilXG41DHj3oP0JV8IVaJNYbi0Oal89cVjstUKQaSWu7ByAFUC6EIAHkjjc1hMHl8ki/drmEn/N8dgroNK4SO38hLFR28F76BJBBAp9WTnLkHaFytezTifg6oVLG1gX9apB0MqYyozKTuPRk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611156188; h=Content-Type:Content-Transfer-Encoding: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=49LaDgg7JZQHmliaHvdQYMBS/3LzQKpy8qKOcXGVb9w=; b=PtC4J3FBQeWfCwHJQz0R1/sv2fAvoRjmDo158dWeOCQQCpLFFAHM3sfzW7t+z6sUomTK/xm5JTHZnlVjS2FcLp+VXwxj0S73+JRfMeChX/YUXiFr/GW8EG6Uj3soavruOnfHgLixOSO0ZudEFslT6D8YPx/IMhZ5aBEjRaMQdQA= 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 1611156188318471.88269119404083; Wed, 20 Jan 2021 07:23:08 -0800 (PST) Received: from localhost ([::1]:49452 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2FK7-0004tW-Br for importer@patchew.org; Wed, 20 Jan 2021 10:23:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43834) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2FFW-0000G2-0a for qemu-devel@nongnu.org; Wed, 20 Jan 2021 10:18:22 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:57929) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l2FFF-0007gc-JY for qemu-devel@nongnu.org; Wed, 20 Jan 2021 10:18:14 -0500 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-436-zDEJ4gEXMWupoewgGHCAfw-1; Wed, 20 Jan 2021 10:17:58 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 74DB18066E9; Wed, 20 Jan 2021 15:17:57 +0000 (UTC) Received: from thuth.com (ovpn-114-135.ams2.redhat.com [10.36.114.135]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8D9DA60C6A; Wed, 20 Jan 2021 15:17:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611155881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=49LaDgg7JZQHmliaHvdQYMBS/3LzQKpy8qKOcXGVb9w=; b=GcBv7T885LSYMzv0kjrV8zZSfpPv3hBNrUf7Puy//Tb95Kl0PbosatzJUaJbvmZSuvbjTd iOxhyjN/KYpKUYnRUwWqzXk0pBtGE2GVLbkcBTcRHFnYmcbpWs7MLTrYMHocg4R61/RWQM iUKC8kEbjSwm5R6FDGZpNscBiclazSs= X-MC-Unique: zDEJ4gEXMWupoewgGHCAfw-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 02/14] configure: Add sys/timex.h to probe clock_adjtime Date: Wed, 20 Jan 2021 16:17:39 +0100 Message-Id: <20210120151751.520597-3-thuth@redhat.com> In-Reply-To: <20210120151751.520597-1-thuth@redhat.com> References: <20210120151751.520597-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=63.128.21.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.167, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Jiaxun Yang It is not a part of standard time.h. Glibc put it under time.h however musl treat it as a sys timex extension. Signed-off-by: Jiaxun Yang Reviewed-by: Thomas Huth Message-Id: <20210118063808.12471-2-jiaxun.yang@flygoat.com> Signed-off-by: Thomas Huth --- configure | 1 + 1 file changed, 1 insertion(+) diff --git a/configure b/configure index 9f016b06b5..6f6a319c2f 100755 --- a/configure +++ b/configure @@ -4039,6 +4039,7 @@ fi clock_adjtime=3Dno cat > $TMPC < +#include =20 int main(void) { --=20 2.27.0 From nobody Tue Nov 18 15:26:29 2025 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1611156008; cv=none; d=zohomail.com; s=zohoarc; b=MiuSnXTPCcLe0IL9s3KY0WoFQTUyRKDa4Ab6WCnze3Wx39mbYDsUoG39mWzTFW21PLqa7Ir5UXAc/4xVaI7XRo+IoGE4DBlXIZV/5m+d61lg7man+JEWw5e+7qWR7eNtoYbWpMrisEqNFsl1M2uonmZtGew0zfa+uwe2cVg9zJ8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611156008; 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=SxRGBacGN7JHOgjcGq6UnWtKW4SSuZsW+FJi/XGERTw=; b=nUtmCmPtHoV3ZzdLB8jjFtEhCx8bZ5glck7Pt7r9c00rDaCr+jbW6jSnJLdfZuvqyRugJMOcCPn1UcuH5biCabKra0f3GuroVgXtRfSrf2XuEUBQgNorzJqVnWjSNuCmixQuJHEEu5CTKs9mcu5SQXpwtNLUFHt9T4lVnj9/bro= 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 1611156008873580.9927295637309; Wed, 20 Jan 2021 07:20:08 -0800 (PST) Received: from localhost ([::1]:42108 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2FHD-0001ne-8Q for importer@patchew.org; Wed, 20 Jan 2021 10:20:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43776) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2FFM-0000Fi-MW for qemu-devel@nongnu.org; Wed, 20 Jan 2021 10:18:22 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:39955) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l2FFF-0007hg-NF for qemu-devel@nongnu.org; Wed, 20 Jan 2021 10:18:12 -0500 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-254-aJGDy2h_OpOWBszODmUc-Q-1; Wed, 20 Jan 2021 10:18:00 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 163C4190A7A4; Wed, 20 Jan 2021 15:17:59 +0000 (UTC) Received: from thuth.com (ovpn-114-135.ams2.redhat.com [10.36.114.135]) by smtp.corp.redhat.com (Postfix) with ESMTP id CE04360C78; Wed, 20 Jan 2021 15:17:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611155884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SxRGBacGN7JHOgjcGq6UnWtKW4SSuZsW+FJi/XGERTw=; b=H0rVJuYR3sASxNSDoWCZhyMNWu6nlt0QYHZyUrfvE5VUIPQTJvbRhlkgv/EZfxXWEgzGrd nE3rxm9SWNRZ+tbIfhrWagQVMDM80yse4ujd1Lr+SPPhzuJGsXeyAjcMXTeGw4+/1iZKhi 9nTbShT3pzOyVruDC/Mu3AodCJX4JTk= X-MC-Unique: aJGDy2h_OpOWBszODmUc-Q-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 03/14] libvhost-user: Include poll.h instead of sys/poll.h Date: Wed, 20 Jan 2021 16:17:40 +0100 Message-Id: <20210120151751.520597-4-thuth@redhat.com> In-Reply-To: <20210120151751.520597-1-thuth@redhat.com> References: <20210120151751.520597-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=63.128.21.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.167, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Jiaxun Yang Musl libc complains about it's wrong usage. In file included from ../subprojects/libvhost-user/libvhost-user.h:20, from ../subprojects/libvhost-user/libvhost-user-glib.h:19, from ../subprojects/libvhost-user/libvhost-user-glib.c:15: /usr/include/sys/poll.h:1:2: error: #warning redirecting incorrect #include= to [-Werror=3Dcpp] 1 | #warning redirecting incorrect #include to | ^~~~~~~ Signed-off-by: Jiaxun Yang Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210118063808.12471-3-jiaxun.yang@flygoat.com> Signed-off-by: Thomas Huth --- subprojects/libvhost-user/libvhost-user.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subprojects/libvhost-user/libvhost-user.h b/subprojects/libvho= st-user/libvhost-user.h index 7d47f1364a..3d13dfadde 100644 --- a/subprojects/libvhost-user/libvhost-user.h +++ b/subprojects/libvhost-user/libvhost-user.h @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include "standard-headers/linux/virtio_ring.h" --=20 2.27.0 From nobody Tue Nov 18 15:26:29 2025 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1611156313; cv=none; d=zohomail.com; s=zohoarc; b=jSeWKNOcSVlPM5TKh7wrAqwfT/+cB5WtQig5r8QPU4DyE7nSwGTiS47zjGd5AFeQEO1lu15FyrEnHSFu95wHCjUBpUDazE6pc8vUqm2HrXKIXweMQv+sIDGW4jF/OHgxXbw8LH16yUagYUxfYV7fHStpgDdU8DWuBHdoAS/QffA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611156313; h=Content-Type:Content-Transfer-Encoding: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=5gKL7iTatfCI0mX1g/0ZodtyxWtVdt3kWkz5/JlwvPU=; b=fv5sZXR567+NZIFc8NNYHPz0VcBqGMtGbqghkFs3x7hzou8ag9TtfInMF9i7OD3SKCPNqplWQiIbBIFGAzivz0nT2/HuI+2WUc1wSZvr48M9ilM3ajbhb4a1tdBTLlXE6PNB0xqGt9guATJ+/kiqtCdxDDPQsRjes72IMN1FF1o= 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 1611156313035285.53862219346956; Wed, 20 Jan 2021 07:25:13 -0800 (PST) Received: from localhost ([::1]:57934 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2FM7-0008Kp-P2 for importer@patchew.org; Wed, 20 Jan 2021 10:25:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43858) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2FFW-0000GU-9x for qemu-devel@nongnu.org; Wed, 20 Jan 2021 10:18:23 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:38154) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l2FFG-0007hm-9A for qemu-devel@nongnu.org; Wed, 20 Jan 2021 10:18:17 -0500 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-416-japLOEmwO1-K091xt_Bttw-1; Wed, 20 Jan 2021 10:18:01 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 718BE8066ED; Wed, 20 Jan 2021 15:18:00 +0000 (UTC) Received: from thuth.com (ovpn-114-135.ams2.redhat.com [10.36.114.135]) by smtp.corp.redhat.com (Postfix) with ESMTP id 64D8C60C6C; Wed, 20 Jan 2021 15:17:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611155885; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5gKL7iTatfCI0mX1g/0ZodtyxWtVdt3kWkz5/JlwvPU=; b=BvDnCt9+hglAzo4cS4AJbyhll6Q8M65yB2fFDKvCnaKI1Itk5FnP4HU+dBZES68n3J+e5s aRFeliyShw8Vw5bTfXfPsL0Eapszkan+/fS1YQGZ6Go8TW1QCVMH9KU4GAQE8DEwzHWG6i /BUOfthe5Bov/xk99c0mVp3O3SDE0tQ= X-MC-Unique: japLOEmwO1-K091xt_Bttw-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 04/14] hw/block/nand: Rename PAGE_SIZE to NAND_PAGE_SIZE Date: Wed, 20 Jan 2021 16:17:41 +0100 Message-Id: <20210120151751.520597-5-thuth@redhat.com> In-Reply-To: <20210120151751.520597-1-thuth@redhat.com> References: <20210120151751.520597-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=63.128.21.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.167, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Jiaxun Yang As per POSIX specification of limits.h [1], OS libc may define PAGE_SIZE in limits.h. To prevent collosion of definition, we rename PAGE_SIZE here. [1]: https://pubs.opengroup.org/onlinepubs/7908799/xsh/limits.h.html Signed-off-by: Jiaxun Yang Reviewed-by: Thomas Huth Message-Id: <20210118063808.12471-5-jiaxun.yang@flygoat.com> Signed-off-by: Thomas Huth --- hw/block/nand.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/hw/block/nand.c b/hw/block/nand.c index 123020aebf..913292ad1d 100644 --- a/hw/block/nand.c +++ b/hw/block/nand.c @@ -115,24 +115,24 @@ static void mem_and(uint8_t *dest, const uint8_t *src= , size_t n) # define NAND_IO =20 # define PAGE(addr) ((addr) >> ADDR_SHIFT) -# define PAGE_START(page) (PAGE(page) * (PAGE_SIZE + OOB_SIZE)) +# define PAGE_START(page) (PAGE(page) * (NAND_PAGE_SIZE + OOB_SIZE)) # define PAGE_MASK ((1 << ADDR_SHIFT) - 1) # define OOB_SHIFT (PAGE_SHIFT - 5) # define OOB_SIZE (1 << OOB_SHIFT) # define SECTOR(addr) ((addr) >> (9 + ADDR_SHIFT - PAGE_SHIFT)) # define SECTOR_OFFSET(addr) ((addr) & ((511 >> PAGE_SHIFT) << 8)) =20 -# define PAGE_SIZE 256 +# define NAND_PAGE_SIZE 256 # define PAGE_SHIFT 8 # define PAGE_SECTORS 1 # define ADDR_SHIFT 8 # include "nand.c" -# define PAGE_SIZE 512 +# define NAND_PAGE_SIZE 512 # define PAGE_SHIFT 9 # define PAGE_SECTORS 1 # define ADDR_SHIFT 8 # include "nand.c" -# define PAGE_SIZE 2048 +# define NAND_PAGE_SIZE 2048 # define PAGE_SHIFT 11 # define PAGE_SECTORS 4 # define ADDR_SHIFT 16 @@ -652,7 +652,7 @@ type_init(nand_register_types) #else =20 /* Program a single page */ -static void glue(nand_blk_write_, PAGE_SIZE)(NANDFlashState *s) +static void glue(nand_blk_write_, NAND_PAGE_SIZE)(NANDFlashState *s) { uint64_t off, page, sector, soff; uint8_t iobuf[(PAGE_SECTORS + 2) * 0x200]; @@ -672,11 +672,11 @@ static void glue(nand_blk_write_, PAGE_SIZE)(NANDFlas= hState *s) return; } =20 - mem_and(iobuf + (soff | off), s->io, MIN(s->iolen, PAGE_SIZE - off= )); - if (off + s->iolen > PAGE_SIZE) { + mem_and(iobuf + (soff | off), s->io, MIN(s->iolen, NAND_PAGE_SIZE = - off)); + if (off + s->iolen > NAND_PAGE_SIZE) { page =3D PAGE(s->addr); - mem_and(s->storage + (page << OOB_SHIFT), s->io + PAGE_SIZE - = off, - MIN(OOB_SIZE, off + s->iolen - PAGE_SIZE)); + mem_and(s->storage + (page << OOB_SHIFT), s->io + NAND_PAGE_SI= ZE - off, + MIN(OOB_SIZE, off + s->iolen - NAND_PAGE_SIZE)= ); } =20 if (blk_pwrite(s->blk, sector << BDRV_SECTOR_BITS, iobuf, @@ -704,7 +704,7 @@ static void glue(nand_blk_write_, PAGE_SIZE)(NANDFlashS= tate *s) } =20 /* Erase a single block */ -static void glue(nand_blk_erase_, PAGE_SIZE)(NANDFlashState *s) +static void glue(nand_blk_erase_, NAND_PAGE_SIZE)(NANDFlashState *s) { uint64_t i, page, addr; uint8_t iobuf[0x200] =3D { [0 ... 0x1ff] =3D 0xff, }; @@ -716,7 +716,7 @@ static void glue(nand_blk_erase_, PAGE_SIZE)(NANDFlashS= tate *s) =20 if (!s->blk) { memset(s->storage + PAGE_START(addr), - 0xff, (PAGE_SIZE + OOB_SIZE) << s->erase_shift); + 0xff, (NAND_PAGE_SIZE + OOB_SIZE) << s->erase_shif= t); } else if (s->mem_oob) { memset(s->storage + (PAGE(addr) << OOB_SHIFT), 0xff, OOB_SIZE << s->erase_shift); @@ -742,7 +742,7 @@ static void glue(nand_blk_erase_, PAGE_SIZE)(NANDFlashS= tate *s) =20 memset(iobuf, 0xff, 0x200); i =3D (addr & ~0x1ff) + 0x200; - for (addr +=3D ((PAGE_SIZE + OOB_SIZE) << s->erase_shift) - 0x200; + for (addr +=3D ((NAND_PAGE_SIZE + OOB_SIZE) << s->erase_shift) - 0= x200; i < addr; i +=3D 0x200) { if (blk_pwrite(s->blk, i, iobuf, BDRV_SECTOR_SIZE, 0) < 0) { printf("%s: write error in sector %" PRIu64 "\n", @@ -763,7 +763,7 @@ static void glue(nand_blk_erase_, PAGE_SIZE)(NANDFlashS= tate *s) } } =20 -static void glue(nand_blk_load_, PAGE_SIZE)(NANDFlashState *s, +static void glue(nand_blk_load_, NAND_PAGE_SIZE)(NANDFlashState *s, uint64_t addr, int offset) { if (PAGE(addr) >=3D s->pages) { @@ -777,7 +777,7 @@ static void glue(nand_blk_load_, PAGE_SIZE)(NANDFlashSt= ate *s, printf("%s: read error in sector %" PRIu64 "\n", __func__, SECTOR(addr)); } - memcpy(s->io + SECTOR_OFFSET(s->addr) + PAGE_SIZE, + memcpy(s->io + SECTOR_OFFSET(s->addr) + NAND_PAGE_SIZE, s->storage + (PAGE(s->addr) << OOB_SHIFT), OOB_SIZE); s->ioaddr =3D s->io + SECTOR_OFFSET(s->addr) + offset; @@ -791,23 +791,23 @@ static void glue(nand_blk_load_, PAGE_SIZE)(NANDFlash= State *s, } } else { memcpy(s->io, s->storage + PAGE_START(s->addr) + - offset, PAGE_SIZE + OOB_SIZE - offset); + offset, NAND_PAGE_SIZE + OOB_SIZE - offset); s->ioaddr =3D s->io; } } =20 -static void glue(nand_init_, PAGE_SIZE)(NANDFlashState *s) +static void glue(nand_init_, NAND_PAGE_SIZE)(NANDFlashState *s) { s->oob_shift =3D PAGE_SHIFT - 5; s->pages =3D s->size >> PAGE_SHIFT; s->addr_shift =3D ADDR_SHIFT; =20 - s->blk_erase =3D glue(nand_blk_erase_, PAGE_SIZE); - s->blk_write =3D glue(nand_blk_write_, PAGE_SIZE); - s->blk_load =3D glue(nand_blk_load_, PAGE_SIZE); + s->blk_erase =3D glue(nand_blk_erase_, NAND_PAGE_SIZE); + s->blk_write =3D glue(nand_blk_write_, NAND_PAGE_SIZE); + s->blk_load =3D glue(nand_blk_load_, NAND_PAGE_SIZE); } =20 -# undef PAGE_SIZE +# undef NAND_PAGE_SIZE # undef PAGE_SHIFT # undef PAGE_SECTORS # undef ADDR_SHIFT --=20 2.27.0 From nobody Tue Nov 18 15:26:29 2025 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1611156187; cv=none; d=zohomail.com; s=zohoarc; b=C0ChJBr+tH9rb3xNTEpaSILLMXtBfiHu736Z+6Y1rokgw0srpToU0TU1unvPD7p1YDzE7EGlVfN50WQ+2TTssIKdnKjEfPRrFmRmo17lEnNlhjSNUaCOLwB6cnusFd6fwPMBf65Clxh8FqOpc60CYWRjscOayNuOuoDeNukOF6k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611156187; 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=TdG9O0sWijtsBB97lQ18hk5C9jos/AzZLMhxasOjyos=; b=eAh29Y1kTwfoi+k9NeuCtHX8luwSrRoXrPaVw67d9hYAvLENVdS+B48odfOYHPLSogIYAwkMbL8wgG61PevQv1o/+Cse8hUA47I2fyo1oP200EpQzWflEe2s6cZR0Qy3nUgtq3JMzSIQvLQuL/U7KydK5fK780WfYCItaHPGUYA= 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 1611156187919549.2067937693524; Wed, 20 Jan 2021 07:23:07 -0800 (PST) Received: from localhost ([::1]:49364 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2FK6-0004rR-Ud for importer@patchew.org; Wed, 20 Jan 2021 10:23:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43910) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2FFc-0000H6-5S for qemu-devel@nongnu.org; Wed, 20 Jan 2021 10:18:28 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:28479) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l2FFM-0007hz-DX for qemu-devel@nongnu.org; Wed, 20 Jan 2021 10:18:22 -0500 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-348-2VWuCwn6PhW5WSOvTXli5g-1; Wed, 20 Jan 2021 10:18:03 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 07D3F8066EA; Wed, 20 Jan 2021 15:18:02 +0000 (UTC) Received: from thuth.com (ovpn-114-135.ams2.redhat.com [10.36.114.135]) by smtp.corp.redhat.com (Postfix) with ESMTP id C2B2260C6C; Wed, 20 Jan 2021 15:18:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611155886; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TdG9O0sWijtsBB97lQ18hk5C9jos/AzZLMhxasOjyos=; b=DLpKpRUg5ruA29aP5SYl00ZKuOLEj+dy/qr1VL1IEGc+kZFzYorOJZTB7E561rR+KrTLvN PBT95F3vpzR5Tge6Qp75vNTVl+aHOJKvVS0SzWSKqbx3ogsxppd+ifl59hu7f6Cvs6yK22 Ye4xroCgKtWZqibtPlzPJIkiN56fyMw= X-MC-Unique: 2VWuCwn6PhW5WSOvTXli5g-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 05/14] elf2dmp: Rename PAGE_SIZE to ELF2DMP_PAGE_SIZE Date: Wed, 20 Jan 2021 16:17:42 +0100 Message-Id: <20210120151751.520597-6-thuth@redhat.com> In-Reply-To: <20210120151751.520597-1-thuth@redhat.com> References: <20210120151751.520597-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=63.128.21.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.167, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Jiaxun Yang As per POSIX specification of limits.h [1], OS libc may define PAGE_SIZE in limits.h. To prevent collosion of definition, we rename PAGE_SIZE here. [1]: https://pubs.opengroup.org/onlinepubs/7908799/xsh/limits.h.html Signed-off-by: Jiaxun Yang Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210118063808.12471-6-jiaxun.yang@flygoat.com> Signed-off-by: Thomas Huth --- contrib/elf2dmp/addrspace.c | 4 ++-- contrib/elf2dmp/addrspace.h | 6 +++--- contrib/elf2dmp/main.c | 18 +++++++++--------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/contrib/elf2dmp/addrspace.c b/contrib/elf2dmp/addrspace.c index 8a76069cb5..53ded17061 100644 --- a/contrib/elf2dmp/addrspace.c +++ b/contrib/elf2dmp/addrspace.c @@ -207,8 +207,8 @@ int va_space_rw(struct va_space *vs, uint64_t addr, void *buf, size_t size, int is_write) { while (size) { - uint64_t page =3D addr & PFN_MASK; - size_t s =3D (page + PAGE_SIZE) - addr; + uint64_t page =3D addr & ELF2DMP_PFN_MASK; + size_t s =3D (page + ELF2DMP_PAGE_SIZE) - addr; void *ptr; =20 s =3D (s > size) ? size : s; diff --git a/contrib/elf2dmp/addrspace.h b/contrib/elf2dmp/addrspace.h index d87f6a18c6..00b44c1218 100644 --- a/contrib/elf2dmp/addrspace.h +++ b/contrib/elf2dmp/addrspace.h @@ -10,9 +10,9 @@ =20 #include "qemu_elf.h" =20 -#define PAGE_BITS 12 -#define PAGE_SIZE (1ULL << PAGE_BITS) -#define PFN_MASK (~(PAGE_SIZE - 1)) +#define ELF2DMP_PAGE_BITS 12 +#define ELF2DMP_PAGE_SIZE (1ULL << ELF2DMP_PAGE_BITS) +#define ELF2DMP_PFN_MASK (~(ELF2DMP_PAGE_SIZE - 1)) =20 #define INVALID_PA UINT64_MAX =20 diff --git a/contrib/elf2dmp/main.c b/contrib/elf2dmp/main.c index ac746e49e0..20b477d582 100644 --- a/contrib/elf2dmp/main.c +++ b/contrib/elf2dmp/main.c @@ -244,8 +244,8 @@ static int fill_header(WinDumpHeader64 *hdr, struct pa_= space *ps, WinDumpHeader64 h; size_t i; =20 - QEMU_BUILD_BUG_ON(KUSD_OFFSET_SUITE_MASK >=3D PAGE_SIZE); - QEMU_BUILD_BUG_ON(KUSD_OFFSET_PRODUCT_TYPE >=3D PAGE_SIZE); + QEMU_BUILD_BUG_ON(KUSD_OFFSET_SUITE_MASK >=3D ELF2DMP_PAGE_SIZE); + QEMU_BUILD_BUG_ON(KUSD_OFFSET_PRODUCT_TYPE >=3D ELF2DMP_PAGE_SIZE); =20 if (!suite_mask || !product_type) { return 1; @@ -281,14 +281,14 @@ static int fill_header(WinDumpHeader64 *hdr, struct p= a_space *ps, }; =20 for (i =3D 0; i < ps->block_nr; i++) { - h.PhysicalMemoryBlock.NumberOfPages +=3D ps->block[i].size / PAGE_= SIZE; + h.PhysicalMemoryBlock.NumberOfPages +=3D ps->block[i].size / ELF2D= MP_PAGE_SIZE; h.PhysicalMemoryBlock.Run[i] =3D (WinDumpPhyMemRun64) { - .BasePage =3D ps->block[i].paddr / PAGE_SIZE, - .PageCount =3D ps->block[i].size / PAGE_SIZE, + .BasePage =3D ps->block[i].paddr / ELF2DMP_PAGE_SIZE, + .PageCount =3D ps->block[i].size / ELF2DMP_PAGE_SIZE, }; } =20 - h.RequiredDumpSpace +=3D h.PhysicalMemoryBlock.NumberOfPages << PAGE_B= ITS; + h.RequiredDumpSpace +=3D h.PhysicalMemoryBlock.NumberOfPages << ELF2DM= P_PAGE_BITS; =20 *hdr =3D h; =20 @@ -379,7 +379,7 @@ static int pe_get_pdb_symstore_hash(uint64_t base, void= *start_addr, size_t pdb_name_sz; size_t i; =20 - QEMU_BUILD_BUG_ON(sizeof(*dos_hdr) >=3D PAGE_SIZE); + QEMU_BUILD_BUG_ON(sizeof(*dos_hdr) >=3D ELF2DMP_PAGE_SIZE); =20 if (memcmp(&dos_hdr->e_magic, e_magic, sizeof(e_magic))) { return 1; @@ -509,10 +509,10 @@ int main(int argc, char *argv[]) } printf("CPU #0 IDT[0] -> 0x%016"PRIx64"\n", idt_desc_addr(first_idt_de= sc)); =20 - KernBase =3D idt_desc_addr(first_idt_desc) & ~(PAGE_SIZE - 1); + KernBase =3D idt_desc_addr(first_idt_desc) & ~(ELF2DMP_PAGE_SIZE - 1); printf("Searching kernel downwards from 0x%016"PRIx64"...\n", KernBase= ); =20 - for (; KernBase >=3D 0xfffff78000000000; KernBase -=3D PAGE_SIZE) { + for (; KernBase >=3D 0xfffff78000000000; KernBase -=3D ELF2DMP_PAGE_SI= ZE) { nt_start_addr =3D va_space_resolve(&vs, KernBase); if (!nt_start_addr) { continue; --=20 2.27.0 From nobody Tue Nov 18 15:26:29 2025 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1611156423; cv=none; d=zohomail.com; s=zohoarc; b=ITtV/bTZyYYoSrQQQN+gYTM08cRAHRmcXt0TuJXE6lO+Wlw5uhQ9q/eD03HPKcRClvhrV0zmIgdig+dHnuOj3mDF4UMX05DoZqervhSyPEPFXZDiepZfqzFFswBo0mXDICJXBSgN3fl+pFTFJsOC7Dmf8raj4+wMRao4YaZvrnU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611156423; 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=x1sacvhHAS99n1fJkaqVFVdy7b7/Dd1myJok46QnNuc=; b=cxAnva1P+nq0zjDn5MCe7DyvvOfxsje5EDdQIvaxQ2RlGIR59/drMbs2LvxTOczzy+REpCns9pzCp7ueydBqH1k9J66nw3/+9fvPFxYoM0ETwcixC4vgdaghL4zxFKroAyrz/J7+7HxqwrvVJNg8g6ecyG5B+EjBQcAigqF+arI= 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 1611156423952828.9866256591145; Wed, 20 Jan 2021 07:27:03 -0800 (PST) Received: from localhost ([::1]:35448 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2FNu-0002IG-Hz for importer@patchew.org; Wed, 20 Jan 2021 10:27:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43916) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2FFc-0000HC-76 for qemu-devel@nongnu.org; Wed, 20 Jan 2021 10:18:28 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:34128) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l2FFM-0007jA-FM for qemu-devel@nongnu.org; Wed, 20 Jan 2021 10:18:27 -0500 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-585-h3fgJqp6MOObaLdtwVF1vQ-1; Wed, 20 Jan 2021 10:18:04 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DAEEB101F7A3; Wed, 20 Jan 2021 15:18:03 +0000 (UTC) Received: from thuth.com (ovpn-114-135.ams2.redhat.com [10.36.114.135]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6600860C6C; Wed, 20 Jan 2021 15:18:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611155889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=x1sacvhHAS99n1fJkaqVFVdy7b7/Dd1myJok46QnNuc=; b=bEBdFrm+qq5dHSw7rUocdQmgny8/O8hj0krjN9yx6DkJWGJ663ib6aFvYWmGxgAtC6ZKuW M5fp4129n4H8stUA57nCcLX/koGxPEqUp6UuJ4drTAe/R9kBK793kaMW7cTxhhRjwDJZAc t1Bs5y5meVv+jxXW5vesxwUa7dxT8zs= X-MC-Unique: h3fgJqp6MOObaLdtwVF1vQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 06/14] tests: Rename PAGE_SIZE definitions Date: Wed, 20 Jan 2021 16:17:43 +0100 Message-Id: <20210120151751.520597-7-thuth@redhat.com> In-Reply-To: <20210120151751.520597-1-thuth@redhat.com> References: <20210120151751.520597-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=216.205.24.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.167, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Jiaxun Yang As per POSIX specification of limits.h [1], OS libc may define PAGE_SIZE in limits.h. Self defined PAGE_SIZE is frequently used in tests, to prevent collosion of definition, we give PAGE_SIZE definitons reasonable prefixs. [1]: https://pubs.opengroup.org/onlinepubs/7908799/xsh/limits.h.html Signed-off-by: Jiaxun Yang Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210118063808.12471-7-jiaxun.yang@flygoat.com> Signed-off-by: Thomas Huth --- tests/migration/stress.c | 10 ++--- tests/qtest/libqos/malloc-pc.c | 4 +- tests/qtest/libqos/malloc-spapr.c | 4 +- tests/qtest/m25p80-test.c | 54 +++++++++++----------- tests/tcg/multiarch/system/memory.c | 6 +-- tests/test-xbzrle.c | 70 ++++++++++++++--------------- 6 files changed, 74 insertions(+), 74 deletions(-) diff --git a/tests/migration/stress.c b/tests/migration/stress.c index de45e8e490..b7240a15c8 100644 --- a/tests/migration/stress.c +++ b/tests/migration/stress.c @@ -27,7 +27,7 @@ =20 const char *argv0; =20 -#define PAGE_SIZE 4096 +#define RAM_PAGE_SIZE 4096 =20 #ifndef CONFIG_GETTID static int gettid(void) @@ -158,11 +158,11 @@ static unsigned long long now(void) =20 static void stressone(unsigned long long ramsizeMB) { - size_t pagesPerMB =3D 1024 * 1024 / PAGE_SIZE; + size_t pagesPerMB =3D 1024 * 1024 / RAM_PAGE_SIZE; g_autofree char *ram =3D g_malloc(ramsizeMB * 1024 * 1024); char *ramptr; size_t i, j, k; - g_autofree char *data =3D g_malloc(PAGE_SIZE); + g_autofree char *data =3D g_malloc(RAM_PAGE_SIZE); char *dataptr; size_t nMB =3D 0; unsigned long long before, after; @@ -174,7 +174,7 @@ static void stressone(unsigned long long ramsizeMB) * calloc instead :-) */ memset(ram, 0xfe, ramsizeMB * 1024 * 1024); =20 - if (random_bytes(data, PAGE_SIZE) < 0) { + if (random_bytes(data, RAM_PAGE_SIZE) < 0) { return; } =20 @@ -186,7 +186,7 @@ static void stressone(unsigned long long ramsizeMB) for (i =3D 0; i < ramsizeMB; i++, nMB++) { for (j =3D 0; j < pagesPerMB; j++) { dataptr =3D data; - for (k =3D 0; k < PAGE_SIZE; k +=3D sizeof(long long)) { + for (k =3D 0; k < RAM_PAGE_SIZE; k +=3D sizeof(long long))= { ramptr +=3D sizeof(long long); dataptr +=3D sizeof(long long); *(unsigned long long *)ramptr ^=3D *(unsigned long lon= g *)dataptr; diff --git a/tests/qtest/libqos/malloc-pc.c b/tests/qtest/libqos/malloc-pc.c index 16ff9609cc..f1e3b392a5 100644 --- a/tests/qtest/libqos/malloc-pc.c +++ b/tests/qtest/libqos/malloc-pc.c @@ -18,7 +18,7 @@ =20 #include "qemu-common.h" =20 -#define PAGE_SIZE (4096) +#define ALLOC_PAGE_SIZE (4096) =20 void pc_alloc_init(QGuestAllocator *s, QTestState *qts, QAllocOpts flags) { @@ -26,7 +26,7 @@ void pc_alloc_init(QGuestAllocator *s, QTestState *qts, Q= AllocOpts flags) QFWCFG *fw_cfg =3D pc_fw_cfg_init(qts); =20 ram_size =3D qfw_cfg_get_u64(fw_cfg, FW_CFG_RAM_SIZE); - alloc_init(s, flags, 1 << 20, MIN(ram_size, 0xE0000000), PAGE_SIZE); + alloc_init(s, flags, 1 << 20, MIN(ram_size, 0xE0000000), ALLOC_PAGE_SI= ZE); =20 /* clean-up */ pc_fw_cfg_uninit(fw_cfg); diff --git a/tests/qtest/libqos/malloc-spapr.c b/tests/qtest/libqos/malloc-= spapr.c index 84862e4876..05b306c191 100644 --- a/tests/qtest/libqos/malloc-spapr.c +++ b/tests/qtest/libqos/malloc-spapr.c @@ -10,7 +10,7 @@ =20 #include "qemu-common.h" =20 -#define PAGE_SIZE 4096 +#define SPAPR_PAGE_SIZE 4096 =20 /* Memory must be a multiple of 256 MB, * so we have at least 256MB @@ -19,5 +19,5 @@ =20 void spapr_alloc_init(QGuestAllocator *s, QTestState *qts, QAllocOpts flag= s) { - alloc_init(s, flags, 1 << 20, SPAPR_MIN_SIZE, PAGE_SIZE); + alloc_init(s, flags, 1 << 20, SPAPR_MIN_SIZE, SPAPR_PAGE_SIZE); } diff --git a/tests/qtest/m25p80-test.c b/tests/qtest/m25p80-test.c index 50c6b79fb3..f860cef5f0 100644 --- a/tests/qtest/m25p80-test.c +++ b/tests/qtest/m25p80-test.c @@ -62,7 +62,7 @@ enum { #define FLASH_JEDEC 0x20ba19 /* n25q256a */ #define FLASH_SIZE (32 * 1024 * 1024) =20 -#define PAGE_SIZE 256 +#define FLASH_PAGE_SIZE 256 =20 /* * Use an explicit bswap for the values read/wrote to the flash region @@ -165,7 +165,7 @@ static void read_page(uint32_t addr, uint32_t *page) writel(ASPEED_FLASH_BASE, make_be32(addr)); =20 /* Continuous read are supported */ - for (i =3D 0; i < PAGE_SIZE / 4; i++) { + for (i =3D 0; i < FLASH_PAGE_SIZE / 4; i++) { page[i] =3D make_be32(readl(ASPEED_FLASH_BASE)); } spi_ctrl_stop_user(); @@ -178,15 +178,15 @@ static void read_page_mem(uint32_t addr, uint32_t *pa= ge) /* move out USER mode to use direct reads from the AHB bus */ spi_ctrl_setmode(CTRL_READMODE, READ); =20 - for (i =3D 0; i < PAGE_SIZE / 4; i++) { + for (i =3D 0; i < FLASH_PAGE_SIZE / 4; i++) { page[i] =3D make_be32(readl(ASPEED_FLASH_BASE + addr + i * 4)); } } =20 static void test_erase_sector(void) { - uint32_t some_page_addr =3D 0x600 * PAGE_SIZE; - uint32_t page[PAGE_SIZE / 4]; + uint32_t some_page_addr =3D 0x600 * FLASH_PAGE_SIZE; + uint32_t page[FLASH_PAGE_SIZE / 4]; int i; =20 spi_conf(CONF_ENABLE_W0); @@ -200,14 +200,14 @@ static void test_erase_sector(void) =20 /* Previous page should be full of zeroes as backend is not * initialized */ - read_page(some_page_addr - PAGE_SIZE, page); - for (i =3D 0; i < PAGE_SIZE / 4; i++) { + read_page(some_page_addr - FLASH_PAGE_SIZE, page); + for (i =3D 0; i < FLASH_PAGE_SIZE / 4; i++) { g_assert_cmphex(page[i], =3D=3D, 0x0); } =20 /* But this one was erased */ read_page(some_page_addr, page); - for (i =3D 0; i < PAGE_SIZE / 4; i++) { + for (i =3D 0; i < FLASH_PAGE_SIZE / 4; i++) { g_assert_cmphex(page[i], =3D=3D, 0xffffffff); } =20 @@ -216,8 +216,8 @@ static void test_erase_sector(void) =20 static void test_erase_all(void) { - uint32_t some_page_addr =3D 0x15000 * PAGE_SIZE; - uint32_t page[PAGE_SIZE / 4]; + uint32_t some_page_addr =3D 0x15000 * FLASH_PAGE_SIZE; + uint32_t page[FLASH_PAGE_SIZE / 4]; int i; =20 spi_conf(CONF_ENABLE_W0); @@ -225,7 +225,7 @@ static void test_erase_all(void) /* Check some random page. Should be full of zeroes as backend is * not initialized */ read_page(some_page_addr, page); - for (i =3D 0; i < PAGE_SIZE / 4; i++) { + for (i =3D 0; i < FLASH_PAGE_SIZE / 4; i++) { g_assert_cmphex(page[i], =3D=3D, 0x0); } =20 @@ -236,7 +236,7 @@ static void test_erase_all(void) =20 /* Recheck that some random page */ read_page(some_page_addr, page); - for (i =3D 0; i < PAGE_SIZE / 4; i++) { + for (i =3D 0; i < FLASH_PAGE_SIZE / 4; i++) { g_assert_cmphex(page[i], =3D=3D, 0xffffffff); } =20 @@ -245,9 +245,9 @@ static void test_erase_all(void) =20 static void test_write_page(void) { - uint32_t my_page_addr =3D 0x14000 * PAGE_SIZE; /* beyond 16MB */ - uint32_t some_page_addr =3D 0x15000 * PAGE_SIZE; - uint32_t page[PAGE_SIZE / 4]; + uint32_t my_page_addr =3D 0x14000 * FLASH_PAGE_SIZE; /* beyond 16MB */ + uint32_t some_page_addr =3D 0x15000 * FLASH_PAGE_SIZE; + uint32_t page[FLASH_PAGE_SIZE / 4]; int i; =20 spi_conf(CONF_ENABLE_W0); @@ -259,20 +259,20 @@ static void test_write_page(void) writel(ASPEED_FLASH_BASE, make_be32(my_page_addr)); =20 /* Fill the page with its own addresses */ - for (i =3D 0; i < PAGE_SIZE / 4; i++) { + for (i =3D 0; i < FLASH_PAGE_SIZE / 4; i++) { writel(ASPEED_FLASH_BASE, make_be32(my_page_addr + i * 4)); } spi_ctrl_stop_user(); =20 /* Check what was written */ read_page(my_page_addr, page); - for (i =3D 0; i < PAGE_SIZE / 4; i++) { + for (i =3D 0; i < FLASH_PAGE_SIZE / 4; i++) { g_assert_cmphex(page[i], =3D=3D, my_page_addr + i * 4); } =20 /* Check some other page. It should be full of 0xff */ read_page(some_page_addr, page); - for (i =3D 0; i < PAGE_SIZE / 4; i++) { + for (i =3D 0; i < FLASH_PAGE_SIZE / 4; i++) { g_assert_cmphex(page[i], =3D=3D, 0xffffffff); } =20 @@ -281,9 +281,9 @@ static void test_write_page(void) =20 static void test_read_page_mem(void) { - uint32_t my_page_addr =3D 0x14000 * PAGE_SIZE; /* beyond 16MB */ - uint32_t some_page_addr =3D 0x15000 * PAGE_SIZE; - uint32_t page[PAGE_SIZE / 4]; + uint32_t my_page_addr =3D 0x14000 * FLASH_PAGE_SIZE; /* beyond 16MB */ + uint32_t some_page_addr =3D 0x15000 * FLASH_PAGE_SIZE; + uint32_t page[FLASH_PAGE_SIZE / 4]; int i; =20 /* Enable 4BYTE mode for controller. This is should be strapped by @@ -300,13 +300,13 @@ static void test_read_page_mem(void) =20 /* Check what was written */ read_page_mem(my_page_addr, page); - for (i =3D 0; i < PAGE_SIZE / 4; i++) { + for (i =3D 0; i < FLASH_PAGE_SIZE / 4; i++) { g_assert_cmphex(page[i], =3D=3D, my_page_addr + i * 4); } =20 /* Check some other page. It should be full of 0xff */ read_page_mem(some_page_addr, page); - for (i =3D 0; i < PAGE_SIZE / 4; i++) { + for (i =3D 0; i < FLASH_PAGE_SIZE / 4; i++) { g_assert_cmphex(page[i], =3D=3D, 0xffffffff); } =20 @@ -315,8 +315,8 @@ static void test_read_page_mem(void) =20 static void test_write_page_mem(void) { - uint32_t my_page_addr =3D 0x15000 * PAGE_SIZE; - uint32_t page[PAGE_SIZE / 4]; + uint32_t my_page_addr =3D 0x15000 * FLASH_PAGE_SIZE; + uint32_t page[FLASH_PAGE_SIZE / 4]; int i; =20 /* Enable 4BYTE mode for controller. This is should be strapped by @@ -334,14 +334,14 @@ static void test_write_page_mem(void) /* move out USER mode to use direct writes to the AHB bus */ spi_ctrl_setmode(CTRL_WRITEMODE, PP); =20 - for (i =3D 0; i < PAGE_SIZE / 4; i++) { + for (i =3D 0; i < FLASH_PAGE_SIZE / 4; i++) { writel(ASPEED_FLASH_BASE + my_page_addr + i * 4, make_be32(my_page_addr + i * 4)); } =20 /* Check what was written */ read_page_mem(my_page_addr, page); - for (i =3D 0; i < PAGE_SIZE / 4; i++) { + for (i =3D 0; i < FLASH_PAGE_SIZE / 4; i++) { g_assert_cmphex(page[i], =3D=3D, my_page_addr + i * 4); } =20 diff --git a/tests/tcg/multiarch/system/memory.c b/tests/tcg/multiarch/syst= em/memory.c index d124502d73..eb0ec6f8eb 100644 --- a/tests/tcg/multiarch/system/memory.c +++ b/tests/tcg/multiarch/system/memory.c @@ -20,12 +20,12 @@ # error "Target does not specify CHECK_UNALIGNED" #endif =20 -#define PAGE_SIZE 4096 /* nominal 4k "pages" */ -#define TEST_SIZE (PAGE_SIZE * 4) /* 4 pages */ +#define MEM_PAGE_SIZE 4096 /* nominal 4k "pages" */ +#define TEST_SIZE (MEM_PAGE_SIZE * 4) /* 4 pages */ =20 #define ARRAY_SIZE(x) ((sizeof(x) / sizeof((x)[0]))) =20 -__attribute__((aligned(PAGE_SIZE))) +__attribute__((aligned(MEM_PAGE_SIZE))) static uint8_t test_data[TEST_SIZE]; =20 typedef void (*init_ufn) (int offset); diff --git a/tests/test-xbzrle.c b/tests/test-xbzrle.c index f5e08de91e..795d6f1cba 100644 --- a/tests/test-xbzrle.c +++ b/tests/test-xbzrle.c @@ -15,7 +15,7 @@ #include "qemu/cutils.h" #include "../migration/xbzrle.h" =20 -#define PAGE_SIZE 4096 +#define XBZRLE_PAGE_SIZE 4096 =20 static void test_uleb(void) { @@ -41,11 +41,11 @@ static void test_uleb(void) =20 static void test_encode_decode_zero(void) { - uint8_t *buffer =3D g_malloc0(PAGE_SIZE); - uint8_t *compressed =3D g_malloc0(PAGE_SIZE); + uint8_t *buffer =3D g_malloc0(XBZRLE_PAGE_SIZE); + uint8_t *compressed =3D g_malloc0(XBZRLE_PAGE_SIZE); int i =3D 0; int dlen =3D 0; - int diff_len =3D g_test_rand_int_range(0, PAGE_SIZE - 1006); + int diff_len =3D g_test_rand_int_range(0, XBZRLE_PAGE_SIZE - 1006); =20 for (i =3D diff_len; i > 0; i--) { buffer[1000 + i] =3D i; @@ -55,8 +55,8 @@ static void test_encode_decode_zero(void) buffer[1000 + diff_len + 5] =3D 105; =20 /* encode zero page */ - dlen =3D xbzrle_encode_buffer(buffer, buffer, PAGE_SIZE, compressed, - PAGE_SIZE); + dlen =3D xbzrle_encode_buffer(buffer, buffer, XBZRLE_PAGE_SIZE, compre= ssed, + XBZRLE_PAGE_SIZE); g_assert(dlen =3D=3D 0); =20 g_free(buffer); @@ -65,11 +65,11 @@ static void test_encode_decode_zero(void) =20 static void test_encode_decode_unchanged(void) { - uint8_t *compressed =3D g_malloc0(PAGE_SIZE); - uint8_t *test =3D g_malloc0(PAGE_SIZE); + uint8_t *compressed =3D g_malloc0(XBZRLE_PAGE_SIZE); + uint8_t *test =3D g_malloc0(XBZRLE_PAGE_SIZE); int i =3D 0; int dlen =3D 0; - int diff_len =3D g_test_rand_int_range(0, PAGE_SIZE - 1006); + int diff_len =3D g_test_rand_int_range(0, XBZRLE_PAGE_SIZE - 1006); =20 for (i =3D diff_len; i > 0; i--) { test[1000 + i] =3D i + 4; @@ -79,8 +79,8 @@ static void test_encode_decode_unchanged(void) test[1000 + diff_len + 5] =3D 109; =20 /* test unchanged buffer */ - dlen =3D xbzrle_encode_buffer(test, test, PAGE_SIZE, compressed, - PAGE_SIZE); + dlen =3D xbzrle_encode_buffer(test, test, XBZRLE_PAGE_SIZE, compressed, + XBZRLE_PAGE_SIZE); g_assert(dlen =3D=3D 0); =20 g_free(test); @@ -89,21 +89,21 @@ static void test_encode_decode_unchanged(void) =20 static void test_encode_decode_1_byte(void) { - uint8_t *buffer =3D g_malloc0(PAGE_SIZE); - uint8_t *test =3D g_malloc0(PAGE_SIZE); - uint8_t *compressed =3D g_malloc(PAGE_SIZE); + uint8_t *buffer =3D g_malloc0(XBZRLE_PAGE_SIZE); + uint8_t *test =3D g_malloc0(XBZRLE_PAGE_SIZE); + uint8_t *compressed =3D g_malloc(XBZRLE_PAGE_SIZE); int dlen =3D 0, rc =3D 0; uint8_t buf[2]; =20 - test[PAGE_SIZE - 1] =3D 1; + test[XBZRLE_PAGE_SIZE - 1] =3D 1; =20 - dlen =3D xbzrle_encode_buffer(buffer, test, PAGE_SIZE, compressed, - PAGE_SIZE); + dlen =3D xbzrle_encode_buffer(buffer, test, XBZRLE_PAGE_SIZE, compress= ed, + XBZRLE_PAGE_SIZE); g_assert(dlen =3D=3D (uleb128_encode_small(&buf[0], 4095) + 2)); =20 - rc =3D xbzrle_decode_buffer(compressed, dlen, buffer, PAGE_SIZE); - g_assert(rc =3D=3D PAGE_SIZE); - g_assert(memcmp(test, buffer, PAGE_SIZE) =3D=3D 0); + rc =3D xbzrle_decode_buffer(compressed, dlen, buffer, XBZRLE_PAGE_SIZE= ); + g_assert(rc =3D=3D XBZRLE_PAGE_SIZE); + g_assert(memcmp(test, buffer, XBZRLE_PAGE_SIZE) =3D=3D 0); =20 g_free(buffer); g_free(compressed); @@ -112,18 +112,18 @@ static void test_encode_decode_1_byte(void) =20 static void test_encode_decode_overflow(void) { - uint8_t *compressed =3D g_malloc0(PAGE_SIZE); - uint8_t *test =3D g_malloc0(PAGE_SIZE); - uint8_t *buffer =3D g_malloc0(PAGE_SIZE); + uint8_t *compressed =3D g_malloc0(XBZRLE_PAGE_SIZE); + uint8_t *test =3D g_malloc0(XBZRLE_PAGE_SIZE); + uint8_t *buffer =3D g_malloc0(XBZRLE_PAGE_SIZE); int i =3D 0, rc =3D 0; =20 - for (i =3D 0; i < PAGE_SIZE / 2 - 1; i++) { + for (i =3D 0; i < XBZRLE_PAGE_SIZE / 2 - 1; i++) { test[i * 2] =3D 1; } =20 /* encode overflow */ - rc =3D xbzrle_encode_buffer(buffer, test, PAGE_SIZE, compressed, - PAGE_SIZE); + rc =3D xbzrle_encode_buffer(buffer, test, XBZRLE_PAGE_SIZE, compressed, + XBZRLE_PAGE_SIZE); g_assert(rc =3D=3D -1); =20 g_free(buffer); @@ -133,13 +133,13 @@ static void test_encode_decode_overflow(void) =20 static void encode_decode_range(void) { - uint8_t *buffer =3D g_malloc0(PAGE_SIZE); - uint8_t *compressed =3D g_malloc(PAGE_SIZE); - uint8_t *test =3D g_malloc0(PAGE_SIZE); + uint8_t *buffer =3D g_malloc0(XBZRLE_PAGE_SIZE); + uint8_t *compressed =3D g_malloc(XBZRLE_PAGE_SIZE); + uint8_t *test =3D g_malloc0(XBZRLE_PAGE_SIZE); int i =3D 0, rc =3D 0; int dlen =3D 0; =20 - int diff_len =3D g_test_rand_int_range(0, PAGE_SIZE - 1006); + int diff_len =3D g_test_rand_int_range(0, XBZRLE_PAGE_SIZE - 1006); =20 for (i =3D diff_len; i > 0; i--) { buffer[1000 + i] =3D i; @@ -153,12 +153,12 @@ static void encode_decode_range(void) test[1000 + diff_len + 5] =3D 109; =20 /* test encode/decode */ - dlen =3D xbzrle_encode_buffer(test, buffer, PAGE_SIZE, compressed, - PAGE_SIZE); + dlen =3D xbzrle_encode_buffer(test, buffer, XBZRLE_PAGE_SIZE, compress= ed, + XBZRLE_PAGE_SIZE); =20 - rc =3D xbzrle_decode_buffer(compressed, dlen, test, PAGE_SIZE); - g_assert(rc < PAGE_SIZE); - g_assert(memcmp(test, buffer, PAGE_SIZE) =3D=3D 0); + rc =3D xbzrle_decode_buffer(compressed, dlen, test, XBZRLE_PAGE_SIZE); + g_assert(rc < XBZRLE_PAGE_SIZE); + g_assert(memcmp(test, buffer, XBZRLE_PAGE_SIZE) =3D=3D 0); =20 g_free(buffer); g_free(compressed); --=20 2.27.0 From nobody Tue Nov 18 15:26:29 2025 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1611156468; cv=none; d=zohomail.com; s=zohoarc; b=hCtoJSeJlFcbr/k4Hjd0vv+zOkB9xvmmz6edU3IM/cKn7lFjw7L6yvagYj3iSosp1K77ycL4bp2t9uLg2XOmvQE3I1yTipwkEJje7IWfacBoVfyeXIWqxsfPa9Omph4XrSyBqCCtf7WwO+NI0cj6+CXW5/DajkicnBBRe9TIIM4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611156468; h=Content-Type:Content-Transfer-Encoding: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=pBRjdhDQOtlhhyGV3RvkwJyQMIOA6YfZOxEDAuuGBEc=; b=Kxore5bEn6DkIU5TKSW6Q2N5wkk8rGHe7OVC7OFRSWqL2jP7nnLotOEwqPZfx73qJ0SBfFo2CmhP0GspcEyIkxeLNf9OVywa4Rcjzo/OiBMa9fCqgU3N264NgticaIElWJNdchrLQ8SCcQkf3PE8/RhKsz6Jn5AWTLhu9aaspno= 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 1611156468982182.62365347993148; Wed, 20 Jan 2021 07:27:48 -0800 (PST) Received: from localhost ([::1]:38226 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2FOd-0003Pb-Uo for importer@patchew.org; Wed, 20 Jan 2021 10:27:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43930) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2FFc-0000IG-N8 for qemu-devel@nongnu.org; Wed, 20 Jan 2021 10:18:28 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:24944) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l2FFM-0007j5-GE for qemu-devel@nongnu.org; Wed, 20 Jan 2021 10:18:28 -0500 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-140-u0FDZE64P4eQi7nrqOHPGg-1; Wed, 20 Jan 2021 10:18:06 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4B6C6190A7A3; Wed, 20 Jan 2021 15:18:05 +0000 (UTC) Received: from thuth.com (ovpn-114-135.ams2.redhat.com [10.36.114.135]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3FDE660C6A; Wed, 20 Jan 2021 15:18:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611155888; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pBRjdhDQOtlhhyGV3RvkwJyQMIOA6YfZOxEDAuuGBEc=; b=aNno/EkRVK00IfhFAttdxrloifkHlb40viJd0jlAXX7WxLswH4gOtTb3Exa1p/8P+1tW7G F7kmIUlZQAN3q4mVT+67fMWaqyKI0soTmxu4hNooNQd7WPYWoLEQqAELRxuKz4pK79xBOl EamJ61vKgDteaGQrK+oveJEwHFpPFyg= X-MC-Unique: u0FDZE64P4eQi7nrqOHPGg-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 07/14] accel/kvm: avoid using predefined PAGE_SIZE Date: Wed, 20 Jan 2021 16:17:44 +0100 Message-Id: <20210120151751.520597-8-thuth@redhat.com> In-Reply-To: <20210120151751.520597-1-thuth@redhat.com> References: <20210120151751.520597-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=63.128.21.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.167, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Jiaxun Yang As per POSIX specification of limits.h [1], OS libc may define PAGE_SIZE in limits.h. PAGE_SIZE is used in included kernel uapi headers. To prevent collosion of definition, we discard PAGE_SIZE from defined by libc and take QEMU's variable. [1]: https://pubs.opengroup.org/onlinepubs/7908799/xsh/limits.h.html Signed-off-by: Jiaxun Yang Message-Id: <20210118063808.12471-8-jiaxun.yang@flygoat.com> Signed-off-by: Thomas Huth --- accel/kvm/kvm-all.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 389eaace72..3feb17d965 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -58,6 +58,9 @@ /* KVM uses PAGE_SIZE in its definition of KVM_COALESCED_MMIO_MAX. We * need to use the real host PAGE_SIZE, as that's what KVM will use. */ +#ifdef PAGE_SIZE +#undef PAGE_SIZE +#endif #define PAGE_SIZE qemu_real_host_page_size =20 //#define DEBUG_KVM --=20 2.27.0 From nobody Tue Nov 18 15:26:29 2025 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1611156358; cv=none; d=zohomail.com; s=zohoarc; b=ZivTpHJsbsPqFAar/uvKanteIFhA1SKcvB/Qlt/IWFifp/hzx+MRPTwSiIS0DFhUTLsa3BjsH/PeKvtHJCtec9160qAl7dThcdUHpdZ1NWGtNsrvDLWjbXmqaqPrrUrrl+QO3U9NSFeH0lmmsi4W4OhJhCQ1K0KdY9ukPZD0JfY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611156358; h=Content-Type:Content-Transfer-Encoding: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=GkBW1GpqdD4/CcxzEUiYhWNIUx8Iiek4NeD4ElH40zY=; b=fB8U2S9lb5c77DtnEuUCJKjbIBPywU4JVGoxAs9QB6oZO+CnZlEw3Vai4/ZlifzyB2TL/d7jXyhWTRdMFe5/4W84eS6U9VeL2E1WPD0ses3A3vrNAOlmmoOq7qDsEI+3Oaph1nOM/YmVh2PpNmxUB6iQw3vFLeTgO73MTYjdIUI= 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 1611156358919138.26097524861984; Wed, 20 Jan 2021 07:25:58 -0800 (PST) Received: from localhost ([::1]:60102 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2FMr-0000lc-RX for importer@patchew.org; Wed, 20 Jan 2021 10:25:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43860) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2FFW-0000GZ-CP for qemu-devel@nongnu.org; Wed, 20 Jan 2021 10:18:23 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:30907) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l2FFM-0007jT-FR for qemu-devel@nongnu.org; Wed, 20 Jan 2021 10:18:22 -0500 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-171-wkO0xh4sMAWUElcFDziqYw-1; Wed, 20 Jan 2021 10:18:08 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0765210054FF; Wed, 20 Jan 2021 15:18:07 +0000 (UTC) Received: from thuth.com (ovpn-114-135.ams2.redhat.com [10.36.114.135]) by smtp.corp.redhat.com (Postfix) with ESMTP id A99CA60C6A; Wed, 20 Jan 2021 15:18:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611155891; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GkBW1GpqdD4/CcxzEUiYhWNIUx8Iiek4NeD4ElH40zY=; b=MTNAAPBI3pQhjmNASJR6u5DB06z/ls8TV/dsyML4SlU5mfBPxcw5A8ilxd+++VwOGWzwDl Mu4vyjmlbqjToNOvu+q2weDoGwHzmDJcsUyEsEDTWlCrEUsnM+awY3R0/7VlCNvCF2dICs XcDjE6PMVNpV/RZtWFoCCUsGK8YumjI= X-MC-Unique: wkO0xh4sMAWUElcFDziqYw-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 08/14] tests/docker: Add dockerfile for Alpine Linux Date: Wed, 20 Jan 2021 16:17:45 +0100 Message-Id: <20210120151751.520597-9-thuth@redhat.com> In-Reply-To: <20210120151751.520597-1-thuth@redhat.com> References: <20210120151751.520597-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=216.205.24.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.167, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Jiaxun Yang Alpine Linux[1] is a security-oriented, lightweight Linux distribution based on musl libc and busybox. It it popular among Docker guests and embedded applications. Adding it to test against different libc. [1]: https://alpinelinux.org/ Signed-off-by: Jiaxun Yang Message-Id: <20210118063808.12471-9-jiaxun.yang@flygoat.com> [thuth: Dropped some unnecessary packages, replaced build-base with its dep= s] Signed-off-by: Thomas Huth --- tests/docker/dockerfiles/alpine.docker | 55 ++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 tests/docker/dockerfiles/alpine.docker diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfi= les/alpine.docker new file mode 100644 index 0000000000..d63a269aef --- /dev/null +++ b/tests/docker/dockerfiles/alpine.docker @@ -0,0 +1,55 @@ + +FROM alpine:edge + +RUN apk update +RUN apk upgrade + +# Please keep this list sorted alphabetically +ENV PACKAGES \ + alsa-lib-dev \ + bash \ + binutils \ + coreutils \ + curl-dev \ + g++ \ + gcc \ + git \ + glib-dev \ + glib-static \ + gnutls-dev \ + gtk+3.0-dev \ + libaio-dev \ + libcap-ng-dev \ + libjpeg-turbo-dev \ + libnfs-dev \ + libpng-dev \ + libseccomp-dev \ + libssh-dev \ + libusb-dev \ + libxml2-dev \ + lzo-dev \ + make \ + mesa-dev \ + mesa-egl \ + mesa-gbm \ + meson \ + ncurses-dev \ + ninja \ + perl \ + pulseaudio-dev \ + python3 \ + py3-sphinx \ + shadow \ + snappy-dev \ + spice-dev \ + texinfo \ + usbredir-dev \ + util-linux-dev \ + vde2-dev \ + virglrenderer-dev \ + vte3-dev \ + xfsprogs-dev \ + zlib-dev \ + zlib-static + +RUN apk add $PACKAGES --=20 2.27.0 From nobody Tue Nov 18 15:26:29 2025 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1611156542; cv=none; d=zohomail.com; s=zohoarc; b=Tv5qt+tY+4ddoVacceTmR9JBrFo35NKGE3kaQfpmirZ+3UFw5Y3RLBvRzCE5Mzk8bHfpzXoAO5fwfqWThHVgdcwC0DyN60lUd6m+VzqY2kuYH5JjB5t7K7twrrEyjreC/X3RIJmaiv3/Py/z3kPMI+PFGm3Hw/A2sXtM9lF2w0M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611156542; 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=8KhCgIw6Q36UfCR4Z3i9ErZUXbeOerQGuMqLNgS0TD0=; b=OSES6Gta8pxmZ5Si/IzDK3hwCfpq6k15geEPaV+lcVf98TTX4QHHOeBAhGTi1NjsQJskQ1Pfma0KAMNZ8u+en/juQAS5GuzXfvPGzk+SpcMIdsAvaaCWekrm522a881jTB0sr+w8C/pj/wbUbehwt3Xyze+UDJmJG5X3F8t1tlM= 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 1611156542397194.29379801148127; Wed, 20 Jan 2021 07:29:02 -0800 (PST) Received: from localhost ([::1]:44072 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2FPp-0005l7-Bk for importer@patchew.org; Wed, 20 Jan 2021 10:29:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43934) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2FFc-0000IL-Od for qemu-devel@nongnu.org; Wed, 20 Jan 2021 10:18:28 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:57874) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l2FFM-0007jX-GF for qemu-devel@nongnu.org; Wed, 20 Jan 2021 10:18:28 -0500 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-396-HFaVlx8XOr-fIKd3yq9hqw-1; Wed, 20 Jan 2021 10:18:09 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A6D5E8145EC; Wed, 20 Jan 2021 15:18:08 +0000 (UTC) Received: from thuth.com (ovpn-114-135.ams2.redhat.com [10.36.114.135]) by smtp.corp.redhat.com (Postfix) with ESMTP id 62F9160C6A; Wed, 20 Jan 2021 15:18:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611155891; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8KhCgIw6Q36UfCR4Z3i9ErZUXbeOerQGuMqLNgS0TD0=; b=Yc7kYiRtSabxyKKvcHKZ1Dm1EUYDSLq2L3KMCewK7G2egz6G/OBNHKkVgBVt0gjxnFtVq9 ojWhEedD7X+FqVvyQKBoTASgMgOrr7isx7Ah3UC6MGoafbWz4fblqs3cdvUwABF5d3A0bc WMwXcf7sHZ3ILCdMXIgvfuBR0Pk4sDo= X-MC-Unique: HFaVlx8XOr-fIKd3yq9hqw-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 09/14] tests/check-block.sh: Refuse to run the iotests with BusyBox' sed Date: Wed, 20 Jan 2021 16:17:46 +0100 Message-Id: <20210120151751.520597-10-thuth@redhat.com> In-Reply-To: <20210120151751.520597-1-thuth@redhat.com> References: <20210120151751.520597-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=63.128.21.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.167, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) BusyBox' sed reports itself as "This is not GNU sed version 4.0" when being run with the --version parameter. However, the iotests really need GNU sed, they do not work with the BusyBox version. So let's make sure that we really have GNU sed and refuse to run the tests with BusyBox' sed. Signed-off-by: Thomas Huth Message-Id: <20210119134749.401311-1-thuth@redhat.com> Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Thomas Huth --- tests/check-block.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/check-block.sh b/tests/check-block.sh index fb4c1baae9..e4f37905be 100755 --- a/tests/check-block.sh +++ b/tests/check-block.sh @@ -60,6 +60,13 @@ if ! (sed --version | grep 'GNU sed') > /dev/null 2>&1 ;= then echo "GNU sed not available =3D=3D> Not running the qemu-iotests." exit 0 fi +else + # Double-check that we're not using BusyBox' sed which says + # that "This is not GNU sed version 4.0" ... + if sed --version | grep -q 'not GNU sed' ; then + echo "BusyBox sed not supported =3D=3D> Not running the qemu-iotes= ts." + exit 0 + fi fi =20 cd tests/qemu-iotests --=20 2.27.0 From nobody Tue Nov 18 15:26:29 2025 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1611156317; cv=none; d=zohomail.com; s=zohoarc; b=fBnIy+L3f/xIirA887D3hsmMPJyP3b7siqqD62KGxLikMLWoGXv49mqBRdGD2oegxahdboPzDqFdDnuBTbdxBxWbsTwL52JqLbWoX2p/NRO7VLEwkBP2mbz1tTFnq6fkb78yXaCfbnG+jt8Cc6luZfA5/hP2QwqE86zrCdOt7fI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611156317; h=Content-Type:Content-Transfer-Encoding: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=fgMHt08Iel3umUrdfF7cKpnrqvpGYPuSLVrfKdmyq5k=; b=mGdW4O5NwQ3Co5XcZdilodmQ4XDxThG5IHOkGVsHQs38hKZkHjpU7Wy+PDRFeb2w9MhpVFhw3MruKsLG1SMS5IFCvhi5EdTF0CUURlpCgv5bNBkAYdVwZItvmOH+3uFOval4MlD8c9N7nxZDGazSVnuVAGRV9+8gLR+iFfi+ex8= 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 1611156317387682.376166458944; Wed, 20 Jan 2021 07:25:17 -0800 (PST) Received: from localhost ([::1]:58010 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2FMC-0008MN-Bm for importer@patchew.org; Wed, 20 Jan 2021 10:25:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43996) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2FFe-0000LW-Qy for qemu-devel@nongnu.org; Wed, 20 Jan 2021 10:18:32 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:25106) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l2FFV-0007jz-Nl for qemu-devel@nongnu.org; Wed, 20 Jan 2021 10:18:30 -0500 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-27-Fhpb85GOMM2hAgTHIuxW9A-1; Wed, 20 Jan 2021 10:18:11 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1D9C11800D41; Wed, 20 Jan 2021 15:18:10 +0000 (UTC) Received: from thuth.com (ovpn-114-135.ams2.redhat.com [10.36.114.135]) by smtp.corp.redhat.com (Postfix) with ESMTP id 122E160C6A; Wed, 20 Jan 2021 15:18:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611155893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fgMHt08Iel3umUrdfF7cKpnrqvpGYPuSLVrfKdmyq5k=; b=iMCLZP/tlBA5yI/Q/X6Nisrfl2KRw7gljL7DSULXHE59fRdzbCPpHguFTcXkUdW046hguQ XSyNAQjFEUVnIylyJ3MjajEfX1v1SJeKXstMNLshtiqlADs8s77MMCjI8C6xprsGgg0/pw RNIuutB3s1G1a/uCkjiixCIPkk15WDg= X-MC-Unique: Fhpb85GOMM2hAgTHIuxW9A-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 10/14] gitlab-ci: Add alpine to pipeline Date: Wed, 20 Jan 2021 16:17:47 +0100 Message-Id: <20210120151751.520597-11-thuth@redhat.com> In-Reply-To: <20210120151751.520597-1-thuth@redhat.com> References: <20210120151751.520597-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=216.205.24.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.167, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Jiaxun Yang [thuth: Enable "make check" tests, too, after tests/check-block.sh got fixe= d] Signed-off-by: Jiaxun Yang Message-Id: <20210118063808.12471-10-jiaxun.yang@flygoat.com> Signed-off-by: Thomas Huth --- .gitlab-ci.d/containers.yml | 5 +++++ .gitlab-ci.yml | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index 910754a699..90fac85ce4 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -28,6 +28,11 @@ - if: '$CI_COMMIT_BRANCH =3D=3D $CI_DEFAULT_BRANCH' - if: '$CI_COMMIT_REF_NAME =3D=3D "testing/next"' =20 +amd64-alpine-container: + <<: *container_job_definition + variables: + NAME: alpine + amd64-centos7-container: <<: *container_job_definition variables: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 203b1671c4..de3a3d25b5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -72,6 +72,39 @@ include: - cd build - du -chs ${CI_PROJECT_DIR}/avocado-cache =20 +build-system-alpine: + <<: *native_build_job_definition + variables: + IMAGE: alpine + TARGETS: aarch64-softmmu alpha-softmmu cris-softmmu hppa-softmmu + moxie-softmmu microblazeel-softmmu mips64el-softmmu + MAKE_CHECK_ARGS: check-build + CONFIGURE_ARGS: --enable-docs + artifacts: + expire_in: 2 days + paths: + - .git-submodule-status + - build + +check-system-alpine: + <<: *native_test_job_definition + needs: + - job: build-system-alpine + artifacts: true + variables: + IMAGE: alpine + MAKE_CHECK_ARGS: check + +acceptance-system-alpine: + <<: *native_test_job_definition + needs: + - job: build-system-alpine + artifacts: true + variables: + IMAGE: alpine + MAKE_CHECK_ARGS: check-acceptance + <<: *acceptance_definition + build-system-ubuntu: <<: *native_build_job_definition variables: --=20 2.27.0 From nobody Tue Nov 18 15:26:29 2025 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1611156508; cv=none; d=zohomail.com; s=zohoarc; b=f5yz7R4qIEYODUKcbvYlheCqwY6eTyH7wdQk1dNZy/r/3UbmRVJt4XLJKbyc5Xo6sUMK8rOavhMPavhKdaLlVx9uKbNqzHp1zppR+7fVVvdk7ZE2DEwzAJK8aVryRyitoqucmQSY/uxFlzywyG+HieSqFAyd0ntyb36BtsM5BDE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611156508; 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=JsFy57mklfkgmUkJDKn2sHqNbbu7Gv8LwGJW/LsQMUQ=; b=ZxCQDTJVMKr3ql2EstPqJhaeFU5NrnUt/JPQuy5I5dGBVZVyAMJD7sS2EbJmKAfO7z2/YLbPs9RnbgDjVvsFCjOP03IGQAO0taao4KfWJ9i7mZWQwUzMKJncXCWbYQ+laeTxITf5CHX7V6tbW/1IZtgGyjiEzXqY9RdX01kFXEM= 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 1611156508589851.2782881709657; Wed, 20 Jan 2021 07:28:28 -0800 (PST) Received: from localhost ([::1]:40422 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2FPH-0004IJ-JC for importer@patchew.org; Wed, 20 Jan 2021 10:28:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44068) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2FFh-0000Mc-2x for qemu-devel@nongnu.org; Wed, 20 Jan 2021 10:18:34 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:25236) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l2FFV-0007k6-NX for qemu-devel@nongnu.org; Wed, 20 Jan 2021 10:18:32 -0500 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-278-5Z7qBe_xMt6OAQd4vuDJ-g-1; Wed, 20 Jan 2021 10:18:14 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C00EEEC1A3; Wed, 20 Jan 2021 15:18:12 +0000 (UTC) Received: from thuth.com (ovpn-114-135.ams2.redhat.com [10.36.114.135]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7BCAE60C6A; Wed, 20 Jan 2021 15:18:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611155896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JsFy57mklfkgmUkJDKn2sHqNbbu7Gv8LwGJW/LsQMUQ=; b=iTBLlb/ffeD2Uo9oFV9N3gN7P5qaDqltqljR6dshpm2OpYXFWRpCErx8jrAW4tgWYFBDoJ 6IBG13UJSRS1CiWCVXC24muJroTfl69BQuLmZr4Yp1EyP9h1Oaj0X7WC+EyF6qjXEI4R8H pS/PDuf0WdUXNbdQM2co/2HrmwHDz6k= X-MC-Unique: 5Z7qBe_xMt6OAQd4vuDJ-g-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 11/14] qtest/npcm7xx_pwm-test: Fix memleak in pwm_qom_get Date: Wed, 20 Jan 2021 16:17:48 +0100 Message-Id: <20210120151751.520597-12-thuth@redhat.com> In-Reply-To: <20210120151751.520597-1-thuth@redhat.com> References: <20210120151751.520597-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=63.128.21.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.167, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: Hao Wu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Havard Skinnemoen , Gan Qixin , Euler Robot Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Gan Qixin The pwm_qom_get function didn't free "response", which caused an indirect memory leak. So use qobject_unref() to fix it. ASAN shows memory leak stack: Indirect leak of 74160000 byte(s) in 18000 object(s) allocated from: #0 0x7f96e2f79d4e in __interceptor_calloc (/lib64/libasan.so.5+0x112d4e) #1 0x7f96e2d98a50 in g_malloc0 (/lib64/libglib-2.0.so.0+0x55a50) #2 0x556313112180 in qdict_new ../qobject/qdict.c:30 #3 0x556313115bca in parse_object ../qobject/json-parser.c:318 #4 0x556313117810 in parse_value ../qobject/json-parser.c:546 #5 0x556313117bda in json_parser_parse ../qobject/json-parser.c:580 #6 0x55631310fe67 in json_message_process_token ../qobject/json-streame= r.c:92 #7 0x5563131210b7 in json_lexer_feed_char ../qobject/json-lexer.c:313 #8 0x556313121662 in json_lexer_feed ../qobject/json-lexer.c:350 #9 0x5563131101e9 in json_message_parser_feed ../qobject/json-streamer.= c:121 #10 0x5563130cb81e in qmp_fd_receive ../tests/qtest/libqtest.c:614 #11 0x5563130cba2b in qtest_qmp_receive_dict ../tests/qtest/libqtest.c:= 636 #12 0x5563130cb939 in qtest_qmp_receive ../tests/qtest/libqtest.c:624 #13 0x5563130cbe0d in qtest_vqmp ../tests/qtest/libqtest.c:715 #14 0x5563130cc40f in qtest_qmp ../tests/qtest/libqtest.c:756 #15 0x5563130c5623 in pwm_qom_get ../tests/qtest/npcm7xx_pwm-test.c:180 #16 0x5563130c595e in pwm_get_duty ../tests/qtest/npcm7xx_pwm-test.c:210 #17 0x5563130c7529 in test_toggle ../tests/qtest/npcm7xx_pwm-test.c:447 Reported-by: Euler Robot Message-Id: <20210115075634.717909-1-ganqixin@huawei.com> Signed-off-by: Gan Qixin Reviewed-by: Havard Skinnemoen Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Hao Wu Signed-off-by: Thomas Huth --- tests/qtest/npcm7xx_pwm-test.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/qtest/npcm7xx_pwm-test.c b/tests/qtest/npcm7xx_pwm-test.c index 33fbdf5f54..63557d2c06 100644 --- a/tests/qtest/npcm7xx_pwm-test.c +++ b/tests/qtest/npcm7xx_pwm-test.c @@ -175,6 +175,7 @@ static int pwm_index(const PWM *pwm) static uint64_t pwm_qom_get(QTestState *qts, const char *path, const char = *name) { QDict *response; + uint64_t val; =20 g_test_message("Getting properties %s from %s", name, path); response =3D qtest_qmp(qts, "{ 'execute': 'qom-get'," @@ -182,7 +183,9 @@ static uint64_t pwm_qom_get(QTestState *qts, const char= *path, const char *name) path, name); /* The qom set message returns successfully. */ g_assert_true(qdict_haskey(response, "return")); - return qnum_get_uint(qobject_to(QNum, qdict_get(response, "return"))); + val =3D qnum_get_uint(qobject_to(QNum, qdict_get(response, "return"))); + qobject_unref(response); + return val; } =20 static uint64_t pwm_get_freq(QTestState *qts, int module_index, int pwm_in= dex) --=20 2.27.0 From nobody Tue Nov 18 15:26:29 2025 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1611156611; cv=none; d=zohomail.com; s=zohoarc; b=e6e6riXx8+fpunmueua9OrvKmsAb3IbGexAXLNDkqw/LLIsFCCOLdsHixbwFIEiFrgC6sqo0hAvC3LuEg2q4Gya4mu5xCcw/qxLxoqr2Hzjg5McuyZjObUkS/TLrXJspA7A6mdbGBNWErJ+IwNlao9NVbZ4gwwwCWXN22CBOknM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611156611; 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=hRg4sE/VgKudjQt+zXrgar9IY3gEmqlrOhBY1H1kpic=; b=grXCmjXHH7bHYwDGsfm+zQTSG8emogW7xZlFVuH02elzSPlUbdf/ky2XqE5Uljh6K9y124nloBb1qOtG8V9RHifEErUU3E/eDpcB4p03Zw1LXtn02bH/dV/8T5qizHg3R3IZl6wJ2L5clkRkfui+foL6SQd5lzRgWe5rHsyLZfQ= 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 16111566113821023.6833016339722; Wed, 20 Jan 2021 07:30:11 -0800 (PST) Received: from localhost ([::1]:46698 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2FQw-0006na-8L for importer@patchew.org; Wed, 20 Jan 2021 10:30:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44010) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2FFf-0000Lr-Av for qemu-devel@nongnu.org; Wed, 20 Jan 2021 10:18:32 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:25516) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l2FFW-0007kK-2x for qemu-devel@nongnu.org; Wed, 20 Jan 2021 10:18:31 -0500 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-361-Rhfy4ekQNFmwAyT4s2RFvA-1; Wed, 20 Jan 2021 10:18:15 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 83A331005504; Wed, 20 Jan 2021 15:18:14 +0000 (UTC) Received: from thuth.com (ovpn-114-135.ams2.redhat.com [10.36.114.135]) by smtp.corp.redhat.com (Postfix) with ESMTP id 296E260C6A; Wed, 20 Jan 2021 15:18:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611155899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hRg4sE/VgKudjQt+zXrgar9IY3gEmqlrOhBY1H1kpic=; b=MHhSs4HUV/hsr71La6rL9f3cpADAfdqDqW19mb9eBHqf1OWFS2vbrgLSYf76khUAGpAZSL HPLw8LfROw4EBH4w7qWq8yGyP4lRoFGjNvtJ1fCNdHlhLpnk8stbn+bdHCD+B0cNxk9jPv BYrZZyFJ+nZKrMH6v8LEE4kFza3yZ4M= X-MC-Unique: Rhfy4ekQNFmwAyT4s2RFvA-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 12/14] tests: Fix memory leak in tpm-util.c Date: Wed, 20 Jan 2021 16:17:49 +0100 Message-Id: <20210120151751.520597-13-thuth@redhat.com> In-Reply-To: <20210120151751.520597-1-thuth@redhat.com> References: <20210120151751.520597-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=216.205.24.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.167, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: Stefan Berger , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Berger Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Stefan Berger This patch fixes the following memory leak detected by asan: Indirect leak of 560320 byte(s) in 136 object(s) allocated from: #0 0x556b3b3f9b57 in calloc (/home/stefanb/tmp/qemu-tip/build/tests/qte= st/tpm-crb-swtpm-test+0x23fb57) #1 0x152b0e96b9b0 in g_malloc0 (/lib64/libglib-2.0.so.0+0x589b0) #2 0x556b3b588f61 in parse_object /home/stefanb/tmp/qemu-tip/build/../q= object/json-parser.c:318:12 #3 0x556b3b588f61 in parse_value /home/stefanb/tmp/qemu-tip/build/../qo= bject/json-parser.c:546:16 #4 0x556b3b5886e8 in json_parser_parse /home/stefanb/tmp/qemu-tip/build= /../qobject/json-parser.c:580:14 #5 0x556b3b52ff4a in json_message_process_token /home/stefanb/tmp/qemu-= tip/build/../qobject/json-streamer.c:92:12 #6 0x556b3b59896f in json_lexer_feed_char /home/stefanb/tmp/qemu-tip/bu= ild/../qobject/json-lexer.c:313:13 #7 0x556b3b598443 in json_lexer_feed /home/stefanb/tmp/qemu-tip/build/.= ./qobject/json-lexer.c:350:9 #8 0x556b3b436c70 in qmp_fd_receive /home/stefanb/tmp/qemu-tip/build/..= /tests/qtest/libqtest.c:614:9 #9 0x556b3b435871 in qtest_qmp_receive_dict /home/stefanb/tmp/qemu-tip/= build/../tests/qtest/libqtest.c:636:12 #10 0x556b3b435871 in qtest_qmp_receive /home/stefanb/tmp/qemu-tip/buil= d/../tests/qtest/libqtest.c:624:27 #11 0x556b3b435c59 in qtest_vqmp /home/stefanb/tmp/qemu-tip/build/../te= sts/qtest/libqtest.c:715:12 #12 0x556b3b435c59 in qtest_qmp /home/stefanb/tmp/qemu-tip/build/../tes= ts/qtest/libqtest.c:756:16 #13 0x556b3b4328c7 in tpm_util_wait_for_migration_complete /home/stefan= b/tmp/qemu-tip/build/../tests/qtest/tpm-util.c:245:15 #14 0x556b3b4333be in tpm_test_swtpm_migration_test /home/stefanb/tmp/q= emu-tip/build/../tests/qtest/tpm-tests.c:117:5 #15 0x152b0e98e29d (/lib64/libglib-2.0.so.0+0x7b29d) Signed-off-by: Stefan Berger Cc: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210115204637.3332555-1-stefanb@linux.vnet.ibm.com> Signed-off-by: Thomas Huth --- tests/qtest/tpm-util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qtest/tpm-util.c b/tests/qtest/tpm-util.c index 5a33a6ef0f..b70cc32d60 100644 --- a/tests/qtest/tpm-util.c +++ b/tests/qtest/tpm-util.c @@ -250,7 +250,7 @@ void tpm_util_wait_for_migration_complete(QTestState *w= ho) status =3D qdict_get_str(rsp_return, "status"); completed =3D strcmp(status, "completed") =3D=3D 0; g_assert_cmpstr(status, !=3D, "failed"); - qobject_unref(rsp_return); + qobject_unref(rsp); if (completed) { return; } --=20 2.27.0 From nobody Tue Nov 18 15:26:29 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1611156936; cv=none; d=zohomail.com; s=zohoarc; b=IszsoJ+7Aehbbjdz/UOKQ744IWQU3gugGGgQHeDNi7C9a+p0tdT3AHgC5pyCrXydUDy3RPTvq02G5HxZt79JSgsqKOuuPBw2yNeyA4gE9uPr3MgSiQckrisrBXvzrFFT6fWd/qEaXa0DRdkBJEsyWwiMVMwvgeK6XCAP564oIYw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611156936; 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=Rz4fvFEatUX9VVx8qi9pHg7GTDGLJFwywBlIwJ1zUlg=; b=YDW/lRrACy8n209yFtWDjCvbVU0e8Rh3eIvX0Z7CYP+szYejakU2P69uK9xzn1YqeAbWOD42KcVXOfPGhxtB18R//KOtMq4PEzM7/bkG7bho/AuHLZRSzBkILQPWkJ6CPqdOI9cOnimFbOtymB1oJz6tgepa2OyPNBP1xlMCogc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1611156936478435.96992648454363; Wed, 20 Jan 2021 07:35:36 -0800 (PST) Received: from localhost ([::1]:58778 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2FWB-0003Rr-BT for importer@patchew.org; Wed, 20 Jan 2021 10:35:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44096) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2FFk-0000OB-VE for qemu-devel@nongnu.org; Wed, 20 Jan 2021 10:18:42 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:51774) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l2FFb-0007lB-Uy for qemu-devel@nongnu.org; Wed, 20 Jan 2021 10:18:36 -0500 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-420-OJlwlNoOO5mGUSP5gljaug-1; Wed, 20 Jan 2021 10:18:17 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E9682101F7A9; Wed, 20 Jan 2021 15:18:15 +0000 (UTC) Received: from thuth.com (ovpn-114-135.ams2.redhat.com [10.36.114.135]) by smtp.corp.redhat.com (Postfix) with ESMTP id DDC6D60C6A; Wed, 20 Jan 2021 15:18:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611155904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Rz4fvFEatUX9VVx8qi9pHg7GTDGLJFwywBlIwJ1zUlg=; b=IpTrWDsmG1IlKNC7Y/6pB84Fg/5yVuCDolfxeJAg3eit3iaWNXMqVipKuQ1eq0tuc+sKV6 iY3GoWrRSyR26voUarOQBS8n2Go4pCSk6TsN6mbzoqCc/2V5cRqthfGlUYND9ut2zCIRrs wkFfoC0vhEmB7lh6B1Q1r2e7s8b/Qrg= X-MC-Unique: OJlwlNoOO5mGUSP5gljaug-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 13/14] MAINTAINERS: Remove Ben Warren Date: Wed, 20 Jan 2021 16:17:50 +0100 Message-Id: <20210120151751.520597-14-thuth@redhat.com> In-Reply-To: <20210120151751.520597-1-thuth@redhat.com> References: <20210120151751.520597-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=63.128.21.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.167, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: John Snow Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: John Snow Ben's email bounces and he no longer works for Skyport Systems. I was unable to reach Ben, so mark this section as Orphaned for now. Signed-off-by: John Snow Message-Id: <20201030153416.429791-2-jsnow@redhat.com> Signed-off-by: Thomas Huth --- MAINTAINERS | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 3216387521..778b3da406 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1999,8 +1999,7 @@ F: include/hw/nvram/chrp_nvram.h F: tests/qtest/prom-env-test.c =20 VM Generation ID -M: Ben Warren -S: Maintained +S: Orphan F: hw/acpi/vmgenid.c F: include/hw/acpi/vmgenid.h F: docs/specs/vmgenid.txt --=20 2.27.0 From nobody Tue Nov 18 15:26:29 2025 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1611156769; cv=none; d=zohomail.com; s=zohoarc; b=KQyoUiVnftB8gVPsnoWUDOxFv3Xn9dT+rzagtQkla9u3rVAoUOeSIaYDHE3BwaL8AZaTElqAagjz8WVHgjT1YVUsOwqvuMbzWNyz6Xzwhb7flwL480XyVwDE3v/Gwsp4j/5UD8uWxFj/MGBHRwpTSfhClBmC5KNegp+L/LPxuLI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611156769; 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=9Zabz53bkpxvAyuAye5doqdmzTSPe0X1Av7GxCoHmG0=; b=UpJ/cPHSrSb0GlFBvERJtgAQHV0IfIErLHGohTcPe8BRiUWuNsXrU7zj708jAt6QOOFkFR591PbFh460gDpy76Uvyee0283clVuC2v9A6BuFANX/m0JtZJC1RsScnJG/iNHwolaK97RrMv7TxRO1ab0/s/R2B8QfCyy+JOl9aII= 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 1611156769085396.9689532832091; Wed, 20 Jan 2021 07:32:49 -0800 (PST) Received: from localhost ([::1]:54026 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2FTT-0001Ug-Rd for importer@patchew.org; Wed, 20 Jan 2021 10:32:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44002) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2FFf-0000Lm-1y for qemu-devel@nongnu.org; Wed, 20 Jan 2021 10:18:32 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:57060) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l2FFW-0007kZ-2e for qemu-devel@nongnu.org; Wed, 20 Jan 2021 10:18:30 -0500 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-496-B9nSAuurOua51-xCln1E5Q-1; Wed, 20 Jan 2021 10:18:18 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A3481190A7A1; Wed, 20 Jan 2021 15:18:17 +0000 (UTC) Received: from thuth.com (ovpn-114-135.ams2.redhat.com [10.36.114.135]) by smtp.corp.redhat.com (Postfix) with ESMTP id 53C1960C6A; Wed, 20 Jan 2021 15:18:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611155901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9Zabz53bkpxvAyuAye5doqdmzTSPe0X1Av7GxCoHmG0=; b=fQBenYvAr/DXDXPIwnk6a80GypuikP2r3eCIIMRziDVA+ykWyhBkHvVoK/wC336zEn4N/j /tg+l8NCw5xTcfsHHfYwuZ9d3A6WJsZdtQ+q9hNgoAZ6TUcvPQX9Ye+9j3uexUZR0Y8jg+ hRzSNW7Hc9RhqsJMavwg23vmuqOYMrg= X-MC-Unique: B9nSAuurOua51-xCln1E5Q-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 14/14] MAINTAINERS: Make status spellings consistent Date: Wed, 20 Jan 2021 16:17:51 +0100 Message-Id: <20210120151751.520597-15-thuth@redhat.com> In-Reply-To: <20210120151751.520597-1-thuth@redhat.com> References: <20210120151751.520597-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=63.128.21.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.167, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: John Snow Signed-off-by: John Snow Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20201030153416.429791-3-jsnow@redhat.com> Signed-off-by: Thomas Huth --- MAINTAINERS | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 778b3da406..34359a99b8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1142,7 +1142,7 @@ F: tests/acceptance/machine_mips_malta.py =20 Mipssim R: Aleksandar Rikalo -S: Orphaned +S: Orphan F: hw/mips/mipssim.c F: hw/net/mipsnet.c =20 @@ -2443,7 +2443,7 @@ T: git https://gitlab.com/jsnow/qemu.git python Python scripts M: Eduardo Habkost M: Cleber Rosa -S: Odd fixes +S: Odd Fixes F: scripts/*.py F: tests/*.py =20 @@ -2680,7 +2680,7 @@ F: tests/test-coroutine.c =20 Buffers M: Daniel P. Berrange -S: Odd fixes +S: Odd Fixes F: util/buffer.c F: include/qemu/buffer.h =20 @@ -2709,7 +2709,7 @@ F: qapi/sockets.json =20 File monitor M: Daniel P. Berrange -S: Odd fixes +S: Odd Fixes F: util/filemonitor*.c F: include/qemu/filemonitor.h F: tests/test-util-filemonitor.c @@ -3263,7 +3263,7 @@ S: Odd Fixes F: scripts/git-submodule.sh =20 UI translations -S: Orphaned +S: Orphan F: po/*.po =20 Sphinx documentation configuration and build machinery --=20 2.27.0