--- bootstrap.conf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index 157092f..fb862ad 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -56,6 +56,7 @@ strsep sys_stat time_r useless-if-before-free +usleep vasprintf verify vc-list-files --

On 03/22/2010 08:54 AM, Daniel P. Berrange wrote: > On Mon, Mar 22, 2010 at 02:25:31AM +0100, Matthias Bolte wrote: >> --- >> bootstrap.conf | 1 + >> 1 files changed, 1 insertions(+), 0 deletions(-) >> >> diff --git a/bootstrap.conf b/bootstrap.conf >> index 157092f..fb862ad 100644 >> --- a/bootstrap.conf >> +++ b/bootstrap.conf >> @@ -56,6 +56,7 @@ strsep >> sys_stat >> time_r >> useless-if-before-free >> +usleep >> vasprintf >> verify >> vc-list-files >> -- > > ACK POSIX 2008 delisted usleep as an obsolete interface; it has some usability issues when compared to nanosleep. While gnulib at least fixes the worst of the portability problems (namely, the fact that usleep is not required to sleep longer than 1 second, even though it can sleep over 4000 seconds on glibc), I'm wondering if we should instead be converting all existing uses of usleep to a more modern interface.

--- configure.ac | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index 654b9a8..1a3c788 100644 --- a/configure.ac +++ b/configure.ac @@ -61,6 +61,7 @@ gl_INIT AM_PROG_CC_STDC AC_C_CONST +AC_TYPE_UID_T dnl Make sure we have an ANSI compiler AM_C_PROTOTYPES --

On Mon, Mar 22, 2010 at 02:25:33AM +0100, Matthias Bolte wrote: > This is necessary for MinGW builds. > --- >  src/Makefile.am          |    7 ++++++- >  src/libvirt_daemon.syms  |   10 ++++++++++ >  src/libvirt_private.syms |    5 ----- >  3 files changed, 16 insertions(+), 6 deletions(-) >  create mode 100644 src/libvirt_daemon.syms > > diff --git a/src/Makefile.am b/src/Makefile.am > index c6371fb..08e204d 100644 > --- a/src/Makefile.am > +++ b/src/Makefile.am > @@ -813,13 +813,18 @@ if WITH_MACVTAP >  USED_SYM_FILES += libvirt_macvtap.syms >  endif > > +if WITH_LIBVIRTD > +USED_SYM_FILES += libvirt_daemon.syms > +endif > + >  EXTRA_DIST += \ >    libvirt_public.syms                \ >    libvirt_private.syms               \ >    libvirt_driver_modules.syms        \ >    libvirt_bridge.syms                \ >    libvirt_linux.syms         \ > -  libvirt_macvtap.syms > +  libvirt_macvtap.syms               \ > +  libvirt_daemon.syms > >  BUILT_SOURCES = libvirt.syms > > diff --git a/src/libvirt_daemon.syms b/src/libvirt_daemon.syms > new file mode 100644 > index 0000000..eb6e594 > --- /dev/null > +++ b/src/libvirt_daemon.syms > @@ -0,0 +1,10 @@ > +# > +# These symbols are dependent upon --with-libvirtd via WITH_LIBVIRTD. > +# > + > +# libvirt_internal.h > +virStateInitialize; > +virStateCleanup; > +virStateReload; > +virStateActive; > +virRegisterStateDriver; > diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms > index c5ee23d..5d30b90 100644 > --- a/src/libvirt_private.syms > +++ b/src/libvirt_private.syms > @@ -285,10 +285,6 @@ iptablesRemoveUdpInput; > > >  # libvirt_internal.h > -virStateInitialize; > -virStateCleanup; > -virStateReload; > -virStateActive; >  virDrvSupportsFeature; >  virDomainMigratePrepare; >  virDomainMigratePerform; > @@ -299,7 +295,6 @@ virDomainMigratePrepareTunnel; >  virRegisterDriver; >  virRegisterInterfaceDriver; >  virRegisterNetworkDriver; > -virRegisterStateDriver; >  virRegisterStorageDriver; >  virRegisterDeviceMonitor; >  virRegisterSecretDriver; > -- ACK Daniel

This symbol is conditional, it would need to be exported conditional to work properly with MinGW. So just remove it, as no other driver register function is listed in the symbols files. --- src/libvirt_private.syms | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 5d30b90..f1ad6db 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -257,10 +257,6 @@ virInterfaceObjUnlock; virInterfaceObjListFree; -# interface_driver.h -interfaceRegister; - - # iptables.h iptablesAddForwardAllowCross; iptablesAddForwardAllowIn;

