From nobody Fri May 3 03:56:42 2024 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=1605607294; cv=none; d=zohomail.com; s=zohoarc; b=EglDkGiO3y1yrx0iNeHH/uCqw5kd7DmGYaK6fL38+tVuPpkQvO3sK12+rc1hGcO6lZ0DEMk5q2PfFlh4Y4WE6ylUUzW4e+dSAJMkErcubowWMFBB0vVr24uAO+eZNCM/fRavB/bZMh/+ShClrBWorgxSjcGR8TY//X4ZlindupQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605607294; 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=a58ip3fhIQWC725sqe6TyIlIuM+QnBNQy9RtBJFzd9M=; b=j9ZcE8M7lGW+KGMBHgrKDt1gmjXF6gPRtBOVe8JESmhCwgUerPkssQAqym0CWeTVC5AuEJxkbRgyA8C1lQZmyxIn+1y9KtzQjATxqVSr2uxKDsipmFpk6vqw7Unt6FJqRZHo6ge2DQhQlWWI2tu6/apRCa7w/k4m5HewtljlYR0= 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 1605607294050699.3980422780029; Tue, 17 Nov 2020 02:01:34 -0800 (PST) Received: from localhost ([::1]:47316 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kexno-00079B-Ua for importer@patchew.org; Tue, 17 Nov 2020 05:01:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54200) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kexkO-0003LJ-SL for qemu-devel@nongnu.org; Tue, 17 Nov 2020 04:58:01 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:52078) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kexkL-0003Uj-UV for qemu-devel@nongnu.org; Tue, 17 Nov 2020 04:58:00 -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-578-iDoO5vIuNlS7TgKO61GA9w-1; Tue, 17 Nov 2020 04:57:54 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 17754186DD56; Tue, 17 Nov 2020 09:57:53 +0000 (UTC) Received: from thuth.com (ovpn-113-138.ams2.redhat.com [10.36.113.138]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3C1B15B4B6; Tue, 17 Nov 2020 09:57:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605607076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=a58ip3fhIQWC725sqe6TyIlIuM+QnBNQy9RtBJFzd9M=; b=bdXnnvZGi7TD9SurDKHpoEB3/a7fCapSuStjmTDyhLq0TTv05OVtAPSIzop0F/a0GYL0rI CsNlmShtZ76fPnqf/kZ0kOriUMr0VY9+182+khRSFwaQtYvql4epvGd0Vj7OksA9jTwgl7 sd1DWmhRZJRY2rFVUkmRMjbfLaD1Q4s= X-MC-Unique: iDoO5vIuNlS7TgKO61GA9w-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 01/12] qemu/bswap: Remove unused qemu_bswap_len() Date: Tue, 17 Nov 2020 10:57:37 +0100 Message-Id: <20201117095748.122371-2-thuth@redhat.com> In-Reply-To: <20201117095748.122371-1-thuth@redhat.com> References: <20201117095748.122371-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/17 00:41:22 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: pass (identity @redhat.com) From: Philippe Mathieu-Daud=C3=A9 Last use of qemu_bswap_len() has been removed in commit e5fd1eb05ec ("apb: add busA qdev property to PBM PCI bridge"). Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20200928131934.739451-2-philmd@redhat.com> Signed-off-by: Thomas Huth --- include/qemu/bswap.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h index 1d3e4c24e4..8b01c38040 100644 --- a/include/qemu/bswap.h +++ b/include/qemu/bswap.h @@ -169,12 +169,6 @@ CPU_CONVERT(le, 16, uint16_t) CPU_CONVERT(le, 32, uint32_t) CPU_CONVERT(le, 64, uint64_t) =20 -/* len must be one of 1, 2, 4 */ -static inline uint32_t qemu_bswap_len(uint32_t value, int len) -{ - return bswap32(value) >> (32 - 8 * len); -} - /* * Same as cpu_to_le{16,32}, except that gcc will figure the result is * a compile-time constant if you pass in a constant. So this can be --=20 2.18.4 From nobody Fri May 3 03:56:42 2024 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=1605607204; cv=none; d=zohomail.com; s=zohoarc; b=cbjpAciWdC86qs+Hpf6QMm7dWAb0eVV7y4tWPXHuv7h1X8CR/eCWOkBzfMfx+sW+uXw9SeHcZjLcrccsGWRJBRZx14+vMFN0JT/+l1B+TBhZvTEbcnOa3bn5rmdk2c0coSGV4jlEeVTAv+IH8te/V/8VldXPNQHs0OG1sRUPV1Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605607204; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=1tcsTmyQEqoy8eAVPVvaWe95q+8v20jdLwU+sNUf5+s=; b=huk7LEmeprkCZCguB/F0SDJ8KH/pddAjoyhq0HHZQrwxF9GB6bhoh1b2m9orlrpIlIfg6e+7F3NLMvPb/OCI07ADPTvxJfsghm3C9gisgi820SYx4ems5wozFKT/Y7gf0lOKQdTzDyLVFHACgAsvcNQeBxr/AYVeBEdRxzfOkxU= 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 1605607204201173.44634135989907; Tue, 17 Nov 2020 02:00:04 -0800 (PST) Received: from localhost ([::1]:43230 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kexmN-0005OA-3F for importer@patchew.org; Tue, 17 Nov 2020 05:00:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54238) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kexkQ-0003O5-42 for qemu-devel@nongnu.org; Tue, 17 Nov 2020 04:58:02 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:48680) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kexkM-0003Ur-CZ for qemu-devel@nongnu.org; Tue, 17 Nov 2020 04:58:01 -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-243-e0n6D6nlP1yG8z3_ETw3sQ-1; Tue, 17 Nov 2020 04:57:55 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4493A1008319; Tue, 17 Nov 2020 09:57:54 +0000 (UTC) Received: from thuth.com (ovpn-113-138.ams2.redhat.com [10.36.113.138]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6BB555B4B6; Tue, 17 Nov 2020 09:57:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605607077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=1tcsTmyQEqoy8eAVPVvaWe95q+8v20jdLwU+sNUf5+s=; b=VFnIAeS7cN+oXOwaWuW5eeA/lr/vnZR9VvdmC9aPh7lMRres8jdF37eqOlyJgwMhNE3r/o FmH473/bRDsEIqHjW+gE12ORglw3QxTk/Ul3+byE6GSxv1CH8bOHmJMLkn4NlzzIT8lOTV mnKGijZekKEDo2SJjfZ6+8TvQC54VVc= X-MC-Unique: e0n6D6nlP1yG8z3_ETw3sQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 02/12] configure: Fix the _BSD_SOURCE define for the Haiku build Date: Tue, 17 Nov 2020 10:57:38 +0100 Message-Id: <20201117095748.122371-3-thuth@redhat.com> In-Reply-To: <20201117095748.122371-1-thuth@redhat.com> References: <20201117095748.122371-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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 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-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/17 01:18:45 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The Haiku VM that we are going to add is using _BSD_SOURCE instead of BSD_SOURCE (without initial underscore)... according to David Carlier, the BSD_SOURCE without underscore was likely a typo, so let's simply add the underscore there now. This fixes the build failure with the bswapXX() macros not being defined after including . Message-Id: <20201114165137.15379-2-thuth@redhat.com> Reviewed-by: Stefan Berger --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 4cef321d9d..a273a93377 100755 --- a/configure +++ b/configure @@ -790,7 +790,7 @@ SunOS) ;; Haiku) haiku=3D"yes" - QEMU_CFLAGS=3D"-DB_USE_POSITIVE_POSIX_ERRORS -DBSD_SOURCE $QEMU_CFLAGS" + QEMU_CFLAGS=3D"-DB_USE_POSITIVE_POSIX_ERRORS -D_BSD_SOURCE $QEMU_CFLAGS" ;; Linux) audio_drv_list=3D"try-pa oss" --=20 2.18.4 From nobody Fri May 3 03:56:42 2024 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=1605607223; cv=none; d=zohomail.com; s=zohoarc; b=lmjajG/StDzJxZhmqhAgPuZqQ8CvbhK3Ws2W1NeIjXcr5Ko26hQc18QkM7ClzLNkrdpOmAT2yjb6hOz+lAfSdQJhFKDMg3oyEKn3CwUgPr5czQ39ffIKC5oIMcN7En+7sOsKd458ya58QjhyumlK/md8k0NrR/ekPIU6ghGHzog= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605607223; 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=W8VKBAAQh54vYBa0H9TjHn/zaztYybUd1IJuwM8EANY=; b=lwAoOxB5aU/v/bsAiohNz86zYecKgsf7ejQ5JyQW4NYU1+LNwkcZYiZMN+XpyyIsTm5eTkwFlGO6da8ntMms8p/KKqJ3Jur56fVeqv0rK7ALemeTPEkGGReR6PlbYfDyCCDWOkQpNwRpOKlf7gHHBaiXmZJ1CTN7t35rniH/IEM= 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 1605607223261207.97894327752067; Tue, 17 Nov 2020 02:00:23 -0800 (PST) Received: from localhost ([::1]:44446 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kexmf-0005vB-T9 for importer@patchew.org; Tue, 17 Nov 2020 05:00:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54254) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kexkS-0003Q0-6P for qemu-devel@nongnu.org; Tue, 17 Nov 2020 04:58:04 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:28952) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kexkN-0003Vq-He for qemu-devel@nongnu.org; Tue, 17 Nov 2020 04:58:03 -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-303-v8kNJ2UhPpOEnAW_7zZNXg-1; Tue, 17 Nov 2020 04:57:56 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6B4AA10866A6; Tue, 17 Nov 2020 09:57:55 +0000 (UTC) Received: from thuth.com (ovpn-113-138.ams2.redhat.com [10.36.113.138]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9A7475B4BF; Tue, 17 Nov 2020 09:57:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605607078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=W8VKBAAQh54vYBa0H9TjHn/zaztYybUd1IJuwM8EANY=; b=Cy77PB1UaiXzYGesWzuh0N/AgAEn7oaf5GJXA9+HQda3WY+hL/ua7KOVRSuK7+RDF3xdaM T+foKWawTCbtfq5K0ax/NH84dFfACvbVKaqn84phvimxosQJRSaap0anB8G/Pwcsevty0v 3H/bszXAXSWd6ykTm7DIzVyl0Lgw88k= X-MC-Unique: v8kNJ2UhPpOEnAW_7zZNXg-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 03/12] configure: Do not build pc-bios/optionrom on Haiku Date: Tue, 17 Nov 2020 10:57:39 +0100 Message-Id: <20201117095748.122371-4-thuth@redhat.com> In-Reply-To: <20201117095748.122371-1-thuth@redhat.com> References: <20201117095748.122371-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/17 01:18:45 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: pass (identity @redhat.com) Compilation of pc-bios/optionrom fails on Haiku with: BUILD pvh.img ld: pvh_main.o: in function `pvh_load_kernel': pc-bios/optionrom/pvh_main.c:73: undefined reference to `GLOBAL_OFFSET_TAB= LE_' Makefile:57: recipe for target 'pvh.img' failed make[1]: *** [pvh.img] Error 1 Let's simply disable it, like it is already done on macOS and Solaris. Message-Id: <20201114165137.15379-3-thuth@redhat.com> Reviewed-by: Stefan Berger Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Thomas Huth --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index a273a93377..c0acda164d 100755 --- a/configure +++ b/configure @@ -5842,7 +5842,7 @@ fi roms=3D if { test "$cpu" =3D "i386" || test "$cpu" =3D "x86_64"; } && \ test "$targetos" !=3D "Darwin" && test "$targetos" !=3D "SunOS" &&= \ - test "$softmmu" =3D yes ; then + test "$targetos" !=3D "Haiku" && test "$softmmu" =3D yes ; then # Different host OS linkers have different ideas about the name of the= ELF # emulation. Linux and OpenBSD/amd64 use 'elf_i386'; FreeBSD uses the = _fbsd # variant; OpenBSD/i386 uses the _obsd variant; and Windows uses i386p= e. --=20 2.18.4 From nobody Fri May 3 03:56:42 2024 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=1605607359; cv=none; d=zohomail.com; s=zohoarc; b=E5mWIgUPDeg1ERZZGVWoy3lESEe1sdhKAh0pWxMC1UUtn8DHYjI9NMWX2naI6N9Tf8+i6icPk/A0L1xAALz+qS+122VMku2TRso+tpOJWaK6xyNxdsaxU7vktk5qam+z68AfjqGq01W5ZoJLHvL5TQk0Tv3aCF2LnZZcs7Nuu/s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605607359; 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=Uh9t5ip6sH+jKAgMU4sCMihCzZZ0cwJnHv1Jcq/iOZE=; b=fXX81+MLIptoidUjxyB6A02vf/RGCNDYIDxKZIIM3LTunRvnXpi+PAzxJvu8hxe7TVnMqPwmDtITEz3iyjw6iBVSEifnPuYtFJ7+3RoZzAWOO9Yb3Yhoud17z3ls5wS96AbCe9kn/Xw3YkXZMnXv3hBOlpEhWMyVHJRVWhOvX78= 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 160560735909571.50840594163662; Tue, 17 Nov 2020 02:02:39 -0800 (PST) Received: from localhost ([::1]:51750 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kexor-0000hQ-GQ for importer@patchew.org; Tue, 17 Nov 2020 05:02:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54286) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kexkU-0003W3-7M for qemu-devel@nongnu.org; Tue, 17 Nov 2020 04:58:06 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:51776) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kexkP-0003W4-JF for qemu-devel@nongnu.org; Tue, 17 Nov 2020 04:58:05 -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-190-GaY4f9PNN2eisiX2FtWWUw-1; Tue, 17 Nov 2020 04:57:57 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A1B828030AA; Tue, 17 Nov 2020 09:57:56 +0000 (UTC) Received: from thuth.com (ovpn-113-138.ams2.redhat.com [10.36.113.138]) by smtp.corp.redhat.com (Postfix) with ESMTP id CA5CF5B4B6; Tue, 17 Nov 2020 09:57:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605607079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Uh9t5ip6sH+jKAgMU4sCMihCzZZ0cwJnHv1Jcq/iOZE=; b=UOATS7INfaYnV7zI6Kux9vArZZJnYqNMbVg4MAUTFTz5AA/GpgDnaOURvaRSeNrNEPhVR/ 13McC0Xg5mvGnnPvHdtzrHy5TdG4PIsZHUi6LKOCS0PfiacWQYmeiWjdCVA8YGRr4qifbH vK0cR8UuQlLEOTbWd5FzYuS9GJzN3v0= X-MC-Unique: GaY4f9PNN2eisiX2FtWWUw-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 04/12] configure: Add a proper check for sys/ioccom.h and use it in tpm_ioctl.h Date: Tue, 17 Nov 2020 10:57:40 +0100 Message-Id: <20201117095748.122371-5-thuth@redhat.com> In-Reply-To: <20201117095748.122371-1-thuth@redhat.com> References: <20201117095748.122371-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/17 00:41:22 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: pass (identity @redhat.com) On Solaris and Haiku, the _IO() macros are defined in . Add a proper check for this header to our build system, and make sure to include the header in tpm_ioctl.h to fix a build failure on Solaris and Haiku. Message-Id: <20201115152317.42752-1-thuth@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Thomas Huth --- backends/tpm/tpm_ioctl.h | 4 ++++ meson.build | 2 ++ nbd/nbd-internal.h | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/backends/tpm/tpm_ioctl.h b/backends/tpm/tpm_ioctl.h index f5f5c553a9..bd6c12cb86 100644 --- a/backends/tpm/tpm_ioctl.h +++ b/backends/tpm/tpm_ioctl.h @@ -12,6 +12,10 @@ #include #include =20 +#ifdef HAVE_SYS_IOCCOM_H +#include +#endif + /* * Every response from a command involving a TPM command execution must ho= ld * the ptm_res as the first element. diff --git a/meson.build b/meson.build index 132bc49782..30f86ddafb 100644 --- a/meson.build +++ b/meson.build @@ -794,6 +794,8 @@ config_host_data.set('QEMU_VERSION_MAJOR', meson.projec= t_version().split('.')[0] config_host_data.set('QEMU_VERSION_MINOR', meson.project_version().split('= .')[1]) config_host_data.set('QEMU_VERSION_MICRO', meson.project_version().split('= .')[2]) =20 +config_host_data.set('HAVE_SYS_IOCCOM_H', cc.has_header('sys/ioccom.h')) + ignored =3D ['CONFIG_QEMU_INTERP_PREFIX'] # actually per-target arrays =3D ['CONFIG_AUDIO_DRIVERS', 'CONFIG_BDRV_RW_WHITELIST', 'CONFIG_BD= RV_RO_WHITELIST'] strings =3D ['HOST_DSOSUF', 'CONFIG_IASL'] diff --git a/nbd/nbd-internal.h b/nbd/nbd-internal.h index 60629ef160..1b2141ab4b 100644 --- a/nbd/nbd-internal.h +++ b/nbd/nbd-internal.h @@ -19,7 +19,7 @@ #ifndef _WIN32 #include #endif -#if defined(__sun__) || defined(__HAIKU__) +#ifdef HAVE_SYS_IOCCOM_H #include #endif =20 --=20 2.18.4 From nobody Fri May 3 03:56:42 2024 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=1605607666; cv=none; d=zohomail.com; s=zohoarc; b=Cq1bpVyqmdU/+4uFEYmJoNppjsmoFulTtfA1hOw9eiGxKBOgvEKL2nUqGs2vB7KQvPDvY1OhiO/uZLtX6gwojGQjMDIcCO64eoCu5JYPxu2dF5B2R+IaUND1o+eeMOAgORoaL5n7sN5COQBP7UTY9zJJFYzb4L1Icdg0X0cmXWE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605607666; 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=G0pVfpvxL6sRZRksObC/3bEaZWSPfFBMc9yN7ltpcpM=; b=Oo5H3okM9lS6ga1mnv+YEIywgznMpaeSrCly58PesEUeAWkL5Dv5KGlY2/cBBgLFDxeOPavE1kOs8eh1nr2qXwcMudLGXeN8OP/vutKQUH96dTNjomiHvkRX0t9gu1cxzIJH8RfyhR/CCWvIM/Mb2zVMBILcGq55Q6Met6QWi28= 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 1605607666258890.0537479082789; Tue, 17 Nov 2020 02:07:46 -0800 (PST) Received: from localhost ([::1]:37868 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kexto-0006jB-Nk for importer@patchew.org; Tue, 17 Nov 2020 05:07:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54330) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kexkW-0003dv-VG for qemu-devel@nongnu.org; Tue, 17 Nov 2020 04:58:08 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:54221) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kexkU-0003Xo-Rl for qemu-devel@nongnu.org; Tue, 17 Nov 2020 04:58:08 -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-511-Q2egE0zPMXWsgl6KEX2hbw-1; Tue, 17 Nov 2020 04:57:58 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C8C28873073; Tue, 17 Nov 2020 09:57:57 +0000 (UTC) Received: from thuth.com (ovpn-113-138.ams2.redhat.com [10.36.113.138]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0C31D5B4B6; Tue, 17 Nov 2020 09:57:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605607086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=G0pVfpvxL6sRZRksObC/3bEaZWSPfFBMc9yN7ltpcpM=; b=eOlYKE+0u8PXN6IXXPemWnWbIMkP0Ju8VqbM6mGIjUMWEtgksHeNBoB9SbDVNjTk0qr2Ik Oo5t/7uGO5AfTVNGQ2DaRd54U6gMT5eh7bwHqYRlJlLJ3OvGpz35WqFTeHWRt64sBRWhcs 7+4s0Nhnk/Gm/k3kG4rGVsPFgAaA2yY= X-MC-Unique: Q2egE0zPMXWsgl6KEX2hbw-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 05/12] tests/vm: Add Haiku test based on their vagrant images Date: Tue, 17 Nov 2020 10:57:41 +0100 Message-Id: <20201117095748.122371-6-thuth@redhat.com> In-Reply-To: <20201117095748.122371-1-thuth@redhat.com> References: <20201117095748.122371-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/17 01:18:45 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -15 X-Spam_score: -1.6 X-Spam_bar: - X-Spam_report: (-1.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_BTC_ID=0.5, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: pass (identity @redhat.com) From: Alexander von Gluck IV Signed-off-by: Alexander von Gluck IV [PMD: Avoid recreating the image each time] Signed-off-by: Philippe Mathieu-Daud=C3=A9 [thuth: Add ninja package, /usr/bin/env hack and --disable-slirp] Message-Id: <20201114165137.15379-5-thuth@redhat.com> Buglink: https://bugs.launchpad.net/qemu/+bug/1715203 Signed-off-by: Thomas Huth --- tests/keys/vagrant | 27 +++++++++ tests/keys/vagrant.pub | 1 + tests/vm/Makefile.include | 3 +- tests/vm/basevm.py | 5 +- tests/vm/haiku.x86_64 | 119 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 152 insertions(+), 3 deletions(-) create mode 100644 tests/keys/vagrant create mode 100644 tests/keys/vagrant.pub create mode 100755 tests/vm/haiku.x86_64 diff --git a/tests/keys/vagrant b/tests/keys/vagrant new file mode 100644 index 0000000000..7d6a083909 --- /dev/null +++ b/tests/keys/vagrant @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEogIBAAKCAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzI +w+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoP +kcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2 +hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NO +Td0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcW +yLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQIBIwKCAQEA4iqWPJXtzZA68mKd +ELs4jJsdyky+ewdZeNds5tjcnHU5zUYE25K+ffJED9qUWICcLZDc81TGWjHyAqD1 +Bw7XpgUwFgeUJwUlzQurAv+/ySnxiwuaGJfhFM1CaQHzfXphgVml+fZUvnJUTvzf +TK2Lg6EdbUE9TarUlBf/xPfuEhMSlIE5keb/Zz3/LUlRg8yDqz5w+QWVJ4utnKnK +iqwZN0mwpwU7YSyJhlT4YV1F3n4YjLswM5wJs2oqm0jssQu/BT0tyEXNDYBLEF4A +sClaWuSJ2kjq7KhrrYXzagqhnSei9ODYFShJu8UWVec3Ihb5ZXlzO6vdNQ1J9Xsf +4m+2ywKBgQD6qFxx/Rv9CNN96l/4rb14HKirC2o/orApiHmHDsURs5rUKDx0f9iP +cXN7S1uePXuJRK/5hsubaOCx3Owd2u9gD6Oq0CsMkE4CUSiJcYrMANtx54cGH7Rk +EjFZxK8xAv1ldELEyxrFqkbE4BKd8QOt414qjvTGyAK+OLD3M2QdCQKBgQDtx8pN +CAxR7yhHbIWT1AH66+XWN8bXq7l3RO/ukeaci98JfkbkxURZhtxV/HHuvUhnPLdX +3TwygPBYZFNo4pzVEhzWoTtnEtrFueKxyc3+LjZpuo+mBlQ6ORtfgkr9gBVphXZG +YEzkCD3lVdl8L4cw9BVpKrJCs1c5taGjDgdInQKBgHm/fVvv96bJxc9x1tffXAcj +3OVdUN0UgXNCSaf/3A/phbeBQe9xS+3mpc4r6qvx+iy69mNBeNZ0xOitIjpjBo2+ +dBEjSBwLk5q5tJqHmy/jKMJL4n9ROlx93XS+njxgibTvU6Fp9w+NOFD/HvxB3Tcz +6+jJF85D5BNAG3DBMKBjAoGBAOAxZvgsKN+JuENXsST7F89Tck2iTcQIT8g5rwWC +P9Vt74yboe2kDT531w8+egz7nAmRBKNM751U/95P9t88EDacDI/Z2OwnuFQHCPDF +llYOUI+SpLJ6/vURRbHSnnn8a/XG+nzedGH5JGqEJNQsz+xT2axM0/W/CRknmGaJ +kda/AoGANWrLCz708y7VYgAtW2Uf1DPOIYMdvo6fxIB5i9ZfISgcJ/bbCUkFrhoH ++vq/5CIWxCPp0f85R4qxxQ5ihxJ0YDQT9Jpx4TMss4PSavPaBH3RXow5Ohe+bYoQ +NE5OgEXk2wVfZczCZpigBKbKZHNYcelXtTt/nP3rsCuGcM4h53s=3D +-----END RSA PRIVATE KEY----- diff --git a/tests/keys/vagrant.pub b/tests/keys/vagrant.pub new file mode 100644 index 0000000000..b8d012d787 --- /dev/null +++ b/tests/keys/vagrant.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4= TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPk= cmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUec= p4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdET= k1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c= 9WhQ=3D=3D well-known vagrant key for qemu-test, do not use on any machine = exposed to an external network diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index 61f893ffdc..e94d95ec54 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -4,7 +4,7 @@ =20 EFI_AARCH64 =3D $(wildcard $(BUILD_DIR)/pc-bios/edk2-aarch64-code.fd) =20 -IMAGES :=3D freebsd netbsd openbsd centos fedora +IMAGES :=3D freebsd netbsd openbsd centos fedora haiku.x86_64 ifneq ($(GENISOIMAGE),) IMAGES +=3D ubuntu.i386 centos ifneq ($(EFI_AARCH64),) @@ -41,6 +41,7 @@ endif else @echo " (install genisoimage to build centos/ubuntu images)" endif + @echo " vm-build-haiku.x86_64 - Build QEMU in Haiku VM" @echo "" @echo " vm-build-all - Build QEMU in all VMs" @echo " vm-clean-all - Clean up VM images" diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 3fac20e929..00f1d5ca8d 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -44,6 +44,7 @@ DEFAULT_CONFIG =3D { 'machine' : 'pc', 'guest_user' : "qemu", 'guest_pass' : "qemupass", + 'root_user' : "root", 'root_pass' : "qemupass", 'ssh_key_file' : SSH_KEY_FILE, 'ssh_pub_key_file': SSH_PUB_KEY_FILE, @@ -245,13 +246,13 @@ class BaseVM(object): return self._ssh_do(self._config["guest_user"], cmd, False) =20 def ssh_root(self, *cmd): - return self._ssh_do("root", cmd, False) + return self._ssh_do(self._config["root_user"], cmd, False) =20 def ssh_check(self, *cmd): self._ssh_do(self._config["guest_user"], cmd, True) =20 def ssh_root_check(self, *cmd): - self._ssh_do("root", cmd, True) + self._ssh_do(self._config["root_user"], cmd, True) =20 def build_image(self, img): raise NotImplementedError diff --git a/tests/vm/haiku.x86_64 b/tests/vm/haiku.x86_64 new file mode 100755 index 0000000000..37af48bf1b --- /dev/null +++ b/tests/vm/haiku.x86_64 @@ -0,0 +1,119 @@ +#!/usr/bin/env python3 +# +# Haiku VM image +# +# Copyright 2020 Haiku, Inc. +# +# Authors: +# Alexander von Gluck IV +# +# This code is licensed under the GPL version 2 or later. See +# the COPYING file in the top-level directory. +# + +import os +import re +import sys +import time +import socket +import subprocess +import basevm + +VAGRANT_KEY_FILE =3D os.path.join(os.path.dirname(__file__), + "..", "keys", "vagrant") + +VAGRANT_PUB_KEY_FILE =3D os.path.join(os.path.dirname(__file__), + "..", "keys", "vagrant.pub") + +HAIKU_CONFIG =3D { + 'cpu' : "max", + 'machine' : 'pc', + 'guest_user' : "vagrant", + 'guest_pass' : "", + 'root_user' : "vagrant", + 'root_pass' : "", + 'ssh_key_file' : VAGRANT_KEY_FILE, + 'ssh_pub_key_file': VAGRANT_PUB_KEY_FILE, + 'memory' : "4G", + 'extra_args' : [], + 'qemu_args' : "-device VGA", + 'dns' : "", + 'ssh_port' : 0, + 'install_cmds' : "", + 'boot_dev_type' : "block", + 'ssh_timeout' : 1, +} + +class HaikuVM(basevm.BaseVM): + name =3D "haiku" + arch =3D "x86_64" + + link =3D "https://app.vagrantup.com/haiku-os/boxes/r1beta2-x86_64/vers= ions/20200702/providers/libvirt.box" + csum =3D "41c38b316e0cbdbc66b5dbaf3612b866700a4f35807cb1eb266a5bf83e9e= 68d5" + + poweroff =3D "shutdown" + + requirements =3D [ + "devel:libbz2", + "devel:libcapstone", + "devel:libcurl", + "devel:libfdt", + "devel:libgcrypt", + "devel:libgl", + "devel:libglib_2.0", + "devel:libgnutls", + "devel:libgpg_error", + "devel:libintl", + "devel:libjpeg", + "devel:liblzo2", + "devel:libncursesw", + "devel:libnettle", + "devel:libpixman_1", + "devel:libpng16", + "devel:libsdl2_2.0", + "devel:libsnappy", + "devel:libssh2", + "devel:libtasn1", + "devel:libusb_1.0", + "devel:libz", + "ninja", + "setuptools_python3" + ] + + # https://dev.haiku-os.org/ticket/16512 virtio disk1 shows up as 0 (re= versed order) + BUILD_SCRIPT =3D """ + set -e; + rm -rf /tmp/qemu-test.* + cd $(mktemp -d /tmp/qemu-test.XXXXXX); + mkdir src build; cd src; + tar -xf /dev/disk/virtual/virtio_block/0/raw; + mkdir -p /usr/bin + ln -s /boot/system/bin/env /usr/bin/env + cd ../build + ../src/configure --disable-slirp {configure_opts}; + make --output-sync -j{jobs} {target} {verbose}; + """ + + def build_image(self, img): + self.print_step("Downloading disk image") + tarball =3D self._download_with_cache(self.link, sha256sum=3Dself.= csum) + + self.print_step("Extracting disk image") + + subprocess.check_call(["tar", "xzf", tarball, "./box.img", "-O"], + stdout=3Dopen(img, 'wb')) + + self.print_step("Preparing disk image") + self.boot(img) + + # Wait for ssh to be available. + self.wait_ssh(wait_root=3DTrue, cmd=3D"exit 0") + + # Install packages + self.ssh_root("pkgman install -y %s" % " ".join(self.requirements)) + self.graceful_shutdown() + + self.print_step("All done") + +if __name__ =3D=3D "__main__": + sys.exit(basevm.main(HaikuVM, config=3DHAIKU_CONFIG)) --=20 2.18.4 From nobody Fri May 3 03:56:42 2024 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=1605607757; cv=none; d=zohomail.com; s=zohoarc; b=MKKySEDnWp2u8M2u6vBnt7dfcLX9Edf9SXCogNUD1Vk5SL4LFrsedO3WhJTc10skF3m+TCtbkOr0v+DI1O96sSDpUSNdznV9Z4pvN0jXIOE51W6Wg3UuAHOZ3C3Ug28kbKdM4VsdBdETb7sKPMqx6rdbTvmkqCZXhM3bT+mVETc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605607757; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=roLQ9xAuLbxQoLx9y7mZ1sDIrAf7Br0uy/wknZBshXU=; b=ADBi8Lv1mYhydvVti+ItZfYn2/5w9a2qIh6FvAImohJ3mTxGaifM5wcGKFLzcCV6R6JihPldjvXm9NNmO1M0HLpx53AejNDE5Sz3HVgqaR62oyXEb7QTUj7B2b46rUm9GoGG7BTFkCgiYY2WQd8KbNG/Bik8vzELqhnOKY219hM= 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 1605607757254745.2678908961781; Tue, 17 Nov 2020 02:09:17 -0800 (PST) Received: from localhost ([::1]:42292 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kexvI-000065-6J for importer@patchew.org; Tue, 17 Nov 2020 05:09:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54348) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kexkY-0003jK-Vp for qemu-devel@nongnu.org; Tue, 17 Nov 2020 04:58:10 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:31559) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kexkX-0003Z5-3p for qemu-devel@nongnu.org; Tue, 17 Nov 2020 04:58:10 -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-441--PCy8DWjMSWccJ0MQ9XpMA-1; Tue, 17 Nov 2020 04:58:00 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 04FCA64158; Tue, 17 Nov 2020 09:57:59 +0000 (UTC) Received: from thuth.com (ovpn-113-138.ams2.redhat.com [10.36.113.138]) by smtp.corp.redhat.com (Postfix) with ESMTP id 323E15B4B6; Tue, 17 Nov 2020 09:57:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605607088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=roLQ9xAuLbxQoLx9y7mZ1sDIrAf7Br0uy/wknZBshXU=; b=AqhXM2IHX+AlSbIThExar/3dLTlrtLqRgYv/ymBVxbKuOJO9kqFEjDXkyWIascJkD74xfd ogb0c+KhgYV9Tikrsu9d55/dvIs32bR91ZKq/UUjfv1QPct988lnMsBjevfIV83a+kqBJy CLXgJXIbX2TtFjD0A514/e8JGI0pIvQ= X-MC-Unique: -PCy8DWjMSWccJ0MQ9XpMA-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 06/12] tests/vm: update NetBSD to 9.1 Date: Tue, 17 Nov 2020 10:57:42 +0100 Message-Id: <20201117095748.122371-7-thuth@redhat.com> In-Reply-To: <20201117095748.122371-1-thuth@redhat.com> References: <20201117095748.122371-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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 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-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/17 01:18:45 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Brad Smith update NetBSD to 9.1 Signed-off-by: Brad Smith Reviewed-by: Gerd Hoffmann Tested-by: Gerd Hoffmann Message-Id: <20201114040150.GD13329@humpty.home.comstyle.com> Signed-off-by: Thomas Huth --- tests/vm/netbsd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/vm/netbsd b/tests/vm/netbsd index 447de9747d..596717cc76 100755 --- a/tests/vm/netbsd +++ b/tests/vm/netbsd @@ -22,8 +22,8 @@ class NetBSDVM(basevm.BaseVM): name =3D "netbsd" arch =3D "x86_64" =20 - link =3D "https://cdn.netbsd.org/pub/NetBSD/NetBSD-9.0/images/NetBSD-9= .0-amd64.iso" - csum =3D "34da4882ee61bdbf69f241195a8933dc800949d30b43fc6988da853d57fc= 2b8cac50cf97a0d2adaf93250b4e329d189c1a8b83c33bd515226f37745d50c33369" + link =3D "https://cdn.netbsd.org/pub/NetBSD/NetBSD-9.1/images/NetBSD-9= .1-amd64.iso" + csum =3D "65bddc95945991c3b2021f9c8ded7f34c25f0a7611b7aa15a15fe23399e9= 02307e926ae97fcd01dc1662ac67b5f6e4be643c6a2b581692ddcb616d30125066f9" size =3D "20G" pkgs =3D [ # tools @@ -38,7 +38,7 @@ class NetBSDVM(basevm.BaseVM): "bash", "gmake", "gsed", - "gettext", + "gettext-tools", =20 # libs: crypto "gnutls", --=20 2.18.4 From nobody Fri May 3 03:56:42 2024 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=1605607369; cv=none; d=zohomail.com; s=zohoarc; b=G4woKz8sCy5+5okVgwkaXCoztoMjZJtBcauZ4IIHk1r16BVFDvggWE2UhdboHNLjw7gks8p55MdXTmUeYlTcf0yJLdw3jcj29Zmp1lq+paLQaekQm4n9BiwO3ifADy7zskQCN2ZkBxmhGY5tRXae2Tjq0pzis2wzY7zzu3lIN/Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605607369; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=BZEG4W+EcU2ZPgJac6qWwUr/0t43j26tSCn7gDFtKkY=; b=GKQBEHJC+pOAxCM6b6ubs9NP5uMq/ggjIEi2lBsbMnwEEolYxPC0DW4dEp1V0+JMiZBDmmMCxMS74dHcnWH7Ai8Ei6XMKpp3BRkUzn4Slz4bTYT39w4egZDTEaarrKRq+HS+zifn9yJI1RS6XIUakuYG+XUee49VooNjT6cyHV8= 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 1605607369147188.26481632797493; Tue, 17 Nov 2020 02:02:49 -0800 (PST) Received: from localhost ([::1]:52784 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kexp1-000172-UK for importer@patchew.org; Tue, 17 Nov 2020 05:02:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54294) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kexkU-0003Wy-I3 for qemu-devel@nongnu.org; Tue, 17 Nov 2020 04:58:06 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:43918) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kexkS-0003We-Qa for qemu-devel@nongnu.org; Tue, 17 Nov 2020 04:58: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-501-4NPFRHJmMfuqtcwF2WgNTQ-1; Tue, 17 Nov 2020 04:58:01 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A16451882FA8; Tue, 17 Nov 2020 09:58:00 +0000 (UTC) Received: from thuth.com (ovpn-113-138.ams2.redhat.com [10.36.113.138]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6496D5B4BF; Tue, 17 Nov 2020 09:57:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605607083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=BZEG4W+EcU2ZPgJac6qWwUr/0t43j26tSCn7gDFtKkY=; b=NSTqXKsCCfeDZEffDkrMCZYua5xvVhjEPkg+O9Y9ASVjqiLae/64E7JY3/omx28d80yB5U Yx0Apivja6lVzSvsS42xoKwFSSZpCnSbmS+mXhkwLtTVRPLQ5cyC1H8HvlXItIgTrc5Prd 01W5im0KZI8lT9cIRI9S9myH6/I4kVg= X-MC-Unique: 4NPFRHJmMfuqtcwF2WgNTQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 07/12] target/microblaze: Fix possible array out of bounds in mmu_write() Date: Tue, 17 Nov 2020 10:57:43 +0100 Message-Id: <20201117095748.122371-8-thuth@redhat.com> In-Reply-To: <20201117095748.122371-1-thuth@redhat.com> References: <20201117095748.122371-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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 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-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/17 01:18:45 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: AlexChen The size of env->mmu.regs is 3, but the range of 'rn' is [0, 5]. To avoid data access out of bounds, only if 'rn' is less than 3, we can print env->mmu.regs[rn]. In other cases, we can print env->mmu.regs[MMU_R_TLBX]. Reported-by: Euler Robot Signed-off-by: Alex Chen Reviewed-by: Thomas Huth Reviewed-by: Edgar E. Iglesias Message-Id: <5FA10ABA.1080109@huawei.com> Signed-off-by: Thomas Huth --- target/microblaze/mmu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/microblaze/mmu.c b/target/microblaze/mmu.c index 2baaef7545..1e426963ba 100644 --- a/target/microblaze/mmu.c +++ b/target/microblaze/mmu.c @@ -234,7 +234,8 @@ void mmu_write(CPUMBState *env, bool ext, uint32_t rn, = uint32_t v) unsigned int i; =20 qemu_log_mask(CPU_LOG_MMU, - "%s rn=3D%d=3D%x old=3D%x\n", __func__, rn, v, env->mmu.= regs[rn]); + "%s rn=3D%d=3D%x old=3D%x\n", __func__, rn, v, + rn < 3 ? env->mmu.regs[rn] : env->mmu.regs[MMU_R_TLBX]); =20 if (cpu->cfg.mmu < 2 || !cpu->cfg.mmu_tlb_access) { qemu_log_mask(LOG_GUEST_ERROR, "MMU access on MMU-less system\n"); --=20 2.18.4 From nobody Fri May 3 03:56:42 2024 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=1605607525; cv=none; d=zohomail.com; s=zohoarc; b=fb0tPpQBU1M0RDrXy2VKEmpnJDOuf4ivmaqXS+m7KjCBNT0IX80pfM7p74PU+RtlrVVjuq+wrj0/YInHruw1/t9VEPEnLIOcH/xJRMEZrbnGNk9iWJM3IX+36dx330D57qGevkwZTjZnWWxekKY0GefmpFamY0p64IB1DPV2ym8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605607525; 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=CvSVTueNZPt9r6qSoEMyMyJXhOAGSbzYRG7Ix2GS0yE=; b=nwzYe53i8r7ktszdLBLjgW+K7TgnxwhJ4Y3E7cypQNCd2Oh1pv3PmyDH5b90/wzJrtDlkBs1m44UT30vNQLRpl4iuElAMiGOUrTgF9YXPjzR0kukeKBBSRYKzOmwvcba5pq23aW2C3yzM1XJ8MFFV2XFMjnCr+zkcggSUsGg+pk= 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 1605607525392166.5996303400467; Tue, 17 Nov 2020 02:05:25 -0800 (PST) Received: from localhost ([::1]:60492 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kexrY-0004HR-AV for importer@patchew.org; Tue, 17 Nov 2020 05:05:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54312) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kexkV-0003Zi-HF for qemu-devel@nongnu.org; Tue, 17 Nov 2020 04:58:07 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:31242) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kexkT-0003XX-S3 for qemu-devel@nongnu.org; Tue, 17 Nov 2020 04:58:07 -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-346-5OPYZASPOaC99wVzxTwCgg-1; Tue, 17 Nov 2020 04:58:02 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DA9F58030AA; Tue, 17 Nov 2020 09:58:01 +0000 (UTC) Received: from thuth.com (ovpn-113-138.ams2.redhat.com [10.36.113.138]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0C57776640; Tue, 17 Nov 2020 09:58:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605607085; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CvSVTueNZPt9r6qSoEMyMyJXhOAGSbzYRG7Ix2GS0yE=; b=XyB3x7j4qAgfxemIr52AWfHM67LkM2rLxvhp4ByOP2cLk9Pm+5jzkQd2/dfXVt1CUgvb/1 8c79iAbuq6PxBqpCENeiEoGqAII0vAXKpA6+oLF2GAKSsz031GEHHcYk+z5lmO5TtfD4cp z8wWPlcoSNmbYXxlyzWsZJcJLrnRNIQ= X-MC-Unique: 5OPYZASPOaC99wVzxTwCgg-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 08/12] gitlab-ci: Use $CI_REGISTRY instead of hard-coding registry.gitlab.com Date: Tue, 17 Nov 2020 10:57:44 +0100 Message-Id: <20201117095748.122371-9-thuth@redhat.com> In-Reply-To: <20201117095748.122371-1-thuth@redhat.com> References: <20201117095748.122371-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/17 00:41:22 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: pass (identity @redhat.com) From: Rebecca Cran Update containers.yml to use the $CI_REGISTRY variable as other files such as edk2.yml do. Signed-off-by: Rebecca Cran Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20201113172519.31056-1-rebecca@nuviainc.com> Signed-off-by: Thomas Huth --- .gitlab-ci.d/containers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index 11d079ea58..892ca8d838 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -8,7 +8,7 @@ - export COMMON_TAG=3D"$CI_REGISTRY/qemu-project/qemu/$NAME:latest" - apk add python3 - docker info - - docker login registry.gitlab.com -u "$CI_REGISTRY_USER" -p "$CI_REGI= STRY_PASSWORD" + - docker login $CI_REGISTRY -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PA= SSWORD" script: - echo "TAG:$TAG" - echo "COMMON_TAG:$COMMON_TAG" --=20 2.18.4 From nobody Fri May 3 03:56:42 2024 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=1605607517; cv=none; d=zohomail.com; s=zohoarc; b=WyNZFX43kg63m5CV1WRMktpmNKABIguKR19IlmoEBw/xSouEZd5fNoQj83S1dxYr2waEbRhWaGyPtXAhRQYH0KOFk/fy1zfeJTi8UNiDv9i4xE6kL4k2eHQxJ/qUkIYLB2PEQ84EdinwGz/S2SiEW88tB02EQJC0GutaXAGbfl8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605607517; 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=eGRW2bhwMn6fI8qxgCcTyS9b6HCEkoNoblrMDXxz5dM=; b=IjQHgLY42FgZYcWI1JeVKHUDmhdXwOLECqE3gdNP7hGgfiSGg4OCaCA90cATyAdrRcvLiKS9ZK9OfxWQzSL6lRpNyA+lSO0AGwFfOgLroGFCEBkQGMutbXpbHNXnN3XupYinocgrA/RJvcD8Koib2Y9W0czLnRxWA6cLB2gu3mg= 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 1605607517641955.7929876318972; Tue, 17 Nov 2020 02:05:17 -0800 (PST) Received: from localhost ([::1]:59798 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kexrQ-0003yp-If for importer@patchew.org; Tue, 17 Nov 2020 05:05:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54328) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kexkW-0003cz-LS for qemu-devel@nongnu.org; Tue, 17 Nov 2020 04:58:08 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:51116) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kexkU-0003Xr-TK for qemu-devel@nongnu.org; Tue, 17 Nov 2020 04:58:08 -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-515-UVZJ0hByOUucp1J9NOMieg-1; Tue, 17 Nov 2020 04:58:04 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1DB5510866DB; Tue, 17 Nov 2020 09:58:03 +0000 (UTC) Received: from thuth.com (ovpn-113-138.ams2.redhat.com [10.36.113.138]) by smtp.corp.redhat.com (Postfix) with ESMTP id 43DBB5B4B6; Tue, 17 Nov 2020 09:58:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605607086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eGRW2bhwMn6fI8qxgCcTyS9b6HCEkoNoblrMDXxz5dM=; b=SLZsvdxjg7XI+A7gO9hGX4QUWkMKJsGLE7CsCXxjVoZmn0z/EAEuwfN0MaXbKZ6NPX77bG 56aUi1r1d6YS7btrLuY3CkRCl96gkjiuEduuBUW/qip2NpXgsFyUMBUKKUsb+Gtam0z4mc PpVhcRaCSkU+DdbZRTS7tHEol/Wyo3M= X-MC-Unique: UVZJ0hByOUucp1J9NOMieg-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 09/12] ssd0323: put it into the 'display' category Date: Tue, 17 Nov 2020 10:57:45 +0100 Message-Id: <20201117095748.122371-10-thuth@redhat.com> In-Reply-To: <20201117095748.122371-1-thuth@redhat.com> References: <20201117095748.122371-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/17 01:18:45 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: pass (identity @redhat.com) From: Gan Qixin The category of the ssd0323 device is not set, put it into the 'display' category. Signed-off-by: Gan Qixin Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20201112125824.763182-2-ganqixin@huawei.com> Signed-off-by: Thomas Huth --- hw/display/ssd0323.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/display/ssd0323.c b/hw/display/ssd0323.c index 17d4b32ae3..cbfd21dfd5 100644 --- a/hw/display/ssd0323.c +++ b/hw/display/ssd0323.c @@ -370,6 +370,7 @@ static void ssd0323_class_init(ObjectClass *klass, void= *data) k->transfer =3D ssd0323_transfer; k->cs_polarity =3D SSI_CS_HIGH; dc->vmsd =3D &vmstate_ssd0323; + set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories); } =20 static const TypeInfo ssd0323_info =3D { --=20 2.18.4 From nobody Fri May 3 03:56:42 2024 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=1605607574; cv=none; d=zohomail.com; s=zohoarc; b=MV1NhkUTcaGw4zmONulwft4U6WhYlGAoMj2CyMwoG3GBXjaelhLWb5nhjP0r0xY8JhYRH7FEbDHkFJRFnwdDffUEWLLPy9C8rxYMAcriEOZia02+N/IoQIZXVQvCySRynRdjMvz6p9YJhFd378VL8Hx7PJquZtM/gxjKycXoPg8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605607574; 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=iiiN84M9qNCYrV6ZuA1ioDrQ3xK431Fv7dDz215n99c=; b=aZ5uA40VBQwp90EzFH5+3yzfs7aLu+o01olpjASg7muLrxzimUtnvnhNE1yjiUiatYAYhg2sIa9pwGzWY49CgKiG80mcn/G2cCPYKUxa0+yBNkHE0Jt2/Tm7dzanCzhEa4EB2c0Z1dhXg9gpVKJWB7AL43ObEP530LGLS0QFpqw= 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 1605607574551872.4388312586899; Tue, 17 Nov 2020 02:06:14 -0800 (PST) Received: from localhost ([::1]:34480 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kexsL-0005F7-GG for importer@patchew.org; Tue, 17 Nov 2020 05:06:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54382) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kexka-0003o6-SN for qemu-devel@nongnu.org; Tue, 17 Nov 2020 04:58:12 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:44149) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kexkZ-0003ZK-3e for qemu-devel@nongnu.org; Tue, 17 Nov 2020 04:58: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-12-jxdUpk40OlC-TOh5TuwwTg-1; Tue, 17 Nov 2020 04:58:06 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5B28D188C12C; Tue, 17 Nov 2020 09:58:05 +0000 (UTC) Received: from thuth.com (ovpn-113-138.ams2.redhat.com [10.36.113.138]) by smtp.corp.redhat.com (Postfix) with ESMTP id 81AA95B4B6; Tue, 17 Nov 2020 09:58:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605607090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iiiN84M9qNCYrV6ZuA1ioDrQ3xK431Fv7dDz215n99c=; b=Rgws4wz4OmEu39IlZi5YcftGZXbzyAENmivLHHVyFuTTjNyBTeA6Y/rKiu1mFhmTx+c4sb S4Q4hkPFEsrar3ckCBejRVUcTXrWK6Z2X+/avGQcMfSLBB69IxJ6YsOS04QWwqzOiDVxqZ EL0b2yRnVJGEmZe0loENyuQwwvQy02M= X-MC-Unique: jxdUpk40OlC-TOh5TuwwTg-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 10/12] ads7846: put it into the 'input' category Date: Tue, 17 Nov 2020 10:57:46 +0100 Message-Id: <20201117095748.122371-11-thuth@redhat.com> In-Reply-To: <20201117095748.122371-1-thuth@redhat.com> References: <20201117095748.122371-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/17 00:41:22 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: pass (identity @redhat.com) From: Gan Qixin The category of the ads7846 device is not set, put it into the 'input' category. Signed-off-by: Gan Qixin Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell Message-Id: <20201112125824.763182-3-ganqixin@huawei.com> Signed-off-by: Thomas Huth --- hw/display/ads7846.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/display/ads7846.c b/hw/display/ads7846.c index 023165b2a3..cb3a431cfd 100644 --- a/hw/display/ads7846.c +++ b/hw/display/ads7846.c @@ -163,10 +163,12 @@ static void ads7846_realize(SSISlave *d, Error **errp) =20 static void ads7846_class_init(ObjectClass *klass, void *data) { + DeviceClass *dc =3D DEVICE_CLASS(klass); SSISlaveClass *k =3D SSI_SLAVE_CLASS(klass); =20 k->realize =3D ads7846_realize; k->transfer =3D ads7846_transfer; + set_bit(DEVICE_CATEGORY_INPUT, dc->categories); } =20 static const TypeInfo ads7846_info =3D { --=20 2.18.4 From nobody Fri May 3 03:56:42 2024 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=1605607398; cv=none; d=zohomail.com; s=zohoarc; b=mcH2hqeH+nmPbu+ActlkqWqTU5YV7lALQU0QTgGnUmRV6bV+5VTyZmPfHoRto9tyBhdBJkfcGESnig+63+EHm+bh57mBc93ayieOvkfDR3slO8NhqlpIQaTH/iddlEWePKMf98N++oVOr+iFmQ+EMkl6lzftKNQZNOGwVQdMfKE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605607398; 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=Van5PEIYz0epUlwxPEHomhRfzd/N+/y+CLzktv6XbSw=; b=DXIvP1gfr5FnVDnvOPJnIYed6CDK7Z6jciZ8mo3EWkLl/D8YHquidbRsGJIfiRKb9lUirJFYZfnU8sLAkfHgTG20rzdu7w2XZy/+y/rPi+dCUn+PYFDmDy70qy3c2t4znil07qpS2glrjDy9TyPfRmhtTVASSxxH/W4JDNpLuI0= 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 1605607398150246.55863080771906; Tue, 17 Nov 2020 02:03:18 -0800 (PST) Received: from localhost ([::1]:55672 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kexpV-0002HC-4f for importer@patchew.org; Tue, 17 Nov 2020 05:03:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54364) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kexkZ-0003lf-TN for qemu-devel@nongnu.org; Tue, 17 Nov 2020 04:58:11 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:36186) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kexkY-0003ZE-9j for qemu-devel@nongnu.org; Tue, 17 Nov 2020 04:58:11 -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-591-U9NTU9sQPyK1wIxur6SqNQ-1; Tue, 17 Nov 2020 04:58:07 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 929F11009443; Tue, 17 Nov 2020 09:58:06 +0000 (UTC) Received: from thuth.com (ovpn-113-138.ams2.redhat.com [10.36.113.138]) by smtp.corp.redhat.com (Postfix) with ESMTP id B9D145B4B6; Tue, 17 Nov 2020 09:58:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605607089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Van5PEIYz0epUlwxPEHomhRfzd/N+/y+CLzktv6XbSw=; b=E+cpFsFXDsIypJfuy+h5sKX2Nrx3LCDbod+NzlpCJEQ4m9Lt579aH+tbZmQQKz5Ku33wgN +wjm9tcnErkC9EsxaF9D5F3nJItvXUgIK2PkKGIV+yVNkS3U7AJV6uQgKJEtUWWIyX+bcI AHTLJHOzERSyEop8RgkRtL8qWLyJBK4= X-MC-Unique: U9NTU9sQPyK1wIxur6SqNQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 11/12] nand: put it into the 'storage' category Date: Tue, 17 Nov 2020 10:57:47 +0100 Message-Id: <20201117095748.122371-12-thuth@redhat.com> In-Reply-To: <20201117095748.122371-1-thuth@redhat.com> References: <20201117095748.122371-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/17 01:18:45 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: pass (identity @redhat.com) From: Gan Qixin The category of the nand device is not set, put it into the 'storage' category. Signed-off-by: Gan Qixin Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20201112125824.763182-4-ganqixin@huawei.com> Signed-off-by: Thomas Huth --- hw/block/nand.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/block/nand.c b/hw/block/nand.c index bcceb64ebb..1d7a48a2ec 100644 --- a/hw/block/nand.c +++ b/hw/block/nand.c @@ -449,6 +449,7 @@ static void nand_class_init(ObjectClass *klass, void *d= ata) dc->reset =3D nand_reset; dc->vmsd =3D &vmstate_nand; device_class_set_props(dc, nand_properties); + set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); } =20 static const TypeInfo nand_info =3D { --=20 2.18.4 From nobody Fri May 3 03:56:42 2024 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=1605607381; cv=none; d=zohomail.com; s=zohoarc; b=nO64ImpQKrTYkUTiwyUHyc8UcfVMlZOPH8klTzDVWKCYBfErsHR5HneMm5git+7m9+7l1ERjKNQEX2RR+kX78o2Ik2nBxBcUI80pTE1pLLbj+JsNBuS0CS0e10fxpfcNwwAm1a80D+J50JDZ8FjkiuYlZHazChv8AjitLXn21vU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605607381; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=dx4iQ6/bvUhKAcvhxvQSYfXw8/ZRkSe6hKQOd1gdGeo=; b=RFAj8ctx8SwCD/J19lUY+z3haAp07uzyYQmN5PuHJ/+Q8mvIci9zN8oVC78lhl8kS+uFQwBoWp8NUD/NZqtud7ueypjZpSfKNO8quHDdcBV81CZ8bb9jkJ+n94h9P3qvjpyn0pwGU7uR433bLy9/5cGM75zoHZgc8oJkhpjQXQ0= 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 1605607381218606.0990504318273; Tue, 17 Nov 2020 02:03:01 -0800 (PST) Received: from localhost ([::1]:53932 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kexpE-0001Zi-2L for importer@patchew.org; Tue, 17 Nov 2020 05:03:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54404) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kexkc-0003rq-81 for qemu-devel@nongnu.org; Tue, 17 Nov 2020 04:58:14 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:31092) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kexka-0003aF-FC for qemu-devel@nongnu.org; Tue, 17 Nov 2020 04:58:13 -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-130-r2Lm7YtsPaKNjx5cJ1zB9w-1; Tue, 17 Nov 2020 04:58:08 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CA1146D241; Tue, 17 Nov 2020 09:58:07 +0000 (UTC) Received: from thuth.com (ovpn-113-138.ams2.redhat.com [10.36.113.138]) by smtp.corp.redhat.com (Postfix) with ESMTP id EF89B76646; Tue, 17 Nov 2020 09:58:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605607091; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=dx4iQ6/bvUhKAcvhxvQSYfXw8/ZRkSe6hKQOd1gdGeo=; b=HPkWX6K71Ux9Ij+4mxAixX9FtpTjlhnsiLXk0JpDvBWih/3RcxsHBYDNve26t+ZKaFtV7T Uu2O4a79q1n7Lh3WfzH7YjSsj/aVPntW14/dioqaf6Ocibc2313AuI76N3cERmcFcn0LyH VpKiwN52ndLAGw8ox8lC/mDbe9Nlt2Y= X-MC-Unique: r2Lm7YtsPaKNjx5cJ1zB9w-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 12/12] max111x: put it into the 'misc' category Date: Tue, 17 Nov 2020 10:57:48 +0100 Message-Id: <20201117095748.122371-13-thuth@redhat.com> In-Reply-To: <20201117095748.122371-1-thuth@redhat.com> References: <20201117095748.122371-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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 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-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/17 00:41:22 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Gan Qixin The category of the max111x device is not set, put it into the 'misc' category. Signed-off-by: Gan Qixin Reviewed-by: Thomas Huth Message-Id: <20201112125824.763182-5-ganqixin@huawei.com> Signed-off-by: Thomas Huth --- hw/misc/max111x.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/misc/max111x.c b/hw/misc/max111x.c index 7e6723f343..eae0f9b598 100644 --- a/hw/misc/max111x.c +++ b/hw/misc/max111x.c @@ -185,6 +185,7 @@ static void max111x_class_init(ObjectClass *klass, void= *data) k->transfer =3D max111x_transfer; dc->reset =3D max111x_reset; dc->vmsd =3D &vmstate_max111x; + set_bit(DEVICE_CATEGORY_MISC, dc->categories); } =20 static const TypeInfo max111x_info =3D { --=20 2.18.4