From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Subject: Re: [Qemu-devel] [PATCH 09/21] configure: use pkg-config for obtaining xen version Date: Tue, 11 Dec 2018 10:43:42 +0000 Message-ID: <20181211104342.GD921@redhat.com> References: <1493145313-31311-1-git-send-email-sstabellini@kernel.org> <1493145313-31311-9-git-send-email-sstabellini@kernel.org> Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1gWfW7-0004kh-94 for xen-devel@lists.xenproject.org; Tue, 11 Dec 2018 10:43:55 +0000 Content-Disposition: inline In-Reply-To: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: Peter Maydell Cc: Juergen Gross , Stefano Stabellini , Michael Tokarev , QEMU Developers , Stefan Hajnoczi , Anthony PERARD , "open list:X86" List-Id: xen-devel@lists.xenproject.org T24gVHVlLCBEZWMgMTEsIDIwMTggYXQgMTA6MzQ6NTJBTSArMDAwMCwgUGV0ZXIgTWF5ZGVsbCB3 cm90ZToKPiBPbiBUdWUsIDI1IEFwciAyMDE3IGF0IDE5OjM1LCBTdGVmYW5vIFN0YWJlbGxpbmkg PHNzdGFiZWxsaW5pQGtlcm5lbC5vcmc+IHdyb3RlOgo+ID4KPiA+IEZyb206IEp1ZXJnZW4gR3Jv c3MgPGpncm9zc0BzdXNlLmNvbT4KPiA+Cj4gPiBJbnN0ZWFkIG9mIHRyeWluZyB0byBndWVzcyB0 aGUgWGVuIHZlcnNpb24gdG8gdXNlIGJ5IGNvbXBpbGluZyB2YXJpb3VzCj4gPiB0ZXN0IHByb2dy YW1zIGZpcnN0IGp1c3QgYXNrIHRoZSBzeXN0ZW0gdmlhIHBrZy1jb25maWcuIE9ubHkgaWYgaXQK PiA+IGNhbid0IHJldHVybiB0aGUgdmVyc2lvbiBmYWxsIGJhY2sgdG8gdGhlIHRlc3QgcHJvZ3Jh bSBzY2hlbWUuCj4gPgo+ID4gSWYgY29uZmlndXJlIGlzIGJlaW5nIGNhbGxlZCB3aXRoIGRlZGlj YXRlZCBmbGFncyBmb3IgdGhlIFhlbiBsaWJyYXJpZXMKPiA+IHVzZSB0aG9zZSBpbnN0ZWFkIG9m IHRoZSBwa2ctY29uZmlnIG91dHB1dC4gVGhpcyB3aWxsIGF2b2lkIGJyZWFraW5nCj4gPiBhbiBp bi10cmVlIFhlbiBidWlsZCBvZiBhbiBvbGQgWGVuIHZlcnNpb24gd2hpbGUgYSBuZXcgWGVuIHZl cnNpb24gaXMKPiA+IGluc3RhbGxlZCBvbiB0aGUgYnVpbGQgbWFjaGluZTogcGtnLWNvbmZpZyB3 b3VsZCBwaWNrIHVwIHRoZSBpbnN0YWxsZWQKPiA+IFhlbiBjb25maWcgZmlsZXMgYXMgdGhlIFhl biB0cmVlIHdvdWxkbid0IGNvbnRhaW4gYW55IG9mIHRoZW0uCj4gPgo+ID4gU2lnbmVkLW9mZi1i eTogSnVlcmdlbiBHcm9zcyA8amdyb3NzQHN1c2UuY29tPgo+ID4gU2lnbmVkLW9mZi1ieTogU3Rl ZmFubyBTdGFiZWxsaW5pIDxzc3RhYmVsbGluaUBrZXJuZWwub3JnPgo+ID4gVGVzdGVkLWJ5OiBQ YXVsIER1cnJhbnQgPHBhdWwuZHVycmFudEBjaXRyaXguY29tPgo+ID4gUmV2aWV3ZWQtYnk6IFN0 ZWZhbm8gU3RhYmVsbGluaSA8c3N0YWJlbGxpbmlAa2VybmVsLm9yZz4KPiA+IC0tLQo+ID4gIGNv bmZpZ3VyZSB8IDE1OSArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLQo+ID4gIDEgZmlsZSBjaGFuZ2VkLCA4OCBpbnNlcnRpb25zKCsp LCA3MSBkZWxldGlvbnMoLSkKPiA+Cj4gPiBkaWZmIC0tZ2l0IGEvY29uZmlndXJlIGIvY29uZmln dXJlCj4gPiBpbmRleCAyNzFiZWE4Li4zMTMzZWY4IDEwMDc1NQo+ID4gLS0tIGEvY29uZmlndXJl Cj4gPiArKysgYi9jb25maWd1cmUKPiA+IEBAIC0xOTc1LDMwICsxOTc1LDQ2IEBAIGZpCj4gPiAg IyB4ZW4gcHJvYmUKPiA+Cj4gPiAgaWYgdGVzdCAiJHhlbiIgIT0gIm5vIiA7IHRoZW4KPiA+IC0g IHhlbl9saWJzPSItbHhlbnN0b3JlIC1seGVuY3RybCAtbHhlbmd1ZXN0Igo+ID4gLSAgeGVuX3N0 YWJsZV9saWJzPSItbHhlbmNhbGwgLWx4ZW5mb3JlaWdubWVtb3J5IC1seGVuZ250dGFiIC1seGVu ZXZ0Y2huIgo+ID4gKyAgIyBDaGVjayB3aGV0aGVyIFhlbiBsaWJyYXJ5IHBhdGggaXMgc3BlY2lm aWVkIHZpYSAtLWV4dHJhLWxkZmxhZ3MgdG8gYXZvaWQKPiA+ICsgICMgb3ZlcnJpZGluZyB0aGlz IHNldHRpbmcgd2l0aCBwa2ctY29uZmlnIG91dHB1dC4gSWYgbm90LCB0cnkgcGtnLWNvbmZpZwo+ ID4gKyAgIyB0byBvYnRhaW4gYWxsIG5lZWRlZCBmbGFncy4KPiA+ICsKPiA+ICsgIGlmICEgZWNo byAkRVhUUkFfTERGTEFHUyB8IGdyZXAgdG9vbHMvbGlieGMgPiAvZGV2L251bGwgJiYgXAo+ID4g KyAgICAgJHBrZ19jb25maWcgLS1leGlzdHMgeGVuY29udHJvbCA7IHRoZW4KPiA+ICsgICAgeGVu X2N0cmxfdmVyc2lvbj0iJChwcmludGYgJyVkJTAyZCUwMmQnIFwKPiA+ICsgICAgICAkKCRwa2df Y29uZmlnIC0tbW9kdmVyc2lvbiB4ZW5jb250cm9sIHwgc2VkICdzL1wuLyAvZycpICkiCj4gPiAr ICAgIHhlbj15ZXMKPiA+ICsgICAgeGVuX3BjPSJ4ZW5jb250cm9sIHhlbnN0b3JlIHhlbmd1ZXN0 IHhlbmZvcmVpZ25tZW1vcnkgeGVuZ250dGFiIgo+ID4gKyAgICB4ZW5fcGM9IiR4ZW5fcGMgeGVu ZXZ0Y2huIHhlbmRldmljZW1vZGVsIgo+ID4gKyAgICBRRU1VX0NGTEFHUz0iJFFFTVVfQ0ZMQUdT ICQoJHBrZ19jb25maWcgLS1jZmxhZ3MgJHhlbl9wYykiCj4gPiArICAgIGxpYnNfc29mdG1tdT0i JCgkcGtnX2NvbmZpZyAtLWxpYnMgJHhlbl9wYykgJGxpYnNfc29mdG1tdSIKPiA+ICsgICAgTERG TEFHUz0iJCgkcGtnX2NvbmZpZyAtLWxpYnMgJHhlbl9wYykgJExERkxBR1MiCj4gPiArICBlbHNl Cj4gCj4gSGkgLS0gdGhpcyBpcyBhbiBvbGQgcGF0Y2gsIGJ1dCBNSlQgaGFzIGp1c3Qgbm90aWNl ZCB0aGF0Cj4gaXQgbWVhbnMgdGhhdCAoYXNzdW1pbmcgY29uZmlndXJlIHRha2VzIHRoZSAid2Ug aGF2ZSBhIHBrZy1jb25maWcKPiBmb3IgWGVuIiBwYXRoKSB0aGUgWGVuIGxpYnJhcmllcyBnZXQg YWRkZWQgdG8gYm90aCBsaWJzX3NvZnRtbXUKPiBhbmQgTERGTEFHUywgd2hpY2ggbWVhbnMgdGhh dCBldmVyeXRoaW5nLCBpbmNsdWRpbmcgdGhlIGxpbnV4LXVzZXIKPiBiaW5hcmllcywgZ2V0cyBs aW5rZWQgYWdhaW5zdCB0aGVtLiBUaGUgb2xkIGZhbGxiYWNrIHBhdGgKPiBvbmx5IGFkZHMgdGhl bSB0byBsaWJzX3NvZnRtbXUuCj4gCj4gSnVlcmdlbjogaXMgdGhlcmUgYSByZWFzb24gd2h5IHlv dSBhZGRlZCB0aGUgbGlicyB0byBib3RoCj4gbGlic19zb2Z0bW11IGFuZCBMREZMQUdTIGhlcmU/ IENhbiB3ZSBqdXN0IGRlbGV0ZSB0aGUgbGluZQo+IHRoYXQgYWx0ZXJzIExERkxBR1M/CgpJbiB0 aGUgJ2Vsc2UnIGJsb2NrIHRoYXQgdGFrZXMgdGhlIG5vbi1wa2ctY29uZmlnIHBhdGgsIHRoZSBs aWJzIGFyZQpvbmx5IGFkZGVkIHRvICJsaWJzX3NvZnRtbXUiLiBTbyBJIHRoaW5rIHJlbW92aW5n IExERkxBR1MgaXMgcmlnaHQuCgpSZWdhcmRzLApEYW5pZWwKLS0gCnw6IGh0dHBzOi8vYmVycmFu Z2UuY29tICAgICAgLW8tICAgIGh0dHBzOi8vd3d3LmZsaWNrci5jb20vcGhvdG9zL2RiZXJyYW5n ZSA6fAp8OiBodHRwczovL2xpYnZpcnQub3JnICAgICAgICAgLW8tICAgICAgICAgICAgaHR0cHM6 Ly9mc3RvcDEzOC5iZXJyYW5nZS5jb20gOnwKfDogaHR0cHM6Ly9lbnRhbmdsZS1waG90by5vcmcg ICAgLW8tICAgIGh0dHBzOi8vd3d3Lmluc3RhZ3JhbS5jb20vZGJlcnJhbmdlIDp8CgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGlu ZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnBy b2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54739) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWfWB-0002UZ-5j for qemu-devel@nongnu.org; Tue, 11 Dec 2018 05:44:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gWfW7-0006MF-6q for qemu-devel@nongnu.org; Tue, 11 Dec 2018 05:43:59 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43170) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gWfW6-0006Lb-PE for qemu-devel@nongnu.org; Tue, 11 Dec 2018 05:43:55 -0500 Date: Tue, 11 Dec 2018 10:43:42 +0000 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Message-ID: <20181211104342.GD921@redhat.com> Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= References: <1493145313-31311-1-git-send-email-sstabellini@kernel.org> <1493145313-31311-9-git-send-email-sstabellini@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: Subject: Re: [Qemu-devel] [PATCH 09/21] configure: use pkg-config for obtaining xen version List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: Stefano Stabellini , Juergen Gross , Michael Tokarev , QEMU Developers , Stefan Hajnoczi , Anthony PERARD , "open list:X86" On Tue, Dec 11, 2018 at 10:34:52AM +0000, Peter Maydell wrote: > On Tue, 25 Apr 2017 at 19:35, Stefano Stabellini wrote: > > > > From: Juergen Gross > > > > Instead of trying to guess the Xen version to use by compiling various > > test programs first just ask the system via pkg-config. Only if it > > can't return the version fall back to the test program scheme. > > > > If configure is being called with dedicated flags for the Xen libraries > > use those instead of the pkg-config output. This will avoid breaking > > an in-tree Xen build of an old Xen version while a new Xen version is > > installed on the build machine: pkg-config would pick up the installed > > Xen config files as the Xen tree wouldn't contain any of them. > > > > Signed-off-by: Juergen Gross > > Signed-off-by: Stefano Stabellini > > Tested-by: Paul Durrant > > Reviewed-by: Stefano Stabellini > > --- > > configure | 159 ++++++++++++++++++++++++++++++++++---------------------------- > > 1 file changed, 88 insertions(+), 71 deletions(-) > > > > diff --git a/configure b/configure > > index 271bea8..3133ef8 100755 > > --- a/configure > > +++ b/configure > > @@ -1975,30 +1975,46 @@ fi > > # xen probe > > > > if test "$xen" != "no" ; then > > - xen_libs="-lxenstore -lxenctrl -lxenguest" > > - xen_stable_libs="-lxencall -lxenforeignmemory -lxengnttab -lxenevtchn" > > + # Check whether Xen library path is specified via --extra-ldflags to avoid > > + # overriding this setting with pkg-config output. If not, try pkg-config > > + # to obtain all needed flags. > > + > > + if ! echo $EXTRA_LDFLAGS | grep tools/libxc > /dev/null && \ > > + $pkg_config --exists xencontrol ; then > > + xen_ctrl_version="$(printf '%d%02d%02d' \ > > + $($pkg_config --modversion xencontrol | sed 's/\./ /g') )" > > + xen=yes > > + xen_pc="xencontrol xenstore xenguest xenforeignmemory xengnttab" > > + xen_pc="$xen_pc xenevtchn xendevicemodel" > > + QEMU_CFLAGS="$QEMU_CFLAGS $($pkg_config --cflags $xen_pc)" > > + libs_softmmu="$($pkg_config --libs $xen_pc) $libs_softmmu" > > + LDFLAGS="$($pkg_config --libs $xen_pc) $LDFLAGS" > > + else > > Hi -- this is an old patch, but MJT has just noticed that > it means that (assuming configure takes the "we have a pkg-config > for Xen" path) the Xen libraries get added to both libs_softmmu > and LDFLAGS, which means that everything, including the linux-user > binaries, gets linked against them. The old fallback path > only adds them to libs_softmmu. > > Juergen: is there a reason why you added the libs to both > libs_softmmu and LDFLAGS here? Can we just delete the line > that alters LDFLAGS? In the 'else' block that takes the non-pkg-config path, the libs are only added to "libs_softmmu". So I think removing LDFLAGS is right. Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|