The MinGW linker needs the libvirt.def file. --- configure.ac | 5 +++++ src/.gitignore | 1 + src/Makefile.am | 15 +++++++++++---- 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am index 0aa3443..fea1bd3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -828,7 +828,7 @@ EXTRA_DIST += \ libvirt_macvtap.syms \ libvirt_daemon.syms -BUILT_SOURCES = libvirt.syms +BUILT_SOURCES = libvirt.syms libvirt.def libvirt.syms: libvirt_public.syms $(USED_SYM_FILES) rm -f $@-tmp $@ @@ -844,18 +844,25 @@ libvirt.syms: libvirt_public.syms $(USED_SYM_FILES) chmod a-w $@-tmp mv $@-tmp libvirt.syms +libvirt.def: libvirt.syms + rm -f -- $@-tmp $@ + printf 'EXPORTS\n' > $@-tmp + sed -e '/^$$/d; /#/d; /:/d; /\}/d; /\*/d; /LIBVIRT_/d; s/\(.*\)\;/\1/g' $^ >> $@-tmp + chmod a-w $@-tmp + mv $@-tmp libvirt.def

On Mon, Mar 22, 2010 at 02:25:36AM +0100, Matthias Bolte wrote: > The MinGW linker needs the libvirt.def file. > --- >  configure.ac    |    5 +++++ >  src/.gitignore  |    1 + >  src/Makefile.am |   15 +++++++++++---- >  3 files changed, 17 insertions(+), 4 deletions(-) > > diff --git a/configure.ac b/configure.ac > index bcf1d5a..6e568ee 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -1733,6 +1733,7 @@ CYGWIN_EXTRA_LIBADD= >  CYGWIN_EXTRA_PYTHON_LIBADD= >  MINGW_EXTRA_LDFLAGS= >  WIN32_EXTRA_CFLAGS= > +LIBVIRT_SYMBOL_FILE=libvirt.syms >  case "$host" in >    *-*-cygwin*) >      CYGWIN_EXTRA_LDFLAGS="-no-undefined" > @@ -1752,6 +1753,9 @@ case "$host" in >      if test "x$enable_shared" = "xno"; then >        WIN32_EXTRA_CFLAGS="-DLIBVIRT_STATIC" >      fi > +    # Also set the symbol file to .def, so src/Makefile generates libvirt.def > +    # from libvirt.syms and passes libvirt.def instead of libvirt.syms to the linker > +    LIBVIRT_SYMBOL_FILE=libvirt.def >      ;; >  esac >  AC_SUBST([CYGWIN_EXTRA_LDFLAGS]) > @@ -1759,6 +1763,7 @@ AC_SUBST([CYGWIN_EXTRA_LIBADD]) >  AC_SUBST([CYGWIN_EXTRA_PYTHON_LIBADD]) >  AC_SUBST([MINGW_EXTRA_LDFLAGS]) >  AC_SUBST([WIN32_EXTRA_CFLAGS]) > +AC_SUBST([LIBVIRT_SYMBOL_FILE]) > >  dnl Look for windres to build a Windows icon resource. >  AC_CHECK_TOOL([WINDRES], [windres], [no]) > diff --git a/src/.gitignore b/src/.gitignore > index 26b8689..a5c27a5 100644 > --- a/src/.gitignore > +++ b/src/.gitignore > @@ -12,6 +12,7 @@ Makefile.in >  *.cov >  libvirt_parthelper >  libvirt_lxc > +libvirt.def >  libvirt.syms >  *.i >  *.s > diff --git a/src/Makefile.am b/src/Makefile.am > index 0aa3443..fea1bd3 100644 > --- a/src/Makefile.am > +++ b/src/Makefile.am > @@ -828,7 +828,7 @@ EXTRA_DIST += \ >    libvirt_macvtap.syms               \ >    libvirt_daemon.syms > > -BUILT_SOURCES = libvirt.syms > +BUILT_SOURCES = libvirt.syms libvirt.def > >  libvirt.syms: libvirt_public.syms $(USED_SYM_FILES) >       rm -f $@-tmp $@ > @@ -844,18 +844,25 @@ libvirt.syms: libvirt_public.syms $(USED_SYM_FILES) >       chmod a-w $@-tmp >       mv $@-tmp libvirt.syms > > +libvirt.def: libvirt.syms > +     rm -f -- $@-tmp $@ > +     printf 'EXPORTS\n' > $@-tmp > +     sed -e '/^$$/d; /#/d; /:/d; /\}/d; /\*/d; /LIBVIRT_/d; s/\(.*\)\;/\1/g' $^ >> $@-tmp > +     chmod a-w $@-tmp > +     mv $@-tmp libvirt.def > + >  # Empty source list - it merely links a bunch of convenience libs together >  libvirt_la_SOURCES = >  libvirt_la_LIBADD += \ >                   $(CYGWIN_EXTRA_LIBADD) ../gnulib/lib/libgnu.la > -libvirt_la_LDFLAGS = $(VERSION_SCRIPT_FLAGS)libvirt.syms \ > +libvirt_la_LDFLAGS = $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_SYMBOL_FILE) \ >                       -version-info $(LIBVIRT_VERSION_INFO) \ >                      $(COVERAGE_CFLAGS:-f%=-Wc,-f%) \ >                      $(LIBXML_LIBS) \ >                   $(DRIVER_MODULE_LIBS) \ >                   $(CYGWIN_EXTRA_LDFLAGS) $(MINGW_EXTRA_LDFLAGS) >  libvirt_la_CFLAGS = $(COVERAGE_CFLAGS) -DIN_LIBVIRT > -libvirt_la_DEPENDENCIES = $(libvirt_la_LIBADD) libvirt.syms > +libvirt_la_DEPENDENCIES = $(libvirt_la_LIBADD) $(LIBVIRT_SYMBOL_FILE) > >  # Create an automake "convenience library" version of libvirt_la, >  # just for testing, since the test harness requires access to internal > @@ -865,7 +872,7 @@ noinst_LTLIBRARIES += libvirt_test.la >  # Remove version script from convenience library >  test_LDFLAGS =                                               \ >    $$(echo '$(libvirt_la_LDFLAGS)'                    \ > -     |sed 's!$(VERSION_SCRIPT_FLAGS)libvirt.syms!!'  \ > +     |sed 's!$(VERSION_SCRIPT_FLAGS)$(LIBVIRT_SYMBOL_FILE)!!'        \ >       |sed 's!-version-info $(LIBVIRT_VERSION_INFO)!!') > >  # Just like the above, but with a slightly different set of public symbols. I've re-examined this now to discover why we had this regression. Originally, say in 0.7.5, everything was linking fine on Mingw32 without this .defs file.  I figured out that this is because Mingw32 was ignoring our .syms file, and using its default logic of exporting *everything* :-) Then, in commit 190aaa2627a8c6e455088f1e7801708fb5f123b1 Author: Matthias Bolte <matthias.bolte(a)googlemail.com&gt; Date:   Tue Mar 16 23:54:22 2010 +0100    Fix export of virConnectAuthPtrDefault for MinGW builds    Use the __declspec(dllexport/dllimport) stuff to export the symbol,    otherwise accessing virConnectAuthPtrDefault triggers a segfault. We used declspec() on the virConnectAuthPtrDefault. This turned off the Mingw32 logic that exported everything & thus caused virsh link failures. Adding this .defs file as per your patch re-exports everything. It sucks that we export everything, but it is no worse than the old situation we had on mingw. ACK to this patch Daniel

