From nobody Wed May 1 23:29:36 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1498675102836724.5782347428262; Wed, 28 Jun 2017 11:38:22 -0700 (PDT) Received: from localhost ([::1]:35135 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQHr1-0000sc-TB for importer@patchew.org; Wed, 28 Jun 2017 14:38:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33411) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQHq9-0000Yy-EM for qemu-devel@nongnu.org; Wed, 28 Jun 2017 14:37:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dQHq6-0003DX-BX for qemu-devel@nongnu.org; Wed, 28 Jun 2017 14:37:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:41614) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dQHq6-0003CY-3A for qemu-devel@nongnu.org; Wed, 28 Jun 2017 14:37:22 -0400 Received: from [10.149.184.130] (162-198-228-33.lightspeed.wlfrct.sbcglobal.net [162.198.228.33]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6BA8722B5A; Wed, 28 Jun 2017 18:37:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6BA8722B5A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=sstabellini@kernel.org Date: Wed, 28 Jun 2017 11:37:19 -0700 (PDT) From: Stefano Stabellini X-X-Sender: sstabellini@sstabellini-ThinkPad-X260 To: xen-devel@lists.xenproject.org, qemu-devel@nongnu.org Message-ID: User-Agent: Alpine 2.10 (DEB 1266 2009-07-14) MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 198.145.29.99 Subject: [Qemu-devel] [PATCH v2] xenfb: remove xen_init_display "temporary" hack X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: anthony.perard@citrix.com, peter.maydell@linaro.org, sstabellini@kernel.org, kraxel@redhat.com, paul.durrant@citrix.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: TEXT/PLAIN; charset="utf-8" Initialize xenfb properly, as all other backends, from its own "initialise" function. Signed-off-by: Stefano Stabellini --- Changes in v2: - remove xen_init_display from xen_backend.h - handle cases where vkbd is missing diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c index e76c0d8..3b0168b 100644 --- a/hw/display/xenfb.c +++ b/hw/display/xenfb.c @@ -71,7 +71,6 @@ struct XenFB { int fbpages; int feature_update; int bug_trigger; - int have_console; int do_resize; =20 struct { @@ -80,6 +79,7 @@ struct XenFB { int up_count; int up_fullscreen; }; +static const GraphicHwOps xenfb_ops; =20 /* -------------------------------------------------------------------- */ =20 @@ -855,6 +855,8 @@ static int fb_init(struct XenDevice *xendev) static int fb_initialise(struct XenDevice *xendev) { struct XenFB *fb =3D container_of(xendev, struct XenFB, c.xendev); + struct XenDevice *xin; + struct XenInput *in; struct xenfb_page *fb_page; int videoram; int rc; @@ -877,16 +879,16 @@ static int fb_initialise(struct XenDevice *xendev) if (rc !=3D 0) return rc; =20 -#if 0 /* handled in xen_init_display() for now */ - if (!fb->have_console) { - fb->c.ds =3D graphic_console_init(xenfb_update, - xenfb_invalidate, - NULL, - NULL, - fb); - fb->have_console =3D 1; + fb->c.con =3D graphic_console_init(NULL, 0, &xenfb_ops, fb); + + xin =3D xen_pv_find_xendev("vkbd", xen_domid, 0); + if (xin =3D=3D NULL) { + xen_pv_printf(xendev, 1, "xenfb is up, but vkbd is not present\n"); + } else { + in =3D container_of(xin, struct XenInput, c.xendev); + in->c.con =3D fb->c.con; + xen_be_check_state(xin); } -#endif =20 if (xenstore_read_fe_int(xendev, "feature-update", &fb->feature_update= ) =3D=3D -1) fb->feature_update =3D 0; @@ -972,42 +974,3 @@ static const GraphicHwOps xenfb_ops =3D { .gfx_update =3D xenfb_update, .update_interval =3D xenfb_update_interval, }; - -/* - * FIXME/TODO: Kill this. - * Temporary needed while DisplayState reorganization is in flight. - */ -void xen_init_display(int domid) -{ - struct XenDevice *xfb, *xin; - struct XenFB *fb; - struct XenInput *in; - int i =3D 0; - -wait_more: - i++; - main_loop_wait(true); - xfb =3D xen_pv_find_xendev("vfb", domid, 0); - xin =3D xen_pv_find_xendev("vkbd", domid, 0); - if (!xfb || !xin) { - if (i < 256) { - usleep(10000); - goto wait_more; - } - xen_pv_printf(NULL, 1, "displaystate setup failed\n"); - return; - } - - /* vfb */ - fb =3D container_of(xfb, struct XenFB, c.xendev); - fb->c.con =3D graphic_console_init(NULL, 0, &xenfb_ops, fb); - fb->have_console =3D 1; - - /* vkbd */ - in =3D container_of(xin, struct XenInput, c.xendev); - in->c.con =3D fb->c.con; - - /* retry ->init() */ - xen_be_check_state(xin); - xen_be_check_state(xfb); -} diff --git a/hw/xenpv/xen_machine_pv.c b/hw/xenpv/xen_machine_pv.c index 79aef4e..31d2f25 100644 --- a/hw/xenpv/xen_machine_pv.c +++ b/hw/xenpv/xen_machine_pv.c @@ -94,9 +94,6 @@ static void xen_init_pv(MachineState *machine) =20 /* config cleanup hook */ atexit(xen_config_cleanup); - - /* setup framebuffer */ - xen_init_display(xen_domid); } =20 static void xenpv_machine_init(MachineClass *mc) diff --git a/include/hw/xen/xen_backend.h b/include/hw/xen/xen_backend.h index 852c2ea..8a6fbcb 100644 --- a/include/hw/xen/xen_backend.h +++ b/include/hw/xen/xen_backend.h @@ -55,8 +55,6 @@ extern struct XenDevOps xen_netdev_ops; /* xen_nic.= c */ extern struct XenDevOps xen_usb_ops; /* xen-usb.c */ #endif =20 -void xen_init_display(int domid); - /* configuration (aka xenbus setup) */ void xen_config_cleanup(void); int xen_config_dev_blk(DriveInfo *disk);