Re: [Qemu-devel] [PULL v5 00/43] Machine and x86 queue, 2019-07-03

[Peter Maydell]

On Wed, 3 Jul 2019 at 22:08, Eduardo Habkost <address@hidden> wrote:
>
> Changes v4 -> v5:
> * Rebase and solve conflicts with commit 374f63f6810a ("Merge remote-tracking
>   branch 'remotes/armbru/tags/pull-monitor-2019-07-02-v2' into staging")
>
> Changes v3 -> v4:
> * Fix ppc64 "make check" failure
>
> Changes v2 -> v3:
> * Fix "make check" warnings (Igor Mammedov)
> * Fix conflicts of "hw/arm: Replace global smp variables with
>   machine smp properties" with recent arm changes (Eduardo Habkost)
> * x86 versioned CPU models (Eduardo Habkost)
> * SnowRidge CPU model (Paul Lai)
> * Add deprecation information to query-machines (Eduardo Habkost)
>
> Changes v1 -> v2:
> * Fix s390x build failure
>
>
> The following changes since commit 374f63f6810a2f99254cdf32af67035d951301c8:
>
>   Merge remote-tracking branch 
> 'remotes/armbru/tags/pull-monitor-2019-07-02-v2' into staging (2019-07-03 
> 00:16:43 +0100)
>
> are available in the Git repository at:
>
>   git://github.com/ehabkost/qemu.git tags/machine-next-pull-request
>
> for you to fetch changes up to adae41278c7e3472b1f4f0228c37dbcfd95fa6a5:
>
>   tests: use -numa memdev option in tests instead of legacy 'mem' option 
> (2019-07-03 15:41:29 -0300)
>
> ----------------------------------------------------------------
> Machine and x86 queue, 2019-07-03
>
> * CPU die topology support (Like Xu)
> * Deprecation of features (Igor Mammedov):
>   * 'mem' parameter of '-numa node' option
>   * implict memory distribution between NUMA nodes
>   * deprecate -mem-path fallback to anonymous RAM
> * x86 versioned CPU models (Eduardo Habkost)
> * SnowRidge CPU model (Paul Lai)
> * Add deprecation information to query-machines (Eduardo Habkost)
> * Other i386 fixes
>

Hi; this fails to link (all platforms):

hw/riscv/sifive_u.o: In function `riscv_sifive_u_soc_realize':
/home/petmay01/linaro/qemu-for-merges/hw/riscv/sifive_u.c:356:
undefined reference to `smp_cpus'
/home/petmay01/linaro/qemu-for-merges/hw/riscv/sifive_u.c:358:
undefined reference to `smp_cpus'
collect2: error: ld returned 1 exit status

I guess you have a conflict with the recent riscv pullreq.

thanks
-- PMM