diff mbox series

[7/9] tests/acpi: unit test for 'acpi-pci-hotplug-with-bridge-support' bridge flag

Message ID 20200911180755.28409-7-ani@anisinha.ca (mailing list archive)
State New, archived
Headers show
Series [1/9] tests/acpi: document addition of table DSDT.roothp for unit testing root pci hotplug on/off | expand

Commit Message

Ani Sinha Sept. 11, 2020, 6:07 p.m. UTC
This change adds a new unit test for the global flag
'acpi-pci-hotplug-with-bridge-support' which is available for cold plugged pci
bridges in i440fx. The flag can be used to turn off acpi based hotplug support
for all the slots of the pci bus.

Tested on the upstream qemu master branch.

Signed-off-by: Ani Sinha <ani@anisinha.ca>
---
 tests/qtest/bios-tables-test.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

Comments

Igor Mammedov Sept. 14, 2020, 12:42 p.m. UTC | #1
On Fri, 11 Sep 2020 23:37:53 +0530
Ani Sinha <ani@anisinha.ca> wrote:

> This change adds a new unit test for the global flag
> 'acpi-pci-hotplug-with-bridge-support' which is available for cold plugged pci
> bridges in i440fx. The flag can be used to turn off acpi based hotplug support
> for all the slots of the pci bus.
not true or not clear,
should be 
 "turn off acpi based hotplug support on all PCI bridges"

> Tested on the upstream qemu master branch.
Doesn't belong to commit message

