From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47171) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQ9DG-000352-Ov for qemu-devel@nongnu.org; Wed, 28 Jun 2017 05:24:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dQ9DF-00034R-SU for qemu-devel@nongnu.org; Wed, 28 Jun 2017 05:24:42 -0400 Received: from mail-wm0-x229.google.com ([2a00:1450:400c:c09::229]:34988) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dQ9DF-00033c-Kc for qemu-devel@nongnu.org; Wed, 28 Jun 2017 05:24:41 -0400 Received: by mail-wm0-x229.google.com with SMTP id w126so47243399wme.0 for ; Wed, 28 Jun 2017 02:24:39 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: References: From: Peter Maydell Date: Wed, 28 Jun 2017 10:24:18 +0100 Message-ID: Content-Type: text/plain; charset="UTF-8" Subject: Re: [Qemu-devel] Getting rid of xen_init_display() (and its dubious call into main_loop_wait()) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefano Stabellini Cc: QEMU Developers , Anthony PERARD , Gerd Hoffmann , Paul Durrant , xen-devel@lists.xenproject.org On 28 June 2017 at 01:06, Stefano Stabellini wrote: > On Tue, 27 Jun 2017, Peter Maydell wrote: >> So, there is exactly one caller of main_loop_wait() in the tree that >> passes it 'true' as an argument. That caller is in xen_init_display() >> in hw/dispaly/xenfb.c. The function was added in 2009 with the comment >> "FIXME/TODO: Kill this. Temporary needed while DisplayState >> reorganization is in flight." >> >> I'd like to think that we've now completed whatever reorg that was, >> 8 years on, so can we now get rid of this function? It definitely >> seems very dubious to have a display init function with a busy loop >> and a call into main_loop_wait()... > > LOL, you gotta love "temporary fixes". I am happy to see it wasn't me > that added it ;-) > > I think the following should do the trick. Thanks! > --- > > xenfb: remove xen_init_display "temporary" hack > > Initialize xenfb properly, as all other backends, from its own > "initialise" function. > > Signed-off-by: Stefano Stabellini > > diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c > index e76c0d8..873e51f 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,12 @@ 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; > - } > -#endif > + fb->c.con = graphic_console_init(NULL, 0, &xenfb_ops, fb); > + > + xin = xen_pv_find_xendev("vkbd", xen_domid, 0); > + in = container_of(xin, struct XenInput, c.xendev); > + in->c.con = fb->c.con; Won't this crash if xen_pv_find_xendev() returned NULL? Or are we guaranteed that that can't happen here? thanks -- PMM From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Maydell Subject: Re: Getting rid of xen_init_display() (and its dubious call into main_loop_wait()) Date: Wed, 28 Jun 2017 10:24:18 +0100 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dQ9DE-0007P3-Om for xen-devel@lists.xenproject.org; Wed, 28 Jun 2017 09:24:41 +0000 Received: by mail-wm0-f50.google.com with SMTP id 62so47367441wmw.1 for ; Wed, 28 Jun 2017 02:24:39 -0700 (PDT) In-Reply-To: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: Stefano Stabellini Cc: Anthony PERARD , xen-devel@lists.xenproject.org, Paul Durrant , QEMU Developers , Gerd Hoffmann List-Id: xen-devel@lists.xenproject.org T24gMjggSnVuZSAyMDE3IGF0IDAxOjA2LCBTdGVmYW5vIFN0YWJlbGxpbmkgPHNzdGFiZWxsaW5p QGtlcm5lbC5vcmc+IHdyb3RlOgo+IE9uIFR1ZSwgMjcgSnVuIDIwMTcsIFBldGVyIE1heWRlbGwg d3JvdGU6Cj4+IFNvLCB0aGVyZSBpcyBleGFjdGx5IG9uZSBjYWxsZXIgb2YgbWFpbl9sb29wX3dh aXQoKSBpbiB0aGUgdHJlZSB0aGF0Cj4+IHBhc3NlcyBpdCAndHJ1ZScgYXMgYW4gYXJndW1lbnQu IFRoYXQgY2FsbGVyIGlzIGluIHhlbl9pbml0X2Rpc3BsYXkoKQo+PiBpbiBody9kaXNwYWx5L3hl bmZiLmMuIFRoZSBmdW5jdGlvbiB3YXMgYWRkZWQgaW4gMjAwOSB3aXRoIHRoZSBjb21tZW50Cj4+ ICJGSVhNRS9UT0RPOiBLaWxsIHRoaXMuIFRlbXBvcmFyeSBuZWVkZWQgd2hpbGUgRGlzcGxheVN0 YXRlCj4+IHJlb3JnYW5pemF0aW9uIGlzIGluIGZsaWdodC4iCj4+Cj4+IEknZCBsaWtlIHRvIHRo aW5rIHRoYXQgd2UndmUgbm93IGNvbXBsZXRlZCB3aGF0ZXZlciByZW9yZyB0aGF0IHdhcywKPj4g OCB5ZWFycyBvbiwgc28gY2FuIHdlIG5vdyBnZXQgcmlkIG9mIHRoaXMgZnVuY3Rpb24/IEl0IGRl ZmluaXRlbHkKPj4gc2VlbXMgdmVyeSBkdWJpb3VzIHRvIGhhdmUgYSBkaXNwbGF5IGluaXQgZnVu Y3Rpb24gd2l0aCBhIGJ1c3kgbG9vcAo+PiBhbmQgYSBjYWxsIGludG8gbWFpbl9sb29wX3dhaXQo KS4uLgo+Cj4gTE9MLCB5b3UgZ290dGEgbG92ZSAidGVtcG9yYXJ5IGZpeGVzIi4gSSBhbSBoYXBw eSB0byBzZWUgaXQgd2Fzbid0IG1lCj4gdGhhdCBhZGRlZCBpdCA7LSkKPgo+IEkgdGhpbmsgdGhl IGZvbGxvd2luZyBzaG91bGQgZG8gdGhlIHRyaWNrLgoKVGhhbmtzIQoKPiAtLS0KPgo+IHhlbmZi OiByZW1vdmUgeGVuX2luaXRfZGlzcGxheSAidGVtcG9yYXJ5IiBoYWNrCj4KPiBJbml0aWFsaXpl IHhlbmZiIHByb3Blcmx5LCBhcyBhbGwgb3RoZXIgYmFja2VuZHMsIGZyb20gaXRzIG93bgo+ICJp bml0aWFsaXNlIiBmdW5jdGlvbi4KPgo+IFNpZ25lZC1vZmYtYnk6IFN0ZWZhbm8gU3RhYmVsbGlu aSA8c3N0YWJlbGxpbmlAa2VybmVsLm9yZz4KPgo+IGRpZmYgLS1naXQgYS9ody9kaXNwbGF5L3hl bmZiLmMgYi9ody9kaXNwbGF5L3hlbmZiLmMKPiBpbmRleCBlNzZjMGQ4Li44NzNlNTFmIDEwMDY0 NAo+IC0tLSBhL2h3L2Rpc3BsYXkveGVuZmIuYwo+ICsrKyBiL2h3L2Rpc3BsYXkveGVuZmIuYwo+ IEBAIC03MSw3ICs3MSw2IEBAIHN0cnVjdCBYZW5GQiB7Cj4gICAgICBpbnQgICAgICAgICAgICAg ICBmYnBhZ2VzOwo+ICAgICAgaW50ICAgICAgICAgICAgICAgZmVhdHVyZV91cGRhdGU7Cj4gICAg ICBpbnQgICAgICAgICAgICAgICBidWdfdHJpZ2dlcjsKPiAtICAgIGludCAgICAgICAgICAgICAg IGhhdmVfY29uc29sZTsKPiAgICAgIGludCAgICAgICAgICAgICAgIGRvX3Jlc2l6ZTsKPgo+ICAg ICAgc3RydWN0IHsKPiBAQCAtODAsNiArNzksNyBAQCBzdHJ1Y3QgWGVuRkIgewo+ICAgICAgaW50 ICAgICAgICAgICAgICAgdXBfY291bnQ7Cj4gICAgICBpbnQgICAgICAgICAgICAgICB1cF9mdWxs c2NyZWVuOwo+ICB9Owo+ICtzdGF0aWMgY29uc3QgR3JhcGhpY0h3T3BzIHhlbmZiX29wczsKPgo+ ICAvKiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLSAqLwo+Cj4gQEAgLTg1NSw2ICs4NTUsOCBAQCBzdGF0aWMgaW50IGZi X2luaXQoc3RydWN0IFhlbkRldmljZSAqeGVuZGV2KQo+ICBzdGF0aWMgaW50IGZiX2luaXRpYWxp c2Uoc3RydWN0IFhlbkRldmljZSAqeGVuZGV2KQo+ICB7Cj4gICAgICBzdHJ1Y3QgWGVuRkIgKmZi ID0gY29udGFpbmVyX29mKHhlbmRldiwgc3RydWN0IFhlbkZCLCBjLnhlbmRldik7Cj4gKyAgICBz dHJ1Y3QgWGVuRGV2aWNlICp4aW47Cj4gKyAgICBzdHJ1Y3QgWGVuSW5wdXQgKmluOwo+ICAgICAg c3RydWN0IHhlbmZiX3BhZ2UgKmZiX3BhZ2U7Cj4gICAgICBpbnQgdmlkZW9yYW07Cj4gICAgICBp bnQgcmM7Cj4gQEAgLTg3NywxNiArODc5LDEyIEBAIHN0YXRpYyBpbnQgZmJfaW5pdGlhbGlzZShz dHJ1Y3QgWGVuRGV2aWNlICp4ZW5kZXYpCj4gICAgICBpZiAocmMgIT0gMCkKPiAgICAgICAgIHJl dHVybiByYzsKPgo+IC0jaWYgMCAgLyogaGFuZGxlZCBpbiB4ZW5faW5pdF9kaXNwbGF5KCkgZm9y IG5vdyAqLwo+IC0gICAgaWYgKCFmYi0+aGF2ZV9jb25zb2xlKSB7Cj4gLSAgICAgICAgZmItPmMu ZHMgPSBncmFwaGljX2NvbnNvbGVfaW5pdCh4ZW5mYl91cGRhdGUsCj4gLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICB4ZW5mYl9pbnZhbGlkYXRlLAo+IC0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTlVMTCwKPiAtICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIE5VTEwsCj4gLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBmYik7Cj4gLSAgICAgICAgZmItPmhhdmVfY29uc29sZSA9IDE7Cj4gLSAg ICB9Cj4gLSNlbmRpZgo+ICsgICAgZmItPmMuY29uID0gZ3JhcGhpY19jb25zb2xlX2luaXQoTlVM TCwgMCwgJnhlbmZiX29wcywgZmIpOwo+ICsKPiArICAgIHhpbiA9IHhlbl9wdl9maW5kX3hlbmRl digidmtiZCIsIHhlbl9kb21pZCwgMCk7Cj4gKyAgICBpbiA9IGNvbnRhaW5lcl9vZih4aW4sIHN0 cnVjdCBYZW5JbnB1dCwgYy54ZW5kZXYpOwo+ICsgICAgaW4tPmMuY29uID0gZmItPmMuY29uOwoK V29uJ3QgdGhpcyBjcmFzaCBpZiB4ZW5fcHZfZmluZF94ZW5kZXYoKSByZXR1cm5lZCBOVUxMPwpP ciBhcmUgd2UgZ3VhcmFudGVlZCB0aGF0IHRoYXQgY2FuJ3QgaGFwcGVuIGhlcmU/Cgp0aGFua3MK LS0gUE1NCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpY ZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHBzOi8vbGlz dHMueGVuLm9yZy94ZW4tZGV2ZWwK