1. 14 4月, 2016 6 次提交
  2. 13 4月, 2016 15 次提交
    • P
      Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging · d44122ec
      Peter Maydell 提交于
      Block layer patches for 2.6
      
      # gpg: Signature made Tue 12 Apr 2016 17:10:29 BST using RSA key ID C88F2FD6
      # gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
      
      * remotes/kevin/tags/for-upstream:
        qemu-iotests: iotests.py: get rid of __all__
        qemu-iotests: 068: don't require KVM
        qemu-iotests: 148: properly skip test if quorum support is missing
        qemu-iotests: iotests.VM: remove qtest socket on error
        qemu-iotests: fix 051 on non-PC architectures
        qemu-iotests: check: don't place files with predictable names in /tmp
        MAINTAINERS: Block layer core, qcow2 and blkdebug
        qcow2: Prevent backing file names longer than 1023
        vpc: fix return value check for blk_pwrite
        iotests: Make 150 use qemu-img map instead of du
        block: initialize qcrypto API at startup
        qemu-img: fix formatting of error message
        iotests: fix the broken 026.nocache output
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      d44122ec
    • K
      Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2016-04-12' into queue-block · 5158ac58
      Kevin Wolf 提交于
      Block patches for 2.6-rc2.
      
      # gpg: Signature made Tue Apr 12 18:08:20 2016 CEST using RSA key ID E838ACAD
      # gpg: Good signature from "Max Reitz <mreitz@redhat.com>"
      
      * mreitz/tags/pull-block-for-kevin-2016-04-12:
        qemu-iotests: iotests.py: get rid of __all__
        qemu-iotests: 068: don't require KVM
        qemu-iotests: 148: properly skip test if quorum support is missing
        qemu-iotests: iotests.VM: remove qtest socket on error
        qemu-iotests: fix 051 on non-PC architectures
        qemu-iotests: check: don't place files with predictable names in /tmp
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      5158ac58
    • S
      qemu-iotests: iotests.py: get rid of __all__ · 3ef3dcef
      Sascha Silbe 提交于
      The __all__ list contained a typo for as long as the iotests module
      existed. That typo prevented "from iotests import *" (which is the
      only case where iotests.__all__ is used at all) from ever working.
      
      The names used by iotests are highly prone to name collisions, so
      importing them all unconditionally is a bad idea anyway. Since __all__
      is not adding any value, let's just get rid of it.
      
      Fixes: f345cfd0 ("qemu-iotests: add iotests Python module")
      Signed-off-by: NSascha Silbe <silbe@linux.vnet.ibm.com>
      Reviewed-by: NBo Tu <tubo@linux.vnet.ibm.com>
      Message-id: 1459848109-29756-8-git-send-email-silbe@linux.vnet.ibm.com
      Reviewed-by: NMax Reitz <mreitz@redhat.com>
      Signed-off-by: NMax Reitz <mreitz@redhat.com>
      3ef3dcef
    • S
      qemu-iotests: 068: don't require KVM · 9bf8027d
      Sascha Silbe 提交于
      None of the other test cases explicitly enable KVM and there's no
      obvious reason for 068 to require it. Drop this so all test cases can be
      executed in environments where KVM is not available (e.g. because the
      user doesn't have sufficient permissions to access /dev/kvm).
      Signed-off-by: NSascha Silbe <silbe@linux.vnet.ibm.com>
      Reviewed-by: NBo Tu <tubo@linux.vnet.ibm.com>
      Message-id: 1459848109-29756-6-git-send-email-silbe@linux.vnet.ibm.com
      Signed-off-by: NMax Reitz <mreitz@redhat.com>
      9bf8027d
    • S
      qemu-iotests: 148: properly skip test if quorum support is missing · 3f647b51
      Sascha Silbe 提交于
      qemu-iotests test case 148 already had some code for skipping the test
      if quorum support is missing, but it didn't work in all
      cases. TestQuorumEvents.setUp() gets run before the actual test class
      (which contains the skipping code) and tries to start qemu with a drive
      using the quorum driver. For some reason this works fine when using
      qcow2, but fails for raw.
      
      As the entire test case requires quorum, just check for availability
      before even starting the test suite. Introduce a verify_quorum()
      function in iotests.py for this purpose so future test cases can make
      use of it.
      Signed-off-by: NSascha Silbe <silbe@linux.vnet.ibm.com>
      Reviewed-by: NBo Tu <tubo@linux.vnet.ibm.com>
      Message-id: 1459848109-29756-5-git-send-email-silbe@linux.vnet.ibm.com
      Reviewed-by: NMax Reitz <mreitz@redhat.com>
      Signed-off-by: NMax Reitz <mreitz@redhat.com>
      3f647b51
    • S
      qemu-iotests: iotests.VM: remove qtest socket on error · c1c71e49
      Sascha Silbe 提交于
      On error, VM.launch() cleaned up the monitor unix socket, but left the
      qtest unix socket behind. This caused the remaining sub-tests to fail
      with EADDRINUSE:
      
      +======================================================================
      +ERROR: testQuorum (__main__.TestFifoQuorumEvents)
      +----------------------------------------------------------------------
      +Traceback (most recent call last):
      +  File "148", line 63, in setUp
      +    self.vm.launch()
      +  File "/home6/silbe/qemu/tests/qemu-iotests/iotests.py", line 247, in launch
      +    self._qmp.accept()
      +  File "/home6/silbe/qemu/tests/qemu-iotests/../../scripts/qmp/qmp.py", line 141, in accept
      +    return self.__negotiate_capabilities()
      +  File "/home6/silbe/qemu/tests/qemu-iotests/../../scripts/qmp/qmp.py", line 57, in __negotiate_capabilities
      +    raise QMPConnectError
      +QMPConnectError
      +
      +======================================================================
      +ERROR: testQuorum (__main__.TestQuorumEvents)
      +----------------------------------------------------------------------
      +Traceback (most recent call last):
      +  File "148", line 63, in setUp
      +    self.vm.launch()
      +  File "/home6/silbe/qemu/tests/qemu-iotests/iotests.py", line 244, in launch
      +    self._qtest = qtest.QEMUQtestProtocol(self._qtest_path, server=True)
      +  File "/home6/silbe/qemu/tests/qemu-iotests/../../scripts/qtest.py", line 33, in __init__
      +    self._sock.bind(self._address)
      +  File "/usr/lib64/python2.7/socket.py", line 224, in meth
      +    return getattr(self._sock,name)(*args)
      +error: [Errno 98] Address already in use
      
      Fix this by cleaning up both the monitor socket and the qtest socket iff
      they exist.
      Signed-off-by: NSascha Silbe <silbe@linux.vnet.ibm.com>
      Reviewed-by: NBo Tu <tubo@linux.vnet.ibm.com>
      Message-id: 1459848109-29756-4-git-send-email-silbe@linux.vnet.ibm.com
      Reviewed-by: NMax Reitz <mreitz@redhat.com>
      Signed-off-by: NMax Reitz <mreitz@redhat.com>
      c1c71e49
    • S
      qemu-iotests: fix 051 on non-PC architectures · 1759386b
      Sascha Silbe 提交于
      Commit 61de4c68 [block: Remove BDRV_O_CACHE_WB] updated the reference
      output for PCs, but neglected to do the same for the generic reference
      output file. Fix 051 on all non-PC architectures by applying the same
      change to the generic output file.
      
      Fixes: 61de4c68 ("block: Remove BDRV_O_CACHE_WB")
      Signed-off-by: NSascha Silbe <silbe@linux.vnet.ibm.com>
      Reviewed-by: NBo Tu <tubo@linux.vnet.ibm.com>
      Message-id: 1459848109-29756-3-git-send-email-silbe@linux.vnet.ibm.com
      Reviewed-by: NMax Reitz <mreitz@redhat.com>
      Signed-off-by: NMax Reitz <mreitz@redhat.com>
      1759386b
    • S
      qemu-iotests: check: don't place files with predictable names in /tmp · 0145b4e1
      Sascha Silbe 提交于
      Placing files with predictable or even hard-coded names in /tmp is a
      security risk and can prevent or disturb operation on a multi-user
      machine. Place them inside the "scratch" directory instead, as we
      already do for most other test-related files.
      Signed-off-by: NSascha Silbe <silbe@linux.vnet.ibm.com>
      Reviewed-by: NBo Tu <tubo@linux.vnet.ibm.com>
      Message-id: 1459848109-29756-2-git-send-email-silbe@linux.vnet.ibm.com
      Reviewed-by: NMax Reitz <mreitz@redhat.com>
      Signed-off-by: NMax Reitz <mreitz@redhat.com>
      0145b4e1
    • M
      MAINTAINERS: Block layer core, qcow2 and blkdebug · c4189d85
      Max Reitz 提交于
      As agreed with Kevin and already practiced for a while, I am adding
      myself as co-maintainer of the block layer core, qcow2 and blkdebug.
      Signed-off-by: NMax Reitz <mreitz@redhat.com>
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      c4189d85
    • M
      qcow2: Prevent backing file names longer than 1023 · 4e876bcf
      Max Reitz 提交于
      We reject backing file names with a length of more than 1023 characters
      when opening a qcow2 file, so we should not produce such files
      ourselves.
      
      Cc: qemu-stable@nongnu.org
      Signed-off-by: NMax Reitz <mreitz@redhat.com>
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      4e876bcf
    • P
      vpc: fix return value check for blk_pwrite · 40a99aac
      Paolo Bonzini 提交于
      bdrv_pwrite_sync used to return zero or negative error, while blk_pwrite returns
      the number of written bytes when successful.  This caused VPC image creation
      to fail spectacularly: it wrote the first 512 bytes, and then exited immediately
      because of the non-zero answer from blk_pwrite.  But the truly spectacular part
      is that it returns a positive value (the 512 that blk_pwrite returned) causing
      everyone to believe that it succeeded.
      
      This fixes qemu-iotests with vpc format.
      
      Fixes: b8f45cdfSigned-off-by: NPaolo Bonzini <pbonzini@redhat.com>
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      40a99aac
    • M
      iotests: Make 150 use qemu-img map instead of du · 1fd06db0
      Max Reitz 提交于
      The actual on-disk size of a file does not only depend on factors qemu
      can control. Thus, we should not depend on this to determine whether a
      file has indeed been fully allocated. Instead, use qemu-img map and hope
      that if an area is referenced, it is indeed allocated, too.
      
      Also, limit the supported image formats to raw and qcow2 because the
      actual qemu-img map output may depend on the image format.
      Signed-off-by: NMax Reitz <mreitz@redhat.com>
      Tested-by: NPaolo Bonzini <pbonzini@redhat.com>
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      1fd06db0
    • D
      block: initialize qcrypto API at startup · c2297088
      Daniel P. Berrange 提交于
      Any programs which call the qcrypto APIs should ensure that
      qcrypto_init() has been called before anything else which
      can use crypto. Essentially this means right at the start
      of the main method before initializing anything else.
      
      This is important because some versions of gnutls/gcrypt
      require explicit initialization before use.
      Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
      Reviewed-by: NAlex Bligh <alex@alex.org.uk>
      Tested-by: NAlex Bligh <alex@alex.org.uk>
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      c2297088
    • D
      qemu-img: fix formatting of error message · 143605a2
      Daniel P. Berrange 提交于
      The error_reportf_err() will not automatically append a
      ': ' before adding its suffix, so we must include that
      in the message we pass it, otherwise we get a badly
      formatted message lacking whitespace:
      
      qemu-img: Could not open 'driver=nbd,host=127.0.0.1,port=6666,tls-creds=tls0'Failed to connect socket: Connection refused
      Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
      Reviewed-by: NEric Blake <eblake@redhat.com>
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      143605a2
    • P
      iotests: fix the broken 026.nocache output · af74e865
      Pavel Butsykin 提交于
      This patch fixes longstanding issue with 026 iotest. Unfortunately,
      this test contains 2 versions of the correct output, one for cached
      writes and one for non-cached ones. People tends to fix only one
      version of output of the test and thus noncached version becomes
      broken. Unfortunately, it is default in tests/check-block.sh
      
      The following problematic commits were made:
          commit 3b5e14c7
          Author: Max Reitz <mreitz@redhat.com>
          Date:   Tue Dec 2 18:32:51 2014 +0100
          qcow2: Flushing the caches in qcow2_close may fail
      
          commit a069e2f1
          Author: John Snow <jsnow@redhat.com>
          Date:   Fri Feb 6 16:26:17 2015 -0500
          blkdebug: fix "once" rule
      
          commit b106ad91
          Author: Kevin Wolf <kwolf@redhat.com>
          Date:   Fri Mar 28 18:06:31 2014 +0100
          qcow2: Don't rely on free_cluster_index in alloc_refcount_block()
      Signed-off-by: NPavel Butsykin <pbutsykin@virtuozzo.com>
      Signed-off-by: NDenis V. Lunev <den@openvz.org>
      CC: Max Reitz <mreitz@redhat.com>
      CC: John Snow <jsnow@redhat.com>
      CC: Kevin Wolf <kwolf@redhat.com>
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      af74e865
  3. 12 4月, 2016 1 次提交
  4. 11 4月, 2016 10 次提交
  5. 08 4月, 2016 8 次提交
    • P
      Merge remote-tracking branch 'remotes/lalrae/tags/mips-20160408' into staging · 9628af03
      Peter Maydell 提交于
      MIPS patches 2016-04-08
      
      Changes:
      * fix off-by-one error in ITU
      
      # gpg: Signature made Fri 08 Apr 2016 10:43:16 BST using RSA key ID 0B29DA6B
      # gpg: Good signature from "Leon Alrae <leon.alrae@imgtec.com>"
      
      * remotes/lalrae/tags/mips-20160408:
        hw/mips_itu: fix off-by-one reported by Coverity
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      9628af03
    • P
      Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging · 8227e2d1
      Peter Maydell 提交于
      pci, virtio, acpi: fixes for 2.6
      
      Fixes all over the place. Most notably, fixes migration
      for systems with pci express bridges, and random crashes
      observed with virtio blk and scsi dataplane.
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      
      # gpg: Signature made Fri 08 Apr 2016 08:53:46 BST using RSA key ID D28D5469
      # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
      # gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"
      
      * remotes/mst/tags/for_upstream:
        hw/pci-bridge: Add missing unref in case register-bus fails
        virtio: merge virtio_queue_aio_set_host_notifier_handler with virtio_queue_set_aio
        virtio-scsi: use aio handler for data plane
        virtio-blk: use aio handler for data plane
        virtio: add aio handler
        virtio-scsi: fix disabled mode
        virtio-blk: fix disabled mode
        virtio: make virtio_queue_notify_vq static
        tests/bios-tables-test: fix assert
        virtio-balloon: reset the statistic timer to load device
        Migration: Add i82801b11 migration data
        Sort the fw_cfg file list
        xen: piix reuse pci generic class init function
        pci-testdev: fast mmio support
        acpi: Add missing GCC_FMT_ATTR
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      8227e2d1
    • P
      Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.6-20160408' into staging · 3be4f4d7
      Peter Maydell 提交于
      ppc patch queue for 2016-04-08
      
      Just a single bugfix for spapr in this batch, but I want to make sure
      it gets in for 2.6.
      
      # gpg: Signature made Fri 08 Apr 2016 06:02:45 BST using RSA key ID 20D9B392
      # gpg: Good signature from "David Gibson <david@gibson.dropbear.id.au>"
      # gpg:                 aka "David Gibson (Red Hat) <dgibson@redhat.com>"
      # gpg:                 aka "David Gibson (ozlabs.org) <dgibson@ozlabs.org>"
      # gpg: WARNING: This key is not certified with sufficiently trusted signatures!
      # gpg:          It is not certain that the signature belongs to the owner.
      # Primary key fingerprint: 75F4 6586 AE61 A66C C44E  87DC 6C38 CACA 20D9 B392
      
      * remotes/dgibson/tags/ppc-for-2.6-20160408:
        spapr: Fix ibm,lrdr-capacity
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      3be4f4d7
    • P
      Merge remote-tracking branch 'remotes/xtensa/tags/20160408-xtensa' into staging · 24790aef
      Peter Maydell 提交于
      Xtensa-related fixes:
      
      - fix networking on xtfpga platform in linux v4.5 by indicating
        autonegotiation completion in opencores_eth MII BMSR.
      
      # gpg: Signature made Thu 07 Apr 2016 23:33:59 BST using RSA key ID F83FA044
      # gpg: Good signature from "Max Filippov <max.filippov@cogentembedded.com>"
      # gpg:                 aka "Max Filippov <jcmvbkbc@gmail.com>"
      
      * remotes/xtensa/tags/20160408-xtensa:
        opencores_eth: indicate autonegotiation completion
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      24790aef
    • P
      Merge remote-tracking branch 'remotes/weil/tags/pull-tci-20160407' into staging · 5542417d
      Peter Maydell 提交于
      tci patch queue
      
      # gpg: Signature made Thu 07 Apr 2016 18:01:55 BST using RSA key ID 677450AD
      # gpg: Good signature from "Stefan Weil <sw@weilnetz.de>"
      # gpg:                 aka "Stefan Weil <stefan.weil@weilnetz.de>"
      # gpg:                 aka "Stefan Weil <stefan.weil@bib.uni-mannheim.de>"
      # gpg: WARNING: This key is not certified with sufficiently trusted signatures!
      # gpg:          It is not certain that the signature belongs to the owner.
      # Primary key fingerprint: 4923 6FEA 75C9 5D69 8EC2  B78A E08C 21D5 6774 50AD
      
      * remotes/weil/tags/pull-tci-20160407:
        tci: Fix build regression
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      5542417d
    • P
      Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging · 28ee0126
      Peter Maydell 提交于
      * NBD fixes from Alex and Eric
      * Debug code bitrot from Emilio
      * HPET fix from Bill
      * ps2kbd fix from Hervé
      * PKU fix from myself
      * Coverity fixes from Gonglei
      * More memory.txt update from Jiangang
      * .gitignore maintenance from Changlong
      
      # gpg: Signature made Thu 07 Apr 2016 23:08:12 BST using RSA key ID 78C7AE83
      # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
      # gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"
      
      * remotes/bonzini/tags/for-upstream:
        target-i386: check for PKU even for non-writable pages
        tests: ignore test-logging
        translate-all: add missing fold of tb_ctx into tcg_ctx
        hostmem-file: fix memory leak
        spapr: fix possible Negative array index read
        nbd: do not hang nbd_wr_syncv if outside a coroutine and no available data
        nbd: Don't kill server when client requests unknown option
        nbd: Fix NBD unsupported options
        qemu-nbd: Document -x option
        nbd: Improve debug traces on little-endian
        nbd: Avoid bitrot in TRACE() usage
        nbd: Return correct error for write to read-only export
        docs: fix typo in memory.txt
        hw/timer: Revert "hpet: inverse polarity when pin above ISA_NUM_IRQS"
        ps2kbd: default to scancode_set 2, as with KBD_CMD_RESET
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      28ee0126
    • L
      hw/mips_itu: fix off-by-one reported by Coverity · f2eb665a
      Leon Alrae 提交于
      Fix off-by-one error in ITC Tag read.
      
      Remove the switch as we just want to check if index is in valid range
      rather than test against list of values.
      Signed-off-by: NLeon Alrae <leon.alrae@imgtec.com>
      f2eb665a
    • B
      spapr: Fix ibm,lrdr-capacity · a110655a
      Bharata B Rao 提交于
      ibm,lrdr-capacity has a field to describe the maximum address in bytes
      and therefore, the most memory that can be allocated to this guest. We
      are using maxmem for this field, but instead should use the actual RAM
      address corresponding to the end of hotplug region.
      Signed-off-by: NBharata B Rao <bharata@linux.vnet.ibm.com>
      Signed-off-by: NDavid Gibson <david@gibson.dropbear.id.au>
      a110655a