From patchwork Thu Apr 19 16:46:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 10351371 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 81A596023A for ; Thu, 19 Apr 2018 17:01:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 72AC12000A for ; Thu, 19 Apr 2018 17:01:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 65FEC219AC; Thu, 19 Apr 2018 17:01:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E6D5E2000A for ; Thu, 19 Apr 2018 17:00:59 +0000 (UTC) Received: from localhost ([::1]:60624 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f9Cva-0005uw-V3 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 19 Apr 2018 13:00:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33168) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f9CiC-0003IP-W6 for qemu-devel@nongnu.org; Thu, 19 Apr 2018 12:47:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f9CiB-0007RY-Pi for qemu-devel@nongnu.org; Thu, 19 Apr 2018 12:47:09 -0400 Received: from mail-qt0-x22b.google.com ([2607:f8b0:400d:c0d::22b]:45202) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f9CiB-0007RE-KF for qemu-devel@nongnu.org; Thu, 19 Apr 2018 12:47:07 -0400 Received: by mail-qt0-x22b.google.com with SMTP id b13-v6so6485545qtp.12 for ; Thu, 19 Apr 2018 09:47:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5rMypBEglsvAZFnjEzp/pe9q5f6nHe5/xb5qFlncpn0=; b=f4hkzIcX+hBr7o2t7XleCvaEPCC6nFiMx2de264cGDwy0LivhIMcs0NGyjFzd+1ghw mazWaf53R7BbWEBURJU+n0EiaHh5auxO+6fXFXHoZ3GRgXqj33fhJnNu01befXW26FUm E7uoQY59EtvFckCVcYDjLjmE7DbXnPK+poV2SuCgrH/0/kaZy84d8ReFs2auaYDXh3cX utgDQ/RoUmbvtCB2xef4vn/0hlxysn1zomPifpHy1lYax11rZk1HsrE0i/wD/Q8+oIfN KWjCjUslv52GJKEnIPV6/Yr5BwAGdgEcA5GWxEDbddpcQdYhtuMDba5YM9DtugDOSvLj LBnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=5rMypBEglsvAZFnjEzp/pe9q5f6nHe5/xb5qFlncpn0=; b=tX/KMmu4PtRFRPug7S94OzTha8v/mapkuvcg5Raxcd43TWDQnZ023nJ5ywA64stz2i E5Sl5co/D3IjKnDHaTUmb3NYxdD1qVgjvTBLDJpwYsEYTxspo1qW7AMEDgVcKYgY0Dgc 7XH99qhqOs5vEoGo+nygxxdc2CURKrvLWYtQWImgKllLy0G0YAIfnrIIjQbodFD9MLyt W0QuC7ILWF/MoXOSyQri4nYOgpcYH3W+rYw6SeYqhWsCCt4bEwqCr4bRE3E2TFhOu6Yt TzpdbqVZ/qmcr6Ve4fim3h9b9NCqZhkkEUBXkcuCCfkBhJ5Usb9zP0eNMjqcxYDSZtc0 GDTw== X-Gm-Message-State: ALQs6tA5d09HiZGIoH9EjZ2rXPdbwZkDGojoh9mlvgKrzOhvG97jkzVo iHkkvUzgWjKAiR49YUXypzg= X-Google-Smtp-Source: AIpwx49VdiGXhJDd6lQpPbZlxCh3xZ9fbYqiBlpoc/8ehIHKS2zUokKwY/HVVpXyoUmLTMmhaMxboA== X-Received: by 2002:ac8:701:: with SMTP id g1-v6mr6440102qth.397.1524156427043; Thu, 19 Apr 2018 09:47:07 -0700 (PDT) Received: from x1.local ([138.117.48.212]) by smtp.gmail.com with ESMTPSA id k126sm3040039qkd.34.2018.04.19.09.47.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Apr 2018 09:47:06 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: =?UTF-8?q?Luk=C3=A1=C5=A1=20Doktor?= , Cleber Rosa , Amador Pahim , Stefan Hajnoczi , Zheng Xiang Date: Thu, 19 Apr 2018 13:46:38 -0300 Message-Id: <20180419164642.9536-4-f4bug@amsat.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180419164642.9536-1-f4bug@amsat.org> References: <20180419164642.9536-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::22b Subject: [Qemu-devel] [RFC PATCH 3/7] qemu.py: Check console arch is supported before calling mktemp() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Alistair Francis , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Philippe Mathieu-Daudé Acked-by: Cleber Rosa --- scripts/qemu.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/qemu.py b/scripts/qemu.py index 0eecc44d09..379767b62f 100644 --- a/scripts/qemu.py +++ b/scripts/qemu.py @@ -189,6 +189,16 @@ class QEMUMachine(object): if option in item: return [] + device = '{dev_type},chardev=console' + if '86' in self._arch: + device = device.format(dev_type='isa-serial') + elif 'ppc' in self._arch: + device = device.format(dev_type='spapr-vty') + elif 's390x' in self._arch: + device = device.format(dev_type='sclpconsole') + else: + return [] + chardev = 'socket,id=console,{address},server,nowait' if console_address is None: console_address = tempfile.mktemp() @@ -203,16 +213,6 @@ class QEMUMachine(object): self._console_address = console_address - device = '{dev_type},chardev=console' - if '86' in self._arch: - device = device.format(dev_type='isa-serial') - elif 'ppc' in self._arch: - device = device.format(dev_type='spapr-vty') - elif 's390x' in self._arch: - device = device.format(dev_type='sclpconsole') - else: - return [] - return ['-chardev', chardev, '-device', device]