xen: xenguest is not used so is not needed

[PATCH] xen: xenguest is not used so is not needed

Posted by Michael Tokarev 3 years, 9 months ago

There's no references in only file which includes xenguest.h
to any xen definitions. And there's no references to -lxenguest
in qemu, either. Drop it.

Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 configure                  | 4 ++--
 hw/i386/xen/xen_platform.c | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 2acc4d1465..09da2637a4 100755
--- a/configure
+++ b/configure
@@ -2646,7 +2646,7 @@ if test "$xen" != "no" ; 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="xencontrol xenstore xenforeignmemory xengnttab"
     xen_pc="$xen_pc xenevtchn xendevicemodel"
     if $pkg_config --exists xentoolcore; then
       xen_pc="$xen_pc xentoolcore"
@@ -2655,7 +2655,7 @@ if test "$xen" != "no" ; then
     libs_softmmu="$($pkg_config --libs $xen_pc) $libs_softmmu"
   else
 
-    xen_libs="-lxenstore -lxenctrl -lxenguest"
+    xen_libs="-lxenstore -lxenctrl"
     xen_stable_libs="-lxenforeignmemory -lxengnttab -lxenevtchn"
 
     # First we test whether Xen headers and libraries are available.
diff --git a/hw/i386/xen/xen_platform.c b/hw/i386/xen/xen_platform.c
index a1492fdecd..6e10451178 100644
--- a/hw/i386/xen/xen_platform.c
+++ b/hw/i386/xen/xen_platform.c
@@ -38,8 +38,6 @@
 #include "qemu/error-report.h"
 #include "qemu/module.h"
 
-#include <xenguest.h>
-
 //#define DEBUG_PLATFORM
 
 #ifdef DEBUG_PLATFORM
-- 
2.20.1

Re: [PATCH] xen: xenguest is not used so is not needed

Posted by Anthony PERARD 3 years, 9 months ago

On Mon, Jul 27, 2020 at 05:00:48PM +0300, Michael Tokarev wrote:
> There's no references in only file which includes xenguest.h
> to any xen definitions. And there's no references to -lxenguest
> in qemu, either. Drop it.

I'm not sure what you mean by "no references to -lxenguest", do you mean
in the binary?

> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>

Otherwise, thanks for the cleanup!

Reviewed-by: Anthony PERARD <anthony.perard@citrix.com>

-- 
Anthony PERARD

Re: [PATCH] xen: xenguest is not used so is not needed

Posted by Michael Tokarev 3 years, 9 months ago

27.07.2020 18:09, Anthony PERARD wrote:
> On Mon, Jul 27, 2020 at 05:00:48PM +0300, Michael Tokarev wrote:
>> There's no references in only file which includes xenguest.h
>> to any xen definitions. And there's no references to -lxenguest
>> in qemu, either. Drop it.
> 
> I'm not sure what you mean by "no references to -lxenguest", do you mean
> in the binary?

Yes, in the qemu-system-i386 binary, it can be linked without -lxenguest.

Just a caveat, -- I know almost nothing about xen, especially xen
internals and its (stable, unversioned and unstable, versioned) libs.
Qemu links fine without libxenguest in the mix with xen 4.11.4, - I
can't say for other versions.  I just thought if it does not include
<xenguest.h>, why it should link with -lxenguest? :)

/mjt

Re: [PATCH] xen: xenguest is not used so is not needed

Posted by Philippe Mathieu-Daudé 3 years, 7 months ago

Cc'ing qemu-trivial@

On 7/27/20 5:09 PM, Anthony PERARD wrote:
> On Mon, Jul 27, 2020 at 05:00:48PM +0300, Michael Tokarev wrote:
>> There's no references in only file which includes xenguest.h
>> to any xen definitions. And there's no references to -lxenguest
>> in qemu, either. Drop it.
> 
> I'm not sure what you mean by "no references to -lxenguest", do you mean
> in the binary?
> 
>> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
> 
> Otherwise, thanks for the cleanup!
> 
> Reviewed-by: Anthony PERARD <anthony.perard@citrix.com>
>

Re: [PATCH] xen: xenguest is not used so is not needed

Posted by Stefano Stabellini 3 years, 7 months ago

Adding Paul


On Sat, 19 Sep 2020, Philippe Mathieu-Daudé wrote:
> Cc'ing qemu-trivial@
> 
> On 7/27/20 5:09 PM, Anthony PERARD wrote:
> > On Mon, Jul 27, 2020 at 05:00:48PM +0300, Michael Tokarev wrote:
> >> There's no references in only file which includes xenguest.h
> >> to any xen definitions. And there's no references to -lxenguest
> >> in qemu, either. Drop it.
> > 
> > I'm not sure what you mean by "no references to -lxenguest", do you mean
> > in the binary?
> > 
> >> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
> > 
> > Otherwise, thanks for the cleanup!
> > 
> > Reviewed-by: Anthony PERARD <anthony.perard@citrix.com>
> > 
>