From patchwork Wed Jun 28 18:37:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 9815029 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E581360365 for ; Wed, 28 Jun 2017 18:39:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DD19B28417 for ; Wed, 28 Jun 2017 18:39:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CF12F285A9; Wed, 28 Jun 2017 18:39:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B1E1928417 for ; Wed, 28 Jun 2017 18:39:38 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dQHq9-00064N-LZ; Wed, 28 Jun 2017 18:37:25 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dQHq8-00064H-I4 for xen-devel@lists.xenproject.org; Wed, 28 Jun 2017 18:37:24 +0000 Received: from [193.109.254.147] by server-6.bemta-6.messagelabs.com id A7/6F-03937-367F3595; Wed, 28 Jun 2017 18:37:23 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprFIsWRWlGSWpSXmKPExsVybKJssm7S9+B Ig6bNRhbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8bmNcYFnQoVr+5PYmxgfCXexcjFISSwhEli 1YJepi5GTg4WAQeJb9eOsHUxcnAwCsRIPPhhDRJmFAiTmHx5CStEibbEkS3zwMrZBAwl/j7ZB FYuAWQv+cwBEhYRsJRo+tnDDjKeWaCBUeJG+11mkISwgLPExJsrWUDqeQW8JP7c1AUJiwroSh z694cNxOYVEJQ4OfMJC4jNLKAlsXz6NpYJjHyzkKRmIUktYGRaxahenFpUllqka6mXVJSZnlG Sm5iZo2toYKaXm1pcnJiempOYVKyXnJ+7iREYTgxAsIPx7qaAQ4ySHExKorxH3gdHCvEl5adU ZiQWZ8QXleakFh9ilOHgUJLgjfkGlBMsSk1PrUjLzAEGNkxagoNHSYT3yyegNG9xQWJucWY6R OoUoy7HhtXrvzAJseTl56VKifMeBZkhAFKUUZoHNwIWZZcYZaWEeRmBjhLiKUgtys0sQZV/xS jOwagkzMsLMoUnM68EbtMroCOYgI5gmRcAckRJIkJKqoFx7oEwxkeiO98KMfZxTjI3vxe+3VH i+2fW14xnIm9+2nvA6Kvx1VePpti8LdZb/y2j46vvzK27FkXNEf5QY/b92eZtm5Ycn3Zh1ae/ msc19WcynGoIqH8VauN9pnCF5EPfky+CtCr1jrmrqDZ2JqRc/SFz4vFv5SCn2G1n+k6ciltf/ Utk+ZUZv5VYijMSDbWYi4oTAbzcEKGtAgAA X-Env-Sender: sstabellini@kernel.org X-Msg-Ref: server-2.tower-27.messagelabs.com!1498675041!45092707!1 X-Originating-IP: [198.145.29.99] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 9.4.19; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24779 invoked from network); 28 Jun 2017 18:37:22 -0000 Received: from mail.kernel.org (HELO mail.kernel.org) (198.145.29.99) by server-2.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 28 Jun 2017 18:37:22 -0000 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 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 Cc: anthony.perard@citrix.com, peter.maydell@linaro.org, sstabellini@kernel.org, kraxel@redhat.com, paul.durrant@citrix.com Subject: [Xen-devel] [PATCH v2] xenfb: remove xen_init_display "temporary" hack X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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; struct { @@ -80,6 +79,7 @@ struct XenFB { int up_count; int up_fullscreen; }; +static const GraphicHwOps xenfb_ops; /* -------------------------------------------------------------------- */ @@ -855,6 +855,8 @@ static int fb_init(struct XenDevice *xendev) static int fb_initialise(struct XenDevice *xendev) { struct XenFB *fb = 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 != 0) return rc; -#if 0 /* handled in xen_init_display() for now */ - if (!fb->have_console) { - fb->c.ds = graphic_console_init(xenfb_update, - xenfb_invalidate, - NULL, - NULL, - fb); - fb->have_console = 1; + fb->c.con = graphic_console_init(NULL, 0, &xenfb_ops, fb); + + xin = xen_pv_find_xendev("vkbd", xen_domid, 0); + if (xin == NULL) { + xen_pv_printf(xendev, 1, "xenfb is up, but vkbd is not present\n"); + } else { + in = container_of(xin, struct XenInput, c.xendev); + in->c.con = fb->c.con; + xen_be_check_state(xin); } -#endif if (xenstore_read_fe_int(xendev, "feature-update", &fb->feature_update) == -1) fb->feature_update = 0; @@ -972,42 +974,3 @@ static const GraphicHwOps xenfb_ops = { .gfx_update = xenfb_update, .update_interval = 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 = 0; - -wait_more: - i++; - main_loop_wait(true); - xfb = xen_pv_find_xendev("vfb", domid, 0); - xin = 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 = container_of(xfb, struct XenFB, c.xendev); - fb->c.con = graphic_console_init(NULL, 0, &xenfb_ops, fb); - fb->have_console = 1; - - /* vkbd */ - in = container_of(xin, struct XenInput, c.xendev); - in->c.con = 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) /* config cleanup hook */ atexit(xen_config_cleanup); - - /* setup framebuffer */ - xen_init_display(xen_domid); } 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 -void xen_init_display(int domid); - /* configuration (aka xenbus setup) */ void xen_config_cleanup(void); int xen_config_dev_blk(DriveInfo *disk);