From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6599936908158042112 X-Received: by 2002:a1c:ed0f:: with SMTP id l15-v6mr136704wmh.24.1536667559633; Tue, 11 Sep 2018 05:05:59 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:9a57:: with SMTP id z81-v6ls5651288wrb.11.gmail; Tue, 11 Sep 2018 05:05:59 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYDqhjU1NBkrGLcqTU/oJJrtl0ImiWE8JMWrG2xcZg6vZFU5nYVMt/wvsRFd+sPuKg2npeG X-Received: by 2002:adf:b2c5:: with SMTP id g63-v6mr1679772wrd.27.1536667559261; Tue, 11 Sep 2018 05:05:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536667559; cv=none; d=google.com; s=arc-20160816; b=jbVKqFAMVMHZbX35CeBaH69FohqFud+sAz8mZ/NcnsCYb2QwyAnWLrVKBM4ESoIhqE slCGSbrDEf1e5EPePkxsJwq+ZiPTUbHZSUBy2Yv98HOSyGC9uln1VsZRrGHl9GaJeYny 3UW4wKgPenltWTEBHqSupsHwqA9cIgOM9/VReOklGQB2PiCeULWsokVsDXdvenVCAg4K 65oL4ouUMWPguTLZY63LO09aKXE4FpyKDGPBls98Qy0dWteEQadAFv42VDp0mspJ4+6T CyTZnmu7fFg1knx9l82tDI1h1CDW4N/yYPMteHTokvnD9Cix5DZUk9sS8NGmW8UxT87C 9gEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:to:from; bh=TT2T+i79AFmmixxjVOvSYCySj4qln5ZHN8Q7UMqba1k=; b=Ub0MG5BlxEMm9EcQKKEy5PaNyKLfJyo3YmAp9aKEPNqMgN1rN/C0Nt0UGMd3X74l4p nl712IrjXaUleYmWZAWB6LMAPzQnQwliKnJIh2FqpQzDcdc8+Mt8clgE0/FdCmJjcxt0 bRRFKIzLkFMZCyT2W088lOSFeLhwZqOC1C5HKG3S7tJEkzfLDA161QhL6n5lvk4Iah1I hvdMh8dVbnkPJFfcarZ2Lkx7JwGIGD0PC/tYTPC+vF7y3TPeHvfSKM01nd2K13WW9C3G q3x9LSep19rz3oR09+5Rk8MMnp7zmpt2i0OYc++ksPoV9I4KvfGTMSuBERRKX/BSG9Qq bAqw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id l11-v6si24823wmc.0.2018.09.11.05.05.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Sep 2018 05:05:59 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id w8BC5wM0004596 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 11 Sep 2018 14:05:58 +0200 Received: from md1f2u6c.ad001.siemens.net (md1q0hnc.ad001.siemens.net [139.25.68.37] (may be forged)) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id w8BC5vIT000884 for ; Tue, 11 Sep 2018 14:05:58 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH 09/16] start_vm: Rename QEMU_ROOTFS_DEV to QEMU_DISK_ARGS Date: Tue, 11 Sep 2018 14:05:49 +0200 Message-Id: <5d0501db22105e8ed3026592f947de4f5ba599e7.1536667556.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: g5iqSmdOu6eg From: Jan Kiszka This describes better what the variable contains and frees the name for the real QEMU-related ROOTFS_DEV. Signed-off-by: Jan Kiszka --- meta-isar/conf/multiconfig/qemuamd64-buster.conf | 2 +- meta-isar/conf/multiconfig/qemuamd64-jessie.conf | 2 +- meta-isar/conf/multiconfig/qemuamd64-stretch.conf | 2 +- meta-isar/conf/multiconfig/qemuarm-buster.conf | 2 +- meta-isar/conf/multiconfig/qemuarm-jessie.conf | 2 +- meta-isar/conf/multiconfig/qemuarm-stretch.conf | 2 +- meta-isar/conf/multiconfig/qemuarm-wheezy.conf | 2 +- meta-isar/conf/multiconfig/qemuarm64-buster.conf | 2 +- meta-isar/conf/multiconfig/qemuarm64-stretch.conf | 2 +- meta-isar/conf/multiconfig/qemui386-buster.conf | 2 +- meta-isar/conf/multiconfig/qemui386-jessie.conf | 2 +- meta-isar/conf/multiconfig/qemui386-stretch.conf | 2 +- scripts/start_vm | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster.conf b/meta-isar/conf/multiconfig/qemuamd64-buster.conf index 404f48a..90bb0d1 100644 --- a/meta-isar/conf/multiconfig/qemuamd64-buster.conf +++ b/meta-isar/conf/multiconfig/qemuamd64-buster.conf @@ -18,4 +18,4 @@ ROOTFS_DEV ?= "sda2" QEMU_ARCH ?= "x86_64" QEMU_MACHINE ?= "q35" QEMU_CPU ?= "" -QEMU_ROOTFS_DEV ?= "-hda ##ROOTFS_IMAGE## -bios /usr/local/share/ovmf/OVMF.fd" +QEMU_DISK_ARGS ?= "-hda ##ROOTFS_IMAGE## -bios /usr/local/share/ovmf/OVMF.fd" diff --git a/meta-isar/conf/multiconfig/qemuamd64-jessie.conf b/meta-isar/conf/multiconfig/qemuamd64-jessie.conf index b422008..65167a9 100644 --- a/meta-isar/conf/multiconfig/qemuamd64-jessie.conf +++ b/meta-isar/conf/multiconfig/qemuamd64-jessie.conf @@ -13,4 +13,4 @@ ROOTFS_DEV ?= "sda" QEMU_ARCH ?= "x86_64" QEMU_MACHINE ?= "pc" QEMU_CPU ?= "" -QEMU_ROOTFS_DEV ?= "-hda ##ROOTFS_IMAGE##" +QEMU_DISK_ARGS ?= "-hda ##ROOTFS_IMAGE##" diff --git a/meta-isar/conf/multiconfig/qemuamd64-stretch.conf b/meta-isar/conf/multiconfig/qemuamd64-stretch.conf index 3d1ef28..3592cdc 100644 --- a/meta-isar/conf/multiconfig/qemuamd64-stretch.conf +++ b/meta-isar/conf/multiconfig/qemuamd64-stretch.conf @@ -19,4 +19,4 @@ ROOTFS_DEV ?= "sda2" QEMU_ARCH ?= "x86_64" QEMU_MACHINE ?= "q35" QEMU_CPU ?= "" -QEMU_ROOTFS_DEV ?= "-hda ##ROOTFS_IMAGE## -bios /usr/local/share/ovmf/OVMF.fd" +QEMU_DISK_ARGS ?= "-hda ##ROOTFS_IMAGE## -bios /usr/local/share/ovmf/OVMF.fd" diff --git a/meta-isar/conf/multiconfig/qemuarm-buster.conf b/meta-isar/conf/multiconfig/qemuarm-buster.conf index 003f7c4..aa80ad6 100644 --- a/meta-isar/conf/multiconfig/qemuarm-buster.conf +++ b/meta-isar/conf/multiconfig/qemuarm-buster.conf @@ -15,4 +15,4 @@ QEMU_ARCH ?= "arm" QEMU_MACHINE ?= "virt" QEMU_CPU ?= "cortex-a15" # TODO: start_vm doesn't support multiline vars -QEMU_ROOTFS_DEV ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0" +QEMU_DISK_ARGS ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0" diff --git a/meta-isar/conf/multiconfig/qemuarm-jessie.conf b/meta-isar/conf/multiconfig/qemuarm-jessie.conf index fe1d760..0735d95 100644 --- a/meta-isar/conf/multiconfig/qemuarm-jessie.conf +++ b/meta-isar/conf/multiconfig/qemuarm-jessie.conf @@ -21,4 +21,4 @@ QEMU_ARCH ?= "arm" QEMU_MACHINE ?= "virt" QEMU_CPU ?= "cortex-a15" # TODO: start_vm doesn't support multiline vars -QEMU_ROOTFS_DEV ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0" +QEMU_DISK_ARGS ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0" diff --git a/meta-isar/conf/multiconfig/qemuarm-stretch.conf b/meta-isar/conf/multiconfig/qemuarm-stretch.conf index 00cdaa0..db74cb6 100644 --- a/meta-isar/conf/multiconfig/qemuarm-stretch.conf +++ b/meta-isar/conf/multiconfig/qemuarm-stretch.conf @@ -16,4 +16,4 @@ QEMU_ARCH ?= "arm" QEMU_MACHINE ?= "virt" QEMU_CPU ?= "cortex-a15" # TODO: start_vm doesn't support multiline vars -QEMU_ROOTFS_DEV ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0" +QEMU_DISK_ARGS ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0" diff --git a/meta-isar/conf/multiconfig/qemuarm-wheezy.conf b/meta-isar/conf/multiconfig/qemuarm-wheezy.conf index c573254..5498652 100644 --- a/meta-isar/conf/multiconfig/qemuarm-wheezy.conf +++ b/meta-isar/conf/multiconfig/qemuarm-wheezy.conf @@ -20,4 +20,4 @@ ROOTFS_DEV ?= "mmcblk0" QEMU_ARCH ?= "arm" QEMU_MACHINE ?= "vexpress-a9" QEMU_CPU ?= "" -QEMU_ROOTFS_DEV ?= "-sd ##ROOTFS_IMAGE##" +QEMU_DISK_ARGS ?= "-sd ##ROOTFS_IMAGE##" diff --git a/meta-isar/conf/multiconfig/qemuarm64-buster.conf b/meta-isar/conf/multiconfig/qemuarm64-buster.conf index 80b88f2..6e037ed 100644 --- a/meta-isar/conf/multiconfig/qemuarm64-buster.conf +++ b/meta-isar/conf/multiconfig/qemuarm64-buster.conf @@ -17,4 +17,4 @@ QEMU_ARCH ?= "aarch64" QEMU_MACHINE ?= "virt" QEMU_CPU ?= "cortex-a57" # TODO: start_vm doesn't support multiline vars -QEMU_ROOTFS_DEV ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0" +QEMU_DISK_ARGS ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0" diff --git a/meta-isar/conf/multiconfig/qemuarm64-stretch.conf b/meta-isar/conf/multiconfig/qemuarm64-stretch.conf index cffdcdb..ee8f35e 100644 --- a/meta-isar/conf/multiconfig/qemuarm64-stretch.conf +++ b/meta-isar/conf/multiconfig/qemuarm64-stretch.conf @@ -17,4 +17,4 @@ QEMU_ARCH ?= "aarch64" QEMU_MACHINE ?= "virt" QEMU_CPU ?= "cortex-a57" # TODO: start_vm doesn't support multiline vars -QEMU_ROOTFS_DEV ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0" +QEMU_DISK_ARGS ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0" diff --git a/meta-isar/conf/multiconfig/qemui386-buster.conf b/meta-isar/conf/multiconfig/qemui386-buster.conf index 279d321..be89001 100644 --- a/meta-isar/conf/multiconfig/qemui386-buster.conf +++ b/meta-isar/conf/multiconfig/qemui386-buster.conf @@ -18,4 +18,4 @@ ROOTFS_DEV ?= "sda2" QEMU_ARCH ?= "i386" QEMU_MACHINE ?= "pc" QEMU_CPU ?= "" -QEMU_ROOTFS_DEV ?= "-hda ##ROOTFS_IMAGE##" +QEMU_DISK_ARGS ?= "-hda ##ROOTFS_IMAGE##" diff --git a/meta-isar/conf/multiconfig/qemui386-jessie.conf b/meta-isar/conf/multiconfig/qemui386-jessie.conf index e8c81fb..33d515c 100644 --- a/meta-isar/conf/multiconfig/qemui386-jessie.conf +++ b/meta-isar/conf/multiconfig/qemui386-jessie.conf @@ -13,4 +13,4 @@ ROOTFS_DEV ?= "sda" QEMU_ARCH ?= "i386" QEMU_MACHINE ?= "pc" QEMU_CPU ?= "" -QEMU_ROOTFS_DEV ?= "-hda ##ROOTFS_IMAGE##" +QEMU_DISK_ARGS ?= "-hda ##ROOTFS_IMAGE##" diff --git a/meta-isar/conf/multiconfig/qemui386-stretch.conf b/meta-isar/conf/multiconfig/qemui386-stretch.conf index 6f3041b..7df80f5 100644 --- a/meta-isar/conf/multiconfig/qemui386-stretch.conf +++ b/meta-isar/conf/multiconfig/qemui386-stretch.conf @@ -19,4 +19,4 @@ ROOTFS_DEV ?= "sda2" QEMU_ARCH ?= "i386" QEMU_MACHINE ?= "pc" QEMU_CPU ?= "" -QEMU_ROOTFS_DEV ?= "-hda ##ROOTFS_IMAGE##" +QEMU_DISK_ARGS ?= "-hda ##ROOTFS_IMAGE##" diff --git a/scripts/start_vm b/scripts/start_vm index 5d6556d..5be348a 100755 --- a/scripts/start_vm +++ b/scripts/start_vm @@ -17,7 +17,7 @@ bb2sh() { } start_qemu() { - root=`echo $QEMU_ROOTFS_DEV \ + root=`echo $QEMU_DISK_ARGS \ | sed 's,##ROOTFS_IMAGE##,'$IMAGE_DIR/$ROOTFS_IMAGE','` local had_x echo $- | grep -q x && had_x=1 || had_x=0 -- 2.16.4