From nobody Sun May 19 06:50:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1595514538; cv=none; d=zohomail.com; s=zohoarc; b=ii0Gr5SlXEy67J8wm5e7+XUth9262PT738d/Hsnla39YrSc1cGfLkyvYeFEtXEYzI8pfkLF1km6GhJFAxvGA3Za5PLqgyvAhEM6W4pEVxX9hMS6iOrhOBgejPcfp5iKxoXX0Hr6jDpeV9ltPKkXuGFxGFffoAgaTU3OSSi6tZC8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595514538; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=VfTjsX6m7L9Arz4pLCqERJ9MtufA/zlYkLZGF36+QQg=; b=kdWq/6feEGKG4pCwzY1Z8K+hfk+0SHcdmg+VYJtC82gGI5AOTLQQelKGlFUzQP8x1Q1RRG7KzB8BCzBWcxyPEsz4DxG5e+ynnc3DETJy1wcGyGE0ALTYRxjtxInaiziZxqKrbKnN1JezhM9W4BK75REwsrpNP35uE2Mhhm6PCGE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1595514538165317.04799080460134; Thu, 23 Jul 2020 07:28:58 -0700 (PDT) Received: from localhost ([::1]:46316 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jycDQ-00084s-VY for importer@patchew.org; Thu, 23 Jul 2020 10:28:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45216) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jycCG-0006S9-Ij for qemu-devel@nongnu.org; Thu, 23 Jul 2020 10:27:44 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:51963 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jycCF-0006wx-1s for qemu-devel@nongnu.org; Thu, 23 Jul 2020 10:27:44 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-508-zRU38InFOTSa2b0GuqWeJg-1; Thu, 23 Jul 2020 10:27:40 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E53718014D4 for ; Thu, 23 Jul 2020 14:27:39 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-143.ams2.redhat.com [10.36.112.143]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B8A4D5D9D3; Thu, 23 Jul 2020 14:27:39 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 521C2111CA27; Thu, 23 Jul 2020 16:27:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595514462; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VfTjsX6m7L9Arz4pLCqERJ9MtufA/zlYkLZGF36+QQg=; b=KtMt3Cz2yQvVP+8/Z8e7xVnW5HNCVxfpibiKf9IHfoauqNRxzCwDXy7V1VXYFQyn6lq88e 7J2PydplwUWQX2I9ULKyNbTlCpwV9ZYWmi2Z5QOPogZ56TechulSOdjzWduH/XzsvDy50G 2nwbiVcEb27BXmwA+a7RInu46r+VvbA= X-MC-Unique: zRU38InFOTSa2b0GuqWeJg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 1/3] scripts/qmp/qom-fuse: Unbreak import of QEMUMonitorProtocol Date: Thu, 23 Jul 2020 16:27:36 +0200 Message-Id: <20200723142738.1868568-2-armbru@redhat.com> In-Reply-To: <20200723142738.1868568-1-armbru@redhat.com> References: <20200723142738.1868568-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.120; envelope-from=armbru@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/23 06:04:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Commit c7b942d7f8 "scripts/qmp: Fix shebang and imports" messed with it for reasons I don't quite understand. I do understand how it fails now: it neglects to import sys. Fix that. It now fails because it expects an old version of module fuse. That's next. Fixes: c7b942d7f84ef54f266921bf7668d43f1f2c7c79 Signed-off-by: Markus Armbruster Reviewed-by: John Snow Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- scripts/qmp/qom-fuse | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/qmp/qom-fuse b/scripts/qmp/qom-fuse index 5fa6b3bf64..b7dabe8d65 100755 --- a/scripts/qmp/qom-fuse +++ b/scripts/qmp/qom-fuse @@ -13,7 +13,7 @@ =20 import fuse, stat from fuse import Fuse -import os, posix +import os, posix, sys from errno import * =20 sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'pytho= n')) @@ -134,7 +134,7 @@ class QOMFS(Fuse): yield fuse.Direntry(str(item['name'])) =20 if __name__ =3D=3D '__main__': - import sys, os + import os =20 fs =3D QOMFS(QEMUMonitorProtocol(os.environ['QMP_SOCKET'])) fs.main(sys.argv) --=20 2.26.2 From nobody Sun May 19 06:50:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1595514539; cv=none; d=zohomail.com; s=zohoarc; b=clRbUTPQVQRymg+vLtaxnWCglz6a9p11azc4DR36R+FIbbjQYyuqojpZf+gMiAKbI9M6fG5FY3id6sMcEW75ZjqdYBvd18PD2vQ2Pc2M1uxSuf+tz70PhAi5DhMlHq10ma9RuJKj4hPUlO51QXeaohOs8filkEcR0Q3qrI2DFkc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595514539; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=FZ1A2Hc3w9dkNZx2lIZVLhtzz4NsYsiZiVAVTwKBLDc=; b=fY5iMTtD4VvGz8wJ7B8dogHfQjQ0zvpc5SXl1ytaAaw41CZWpSsKFDmr4ddBZT+D6cm6ohUnauUVhbmk2/g7NA/lpn7VsabEME2i0Dwj0MgzMifle78yfxf0yKzcPkfr/198XqjOy1/eP2817R2Fs8Taw3X4UJe3q8eaDdqHg2g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1595514539693904.2062554416783; Thu, 23 Jul 2020 07:28:59 -0700 (PDT) Received: from localhost ([::1]:46478 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jycDS-000897-DJ for importer@patchew.org; Thu, 23 Jul 2020 10:28:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45246) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jycCI-0006UP-53 for qemu-devel@nongnu.org; Thu, 23 Jul 2020 10:27:46 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:33577 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jycCG-0006x4-2L for qemu-devel@nongnu.org; Thu, 23 Jul 2020 10:27:45 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-19-atuCbOUCPDm48rhDcKRW9Q-1; Thu, 23 Jul 2020 10:27:40 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1827E10059B0 for ; Thu, 23 Jul 2020 14:27:40 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-143.ams2.redhat.com [10.36.112.143]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B967F60CC0; Thu, 23 Jul 2020 14:27:39 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 5581510F5AF1; Thu, 23 Jul 2020 16:27:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595514462; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FZ1A2Hc3w9dkNZx2lIZVLhtzz4NsYsiZiVAVTwKBLDc=; b=YKaix4qAE139s3iQTYfxFuu3o9UhKdmWDkIctVhy3Umd687gbaHBnbZdu4SyTwC13uTtX4 bHO2g34OrjtByepMEmiYYp6k+K/qstUJWsGzyCMX+u+j9ELjpYGDUMzniF4IN1b5YFwX+u ZCFWPMHK83LL0gmP7SR9zoF0Y6EPMIM= X-MC-Unique: atuCbOUCPDm48rhDcKRW9Q-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 2/3] scripts/qmp/qom-fuse: Port to current Python module fuse Date: Thu, 23 Jul 2020 16:27:37 +0200 Message-Id: <20200723142738.1868568-3-armbru@redhat.com> In-Reply-To: <20200723142738.1868568-1-armbru@redhat.com> References: <20200723142738.1868568-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.120; envelope-from=armbru@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/22 22:13:02 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Reviewed-by: John Snow --- scripts/qmp/qom-fuse | 93 ++++++++++++++++++++++---------------------- 1 file changed, 47 insertions(+), 46 deletions(-) diff --git a/scripts/qmp/qom-fuse b/scripts/qmp/qom-fuse index b7dabe8d65..405e6ebd67 100755 --- a/scripts/qmp/qom-fuse +++ b/scripts/qmp/qom-fuse @@ -3,16 +3,18 @@ # QEMU Object Model test tools # # Copyright IBM, Corp. 2012 +# Copyright (C) 2020 Red Hat, Inc. # # Authors: # Anthony Liguori +# Markus Armbruster # # This work is licensed under the terms of the GNU GPL, version 2 or later= . See # the COPYING file in the top-level directory. ## =20 import fuse, stat -from fuse import Fuse +from fuse import FUSE, FuseOSError, Operations import os, posix, sys from errno import * =20 @@ -21,9 +23,8 @@ from qemu.qmp import QEMUMonitorProtocol =20 fuse.fuse_python_api =3D (0, 2) =20 -class QOMFS(Fuse): - def __init__(self, qmp, *args, **kwds): - Fuse.__init__(self, *args, **kwds) +class QOMFS(Operations): + def __init__(self, qmp): self.qmp =3D qmp self.qmp.connect() self.ino_map =3D {} @@ -65,21 +66,21 @@ class QOMFS(Fuse): except: return False =20 - def read(self, path, length, offset): + def read(self, path, length, offset, fh): if not self.is_property(path): return -ENOENT =20 path, prop =3D path.rsplit('/', 1) try: - data =3D str(self.qmp.command('qom-get', path=3Dpath, property= =3Dprop)) + data =3D self.qmp.command('qom-get', path=3Dpath, property=3Dp= rop) data +=3D '\n' # make values shell friendly except: - return -EPERM + raise FuseOSError(EPERM) =20 if offset > len(data): return '' =20 - return str(data[offset:][:length]) + return bytes(data[offset:][:length], encoding=3D'utf-8') =20 def readlink(self, path): if not self.is_link(path): @@ -89,52 +90,52 @@ class QOMFS(Fuse): return prefix + str(self.qmp.command('qom-get', path=3Dpath, property=3Dprop)) =20 - def getattr(self, path): + def getattr(self, path, fh=3DNone): if self.is_link(path): - value =3D posix.stat_result((0o755 | stat.S_IFLNK, - self.get_ino(path), - 0, - 2, - 1000, - 1000, - 4096, - 0, - 0, - 0)) + value =3D { 'st_mode': 0o755 | stat.S_IFLNK, + 'st_ino': self.get_ino(path), + 'st_dev': 0, + 'st_nlink': 2, + 'st_uid': 1000, + 'st_gid': 1000, + 'st_size': 4096, + 'st_atime': 0, + 'st_mtime': 0, + 'st_ctime': 0 } elif self.is_object(path): - value =3D posix.stat_result((0o755 | stat.S_IFDIR, - self.get_ino(path), - 0, - 2, - 1000, - 1000, - 4096, - 0, - 0, - 0)) + value =3D { 'st_mode': 0o755 | stat.S_IFDIR, + 'st_ino': self.get_ino(path), + 'st_dev': 0, + 'st_nlink': 2, + 'st_uid': 1000, + 'st_gid': 1000, + 'st_size': 4096, + 'st_atime': 0, + 'st_mtime': 0, + 'st_ctime': 0 } elif self.is_property(path): - value =3D posix.stat_result((0o644 | stat.S_IFREG, - self.get_ino(path), - 0, - 1, - 1000, - 1000, - 4096, - 0, - 0, - 0)) + value =3D { 'st_mode': 0o644 | stat.S_IFREG, + 'st_ino': self.get_ino(path), + 'st_dev': 0, + 'st_nlink': 1, + 'st_uid': 1000, + 'st_gid': 1000, + 'st_size': 4096, + 'st_atime': 0, + 'st_mtime': 0, + 'st_ctime': 0 } else: - value =3D -ENOENT + raise FuseOSError(ENOENT) return value =20 - def readdir(self, path, offset): - yield fuse.Direntry('.') - yield fuse.Direntry('..') + def readdir(self, path, fh): + yield '.' + yield '..' for item in self.qmp.command('qom-list', path=3Dpath): - yield fuse.Direntry(str(item['name'])) + yield str(item['name']) =20 if __name__ =3D=3D '__main__': import os =20 - fs =3D QOMFS(QEMUMonitorProtocol(os.environ['QMP_SOCKET'])) - fs.main(sys.argv) + fuse =3D FUSE(QOMFS(QEMUMonitorProtocol(os.environ['QMP_SOCKET'])), + sys.argv[1], foreground=3DTrue) --=20 2.26.2 From nobody Sun May 19 06:50:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1595514625; cv=none; d=zohomail.com; s=zohoarc; b=hWPT7wUfbzNAzfk9iT1FY/2KrZTTwYRQnznOhxo10ilwi3iV0WptL36Y3r9PXJL37uwiviUTW/c4Sbg/io+w4NX+tP0nQYlTCwQujpfCjo8Hd4eYLRe5RbK8HsAJjX31R3c4UFzKWh94OepjrH/olIqnz5eaGIUVtH/BoF+e1/o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595514625; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SxgpzSARUKg0APZeWeak/iVUy1+FhCYqHcriF0jmv2s=; b=mCzW+1NbAMxgD5nVb5fdbsQfW8pMudh7Cx6QA3SWNBAVuucmr7HUGp2UF4r7Rjgz4n5SAbajQss5Rw0GBVNebmML/xCfyjYKdradtg6A05EZjwmOtlbW9IU/FQfZ3hW7j6QywZf9lsEtvSqqcODsMHELXvCs14hWXNlil/CvMEc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1595514625827548.6401077952235; Thu, 23 Jul 2020 07:30:25 -0700 (PDT) Received: from localhost ([::1]:52148 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jycEp-00025F-Dl for importer@patchew.org; Thu, 23 Jul 2020 10:30:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45244) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jycCH-0006Ts-Sx for qemu-devel@nongnu.org; Thu, 23 Jul 2020 10:27:45 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:51017 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jycCG-0006x2-27 for qemu-devel@nongnu.org; Thu, 23 Jul 2020 10:27:45 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-68-cEPslwJ9N_W8pw3ZMJydGg-1; Thu, 23 Jul 2020 10:27:40 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EAF9C1DE9 for ; Thu, 23 Jul 2020 14:27:39 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-143.ams2.redhat.com [10.36.112.143]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BD75919D7B; Thu, 23 Jul 2020 14:27:39 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 58EAC10A5B7A; Thu, 23 Jul 2020 16:27:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595514462; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SxgpzSARUKg0APZeWeak/iVUy1+FhCYqHcriF0jmv2s=; b=Hgfpyk96xtxf8zHcmVmdTMzYQiWJ3dw9w3avu9io3iYGSrxPUZP9aBcp0lxARKpEiFyTTW NNIWMWN5wwumvcfVN+3quYUOhR/hCIEtEfZ7CEmYtVgtFp0Vq6XiCjnw9mFnTUzwKPJbmI pvmtZMvXiPmo2VnUS73H2A3qXOvUsrk= X-MC-Unique: cEPslwJ9N_W8pw3ZMJydGg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 3/3] scripts/qmp/qom-fuse: Fix getattr(), read() for files in / Date: Thu, 23 Jul 2020 16:27:38 +0200 Message-Id: <20200723142738.1868568-4-armbru@redhat.com> In-Reply-To: <20200723142738.1868568-1-armbru@redhat.com> References: <20200723142738.1868568-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.61; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/23 02:33:29 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" path, prop =3D "type".rsplit('/', 1) sets path to "", which doesn't work. Correct to "/". Signed-off-by: Markus Armbruster Reviewed-by: John Snow Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- scripts/qmp/qom-fuse | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/scripts/qmp/qom-fuse b/scripts/qmp/qom-fuse index 405e6ebd67..7c7cff8edf 100755 --- a/scripts/qmp/qom-fuse +++ b/scripts/qmp/qom-fuse @@ -45,8 +45,10 @@ class QOMFS(Operations): return False =20 def is_property(self, path): + path, prop =3D path.rsplit('/', 1) + if path =3D=3D '': + path =3D '/' try: - path, prop =3D path.rsplit('/', 1) for item in self.qmp.command('qom-list', path=3Dpath): if item['name'] =3D=3D prop: return True @@ -55,8 +57,10 @@ class QOMFS(Operations): return False =20 def is_link(self, path): + path, prop =3D path.rsplit('/', 1) + if path =3D=3D '': + path =3D '/' try: - path, prop =3D path.rsplit('/', 1) for item in self.qmp.command('qom-list', path=3Dpath): if item['name'] =3D=3D prop: if item['type'].startswith('link<'): @@ -71,6 +75,8 @@ class QOMFS(Operations): return -ENOENT =20 path, prop =3D path.rsplit('/', 1) + if path =3D=3D '': + path =3D '/' try: data =3D self.qmp.command('qom-get', path=3Dpath, property=3Dp= rop) data +=3D '\n' # make values shell friendly --=20 2.26.2