From nobody Sun May 19 09:08:45 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=1671645954; cv=none; d=zohomail.com; s=zohoarc; b=Sby2hDBL2L7d2Y1zivB775womrgoImj0l0EByozy92bRFYapSG34dLGrUCZC7kO9ydtnvTvx4gW1TSfao6ttLbx16Ju0b9FEe8Wq8o4ucVpoaL84EVVqa4aSpv+YQhBfAb/6l0qG619KtBS2AH9vj5XZ8ZUHaczhjq1aw7ausho= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671645954; 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=0RLjBKC7zuAW/a6ddtPwalPoTZK/tLDETD58h1g0NvY=; b=jJeKMxgQW0GyNQfz+llYpGvs6NxIgxhDCNzgF3DsbbvL1HYKsH9Gysfp7QIChEOJNM0MM6p7p2ERncLpMHvnpxkwbzFlBbicnpaneupWM2VPsvSjf0S2kI5UvxP7vLFcmz+2dhOqx2GVmXXDkaVY9Bt2JNeuD/ysDNk9z3ztx9M= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1671645954187324.0569471109459; Wed, 21 Dec 2022 10:05:54 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p83Py-0000Tu-Qh; Wed, 21 Dec 2022 13:02:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83Pl-0000Is-8Y for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:02 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83Pi-0004GK-Sw for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:00 -0500 Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-449-Qzw0oBfONwO6k6MSVVIXhg-1; Wed, 21 Dec 2022 13:01:56 -0500 Received: by mail-ej1-f70.google.com with SMTP id hr34-20020a1709073fa200b0083a60c1d7abso2898064ejc.13 for ; Wed, 21 Dec 2022 10:01:56 -0800 (PST) Received: from avogadro.local ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id g19-20020a170906539300b007c0efbaa8a0sm7393236ejo.4.2022.12.21.10.01.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 10:01:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671645718; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0RLjBKC7zuAW/a6ddtPwalPoTZK/tLDETD58h1g0NvY=; b=dEsK9ojsliWVEZV88JAaELcedNMwdyVlp5npPtTXkxjlqsYRSAKXM0zRtFmrB2MUD2KNRK O3jkh5DhyVXmrUpwWifn2L6iePPQO1UU0vKuvXSLIAXUXB41nRDSfMdec/4vef6siaS7kn l97YBcL7HMWCU1xLMGFB6T1biRIgIUQ= X-MC-Unique: Qzw0oBfONwO6k6MSVVIXhg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0RLjBKC7zuAW/a6ddtPwalPoTZK/tLDETD58h1g0NvY=; b=q4pXS9AGA+UA8U6MEdBMCVibtxkUcrWYgXyS5X6rSv304GeZMvtcCff/3DrXqq88ZS sDfEGV5TjDoe1K3XVNvrPGfNk7OH8n/4VtUAlluspSrRJ9CairgTV+xuAr5v6b2nBjd7 f0SGhjV9SwWwRp+byRmt6XwHVXHanppWZ/jVvW5Okfow1bmg0pmyupsnQmXx/0MLzevK R2l+7muhmrfdEnjyw5G9raGRk7YOnOHrnZLDIu0zM9c5W6zAyPLvl564LEUevIi2fe5o xc02bsgBWeF7K70cNKc+SSmALymQ0iJkPSC87GQ0XlAUAq6bRI+db0gGGFTprAZ2BfdO RmLQ== X-Gm-Message-State: AFqh2krkHZkQOv5RkmUsFXRiLVbq5sCJaArtORayxjqG1B/P7UmzVaIZ bJf7uQiucYq31YRrp6ipQtH17KfwTUq+qXvgeapWkgvUPWaxR+p81JcUOOttMPGwfVywLUGeQoJ P271vm39Eg12nmuo6KcUiDkH4CRSQTJ3R37WSnzOxGkQ6AbYmYX9dD+krpFMeWSTu5Qg= X-Received: by 2002:a17:906:6d47:b0:7c1:311f:3533 with SMTP id a7-20020a1709066d4700b007c1311f3533mr1835070ejt.60.1671645707400; Wed, 21 Dec 2022 10:01:47 -0800 (PST) X-Google-Smtp-Source: AMrXdXvrOfnABj65B+r5b8WvUglItAVeJrJ5ALfnC3UhP2YjqafZGRBgcSAaZety3uLWw8Z1NI6jTA== X-Received: by 2002:a17:906:6d47:b0:7c1:311f:3533 with SMTP id a7-20020a1709066d4700b007c1311f3533mr1835045ejt.60.1671645707108; Wed, 21 Dec 2022 10:01:47 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Fabiano Rosas Subject: [PULL 01/24] typedefs: Forward-declare AccelState Date: Wed, 21 Dec 2022 19:01:18 +0100 Message-Id: <20221221180141.839616-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221221180141.839616-1-pbonzini@redhat.com> References: <20221221180141.839616-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain 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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PP_MIME_FAKE_ASCII_TEXT=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671645954635100001 From: Philippe Mathieu-Daud=C3=A9 Forward-declare AccelState in "qemu/typedefs.h" so structures using a reference of it (like MachineState in "hw/boards.h") don't have to include "qemu/accel.h". Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Fabiano Rosas Message-Id: <20221130135641.85328-2-philmd@linaro.org> Signed-off-by: Paolo Bonzini --- include/qemu/accel.h | 4 ++-- include/qemu/typedefs.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/qemu/accel.h b/include/qemu/accel.h index ce4747634a7c..e84db2e3e504 100644 --- a/include/qemu/accel.h +++ b/include/qemu/accel.h @@ -26,10 +26,10 @@ #include "qom/object.h" #include "exec/hwaddr.h" =20 -typedef struct AccelState { +struct AccelState { /*< private >*/ Object parent_obj; -} AccelState; +}; =20 typedef struct AccelClass { /*< private >*/ diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 688408e0481e..073abab9988a 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -21,6 +21,7 @@ * Incomplete struct types * Please keep this list in case-insensitive alphabetical order. */ +typedef struct AccelState AccelState; typedef struct AdapterInfo AdapterInfo; typedef struct AddressSpace AddressSpace; typedef struct AioContext AioContext; --=20 2.38.1 From nobody Sun May 19 09:08:45 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=1671645792; cv=none; d=zohomail.com; s=zohoarc; b=BkGZ/02BTIjlKT5rkvATcEcySimKWLYNgsoV0RmLeOPcCtYkim7b1bEW+X2RSrVvorMPvEQzAK2Z84GoJDkcTJBTJldgxJO0E2eCmB9u7KzaaKS8JyPW3NA8ntvQ5oqI18COIQ/QCM+dBinUf0AYzeNEBSFtSgwi/rhxBW2sKWI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671645792; 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=ZCil6Tgw9ufX/VtVVL5nS02IrjTCZZZWdCHHxmZxMPM=; b=KmSunZ+IuHQfYIZvKoMoFOsPIEfNvAnSMS+IZnDCMsQ1m0VobvXMrDOu/pHZlgbz9onSIuVdrWTWs2Y0l7OX45SeQy5IIeCtBERaMn7ymO8Kr7rD0El5232FrXbduTELc7M5Xzmch8J2Kshsz9l2DBo9pK1me/1OfAfVwfSNsh8= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 167164579274936.81315128996084; Wed, 21 Dec 2022 10:03:12 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p83Q1-0000bK-PY; Wed, 21 Dec 2022 13:02:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83Pn-0000N4-4E for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:04 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83Pl-0004GP-0O for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:02 -0500 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-505-4fvH47Y-NJqJj2mgJ2WvfQ-1; Wed, 21 Dec 2022 13:01:51 -0500 Received: by mail-ej1-f69.google.com with SMTP id hd17-20020a170907969100b007c117851c81so11125046ejc.10 for ; Wed, 21 Dec 2022 10:01:51 -0800 (PST) Received: from avogadro.local ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id c2-20020a17090618a200b008318e6d09easm3337576ejf.103.2022.12.21.10.01.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 10:01:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671645718; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZCil6Tgw9ufX/VtVVL5nS02IrjTCZZZWdCHHxmZxMPM=; b=Eqz5wP5/YOViYndUOZUPOBAwlX3ltSRbCcPjKfK1TKWXrQPQoIXhYOtuNm24IThxdA5Z6H wdKv0pOXQxSf4Nq5sbSz8V3hM9MS4/s36kJ7lNsiWpKcgYwRw6SA5MqlVFMnd6XZ5REjje WmiYV3JPA7KmKyu2eLF4HBsR/LYNkNE= X-MC-Unique: 4fvH47Y-NJqJj2mgJ2WvfQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZCil6Tgw9ufX/VtVVL5nS02IrjTCZZZWdCHHxmZxMPM=; b=grFkOb7E3v6rlQrCq4LxMCuvlYb9wMriuzygXH0azK9+/dsHHeatODGsm396xH9cKo 5R004spnFcxOBye0FXHdKlbOIDJfUS3C1ScDj1LresHpBJ3An4XQY8zEIJP0JBBbUv/D owsA9HveFbO7SA6C3UnjesX38XY8cldazkeSq6YcPqaClhSbfJBdzu1BKUWp67ay59WH 5mcfpIDrt8TPbbyIuHjuqqD1I+sraSeNeNHUONeeErM/Et8Htww8uwbETrQdFEH4+K7U pDlRf2AhqoWIXaxquVwIjJLAb2fiEIdw0onec9fVyl4qlSdnU5PHA+lJsMVSxhuLh0fq xYRQ== X-Gm-Message-State: AFqh2koQyHr2hRSkrvkSlI9GHZ4ev7CgTsZ82V/WGQVRpWB/ZfS1O8FH /TNZj8wDr01SuVuETEd/fQ89cZmbPhHLy8C5TpnAtpfL88n28PmsQJyvBr5QqSAEg7JDCMOWaNb 4Rlx5C/GRUQEMRj0fFtSS1HWvj3+E8ERy9K/Digh5BDGT5KvwPj3gNAHGsaUQFt0GRoM= X-Received: by 2002:a17:907:c712:b0:7bd:6372:fdb4 with SMTP id ty18-20020a170907c71200b007bd6372fdb4mr2801577ejc.41.1671645710027; Wed, 21 Dec 2022 10:01:50 -0800 (PST) X-Google-Smtp-Source: AMrXdXvjn+dymry1HqlaRzj+Z47i0CNt5GNoT0o25w7f5cS4zNMB+WMGkFI/hyVejFUWEHxwGxs/2A== X-Received: by 2002:a17:907:c712:b0:7bd:6372:fdb4 with SMTP id ty18-20020a170907c71200b007bd6372fdb4mr2801540ejc.41.1671645709762; Wed, 21 Dec 2022 10:01:49 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Fabiano Rosas Subject: [PULL 02/24] hw: Reduce "qemu/accel.h" inclusion Date: Wed, 21 Dec 2022 19:01:19 +0100 Message-Id: <20221221180141.839616-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221221180141.839616-1-pbonzini@redhat.com> References: <20221221180141.839616-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain 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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PP_MIME_FAKE_ASCII_TEXT=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671645794717100003 From: Philippe Mathieu-Daud=C3=A9 Move "qemu/accel.h" include from the heavily included "hw/boards.h" to hw/core/machine.c, the single file using the AccelState definition. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Fabiano Rosas Message-Id: <20221130135641.85328-3-philmd@linaro.org> Signed-off-by: Paolo Bonzini --- hw/core/machine.c | 1 + include/hw/boards.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index 644b34cd24d0..3e51a5d8eb2c 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -12,6 +12,7 @@ =20 #include "qemu/osdep.h" #include "qemu/option.h" +#include "qemu/accel.h" #include "qapi/qmp/qerror.h" #include "sysemu/replay.h" #include "qemu/units.h" diff --git a/include/hw/boards.h b/include/hw/boards.h index 90f1dd3aeb79..f00f74c5f40e 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -6,7 +6,6 @@ #include "exec/memory.h" #include "sysemu/hostmem.h" #include "sysemu/blockdev.h" -#include "qemu/accel.h" #include "qapi/qapi-types-machine.h" #include "qemu/module.h" #include "qom/object.h" --=20 2.38.1 From nobody Sun May 19 09:08:45 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=1671645736; cv=none; d=zohomail.com; s=zohoarc; b=bTE6g68RA8uZYq3BDsmi3eiVC8aJiiDRuKTYU29w9EVycSH7hPZMxfl+X5/qHUD8WP1MYuGjrKPLkGZIOZGdvaEifE8JduUZlQy013LzNz7fqMw1mGV7KysEn+Pn6gnRyUQ/14WmdyaJ7tmqOxJMdkUAIZb56GzAURullj4wOOU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671645736; 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=qEV568ljp5mMfHH8uRbvJL9dTMC1wyo3LHximeavPI0=; b=dLlSW+xW+C27FNhYdkqcc9ywF7BVcY82gJVMSAjmlDS6BxfJdinYcSSfJK0D24KscQ7f3iKt85zTdsnTZxFogcsM70Qr9DSMfrEoRNVDCTCupDlLisXxpfe31Yxhgl2e9pAMEYWIh0QZiwJAukxnUVuGLi11ngwMCAwTHT/2lMs= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1671645736295630.6782450194005; Wed, 21 Dec 2022 10:02:16 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p83Ps-0000Nm-QM; Wed, 21 Dec 2022 13:02:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83Pl-0000It-8S for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:02 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83Pi-0004Ew-4a for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:01:59 -0500 Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-277-QJgf4zW7NdySzQzgP-b2gw-1; Wed, 21 Dec 2022 13:01:54 -0500 Received: by mail-ed1-f69.google.com with SMTP id h8-20020a056402280800b0046af59e0986so12038577ede.22 for ; Wed, 21 Dec 2022 10:01:54 -0800 (PST) Received: from avogadro.local ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id 27-20020a170906309b00b008369cf730e1sm2511299ejv.187.2022.12.21.10.01.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 10:01:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671645717; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qEV568ljp5mMfHH8uRbvJL9dTMC1wyo3LHximeavPI0=; b=XTeSw9e4ZOjmsyh0z6U6XEjLHpEy7q6ZOcJDRZ6y/JaFYBXgpfDaX3WDkJiLL+ArDvjSz6 +QKMICXJV3igHH/TXzFGcn51/V58l2KliZcMTWq/tA143w8TbgX95wCGQ1TGjRJpDts1Wq zKCUu6glceXAgPGsMXwKT7e+UQZXuWA= X-MC-Unique: QJgf4zW7NdySzQzgP-b2gw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qEV568ljp5mMfHH8uRbvJL9dTMC1wyo3LHximeavPI0=; b=A0M2u8nyIMNuZgsS0/lBgsmrXWHNF4OmvXXXuVAma91oqhA+izTQZEyhBKBZMSIokT Lv79AhuKYvcxhfs+nHdZWYwNfdRugs/UPO3UosUCqeOTqaX62B+MWwUGzlyhyVRa4cMp +6lafn+Kb7iyD8HPhHuvmvfHyBN2QDMlnKY29UKhyhM9PPPi19p2LlhiFwZS6GARroOQ XL+IfI9goL+dzcxclitTLzJ9qqG7p46yl5XdCGxlulplRG99qI6X+/t6MFMe9T+TfDm5 8OW4TXKgGN+95ZgfzSfpBts1cP52PRWx6dHcr0LTcejth4H2qJxNLWtn43P5jNlUssWe UYFQ== X-Gm-Message-State: AFqh2kriruXJKG2LQEPVLRwDvvudB0xjlfPJDjV9XW6qKTWqn2bNuirL SzQgNvx5mvZPnJP4J/7fT45Qus1FvsLkyyHnoC9HEbSbPkx3I0h4aa8vcqeb0gPm/hHgIL6Hei4 Wsax0KTNs08w7jgqPFsK11TADtxpAollqlZxJRya12ITVR6Bylt+lUlwv775hdy+oLZU= X-Received: by 2002:a17:906:6bc7:b0:7c1:1bc:7fd4 with SMTP id t7-20020a1709066bc700b007c101bc7fd4mr5654237ejs.42.1671645712810; Wed, 21 Dec 2022 10:01:52 -0800 (PST) X-Google-Smtp-Source: AMrXdXsAtOqHv8BtgZpRPSwST1zjeeLsZfRllq3zD42v7Pfoo6fOLRUyY4TsCE2e4UpVeuVMxYedXA== X-Received: by 2002:a17:906:6bc7:b0:7c1:1bc:7fd4 with SMTP id t7-20020a1709066bc700b007c101bc7fd4mr5654212ejs.42.1671645712590; Wed, 21 Dec 2022 10:01:52 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Greg Kurz Subject: [PULL 03/24] util/log: do not close and reopen log files when flags are turned off Date: Wed, 21 Dec 2022 19:01:20 +0100 Message-Id: <20221221180141.839616-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221221180141.839616-1-pbonzini@redhat.com> References: <20221221180141.839616-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain 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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PP_MIME_FAKE_ASCII_TEXT=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671645737936100003 log_append makes sure that if you turn off the logging (which clears log_flags and makes need_to_open_file false) the old log is not overwritten. The usecase is that if you remove or move the file QEMU will not keep writing to the old file. However, this is not always the desited behavior, in particular having log_append=3D=3D1 after changing the file name makes little sense. When qemu_set_log_internal is called from the logfile monitor command, filename must be non-NULL and therefore changed_name must be true. Therefore, the only case where the file is closed and need_to_open_file =3D=3D false is indeed when log_flags becomes zero. In this case, just flush the file and do not bother closing it, thus faking the same append behavior as previously. The behavioral change is that changing the logfile twice, for example log1 -> log2 -> log1, will cause log1 to be overwritten. This can simply be documented, since it is not a particularly surprising behavior. Suggested-by: Alex Benn=C3=A9e Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson Reviewed-by: Greg Kurz Message-Id: <20221025092119.236224-1-pbonzini@redhat.com> [groug: nullify global_file before actually closing the file] Signed-off-by: Greg Kurz Message-Id: <20221108140032.1460307-2-groug@kaod.org> Signed-off-by: Paolo Bonzini --- util/log.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/util/log.c b/util/log.c index c2198badf240..fb843453dd49 100644 --- a/util/log.c +++ b/util/log.c @@ -45,7 +45,6 @@ static __thread FILE *thread_file; static __thread Notifier qemu_log_thread_cleanup_notifier; =20 int qemu_loglevel; -static bool log_append; static bool log_per_thread; static GArray *debug_regions; =20 @@ -277,19 +276,20 @@ static bool qemu_set_log_internal(const char *filenam= e, bool changed_name, daemonized =3D is_daemonized(); need_to_open_file =3D log_flags && !per_thread && (!daemonized || file= name); =20 - if (logfile && (!need_to_open_file || changed_name)) { - qatomic_rcu_set(&global_file, NULL); - if (logfile !=3D stderr) { + if (logfile) { + fflush(logfile); + if (changed_name && logfile !=3D stderr) { RCUCloseFILE *r =3D g_new0(RCUCloseFILE, 1); r->fd =3D logfile; + qatomic_rcu_set(&global_file, NULL); call_rcu(r, rcu_close_file, rcu); + logfile =3D NULL; } - logfile =3D NULL; } =20 if (!logfile && need_to_open_file) { if (filename) { - logfile =3D fopen(filename, log_append ? "a" : "w"); + logfile =3D fopen(filename, "w"); if (!logfile) { error_setg_errno(errp, errno, "Error opening logfile %s", filename); @@ -308,8 +308,6 @@ static bool qemu_set_log_internal(const char *filename,= bool changed_name, logfile =3D stderr; } =20 - log_append =3D 1; - qatomic_rcu_set(&global_file, logfile); } return true; --=20 2.38.1 From nobody Sun May 19 09:08:45 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=1671645763; cv=none; d=zohomail.com; s=zohoarc; b=Ovdp3p6XkfyyU+KptmsfJE01v+Eqd+y87wkoAHL0z1Y1e8A0FtvguJtnOj98rbMijQ25bfU66l9JEiQle74LWpCuB5pUjA3gPQ2JF52yymfok8zt7+0qJ2zHyzBLYh1TfT7PTNqQ4C2Jc68cYJwHUFaIGJPNbXPcSBQhL1jffVg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671645763; 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=pGruhFN1Ah0Tyzf3f5eAFP8AJR0vYuG7YCmcdclAJus=; b=l8m6ySe86vQp9GIP8Iufyq31b2Xr16JirHiM5uJmnZwGUWt4/QDOExrHOOZL6Vmhvnv1FH8+3R2Hi2ZnvvEEVCrGLRigokk4WV7LrvD946fqNiGnLsNY64H1aZJKHju0G1cRwqz9xlXsuNVBmoyCNGGIJ6upRNZKnvZndKMMGCs= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1671645763582107.8703478183703; Wed, 21 Dec 2022 10:02:43 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p83Py-0000TI-Lt; Wed, 21 Dec 2022 13:02:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83Pn-0000Mx-2P for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:04 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83Pj-0004GO-JN for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:02 -0500 Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-280-B0eLaVIIOs-tdb2q2v-jcw-1; Wed, 21 Dec 2022 13:01:57 -0500 Received: by mail-ed1-f72.google.com with SMTP id y10-20020a056402358a00b0046fc5125069so11910485edc.23 for ; Wed, 21 Dec 2022 10:01:57 -0800 (PST) Received: from avogadro.local ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id v25-20020a170906b01900b007add1c4dadbsm7323491ejy.153.2022.12.21.10.01.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 10:01:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671645718; 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=pGruhFN1Ah0Tyzf3f5eAFP8AJR0vYuG7YCmcdclAJus=; b=UzeS+LlvU45vRT7rKR0FEZKIa3Dr3FfJ74TjqS8aIpC+v6WzY2vQDz1o0qhQh/VF7zMErG EOavXiYY4H+IFXO1bxLvMkuaUTzY+zvCiutl6V/whXY+Js061uUjLx+ygq5/Rc9TZTSipB ZxDLq7AUN22E9hs5nPfdan89S8Pr4eQ= X-MC-Unique: B0eLaVIIOs-tdb2q2v-jcw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pGruhFN1Ah0Tyzf3f5eAFP8AJR0vYuG7YCmcdclAJus=; b=W7sHkUynVZ93Cubw/5XL8lB3V5n2DhaXNiiQsRECu7LKgALVJ3N9Pjx7LV3iVhsne3 NliaAPzWKi7mN+Q/tq5kuxm4XpYUYHg9PZsm3rKiGV7/BzB4xwsIKPhLxp5vGzZu9HTs JHrd6xQ9oMH+5/omQTtQrUeLVaboM1KR8F9CdtooAwosgELLrnxrSDUayXvzaOjvz0rw qEdb1FZDB8hXSXqs7vSJup/TISyV9rIKYqQmsHAWs+g3WvjRXt2qeBqJX8X8g+eOs/Aa 9pQE/5qdkDgnyVkmCkB9jAgVbTSidQ5Htht/g6u9UGuEaav3c3diiV3bWuCE8tdmwyXf VCnA== X-Gm-Message-State: AFqh2kqaEfgRgz9Vc9hdnAzOomEhaOYW6LYTE0gik7fhum6+V0Ga2RIb kCQY3MK5QVnP80gmrDvLHOvQOe6Yvpyiv7VzIeONsWDP+hiynz5PjX5ccaAcelVF5zxhgHhY6JN nx/hVItZKMXJyvBWjzt7PpW+BED19Y0zIKVpjMwRycPN+fzynWGVdgHzvr9BKGysinss= X-Received: by 2002:a17:907:8b17:b0:78d:f454:3856 with SMTP id sz23-20020a1709078b1700b0078df4543856mr2246835ejc.19.1671645715649; Wed, 21 Dec 2022 10:01:55 -0800 (PST) X-Google-Smtp-Source: AMrXdXsYIOWUiZwJZPNDA/I4SWW1arFzAsMyFyHQVw7YhijLHylbMn4D2CHigCmbOrj4TgeO+umHzg== X-Received: by 2002:a17:907:8b17:b0:78d:f454:3856 with SMTP id sz23-20020a1709078b1700b0078df4543856mr2246797ejc.19.1671645715268; Wed, 21 Dec 2022 10:01:55 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Greg Kurz Subject: [PULL 04/24] util/log: Always send errors to logfile when daemonized Date: Wed, 21 Dec 2022 19:01:21 +0100 Message-Id: <20221221180141.839616-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221221180141.839616-1-pbonzini@redhat.com> References: <20221221180141.839616-1-pbonzini@redhat.com> MIME-Version: 1.0 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=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, 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_H2=-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.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671645764177100001 Content-Type: text/plain; charset="utf-8" From: Greg Kurz When QEMU is started with `-daemonize`, all stdio descriptors get redirected to `/dev/null`. This basically means that anything printed with error_report() and friends is lost. Current logging code allows to redirect to a file with `-D` but this requires to enable some logging item with `-d` as well to be functional. Relax the check on the log flags when QEMU is daemonized, so that other users of stderr can benefit from the redirection, without the need to enable unwanted debug logs. Previous behaviour is retained for the non-daemonized case. The logic is unrolled as an `if` for better readability. The qemu_log_level and log_per_thread globals reflect the state we want to transition to at this point : use them instead of the intermediary locals for correctness. qemu_set_log_internal() is adapted to open a per-thread log file when '-d tid' is passed. This is done by hijacking qemu_try_lock() which seems simpler that refactoring the code. Signed-off-by: Greg Kurz Message-Id: <20221108140032.1460307-3-groug@kaod.org> Signed-off-by: Paolo Bonzini --- util/log.c | 72 ++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 53 insertions(+), 19 deletions(-) diff --git a/util/log.c b/util/log.c index fb843453dd49..7837ff991769 100644 --- a/util/log.c +++ b/util/log.c @@ -79,13 +79,15 @@ static int log_thread_id(void) =20 static void qemu_log_thread_cleanup(Notifier *n, void *unused) { - fclose(thread_file); - thread_file =3D NULL; + if (thread_file !=3D stderr) { + fclose(thread_file); + thread_file =3D NULL; + } } =20 /* Lock/unlock output. */ =20 -FILE *qemu_log_trylock(void) +static FILE *qemu_log_trylock_with_err(Error **errp) { FILE *logfile; =20 @@ -96,6 +98,9 @@ FILE *qemu_log_trylock(void) =3D g_strdup_printf(global_filename, log_thread_id()); logfile =3D fopen(filename, "w"); if (!logfile) { + error_setg_errno(errp, errno, + "Error opening logfile %s for thread %d", + filename, log_thread_id()); return NULL; } thread_file =3D logfile; @@ -122,6 +127,11 @@ FILE *qemu_log_trylock(void) return logfile; } =20 +FILE *qemu_log_trylock(void) +{ + return qemu_log_trylock_with_err(NULL); +} + void qemu_log_unlock(FILE *logfile) { if (logfile) { @@ -265,16 +275,21 @@ static bool qemu_set_log_internal(const char *filenam= e, bool changed_name, #endif qemu_loglevel =3D log_flags; =20 - /* - * In all cases we only log if qemu_loglevel is set. - * Also: - * If per-thread, open the file for each thread in qemu_log_lock. - * If not daemonized we will always log either to stderr - * or to a file (if there is a filename). - * If we are daemonized, we will only log if there is a filename. - */ daemonized =3D is_daemonized(); - need_to_open_file =3D log_flags && !per_thread && (!daemonized || file= name); + need_to_open_file =3D false; + if (!daemonized) { + /* + * If not daemonized we only log if qemu_loglevel is set, either to + * stderr or to a file (if there is a filename). + * If per-thread, open the file for each thread in qemu_log_tryloc= k(). + */ + need_to_open_file =3D qemu_loglevel && !log_per_thread; + } else { + /* + * If we are daemonized, we will only log if there is a filename. + */ + need_to_open_file =3D filename !=3D NULL; + } =20 if (logfile) { fflush(logfile); @@ -287,19 +302,34 @@ static bool qemu_set_log_internal(const char *filenam= e, bool changed_name, } } =20 + if (log_per_thread && daemonized) { + logfile =3D thread_file; + } + if (!logfile && need_to_open_file) { if (filename) { - logfile =3D fopen(filename, "w"); - if (!logfile) { - error_setg_errno(errp, errno, "Error opening logfile %s", - filename); - return false; + if (log_per_thread) { + logfile =3D qemu_log_trylock_with_err(errp); + if (!logfile) { + return false; + } + qemu_log_unlock(logfile); + } else { + logfile =3D fopen(filename, "w"); + if (!logfile) { + error_setg_errno(errp, errno, "Error opening logfile %= s", + filename); + return false; + } } /* In case we are a daemon redirect stderr to logfile */ if (daemonized) { dup2(fileno(logfile), STDERR_FILENO); fclose(logfile); - /* This will skip closing logfile in rcu_close_file. */ + /* + * This will skip closing logfile in rcu_close_file() + * or qemu_log_thread_cleanup(). + */ logfile =3D stderr; } } else { @@ -308,7 +338,11 @@ static bool qemu_set_log_internal(const char *filename= , bool changed_name, logfile =3D stderr; } =20 - qatomic_rcu_set(&global_file, logfile); + if (log_per_thread && daemonized) { + thread_file =3D logfile; + } else { + qatomic_rcu_set(&global_file, logfile); + } } return true; } --=20 2.38.1 From nobody Sun May 19 09:08:45 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=1671646181; cv=none; d=zohomail.com; s=zohoarc; b=jQ6b5nn3RBqEd96zxbuEUGtvkIRDjHMrp726L1BlyS3J7b7nZQI5iKaq4FNFSV1fgtw3wrl3NlAVJb7Mdb29UeC29VfO2CYt/rwzbxN/Fu1482C6i4gD+RSD/VgftILkIg+4K1DixRKdUxD3clff05VGvGZIf9ZlDhjXX+gYgZ4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671646181; 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=edX+jDZNKjaZ+u+Si+4u+QIEgjdLUDEnkFgau27MKqA=; b=O41kGGnOjVlHMPj4tHfFUi0KIvqVHQjtOQkzvCfyGhyzuddxQSzPe3UiNfIz4pbPi+CFNOkAMQAJNUxf6rtX0YZHi0toIzltwCpjYmsk5F4yN7GiusZp2S5NnwoGK5wSwanrGoV/G2gIzklrskNyJpmBbFErPzjxK3Aco9ScgqI= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1671646181463153.48079362943554; Wed, 21 Dec 2022 10:09:41 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p83Pz-0000XG-MX; Wed, 21 Dec 2022 13:02:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83Pp-0000Nc-A4 for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:07 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83Pm-0004Gh-RX for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:04 -0500 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-83-tgnDRyIUPK291K5-r7wN1A-1; Wed, 21 Dec 2022 13:02:00 -0500 Received: by mail-ej1-f72.google.com with SMTP id sg39-20020a170907a42700b007c19b10a747so11116787ejc.11 for ; Wed, 21 Dec 2022 10:02:00 -0800 (PST) Received: from avogadro.local ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id c2-20020a17090618a200b008318e6d09easm3337678ejf.103.2022.12.21.10.01.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 10:01:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671645722; 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=edX+jDZNKjaZ+u+Si+4u+QIEgjdLUDEnkFgau27MKqA=; b=dgikEB4Qc1SnwuBRkDtwJAmCcQbi/0UucE8jDvYKfI6LzmxOXDNdi9RM1F/+g4wb3TAH/W EcClVZaI8rx9y+BGcNCQUJedtlGtzv6NyFHQ6EFto/IzeXH7woRes5xXWy8F6i1FQQGQVw who8399KCzUBP2Ks23sVpw/kNEibfQY= X-MC-Unique: tgnDRyIUPK291K5-r7wN1A-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=edX+jDZNKjaZ+u+Si+4u+QIEgjdLUDEnkFgau27MKqA=; b=6slk99kVPyHoiVabdD9nduA+dhoXn5/ovLdfpMa5omwuwkUWtcuaUvgFP6TpBzFRDS Akmpz/lDFVPWUyZ6RyevxtiahP1IlM34sTeqAEWkKAcpXfBkxVM11aUfwtmK5T9J3CQH wdKSZoTjCltV0xnDY+vNDKLtpAkiWdZX/ckNmwinycWoz2Fdu7ASiF9rp7JKVxAoPtEk 99P6xu2tPW/MzNpjj9qagxqyEXbEQXcD8ZpdhtJ83sho9NMtjz00vFOxEXgQAE5oIUog 8kBlBSk2Evz/daxp0ijSuJ+4KNNBLRCoHym6VdqdAA/MDErkVkcKsJX8qsdco6dZIOWq D69A== X-Gm-Message-State: AFqh2kq8xdQ5A3kkAIOk5QwovR0nKicW7a/WhmySYAB6m3cFk7md1qVZ ukZWF6CgG8DflzFPsHpe+GoaGqmdl7cWUGir+mddV5B+UYQcQempvrzrin/QYEz9gsKUD0uqJzg G+40DrYV3XaQMi91XzIk4IUpuhMzkqh8u+lBvn3qxFN3cvSrQFGZqy4N/YTGUPjh+bMI= X-Received: by 2002:a17:907:a707:b0:7c1:75e9:1180 with SMTP id vw7-20020a170907a70700b007c175e91180mr2288647ejc.22.1671645718923; Wed, 21 Dec 2022 10:01:58 -0800 (PST) X-Google-Smtp-Source: AMrXdXueiORvrpcZJS2BdJY40SW+BwE/4Vd5fAGIs22eo2LEGQV6Bi5QS2Y4/+sGKN+ZBAga+8nBJQ== X-Received: by 2002:a17:907:a707:b0:7c1:75e9:1180 with SMTP id vw7-20020a170907a70700b007c175e91180mr2288614ejc.22.1671645718672; Wed, 21 Dec 2022 10:01:58 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Lubomir Rintel Subject: [PULL 05/24] ide: Add 8-bit data mode Date: Wed, 21 Dec 2022 19:01:22 +0100 Message-Id: <20221221180141.839616-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221221180141.839616-1-pbonzini@redhat.com> References: <20221221180141.839616-1-pbonzini@redhat.com> MIME-Version: 1.0 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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, 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_H2=-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.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671646181961100007 Content-Type: text/plain; charset="utf-8" From: Lubomir Rintel CompactFlash uses features 0x01 and 0x81 to enable/disable 8-bit data path. Implement them. Signed-off-by: Lubomir Rintel Message-Id: <20221130120238.706717-1-lkundrak@v3.sk> Signed-off-by: Paolo Bonzini --- hw/ide/core.c | 43 ++++++++++++++++++++++++++++++--------- include/hw/ide/internal.h | 1 + 2 files changed, 34 insertions(+), 10 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index 39afdc0006b9..5d1039378f1d 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -1648,6 +1648,13 @@ static bool cmd_set_features(IDEState *s, uint8_t cm= d) =20 /* XXX: valid for CDROM ? */ switch (s->feature) { + case 0x01: /* 8-bit I/O enable (CompactFlash) */ + case 0x81: /* 8-bit I/O disable (CompactFlash) */ + if (s->drive_kind !=3D IDE_CFATA) { + goto abort_cmd; + } + s->io8 =3D !(s->feature & 0x80); + return true; case 0x02: /* write cache enable */ blk_set_enable_write_cache(s->blk, true); identify_data =3D (uint16_t *)s->identify_data; @@ -2374,12 +2381,20 @@ void ide_data_writew(void *opaque, uint32_t addr, u= int32_t val) } =20 p =3D s->data_ptr; - if (p + 2 > s->data_end) { - return; - } + if (s->io8) { + if (p + 1 > s->data_end) { + return; + } =20 - *(uint16_t *)p =3D le16_to_cpu(val); - p +=3D 2; + *p++ =3D val; + } else { + if (p + 2 > s->data_end) { + return; + } + + *(uint16_t *)p =3D le16_to_cpu(val); + p +=3D 2; + } s->data_ptr =3D p; if (p >=3D s->data_end) { s->status &=3D ~DRQ_STAT; @@ -2401,12 +2416,20 @@ uint32_t ide_data_readw(void *opaque, uint32_t addr) } =20 p =3D s->data_ptr; - if (p + 2 > s->data_end) { - return 0; - } + if (s->io8) { + if (p + 1 > s->data_end) { + return 0; + } =20 - ret =3D cpu_to_le16(*(uint16_t *)p); - p +=3D 2; + ret =3D *p++; + } else { + if (p + 2 > s->data_end) { + return 0; + } + + ret =3D cpu_to_le16(*(uint16_t *)p); + p +=3D 2; + } s->data_ptr =3D p; if (p >=3D s->data_end) { s->status &=3D ~DRQ_STAT; diff --git a/include/hw/ide/internal.h b/include/hw/ide/internal.h index b17f36df957d..fc0aa81a88b9 100644 --- a/include/hw/ide/internal.h +++ b/include/hw/ide/internal.h @@ -402,6 +402,7 @@ struct IDEState { uint8_t select; uint8_t status; =20 + bool io8; bool reset_reverts; =20 /* set for lba48 access */ --=20 2.38.1 From nobody Sun May 19 09:08:45 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=1671646039; cv=none; d=zohomail.com; s=zohoarc; b=BrBKyxLAPkFVJktG2S0Uimex89RI/4/iWb7Biy/KM6A/qb+qVx/Dg7GjHSP4rCOMJbjZvSyVzYCJMM+rydDVz8BRLrXI/zR8xna5nA0RTCsZx6XVVcD7rj9eRRYiHrdLmOGX7N3Fwy1/F7DdL1n/QMdv7XnOjZhTtvp09ALoM2M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671646039; 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=AAE5XBbZPxRtMxJ3gEaAlG9mV4wCpEybbi9pnLU1/nQ=; b=YPVPJcXOuIQ89rxs3jDEaAl4vrvRQcyBF4r7uum0PqG2R/qAppZzBd0bUldmvkgWoMKKEC32R6LMp0Inkm8z+pfhYZ19Aatdr5OrsmcAWbj/a2EdY3AEJ8FqLLoGnJ+d0BbDAuafBOtj2oeKOXC2UT9wU156/EIbNbmMvM+JNXo= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1671646039979963.7033693466225; Wed, 21 Dec 2022 10:07:19 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p83Q2-0000da-Uq; Wed, 21 Dec 2022 13:02:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83Pu-0000SS-Sc for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:10 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83Pr-0004HU-GD for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:09 -0500 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-617-Fx08TasWO6m7tZ56GS1pAg-1; Wed, 21 Dec 2022 13:02:03 -0500 Received: by mail-ej1-f71.google.com with SMTP id xj11-20020a170906db0b00b0077b6ecb23fcso11080859ejb.5 for ; Wed, 21 Dec 2022 10:02:03 -0800 (PST) Received: from avogadro.local ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id sy26-20020a1709076f1a00b007c0b530f3cfsm7370946ejc.72.2022.12.21.10.02.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 10:02:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671645726; 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=AAE5XBbZPxRtMxJ3gEaAlG9mV4wCpEybbi9pnLU1/nQ=; b=G8XmjRAWT4u5lpC6HgHfITEmYD2CrTKqEI+QGTCqUoe3TLLbSHUrPLBz+ezBmnv4nsSoHH XOUSInNKwU36NZxzalFpeklh4WqipoX64AJzb3iKo0IiSlg+OIh3nxQEziYafxJlm+Fi62 QtwXZr2Ld55pnNu69sniMJTyigimEww= X-MC-Unique: Fx08TasWO6m7tZ56GS1pAg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AAE5XBbZPxRtMxJ3gEaAlG9mV4wCpEybbi9pnLU1/nQ=; b=a09N/PRIywKILBORss32nW12HhAD6vEZokh+fcQW4cTuBEx4AQgCLLhL74YjLlP08d 5pE/Qf67PHT0wo5o3nl9Pau8ggWigrvIxOJgipGP0XwMeCONWrJnXQhWPLyn3dz8t+Vb WPuHsizyDmWCAIgZhXyEfmXQIw9tzzsS28S6VkSvNnEwsjcZztpq76jx4TBK5ZekTttC 0FrvgILb8VVc9AM/NbYZ/iqJYiTzqhzIXm+8myxQEm2aUC/Y6nN7kCswbDCv8eQIYp+s a1ZWDSeF5AbXGNPFVQzJVVepezE44UQAs6rcFTCrzDqxyCGnKAobApgK/jr2eE0DVF5Q Dyww== X-Gm-Message-State: AFqh2kribvubu8h2VWvljvIl4GrRkEggwNlhno1fCZZIjwsUVDtfK7FN lPgspnjJ1AvrwbgELFL7JqXviyn9IFWJT/A7Dwt4nbM6oLSuNKsrRCNrFbFYeUlN8swW1YUdtU1 PeWXhOX79MxKXG1Ac4PbDai7dRoJ5mCgV2b+h0oYs40nqPGnmXnVkxnJLTGEAUNs2bPk= X-Received: by 2002:a17:906:6dd4:b0:836:e6f7:8138 with SMTP id j20-20020a1709066dd400b00836e6f78138mr2317854ejt.13.1671645721618; Wed, 21 Dec 2022 10:02:01 -0800 (PST) X-Google-Smtp-Source: AMrXdXtz9NiO98rFIisjcQLy+a33NiFMA8me5RWH/4x2IGqySdM+etozbEHizPLQcs7ff/0Y1FSxeg== X-Received: by 2002:a17:906:6dd4:b0:836:e6f7:8138 with SMTP id j20-20020a1709066dd400b00836e6f78138mr2317833ejt.13.1671645721348; Wed, 21 Dec 2022 10:02:01 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Lubomir Rintel Subject: [PULL 06/24] ide: Add "ide-cf" driver, a CompactFlash card Date: Wed, 21 Dec 2022 19:01:23 +0100 Message-Id: <20221221180141.839616-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221221180141.839616-1-pbonzini@redhat.com> References: <20221221180141.839616-1-pbonzini@redhat.com> MIME-Version: 1.0 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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, 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_H2=-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.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671646042598100004 Content-Type: text/plain; charset="utf-8" From: Lubomir Rintel This allows attaching IDE_CFATA device to an IDE bus. Behaves like a CompactFlash card in True IDE mode. Tested with: qemu-system-i386 \ -device driver=3Dide-cf,drive=3Dcf,bus=3Dide.0 \ -drive id=3Dcf,index=3D0,format=3Draw,if=3Dnone,file=3Dcf.img Signed-off-by: Lubomir Rintel Message-Id: <20221130120319.706885-1-lkundrak@v3.sk> Signed-off-by: Paolo Bonzini --- hw/ide/qdev.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c index 618045b85ace..6f6c7462f3b6 100644 --- a/hw/ide/qdev.c +++ b/hw/ide/qdev.c @@ -283,6 +283,11 @@ static void ide_cd_realize(IDEDevice *dev, Error **err= p) ide_dev_initfn(dev, IDE_CD, errp); } =20 +static void ide_cf_realize(IDEDevice *dev, Error **errp) +{ + ide_dev_initfn(dev, IDE_CFATA, errp); +} + #define DEFINE_IDE_DEV_PROPERTIES() \ DEFINE_BLOCK_PROPERTIES(IDEDrive, dev.conf), \ DEFINE_BLOCK_ERROR_PROPERTIES(IDEDrive, dev.conf), \ @@ -341,6 +346,32 @@ static const TypeInfo ide_cd_info =3D { .class_init =3D ide_cd_class_init, }; =20 +static Property ide_cf_properties[] =3D { + DEFINE_IDE_DEV_PROPERTIES(), + DEFINE_BLOCK_CHS_PROPERTIES(IDEDrive, dev.conf), + DEFINE_PROP_BIOS_CHS_TRANS("bios-chs-trans", + IDEDrive, dev.chs_trans, BIOS_ATA_TRANSLATION_AUTO), + DEFINE_PROP_END_OF_LIST(), +}; + +static void ide_cf_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + IDEDeviceClass *k =3D IDE_DEVICE_CLASS(klass); + + k->realize =3D ide_cf_realize; + dc->fw_name =3D "drive"; + dc->desc =3D "virtual CompactFlash card"; + device_class_set_props(dc, ide_cf_properties); +} + +static const TypeInfo ide_cf_info =3D { + .name =3D "ide-cf", + .parent =3D TYPE_IDE_DEVICE, + .instance_size =3D sizeof(IDEDrive), + .class_init =3D ide_cf_class_init, +}; + static void ide_device_class_init(ObjectClass *klass, void *data) { DeviceClass *k =3D DEVICE_CLASS(klass); @@ -365,6 +396,7 @@ static void ide_register_types(void) type_register_static(&ide_bus_info); type_register_static(&ide_hd_info); type_register_static(&ide_cd_info); + type_register_static(&ide_cf_info); type_register_static(&ide_device_type_info); } =20 --=20 2.38.1 From nobody Sun May 19 09:08:45 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=1671645896; cv=none; d=zohomail.com; s=zohoarc; b=X1+mOFmKN7jOooDybSGNxHZDvIhRd9xo6lvjWEf6ynD9+2nhmix4B3qKoF7tJPuC/JsK1nP75ByYWd0701tPHwfsZrR4iUQ3rlVjBui4H9iL3Wyquea+iLYGK4QFtMenn2gVTamCk1Qk6a7ZL37hqqF+Ir+Ym8TcsorfWNTctwo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671645896; 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=TjIqmIDz3cwBtIFP4+iRCGiKOecOxAf7+zbIUuPQ+rg=; b=M7oNh4drW0nGwzB1WTzaxNPAjiLe1N6AR508CtvlsGp3pTDLwA8MRBedByULt48VpFaqjFEnXeTslAp0W8qtCPDc5ejam/lULVHpkbzfUTWZUFuXqZjtTv0twtEsCYUV9k53wCkHutynQeqpmXi3joy2XemjrPKC6FcAFDcN5ME= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1671645896903658.8756676088226; Wed, 21 Dec 2022 10:04:56 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p83Q1-0000bD-MQ; Wed, 21 Dec 2022 13:02:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83Py-0000UH-Qk for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:15 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83Pw-0004Hp-LX for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:13 -0500 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-378-zXeq0gzgPQyGdXGwBOGiZQ-1; Wed, 21 Dec 2022 13:02:05 -0500 Received: by mail-ej1-f71.google.com with SMTP id qf33-20020a1709077f2100b007c155ab74e9so11111958ejc.18 for ; Wed, 21 Dec 2022 10:02:05 -0800 (PST) Received: from avogadro.local ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id r17-20020a17090609d100b007c176597b55sm7398833eje.37.2022.12.21.10.02.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 10:02:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671645730; 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=TjIqmIDz3cwBtIFP4+iRCGiKOecOxAf7+zbIUuPQ+rg=; b=JwTRVTPfqklZ3S1PRd7QaaqniLIXF1WDSn2iMdHnViMp8XYjtWeueAi/zS540VyV09Rz6B HpHYQbiQac+h6K9oGW1ig7CbBWqVagKuO6Cu1aDgmYiZvybiy79B3u0kz7+klJSu5fL93l hlfPLMVwSYg/1eaUJwDalKqvaCq1BGU= X-MC-Unique: zXeq0gzgPQyGdXGwBOGiZQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TjIqmIDz3cwBtIFP4+iRCGiKOecOxAf7+zbIUuPQ+rg=; b=lU5IE2Y5HiNBjd7+1NhwQIr423oBa1i9l+358ZLSf3ywAJW9CwXU54hZL5efBdLQT0 ub1vX4LcxQvIIsZdev99bSBrTuR9RL+DLjk1ICa3B776f0SeE07OysEDGzVdNJ7Lx75g qIHDxZuiWi94I2lcw/ae8XY+wcBgCezwEm6XuCJCv6lVnsIm04rvahJ+b9FVFTf9o4jf bGJ2QL1+POCqx1A2pbNmT1XoauJz8XljAcMqiRC2V3tnEqS3wqMpNXB+vN2n3KY7oTO4 X6+AtY2Pdc/8oXL/tqIhYDgVL66KIQDforwHIaCg5F9aInokh3Mmw7e+N0ok0Bq7rVH3 T9kA== X-Gm-Message-State: AFqh2kppqaVCYemlRCKVYl5kTA7xCWHBsPQmQlsDJd8uCyh5+Tl88gh8 GGIArtVgJDFpQKBSIFdeSZJ8phDf+/5UACyrbfY1UuxZQ8v2BsFhz3NRIQUxfCz2XQYSwXJXThZ FuFKPGtraRjhlS7PpEdHpp7PNhBQ6j6XyQ+mYXxgghaXqBh20Lwc81n4aSEGgTaH2B5s= X-Received: by 2002:a17:907:ca0a:b0:7c0:eb35:b3f9 with SMTP id uk10-20020a170907ca0a00b007c0eb35b3f9mr2003733ejc.30.1671645724117; Wed, 21 Dec 2022 10:02:04 -0800 (PST) X-Google-Smtp-Source: AMrXdXsy9Jv+0k257fSw1UJLoXLA0K39CWBYh0/tKTTsvQp/cq+xW4GUBpYGL2bAsAF02YqU0OvxLA== X-Received: by 2002:a17:907:ca0a:b0:7c0:eb35:b3f9 with SMTP id uk10-20020a170907ca0a00b007c0eb35b3f9mr2003717ejc.30.1671645723937; Wed, 21 Dec 2022 10:02:03 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Peter Maydell Subject: [PULL 07/24] configure: remove useless write_c_skeleton Date: Wed, 21 Dec 2022 19:01:24 +0100 Message-Id: <20221221180141.839616-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221221180141.839616-1-pbonzini@redhat.com> References: <20221221180141.839616-1-pbonzini@redhat.com> MIME-Version: 1.0 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=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, 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_H2=-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.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671645898103100003 Content-Type: text/plain; charset="utf-8" This is not needed ever since QEMU stopped detecting -liberty; this happened with the Meson switch but it is quite likely that the library was not really necessary years before. Reviewed-by: Peter Maydell Signed-off-by: Paolo Bonzini --- configure | 1 - 1 file changed, 1 deletion(-) diff --git a/configure b/configure index 26c7bc515468..e31d4522ea63 100755 --- a/configure +++ b/configure @@ -638,7 +638,6 @@ if test "$mingw32" =3D "yes" ; then EXESUF=3D".exe" # MinGW needs -mthreads for TLS and macro _MT. CONFIGURE_CFLAGS=3D"-mthreads $CONFIGURE_CFLAGS" - write_c_skeleton; prefix=3D"/qemu" bindir=3D"" qemu_suffix=3D"" --=20 2.38.1 From nobody Sun May 19 09:08:45 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=1671645750; cv=none; d=zohomail.com; s=zohoarc; b=U2P5myDBNVwpt76PdHoE/y9kwvIJaZ6+5kPyGtw9dMl9p/bvPMF9DwARml7SqZ8rJNb7PAcnUyJdIJ2fn9GLn99x8Rgqz9Fg+cZu8XqGBvd18qxj1bxOtBwEdqCpL49CknIdAScetABi4PAYpkhS/09chBEsb1hOwSEb0TxEddA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671645750; 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=1DU2lyk4LUD+vcQqslLA9QT+Gbzjf3xmugA48H80Os8=; b=awdZ+fdDAAcn26Ycw3rJ4+gvYHTCJYf5CzGouDmBBO6cZVfsPoRO9KLBkTrTftZVR5wWgxPAhkIx9OtBE3EKy1xtz/QTzDIBSSISLP9wMM4ElBgf1hZHoQU/tT8Lnthr5MBdwHmjd08jkccwHxebLUtQ0tud99k0/P9PCeSwZ6E= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1671645750788749.1369358013857; Wed, 21 Dec 2022 10:02:30 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p83Q2-0000dX-V4; Wed, 21 Dec 2022 13:02:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83Pw-0000TM-TJ for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:13 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83Pu-0004Hg-KK for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:11 -0500 Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-674-NZO9H4ReOuq5iLgPIv3Ykg-1; Wed, 21 Dec 2022 13:02:08 -0500 Received: by mail-ed1-f71.google.com with SMTP id r14-20020a05640251ce00b0047d67ab2019so2805713edd.12 for ; Wed, 21 Dec 2022 10:02:08 -0800 (PST) Received: from avogadro.local ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id a22-20020a170906671600b007806c1474e1sm7279427ejp.127.2022.12.21.10.02.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 10:02:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671645729; 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=1DU2lyk4LUD+vcQqslLA9QT+Gbzjf3xmugA48H80Os8=; b=MLEpvNPpQnfbe5JNT9CCDJqP/SXA7ihdJkoSbugckrpatYOfGgOO0fhCsh/MwWsRJo+6gF PMhCHYs8vI90/ginHSjZCVeyTBHwLac9bPp2BqxiO6kbsHW7KwGSht2Oz86+Bz8v2bhFjR /vGO/ULGKxvSRXcMApjdcc0eLcRcFAU= X-MC-Unique: NZO9H4ReOuq5iLgPIv3Ykg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1DU2lyk4LUD+vcQqslLA9QT+Gbzjf3xmugA48H80Os8=; b=5r+j//UDalorGWbabZgSAE6P+vtPTQ8W7G+Y3F4opKUXZSpryj1m17xHtHY4Zvt0Zx l/fSaTtis6XqWKJzarP7FuEi5ALux5durB8LYPZywHdsDiu8d44kBrmOFS0LAl1isIQP 8RGhr4E492LLUwSBAt9Ojvdz1xGIiw7J9aVFYePj30BGXZVP9Kx3jTHtiRIUq7/f+N1J yK5KIMppqcKoSn8bh6wZUYAibvuUn5Ep4xpKcyTe0wAckSQxAJqrVfwSam5lmFBTz0Hq GR52/JBe1hNf0ZNQLwu+aiYOSzUCqK/BUA2NmnqXJO+hYP0Cl7IkV8vLKT7yz9jmwCZt oV6w== X-Gm-Message-State: AFqh2kqO3o2JCIGM4XI7OQEAWWbk2L5yE1EqQBYyDp6Bn6rK8/kmQwcy +B5U8By2gxjfAG8KsHfa9fl/RWQgzOvjohFbFv08KLZnbiOAxg50o9pWfe2elDgeadlnrjft5lA s+7T+gBFp2A16B5tTEiP3FlgZzCGCx5FtmSPH2eP45C0FQW/aASUO4ht00xwOPCVCXNo= X-Received: by 2002:a17:906:6d97:b0:78d:f455:c386 with SMTP id h23-20020a1709066d9700b0078df455c386mr2299473ejt.44.1671645726631; Wed, 21 Dec 2022 10:02:06 -0800 (PST) X-Google-Smtp-Source: AMrXdXvWLMTMBRRX8rBJcPFXvDBFxUeLZodhuFAq7+L7l4HGHdxPuLaR5e1itWcWQxl0mKkJbSI8zQ== X-Received: by 2002:a17:906:6d97:b0:78d:f455:c386 with SMTP id h23-20020a1709066d9700b0078df455c386mr2299453ejt.44.1671645726462; Wed, 21 Dec 2022 10:02:06 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Peter Maydell Subject: [PULL 08/24] configure: remove dead function Date: Wed, 21 Dec 2022 19:01:25 +0100 Message-Id: <20221221180141.839616-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221221180141.839616-1-pbonzini@redhat.com> References: <20221221180141.839616-1-pbonzini@redhat.com> MIME-Version: 1.0 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=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, 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_H2=-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.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671645752007100001 Content-Type: text/plain; charset="utf-8" Reviewed-by: Peter Maydell Signed-off-by: Paolo Bonzini --- configure | 4 ---- 1 file changed, 4 deletions(-) diff --git a/configure b/configure index e31d4522ea63..543fd5a48bf0 100755 --- a/configure +++ b/configure @@ -210,10 +210,6 @@ version_ge () { done } =20 -glob() { - eval test -z '"${1#'"$2"'}"' -} - if printf %s\\n "$source_path" "$PWD" | grep -q "[[:space:]:]"; then error_exit "main directory cannot contain spaces nor colons" --=20 2.38.1 From nobody Sun May 19 09:08:45 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=1671646313; cv=none; d=zohomail.com; s=zohoarc; b=YcXEfpnMpYQ45LktGJLz4/nT2QbiPCJ6AmTWaHwysrw6tp3iyyHkzjGuTVCaoemeBNn2FaurtdYGN709hIHMQxdQQVW8pLMWBQ+8l+OkGoKZmbnwcLgP5FyAYm2MaAItJOkhcKaMbLJi9Zf0WilMC2eY4eykCQfxF7EWO9PsyCQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671646313; 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=PBODSe+9wJNvncsm+Vv6BK3PHV793OAwINbgAu0jenE=; b=K/4wP/i59ikLy3AgLyGrUddTi1pRU9I9Koe7uaT+qF4ENRuADVLYJxWjAe9ykWlx1XMDuE9O+BTgzLmTwQG4StLIWy9gc0QA+TzHGN+I1FfTAEJ1i0Qrj7ENDdR6/otDlnxvyvMnBVtiitojhndjfCvqXrAyv3eEb+DU0fQlawQ= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1671646313868112.43125775019621; Wed, 21 Dec 2022 10:11:53 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p83Q7-0000n1-R2; Wed, 21 Dec 2022 13:02:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83Q0-0000Z2-0y for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:16 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83Px-0004JG-Aa for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:15 -0500 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-342-AioF3VgGMCqu_KJ0NuvYsg-1; Wed, 21 Dec 2022 13:02:11 -0500 Received: by mail-ej1-f69.google.com with SMTP id hq42-20020a1709073f2a00b007c100387d64so10985553ejc.3 for ; Wed, 21 Dec 2022 10:02:10 -0800 (PST) Received: from avogadro.local ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id ku13-20020a170907788d00b00837ac146a53sm2340571ejc.23.2022.12.21.10.02.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 10:02:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671645732; 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=PBODSe+9wJNvncsm+Vv6BK3PHV793OAwINbgAu0jenE=; b=QOxU6Izj89t4W45+5MpYNxQMulfIP5T0i8r4yjTO3aAyFzLQuoFU1IpvMs3HHI3iCRocgY 3iCkRCsQev45T/jflyVF6EiXDKGTZft2qyj3/sezZdRt7Czq9gLm7SBFFm/lE1+jeCiy+5 J1rH/7OycOcJVjP7Gi6RIrgiuFzFpok= X-MC-Unique: AioF3VgGMCqu_KJ0NuvYsg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PBODSe+9wJNvncsm+Vv6BK3PHV793OAwINbgAu0jenE=; b=mapDbGPyFVCVMZR+H5H1Nyj4Rpo6npXSVKxaH2ZI+Wrxwr0A/fKgmeh30lPemUcINc Kj3feYoWhyeO1yJNzxXuY8HzAbBQCar+KDWINDRcvFWsPMVnb08fB8JnJqmJDeHNgwPm sHe3XG91uU9xfwr5LpZ9RWnyMZw94l9e/fvTpxgkKvio5SA7pWd/ywguknuuakmVtZUW Bw3U677NTk/+JQLK5791XZ9pJuf8oXGzi0xX8SwsqULsVnu271N4fnk74bBGCe+CuW0s 0N1FzvYqMRBY5XBhULXfsHSq33qT89wnXNf7FRfU5UXCOMIA1/Pr0+sZI0OLyiWCtfNV w5lA== X-Gm-Message-State: AFqh2ko8C5qtqAn7/nXRbQU6Wb5Q3Bxy6m1p97FAPBeW1USLjtZ9/11y FbaRcgmEqOr7kCZ3JS3kjqaNEBOAZi3s2l8ik7BOKmR0aGc8GbUeQ7ZNWiWUcpg54hFD0+uaJUI K4BjOvHkc6LQfW02N4EiPpVgKCkMgqG9GpBwwkW6O1Ed9uwQtk5yL7IkwzauljVWRn+w= X-Received: by 2002:a17:906:430a:b0:7c1:54b9:c688 with SMTP id j10-20020a170906430a00b007c154b9c688mr1942919ejm.60.1671645729317; Wed, 21 Dec 2022 10:02:09 -0800 (PST) X-Google-Smtp-Source: AMrXdXsJNgwsqp1jFzJC3MHWlPHkiMJnv2kahc90+RGtkKXlqeEbUFgbn7g8hiMKRosYo8iXh5/O/A== X-Received: by 2002:a17:906:430a:b0:7c1:54b9:c688 with SMTP id j10-20020a170906430a00b007c154b9c688mr1942891ejm.60.1671645729016; Wed, 21 Dec 2022 10:02:09 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Peter Maydell Subject: [PULL 09/24] configure: cleanup $cpu tests Date: Wed, 21 Dec 2022 19:01:26 +0100 Message-Id: <20221221180141.839616-10-pbonzini@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221221180141.839616-1-pbonzini@redhat.com> References: <20221221180141.839616-1-pbonzini@redhat.com> MIME-Version: 1.0 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=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, 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_H2=-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.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671646314802100001 Content-Type: text/plain; charset="utf-8" $cpu is derived from preprocessor defines rather than uname these days, so do not bother using isainfo on Solaris. Likewise do not recognize BeOS's uname -m output. Keep the other, less OS-specific canonicalizations for the benefit of people using --cpu. Reviewed-by: Peter Maydell Signed-off-by: Paolo Bonzini --- configure | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/configure b/configure index 543fd5a48bf0..9cbbeaa269d1 100755 --- a/configure +++ b/configure @@ -337,9 +337,6 @@ for opt do ;; esac done -# OS specific -# Using uname is really, really broken. Once we have the right set of che= cks -# we can eliminate its usage altogether. =20 # Preferred compiler: # ${CC} (if set) @@ -489,13 +486,6 @@ sunos) QEMU_CFLAGS=3D"-D_XOPEN_SOURCE=3D600 $QEMU_CFLAGS" # needed for TIOCWIN* defines in termios.h QEMU_CFLAGS=3D"-D__EXTENSIONS__ $QEMU_CFLAGS" - # $(uname -m) returns i86pc even on an x86_64 box, so default based on i= sainfo - # Note that this check is broken for cross-compilation: if you're - # cross-compiling to one of these OSes then you'll need to specify - # the correct CPU with the --cpu option. - if test -z "$cpu" && test "$(isainfo -k)" =3D "amd64"; then - cpu=3D"x86_64" - fi ;; haiku) pie=3D"no" @@ -550,16 +540,21 @@ elif check_define __aarch64__ ; then elif check_define __loongarch64 ; then cpu=3D"loongarch64" else + # Using uname is really broken, but it is just a fallback for architectu= res + # that are going to use TCI anyway cpu=3D$(uname -m) + echo "WARNING: unrecognized host CPU, proceeding with 'uname -m' output = '$cpu'" fi =20 -# Normalise host CPU name, set multilib cflags +# Normalise host CPU name and set multilib cflags. The canonicalization +# isn't really necessary, because the architectures that we check for +# should not hit the 'uname -m' case, but better safe than sorry. # Note that this case should only have supported host CPUs, not guests. case "$cpu" in armv*b|armv*l|arm) cpu=3D"arm" ;; =20 - i386|i486|i586|i686|i86pc|BePC) + i386|i486|i586|i686) cpu=3D"i386" CPU_CFLAGS=3D"-m32" ;; x32) --=20 2.38.1 From nobody Sun May 19 09:08:45 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=1671646337; cv=none; d=zohomail.com; s=zohoarc; b=cc5RUtebWc8P9sL+6e2mdhg7OJlFFVFf8UFFP5pSy1Yffsdo1YPs4b8GVNAb29v1R57x8KY5f6W4zwlUjHprrYlzO5WGjsg1QxYZY6ML14PxclL/U7ZuhwoCiNd0+8UZ0CexZfmgv2V4pBpnKyYiG44c4NxsAk1lGTsOc9YVqVY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671646337; 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=3+/09ynFcBHA4MWVO2yoREd4a+0CntG42IHNkNDsO8s=; b=Ssgod7EQ255Ef28oEFzp7n0ACDQZisu2nq0BMH7eBbZJpl/zedOmDGsFSbC5Y1XzH0S+MXTgs6ws/S384LtAk2OGS7/LlsGljBLNW9hBDk1Dm/Y8bE1iRE19q/Iz6d5DS3VR9HwjuebigVW4rNvlyM9NmNg7ZBu5ED2oGrfLt2o= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1671646337626474.54540319251964; Wed, 21 Dec 2022 10:12:17 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p83Q3-0000eZ-90; Wed, 21 Dec 2022 13:02:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83Q1-0000bF-Li for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:17 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83Q0-0004JU-0M for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:17 -0500 Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-9-J4zxJ0KROka7CEt8UsfmYw-1; Wed, 21 Dec 2022 13:02:13 -0500 Received: by mail-ed1-f71.google.com with SMTP id h8-20020a056402280800b0046af59e0986so12039252ede.22 for ; Wed, 21 Dec 2022 10:02:13 -0800 (PST) Received: from avogadro.local ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id r22-20020aa7cb96000000b0045726e8a22bsm7246090edt.46.2022.12.21.10.02.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 10:02:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671645735; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3+/09ynFcBHA4MWVO2yoREd4a+0CntG42IHNkNDsO8s=; b=WQbEM9en/8B0CQyRmpjX+XH+U8rF39qcuCtaMAJI0XCOVuxAhwXkBSLfoCrp+gowsl8WA0 8wLoWsEgy65XuGqcfH8ZmPMUobZ4dGjE6+4CZj2rayvCUuqkp2STmC9jm0+CfBMOiJ4/FJ AOWC2FpvrTHK16cTGi24CAtgoGMmvGg= X-MC-Unique: J4zxJ0KROka7CEt8UsfmYw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3+/09ynFcBHA4MWVO2yoREd4a+0CntG42IHNkNDsO8s=; b=g0kUC0IUQb9tzi1/xOU1cnsm0GGBtdTq+1AMmcl8sPTnCbkCMTpZmnv9DVatIsICsD vgxZ/JfZPIKXp1Dft/VTg+VqoYgrkNF06YcsNzCWXoTiyqi1JndY1FTQ5RoagmQExTRi yuvS1UOhJAd//6RbCtaIttuPxZOWjH5Py6ZoEn/Lrlc/DUQ05ylKZMuJDI1GO+Ttn1eH T1i5LEh4L6cLL3+7r/uA8R5CSGFBFWoO5z61baB9VGg2GA+wnLQDMyfW03Bpr0UggnHW u4c/kQ1FOA1Vtyzax0pdAjdXtqWJ+QtKqarfqGtyNj7rbzjnrxlQpIMWzpmFXHCgPGMX Sg9g== X-Gm-Message-State: AFqh2ko3oG7jQZ9JpkNnrXvKEihPQca8YK/KoP+1azANDTg5GZlvKKsH FdGoiwT8GNcNBGs10Z1FYMtiVS89vvYVtRainyI21d5BrdV+iImJsTaOhRYTddHkq3LNSmoI6TP qjUE7Rl2CfYrHfOxPBz7NjV+BdutL2pIvv8lJzAacQnlJMyAHhR6kwid3qnLV0vBK6DQ= X-Received: by 2002:a05:6402:1948:b0:470:1f1:257a with SMTP id f8-20020a056402194800b0047001f1257amr2455613edz.25.1671645732118; Wed, 21 Dec 2022 10:02:12 -0800 (PST) X-Google-Smtp-Source: AMrXdXsdHKUZ54pb9sJq6BVWZm3WZ+CbSPYpBWyc2vOk8gqORJw4wGelEXDAgxoUGs9i+1ggZHvKkA== X-Received: by 2002:a05:6402:1948:b0:470:1f1:257a with SMTP id f8-20020a056402194800b0047001f1257amr2455581edz.25.1671645731860; Wed, 21 Dec 2022 10:02:11 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 10/24] configure: preserve qemu-ga variables Date: Wed, 21 Dec 2022 19:01:27 +0100 Message-Id: <20221221180141.839616-11-pbonzini@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221221180141.839616-1-pbonzini@redhat.com> References: <20221221180141.839616-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain 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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PP_MIME_FAKE_ASCII_TEXT=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671646338781100001 Ensure that qemu-ga variables set at configure time are kept later when the script is rerun. For preserve_env to work, the variables need to be empty so move the default values to config-host.mak generation. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- configure | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/configure b/configure index 9cbbeaa269d1..4958ac99bcef 100755 --- a/configure +++ b/configure @@ -2227,20 +2227,6 @@ if test "$have_ubsan" =3D "yes"; then QEMU_LDFLAGS=3D"-fsanitize=3Dundefined $QEMU_LDFLAGS" fi =20 -########################################## -# Guest agent Windows MSI package - -if test "$QEMU_GA_MANUFACTURER" =3D ""; then - QEMU_GA_MANUFACTURER=3DQEMU -fi -if test "$QEMU_GA_DISTRO" =3D ""; then - QEMU_GA_DISTRO=3DLinux -fi -if test "$QEMU_GA_VERSION" =3D ""; then - QEMU_GA_VERSION=3D$(cat "$source_path"/VERSION) -fi - - ####################################### # cross-compiled firmware targets =20 @@ -2336,9 +2322,9 @@ if test "$debug_tcg" =3D "yes" ; then fi if test "$mingw32" =3D "yes" ; then echo "CONFIG_WIN32=3Dy" >> $config_host_mak - echo "QEMU_GA_MANUFACTURER=3D${QEMU_GA_MANUFACTURER}" >> $config_host_mak - echo "QEMU_GA_DISTRO=3D${QEMU_GA_DISTRO}" >> $config_host_mak - echo "QEMU_GA_VERSION=3D${QEMU_GA_VERSION}" >> $config_host_mak + echo "QEMU_GA_MANUFACTURER=3D${QEMU_GA_MANUFACTURER-QEMU}" >> $config_ho= st_mak + echo "QEMU_GA_DISTRO=3D${QEMU_GA_DISTRO-Linux}" >> $config_host_mak + echo "QEMU_GA_VERSION=3D${QEMU_GA_VERSION-$(cat "$source_path"/VERSION)}= " >> $config_host_mak else echo "CONFIG_POSIX=3Dy" >> $config_host_mak fi @@ -2652,6 +2638,9 @@ preserve_env PKG_CONFIG preserve_env PKG_CONFIG_LIBDIR preserve_env PKG_CONFIG_PATH preserve_env PYTHON +preserve_env QEMU_GA_MANUFACTURER +preserve_env QEMU_GA_DISTRO +preserve_env QEMU_GA_VERSION preserve_env SDL2_CONFIG preserve_env SMBD preserve_env STRIP --=20 2.38.1 From nobody Sun May 19 09:08:45 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=1671646287; cv=none; d=zohomail.com; s=zohoarc; b=nLwPKrTSOhVqFgn3j//XN06Ta8pej05yZTGF5A+8LpIA64q9AoHquS4RlY2buoRqI2o2UWxpGBs/9oVVpjRpLScBZfvQgbYHFvX2w4PJ+fINitvwLt8z3u7YbDk+R8KJ/C7EBkWC9QNJTQnKf+1PLe6I8fDO72WkInbGuyUg+70= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671646287; 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=Wyr5JrWTZ0YvqwA7HlA5lc+mTPvzQE5kv1C6a+Lq9oQ=; b=bHXYLmWLQe6ZBCzSsYsAqMfUYs4Ij5u03qmX58gcwpVB/M8WzhnZ56AnqtKwW2Bf0StSLKP0FPtfoo3W0ccYsepibfcX2Sj6C4C6askbJ7ynF0IQBmQ6T0XNJYbgYyNx5z6WNdN1v1H9VIrYpQklpttsCZ42dIeKaEe8qoW6v/8= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1671646287622655.7055477253559; Wed, 21 Dec 2022 10:11:27 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p83Q7-0000mt-Qq; Wed, 21 Dec 2022 13:02:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83Q4-0000j5-Ah for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:20 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83Q2-0004Jq-Q7 for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:20 -0500 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-527-ebCXXKUzPoufI4ATuijf9g-1; Wed, 21 Dec 2022 13:02:16 -0500 Received: by mail-ej1-f72.google.com with SMTP id xh12-20020a170906da8c00b007413144e87fso11079319ejb.14 for ; Wed, 21 Dec 2022 10:02:15 -0800 (PST) Received: from avogadro.local ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id cf25-20020a0564020b9900b0045b4b67156fsm7349998edb.45.2022.12.21.10.02.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 10:02:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671645738; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Wyr5JrWTZ0YvqwA7HlA5lc+mTPvzQE5kv1C6a+Lq9oQ=; b=EtvSvOFMadOFWaOx90JXjdf2b8t6m/J2MBEE28Ii5W51CtIJDhFFmyq2dNs/8Wnsp+/4pB xjsnyPc6foCrjvU5liFww8uQwZ9kSpVYU9iTpKEbvjVsVHpyMQWz7md0pF2RV5Scn/BUA1 /rBjqR0dgC0D/xeYjMZlFalMJSdvjDA= X-MC-Unique: ebCXXKUzPoufI4ATuijf9g-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Wyr5JrWTZ0YvqwA7HlA5lc+mTPvzQE5kv1C6a+Lq9oQ=; b=zOpm6m8RVH7fdCyLKndp5peRbA+lBhiV5A5L3Qunrgv/LZGwIdrBzRGd3+cMQvi6P7 +yk2SrfEr0tRNXTJ2D0RfIJ76CoY8LKMoE5s8IQaaobSViDRKvCW2mxa0vGQ8MvKLRv+ 7SdoyzPnXkDKa0sGsmnEMlmiObw3r45KU6LnFf/bYumSL5Cjio4gMtl6i21TFnsEQewE mu2USWi6f7cYzaAyL4G8+cVrCc207h865GEauz+V3idOrR0nu8pWB7p1OO7eDS2dvzmz ijK3udF3JG7ru0AZvrYiC1jxMJMoJVU3qChx3MpJbsFvKpRBSW6k06JMihohp/CRnuI7 Ov2A== X-Gm-Message-State: AFqh2kq47vt7ERHfCTjhtx6BKHuKw/LTI7em9T0GDNSvcCSGBqMsuyI/ fu9QUWEk8HMBI/0Oq/XqrtgUTC+bcEV6NFQFj/Us384fCNWlOpwwSYGeBBaPCkAzhtz5m+clV+g E3hYCxCPbuu8A96oCVLVoEzPJ3Nlderx27IkhtZVnhZ3X/VUERLOR3qMITb0odiXjd/c= X-Received: by 2002:aa7:d3d9:0:b0:46b:1715:e64 with SMTP id o25-20020aa7d3d9000000b0046b17150e64mr5291152edr.18.1671645734683; Wed, 21 Dec 2022 10:02:14 -0800 (PST) X-Google-Smtp-Source: AMrXdXvBzyFozc6ShaeNNmUzpTLsRjJxh2VpcKI4UX5QRDCGlzHk+C9G1Aw5fyhzp3Khq0ZdGTe5rA== X-Received: by 2002:aa7:d3d9:0:b0:46b:1715:e64 with SMTP id o25-20020aa7d3d9000000b0046b17150e64mr5291136edr.18.1671645734447; Wed, 21 Dec 2022 10:02:14 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 11/24] configure: remove backwards-compatibility and obsolete options Date: Wed, 21 Dec 2022 19:01:28 +0100 Message-Id: <20221221180141.839616-12-pbonzini@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221221180141.839616-1-pbonzini@redhat.com> References: <20221221180141.839616-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain 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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PP_MIME_FAKE_ASCII_TEXT=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671646288564100001 Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- configure | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/configure b/configure index 4958ac99bcef..0667dde1654c 100755 --- a/configure +++ b/configure @@ -843,17 +843,6 @@ for opt do ;; --with-coroutine=3D*) coroutine=3D"$optarg" ;; - --disable-zlib-test) - ;; - --disable-virtio-blk-data-plane|--enable-virtio-blk-data-plane) - echo "$0: $opt is obsolete, virtio-blk data-plane is always on" >&2 - ;; - --enable-vhdx|--disable-vhdx) - echo "$0: $opt is obsolete, VHDX driver is always built" >&2 - ;; - --enable-uuid|--disable-uuid) - echo "$0: $opt is obsolete, UUID support is always built" >&2 - ;; --with-git=3D*) git=3D"$optarg" ;; --with-git-submodules=3D*) @@ -873,19 +862,10 @@ for opt do ;; --gdb=3D*) gdb_bin=3D"$optarg" ;; - # backwards compatibility options - --enable-trace-backend=3D*) meson_option_parse "--enable-trace-backends= =3D$optarg" "$optarg" - ;; - --disable-blobs) meson_option_parse --disable-install-blobs "" - ;; --enable-vfio-user-server) vfio_user_server=3D"enabled" ;; --disable-vfio-user-server) vfio_user_server=3D"disabled" ;; - --enable-tcmalloc) meson_option_parse --enable-malloc=3Dtcmalloc tcmalloc - ;; - --enable-jemalloc) meson_option_parse --enable-malloc=3Djemalloc jemalloc - ;; # everything else has the same name in configure and meson --*) meson_option_parse "$opt" "$optarg" ;; --=20 2.38.1 From nobody Sun May 19 09:08:45 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=1671645780; cv=none; d=zohomail.com; s=zohoarc; b=CqmfGfoCEkUhmb7PNySCb0B0zyWOeWA3Es4L/THiDIAdEXm4sRxxjJLRnGHukWfXG4J7OzB/NKzhsX5hNbF8+rYotvTXAhcc91Y2/FyBG1U93AP3/KEB+H3C/rvIcayt0YEm8qAv/nQw12wWcmHLfPAZoeZgm3Ohjptv38mTYMY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671645780; 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=/jY4sDZGlqpxnHZO0MFdt7TM4ihTKq+v+miIcD6185U=; b=NNlTKm1bWngWkc7bi7uVbWomSakBzCtIWuhVge+2AH4HAA5hakOE0nTUAp4HBN1lr447e5zmUNwmfXVf9xT3mjKyT4f7OFUZdMG7KVpFVEVeChctnWk/eNHBldvtT/GSbL6GWb3VXWV5U2FM//0hUvaGilMJ7biatlh28sTEbks= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16716457800681007.9213052311354; Wed, 21 Dec 2022 10:03:00 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p83Q9-0000qk-4c; Wed, 21 Dec 2022 13:02:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83Q6-0000nd-Ry for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:23 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83Q4-0004K4-Up for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:22 -0500 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-83-4ZPrhC9bO5Kr2BL57if6cQ-1; Wed, 21 Dec 2022 13:02:18 -0500 Received: by mail-ej1-f69.google.com with SMTP id dn11-20020a17090794cb00b007c14ea70afcso10967196ejc.0 for ; Wed, 21 Dec 2022 10:02:18 -0800 (PST) Received: from avogadro.local ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id r20-20020aa7da14000000b0046b9c536fc5sm7218763eds.63.2022.12.21.10.02.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 10:02:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671645740; 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=/jY4sDZGlqpxnHZO0MFdt7TM4ihTKq+v+miIcD6185U=; b=LJ4a3h/qdTyo/z8zOi1yZqql5kGNsSBsGpuB565SZ9Ba2dEMqpsUo3/9ZuV/97/N3ylWix +GnNNF86aG60klx3C64Eqv1vIKZmMAiHPDxjvVgi8XbgJr4od3qgpzq/bu8xPrp2iVm9w6 ezorUGjunmFMMiZ3tPkyFkkkelGJ6pE= X-MC-Unique: 4ZPrhC9bO5Kr2BL57if6cQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/jY4sDZGlqpxnHZO0MFdt7TM4ihTKq+v+miIcD6185U=; b=6E2V+7UMNSjQpfH+NSPqiC072SsljWA3aptSlxYLmaCNrv4w4t5PIIqgOxYpErGn2A 3feMFwy8qJubS6jw1B/FAnUiqJEvWTeYzI/pZHTeTj6zPMHhSoLXiUI+rxtLRha+Jexx SBP9JbspznfhIFvsaH1BFBmChROIxrrQgbR3jb52adAV5+qevVZOv7h0YZmLXgjmqBa3 lxloDV6mee6QH6YuvbzK09hdfZsqExDMNSZD3TuuTaXfpcxqe3CPgTFG5yUzW1G9MgMi HZ8NrFEYcB2SFgRJt68gKF9gDuJuMbv9VfzEbXXpo40+O8VqfXEmMDR51REVtMwKDnBr xSXQ== X-Gm-Message-State: AFqh2kq67N6Y42O3sK8Rb2Dcz9VJB3bnoi9Qtwh2SVUVboT9eXn5jeTI fsG0ybhaNk723mFzo8qvVVjubettMlIKDQbUd1WpCoDLFf/L+YweDMScPIFUjaSodL6pHMw+9Dx zyIQcZhZizb5Gz7ukhcOj+0XBy5Vfaj2K8Q2ZKj0NanEeihr+miRwLpheGJDq1fJ9I/M= X-Received: by 2002:a17:906:1583:b0:83f:384f:ea23 with SMTP id k3-20020a170906158300b0083f384fea23mr1822343ejd.57.1671645737158; Wed, 21 Dec 2022 10:02:17 -0800 (PST) X-Google-Smtp-Source: AMrXdXuwb1VCOXVnCFh2LkoXSzWZz5NPURz0zpcK8ezXdgzLZN7SKBf0iixt8nDFJd0Xx77lHmFzqQ== X-Received: by 2002:a17:906:1583:b0:83f:384f:ea23 with SMTP id k3-20020a170906158300b0083f384fea23mr1822326ejd.57.1671645736960; Wed, 21 Dec 2022 10:02:16 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 12/24] meson: tweak hardening options for Windows Date: Wed, 21 Dec 2022 19:01:29 +0100 Message-Id: <20221221180141.839616-13-pbonzini@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221221180141.839616-1-pbonzini@redhat.com> References: <20221221180141.839616-1-pbonzini@redhat.com> MIME-Version: 1.0 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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, 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_H2=-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.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671645782123100001 Content-Type: text/plain; charset="utf-8" meson.build has been enabling ASLR _only_ for debug builds since commit d2147e04f95f ("configure: move Windows flags detection to meson", 2022-05-07); instead it was supposed to disable it for debug builds. However, the flag has been enabled for DLLs upstream for roughly 2 years (https://sourceware.org/bugzilla/show_bug.cgi?id=3D19011), and also by some distros including Debian for 6 years even (https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=3D836365). Enable it unconditionally; we can fix the reversed logic of commit d2147e04f95f later if there are any reports, but for now just enable the hardening. Also add -Wl,--high-entropy-va, which also controls ASLR. Signed-off-by: Paolo Bonzini --- meson.build | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 5c6b5a1c757f..d61c7a82f112 100644 --- a/meson.build +++ b/meson.build @@ -193,10 +193,7 @@ qemu_ldflags +=3D cc.get_supported_link_arguments('-Wl= ,-z,relro', '-Wl,-z,now') =20 if targetos =3D=3D 'windows' qemu_ldflags +=3D cc.get_supported_link_arguments('-Wl,--no-seh', '-Wl,-= -nxcompat') - # Disable ASLR for debug builds to allow debugging with gdb - if get_option('optimization') =3D=3D '0' - qemu_ldflags +=3D cc.get_supported_link_arguments('-Wl,--dynamicbase') - endif + qemu_ldflags +=3D cc.get_supported_link_arguments('-Wl,--dynamicbase', '= -Wl,--high-entropy-va') endif =20 if get_option('gprof') --=20 2.38.1 From nobody Sun May 19 09:08:45 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=1671646141; cv=none; d=zohomail.com; s=zohoarc; b=muG9lefud1fh3Mfwao4ZNwfV3doe/iz1CliPfaNrfWlBYCXt+JRD9cA4eRPcTBCE5QlSAll1RoqzPW/243/fFVFinmTH8VP8jGzKfGGw6zFe+/WrumAbibBQaYWAQ6xVLdMVrFzDtRwuwQ0i9RVmroxsdZaIU741XHzP2X0uBCA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671646141; 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=lNbeKtBEPdV4c/ohPUb/KqQoDWRa4JxrKQWIRrnkmoI=; b=mPxjkxqkjf/GW0DVyXciVqu7Br6Wrw1Y92t7ihzAKfyDa/VZn+8Py+hN7p6RdraAYIQKJt1Veq34SiSuSjP0xHwuK2SfoJRoBAnli82ta4LakgG35/rpZqYsOauy1kMObl2Q2a9uSX9ItYyAjnh2GowucyQ5Zxp+xtuJ++y6f2E= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1671646141439741.5042297967933; Wed, 21 Dec 2022 10:09:01 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p83QA-0000s7-6k; Wed, 21 Dec 2022 13:02:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83Q9-0000qt-5b for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:25 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83Q7-0004KE-HE for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:24 -0500 Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-344-FzbLI7jMMUWrVXOkSlLtEA-1; Wed, 21 Dec 2022 13:02:21 -0500 Received: by mail-ed1-f69.google.com with SMTP id s13-20020a056402520d00b0046c78433b54so11847056edd.16 for ; Wed, 21 Dec 2022 10:02:21 -0800 (PST) Received: from avogadro.local ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id sy26-20020a1709076f1a00b007c0b530f3cfsm7371256ejc.72.2022.12.21.10.02.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 10:02:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671645742; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lNbeKtBEPdV4c/ohPUb/KqQoDWRa4JxrKQWIRrnkmoI=; b=cgc32ZxDhy/eZUJ24R6g3Ch5hDhmbeU/j7EqOTpCii8x04jbPztn59y2CNkO+zaiGOuMnF 4YBufiQowZZFTbSMcKpGRBf8BfH7JJ4EP0tV++39Q73QSr7Ykg0uf/3q977KGFcqTEKIgm +qX0lHF4c0dTJ3QOMGIC645U8ioG6YA= X-MC-Unique: FzbLI7jMMUWrVXOkSlLtEA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lNbeKtBEPdV4c/ohPUb/KqQoDWRa4JxrKQWIRrnkmoI=; b=hgt9TZytsZP7bFG3vlbDG8a/07mO0dqVBPGDSp8XmHZVxdL1wtsleoosjlfp0hTrzC 4TqV3wGwMtOlggDMDL3cyVXbMw+Vtc0dfR0xGk1PlAncO7hB98JnIIyj6g+lge5wGA+w +xl4XGe1oKOLe/JARXI28C4R9ayFeLKCGvh0GoLyK3G40dTCTDggG9Nob2+D0ZN01TBp pWfEkcan34B8ptW18jXB9JtUdXMgkLS/6iw+4fZSNqS5aEE3SVPEYU31aUr8BPWLYpKy IIr8E2Dm7pcaqEFDkYkSevdmr2ua34juM3d1CT5DVW3mqR5hP4n5ZOgzj/RyYOVYCpVE JJlA== X-Gm-Message-State: AFqh2koEp0PSCWBYuRD54SLA89jZozr+bWheW8dea3LC8DwDkJsvYkbo 1c2UnEXAZ35W3umGE7ejxjfa2P6HGuW3Nq3WBAkUg3H6omAc92E30WoeJYK7THbfFaSR5Qu6KbQ EEFfaBAYwY7XBhp2LTCzudM2yHkeJ/ldX5nd9WRGEX3u8+tt9kaUSiW4K3hSQKyfiHEQ= X-Received: by 2002:a17:906:4d58:b0:7c4:fa17:7204 with SMTP id b24-20020a1709064d5800b007c4fa177204mr2186988ejv.7.1671645739719; Wed, 21 Dec 2022 10:02:19 -0800 (PST) X-Google-Smtp-Source: AMrXdXuzY+7jlo49ab1DviTY3qnEOj1u0iUChTNiUImK9CXAKtdHG9oLIzqYvBhb2k9uFHJA9Uxb9g== X-Received: by 2002:a17:906:4d58:b0:7c4:fa17:7204 with SMTP id b24-20020a1709064d5800b007c4fa177204mr2186970ejv.7.1671645739454; Wed, 21 Dec 2022 10:02:19 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 13/24] meson: cleanup dummy-cpus.c rules Date: Wed, 21 Dec 2022 19:01:30 +0100 Message-Id: <20221221180141.839616-14-pbonzini@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221221180141.839616-1-pbonzini@redhat.com> References: <20221221180141.839616-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain 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=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PP_MIME_FAKE_ASCII_TEXT=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671646141847100001 Now that qtest is available on all targets including Windows, dummy-cpus.c is included unconditionally in the build. It also does not need to be compiled per-target. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- accel/meson.build | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/accel/meson.build b/accel/meson.build index 259c35c4c882..3a480cc2efef 100644 --- a/accel/meson.build +++ b/accel/meson.build @@ -11,10 +11,5 @@ if have_system subdir('stubs') endif =20 -dummy_ss =3D ss.source_set() -dummy_ss.add(files( - 'dummy-cpus.c', -)) - -specific_ss.add_all(when: ['CONFIG_SOFTMMU'], if_true: dummy_ss) -specific_ss.add_all(when: ['CONFIG_XEN'], if_true: dummy_ss) +# qtest +softmmu_ss.add(files('dummy-cpus.c')) --=20 2.38.1 From nobody Sun May 19 09:08:45 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=1671646178; cv=none; d=zohomail.com; s=zohoarc; b=HwJ4mwAOt+5GhSi7fy7Axy7d8Cgbfl+G3Z3M1jbNiLh5I3Bh7pVo/h2COL1Ac1hjTcXZ5Vgoddt4WBHc/1GX6VI/VzpmWeqeX62Ogx7q/t1hHhoXOADfjhBTcicbiVLTui913Vx36H3uqBKYzW0Dp4F7jzzqT+/0MPSs8J80ri0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671646178; 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=nNOmRrsHPtBQhQTF9lfyyn6dv9cNBUyxueAuv++IYNg=; b=QYwDYAAbXFXDTKzb/DP8d8+wWbOEXeQyNplato1wjDpYmrADY6FCISIxXhrmNdTrQd/9VardIE/1CPiAvJuGm8qi8eFM6Xw9mKwkQL9haS4gFTsy1QDq1t1QmXrJDepnXfe8+FDCj7egk6uYvHB+5ueSLqZv9FvyRb2bVoF4lko= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1671646178869641.985970106451; Wed, 21 Dec 2022 10:09:38 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p83QC-0000wp-RC; Wed, 21 Dec 2022 13:02:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83QB-0000tq-6x for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:27 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83Q9-0004Kj-KF for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:26 -0500 Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-310-lMz7iCHQNI6XqtTiFmF_2g-1; Wed, 21 Dec 2022 13:02:23 -0500 Received: by mail-ed1-f71.google.com with SMTP id y2-20020a056402440200b004779fcdf1baso9220463eda.4 for ; Wed, 21 Dec 2022 10:02:23 -0800 (PST) Received: from avogadro.local ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id jx14-20020a170906ca4e00b007b47749838asm7292426ejb.45.2022.12.21.10.02.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 10:02:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671645745; 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=nNOmRrsHPtBQhQTF9lfyyn6dv9cNBUyxueAuv++IYNg=; b=NzAD0yTVl35mNuanKTA/pfFkVvwGMMKcyPGwfE9bH4UQeiaV6xZJCV6d67HEIIKVVtljH9 m91QYCdRKrs8ha5UmWgQjjLDwre+jPvzoDOSCrIBHkljOA4v403SfrO/q5/+ELp7Bj64pH X/tWu0eSJXiaRIIsQyf7lUFaOQ+4yY0= X-MC-Unique: lMz7iCHQNI6XqtTiFmF_2g-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nNOmRrsHPtBQhQTF9lfyyn6dv9cNBUyxueAuv++IYNg=; b=yHA2cyGVEgD3fkMZfKoyn/ZAP8R9eZ4EgdCMIgjxsW+JOTGWsjLlP3nTP5vP+SKYhQ eTjgBKbfhjXgeYbx7UKNx6Ggl2qsrBaUlT0AsVBXT29Jwd3aSrgK/BqjOHFzmUf1dofu n1v0ibXuEEhQGyO/cUeZYZShZg2iHjVVt0yLmB6UA7tEioKIaH3ssJsycBtocAhjCwUW uWE6FcsILMiQEL3Onb8szNddnQZUu2asWwUja66i1NEwAfXl6QZDzIIGC+S9nLFacUUv OJi7O+AgyyYqBQwV7tpZsSbh+k02eIZSYgJ2mDwumgYkhYuIWFNHuM2S4GIAFLB36GoR EBHg== X-Gm-Message-State: AFqh2kpkavYLVfDVMUk24LF1/MhxWdvijpI/EpsyRz04GaOXQAv1+6Jl JKkrYdD+9ld00jTLvKtyiqUiGSivPU3MfEI2WOkCzc3ahIgNmBFIB6D8CtL19amLHhtro1aNGaA frPnUPLRi2LF7hPXU735L60xIhuNZiEQdNAdPi4IEc34tHoVCcL9OxAe03qzEheXUYWc= X-Received: by 2002:a17:906:9c85:b0:7c1:27a:80ed with SMTP id fj5-20020a1709069c8500b007c1027a80edmr2085489ejc.0.1671645742103; Wed, 21 Dec 2022 10:02:22 -0800 (PST) X-Google-Smtp-Source: AMrXdXuLedHBCcpNzutnXWF6jPNOpPJdE5F0xKonMkQARPn9rr+MfkMTuKBL6LSvW0JxE0P0RqttwQ== X-Received: by 2002:a17:906:9c85:b0:7c1:27a:80ed with SMTP id fj5-20020a1709069c8500b007c1027a80edmr2085475ejc.0.1671645741870; Wed, 21 Dec 2022 10:02:21 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 14/24] tests/qapi-schema: remove Meson workaround Date: Wed, 21 Dec 2022 19:01:31 +0100 Message-Id: <20221221180141.839616-15-pbonzini@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221221180141.839616-1-pbonzini@redhat.com> References: <20221221180141.839616-1-pbonzini@redhat.com> MIME-Version: 1.0 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=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, 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_H2=-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.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671646179958100003 Content-Type: text/plain; charset="utf-8" The referenced issue has been fixed since version 0.61, so remove the workaround. Signed-off-by: Paolo Bonzini --- tests/qapi-schema/meson.build | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build index 406bc7255d23..9dfe98bc9a68 100644 --- a/tests/qapi-schema/meson.build +++ b/tests/qapi-schema/meson.build @@ -277,10 +277,6 @@ if build_docs command: ['perl', '-pe', '$x =3D chr 1= 3; s/$x$//', '@INPUT@'], capture: true) =20 - # "full_path()" needed here to work around - # https://github.com/mesonbuild/meson/issues/7585 - test('QAPI rST doc', diff, args: ['-u', qapi_doc_ref_nocr[0].full_path(), - qapi_doc_out_nocr[0].full_path()], - depends: [qapi_doc_ref_nocr, qapi_doc_out_nocr], + test('QAPI rST doc', diff, args: ['-u', qapi_doc_ref_nocr[0], qapi_doc_o= ut_nocr[0]], suite: ['qapi-schema', 'qapi-doc']) endif --=20 2.38.1 From nobody Sun May 19 09:08:45 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=1671646039; cv=none; d=zohomail.com; s=zohoarc; b=Y2o2eG8lMaUqnmrS+DM//lQRSGtOIsVjJ1D/BEqFMFO3mQT+TXLVujMm6+Cc9yrrNIJQ2wW9LdBjE9miiDL93N+TYkIJHwVeUQlfsU+xJx3pw2Sm3A3wcdJeGthn1UxZ4vq2hKDTtgH6VTqw2J4vsINd8nHposBaPTWZ2Dm1qsc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671646039; 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=H6utDEA9FL9+z6a3dK1CdWp05StWrgcvctPIPndusps=; b=G/XFAWkz3Ai492nClLLklS8abFc386nmCx8LoaMlwTWUUnkakzulAeDW5XFjA3BzD0xAEkx4+jFiOJY6uyd/paSuXDEnlqNSHtWPVXqSK0Lb7L/NaOjyMWI2hqJWsWKFpqia0dJ2vAkCgoNOVYg+LmYia/4aCsuZP3qXWz2gqLA= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1671646039923520.5770282149222; Wed, 21 Dec 2022 10:07:19 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p83QH-00013k-MK; Wed, 21 Dec 2022 13:02:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83QD-0000yo-Ra for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:29 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83QC-0004Kz-9A for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:29 -0500 Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-636-HIXHYlxCPGKPUVtTWxiUfg-1; Wed, 21 Dec 2022 13:02:26 -0500 Received: by mail-ed1-f72.google.com with SMTP id h18-20020a05640250d200b004758e655ebeso11522692edb.11 for ; Wed, 21 Dec 2022 10:02:25 -0800 (PST) Received: from avogadro.local ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id kb18-20020a1709070f9200b007c0f90792ffsm7318693ejc.89.2022.12.21.10.02.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 10:02:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671645747; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=H6utDEA9FL9+z6a3dK1CdWp05StWrgcvctPIPndusps=; b=BXxp+Bu2QglLiGNSrz79XvIUaOUvupcuTiyqrawvYWmhoWiLjz3yHHVxnh28Q954k6uvpc M8LNn4HMrbTziJdcbMUvqvGY8D3hejchcmScacU13Kec1IXtD9ChCCKqaljz0Ui/ks89QG AyVHdeFx/NfHGzpJoFJCvyRAWiSJ/Rw= X-MC-Unique: HIXHYlxCPGKPUVtTWxiUfg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=H6utDEA9FL9+z6a3dK1CdWp05StWrgcvctPIPndusps=; b=DQCcmXX8N/cUzKPYcIGMhNxwSRDm39WCRRVPymqLoH3n7+QHxaZgYn3jNCfvjHYH3T MDcuVxh6jS4oE1wDxSN09tK0lpMAyeVA8RvWCZI2hqk4CNwsB3OLOsb+bhlzBqjEG+r4 H0vfD4MlprfHl5TIHkdkPMLEJu7TaFhB1ma70g2rMEyVIu6Q1Bh0nkOpPeKXLOtQ36Cq lRjA+NFe379e5AdXM3QmgSZVkU/9TQb0a/0mGu6+tA9/7dA8tQzXi29cHyjT3Yshy8Ea c2V1sLkv983sm32NRYnNLNmd119CS2qELXpDolv5yVpMBg9qhEwQMGjlcviSPUpoiU03 ascA== X-Gm-Message-State: AFqh2kp61uxDuyRqQqF8BK2+tMzWVnVOQYF6Fax9Msdt7mVN2ioYT/xn YH6sAcJR82UJuq+F7cr/IZCXIPgfImOU7+cisjI5yT5Md7Fidp542fFrLXFyVIZrgk84mnwVdOZ Bv/oj5n9U0AGOPXNHAy8sjZ+Mn0eC7eEG94DDiTkvcmMvmmJmV3UZ+2xC6F+B+8zS7Zc= X-Received: by 2002:a17:907:cb84:b0:836:e8a6:f6f5 with SMTP id un4-20020a170907cb8400b00836e8a6f6f5mr2248457ejc.66.1671645744651; Wed, 21 Dec 2022 10:02:24 -0800 (PST) X-Google-Smtp-Source: AMrXdXtIkk+nMMwJUZdY8SofM13H2xO74mvLMGRrgG6lPPq3ktGT0Ypfx0g3rNpIBKG7m5d4pQCJhA== X-Received: by 2002:a17:907:cb84:b0:836:e8a6:f6f5 with SMTP id un4-20020a170907cb8400b00836e8a6f6f5mr2248438ejc.66.1671645744418; Wed, 21 Dec 2022 10:02:24 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 15/24] configure: test all warnings Date: Wed, 21 Dec 2022 19:01:32 +0100 Message-Id: <20221221180141.839616-16-pbonzini@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221221180141.839616-1-pbonzini@redhat.com> References: <20221221180141.839616-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain 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=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PP_MIME_FAKE_ASCII_TEXT=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671646042595100003 Some warnings are hardcoded in QEMU_CFLAGS and not tested. There is no particular reason to single out these five, as many more -W flags are present on all the supported compilers. For homogeneity when moving the detection to meson, make them use the same warn_flags infrastructure. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini --- configure | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 0667dde1654c..df19605ec398 100755 --- a/configure +++ b/configure @@ -378,8 +378,6 @@ sdl2_config=3D"${SDL2_CONFIG-${cross_prefix}sdl2-config= }" # 2s-complement style results. (Both clang and gcc agree that it # provides these semantics.) QEMU_CFLAGS=3D"-fno-strict-aliasing -fno-common -fwrapv" -QEMU_CFLAGS=3D"-Wundef -Wwrite-strings -Wmissing-prototypes $QEMU_CFLAGS" -QEMU_CFLAGS=3D"-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS" QEMU_CFLAGS=3D"-D_GNU_SOURCE -D_FILE_OFFSET_BITS=3D64 -D_LARGEFILE_SOURCE = $QEMU_CFLAGS" =20 QEMU_LDFLAGS=3D @@ -1166,6 +1164,11 @@ fi # just silently disable some features, so it's too error prone. =20 warn_flags=3D +add_to warn_flags -Wundef +add_to warn_flags -Wwrite-strings +add_to warn_flags -Wmissing-prototypes +add_to warn_flags -Wstrict-prototypes +add_to warn_flags -Wredundant-decls add_to warn_flags -Wold-style-declaration add_to warn_flags -Wold-style-definition add_to warn_flags -Wtype-limits --=20 2.38.1 From nobody Sun May 19 09:08:45 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=1671646367; cv=none; d=zohomail.com; s=zohoarc; b=KouujMWTIK7GWXm/5zRZkUbmJ+HpSIk02zoxltJOkt0uGUdTLUhS4Q146KOFA0GTHP73JoYHdrqUqqdHyvkcAch/0sq5ifO7/z8W9xiDFDkJi0t8iVrxdoPbmn2+8NijoMerLXquFchBOgIGaFJC7LVAyoC1rF7D+ohwrb5AGMs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671646367; 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=v6VD/Q5Gt/FhilrcqjJqPVJfwNa0pUgpO9CIhbWE9GA=; b=EWOHqcJGyvdzgfVIAepOW8pWVimrONNjxdtA1EQgOVSMySUQeKFiJuagnbYXR/fkSI1LuURCWr42md2pDCgvEPmGjBa5KTQ4FyvjBbzIPZCsDAj7u/GzvS2buccxCY61QLupGWZTDqFnTM/c4lv64+foAv565SEFKpz97wRvuTo= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1671646367750340.2304248617271; Wed, 21 Dec 2022 10:12:47 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p83QI-00018r-6T; Wed, 21 Dec 2022 13:02:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83QG-00012J-Nh for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:32 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83QF-0004LL-2n for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:32 -0500 Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-414-rsM8W-44OrW9-0jMLUUR-Q-1; Wed, 21 Dec 2022 13:02:28 -0500 Received: by mail-ed1-f72.google.com with SMTP id r14-20020a05640251ce00b0047d67ab2019so2806444edd.12 for ; Wed, 21 Dec 2022 10:02:28 -0800 (PST) Received: from avogadro.local ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id g11-20020aa7c58b000000b0046b1d63cfc1sm7246330edq.88.2022.12.21.10.02.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 10:02:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671645750; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=v6VD/Q5Gt/FhilrcqjJqPVJfwNa0pUgpO9CIhbWE9GA=; b=DtW+u+l63cweIrsKrrk4LesZEw7T+5BvuB4CHgu2hTudJu4gEcA9M9tiNgRvtCFS7fUaz0 JSXjZGNQcDmZCbmZW7KmOxwpu/VvZGDc3F0XarP0znLG8jDvOCsghRGN6U04q3zqN/XXLD Rl98BWRw5ZXXt3qD7JlGI5s2vjDm3Qk= X-MC-Unique: rsM8W-44OrW9-0jMLUUR-Q-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=v6VD/Q5Gt/FhilrcqjJqPVJfwNa0pUgpO9CIhbWE9GA=; b=VAXx4mvamtMQCSCCs9ex9bVNwggmdMY/hEdGwtW9d+bRc614sB1RTJDDSd/KOfK2KQ zl90VR6yWlqC5/LUZEKAW97UEWMBgnbuEVFJWylEwN+Xw3sjEREFbVh0w25ed2Jd9UKG 8qcy1CbJUweKmJn/5MWpNClZaOgTuKv48+xHoyLPit9/3wnwqW+HH7QFLKw0zHa2cYH7 0sLGhz7g0wp4ByV09p6FSsb4oyUcf2+7eAUOuNLo2dQGf9tsCn4g/QQQ5+6CkiwGEwFH x2o3CIRz6aIJpK70hG7EId7bvA3gbKRsoT+6PHir8nFjyAoXsfWSKVJnn3wDJQKZ4T3E 0Lhw== X-Gm-Message-State: AFqh2kpXO91ZKPsKl7eiU89YK6JyE3J3Jqwmldqo/rO89Oj+PaB5yoU8 Y8wF9uKg5M64we8zHrvViDl+IFfzM86XkSmNvIsdEhTg7KQWd6uBVmIlmPWxDIaetvvLBLC+K3o jgxh6NGnjJKIthOV4cWMT0hkLCRdtc1NjgHKzcSBENkvWN6FAXQw+gFVMYkG8nkP0iJ8= X-Received: by 2002:a17:906:369b:b0:7e2:c573:d2e9 with SMTP id a27-20020a170906369b00b007e2c573d2e9mr2203930ejc.48.1671645747211; Wed, 21 Dec 2022 10:02:27 -0800 (PST) X-Google-Smtp-Source: AMrXdXsd3epJwkRTBHs1HELQ4NrCfcCj7Q3lygGA3V//43pv/wogL+rTEBV452yHiRRl/IJmOAKB7Q== X-Received: by 2002:a17:906:369b:b0:7e2:c573:d2e9 with SMTP id a27-20020a170906369b00b007e2c573d2e9mr2203912ejc.48.1671645746956; Wed, 21 Dec 2022 10:02:26 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 16/24] meson: support meson 0.64 -Doptimization=plain Date: Wed, 21 Dec 2022 19:01:33 +0100 Message-Id: <20221221180141.839616-17-pbonzini@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221221180141.839616-1-pbonzini@redhat.com> References: <20221221180141.839616-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain 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=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PP_MIME_FAKE_ASCII_TEXT=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671646368997100001 In Meson 0.64, the optimization built-in option now accepts the "plain" val= ue, which will not set any optimization flags. While QEMU does not check the contents of the option and therefore does not suffer any ill effect from the new value, it uses get_option to print the optimization flags in the summary. Clean the code up to remove duplication, and check for -Doptimization=3Dplain at the same time. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- meson.build | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/meson.build b/meson.build index d61c7a82f112..dbd0b5563446 100644 --- a/meson.build +++ b/meson.build @@ -3752,18 +3752,16 @@ endif if targetos =3D=3D 'darwin' summary_info +=3D {'Objective-C compiler': ' '.join(meson.get_compiler('= objc').cmd_array())} endif -summary_info +=3D {'CFLAGS': ' '.join(get_option('c_args') - + ['-O' + get_option('optim= ization')] - + (get_option('debug') ? ['= -g'] : []))} +option_cflags =3D (get_option('debug') ? ['-g'] : []) +if get_option('optimization') !=3D 'plain' + option_cflags +=3D ['-O' + get_option('optimization')] +endif +summary_info +=3D {'CFLAGS': ' '.join(get_option('c_args') + op= tion_cflags)} if link_language =3D=3D 'cpp' - summary_info +=3D {'CXXFLAGS': ' '.join(get_option('cpp_args') - + ['-O' + get_option('optim= ization')] - + (get_option('debug') ? ['= -g'] : []))} + summary_info +=3D {'CXXFLAGS': ' '.join(get_option('cpp_args') + = option_cflags)} endif if targetos =3D=3D 'darwin' - summary_info +=3D {'OBJCFLAGS': ' '.join(get_option('objc_args') - + ['-O' + get_option('optim= ization')] - + (get_option('debug') ? ['= -g'] : []))} + summary_info +=3D {'OBJCFLAGS': ' '.join(get_option('objc_args') += option_cflags)} endif link_args =3D get_option(link_language + '_link_args') if link_args.length() > 0 --=20 2.38.1 From nobody Sun May 19 09:08:45 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=1671646162; cv=none; d=zohomail.com; s=zohoarc; b=NN2W1CTBTzLK3srjivHVsqcFl0B98YCSBd/sDea8nuN9eAkcwMH7FX5YIoPGy28beVutiN5gtvFS8UvzdeOe01VkhWRkvgaKyKlk4QEuVzcisvfFWpwGCPTu8MyNSYqeolUvSKKUQWOCeIkeoJl1MYalCGqCmh6vDkiSQPOJhpM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671646162; 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=82nDtmiImedDhp3vkdUqEEQgeQIdwDkdoWjDJgK0/Po=; b=kiSwwAQmOvvt5nHVuYvA/w36D/NX1KjaJzzkrZvbzd4Gun3jLjjDQCnK1MAG5d6nxqu02FkDlxQFqMFxDEDY2QInMmpWWM22dsa2JcU0FQ/utaf8P1y0vuGJRslMHSNqFUCkwJWJ3UmpX5euJ03DnJf4gM8/oAFT8juHJwcjLp8= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1671646162271746.5812681982243; Wed, 21 Dec 2022 10:09:22 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p83QP-0001D3-BQ; Wed, 21 Dec 2022 13:02:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83QJ-0001CN-Ez for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:35 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83QH-0004LW-IR for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:35 -0500 Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-655-vGcvpPpbNbujURzwccR0mQ-1; Wed, 21 Dec 2022 13:02:31 -0500 Received: by mail-ej1-f70.google.com with SMTP id jg25-20020a170907971900b007c0e98ad898so11106052ejc.15 for ; Wed, 21 Dec 2022 10:02:31 -0800 (PST) Received: from avogadro.local ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id rs13-20020a170907036d00b0077a1dd3e7b7sm7410423ejb.102.2022.12.21.10.02.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 10:02:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671645753; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=82nDtmiImedDhp3vkdUqEEQgeQIdwDkdoWjDJgK0/Po=; b=GOXoYAlBPvz/26yzMEP6eUZBr/3Ue5UcxWKXlwD4bFX9ygWNlGW5pUQ9uWxwrWoPvYZWR6 ZGwfcUyFt9Jm/kWcGfhhMg64wm4JOJ8mcm5ykqkjVh/kq1yuW0gL1fituZQW1pmI1HCNxm Y6vwFl1gqIpCWgQL9fVVYhLLIPd63OQ= X-MC-Unique: vGcvpPpbNbujURzwccR0mQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=82nDtmiImedDhp3vkdUqEEQgeQIdwDkdoWjDJgK0/Po=; b=XJG3+ct/u1VsxtHT+6D0GkJCL4ct73s9UNPt9s9DyLsZ7IZMf3W75+ZxU6LjJCZ6nE nCAqdEnpWHWLapJsWZYMKFkZ9XSBfrckIgUmXVTXN+Zj0HPRRDrIF6eT5wT5XvYRwMPo 9M8moZM5UiXeyisGa5HBM6F7VR4HGUdkYi44qGFduNiF6r2KclbJbMIRsiofR2hZs/7D aYtodNQzIoWP3iYq1DVWlyibp6lMUgkTTc3f67ZVTF0xMbVW+emKxELSB/hdXvbr5tbM 21BQDPeqUCM7yA7iVsianiZ9YUg0VwuDSXPJRO+IIgmm/EM8FBMuCQrYm5rSilMLrJML 3+Wg== X-Gm-Message-State: AFqh2krjeb17wrscbMeVYcZocuuolkjA4lfjALLhSXgzAqSjYRKpHAuW 4lar7TDyY2tySRa+OybrUxN7tUbZQmgEX8Oto4Bf1qRX29alYnVCMA7ervoyWDXX0lpnmqG5XuL au6Jb09ZcGhnho1ezTdF0mrPpiradZ2Oo83QdNrkbRY6JnN2Wdy2jqNUblQcFGvoCCws= X-Received: by 2002:a05:6402:1298:b0:461:75f1:9254 with SMTP id w24-20020a056402129800b0046175f19254mr2442585edv.2.1671645749888; Wed, 21 Dec 2022 10:02:29 -0800 (PST) X-Google-Smtp-Source: AMrXdXvFBFaiqqKzulTgBrEfTvafb/vT5xbCd2liNi5GulqCFWX950bX0kuB1zBY9NqEXV8Q+FHvcg== X-Received: by 2002:a05:6402:1298:b0:461:75f1:9254 with SMTP id w24-20020a056402129800b0046175f19254mr2442563edv.2.1671645749575; Wed, 21 Dec 2022 10:02:29 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 17/24] meson: cleanup compiler detection Date: Wed, 21 Dec 2022 19:01:34 +0100 Message-Id: <20221221180141.839616-18-pbonzini@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221221180141.839616-1-pbonzini@redhat.com> References: <20221221180141.839616-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain 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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PP_MIME_FAKE_ASCII_TEXT=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671646163966100003 Detect all compilers at the beginning of meson.build, and store the available languages in an array. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- meson.build | 62 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 27 deletions(-) diff --git a/meson.build b/meson.build index dbd0b5563446..81920844448d 100644 --- a/meson.build +++ b/meson.build @@ -14,8 +14,8 @@ keyval =3D import('keyval') ss =3D import('sourceset') fs =3D import('fs') =20 +targetos =3D host_machine.system() sh =3D find_program('sh') -cc =3D meson.get_compiler('c') config_host =3D keyval.load(meson.current_build_dir() / 'config-host.mak') enable_modules =3D 'CONFIG_MODULES' in config_host enable_static =3D 'CONFIG_STATIC' in config_host @@ -23,6 +23,18 @@ enable_static =3D 'CONFIG_STATIC' in config_host # Allow both shared and static libraries unless --enable-static static_kwargs =3D enable_static ? {'static': true} : {} =20 +cc =3D meson.get_compiler('c') +all_languages =3D ['c'] +if add_languages('cpp', required: false, native: false) + all_languages +=3D ['cpp'] + cxx =3D meson.get_compiler('cpp') +endif +if targetos =3D=3D 'darwin' and \ + add_languages('objc', required: get_option('cocoa'), native: false) + all_languages +=3D ['objc'] + objc =3D meson.get_compiler('objc') +endif + # Temporary directory used for files created while # configure runs. Since it is in the build directory # we can safely blow away any previous version of it @@ -58,8 +70,6 @@ if cpu in ['riscv32', 'riscv64'] cpu =3D 'riscv' endif =20 -targetos =3D host_machine.system() - target_dirs =3D config_host['TARGET_DIRS'].split() have_linux_user =3D false have_bsd_user =3D false @@ -165,7 +175,7 @@ if 'dtrace' in get_option('trace_backends') # semaphores are linked into the main binary and not the module's shar= ed # object. add_global_arguments('-DSTAP_SDT_V2', - native: false, language: ['c', 'cpp', 'objc']) + native: false, language: all_languages) endif endif =20 @@ -207,7 +217,7 @@ endif if get_option('fuzzing') add_project_link_arguments(['-Wl,-T,', (meson.current_source_dir() / 'tests/qtest/f= uzz/fork_fuzz.ld')], - native: false, language: ['c', 'cpp', 'objc']) + native: false, language: all_languages) =20 # Specify a filter to only instrument code that is directly related to # virtual-devices. @@ -220,7 +230,7 @@ if get_option('fuzzing') args: ['-fsanitize-coverage-allowlist=3D/dev/null', '-fsanitize-coverage=3Dtrace-pc'] ) add_global_arguments('-fsanitize-coverage-allowlist=3Dinstrumentation-= filter', - native: false, language: ['c', 'cpp', 'objc']) + native: false, language: all_languages) endif =20 if get_option('fuzzing_engine') =3D=3D '' @@ -229,9 +239,9 @@ if get_option('fuzzing') # everything with fsanitize=3Dfuzzer-no-link. Otherwise, the linker wi= ll be # unable to bind the fuzzer-related callbacks added by instrumentation. add_global_arguments('-fsanitize=3Dfuzzer-no-link', - native: false, language: ['c', 'cpp', 'objc']) + native: false, language: all_languages) add_global_link_arguments('-fsanitize=3Dfuzzer-no-link', - native: false, language: ['c', 'cpp', 'objc'= ]) + native: false, language: all_languages) # For the actual fuzzer binaries, we need to link against the libfuzzer # library. They need to be configurable, to support OSS-Fuzz fuzz_exe_ldflags =3D ['-fsanitize=3Dfuzzer'] @@ -242,15 +252,11 @@ if get_option('fuzzing') endif endif =20 -add_global_arguments(qemu_cflags, native: false, language: ['c']) -add_global_arguments(qemu_objcflags, native: false, language: ['objc']) - # Check that the C++ compiler exists and works with the C compiler. link_language =3D 'c' linker =3D cc qemu_cxxflags =3D [] -if add_languages('cpp', required: false, native: false) - cxx =3D meson.get_compiler('cpp') +if 'cpp' in all_languages add_global_arguments(['-D__STDC_LIMIT_MACROS', '-D__STDC_CONSTANT_MACROS= ', '-D__STDC_FORMAT_MACROS'], native: false, language: 'cpp') foreach k: qemu_cflags @@ -259,7 +265,6 @@ if add_languages('cpp', required: false, native: false) qemu_cxxflags +=3D [k] endif endforeach - add_global_arguments(qemu_cxxflags, native: false, language: 'cpp') =20 if cxx.links(files('scripts/main.c'), args: qemu_cflags) link_language =3D 'cpp' @@ -275,22 +280,21 @@ if targetos !=3D 'sunos' and not config_host.has_key(= 'CONFIG_TSAN') qemu_ldflags +=3D linker.get_supported_link_arguments('-Wl,--warn-common= ') endif =20 -add_global_link_arguments(qemu_ldflags, native: false, language: ['c', 'cp= p', 'objc']) +add_global_link_arguments(qemu_ldflags, native: false, language: all_langu= ages) =20 +add_global_arguments(qemu_cflags, native: false, language: 'c') +add_global_arguments(qemu_cxxflags, native: false, language: 'cpp') +add_global_arguments(qemu_objcflags, native: false, language: 'objc') if targetos =3D=3D 'linux' add_project_arguments('-isystem', meson.current_source_dir() / 'linux-he= aders', '-isystem', 'linux-headers', - language: ['c', 'cpp']) + language: all_languages) endif =20 add_project_arguments('-iquote', '.', '-iquote', meson.current_source_dir(), '-iquote', meson.current_source_dir() / 'include', - language: ['c', 'cpp', 'objc']) - -if host_machine.system() =3D=3D 'darwin' - add_languages('objc', required: false, native: false) -endif + language: all_languages) =20 sparse =3D find_program('cgcc', required: get_option('sparse')) if sparse.found() @@ -472,7 +476,7 @@ if get_option('tcg').allowed() tcg_arch =3D 'ppc' endif add_project_arguments('-iquote', meson.current_source_dir() / 'tcg' / tc= g_arch, - language: ['c', 'cpp', 'objc']) + language: all_languages) =20 accelerators +=3D 'CONFIG_TCG' config_host +=3D { 'CONFIG_TCG': 'y' } @@ -498,7 +502,7 @@ endif # The path to glib.h is added to all compilation commands. This was # grandfathered in from the QEMU Makefiles. add_project_arguments(config_host['GLIB_CFLAGS'].split(), - native: false, language: ['c', 'cpp', 'objc']) + native: false, language: all_languages) glib =3D declare_dependency(compile_args: config_host['GLIB_CFLAGS'].split= (), link_args: config_host['GLIB_LIBS'].split(), version: config_host['GLIB_VERSION'], @@ -1723,8 +1727,8 @@ if get_option('cfi') error('-fno-sanitize-trap=3Dcfi-icall is not supported by the compil= er') endif endif - add_global_arguments(cfi_flags, native: false, language: ['c', 'cpp', 'o= bjc']) - add_global_link_arguments(cfi_flags, native: false, language: ['c', 'cpp= ', 'objc']) + add_global_arguments(cfi_flags, native: false, language: all_languages) + add_global_link_arguments(cfi_flags, native: false, language: all_langua= ges) endif =20 have_host_block_device =3D (targetos !=3D 'darwin' or @@ -3768,8 +3772,12 @@ if link_args.length() > 0 summary_info +=3D {'LDFLAGS': ' '.join(link_args)} endif summary_info +=3D {'QEMU_CFLAGS': ' '.join(qemu_cflags)} -summary_info +=3D {'QEMU_CXXFLAGS': ' '.join(qemu_cxxflags)} -summary_info +=3D {'QEMU_OBJCFLAGS': ' '.join(qemu_objcflags)} +if 'cpp' in all_languages + summary_info +=3D {'QEMU_CXXFLAGS': ' '.join(qemu_cxxflags)} +endif +if 'objc' in all_languages + summary_info +=3D {'QEMU_OBJCFLAGS': ' '.join(qemu_objcflags)} +endif summary_info +=3D {'QEMU_LDFLAGS': ' '.join(qemu_ldflags)} summary_info +=3D {'profiler': get_option('profiler')} summary_info +=3D {'link-time optimization (LTO)': get_option('b_lto')} --=20 2.38.1 From nobody Sun May 19 09:08:45 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=1671646222; cv=none; d=zohomail.com; s=zohoarc; b=g75mfQJKcZkBcQdYiFNj56qOQ9JzCtjwGKOHp6uUvNPKk0OEyavgDBKexmLdvPQ0Ei7HR+8zF95gEjxNEjXd3weGHVD9Gi8cHTzG341SfP5WdkDjiQQdsIHwL4WKfHLX5SaENcrqRYeYKweLqSa75i2qt1P7ohN29rNDzYTdCPs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671646222; 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=UUQU3z+7mm9jDbX62tkp0yPYmJk5AZgplqBgQFHgKds=; b=FzQ7cyBNU9RiYs1PBjHAVSMFwRIFNsff80Xsl7e9nOteun8f+xm0z3Jb1xMKVRBVP+RSEknE2mPiI4n56qmz3D4ckwYI0GjPOftwpVgqKXTOJIzPaYuEV2ijCixi1SzdZV6bCYcpyWrLLdkch0DzPUFTYbwXOdm3JtfJe/+XHIA= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1671646222757673.9974018005129; Wed, 21 Dec 2022 10:10:22 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p83Qj-0001Yt-1a; Wed, 21 Dec 2022 13:03:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83QO-0001N1-Pr for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:43 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83QK-0004N1-8u for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:40 -0500 Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-615-OEWI9ItnNM6kzLl94mHPsw-1; Wed, 21 Dec 2022 13:02:34 -0500 Received: by mail-ed1-f69.google.com with SMTP id t17-20020a056402525100b00478b85eecedso8358274edd.18 for ; Wed, 21 Dec 2022 10:02:33 -0800 (PST) Received: from avogadro.local ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id r9-20020a1709061ba900b0081586470b7csm5150946ejg.173.2022.12.21.10.02.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 10:02:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671645755; 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=UUQU3z+7mm9jDbX62tkp0yPYmJk5AZgplqBgQFHgKds=; b=ckhjd0/BrMNUlnDCBzQ+TlBtd5vOhNdEPjoTAFw0TeouDAHpnDMXKWDDePgLs0r3WnSdrJ 9fC9k+AXBlYS/iMRtMJuAU/ftyp415Y/s9tb/ogJQ62v+ZUbWeqR+eoXLEcve/wnzfIGXB Oawr5o5ZHz56QOO80T/DBoDp2tW8+6g= X-MC-Unique: OEWI9ItnNM6kzLl94mHPsw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UUQU3z+7mm9jDbX62tkp0yPYmJk5AZgplqBgQFHgKds=; b=4bTsJRqUYb98vVgKLHDQ/TV6eJCVb3EhO8mQOTzMbhicGhrzXY9LbhEbTkTb7XeuDT Bzy3loURYG8C3QJ09gjqMcYueSNn34BI34zbCJU4K9ttcDtfa1EsoF32eDg4M4VVpzd6 APxXNwau3B/4ru8iCNuyaX0bKFMtvphWCGMyy/HkQ6ISuuwCU8+1cdhaZgkq+EaGjvdA RR9WtKOOQCgZ0oKbQhbbd7V6a93Nknax+CFrKmpsCHMj01IvF1x7PZOCp0Bxr9YckFdg mb/b5D3tiLHxsc6OkNEp9VW2dgpO0WiG0MK2UOeXwpY33KKxDMve5kAQrZZ5L3SpwvGw uafA== X-Gm-Message-State: AFqh2kpvr/w+uwITnV6knHJWw6AqKHEePH74zd6yv/jM+iICtAZ1L50y YURBLEkFLZ/3MMAkN0IwrY1bGgmFwU6qsZkF3CNHt87PtV1zKEmPSDfvsrDZpuX9S39CEJ86RwL QFwF/51A3X99Wr9wuK9MlrzHPNt4Nmqjbfw7AE4Gg5f3gXFXXgiXsHivWh3HQWiLbntY= X-Received: by 2002:a17:906:b142:b0:7c1:6fd3:1efa with SMTP id bt2-20020a170906b14200b007c16fd31efamr5572416ejb.28.1671645752437; Wed, 21 Dec 2022 10:02:32 -0800 (PST) X-Google-Smtp-Source: AMrXdXvMWmDCwHx5BYhejiaY6gKbaskkZ3gS489Sbt/W6q0R3pxMpaCPKmXaXN5eN7BucXPOpHBe3w== X-Received: by 2002:a17:906:b142:b0:7c1:6fd3:1efa with SMTP id bt2-20020a170906b14200b007c16fd31efamr5572400ejb.28.1671645752188; Wed, 21 Dec 2022 10:02:32 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org Subject: [PULL 18/24] meson: accept relative symlinks in "meson introspect --installed" data Date: Wed, 21 Dec 2022 19:01:35 +0100 Message-Id: <20221221180141.839616-19-pbonzini@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221221180141.839616-1-pbonzini@redhat.com> References: <20221221180141.839616-1-pbonzini@redhat.com> MIME-Version: 1.0 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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, 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_H2=-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.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671646224210100001 Content-Type: text/plain; charset="utf-8" When installing shared libraries, as is the case for libvfio-user.so, Meson will include relative symbolic links in the output of "meson introspect --installed": { "libvfio-user.so": "/usr/local/lib64/libvfio-user.so", ... } In the case of scripts/symlink-install-tree.py, this will be a symbolic link to a symbolic link but, in any case, there is no issue in creating it. Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini --- scripts/symlink-install-tree.py | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/symlink-install-tree.py b/scripts/symlink-install-tree= .py index a5bf0b0d6d7c..67cb86dd523a 100644 --- a/scripts/symlink-install-tree.py +++ b/scripts/symlink-install-tree.py @@ -17,7 +17,6 @@ def destdir_join(d1: str, d2: str) -> str: out =3D subprocess.run([*introspect.split(' '), '--installed'], stdout=3Dsubprocess.PIPE, check=3DTrue).stdout for source, dest in json.loads(out).items(): - assert os.path.isabs(source) bundle_dest =3D destdir_join('qemu-bundle', dest) path =3D os.path.dirname(bundle_dest) try: --=20 2.38.1 From nobody Sun May 19 09:08:45 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=1671646227; cv=none; d=zohomail.com; s=zohoarc; b=GPSYAZqzce0/FAQU+dwT7GJ5ON0KWXYWKZs14GYjY4f8yE5xPz7p821fQC7tLLl7n1bqkLU+CMmWYIoKQeBrRDfFTAAxztGO0KyLXe4YfLu+iuczXAR+YkhakgijuxeyAq4ZGSA+3/4MXNQhgYgFxLXoy27GvX3XKHEoFCaUQ6Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671646227; 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=XZd3HzAjJ9xPg38fGQkpD3Zut3j+7V1bMLg8fvGz+vQ=; b=RMuKZY/OkxNBn4r5RQqHpMP+6qULrfBk1Agmp3dwhv+wF4EsdLAOdFs5iVLqoTIDpiot/QuOVVsSIgYfq7ZRGz0rFuf9KEu5HSgCzVmYTAZY0tLl20aUEqk2vMifM+wV2QiqcYRaW+uuJWkvHvr/7O36j+GUsBVSDs5zmeavRwI= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1671646227327117.38611294224916; Wed, 21 Dec 2022 10:10:27 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p83Qj-0001Z0-58; Wed, 21 Dec 2022 13:03:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83QO-0001N2-QR for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:43 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83QM-0004P2-Tj for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:40 -0500 Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-335-kEMm7T3tNROM8XuvxQ7hRA-1; Wed, 21 Dec 2022 13:02:36 -0500 Received: by mail-ed1-f70.google.com with SMTP id q10-20020a056402518a00b00472a255eef7so11849411edd.15 for ; Wed, 21 Dec 2022 10:02:36 -0800 (PST) Received: from avogadro.local ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id g17-20020a17090604d100b007c0e23b5615sm7331579eja.34.2022.12.21.10.02.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 10:02:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671645757; 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=XZd3HzAjJ9xPg38fGQkpD3Zut3j+7V1bMLg8fvGz+vQ=; b=PQ05ZYX/kixVQE/SWtZScdpKq0DBDUloq415W2KhU4g4/OJN1CRaOPQluHlKlbh2ve4SBl /1L0F3/Sece+rXr8Xldb0kO3pFN44TLBCHtk/lKGm/Pm7SISkUTmUO72gl/EfLuo0gX/XR S+QFAnqJJq4DBAKR1aUEG/KqxhsUuB4= X-MC-Unique: kEMm7T3tNROM8XuvxQ7hRA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XZd3HzAjJ9xPg38fGQkpD3Zut3j+7V1bMLg8fvGz+vQ=; b=0/hn9kdQTuy107xkuqeRhWnIVPCBmp7Tow9aKNzWl/jRDiilYV4dkrJ0jrCZp5wg4h uBph+rS2ImhoXZ/92saUX7+ergWOPxOagBBqcw5Blu4PAa0ykRwphEtH9hJa/eL6h18l gEAFPsFuS9G691IXtigLBCN5d381yj/zpZg9PQLZ5TOmeCIrtuTT8bPXwMHxuvrHIBtR pZw/mJCKroxhX3zyxjGDs9lZ/TJ6MjNXoktqWcTYwRRpgLoAbKoxkq9PDstzehBP24vK 1WFrIc2dAZA5IYXJq/fb0NXtDCtjUi96utdLkoKwcsFjjhBPWJezY4EuXah8ozoFLyam wrmQ== X-Gm-Message-State: AFqh2krnqMIpy6+hF86q1O1wCSsD+px4DUHPhXM1mGD7NdFgBmm6Ri+k wbETUCfri8Px3GFle4gs59jLClwc95G79gMOWsonxb0bh8XrpO10yfGXAJ82vKgLU6amuT9Whla Ht1eK+1WJpNIaAatnjQVzWsLd1TIRcfR9hw0NW7T51WAZei3XXoRBPWqFD97VW0Vu2YE= X-Received: by 2002:a17:906:b08b:b0:7c4:f8fb:6a27 with SMTP id x11-20020a170906b08b00b007c4f8fb6a27mr6228075ejy.0.1671645754919; Wed, 21 Dec 2022 10:02:34 -0800 (PST) X-Google-Smtp-Source: AMrXdXukehTQanpTJLaAQAe7+KkmShGlzM0/wK6j2KU7SM9C/+6Ffc8LXi/oIezcUFP4y+V/dXy1Xg== X-Received: by 2002:a17:906:b08b:b0:7c4:f8fb:6a27 with SMTP id x11-20020a170906b08b00b007c4f8fb6a27mr6228050ejy.0.1671645754601; Wed, 21 Dec 2022 10:02:34 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 19/24] docs: do not talk about past removal as happening in the future Date: Wed, 21 Dec 2022 19:01:36 +0100 Message-Id: <20221221180141.839616-20-pbonzini@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221221180141.839616-1-pbonzini@redhat.com> References: <20221221180141.839616-1-pbonzini@redhat.com> MIME-Version: 1.0 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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, 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_H2=-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.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671646228217100007 Content-Type: text/plain; charset="utf-8" KVM guest support on 32-bit Arm hosts *has* been removed, so rephrase the sentence describing it. Signed-off-by: Paolo Bonzini --- docs/about/removed-features.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.= rst index 63df9848fda2..7e12145c120d 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -565,9 +565,8 @@ KVM guest support on 32-bit Arm hosts (removed in 5.2) '''''''''''''''''''''''''''''''''''''''''''''''''''''' =20 The Linux kernel has dropped support for allowing 32-bit Arm systems -to host KVM guests as of the 5.7 kernel. Accordingly, QEMU is deprecating -its support for this configuration and will remove it in a future version. -Running 32-bit guests on a 64-bit Arm host remains supported. +to host KVM guests as of the 5.7 kernel, and was thus removed from QEMU +as well. Running 32-bit guests on a 64-bit Arm host remains supported. =20 RISC-V ISA Specific CPUs (removed in 5.1) ''''''''''''''''''''''''''''''''''''''''' --=20 2.38.1 From nobody Sun May 19 09:08:45 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=1671645828; cv=none; d=zohomail.com; s=zohoarc; b=XN6P+xRI0i1YhT82wz8avoNDEka9rrj+DW5u4X26BjFDQyTgzWlX6Qv2OlVrcgvOc0aDQk3AM081f+GhWAiCuWSnTTJedfmJRpTX0qpPhOtCP619dbhSoDwvtwKeSgzS+SVly4uyLo4KjA64cQyVu34oa8Sj04zW2c7MaSoWITM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671645828; 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=mBXTBGajaokMJvdkoc0LkDvuy3n+VaY2gFUkXO8juRo=; b=mi6OdJ2c81eRKrU8C3IKehzl3ivF568YXGvj0v0buOOP4cEn1BrlnM1nOZ0zJ6zIT51ntvAt/AZ+ru9aJEPmdT/ORXnBjJB10p6Ds/ZSnxsIsMI1VCfhuvgk/5b3+3IEd0wGS3drSJ2McxxeYxnsajHVkOzlH15Am4yOIxoayA8= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1671645828720792.9903222353388; Wed, 21 Dec 2022 10:03:48 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p83Qw-0001o7-1O; Wed, 21 Dec 2022 13:03:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83QS-0001PO-MT for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:45 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83QR-0004QE-43 for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:44 -0500 Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-380-p39R_vxzOP6M8EXFxEJmDw-1; Wed, 21 Dec 2022 13:02:39 -0500 Received: by mail-ed1-f71.google.com with SMTP id y20-20020a056402271400b0046c9a6ec30fso11826310edd.14 for ; Wed, 21 Dec 2022 10:02:38 -0800 (PST) Received: from avogadro.local ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id l10-20020a1709060cca00b00829e391b9ffsm3921080ejh.84.2022.12.21.10.02.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 10:02:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671645762; 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=mBXTBGajaokMJvdkoc0LkDvuy3n+VaY2gFUkXO8juRo=; b=Tg1/41R8ejI7FaeyFAGqQap38C6SOKF+gZqQhnx3Ua1YIQPKB0on5+1pL1SUAklb+Qwn0i CGSJ9EnYnjK/AAcfe6PIfxQgr8wo4KLc5uHX40+AdYbWqsSMeafHef1yUp7rpMeV9lYGlo 7VsCSVMdENtBMQ+DbsQTG2C06nT96Wk= X-MC-Unique: p39R_vxzOP6M8EXFxEJmDw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mBXTBGajaokMJvdkoc0LkDvuy3n+VaY2gFUkXO8juRo=; b=sGMjgOUR+wjy6udEYMALsLYu/0Ei53m2TGAX8KPYp+PIBBxqjpPp/K/LRSUvQ2VYLj upSrtXohTP9PyrI9JzekUSUt3Zgt/d8JoeKSFOhWNABhY9B4mQuoknmvmUbhMALv2m80 W+hof9cN31D0li6KyRIKJJSpivjuhk97yj93UZ2FkyouCdY+tUIghNone5TZCmezz1Cp gsYermt77Yv/7Oq61JaYgaWBGTV7dNtLt0m7NxUb/cnRGnnq9OuO1UmF2O0LpXBex2bO Kv/xBlvP0KaSI+HGUg9gkDNR1C/PzYu6vsziAihMGTrJCQ5RZZ1U27aYicJvzL1Ijl8Y ScCw== X-Gm-Message-State: AFqh2kowrldQ3TY2AIZMg+aYV1vq0ro62/LZ4329FHsxcSc7Pot7y41j CKdy/MZufmcE7TVCFL77RkXBKCc9Jp14ULjIcX1b3XgxDI0IQgNfOZIYJtpkS6W58pwcFQ/Q+0T mIRSNCOlmI+Y10FYSQHrrvboAFhvxEQk/DaJN1MdgrIXNTkYgafIYcWjb+SZFXtu37/M= X-Received: by 2002:aa7:db53:0:b0:45c:835c:c6d0 with SMTP id n19-20020aa7db53000000b0045c835cc6d0mr2226366edt.1.1671645757496; Wed, 21 Dec 2022 10:02:37 -0800 (PST) X-Google-Smtp-Source: AMrXdXsxw6kZ7+op+G3lb/5o5VC7AQ4s53+S420ySuAN/3IkV3xkGunyv8Zokxo+38FJRnOrj71/gA== X-Received: by 2002:aa7:db53:0:b0:45c:835c:c6d0 with SMTP id n19-20020aa7db53000000b0045c835cc6d0mr2226348edt.1.1671645757215; Wed, 21 Dec 2022 10:02:37 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 20/24] KVM: remove support for kernel-irqchip=off Date: Wed, 21 Dec 2022 19:01:37 +0100 Message-Id: <20221221180141.839616-21-pbonzini@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221221180141.839616-1-pbonzini@redhat.com> References: <20221221180141.839616-1-pbonzini@redhat.com> MIME-Version: 1.0 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=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, 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_H2=-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.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671645830820100003 Content-Type: text/plain; charset="utf-8" -machine kernel-irqchip=3Doff is broken for many guest OSes; kernel-irqchip= =3Dsplit is the replacement that works, so remove the deprecated support for the for= mer. Signed-off-by: Paolo Bonzini --- docs/about/deprecated.rst | 7 ------- docs/about/removed-features.rst | 10 ++++++++++ hw/i386/amd_iommu.c | 2 +- hw/i386/intel_iommu.c | 4 ++-- include/hw/i386/apic_internal.h | 2 +- target/i386/cpu-sysemu.c | 15 +++++++++++---- 6 files changed, 25 insertions(+), 15 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 93affe3669ff..5414289ffaf3 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -58,13 +58,6 @@ and will cause a warning. The replacement for the ``nodelay`` short-form boolean option is ``nodelay= =3Don`` rather than ``delay=3Doff``. =20 -Userspace local APIC with KVM (x86, since 6.0) -'''''''''''''''''''''''''''''''''''''''''''''' - -Using ``-M kernel-irqchip=3Doff`` with x86 machine types that include a lo= cal -APIC is deprecated. The ``split`` setting is supported, as is using -``-M kernel-irqchip=3Doff`` with the ISA PC machine type. - hexadecimal sizes with scaling multipliers (since 6.0) '''''''''''''''''''''''''''''''''''''''''''''''''''''' =20 diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.= rst index 7e12145c120d..78b332faf50a 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -616,6 +616,16 @@ x86 ``Icelake-Client`` CPU (removed in 7.1) There isn't ever Icelake Client CPU, it is some wrong and imaginary one. Use ``Icelake-Server`` instead. =20 +System accelerators +------------------- + +Userspace local APIC with KVM (x86, removed 8.0) +'''''''''''''''''''''''''''''''''''''''''''''''' + +``-M kernel-irqchip=3Doff`` cannot be used on KVM if the CPU model includes +a local APIC. The ``split`` setting is supported, as is using ``-M +kernel-irqchip=3Doff`` when the CPU does not have a local APIC. + System emulator machines ------------------------ =20 diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c index 725f69095b9e..bcd016f5c5a5 100644 --- a/hw/i386/amd_iommu.c +++ b/hw/i386/amd_iommu.c @@ -1368,7 +1368,7 @@ static MemTxResult amdvi_mem_ir_write(void *opaque, h= waddr addr, return MEMTX_ERROR; } =20 - apic_get_class()->send_msi(&to); + apic_get_class(NULL)->send_msi(&to); =20 trace_amdvi_mem_ir_write(to.address, to.data); return MEMTX_OK; diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index a08ee85edf2a..98a5c304a7d7 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -396,7 +396,7 @@ static void vtd_generate_interrupt(IntelIOMMUState *s, = hwaddr mesg_addr_reg, =20 trace_vtd_irq_generate(msi.address, msi.data); =20 - apic_get_class()->send_msi(&msi); + apic_get_class(NULL)->send_msi(&msi); } =20 /* Generate a fault event to software via MSI if conditions are met. @@ -3529,7 +3529,7 @@ static MemTxResult vtd_mem_ir_write(void *opaque, hwa= ddr addr, return MEMTX_ERROR; } =20 - apic_get_class()->send_msi(&to); + apic_get_class(NULL)->send_msi(&to); =20 return MEMTX_OK; } diff --git a/include/hw/i386/apic_internal.h b/include/hw/i386/apic_interna= l.h index c175e7e71816..968b6648b3a4 100644 --- a/include/hw/i386/apic_internal.h +++ b/include/hw/i386/apic_internal.h @@ -226,6 +226,6 @@ static inline int apic_get_bit(uint32_t *tab, int index) return !!(tab[i] & mask); } =20 -APICCommonClass *apic_get_class(void); +APICCommonClass *apic_get_class(Error **errp); =20 #endif /* QEMU_APIC_INTERNAL_H */ diff --git a/target/i386/cpu-sysemu.c b/target/i386/cpu-sysemu.c index fc97213a73cf..28115edf44f7 100644 --- a/target/i386/cpu-sysemu.c +++ b/target/i386/cpu-sysemu.c @@ -247,12 +247,16 @@ void x86_cpu_machine_reset_cb(void *opaque) cpu_reset(CPU(cpu)); } =20 -APICCommonClass *apic_get_class(void) +APICCommonClass *apic_get_class(Error **errp) { const char *apic_type =3D "apic"; =20 /* TODO: in-kernel irqchip for hvf */ - if (kvm_apic_in_kernel()) { + if (kvm_enabled()) { + if (!kvm_apic_in_kernel()) { + error_setg(errp, "KVM does not support userspace APIC"); + return NULL; + } apic_type =3D "kvm-apic"; } else if (xen_enabled()) { apic_type =3D "xen-apic"; @@ -266,10 +270,13 @@ APICCommonClass *apic_get_class(void) void x86_cpu_apic_create(X86CPU *cpu, Error **errp) { APICCommonState *apic; - ObjectClass *apic_class =3D OBJECT_CLASS(apic_get_class()); + APICCommonClass *apic_class =3D apic_get_class(errp); =20 - cpu->apic_state =3D DEVICE(object_new_with_class(apic_class)); + if (!apic_class) { + return; + } =20 + cpu->apic_state =3D DEVICE(object_new_with_class(OBJECT_CLASS(apic_cla= ss))); object_property_add_child(OBJECT(cpu), "lapic", OBJECT(cpu->apic_state)); object_unref(OBJECT(cpu->apic_state)); --=20 2.38.1 From nobody Sun May 19 09:08:45 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=1671646270; cv=none; d=zohomail.com; s=zohoarc; b=PsWjzi1OURW61pQ3usUVGkvyxIgII2kyAQMno+mLX5KyhO3K1FtPWKQDbUL0nLa1CJWaNnWqZ83x2bj55KOwxhTQbWhnN6D289qEb3zJrhelhRL3UqJVeqgydqQemq8JJnBgSVVikmAtDsMpHoOsljU5Gs9JerMrNTZWtmm0Krc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671646270; 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=1Jeu6FA/MHieGI8CRyJ/ec1SisMuo8BV2uEAxcGzt/U=; b=b9XzMOv6GqVt9/9ZjmUAiVTd7Vztei6fuNgg7R1xx9Ak45P1y2/xoMszrlpXYIEfYe5qGp/DXfmJtx1lgKYkY/RkhsLeAhVFN9MJaenMI6CQ0L7nZrKk1Z/xF1+GqngtQyFalCpBNwLCVZS5Vac9j+uBeXZ/7cwPghHrs7sCd6E= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1671646270060999.9753672805799; Wed, 21 Dec 2022 10:11:10 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p83Qj-0001Z2-5D; Wed, 21 Dec 2022 13:03:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83QW-0001Q4-Hf for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:48 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83QU-0004QQ-Rt for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:48 -0500 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-84-RlgLHrgKPNy3QxiZjGD_8A-1; Wed, 21 Dec 2022 13:02:41 -0500 Received: by mail-ej1-f72.google.com with SMTP id qb2-20020a1709077e8200b00842b790008fso254196ejc.21 for ; Wed, 21 Dec 2022 10:02:41 -0800 (PST) Received: from avogadro.local ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id jx14-20020a170906ca4e00b007b47749838asm7292711ejb.45.2022.12.21.10.02.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 10:02:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671645765; 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=1Jeu6FA/MHieGI8CRyJ/ec1SisMuo8BV2uEAxcGzt/U=; b=I79/pXzcysPOGzsoWG7aGPeguRoa35O1SnPClL3tmhaMLqoywGdp19TsvRwxI/iqBzA4gf 04Aw2YTB3MS2+i8aO0TX3hSdvNxRcueSKkFzA6msgY8mfZpmlZFhQP2FnK0KqS+j/b63mh BeB0MBQ/T3OaYaNZPWr4Qp/H+qa06gs= X-MC-Unique: RlgLHrgKPNy3QxiZjGD_8A-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1Jeu6FA/MHieGI8CRyJ/ec1SisMuo8BV2uEAxcGzt/U=; b=eD01IqAASDwxFqz8g0iAm3I04zMiCXr6qouWkxBtScnfes7pAjgK+/s17TqqEwKsmL GpheUw/mpBlETt1adkfFd5o/LrNFyJK1iAclZABJWzpWKFOT3fA8YKvPtkfTj/Y6AmTB ZYZLeHZmKHDfDBSUJDQ51eDGnhNlTtG04CLLYmKXZvi+XmEoPOx9v5gMA6oy06nK0aVH jIX+dyNoY79tQ+9GQ1GExFyyg13bB+AaJvSP5ZCHOZ2oI22SOajcpApFg7yjXYT3OUv6 Cwdc1bLlYJ2sMzLqi8t5p1QTEro4qfXXnCaiwPlfcgNYDjDi2jv3mTmlWJ9AcH3cYcGV tVVQ== X-Gm-Message-State: AFqh2krhIKBgN2d+IFa0DOIOsX2lpdRIW+BjXr2KJ3odGouSYYJ2P/ZS 1NLZSYT6Qi25LVwR8d74fRqn+4Oo8XOvwcSe5xlADZVYur7xM6E9mcvGfV5TmzZ7xtxg13P94z8 YwozBVWbN5Aqbf1MzJ7rseyB3oLXHSgN+jlm7fRl7oJZjEoqTN62pIbCyst37/+u0iJE= X-Received: by 2002:a17:907:a789:b0:7c0:bbab:22e5 with SMTP id vx9-20020a170907a78900b007c0bbab22e5mr2018487ejc.16.1671645759965; Wed, 21 Dec 2022 10:02:39 -0800 (PST) X-Google-Smtp-Source: AMrXdXt0noU568TzeY9hqVxB2KlbqoDN507hc610RwHymRBhJJt+a2lMYX3Iwpdd/Ckx+yRIpWuHVw== X-Received: by 2002:a17:907:a789:b0:7c0:bbab:22e5 with SMTP id vx9-20020a170907a78900b007c0bbab22e5mr2018467ejc.16.1671645759646; Wed, 21 Dec 2022 10:02:39 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 21/24] util: remove support for hex numbers with a scaling suffix Date: Wed, 21 Dec 2022 19:01:38 +0100 Message-Id: <20221221180141.839616-22-pbonzini@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221221180141.839616-1-pbonzini@redhat.com> References: <20221221180141.839616-1-pbonzini@redhat.com> MIME-Version: 1.0 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=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, 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_H2=-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.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671646270524100005 Content-Type: text/plain; charset="utf-8" This was deprecated in 6.0 and can now be removed. Signed-off-by: Paolo Bonzini --- docs/about/deprecated.rst | 8 -------- docs/about/removed-features.rst | 8 ++++++++ tests/unit/test-cutils.c | 8 ++++++++ util/cutils.c | 14 +++----------- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 5414289ffaf3..e2ca3c8b566d 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -58,14 +58,6 @@ and will cause a warning. The replacement for the ``nodelay`` short-form boolean option is ``nodelay= =3Don`` rather than ``delay=3Doff``. =20 -hexadecimal sizes with scaling multipliers (since 6.0) -'''''''''''''''''''''''''''''''''''''''''''''''''''''' - -Input parameters that take a size value should only use a size suffix -(such as 'k' or 'M') when the base is written in decimal, and not when -the value is hexadecimal. That is, '0x20M' is deprecated, and should -be written either as '32M' or as '0x2000000'. - ``-spice password=3Dstring`` (since 6.0) '''''''''''''''''''''''''''''''''''''' =20 diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.= rst index 78b332faf50a..724a83142511 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -408,6 +408,14 @@ pcspk-audiodev=3D``. =20 Use ``-device`` instead. =20 +Hexadecimal sizes with scaling multipliers (since 8.0) +'''''''''''''''''''''''''''''''''''''''''''''''''''''' + +Input parameters that take a size value should only use a size suffix +(such as 'k' or 'M') when the base is written in decimal, and not when +the value is hexadecimal. That is, '0x20M' should be written either as +'32M' or as '0x2000000'. + =20 QEMU Machine Protocol (QMP) commands ------------------------------------ diff --git a/tests/unit/test-cutils.c b/tests/unit/test-cutils.c index 86caddcf6498..2126b463919b 100644 --- a/tests/unit/test-cutils.c +++ b/tests/unit/test-cutils.c @@ -2315,6 +2315,14 @@ static void test_qemu_strtosz_invalid(void) g_assert_cmpint(res, =3D=3D, 0xbaadf00d); g_assert(endptr =3D=3D str); =20 + /* No suffixes */ + str =3D "0x18M"; + endptr =3D NULL; + err =3D qemu_strtosz(str, &endptr, &res); + g_assert_cmpint(err, =3D=3D, -EINVAL); + g_assert_cmpint(res, =3D=3D, 0xbaadf00d); + g_assert(endptr =3D=3D str); + /* No negative values */ str =3D "-0"; endptr =3D NULL; diff --git a/util/cutils.c b/util/cutils.c index def9c746cede..5887e7441405 100644 --- a/util/cutils.c +++ b/util/cutils.c @@ -197,10 +197,8 @@ static int64_t suffix_mul(char suffix, int64_t unit) * fractional portion is truncated to byte * - 0x7fEE - hexadecimal, unit determined by @default_suffix * - * The following cause a deprecation warning, and may be removed in the fu= ture - * - 0xabc{kKmMgGtTpP} - hex with scaling suffix - * * The following are intentionally not supported + * - hex with scaling suffix, such as 0x20M * - octal, such as 08 * - fractional hex, such as 0x1.8 * - floating point exponents, such as 1e3 @@ -222,7 +220,6 @@ static int do_strtosz(const char *nptr, const char **en= d, int retval; const char *endptr, *f; unsigned char c; - bool hex =3D false; uint64_t val, valf =3D 0; int64_t mul; =20 @@ -237,17 +234,16 @@ static int do_strtosz(const char *nptr, const char **= end, goto out; } if (val =3D=3D 0 && (*endptr =3D=3D 'x' || *endptr =3D=3D 'X')) { - /* Input looks like hex, reparse, and insist on no fraction. */ + /* Input looks like hex; reparse, and insist on no fraction or suf= fix. */ retval =3D qemu_strtou64(nptr, &endptr, 16, &val); if (retval) { goto out; } - if (*endptr =3D=3D '.') { + if (*endptr =3D=3D '.' || suffix_mul(*endptr, unit) > 0) { endptr =3D nptr; retval =3D -EINVAL; goto out; } - hex =3D true; } else if (*endptr =3D=3D '.') { /* * Input looks like a fraction. Make sure even 1.k works @@ -272,10 +268,6 @@ static int do_strtosz(const char *nptr, const char **e= nd, c =3D *endptr; mul =3D suffix_mul(c, unit); if (mul > 0) { - if (hex) { - warn_report("Using a multiplier suffix on hex numbers " - "is deprecated: %s", nptr); - } endptr++; } else { mul =3D suffix_mul(default_suffix, unit); --=20 2.38.1 From nobody Sun May 19 09:08:45 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=1671646049; cv=none; d=zohomail.com; s=zohoarc; b=gXmS4ODyikrHjh0z2dzFS0C+hlRlTPEgA2z9fxz46krTFlAo8KPFFz9hHIuHbdkCOoDZ3PPmyttm8Xli67qohHFo1SXU3zPO1ZpV1v79eh3rdfVFKtSb75eKKrsaaes1bY6CnmzE5PqMyhVBUffy3CbYlDTEi8vcPcDfrstKSzA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671646049; 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=N2YIepTp86KZkTWlT6697JjI+bssqxMA1MngkOKDmEw=; b=k5lVsM5yUkkz3YzWSzAlfX0hz80uJ4M99rPVZMSGdlH9BR2+9Jjk0IeBNhZ3NQ5vv/2igQ8B8v6wTknqpuwS2dc3NvrW4Q33VNoCyXACWyTfAKc3ExTEUOACg7ittJYYJmrgCimMk5qWo0GTAUlX38ZqQPkB1aUKriZfbacSbQA= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1671646049495345.790269330107; Wed, 21 Dec 2022 10:07:29 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p83Qu-0001lw-Kp; Wed, 21 Dec 2022 13:03:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83QX-0001Qk-QX for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:50 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83QV-0004QO-SI for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:49 -0500 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-284-qCuQhMbwN-G0GrJU6SNj0g-1; Wed, 21 Dec 2022 13:02:44 -0500 Received: by mail-ej1-f72.google.com with SMTP id ga21-20020a1709070c1500b007c171be7cd7so11222660ejc.20 for ; Wed, 21 Dec 2022 10:02:43 -0800 (PST) Received: from avogadro.local ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id p26-20020a056402045a00b004610899742asm7286845edw.13.2022.12.21.10.02.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 10:02:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671645765; 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=N2YIepTp86KZkTWlT6697JjI+bssqxMA1MngkOKDmEw=; b=bmauTUgwtS5wcq4UR7wu5rxRW/AXOuuwUlJFVyYM+vALk2vWaSD7AW39CrDM34LczX+aCz 0Ez56gOA5/oICPJbPSFVf3HnjEdfiPNK4cL+gCfPGugzBJJpimXgakrDkg9WCvbdF5cQgm 6DgvO4mxU+J/0/fTcpY7eBlHZLxJxMg= X-MC-Unique: qCuQhMbwN-G0GrJU6SNj0g-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=N2YIepTp86KZkTWlT6697JjI+bssqxMA1MngkOKDmEw=; b=H/ZeZ/649c+q39QthRsSAKxIMBtm/ImS7pdTk85t1BB3pntSgqHWa5pwY/AmbWLnJD QUzXGUpJkLxkvpxvSIh7QMKnMWrdmdDFqTEtxif+mVStbAvH/8CItpBxYxBzlLMMRv5s LYvN1W8IV/siJtVWu3M2tHmR1WuuZkhzgt4uIzjc2/HTMgRocjKjnCU6h9FOQpMVSLdU 7XNIAnR/JchZwRZNx3aQPZeAbR34BznMhDzdRnXuRDWcOIf7ivVuU+F9n0QZCRrtkqzs +ITn4cAYot1Bcr2jErzqVjU8aIbkSxmU1IlG5ccfuXPSfZqoxZ/88dACg/J81ckUOR/Z ie3Q== X-Gm-Message-State: AFqh2korhyYE7W87l+RQJRiDSGUAWvfxBRFX6sVG690vemhDIPm+lJLG FLH3LXGm9fuFqKq/4VkjWKU6uOzdMnBOfG//6WI9CIpShyd5b2Ke7pIoeI1+7kw+F/+yng2Foio 3Dv73pgIkM2o7X2rc8vdSOe4OUWFKk/32n8PJCjJpkf6Z2yc2UXnGmRvkRecMMX1oJ0s= X-Received: by 2002:a05:6402:e09:b0:479:3ffb:9243 with SMTP id h9-20020a0564020e0900b004793ffb9243mr2299133edh.25.1671645762531; Wed, 21 Dec 2022 10:02:42 -0800 (PST) X-Google-Smtp-Source: AMrXdXse7vPXZ8Sc9vX6WHpreMRKmD0Al0jounwzppmz9MxojR7pVGi6dumaQcG+r8/VDyp5lGRvZQ== X-Received: by 2002:a05:6402:e09:b0:479:3ffb:9243 with SMTP id h9-20020a0564020e0900b004793ffb9243mr2299110edh.25.1671645762199; Wed, 21 Dec 2022 10:02:42 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 22/24] util: remove support -chardev tty and -chardev parport Date: Wed, 21 Dec 2022 19:01:39 +0100 Message-Id: <20221221180141.839616-23-pbonzini@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221221180141.839616-1-pbonzini@redhat.com> References: <20221221180141.839616-1-pbonzini@redhat.com> MIME-Version: 1.0 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=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, 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_H2=-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.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671646051277100003 Content-Type: text/plain; charset="utf-8" These were deprecated in 6.0 and can now be removed. Signed-off-by: Paolo Bonzini --- chardev/char.c | 33 ++------------------------------- docs/about/deprecated.rst | 6 ------ docs/about/removed-features.rst | 5 +++++ docs/qdev-device-use.txt | 4 ++-- qemu-options.hx | 11 +---------- 5 files changed, 10 insertions(+), 49 deletions(-) diff --git a/chardev/char.c b/chardev/char.c index 4c5de164025d..87ab6efbcca0 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -530,19 +530,6 @@ static const ChardevClass *char_get_class(const char *= driver, Error **errp) return cc; } =20 -static struct ChardevAlias { - const char *typename; - const char *alias; - bool deprecation_warning_printed; -} chardev_alias_table[] =3D { -#ifdef HAVE_CHARDEV_PARPORT - { "parallel", "parport" }, -#endif -#ifdef HAVE_CHARDEV_SERIAL - { "serial", "tty" }, -#endif -}; - typedef struct ChadevClassFE { void (*fn)(const char *name, void *opaque); void *opaque; @@ -578,28 +565,12 @@ help_string_append(const char *name, void *opaque) g_string_append_printf(str, "\n %s", name); } =20 -static const char *chardev_alias_translate(const char *name) -{ - int i; - for (i =3D 0; i < (int)ARRAY_SIZE(chardev_alias_table); i++) { - if (g_strcmp0(chardev_alias_table[i].alias, name) =3D=3D 0) { - if (!chardev_alias_table[i].deprecation_warning_printed) { - warn_report("The alias '%s' is deprecated, use '%s' instea= d", - name, chardev_alias_table[i].typename); - chardev_alias_table[i].deprecation_warning_printed =3D tru= e; - } - return chardev_alias_table[i].typename; - } - } - return name; -} - ChardevBackend *qemu_chr_parse_opts(QemuOpts *opts, Error **errp) { Error *local_err =3D NULL; const ChardevClass *cc; ChardevBackend *backend =3D NULL; - const char *name =3D chardev_alias_translate(qemu_opt_get(opts, "backe= nd")); + const char *name =3D qemu_opt_get(opts, "backend"); =20 if (name =3D=3D NULL) { error_setg(errp, "chardev: \"%s\" missing backend", @@ -637,7 +608,7 @@ Chardev *qemu_chr_new_from_opts(QemuOpts *opts, GMainCo= ntext *context, const ChardevClass *cc; Chardev *chr =3D NULL; ChardevBackend *backend =3D NULL; - const char *name =3D chardev_alias_translate(qemu_opt_get(opts, "backe= nd")); + const char *name =3D qemu_opt_get(opts, "backend"); const char *id =3D qemu_opts_id(opts); char *bid =3D NULL; =20 diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index e2ca3c8b566d..91015ce5da3b 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -39,12 +39,6 @@ should specify an ``audiodev=3D`` property. Additionall= y, when using vnc, you should specify an ``audiodev=3D`` property if you plan to transmit audio through the VNC protocol. =20 -``-chardev`` backend aliases ``tty`` and ``parport`` (since 6.0) -'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - -``tty`` and ``parport`` are aliases that will be removed. Instead, the -actual backend names ``serial`` and ``parallel`` should be used. - Short-form boolean options (since 6.0) '''''''''''''''''''''''''''''''''''''' =20 diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.= rst index 724a83142511..44bd299142ca 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -416,6 +416,11 @@ Input parameters that take a size value should only us= e a size suffix the value is hexadecimal. That is, '0x20M' should be written either as '32M' or as '0x2000000'. =20 +``-chardev`` backend aliases ``tty`` and ``parport`` (removed in 8.0) +''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +``tty`` and ``parport`` used to be aliases for ``serial`` and ``parallel`` +respectively. The actual backend names should be used instead. =20 QEMU Machine Protocol (QMP) commands ------------------------------------ diff --git a/docs/qdev-device-use.txt b/docs/qdev-device-use.txt index 240888933482..c98c86d82802 100644 --- a/docs/qdev-device-use.txt +++ b/docs/qdev-device-use.txt @@ -216,11 +216,11 @@ LEGACY-CHARDEV translates to -chardev HOST-OPTS... as= follows: =20 * unix:FNAME becomes -chardev socket,path=3DFNAME =20 -* /dev/parportN becomes -chardev parport,file=3D/dev/parportN +* /dev/parportN becomes -chardev parallel,file=3D/dev/parportN =20 * /dev/ppiN likewise =20 -* Any other /dev/FNAME becomes -chardev tty,path=3D/dev/FNAME +* Any other /dev/FNAME becomes -chardev serial,path=3D/dev/FNAME =20 * mon:LEGACY-CHARDEV is special: it multiplexes the monitor onto the character device defined by LEGACY-CHARDEV. -chardev provides more diff --git a/qemu-options.hx b/qemu-options.hx index 7f99d15b231f..f3d5e1313ca1 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -3379,11 +3379,9 @@ DEF("chardev", HAS_ARG, QEMU_OPTION_chardev, #if defined(__linux__) || defined(__sun__) || defined(__FreeBSD__) \ || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__Dragon= Fly__) "-chardev serial,id=3Did,path=3Dpath[,mux=3Don|off][,logfile=3DPATH][,= logappend=3Don|off]\n" - "-chardev tty,id=3Did,path=3Dpath[,mux=3Don|off][,logfile=3DPATH][,log= append=3Don|off]\n" #endif #if defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__) "-chardev parallel,id=3Did,path=3Dpath[,mux=3Don|off][,logfile=3DPATH]= [,logappend=3Don|off]\n" - "-chardev parport,id=3Did,path=3Dpath[,mux=3Don|off][,logfile=3DPATH][= ,logappend=3Don|off]\n" #endif #if defined(CONFIG_SPICE) "-chardev spicevmc,id=3Did,name=3Dname[,debug=3Ddebug][,logfile=3DPATH= ][,logappend=3Don|off]\n" @@ -3398,7 +3396,7 @@ The general form of a character device option is: ``-chardev backend,id=3Did[,mux=3Don|off][,options]`` Backend is one of: ``null``, ``socket``, ``udp``, ``msmouse``, ``vc``, ``ringbuf``, ``file``, ``pipe``, ``console``, ``serial``, - ``pty``, ``stdio``, ``braille``, ``tty``, ``parallel``, ``parport``, + ``pty``, ``stdio``, ``braille``, ``parallel``, ``spicevmc``, ``spiceport``. The specific backend will determine the applicable options. =20 @@ -3622,15 +3620,8 @@ The available backends are: Connect to a local BrlAPI server. ``braille`` does not take any options. =20 -``-chardev tty,id=3Did,path=3Dpath`` - ``tty`` is only available on Linux, Sun, FreeBSD, NetBSD, OpenBSD - and DragonFlyBSD hosts. It is an alias for ``serial``. - - ``path`` specifies the path to the tty. ``path`` is required. - ``-chardev parallel,id=3Did,path=3Dpath`` \ -``-chardev parport,id=3Did,path=3Dpath`` ``parallel`` is only available on Linux, FreeBSD and DragonFlyBSD hosts. =20 --=20 2.38.1 From nobody Sun May 19 09:08:45 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=1671646252; cv=none; d=zohomail.com; s=zohoarc; b=Ir8Gx4TbKOvs2czuIYvIjxJjnUOLRB3TTbzCtscXWa/ehNXECbyGLLH74K0Q3vQRWshyXWD99s0M+WvU59epry4yr1MEIl8/CZzL+0z/2uEh/AATDTgijCpqf1tnzfurw+8w/NxeqSOxJ4qotzTGews32mdRrX2OrsQ51QPR8hk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671646252; 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=neorI5R9dYxm/+7T9pdqUTHAqRJ3IQekQ63O5eFICoE=; b=dfpPeZx+gQfZqSFtriVwNP63WJUTGasPUKO9YWHRqTdiAHo7uBf+Jl5qm4CSM1hQE+PX0KN6a7xYqofP6M5vkuj+FY+xvdTSI5emfgBg2lRKtGYyDzhbTjOe3ldQG+vWA/8PqXEgNKFu/15wnlzCK+6NLFugpgdySaznkB4Qiuo= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1671646252939476.25958186819696; Wed, 21 Dec 2022 10:10:52 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p83Ql-0001aK-AU; Wed, 21 Dec 2022 13:03:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83QX-0001Ql-SH for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:52 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83QW-0004QZ-7D for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:49 -0500 Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-540-cVsU3dqBNLCUhgUX3Gf7Ww-1; Wed, 21 Dec 2022 13:02:46 -0500 Received: by mail-ed1-f72.google.com with SMTP id z16-20020a05640235d000b0046d0912ae25so11827287edc.5 for ; Wed, 21 Dec 2022 10:02:46 -0800 (PST) Received: from avogadro.local ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id bq18-20020a170906d0d200b00782fbb7f5f7sm7317566ejb.113.2022.12.21.10.02.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 10:02:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671645767; 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=neorI5R9dYxm/+7T9pdqUTHAqRJ3IQekQ63O5eFICoE=; b=OlOKA1r/Tk0F/7JN+0EjvM8NLcVJhzMtaWROTaZzhqMYHu8W0xSxlHJvq2V9QXB/FgMDkX KOsQ3XK77raGRolzysfK//QlmnxHeuSj3PcYD7rItMgS5/A7LflCNvU8UZpp9gKVNrt5vm wJSFm/BFuVKnbkyC8h5EHDRZmds6m8Q= X-MC-Unique: cVsU3dqBNLCUhgUX3Gf7Ww-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=neorI5R9dYxm/+7T9pdqUTHAqRJ3IQekQ63O5eFICoE=; b=gCVHIGDp2fLfRUPUN1oiiGtcXeXcIehVkdHmzS466PLGBfCLSwEODWHfvDfpJgABVz bT6qWmHtm1Bcv1bmci6yPjSTm64kZ72R5E1r7uI6ORl4HQwJpdCG5/5Ehv2Vpkp1Qb9M WJ4Dnblwem3TqSCl+hN5TjVkn9FbDNeyCh5WSjvLecLmh6tj+A8pRhNeI6F0JaPUQi7Y wn311HkPAjZM+wk25li40o4v4wB0PiewfGLKrIMWAgGqb7VgrFtqUypJasbYQglfCRA1 yk20kURxct1LcZmtEbkKc968rOQB+/DtkmNKZNmLOMGZ3z/9ipX19VIhw7KV1HqJHYEY aHyA== X-Gm-Message-State: AFqh2ko+eg0ZQ16Otrv3h/I4A8L7F1L4+UH4y4YiAo3YDqWlyNrPFkug 82tZKV0fOZyxp3zY+omSXO2Zw1IVi6YoMXkuxAGOUtsjig0UjvqEzaahQiNhzhEaDRYhIHaZCn1 t7stiEtH7FbRfLIipJEWFtwwlvMBTJEiyVFj+f5XKLHMZV2MFKmY3WQVpcXKCxDpHmgA= X-Received: by 2002:a05:6402:685:b0:45c:be41:a473 with SMTP id f5-20020a056402068500b0045cbe41a473mr2322624edy.29.1671645764925; Wed, 21 Dec 2022 10:02:44 -0800 (PST) X-Google-Smtp-Source: AMrXdXvj0uLDykb5JiQ1CRoxSsiADuq3GdlWal0pDBmjJC0Pgbfgc+jFr7Udeqqay7KJmLSe/5OWmA== X-Received: by 2002:a05:6402:685:b0:45c:be41:a473 with SMTP id f5-20020a056402068500b0045cbe41a473mr2322606edy.29.1671645764675; Wed, 21 Dec 2022 10:02:44 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Kai Huang , Yang Zhong Subject: [PULL 23/24] target/i386: Add SGX aex-notify and EDECCSSA support Date: Wed, 21 Dec 2022 19:01:40 +0100 Message-Id: <20221221180141.839616-24-pbonzini@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221221180141.839616-1-pbonzini@redhat.com> References: <20221221180141.839616-1-pbonzini@redhat.com> MIME-Version: 1.0 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=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, 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_H2=-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.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671646254413100003 Content-Type: text/plain; charset="utf-8" From: Kai Huang The new SGX Asynchronous Exit (AEX) notification mechanism (AEX-notify) allows one enclave to receive a notification in the ERESUME after the enclave exit due to an AEX. EDECCSSA is a new SGX user leaf function (ENCLU[EDECCSSA]) to facilitate the AEX notification handling. Whether the hardware supports to create enclave with AEX-notify support is enumerated via CPUID.(EAX=3D0x12,ECX=3D0x1):EAX[10]. The new EDECCSSA user leaf function is enumerated via CPUID.(EAX=3D0x12,ECX=3D0x0):EAX[11]. Add support to allow to expose the new SGX AEX-notify feature and the new EDECCSSA user leaf function to KVM guest. Link: https://lore.kernel.org/lkml/166760360549.4906.809756297092548496.tip= -bot2@tip-bot2/ Link: https://lore.kernel.org/lkml/166760360934.4906.2427175408052308969.ti= p-bot2@tip-bot2/ Reviewed-by: Yang Zhong Signed-off-by: Kai Huang Message-Id: <20221109024834.172705-1-kai.huang@intel.com> Signed-off-by: Paolo Bonzini --- target/i386/cpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index ae502f0bfeab..6c742c891022 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -1233,7 +1233,7 @@ FeatureWordInfo feature_word_info[FEATURE_WORDS] =3D { .feat_names =3D { "sgx1", "sgx2", NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, + NULL, NULL, NULL, "sgx-edeccssa", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, @@ -1273,7 +1273,7 @@ FeatureWordInfo feature_word_info[FEATURE_WORDS] =3D { .feat_names =3D { NULL, "sgx-debug", "sgx-mode64", NULL, "sgx-provisionkey", "sgx-tokenkey", NULL, "sgx-kss", - NULL, NULL, NULL, NULL, + NULL, NULL, "sgx-aex-notify", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, --=20 2.38.1 From nobody Sun May 19 09:08:45 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=1671645887; cv=none; d=zohomail.com; s=zohoarc; b=PgV/Wjk1j5p+ypFr2Ug848YQiw+YUBDnIbPbulwD12IDwBRynBLVmTxhkem8nBN/zQwt2kTt6O9mST79RBpkFfzxENU7KViKBuQkbIEdbU0Zg27/yY59/7f8Lh7nUCe+GeLJacVoIEX7IB98BmgrfH8jeecm3qcdIT3tVyq2Y4s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671645887; 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=LGPZjGxxYxhIYJTsd727PH2vevZKkF3XOuCGOKh0wZw=; b=YbPfG6tmTkasJLQLJz3uiEGE8L+xHSacqBM2xZji1h/br/FFBSoWJatr5poVEsltKCPLySuvNjkzO2PebCxLhZKwjoELtJeBvTpgbViKcZ2qQdX/7RJyNdRtrs8QliA7UKQ2fqraemeM3DbblLKcPwUNDOsIddBrubj1gUllvJA= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1671645887848277.24895677615416; Wed, 21 Dec 2022 10:04:47 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p83Qp-0001fS-Mo; Wed, 21 Dec 2022 13:03:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83Qb-0001SJ-GP for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:55 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p83QZ-0004Rr-Ph for qemu-devel@nongnu.org; Wed, 21 Dec 2022 13:02:53 -0500 Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-624-mu6AZMfwMBCrjyNKw-p91Q-1; Wed, 21 Dec 2022 13:02:49 -0500 Received: by mail-ed1-f69.google.com with SMTP id b16-20020a056402279000b0046fb99731e6so11706728ede.1 for ; Wed, 21 Dec 2022 10:02:49 -0800 (PST) Received: from avogadro.local ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id ku17-20020a170907789100b008072c925e4csm5734907ejc.21.2022.12.21.10.02.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 10:02:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671645771; 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=LGPZjGxxYxhIYJTsd727PH2vevZKkF3XOuCGOKh0wZw=; b=et0jQmKbzJTzVQiAx9/Dm8lowRHWqSCBfXAk+4BTvOs3YAHk5CUZAPSj5YoeOGbGlkm1so qIqfhgK1ppDDpUlOp75UAz9hoz5g3jACGWjNW6Q34OwVzxKoz6oOpMO+mr5qPPzrCFPtUE QWHfDnSlsjlCmHzg97NaIdp7FaGAeX0= X-MC-Unique: mu6AZMfwMBCrjyNKw-p91Q-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LGPZjGxxYxhIYJTsd727PH2vevZKkF3XOuCGOKh0wZw=; b=vfr36S2lFP3qvkYcb3Psj7be82DzVSklhXy8xbTXSFHjbTQtHvYMVjUltZlf2xYapw ejji0cOgkq7c9Tq++KmXSSeKogcbsiGYP1lh5Tv6C6fFKy1zPBY4BcbohACE4vzMAHuN VDZAjrvTIhFuKpbBNWBmai3df/AhCEMSjV+LcFUDMd2QDnhDbif1bHaEK0LvlhYv+2Lu /B7iePAc59vhDNoCs0X0yU6wXd4YfGbtm2Z99EQ2EnrPJRB/BF4QAOMqckG01/b9ruaa /9BxS7MEO3UCa8/DdgtdvHX3r5mAi1DqMIZw3ul5Og/6k5Fo7wIWko/DnzkHzBTedBYC pZ/Q== X-Gm-Message-State: AFqh2krqyrhbfJLaLVytGRRBG6pw7A5Glha30j6QSOTfEWUOUKhdfO+H o8SMb7nAMTdRhBg2sbJNUcBej4+27Rj4WKV0p4C6znHNhxkawOq65b/5i5q33YWqCMczY+//ZIT yKpXSMhsa9UTRy8y2Jz7r4Im11DdB2hAAbMGVEvm3bgr7bmvqTsforjtYAsMa7Tv2F94= X-Received: by 2002:a17:906:191a:b0:837:c2fc:a97c with SMTP id a26-20020a170906191a00b00837c2fca97cmr2073961eje.64.1671645767881; Wed, 21 Dec 2022 10:02:47 -0800 (PST) X-Google-Smtp-Source: AMrXdXuxrYSYycO8GvzZd8EBGABDmzX7fm+pzF/y2fKtrUDySg4p21c07UFGYEjVVPCd4/FhY0tKIw== X-Received: by 2002:a17:906:191a:b0:837:c2fc:a97c with SMTP id a26-20020a170906191a00b00837c2fca97cmr2073931eje.64.1671645767548; Wed, 21 Dec 2022 10:02:47 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 24/24] i386: SGX: remove deprecated member of SGXInfo Date: Wed, 21 Dec 2022 19:01:41 +0100 Message-Id: <20221221180141.839616-25-pbonzini@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221221180141.839616-1-pbonzini@redhat.com> References: <20221221180141.839616-1-pbonzini@redhat.com> MIME-Version: 1.0 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=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, 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_H2=-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.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671645888071100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- docs/about/deprecated.rst | 13 ------------- docs/about/removed-features.rst | 13 +++++++++++++ hw/i386/sgx.c | 15 ++++++--------- qapi/misc-target.json | 12 ++---------- 4 files changed, 21 insertions(+), 32 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 91015ce5da3b..c3a874dee806 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -165,19 +165,6 @@ accepted incorrect commands will return an error. User= s should make sure that all arguments passed to ``device_add`` are consistent with the documented property types. =20 -``query-sgx`` return value member ``section-size`` (since 7.0) -'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - -Member ``section-size`` in return value elements with meta-type ``uint64``= is -deprecated. Use ``sections`` instead. - - -``query-sgx-capabilities`` return value member ``section-size`` (since 7.0) -''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - -Member ``section-size`` in return value elements with meta-type ``uint64``= is -deprecated. Use ``sections`` instead. - System accelerators ------------------- =20 diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.= rst index 44bd299142ca..c918cabd1aaa 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -507,6 +507,19 @@ type of array items in query-named-block-nodes. =20 Specify the properties for the object as top-level arguments instead. =20 +``query-sgx`` return value member ``section-size`` (removed in 8.0) +''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +Member ``section-size`` in the return value of ``query-sgx`` +was superseded by ``sections``. + + +``query-sgx-capabilities`` return value member ``section-size`` (removed i= n 8.0) +''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''= '''''' + +Member ``section-size`` in the return value of ``query-sgx-capabilities`` +was superseded by ``sections``. + Human Monitor Protocol (HMP) commands ------------------------------------- =20 diff --git a/hw/i386/sgx.c b/hw/i386/sgx.c index 09d9c7c73d9f..db004d17a65d 100644 --- a/hw/i386/sgx.c +++ b/hw/i386/sgx.c @@ -83,7 +83,7 @@ static uint64_t sgx_calc_section_metric(uint64_t low, uin= t64_t high) ((high & MAKE_64BIT_MASK(0, 20)) << 32); } =20 -static SGXEPCSectionList *sgx_calc_host_epc_sections(uint64_t *size) +static SGXEPCSectionList *sgx_calc_host_epc_sections(void) { SGXEPCSectionList *head =3D NULL, **tail =3D &head; SGXEPCSection *section; @@ -106,7 +106,6 @@ static SGXEPCSectionList *sgx_calc_host_epc_sections(ui= nt64_t *size) section =3D g_new0(SGXEPCSection, 1); section->node =3D j++; section->size =3D sgx_calc_section_metric(ecx, edx); - *size +=3D section->size; QAPI_LIST_APPEND(tail, section); } =20 @@ -157,7 +156,6 @@ SGXInfo *qmp_query_sgx_capabilities(Error **errp) { SGXInfo *info =3D NULL; uint32_t eax, ebx, ecx, edx; - uint64_t size =3D 0; =20 int fd =3D qemu_open_old("/dev/sgx_vepc", O_RDWR); if (fd < 0) { @@ -175,8 +173,7 @@ SGXInfo *qmp_query_sgx_capabilities(Error **errp) info->sgx1 =3D eax & (1U << 0) ? true : false; info->sgx2 =3D eax & (1U << 1) ? true : false; =20 - info->sections =3D sgx_calc_host_epc_sections(&size); - info->section_size =3D size; + info->sections =3D sgx_calc_host_epc_sections(); =20 close(fd); =20 @@ -223,14 +220,12 @@ SGXInfo *qmp_query_sgx(Error **errp) return NULL; } =20 - SGXEPCState *sgx_epc =3D &pcms->sgx_epc; info =3D g_new0(SGXInfo, 1); =20 info->sgx =3D true; info->sgx1 =3D true; info->sgx2 =3D true; info->flc =3D true; - info->section_size =3D sgx_epc->size; info->sections =3D sgx_get_epc_sections_list(); =20 return info; @@ -241,6 +236,7 @@ void hmp_info_sgx(Monitor *mon, const QDict *qdict) Error *err =3D NULL; SGXEPCSectionList *section_list, *section; g_autoptr(SGXInfo) info =3D qmp_query_sgx(&err); + uint64_t size =3D 0; =20 if (err) { error_report_err(err); @@ -254,8 +250,6 @@ void hmp_info_sgx(Monitor *mon, const QDict *qdict) info->sgx2 ? "enabled" : "disabled"); monitor_printf(mon, "FLC support: %s\n", info->flc ? "enabled" : "disabled"); - monitor_printf(mon, "size: %" PRIu64 "\n", - info->section_size); =20 section_list =3D info->sections; for (section =3D section_list; section; section =3D section->next) { @@ -263,7 +257,10 @@ void hmp_info_sgx(Monitor *mon, const QDict *qdict) section->value->node); monitor_printf(mon, "size=3D%" PRIu64 "\n", section->value->size); + size +=3D section->value->size; } + monitor_printf(mon, "total size=3D%" PRIu64 "\n", + size); } =20 bool sgx_epc_get_section(int section_nr, uint64_t *addr, uint64_t *size) diff --git a/qapi/misc-target.json b/qapi/misc-target.json index 4944c0528fe2..5b6a8e91850a 100644 --- a/qapi/misc-target.json +++ b/qapi/misc-target.json @@ -329,14 +329,8 @@ # # @flc: true if FLC is supported # -# @section-size: The EPC section size for guest -# Redundant with @sections. Just for backward compatibilit= y. -# # @sections: The EPC sections info for guest (Since: 7.0) # -# Features: -# @deprecated: Member @section-size is deprecated. Use @sections instead. -# # Since: 6.2 ## { 'struct': 'SGXInfo', @@ -344,8 +338,6 @@ 'sgx1': 'bool', 'sgx2': 'bool', 'flc': 'bool', - 'section-size': { 'type': 'uint64', - 'features': [ 'deprecated' ] }, 'sections': ['SGXEPCSection']}, 'if': 'TARGET_I386' } =20 @@ -362,7 +354,7 @@ # # -> { "execute": "query-sgx" } # <- { "return": { "sgx": true, "sgx1" : true, "sgx2" : true, -# "flc": true, "section-size" : 96468992, +# "flc": true, # "sections": [{"node": 0, "size": 67108864}, # {"node": 1, "size": 29360128}]} } # @@ -382,7 +374,7 @@ # # -> { "execute": "query-sgx-capabilities" } # <- { "return": { "sgx": true, "sgx1" : true, "sgx2" : true, -# "flc": true, "section-size" : 96468992, +# "flc": true, # "section" : [{"node": 0, "size": 67108864}, # {"node": 1, "size": 29360128}]} } # --=20 2.38.1