Author: aschnell Date: Tue Aug 5 12:13:25 2008 New Revision: 49687 URL: http://svn.opensuse.org/viewcvs/yast?rev=49687&view=rev Log: - removed EVMS functions from StorageInterface.h Modified: trunk/storage/VERSION trunk/storage/libstorage/src/StorageInterface.h trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=49687&r1=49686&r2=49687&view=diff ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Tue Aug 5 12:13:25 2008 @@ -1 +1 @@ -2.17.10 +2.17.11 Modified: trunk/storage/libstorage/src/StorageInterface.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageInterface.h?rev=49687&r1=49686&r2=49687&view=diff ============================================================================== --- trunk/storage/libstorage/src/StorageInterface.h (original) +++ trunk/storage/libstorage/src/StorageInterface.h Tue Aug 5 12:13:25 2008 @@ -773,26 +773,6 @@ LvmVgInfo& info) = 0; /** - * Query container info for a EVMS container - * - * @param name name of container, e.g. lvm2/system - * @param info record that gets filled with EVMS Container special data - * @return zero if all is ok, a negative number to indicate an error - */ - virtual int getEvmsCoInfo( const string& name, EvmsCoInfo& info) = 0; - - /** - * Query container info for a EVMS container - * - * @param name name of container, e.g. lvm2/system - * @param cinfo record that gets filled with container general data - * @param info record that gets filled with EVMS Container special data - * @return zero if all is ok, a negative number to indicate an error - */ - virtual int getContEvmsCoInfo( const string& name, ContainerInfo& cinfo, - EvmsCoInfo& info) = 0; - - /** * Query container info for a DMRAID container * * @param name name of container, e.g. pdc_ccaihgii @@ -849,16 +829,6 @@ deque<LvmLvInfo>& plist ) = 0; /** - * Query infos for EVMS volumes of a EVMS container - * - * @param name name of volume group, e.g. lvm2/system - * @param plist list of records that get filled with EVMS specific info - * @return zero if all is ok, a negative number to indicate an error - */ - virtual int getEvmsInfo( const string& name, - deque<EvmsInfo>& plist ) = 0; - - /** * Query infos for software raid devices in system * * @param plist list of records that get filled with MD specific info @@ -1592,137 +1562,6 @@ unsigned long long stripeSize ) = 0; /** - * Create a EVMS container - * - * @param name name of container, must not contain blanks, colons - * and shell special characters (e.g. system) - * @param peSizeK physical extent size in kilobytes - * @param lvm1 flag if lvm1 compatible format should be used - * @param devs list with physical devices to add to that volume group - * @return zero if all is ok, a negative number to indicate an error - */ - virtual int createEvmsContainer( const string& name, - unsigned long long peSizeK, bool lvm1, - const deque<string>& devs ) = 0; - - /** - * Modify a EVMS container. - * This function can only be used between the creation of a - * EVMS container and the next call to commit(). Containers that - * are already written to disk cannot have these properties changed. - * - * @param old_name name of container, must not contain blanks, colons - * and shell special characters (e.g. system) - * @param new_name new name of container, same restrictions as for - * first parameter - * @param peSizeK physical extent size in kilobytes - * @param lvm1 flag if lvm1 compatible format should be used - * @return zero if all is ok, a negative number to indicate an error - */ - virtual int modifyEvmsContainer( const string& old_name, - const string& new_name, - unsigned long long peSizeK, - bool lvm1 ) = 0; - - /** - * Remove a EVMS container. If the container contains - * logical volumes, these are automatically also removed. - * - * @param name name of container - * @return zero if all is ok, a negative number to indicate an error - */ - virtual int removeEvmsContainer( const string& name ) = 0; - - /** - * Extend a EVMS container with additional physical devices - * - * @param name name of container - * @param devs list with physical devices to add to that container - * @return zero if all is ok, a negative number to indicate an error - */ - virtual int extendEvmsContainer( const string& name, - const deque<string>& devs ) = 0; - - /** - * Shrink a EVMS container - * - * @param name name of container - * @param devs list with physical devices to remove from that container - * @return zero if all is ok, a negative number to indicate an error - */ - virtual int shrinkEvmsContainer( const string& name, - const deque<string>& devs ) = 0; - - /** - * Create a EVMS volume within a EVMS container - * - * @param coname of container - * @param name of volume - * @param size size of volume in megabytes - * @param stripe stripe count of volume (use 1 unless you know - * exactly what you are doing) - * @param device is set to the device name of the new volume - * @return zero if all is ok, a negative number to indicate an error - */ - virtual int createEvmsVolume( const string& coname, const string& name, - unsigned long long sizeM, unsigned stripe, - string& device ) = 0; - - /** - * Remove a EVMS volume - * - * @param device name of EVMS volume - * @return zero if all is ok, a negative number to indicate an error - */ - virtual int removeEvmsVolumeByDevice( const string& device ) = 0; - - /** - * Remove a EVMS volume from a EVMS container - * - * @param coname name of container - * @param name name of volume - * @return zero if all is ok, a negative number to indicate an error - */ - virtual int removeEvmsVolume( const string& coname, const string& name ) = 0; - - /** - * Change strip count of a EVMS volume. - * This can only be before the volume is created on disk. - * - * @param coname name of EVMS container - * @param name of volume - * @param stripe new stripe count of volume - * @return zero if all is ok, a negative number to indicate an error - */ - virtual int changeEvmsStripeCount( const string& coname, - const string& name, - unsigned long stripe ) = 0; - - /** - * Change strip size of a EVMS volume. - * This can only be before the volume is created on disk. - * - * @param coname name of EVMS container - * @param name of volume - * @param stripeSize new stripe size of volume - * @return zero if all is ok, a negative number to indicate an error - */ - virtual int changeEvmsStripeSize( const string& coname, - const string& name, - unsigned long long stripeSize ) = 0; - - /** - * Activate EVMS devices on the system. - * This is only necessary on systems where EVMS is not activated - * during system startup. This command is executed immediately, - * there is no need for a call to commit(). - * - * @param force flag if activation should be forced - * @return zero if all is ok, a negative number to indicate an error - */ - virtual int evmsActivate( bool force ) = 0; - - /** * Determine the device name of the next created software raid device * * @param nr is set to the number of the next created software raid device @@ -2184,23 +2023,7 @@ virtual bool readFstab( const string& dir, deque<VolumeInfo>& infos) = 0; /** - * Possibility to switch Evms handling off or on in libstorage. - * This function must be called prior to libstorage initialisation. - * Default is on. - * - * @param val determines if Evms is switched off or on - */ - virtual void setNoEvms( bool val ) = 0; - - /** - * Returns the state of Evms handling in libstorage. - * - * @param val determines if Evms is switched off or on - */ - virtual bool getNoEvms() = 0; - - /** - * Activate or deactivate higher level devices as MD,LVM,DM,EVMS + * Activate or deactivate higher level devices as MD, LVM, DM * * @param val flag if devices should be activated or deactivated * @return bool if values could be successfully determined @@ -2210,7 +2033,7 @@ /** * Rescan all disks. * All currently detected objects are forgotten and a new scan - * for all type of objects (disks, LVM, EVMS, MD) is initiated. + * for all type of objects (disks, LVM, MD) is initiated. * This function makes sense to be called after something outside * of libstorage changed disk layout or created storage objects. * Any changes already cached are lost. Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=49687&r1=49686&r2=49687&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Tue Aug 5 12:13:25 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Aug 05 12:07:10 CEST 2008 - aschnell@suse.de + +- removed EVMS functions from StorageInterface.h +- version 2.17.11 + +------------------------------------------------------------------- Mon Aug 04 15:00:26 CEST 2008 - aschnell@suse.de - changed default mount-by to path on s390 (fate #303557) Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Storage.ycp?rev=49687&r1=49686&r2=49687&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Tue Aug 5 12:13:25 2008 @@ -3010,12 +3010,7 @@ global boolean DeleteEvmsCo( string name ) { - y2milestone( "DeleteEvmsCo name:%1", name ); - integer ret = LibStorage::StorageInterface::removeEvmsContainer( sint, name ); - if( ret<0 ) - y2error( "DeleteEvmsCo sint ret:%1", ret ); - UpdateTargetMap(); - return( ret==0 ); + return false; } global string EvmsShortName( string lname ) @@ -3028,13 +3023,7 @@ global boolean ActivateEvms() { - integer ret = 0; - y2milestone( "Mode:%1", Mode::mode() ); - ret = LibStorage::StorageInterface::evmsActivate( sint, Mode::update() ); - if( ret<0 ) - y2error( "activateEvms sint ret:%1", ret ); - UpdateTargetMap(); - return( ret==0 ); + return false; } global list EvmsTrivialMaps( map tgMap ) @@ -3049,116 +3038,41 @@ global boolean CreateEvmsCo( string name, integer pesize, boolean lvm2 ) { - y2milestone( "CreateEvmsCo name:%1 pesize:%2 lvm2:%3", name, pesize, lvm2 ); - string sname = EvmsShortName( name ); - y2milestone( "CreateEvmsCo sname:%1", sname ); - list<string> devs = []; - integer ret = 0; - ret = LibStorage::StorageInterface::createEvmsContainer( sint, sname, - pesize/1024, - !lvm2, devs ); - if( ret<0 ) - y2error( "CreateEvmsCo sint ret:%1", ret ); - UpdateTargetMap(); - return( ret==0 ); + return false; } global boolean ModifyEvmsCo( string old_name, string new_name, integer pesize, boolean lvm2 ) { - y2milestone( "ModifyEvmsCo old name:%1 new name:%2 pesize:%3 lvm2:%4", - old_name, new_name, pesize, lvm2 ); - string sname = EvmsShortName( old_name ); - y2milestone( "CreateEvmsCo sname:%1", sname ); - list<string> devs = []; - integer ret = 0; - ret = LibStorage::StorageInterface::modifyEvmsContainer( sint, sname, - new_name, - pesize/1024, - !lvm2 ); - if( ret<0 ) - y2error( "ModifyEvmsCo sint ret:%1", ret ); - UpdateTargetMap(); - return( ret==0 ); + return false; } global boolean ExtendEvmsCo( string name, string device ) { - y2milestone( "ExtendEvmsCo name:%1 device:%2", name, device ); - integer ret = 0; - string sname = EvmsShortName( name ); - y2milestone( "ExtendEvmsCo sname:%1", sname ); - list<string> devs = [ device ]; - ret = LibStorage::StorageInterface::extendEvmsContainer( sint, sname, - devs ); - if( ret<0 ) - y2error( "ExtendEvmsCo sint ret:%1", ret ); - UpdateTargetMap(); - return( ret==0 ); + return false; } global boolean ReduceEvmsCo( string name, string device ) { - y2milestone( "ReduceEvmsCo name:%1 device:%2", name, device ); - integer ret = 0; - string sname = EvmsShortName( name ); - y2milestone( "ReduceEvmsCo sname:%1", sname ); - list<string> devs = [ device ]; - ret = LibStorage::StorageInterface::shrinkEvmsContainer( sint, sname, - devs ); - if( ret<0 ) - y2error( "ReduceEvmsCo sint ret:%1", ret ); - UpdateTargetMap(); - return( ret==0 ); + return false; } global boolean CreateEvmsVolume( string coname, string lvname, integer sizeK, integer stripe ) { - y2milestone( "CreateEvmsVolume vg:%1 name:%2 sizeK:%3 stripe:%4", coname, - lvname, sizeK, stripe ); - integer ret = 0; - string dummy = ""; - string sname = EvmsShortName( coname ); - y2milestone( "CreateEvmsVolume sname:%1", sname ); - ret = LibStorage::StorageInterface::createEvmsVolume( sint, sname, lvname, - (sizeK+1023)/1024, - stripe, dummy ); - if( ret<0 ) - y2error( "CreateEvmsVolume sint ret:%1", ret ); - UpdateTargetMapDisk( "/dev/evms/"+coname ); - return( ret==0 ); + return false; } global boolean ChangeEvmsStripeCount( string coname, string name, integer stripe ) { - y2milestone( "ChangeEvmsStripeCount co:%1 name:%2 stripe:%3", coname, - name, stripe ); - integer ret = 0; - string dummy = ""; - ret = LibStorage::StorageInterface::changeEvmsStripeCount( sint, coname, - name, stripe ); - if( ret<0 ) - y2error( "ChangeEvmsStripeCount sint ret:%1", ret ); - UpdateTargetMapDisk( "/dev/evms/"+coname ); - return( ret==0 ); + return false; } global boolean ChangeEvmsStripeSize( string coname, string name, integer stripeSize ) { - y2milestone( "ChangeEvmsStripeSize co:%1 name:%2 stripeSize:%3", coname, - name, stripeSize ); - integer ret = 0; - string dummy = ""; - ret = LibStorage::StorageInterface::changeEvmsStripeSize( sint, coname, - name, - stripeSize ); - if( ret<0 ) - y2error( "ChangeEvmsStripeSize sint ret:%1", ret ); - UpdateTargetMapDisk( "/dev/evms/"+coname ); - return( ret==0 ); + return false; } global boolean AddNfsVolume( string nfsdev, string opts, integer sz, string mp ) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org