| Message ID | 1488291209-29430-2-git-send-email-marcel@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Tue, 28 Feb 2017 16:13:28 +0200 Marcel Apfelbaum <marcel@redhat.com> wrote: > From: "Michael S. Tsirkin" <mst@redhat.com> > > Our _OSC method has a bunch of unused code loading data > into external CTRL and SUPP fields which are then never > used. Drop this in favor of a single local variable. > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> > --- > hw/i386/acpi-build.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index 1c928ab..1da6d9f 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -1803,7 +1803,7 @@ static Aml *build_q35_osc_method(void) > Aml *else_ctx; > Aml *method; > Aml *a_cwd1 = aml_name("CDW1"); > - Aml *a_ctrl = aml_name("CTRL"); > + Aml *a_ctrl = aml_local(0); > > method = aml_method("_OSC", 4, AML_NOTSERIALIZED); > aml_append(method, aml_create_dword_field(aml_arg(3), aml_int(0), "CDW1")); > @@ -1813,7 +1813,6 @@ static Aml *build_q35_osc_method(void) > aml_append(if_ctx, aml_create_dword_field(aml_arg(3), aml_int(4), "CDW2")); > aml_append(if_ctx, aml_create_dword_field(aml_arg(3), aml_int(8), "CDW3")); > > - aml_append(if_ctx, aml_store(aml_name("CDW2"), aml_name("SUPP"))); > aml_append(if_ctx, aml_store(aml_name("CDW3"), a_ctrl)); > > /* > @@ -1898,8 +1897,6 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, > aml_append(dev, aml_name_decl("_CID", aml_eisaid("PNP0A03"))); > aml_append(dev, aml_name_decl("_ADR", aml_int(0))); > aml_append(dev, aml_name_decl("_UID", aml_int(1))); > - aml_append(dev, aml_name_decl("SUPP", aml_int(0))); > - aml_append(dev, aml_name_decl("CTRL", aml_int(0))); > aml_append(dev, build_q35_osc_method()); > aml_append(sb_scope, dev); > aml_append(dsdt, sb_scope);
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 1c928ab..1da6d9f 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1803,7 +1803,7 @@ static Aml *build_q35_osc_method(void) Aml *else_ctx; Aml *method; Aml *a_cwd1 = aml_name("CDW1"); - Aml *a_ctrl = aml_name("CTRL"); + Aml *a_ctrl = aml_local(0); method = aml_method("_OSC", 4, AML_NOTSERIALIZED); aml_append(method, aml_create_dword_field(aml_arg(3), aml_int(0), "CDW1")); @@ -1813,7 +1813,6 @@ static Aml *build_q35_osc_method(void) aml_append(if_ctx, aml_create_dword_field(aml_arg(3), aml_int(4), "CDW2")); aml_append(if_ctx, aml_create_dword_field(aml_arg(3), aml_int(8), "CDW3")); - aml_append(if_ctx, aml_store(aml_name("CDW2"), aml_name("SUPP"))); aml_append(if_ctx, aml_store(aml_name("CDW3"), a_ctrl)); /* @@ -1898,8 +1897,6 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, aml_append(dev, aml_name_decl("_CID", aml_eisaid("PNP0A03"))); aml_append(dev, aml_name_decl("_ADR", aml_int(0))); aml_append(dev, aml_name_decl("_UID", aml_int(1))); - aml_append(dev, aml_name_decl("SUPP", aml_int(0))); - aml_append(dev, aml_name_decl("CTRL", aml_int(0))); aml_append(dev, build_q35_osc_method()); aml_append(sb_scope, dev); aml_append(dsdt, sb_scope);