From nobody Fri Nov 7 18:35:56 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linux.intel.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548807972661945.8305064208711; Tue, 29 Jan 2019 16:26:12 -0800 (PST) Received: from localhost ([127.0.0.1]:57524 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1godhe-0004CW-M3 for importer@patchew.org; Tue, 29 Jan 2019 19:26:06 -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 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 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 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,538,1539673200"; d="scan'208";a="142536320" 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Function pc_acpi_init() is not used anymore. Remove the definition and declaration. Signed-off-by: Wei Yang Reviewed-by: Philippe Mathieu-Daud=E8=8C=85 Tested-by: Philippe Mathieu-Daud=E8=8C=85 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, MemoryReg= ion *system_memory, pci_address_space, -1); } =20 -void pc_acpi_init(const char *default_dsdt) -{ - char *filename; - - if (acpi_tables !=3D NULL) { - /* manually set via -acpitable, leave it alone */ - return; - } - - filename =3D qemu_find_file(QEMU_FILE_TYPE_BIOS, default_dsdt); - if (filename =3D=3D NULL) { - warn_report("failed to find %s", default_dsdt); - } else { - QemuOpts *opts =3D qemu_opts_create(qemu_find_opts("acpi"), NULL, = 0, - &error_abort); - Error *err =3D 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 l= evel); =20 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); =20 void pc_guest_info_init(PCMachineState *pcms); =20 --=20 2.19.1 From nobody Fri Nov 7 18:35:56 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linux.intel.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548808018430667.2081315761121; Tue, 29 Jan 2019 16:26:58 -0800 (PST) Received: from localhost ([127.0.0.1]:57526 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1godiO-0004hF-G1 for importer@patchew.org; Tue, 29 Jan 2019 19:26:52 -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 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 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 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,538,1539673200"; d="scan'208";a="142536323" 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Function acpi_table_add_builtin() is not used anymore. Remove the definition and declaration. Signed-off-by: Wei Yang Reviewed-by: Philippe Mathieu-Daud=E8=8C=85 Tested-by: Philippe Mathieu-Daud=E8=8C=85 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: =20 static bool acpi_table_builtin =3D false; =20 -void acpi_table_add_builtin(const QemuOpts *opts, Error **errp) -{ - acpi_table_builtin =3D true; - acpi_table_add(opts, errp); -} - unsigned acpi_table_len(void *current) { struct acpi_table_header *hdr =3D 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); =20 typedef struct AcpiSlicOem AcpiSlicOem; struct AcpiSlicOem { --=20 2.19.1 From nobody Fri Nov 7 18:35:56 2025 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linux.intel.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548807874229254.71245299012685; Tue, 29 Jan 2019 16:24:34 -0800 (PST) Received: from localhost ([127.0.0.1]:57476 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1godfz-0002nl-6G for importer@patchew.org; Tue, 29 Jan 2019 19:24:23 -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 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 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 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,538,1539673200"; d="scan'208";a="142536326" 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" 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=E8=8C=85 Tested-by: Philippe Mathieu-Daud=E8=8C=85 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); } =20 -static bool acpi_table_builtin =3D false; - unsigned acpi_table_len(void *current) { struct acpi_table_header *hdr =3D current - sizeof(hdr->_length); @@ -320,7 +318,7 @@ void *acpi_table_hdr(void *h) =20 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); --=20 2.19.1