1. 02 12月, 2013 3 次提交
    • N
      Fix memory leak in virDomainDefParseXML() · 2cfcd2cc
      Nehal J Wani 提交于
      This patch fixes the memory leaks found while running qemuxml2argvtest
      
      ==8260== 3 bytes in 1 blocks are definitely lost in loss record 1 of
      129
      ==8260==    at 0x4A0887C: malloc (vg_replace_malloc.c:270)
      ==8260==    by 0x341F485E21: strdup (strdup.c:42)
      ==8260==    by 0x4CADCFF: virStrdup (virstring.c:554)
      ==8260==    by 0x4CBB839: virXPathString (virxml.c:90)
      ==8260==    by 0x4CE753A: virDomainDefParseXML (domain_conf.c:11478)
      ==8260==    by 0x4CEB4FE: virDomainDefParseNode (domain_conf.c:12742)
      ==8260==    by 0x4CEB675: virDomainDefParse (domain_conf.c:12684)
      ==8260==    by 0x425958: testCompareXMLToArgvHelper (qemuxml2argvtest.c:107)
      ==8260==    by 0x427111: virtTestRun (testutils.c:138)
      ==8260==    by 0x41D3FE: mymain (qemuxml2argvtest.c:452)
      ==8260==    by 0x4277B2: virtTestMain (testutils.c:593)
      ==8260==    by 0x341F421A04: (below main) (libc-start.c:225)
      ==8260==
      ==8260== 4 bytes in 1 blocks are definitely lost in loss record 5 of
      129
      ==8260==    at 0x4A0887C: malloc (vg_replace_malloc.c:270)
      ==8260==    by 0x341F485E21: strdup (strdup.c:42)
      ==8260==    by 0x4CADCFF: virStrdup (virstring.c:554)
      ==8260==    by 0x4CBB839: virXPathString (virxml.c:90)
      ==8260==    by 0x4CE753A: virDomainDefParseXML (domain_conf.c:11478)
      ==8260==    by 0x4CEB4FE: virDomainDefParseNode (domain_conf.c:12742)
      ==8260==    by 0x4CEB675: virDomainDefParse (domain_conf.c:12684)
      ==8260==    by 0x425958: testCompareXMLToArgvHelper (qemuxml2argvtest.c:107)
      ==8260==    by 0x427111: virtTestRun (testutils.c:138)
      ==8260==    by 0x41D39A: mymain (qemuxml2argvtest.c:451)
      ==8260==    by 0x4277B2: virtTestMain (testutils.c:593)
      ==8260==    by 0x341F421A04: (below main) (libc-start.c:225)
      ==8260==
      2cfcd2cc
    • N
      virsh: fix doc typos · 77b97d80
      Nehal J Wani 提交于
      Fix 6 minor spelling errors in virsh doc
      77b97d80
    • N
      Fix typos in various docs · 968a4692
      Nehal J Wani 提交于
      Fix 8 minor spelling errors in docs/*.html.in
      968a4692
  2. 29 11月, 2013 1 次提交
  3. 28 11月, 2013 6 次提交
    • L
      network: properly update iptables rules during net-update · 54f94923
      Laine Stump 提交于
      This patch resolves:
      
        https://bugzilla.redhat.com/show_bug.cgi?id=1035336
      
      The basic problem is that during a network update, the required
      iptables rules sometimes change, and this was being handled by simply
      removing and re-adding the rules. However, the removal of the old
      rules was done based on the *new* state of the network, which would
      mean that some of the rules would not match those currently in the
      system, so the old rules wouldn't be removed.
      
      This patch removes the old rules prior to updating the network
      definition then adds the new rules as soon as the definition is
      updated. Note that this could lead to a stray packet or two during the
      interim, but that was already a problem before (the period of limbo is
      now just slightly longer).
      
      While moving the location for the rules, I added a few more sections
      that should result in the iptables rules being redone:
      
      DHCP_RANGE and DHCP_HOST - these are needed because adding/removing a dhcp
      host entry could lead to the dhcp service being started/stopped, which
      would require that the mangle rule that fixes up dhcp response
      checksums sould need to be added/removed, and this wasn't being done.
      54f94923
    • D
      Fix bug in identifying sub-mounts · 84fd470d
      Daniel P. Berrange 提交于
      The code for extracting sub-mounts would just do a STRPREFIX
      check on the mount. This was flawed because if there were
      the following mounts
      
       /etc/aliases
       /etc/aliases.db
      
      and '/etc/aliases' was asked for, it would return both even
      though the latter isn't a sub-mount.
      Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
      84fd470d
    • D
      Pull lxcContainerGetSubtree out into shared virfile module · d45b833d
      Daniel P. Berrange 提交于
      Move the code for lxcContainerGetSubtree into the virfile
      module creating 2 new functions
      
        int virFileGetMountSubtree(const char *mtabpath,
                                   const char *prefix,
                                   char ***mountsret,
                                   size_t *nmountsret);
        int virFileGetMountReverseSubtree(const char *mtabpath,
                                          const char *prefix,
                                          char ***mountsret,
                                          size_t *nmountsret);
      
      Add a new virfiletest.c test case to validate the new code.
      Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
      d45b833d
    • D
      Introduce standard methods for sorting strings with qsort · c60a2713
      Daniel P. Berrange 提交于
      Add virStringSortCompare and virStringSortRevCompare as
      standard functions to use with qsort.
      Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
      c60a2713
    • E
      tests: fix virpcitest with read-only srcdir · e821de2c
      Eric Blake 提交于
      'make distcheck' has been broken since commit 21685c95; basically,
      it emulates the case of a read-only $(srcdir) (such as building
      from a tarball exploded onto a CD-ROM), but we were creating our
      fake pci device as a symlink into $(srcdir) and failing when that
      requires opening the config file for writing:
      
       3) testVirPCIDeviceReset                                             ... libvirt:  error : Failed to open config space file '/sys/bus/pci/devices/0000:00:01.0/config': Permission denied
      
      Fix it by copying rather than symlinking.
      
      * tests/virpcimock.c (make_file): Add parameter to allow binary
      creation; adjust all callers.
      (pci_device_new_from_stub): Copy rather than symlink.
      Signed-off-by: NEric Blake <eblake@redhat.com>
      e821de2c
    • E
      tests: guarantee abs_srcdir in all C tests · 0aa873d7
      Eric Blake 提交于
      While trying to debug a failure of virpcitest during 'make distcheck',
      I noticed that with a VPATH build, 'cd tests; ./virpcitest' fails for
      an entirely different reason.  To reproduce the distcheck failure, I
      had to run 'cd tests; abs_srcdir=/path/to/src ./virpcitest'.  But we
      document in HACKING that all of our tests are supposed to be runnable
      without requiring extra environment variables.
      
      The solution: hardcode the location of srcdir into the just-built
      binaries, rather than requiring make to prepopulate environment
      variables.  With this, './virpcitest' passes even in a VPATH build
      (provided that $(srcdir) is writable; a followup patch will fix the
      conditions required by 'make distcheck').  [Note: the makefile must
      still pass on directory variables to the test environment of shell
      scripts, since those aren't compiled.  So while this solves the case
      of a compiled test, it still requires environment variables to pass
      a VPATH build of any shell script test case that relies on srcdir.]
      
      * tests/Makefile.am (AM_CFLAGS): Define abs_srcdir in all compiled
      tests.
      * tests/testutils.h (abs_srcdir): Quit declaring.
      * tests/testutils.c (virtTestMain): Rely on define rather than
      environment variable.
      * tests/virpcimock.c (pci_device_new_from_stub): Rely on define.
      * tests/cputest.c (mymain): Adjust abs_top_srcdir default.
      * tests/qemuxml2argvtest.c (mymain): Likewise.
      * tests/qemuxmlnstest.c (mymain): Likewise.
      Signed-off-by: NEric Blake <eblake@redhat.com>
      0aa873d7
  4. 27 11月, 2013 6 次提交
    • P
      conf: Export virStorageVolType enum helper functions · 69d20452
      Peter Krempa 提交于
      Export string conversion from and to the virStorageVolType enum.
      69d20452
    • E
      storage: skip selinux cleanup when fd not available · c8b8b50c
      Eric Blake 提交于
      When attempting to backport gluster pools to an older versoin
      where there is no VIR_STRDUP, I got a crash from calling
      strdup(,NULL). Rather than relying on the current else branch
      safely doing nothing when there is no fd, it is easier to just
      skip it. While at it, there's no need to explicitly set
      perms.label to NULL after a VIR_FREE().
      
      * src/storage/storage_backend.c
      (virStorageBackendUpdateVolTargetInfoFD): Minor optimization.
      Signed-off-by: NEric Blake <eblake@redhat.com>
      c8b8b50c
    • B
      qemu: preserve netdev MAC address during 'domxml-to-native' · 8e043864
      Bing Bu Cao 提交于
      The virsh command 'domxml-to-native' (virConnectDomainXMLToNative())
      converts all network devices to "type='ethernet'" in order to make it
      more likely that the generated command could be run directly from a
      shell (other libvirt network device types end up referencing file
      descriptors for tap devices assumed to have been created by libvirt,
      which can't be done in this case).
      
      During this conversion, all of the netdev parameters are cleared out,
      then specific items are filled in after changing the type. The MAC
      address was not one of these preserved items, and the result was that
      mac addresses in the generated commandlines were always
      00:00:00:00:00:00.
      
      This patch saves the mac address before the conversion, then
      repopulates it afterwards, so the proper mac addresses show up in the
      commandline.
      Signed-off-by: NBing Bu Cao <mars@linux.vnet.ibm.com>
      Signed-off-by: NLaine Stump <laine@laine.org>
      8e043864
    • J
      look for numad in /usr/sbin · 56022a29
      Jim Fehlig 提交于
      When looking for numad with AC_PATH_PROG, include /usr/sbin in
      the search path.
      56022a29
    • E
      storage: don't read storage volumes in nonblock mode · 655ea8dc
      Eric Blake 提交于
      Commit 348b4e25 introduced a potential problem (thankfully not
      in any release): we are attempting to use virFileReadHeaderFD()
      on a file that was opened with O_NONBLOCK.  While this
      shouldn't be a problem in practice (because O_NONBLOCK
      typically doesn't affect regular or block files, and fifos and
      sockets cannot be storage volumes), it's better to play it safe
      to avoid races from opening an unexpected file type while also
      avoiding problems with having to handle EAGAIN while read()ing.
      
      Based on a report by Dan Berrange.
      
      * src/storage/storage_backend.c
      (virStorageBackendVolOpenCheckMode): Fix up fd after avoiding race.
      Signed-off-by: NEric Blake <eblake@redhat.com>
      655ea8dc
    • G
      LXC: add securetty related note in Device nodes · 6616582c
      Gao feng 提交于
      Tell user how to resolve the problem that fail to log in
      the container.
      Signed-off-by: NGao feng <gaofeng@cn.fujitsu.com>
      6616582c
  5. 26 11月, 2013 20 次提交
    • G
      LXC: don't unmount mounts for shared root · f575fda7
      Gao feng 提交于
      Also after commit 5ff9d8a65ce80efb509ce4e8051394e9ed2cd942
      vfs: Lock in place mounts from more privileged users,
      
      unprivileged user has no rights to umount the mounts that
      inherited from parent mountns.
      
      right now, I have no good idea to fix this problem, we need
      to do more research. this patch just skip unmounting these
      mounts for shared root.
      
      BTW, I think when libvirt lxc enables user namespace, the
      configuation that shares root with host is very rara.
      Signed-off-by: NGao feng <gaofeng@cn.fujitsu.com>
      f575fda7
    • G
      LXC: fix the problem that libvirt lxc fail to start on latest kernel · 46f2d16f
      Gao feng 提交于
      After kernel commit 5ff9d8a65ce80efb509ce4e8051394e9ed2cd942
      vfs: Lock in place mounts from more privileged users,
      
      unprivileged user has no rights to move the mounts that
      inherited from parent mountns. we use this feature to move
      the /stateDir/domain-name.{dev, devpts} to the /dev/ and
      /dev/pts directroy of container. this commit breaks libvirt lxc.
      
      this patch changes the behavior to bind these mounts when
      user namespace is enabled and move these mounts when user
      namespace is disabled.
      Signed-off-by: NGao feng <gaofeng@cn.fujitsu.com>
      46f2d16f
    • C
      sasl: Replace 'restep' label with 'continue' · 78e90968
      Christophe Fergeau 提交于
      Since the label is at the beginning of the loop, this has the same effect.
      78e90968
    • C
      sasl: Fix authentication when using PLAIN mechanism · 0955025b
      Christophe Fergeau 提交于
      With some authentication mechanism (PLAIN for example), sasl_client_start()
      can return SASL_OK, which translates to virNetSASLSessionClientStart()
      returning VIR_NET_SASL_COMPLETE.
      cyrus-sasl documentation is a bit vague as to what to do in such situation,
      but upstream clarified this a bit in
      http://asg.andrew.cmu.edu/archive/message.php?mailbox=archive.cyrus-sasl&msg=10104
      
      When we got VIR_NET_SASL_COMPLETE after virNetSASLSessionClientStart() and
      if the remote also tells us that authentication is complete, then we should
      end the authentication procedure rather than forcing a call to
      virNetSASLSessionClientStep(). Without this patch, when trying to use SASL
      PLAIN, I get:
      error :authentication failed : Failed to step SASL negotiation: -1
      (SASL(-1): generic failure: Unable to find a callback: 32775)
      
      This patch is based on a spice-gtk patch by Dietmar Maurer.
      0955025b
    • C
      Fix invalid read in virNetSASLSessionClientStep debug log · 986900a5
      Christophe Fergeau 提交于
      virNetSASLSessionClientStep logs the data that is going to be passed to
      sasl_client_step as input data. However, it tries to log it as a string,
      while there is no guarantee that this data is going to be nul-terminated.
      This leads to this valgrind log:
      
      ==20938== Invalid read of size 1
      ==20938==    at 0x8BDB08F: vfprintf (vfprintf.c:1635)
      ==20938==    by 0x8C06DF2: vasprintf (vasprintf.c:62)
      ==20938==    by 0x4CCEDF9: virVasprintfInternal (virstring.c:337)
      ==20938==    by 0x4CA9516: virLogVMessage (virlog.c:842)
      ==20938==    by 0x4CA939A: virLogMessage (virlog.c:778)
      ==20938==    by 0x4E21E0D: virNetSASLSessionClientStep (virnetsaslcontext.c:458)
      ==20938==    by 0x4DE47B8: remoteAuthSASL (remote_driver.c:4136)
      ==20938==    by 0x4DE33AE: remoteAuthenticate (remote_driver.c:3635)
      ==20938==    by 0x4DDBFAA: doRemoteOpen (remote_driver.c:832)
      ==20938==    by 0x4DDC8BA: remoteConnectOpen (remote_driver.c:1027)
      ==20938==    by 0x4D8595F: do_open (libvirt.c:1239)
      ==20938==    by 0x4D863F3: virConnectOpenAuth (libvirt.c:1481)
      ==20938==    by 0x12762B: vshReconnect (virsh.c:337)
      ==20938==    by 0x12C9B0: vshInit (virsh.c:2470)
      ==20938==    by 0x12E9A5: main (virsh.c:3338)
      ==20938==  Address 0xe329ccd is 0 bytes after a block of size 141 alloc'd
      ==20938==    at 0x4A081D4: calloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
      ==20938==    by 0x8CB91B4: xdr_array (xdr_array.c:94)
      ==20938==    by 0x4E039C2: xdr_remote_auth_sasl_start_ret (remote_protocol.c:3134)
      ==20938==    by 0x4E1F8AA: virNetMessageDecodePayload (virnetmessage.c:405)
      ==20938==    by 0x4E119F5: virNetClientProgramCall (virnetclientprogram.c:377)
      ==20938==    by 0x4DF8141: callFull (remote_driver.c:5794)
      ==20938==    by 0x4DF821A: call (remote_driver.c:5816)
      ==20938==    by 0x4DE46CF: remoteAuthSASL (remote_driver.c:4112)
      ==20938==    by 0x4DE33AE: remoteAuthenticate (remote_driver.c:3635)
      ==20938==    by 0x4DDBFAA: doRemoteOpen (remote_driver.c:832)
      ==20938==    by 0x4DDC8BA: remoteConnectOpen (remote_driver.c:1027)
      ==20938==    by 0x4D8595F: do_open (libvirt.c:1239)
      ==20938==    by 0x4D863F3: virConnectOpenAuth (libvirt.c:1481)
      ==20938==    by 0x12762B: vshReconnect (virsh.c:337)
      ==20938==    by 0x12C9B0: vshInit (virsh.c:2470)
      ==20938==    by 0x12E9A5: main (virsh.c:3338)
      986900a5
    • C
      Tie SASL callbacks lifecycle to virNetSessionSASLContext · 13fdc6d6
      Christophe Fergeau 提交于
      The array of sasl_callback_t callbacks which is passed to sasl_client_new()
      must be kept alive as long as the created sasl_conn_t object is alive as
      cyrus-sasl uses this structure internally for things like logging, so
      the memory used for callbacks must only be freed after sasl_dispose() has
      been called.
      
      During testing of successful SASL logins with
      virsh -c qemu+tls:///system list --all
      I've been getting invalid read reports from valgrind
      
      ==9237== Invalid read of size 8
      ==9237==    at 0x6E93B6F: _sasl_getcallback (common.c:1745)
      ==9237==    by 0x6E95430: _sasl_log (common.c:1850)
      ==9237==    by 0x16593D87: digestmd5_client_mech_dispose (digestmd5.c:4580)
      ==9237==    by 0x6E91653: client_dispose (client.c:332)
      ==9237==    by 0x6E9476A: sasl_dispose (common.c:851)
      ==9237==    by 0x4E225A1: virNetSASLSessionDispose (virnetsaslcontext.c:678)
      ==9237==    by 0x4CBC551: virObjectUnref (virobject.c:262)
      ==9237==    by 0x4E254D1: virNetSocketDispose (virnetsocket.c:1042)
      ==9237==    by 0x4CBC551: virObjectUnref (virobject.c:262)
      ==9237==    by 0x4E2701C: virNetSocketEventFree (virnetsocket.c:1794)
      ==9237==    by 0x4C965D3: virEventPollCleanupHandles (vireventpoll.c:583)
      ==9237==    by 0x4C96987: virEventPollRunOnce (vireventpoll.c:652)
      ==9237==    by 0x4C94730: virEventRunDefaultImpl (virevent.c:274)
      ==9237==    by 0x12C7BA: vshEventLoop (virsh.c:2407)
      ==9237==    by 0x4CD3D04: virThreadHelper (virthreadpthread.c:161)
      ==9237==    by 0x7DAEF32: start_thread (pthread_create.c:309)
      ==9237==    by 0x8C86EAC: clone (clone.S:111)
      ==9237==  Address 0xe2d61b0 is 0 bytes inside a block of size 168 free'd
      ==9237==    at 0x4A07577: free (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
      ==9237==    by 0x4C73827: virFree (viralloc.c:580)
      ==9237==    by 0x4DE4BC7: remoteAuthSASL (remote_driver.c:4219)
      ==9237==    by 0x4DE33D0: remoteAuthenticate (remote_driver.c:3639)
      ==9237==    by 0x4DDBFAA: doRemoteOpen (remote_driver.c:832)
      ==9237==    by 0x4DDC8DC: remoteConnectOpen (remote_driver.c:1031)
      ==9237==    by 0x4D8595F: do_open (libvirt.c:1239)
      ==9237==    by 0x4D863F3: virConnectOpenAuth (libvirt.c:1481)
      ==9237==    by 0x12762B: vshReconnect (virsh.c:337)
      ==9237==    by 0x12C9B0: vshInit (virsh.c:2470)
      ==9237==    by 0x12E9A5: main (virsh.c:3338)
      
      This commit changes virNetSASLSessionNewClient() to take ownership of the SASL
      callbacks. Then we can free them in virNetSASLSessionDispose() after the corresponding
      sasl_conn_t has been freed.
      13fdc6d6
    • C
      remote: Don't leak priv->tls object on connection failure · c7cdc9b0
      Christophe Fergeau 提交于
      When testing SASL authentication over TLS with
      virsh -c qemu+tls:///system list --all
      I got this valgrind trace after entering wrong credentials:
      
      ==30540== 26,903 (88 direct, 26,815 indirect) bytes in 1 blocks are definitely lost in loss record 289 of 293
      ==30540==    at 0x4A081D4: calloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
      ==30540==    by 0x4C7379A: virAllocVar (viralloc.c:558)
      ==30540==    by 0x4CBC178: virObjectNew (virobject.c:190)
      ==30540==    by 0x4CBC329: virObjectLockableNew (virobject.c:216)
      ==30540==    by 0x4E2D003: virNetTLSContextNew (virnettlscontext.c:719)
      ==30540==    by 0x4E2DC3F: virNetTLSContextNewPath (virnettlscontext.c:930)
      ==30540==    by 0x4E2DD5B: virNetTLSContextNewClientPath (virnettlscontext.c:957)
      ==30540==    by 0x4DDB618: doRemoteOpen (remote_driver.c:627)
      ==30540==    by 0x4DDC8BA: remoteConnectOpen (remote_driver.c:1031)
      ==30540==    by 0x4D8595F: do_open (libvirt.c:1239)
      ==30540==    by 0x4D863F3: virConnectOpenAuth (libvirt.c:1481)
      ==30540==    by 0x12762B: vshReconnect (virsh.c:337)
      ==30540==    by 0x12C9B0: vshInit (virsh.c:2470)
      ==30540==    by 0x12E9A5: main (virsh.c:3338)
      c7cdc9b0
    • Y
      Fix three minor typos · 73a03e30
      Yuri Chornoivan 提交于
      73a03e30
    • E
      storage: fix typo in previous patch · 053f45f8
      Eric Blake 提交于
      You'd think I'd learn to actually COMMIT my working tree
      between testing that a last-minute fix compiles and pushing.
      
      * src/storage/storage_backend_gluster.c
      (virStorageBackendGlusterRefreshVol): Typo fix.
      Signed-off-by: NEric Blake <eblake@redhat.com>
      053f45f8
    • E
      storage: probe qcow2 volumes in gluster pool · 14daa812
      Eric Blake 提交于
      Putting together pieces from previous patches, it is now possible
      for 'virsh vol-dumpxml --pool gluster volname' to report metadata
      about a qcow2 file stored on gluster.  The backing file is still
      treated as raw; to fix that, more patches are needed to make the
      storage backing chain analysis recursive rather than halting at
      a network protocol name, but that work will not need any further
      calls into libgfapi so much as just reusing this code, and that
      should be the only code outside of the storage driver that needs
      any help from libgfapi.  Any additional use of libgfapi within
      libvirt should only be needed for implementing storage pool APIs
      such as volume creation or resizing, where backing chain analysis
      should be unaffected.
      
      * src/storage/storage_backend_gluster.c
      (virStorageBackendGlusterReadHeader): New helper function.
      (virStorageBackendGlusterRefreshVol): Probe non-raw files.
      Signed-off-by: NEric Blake <eblake@redhat.com>
      14daa812
    • E
      storage: improve handling of symlinks in gluster · 79eb21f9
      Eric Blake 提交于
      With this patch, dangling and looping symlinks are silently
      ignored, while links to files and directories are treated the
      same as the underlying file or directory.  This is the same
      behavior as both 'directory' and 'netfs' pools.
      
      * src/storage/storage_backend_gluster.c
      (virStorageBackendGlusterRefreshVol): Treat symlinks similar to
      directory and netfs pools.
      Signed-off-by: NEric Blake <eblake@redhat.com>
      79eb21f9
    • E
      storage: improve allocation stats reported on gluster files · 13e738cc
      Eric Blake 提交于
      We already had code for handling allocation different than
      capacity for sparse files; we just had to wire it up to be
      used when inspecting gluster images.
      
      * src/storage/storage_backend.c
      (virStorageBackendUpdateVolTargetInfoFD): Handle no fd.
      * src/storage/storage_backend_gluster.c
      (virStorageBackendGlusterRefreshVol): Handle sparse files.
      Signed-off-by: NEric Blake <eblake@redhat.com>
      13e738cc
    • E
      storage: improve directory support in gluster pool · 1458b2e9
      Eric Blake 提交于
      Take advantage of the previous patch's addition of 'netdir' as
      a distinct volume type, to expose rather than silently skip
      directories embedded in a gluster pool.  Also serves as an XML
      validation for the previous patch.
      
      * src/storage/storage_backend_gluster.c
      (virStorageBackendGlusterRefreshVol): Don't skip directories.
      * tests/storagevolxml2xmltest.c (mymain): Add test.
      * tests/storagevolxml2xmlin/vol-gluster-dir.xml: New file.
      * tests/storagevolxml2xmlout/vol-gluster-dir.xml: Likewise.
      Signed-off-by: NEric Blake <eblake@redhat.com>
      1458b2e9
    • E
      storage: add network-dir as new storage volume type · ecd881b7
      Eric Blake 提交于
      In the 'directory' and 'netfs' storage pools, a user can see
      both 'file' and 'dir' storage volume types, to know when they
      can descend into a subdirectory.  But in a network-based storage
      pool, such as the upcoming 'gluster' pool, we use 'network'
      instead of 'file', and did not have any counterpart for a
      directory until this patch.  Adding a new volume type
      'network-dir' is better than reusing 'dir', because it makes
      it clear that the only way to access 'network' volumes within
      that container is through the network mounting (leaving 'dir'
      for something accessible in the local file system).
      
      * include/libvirt/libvirt.h.in (virStorageVolType): Expand enum.
      * docs/formatstorage.html.in: Document it.
      * docs/schemasa/storagevol.rng (vol): Allow new value.
      * src/conf/storage_conf.c (virStorageVol): Use new value.
      * src/qemu/qemu_command.c (qemuBuildVolumeString): Fix client.
      * src/qemu/qemu_conf.c (qemuTranslateDiskSourcePool): Likewise.
      * tools/virsh-volume.c (vshVolumeTypeToString): Likewise.
      * src/storage/storage_backend_fs.c
      (virStorageBackendFileSystemVolDelete): Likewise.
      Signed-off-by: NEric Blake <eblake@redhat.com>
      ecd881b7
    • E
      storage: implement rudimentary glusterfs pool refresh · efee1af5
      Eric Blake 提交于
      Actually put gfapi to use, by allowing the creation of a gluster
      pool.  Right now, all volumes are treated as raw and directories
      are skipped; further patches will allow peering into files to
      allow for qcow2 files and backing chains, and reporting proper
      volume allocation.  This implementation was tested against Fedora
      19's glusterfs 3.4.1; it might be made simpler by requiring a
      higher minimum, and/or require more hacks to work with a lower
      minimum.
      
      * src/storage/storage_backend_gluster.c
      (virStorageBackendGlusterRefreshPool): Initial implementation.
      (virStorageBackendGlusterOpen, virStorageBackendGlusterClose)
      (virStorageBackendGlusterRefreshVol): New helper functions.
      Signed-off-by: NEric Blake <eblake@redhat.com>
      efee1af5
    • E
      storage: document gluster pool · ed5fa7f3
      Eric Blake 提交于
      Add support for a new <pool type='gluster'>, similar to
      RBD and Sheepdog.  Terminology wise, a gluster volume
      forms a libvirt storage pool, within the gluster volume,
      individual files are treated as libvirt storage volumes.
      
      * docs/schemas/storagepool.rng (poolgluster): New pool type.
      * docs/formatstorage.html.in: Document gluster.
      * docs/storage.html.in: Likewise, and contrast it with netfs.
      * tests/storagepoolxml2xmlin/pool-gluster.xml: New test.
      * tests/storagepoolxml2xmlout/pool-gluster.xml: Likewise.
      * tests/storagepoolxml2xmltest.c (mymain): Likewise.
      Signed-off-by: NEric Blake <eblake@redhat.com>
      ed5fa7f3
    • E
      storage: initial support for linking with libgfapi · 318ea3cb
      Eric Blake 提交于
      We support gluster volumes in domain XML, so we also ought to
      support them as a storage pool.  Besides, a future patch will
      want to take advantage of libgfapi to handle the case of a
      gluster device holding qcow2 rather than raw storage, and for
      that to work, we need a storage backend that can read gluster
      storage volume contents.  This sets up the framework.
      
      Note that the new pool is named 'gluster' to match a
      <disk type='network'><source protocol='gluster'> image source
      already supported in a <domain>; it does NOT match the
      <pool type='netfs'><source><target type='glusterfs'>,
      since that uses a FUSE mount to a local file name rather than
      a network name.
      
      This and subsequent patches have been tested against glusterfs
      3.4.1 (available on Fedora 19); there are likely bugs in older
      versions that may prevent decent use of gfapi, so this patch
      enforces the minimum version tested.  A future patch may lower
      the minimum.  On the other hand, I hit at least two bugs in
      3.4.1 that will be fixed in 3.5/3.4.2, where it might be worth
      raising the minimum: glfs_readdir is nicer to use than
      glfs_readdir_r [1], and glfs_fini should only return failure on
      an actual failure [2].
      
      [1] http://lists.gnu.org/archive/html/gluster-devel/2013-10/msg00085.html
      [2] http://lists.gnu.org/archive/html/gluster-devel/2013-10/msg00086.html
      
      * configure.ac (WITH_STORAGE_GLUSTER): New conditional.
      * m4/virt-gluster.m4: new file.
      * libvirt.spec.in (BuildRequires): Support gluster in spec file.
      * src/conf/storage_conf.h (VIR_STORAGE_POOL_GLUSTER): New pool
      type.
      * src/conf/storage_conf.c (poolTypeInfo): Treat similar to
      sheepdog and rbd.
      (virStoragePoolDefFormat): Don't output target for gluster.
      * src/storage/storage_backend_gluster.h: New file.
      * src/storage/storage_backend_gluster.c: Likewise.
      * po/POTFILES.in: Add new file.
      * src/storage/storage_backend.c (backends): Register new type.
      * src/Makefile.am (STORAGE_DRIVER_GLUSTER_SOURCES): Build new files.
      * src/storage/storage_backend.h (_virStorageBackend): Documet
      assumption.
      Signed-off-by: NEric Blake <eblake@redhat.com>
      318ea3cb
    • E
      storage: expose volume meta-type in XML · 1b5c8d4c
      Eric Blake 提交于
      I got annoyed at having to use both 'virsh vol-list $pool --details'
      AND 'virsh vol-dumpxml $vol $pool' to learn if I had populated
      the volume correctly.  Since two-thirds of the data present in
      virStorageVolGetInfo() already appears in virStorageVolGetXMLDesc(),
      this just adds the remaining piece of information, as:
      
      <volume type='...'>
        ...
      </volume>
      
      * docs/formatstorage.html.in: Document new <volume type=...>.
      * docs/schemas/storagevol.rng (vol): Add it to RelaxNG.
      * src/conf/storage_conf.h (virStorageVolTypeToString): Declare.
      * src/conf/storage_conf.c (virStorageVolTargetDefFormat): Output
      the metatype.
      (virStorageVolDefParseXML): Parse it, for unit tests.
      * tests/storagevolxml2xmlout/vol-*.xml: Update tests to match.
      Signed-off-by: NEric Blake <eblake@redhat.com>
      1b5c8d4c
    • D
      Remove obsolete 'tests' makefile target · 4d52b465
      Daniel P. Berrange 提交于
      The 'docs/examples' code was long ago removed and now the
      python code was gone too, the custom 'tests' makefile target
      serves no purpose
      Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
      4d52b465
    • D
      Remove python binding · a7a1244a
      Daniel P. Berrange 提交于
      The python binding now lives in
      
        http://libvirt.org/git/?p=libvirt-python.git
      
      that repo also provides an RPM which is upgrade compatible
      with the old libvirt-python sub-RPM.
      Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
      a7a1244a
  6. 25 11月, 2013 4 次提交