1. 13 5月, 2014 37 次提交
  2. 10 5月, 2014 3 次提交
    • M
      libcacard: remove libcacard-specific CFLAGS and LIBS from global vars · 9d171bd9
      Michael Tokarev 提交于
      Currently all what's needed for single file libcacard/vcard_emul_nss.c
      (libnss cflags) and hw/usb/ccid-card-emulated.c (libcacard includes)
      together with the libs is added to global QEMU_CFLAGS and libs_softmmu.
      
      Use the cflags only where really used (for two mentioned files), and
      libs only where needed.
      
      While at it, rename variables to better reflect reality: libcacard_*
      is really nss_*.
      
      This needs a bit more tweaking: $(NSS_LIBS) should not contain $glib_libs
      (ditto for _cflags).  But in order to fix it, some more preparations
      should be made first.  So add a FIXME comment.
      Signed-off-by: NMichael Tokarev <mjt@tls.msk.ru>
      Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
      9d171bd9
    • P
      build: simplify and fix fix-obj-vars · 2a8e6c7a
      Paolo Bonzini 提交于
      fix-obj-vars has the undesired side effect of breaking -cflags
      -objs and -libs variables in the toplevel Makefile.objs.  The
      variables in the toplevel Makefile.objs do not need any fix,
      so fix-obj-vars need not do anything.
      
      Since we are touching it, remove the now unnecessary $(if)
      in the callers.
      Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
      2a8e6c7a
    • S
      glib: fix g_poll early timeout on windows · 5a007547
      Sangho Park 提交于
      g_poll has a problem on Windows when using
      timeouts < 10ms, in glib/gpoll.c:
      
      /* If not, and we have a significant timeout, poll again with
       * timeout then. Note that this will return indication for only
       * one event, or only for messages. We ignore timeouts less than
       * ten milliseconds as they are mostly pointless on Windows, the
       * MsgWaitForMultipleObjectsEx() call will timeout right away
       * anyway.
       */
      if (retval == 0 && (timeout == INFINITE || timeout >= 10))
        retval = poll_rest (poll_msgs, handles, nhandles, fds, nfds, timeout);
      
      so whenever g_poll is called with timeout < 10ms it does
      a quick poll instead of wait, this causes significant performance
      degradation of QEMU, thus we should use WaitForMultipleObjectsEx
      directly
      Signed-off-by: NStanislav Vorobiov <s.vorobiov@samsung.com>
      Signed-off-by: NStefan Hajnoczi <stefanha@redhat.com>
      5a007547