qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] eabff1: Revert "pc: Add 'etc/boot-cpus' fw_cf


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] eabff1: Revert "pc: Add 'etc/boot-cpus' fw_cfg file for ma...
Date: Sat, 19 Nov 2016 04:30:03 -0800

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: eabff1582032b662fa58e6e880ca7399f1b78369
      
https://github.com/qemu/qemu/commit/eabff1582032b662fa58e6e880ca7399f1b78369
  Author: Igor Mammedov <address@hidden>
  Date:   2016-11-16 (Wed, 16 Nov 2016)

  Changed paths:
    M hw/i386/pc.c
    M include/hw/i386/pc.h

  Log Message:
  -----------
  Revert "pc: Add 'etc/boot-cpus' fw_cfg file for machine with more than 255 
CPUs"

This reverts commit 080ac219cc7d9c55adf925c3545b7450055ad625.

Legacy FW_CFG_NB_CPUS will be reused instead of 'etc/boot-cpus'
fw_cfg file since it does the same and there is no point
to maintaing duplicate guest ABI, if it can be helped.

Signed-off-by: Igor Mammedov <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>


  Commit: 5836d16812cda6b93380632802d56411972e3148
      
https://github.com/qemu/qemu/commit/5836d16812cda6b93380632802d56411972e3148
  Author: Igor Mammedov <address@hidden>
  Date:   2016-11-16 (Wed, 16 Nov 2016)

  Changed paths:
    M hw/arm/virt.c
    M hw/i386/pc.c
    M hw/nvram/fw_cfg.c
    M hw/ppc/mac_newworld.c
    M hw/ppc/mac_oldworld.c
    M hw/sparc/sun4m.c
    M hw/sparc64/sun4u.c

  Log Message:
  -----------
  fw_cfg: move FW_CFG_NB_CPUS out of fw_cfg_init1()

PC will use this field in other way, so move it outside the common
code so PC could set a different value, i.e. all CPUs
regardless of where they are coming from (-smp X | -device cpu...).

It's quick and dirty hack as it could be implemented in more generic
way in MashineClass. But do it in simple way since only PC is affected
so far.

Later we can generalize it when another affected target gets support
for -device cpu.

Signed-off-by: Igor Mammedov <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>


  Commit: e3cadac073a99489df1627be56c3f487f5cb9e31
      
https://github.com/qemu/qemu/commit/e3cadac073a99489df1627be56c3f487f5cb9e31
  Author: Igor Mammedov <address@hidden>
  Date:   2016-11-16 (Wed, 16 Nov 2016)

  Changed paths:
    M hw/i386/pc.c
    M include/hw/i386/pc.h

  Log Message:
  -----------
  pc: fix FW_CFG_NB_CPUS to account for -device added CPUs

Signed-off-by: Igor Mammedov <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>


  Commit: 252093a726eb8aefdea13544554c24f7704555b4
      
https://github.com/qemu/qemu/commit/252093a726eb8aefdea13544554c24f7704555b4
  Author: zhanghailiang <address@hidden>
  Date:   2016-11-17 (Thu, 17 Nov 2016)

  Changed paths:
    M qapi-schema.json

  Log Message:
  -----------
  qapi-schema: clarify 'colo' state for MigrationStatus

VM can not get into colo state unless users enable 'x-colo'
capability for migration, Here it is necessary to clarify
this.

Suggested-by: Eric Blake <address@hidden>
Signed-off-by: zhanghailiang <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: b2b79a696052040389e0f9980801a880ce5a6ae3
      
https://github.com/qemu/qemu/commit/b2b79a696052040389e0f9980801a880ce5a6ae3
  Author: Zhuang Yanying <address@hidden>
  Date:   2016-11-17 (Thu, 17 Nov 2016)

  Changed paths:
    M hw/misc/ivshmem.c

  Log Message:
  -----------
  ivshmem: Fix 64 bit memory bar configuration

Device ivshmem property use64=0 is designed to make the device
expose a 32 bit shared memory BAR instead of 64 bit one.  The
default is a 64 bit BAR, except pc-1.2 and older retain a 32 bit
BAR.  A 32 bit BAR can support only up to 1 GiB of shared memory.

This worked as designed until commit 5400c02 accidentally flipped
its sense: since then, we misinterpret use64=0 as use64=1 and vice
versa.  Worse, the default got flipped as well.  Devices
ivshmem-plain and ivshmem-doorbell are not affected.

Fix by restoring the test of IVShmemState member not_legacy_32bit
that got messed up in commit 5400c02.  Also update its
initialization for devices ivhsmem-plain and ivshmem-doorbell.
Without that, they'd regress to 32 bit BARs.

Signed-off-by: Zhuang Yanying <address@hidden>
Reviewed-by: Gonglei <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>


  Commit: dfbd2768b26d8aa1018004e736f2573e7f6abe67
      
https://github.com/qemu/qemu/commit/dfbd2768b26d8aa1018004e736f2573e7f6abe67
  Author: Richard Henderson <address@hidden>
  Date:   2016-11-17 (Thu, 17 Nov 2016)

  Changed paths:
    M pc-bios/palcode-clipper
    M roms/qemu-palcode

  Log Message:
  -----------
  target-alpha: Update palcode for smp

