The following changes since commit d8f932cc696250cb740240d668b39df5fbb2d5a0:

  Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging (2017-10-05 16:54:29 +0100)

are available in the git repository at:

  git://github.com/ehabkost/qemu.git tags/x86-and-machine-pull-request

for you to fetch changes up to 7d7e9c4fd6873d9624956cbe0a5cbfae59b7f8af:

  x86: Correct translation of some rdgsbase and wrgsbase encodings (2017-10-05 17:30:06 -0300)

----------------------------------------------------------------
x86 and machine queue, 2017-10-05

Includes x86, NUMA, ACPI, QOM, CPU, and option/config parsing
patches.

Highlights:
* Deprecation of -nodefconfig option;
* MachineClass::valid_cpu_types field.

----------------------------------------------------------------

Alistair Francis (1):
  machine: Add a valid_cpu_types property

Dou Liyang (2):
  hw/acpi-build: Make assignment statement of next_base easy to read
  ACPI/unit-test: Add a new testcase for RAM allocation in numa node

Eduardo Habkost (3):
  vl: Eliminate defconfig variable
  qemu-options: Deprecate -nodefconfig
  config: qemu_config_parse() return number of config groups

Igor Mammedov (1):
  qom: update doc comment for type_register[_static]()

Philippe Mathieu-Daudé (1):
  qom/cpu: move cpu_model null check to cpu_class_by_name()

Todd Eisenberger (1):
  x86: Correct translation of some rdgsbase and wrgsbase encodings

 include/hw/boards.h                   |   1 +
 include/qom/object.h                  |   4 ++--
 block/blkdebug.c                      |   1 -
 hw/core/machine.c                     |  32 ++++++++++++++++++++++++++++++++
 hw/i386/acpi-build.c                  |   2 +-
 qom/cpu.c                             |   7 ++++++-
 target/alpha/cpu.c                    |   6 +-----
 target/arm/cpu.c                      |   4 ----
 target/cris/cpu.c                     |   4 ----
 target/i386/translate.c               |   4 ++--
 target/lm32/cpu.c                     |   4 ----
 target/m68k/cpu.c                     |   4 ----
 target/mips/cpu.c                     |   4 ----
 target/moxie/cpu.c                    |   8 +-------
 target/openrisc/cpu.c                 |   4 ----
 target/sh4/cpu.c                      |   3 ---
 target/sparc/cpu.c                    |   4 ----
 target/tricore/cpu.c                  |   4 ----
 target/unicore32/cpu.c                |   4 ----
 target/xtensa/cpu.c                   |   4 ----
 tests/bios-tables-test.c              |  24 ++++++++++++++++++++++++
 util/qemu-config.c                    |  15 +++++++--------
 vl.c                                  |   5 +----
 qemu-doc.texi                         |   4 ++++
 qemu-options.hx                       |  17 ++++-------------
 tests/acpi-test-data/pc/DSDT.numamem  | Bin 0 -> 5104 bytes
 tests/acpi-test-data/pc/SRAT.numamem  | Bin 0 -> 224 bytes
 tests/acpi-test-data/q35/DSDT.numamem | Bin 0 -> 7788 bytes
 tests/acpi-test-data/q35/SRAT.numamem | Bin 0 -> 224 bytes
 29 files changed, 86 insertions(+), 87 deletions(-)
 create mode 100644 tests/acpi-test-data/pc/DSDT.numamem
 create mode 100644 tests/acpi-test-data/pc/SRAT.numamem
 create mode 100644 tests/acpi-test-data/q35/DSDT.numamem
 create mode 100644 tests/acpi-test-data/q35/SRAT.numamem

-- 
2.13.6

