1. 13 12月, 2016 9 次提交
    • N
      qemu: agent: fix uninitialized var case in qemuAgentGetFSInfo · 3ab9652a
      Nikolay Shirokovskiy 提交于
      In case of 0 filesystems *info is not set while according
      to virDomainGetFSInfo contract user should call free on it even
      in case of 0 filesystems. Thus we need to properly set
      it. NULL will be enough as free eats NULLs ok.
      3ab9652a
    • J
      d2c12226
    • J
      qemu: Fix GetBlockInfo setting allocation from wr_highest_offset · cf436a56
      John Ferlan 提交于
      The libvirt-domain.h documentation indicates that for a qcow2 file
      in a filesystem being used for a backing store should report the disk
      space occupied by a file; however, commit id '15fa84ac' altered the
      code to trust that the wr_highest_offset should be used whenever
      wr_highest_offset_valid was set.
      
      As it turns out this will lead to indeterminite results. For an active
      domain when qemu hasn't yet had the need to find the wr_highest_offset
      value, qemu will report 0 even though qemu-img will report the proper
      disk size. This causes reporting of the following XML:
      
        <disk type='file' device='disk'>
          <driver name='qemu' type='qcow2'/>
          <source file='/path/to/test-1g.qcow2'/>
      
      to be as follows:
      
      Capacity:       1073741824
      Allocation:     0
      Physical:       1074139136
      
      with qemu-img indicating:
      
      image: /path/to/test-1g.qcow2
      file format: qcow2
      virtual size: 1.0G (1073741824 bytes)
      disk size: 1.0G
      
      Once the backing source file is opened on the guest, then wr_highest_offset
      is updated, but only to the high water mark and not the size of the file.
      
      This patch will adjust the logic to check for the file backed qcow2 image
      and enforce setting the allocation to the returned 'physical' value, which
      is the 'actual-size' value from a 'query-block' operation.
      
      NB: The other consumer of the wr_highest_offset output (GetAllDomainStats)
      has a contract that indicates 'allocation' is the offset of the highest
      written sector, so it doesn't need adjustment.
      Signed-off-by: NJohn Ferlan <jferlan@redhat.com>
      cf436a56
    • J
      util: Introduce virStorageSourceUpdateCapacity · 9d734b60
      John Ferlan 提交于
      Instead of having duplicated code in qemuStorageLimitsRefresh and
      virStorageBackendUpdateVolTargetInfo to get capacity specific data
      about the storage backing source or volume -- create a common API
      to handle the details for both.
      
      As a side effect, virStorageFileProbeFormatFromBuf returns to being
      a local/static helper to virstoragefile.c
      
      For the QEMU code - if the probe is done, then the format is saved so
      as to avoid future such probes.
      
      For the storage backend code, there is no need to deal with the probe
      since we cannot call the new API if target->format == NONE.
      Signed-off-by: NJohn Ferlan <jferlan@redhat.com>
      9d734b60
    • J
      util: Introduce virStorageSourceUpdateBackingSizes · 3039ec96
      John Ferlan 提交于
      Instead of having duplicated code in qemuStorageLimitsRefresh and
      virStorageBackendUpdateVolTargetInfoFD to fill in the storage backing
      source or volume allocation, capacity, and physical values - create a
      common API that will handle the details for both.
      
      The common API will fill in "default" capacity values as well - although
      those more than likely will be overridden by subsequent code. Having just
      one place to make the determination of what the values should be will
      make things be more consistent.
      
      For the QEMU code - the data filled in will be for inactive domains
      for the GetBlockInfo and DomainGetStatsOneBlock API's. For the storage
      backend code - the data will be filled in during the volume updates.
      Signed-off-by: NJohn Ferlan <jferlan@redhat.com>
      3039ec96
    • J
      util: Introduce virStorageSourceUpdatePhysicalSize · c5f61513
      John Ferlan 提交于
      Commit id '8dc27259' introduced virStorageSourceUpdateBlockPhysicalSize
      in order to retrieve the physical size for a block backed source device
      for an active domain since commit id '15fa84ac' changed to use the
      qemuMonitorGetAllBlockStatsInfo and qemuMonitorBlockStatsUpdateCapacity
      API's to (essentially) retrieve the "actual-size" from a 'query-block'
      operation for the source device.
      
      However, the code only was made functional for a BLOCK backing type
      and it neglected to use qemuOpenFile, instead using just open. After
      the open the block lseek would find the end of the block and set the
      physical value, close the fd and return.
      
      Since the code would return 0 immediately if the source device wasn't
      a BLOCK backed device, the physical would be displayed incorrectly,
      such as follows in domblkinfo for a file backed source device:
      
      Capacity:       1073741824
      Allocation:     0
      Physical:       0
      
      This patch will modify the algorithm to get the physical size for other
      backing types and it will make use of the qemuDomainStorageOpenStat
      helper in order to open/stat the source file depending on its type.
      The qemuDomainGetStatsOneBlock will no longer inhibit printing errors,
      but it will still ignore them leaving the physical value set to 0.
      Signed-off-by: NJohn Ferlan <jferlan@redhat.com>
      c5f61513
    • J
      qemu: Introduce helper qemuDomainStorageUpdatePhysical · a7fea19f
      John Ferlan 提交于
      Currently just a shim to call virStorageSourceUpdateBlockPhysicalSize
      Signed-off-by: NJohn Ferlan <jferlan@redhat.com>
      a7fea19f
    • J
      qemu: Add helpers to handle stat data for qemuStorageLimitsRefresh · 732af77c
      John Ferlan 提交于
      Split out the opening of the file and fetch of the stat buffer into a
      helper qemuDomainStorageOpenStat. This will handle either opening the
      local or remote storage.
      
      Additionally split out the cleanup of that into a separate helper
      qemuDomainStorageCloseStat which will either close the file or
      call the virStorageFileDeinit function.
      Signed-off-by: NJohn Ferlan <jferlan@redhat.com>
      732af77c
    • J
      qemu: Clean up description for qemuStorageLimitsRefresh · 7149d169
      John Ferlan 提交于
      Originally added by commit id '89646e69' prior to commit id '15fa84ac'
      and '71d2c172' which ensured that qemuStorageLimitsRefresh was only called
      for inactive domains.
      
      Adjust the comment describing the need for FIXME and move all the text
      to the function description.
      Signed-off-by: NJohn Ferlan <jferlan@redhat.com>
      7149d169
  2. 12 12月, 2016 2 次提交
  3. 11 12月, 2016 2 次提交
  4. 09 12月, 2016 15 次提交
  5. 08 12月, 2016 7 次提交
  6. 07 12月, 2016 5 次提交