1. 25 4月, 2014 21 次提交
  2. 24 4月, 2014 19 次提交
    • R
      docs: document nmdm type console · 6d0a6175
      Roman Bogorodskiy 提交于
      * Add nmdm type device to domain format documnetation
      * Add a section about nmdm console usage to the bhyve driver
        documentation
      6d0a6175
    • M
    • J
      1445f34b
    • J
      tests: More output options for xml2xml tests · 022ccd3d
      Jiri Denemark 提交于
      So far, qemuxml2xml test was only able to check if the result matches
      the original or the appropriate XML in qemuxml2xmloutdata regardless on
      flags used to format the XML. Since the result can be different
      depending on VIR_DOMAIN_XML_INACTIVE flag being used or not, this patch
      adds support for qemuxml2xmlout-%s-active.xml and
      qemuxml2xmlout-%s-inactive.xml output files. If the file specific to the
      flag used exists, it is used in preference to the generic
      qemuxml2xmlout-%s.xml file when reading the expected output.
      Signed-off-by: NJiri Denemark <jdenemar@redhat.com>
      022ccd3d
    • J
      conf: Format and parse backing chains in domain XML · 546154e3
      Jiri Denemark 提交于
      This patch implements formating and parsing code for the backing store
      schema defined and documented by the previous patch.
      
      This patch does not aim at providing full persistent storage of disk
      backing chains yet. The formatter is supposed to provide the backing
      chain detected when starting a domain and thus it is not formatted into
      an inactive domain XML. The parser is implemented mainly for the purpose
      of testing the XML generated by the formatter and thus it does not
      distinguish between no backingStore element and an empty backingStore
      element. This will have to change once we fully implement support for
      user-supplied backing chains.
      Signed-off-by: NJiri Denemark <jdenemar@redhat.com>
      546154e3
    • J
      conf: Output disk backing store details in domain XML · a2e369bc
      Jiri Denemark 提交于
      The XML for quite a longish backing chain is shown below:
      
        <disk type='network' device='disk'>
          <driver name='qemu' type='qcow2'/>
          <source protocol='nbd' name='bar'>
            <host transport='unix' socket='/var/run/nbdsock'/>
          </source>
          <backingStore type='block' index='1'>
            <format type='qcow2'/>
            <source dev='/dev/HostVG/QEMUGuest1'/>
            <backingStore type='file' index='2'>
              <format type='qcow2'/>
              <source file='/tmp/image2.qcow'/>
              <backingStore type='file' index='3'>
                <format type='qcow2'/>
                <source file='/tmp/image3.qcow'/>
                <backingStore type='file' index='4'>
                  <format type='qcow2'/>
                  <source file='/tmp/image4.qcow'/>
                  <backingStore type='file' index='5'>
                    <format type='qcow2'/>
                    <source file='/tmp/image5.qcow'/>
                    <backingStore type='file' index='6'>
                      <format type='raw'/>
                      <source file='/tmp/Fedora-17-x86_64-Live-KDE.iso'/>
                      <backingStore/>
                    </backingStore>
                  </backingStore>
                </backingStore>
              </backingStore>
            </backingStore>
          </backingStore>
          <target dev='vdb' bus='virtio'/>
        </disk>
      
      Various disk types and formats can be mixed in one chain. The
      <backingStore/> empty element marks the end of the backing chain and it
      is there mostly for future support of parsing the chain provided by a
      user. If it's missing, we are supposed to probe for the rest of the
      chain ourselves, otherwise complete chain was provided by the user. The
      index attributes of backingStore elements can be used to unambiguously
      identify a specific part of the image chain.
      Signed-off-by: NJiri Denemark <jdenemar@redhat.com>
      a2e369bc
    • D
      Fix pci bus naming for PPC · 27b2b987
      Daniel P. Berrange 提交于
      Recent discussions around naming of 'pci' vs 'pci.0' for PPC
      made me go back and look at the PPC emulator in every historical
      version of QEMU since 1.0. The results were worse than I imagined.
      This patch adds the logic required to make libvirt work with PPC
      correctly with naming variations across all versions & machine
      types.
      Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
      27b2b987
    • P
      util: storage: Invert the way recursive metadata retrieval works · 8823272d
      Peter Krempa 提交于
      To avoid having the root of a backing chain present twice in the list we
      need to invert the working of virStorageFileGetMetadataRecurse.
      
      Until now the recursive worker created a new backing chain element from
      the name and other information passed as arguments. This required us to
      pass the data of the parent in a deconstructed way and the worker
      created a new entry for the parent.
      
      This patch converts this function so that it just fills in metadata
      about the parent and creates a backing chain element from those. This
      removes the duplication of the first element.
      
      To avoid breaking the test suite, virstoragetest now calls a wrapper
      that creates the parent structure explicitly and pre-fills it with the
      test data with same function signature as previously used.
      8823272d
    • P
      util: virstoragefile: Don't mangle data stored about directories · cc92ee32
      Peter Krempa 提交于
      Don't remove detected metadata about directory based storage volumes.
      cc92ee32
    • P
      storage: Move disk->backingChain to the recursive disk->src.backingStore · 44551275
      Peter Krempa 提交于
      Switch over to storing of the backing chain as a recursive
      virStorageSource structure.
      
      This is a string based move. Currently the first element will be present
      twice in the backing chain as currently the retrieval function stores
      the parent in the newly detected chain. This will be fixed later.
      44551275
    • P
      util: virstoragefile: Rename backingMeta to backingStore · b627b8fd
      Peter Krempa 提交于
      To conform with the naming of the planned XML output rename the metadata
      variable name.
      
      s/backingMeta/backingStore/g
      b627b8fd
    • P
      util: virstorage: Kill struct virStorageFileMetadata · 4905b983
      Peter Krempa 提交于
      Remove the now unused pieces of the structure.
      4905b983
    • P
      maint: Switch over from struct virStorageFileMetadata to virStorageSource · d64d9ff9
      Peter Krempa 提交于
      Replace the old structure with the new one. This change is a trivial
      name change operation (along with change of the freeing function).
      d64d9ff9
    • P
      util: storagefile: Add fields from virStorageMetadata to virStorageSource · 0b5161d9
      Peter Krempa 提交于
      Add the required fields that are missing from the new structure that
      will allow us to switch the storage file metadata code entirely to the
      new structure.
      
      Add "relPath" and "relDir" and the raw backing store name. Also allow
      creating linked lists of virStorageSourcePtrs to express backing chains.
      0b5161d9
    • P
      util: storagefile: Add function to free a virStorageSourcePtr · 0bd54a10
      Peter Krempa 提交于
      Add a free function as some parts of the code will allocate the
      structure.
      0bd54a10
    • P
      virstoragefile: Kill "backingStore" field from virStorageFileMetadata · 39c5aa4e
      Peter Krempa 提交于
      Remove the obsolete field replaced by data in "path".
      
      The testsuite requires tweaking as the name of the backing file is now
      stored one layer deeper in the backing chain linked list.
      39c5aa4e
    • P
      util: virstoragefile: Don't use "backingStore" directly · c366a1ef
      Peter Krempa 提交于
      As a temporary step to allow killing of the "backingStore" field of
      struct virStorageFileMetadata the recursive metadata retrieval function
      will be converted not to use the field in the lookup process.
      c366a1ef
    • P
      util: storagefile: Rename "canonPath" to "path" in virStorageFileMetadata · 05bc536c
      Peter Krempa 提交于
      As for the previous patch, this change is needed to achieve
      compatibility with all the existing code, where we expect a fully
      qualified path of local files to be present.
      05bc536c
    • P
      util: storage: Rename "path" to "relPath" in virStorageFileMetadata · f34b8296
      Peter Krempa 提交于
      To allow future change of virStorageFileMetadata to virStorageSource we
      need to store a full path in the "path" variable as rest of the code
      expects it to be a full path. Rename the "path" field to "relPath" to
      keep tracking the info but allowing a real "path" field.
      f34b8296