On 5 October 2017 at 21:36, Eduardo Habkost <ehabkost@redhat.com> wrote:
> The following changes since commit d8f932cc696250cb740240d668b39df5fbb2d5a0:
>
>   Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging (2017-10-05 16:54:29 +0100)
>
> are available in the git repository at:
>
>   git://github.com/ehabkost/qemu.git tags/x86-and-machine-pull-request
>
> for you to fetch changes up to 7d7e9c4fd6873d9624956cbe0a5cbfae59b7f8af:
>
>   x86: Correct translation of some rdgsbase and wrgsbase encodings (2017-10-05 17:30:06 -0300)
>
> ----------------------------------------------------------------
> x86 and machine queue, 2017-10-05
>
> Includes x86, NUMA, ACPI, QOM, CPU, and option/config parsing
> patches.
>
> Highlights:
> * Deprecation of -nodefconfig option;
> * MachineClass::valid_cpu_types field.
>
> ----------------------------------------------------------------

This fails tests, I'm afraid:

TEST: tests/bios-tables-test... (pid=5565)
  /i386/acpi/piix4:
Looking for expected file 'tests/acpi-test-data/pc/DSDT'

Using expected file 'tests/acpi-test-data/pc/DSDT'

Looking for expected file 'tests/acpi-test-data/pc/APIC'

Using expected file 'tests/acpi-test-data/pc/APIC'

Looking for expected file 'tests/acpi-test-data/pc/HPET'

Using expected file 'tests/acpi-test-data/pc/HPET'
OK
  /i386/acpi/q35:
[snip]
  /i386/acpi/piix4/memhp:
Looking for expected file 'tests/acpi-test-data/pc/DSDT.memhp'

Using expected file 'tests/acpi-test-data/pc/DSDT.memhp'

Looking for expected file 'tests/acpi-test-data/pc/APIC.memhp'

Looking for expected file 'tests/acpi-test-data/pc/APIC'

Using expected file 'tests/acpi-test-data/pc/APIC'

Looking for expected file 'tests/acpi-test-data/pc/HPET.memhp'

Looking for expected file 'tests/acpi-test-data/pc/HPET'

Using expected file 'tests/acpi-test-data/pc/HPET'

Looking for expected file 'tests/acpi-test-data/pc/SRAT.memhp'

Using expected file 'tests/acpi-test-data/pc/SRAT.memhp'

Looking for expected file 'tests/acpi-test-data/pc/SLIT.memhp'

Using expected file 'tests/acpi-test-data/pc/SLIT.memhp'
acpi-test: Warning! DSDT mismatch. Actual [asl:/tmp/asl-6QYK7Y.dsl,
aml:/tmp/aml-E8YK7Y], Expected [asl:/tmp/asl-1H1I7Y.dsl,
aml:tests/acpi-test-data/pc/DSDT.memhp].
acpi-test: Warning. not showing difference since no diff utility is
specified. Set 'DIFF' environment variable to a preferred diff utility
and run 'make V=1 check' again to see ASL difference.OK

and same for /i386/acpi/piix4/numamem and for the
equivalent q35 tests.

Fails on s390, netbsd, freebsd, aarch32, x86-64.

As an aside, these acpi tests are a bit noisy with
V=1, especially the extra blank lines.

thanks
-- PMM

On 06.10.2017 14:17, Peter Maydell wrote:
[...]
> 
> As an aside, these acpi tests are a bit noisy with
> V=1, especially the extra blank lines.
> 

FWIW, I suggested a patch here to fix that:

https://lists.gnu.org/archive/html/qemu-devel/2017-08/msg05404.html

... but apparently Igor did not like it that much.

 Thomas

