[libvirt] [PATCH 1/3] Move linux specific symbol to src/libvirt_linux.syms
From: "Daniel P. Berrange" <berrange@redhat.com> linuxNodeInfoCPUPopulate is not built on Mingw32 so should be in libvirt_linux.syms, not libvirt_private.syms Signed-off-by: Daniel P. Berrange <berrange@redhat.com> --- src/libvirt_linux.syms | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/libvirt_linux.syms b/src/libvirt_linux.syms index 018c892..2258739 100644 --- a/src/libvirt_linux.syms +++ b/src/libvirt_linux.syms @@ -6,3 +6,6 @@ # stats_linux.h linuxDomainInterfaceStats; xenLinuxDomainBlockStats; + +# nodeinfo.h +linuxNodeInfoCPUPopulate; -- 1.7.7.6
From: "Daniel P. Berrange" <berrange@redhat.com> --- bootstrap.conf | 1 + po/POTFILES.in | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index c6f7fd9..c6620e5 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -80,6 +80,7 @@ posix-shell pthread pthread_sigmask recv +regex random_r sched send diff --git a/po/POTFILES.in b/po/POTFILES.in index 88be04e..5d5739a 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -4,6 +4,7 @@ daemon/remote.c daemon/remote_dispatch.h daemon/stream.c gnulib/lib/gai_strerror.c +gnulib/lib/regcomp.c src/conf/cpu_conf.c src/conf/domain_conf.c src/conf/domain_event.c -- 1.7.7.6
On Wed, Apr 04, 2012 at 13:47:58 +0100, Daniel P. Berrange wrote:
From: "Daniel P. Berrange" <berrange@redhat.com>
--- bootstrap.conf | 1 + po/POTFILES.in | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/bootstrap.conf b/bootstrap.conf index c6f7fd9..c6620e5 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -80,6 +80,7 @@ posix-shell pthread pthread_sigmask recv +regex random_r sched send diff --git a/po/POTFILES.in b/po/POTFILES.in index 88be04e..5d5739a 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -4,6 +4,7 @@ daemon/remote.c daemon/remote_dispatch.h daemon/stream.c gnulib/lib/gai_strerror.c +gnulib/lib/regcomp.c src/conf/cpu_conf.c src/conf/domain_conf.c src/conf/domain_event.c
ACK Jirka
From: "Daniel P. Berrange" <berrange@redhat.com> Every now & then, with parallel builds, we get a failure to validate hvsupport.html.in. I eventually noticed that this is because we get 2 instances of the generator running at once. We already list hvsupport.html.in in BUILT_SOURCES but this was not working. It turns out the flaw is that we were adding deps to the 'all:' target instead of the 'all-am:' target. BUILT_SOURCES is a dep of 'all', so any custom targets written in Makefile.am must use 'all-am:' so that they don't get run until BUILT_SOURCES are completely generated * docs/Makefile.am: s/all/all-am/ --- docs/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 2bef982..53328f7 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -116,7 +116,7 @@ MAINTAINERCLEANFILES = \ $(addprefix $(srcdir)/,$(apihtml)) \ $(addprefix $(srcdir)/,$(devhelphtml)) -all: web +all-am: web api: $(srcdir)/libvirt-api.xml $(srcdir)/libvirt-refs.xml qemu_api: $(srcdir)/libvirt-qemu-api.xml $(srcdir)/libvirt-qemu-refs.xml -- 1.7.7.6
On Wed, Apr 04, 2012 at 13:47:59 +0100, Daniel P. Berrange wrote:
From: "Daniel P. Berrange" <berrange@redhat.com>
Every now & then, with parallel builds, we get a failure to validate hvsupport.html.in. I eventually noticed that this is because we get 2 instances of the generator running at once.
We already list hvsupport.html.in in BUILT_SOURCES but this was not working. It turns out the flaw is that we were adding deps to the 'all:' target instead of the 'all-am:' target. BUILT_SOURCES is a dep of 'all', so any custom targets written in Makefile.am must use 'all-am:' so that they don't get run until BUILT_SOURCES are completely generated
* docs/Makefile.am: s/all/all-am/ --- docs/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/docs/Makefile.am b/docs/Makefile.am index 2bef982..53328f7 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -116,7 +116,7 @@ MAINTAINERCLEANFILES = \ $(addprefix $(srcdir)/,$(apihtml)) \ $(addprefix $(srcdir)/,$(devhelphtml))
-all: web +all-am: web
api: $(srcdir)/libvirt-api.xml $(srcdir)/libvirt-refs.xml qemu_api: $(srcdir)/libvirt-qemu-api.xml $(srcdir)/libvirt-qemu-refs.xml
Oh, cool. I saw this several times myself and I was wondering why it happened since everything looked correct at first glance. Thanks for fixing it. ACK. Jirka
On 04/04/2012 07:04 AM, Jiri Denemark wrote:
We already list hvsupport.html.in in BUILT_SOURCES but this was not working. It turns out the flaw is that we were adding deps to the 'all:' target instead of the 'all-am:'
Oh, cool. I saw this several times myself and I was wondering why it happened since everything looked correct at first glance. Thanks for fixing it. ACK.
Seconded! I've been bit by this multiple times as well, and your diagnosis was something that eluded me when it hit me. -- Eric Blake eblake@redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
On Wed, Apr 04, 2012 at 09:17:46AM -0600, Eric Blake wrote:
On 04/04/2012 07:04 AM, Jiri Denemark wrote:
We already list hvsupport.html.in in BUILT_SOURCES but this was not working. It turns out the flaw is that we were adding deps to the 'all:' target instead of the 'all-am:'
Oh, cool. I saw this several times myself and I was wondering why it happened since everything looked correct at first glance. Thanks for fixing it. ACK.
Seconded! I've been bit by this multiple times as well, and your diagnosis was something that eluded me when it hit me.
Indeed, this was my third attempt to fix this problem. 3rd time lucky I guess :-) Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
On Wed, Apr 04, 2012 at 01:47:59PM +0100, Daniel P. Berrange wrote:
From: "Daniel P. Berrange" <berrange@redhat.com>
Every now & then, with parallel builds, we get a failure to validate hvsupport.html.in. I eventually noticed that this is because we get 2 instances of the generator running at once.
Gahhhh .... I never managed to found out the problem and was afraid it was due to my experimental libxml2 patches on my workstation !!!
We already list hvsupport.html.in in BUILT_SOURCES but this was not working. It turns out the flaw is that we were adding deps to the 'all:' target instead of the 'all-am:' target. BUILT_SOURCES is a dep of 'all', so any custom targets written in Makefile.am must use 'all-am:' so that they don't get run until BUILT_SOURCES are completely generated
* docs/Makefile.am: s/all/all-am/ --- docs/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/docs/Makefile.am b/docs/Makefile.am index 2bef982..53328f7 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -116,7 +116,7 @@ MAINTAINERCLEANFILES = \ $(addprefix $(srcdir)/,$(apihtml)) \ $(addprefix $(srcdir)/,$(devhelphtml))
-all: web +all-am: web
api: $(srcdir)/libvirt-api.xml $(srcdir)/libvirt-refs.xml qemu_api: $(srcdir)/libvirt-qemu-api.xml $(srcdir)/libvirt-qemu-refs.xml
Subtle ! ACK ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel@veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/
On Wed, Apr 04, 2012 at 01:47:57PM +0100, Daniel P. Berrange wrote:
From: "Daniel P. Berrange" <berrange@redhat.com>
linuxNodeInfoCPUPopulate is not built on Mingw32 so should be in libvirt_linux.syms, not libvirt_private.syms
Opps, misleading comment. For upstream, it was never in libvirt_private.syms at all. I only had it there in a temporarily local change.So this should read Add linuxNodeInfoCPUPopulate to libvirt_private.syms for benefit of nodeinfotest.c Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
On Wed, Apr 04, 2012 at 13:47:57 +0100, Daniel P. Berrange wrote:
From: "Daniel P. Berrange" <berrange@redhat.com>
linuxNodeInfoCPUPopulate is not built on Mingw32 so should be in libvirt_linux.syms, not libvirt_private.syms
Signed-off-by: Daniel P. Berrange <berrange@redhat.com> --- src/libvirt_linux.syms | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/libvirt_linux.syms b/src/libvirt_linux.syms index 018c892..2258739 100644 --- a/src/libvirt_linux.syms +++ b/src/libvirt_linux.syms @@ -6,3 +6,6 @@ # stats_linux.h linuxDomainInterfaceStats; xenLinuxDomainBlockStats; + +# nodeinfo.h +linuxNodeInfoCPUPopulate;
Both subject and commit message confused me a bit since they are misleading. The symbol is not really moved since it was missing from any *.syms in the first place. ACK to adding it to libvirt_linux.syms, though. Jirka
participants (4)
-
Daniel P. Berrange -
Daniel Veillard -
Eric Blake -
Jiri Denemark