[Qemu-commits] [qemu/qemu] 64bc77: hw/nmi: Fix the NMI() macro, based on INTERFACE_CH...

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 64bc77eb2c0809f11860cfe53d47e9c6f77e85f3
      
https://github.com/qemu/qemu/commit/64bc77eb2c0809f11860cfe53d47e9c6f77e85f3
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2020-02-28 (Fri, 28 Feb 2020)

  Changed paths:
    M include/hw/nmi.h

  Log Message:
  -----------
  hw/nmi: Fix the NMI() macro, based on INTERFACE_CHECK()

There is no declaration of the 'NMI' type. INTERFACE_CHECK()
returns an abstract type (see commit aa1b35b975d8). The abstract
type corresponding to the TYPE_NMI interface is 'NMIState'.

Fixes: 9cb805fd267
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Gavin Shan <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>


  Commit: abcbc4eeca50bc4fa2963f8cc6308c3aad51148a
      
https://github.com/qemu/qemu/commit/abcbc4eeca50bc4fa2963f8cc6308c3aad51148a
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2020-02-28 (Fri, 28 Feb 2020)

  Changed paths:
    M hw/lm32/lm32_boards.c
    M hw/lm32/milkymist.c
    M hw/m68k/q800.c
    M hw/microblaze/petalogix_ml605_mmu.c
    M hw/tricore/tricore_testboard.c

  Log Message:
  -----------
  hw: Do not initialize MachineClass::is_default to 0

The MachineClass is already zeroed on creation.

Note: The code setting is_default=0 in hw/i386/pc_piix.c is
      different (related to compat options). When adding a
      new versioned machine, we want it to be the new default,
      so we have to mark the previous one as not default.

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>


  Commit: ea0ac7f6f8f313f810858dd1ba4e7fae602e01bd
      
https://github.com/qemu/qemu/commit/ea0ac7f6f8f313f810858dd1ba4e7fae602e01bd
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2020-02-28 (Fri, 28 Feb 2020)

  Changed paths:
    M hw/alpha/dp264.c
    M hw/cris/axis_dev88.c
    M hw/hppa/machine.c
    M hw/i386/pc_piix.c
    M hw/lm32/lm32_boards.c
    M hw/m68k/mcf5208.c
    M hw/microblaze/petalogix_s3adsp1800_mmu.c
    M hw/mips/mips_malta.c
    M hw/moxie/moxiesim.c
    M hw/nios2/10m50_devboard.c
    M hw/openrisc/openrisc_sim.c
    M hw/ppc/mac_oldworld.c
    M hw/ppc/spapr.c
    M hw/riscv/spike.c
    M hw/s390x/s390-virtio-ccw.c
    M hw/sh4/shix.c
    M hw/sparc/sun4m.c
    M hw/sparc64/sun4u.c
    M hw/unicore32/puv3.c
    M include/hw/boards.h

  Log Message:
  -----------
  hw: Make MachineClass::is_default a boolean type

There's no good reason for it to be type int, change it to bool.

Suggested-by: Richard Henderson <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>


  Commit: 6db1857ec9960c63024f4ce6329d947f727bad39
      
https://github.com/qemu/qemu/commit/6db1857ec9960c63024f4ce6329d947f727bad39
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2020-02-28 (Fri, 28 Feb 2020)

  Changed paths:
    M softmmu/vl.c

  Log Message:
  -----------
  vl: Abort if multiple machines are registered as default

It would be confusing to have multiple default machines.
Abort if this ever occurs.

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
Tested-by: Laurent Vivier <address@hidden>


  Commit: a4c7ed8b89e8919ddb71c78c4f42b8fdc455ac27
      
https://github.com/qemu/qemu/commit/a4c7ed8b89e8919ddb71c78c4f42b8fdc455ac27
  Author: Peter Maydell <address@hidden>
  Date:   2020-03-02 (Mon, 02 Mar 2020)

  Changed paths:
    M hw/alpha/dp264.c
    M hw/cris/axis_dev88.c
    M hw/hppa/machine.c
    M hw/i386/pc_piix.c
    M hw/lm32/lm32_boards.c
    M hw/lm32/milkymist.c
    M hw/m68k/mcf5208.c
    M hw/m68k/q800.c
    M hw/microblaze/petalogix_ml605_mmu.c
    M hw/microblaze/petalogix_s3adsp1800_mmu.c
    M hw/mips/mips_malta.c
    M hw/moxie/moxiesim.c
    M hw/nios2/10m50_devboard.c
    M hw/openrisc/openrisc_sim.c
    M hw/ppc/mac_oldworld.c
    M hw/ppc/spapr.c
    M hw/riscv/spike.c
    M hw/s390x/s390-virtio-ccw.c
    M hw/sh4/shix.c
    M hw/sparc/sun4m.c
    M hw/sparc64/sun4u.c
    M hw/tricore/tricore_testboard.c
    M hw/unicore32/puv3.c
    M include/hw/boards.h
    M include/hw/nmi.h
    M softmmu/vl.c

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/ehabkost/tags/machine-next-pull-request' into staging

Machine queue, 2020-02-28

Cleanups:
* Fix NMI() macro (Philippe Mathieu-Daudé)
* Make MachineClass::is_default boolean, refuse multiple
  default machines (Philippe Mathieu-Daudé)

# gpg: Signature made Fri 28 Feb 2020 21:03:20 GMT
# gpg:                using RSA key 5A322FD5ABC4D3DBACCFD1AA2807936F984DC5A6
# gpg:                issuer "address@hidden"
# gpg: Good signature from "Eduardo Habkost <address@hidden>" [full]
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6

* remotes/ehabkost/tags/machine-next-pull-request:
  vl: Abort if multiple machines are registered as default
  hw: Make MachineClass::is_default a boolean type
  hw: Do not initialize MachineClass::is_default to 0
  hw/nmi: Fix the NMI() macro, based on INTERFACE_CHECK()

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/e0175b71638c...a4c7ed8b89e8