1. Patchew
  2. QEMU
  3. View series

[PATCH] hw/pci/pcie_port: Rename "enable-native-hotplug" property

Julia Suvorova posted 1 patch 2 years, 10 months ago
Failed in applying to current master (apply log)
hw/i386/pc_q35.c   | 4 ++--
hw/pci/pcie_port.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
[PATCH] hw/pci/pcie_port: Rename "enable-native-hotplug" property
Posted by Julia Suvorova 2 years, 10 months ago 
PCIE_SLOT property renamed to "native-hotplug" to be more concise
and consistent with other properties.

Signed-off-by: Julia Suvorova <jusual@redhat.com>
---
 hw/i386/pc_q35.c   | 4 ++--
 hw/pci/pcie_port.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index a0ec7964cc..04b4a4788d 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -243,8 +243,8 @@ static void pc_q35_init(MachineState *machine)
                                           NULL);
 
     if (acpi_pcihp) {
-        object_register_sugar_prop(TYPE_PCIE_SLOT, "enable-native-hotplug",
-                                  "false", true);
+        object_register_sugar_prop(TYPE_PCIE_SLOT, "native-hotplug",
+                                   "false", true);
     }
 
     /* irq lines */
diff --git a/hw/pci/pcie_port.c b/hw/pci/pcie_port.c
index a410111825..da850e8dde 100644
--- a/hw/pci/pcie_port.c
+++ b/hw/pci/pcie_port.c
@@ -148,7 +148,7 @@ static Property pcie_slot_props[] = {
     DEFINE_PROP_UINT8("chassis", PCIESlot, chassis, 0),
     DEFINE_PROP_UINT16("slot", PCIESlot, slot, 0),
     DEFINE_PROP_BOOL("hotplug", PCIESlot, hotplug, true),
-    DEFINE_PROP_BOOL("enable-native-hotplug", PCIESlot, native_hotplug, true),
+    DEFINE_PROP_BOOL("native-hotplug", PCIESlot, native_hotplug, true),
     DEFINE_PROP_END_OF_LIST()
 };
 
-- 
2.30.2
Re: [PATCH] hw/pci/pcie_port: Rename "enable-native-hotplug" property
Posted by Marcel Apfelbaum 2 years, 10 months ago 
On Wed, Jun 23, 2021 at 5:47 PM Julia Suvorova <jusual@redhat.com> wrote:

> PCIE_SLOT property renamed to "native-hotplug" to be more concise
> and consistent with other properties.
>
> Signed-off-by: Julia Suvorova <jusual@redhat.com>
> ---
>  hw/i386/pc_q35.c   | 4 ++--
>  hw/pci/pcie_port.c | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index a0ec7964cc..04b4a4788d 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -243,8 +243,8 @@ static void pc_q35_init(MachineState *machine)
>                                            NULL);
>
>      if (acpi_pcihp) {
> -        object_register_sugar_prop(TYPE_PCIE_SLOT,
> "enable-native-hotplug",
> -                                  "false", true);
> +        object_register_sugar_prop(TYPE_PCIE_SLOT, "native-hotplug",
> +                                   "false", true);
>      }
>
>      /* irq lines */
> diff --git a/hw/pci/pcie_port.c b/hw/pci/pcie_port.c
> index a410111825..da850e8dde 100644
> --- a/hw/pci/pcie_port.c
> +++ b/hw/pci/pcie_port.c
> @@ -148,7 +148,7 @@ static Property pcie_slot_props[] = {
>      DEFINE_PROP_UINT8("chassis", PCIESlot, chassis, 0),
>      DEFINE_PROP_UINT16("slot", PCIESlot, slot, 0),
>      DEFINE_PROP_BOOL("hotplug", PCIESlot, hotplug, true),
> -    DEFINE_PROP_BOOL("enable-native-hotplug", PCIESlot, native_hotplug,
> true),
> +    DEFINE_PROP_BOOL("native-hotplug", PCIESlot, native_hotplug, true),
>      DEFINE_PROP_END_OF_LIST()
>  };
>
> --
> 2.30.2
>
>
Reviewed-by: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>

