1. 15 7月, 2013 1 次提交
  2. 03 7月, 2013 1 次提交
  3. 01 7月, 2013 36 次提交
  4. 29 6月, 2013 2 次提交
    • A
      Merge remote-tracking branch 'mjt/trivial-patches' into staging · ffeec223
      Anthony Liguori 提交于
      # By Gerd Hoffmann (13) and Michael Tokarev (1)
      # Via Michael Tokarev
      * mjt/trivial-patches:
        doc: we use seabios, not bochs bios
        qemu-socket: don't leak opts on error
        qemu-char: report udp backend errors
        qemu-char: add -chardev mux support
        qemu-char: minor mux chardev fixes
        qemu-char: use ChardevBackendKind in CharDriver
        qemu-char: don't leak opts on error
        qemu-char: fix documentation for telnet+wait socket flags
        qemu-char: print notification to stderr
        qemu-char: use more specific error_setg_* variants
        qemu-char: check optional fields using has_*
        qemu-socket: catch monitor_get_fd failures
        qemu-socket: drop pointless allocation
        qemu-socket: zero-initialize SocketAddress
      
      Message-id: 1372443465-22384-1-git-send-email-mjt@msgid.tls.msk.ru
      Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
      ffeec223
    • K
      hmp: Make "info block" output more readable · fbe2e26c
      Kevin Wolf 提交于
      HMP is meant for humans and you should notice it.
      
      This changes the output format to use a bit more space to display the
      information more readable and leaves out irrelevant information (e.g.
      mention only that an image is encrypted, but not when it's not; display
      I/O limits only if throttling is in effect; ...)
      
      Before:
      
          (qemu) info block
          ide0-hd0: removable=0 io-status=ok file=/tmp/overlay.qcow2
          backing_file=/tmp/backing.img backing_file_depth=1 ro=0 drv=qcow2
          encrypted=1 bps=0 bps_rd=0 bps_wr=0 iops=1024 iops_rd=0 iops_wr=0
          ide1-cd0: removable=1 locked=0 tray-open=0 io-status=ok
          file=/home/kwolf/images/iso/Fedora-18-x86_64-Live-Desktop.iso ro=1
          drv=raw encrypted=0 bps=0 bps_rd=0 bps_wr=0 iops=0 iops_rd=0 iops_wr=0
          floppy0: removable=1 locked=0 tray-open=0 [not inserted]
          sd0: removable=1 locked=0 tray-open=0 [not inserted]
      
      After:
      
          (qemu) info block
          ide0-hd0: /tmp/overlay.qcow2 (qcow2, encrypted)
              Backing file:     /tmp/backing.img (chain depth: 1)
              I/O limits:       bps=0 bps_rd=0 bps_wr=0 iops=1024 iops_rd=0 iops_wr=0
      
          ide1-cd0: /home/kwolf/images/iso/Fedora-18-x86_64-Live-Desktop.iso (raw, read-only)
              Removable device: not locked, tray closed
      
          floppy0: [not inserted]
              Removable device: not locked, tray closed
      
          sd0: [not inserted]
              Removable device: not locked, tray closed
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      Reviewed-by: NFam Zheng <famz@redhat.com>
      Acked-by: NAnthony Liguori <aliguori@us.ibm.com>
      Signed-off-by: NLuiz Capitulino <lcapitulino@redhat.com>
      fbe2e26c