* [Qemu-devel] [PATCH for-2.10] numa: Move numa_legacy_auto_assign_ram to pc-i440fx-2.9
@ 2017-08-18 19:09 Eduardo Habkost
2017-08-18 19:15 ` Eduardo Habkost
2017-08-23 12:47 ` Igor Mammedov
0 siblings, 2 replies; 6+ messages in thread
From: Eduardo Habkost @ 2017-08-18 19:09 UTC (permalink / raw)
To: qemu-devel
Cc: Laurent Vivier, Michael S. Tsirkin, Stefan Hajnoczi, Igor Mammedov
The 'm->numa_auto_assign_ram = numa_legacy_auto_assign_ram;' line
was supposed to be in pc_i440fx_2_9_machine_options() (see commit
3bfe5716 "numa: equally distribute memory on nodes"), but the
merge commit adb354dd ("Merge remote-tracking branch
'mst/tags/for_upstream' into staging") moved it to the
pc_i440fx_2_10_machine_options().
Move the line back to pc_i440fx_2_9_machine_options().
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
hw/i386/pc_piix.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 11b4336..46dfd2c 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -441,7 +441,6 @@ static void pc_i440fx_2_10_machine_options(MachineClass *m)
pc_i440fx_machine_options(m);
m->alias = "pc";
m->is_default = 1;
- m->numa_auto_assign_ram = numa_legacy_auto_assign_ram;
}
DEFINE_I440FX_MACHINE(v2_10, "pc-i440fx-2.10", NULL,
@@ -453,6 +452,7 @@ static void pc_i440fx_2_9_machine_options(MachineClass *m)
m->is_default = 0;
m->alias = NULL;
SET_MACHINE_COMPAT(m, PC_COMPAT_2_9);
+ m->numa_auto_assign_ram = numa_legacy_auto_assign_ram;
}
DEFINE_I440FX_MACHINE(v2_9, "pc-i440fx-2.9", NULL,
--
2.9.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.10] numa: Move numa_legacy_auto_assign_ram to pc-i440fx-2.9
2017-08-18 19:09 [Qemu-devel] [PATCH for-2.10] numa: Move numa_legacy_auto_assign_ram to pc-i440fx-2.9 Eduardo Habkost
@ 2017-08-18 19:15 ` Eduardo Habkost
2017-08-21 11:17 ` Igor Mammedov
2017-08-21 12:00 ` Peter Maydell
2017-08-23 12:47 ` Igor Mammedov
1 sibling, 2 replies; 6+ messages in thread
From: Eduardo Habkost @ 2017-08-18 19:15 UTC (permalink / raw)
To: qemu-devel
Cc: Laurent Vivier, Michael S. Tsirkin, Stefan Hajnoczi,
Igor Mammedov, Peter Maydell
On Fri, Aug 18, 2017 at 04:09:43PM -0300, Eduardo Habkost wrote:
> The 'm->numa_auto_assign_ram = numa_legacy_auto_assign_ram;' line
> was supposed to be in pc_i440fx_2_9_machine_options() (see commit
> 3bfe5716 "numa: equally distribute memory on nodes"), but the
> merge commit adb354dd ("Merge remote-tracking branch
> 'mst/tags/for_upstream' into staging") moved it to the
> pc_i440fx_2_10_machine_options().
>
> Move the line back to pc_i440fx_2_9_machine_options().
>
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
I just re-read the schedule wiki page and noticed 2017-08-22 is
"release _or_ tag -rc4". Does this mean including this patch
would slip the schedule for 1 week?
In that case, I don't think this patch should block the release
and cause a schedule slip. We can simply change the NUMA RAM
assignment algorithm in pc-2.11 and keep the old one in pc-2.10.
--
Eduardo
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.10] numa: Move numa_legacy_auto_assign_ram to pc-i440fx-2.9
2017-08-18 19:15 ` Eduardo Habkost
@ 2017-08-21 11:17 ` Igor Mammedov
2017-08-21 12:00 ` Peter Maydell
1 sibling, 0 replies; 6+ messages in thread
From: Igor Mammedov @ 2017-08-21 11:17 UTC (permalink / raw)
To: Eduardo Habkost
Cc: qemu-devel, Laurent Vivier, Peter Maydell, Stefan Hajnoczi,
Michael S. Tsirkin
On Fri, 18 Aug 2017 16:15:34 -0300
Eduardo Habkost <ehabkost@redhat.com> wrote:
> On Fri, Aug 18, 2017 at 04:09:43PM -0300, Eduardo Habkost wrote:
> > The 'm->numa_auto_assign_ram = numa_legacy_auto_assign_ram;' line
> > was supposed to be in pc_i440fx_2_9_machine_options() (see commit
> > 3bfe5716 "numa: equally distribute memory on nodes"), but the
> > merge commit adb354dd ("Merge remote-tracking branch
> > 'mst/tags/for_upstream' into staging") moved it to the
> > pc_i440fx_2_10_machine_options().
> >
> > Move the line back to pc_i440fx_2_9_machine_options().
> >
> > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
>
> I just re-read the schedule wiki page and noticed 2017-08-22 is
> "release _or_ tag -rc4". Does this mean including this patch
> would slip the schedule for 1 week?
>
> In that case, I don't think this patch should block the release
> and cause a schedule slip. We can simply change the NUMA RAM
> assignment algorithm in pc-2.11 and keep the old one in pc-2.10.
>
It doesn't look like blocker tom either,
at this point, I'd keep old algorithm for 2.10.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.10] numa: Move numa_legacy_auto_assign_ram to pc-i440fx-2.9
2017-08-18 19:15 ` Eduardo Habkost
2017-08-21 11:17 ` Igor Mammedov
@ 2017-08-21 12:00 ` Peter Maydell
1 sibling, 0 replies; 6+ messages in thread
From: Peter Maydell @ 2017-08-21 12:00 UTC (permalink / raw)
To: Eduardo Habkost
Cc: QEMU Developers, Laurent Vivier, Michael S. Tsirkin,
Stefan Hajnoczi, Igor Mammedov
On 18 August 2017 at 20:15, Eduardo Habkost <ehabkost@redhat.com> wrote:
> On Fri, Aug 18, 2017 at 04:09:43PM -0300, Eduardo Habkost wrote:
>> The 'm->numa_auto_assign_ram = numa_legacy_auto_assign_ram;' line
>> was supposed to be in pc_i440fx_2_9_machine_options() (see commit
>> 3bfe5716 "numa: equally distribute memory on nodes"), but the
>> merge commit adb354dd ("Merge remote-tracking branch
>> 'mst/tags/for_upstream' into staging") moved it to the
>> pc_i440fx_2_10_machine_options().
>>
>> Move the line back to pc_i440fx_2_9_machine_options().
>>
>> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
>
> I just re-read the schedule wiki page and noticed 2017-08-22 is
> "release _or_ tag -rc4". Does this mean including this patch
> would slip the schedule for 1 week?
Yes; we have a few patches of the "include this if we're doing
an rc4 anyway" variety, but currently nothing that would mean
we need to do an rc4.
> In that case, I don't think this patch should block the release
> and cause a schedule slip. We can simply change the NUMA RAM
> assignment algorithm in pc-2.11 and keep the old one in pc-2.10.
OK.
thanks
-- PMM
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.10] numa: Move numa_legacy_auto_assign_ram to pc-i440fx-2.9
2017-08-18 19:09 [Qemu-devel] [PATCH for-2.10] numa: Move numa_legacy_auto_assign_ram to pc-i440fx-2.9 Eduardo Habkost
2017-08-18 19:15 ` Eduardo Habkost
@ 2017-08-23 12:47 ` Igor Mammedov
2017-08-23 15:13 ` Peter Maydell
1 sibling, 1 reply; 6+ messages in thread
From: Igor Mammedov @ 2017-08-23 12:47 UTC (permalink / raw)
To: Eduardo Habkost
Cc: qemu-devel, Laurent Vivier, Stefan Hajnoczi, Michael S. Tsirkin,
Peter Maydell
On Fri, 18 Aug 2017 16:09:43 -0300
Eduardo Habkost <ehabkost@redhat.com> wrote:
> The 'm->numa_auto_assign_ram = numa_legacy_auto_assign_ram;' line
> was supposed to be in pc_i440fx_2_9_machine_options() (see commit
> 3bfe5716 "numa: equally distribute memory on nodes"), but the
> merge commit adb354dd ("Merge remote-tracking branch
> 'mst/tags/for_upstream' into staging") moved it to the
> pc_i440fx_2_10_machine_options().
>
> Move the line back to pc_i440fx_2_9_machine_options().
>
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Peter,
Could you merge this mis-merge fix as well for rc4?
> ---
> hw/i386/pc_piix.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 11b4336..46dfd2c 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -441,7 +441,6 @@ static void pc_i440fx_2_10_machine_options(MachineClass *m)
> pc_i440fx_machine_options(m);
> m->alias = "pc";
> m->is_default = 1;
> - m->numa_auto_assign_ram = numa_legacy_auto_assign_ram;
> }
>
> DEFINE_I440FX_MACHINE(v2_10, "pc-i440fx-2.10", NULL,
> @@ -453,6 +452,7 @@ static void pc_i440fx_2_9_machine_options(MachineClass *m)
> m->is_default = 0;
> m->alias = NULL;
> SET_MACHINE_COMPAT(m, PC_COMPAT_2_9);
> + m->numa_auto_assign_ram = numa_legacy_auto_assign_ram;
> }
>
> DEFINE_I440FX_MACHINE(v2_9, "pc-i440fx-2.9", NULL,
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.10] numa: Move numa_legacy_auto_assign_ram to pc-i440fx-2.9
2017-08-23 12:47 ` Igor Mammedov
@ 2017-08-23 15:13 ` Peter Maydell
0 siblings, 0 replies; 6+ messages in thread
From: Peter Maydell @ 2017-08-23 15:13 UTC (permalink / raw)
To: Igor Mammedov
Cc: Eduardo Habkost, QEMU Developers, Laurent Vivier,
Stefan Hajnoczi, Michael S. Tsirkin
On 23 August 2017 at 13:47, Igor Mammedov <imammedo@redhat.com> wrote:
> On Fri, 18 Aug 2017 16:09:43 -0300
> Eduardo Habkost <ehabkost@redhat.com> wrote:
>
>> The 'm->numa_auto_assign_ram = numa_legacy_auto_assign_ram;' line
>> was supposed to be in pc_i440fx_2_9_machine_options() (see commit
>> 3bfe5716 "numa: equally distribute memory on nodes"), but the
>> merge commit adb354dd ("Merge remote-tracking branch
>> 'mst/tags/for_upstream' into staging") moved it to the
>> pc_i440fx_2_10_machine_options().
>>
>> Move the line back to pc_i440fx_2_9_machine_options().
>>
>> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> Reviewed-by: Igor Mammedov <imammedo@redhat.com>
>
>
> Peter,
>
> Could you merge this mis-merge fix as well for rc4?
Sure, applied to master.
thanks
-- PMM
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-08-23 15:13 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-08-18 19:09 [Qemu-devel] [PATCH for-2.10] numa: Move numa_legacy_auto_assign_ram to pc-i440fx-2.9 Eduardo Habkost
2017-08-18 19:15 ` Eduardo Habkost
2017-08-21 11:17 ` Igor Mammedov
2017-08-21 12:00 ` Peter Maydell
2017-08-23 12:47 ` Igor Mammedov
2017-08-23 15:13 ` Peter Maydell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.