Commit 8e0adf64 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging 



# gpg: Signature made Fri 14 Aug 2015 15:41:14 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"

* remotes/stefanha/tags/block-pull-request:
  throttle: add throttle_max_is_missing_limit() test
  throttle: refuse bps_max/iops_max without bps/iops

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents be1f13ac 92e11a17

blockdev.c

+6 −0
Original line number Diff line number Diff line
@@ -337,6 +337,12 @@ static bool check_throttle_config(ThrottleConfig *cfg, Error **errp) 
        return false;

    }



    if (throttle_max_is_missing_limit(cfg)) {

        error_setg(errp, "bps_max/iops_max require corresponding"

                         " bps/iops values");

        return false;

    }



    return true;

}

include/qemu/throttle.h

+2 −0
Original line number Diff line number Diff line
@@ -114,6 +114,8 @@ bool throttle_conflicting(ThrottleConfig *cfg); 


bool throttle_is_valid(ThrottleConfig *cfg);



bool throttle_max_is_missing_limit(ThrottleConfig *cfg);



void throttle_config(ThrottleState *ts,

                     ThrottleTimers *tt,

                     ThrottleConfig *cfg);

tests/test-throttle.c

+21 −0
Original line number Diff line number Diff line
@@ -329,6 +329,26 @@ static void test_is_valid(void) 
    test_is_valid_for_value(1, true);

}



static void test_max_is_missing_limit(void)

{

    int i;



    for (i = 0; i < BUCKETS_COUNT; i++) {

        memset(&cfg, 0, sizeof(cfg));

        cfg.buckets[i].max = 100;

        cfg.buckets[i].avg = 0;

        g_assert(throttle_max_is_missing_limit(&cfg));



        cfg.buckets[i].max = 0;

        cfg.buckets[i].avg = 0;

        g_assert(!throttle_max_is_missing_limit(&cfg));



        cfg.buckets[i].max = 0;

        cfg.buckets[i].avg = 100;

        g_assert(!throttle_max_is_missing_limit(&cfg));

    }

}



static void test_have_timer(void)

{

    /* zero structures */
@@ -591,6 +611,7 @@ int main(int argc, char **argv) 
    g_test_add_func("/throttle/config/enabled",     test_enabled);

    g_test_add_func("/throttle/config/conflicting", test_conflicting_config);

    g_test_add_func("/throttle/config/is_valid",    test_is_valid);

    g_test_add_func("/throttle/config/max",         test_max_is_missing_limit);

    g_test_add_func("/throttle/config_functions",   test_config_functions);

    g_test_add_func("/throttle/accounting",         test_accounting);

    g_test_add_func("/throttle/groups",             test_groups);

util/throttle.c

+15 −0
Original line number Diff line number Diff line
@@ -300,6 +300,21 @@ bool throttle_is_valid(ThrottleConfig *cfg) 
    return !invalid;

}



/* check if bps_max/iops_max is used without bps/iops

 * @cfg: the throttling configuration to inspect

 */

bool throttle_max_is_missing_limit(ThrottleConfig *cfg)

{

    int i;



    for (i = 0; i < BUCKETS_COUNT; i++) {

        if (cfg->buckets[i].max && !cfg->buckets[i].avg) {

            return true;

        }

    }

    return false;

}



/* fix bucket parameters */

static void throttle_fix_bucket(LeakyBucket *bkt)

{