1. 26 11月, 2015 1 次提交
    • M
      makefile: fix qemu-ga make install for --disable-tools · 68aa262a
      Michael Roth 提交于
      ab59e3ec introduced a fix for `make install` on w32 that involved
      filtering out qemu-ga from $TOOLS install recipe so that we could
      append $(EXESUF) to it before attempting to install the binary
      via install-prog function.
      
      install-prog takes a list of binaries to install to a particular
      directory. If the list is empty it breaks. We guard against this
      by ensuring $TOOLS is not empty prior to calling.
      
      However, ab59e3ec introduces extra filtering after this check which
      can still result on us attempting to call install-prog with an
      empty list of binaries. In particular, this occurs if we
      build with the --disable-tools configure option, which results
      in qemu-ga being the only member of $TOOLS.
      
      Fix this by doing a simple s/qemu-ga/qemu-ga$(EXESUF)/ pass through
      $TOOLS instead of filtering out qemu-ga to handle it seperately.
      Reported-by: NSteve Ellcey <sellcey@imgtec.com>
      Cc: Stefan Weil <sw@weilnetz.de>
      Signed-off-by: NMichael Roth <mdroth@linux.vnet.ibm.com>
      68aa262a
  2. 18 11月, 2015 1 次提交
    • M
      makefile: fix w32 install target for qemu-ga · ab59e3ec
      Michael Roth 提交于
      fafcaf1d added a 'qemu-ga' install target on w32, which can be used
      in place of the existing qemu-ga.exe target to also handle dealing
      with other components such as DLLs for VSS/fsfreeze and generating
      an MSI package if appropriate configure options are present.
      
      As part of that, qemu-ga$(EXESUF) was removed from $TOOLS in favor
      of this new qemu-ga target.
      
      The install rule however relies on a direct mapping of the $TOOLS
      entry to the actual resulting binary. In the case of w32, qemu-ga
      is not identical to qemu-ga$(EXESUF), and the install recipe fails
      to find the 'qemu-ga' binary.
      
      Fix this by essentially remapping 'qemu-ga' back to 'qemu-ga.exe'
      in the install recipe.
      
      This raises the question of whether or not qemu-ga should continue
      to live in TOOLS as opposed to its own special target, but as a
      late fix for a regression in 2.5 this commit should be safer, since
      we rely on qemu-ga's presence in $TOOLS in several places throughout
      Makefile.
      Reported-by: NStefan Weil <sw@weilnetz.de>
      Cc: Paolo Bonzini <pbonzini@redhat.com>
      Reviewed-by: NStefan Weil <sw@weilnetz.de>
      Signed-off-by: NMichael Roth <mdroth@linux.vnet.ibm.com>
      ab59e3ec
  3. 25 10月, 2015 1 次提交
  4. 20 10月, 2015 1 次提交
    • M
      build: qemu-ga: add 'qemu-ga' build target for w32 · fafcaf1d
      Michael Roth 提交于
      Currently POSIX builds rely on 'qemu-ga' target to do qga-only
      distributable build. On w32, as with most standalone binary targets,
      we rely on 'qemu-ga.exe' target.
      
      Unlike with POSIX, qemu-ga for w32 has a number of related targets
      such as VSS DLL and MSI package. We can do the full distributable
      qga-only build on w32 with:
      
        make qemu-ga.exe
      
      or:
      
        make msi
      
      To make that work, we tie VSS dependencies onto qemu-ga.exe.
      However, in reality the DLL isn't part of the binary, so we use a
      filter to pull them out of the LINK recipe, which attempts to link
      against prereqs for binary targets. Additionally, it could be argued
      that VSS is a separate distributable, and shouldn't be implied by
      qemu-ga.exe binary target.
      
      To avoid this, we can tie the VSS dependencies only to the 'msi'
      target, but that would make it impossible to do a qga-only build of
      the w32 distributable without building the 'msi' package, which was
      supported in the past.
      
      An alternative approach is to add a new target to build the whole
      distributable. w32 allows us to use the same build target we use
      on POSIX, 'qemu-ga', since the current binary-only target on w32
      is 'qemu-ga.exe'.
      
      To further simplify the build, we also make 'qemu-ga' build the MSI
      package if the appropriate ./configure options are set, making the
      full qga-only build the same on both POSIX and w32: `make qemu-ga`
      
      Cc: Paolo Bonzini <pbonzini@redhat.com>
      Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
      Signed-off-by: NMichael Roth <mdroth@linux.vnet.ibm.com>
      fafcaf1d
  5. 25 9月, 2015 2 次提交
    • D
      Makefile: fix build when VPATH is outside GIT tree · 57f54629
      Daniel P. Berrange 提交于
      Steve Ellcey / Leon Alrae reported that QEMU fails to build when
      the VPATH directory is outside of the GIT tree, and the system
      emulators & tools build is disabled. eg
      
         cd ..
         mkdir build
         cd build
         ../qemu/configure --disable-system --disable-tools
         make
         (...)
         make[1]: *** No rule to make target `../qom/object.o', needed by `qemu-aarch64'. Stop.
         make: *** [subdir-aarch64-linux-user] Error 2
      
      The problem is due to the fact that some sub directory deps
      were listed against SOFTMMU_SUBDIR_RULES instead of SUBDIR_RULES,
      so were only processed for system emulators, not user emalutors.
      Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
      Message-Id: <1442570495-22029-1-git-send-email-berrange@redhat.com>
      Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
      57f54629
    • S
      nsis: Add QEMU version information to Windows registry · 805d8a67
      Stefan Weil 提交于
      The uninstall keys include an option key "DisplayVersion" which we set
      now. By default the version value is read from file VERSION, but it is
      also possible to pass VERSION=#.#.# to make.
      Signed-off-by: NStefan Weil <sw@weilnetz.de>
      805d8a67
  6. 24 9月, 2015 1 次提交
  7. 21 9月, 2015 1 次提交
    • M
      qapi: New QMP command query-qmp-schema for QMP introspection · 39a18158
      Markus Armbruster 提交于
      qapi/introspect.json defines the introspection schema.  It's designed
      for QMP introspection, but should do for similar uses, such as QGA.
      
      The introspection schema does not reflect all the rules and
      restrictions that apply to QAPI schemata.  A valid QAPI schema has an
      introspection value conforming to the introspection schema, but the
      converse is not true.
      
      Introspection lowers away a number of schema details, and makes
      implicit things explicit:
      
      * The built-in types are declared with their JSON type.
      
        All integer types are mapped to 'int', because how many bits we use
        internally is an implementation detail.  It could be pressed into
        external interface service as very approximate range information,
        but that's a bad idea.  If we need range information, we better do
        it properly.
      
      * Implicit type definitions are made explicit, and given
        auto-generated names:
      
        - Array types, named by appending "List" to the name of their
          element type, like in generated C.
      
        - The enumeration types implicitly defined by simple union types,
          named by appending "Kind" to the name of their simple union type,
          like in generated C.
      
        - Types that don't occur in generated C.  Their names start with ':'
          so they don't clash with the user's names.
      
      * All type references are by name.
      
      * The struct and union types are generalized into an object type.
      
      * Base types are flattened.
      
      * Commands take a single argument and return a single result.
      
        Dictionary argument or list result is an implicit type definition.
      
        The empty object type is used when a command takes no arguments or
        produces no results.
      
        The argument is always of object type, but the introspection schema
        doesn't reflect that.
      
        The 'gen': false directive is omitted as implementation detail.
      
        The 'success-response' directive is omitted as well for now, even
        though it's not an implementation detail, because it's not used by
        QMP.
      
      * Events carry a single data value.
      
        Implicit type definition and empty object type use, just like for
        commands.
      
        The value is of object type, but the introspection schema doesn't
        reflect that.
      
      * Types not used by commands or events are omitted.
      
        Indirect use counts as use.
      
      * Optional members have a default, which can only be null right now
      
        Instead of a mandatory "optional" flag, we have an optional default.
        No default means mandatory, default null means optional without
        default value.  Non-null is available for optional with default
        (possible future extension).
      
      * Clients should *not* look up types by name, because type names are
        not ABI.  Look up the command or event you're interested in, then
        follow the references.
      
        TODO Should we hide the type names to eliminate the temptation?
      
      New generator scripts/qapi-introspect.py computes an introspection
      value for its input, and generates a C variable holding it.
      
      It can generate awfully long lines.  Marked TODO.
      
      A new test-qmp-input-visitor test case feeds its result for both
      tests/qapi-schema/qapi-schema-test.json and qapi-schema.json to a
      QmpInputVisitor to verify it actually conforms to the schema.
      
      New QMP command query-qmp-schema takes its return value from that
      variable.  Its reply is some 85KiBytes for me right now.
      
      If this turns out to be too much, we have a couple of options:
      
      * We can use shorter names in the JSON.  Not the QMP style.
      
      * Optionally return the sub-schema for commands and events given as
        arguments.
      
        Right now qmp_query_schema() sends the string literal computed by
        qmp-introspect.py.  To compute sub-schema at run time, we'd have to
        duplicate parts of qapi-introspect.py in C.  Unattractive.
      
      * Let clients cache the output of query-qmp-schema.
      
        It changes only on QEMU upgrades, i.e. rarely.  Provide a command
        query-qmp-schema-hash.  Clients can have a cache indexed by hash,
        and re-query the schema only when they don't have it cached.  Even
        simpler: put the hash in the QMP greeting.
      Signed-off-by: NMarkus Armbruster <armbru@redhat.com>
      Reviewed-by: NEric Blake <eblake@redhat.com>
      39a18158
  8. 16 9月, 2015 1 次提交
  9. 15 9月, 2015 2 次提交
    • D
      qom: allow QOM to be linked into tools binaries · 0c7012e0
      Daniel P. Berrange 提交于
      The qom objects are currently added to common-obj-y
      which is only linked into the system emulators. The
      later crypto patches will depend on QOM infrastructure
      and will also be used from tools binaries. Thus the QOM
      objects are moved into a new qom-obj-y variable which
      can be referenced when linking tools, system emulators
      and tests.
      Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
      0c7012e0
    • D
      crypto: move crypto objects out of libqemuutil.la · fb37726d
      Daniel P. Berrange 提交于
      Future patches will be adding more crypto related APIs which
      rely on QOM infrastructure. This creates a problem, because
      QOM relies on library constructors to register objects. When
      you have a file in a static .a library though which is only
      referenced by a constructor the linker is dumb and will drop
      that file when linking to the final executable :-( The only
      workaround for this is to link the .a library to the executable
      using the -Wl,--whole-archive flag, but this creates its own
      set of problems because QEMU is relying on lazy linking for
      libqemuutil.a. Using --whole-archive majorly increases the
      size of final executables as they now contain a bunch of
      object code they don't actually use.
      
      The least bad option is to thus not include the crypto objects
      in libqemuutil.la, and instead define a crypto-obj-y variable
      that is referenced directly by all the executables that need
      this code (tools + softmmu, but not qemu-ga). We avoid pulling
      entire of crypto-obj-y into the userspace emulators as that
      would force them to link to gnutls too, which is not required.
      Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
      fb37726d
  10. 02 9月, 2015 5 次提交
  11. 28 7月, 2015 1 次提交
  12. 24 6月, 2015 2 次提交
  13. 17 6月, 2015 1 次提交
  14. 12 6月, 2015 1 次提交
  15. 03 6月, 2015 1 次提交
  16. 15 5月, 2015 2 次提交
  17. 05 5月, 2015 2 次提交
  18. 02 4月, 2015 1 次提交
  19. 18 3月, 2015 1 次提交
  20. 10 3月, 2015 1 次提交
  21. 28 2月, 2015 2 次提交
    • M
      Makefile: don't silence mak file test with V=1 · 12ccfec9
      Michael S. Tsirkin 提交于
      V=1 should show what's going on, it's not nice
      to silence things unconditionally.
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      Message-Id: <1424332114-13440-1-git-send-email-mst@redhat.com>
      Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
      12ccfec9
    • V
      Makefile: fix up parallel building under MSYS+MinGW · 23cab7b7
      Vasily Efimov 提交于
      This patch enables parallel building of QEMU in MSYS+MinGW environment.
      Currently an attempt to build QEMU in parallel fails on generation of
      version.lo (and version.o too).
      
      The cause of the failure is that when listing prerequisites "Makefile"
      references "config-host.h" by absolute path in some rules and by relative
      path in others. Make cannot figure out that these references points to the
      same file which leads to the race: the generation of "version.*" which
      requires "$(BUILD_DIR)/config-host.h" is launched in parallel with the
      generation of "config-host.h" needed by other "Makefile" targets.
      
      This patch removes "$(BUILD_DIR)/" prefix from corresponding prerequisite
      of "version.*". There is no other prerequisites "$(BUILD_DIR)/config-host.h"
      found.
      
      Also note that not every version of MSYS is able to build QEMU in parallel,
      see: "http://sourceforge.net/p/mingw/bugs/1950/". The suggested version is
      1.0.17.
      Signed-off-by: NVasily Efimov <real@ispras.ru>
      Message-Id: <1424264377-5992-1-git-send-email-real@ispras.ru>
      Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
      23cab7b7
  22. 15 1月, 2015 1 次提交
  23. 26 9月, 2014 1 次提交
    • S
      trace: install trace-events file · 89ae5831
      Stefan Hajnoczi 提交于
      Install the ./trace-events file into the data directory.  This file
      contains the list of trace events that were built into QEMU at
      compile-time.
      
      The file is a handy reference for the set of trace events that the QEMU
      binary was built with.  It is also needed by the simpletrace.py tool
      that parses binary trace data either emitted from QEMU when built with
      --enable-trace-backend=simple or by the SystemTap simpletrace script
      that QEMU provides.
      Signed-off-by: NStefan Hajnoczi <stefanha@redhat.com>
      Message-id: 1411486175-3017-1-git-send-email-stefanha@redhat.com
      89ae5831
  24. 12 8月, 2014 4 次提交
  25. 09 8月, 2014 1 次提交
  26. 08 7月, 2014 1 次提交
  27. 27 6月, 2014 1 次提交