From patchwork Mon Dec 19 17:08:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 635121 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2448876pvb; Mon, 19 Dec 2022 09:08:55 -0800 (PST) X-Google-Smtp-Source: AA0mqf6CD5pfkcnm4fV9SyR0SmZcazwvK884KISOvvhVWPwIbSwNB+xtmnb2cwHnB11qoE1c2LBy X-Received: by 2002:a05:6358:d189:b0:e0:3375:8d05 with SMTP id ka9-20020a056358d18900b000e033758d05mr1884592rwb.2.1671469735071; Mon, 19 Dec 2022 09:08:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671469735; cv=none; d=google.com; s=arc-20160816; b=lSqkDTDANrfyr14VHB87xNevQjK4K9craOwaGvOI0AfKZ0XiYM2jK0mIMTewC+LREQ nN2f3y5JoKJLJtTfrxNvr+hrMVOxMN1d2ecpF5/Xe32m8o1vShUvI9jDe9TMxmY5ar4x cT1/MfQEqCHuTJ8FFgCrgNqXTHICaIIRukLF00uWih2hO5jbyEW2wKlUwRv49HQfo7TC 85NAKgEhUvkHw/2+nAntAc3RPaoXwKk0A4iUGr2Il7HJk3GVjM2aYXa/HI1la+dP5iTi aiWJOYGF8fhqKOYvzymd8ePRNRcpDrUtcDjK+TdcbqUopDEDNd98rT/P4IlXLZF4vkeY dBjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=2I9jBzjhbP9BR4+xEVxqmNR4IAreTs/c1FrP+L03MM4=; b=l/fWbtPlo6Cq/J/CSiJ4dT6NWGX3Tci0jyUlAgNsHNhCbvnbx8BibyJSJO+wbschsc N319fHQZ7EpbWRX2d4XLuCysP8wabvbKbiFGASntUEBn1m8B97KF4lO/w2g5GHLQ57xv KTzrrzeiTuiyXBYBm8mYXJHVU9dgVDgHrYneZlni9KoE6AD7m2wwVdtLDrEm8/Oa7Z+i /S3I9jZEWzqqfhmHhDA/iWQuFcGWcKGD3VnlIRxuwoUSVV1rfNrhv6hdN7VZ0FCPN2kf zSkmA4t8HUXbLnEusOcpriQZeW8m5MmqDzLyWLbFfhqQU54ckRKXbD24+W69/zPHlmt6 /fiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=aSQBYpy+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v9-20020ae9e309000000b006fa57ff8d78si4083124qkf.67.2022.12.19.09.08.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 19 Dec 2022 09:08:55 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=aSQBYpy+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7Jci-00016r-Hf; Mon, 19 Dec 2022 12:08:20 -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 1p7Jcg-00013B-Ie for qemu-devel@nongnu.org; Mon, 19 Dec 2022 12:08:18 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p7Jce-0008Cc-Pc for qemu-devel@nongnu.org; Mon, 19 Dec 2022 12:08:18 -0500 Received: by mail-wm1-x331.google.com with SMTP id r8-20020a1c4408000000b003d35acb0f9fso101313wma.2 for ; Mon, 19 Dec 2022 09:08:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2I9jBzjhbP9BR4+xEVxqmNR4IAreTs/c1FrP+L03MM4=; b=aSQBYpy+/FWW9BxI/g7cyeyIGqgq+EHHrxC0PMs/lyo1kFGtWdDED/v4HuSGuKGOQJ sanX4cuo3HQTX7ppv/Y/QkAvG3vthFkw7g4UNP3QANENyzrfMGBKeS1kZSz5PGnVcb3e tYFFaAI1XbDaeCZCk9wNsp83rgFVtRRyqFVSUA8RT3GN0UWupq9U7X1CmeUA7YwRfQcR zJ0yELV8/jvHygoKusgmpB5tpEt0uEEcEes73h8SRHTV99RX3Lbyc58x/MKgLB10b/FA TBMKFvNXGdgKHZ7ybSj4Bn8gG2lfd63A4G3Hk5A1GYlKFM0me4zwttL4G45ehUky2x+8 TApQ== 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=2I9jBzjhbP9BR4+xEVxqmNR4IAreTs/c1FrP+L03MM4=; b=eXP2SHCsP6aQAmLO7U+V5E2dhnX7vYz8batzYDDkICgqhzdLwQw6GJ9alBPxOwCUZ+ 1+Zd4SjgZDBhij9AnoeBjXTciqt4qHFaHk7zKnurEDtqrSg/H1o4Xi6w+xK72+5uq5VG PAhIwTndjZ+lpQduIf9ej2HCyUvbqkzAg6vcQNoF48XSxsAqdzNQP6hZ2pTG+LmgLfVZ YuOvsaL6gmx8kfcux+wbkTheBkANwUOGaEdAonPjIhKYCKDTuUW0d6dlCjwN8mq8uJqh i0agzBF1KA396eIFqHa56kxvTkUgA0abdX0XUCwnZ7X0mp8ZMObtJgv1Y6VcRyC/kgls a32w== X-Gm-Message-State: ANoB5pk8Gxq11v6Advr4uTVH0AJysczmAdun8rz9RHXDaoQHePM8SnfY sq5iyx3SNnt8pgia5yfqYFu1T0OqqvB5HrrY0no= X-Received: by 2002:a05:600c:6543:b0:3d1:fcca:ce24 with SMTP id dn3-20020a05600c654300b003d1fccace24mr31310337wmb.32.1671469694960; Mon, 19 Dec 2022 09:08:14 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id c6-20020a05600c0a4600b003d1e3b1624dsm22246964wmq.2.2022.12.19.09.08.13 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 19 Dec 2022 09:08:14 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?A?= =?utf-8?q?lex_Benn=C3=A9e?= , Richard Henderson , Paolo Bonzini , Eduardo Habkost , Yanan Wang , Pavel Dovgalyuk , Marcel Apfelbaum , Markus Armbruster , Riku Voipio Subject: [PATCH 1/5] exec: Remove unused 'qemu/timer.h' timer Date: Mon, 19 Dec 2022 18:08:02 +0100 Message-Id: <20221219170806.60580-2-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221219170806.60580-1-philmd@linaro.org> References: <20221219170806.60580-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- accel/tcg/cpu-exec.c | 1 - accel/tcg/translate-all.c | 1 - include/exec/gen-icount.h | 1 - include/sysemu/cpus.h | 1 - tcg/tcg.c | 1 - 5 files changed, 5 deletions(-) diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 356fe348de..298149ed07 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -29,7 +29,6 @@ #include "tcg/tcg.h" #include "qemu/atomic.h" #include "qemu/compiler.h" -#include "qemu/timer.h" #include "qemu/rcu.h" #include "exec/log.h" #include "qemu/main-loop.h" diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index ed6656fb14..dea5ca81b5 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -49,7 +49,6 @@ #include "exec/translator.h" #include "qemu/bitmap.h" #include "qemu/qemu-print.h" -#include "qemu/timer.h" #include "qemu/main-loop.h" #include "qemu/cacheinfo.h" #include "exec/log.h" diff --git a/include/exec/gen-icount.h b/include/exec/gen-icount.h index c57204ddad..166170b08e 100644 --- a/include/exec/gen-icount.h +++ b/include/exec/gen-icount.h @@ -2,7 +2,6 @@ #define GEN_ICOUNT_H #include "exec/exec-all.h" -#include "qemu/timer.h" /* Helpers for instruction counting code generation. */ diff --git a/include/sysemu/cpus.h b/include/sysemu/cpus.h index 1bace3379b..0535a4c68a 100644 --- a/include/sysemu/cpus.h +++ b/include/sysemu/cpus.h @@ -1,7 +1,6 @@ #ifndef QEMU_CPUS_H #define QEMU_CPUS_H -#include "qemu/timer.h" #include "sysemu/accel-ops.h" /* register accel-specific operations */ diff --git a/tcg/tcg.c b/tcg/tcg.c index 436fcf6ebd..1071fc00fe 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -34,7 +34,6 @@ #include "qemu/cutils.h" #include "qemu/host-utils.h" #include "qemu/qemu-print.h" -#include "qemu/timer.h" #include "qemu/cacheflush.h" #include "qemu/cacheinfo.h" From patchwork Mon Dec 19 17:08:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 635124 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2449412pvb; Mon, 19 Dec 2022 09:09:44 -0800 (PST) X-Google-Smtp-Source: AA0mqf5Nqo5h/oE1J5GluY8y6psw3QF7ijQgmKPy/C7WUQaOEEhNiv1lJm2vAZs5bArnta+rr2OH X-Received: by 2002:a05:622a:4ac4:b0:3a5:430e:e396 with SMTP id fx4-20020a05622a4ac400b003a5430ee396mr60476791qtb.2.1671469784112; Mon, 19 Dec 2022 09:09:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671469784; cv=none; d=google.com; s=arc-20160816; b=rxC/XO9TR+IW5ACbWR+xI2EbQBU/blUpIdN3u2pmYrnOVZC0gaa6AnMFCR9dp7uWbK 573XgAjcOe45QTIAWQgvFTCGtopkDJqcDdvAEv5kp0miyXZRaqkmvtycuMzvH4so7VZw MJtmanB2NgE5vBB/JLrRjgl/W8KqqebTFNHXAMtBPDJ3YPwGNgTemqjZuLBibIpQqfdN +1W5xAtgeHLWnZ3lBVFLS2zObqPyLHsNIJg0NgCqioNglBawJSHihvW6XVMtR6h6Y2uT tzHUzuSkG7+J4m5uhGzeTomR2Um8QlStqyO1wilm6RPh7pU1zYaIhzvVKW5QFOxvM3G4 sOfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=PPCnaiFp/o2NqOTQwYWhzNIl62iAeoVZZkQOuLVC7VU=; b=JnPi9z0tu12CnhuSKjT8kmf9kvsH6KcWxGNYT4g/HsjViNXf53v43GUILuSuAylWZY IlqVa05Rw6sIwLmVEt56Hup08KLC/QDeiEwldr7l6EP27vfQQpc2Nz3nH0l29oQlVrFo Fu1zTATtzJ5Mnk7OoKPRRwI09Z9kEGx4h9Gqz6UfYV3OBWXniyld7/i9FtrdBbJfeLnO ScbrJZW5/bH24LvkThn6QFEXByqUNFbaQUnFuT9SuPr5oWYcMcbsYSBqqQBDjzTUX3iu 0oanzb/YMGTp+gvnrnQL+KFHnOPwDm+f+JKSYIyiuEAGJlzhOLvX5wClnij4qzoa9Iw3 vhCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BSYmtVFS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id bx12-20020a05622a090c00b003a826a0d0e1si4189927qtb.629.2022.12.19.09.09.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 19 Dec 2022 09:09:44 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BSYmtVFS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7Jcn-0001L2-NB; Mon, 19 Dec 2022 12:08: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 1p7Jcl-0001Gm-TK for qemu-devel@nongnu.org; Mon, 19 Dec 2022 12:08:23 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p7Jck-0008DI-Dh for qemu-devel@nongnu.org; Mon, 19 Dec 2022 12:08:23 -0500 Received: by mail-wm1-x329.google.com with SMTP id o15so6898397wmr.4 for ; Mon, 19 Dec 2022 09:08:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PPCnaiFp/o2NqOTQwYWhzNIl62iAeoVZZkQOuLVC7VU=; b=BSYmtVFSCObRazke2J0XPBMJxLhmT7pTBCy2XQfcbfq5Cvd4hYI/Hdg+kQKGALn14n SwTRaBIQmHk81S1SGYRUcO0sx8Cyh+mnKk27XYZvIbpk/YDX+FRKAw1otocyhOyzZvZg IOb0++xZmwWUF7GH1GhRCs6MM3ogE7HiC/zyoGVNiL2cbreB04DXbEzRgdk3WL6cnadt JWijh7uAGc/v3svdnxXsz10N91ANQguY1NH2/czEyHKeVxRUIUOvFrH9o3V6C5bvtyet XU2Gu5fx4eaNepxNuhJ4M0V2U7Aspq5NDIgTCDegi1aSFssnUsbAMFlG8/LOqf8dxcYD 2Ilw== 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=PPCnaiFp/o2NqOTQwYWhzNIl62iAeoVZZkQOuLVC7VU=; b=hp3ca/I2riC9G4i9R+S97lNFb3uDgw747X7B0/jHl/TInaDatZ85uURyo3XqfYU2Ka qjFuUK+l0zlo0iPUG/mE34xkGId9kUmS+Px2Uvp9q78wN6exxy52tRO+31p/uM83B9ea Zyn5dlbrGw2poWJLpMT4j8opIwct4ko6Nb9uhNerbu1sIW9MGHEHIsteHH8bLKneMAjW ko2wXAb3W8xgLQm5mzBxeeXm6dcnyFWQFhFUN6xL+WUKfxFCl3h3/4cKb31J6uqXgrJk hZ8XrVfE2AegC9Bp/OdS1DpiS7LqRwUt3KrcXsM7+JXQK4ihnjfVICknv6xTCKLEc8zu FT8g== X-Gm-Message-State: ANoB5pm3sXb5Ooei+S9eIUKkHgGi9nClEU4X0nHsa7bGpytlRcROIBSI rZWd7ku5o+eeoxDpSkIKV4UAae/b0TIfKpnM23s= X-Received: by 2002:a05:600c:4fc8:b0:3cf:b067:4142 with SMTP id o8-20020a05600c4fc800b003cfb0674142mr32775937wmq.4.1671469700452; Mon, 19 Dec 2022 09:08:20 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id c6-20020a05600c0a4600b003d1e3b1624dsm22247214wmq.2.2022.12.19.09.08.18 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 19 Dec 2022 09:08:19 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?A?= =?utf-8?q?lex_Benn=C3=A9e?= , Richard Henderson , Paolo Bonzini , Eduardo Habkost , Yanan Wang , Pavel Dovgalyuk , Marcel Apfelbaum , Markus Armbruster , Riku Voipio Subject: [PATCH 2/5] tcg/tcg-op-gvec: Remove unused "qemu/main-loop.h" header Date: Mon, 19 Dec 2022 18:08:03 +0100 Message-Id: <20221219170806.60580-3-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221219170806.60580-1-philmd@linaro.org> References: <20221219170806.60580-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=philmd@linaro.org; helo=mail-wm1-x329.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- Added in db72581598 ("Include qemu/main-loop.h less") but now I can't see what is requiring it. I checked 'git diff db725815985..origin/master -- tcg/tcg-op-gvec.c' to see if some code was removed without removing the header; I haven't checked individual commits. --- tcg/tcg-op-gvec.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tcg/tcg-op-gvec.c b/tcg/tcg-op-gvec.c index 079a761b04..aacedd3e15 100644 --- a/tcg/tcg-op-gvec.c +++ b/tcg/tcg-op-gvec.c @@ -21,7 +21,6 @@ #include "tcg/tcg.h" #include "tcg/tcg-op.h" #include "tcg/tcg-op-gvec.h" -#include "qemu/main-loop.h" #include "tcg/tcg-gvec-desc.h" #define MAX_UNROLL 4 From patchwork Mon Dec 19 17:08:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 635125 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2449797pvb; Mon, 19 Dec 2022 09:10:19 -0800 (PST) X-Google-Smtp-Source: AA0mqf5pFoeH89IyoT+Nw8t5n5tP111VTgYyoYAo7aLMkH7s2dx614iMTOsa5lX230xkR0QBTfDM X-Received: by 2002:a05:622a:6114:b0:3a7:fd82:f69b with SMTP id hg20-20020a05622a611400b003a7fd82f69bmr47911517qtb.8.1671469819338; Mon, 19 Dec 2022 09:10:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671469819; cv=none; d=google.com; s=arc-20160816; b=upmCbgYaqg+rVzeC793eIwiNMHIk4jeIAMSOjjkXeI3aYqZD7uE0ahJLGTUR8S46Dr 9Yidw6JjPAmu26sOjNlHoTmI/nO9fwfTx5Og4KBcF4bIFwKiusyFT09gbI5yWd72zSRt oriVzQ29v6CgfiXPZ1cLiTFUGbt6wPOG8XPO2FaNy21YONk0uH9MMxnyYt9hkWxsjkT0 nia9EMI0v7+j9i0i/H+Q3H1YRwUwgu8lb+9hSAaaeJzFelcU7eevBF8AqExDzEl4mwUL kBzDm5FVFIRCWZYA0SuDEv2wzsRkzrsH7SZbb6x+Lb+mS4ubBts9QHIBxMoFiBuTuXtG rLGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=nWmFA2W38I7w2kRnI6UYlXE2qkCTQg0mxTJlq43TbYg=; b=dkCoW8jJSvfuTvTsHcuBX3NIr3NRWTEadkvDkJu0hKKIgWEHp4ENMCyESiDUCYE6E1 rRyPddtLKVjxMM1Gc9d/Baue0FqqIILYuUBdSYUAC0bMwwoGvUAqp4JQzJT+X9hINakj lqea9qITAEYpvDHVVunPbKTThut/c0RtPDGRBpVjWxe8Qf0go4hXi9WBni2kJrx9lYzi dIj88LyMtTscf4JqIJKJyI+4lp0ooKA3Y7OXr54bfj+tRfRTKWsU3AJACF4gBY+gvq35 DrU+ujw6AIpjir1TJQkmh0uR0cP48syvlcMzp8M6z07uwyarQnlUxEkJZvMsMkBsf2db OH5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GP5AdSYg; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ci13-20020a05622a260d00b00393d3e3decdsi4327099qtb.22.2022.12.19.09.10.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 19 Dec 2022 09:10:19 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GP5AdSYg; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7Jct-0001VO-Co; Mon, 19 Dec 2022 12:08:31 -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 1p7Jcr-0001RW-Dm for qemu-devel@nongnu.org; Mon, 19 Dec 2022 12:08:29 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p7Jcp-0008EH-EW for qemu-devel@nongnu.org; Mon, 19 Dec 2022 12:08:29 -0500 Received: by mail-wm1-x32c.google.com with SMTP id bg10so6927419wmb.1 for ; Mon, 19 Dec 2022 09:08:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nWmFA2W38I7w2kRnI6UYlXE2qkCTQg0mxTJlq43TbYg=; b=GP5AdSYgmSETsrJsGabHdLBtnNDfXNRvR9hpT4b3pBvTvAiQ4XHALEZVSy85iOECvz Mqcf3FzK7FqTrF4U6Hon5LgAf9rKKpFLQCkNbWdIfJeLsyYIwjpWMt3hROtGoLXuWjvM SGhLfGeKIBITlwRvG82BXfSdNUJ48sbqvkkNnAwqxPXTifh0K0Sqjh1GmfMOisheGp4N hbi8uU2aok5EoFVm9W1Vkx9FP9h9uJKkX/szRMTXLnD0o9Nhpab4MWMBGlYpjdWs2Apy RWP9TzrsiJdtx4ziVkubJq+yKdVLnVGOZ+azJ0yffAwCa6IQZVHSeJStDssOBMLJxN86 GGKg== 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=nWmFA2W38I7w2kRnI6UYlXE2qkCTQg0mxTJlq43TbYg=; b=HARy7AandWNMjIRX6dgGbF7+u/YGkwaPZfTnYj4mrpN2Pzgm84unKDF8IV6xHqyzBT 89mEZrQt+yi5aMdQu5gHWbqceGQhKpELtNY01mgcyl8///CfRfMWrBYok6mArkhGZjzM jnw7V97EpS6/Mrv05mlPJjiqMWT/RmMLluUwzTKZZS5FnbN+4a2UoUhvwep8aoNCvWW3 3sPuuNRDPnankt2DKyubnfOjNHUBqO9JhRhZZGHSVNXNQwkpQ2z9uWmYVetIztMKXgaK wah6dX4oK1CJUl25w4l60uJe6+Y/FY8FWfLBtZazvI/lmCvvRUoXrOsZhVn80i3BmzI9 YssA== X-Gm-Message-State: ANoB5pkNIj/yG5jw03ywjoUXYG6E74J7WNamdkHiHF1pBOUh0ydP0Pw/ U2og82Us11rbC4v+gnMVKVqGAgQuAXeQz852+BI= X-Received: by 2002:a1c:f216:0:b0:3cf:87c6:890e with SMTP id s22-20020a1cf216000000b003cf87c6890emr34905826wmc.27.1671469705898; Mon, 19 Dec 2022 09:08:25 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id z19-20020a05600c221300b003a3170a7af9sm12882818wml.4.2022.12.19.09.08.24 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 19 Dec 2022 09:08:25 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?A?= =?utf-8?q?lex_Benn=C3=A9e?= , Richard Henderson , Paolo Bonzini , Eduardo Habkost , Yanan Wang , Pavel Dovgalyuk , Marcel Apfelbaum , Markus Armbruster , Riku Voipio Subject: [PATCH 3/5] accel/tcg: Restrict 'qapi-commands-machine.h' to system emulation Date: Mon, 19 Dec 2022 18:08:04 +0100 Message-Id: <20221219170806.60580-4-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221219170806.60580-1-philmd@linaro.org> References: <20221219170806.60580-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Since commit a0e61807a3 ("qapi: Remove QMP events and commands from user-mode builds") we don't generate the "qapi-commands-machine.h" header in a user-emulation-only build. Rename 'hmp.c' as 'monitor.c' and move the QMP functions from cpu-exec.c (which is always compiled) to monitor.c (which is only compiled when system-emulation is selected). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- accel/tcg/cpu-exec.c | 88 +---------------------------------- accel/tcg/hmp.c | 14 ------ accel/tcg/internal.h | 3 ++ accel/tcg/meson.build | 2 +- accel/tcg/monitor.c | 105 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 111 insertions(+), 101 deletions(-) delete mode 100644 accel/tcg/hmp.c create mode 100644 accel/tcg/monitor.c diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 298149ed07..5a7825dce1 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -20,7 +20,6 @@ #include "qemu/osdep.h" #include "qemu/qemu-print.h" #include "qapi/error.h" -#include "qapi/qapi-commands-machine.h" #include "qapi/type-helpers.h" #include "hw/core/tcg-cpu-ops.h" #include "trace.h" @@ -64,8 +63,8 @@ typedef struct SyncClocks { #define MAX_DELAY_PRINT_RATE 2000000000LL #define MAX_NB_PRINTS 100 -static int64_t max_delay; -static int64_t max_advance; +int64_t max_delay; +int64_t max_advance; static void align_clocks(SyncClocks *sc, CPUState *cpu) { @@ -1071,86 +1070,3 @@ void tcg_exec_unrealizefn(CPUState *cpu) tlb_destroy(cpu); g_free(cpu->tb_jmp_cache); } - -#ifndef CONFIG_USER_ONLY - -static void dump_drift_info(GString *buf) -{ - if (!icount_enabled()) { - return; - } - - g_string_append_printf(buf, "Host - Guest clock %"PRIi64" ms\n", - (cpu_get_clock() - icount_get()) / SCALE_MS); - if (icount_align_option) { - g_string_append_printf(buf, "Max guest delay %"PRIi64" ms\n", - -max_delay / SCALE_MS); - g_string_append_printf(buf, "Max guest advance %"PRIi64" ms\n", - max_advance / SCALE_MS); - } else { - g_string_append_printf(buf, "Max guest delay NA\n"); - g_string_append_printf(buf, "Max guest advance NA\n"); - } -} - -HumanReadableText *qmp_x_query_jit(Error **errp) -{ - g_autoptr(GString) buf = g_string_new(""); - - if (!tcg_enabled()) { - error_setg(errp, "JIT information is only available with accel=tcg"); - return NULL; - } - - dump_exec_info(buf); - dump_drift_info(buf); - - return human_readable_text_from_str(buf); -} - -HumanReadableText *qmp_x_query_opcount(Error **errp) -{ - g_autoptr(GString) buf = g_string_new(""); - - if (!tcg_enabled()) { - error_setg(errp, "Opcode count information is only available with accel=tcg"); - return NULL; - } - - tcg_dump_op_count(buf); - - return human_readable_text_from_str(buf); -} - -#ifdef CONFIG_PROFILER - -int64_t dev_time; - -HumanReadableText *qmp_x_query_profile(Error **errp) -{ - g_autoptr(GString) buf = g_string_new(""); - static int64_t last_cpu_exec_time; - int64_t cpu_exec_time; - int64_t delta; - - cpu_exec_time = tcg_cpu_exec_time(); - delta = cpu_exec_time - last_cpu_exec_time; - - g_string_append_printf(buf, "async time %" PRId64 " (%0.3f)\n", - dev_time, dev_time / (double)NANOSECONDS_PER_SECOND); - g_string_append_printf(buf, "qemu time %" PRId64 " (%0.3f)\n", - delta, delta / (double)NANOSECONDS_PER_SECOND); - last_cpu_exec_time = cpu_exec_time; - dev_time = 0; - - return human_readable_text_from_str(buf); -} -#else -HumanReadableText *qmp_x_query_profile(Error **errp) -{ - error_setg(errp, "Internal profiler not compiled"); - return NULL; -} -#endif - -#endif /* !CONFIG_USER_ONLY */ diff --git a/accel/tcg/hmp.c b/accel/tcg/hmp.c deleted file mode 100644 index bb67941420..0000000000 --- a/accel/tcg/hmp.c +++ /dev/null @@ -1,14 +0,0 @@ -#include "qemu/osdep.h" -#include "qemu/error-report.h" -#include "qapi/error.h" -#include "qapi/qapi-commands-machine.h" -#include "exec/exec-all.h" -#include "monitor/monitor.h" - -static void hmp_tcg_register(void) -{ - monitor_register_hmp_info_hrt("jit", qmp_x_query_jit); - monitor_register_hmp_info_hrt("opcount", qmp_x_query_opcount); -} - -type_init(hmp_tcg_register); diff --git a/accel/tcg/internal.h b/accel/tcg/internal.h index 6edff16fb0..130d7fd564 100644 --- a/accel/tcg/internal.h +++ b/accel/tcg/internal.h @@ -64,4 +64,7 @@ static inline target_ulong log_pc(CPUState *cpu, const TranslationBlock *tb) #endif } +extern int64_t max_delay; +extern int64_t max_advance; + #endif /* ACCEL_TCG_INTERNAL_H */ diff --git a/accel/tcg/meson.build b/accel/tcg/meson.build index 75e1dffb4d..d645c38112 100644 --- a/accel/tcg/meson.build +++ b/accel/tcg/meson.build @@ -16,7 +16,7 @@ specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_ss) specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TCG'], if_true: files( 'cputlb.c', - 'hmp.c', + 'monitor.c', )) tcg_module_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TCG'], if_true: files( diff --git a/accel/tcg/monitor.c b/accel/tcg/monitor.c new file mode 100644 index 0000000000..4d01c0a825 --- /dev/null +++ b/accel/tcg/monitor.c @@ -0,0 +1,105 @@ +/* + * SPDX-License-Identifier: LGPL-2.1-or-later + * + * QEMU TCG monitor + * + * Copyright (c) 2003-2005 Fabrice Bellard + */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qapi/type-helpers.h" +#include "qapi/qapi-commands-machine.h" +#include "monitor/monitor.h" +#include "sysemu/cpus.h" +#include "sysemu/cpu-timers.h" +#include "sysemu/tcg.h" +#include "internal.h" + + +static void dump_drift_info(GString *buf) +{ + if (!icount_enabled()) { + return; + } + + g_string_append_printf(buf, "Host - Guest clock %"PRIi64" ms\n", + (cpu_get_clock() - icount_get()) / SCALE_MS); + if (icount_align_option) { + g_string_append_printf(buf, "Max guest delay %"PRIi64" ms\n", + -max_delay / SCALE_MS); + g_string_append_printf(buf, "Max guest advance %"PRIi64" ms\n", + max_advance / SCALE_MS); + } else { + g_string_append_printf(buf, "Max guest delay NA\n"); + g_string_append_printf(buf, "Max guest advance NA\n"); + } +} + +HumanReadableText *qmp_x_query_jit(Error **errp) +{ + g_autoptr(GString) buf = g_string_new(""); + + if (!tcg_enabled()) { + error_setg(errp, "JIT information is only available with accel=tcg"); + return NULL; + } + + dump_exec_info(buf); + dump_drift_info(buf); + + return human_readable_text_from_str(buf); +} + +HumanReadableText *qmp_x_query_opcount(Error **errp) +{ + g_autoptr(GString) buf = g_string_new(""); + + if (!tcg_enabled()) { + error_setg(errp, "Opcode count information is only available with accel=tcg"); + return NULL; + } + + tcg_dump_op_count(buf); + + return human_readable_text_from_str(buf); +} + +#ifdef CONFIG_PROFILER + +int64_t dev_time; + +HumanReadableText *qmp_x_query_profile(Error **errp) +{ + g_autoptr(GString) buf = g_string_new(""); + static int64_t last_cpu_exec_time; + int64_t cpu_exec_time; + int64_t delta; + + cpu_exec_time = tcg_cpu_exec_time(); + delta = cpu_exec_time - last_cpu_exec_time; + + g_string_append_printf(buf, "async time %" PRId64 " (%0.3f)\n", + dev_time, dev_time / (double)NANOSECONDS_PER_SECOND); + g_string_append_printf(buf, "qemu time %" PRId64 " (%0.3f)\n", + delta, delta / (double)NANOSECONDS_PER_SECOND); + last_cpu_exec_time = cpu_exec_time; + dev_time = 0; + + return human_readable_text_from_str(buf); +} +#else +HumanReadableText *qmp_x_query_profile(Error **errp) +{ + error_setg(errp, "Internal profiler not compiled"); + return NULL; +} +#endif + +static void hmp_tcg_register(void) +{ + monitor_register_hmp_info_hrt("jit", qmp_x_query_jit); + monitor_register_hmp_info_hrt("opcount", qmp_x_query_opcount); +} + +type_init(hmp_tcg_register); From patchwork Mon Dec 19 17:08:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 635123 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2449124pvb; Mon, 19 Dec 2022 09:09:16 -0800 (PST) X-Google-Smtp-Source: AA0mqf4V/INPdR/wgThfKoOTmcmwjluEGwfv3BNvUaFJUagFrGru/8ucjrzSY/D4GLNcMCagRihA X-Received: by 2002:a05:6358:fc5:b0:e0:a650:6dd2 with SMTP id d5-20020a0563580fc500b000e0a6506dd2mr1829761rwn.12.1671469756723; Mon, 19 Dec 2022 09:09:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671469756; cv=none; d=google.com; s=arc-20160816; b=xd8SLyvrrAWMqrdhX/XB37h8vt6kuFjl3SBOEWKt9U/yll5CmuBIR3h0KXXC9aM8Wt YOrDh5tLZWntO/xNNEtQlWEuOT2mI+TG0PwZhtAFgBs9V4HwC94Rh881f1Pnj1hn8Eth 8Nut6fgmIJyfoxYo7ZZ+0W2qzxhLPehhaUKeHqGlcsBTBK8XlTK0ueaswFLVz3fSJM23 NI//xXeK+SsGB6CFWcDcvTdmT6qaZ6d0titCpS9ofGK9Gr3SptuZbKtkJ5DrG1fXqueB EK1aTa+X6ZqSNW+W4gUzEXleJelC6p+CVtVquW6LAfVTAmug/+m4XHXNz1tAer2afYDn byLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=+jc4rFW4Fxh9MHRSyJ29B46/XHnkSZ5+7uUGz0PTJsg=; b=nhFBqrvyIzzBS3pTQELADblE2yRWY2qOoRPj51eWaPGQklEddbCcXmb0HEOdlOvDSu gBbZcsb+tRDHmQD3t4vLDv2zrYTE2OcLpB37ba3X7HNx3nZH9yjnpyqkOcCly2WB6B0h mTqGlrMqUlBtfboTTGE/dsTpYqLgKH1UY5MaN0CVqUzC2wNj2Rbvj6NzadB1Za1xWu0q 2WeJTGhNvHnT434m8yZpk/Ty4GN5OwVhgCvHjyo4qh6OtAb1uQvqvWO5TQQxy4GH9LJj Z5vSeREs+10Kxicn6yQs94tri8PGuz6sHYHHmYx0baxE58GmROlA/cT5JGyJN5nSoKyn WKQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=L+PsBvVC; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id u5-20020a05620a454500b006fb65348334si4284090qkp.410.2022.12.19.09.09.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 19 Dec 2022 09:09:16 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=L+PsBvVC; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7Jcy-0001Wx-7n; Mon, 19 Dec 2022 12:08:36 -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 1p7Jcx-0001Wf-6A for qemu-devel@nongnu.org; Mon, 19 Dec 2022 12:08:35 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p7Jcu-0008HT-VJ for qemu-devel@nongnu.org; Mon, 19 Dec 2022 12:08:34 -0500 Received: by mail-wm1-x32e.google.com with SMTP id f13-20020a1cc90d000000b003d08c4cf679so6954564wmb.5 for ; Mon, 19 Dec 2022 09:08:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+jc4rFW4Fxh9MHRSyJ29B46/XHnkSZ5+7uUGz0PTJsg=; b=L+PsBvVCzJKxpxiXs99w+qDqicvLN+hYSYosav5lQ2Y0iImO2/lCPIBNV7zQjHU0wK e49bdR9kZd6DLjqQ9mVHf7sAAzYJLypZ99HxSZ+34f+QZUP2AjFMmCgDDYZEN5oee/Ue j3qHxM4Ayeqf0H2UXizjQHqSN0A9ymidL9HNHtr0apCzHrhzczA7d6FSFNHitb2FIG8A BpuvdFOYsBWnxmtwniYYVxQLU9SRGY8NKgfH369wGCseVepWb4mrsAJoo9SrLYVBKupL ULgT9SW6KGdF0scMPoVYVfJHGPNlbcV8nzdcIOCeqGWJB0lf/u6dRbGEm/wYrE+3KRDS pHDQ== 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=+jc4rFW4Fxh9MHRSyJ29B46/XHnkSZ5+7uUGz0PTJsg=; b=SKOs9h8QMPuL+03MCl9JoM+R4fxpiUyPdxks3l7ejn1OhPYOVThiDshya20Mbj4NMv GeWG06StZFbQP5gUHWGbj3No6d/J9OC79c6xbfszXcBwINJFPrQBvKGPhHBE6szfaBPb Vy4uhdZcxZg3eIVKmtglqcNxv4DvoUaybjGhh7Wf2lHtgmRzFR1nisJBUwGEgEJgIMdD BhDZkq09Kz6r8wmL8Xngw7/gEahjkYUIpYooIw/6pqILp1IbKaaDHyujoYRfjRm3zLuz s4hwF3fWuo6kkMUMVBLuvLCXjzY+X2UgAofFpThQ2Hz4Q7OeHRHb0MzTDrIgO0hq20sj pNUA== X-Gm-Message-State: ANoB5plUxVKvx11hKifUGW0acxglqtHuE7B4IOalM5nXTU3289Condhn Mpm6g5AhgjI+PX5mRF4Jupys427RyXIeCY21Y28= X-Received: by 2002:a05:600c:1549:b0:3d0:a762:6a2d with SMTP id f9-20020a05600c154900b003d0a7626a2dmr34678704wmg.11.1671469711205; Mon, 19 Dec 2022 09:08:31 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id z22-20020a05600c0a1600b003cfd0bd8c0asm12829540wmp.30.2022.12.19.09.08.29 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 19 Dec 2022 09:08:30 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?A?= =?utf-8?q?lex_Benn=C3=A9e?= , Richard Henderson , Paolo Bonzini , Eduardo Habkost , Yanan Wang , Pavel Dovgalyuk , Marcel Apfelbaum , Markus Armbruster , Riku Voipio Subject: [PATCH 4/5] replay: Extract core API to 'exec/replay-core.h' Date: Mon, 19 Dec 2022 18:08:05 +0100 Message-Id: <20221219170806.60580-5-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221219170806.60580-1-philmd@linaro.org> References: <20221219170806.60580-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daude replay API is used deeply within TCG common code (common to user and system emulation). Unfortunately "sysemu/replay.h" requires some QAPI headers for few system-specific declarations, example: void replay_input_event(QemuConsole *src, InputEvent *evt); Since commit c2651c0eaa ("qapi/meson: Restrict UI module to system emulation and tools") the QAPI header defining the InputEvent is not generated anymore. To keep it simple, extract the 'core' replay prototypes to a new "exec/replay-core.h" header which we include in the TCG code that doesn't need the rest of the replay API. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pavel Dovgalyuk --- MAINTAINERS | 1 + accel/tcg/cpu-exec.c | 2 +- accel/tcg/tcg-all.c | 2 +- accel/tcg/translator.c | 2 +- accel/tcg/user-exec-stub.c | 2 +- cpu.c | 2 +- gdbstub/gdbstub.c | 2 +- hw/core/ptimer.c | 2 +- include/exec/replay-core.h | 76 ++++++++++++++++++++++++++++++++++ include/sysemu/replay.h | 67 ++---------------------------- stubs/replay.c | 2 +- tests/unit/ptimer-test-stubs.c | 2 +- util/guest-random.c | 2 +- 13 files changed, 91 insertions(+), 73 deletions(-) create mode 100644 include/exec/replay-core.h diff --git a/MAINTAINERS b/MAINTAINERS index 3bd433b65a..04aa77fd37 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3206,6 +3206,7 @@ S: Supported F: replay/* F: block/blkreplay.c F: net/filter-replay.c +F: include/exec/replay-core.h F: include/sysemu/replay.h F: docs/devel/replay.rst F: docs/system/replay.rst diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 5a7825dce1..040de10440 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -37,7 +37,7 @@ #include "sysemu/cpus.h" #include "exec/cpu-all.h" #include "sysemu/cpu-timers.h" -#include "sysemu/replay.h" +#include "exec/replay-core.h" #include "sysemu/tcg.h" #include "exec/helper-proto.h" #include "tb-jmp-cache.h" diff --git a/accel/tcg/tcg-all.c b/accel/tcg/tcg-all.c index 30b503fb22..5dab1ae9dd 100644 --- a/accel/tcg/tcg-all.c +++ b/accel/tcg/tcg-all.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "sysemu/tcg.h" -#include "sysemu/replay.h" +#include "exec/replay-core.h" #include "sysemu/cpu-timers.h" #include "tcg/tcg.h" #include "qapi/error.h" diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c index 061519691f..3a40f9eaca 100644 --- a/accel/tcg/translator.c +++ b/accel/tcg/translator.c @@ -16,7 +16,7 @@ #include "exec/log.h" #include "exec/translator.h" #include "exec/plugin-gen.h" -#include "sysemu/replay.h" +#include "exec/replay-core.h" /* Pairs with tcg_clear_temp_count. To be called by #TranslatorOps.{translate_insn,tb_stop} if diff --git a/accel/tcg/user-exec-stub.c b/accel/tcg/user-exec-stub.c index 968cd3ca60..874e1f1a20 100644 --- a/accel/tcg/user-exec-stub.c +++ b/accel/tcg/user-exec-stub.c @@ -1,6 +1,6 @@ #include "qemu/osdep.h" #include "hw/core/cpu.h" -#include "sysemu/replay.h" +#include "exec/replay-core.h" bool enable_cpu_pm = false; diff --git a/cpu.c b/cpu.c index 4a7d865427..5503e2ff12 100644 --- a/cpu.c +++ b/cpu.c @@ -33,7 +33,7 @@ #endif #include "sysemu/tcg.h" #include "sysemu/kvm.h" -#include "sysemu/replay.h" +#include "exec/replay-core.h" #include "exec/cpu-common.h" #include "exec/exec-all.h" #include "exec/translate-all.h" diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c index c3fbc31123..fb9c49e0fd 100644 --- a/gdbstub/gdbstub.c +++ b/gdbstub/gdbstub.c @@ -48,7 +48,7 @@ #include "sysemu/runstate.h" #include "semihosting/semihost.h" #include "exec/exec-all.h" -#include "sysemu/replay.h" +#include "exec/replay-core.h" #include "internals.h" diff --git a/hw/core/ptimer.c b/hw/core/ptimer.c index eb5ba1aff7..e03165febf 100644 --- a/hw/core/ptimer.c +++ b/hw/core/ptimer.c @@ -10,7 +10,7 @@ #include "hw/ptimer.h" #include "migration/vmstate.h" #include "qemu/host-utils.h" -#include "sysemu/replay.h" +#include "exec/replay-core.h" #include "sysemu/cpu-timers.h" #include "sysemu/qtest.h" #include "block/aio.h" diff --git a/include/exec/replay-core.h b/include/exec/replay-core.h new file mode 100644 index 0000000000..9ec20cb124 --- /dev/null +++ b/include/exec/replay-core.h @@ -0,0 +1,76 @@ +/* + * QEMU replay core API + * + * Copyright (c) 2010-2015 Institute for System Programming + * of the Russian Academy of Sciences. + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ + +#ifndef EXEC_REPLAY_H +#define EXEC_REPLAY_H + +#include "qapi/qapi-types-replay.h" + +extern ReplayMode replay_mode; + +/* Replay process control functions */ + +/*! Enables recording or saving event log with specified parameters */ +void replay_configure(struct QemuOpts *opts); +/*! Initializes timers used for snapshotting and enables events recording */ +void replay_start(void); +/*! Closes replay log file and frees other resources. */ +void replay_finish(void); +/*! Adds replay blocker with the specified error description */ +void replay_add_blocker(Error *reason); +/* Returns name of the replay log file */ +const char *replay_get_filename(void); + +/* + * Start making one step in backward direction. + * Used by gdbstub for backwards debugging. + * Returns true on success. + */ +bool replay_reverse_step(void); +/* + * Start searching the last breakpoint/watchpoint. + * Used by gdbstub for backwards debugging. + * Returns true if the process successfully started. + */ +bool replay_reverse_continue(void); +/* + * Returns true if replay module is processing + * reverse_continue or reverse_step request + */ +bool replay_running_debug(void); +/* Called in reverse debugging mode to collect breakpoint information */ +void replay_breakpoint(void); +/* Called when gdb is attached to gdbstub */ +void replay_gdb_attached(void); + +/* Interrupts and exceptions */ + +/*! Called by exception handler to write or read + exception processing events. */ +bool replay_exception(void); +/*! Used to determine that exception is pending. + Does not proceed to the next event in the log. */ +bool replay_has_exception(void); +/*! Called by interrupt handlers to write or read + interrupt processing events. + \return true if interrupt should be processed */ +bool replay_interrupt(void); +/*! Tries to read interrupt event from the file. + Returns true, when interrupt request is pending */ +bool replay_has_interrupt(void); + +/* Processing data from random generators */ + +/* Saves the values from the random number generator */ +void replay_save_random(int ret, void *buf, size_t len); +/* Loads the saved values for the random number generator */ +int replay_read_random(void *buf, size_t len); + +#endif diff --git a/include/sysemu/replay.h b/include/sysemu/replay.h index 7ec0882b50..08aae5869f 100644 --- a/include/sysemu/replay.h +++ b/include/sysemu/replay.h @@ -1,8 +1,8 @@ -#ifndef REPLAY_H -#define REPLAY_H +#ifndef SYSEMU_REPLAY_H +#define SYSEMU_REPLAY_H /* - * replay.h + * QEMU replay (system interface) * * Copyright (c) 2010-2015 Institute for System Programming * of the Russian Academy of Sciences. @@ -12,9 +12,9 @@ * */ +#include "exec/replay-core.h" #include "qapi/qapi-types-misc.h" #include "qapi/qapi-types-run-state.h" -#include "qapi/qapi-types-replay.h" #include "qapi/qapi-types-ui.h" #include "block/aio.h" @@ -45,8 +45,6 @@ typedef enum ReplayCheckpoint ReplayCheckpoint; typedef struct ReplayNetState ReplayNetState; -extern ReplayMode replay_mode; - /* Name of the initial VM snapshot */ extern char *replay_snapshot; @@ -63,40 +61,6 @@ extern char *replay_snapshot; void replay_mutex_lock(void); void replay_mutex_unlock(void); -/* Replay process control functions */ - -/*! Enables recording or saving event log with specified parameters */ -void replay_configure(struct QemuOpts *opts); -/*! Initializes timers used for snapshotting and enables events recording */ -void replay_start(void); -/*! Closes replay log file and frees other resources. */ -void replay_finish(void); -/*! Adds replay blocker with the specified error description */ -void replay_add_blocker(Error *reason); -/* Returns name of the replay log file */ -const char *replay_get_filename(void); -/* - * Start making one step in backward direction. - * Used by gdbstub for backwards debugging. - * Returns true on success. - */ -bool replay_reverse_step(void); -/* - * Start searching the last breakpoint/watchpoint. - * Used by gdbstub for backwards debugging. - * Returns true if the process successfully started. - */ -bool replay_reverse_continue(void); -/* - * Returns true if replay module is processing - * reverse_continue or reverse_step request - */ -bool replay_running_debug(void); -/* Called in reverse debugging mode to collect breakpoint information */ -void replay_breakpoint(void); -/* Called when gdb is attached to gdbstub */ -void replay_gdb_attached(void); - /* Processing the instructions */ /*! Returns number of executed instructions. */ @@ -106,22 +70,6 @@ int replay_get_instructions(void); /*! Updates instructions counter in replay mode. */ void replay_account_executed_instructions(void); -/* Interrupts and exceptions */ - -/*! Called by exception handler to write or read - exception processing events. */ -bool replay_exception(void); -/*! Used to determine that exception is pending. - Does not proceed to the next event in the log. */ -bool replay_has_exception(void); -/*! Called by interrupt handlers to write or read - interrupt processing events. - \return true if interrupt should be processed */ -bool replay_interrupt(void); -/*! Tries to read interrupt event from the file. - Returns true, when interrupt request is pending */ -bool replay_has_interrupt(void); - /* Processing clocks and other time sources */ /*! Save the specified clock */ @@ -143,13 +91,6 @@ int64_t replay_read_clock(ReplayClockKind kind, int64_t raw_icount); ? replay_save_clock((clock), (value), icount_get_raw_locked()) \ : (value)) -/* Processing data from random generators */ - -/* Saves the values from the random number generator */ -void replay_save_random(int ret, void *buf, size_t len); -/* Loads the saved values for the random number generator */ -int replay_read_random(void *buf, size_t len); - /* Events */ /*! Called when qemu shutdown is requested. */ diff --git a/stubs/replay.c b/stubs/replay.c index 9d5b4be339..42c92e4acb 100644 --- a/stubs/replay.c +++ b/stubs/replay.c @@ -1,5 +1,5 @@ #include "qemu/osdep.h" -#include "sysemu/replay.h" +#include "exec/replay-core.h" ReplayMode replay_mode; diff --git a/tests/unit/ptimer-test-stubs.c b/tests/unit/ptimer-test-stubs.c index f5e75a96b6..f2bfcede93 100644 --- a/tests/unit/ptimer-test-stubs.c +++ b/tests/unit/ptimer-test-stubs.c @@ -10,7 +10,7 @@ #include "qemu/osdep.h" #include "qemu/main-loop.h" -#include "sysemu/replay.h" +#include "exec/replay-core.h" #include "migration/vmstate.h" #include "ptimer-test.h" diff --git a/util/guest-random.c b/util/guest-random.c index 23643f86cc..a24d27624c 100644 --- a/util/guest-random.c +++ b/util/guest-random.c @@ -14,7 +14,7 @@ #include "qapi/error.h" #include "qemu/guest-random.h" #include "crypto/random.h" -#include "sysemu/replay.h" +#include "exec/replay-core.h" static __thread GRand *thread_rand; From patchwork Mon Dec 19 17:08:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 635122 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2448911pvb; Mon, 19 Dec 2022 09:08:58 -0800 (PST) X-Google-Smtp-Source: AMrXdXv5c+8oNTJ6wH6m87sLcdkOj8S7+uMJ3lP4deT+cb5sdEpgNxf/eVJe7kO7YZ21FZ9dDKiI X-Received: by 2002:ac8:5211:0:b0:3a6:8b5a:7d02 with SMTP id r17-20020ac85211000000b003a68b5a7d02mr14044872qtn.30.1671469737965; Mon, 19 Dec 2022 09:08:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671469737; cv=none; d=google.com; s=arc-20160816; b=Hfe4vAqVQMmDdb14XQ7Okogqsl4Et3fy0p1azFo+QRFJe2o36XBECM+b3ywb3dWgBm mVG9zQWG9rCp5kYy7cUIcGBphxe3C/TAIe7QJePL++0a+IEEzDLgbrC9zILlFf+W5zsj hXywh9IBvD5o8W4FEC3+IPNhM8XqKDhk93MNbQygcNsse3jgwzil4Kl8j1N3HzyUF5RZ yngTvRWvG5hFDbYupWNAY2fkRHFrDhJIDpvXD3xz+AmN63Und7y5WevtsS0rHI4PWddb hKQdRXqLDNL6sECP/tbrDLPUWx/CpSf289e8lVM2L6bBUsKyYk4gm9bDPoJrM4eC0V25 e6Jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=yWAUPEHbEMdLnDIOFAMljqQ3bxfgcSl7wuSDWpPnUAI=; b=B3hjG/mZNV0P/EqR3I9DIil8iIIJmi6rarBhIrSwgAQRaoasi8gwFcW/e/PVJ80ElR oOMJ4Sn6kJgW3kni3e8cY6iAuc+eeLXWJlgew0k2YGGczzs2AqqNXENDKnjPzrKPr9wH fJjwahjhW9EswsXN21pShbTC9qWGIOWOl0qw6xhbi6cWujRsb8kbew9T/wAY0zxlQ1WB Y37JefL8uo5C4S/Pz0mh4TPwwDVPowQ2IthCV2q37NM6/02iAdOyicWCLbfSJ4QpoqwA nTiGBGoA9KAbB755HTVJ9nLejV3h45ToWW0SODJ1mmxotGELK30rgi3/4LSBit/VyGKc 4zDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RFtDCHqw; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v27-20020a05622a189b00b003a7e616e002si4369607qtc.628.2022.12.19.09.08.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 19 Dec 2022 09:08:57 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RFtDCHqw; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7Jd3-0001al-Ce; Mon, 19 Dec 2022 12:08:41 -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 1p7Jd1-0001XX-Gu for qemu-devel@nongnu.org; Mon, 19 Dec 2022 12:08:39 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p7Jcz-0008JS-UD for qemu-devel@nongnu.org; Mon, 19 Dec 2022 12:08:39 -0500 Received: by mail-wm1-x32b.google.com with SMTP id m19so6895878wms.5 for ; Mon, 19 Dec 2022 09:08:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yWAUPEHbEMdLnDIOFAMljqQ3bxfgcSl7wuSDWpPnUAI=; b=RFtDCHqw/rvTGNluRvEIQzZyTnuYaicshgLDpfvXvjDtn+6k4EzOZMssY6TwwQVa2g sTmqxANwYRWTpWJe87vzPDiOe8s6O6dP42hq1BrRSpmOA4tx5IfRbD92xlZjiD8WmtwI RilMrwjaU4uRs76I/ZCvvfhTWEITJMJpHxgmwGDHFQ/lA4HWy7ifC566vj3zL2tbI7TF SfUyrOHnV0o1i+0K9PBS2pjBTLT+gzF7DsclQZ5QjYTtDeLtLncY+Rc3rm3JeYJ4oPgt 0wIAs0WaPwIgWUSMrCaK70Q8sJ3wt7h1fre4SG6n4j4X8FOmikDLIGdV6/x/nfV1uoSj zDLg== 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=yWAUPEHbEMdLnDIOFAMljqQ3bxfgcSl7wuSDWpPnUAI=; b=dtfHSU5r1T/qAUlyHIOWRpVpkbjBKTroKnBGgWIbMtpJG6QJ+/QPDwq8qiz3q1uXXn uI1ke5qQ0jlKBAf21hzC5lJod2yHpXHc82rsh/M0ywhQKZjAvuMC6vtfwNTe7+u0YEjF Iz7n8nFctkliH00sdRJ2TaUhwyeq/n/5HpnEr+QenMGYZH/cpKEuKv8XGDEJd7vf/9re N0RKkclsYT0MywlhEJncIT1JZN6j11shif2afaWa4IrGMHRgrbcJdmwmQDMcfESw71re lsRL19Te2e73xuLmYGXxdPS24Sv44Hvtelp9RpNVw+M+z4SJyBUjM/mozPReogk/icsG oaEg== X-Gm-Message-State: ANoB5pm59LzJhiA0SLXx94gja24rX8Tg8692BYVt1XW85PfVWUCtgvaq UTTkPbUPCbbCuQzDmxUdozE1XDjlrudnaRniQCo= X-Received: by 2002:a05:600c:4f85:b0:3cf:7925:7a3 with SMTP id n5-20020a05600c4f8500b003cf792507a3mr33044982wmq.24.1671469716426; Mon, 19 Dec 2022 09:08:36 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id o13-20020a05600c4fcd00b003b4868eb71bsm22725258wmq.25.2022.12.19.09.08.35 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 19 Dec 2022 09:08:36 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?A?= =?utf-8?q?lex_Benn=C3=A9e?= , Richard Henderson , Paolo Bonzini , Eduardo Habkost , Yanan Wang , Pavel Dovgalyuk , Marcel Apfelbaum , Markus Armbruster , Riku Voipio Subject: [PATCH 5/5] tests/unit: Restrict machine-smp.c test to system emulation Date: Mon, 19 Dec 2022 18:08:06 +0100 Message-Id: <20221219170806.60580-6-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221219170806.60580-1-philmd@linaro.org> References: <20221219170806.60580-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daude Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- tests/unit/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/meson.build b/tests/unit/meson.build index ffa444f432..51f453e6c4 100644 --- a/tests/unit/meson.build +++ b/tests/unit/meson.build @@ -46,7 +46,6 @@ tests = { 'test-uuid': [], 'ptimer-test': ['ptimer-test-stubs.c', meson.project_source_root() / 'hw/core/ptimer.c'], 'test-qapi-util': [], - 'test-smp-parse': [qom, meson.project_source_root() / 'hw/core/machine-smp.c'], 'test-interval-tree': [], } @@ -134,6 +133,7 @@ if have_system 'test-util-sockets': ['socket-helpers.c'], 'test-base64': [], 'test-bufferiszero': [], + 'test-smp-parse': [qom, meson.project_source_root() / 'hw/core/machine-smp.c'], 'test-vmstate': [migration, io], 'test-yank': ['socket-helpers.c', qom, io, chardev] }