From nobody Mon Feb 9 08:29:02 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1641913799; cv=none; d=zohomail.com; s=zohoarc; b=jQp2nYpXDpIXAtP1vXaqIvfSnzUcT40JDQAhWHEMX4WCj8cNv7OT6qwtAQQFh689M/663ZYCE+E3COkyjM8lHjl3x6fFRj6MmmMNMQy0LT2KM6skw+ZfdCnThh4JYvsOQm5goi833uaT3ACzxOJMSqAuYS8uJZMC2xcZroAEBH8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641913799; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TCkN47zI3SYm+mHMLDmij+4Y00VWhhcxxyZlFlzzdgc=; b=LKEAo0pKr+naWr+wfhLJWM8YNYLoXqzgLOCglacuwRd4uVCQ3GCM3MDO5s6uTh5zB+E5ire5kbXIwG9bScRZ8mhb8WwkwF0/gD2GSVV8oRnObvkHMKrE0HMVTNllBUNLaZ8t+6y7FGemdSmTBfg5BHfDRUYxwUFGy5QXeNcgFtY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1641913799139338.44371890001287; Tue, 11 Jan 2022 07:09:59 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.255845.438674 (Exim 4.92) (envelope-from ) id 1n7ImQ-0007qc-1W; Tue, 11 Jan 2022 15:09:46 +0000 Received: by outflank-mailman (output) from mailman id 255845.438674; Tue, 11 Jan 2022 15:09:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1n7ImP-0007pl-R3; Tue, 11 Jan 2022 15:09:45 +0000 Received: by outflank-mailman (input) for mailman id 255845; Tue, 11 Jan 2022 15:09:44 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1n7Ibc-0002Oa-Dd for xen-devel@lists.xenproject.org; Tue, 11 Jan 2022 14:58:36 +0000 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id ec17fb13-72ee-11ec-9ce5-af14b9085ebd; Tue, 11 Jan 2022 15:58:23 +0100 (CET) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 8B8721F3BF; Tue, 11 Jan 2022 14:58:21 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 60D931403F; Tue, 11 Jan 2022 14:58:21 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id cCpeFg2b3WH9eQAAMHmgww (envelope-from ); Tue, 11 Jan 2022 14:58:21 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: ec17fb13-72ee-11ec-9ce5-af14b9085ebd DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1641913101; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TCkN47zI3SYm+mHMLDmij+4Y00VWhhcxxyZlFlzzdgc=; b=OUTHaG7Za4OLcRVER+k9rsHzA3tJlldnWMM3DF4J9ecUKfFu3136R9mIRg4FghLkU13SvK uzc8EpFlxNG/8ZCXTvffr6d1eGq/uWfwpHHKPTcQLAuUO/910sYhoQSv4j9XwZ5PKLNP7i LfwrwgrT9OKljA6xK+yV5nNXDk3W3WA= From: Juergen Gross To: minios-devel@lists.xenproject.org, xen-devel@lists.xenproject.org Cc: samuel.thibault@ens-lyon.org, wl@xen.org, Juergen Gross Subject: [PATCH v2 08/18] mini-os: eliminate fbfront union member in struct file Date: Tue, 11 Jan 2022 15:58:07 +0100 Message-Id: <20220111145817.22170-9-jgross@suse.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20220111145817.22170-1-jgross@suse.com> References: <20220111145817.22170-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1641913800873100003 Content-Type: text/plain; charset="utf-8" Replace the fbfront specific union member in struct file with the common dev pointer. Signed-off-by: Juergen Gross Reviewed-by: Samuel Thibault --- fbfront.c | 2 +- include/lib.h | 3 --- lib/sys.c | 4 ++-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/fbfront.c b/fbfront.c index 6725da1..c8410af 100644 --- a/fbfront.c +++ b/fbfront.c @@ -703,7 +703,7 @@ int fbfront_open(struct fbfront_dev *dev) { dev->fd =3D alloc_fd(FTYPE_FB); printk("fb_open(%s) -> %d\n", dev->nodename, dev->fd); - files[dev->fd].fb.dev =3D dev; + files[dev->fd].dev =3D dev; return dev->fd; } #endif diff --git a/include/lib.h b/include/lib.h index 0cedae6..2a9a01c 100644 --- a/include/lib.h +++ b/include/lib.h @@ -199,9 +199,6 @@ struct file { struct { struct kbdfront_dev *dev; } kbd; - struct { - struct fbfront_dev *dev; - } fb; #ifdef CONFIG_TPMFRONT struct { struct tpmfront_dev *dev; diff --git a/lib/sys.c b/lib/sys.c index 62c2020..2d48657 100644 --- a/lib/sys.c +++ b/lib/sys.c @@ -287,7 +287,7 @@ int read(int fd, void *buf, size_t nbytes) case FTYPE_FB: { int ret, n; n =3D nbytes / sizeof(union xenfb_in_event); - ret =3D fbfront_receive(files[fd].fb.dev, buf, n); + ret =3D fbfront_receive(files[fd].dev, buf, n); if (ret <=3D 0) { errno =3D EAGAIN; return -1; @@ -480,7 +480,7 @@ int close(int fd) #endif #ifdef CONFIG_FBFRONT case FTYPE_FB: - shutdown_fbfront(files[fd].fb.dev); + shutdown_fbfront(files[fd].dev); files[fd].type =3D FTYPE_NONE; return 0; #endif --=20 2.26.2