From patchwork Wed Nov 21 05:10:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Li Qiang X-Patchwork-Id: 10691941 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 68F5413BF for ; Wed, 21 Nov 2018 05:12:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 57EF92B6E0 for ; Wed, 21 Nov 2018 05:12:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4BF182B6E6; Wed, 21 Nov 2018 05:12:08 +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.7 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 EB6AF2B6E0 for ; Wed, 21 Nov 2018 05:12:07 +0000 (UTC) Received: from localhost ([::1]:37252 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPKo3-0004ts-5g for patchwork-qemu-devel@patchwork.kernel.org; Wed, 21 Nov 2018 00:12:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43751) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPKml-00043b-EI for qemu-devel@nongnu.org; Wed, 21 Nov 2018 00:10:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gPKmi-00031M-Bt for qemu-devel@nongnu.org; Wed, 21 Nov 2018 00:10:47 -0500 Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]:34989) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gPKmi-0002zh-60 for qemu-devel@nongnu.org; Wed, 21 Nov 2018 00:10:44 -0500 Received: by mail-pl1-x641.google.com with SMTP id v1-v6so3697975plo.2 for ; Tue, 20 Nov 2018 21:10:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2ddOizbdB6oxBWbDQ3P024m4xfQCg/JY8LWwB7Hpfyc=; b=JbydRuQ6em5ATqT0RuONPbNIBjggbbIfSlG+P1G/vt1b9iUnQzqr2N7cqQjmBCoOhQ T4vcN+xa0r/e5bosF9GwoH/fjq05nqYxJEzjXA8ucOj7pEhxv56WWnrO5tzD4egDQWW6 rFmK+fzwf2uTZbSWVsEXa2dBmV0yCpineVg3ByfoKRx1QHbN06re5hsFbEpyHY/UMfN/ /g/+6nUWS1RLfZEZh080R80m4CBmgh4lzKQt90kV4QeRDKz2p1PgrA4ZJSXnQFvBIlaF zKgfMTiJ5WbV8MsFjqC3x/kvd+51+Eh0kxJduG5aEVzjuBKhTxj2qeO2nmSXWWBdUPaH 9ETQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2ddOizbdB6oxBWbDQ3P024m4xfQCg/JY8LWwB7Hpfyc=; b=A+iSsvK+4/YgCKA+66n1qdI0oyglEim6LEeiXeL5qLW7ynZsKNir0Ify24T/rbz/8z wnnkLWDNYZS6xyVeA5XxbbbJqI4zmqsVClaOG/JB2A21dejrPOEi0/6tYvNVHCRuh2z5 Z6U8lbdA9qfOHlWqwaLI51/7P5Bf1CO1EN8mBjJScSLxvDRfn/oviFAxBmAe1gG1Vhnk 614vgjKvYxoJ2QqYoluRg4dYBgLI+17SKKoTdbIYACAE6cnZuIEtzwR5tKduerQwPwRr seE/EUvwVyuf08YB35bxaPV4nix0Nx1Wek1gboPrvhFd0xe6Fn66xDe3M4FP7M/jddqC asaQ== X-Gm-Message-State: AA+aEWbkf2mP0PVLFHdDSXFPpYc5ehaVPmJqze80aoTyyS7EKyR5AK6+ afoZqOHrXLrgzuzMJZeCRM4= X-Google-Smtp-Source: AFSGD/WtdruIjPBEvEp3GLOHdvFZR5ErfHqTYpWEcjWN93NrCPQJJAl6Jpkq7O4cWDCm14msIOU1RQ== X-Received: by 2002:a17:902:a710:: with SMTP id w16mr5168240plq.95.1542777043244; Tue, 20 Nov 2018 21:10:43 -0800 (PST) Received: from localhost.localdomain.localdomain ([103.129.255.252]) by smtp.gmail.com with ESMTPSA id b62-v6sm52846616pfa.159.2018.11.20.21.10.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Nov 2018 21:10:42 -0800 (PST) From: Li Qiang To: armbru@redhat.com, pbonzini@redhat.com, kraxel@redhat.com, lersek@redhat.com, philmd@redhat.com Date: Tue, 20 Nov 2018 21:10:26 -0800 Message-Id: <1542777026-2788-4-git-send-email-liq3ea@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1542777026-2788-1-git-send-email-liq3ea@gmail.com> References: <1542777026-2788-1-git-send-email-liq3ea@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::641 Subject: [Qemu-devel] [PATCH v2 3/3] fw_cfg: make qemu_extra_params_fw locally 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: liq3ea@gmail.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP qemu_extra_params_fw[] has external linkage, but is used only in fw_cfg_bootsplash(), it makes sense to make it locally. Signed-off-by: Li Qiang Reviewed-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daudé --- hw/nvram/fw_cfg.c | 1 + include/sysemu/sysemu.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index aafa96721f..a71f043b5d 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -120,6 +120,7 @@ static void fw_cfg_bootsplash(FWCfgState *s) { const char *boot_splash_filename = NULL; const char *boot_splash_time = NULL; + uint8_t qemu_extra_params_fw[2]; char *filename, *file_data; gsize file_size; int file_type; diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 8d6095d98b..f8608d24d9 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -133,7 +133,6 @@ extern uint8_t *boot_splash_filedata; extern size_t boot_splash_filedata_size; extern bool enable_mlock; extern bool enable_cpu_pm; -extern uint8_t qemu_extra_params_fw[2]; extern QEMUClockType rtc_clock; extern const char *mem_path; extern int mem_prealloc;