diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-03-02 09:37:06 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-03-02 09:37:06 +0000 |
| commit | a4c7ed8b89e8919ddb71c78c4f42b8fdc455ac27 (patch) | |
| tree | 06d62e3a633ee467010a132133c8fbe33305598b /qemu-io-cmds.c | |
| parent | e0175b71638cf4398903c0d25f93fe62e0606389 (diff) | |
| parent | 6db1857ec9960c63024f4ce6329d947f727bad39 (diff) | |
| download | qemu-a4c7ed8b89e8919ddb71c78c4f42b8fdc455ac27.zip qemu-a4c7ed8b89e8919ddb71c78c4f42b8fdc455ac27.tar.gz qemu-a4c7ed8b89e8919ddb71c78c4f42b8fdc455ac27.tar.bz2 | |
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 "ehabkost@redhat.com"
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" [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 <peter.maydell@linaro.org>
Diffstat (limited to 'qemu-io-cmds.c')
0 files changed, 0 insertions, 0 deletions