On Fri, Oct 06, 2017 at 01:17:42PM +0100, Peter Maydell wrote:
> On 5 October 2017 at 21:36, Eduardo Habkost <ehabkost@redhat.com> wrote:
> > The following changes since commit d8f932cc696250cb740240d668b39df5fbb2d5a0:
> >
> >   Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging (2017-10-05 16:54:29 +0100)
> >
> > are available in the git repository at:
> >
> >   git://github.com/ehabkost/qemu.git tags/x86-and-machine-pull-request
> >
> > for you to fetch changes up to 7d7e9c4fd6873d9624956cbe0a5cbfae59b7f8af:
> >
> >   x86: Correct translation of some rdgsbase and wrgsbase encodings (2017-10-05 17:30:06 -0300)
> >
> > ----------------------------------------------------------------
> > x86 and machine queue, 2017-10-05
> >
> > Includes x86, NUMA, ACPI, QOM, CPU, and option/config parsing
> > patches.
> >
> > Highlights:
> > * Deprecation of -nodefconfig option;
> > * MachineClass::valid_cpu_types field.
> >
> > ----------------------------------------------------------------
> 
> This fails tests, I'm afraid:
[...]
> acpi-test: Warning! DSDT mismatch. Actual [asl:/tmp/asl-6QYK7Y.dsl,
> aml:/tmp/aml-E8YK7Y], Expected [asl:/tmp/asl-1H1I7Y.dsl,
> aml:tests/acpi-test-data/pc/DSDT.memhp].
> acpi-test: Warning. not showing difference since no diff utility is
> specified. Set 'DIFF' environment variable to a preferred diff utility
> and run 'make V=1 check' again to see ASL difference.OK
> 
> and same for /i386/acpi/piix4/numamem and for the
> equivalent q35 tests.
> 
> Fails on s390, netbsd, freebsd, aarch32, x86-64.
> 

Oops, sorry!

I need to find out why it didn't fail on travis-ci:
https://travis-ci.org/ehabkost/qemu/builds/283884670

-- 
Eduardo

On 6 October 2017 at 16:27, Eduardo Habkost <ehabkost@redhat.com> wrote:
> On Fri, Oct 06, 2017 at 01:17:42PM +0100, Peter Maydell wrote:
>> This fails tests, I'm afraid:
> [...]
>> acpi-test: Warning! DSDT mismatch. Actual [asl:/tmp/asl-6QYK7Y.dsl,
>> aml:/tmp/aml-E8YK7Y], Expected [asl:/tmp/asl-1H1I7Y.dsl,
>> aml:tests/acpi-test-data/pc/DSDT.memhp].
>> acpi-test: Warning. not showing difference since no diff utility is
>> specified. Set 'DIFF' environment variable to a preferred diff utility
>> and run 'make V=1 check' again to see ASL difference.OK
>>
>> and same for /i386/acpi/piix4/numamem and for the
>> equivalent q35 tests.
>>
>> Fails on s390, netbsd, freebsd, aarch32, x86-64.
>>
>
> Oops, sorry!
>
> I need to find out why it didn't fail on travis-ci:
> https://travis-ci.org/ehabkost/qemu/builds/283884670

My guess is that one of {iasl installed, iasl not installed}
is broken, but the travis environments don't test both.

thanks
-- PMM

Hi Eduardo,

I couldn't reproduce the failure too. But, I have some concern below.

At 10/06/2017 11:37 PM, Peter Maydell wrote:
> On 6 October 2017 at 16:27, Eduardo Habkost <ehabkost@redhat.com> wrote:
>> On Fri, Oct 06, 2017 at 01:17:42PM +0100, Peter Maydell wrote:
>>> This fails tests, I'm afraid:
>> [...]
>>> acpi-test: Warning! DSDT mismatch. Actual [asl:/tmp/asl-6QYK7Y.dsl,
>>> aml:/tmp/aml-E8YK7Y], Expected [asl:/tmp/asl-1H1I7Y.dsl,
>>> aml:tests/acpi-test-data/pc/DSDT.memhp].

This warning is about memory hot-plug tests. DSDT mismatch is too
strange, I hope to see their difference.

