diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-06-10 11:03:08 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-06-10 11:03:08 +0100 |
| commit | 69600052120bfe651a10b8ae07f20163d895e5da (patch) | |
| tree | 9d42dff349ad99a40d2015bb1d6270b8cc2fe86d /include | |
| parent | 185b7ccc11354cbd69b6d53bf8d831dd964f6c88 (diff) | |
| parent | 754f1dbcf1d4d543167e3212366055761c30bcf4 (diff) | |
Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging
Machine Core queue, 2019-06-07
* Improve CPU hotplug error message
(Laurent Vivier)
* Remove unused AccelClass::opt_name field
(Wainer dos Santos Moschetta)
# gpg: Signature made Fri 07 Jun 2019 19:31:28 BST
# gpg: using RSA key 2807936F984DC5A6
# 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:
accel: Remove unused AccelClass::opt_name attribute
numa: improve cpu hotplug error message with a wrong node-id
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sysemu/accel.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/sysemu/accel.h b/include/sysemu/accel.h index 70e9e2f2a1..81293cdb08 100644 --- a/include/sysemu/accel.h +++ b/include/sysemu/accel.h @@ -36,7 +36,6 @@ typedef struct AccelClass { ObjectClass parent_class; /*< public >*/ - const char *opt_name; const char *name; int (*init_machine)(MachineState *ms); void (*setup_post)(MachineState *ms, AccelState *accel); |