Thanks,
Marcel
Re: [PATCH] hw/pci/pcie_port: Rename "enable-native-hotplug" property
Posted by David Gibson 2 years, 10 months ago 
On Wed, Jun 23, 2021 at 04:47:47PM +0200, Julia Suvorova wrote:
> PCIE_SLOT property renamed to "native-hotplug" to be more concise
> and consistent with other properties.
> 
> Signed-off-by: Julia Suvorova <jusual@redhat.com>
> Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> Reviewed-by: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>

Reviewed-by: David Gibson <david@gibson.dropbear.id.au>

> ---
>  hw/i386/pc_q35.c   | 4 ++--
>  hw/pci/pcie_port.c | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index a0ec7964cc..04b4a4788d 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -243,8 +243,8 @@ static void pc_q35_init(MachineState *machine)
>                                            NULL);
>  
>      if (acpi_pcihp) {
> -        object_register_sugar_prop(TYPE_PCIE_SLOT, "enable-native-hotplug",
> -                                  "false", true);
> +        object_register_sugar_prop(TYPE_PCIE_SLOT, "native-hotplug",
> +                                   "false", true);
>      }
>  
>      /* irq lines */
> diff --git a/hw/pci/pcie_port.c b/hw/pci/pcie_port.c
> index a410111825..da850e8dde 100644
> --- a/hw/pci/pcie_port.c
> +++ b/hw/pci/pcie_port.c
> @@ -148,7 +148,7 @@ static Property pcie_slot_props[] = {
>      DEFINE_PROP_UINT8("chassis", PCIESlot, chassis, 0),
>      DEFINE_PROP_UINT16("slot", PCIESlot, slot, 0),
>      DEFINE_PROP_BOOL("hotplug", PCIESlot, hotplug, true),
> -    DEFINE_PROP_BOOL("enable-native-hotplug", PCIESlot, native_hotplug, true),
> +    DEFINE_PROP_BOOL("native-hotplug", PCIESlot, native_hotplug, true),
>      DEFINE_PROP_END_OF_LIST()
>  };
>  

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson
Re: [PATCH] hw/pci/pcie_port: Rename "enable-native-hotplug" property
Posted by Igor Mammedov 2 years, 10 months ago 
On Wed, 23 Jun 2021 16:47:47 +0200
Julia Suvorova <jusual@redhat.com> wrote:

> PCIE_SLOT property renamed to "native-hotplug" to be more concise
> and consistent with other properties.
> 
> Signed-off-by: Julia Suvorova <jusual@redhat.com>

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

> ---
>  hw/i386/pc_q35.c   | 4 ++--
>  hw/pci/pcie_port.c | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index a0ec7964cc..04b4a4788d 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -243,8 +243,8 @@ static void pc_q35_init(MachineState *machine)
>                                            NULL);
>  
>      if (acpi_pcihp) {
> -        object_register_sugar_prop(TYPE_PCIE_SLOT, "enable-native-hotplug",
> -                                  "false", true);
> +        object_register_sugar_prop(TYPE_PCIE_SLOT, "native-hotplug",
> +                                   "false", true);
>      }
>  
>      /* irq lines */
> diff --git a/hw/pci/pcie_port.c b/hw/pci/pcie_port.c
> index a410111825..da850e8dde 100644
> --- a/hw/pci/pcie_port.c
> +++ b/hw/pci/pcie_port.c
> @@ -148,7 +148,7 @@ static Property pcie_slot_props[] = {
>      DEFINE_PROP_UINT8("chassis", PCIESlot, chassis, 0),
>      DEFINE_PROP_UINT16("slot", PCIESlot, slot, 0),
>      DEFINE_PROP_BOOL("hotplug", PCIESlot, hotplug, true),
> -    DEFINE_PROP_BOOL("enable-native-hotplug", PCIESlot, native_hotplug, true),
> +    DEFINE_PROP_BOOL("native-hotplug", PCIESlot, native_hotplug, true),
>      DEFINE_PROP_END_OF_LIST()
>  };
>

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.