>>> acpi-test: Warning. not showing difference since no diff utility is
>>> specified. Set 'DIFF' environment variable to a preferred diff utility
>>> and run 'make V=1 check' again to see ASL difference.OK
>>>
>>> and same for /i386/acpi/piix4/numamem and for the
>>> equivalent q35 tests.
>>>
>>> Fails on s390, netbsd, freebsd, aarch32, x86-64.
>>>
>>
>> Oops, sorry!
>>
>> I need to find out why it didn't fail on travis-ci:
>> https://travis-ci.org/ehabkost/qemu/builds/283884670
>
> My guess is that one of {iasl installed, iasl not installed}
> is broken, but the travis environments don't test both.
>
If we want do the "bios-tables-test", we need iasl support.

otherwise, when I run "make V=1 check" without iasl, the test
will report error:

...
TEST: tests/bios-tables-test... (pid=1006)
   /i386/acpi/piix4:
Looking for expected file 'tests/acpi-test-data/pc/DSDT'

Using expected file 'tests/acpi-test-data/pc/DSDT'

Looking for expected file 'tests/acpi-test-data/pc/APIC'

Using expected file 'tests/acpi-test-data/pc/APIC'

Looking for expected file 'tests/acpi-test-data/pc/HPET'

Using expected file 'tests/acpi-test-data/pc/HPET'
**
ERROR:tests/bios-tables-test.c:328:load_asl: assertion failed (error == 
NULL): Failed to execute child process "iasl" (No such file or 
directory) (g-exec-error-quark, 8)
FAIL
...

Thanks,
	dou.
> thanks
> -- PMM
>
>
>
>

On 10 October 2017 at 08:41, Dou Liyang <douly.fnst@cn.fujitsu.com> wrote:
> If we want do the "bios-tables-test", we need iasl support.
>
> otherwise, when I run "make V=1 check" without iasl, the test
> will report error:

