* [PATCH 1/8] runqemu: fix 2 typos
2017-04-07 9:47 [PATCH 0/8 V2] fixes for runqemu and runqemu + rm_work Robert Yang
@ 2017-04-07 9:47 ` Robert Yang
2017-04-07 9:47 ` [PATCH 2/8] runqemu: support env vars explicitly Robert Yang
` (6 subsequent siblings)
7 siblings, 0 replies; 13+ messages in thread
From: Robert Yang @ 2017-04-07 9:47 UTC (permalink / raw)
To: openembedded-core
* "is it" -> "it is"
* Remove "<image>.qemuboot.conf =" in the error message which looked strange.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
scripts/runqemu | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/runqemu b/scripts/runqemu
index 23c9efbae2..251f5f7e94 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -421,7 +421,7 @@ class BaseConfig(object):
elif arg.startswith('ovmf'):
self.ovmf_bios.append(arg)
else:
- # At last, assume is it the MACHINE
+ # At last, assume it is the MACHINE
if (not unknown_arg) or unknown_arg == arg:
unknown_arg = arg
else:
@@ -677,7 +677,7 @@ class BaseConfig(object):
return
if not os.path.exists(self.qemuboot):
- raise Exception("Failed to find <image>.qemuboot.conf = %s (wrong image name or BSP does not support running under qemu?)." % self.qemuboot)
+ raise Exception("Failed to find %s (wrong image name or BSP does not support running under qemu?)." % self.qemuboot)
logger.info('CONFFILE: %s' % self.qemuboot)
--
2.11.0.rc2.dirty
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 2/8] runqemu: support env vars explicitly
2017-04-07 9:47 [PATCH 0/8 V2] fixes for runqemu and runqemu + rm_work Robert Yang
2017-04-07 9:47 ` [PATCH 1/8] runqemu: fix 2 typos Robert Yang
@ 2017-04-07 9:47 ` Robert Yang
2017-04-07 9:47 ` [PATCH 3/8] runqemu: use self.rootfs to replace self.nfs_dir Robert Yang
` (5 subsequent siblings)
7 siblings, 0 replies; 13+ messages in thread
From: Robert Yang @ 2017-04-07 9:47 UTC (permalink / raw)
To: openembedded-core
Use self.env_vars to support get vars from environment explicity. The
MACHINE, ROOTFS and KERNEL was supported by shell based runqemu, and
the help text says support them from env vars, so add them back.
[YOCTO #11141]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
scripts/runqemu | 71 ++++++++++++++++++++++++++++++++++-----------------------
1 file changed, 42 insertions(+), 29 deletions(-)
diff --git a/scripts/runqemu b/scripts/runqemu
index 251f5f7e94..ddbff4b221 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -163,12 +163,18 @@ def check_free_port(host, port):
class BaseConfig(object):
def __init__(self):
- # Vars can be merged with .qemuboot.conf, use a dict to manage them.
- self.d = {
- 'MACHINE': '',
- 'DEPLOY_DIR_IMAGE': '',
- 'QB_KERNEL_ROOT': '/dev/vda',
- }
+ # The self.d saved vars from self.set(), part of them are from qemuboot.conf
+ self.d = {'QB_KERNEL_ROOT': '/dev/vda'}
+
+ # Supported env vars, add it here if a var can be got from env,
+ # and don't use os.getenv in the code.
+ self.env_vars = ('MACHINE',
+ 'ROOTFS',
+ 'KERNEL',
+ 'DEPLOY_DIR_IMAGE',
+ 'OE_TMPDIR',
+ 'OECORE_NATIVE_SYSROOT',
+ )
self.qemu_opt = ''
self.qemu_opt_script = ''
@@ -238,6 +244,8 @@ class BaseConfig(object):
def get(self, key):
if key in self.d:
return self.d.get(key)
+ elif os.getenv(key):
+ return os.getenv(key)
else:
return ''
@@ -338,10 +346,13 @@ class BaseConfig(object):
def check_arg_machine(self, arg):
"""Check whether it is a machine"""
- if self.get('MACHINE') and self.get('MACHINE') != arg or re.search('/', arg):
- raise Exception("Unknown arg: %s" % arg)
- elif self.get('MACHINE') == arg:
+ if self.get('MACHINE') == arg:
return
+ elif self.get('MACHINE') and self.get('MACHINE') != arg:
+ raise Exception("Maybe conflicted MACHINE: %s vs %s" % (self.get('MACHINE'), arg))
+ elif re.search('/', arg):
+ raise Exception("Unknown arg: %s" % arg)
+
logger.info('Assuming MACHINE = %s' % arg)
# if we're running under testimage, or similarly as a child
@@ -350,14 +361,14 @@ class BaseConfig(object):
# FIXME: testimage.bbclass exports these two variables into env,
# are there other scenarios in which we need to support being
# invoked by bitbake?
- deploy = os.environ.get('DEPLOY_DIR_IMAGE')
- bbchild = deploy and os.environ.get('OE_TMPDIR')
+ deploy = self.get('DEPLOY_DIR_IMAGE')
+ bbchild = deploy and self.get('OE_TMPDIR')
if bbchild:
self.set_machine_deploy_dir(arg, deploy)
return
# also check whether we're running under a sourced toolchain
# environment file
- if os.environ.get('OECORE_NATIVE_SYSROOT'):
+ if self.get('OECORE_NATIVE_SYSROOT'):
self.set("MACHINE", arg)
return
@@ -430,20 +441,15 @@ class BaseConfig(object):
if unknown_arg:
if self.get('MACHINE') == unknown_arg:
return
- if not self.get('DEPLOY_DIR_IMAGE'):
- # Trying to get DEPLOY_DIR_IMAGE from env.
- p = os.getenv('DEPLOY_DIR_IMAGE')
- if p and self.is_deploy_dir_image(p):
- machine = os.path.basename(p)
- if unknown_arg == machine:
- self.set_machine_deploy_dir(machine, p)
- return
- else:
- logger.info('DEPLOY_DIR_IMAGE: %s' % p)
- self.set("DEPLOY_DIR_IMAGE", p)
+ if self.get('DEPLOY_DIR_IMAGE'):
+ machine = os.path.basename(self.get('DEPLOY_DIR_IMAGE'))
+ if unknown_arg == machine:
+ self.set("MACHINE", machine)
+ return
+
self.check_arg_machine(unknown_arg)
- if not (self.get('MACHINE') or self.get('DEPLOY_DIR_IMAGE')):
+ if not self.get('DEPLOY_DIR_IMAGE'):
self.load_bitbake_env()
s = re.search('^DEPLOY_DIR_IMAGE="(.*)"', self.bitbake_e, re.M)
if s:
@@ -505,7 +511,16 @@ class BaseConfig(object):
def check_rootfs(self):
"""Check and set rootfs"""
- if self.fstype == 'nfs' or self.fstype == "none":
+ if self.fstype == "none":
+ return
+
+ if self.get('ROOTFS'):
+ if not self.rootfs:
+ self.rootfs = self.get('ROOTFS')
+ elif self.get('ROOTFS') != self.rootfs:
+ raise Exception("Maybe conflicted ROOTFS: %s vs %s" % (self.get('ROOTFS'), self.rootfs))
+
+ if self.fstype == 'nfs':
return
if self.rootfs and not os.path.exists(self.rootfs):
@@ -642,8 +657,6 @@ class BaseConfig(object):
if not self.qemuboot:
if self.get('DEPLOY_DIR_IMAGE'):
deploy_dir_image = self.get('DEPLOY_DIR_IMAGE')
- elif os.getenv('DEPLOY_DIR_IMAGE'):
- deploy_dir_image = os.getenv('DEPLOY_DIR_IMAGE')
else:
logger.info("Can't find qemuboot conf file, DEPLOY_DIR_IMAGE is NULL!")
return
@@ -720,8 +733,8 @@ class BaseConfig(object):
# be able to call `bitbake -e`, then try:
# - get OE_TMPDIR from environment and guess paths based on it
# - get OECORE_NATIVE_SYSROOT from environment (for sdk)
- tmpdir = os.environ.get('OE_TMPDIR', None)
- oecore_native_sysroot = os.environ.get('OECORE_NATIVE_SYSROOT', None)
+ tmpdir = self.get('OE_TMPDIR', None)
+ oecore_native_sysroot = self.get('OECORE_NATIVE_SYSROOT', None)
if tmpdir:
logger.info('Setting STAGING_DIR_NATIVE and STAGING_BINDIR_NATIVE relative to OE_TMPDIR (%s)' % tmpdir)
hostos, _, _, _, machine = os.uname()
--
2.11.0.rc2.dirty
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 3/8] runqemu: use self.rootfs to replace self.nfs_dir
2017-04-07 9:47 [PATCH 0/8 V2] fixes for runqemu and runqemu + rm_work Robert Yang
2017-04-07 9:47 ` [PATCH 1/8] runqemu: fix 2 typos Robert Yang
2017-04-07 9:47 ` [PATCH 2/8] runqemu: support env vars explicitly Robert Yang
@ 2017-04-07 9:47 ` Robert Yang
2017-04-07 9:47 ` [PATCH 4/8] runqemu: run without arguments Robert Yang
` (4 subsequent siblings)
7 siblings, 0 replies; 13+ messages in thread
From: Robert Yang @ 2017-04-07 9:47 UTC (permalink / raw)
To: openembedded-core
We can use self.rootfs as self.nfs_dir when self.fstype is nfs, this can
reduce the code's complexity and we can re-use the code of checking
ROOTFS conflictions.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
scripts/runqemu | 28 +++++++++++++---------------
1 file changed, 13 insertions(+), 15 deletions(-)
diff --git a/scripts/runqemu b/scripts/runqemu
index ddbff4b221..7e7a6b4915 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -178,7 +178,6 @@ class BaseConfig(object):
self.qemu_opt = ''
self.qemu_opt_script = ''
- self.nfs_dir = ''
self.clean_nfs_dir = False
self.nfs_server = ''
self.rootfs = ''
@@ -284,12 +283,11 @@ class BaseConfig(object):
def check_arg_nfs(self, p):
if os.path.isdir(p):
- self.nfs_dir = p
+ self.rootfs = p
else:
m = re.match('(.*):(.*)', p)
self.nfs_server = m.group(1)
- self.nfs_dir = m.group(2)
- self.rootfs = ""
+ self.rootfs = m.group(2)
self.check_arg_fstype('nfs')
def check_arg_path(self, p):
@@ -759,7 +757,7 @@ class BaseConfig(object):
print('MACHINE: [%s]' % self.get('MACHINE'))
print('FSTYPE: [%s]' % self.fstype)
if self.fstype == 'nfs':
- print('NFS_DIR: [%s]' % self.nfs_dir)
+ print('NFS_DIR: [%s]' % self.rootfs)
else:
print('ROOTFS: [%s]' % self.rootfs)
if self.ovmf_bios:
@@ -804,13 +802,13 @@ class BaseConfig(object):
self.unfs_opts="nfsvers=3,port=%s,mountprog=%s,nfsprog=%s,udp,mountport=%s" % (nfsd_port, mountd_rpcport, nfsd_rpcport, mountd_port)
- # Extract .tar.bz2 or .tar.bz if no self.nfs_dir
- if not self.nfs_dir:
+ # Extract .tar.bz2 or .tar.bz if no nfs dir
+ if not (self.rootfs and os.path.isdir(self.rootfs)):
src_prefix = '%s/%s' % (self.get('DEPLOY_DIR_IMAGE'), self.get('IMAGE_LINK_NAME'))
dest = "%s-nfsroot" % src_prefix
if os.path.exists('%s.pseudo_state' % dest):
logger.info('Use %s as NFS_DIR' % dest)
- self.nfs_dir = dest
+ self.rootfs = dest
else:
src = ""
src1 = '%s.tar.bz2' % src_prefix
@@ -827,10 +825,10 @@ class BaseConfig(object):
if subprocess.call(cmd, shell=True) != 0:
raise Exception('Failed to run %s' % cmd)
self.clean_nfs_dir = True
- self.nfs_dir = dest
+ self.rootfs = dest
# Start the userspace NFS server
- cmd = 'runqemu-export-rootfs start %s' % self.nfs_dir
+ cmd = 'runqemu-export-rootfs start %s' % self.rootfs
logger.info('Running %s...' % cmd)
if subprocess.call(cmd, shell=True) != 0:
raise Exception('Failed to run %s' % cmd)
@@ -1001,7 +999,7 @@ class BaseConfig(object):
if self.fstype == 'nfs':
self.rootfs_options = ''
- k_root = '/dev/nfs nfsroot=%s:%s,%s' % (self.nfs_server, self.nfs_dir, self.unfs_opts)
+ k_root = '/dev/nfs nfsroot=%s:%s,%s' % (self.nfs_server, self.rootfs, self.unfs_opts)
self.kernel_cmdline = 'root=%s rw highres=off' % k_root
if self.fstype == 'none':
@@ -1147,7 +1145,7 @@ class BaseConfig(object):
if self.nfs_running:
logger.info("Shutting down the userspace NFS server...")
- cmd = "runqemu-export-rootfs stop %s" % self.nfs_dir
+ cmd = "runqemu-export-rootfs stop %s" % self.rootfs
logger.info('Running %s' % cmd)
subprocess.call(cmd, shell=True)
@@ -1156,9 +1154,9 @@ class BaseConfig(object):
subprocess.call(cmd, shell=True)
if self.clean_nfs_dir:
- logger.info('Removing %s' % self.nfs_dir)
- shutil.rmtree(self.nfs_dir)
- shutil.rmtree('%s.pseudo_state' % self.nfs_dir)
+ logger.info('Removing %s' % self.rootfs)
+ shutil.rmtree(self.rootfs)
+ shutil.rmtree('%s.pseudo_state' % self.rootfs)
def load_bitbake_env(self, mach=None):
if self.bitbake_e:
--
2.11.0.rc2.dirty
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 4/8] runqemu: run without arguments
2017-04-07 9:47 [PATCH 0/8 V2] fixes for runqemu and runqemu + rm_work Robert Yang
` (2 preceding siblings ...)
2017-04-07 9:47 ` [PATCH 3/8] runqemu: use self.rootfs to replace self.nfs_dir Robert Yang
@ 2017-04-07 9:47 ` Robert Yang
2017-04-07 9:47 ` [PATCH 5/8] runqemu: use realpath for imgdir Robert Yang
` (3 subsequent siblings)
7 siblings, 0 replies; 13+ messages in thread
From: Robert Yang @ 2017-04-07 9:47 UTC (permalink / raw)
To: openembedded-core
Since we can get MACHINE and others from env vars and "bitbake -e",
"runqemu" can work without any arguments.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
scripts/runqemu | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/runqemu b/scripts/runqemu
index 7e7a6b4915..f55494df12 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -83,6 +83,7 @@ of the following environment variables (in any order):
help, -h, --help: print this text
Examples:
+ runqemu
runqemu qemuarm
runqemu tmp/deploy/images/qemuarm
runqemu tmp/deploy/images/qemux86/<qemuboot.conf>
@@ -1182,8 +1183,7 @@ class BaseConfig(object):
logger.warn("Couldn't run 'bitbake -e' to gather environment information:\n%s" % err.output.decode('utf-8'))
def main():
- if len(sys.argv) == 1 or "help" in sys.argv or \
- '-h' in sys.argv or '--help' in sys.argv:
+ if "help" in sys.argv or '-h' in sys.argv or '--help' in sys.argv:
print_usage()
return 0
config = BaseConfig()
--
2.11.0.rc2.dirty
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 5/8] runqemu: use realpath for imgdir
2017-04-07 9:47 [PATCH 0/8 V2] fixes for runqemu and runqemu + rm_work Robert Yang
` (3 preceding siblings ...)
2017-04-07 9:47 ` [PATCH 4/8] runqemu: run without arguments Robert Yang
@ 2017-04-07 9:47 ` Robert Yang
2017-04-07 9:47 ` [PATCH 6/8] runqemu: do not rely on grepping images Robert Yang
` (2 subsequent siblings)
7 siblings, 0 replies; 13+ messages in thread
From: Robert Yang @ 2017-04-07 9:47 UTC (permalink / raw)
To: openembedded-core
The DEPLOY_DIR_IMAGE maybe relative or absolute path since it can be
read from env vars, so use realpath for both imgdir and
DEPLOY_DIR_IMAGE when compare.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
scripts/runqemu | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/runqemu b/scripts/runqemu
index f55494df12..a4036ae091 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -705,8 +705,8 @@ class BaseConfig(object):
# artefacts are relative to that file, rather than in whatever
# directory DEPLOY_DIR_IMAGE in the conf file points to.
if self.qbconfload:
- imgdir = os.path.dirname(self.qemuboot)
- if imgdir != self.get('DEPLOY_DIR_IMAGE'):
+ imgdir = os.path.realpath(os.path.dirname(self.qemuboot))
+ if imgdir != os.path.realpath(self.get('DEPLOY_DIR_IMAGE')):
logger.info('Setting DEPLOY_DIR_IMAGE to folder containing %s (%s)' % (self.qemuboot, imgdir))
self.set('DEPLOY_DIR_IMAGE', imgdir)
--
2.11.0.rc2.dirty
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 6/8] runqemu: do not rely on grepping images
2017-04-07 9:47 [PATCH 0/8 V2] fixes for runqemu and runqemu + rm_work Robert Yang
` (4 preceding siblings ...)
2017-04-07 9:47 ` [PATCH 5/8] runqemu: use realpath for imgdir Robert Yang
@ 2017-04-07 9:47 ` Robert Yang
2017-04-08 14:24 ` Richard Purdie
2017-04-07 9:47 ` [PATCH 7/8] qemuboot.bbclass: add two vars for use by runqemu Robert Yang
2017-04-07 9:47 ` [PATCH 8/8] runqemu: make use of two new vars Robert Yang
7 siblings, 1 reply; 13+ messages in thread
From: Robert Yang @ 2017-04-07 9:47 UTC (permalink / raw)
To: openembedded-core
Fixed when the image is large and not enough memory:
grep: memory exhausted
Aborted
[YOCTO #11073]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/classes/qemuboot.bbclass | 3 +++
scripts/runqemu | 19 +++++++++++--------
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/meta/classes/qemuboot.bbclass b/meta/classes/qemuboot.bbclass
index 3ca97cad4c..2870388dfb 100644
--- a/meta/classes/qemuboot.bbclass
+++ b/meta/classes/qemuboot.bbclass
@@ -64,6 +64,9 @@ QB_DEFAULT_FSTYPE ?= "ext4"
QB_OPT_APPEND ?= "-show-cursor"
QB_NETWORK_DEVICE ?= "-device virtio-net-pci,netdev=net0,mac=@MAC@"
+# This should be kept align with ROOT_VM
+QB_DRIVE_TYPE ?= "/dev/sd"
+
# Create qemuboot.conf
addtask do_write_qemuboot_conf after do_rootfs before do_image
IMGDEPLOYDIR ?= "${WORKDIR}/deploy-${PN}-image-complete"
diff --git a/scripts/runqemu b/scripts/runqemu
index a4036ae091..5b5d56b9ef 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -978,23 +978,26 @@ class BaseConfig(object):
self.kernel_cmdline = 'root=/dev/ram0 rw debugshell'
self.rootfs_options = '-initrd %s' % self.rootfs
else:
+ vm_drive = ''
if self.fstype in self.vmtypes:
if self.fstype == 'iso':
vm_drive = '-cdrom %s' % self.rootfs
- else:
- cmd1 = "grep -q 'root=/dev/sd' %s" % self.rootfs
- cmd2 = "grep -q 'root=/dev/hd' %s" % self.rootfs
- if subprocess.call(cmd1, shell=True) == 0:
+ elif self.get('QB_DRIVE_TYPE'):
+ drive_type = self.get('QB_DRIVE_TYPE')
+ if drive_type.startswith("/dev/sd"):
logger.info('Using scsi drive')
vm_drive = '-drive if=none,id=hd,file=%s,format=%s -device virtio-scsi-pci,id=scsi -device scsi-hd,drive=hd' \
% (self.rootfs, rootfs_format)
- elif subprocess.call(cmd2, shell=True) == 0:
+ elif drive_type.startswith("/dev/hd"):
logger.info('Using ide drive')
vm_drive = "%s,format=%s" % (self.rootfs, rootfs_format)
else:
- logger.warn("Can't detect drive type %s" % self.rootfs)
- logger.warn('Trying to use virtio block drive')
- vm_drive = '-drive if=virtio,file=%s,format=%s' % (self.rootfs, rootfs_format)
+ logger.warn("Unknown QB_DRIVE_TYPE: %s" % drive_type)
+
+ if not vm_drive:
+ logger.warn("Failed to figure out drive type, consider define or fix QB_DRIVE_TYPE")
+ logger.warn('Trying to use virtio block drive')
+ vm_drive = '-drive if=virtio,file=%s,format=%s' % (self.rootfs, rootfs_format)
self.rootfs_options = '%s -no-reboot' % vm_drive
self.kernel_cmdline = 'root=%s rw highres=off' % (self.get('QB_KERNEL_ROOT'))
--
2.11.0.rc2.dirty
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 6/8] runqemu: do not rely on grepping images
2017-04-07 9:47 ` [PATCH 6/8] runqemu: do not rely on grepping images Robert Yang
@ 2017-04-08 14:24 ` Richard Purdie
2017-04-11 2:21 ` Robert Yang
0 siblings, 1 reply; 13+ messages in thread
From: Richard Purdie @ 2017-04-08 14:24 UTC (permalink / raw)
To: Robert Yang, openembedded-core; +Cc: Bartosh, Eduard
On Fri, 2017-04-07 at 02:47 -0700, Robert Yang wrote:
> Fixed when the image is large and not enough memory:
> grep: memory exhausted
> Aborted
>
> [YOCTO #11073]
>
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
> meta/classes/qemuboot.bbclass | 3 +++
> scripts/runqemu | 19 +++++++++++--------
> 2 files changed, 14 insertions(+), 8 deletions(-)
This breaks oe-selftest:
https://autobuilder.yocto.io/builders/nightly-oe-selftest/builds/248/steps/Running%20oe-selftest/logs/stdio
Perhaps not all the failures but certainly:
wic.Wic.test_rawcopy_plugin_qemu
wic.Wic.test_qemu_efi
wic.Wic.test_qemu
We see intermittent failures on these tests anyway and I think you're
onto the right track with a potential fix though.
Cheers,
Richard
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 6/8] runqemu: do not rely on grepping images
2017-04-08 14:24 ` Richard Purdie
@ 2017-04-11 2:21 ` Robert Yang
0 siblings, 0 replies; 13+ messages in thread
From: Robert Yang @ 2017-04-11 2:21 UTC (permalink / raw)
To: Richard Purdie, openembedded-core; +Cc: Bartosh, Eduard
On 04/08/2017 10:24 PM, Richard Purdie wrote:
> On Fri, 2017-04-07 at 02:47 -0700, Robert Yang wrote:
>> Fixed when the image is large and not enough memory:
>> grep: memory exhausted
>> Aborted
>>
>> [YOCTO #11073]
>>
>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>> ---
>> meta/classes/qemuboot.bbclass | 3 +++
>> scripts/runqemu | 19 +++++++++++--------
>> 2 files changed, 14 insertions(+), 8 deletions(-)
>
> This breaks oe-selftest:
>
> https://autobuilder.yocto.io/builders/nightly-oe-selftest/builds/248/steps/Running%20oe-selftest/logs/stdio
>
> Perhaps not all the failures but certainly:
> wic.Wic.test_rawcopy_plugin_qemu
> wic.Wic.test_qemu_efi
> wic.Wic.test_qemu
>
> We see intermittent failures on these tests anyway and I think you're
> onto the right track with a potential fix though.
Sorry, I was on sick leave yesterday, I will work on it today.
// Robert
>
> Cheers,
>
> Richard
>
>
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 7/8] qemuboot.bbclass: add two vars for use by runqemu
2017-04-07 9:47 [PATCH 0/8 V2] fixes for runqemu and runqemu + rm_work Robert Yang
` (5 preceding siblings ...)
2017-04-07 9:47 ` [PATCH 6/8] runqemu: do not rely on grepping images Robert Yang
@ 2017-04-07 9:47 ` Robert Yang
2017-04-10 16:53 ` Richard Purdie
2017-04-07 9:47 ` [PATCH 8/8] runqemu: make use of two new vars Robert Yang
7 siblings, 1 reply; 13+ messages in thread
From: Robert Yang @ 2017-04-07 9:47 UTC (permalink / raw)
To: openembedded-core
From: Chen Qi <Qi.Chen@windriver.com>
Add STAGING_DIR_TUNCTL_NATIVE and STAGING_DIR_QEMU_BINDIR_NATIVE so that
runqemu could find 'tunctl' and 'qemu-xxx' binaries to run correctly.
[YOCTO #11266]
[YOCTO #11193]
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
meta/classes/qemuboot.bbclass | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/meta/classes/qemuboot.bbclass b/meta/classes/qemuboot.bbclass
index 2870388dfb..ac52ef295e 100644
--- a/meta/classes/qemuboot.bbclass
+++ b/meta/classes/qemuboot.bbclass
@@ -70,12 +70,15 @@ QB_DRIVE_TYPE ?= "/dev/sd"
# Create qemuboot.conf
addtask do_write_qemuboot_conf after do_rootfs before do_image
IMGDEPLOYDIR ?= "${WORKDIR}/deploy-${PN}-image-complete"
+STAGING_DIR_TUNCTL_NATIVE = "${STAGING_DIR}-components/${BUILD_ARCH}/qemu-helper-native"
+STAGING_DIR_QEMU_BINDIR_NATIVE = "${STAGING_DIR}-components/${BUILD_ARCH}/qemu-native/usr/bin"
def qemuboot_vars(d):
build_vars = ['MACHINE', 'TUNE_ARCH', 'DEPLOY_DIR_IMAGE',
'KERNEL_IMAGETYPE', 'IMAGE_NAME', 'IMAGE_LINK_NAME',
'STAGING_DIR_NATIVE', 'STAGING_BINDIR_NATIVE',
- 'STAGING_DIR_HOST']
+ 'STAGING_DIR_HOST', 'STAGING_DIR_TUNCTL_NATIVE',
+ 'STAGING_DIR_QEMU_BINDIR_NATIVE']
return build_vars + [k for k in d.keys() if k.startswith('QB_')]
do_write_qemuboot_conf[vardeps] += "${@' '.join(qemuboot_vars(d))}"
--
2.11.0.rc2.dirty
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 7/8] qemuboot.bbclass: add two vars for use by runqemu
2017-04-07 9:47 ` [PATCH 7/8] qemuboot.bbclass: add two vars for use by runqemu Robert Yang
@ 2017-04-10 16:53 ` Richard Purdie
2017-04-11 2:29 ` ChenQi
0 siblings, 1 reply; 13+ messages in thread
From: Richard Purdie @ 2017-04-10 16:53 UTC (permalink / raw)
To: Robert Yang, openembedded-core; +Cc: Bartosh, Eduard
On Fri, 2017-04-07 at 02:47 -0700, Robert Yang wrote:
> From: Chen Qi <Qi.Chen@windriver.com>
>
> Add STAGING_DIR_TUNCTL_NATIVE and STAGING_DIR_QEMU_BINDIR_NATIVE so
> that
> runqemu could find 'tunctl' and 'qemu-xxx' binaries to run correctly.
>
> [YOCTO #11266]
> [YOCTO #11193]
>
> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Hi Robert/Qi,
Unfortunately this can't work as we can't use binaries directly from
the sysroot-components directory if they link to any libraries. tunctl
is ok but qemu links against libfdt.so.1 which isn't there. If the
system has its own copy, it may happen to work by luck but if it
doesn't, or the system version is incompatible we'd see failures.
So I'm afraid we need to find a different solution.
Cheers,
Richard
> meta/classes/qemuboot.bbclass | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/meta/classes/qemuboot.bbclass
> b/meta/classes/qemuboot.bbclass
> index 2870388dfb..ac52ef295e 100644
> --- a/meta/classes/qemuboot.bbclass
> +++ b/meta/classes/qemuboot.bbclass
> @@ -70,12 +70,15 @@ QB_DRIVE_TYPE ?= "/dev/sd"
> # Create qemuboot.conf
> addtask do_write_qemuboot_conf after do_rootfs before do_image
> IMGDEPLOYDIR ?= "${WORKDIR}/deploy-${PN}-image-complete"
> +STAGING_DIR_TUNCTL_NATIVE = "${STAGING_DIR}-
> components/${BUILD_ARCH}/qemu-helper-native"
> +STAGING_DIR_QEMU_BINDIR_NATIVE = "${STAGING_DIR}-
> components/${BUILD_ARCH}/qemu-native/usr/bin"
>
> def qemuboot_vars(d):
> build_vars = ['MACHINE', 'TUNE_ARCH', 'DEPLOY_DIR_IMAGE',
> 'KERNEL_IMAGETYPE', 'IMAGE_NAME', 'IMAGE_LINK_NAME',
> 'STAGING_DIR_NATIVE', 'STAGING_BINDIR_NATIVE',
> - 'STAGING_DIR_HOST']
> + 'STAGING_DIR_HOST', 'STAGING_DIR_TUNCTL_NATIVE',
> + 'STAGING_DIR_QEMU_BINDIR_NATIVE']
> return build_vars + [k for k in d.keys() if k.startswith('QB_')]
>
> do_write_qemuboot_conf[vardeps] += "${@' '.join(qemuboot_vars(d))}"
> --
> 2.11.0.rc2.dirty
>
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH 7/8] qemuboot.bbclass: add two vars for use by runqemu
2017-04-10 16:53 ` Richard Purdie
@ 2017-04-11 2:29 ` ChenQi
0 siblings, 0 replies; 13+ messages in thread
From: ChenQi @ 2017-04-11 2:29 UTC (permalink / raw)
To: Richard Purdie, Robert Yang, openembedded-core; +Cc: Bartosh, Eduard
On 04/11/2017 12:53 AM, Richard Purdie wrote:
> On Fri, 2017-04-07 at 02:47 -0700, Robert Yang wrote:
>> From: Chen Qi <Qi.Chen@windriver.com>
>>
>> Add STAGING_DIR_TUNCTL_NATIVE and STAGING_DIR_QEMU_BINDIR_NATIVE so
>> that
>> runqemu could find 'tunctl' and 'qemu-xxx' binaries to run correctly.
>>
>> [YOCTO #11266]
>> [YOCTO #11193]
>>
>> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> Hi Robert/Qi,
>
> Unfortunately this can't work as we can't use binaries directly from
> the sysroot-components directory if they link to any libraries. tunctl
> is ok but qemu links against libfdt.so.1 which isn't there. If the
> system has its own copy, it may happen to work by luck but if it
> doesn't, or the system version is incompatible we'd see failures.
>
> So I'm afraid we need to find a different solution.
>
> Cheers,
>
> Richard
>
Thanks for pointing that out.
I'm thinking about still just preserving recipe-sysroot-native of image
as the solution, because this directory seems to be the only one which
have both 'qemu-xxx' from qemu-native and 'tunctl' from
qemu-native-helper. What do you think?
P.S. I noticed that Ed also sent out a patch using this solution. The
patch title is "image.bbclass: prevent rm_work to remove native RSS".
Best Regards,
Chen Qi
>> meta/classes/qemuboot.bbclass | 5 ++++-
>> 1 file changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/meta/classes/qemuboot.bbclass
>> b/meta/classes/qemuboot.bbclass
>> index 2870388dfb..ac52ef295e 100644
>> --- a/meta/classes/qemuboot.bbclass
>> +++ b/meta/classes/qemuboot.bbclass
>> @@ -70,12 +70,15 @@ QB_DRIVE_TYPE ?= "/dev/sd"
>> # Create qemuboot.conf
>> addtask do_write_qemuboot_conf after do_rootfs before do_image
>> IMGDEPLOYDIR ?= "${WORKDIR}/deploy-${PN}-image-complete"
>> +STAGING_DIR_TUNCTL_NATIVE = "${STAGING_DIR}-
>> components/${BUILD_ARCH}/qemu-helper-native"
>> +STAGING_DIR_QEMU_BINDIR_NATIVE = "${STAGING_DIR}-
>> components/${BUILD_ARCH}/qemu-native/usr/bin"
>>
>> def qemuboot_vars(d):
>> build_vars = ['MACHINE', 'TUNE_ARCH', 'DEPLOY_DIR_IMAGE',
>> 'KERNEL_IMAGETYPE', 'IMAGE_NAME', 'IMAGE_LINK_NAME',
>> 'STAGING_DIR_NATIVE', 'STAGING_BINDIR_NATIVE',
>> - 'STAGING_DIR_HOST']
>> + 'STAGING_DIR_HOST', 'STAGING_DIR_TUNCTL_NATIVE',
>> + 'STAGING_DIR_QEMU_BINDIR_NATIVE']
>> return build_vars + [k for k in d.keys() if k.startswith('QB_')]
>>
>> do_write_qemuboot_conf[vardeps] += "${@' '.join(qemuboot_vars(d))}"
>> --
>> 2.11.0.rc2.dirty
>>
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 8/8] runqemu: make use of two new vars
2017-04-07 9:47 [PATCH 0/8 V2] fixes for runqemu and runqemu + rm_work Robert Yang
` (6 preceding siblings ...)
2017-04-07 9:47 ` [PATCH 7/8] qemuboot.bbclass: add two vars for use by runqemu Robert Yang
@ 2017-04-07 9:47 ` Robert Yang
7 siblings, 0 replies; 13+ messages in thread
From: Robert Yang @ 2017-04-07 9:47 UTC (permalink / raw)
To: openembedded-core
From: Chen Qi <Qi.Chen@windriver.com>
Make use of STAGING_DIR_TUNCTL_NATIVE and STAGING_DIR_QEMU_BINDIR_NATIVE
to run correctly. In this way, runqemu would still work when 'rm_work'
is enabled.
[YOCTO #11266]
[YOCTO #11193]
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
scripts/runqemu | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/scripts/runqemu b/scripts/runqemu
index 5b5d56b9ef..e741dfe05d 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -920,7 +920,10 @@ class BaseConfig(object):
gid = os.getgid()
uid = os.getuid()
logger.info("Setting up tap interface under sudo")
- cmd = 'sudo %s %s %s %s' % (self.qemuifup, uid, gid, self.get('STAGING_DIR_NATIVE'))
+ if os.path.exists(self.get('STAGING_DIR_TUNCTL_NATIVE')):
+ cmd = 'sudo %s %s %s %s' % (self.qemuifup, uid, gid, self.get('STAGING_DIR_TUNCTL_NATIVE'))
+ else:
+ cmd = 'sudo %s %s %s %s' % (self.qemuifup, uid, gid, self.get('STAGING_DIR_NATIVE'))
tap = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE).stdout.read().decode('utf-8').rstrip('\n')
lockfile = os.path.join(lockdir, tap)
self.lock = lockfile + '.lock'
@@ -1056,7 +1059,10 @@ class BaseConfig(object):
if not qemu_system:
raise Exception("Failed to boot, QB_SYSTEM_NAME is NULL!")
- qemu_bin = '%s/%s' % (self.get('STAGING_BINDIR_NATIVE'), qemu_system)
+ if os.path.exists(self.get('STAGING_DIR_QEMU_BINDIR_NATIVE')):
+ qemu_bin = '%s/%s' % (self.get('STAGING_DIR_QEMU_BINDIR_NATIVE'), qemu_system)
+ else:
+ qemu_bin = '%s/%s' % (self.get('STAGING_BINDIR_NATIVE'), qemu_system)
# It is possible to have qemu-native in ASSUME_PROVIDED, and it won't
# find QEMU in sysroot, it needs to use host's qemu.
--
2.11.0.rc2.dirty
^ permalink raw reply related [flat|nested] 13+ messages in thread