On Fri, Jan 11, 2019 at 09:30:29AM +0000, Daniel P. Berrangé wrote:
On Fri, Jan 11, 2019 at 09:24:12AM +0000, Richard W.M. Jones wrote:
> On Fri, Jan 11, 2019 at 09:14:29AM +0000, Richard W.M. Jones wrote:
> >
> >
https://koji.fedoraproject.org/koji/buildinfo?buildID=1178711
> >
> > This broke qemu, and indirectly libvirt.
> >
> > I will submit a new build for qemu to see if that fixes things. I
> > didn't look closely to see if there are API changes.
>
> The rebuild failed - it looks like there are some changes to capstone,
> at least the location of the <capstone.h> headers file, which break
> qemu source. I'll see if there's anything we can backport from
> upstream.
The headers haven't moved. It looks like the capstone pkgconfig file is
broken.
In 3.0.5 it had
includedir=/usr/include/capstone
In 4.0.1 is has
includedir=/usr/include
While I don't disagree that this file looks broken, it does seem as if
capstone wants you to use <capstone/capstone.h>. See the tests, for
example:
https://github.com/aquynh/capstone/blob/master/tests/test_basic.c
The below patch fixes qemu when using the system capstone, but
probably breaks when using the git-submodule capstone. However I'll
drop this in as a *temporary* workaround to get Fedora building.
Rich.
diff --git a/include/disas/capstone.h b/include/disas/capstone.h
index 84e214956d..2eb6be222b 100644
--- a/include/disas/capstone.h
+++ b/include/disas/capstone.h
@@ -3,7 +3,7 @@
#ifdef CONFIG_CAPSTONE
-#include <capstone.h>
+#include <capstone/capstone.h>
#else
--
Richard Jones, Virtualization Group, Red Hat
http://people.redhat.com/~rjones
Read my programming and virtualization blog:
http://rwmj.wordpress.com
libguestfs lets you edit virtual machines. Supports shell scripting,
bindings from many languages.
http://libguestfs.org