This works in master at the moment, I think (whether by skipping
the test or by using pre-compiled tables I don't know). We need to
keep 'make check' working with and without iasl.

thanks
-- PMM

Hi Peter,

At 10/10/2017 05:40 PM, Peter Maydell wrote:
> On 10 October 2017 at 08:41, Dou Liyang <douly.fnst@cn.fujitsu.com> wrote:
>> If we want do the "bios-tables-test", we need iasl support.
>>
>> otherwise, when I run "make V=1 check" without iasl, the test
>> will report error:
>
> This works in master at the moment, I think (whether by skipping
> the test or by using pre-compiled tables I don't know). We need to
> keep 'make check' working with and without iasl.

Yes, you are right, QEMU uses the macro named CONFIG_IASL to skip
the test if there is no ACPICA-tools in our system.

The QEMU has already kept 'make check' working with and without iasl.

The way I tested was wrong.

Thanks,
	dou.
>
> thanks
> -- PMM
>
>
>

On Tue, Oct 10, 2017 at 03:41:56PM +0800, Dou Liyang wrote:
> Hi Eduardo,
> 
> I couldn't reproduce the failure too. But, I have some concern below.
> 
> At 10/06/2017 11:37 PM, Peter Maydell wrote:
> > On 6 October 2017 at 16:27, Eduardo Habkost <ehabkost@redhat.com> wrote:
> > > On Fri, Oct 06, 2017 at 01:17:42PM +0100, Peter Maydell wrote:
> > > > This fails tests, I'm afraid:
> > > [...]
> > > > acpi-test: Warning! DSDT mismatch. Actual [asl:/tmp/asl-6QYK7Y.dsl,
> > > > aml:/tmp/aml-E8YK7Y], Expected [asl:/tmp/asl-1H1I7Y.dsl,
> > > > aml:tests/acpi-test-data/pc/DSDT.memhp].
> 
> This warning is about memory hot-plug tests. DSDT mismatch is too
> strange, I hope to see their difference.
> 
> > > > acpi-test: Warning. not showing difference since no diff utility is
> > > > specified. Set 'DIFF' environment variable to a preferred diff utility
> > > > and run 'make V=1 check' again to see ASL difference.OK
> > > > 
> > > > and same for /i386/acpi/piix4/numamem and for the
> > > > equivalent q35 tests.
> > > > 
> > > > Fails on s390, netbsd, freebsd, aarch32, x86-64.
> > > > 
> > > 
> > > Oops, sorry!
> > > 
> > > I need to find out why it didn't fail on travis-ci:
> > > https://travis-ci.org/ehabkost/qemu/builds/283884670
> > 
> > My guess is that one of {iasl installed, iasl not installed}
> > is broken, but the travis environments don't test both.
> > 
> If we want do the "bios-tables-test", we need iasl support.
> 
> otherwise, when I run "make V=1 check" without iasl, the test
> will report error:
> 
> ...
> TEST: tests/bios-tables-test... (pid=1006)
>   /i386/acpi/piix4:
> Looking for expected file 'tests/acpi-test-data/pc/DSDT'
> 
> Using expected file 'tests/acpi-test-data/pc/DSDT'
> 
> Looking for expected file 'tests/acpi-test-data/pc/APIC'
> 
> Using expected file 'tests/acpi-test-data/pc/APIC'
> 
> Looking for expected file 'tests/acpi-test-data/pc/HPET'
> 
> Using expected file 'tests/acpi-test-data/pc/HPET'
> **
> ERROR:tests/bios-tables-test.c:328:load_asl: assertion failed (error ==
> NULL): Failed to execute child process "iasl" (No such file or directory)
> (g-exec-error-quark, 8)
> FAIL

This shouldn't happen if CONFIG_IASL is not defined.  Did you run
configure again after removing iasl?

-- 
Eduardo

On 10 October 2017 at 13:52, Eduardo Habkost <ehabkost@redhat.com> wrote:
> This shouldn't happen if CONFIG_IASL is not defined.  Did you run
> configure again after removing iasl?

I've neither added nor removed iasl from the build systems
in question. Pull request tests just apply the pull and
run make/make check.

thanks
-- PMM

Hi Peter,

At 10/10/2017 08:56 PM, Peter Maydell wrote:
> On 10 October 2017 at 13:52, Eduardo Habkost <ehabkost@redhat.com> wrote:
>> This shouldn't happen if CONFIG_IASL is not defined.  Did you run
>> configure again after removing iasl?
>
> I've neither added nor removed iasl from the build systems
> in question. Pull request tests just apply the pull and
> run make/make check.
>

Yes, Indeed.

now I can be sure that the problem is not related to iasl
installed or not. There are both OK in my host.

According to:
 >>> acpi-test: Warning! DSDT mismatch. Actual [asl:/tmp/asl-6QYK7Y.dsl,
 >>> aml:/tmp/aml-E8YK7Y], Expected [asl:/tmp/asl-1H1I7Y.dsl,
 >>> aml:tests/acpi-test-data/pc/DSDT.memhp].

May I resend the patch independently, and could you help me test it in
your machine. then, give me the output files, such as 
/tmp/asl-6QYK7Y.dsl and /tmp/asl-1H1I7Y.dsl file.

Thanks,
	dou.
> thanks
> -- PMM
>
>
>

On Tue, Oct 10, 2017 at 01:56:55PM +0100, Peter Maydell wrote:
> On 10 October 2017 at 13:52, Eduardo Habkost <ehabkost@redhat.com> wrote:
> > This shouldn't happen if CONFIG_IASL is not defined.  Did you run
> > configure again after removing iasl?
> 
> I've neither added nor removed iasl from the build systems
> in question. Pull request tests just apply the pull and
> run make/make check.

I understand.  The question was about the test failure reported
by Dou Liyang.

-- 
Eduardo

Hi Eduardo,

At 10/10/2017 08:52 PM, Eduardo Habkost wrote:
> This shouldn't happen if CONFIG_IASL is not defined.  Did you run
> configure again after removing iasl?

Oops, Yes, the result above is in CONFIG_IASL = iasl.  :-(
I have been aware of this problem.

I am waiting the result of the test with './configure --iasl="" '

Thanks,
	dou.