From nobody Thu Apr 25 16:11:49 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1620131140; cv=none; d=zohomail.com; s=zohoarc; b=OBtLSwfbuQJ0EJYG5B7r4qpBkmhYmiWt2Oe511OfTCHUd389B292QWhTyrpQ4UCNYrgodn8EWaivdJ+5feYJpn7+mZIJOONzeaBy9eCG+6lSI8ZcvTLlP8/ppWnanENtJ/QhGe2lbl/epEt2hqigzcNauUoYnEZXIfhgQ9BdIsg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620131140; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=pbWO9DRPNiYmpMD3zNME6T7GcNN5zfFc+4/TAeYsrkE=; b=NbymSYsQkZDasm+/SrwmUAn2Vt/zGXN5GfBzQPovJ6/lhYlN/yZAzl7dQod4A9Ub68HZUjbKcPwXQD4yZoBs/vo0Ua44BGu6r+nEC6R/6uUgvdceyjpqVgDXU9Y8WFqnZL61iiBCgWfNPGI5I8hhtQTge63+dZffH8JXRUvRW0Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1620131140443521.6259093809587; Tue, 4 May 2021 05:25:40 -0700 (PDT) Received: from localhost ([::1]:38600 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldu7N-0005lO-AY for importer@patchew.org; Tue, 04 May 2021 08:25:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52782) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldu0u-0002If-3B for qemu-devel@nongnu.org; Tue, 04 May 2021 08:18:56 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:51093) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldu0o-0003kx-4v for qemu-devel@nongnu.org; Tue, 04 May 2021 08:18:54 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-21-XuRKhZGAODCAflBbqjnpDA-1; Tue, 04 May 2021 08:18:43 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 64163C73A1 for ; Tue, 4 May 2021 12:18:42 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 32F3460C0F for ; Tue, 4 May 2021 12:18:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620130725; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pbWO9DRPNiYmpMD3zNME6T7GcNN5zfFc+4/TAeYsrkE=; b=hWJGPmFDfgqYbmuNDEsX8LDGqLsqFZYqIGLojYzzDDEtwkmNWYHBW0JAGXExQWv6VSpw33 FAsmWEriSyzOwSr5BGFBH21CUVPsFyeysSivrRlOmn0jO5AsMVTYnn+J67PQq9VZgbm3U2 8uk1Uz98ZVYh1Xer9sXfKHtfspgM6q4= X-MC-Unique: XuRKhZGAODCAflBbqjnpDA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH] main-loop: remove dead code Date: Tue, 4 May 2021 08:18:41 -0400 Message-Id: <20210504121841.605740-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.697, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" qemu_add_child_watch is not called anywhere since commit 2bdb920ece ("slirp: simplify fork_exec()", 2019-01-14), remove it. Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- include/qemu/main-loop.h | 18 ------------ util/main-loop.c | 59 ---------------------------------------- 2 files changed, 77 deletions(-) diff --git a/include/qemu/main-loop.h b/include/qemu/main-loop.h index d6892fd208..98aef5647c 100644 --- a/include/qemu/main-loop.h +++ b/include/qemu/main-loop.h @@ -234,24 +234,6 @@ void event_notifier_set_handler(EventNotifier *e, =20 GSource *iohandler_get_g_source(void); AioContext *iohandler_get_aio_context(void); -#ifdef CONFIG_POSIX -/** - * qemu_add_child_watch: Register a child process for reaping. - * - * Under POSIX systems, a parent process must read the exit status of - * its child processes using waitpid, or the operating system will not - * free some of the resources attached to that process. - * - * This function directs the QEMU main loop to observe a child process - * and call waitpid as soon as it exits; the watch is then removed - * automatically. It is useful whenever QEMU forks a child process - * but will find out about its termination by other means such as a - * "broken pipe". - * - * @pid: The pid that QEMU should observe. - */ -int qemu_add_child_watch(pid_t pid); -#endif =20 /** * qemu_mutex_iothread_locked: Return lock status of the main loop mutex. diff --git a/util/main-loop.c b/util/main-loop.c index 5188ff6540..0550d71b4b 100644 --- a/util/main-loop.c +++ b/util/main-loop.c @@ -592,63 +592,4 @@ void event_notifier_set_handler(EventNotifier *e, handler, NULL); } =20 -/* reaping of zombies. right now we're not passing the status to - anyone, but it would be possible to add a callback. */ -#ifndef _WIN32 -typedef struct ChildProcessRecord { - int pid; - QLIST_ENTRY(ChildProcessRecord) next; -} ChildProcessRecord; - -static QLIST_HEAD(, ChildProcessRecord) child_watches =3D - QLIST_HEAD_INITIALIZER(child_watches); - -static QEMUBH *sigchld_bh; - -static void sigchld_handler(int signal) -{ - qemu_bh_schedule(sigchld_bh); -} - -static void sigchld_bh_handler(void *opaque) -{ - ChildProcessRecord *rec, *next; - - QLIST_FOREACH_SAFE(rec, &child_watches, next, next) { - if (waitpid(rec->pid, NULL, WNOHANG) =3D=3D rec->pid) { - QLIST_REMOVE(rec, next); - g_free(rec); - } - } -} - -static void qemu_init_child_watch(void) -{ - struct sigaction act; - sigchld_bh =3D qemu_bh_new(sigchld_bh_handler, NULL); - - memset(&act, 0, sizeof(act)); - act.sa_handler =3D sigchld_handler; - act.sa_flags =3D SA_NOCLDSTOP; - sigaction(SIGCHLD, &act, NULL); -} - -int qemu_add_child_watch(pid_t pid) -{ - ChildProcessRecord *rec; - - if (!sigchld_bh) { - qemu_init_child_watch(); - } - - QLIST_FOREACH(rec, &child_watches, next) { - if (rec->pid =3D=3D pid) { - return 1; - } - } - rec =3D g_malloc0(sizeof(ChildProcessRecord)); - rec->pid =3D pid; - QLIST_INSERT_HEAD(&child_watches, rec, next); - return 0; -} #endif --=20 2.26.2