> 
> Signed-off-by: Ani Sinha <ani@anisinha.ca>
> ---
>  tests/qtest/bios-tables-test.c | 15 +++++++++++++++
>  1 file changed, 15 insertions(+)
> 
> diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
> index d8c7d57557..7632cfe1be 100644
> --- a/tests/qtest/bios-tables-test.c
> +++ b/tests/qtest/bios-tables-test.c
> @@ -754,6 +754,20 @@ static void test_acpi_piix4_root_hotplug(void)
>      free_test_data(&data);
>  }
>  
> +static void test_acpi_piix4_bridge_hotplug(void)
> +{
> +    test_data data;
> +
> +    memset(&data, 0, sizeof(data));
> +    data.machine = MACHINE_PC;
> +    data.variant = ".hpbridge";
> +    data.required_struct_types = base_required_struct_types;
> +    data.required_struct_types_len = ARRAY_SIZE(base_required_struct_types);
> +    test_acpi_one("-global PIIX4_PM.acpi-pci-hotplug-with-bridge-support=off "
> +                  "-device pci-bridge,chassis_nr=1", &data);
> +    free_test_data(&data);
> +}
> +
>  static void test_acpi_q35_tcg(void)
>  {
>      test_data data;
> @@ -1159,6 +1173,7 @@ int main(int argc, char *argv[])
>          qtest_add_func("acpi/piix4", test_acpi_piix4_tcg);
>          qtest_add_func("acpi/piix4/bridge", test_acpi_piix4_tcg_bridge);
>          qtest_add_func("acpi/piix4/hotplug", test_acpi_piix4_root_hotplug);
> +        qtest_add_func("acpi/piix4/brhotplug", test_acpi_piix4_bridge_hotplug);
>          qtest_add_func("acpi/q35", test_acpi_q35_tcg);
>          qtest_add_func("acpi/q35/bridge", test_acpi_q35_tcg_bridge);
>          qtest_add_func("acpi/q35/mmio64", test_acpi_q35_tcg_mmio64);
Igor Mammedov Sept. 14, 2020, 1:07 p.m. UTC | #2
On Mon, 14 Sep 2020 14:42:20 +0200
Igor Mammedov <imammedo@redhat.com> wrote:

> On Fri, 11 Sep 2020 23:37:53 +0530
> Ani Sinha <ani@anisinha.ca> wrote:
> 
> > This change adds a new unit test for the global flag
> > 'acpi-pci-hotplug-with-bridge-support' which is available for cold plugged pci
> > bridges in i440fx. The flag can be used to turn off acpi based hotplug support
> > for all the slots of the pci bus.  
> not true or not clear,
> should be 
>  "turn off acpi based hotplug support on all PCI bridges"
> 
> > Tested on the upstream qemu master branch.  
> Doesn't belong to commit message

with above fixed:

Reviewed-by: Igor Mammedov <imammedo@redhat.com>

> > 
> > Signed-off-by: Ani Sinha <ani@anisinha.ca>
> > ---
> >  tests/qtest/bios-tables-test.c | 15 +++++++++++++++
> >  1 file changed, 15 insertions(+)
> > 
> > diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
> > index d8c7d57557..7632cfe1be 100644
> > --- a/tests/qtest/bios-tables-test.c
> > +++ b/tests/qtest/bios-tables-test.c
> > @@ -754,6 +754,20 @@ static void test_acpi_piix4_root_hotplug(void)
> >      free_test_data(&data);
> >  }
> >  
> > +static void test_acpi_piix4_bridge_hotplug(void)
> > +{
> > +    test_data data;
> > +
> > +    memset(&data, 0, sizeof(data));
> > +    data.machine = MACHINE_PC;
> > +    data.variant = ".hpbridge";
> > +    data.required_struct_types = base_required_struct_types;
> > +    data.required_struct_types_len = ARRAY_SIZE(base_required_struct_types);
> > +    test_acpi_one("-global PIIX4_PM.acpi-pci-hotplug-with-bridge-support=off "
> > +                  "-device pci-bridge,chassis_nr=1", &data);
> > +    free_test_data(&data);
> > +}
> > +
> >  static void test_acpi_q35_tcg(void)
> >  {
> >      test_data data;
> > @@ -1159,6 +1173,7 @@ int main(int argc, char *argv[])
> >          qtest_add_func("acpi/piix4", test_acpi_piix4_tcg);
> >          qtest_add_func("acpi/piix4/bridge", test_acpi_piix4_tcg_bridge);
> >          qtest_add_func("acpi/piix4/hotplug", test_acpi_piix4_root_hotplug);
> > +        qtest_add_func("acpi/piix4/brhotplug", test_acpi_piix4_bridge_hotplug);
> >          qtest_add_func("acpi/q35", test_acpi_q35_tcg);
> >          qtest_add_func("acpi/q35/bridge", test_acpi_q35_tcg_bridge);
> >          qtest_add_func("acpi/q35/mmio64", test_acpi_q35_tcg_mmio64);  
> 
>
Ani Sinha Sept. 14, 2020, 1:42 p.m. UTC | #3
On Mon, Sep 14, 2020 at 6:39 PM Igor Mammedov <imammedo@redhat.com> wrote:
>
> On Mon, 14 Sep 2020 14:42:20 +0200
> Igor Mammedov <imammedo@redhat.com> wrote:
>
> > On Fri, 11 Sep 2020 23:37:53 +0530
> > Ani Sinha <ani@anisinha.ca> wrote:
> >
> > > This change adds a new unit test for the global flag
> > > 'acpi-pci-hotplug-with-bridge-support' which is available for cold plugged pci
> > > bridges in i440fx. The flag can be used to turn off acpi based hotplug support
> > > for all the slots of the pci bus.
> > not true or not clear,
> > should be
> >  "turn off acpi based hotplug support on all PCI bridges"
> >
> > > Tested on the upstream qemu master branch.
> > Doesn't belong to commit message
>
> with above fixed:
>
> Reviewed-by: Igor Mammedov <imammedo@redhat.com>

I sent a v2

>
> > >
> > > Signed-off-by: Ani Sinha <ani@anisinha.ca>
> > > ---
> > >  tests/qtest/bios-tables-test.c | 15 +++++++++++++++
> > >  1 file changed, 15 insertions(+)
> > >
> > > diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
> > > index d8c7d57557..7632cfe1be 100644
> > > --- a/tests/qtest/bios-tables-test.c
> > > +++ b/tests/qtest/bios-tables-test.c
> > > @@ -754,6 +754,20 @@ static void test_acpi_piix4_root_hotplug(void)
> > >      free_test_data(&data);
> > >  }
> > >
> > > +static void test_acpi_piix4_bridge_hotplug(void)
> > > +{
> > > +    test_data data;
> > > +
> > > +    memset(&data, 0, sizeof(data));
> > > +    data.machine = MACHINE_PC;
> > > +    data.variant = ".hpbridge";
> > > +    data.required_struct_types = base_required_struct_types;
> > > +    data.required_struct_types_len = ARRAY_SIZE(base_required_struct_types);
> > > +    test_acpi_one("-global PIIX4_PM.acpi-pci-hotplug-with-bridge-support=off "
> > > +                  "-device pci-bridge,chassis_nr=1", &data);
> > > +    free_test_data(&data);
> > > +}
> > > +
> > >  static void test_acpi_q35_tcg(void)
> > >  {
> > >      test_data data;
> > > @@ -1159,6 +1173,7 @@ int main(int argc, char *argv[])
> > >          qtest_add_func("acpi/piix4", test_acpi_piix4_tcg);
> > >          qtest_add_func("acpi/piix4/bridge", test_acpi_piix4_tcg_bridge);
> > >          qtest_add_func("acpi/piix4/hotplug", test_acpi_piix4_root_hotplug);
> > > +        qtest_add_func("acpi/piix4/brhotplug", test_acpi_piix4_bridge_hotplug);
> > >          qtest_add_func("acpi/q35", test_acpi_q35_tcg);
> > >          qtest_add_func("acpi/q35/bridge", test_acpi_q35_tcg_bridge);
> > >          qtest_add_func("acpi/q35/mmio64", test_acpi_q35_tcg_mmio64);
> >
> >
>
diff mbox series

Patch

diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index d8c7d57557..7632cfe1be 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -754,6 +754,20 @@  static void test_acpi_piix4_root_hotplug(void)
     free_test_data(&data);
 }
 
+static void test_acpi_piix4_bridge_hotplug(void)
+{
+    test_data data;
+
+    memset(&data, 0, sizeof(data));
+    data.machine = MACHINE_PC;
+    data.variant = ".hpbridge";
+    data.required_struct_types = base_required_struct_types;
+    data.required_struct_types_len = ARRAY_SIZE(base_required_struct_types);
+    test_acpi_one("-global PIIX4_PM.acpi-pci-hotplug-with-bridge-support=off "
+                  "-device pci-bridge,chassis_nr=1", &data);
+    free_test_data(&data);
+}
+
 static void test_acpi_q35_tcg(void)
 {
     test_data data;
@@ -1159,6 +1173,7 @@  int main(int argc, char *argv[])
         qtest_add_func("acpi/piix4", test_acpi_piix4_tcg);
         qtest_add_func("acpi/piix4/bridge", test_acpi_piix4_tcg_bridge);
         qtest_add_func("acpi/piix4/hotplug", test_acpi_piix4_root_hotplug);
+        qtest_add_func("acpi/piix4/brhotplug", test_acpi_piix4_bridge_hotplug);
         qtest_add_func("acpi/q35", test_acpi_q35_tcg);
         qtest_add_func("acpi/q35/bridge", test_acpi_q35_tcg_bridge);
         qtest_add_func("acpi/q35/mmio64", test_acpi_q35_tcg_mmio64);