diff mbox

[3/3] hw/net/spapr_llan: Enable the RX buffer pools by default for new machines

Message ID 1458130611-17304-4-git-send-email-thuth@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Thomas Huth March 16, 2016, 12:16 p.m. UTC
RX buffer pools are now enabled by default for new machine types.
For older machine types, they are still disabled to avoid breaking
migration.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 hw/net/spapr_llan.c | 2 +-
 hw/ppc/spapr.c      | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

Comments

David Gibson March 17, 2016, 6:27 a.m. UTC | #1
On Wed, Mar 16, 2016 at 01:16:51PM +0100, Thomas Huth wrote:
> RX buffer pools are now enabled by default for new machine types.
> For older machine types, they are still disabled to avoid breaking
> migration.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>

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

> ---
>  hw/net/spapr_llan.c | 2 +-
>  hw/ppc/spapr.c      | 7 ++++++-
>  2 files changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/net/spapr_llan.c b/hw/net/spapr_llan.c
> index 74c8b1e..4e28b89 100644
> --- a/hw/net/spapr_llan.c
> +++ b/hw/net/spapr_llan.c
> @@ -709,7 +709,7 @@ static Property spapr_vlan_properties[] = {
>      DEFINE_SPAPR_PROPERTIES(VIOsPAPRVLANDevice, sdev),
>      DEFINE_NIC_PROPERTIES(VIOsPAPRVLANDevice, nicconf),
>      DEFINE_PROP_BIT("use-rx-buffer-pools", VIOsPAPRVLANDevice,
> -                    compat_flags, SPAPRVLAN_FLAG_RX_BUF_POOLS_BIT, false),
> +                    compat_flags, SPAPRVLAN_FLAG_RX_BUF_POOLS_BIT, true),
>      DEFINE_PROP_END_OF_LIST(),
>  };
>  
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 79a70a9..50d5a62 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -2362,7 +2362,12 @@ DEFINE_SPAPR_MACHINE(2_6, "2.6", true);
>   * pseries-2.5
>   */
>  #define SPAPR_COMPAT_2_5 \
> -        HW_COMPAT_2_5
> +    HW_COMPAT_2_5 \
> +    { \
> +        .driver   = "spapr-vlan", \
> +        .property = "use-rx-buffer-pools", \
> +        .value    = "off", \
> +    },
>  
>  static void spapr_machine_2_5_instance_options(MachineState *machine)
>  {
Laurent Vivier March 18, 2016, 1:15 p.m. UTC | #2
On 16/03/2016 13:16, Thomas Huth wrote:
> RX buffer pools are now enabled by default for new machine types.
> For older machine types, they are still disabled to avoid breaking
> migration.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Reviewed-by: Laurent Vivier <lvivier@redhat.com>

> ---
>  hw/net/spapr_llan.c | 2 +-
>  hw/ppc/spapr.c      | 7 ++++++-
>  2 files changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/net/spapr_llan.c b/hw/net/spapr_llan.c
> index 74c8b1e..4e28b89 100644
> --- a/hw/net/spapr_llan.c
> +++ b/hw/net/spapr_llan.c
> @@ -709,7 +709,7 @@ static Property spapr_vlan_properties[] = {
>      DEFINE_SPAPR_PROPERTIES(VIOsPAPRVLANDevice, sdev),
>      DEFINE_NIC_PROPERTIES(VIOsPAPRVLANDevice, nicconf),
>      DEFINE_PROP_BIT("use-rx-buffer-pools", VIOsPAPRVLANDevice,
> -                    compat_flags, SPAPRVLAN_FLAG_RX_BUF_POOLS_BIT, false),
> +                    compat_flags, SPAPRVLAN_FLAG_RX_BUF_POOLS_BIT, true),
>      DEFINE_PROP_END_OF_LIST(),
>  };
>  
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 79a70a9..50d5a62 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -2362,7 +2362,12 @@ DEFINE_SPAPR_MACHINE(2_6, "2.6", true);
>   * pseries-2.5
>   */
>  #define SPAPR_COMPAT_2_5 \
> -        HW_COMPAT_2_5
> +    HW_COMPAT_2_5 \
> +    { \
> +        .driver   = "spapr-vlan", \
> +        .property = "use-rx-buffer-pools", \
> +        .value    = "off", \
> +    },
>  
>  static void spapr_machine_2_5_instance_options(MachineState *machine)
>  {
>
diff mbox

Patch

diff --git a/hw/net/spapr_llan.c b/hw/net/spapr_llan.c
index 74c8b1e..4e28b89 100644
--- a/hw/net/spapr_llan.c
+++ b/hw/net/spapr_llan.c
@@ -709,7 +709,7 @@  static Property spapr_vlan_properties[] = {
     DEFINE_SPAPR_PROPERTIES(VIOsPAPRVLANDevice, sdev),
     DEFINE_NIC_PROPERTIES(VIOsPAPRVLANDevice, nicconf),
     DEFINE_PROP_BIT("use-rx-buffer-pools", VIOsPAPRVLANDevice,
-                    compat_flags, SPAPRVLAN_FLAG_RX_BUF_POOLS_BIT, false),
+                    compat_flags, SPAPRVLAN_FLAG_RX_BUF_POOLS_BIT, true),
     DEFINE_PROP_END_OF_LIST(),
 };
 
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 79a70a9..50d5a62 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -2362,7 +2362,12 @@  DEFINE_SPAPR_MACHINE(2_6, "2.6", true);
  * pseries-2.5
  */
 #define SPAPR_COMPAT_2_5 \
-        HW_COMPAT_2_5
+    HW_COMPAT_2_5 \
+    { \
+        .driver   = "spapr-vlan", \
+        .property = "use-rx-buffer-pools", \
+        .value    = "off", \
+    },
 
 static void spapr_machine_2_5_instance_options(MachineState *machine)
 {