* [Qemu-devel] [Patch v4 0/3] Trivial cleanup in hw/acpi
@ 2019-02-14 8:49 Wei Yang
2019-02-14 8:49 ` [Qemu-devel] [Patch v4 1/3] hw/i386/pc.c: remove unused function pc_acpi_init() Wei Yang
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Wei Yang @ 2019-02-14 8:49 UTC (permalink / raw)
To: qemu-trivial, qemu-devel; +Cc: mst, laurent, imammedo, philmd, thuth, Wei Yang
There are several functions/variable which are not used anymore.
This serials just remove those without functional change.
v4: fix reviewed-by tags
v3: add ack and repost in a new thread
v2: change commit log from "is now used in no place" to "in not used anymore"
Wei Yang (3):
hw/i386/pc.c: remove unused function pc_acpi_init()
hw/acpi: remove unused function acpi_table_add_builtin()
hw/acpi: remove unnecessary variable acpi_table_builtin
hw/acpi/core.c | 10 +---------
hw/i386/pc.c | 27 ---------------------------
include/hw/acpi/acpi.h | 1 -
include/hw/i386/pc.h | 1 -
4 files changed, 1 insertion(+), 38 deletions(-)
--
2.19.1
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Qemu-devel] [Patch v4 1/3] hw/i386/pc.c: remove unused function pc_acpi_init()
2019-02-14 8:49 [Qemu-devel] [Patch v4 0/3] Trivial cleanup in hw/acpi Wei Yang
@ 2019-02-14 8:49 ` Wei Yang
2019-03-06 9:22 ` [Qemu-devel] [Qemu-trivial] " Laurent Vivier
2019-02-14 8:49 ` [Qemu-devel] [Patch v4 2/3] hw/acpi: remove unused function acpi_table_add_builtin() Wei Yang
2019-02-14 8:49 ` [Qemu-devel] [Patch v4 3/3] hw/acpi: remove unnecessary variable acpi_table_builtin Wei Yang
2 siblings, 1 reply; 7+ messages in thread
From: Wei Yang @ 2019-02-14 8:49 UTC (permalink / raw)
To: qemu-trivial, qemu-devel; +Cc: mst, laurent, imammedo, philmd, thuth, Wei Yang
Function pc_acpi_init() is not used anymore.
Remove the definition and declaration.
Signed-off-by: Wei Yang <richardw.yang@linux.intel.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
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);
--
2.19.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Qemu-devel] [Patch v4 2/3] hw/acpi: remove unused function acpi_table_add_builtin()
2019-02-14 8:49 [Qemu-devel] [Patch v4 0/3] Trivial cleanup in hw/acpi Wei Yang
2019-02-14 8:49 ` [Qemu-devel] [Patch v4 1/3] hw/i386/pc.c: remove unused function pc_acpi_init() Wei Yang
@ 2019-02-14 8:49 ` Wei Yang
2019-03-06 9:22 ` [Qemu-devel] [Qemu-trivial] " Laurent Vivier
2019-02-14 8:49 ` [Qemu-devel] [Patch v4 3/3] hw/acpi: remove unnecessary variable acpi_table_builtin Wei Yang
2 siblings, 1 reply; 7+ messages in thread
From: Wei Yang @ 2019-02-14 8:49 UTC (permalink / raw)
To: qemu-trivial, qemu-devel; +Cc: mst, laurent, imammedo, philmd, thuth, Wei Yang
Function acpi_table_add_builtin() is not used anymore.
Remove the definition and declaration.
Signed-off-by: Wei Yang <richardw.yang@linux.intel.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
---
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 {
--
2.19.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Qemu-devel] [Patch v4 3/3] hw/acpi: remove unnecessary variable acpi_table_builtin
2019-02-14 8:49 [Qemu-devel] [Patch v4 0/3] Trivial cleanup in hw/acpi Wei Yang
2019-02-14 8:49 ` [Qemu-devel] [Patch v4 1/3] hw/i386/pc.c: remove unused function pc_acpi_init() Wei Yang
2019-02-14 8:49 ` [Qemu-devel] [Patch v4 2/3] hw/acpi: remove unused function acpi_table_add_builtin() Wei Yang
@ 2019-02-14 8:49 ` Wei Yang
2019-03-06 9:23 ` [Qemu-devel] [Qemu-trivial] " Laurent Vivier
2 siblings, 1 reply; 7+ messages in thread
From: Wei Yang @ 2019-02-14 8:49 UTC (permalink / raw)
To: qemu-trivial, qemu-devel; +Cc: mst, laurent, imammedo, philmd, thuth, Wei Yang
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 <richardw.yang@linux.intel.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
---
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);
--
2.19.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [Qemu-trivial] [Patch v4 1/3] hw/i386/pc.c: remove unused function pc_acpi_init()
2019-02-14 8:49 ` [Qemu-devel] [Patch v4 1/3] hw/i386/pc.c: remove unused function pc_acpi_init() Wei Yang
@ 2019-03-06 9:22 ` Laurent Vivier
0 siblings, 0 replies; 7+ messages in thread
From: Laurent Vivier @ 2019-03-06 9:22 UTC (permalink / raw)
To: Wei Yang, qemu-trivial, qemu-devel; +Cc: thuth, mst, imammedo, philmd
On 14/02/2019 09:49, Wei Yang wrote:
> Function pc_acpi_init() is not used anymore.
>
> Remove the definition and declaration.
>
> Signed-off-by: Wei Yang <richardw.yang@linux.intel.com>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> Reviewed-by: Thomas Huth <thuth@redhat.com>
> ---
> 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);
>
>
Applied to my trivial-patches branch.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [Qemu-trivial] [Patch v4 2/3] hw/acpi: remove unused function acpi_table_add_builtin()
2019-02-14 8:49 ` [Qemu-devel] [Patch v4 2/3] hw/acpi: remove unused function acpi_table_add_builtin() Wei Yang
@ 2019-03-06 9:22 ` Laurent Vivier
0 siblings, 0 replies; 7+ messages in thread
From: Laurent Vivier @ 2019-03-06 9:22 UTC (permalink / raw)
To: Wei Yang, qemu-trivial, qemu-devel; +Cc: thuth, mst, imammedo, philmd
On 14/02/2019 09:49, Wei Yang wrote:
> Function acpi_table_add_builtin() is not used anymore.
>
> Remove the definition and declaration.
>
> Signed-off-by: Wei Yang <richardw.yang@linux.intel.com>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> ---
> 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 {
>
Applied to my trivial-patches branch.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [Qemu-trivial] [Patch v4 3/3] hw/acpi: remove unnecessary variable acpi_table_builtin
2019-02-14 8:49 ` [Qemu-devel] [Patch v4 3/3] hw/acpi: remove unnecessary variable acpi_table_builtin Wei Yang
@ 2019-03-06 9:23 ` Laurent Vivier
0 siblings, 0 replies; 7+ messages in thread
From: Laurent Vivier @ 2019-03-06 9:23 UTC (permalink / raw)
To: Wei Yang, qemu-trivial, qemu-devel; +Cc: thuth, mst, imammedo, philmd
On 14/02/2019 09:49, Wei Yang wrote:
> 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 <richardw.yang@linux.intel.com>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> ---
> 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);
>
Applied to my trivial-patches branch.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2019-03-06 9:23 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-14 8:49 [Qemu-devel] [Patch v4 0/3] Trivial cleanup in hw/acpi Wei Yang
2019-02-14 8:49 ` [Qemu-devel] [Patch v4 1/3] hw/i386/pc.c: remove unused function pc_acpi_init() Wei Yang
2019-03-06 9:22 ` [Qemu-devel] [Qemu-trivial] " Laurent Vivier
2019-02-14 8:49 ` [Qemu-devel] [Patch v4 2/3] hw/acpi: remove unused function acpi_table_add_builtin() Wei Yang
2019-03-06 9:22 ` [Qemu-devel] [Qemu-trivial] " Laurent Vivier
2019-02-14 8:49 ` [Qemu-devel] [Patch v4 3/3] hw/acpi: remove unnecessary variable acpi_table_builtin Wei Yang
2019-03-06 9:23 ` [Qemu-devel] [Qemu-trivial] " Laurent Vivier
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.