MinGW and gnulib don't provide SA_SIGINFO on Windows. --- tools/virsh.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 32895b2..1c932bd 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -411,11 +411,13 @@ static int disconnected = 0; /* we may have been disconnected */ * We get here when a SIGPIPE is being raised, we can't do much in the * handler, just save the fact it was raised */ +#ifdef SA_SIGINFO static void vshCatchDisconnect(int sig, siginfo_t * siginfo, void* context ATTRIBUTE_UNUSED) { if ((sig == SIGPIPE) || (siginfo->si_signo == SIGPIPE)) disconnected++; } +#endif /* * vshSetupSignals: @@ -425,6 +427,7 @@ static void vshCatchDisconnect(int sig, siginfo_t * siginfo, */ static void vshSetupSignals(void) { +#ifdef SA_SIGINFO struct sigaction sig_action; sig_action.sa_sigaction = vshCatchDisconnect; @@ -432,6 +435,7 @@ vshSetupSignals(void) { sigemptyset(&sig_action.sa_mask); sigaction(SIGPIPE, &sig_action, NULL); +#endif } /*

MinGW and gnulib don't provide SA_SIGINFO on Windows. --- tools/virsh.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 32895b2..1c932bd 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -411,11 +411,13 @@ static int disconnected = 0; /* we may have been disconnected */ * We get here when a SIGPIPE is being raised, we can't do much in the * handler, just save the fact it was raised */ +#ifdef SA_SIGINFO static void vshCatchDisconnect(int sig, siginfo_t * siginfo, void* context ATTRIBUTE_UNUSED) { if ((sig == SIGPIPE) || (siginfo->si_signo == SIGPIPE)) disconnected++; } +#endif /* * vshSetupSignals: @@ -425,6 +427,7 @@ static void vshCatchDisconnect(int sig, siginfo_t * siginfo, */ static void vshSetupSignals(void) { +#ifdef SA_SIGINFO struct sigaction sig_action; sig_action.sa_sigaction = vshCatchDisconnect; @@ -432,6 +435,7 @@ vshSetupSignals(void) { sigemptyset(&sig_action.sa_mask); sigaction(SIGPIPE, &sig_action, NULL); +#endif } /* --

