[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 09/14] tests/vm: add --boot-console switch
From: |
Robert Foley |
Subject: |
[PATCH v2 09/14] tests/vm: add --boot-console switch |
Date: |
Wed, 19 Feb 2020 11:35:32 -0500 |
Added ability to view console during boot via
--boot-console switch to basevm.py. This helps debug issues that occur
during the boot sequence.
Also added a new special variable to vm-build:
BOOT_CONSOLE=1 will cause this new --boot-console switch to be set.
Signed-off-by: Robert Foley <address@hidden>
---
tests/vm/Makefile.include | 4 ++++
tests/vm/basevm.py | 11 +++++++++--
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include
index e19072f303..d1444c99f5 100644
--- a/tests/vm/Makefile.include
+++ b/tests/vm/Makefile.include
@@ -32,6 +32,7 @@ vm-help vm-test:
@echo ' EXTRA_CONFIGURE_OPTS="..."'
@echo " J=[0..9]* - Override the -jN parameter
for make commands"
@echo " DEBUG=1 - Enable verbose output on
host and interactive debugging"
+ @echo " BOOT_CONSOLE=1 - Show the console output at
boot time. "
@echo " LOG_CONSOLE=1 - Log console to file in:
~/.cache/qemu-vm "
@echo " V=1 - Enable verbose ouput on host
and guest commands"
@echo " QEMU=/path/to/qemu - Change path to QEMU binary"
@@ -52,6 +53,7 @@ $(IMAGES_DIR)/%.img: $(SRC_PATH)/tests/vm/% \
$(PYTHON) $< \
$(if $(V)$(DEBUG), --debug) \
$(if $(LOG_CONSOLE),--log-console) \
+ $(if $(BOOT_CONSOLE),--boot-console) \
--image "$@" \
--force \
--build-image $@, \
@@ -67,6 +69,7 @@ vm-build-%: $(IMAGES_DIR)/%.img
$(if $(J),--jobs $(J)) \
$(if $(V),--verbose) \
$(if $(LOG_CONSOLE),--log-console) \
+ $(if $(BOOT_CONSOLE),--boot-console) \
--image "$<" \
$(if $(BUILD_TARGET),--build-target $(BUILD_TARGET)) \
--snapshot \
@@ -88,6 +91,7 @@ vm-boot-ssh-%: $(IMAGES_DIR)/%.img
$(PYTHON) $(SRC_PATH)/tests/vm/$* \
$(if $(J),--jobs $(J)) \
$(if $(LOG_CONSOLE),--log-console) \
+ $(if $(BOOT_CONSOLE),--boot-console) \
--image "$<" \
--interactive \
false, \
diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py
index a24ce090c7..dc94d1988e 100644
--- a/tests/vm/basevm.py
+++ b/tests/vm/basevm.py
@@ -89,8 +89,10 @@ class BaseVM(object):
# since we found we need to wait more than twice as long.
tcg_ssh_timeout_multiplier = 4
def __init__(self, debug=False, vcpus=None, config=None,
- log_console=False):
+ log_console=False,
+ boot_console=None):
self._guest = None
+ self._boot_console = boot_console
# Allow input config to override defaults.
self._config = DEFAULT_CONFIG.copy()
if config != None:
@@ -539,6 +541,8 @@ def parse_args(vmcls):
parser.add_option("--config", "-c", default=None,
help="Provide config yaml for configuration. "\
"See config_example.yaml for example.")
+ parser.add_option("--boot-console", action="store_true",
+ help="Show console during boot. ")
parser.disable_interspersed_args()
return parser.parse_args()
@@ -554,7 +558,8 @@ def main(vmcls, config=None):
logging.basicConfig(level=(logging.DEBUG if args.debug
else logging.WARN))
vm = vmcls(debug=args.debug, vcpus=args.jobs, config=config,
- log_console=args.log_console)
+ log_console=args.log_console,
+ boot_console=args.boot_console)
if args.build_image:
if os.path.exists(args.image) and not args.force:
sys.stderr.writelines(["Image file exists: %s\n" % args.image,
@@ -574,6 +579,8 @@ def main(vmcls, config=None):
if args.snapshot:
img += ",snapshot=on"
vm.boot(img)
+ if vm._boot_console:
+ vm.wait_boot()
vm.wait_ssh()
except Exception as e:
if isinstance(e, SystemExit) and e.code == 0:
--
2.17.1
- [PATCH v2 00/14] tests/vm: Add support for aarch64 VMs, Robert Foley, 2020/02/19
- [PATCH v2 01/14] tests/vm: use $(PYTHON) consistently, Robert Foley, 2020/02/19
- [PATCH v2 02/14] tests/vm: Debug mode shows ssh output., Robert Foley, 2020/02/19
- [PATCH v2 03/14] tests/vm: increased max timeout for vm boot., Robert Foley, 2020/02/19
- [PATCH v2 04/14] tests/vm: give wait_ssh() option to wait for root, Robert Foley, 2020/02/19
- [PATCH v2 05/14] tests/vm: Added gen_cloud_init_iso() to basevm.py, Robert Foley, 2020/02/19
- [PATCH v2 06/14] tests/vm: Add workaround to consume console, Robert Foley, 2020/02/19
- [PATCH v2 07/14] tests/vm: Add configuration to basevm.py, Robert Foley, 2020/02/19
- [PATCH v2 08/14] tests/vm: Added configuration file support, Robert Foley, 2020/02/19
- [PATCH v2 09/14] tests/vm: add --boot-console switch,
Robert Foley <=
- [PATCH v2 10/14] tests/vm: Add ability to select QEMU from current build., Robert Foley, 2020/02/19
- [PATCH v2 11/14] tests/vm: allow wait_ssh() to specify command, Robert Foley, 2020/02/19
- [PATCH v2 12/14] tests/vm: Added a new script for ubuntu.aarch64., Robert Foley, 2020/02/19
- [PATCH v2 13/14] tests/vm: Added a new script for centos.aarch64., Robert Foley, 2020/02/19
- [PATCH v2 14/14] tests/vm: change scripts to use self._config, Robert Foley, 2020/02/19