vyos/vyos-build
1
0
Fork 0
mirror of https://github.com/vyos/vyos-build.git synced 2025-10-01 20:28:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #884 from sever-sever/T7043

Browse Source 
T7043: Add arguments for CPU and memory for the check-qemu-install
This commit is contained in:
Viacheslav Hletenko 2025-01-13 11:20:51 +02:00 committed by GitHub
commit a2fb862fea
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/check-qemu-install
View File

@ -1,6 +1,6 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# #
# Copyright (C) 2019-2024, VyOS maintainers and contributors # Copyright (C) 2019-2025, VyOS maintainers and contributors
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 or later as # it under the terms of the GNU General Public License version 2 or later as
@ -95,6 +95,8 @@ parser.add_argument('--sbtest', help='Execute Secure Boot tests',
action='store_true', default=False) action='store_true', default=False)
parser.add_argument('--qemu-cmd', help='Only generate QEMU launch command', parser.add_argument('--qemu-cmd', help='Only generate QEMU launch command',
action='store_true', default=False) action='store_true', default=False)
parser.add_argument('--cpu', help='Set QEMU CPU', type=int, default=2)
parser.add_argument('--memory', help='Set QEMU memory', type=int, default=4)
args = parser.parse_args() args = parser.parse_args()
@ -168,11 +170,11 @@ def get_qemu_cmd(name, enable_uefi, disk_img, raid=None, iso_img=None, tpm=False
macbase = '00:00:5E:00:53' macbase = '00:00:5E:00:53'
cmd = f'qemu-system-x86_64 \ cmd = f'qemu-system-x86_64 \
-name "{name}" \ -name "{name}" \
-smp 2,sockets=1,cores=2,threads=1 \ -smp {args.cpu},sockets=1,cores={args.cpu},threads=1 \
-cpu host \ -cpu host \
-machine {machine},accel=kvm \ -machine {machine},accel=kvm \
{uefi} \ {uefi} \
-m 4G \ -m {args.memory}G \
-vga none \ -vga none \
-nographic \ -nographic \
{vga} {vnc}\ {vga} {vnc}\
@ -546,6 +548,10 @@ try:
c.sendline('systemd-detect-virt') c.sendline('systemd-detect-virt')
c.expect('kvm') c.expect('kvm')
c.expect(op_mode_prompt) c.expect(op_mode_prompt)
c.sendline('show system cpu')
c.expect(op_mode_prompt)
c.sendline('show system memory')
c.expect(op_mode_prompt)
################################################# #################################################
# Verify /etc/os-release via lsb_release # Verify /etc/os-release via lsb_release