On Mon, Mar 22, 2010 at 02:25:38AM +0100, Matthias Bolte wrote: > Now the virsh tests compile at least. > --- >  tests/testutils.c |    6 ++++++ >  1 files changed, 6 insertions(+), 0 deletions(-) > > diff --git a/tests/testutils.c b/tests/testutils.c > index 8764673..4f17e51 100644 > --- a/tests/testutils.c > +++ b/tests/testutils.c > @@ -280,6 +280,12 @@ int virtTestCaptureProgramOutput(const char *const argv[], >          } >      } >  } > +#else /* !WIN32 */ > +int virtTestCaptureProgramOutput(const char *const argv[] ATTRIBUTE_UNUSED, > +                                 char **buf ATTRIBUTE_UNUSED, > +                                 int buflen ATTRIBUTE_UNUSED) { > +    return -1; > +} >  #endif /* !WIN32 */ ACK Daniel

Add dummy bodies for HAVE_GETPWUID_R and HAVE_MNTENT_H dependent functions for MinGW builds. --- src/util/util.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- src/util/util.h | 4 ---- 2 files changed, 52 insertions(+), 6 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index 87b0714..3e89260 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -2585,7 +2585,46 @@ int virGetGroupID(const char *name, return 0; } -#endif + +#else /* HAVE_GETPWUID_R */ + +char * +virGetUserDirectory(uid_t uid ATTRIBUTE_UNUSED) +{ + virUtilError(VIR_ERR_INTERNAL_ERROR, + "%s", _("virGetUserDirectory is not avialable")); + + return NULL; +} + +char * +virGetUserName(uid_t uid ATTRIBUTE_UNUSED) +{ + virUtilError(VIR_ERR_INTERNAL_ERROR, + "%s", _("virGetUserName is not avialable")); + + return NULL; +} + +int virGetUserID(const char *name ATTRIBUTE_UNUSED, + uid_t *uid ATTRIBUTE_UNUSED) +{ + virUtilError(VIR_ERR_INTERNAL_ERROR, + "%s", _("virGetUserID is not avialable")); + + return 0; +} + + +int virGetGroupID(const char *name ATTRIBUTE_UNUSED, + gid_t *gid ATTRIBUTE_UNUSED) +{ + virUtilError(VIR_ERR_INTERNAL_ERROR, + "%s", _("virGetGroupID is not avialable")); + + return 0; +} +#endif /* HAVE_GETPWUID_R */

On Mon, Mar 22, 2010 at 02:25:40AM +0100, Matthias Bolte wrote: > rsync is used to download .po files, but SKIP_PO=true is set and > downloading .po files is skipped. > > This also fixes a problem with MinGW builds, because rsync is not > available for MinGW. > --- >  bootstrap.conf |    1 - >  1 files changed, 0 insertions(+), 1 deletions(-) > > diff --git a/bootstrap.conf b/bootstrap.conf > index fb862ad..be4ad21 100644 > --- a/bootstrap.conf > +++ b/bootstrap.conf > @@ -130,7 +130,6 @@ git        1.5.5 >  gzip       - >  libtool    - >  perl       5.5 > -rsync      - >  tar        - >  " ACK Daniel

On Mon, Mar 22, 2010 at 02:25:42AM +0100, Matthias Bolte wrote: > MSYS' ln doesn't work well in the way bootstrap uses it with relative paths. > --- >  bootstrap.conf |    6 ++++++ >  1 files changed, 6 insertions(+), 0 deletions(-) > > diff --git a/bootstrap.conf b/bootstrap.conf > index be4ad21..d55dc71 100644 > --- a/bootstrap.conf > +++ b/bootstrap.conf > @@ -74,6 +74,12 @@ MSGID_BUGS_ADDRESS=libvir-list(a)redhat.com >  COPYRIGHT_HOLDER='Red Hat, Inc.' >  SKIP_PO=true > > +# Enable copy-mode for MSYS/MinGW. MSYS' ln doesn't work well in the way > +# bootstrap uses it with relative paths. > +if test -n "$MSYSTEM"; then > +    copy=true > +fi > + >  # If "AM_GNU_GETTEXT(external" or "AM_GNU_GETTEXT([external]" >  # appears in configure.ac, exclude some unnecessary files. >  # Without grep's -E option (not portable enough, pre-configure), ACK Daniel