From nobody Sun Feb 8 05:56:38 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1587673478; cv=none; d=zohomail.com; s=zohoarc; b=DHJfNJ6OfvdIsGhK/HxJa4x++X5DPKykth2IPsrKKqB8dhyxd3YzciJBBI/h9FPJizbZl1C6u9EWRF1Y6Ai+aLfzYXEvqEVGjCyVeQwwYHYNQzLyq8Z18ye5G5NKqm1ir2UcJcoPJ3HkXdwoc5i85qkLSon+w3Z13ZO0MBC1+5o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587673478; 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=S2Q0WaBSBkpjANrVvA4jiA2ezW8UXrcA1fVgJIOFZvQ=; b=bpEuF1EzTWUXgnKFzI1lQXaUS6QrIVQwdoPaoVs+Crd27T9szOQlXHFUFRL4UZz8OSrzXlhBjtgMhMwTrZ9zBaJ02SQVYoF38dQ6oJ5JcBJuJnB09I8bFGDhPMTZdruP9U/Uemzrm9xHe/jvBGdNBLgN4RtVbr5PYObLNhE4bz0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1587673478483111.1631501858518; Thu, 23 Apr 2020 13:24:38 -0700 (PDT) Received: from localhost ([::1]:39972 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRiOj-0002YZ-5n for importer@patchew.org; Thu, 23 Apr 2020 16:24:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55306) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRiLh-0004Dr-Eg for qemu-devel@nongnu.org; Thu, 23 Apr 2020 16:21:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jRiLh-00039L-15 for qemu-devel@nongnu.org; Thu, 23 Apr 2020 16:21:29 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:39235 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jRiLg-00037x-JP for qemu-devel@nongnu.org; Thu, 23 Apr 2020 16:21:28 -0400 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-145-C7nkpQpRPCWsD3CgZsnJDQ-1; Thu, 23 Apr 2020 16:21:24 -0400 Received: by mail-wr1-f72.google.com with SMTP id 11so3408818wrc.3 for ; Thu, 23 Apr 2020 13:21:24 -0700 (PDT) Received: from localhost.localdomain (116.red-83-42-57.dynamicip.rima-tde.net. [83.42.57.116]) by smtp.gmail.com with ESMTPSA id b2sm5961345wrn.6.2020.04.23.13.21.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Apr 2020 13:21:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587673287; 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=S2Q0WaBSBkpjANrVvA4jiA2ezW8UXrcA1fVgJIOFZvQ=; b=XdJnSv+iPPXSST8+wokTdOG5VZCot4aQBlF6aB8WZkbxS/VjlS91xGYNpJD/JRgWf4OgEF 0F8y01B6s/kTQquxcalPuzcPUD/d0V8pQX9fdPGlkKRiODhzoolC+qf67Lge3+kO3DvN9e F0okTGUUycWpFlrP2tpNMm4xfmeEOTM= X-MC-Unique: C7nkpQpRPCWsD3CgZsnJDQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HbSxa+gqPU1dU/akvu1eihUlexpvtYzyR1urxcHvdYY=; b=FM/HiyfQWs/RzIu6CKzSjM1bFOsU55aPaL5qUCztEGa+OTXC+vB056Ygvdu8B3UF4B 44ZFWVG3aJul/2lhHr1LKYkRKZxkDer6LB4KpJLmQB4D0kxdPUfwqrExelWTTcZr7Hrk s5jXo8OPUJ3F5wnb71VjOEpJ8pq+KBG8fyeCkpK582vkHDV0MhvqMu9s5H33ecY4GUpg vd4FfCCxawiE7nHhV5kYg6wJ5osHhA7L++thK1f2Q5kJWXuO+D0O/8NtusHeVJLwA3IA zVifu+qMlQctLvfLwnjk8vOQcZ5aPzG/5dXmcdv7nGJGHw7430wtlQhMRBLWLd4hTicL P9dA== X-Gm-Message-State: AGi0Pua2FtuKLx9b9otSobFwbTceDYKan2QoezAOl0GZpfqQU6GPaWzv jHC+ix3lSDyy+dQlWedAgtQzTGNqggvjiwXfQnW+ai97UD82jEM3N1Y3n9XXFJBmipKagB5covi HhQcDypNxytzcbGw= X-Received: by 2002:adf:9168:: with SMTP id j95mr6544230wrj.145.1587673283459; Thu, 23 Apr 2020 13:21:23 -0700 (PDT) X-Google-Smtp-Source: APiQypKZVmUrEqf34guRgk0dkUhfGUUHDiH7C7fb4PPRk7aNxChVOqxRsfieuSPmthntO4XDgosofQ== X-Received: by 2002:adf:9168:: with SMTP id j95mr6544119wrj.145.1587673281803; Thu, 23 Apr 2020 13:21:21 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 1/7] monitor/misc: Remove unused "chardev/char-mux.h" include Date: Thu, 23 Apr 2020 22:21:06 +0200 Message-Id: <20200423202112.644-2-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200423202112.644-1-philmd@redhat.com> References: <20200423202112.644-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.81; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/23 02:14:02 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Elena Ufimtseva , John G Johnson , Jagannathan Raman , "Dr. David Alan Gilbert" , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" monitor/misc.c never required "chardev/char-mux.h", remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Richard Henderson --- monitor/misc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/monitor/misc.c b/monitor/misc.c index 6c45fa490f..5d68026a7f 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -33,7 +33,6 @@ #include "exec/gdbstub.h" #include "net/net.h" #include "net/slirp.h" -#include "chardev/char-mux.h" #include "ui/qemu-spice.h" #include "qemu/config-file.h" #include "qemu/ctype.h" --=20 2.21.1 From nobody Sun Feb 8 05:56:38 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1587673379; cv=none; d=zohomail.com; s=zohoarc; b=etg0ErwyL8yL+ITSC+Pw79ELC4oQRVXP90hkg7QmseDXh3ENUf6Ks1cm7CdUJ1DuoxSPv3S5Ju2+r6igrzB61xCweX/YJ2kZ4F4mL/3KBAHjn2niM2czvZsjlVj56bDYG8finlzgzt6WeVSafueee0nf828d9VK4wm5SWiMXxQk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587673379; 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=lWM/RJA0i40F5Z53mX1T7pyIQA7QZZS8Zjo3NsXhoDY=; b=UIaVJcPEBmwyWubinidCSLrfebwcaptDLzh0QIcB0WycF+uAVbkz4y4kLGfx9JFIctCZNE47zGMSPkdLsAyqAxQ0kcL7ffqispf0IeM2xdgqKw55pmHKpH6bD5tMFpDXxnodT5MkZ1gmR2jw+e4liUmt2ph0oKx4+6whEi1mRqk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1587673379635628.1611659958454; Thu, 23 Apr 2020 13:22:59 -0700 (PDT) Received: from localhost ([::1]:39764 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRiN8-0006s1-An for importer@patchew.org; Thu, 23 Apr 2020 16:22:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55340) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRiLq-0004Wg-EO for qemu-devel@nongnu.org; Thu, 23 Apr 2020 16:21:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jRiLp-0003NY-Qv for qemu-devel@nongnu.org; Thu, 23 Apr 2020 16:21:38 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:42270 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jRiLp-0003MA-DG for qemu-devel@nongnu.org; Thu, 23 Apr 2020 16:21:37 -0400 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-459-fzLF-ChiMy60w7RlaDbyMQ-1; Thu, 23 Apr 2020 16:21:30 -0400 Received: by mail-wm1-f69.google.com with SMTP id l21so2678273wmh.2 for ; Thu, 23 Apr 2020 13:21:30 -0700 (PDT) Received: from localhost.localdomain (116.red-83-42-57.dynamicip.rima-tde.net. [83.42.57.116]) by smtp.gmail.com with ESMTPSA id c190sm5335974wme.10.2020.04.23.13.21.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Apr 2020 13:21:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587673296; 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=lWM/RJA0i40F5Z53mX1T7pyIQA7QZZS8Zjo3NsXhoDY=; b=iEVNq40P6wP9QoCAQQY4jjNZ1FozCfgbvN8duz8YH6uDLegBhpfIevGnlhk34dmV79/E0R 4KtopLs8QXJo0KHw6HqRZ8qD2Upl0ts5sTNYI02dyvN4bjJokwXsKbZCrgY7idMd3yZHjj X6LXZ369cJzwBNpIpZdLgp+ViKAzZvw= X-MC-Unique: fzLF-ChiMy60w7RlaDbyMQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zlQoC138vjAdmXDl+ROR3VD/b5fkegrhyYTGSi8r/AQ=; b=gB4PDBK4pHSPWgvxVDRh+cUpvgFEe8T9uRB7zfB3GBYlr9ctKW0in7WA8dZGbuqC0+ KlyKOrNoRB1i1m6nBy4n6gyMdmpjj1wEa9eT2I15bmETHnNs3y0/6XkxA2KdEUZr5V21 OeFMUlQVbn9Mllui8WqGN4CIJx3EZ0n39yajsrvuRR8PpItGL/6JWe+js1O4LDcelHNo DRmsjIhbhQnbTDfioq4sfbQSd8PxdYEFJzGWGCtXvNng3LYzzzM9SrwQWOGY5s1m+WMl LKxqQzfAiNLHx3cWojn3iq7YUMog0Es09EJ1WKClB0L32Ujs7JsyfuSRrusdLhK98DsR 0RXw== X-Gm-Message-State: AGi0PuaEQRgWbrfQWH9FwIoM0liRnv1gQhsUTgwaaBy5pYtEHfDYvDnT 1IqyMSJbIjHakpHJDX3q8uFVSVQ4Z8PL3Emx2dmUAzCP1UURGiAAwNse0O4GdpbuATS59k75HIM Bly50GY902UFKJhY= X-Received: by 2002:a5d:4a4b:: with SMTP id v11mr6624662wrs.32.1587673288973; Thu, 23 Apr 2020 13:21:28 -0700 (PDT) X-Google-Smtp-Source: APiQypJN1qnQfPBFb0dFeE83NkorCQvfG9XAh3cXULj8Jgig3pv5hagQ7MeOQCT1YqdPrEDkditbqw== X-Received: by 2002:a5d:4a4b:: with SMTP id v11mr6624640wrs.32.1587673288700; Thu, 23 Apr 2020 13:21:28 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 2/7] tests/test-char: Remove unused "chardev/char-mux.h" include Date: Thu, 23 Apr 2020 22:21:07 +0200 Message-Id: <20200423202112.644-3-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200423202112.644-1-philmd@redhat.com> References: <20200423202112.644-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.81; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/23 02:14:02 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Elena Ufimtseva , John G Johnson , Jagannathan Raman , "Dr. David Alan Gilbert" , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" This test never required "chardev/char-mux.h", remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Richard Henderson --- tests/test-char.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/test-char.c b/tests/test-char.c index 3afc9b1b8d..f08a39790e 100644 --- a/tests/test-char.c +++ b/tests/test-char.c @@ -6,7 +6,6 @@ #include "qemu/option.h" #include "qemu/sockets.h" #include "chardev/char-fe.h" -#include "chardev/char-mux.h" #include "sysemu/sysemu.h" #include "qapi/error.h" #include "qapi/qapi-commands-char.h" --=20 2.21.1 From nobody Sun Feb 8 05:56:38 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1587673380; cv=none; d=zohomail.com; s=zohoarc; b=fJi0h84dKKfzt+Fv9lsKAA4VwgVzZ5nSVvcFFGWpg1ZVoH7Oe0C53sIxC8CPsGTvPMgbmj4MqAZFTVPMqW7PsCnNxYA76cGsO/Rn3fw2sDHoLtcrrKWsoGafQw4iI90UlmxpSGf11EhuSKBvQpjvQdR3VxgGK2g/+4nrGimJ//c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587673380; 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=8pU1FGRWMr9wFChCxvp9YPnfOkoE9DOPVGwWc1xi51Q=; b=j0vD0RpkgoKEzJKlBy/B6NuVYOGJFFkPzBQgxyCZ/NpYvX6cETPHj5hp5HXpKKpXe42tcNJ0/1RWwlumdTLABn1/Ok/aOD+hWnIleKCddf8rL/y4VlJtUIJTSbOqCCtK2SIE9fJ7qf4UG43Lzhbz1h5tqRu3UN1pt3we4wR0LK4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1587673380390924.7583581999019; Thu, 23 Apr 2020 13:23:00 -0700 (PDT) Received: from localhost ([::1]:39772 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRiN8-0006yt-V7 for importer@patchew.org; Thu, 23 Apr 2020 16:22:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55348) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRiLr-0004Ya-9V for qemu-devel@nongnu.org; Thu, 23 Apr 2020 16:21:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jRiLq-0003Nq-Q7 for qemu-devel@nongnu.org; Thu, 23 Apr 2020 16:21:39 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:35436 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jRiLq-0003NW-CO for qemu-devel@nongnu.org; Thu, 23 Apr 2020 16:21:38 -0400 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-305-kYY2Cv8UPfCews5lwClptg-1; Thu, 23 Apr 2020 16:21:36 -0400 Received: by mail-wr1-f70.google.com with SMTP id x15so3419409wrn.0 for ; Thu, 23 Apr 2020 13:21:35 -0700 (PDT) Received: from localhost.localdomain (116.red-83-42-57.dynamicip.rima-tde.net. [83.42.57.116]) by smtp.gmail.com with ESMTPSA id j13sm5196975wro.51.2020.04.23.13.21.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Apr 2020 13:21:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587673297; 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=8pU1FGRWMr9wFChCxvp9YPnfOkoE9DOPVGwWc1xi51Q=; b=Q33MOWoQ18/7I8W2f1MoeeYEhTzGsmvkdY4RA97mnxLuivJukReZua5pjpM7IMEoDZQgBt N4cbFxIQMscZFglJN6N79VvyCbWLdpDgNm/8RQ3oFGqZ++F+Lhe15f7CxgnN8eEdii1aLd e2JM8kl0kCqA1XRSK/gb608keh9z4zA= X-MC-Unique: kYY2Cv8UPfCews5lwClptg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MAl6CeAivHgSy+VUA/NScy4gWhWpCQWoVZ2DVxmZ3RI=; b=sSryivdJIohko6Sm9JmxYwFw+R40GvShYwt5aSuKHqHMUnesJPWz2parZiTT/eyvIG y+W7oNYVpdba3LsVGMcy7KLYD++EHLZ2nSQhUXBJjVQnOqwm31tICKZvE6eGrZz5qqcw AHMJ6ErHkCRl6NWjf809uCEST2pwIoqbRGd86Ow6Q8ApADw7qYhWXmAFFLoAMv1yVo02 NRF7Q/5OfF021ABThatjs6sJI1rmSHIFsZjVT9ICAFm2Jskg3qZEH0UnS1uACNgk4SJ4 r6em8nzfGXMO2H1yWzFaHKe9clV3Cw0HsqYII7B1U6kVhIjT19wt6KLYsmliDM4/LpTw 7dLg== X-Gm-Message-State: AGi0PuaC3pkIrp7FlytD7orOprWcWRdyw9x3iyDLYmZJrp6ueQfeqUZM 5JxdRfoztVWj3t7RuMRhiwC5P9RkSpNUhUQblEApgbuD1Ou7ZVK5972bmXQMBxEGw7dnu8bhBzC 7RKILGlQMKyMBgck= X-Received: by 2002:adf:ee0c:: with SMTP id y12mr7508969wrn.0.1587673294669; Thu, 23 Apr 2020 13:21:34 -0700 (PDT) X-Google-Smtp-Source: APiQypKQPnNcVHQhQ8nOPRlwicSuLfqzuDvwPh7mi8p/kAH4cmdhld0jq1TGlV9yfLAOzZvnBfVicA== X-Received: by 2002:adf:ee0c:: with SMTP id y12mr7508943wrn.0.1587673294395; Thu, 23 Apr 2020 13:21:34 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 3/7] chardev: Restrict msmouse / wctablet / testdev to system emulation Date: Thu, 23 Apr 2020 22:21:08 +0200 Message-Id: <20200423202112.644-4-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200423202112.644-1-philmd@redhat.com> References: <20200423202112.644-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/23 16:21:37 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Elena Ufimtseva , John G Johnson , Jagannathan Raman , "Dr. David Alan Gilbert" , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" The msmouse / wctablet / testdev character devices are only used by system emulation. Remove them from user mode and tools. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Richard Henderson --- chardev/Makefile.objs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chardev/Makefile.objs b/chardev/Makefile.objs index d68e1347f9..15ee7f47da 100644 --- a/chardev/Makefile.objs +++ b/chardev/Makefile.objs @@ -17,7 +17,7 @@ chardev-obj-y +=3D char-udp.o chardev-obj-$(CONFIG_WIN32) +=3D char-win.o chardev-obj-$(CONFIG_WIN32) +=3D char-win-stdio.o =20 -common-obj-y +=3D msmouse.o wctablet.o testdev.o +common-obj-$(CONFIG_SOFTMMU) +=3D msmouse.o wctablet.o testdev.o common-obj-$(CONFIG_BRLAPI) +=3D baum.o baum.o-cflags :=3D $(SDL_CFLAGS) baum.o-libs :=3D $(BRLAPI_LIBS) --=20 2.21.1 From nobody Sun Feb 8 05:56:38 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1587673508; cv=none; d=zohomail.com; s=zohoarc; b=kPzZi7+Pd+piY4t4Vi3Eu/C+6jVYQVh9n9e0wqGIP7ztTmfTt8m+8vhYhuqw4HXQxj16iEadKJE2m9v2NrtRD0VU8mAAdIEcOOYZn/+lHiQyejTa+ghx2LuK1UltNGa8WDKvMPJhXDmO52irjUAVx27ps0+dPNQpwrHgd3CLVt0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587673508; 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=tPIOoo9ftY2Y0yP1OPzgpA1jMu3wYHrPWEzYbrSHsC0=; b=FAIXv9bJe/1UzbcdUVp+o5OfgPG/5fSB0PZHp3oC4kegO9+VEbs7fYV4cEU7Q1Mn5+5yT8x5IaGM+jNnW65B/wU2wK4bkM2A8va7olYebFcOz3apwGzRJB/9WMaXgaPbaYjXmN8E6nhs8dtGfLU9MsjGfuesiBUZnXxMgCpRCoA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1587673508832124.36646733885709; Thu, 23 Apr 2020 13:25:08 -0700 (PDT) Received: from localhost ([::1]:40030 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRiPD-0003rK-3T for importer@patchew.org; Thu, 23 Apr 2020 16:25:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55366) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRiM0-0004ph-DH for qemu-devel@nongnu.org; Thu, 23 Apr 2020 16:21:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jRiLz-0003WS-Rk for qemu-devel@nongnu.org; Thu, 23 Apr 2020 16:21:48 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:22526 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jRiLz-0003U3-0y for qemu-devel@nongnu.org; Thu, 23 Apr 2020 16:21:47 -0400 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-433-FMlagvOiOguPjkD1qfGTHQ-1; Thu, 23 Apr 2020 16:21:41 -0400 Received: by mail-wr1-f69.google.com with SMTP id i10so3385864wrq.8 for ; Thu, 23 Apr 2020 13:21:41 -0700 (PDT) Received: from localhost.localdomain (116.red-83-42-57.dynamicip.rima-tde.net. [83.42.57.116]) by smtp.gmail.com with ESMTPSA id x18sm5121841wrs.11.2020.04.23.13.21.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Apr 2020 13:21:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587673303; 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=tPIOoo9ftY2Y0yP1OPzgpA1jMu3wYHrPWEzYbrSHsC0=; b=RWTxVMVytfxOgyeBYOA88xdntqcb4yVLaFYoLBoPaENs+Rwu8u+lDnb2oMVjm+JeVceEPB eKf7QXu1nyvDRxqNl1qMbFBIrFr5i+WTATWmDRtzy/y+TZ7E6kecTBeByAMJFtT4UW9+z6 wNLVWPLQETGyKH0EIvz4UvvIYAJtHaQ= X-MC-Unique: FMlagvOiOguPjkD1qfGTHQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vj0j3jl3RruHPgtbUoMtt40YI86Ylpvpu3a4TUFv2dY=; b=YC3eKzcUBKPNHfdVPsJ4EgjVfARWxIaGObrewTBsuntMTM2cIm9tb2axKWptmovVNv V01tm7DSZunoSc1Ua0NItnJwE5lkhXBC/5SXgDQL3fQA4RfUg0LnYRNCxtoLH//CTqOM NIKGAKj3M+C7E10AfJxcEk84ZBFIBmhBzP2XRUzS1rGGEBFRpn74ibWngXN3mO2jLP0Z 3KWl19jhWsD7j8n5UuBsQbJCMM3KvDoIlEKvdD0ww/f3zavVFTWW9jXNay9oGo5+a0jK rkBWzIY2nvFHvuEL3BNDea8MjwyIvW/gVvwPAzhJl1SCiQzm8YG1nbWdEAAHyaAaaCWx +oUg== X-Gm-Message-State: AGi0PuYSOHrc8uEhMYQ0E1MdSmvMxeSflRxyBizhCeCP5vTbdObbGSjO JyMc+iYlBjVb/MnDV0ZwFVzibGeEue9GjYV27vawa9bZvxCecYxVsoPvJVjOKQdwL63rT/Mg85i Qj/ZaImqYEdiOhnc= X-Received: by 2002:a1c:e906:: with SMTP id q6mr5779516wmc.62.1587673300285; Thu, 23 Apr 2020 13:21:40 -0700 (PDT) X-Google-Smtp-Source: APiQypJ3zhzGof0w8cR8tv/2XdV1bmsbwmF6riz6ZIDurnmMpSjKvwLvDe4tdg+eVKt+WKTDj8izBg== X-Received: by 2002:a1c:e906:: with SMTP id q6mr5779497wmc.62.1587673299991; Thu, 23 Apr 2020 13:21:39 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 4/7] chardev: Reduce "char-mux.h" scope, rename it "chardev-internal.h" Date: Thu, 23 Apr 2020 22:21:09 +0200 Message-Id: <20200423202112.644-5-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200423202112.644-1-philmd@redhat.com> References: <20200423202112.644-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.81; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/23 02:14:02 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Elena Ufimtseva , John G Johnson , Jagannathan Raman , "Dr. David Alan Gilbert" , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" No file out of chardev/ requires access to this header, restrict its scope. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Richard Henderson --- include/chardev/char-mux.h =3D> chardev/chardev-internal.h | 7 ++++--- chardev/char-fe.c | 2 +- chardev/char-mux.c | 2 +- chardev/char.c | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) rename include/chardev/char-mux.h =3D> chardev/chardev-internal.h (96%) diff --git a/include/chardev/char-mux.h b/chardev/chardev-internal.h similarity index 96% rename from include/chardev/char-mux.h rename to chardev/chardev-internal.h index 417fe32eed..e0264ac349 100644 --- a/include/chardev/char-mux.h +++ b/chardev/chardev-internal.h @@ -1,5 +1,5 @@ /* - * QEMU System Emulator + * QEMU Character device internals * * Copyright (c) 2003-2008 Fabrice Bellard * @@ -21,8 +21,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN * THE SOFTWARE. */ -#ifndef CHAR_MUX_H -#define CHAR_MUX_H +#ifndef CHARDEV_INTERNAL_H +#define CHARDEV_INTERNAL_H =20 #include "chardev/char.h" #include "chardev/char-fe.h" @@ -30,6 +30,7 @@ #define MAX_MUX 4 #define MUX_BUFFER_SIZE 32 /* Must be a power of 2. */ #define MUX_BUFFER_MASK (MUX_BUFFER_SIZE - 1) + typedef struct MuxChardev { Chardev parent; CharBackend *backends[MAX_MUX]; diff --git a/chardev/char-fe.c b/chardev/char-fe.c index f3530a90e6..474715c5a9 100644 --- a/chardev/char-fe.c +++ b/chardev/char-fe.c @@ -29,7 +29,7 @@ =20 #include "chardev/char-fe.h" #include "chardev/char-io.h" -#include "chardev/char-mux.h" +#include "chardev-internal.h" =20 int qemu_chr_fe_write(CharBackend *be, const uint8_t *buf, int len) { diff --git a/chardev/char-mux.c b/chardev/char-mux.c index 46c44af67c..6f980bb836 100644 --- a/chardev/char-mux.c +++ b/chardev/char-mux.c @@ -29,7 +29,7 @@ #include "chardev/char.h" #include "sysemu/block-backend.h" #include "sysemu/sysemu.h" -#include "chardev/char-mux.h" +#include "chardev-internal.h" =20 /* MUX driver for serial I/O splitting */ =20 diff --git a/chardev/char.c b/chardev/char.c index e77564060d..b672a41150 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -39,7 +39,7 @@ #include "qemu/option.h" #include "qemu/id.h" =20 -#include "chardev/char-mux.h" +#include "chardev-internal.h" =20 /***********************************************************/ /* character device */ --=20 2.21.1 From nobody Sun Feb 8 05:56:38 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1587673522; cv=none; d=zohomail.com; s=zohoarc; b=FmKTNe/uofA87+fRVfb9AdX5PmCsF7S4dE6KxCtuOduphiIPBGv92ftoALffv9ieu+awmlYQxH7eJYAPEbytCaWRgNuv8m9ZWBliDTCqCGzUklMvdVoicw9Hf8ytTkTm6UsGBlX689HV93VIyxA6Yp5VYH0WWxRFtupbAxtGi+M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587673522; 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=QpPT5lIf6zF9LbEYpSRYY+8MZQS9JkDT9x3dN4aa87o=; b=TzLXexP1RaRzPsIh2PjR2Lq4h8XQoi7AcbSCBoek+xJ/4I4CEnpQaK/sxbblHxED9800esVcw2fb739Yd5KuNdtzVqUSNwRYk2oDjFhPYdUNSdRjMXI2RY8dKCCke8Jdwx5Iu0kURxY0etBo4FUPsPFmlN8ZnCF5Y6LdDOXJ8rw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1587673522276663.2631741716851; Thu, 23 Apr 2020 13:25:22 -0700 (PDT) Received: from localhost ([::1]:40042 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRiPQ-0004B3-Oz for importer@patchew.org; Thu, 23 Apr 2020 16:25:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55526) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRiN0-0007Xc-W2 for qemu-devel@nongnu.org; Thu, 23 Apr 2020 16:22:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jRiN0-0004rp-8A for qemu-devel@nongnu.org; Thu, 23 Apr 2020 16:22:50 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:44488 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jRiMz-0004qt-RG for qemu-devel@nongnu.org; Thu, 23 Apr 2020 16:22:49 -0400 Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-75-bq2d1Ty9O-ubaDZvI6SIqQ-1; Thu, 23 Apr 2020 16:22:47 -0400 Received: by mail-ed1-f72.google.com with SMTP id y6so2174671edo.18 for ; Thu, 23 Apr 2020 13:22:47 -0700 (PDT) Received: from localhost.localdomain (116.red-83-42-57.dynamicip.rima-tde.net. [83.42.57.116]) by smtp.gmail.com with ESMTPSA id h2sm289026edw.63.2020.04.23.13.21.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Apr 2020 13:21:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587673369; 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=QpPT5lIf6zF9LbEYpSRYY+8MZQS9JkDT9x3dN4aa87o=; b=N3np2N7skDwY0yVAzqLTPMegYqOllfBLu1+l+VeL+zKBDl51bTO5VkCWwhn9TtOlvwb+Rx 2Eb1GEjX5+68AqpZxuUBEqjLg03j1nOfGtKU9pr5RWcauNoYvX25GqKs4x7pbn7PK7Tkp7 cwlSdSHOYfjJoyZ52Xzsm5GJRq9Lxs4= X-MC-Unique: bq2d1Ty9O-ubaDZvI6SIqQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=O4g/2sbaFjmdI3zEPcvvgzI0jd27H8+2xG/e85GYdg0=; b=iCvqtAbY6SsTtl2+qxg89uZWL4wy+y9yxtN0P7Ml0iVmfD1AcRciMgBUnUuPtjG7fa tat9Q4d13jV2PzX6tK/UfB3Q5syFiIiGwQWjI4CI3JqGUOq2HEXFbyJQAqlCZBr//K+H mFtQuF39rQz1XY2BOXMYdgQIEx56Pa3mv94CqhP27mov15rNIfGmRisrp0/8vL3lhlGO ni61jhIyNOEHmvGNV7baZUr3+FaqqrxqnFjkq0qqhA3rE0P/KNYPAa6ZigmTK5lyE5QY c4tAneiOROvGcBXsUkoY5+NJwA0b4yro3mODjF8LUYBQvDZBHZHKpvoVrXziYxxe2bg4 Pokw== X-Gm-Message-State: AGi0PuYkcc55qNDm5OAIisy2TLI7k//BdCHV4Njqkr2wETRtCENnLxCJ hIf/BrMsdVRN7IqYWti9hqvcDeV2zZgNa6AxB96JjusiaI8/9CXs1zxgx++evvu+/ow+4mr7s3s bsDPrlB7/HmzE/0A= X-Received: by 2002:a17:906:c839:: with SMTP id dd25mr4141143ejb.164.1587673306036; Thu, 23 Apr 2020 13:21:46 -0700 (PDT) X-Google-Smtp-Source: APiQypLGILeUrGeze+VvQL1M1zY20TcBmLlQafL6JtfodiPIPxXw6eiMzeaQ1ML/0P357kwWFH7UVQ== X-Received: by 2002:a17:906:c839:: with SMTP id dd25mr4141118ejb.164.1587673305665; Thu, 23 Apr 2020 13:21:45 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 5/7] chardev: Extract system emulation specific code Date: Thu, 23 Apr 2020 22:21:10 +0200 Message-Id: <20200423202112.644-6-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200423202112.644-1-philmd@redhat.com> References: <20200423202112.644-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.81; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/23 02:14:02 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Elena Ufimtseva , John G Johnson , Jagannathan Raman , "Dr. David Alan Gilbert" , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Split out code only used during system emulation, to reduce code pulled in user emulation and tools. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Richard Henderson --- chardev/chardev-internal.h | 3 ++ chardev/char.c | 35 +------------------ chardev/chardev-sysemu.c | 69 ++++++++++++++++++++++++++++++++++++++ chardev/Makefile.objs | 1 + 4 files changed, 74 insertions(+), 34 deletions(-) create mode 100644 chardev/chardev-sysemu.c diff --git a/chardev/chardev-internal.h b/chardev/chardev-internal.h index e0264ac349..f4d0429763 100644 --- a/chardev/chardev-internal.h +++ b/chardev/chardev-internal.h @@ -26,6 +26,7 @@ =20 #include "chardev/char.h" #include "chardev/char-fe.h" +#include "qom/object.h" =20 #define MAX_MUX 4 #define MUX_BUFFER_SIZE 32 /* Must be a power of 2. */ @@ -59,4 +60,6 @@ typedef struct MuxChardev { void mux_set_focus(Chardev *chr, int focus); void mux_chr_send_all_event(Chardev *chr, QEMUChrEvent event); =20 +Object *get_chardevs_root(void); + #endif /* CHAR_MUX_H */ diff --git a/chardev/char.c b/chardev/char.c index b672a41150..555bb0448e 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -44,7 +44,7 @@ /***********************************************************/ /* character device */ =20 -static Object *get_chardevs_root(void) +Object *get_chardevs_root(void) { return container_get(object_get_root(), "/chardevs"); } @@ -300,33 +300,6 @@ static const TypeInfo char_type_info =3D { .class_init =3D char_class_init, }; =20 -static int chardev_machine_done_notify_one(Object *child, void *opaque) -{ - Chardev *chr =3D (Chardev *)child; - ChardevClass *class =3D CHARDEV_GET_CLASS(chr); - - if (class->chr_machine_done) { - return class->chr_machine_done(chr); - } - - return 0; -} - -static void chardev_machine_done_hook(Notifier *notifier, void *unused) -{ - int ret =3D object_child_foreach(get_chardevs_root(), - chardev_machine_done_notify_one, NULL); - - if (ret) { - error_report("Failed to call chardev machine_done hooks"); - exit(1); - } -} - -static Notifier chardev_machine_done_notify =3D { - .notify =3D chardev_machine_done_hook, -}; - static bool qemu_chr_is_busy(Chardev *s) { if (CHARDEV_IS_MUX(s)) { @@ -1187,12 +1160,6 @@ void qemu_chr_cleanup(void) static void register_types(void) { type_register_static(&char_type_info); - - /* this must be done after machine init, since we register FEs with mu= xes - * as part of realize functions like serial_isa_realizefn when -nograp= hic - * is specified - */ - qemu_add_machine_init_done_notifier(&chardev_machine_done_notify); } =20 type_init(register_types); diff --git a/chardev/chardev-sysemu.c b/chardev/chardev-sysemu.c new file mode 100644 index 0000000000..eecdc615ee --- /dev/null +++ b/chardev/chardev-sysemu.c @@ -0,0 +1,69 @@ +/* + * QEMU System Emulator + * + * Copyright (c) 2003-2008 Fabrice Bellard + * + * Permission is hereby granted, free of charge, to any person obtaining a= copy + * of this software and associated documentation files (the "Software"), t= o deal + * in the Software without restriction, including without limitation the r= ights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or se= ll + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included= in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS= OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OT= HER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING= FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN + * THE SOFTWARE. + */ + +#include "qemu/osdep.h" +#include "sysemu/sysemu.h" +#include "chardev/char.h" +#include "qemu/error-report.h" +#include "chardev-internal.h" + +static int chardev_machine_done_notify_one(Object *child, void *opaque) +{ + Chardev *chr =3D (Chardev *)child; + ChardevClass *class =3D CHARDEV_GET_CLASS(chr); + + if (class->chr_machine_done) { + return class->chr_machine_done(chr); + } + + return 0; +} + +static void chardev_machine_done_hook(Notifier *notifier, void *unused) +{ + int ret =3D object_child_foreach(get_chardevs_root(), + chardev_machine_done_notify_one, NULL); + + if (ret) { + error_report("Failed to call chardev machine_done hooks"); + exit(1); + } +} + + +static Notifier chardev_machine_done_notify =3D { + .notify =3D chardev_machine_done_hook, +}; + +static void register_types(void) +{ + /* + * This must be done after machine init, since we register FEs with mu= xes + * as part of realize functions like serial_isa_realizefn when -nograp= hic + * is specified. + */ + qemu_add_machine_init_done_notifier(&chardev_machine_done_notify); +} + +type_init(register_types); diff --git a/chardev/Makefile.objs b/chardev/Makefile.objs index 15ee7f47da..a10acbc2b8 100644 --- a/chardev/Makefile.objs +++ b/chardev/Makefile.objs @@ -1,4 +1,5 @@ chardev-obj-y +=3D char.o +chardev-obj-$(CONFIG_SOFTMMU) +=3D chardev-sysemu.o chardev-obj-$(CONFIG_WIN32) +=3D char-console.o chardev-obj-$(CONFIG_POSIX) +=3D char-fd.o chardev-obj-y +=3D char-fe.o --=20 2.21.1 From nobody Sun Feb 8 05:56:38 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1587673429; cv=none; d=zohomail.com; s=zohoarc; b=nNmmEwYXcHvEiEuSZT9eCgr9lEpvzpt30bbT29kTEJZHu2PhOi2Y75CI5t3usNzH22l2StnJHR7Q4+XGzHjrTbWR4gXg0XDW4gCedH+FpA3SMGcxx15zlupbHq2J//etWZzFXcmmSCG8fHocf3Ohxg9haKvmN8AVOxSWji+JTO0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587673429; 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=aOyVErqFCmyf9pd+Nr+epVzmP7eWXaoL84ISysXFv0Q=; b=Qlafjp7Kc3DS8apPFThKyrEsrS/n37SS5d7Fk+vB9/qshKrZJscXnm6f07LZTALHfqEmxIz1BtmWQPXqSW2KTU1Mjidd0EaxWdFVYES0D71SZzRx45JdVR2Q37TXK54wmnYYUf18ayLVbrWKct2AWy9X0h4VosPQsKt6P+n/2Ns= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1587673429234783.6769426556236; Thu, 23 Apr 2020 13:23:49 -0700 (PDT) Received: from localhost ([::1]:39870 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRiNv-0000Se-Rv for importer@patchew.org; Thu, 23 Apr 2020 16:23:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55394) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRiM9-00056e-2k for qemu-devel@nongnu.org; Thu, 23 Apr 2020 16:21:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jRiM8-0003da-BW for qemu-devel@nongnu.org; Thu, 23 Apr 2020 16:21:56 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:44439 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jRiM7-0003dT-W2 for qemu-devel@nongnu.org; Thu, 23 Apr 2020 16:21:56 -0400 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-271-Jw5aTiasMhqOwhfWO5B5eA-1; Thu, 23 Apr 2020 16:21:53 -0400 Received: by mail-wr1-f72.google.com with SMTP id v9so3380384wrt.7 for ; Thu, 23 Apr 2020 13:21:52 -0700 (PDT) Received: from localhost.localdomain (116.red-83-42-57.dynamicip.rima-tde.net. [83.42.57.116]) by smtp.gmail.com with ESMTPSA id a67sm5423740wmc.30.2020.04.23.13.21.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Apr 2020 13:21:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587673314; 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=aOyVErqFCmyf9pd+Nr+epVzmP7eWXaoL84ISysXFv0Q=; b=Zln9NDJphptNcX3TP8SNVTX5xwA2AhSk8Z4d3viMP3xpCVfi4griM5C434x/eEHdIyrAze glBMYYh6XDAdWf8pXOZZPSWXGBoG1P5UEUQCFSq/BRfYa+JH8VKY8H8vUYI73qXhswRrnQ zOujGeDw+8o9RMi4R5iBmYfCbnnCDvc= X-MC-Unique: Jw5aTiasMhqOwhfWO5B5eA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8gYfBqFeTywo96T3GTdB1ETByq33AuAVSUY1XmaFyaw=; b=LgYPmQxL4iyho6dE3VUMLdfZYNnnu6rUQ64GGSeQCjRt1/ZRRc9Hx2tlQMd2ytGHPl /mNtEwHp7hp6c1Bd2hJq8Uh3Gvl8u1yMTLvwzq5WeG+C3W/BlKU1QdF0Ep3hSx27dfPL FaOGx8FSnSINrletJoIfxXavy+Zq+j0orrd8Ir5mA8JqOUkWEtVSfu4R0rh0Bx1qM2PV ZS25gcRVJIOInFPJI0OQrgjl9p4tQj1+lhOr2exLb4cKo0L0WPX+sZWmY1FiqVdYoJb1 4wrX+/YH+UbLHMNzOtKexRj/36s/olKWkwd+OiArOzKuQOijp7o+ir4PncJqJPYzNloa EDgg== X-Gm-Message-State: AGi0PubdnMNwPUKed84HGtqS60SdD2YSLH5WzMvq3z9JEiPdCZBHcJ4r e4fSwQoY5rpajs61IgCgrza+CMkcO7Fhn2RFbAJfWyNvTK6RltWBL91KhmyioN13FDornmfqnYJ S74ZQuqYwuS8YOB0= X-Received: by 2002:a7b:c7d2:: with SMTP id z18mr6191719wmk.72.1587673311684; Thu, 23 Apr 2020 13:21:51 -0700 (PDT) X-Google-Smtp-Source: APiQypLrHSHmXL1n+qmnOhiwmPwsBhOEScKtOKHLfqMligKeD1o9ZGj3ONDh33mP0lG3nxN3nRqrUw== X-Received: by 2002:a7b:c7d2:: with SMTP id z18mr6191700wmk.72.1587673311445; Thu, 23 Apr 2020 13:21:51 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 6/7] stubs: Split machine-init-done as machine-init and machine-notify Date: Thu, 23 Apr 2020 22:21:11 +0200 Message-Id: <20200423202112.644-7-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200423202112.644-1-philmd@redhat.com> References: <20200423202112.644-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/23 16:21:37 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Elena Ufimtseva , John G Johnson , Jagannathan Raman , "Dr. David Alan Gilbert" , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" As the machine notify handlers are only used in system emulation, split the current file in two, and only build the notifier when system emulation is used. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Richard Henderson --- stubs/machine-init.c | 4 ++++ stubs/{machine-init-done.c =3D> machine-notify.c} | 2 -- stubs/Makefile.objs | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 stubs/machine-init.c rename stubs/{machine-init-done.c =3D> machine-notify.c} (78%) diff --git a/stubs/machine-init.c b/stubs/machine-init.c new file mode 100644 index 0000000000..7622930ee0 --- /dev/null +++ b/stubs/machine-init.c @@ -0,0 +1,4 @@ +#include "qemu/osdep.h" +#include "sysemu/sysemu.h" + +bool machine_init_done =3D true; diff --git a/stubs/machine-init-done.c b/stubs/machine-notify.c similarity index 78% rename from stubs/machine-init-done.c rename to stubs/machine-notify.c index cd8e81392d..d164ecccb9 100644 --- a/stubs/machine-init-done.c +++ b/stubs/machine-notify.c @@ -1,8 +1,6 @@ #include "qemu/osdep.h" #include "sysemu/sysemu.h" =20 -bool machine_init_done =3D true; - void qemu_add_machine_init_done_notifier(Notifier *notify) { } diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs index 45be5dc0ed..765659a3f9 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -15,7 +15,8 @@ stub-obj-y +=3D iothread-lock.o stub-obj-y +=3D is-daemonized.o stub-obj-$(CONFIG_LINUX_AIO) +=3D linux-aio.o stub-obj-$(CONFIG_LINUX_IO_URING) +=3D io_uring.o -stub-obj-y +=3D machine-init-done.o +stub-obj-y +=3D machine-init.o +stub-obj-$(CONFIG_SOFTMMU) +=3D machine-notify.o stub-obj-y +=3D migr-blocker.o stub-obj-y +=3D change-state-handler.o stub-obj-y +=3D monitor.o --=20 2.21.1 From nobody Sun Feb 8 05:56:38 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1587673581; cv=none; d=zohomail.com; s=zohoarc; b=YtYBY+kSRfu28xODEe+WKm3Dgv3xar+jtorsGnhxg3rKBHn+tL431z3rQtwsDKEYFFK+rF8lV/UsIwmjj8YsKSK2Ts0RqcY6LWPwELbtoq6aGyAGoE2xASA3LSlySXO25MfOBugbN4oQUDEp2mQO5mQcgc+Iw1UjbghOO6WW/VU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587673581; 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=wq10tdmagP4bZ/4I285kBZFNlh6YBL1XlJbyw1tLKw8=; b=Q9klW0ivpHkD5bE552Yu/cZCbrgb9tMLN9lsYQClXqs3PuOLU6kjhDuhD3JBXZudEgCNZfOa5TnYhOzuUb1scMCCXI9KC2nsF6fK3rPmWu1A0h/Q+cowMR/804R2NqxO9HR8P9t5NfL01cUxhhAc8QTSIdbscHpLwC1chviBzvc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 158767358133481.75817157047925; Thu, 23 Apr 2020 13:26:21 -0700 (PDT) Received: from localhost ([::1]:40152 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRiQN-0006UC-SD for importer@patchew.org; Thu, 23 Apr 2020 16:26:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55416) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRiMF-0005Oi-Hj for qemu-devel@nongnu.org; Thu, 23 Apr 2020 16:22:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jRiME-0003gI-Nk for qemu-devel@nongnu.org; Thu, 23 Apr 2020 16:22:03 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:29778 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jRiME-0003g9-8H for qemu-devel@nongnu.org; Thu, 23 Apr 2020 16:22:02 -0400 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-152-Q4yM1LQNNliAFdsg53b8pQ-1; Thu, 23 Apr 2020 16:21:59 -0400 Received: by mail-wr1-f71.google.com with SMTP id r11so3381938wrx.21 for ; Thu, 23 Apr 2020 13:21:59 -0700 (PDT) Received: from localhost.localdomain (116.red-83-42-57.dynamicip.rima-tde.net. [83.42.57.116]) by smtp.gmail.com with ESMTPSA id c1sm5402925wrc.4.2020.04.23.13.21.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Apr 2020 13:21:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587673321; 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=wq10tdmagP4bZ/4I285kBZFNlh6YBL1XlJbyw1tLKw8=; b=UNyTq1hmKiPhlS3CMetjre/NIQ5MO29MOYNfVjbUqKPHykIkRMQWsDfj9jVxCNCaK98W8K 5CP8yt8eqed2vdIBlku7QdW9dSAkBLH/0HK/6tVnpVR+PtQRjiQ0Iw9cW32T5xmwUXQODg e3UhkNr6M1qu0/D8kGXFP+WKnkBG1n4= X-MC-Unique: Q4yM1LQNNliAFdsg53b8pQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ar7WwMHZ0+CpcbAoGEZSCSPIuYugOvcLGHNI+3InVx8=; b=WG8apG2vb9yTobcNlK5oIZn+S/6/AcV1VgKzxWf1qOPIL2MOmVeK/+hgiIY5MGGNsr hy1hldMcTZ/yM094UKK7s89ufrMwoHFKZQqVDf7II50Ece0NDFlnDJX4LZ2iB7iVMuQ3 lnyhFsK6YocjjgzNPozK9V4vlSzw8xPZsTk+LtGljYibfO+4fHGF/7EqmpUlO2Pc3tFR zq55VcoftG2v/mTbQf9dr4TfVeaBX/CSAIcVanrk1wWFgrMdX/uEpsLuf5ScO2F0PDUU x9qLRJ5ZORSHfFY1vUZ823idZ/nugbWckUUFox/hXOpm8hQMJlUTvyIskIz7bar8CFSg ckfg== X-Gm-Message-State: AGi0PuZGO5al6sbVaqkdmYGZbvgcRRL8oUT5i6BLtLejZNw0K4XAvIcj ILcyUSi4U/QkF7agesvnNYIYiMtMKdGTlaXBT7APwnmN+VMt2AEwQ9cUTsDNAXsc15eAiDuHbys AxOTX5SfPl66mwUg= X-Received: by 2002:adf:8284:: with SMTP id 4mr6877019wrc.6.1587673318048; Thu, 23 Apr 2020 13:21:58 -0700 (PDT) X-Google-Smtp-Source: APiQypKH9YSaJ+JDgC9pahB+sDTq8Y4XOMtZ0jb+bccjXtPa7WsvKEEXtoqjOLwM/WnoOqI7V7U0Bg== X-Received: by 2002:adf:8284:: with SMTP id 4mr6876984wrc.6.1587673317711; Thu, 23 Apr 2020 13:21:57 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 7/7] multi-process: Refactor machine_init and exit notifiers Date: Thu, 23 Apr 2020 22:21:12 +0200 Message-Id: <20200423202112.644-8-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200423202112.644-1-philmd@redhat.com> References: <20200423202112.644-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/23 05:42:05 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Elena Ufimtseva , John G Johnson , Jagannathan Raman , "Dr. David Alan Gilbert" , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" From: Elena Ufimtseva Relocate machine_int and exit notifiers into common code Signed-off-by: Elena Ufimtseva Signed-off-by: John G Johnson Signed-off-by: Jagannathan Raman [PMD: Removed NotifierList machine_init_done_notifiers stub] Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- Makefile.objs | 1 + include/sysemu/sysemu.h | 2 ++ softmmu/vl.c | 42 ------------------------- stubs/machine-notify.c | 4 +++ util/machine-notify.c | 69 +++++++++++++++++++++++++++++++++++++++++ MAINTAINERS | 1 + 6 files changed, 77 insertions(+), 42 deletions(-) create mode 100644 util/machine-notify.c diff --git a/Makefile.objs b/Makefile.objs index a7c967633a..bfb9271862 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -79,6 +79,7 @@ qemu-seccomp.o-libs :=3D $(SECCOMP_LIBS) common-obj-$(CONFIG_FDT) +=3D device_tree.o =20 common-obj-y +=3D qapi/ +common-obj-y +=3D util/machine-notify.o =20 endif # CONFIG_SOFTMMU =20 diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index ef81302e1a..2438dd7bea 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -17,11 +17,13 @@ extern bool qemu_uuid_set; =20 void qemu_add_exit_notifier(Notifier *notify); void qemu_remove_exit_notifier(Notifier *notify); +void qemu_run_exit_notifiers(void); =20 extern bool machine_init_done; =20 void qemu_add_machine_init_done_notifier(Notifier *notify); void qemu_remove_machine_init_done_notifier(Notifier *notify); +void qemu_run_machine_init_done_notifiers(void); =20 extern int autostart; =20 diff --git a/softmmu/vl.c b/softmmu/vl.c index 32c0047889..39cbb6b50d 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -172,12 +172,6 @@ int icount_align_option; QemuUUID qemu_uuid; bool qemu_uuid_set; =20 -static NotifierList exit_notifiers =3D - NOTIFIER_LIST_INITIALIZER(exit_notifiers); - -static NotifierList machine_init_done_notifiers =3D - NOTIFIER_LIST_INITIALIZER(machine_init_done_notifiers); - bool xen_allowed; uint32_t xen_domid; enum xen_mode xen_mode =3D XEN_EMULATE; @@ -2325,21 +2319,6 @@ static MachineClass *machine_parse(const char *name,= GSList *machines) return mc; } =20 -void qemu_add_exit_notifier(Notifier *notify) -{ - notifier_list_add(&exit_notifiers, notify); -} - -void qemu_remove_exit_notifier(Notifier *notify) -{ - notifier_remove(notify); -} - -static void qemu_run_exit_notifiers(void) -{ - notifier_list_notify(&exit_notifiers, NULL); -} - static const char *pid_file; static Notifier qemu_unlink_pidfile_notifier; =20 @@ -2350,27 +2329,6 @@ static void qemu_unlink_pidfile(Notifier *n, void *d= ata) } } =20 -bool machine_init_done; - -void qemu_add_machine_init_done_notifier(Notifier *notify) -{ - notifier_list_add(&machine_init_done_notifiers, notify); - if (machine_init_done) { - notify->notify(notify, NULL); - } -} - -void qemu_remove_machine_init_done_notifier(Notifier *notify) -{ - notifier_remove(notify); -} - -static void qemu_run_machine_init_done_notifiers(void) -{ - machine_init_done =3D true; - notifier_list_notify(&machine_init_done_notifiers, NULL); -} - static const QEMUOption *lookup_opt(int argc, char **argv, const char **poptarg, int *poptind) { diff --git a/stubs/machine-notify.c b/stubs/machine-notify.c index d164ecccb9..71eba45b0f 100644 --- a/stubs/machine-notify.c +++ b/stubs/machine-notify.c @@ -4,3 +4,7 @@ void qemu_add_machine_init_done_notifier(Notifier *notify) { } + +void qemu_remove_machine_init_done_notifier(Notifier *notify) +{ +} diff --git a/util/machine-notify.c b/util/machine-notify.c new file mode 100644 index 0000000000..718af79335 --- /dev/null +++ b/util/machine-notify.c @@ -0,0 +1,69 @@ +/* + * Machine notifiers. + * + * Copyright (c) 2003-2008 Fabrice Bellard + * + * Permission is hereby granted, free of charge, to any person obtaining a= copy + * of this software and associated documentation files (the "Software"), t= o deal + * in the Software without restriction, including without limitation the r= ights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or se= ll + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included= in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS= OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OT= HER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING= FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN + * THE SOFTWARE. + */ + +#include "qemu/osdep.h" +#include "qemu/notify.h" +#include "sysemu/sysemu.h" + +static NotifierList machine_init_done_notifiers =3D + NOTIFIER_LIST_INITIALIZER(machine_init_done_notifiers); + +static NotifierList exit_notifiers =3D + NOTIFIER_LIST_INITIALIZER(exit_notifiers); + +bool machine_init_done; + +void qemu_add_machine_init_done_notifier(Notifier *notify) +{ + notifier_list_add(&machine_init_done_notifiers, notify); + if (machine_init_done) { + notify->notify(notify, NULL); + } +} + +void qemu_remove_machine_init_done_notifier(Notifier *notify) +{ + notifier_remove(notify); +} + +void qemu_run_machine_init_done_notifiers(void) +{ + machine_init_done =3D true; + notifier_list_notify(&machine_init_done_notifiers, NULL); +} + +void qemu_add_exit_notifier(Notifier *notify) +{ + notifier_list_add(&exit_notifiers, notify); +} + +void qemu_remove_exit_notifier(Notifier *notify) +{ + notifier_remove(notify); +} + +void qemu_run_exit_notifiers(void) +{ + notifier_list_notify(&exit_notifiers, NULL); +} diff --git a/MAINTAINERS b/MAINTAINERS index 8cbc1fac2b..04b19ac56c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2133,6 +2133,7 @@ F: util/qemu-timer.c F: softmmu/vl.c F: softmmu/main.c F: qapi/run-state.json +F: util/machine-notify.c =20 Human Monitor (HMP) M: Dr. David Alan Gilbert --=20 2.21.1