Signed-off-by: Richard Henderson <address@hidden>


  Commit: 022f52e040807363213c8752ce61a7d0f57e3078
      
https://github.com/qemu/qemu/commit/022f52e040807363213c8752ce61a7d0f57e3078
  Author: Richard Henderson <address@hidden>
  Date:   2016-11-17 (Thu, 17 Nov 2016)

  Changed paths:
    M target-alpha/helper.c

  Log Message:
  -----------
  target-alpha: Log cpuid with -d int

Signed-off-by: Richard Henderson <address@hidden>


  Commit: 363effe28b188460f8a0b075b841fdca1b2043d4
      
https://github.com/qemu/qemu/commit/363effe28b188460f8a0b075b841fdca1b2043d4
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2016-11-18 (Fri, 18 Nov 2016)

  Changed paths:
    M qapi-schema.json

  Log Message:
  -----------
  Merge remote-tracking branch 'vivier/tags/trivial-patches-pull-request' into 
staging

# gpg: Signature made Thu 17 Nov 2016 10:18:58 AM GMT
# gpg:                using RSA key 0xF30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <address@hidden>"
# gpg:                 aka "Laurent Vivier <address@hidden>"
# gpg:                 aka "Laurent Vivier (Red Hat) <address@hidden>"
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* vivier/tags/trivial-patches-pull-request:
  qapi-schema: clarify 'colo' state for MigrationStatus

Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: d4f7ca59017835784c6872dfab0e269d9b41b05a
      
https://github.com/qemu/qemu/commit/d4f7ca59017835784c6872dfab0e269d9b41b05a
  Author: Greg Kurz <address@hidden>
  Date:   2016-11-18 (Fri, 18 Nov 2016)

  Changed paths:
    M scripts/tracetool.py

  Log Message:
  -----------
  trace: fix generated code build break

If the QEMU source dir is

    /var/tmp/aaa-qemu-clone

and the build dir is

    /var/tmp/qemu-aio-poll-v2

Then I get an error as:

trace/generated-tracers.c:15950:13: error: invalid suffix "_trace_events"
 on integer constant
 TraceEvent *2_trace_events[] = {
       ^
trace/generated-tracers.c:15950:13: error: expected identifier or ‘(’ before
 numeric constant
trace/generated-tracers.c: In function ‘trace_2_register_events’:
trace/generated-tracers.c:17949:32: error: invalid suffix "_trace_events" on
 integer constant
     trace_event_register_group(2_trace_events);
                          ^
make: *** [trace/generated-tracers.o] Error 1

This patch fixes the issue.

Reported-by: Fam Zheng <address@hidden>
Signed-off-by: Greg Kurz <address@hidden>
Tested-by: Fam Zheng <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: e7830f8961bbe59307e98ba00186d7a7a8152b0c
      
https://github.com/qemu/qemu/commit/e7830f8961bbe59307e98ba00186d7a7a8152b0c
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2016-11-18 (Fri, 18 Nov 2016)

  Changed paths:
    M pc-bios/palcode-clipper
    M roms/qemu-palcode
    M target-alpha/helper.c

  Log Message:
  -----------
  Merge remote-tracking branch 'rth/tags/pull-axp-20161117' into staging

Update alpha palcode for smp

# gpg: Signature made Thu 17 Nov 2016 02:57:29 PM GMT
# gpg:                using RSA key 0xAD1270CC4DD0279B
# gpg: Good signature from "Richard Henderson <address@hidden>"
# gpg:                 aka "Richard Henderson <address@hidden>"
# gpg:                 aka "Richard Henderson <address@hidden>"
# Primary key fingerprint: 9CB1 8DDA F8E8 49AD 2AFC  16A4 AD12 70CC 4DD0 279B

* rth/tags/pull-axp-20161117:
  target-alpha: Log cpuid with -d int
  target-alpha: Update palcode for smp

Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: ad538782d78e46878d1c1cb24582d51bd266c626
      
https://github.com/qemu/qemu/commit/ad538782d78e46878d1c1cb24582d51bd266c626
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2016-11-18 (Fri, 18 Nov 2016)

  Changed paths:
    M hw/misc/ivshmem.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/elmarco/tags/ivshmem-pull-request' into 
staging

* remotes/elmarco/tags/ivshmem-pull-request:
  ivshmem: Fix 64 bit memory bar configuration

Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: d93b1fb009b64333d324a2fe76fe805f2ac2cda4
      
https://github.com/qemu/qemu/commit/d93b1fb009b64333d324a2fe76fe805f2ac2cda4
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2016-11-18 (Fri, 18 Nov 2016)

  Changed paths:
    M scripts/tracetool.py

  Log Message:
  -----------
  Merge remote-tracking branch 'public/tags/tracing-pull-request' into staging

# gpg: Signature made Fri 18 Nov 2016 03:01:22 PM GMT
# gpg:                using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <address@hidden>"
# gpg:                 aka "Stefan Hajnoczi <address@hidden>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* public/tags/tracing-pull-request:
  trace: fix generated code build break

Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


Compare: https://github.com/qemu/qemu/compare/b0bcc86d2a87...d93b1fb009b6

reply via email to

[Prev in Thread] Current Thread [Next in Thread]