From 57c522f47bf85de20c5bef3706b6fca6a70d7ac5 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Mon, 21 Mar 2016 17:25:24 +0100 Subject: [PATCH] hw/net/spapr_llan: Enable the RX buffer pools by default for new machines 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 Reviewed-by: David Gibson Reviewed-by: Laurent Vivier Signed-off-by: David Gibson --- 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 c7ce87017b..efc31cbfba 100644 --- a/hw/net/spapr_llan.c +++ b/hw/net/spapr_llan.c @@ -718,7 +718,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 ebbc6fe093..65abccb2f5 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2356,7 +2356,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) { -- 2.11.0