1. 12 9月, 2012 1 次提交
    • B
      qemu-img: Add json output option to the info command. · c054b3fd
      Benoît Canet 提交于
      This option --output=[human|json] make qemu-img info output on
      human or JSON representation at the choice of the user.
      
      example:
      {
          "snapshots": [
              {
                  "vm-clock-nsec": 637102488,
                  "name": "vm-20120821145509",
                  "date-sec": 1345553709,
                  "date-nsec": 220289000,
                  "vm-clock-sec": 20,
                  "id": "1",
                  "vm-state-size": 96522745
              },
              {
                  "vm-clock-nsec": 28210866,
                  "name": "vm-20120821154059",
                  "date-sec": 1345556459,
                  "date-nsec": 171392000,
                  "vm-clock-sec": 46,
                  "id": "2",
                  "vm-state-size": 101208714
              }
          ],
          "virtual-size": 1073741824,
          "filename": "snap.qcow2",
          "cluster-size": 65536,
          "format": "qcow2",
          "actual-size": 985587712,
          "dirty-flag": false
      }
      Signed-off-by: NBenoit Canet <benoit@irqsave.net>
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      c054b3fd
  2. 15 8月, 2012 2 次提交
  3. 11 8月, 2012 1 次提交
    • S
      Makefile: add qapi.py dependencies · 0521d375
      Stefan Hajnoczi 提交于
      Commit 427a1a2c ("qapi: avoid reserved
      keywords") modifies qapi.py, which is used by qapi-types.py and other
      Python scripts.  Because Makefile has no dependencies for qapi.py the
      qapi code generator will not be rerun and the following build error is
      produced:
      
        net/slirp.c: In function ‘net_init_slirp’:
        net/slirp.c:721:50: error: ‘NetdevUserOptions’ has no member named ‘q_restrict’
      
      Fix this issue by adding the missing qapi.py dependencies.
      Signed-off-by: NStefan Hajnoczi <stefanha@linux.vnet.ibm.com>
      Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>
      0521d375
  4. 03 8月, 2012 2 次提交
  5. 29 7月, 2012 1 次提交
    • D
      build: Fix linking failure for qemu-ga · 54c2e502
      Dunrong Huang 提交于
      This patch will fix the following linking failed:
      
        LINK  qemu-ga
      gcc: error: qga/../qapi-generated/qga-qapi-types.o: No such file or directory
      gcc: error: qga/../qapi-generated/qga-qapi-visit.o: No such file or directory
      gcc: error: qga/../qapi-generated/qga-qmp-marshal.o: No such file or directory
      make: *** [qemu-ga] Error 1
      
      Commit cdc976b0 changes the
      dependencies of qemu-ga to depend "../qapi-generated/qga-qapi-types.o",
      which will be expanded to "qga/../qapi-generated/qga-qapi-types.o" when
      building qemu-ga.
      
      In top-level Makefile, we defined a target "qapi-generated/qga-qapi-types.o"
      which was not equal to "qga/../qapi-generated/qga-qapi-types" in the
      Makefile world. So "No such file" error happened when qemu-ga was linking.
      
      The easy approach to fix is to change the target name to
      "qga/../qapi-generated/qga-qapi-types.o", but it is weird.
      
      So, in order to solve it more graciously, I move those temporary
      files(qga-qapi-*.{c,h}) qemu-ga depends on to qemu-ga/qapi-generated,
      this makes dependencies more clearer.
      Signed-off-by: NDunrong Huang <riegamaths@gmail.com>
      Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>
      54c2e502
  6. 28 7月, 2012 2 次提交
  7. 18 7月, 2012 2 次提交
  8. 13 7月, 2012 1 次提交
  9. 24 6月, 2012 1 次提交
  10. 22 6月, 2012 4 次提交
  11. 20 6月, 2012 1 次提交
  12. 16 6月, 2012 1 次提交
  13. 12 6月, 2012 1 次提交
    • M
      consolidate qemu_iovec_memset{,_skip}() into single function and use existing iov_memset() · 3d9b4925
      Michael Tokarev 提交于
      This patch combines two functions into one, and replaces
      the implementation with already existing iov_memset() from
      iov.c.
      
      The new prototype of qemu_iovec_memset():
        size_t qemu_iovec_memset(qiov, size_t offset, int fillc, size_t bytes)
      It is different from former qemu_iovec_memset_skip(), and
      I want to make other functions to be consistent with it
      too: first how much to skip, second what, and 3rd how many
      of it.  It also returns actual number of bytes filled in,
      which may be less than the requested `bytes' if qiov is
      smaller than offset+bytes, in the same way iov_memset()
      does.
      
      While at it, use utility function iov_memset() from
      iov.h in posix-aio-compat.c, where qiov was used.
      Signed-off-by: NMichael Tokarev <mjt@tls.msk.ru>
      3d9b4925
  14. 07 6月, 2012 5 次提交
  15. 11 5月, 2012 1 次提交
  16. 27 4月, 2012 1 次提交
  17. 25 4月, 2012 1 次提交
  18. 24 4月, 2012 3 次提交
  19. 12 4月, 2012 1 次提交
  20. 03 4月, 2012 1 次提交
  21. 31 3月, 2012 1 次提交
  22. 27 3月, 2012 1 次提交
  23. 26 3月, 2012 1 次提交
  24. 24 3月, 2012 1 次提交
    • M
      Support utf8 chars in pod docs · 3179d694
      Michael Tokarev 提交于
      We've at least one UTF8 char in the qemu texi doc:
      
       $ grep Tibor qemu-doc.texi
       by Tibor "TS" Schütz.
       $ man ./qemu.1 | grep Tibor
              by Tibor "TS" SchA~Xtz.
      
      This patch allows utf8 in man/pod docs.
      
      Initially it was split into two parts and sent on 2012-02-02.
      Resending it again (3rd time) now in merged form.  If any
      other generalizations of $(POD2MAN) are needed it can be done
      in a separate patch.  Current form of $(POD2MAN) is choosen
      to be able to easily change it if some implementation does
      not support utf8 or resulting output has issues with local
      man(1) program/macros.
      
      First, add @documentencoding in scripts/texi2pod.pl:
      
      Currently our texi2pod ignores @documentencoding even if it is set
      properly in *.texi files.  This results in a mojibake in documents
      generated from qemu.pod (which is generated from qemu-doc.texi by
      texi2pod), because the rest of the tools assumes ASCII encoding.
      
      This patch recognizes first @documentencoding in input and places
      it at the beginning of output as =encoding directive.
      
      Second, run pod2man with --utf8 option to enable utf8 in manpages:
      
      This option makes no difference for manpages which contains only
      ascii chars.  But for manpages with actual UTF8 characters (qemu
      docs contains these), this change allows to see real characters
      instead of mojibakes or substitutes.
      Signed-off-By: NMichael Tokarev <mjt@tls.msk.ru>
      Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>
      3179d694
  25. 14 3月, 2012 1 次提交
  26. 11 3月, 2012 1 次提交
  27. 24 2月, 2012 1 次提交