From patchwork Wed Jan 30 00:06:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Wei Yang X-Patchwork-Id: 10787371 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 7260D922 for ; Wed, 30 Jan 2019 00:25:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 647502CD56 for ; Wed, 30 Jan 2019 00:25:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 567662CF0C; Wed, 30 Jan 2019 00:25:46 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DC1632CD56 for ; Wed, 30 Jan 2019 00:25:45 +0000 (UTC) Received: from localhost ([127.0.0.1]:57524 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1godhJ-0004CW-6T for patchwork-qemu-devel@patchwork.kernel.org; Tue, 29 Jan 2019 19:25:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53002) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goddR-0001J7-1N for qemu-devel@nongnu.org; Tue, 29 Jan 2019 19:21:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1goddO-000469-Sg for qemu-devel@nongnu.org; Tue, 29 Jan 2019 19:21:44 -0500 Received: from mga01.intel.com ([192.55.52.88]:3447) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1godd5-0003yS-H6; Tue, 29 Jan 2019 19:21:23 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Jan 2019 16:07:28 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,538,1539673200"; d="scan'208";a="142536320" Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.37]) by fmsmga001.fm.intel.com with ESMTP; 29 Jan 2019 16:07:27 -0800 From: Wei Yang To: qemu-trivial@nongnu.org, qemu-devel@nongnu.org Date: Wed, 30 Jan 2019 08:06:51 +0800 Message-Id: <20190130000653.16267-2-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190130000653.16267-1-richardw.yang@linux.intel.com> References: <20190130000653.16267-1-richardw.yang@linux.intel.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.88 Subject: [Qemu-devel] [PATCH v3 1/3] hw/i386/pc.c: remove unused function pc_acpi_init() 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: imammedo@redhat.com, Wei Yang , philmd@redhat.com, laurent@vivier.eu, mst@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Function pc_acpi_init() is not used anymore. Remove the definition and declaration. Signed-off-by: Wei Yang Reviewed-by: Philippe Mathieu-Daud茅 Tested-by: Philippe Mathieu-Daud茅 Reviewed-by: Igor Mammedov Reviewed-by: Thomas Huth --- hw/i386/pc.c | 27 --------------------------- include/hw/i386/pc.h | 1 - 2 files changed, 28 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 5317e08f60..734d3268fa 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1280,33 +1280,6 @@ void pc_pci_as_mapping_init(Object *owner, MemoryRegion *system_memory, pci_address_space, -1); } -void pc_acpi_init(const char *default_dsdt) -{ - char *filename; - - if (acpi_tables != NULL) { - /* manually set via -acpitable, leave it alone */ - return; - } - - filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, default_dsdt); - if (filename == NULL) { - warn_report("failed to find %s", default_dsdt); - } else { - QemuOpts *opts = qemu_opts_create(qemu_find_opts("acpi"), NULL, 0, - &error_abort); - Error *err = NULL; - - qemu_opt_set(opts, "file", filename, &error_abort); - - acpi_table_add_builtin(opts, &err); - if (err) { - warn_reportf_err(err, "failed to load %s: ", filename); - } - g_free(filename); - } -} - void xen_load_linux(PCMachineState *pcms) { int i; diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 9d29c4b1df..541124ba6d 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -187,7 +187,6 @@ void pc_acpi_smi_interrupt(void *opaque, int irq, int level); void pc_cpus_init(PCMachineState *pcms); void pc_hot_add_cpu(const int64_t id, Error **errp); -void pc_acpi_init(const char *default_dsdt); void pc_guest_info_init(PCMachineState *pcms); From patchwork Wed Jan 30 00:06:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Wei Yang X-Patchwork-Id: 10787373 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 28EBB1399 for ; Wed, 30 Jan 2019 00:26:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 15FB12CD45 for ; Wed, 30 Jan 2019 00:26:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 05C9E2CD61; Wed, 30 Jan 2019 00:26:34 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AE7F12CD45 for ; Wed, 30 Jan 2019 00:26:33 +0000 (UTC) Received: from localhost ([127.0.0.1]:57526 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1godi4-0004hF-V6 for patchwork-qemu-devel@patchwork.kernel.org; Tue, 29 Jan 2019 19:26:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53003) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goddR-0001J8-1g for qemu-devel@nongnu.org; Tue, 29 Jan 2019 19:21:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1goddO-00046I-Ua for qemu-devel@nongnu.org; Tue, 29 Jan 2019 19:21:44 -0500 Received: from mga01.intel.com ([192.55.52.88]:3451) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1godd5-0003zp-Px; Tue, 29 Jan 2019 19:21:25 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Jan 2019 16:07:30 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,538,1539673200"; d="scan'208";a="142536323" Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.37]) by fmsmga001.fm.intel.com with ESMTP; 29 Jan 2019 16:07:29 -0800 From: Wei Yang To: qemu-trivial@nongnu.org, qemu-devel@nongnu.org Date: Wed, 30 Jan 2019 08:06:52 +0800 Message-Id: <20190130000653.16267-3-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190130000653.16267-1-richardw.yang@linux.intel.com> References: <20190130000653.16267-1-richardw.yang@linux.intel.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.88 Subject: [Qemu-devel] [PATCH v3 2/3] hw/acpi: remove unused function acpi_table_add_builtin() 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: imammedo@redhat.com, Wei Yang , philmd@redhat.com, laurent@vivier.eu, mst@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Function acpi_table_add_builtin() is not used anymore. Remove the definition and declaration. Signed-off-by: Wei Yang Reviewed-by: Philippe Mathieu-Daud茅 Tested-by: Philippe Mathieu-Daud茅 Reviewed-by: Igor Mammedov --- hw/acpi/core.c | 6 ------ include/hw/acpi/acpi.h | 1 - 2 files changed, 7 deletions(-) diff --git a/hw/acpi/core.c b/hw/acpi/core.c index d6f0709691..e9b1a85e54 100644 --- a/hw/acpi/core.c +++ b/hw/acpi/core.c @@ -305,12 +305,6 @@ out: static bool acpi_table_builtin = false; -void acpi_table_add_builtin(const QemuOpts *opts, Error **errp) -{ - acpi_table_builtin = true; - acpi_table_add(opts, errp); -} - unsigned acpi_table_len(void *current) { struct acpi_table_header *hdr = current - sizeof(hdr->_length); diff --git a/include/hw/acpi/acpi.h b/include/hw/acpi/acpi.h index c20ace0d0b..4a8bbaf1b5 100644 --- a/include/hw/acpi/acpi.h +++ b/include/hw/acpi/acpi.h @@ -190,7 +190,6 @@ uint8_t *acpi_table_first(void); uint8_t *acpi_table_next(uint8_t *current); unsigned acpi_table_len(void *current); void acpi_table_add(const QemuOpts *opts, Error **errp); -void acpi_table_add_builtin(const QemuOpts *opts, Error **errp); typedef struct AcpiSlicOem AcpiSlicOem; struct AcpiSlicOem { From patchwork Wed Jan 30 00:06:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Wei Yang X-Patchwork-Id: 10787369 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 2B277922 for ; Wed, 30 Jan 2019 00:23:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1C9CD2DD32 for ; Wed, 30 Jan 2019 00:23:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 106062DD7C; Wed, 30 Jan 2019 00:23:47 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B58B12DD32 for ; Wed, 30 Jan 2019 00:23:46 +0000 (UTC) Received: from localhost ([127.0.0.1]:57476 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1godfO-0002nl-16 for patchwork-qemu-devel@patchwork.kernel.org; Tue, 29 Jan 2019 19:23:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53043) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goddT-0001Ly-Ep for qemu-devel@nongnu.org; Tue, 29 Jan 2019 19:21:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1goddR-000470-12 for qemu-devel@nongnu.org; Tue, 29 Jan 2019 19:21:47 -0500 Received: from mga01.intel.com ([192.55.52.88]:3447) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1goddD-0003yS-JV; Tue, 29 Jan 2019 19:21:34 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Jan 2019 16:07:32 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,538,1539673200"; d="scan'208";a="142536326" Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.37]) by fmsmga001.fm.intel.com with ESMTP; 29 Jan 2019 16:07:30 -0800 From: Wei Yang To: qemu-trivial@nongnu.org, qemu-devel@nongnu.org Date: Wed, 30 Jan 2019 08:06:53 +0800 Message-Id: <20190130000653.16267-4-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190130000653.16267-1-richardw.yang@linux.intel.com> References: <20190130000653.16267-1-richardw.yang@linux.intel.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.88 Subject: [Qemu-devel] [PATCH v3 3/3] hw/acpi: remove unnecessary variable acpi_table_builtin 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: imammedo@redhat.com, Wei Yang , philmd@redhat.com, laurent@vivier.eu, mst@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP acpi_table_builtin is now always false, it is not necessary to check it again. This patch just removes it. Signed-off-by: Wei Yang Reviewed-by: Philippe Mathieu-Daud茅 Tested-by: Philippe Mathieu-Daud茅 Reviewed-by: Igor Mammedov --- hw/acpi/core.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/acpi/core.c b/hw/acpi/core.c index e9b1a85e54..f9c96535d1 100644 --- a/hw/acpi/core.c +++ b/hw/acpi/core.c @@ -303,8 +303,6 @@ out: error_propagate(errp, err); } -static bool acpi_table_builtin = false; - unsigned acpi_table_len(void *current) { struct acpi_table_header *hdr = current - sizeof(hdr->_length); @@ -320,7 +318,7 @@ void *acpi_table_hdr(void *h) uint8_t *acpi_table_first(void) { - if (acpi_table_builtin || !acpi_tables) { + if (!acpi_tables) { return NULL; } return acpi_table_hdr(acpi_tables + ACPI_TABLE_PFX_SIZE);