1. 21 9月, 2013 1 次提交
  2. 17 9月, 2013 9 次提交
    • A
      Merge remote-tracking branch 'kiszka/queues/slirp' into staging · 6c2679fc
      Anthony Liguori 提交于
      # By Liu Ping Fan (3) and Jan Kiszka (1)
      # Via Jan Kiszka
      * kiszka/queues/slirp:
        slirp: clean up slirp_update_timeout
        slirp: set mainloop timeout with more precise value
        slirp: define timeout as macro
        slirp: make timeout local
      
      Message-id: cover.1379415024.git.jan.kiszka@siemens.com
      6c2679fc
    • A
      Merge remote-tracking branch 'kwolf/for-anthony' into staging · 5dc11192
      Anthony Liguori 提交于
      # By Max Reitz (16) and others
      # Via Kevin Wolf
      * kwolf/for-anthony: (33 commits)
        qemu-iotests: Fix test 038
        block: Assert validity of BdrvActionOps
        qemu-iotests: Cleanup test image in test number 007
        qemu-img: fix invalid JSON
        coroutine: add ./configure --disable-coroutine-pool
        qemu-iotests: Adjustments due to error propagation
        qcow2: Use Error parameter
        qemu-img create: Emit filename on error
        block: Error parameter for create functions
        block: Error parameter for open functions
        bdrv: Use "Error" for creating images
        bdrv: Use "Error" for opening images
        qemu-iotests: add 057 internal snapshot for block device test case
        hmp: add interface hmp_snapshot_delete_blkdev_internal
        hmp: add interface hmp_snapshot_blkdev_internal
        qmp: add interface blockdev-snapshot-delete-internal-sync
        qmp: add interface blockdev-snapshot-internal-sync
        qmp: add internal snapshot support in qmp_transaction
        snapshot: distinguish id and name in snapshot delete
        snapshot: new function bdrv_snapshot_find_by_id_and_name()
        ...
      
      Message-id: 1379073063-14963-1-git-send-email-kwolf@redhat.com
      5dc11192
    • A
      Merge remote-tracking branch 'rth/tgt-i386' into staging · ab9cec42
      Anthony Liguori 提交于
      # By Paolo Bonzini (1) and Peter Maydell (1)
      # Via Richard Henderson
      * rth/tgt-i386:
        target-i386: Only provide CMOV and friends if feature bit set
        target-i386: fix disassembly with PAE=1, PG=0
      
      Message-id: 1379010496-5875-1-git-send-email-rth@twiddle.net
      ab9cec42
    • A
      Merge remote-tracking branch 'bonzini/scsi-next' into staging · 7d41364e
      Anthony Liguori 提交于
      # By Peter Lieven (3) and others
      # Via Paolo Bonzini
      * bonzini/scsi-next:
        spapr-vscsi: Report error on unsupported MAD requests
        spapr-vscsi: Adding VSCSI capabilities
        iscsi: split discard requests in multiple parts
        iscsi: add .bdrv_get_block_status
        iscsi: add logical block provisioning information to iscsilun
        hw/scsi/lsi53c895a: Use deposit32 rather than handcoded shift/mask
        hw/scsi/lsi53c895a: Use sextract32 for sign-extension
        scsi: Fix scsi_bus_legacy_add_drive() scsi-generic with serial
        virtio-scsi: Make type virtio-scsi-common abstract
        spapr-vscsi: add task management
        scsi: prefer UUID to VM name for the initiator name
      
      Message-id: 1378984634-765-1-git-send-email-pbonzini@redhat.com
      7d41364e
    • A
      Merge remote-tracking branch 'kraxel/chardev.7' into staging · 25afd6eb
      Anthony Liguori 提交于
      # By Gerd Hoffmann
      # Via Gerd Hoffmann
      * kraxel/chardev.7:
        chardev: fix pty_chr_timer
      
      Message-id: 1378972894-11185-1-git-send-email-kraxel@redhat.com
      25afd6eb
    • J
      slirp: clean up slirp_update_timeout · 426e3e6c
      Jan Kiszka 提交于
      No need to write out the timeout early, keep it local until we are done.
      Signed-off-by: NJan Kiszka <jan.kiszka@siemens.com>
      426e3e6c
    • L
      slirp: set mainloop timeout with more precise value · a42e9c41
      Liu Ping Fan 提交于
      If slirp needs to emulate tcp timeout, then the timeout value
      for mainloop should be more precise, which is determined by
      slirp's fasttimo or slowtimo. Achieve this by swap the logic
      sequence of slirp_pollfds_fill and slirp_update_timeout.
      Signed-off-by: NLiu Ping Fan <pingfank@linux.vnet.ibm.com>
      Signed-off-by: NJan Kiszka <jan.kiszka@siemens.com>
      a42e9c41
    • L
      slirp: define timeout as macro · 9b0ca6cc
      Liu Ping Fan 提交于
      Signed-off-by: NLiu Ping Fan <pingfank@linux.vnet.ibm.com>
      Signed-off-by: NJan Kiszka <jan.kiszka@siemens.com>
      9b0ca6cc
    • L
      slirp: make timeout local · fe0ff43c
      Liu Ping Fan 提交于
      Each slirp has its own time to caculate timeout.
      Signed-off-by: NLiu Ping Fan <pingfank@linux.vnet.ibm.com>
      Signed-off-by: NJan Kiszka <jan.kiszka@siemens.com>
      fe0ff43c
  3. 13 9月, 2013 11 次提交
  4. 12 9月, 2013 19 次提交