From patchwork Thu Jan 19 14:58:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 644089 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp257056pvb; Thu, 19 Jan 2023 07:00:08 -0800 (PST) X-Google-Smtp-Source: AMrXdXvcwxhcACAWbGHFEs32FChL0kL2msOwNb+1Hcrqthad8Szd46zAPB7LzFmdMU/x6YoYAQV6 X-Received: by 2002:a0c:ea84:0:b0:534:ec57:5aa4 with SMTP id d4-20020a0cea84000000b00534ec575aa4mr14874688qvp.42.1674140408215; Thu, 19 Jan 2023 07:00:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674140408; cv=none; d=google.com; s=arc-20160816; b=QAR7I/rjFrHsC14UtYD9zksywkFtsKhpkRItJkEpsbJlWqKI2KMv9lnQtU+NsOfJvr aKkAdPJrWX3XNhdYgvXCDI1fAkSxEp6sLrcktHZL2zYZmBEILY8pFEiezease6drrTWp rs/2H0LO8EEzi92osU7wgJaYdCBvDAcyJfhGXoJSwgH8oV2Z3p2kBdWGpn/LgXUH9v0V iOfGL23FrUgmnNFHrTsagVw9toh2recmXagfWqMy9MpbnIutP03V+rba/3kWEVr+TBe1 Fl5/j2YAw9+AIkmq0IOiCDYKHt9Uhqbpn7ZR1jymecC+DkKkbHB2m8pWI9oaiEZx+M7m 8uxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=PHvSg/mQjdmpWjiVzZNybtfs6HzFLrJQQgtlLJ8QVaM=; b=CDvwW0LmUrf4jfGOpS3ShLCRn1cLJgBNbenhIs9AjONo1o7Tgf3fS30THlyNX5e6XN p6e0RaVr9alBaaqfHmCqjhQjNEdu0DaHw7oUXIxTGmialI2RKiV3KsZ39yiorJDSCkJf uABG6xbDdmff7k7Fjno40pbbG0UJLFHERqw4aN7lbpEJwiD7XLaH3TvpLHZVuXUNoO8o eD2lDl1mzKex4zYe1jsuf2PCNbU4aiMMgU2RWniuPUA2IFnmQfaWhDJ9I2FMWe+/N8l1 4ELOHVvua10gU3+JdvNaxdf2puMKHu1MfZ/1hub7ZiQBloPXNgKHa5nEM0kFTHNcnHFl mlpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=grtJredg; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id m4-20020a05620a290400b0070695fa0625si6346060qkp.501.2023.01.19.07.00.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Jan 2023 07:00:08 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=grtJredg; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pIWOA-0007so-9k; Thu, 19 Jan 2023 09:59:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pIWO7-0007pu-VG for qemu-devel@nongnu.org; Thu, 19 Jan 2023 09:59:35 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pIWO6-0003fo-DC for qemu-devel@nongnu.org; Thu, 19 Jan 2023 09:59:35 -0500 Received: by mail-wr1-x432.google.com with SMTP id r30so2125193wrr.10 for ; Thu, 19 Jan 2023 06:59:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PHvSg/mQjdmpWjiVzZNybtfs6HzFLrJQQgtlLJ8QVaM=; b=grtJredguK6Odurr8v7Nd4MFu1fynCqzad4KflFqBvCOvKX+FXGkUunlfMNyIT4oFH z16/A0Uny8/UNv/i6+UzFR38ZVcxLJm+VQ744tmpB1GFODIms2l9/odSdjaEp6g1rCAT XmlumW/NeuNl9QFTab9UKA3c4fWgpiEGg5laOQCB2BQ129FW7fnLQbpZJwqpL69XK27j kltJG7DG+qeDQKxf0NRoS5iOzpw387teTPKoc9NApqEw6Zey5WHbi5qJDtNoTEGxaJJ3 yLyrxYYRjrnWuRAoxG+T+eWlp40CeRadvvxp39lGkM+VWDOChkTJyYfKsROvpm+1jI0S iCjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PHvSg/mQjdmpWjiVzZNybtfs6HzFLrJQQgtlLJ8QVaM=; b=DApxLANFUUEjqcRXrdXROuOFUCQKFSaOqfes28TPda9jTfDaDLdA9rlEDZszaFUYUa DKPEOb7A0+eLT9yPr5IBr00jLNV87qoKSxXH7AN58omrbZn3o87OBGfLYSFWhWc76KYL 80qOXP2vKUeoS88rpW0EM73dMvPi953i7/lBzaQXka3ty3CvAcH7ua+n2JlVY5IHzmNS Clu6Jm4cry0YIPcIBuaf3q83CoC8eHbevHYEuRoDrLjqXgjZ8QPhDhS1wqLwpWb6lFH1 SFf5vv6i3htSQfgQ0vxhdZfYxUDbw8LmmdVHX2G9M2JCTnWV3f/4adZYMNzguvDkBONd Nq6g== X-Gm-Message-State: AFqh2komyA6wf5VCG0kSJj4Jk8cRygvElkGlU2L2XIf2we/jtY4vU8Hy kZGYm/u3qc+SyFepVmBLwB6jEifzjQui6yb6 X-Received: by 2002:adf:dbc6:0:b0:2be:12a8:9f75 with SMTP id e6-20020adfdbc6000000b002be12a89f75mr8304705wrj.55.1674140372843; Thu, 19 Jan 2023 06:59:32 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id m15-20020adffe4f000000b002bdd155ca4dsm19683640wrs.48.2023.01.19.06.59.24 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 19 Jan 2023 06:59:32 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Juan Quintela , Laurent Vivier , Paolo Bonzini , "Dr. David Alan Gilbert" , qemu-arm@nongnu.org, Fabiano Rosas , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 09/11] tests/qtest/migration-test: Build command line using GString API (3/4) Date: Thu, 19 Jan 2023 15:58:36 +0100 Message-Id: <20230119145838.41835-10-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230119145838.41835-1-philmd@linaro.org> References: <20230119145838.41835-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=philmd@linaro.org; helo=mail-wr1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Part 3/4: Convert accelerator options. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- tests/qtest/migration-test.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index 8377b3976a..015b774a9e 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -603,6 +603,9 @@ static int test_migrate_start(QTestState **from, QTestState **to, got_stop = false; cmd_common = g_string_new(""); + g_string_append_printf(cmd_common, "-accel kvm%s ", + args->use_dirty_ring ? ",dirty-ring-size=4096" : ""); + g_string_append(cmd_common, "-accel tcg "); bootpath = g_strdup_printf("%s/bootsect", tmpfs); if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) { @@ -678,25 +681,21 @@ static int test_migrate_start(QTestState **from, QTestState **to, if (!args->only_target) { g_autofree gchar *cmd_source = NULL; - cmd_source = g_strdup_printf("-accel kvm%s -accel tcg%s " + cmd_source = g_strdup_printf("%s " "-name source,debug-threads=on " "-serial file:%s/src_serial " "%s %s %s", - args->use_dirty_ring ? - ",dirty-ring-size=4096" : "", cmd_common->str, tmpfs, arch_source, args->opts_source ? args->opts_source : "", ignore_stderr); *from = qtest_init(cmd_source); } - cmd_target = g_strdup_printf("-accel kvm%s -accel tcg%s " + cmd_target = g_strdup_printf("%s " "-name target,debug-threads=on " "-serial file:%s/dest_serial " "-incoming %s " "%s %s %s", - args->use_dirty_ring ? - ",dirty-ring-size=4096" : "", cmd_common->str, tmpfs, uri, arch_target, args->opts_target ? args->opts_target : "", ignore_stderr);