Skip to contentSkip to conversation

tools/build: fix python xc bindings

PATCH In review Juergen Gross 3 participants 4 messages Sep 12, 2020 – Sep 14, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tools/build: fix python xc bindings

Commit 7c273ffdd0e91 ("tools/python: drop libxenguest from setup.py") was just wrong: there is one function from libxenguest used in the bindings, so readd the library again.

While at it remove the unused PATH_LIBXL setting.

Fixes 7c273ffdd0e91 ("tools/python: drop libxenguest from setup.py")
---
 tools/python/setup.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
tools/python/setup.py +5 -4
index 8254464aff..1afe800479 100644
@@ -10,7 +10,7 @@ PATH_XEN      = XEN_ROOT + "/tools/include"
 PATH_LIBXENTOOLLOG = XEN_ROOT + "/tools/libs/toollog"
 PATH_LIBXENEVTCHN = XEN_ROOT + "/tools/libs/evtchn"
 PATH_LIBXENCTRL = XEN_ROOT + "/tools/libs/ctrl"
-PATH_LIBXL    = XEN_ROOT + "/tools/libxl"
+PATH_LIBXENGUEST = XEN_ROOT + "/tools/libs/guest"
 PATH_XENSTORE = XEN_ROOT + "/tools/libs/store"
 
 xc = Extension("xc",
@@ -19,10 +19,11 @@ xc = Extension("xc",
                                       PATH_LIBXENTOOLLOG + "/include",
                                       PATH_LIBXENEVTCHN + "/include",
                                       PATH_LIBXENCTRL + "/include",
+                                      PATH_LIBXENGUEST + "/include",
                                       "xen/lowlevel/xc" ],
-               library_dirs       = [ PATH_LIBXENCTRL ],
-               libraries          = [ "xenctrl" ],
-               depends            = [ PATH_LIBXENCTRL + "/libxenctrl.so" ],
+               library_dirs       = [ PATH_LIBXENCTRL, PATH_LIBXENGUEST ],
+               libraries          = [ "xenctrl", "xenguest" ],
+               depends            = [ PATH_LIBXENCTRL + "/libxenctrl.so", PATH_LIBXENGUEST + "/libxenguest.so" ],
                extra_link_args    = [ "-Wl,-rpath-link="+PATH_LIBXENTOOLLOG ],
                sources            = [ "xen/lowlevel/xc/xc.c" ])
 
Signature · 1 line
2.26.2
Acked-by on v1 1/1
#1 lore raw
Quoted 8 lines · Juergen Gross

Commit 7c273ffdd0e91 ("tools/python: drop libxenguest from setup.py") was just wrong: there is one function from libxenguest used in the bindings, so readd the library again.

While at it remove the unused PATH_LIBXL setting.

Fixes 7c273ffdd0e91 ("tools/python: drop libxenguest from setup.py")

Since this blocks osstest and is just putting back old code I want to commit it as quickly as possible.

#2 lore raw
Quoted 11 lines · Wei Liu
Quoted 8 lines · Juergen Gross

Commit 7c273ffdd0e91 ("tools/python: drop libxenguest from setup.py") was just wrong: there is one function from libxenguest used in the bindings, so readd the library again.

While at it remove the unused PATH_LIBXL setting.

Fixes 7c273ffdd0e91 ("tools/python: drop libxenguest from setup.py")
Quoted 2 lines

Since this blocks osstest and is just putting back old code I want to commit it as quickly as possible.

Signature · 5 lines
Best Regards,
Marek Marczykowski-Górecki
Invisible Things Lab
A: Because it messes up the order in which people normally read text.
Q: Why is top-posting such a bad thing?
#3 lore raw
Quoted 6 lines · Marek Marczykowski-Górecki
Quoted 5 lines · Wei Liu
Quoted 4 lines · Juergen Gross

Commit 7c273ffdd0e91 ("tools/python: drop libxenguest from setup.py") was just wrong: there is one function from libxenguest used in the bindings, so readd the library again.

Quoted 9 lines
Quoted 6 lines
Quoted 4 lines

While at it remove the unused PATH_LIBXL setting.

Fixes 7c273ffdd0e91 ("tools/python: drop libxenguest from setup.py")

Thanks for the quick turnaround, Marek.