From patchwork Fri Jun 21 15:08:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 3629 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 21 Jun 2024 17:08:38 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f60.google.com (mail-lf1-f60.google.com [209.85.167.60]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 45LF8bFU006232 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 21 Jun 2024 17:08:38 +0200 Received: by mail-lf1-f60.google.com with SMTP id 2adb3069b0e04-52c97141df8sf1544509e87.3 for ; Fri, 21 Jun 2024 08:08:38 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1718982510; cv=pass; d=google.com; s=arc-20160816; b=Q8+QNGLVW+PmRbRjJGk1dx1Hn5gddaiU/IMeMzeMIvjMqlxqq4EYZ3jq9iViOQmg5J RzHn6R7ra8gqpW1LEkmKzKn/JaH7897CoxjFJIbjOTmo19Kn4Gj6jusgPiC/znI0UDxV iHsrnL3Qgq15ARZzpC4e9cxja4a9nXIE03kfrTNPejGTVwF3OZLWz9XyCSsbpFnOejs5 d2bIdeQP1jYRYJ9QMWl16QErpd13H33w24JnB/r1Fh/4YojUpbuPGDUVsY41DXrf8vKT Wybk0V6e0penRgFZa4lRV/zIZ0VMrT7Fq3/9G9V2ahCUAJGFAqMWDRKUlxTYl+goqe4X OMFw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=6ExFoqc9ZZAohyVLdMAWVpnWG+Xl15NZ180aj5ZdeR8=; fh=O0oa2/3SVcYItKgUHYoLMmdS9Tu6a+j6RHOnGYxKf9E=; b=QT5bHCNjVDHTgaNw7iT2kdU0OqUE418uqIE17LmCaEIBmE/KtONWl7PW/3o3jAdvuF zDo7SDq/APg+Ri8VlrNVtNABrSaFF2/VTD+jtycxbNyP/36Trd/WX1A6c25SvgdUvTAM WRPF6/+gml4YD7Ggq0I1ESgyW6OoTdKiNrD9JwU+r3G6LASqNXT64shGYFuuBRY/HssU 54WJE+8CXFGCm2KtcNIjsZReWY0aENMHWrOtkZ5LXn/uzdcemSz3D1JQZEa5/BABMNu2 7UwcKOfPbPzjBgEjBNjKPPgHuyiudjAp6Jw9sg8n9qenp0PYRJ0jU4ZxnvzatHEwIhRX pbsw==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1718982510; x=1719587310; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=6ExFoqc9ZZAohyVLdMAWVpnWG+Xl15NZ180aj5ZdeR8=; b=ukjIcql6+5CChiZm0z1q0EUleLxEslFqF/cXl6tFnMWsLkuTJmF5LqQuKHg/4WUdbV 4MiXvk7Hi1w9L/b/LQtrat0jgAWZCtqOdseq+7zSrs6DsCAdAGo6nhk1TzGMrXfww7va 09vJAWvc+2ppXHHji88mi3nAXsE8kTGlh3Xpfro5DtN0kcjsua/4/ALWpWLq9ZQ6bxk+ ppHuoyTprEJfsbCqFr6YDle+xqzkcLdHa18U9oCpr4bBfe54VprM7M3fk7cHD3QhFIt4 EZ+IeIlsZs2ucpofEF2cB7YE8BSt1HosRVXOLVTS9u9CQ++wrUvyn1S2qVnAfvG6du+T UtAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718982510; x=1719587310; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=6ExFoqc9ZZAohyVLdMAWVpnWG+Xl15NZ180aj5ZdeR8=; b=eMK4PdO6AhyJeZAIRDSz7C5rJkEtYFWbJ0Kn+xLFrD02z2w8vNLfU114Sr3k/aCIlM rDROlwVdHmwWbuuu617lg4a8HCUd5YSHZQRWi8XFhHN3vuBMtVbx6fETpLFvDFZXE7bh ZTEGJtVk9mfsYxDkVbhG8zXKDnPkDfpJr5cH16UQCSeY0ZoJmpyp6ZgE/FNEW6DUm0OV pUMRwDJ2YVjvYh/BZYSZYWBkjIBhgShQbL/6IdtLNdL97CcQGjE8dZo5Hbm5BN2v6E5H gQsyKlEj7K5W+iKTbtaV97ZGDT7ghMI8hBzJVbhE+F7YYwSUu45cvfLjmWR6eE4ZSbQP Aozw== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCVXl33XLA9+ITbfrkyff8Hxwjd4OgqNFpu8R+vu9zDCKzotMUYAFehUB3na84Bu67n9jGeWger3apgrJboAzieQbXj98bM= X-Gm-Message-State: AOJu0YxbvhuglsyvnEh6+EUmPc5ECYUfLlx5yuU1Lw9iQglVCAhodjWu MAwuv4lgQp3pXH67jpou9brZh5N10yZKD5ibZP9EZUy28Dcl2PpU X-Google-Smtp-Source: AGHT+IH0HslV2jcAZsFeJ+irTyCpTmKIFP39IJBzLMaG0tI1V8+QJAuwB0L1DT8s25KFavhYpMDeMA== X-Received: by 2002:ac2:5ecb:0:b0:52c:9383:4c16 with SMTP id 2adb3069b0e04-52ccaa5d4b2mr5090809e87.22.1718982510400; Fri, 21 Jun 2024 08:08:30 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:53bb:0:b0:52c:d248:3eba with SMTP id 2adb3069b0e04-52cd2483edbls584573e87.2.-pod-prod-07-eu; Fri, 21 Jun 2024 08:08:28 -0700 (PDT) X-Received: by 2002:ac2:5dc8:0:b0:52c:dc57:868b with SMTP id 2adb3069b0e04-52cdc57871emr276820e87.13.1718982507992; Fri, 21 Jun 2024 08:08:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718982507; cv=none; d=google.com; s=arc-20160816; b=i2Rq6lk4Gb+ZJTDfNKYiZGt0lju3+849V7NwhTLG2RbHxrKf0srN3u1N8jes3YMuKj y86nnllKI3J3/83SCkO7n697mgwlsMC/g7i3KZSmPKJ/z/Fgo/+hoXtYSNUrMEzabyq8 lQy+CY7Xvt1hKnawAscyCoZF+WXaqmK/QXAPJWpJFdFZsQ6xGq6XYFXvaU8dByxQ0CdK z3UJLFYbkX1g+4PBsWZAcPXZkPg1BAOMPvUWg9eAOCuxmi4M2aIazlg/BAXOQMy7QK4o BbwpOLwSujoZG2XaDCxvXVtkWEi724sIqC/MuDZSF1LTnvp1VcvfpW0NoHS/zSUlPlcR 7ZDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=ok1UBy81qlkPE8j8qElbuQiJiBsAP0Zkl6cdH7pTMbU=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=jZZhImWUEoJKA72uCWYlyTdR5PbbYWqnnbZwvmCqUhj3btAs/nvseje14tNuKqmM5C OCG+RfU4kB/jIQQF+jQOppSYmwGaZuAKdsU+cCCgg5fm+thb/+5ESrA4yY9OMG7ecEvt MB0Yp23gFrP9cmS9z4paTZRtKOtLPRDbOOP8/uzOjUA3PJ1EjXSgZMS4d9K83x5j/TS1 ANkPMUDRb+r63EEVa+elSPvor9WD370q0QqLVHfGh1Ub6a1wMWfF+sBaWLOhi+WY+6dJ o/+dJ04GZuFGNI3p8xmtKS+e8NP7QhMggU+r5pmDaUd+Bu63tevyR5hJxKXRbAIAQ4Rz rzGg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-42478c9bbdesi1253295e9.1.2024.06.21.08.08.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 21 Jun 2024 08:08:27 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from user-B660.promwad.corp ([159.148.83.114]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 45LF8ObG006158 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 21 Jun 2024 17:08:27 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v3 5/5] start_vm: Reuse getVars API Date: Fri, 21 Jun 2024 18:08:14 +0300 Message-Id: <20240621150814.189288-6-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240621150814.189288-1-amikan@ilbers.de> References: <20240621150814.189288-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= We already have an API to get Bitbake variable values without manual handling of bitbake execution. This will speedup und simplify start_vm. Signed-off-by: Anton Mikanovich --- testsuite/start_vm.py | 50 ++++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/testsuite/start_vm.py b/testsuite/start_vm.py index 0e0d7000..d6e04049 100755 --- a/testsuite/start_vm.py +++ b/testsuite/start_vm.py @@ -11,43 +11,50 @@ import sys import shutil import time -OVMF_VARS_PATH = '/usr/share/OVMF/OVMF_VARS_4M.ms.fd' - -def get_bitbake_env(arch, distro, image): - multiconfig = 'mc:qemu' + arch + '-' + distro + ':' + image - output = subprocess.check_output(['bitbake', '-e', str(multiconfig)]) - return output +from utils import CIUtils -def get_bitbake_var(output, var): - ret = '' - for line in output.splitlines(): - if line.startswith(var + '='): - ret = line.split('"')[1] - return ret +OVMF_VARS_PATH = '/usr/share/OVMF/OVMF_VARS_4M.ms.fd' def format_qemu_cmdline(arch, build, distro, image, out, pid, enforce_pcbios=False): - bb_output = get_bitbake_env(arch, distro, image).decode() + multiconfig = f'mc:qemu{arch}-{distro}:{image}' + + image_fstypes, \ + deploy_dir_image, \ + kernel_image, \ + initrd_image, \ + serial, \ + root_dev, \ + qemu_arch, \ + qemu_machine, \ + qemu_cpu, \ + qemu_disk_args = CIUtils.getVars('IMAGE_FSTYPES', + 'DEPLOY_DIR_IMAGE', + 'KERNEL_IMAGE', + 'INITRD_DEPLOY_FILE', + 'MACHINE_SERIAL', + 'QEMU_ROOTFS_DEV', + 'QEMU_ARCH', + 'QEMU_MACHINE', + 'QEMU_CPU', + 'QEMU_DISK_ARGS', + target=multiconfig) extra_args = '' cpu = [''] - image_type = get_bitbake_var(bb_output, 'IMAGE_FSTYPES').split()[0] - deploy_dir_image = get_bitbake_var(bb_output, 'DEPLOY_DIR_IMAGE') + image_type = image_fstypes.split()[0] base = 'ubuntu' if distro in ['jammy', 'focal'] else 'debian' rootfs_image = image + '-' + base + '-' + distro + '-qemu' + arch + '.' + image_type if image_type == 'ext4': - kernel_image = deploy_dir_image + '/' + get_bitbake_var(bb_output, 'KERNEL_IMAGE') - initrd_image = get_bitbake_var(bb_output, 'INITRD_DEPLOY_FILE') + kernel_image = deploy_dir_image + '/' + kernel_image if not initrd_image: initrd_image = '/dev/null' else: initrd_image = deploy_dir_image + '/' + initrd_image - serial = get_bitbake_var(bb_output, 'MACHINE_SERIAL') - root_dev = get_bitbake_var(bb_output, 'QEMU_ROOTFS_DEV') kargs = ['-append', '"console=' + serial + ' root=/dev/' + root_dev + ' rw"'] extra_args = ['-kernel', kernel_image, '-initrd', initrd_image] @@ -57,11 +64,6 @@ def format_qemu_cmdline(arch, build, distro, image, out, pid, enforce_pcbios=Fal else: raise ValueError('Invalid image type: ' + str(image_type)) - qemu_arch = get_bitbake_var(bb_output, 'QEMU_ARCH') - qemu_machine = get_bitbake_var(bb_output, 'QEMU_MACHINE') - qemu_cpu = get_bitbake_var(bb_output, 'QEMU_CPU') - qemu_disk_args = get_bitbake_var(bb_output, 'QEMU_DISK_ARGS') - if out: extra_args.extend(['-chardev','stdio,id=ch0,logfile=' + out]) extra_args.extend(['-serial','chardev:ch0'])