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 /include | |
| 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 'include')
| -rw-r--r-- | include/hw/boards.h | 4 | ||||
| -rw-r--r-- | include/hw/nmi.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/hw/boards.h b/include/hw/boards.h index 142b86d..9bc42df 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -81,6 +81,8 @@ typedef struct { * @max_cpus: maximum number of CPUs supported. Default: 1 * @min_cpus: minimum number of CPUs supported. Default: 1 * @default_cpus: number of CPUs instantiated if none are specified. Default: 1 + * @is_default: + * If true QEMU will use this machine by default if no '-M' option is given. * @get_hotplug_handler: this function is called during bus-less * device hotplug. If defined it returns pointer to an instance * of HotplugHandler object, which handles hotplug operation @@ -181,7 +183,7 @@ struct MachineClass { no_sdcard:1, pci_allow_0_address:1, legacy_fw_cfg_order:1; - int is_default; + bool is_default; const char *default_machine_opts; const char *default_boot_order; const char *default_display; diff --git a/include/hw/nmi.h b/include/hw/nmi.h index a1e1287..fe37ce3 100644 --- a/include/hw/nmi.h +++ b/include/hw/nmi.h @@ -31,7 +31,7 @@ #define NMI_GET_CLASS(obj) \ OBJECT_GET_CLASS(NMIClass, (obj), TYPE_NMI) #define NMI(obj) \ - INTERFACE_CHECK(NMI, (obj), TYPE_NMI) + INTERFACE_CHECK(NMIState, (obj), TYPE_NMI) typedef struct NMIState NMIState; |