openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Machine Core queue, 2019-06-07 

* Improve CPU hotplug error message
   (Laurent Vivier)
 * Remove unused AccelClass::opt_name field
   (Wainer dos Santos Moschetta)
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJc+q2AAAoJECgHk2+YTcWmoxAP/2BlDbsLTyK/nbQS50PcPiEG
 78fIOvdo6+jn+H34uegLoLlrgzk2ociHGNrhw/UaqdQnXob/HTsz6cev9TWSZoJf
 RZ6f7etTMcG6/D/EMGKeaHocjf7EAwvNmVxfL3/2wb4WjZq1dsVo95XqjHo/MDr8
 0mvEEhPH/e2/7BC7S2+JnIKy+SONMKX3ENxpNduMGpSehKZqIXT7XkG4hWcf6snx
 vrhB1U+kpIFa6MBrqptu/kCnYRgP2qm0AH0QLrKwbPfyEautXxhAaUGl2neOePCf
 pYZ0we8WlwChgXxUPMM7LZ2PD+m5hS5sXdrCiapehPbI22SwlJOEP9YVSz2pvvXi
 k3vU7LgrXEYEEoTYFGqy4qiCD1S8qH2/k+1HeqUO/YeKNqf6mj1l+cixOEhAIEs0
 JeXsJiqPIR06oYfy8PbJs6OV/DkKpcnWwiWv+xdA8nWA0bVWEStvk0CoDngRqrVp
 zD17kGT5PAzW3RsRSM3UUbq6Zt247gJKQy+gNgPARd4nOvjcuBndMPzHeCmTfjtE
 JY6/xQ1vCAn7mudQB2ygm+utGBP0StYUzMjmhHbm2+JG6WpA51kKmogipfHYgaw2
 HiJ3E2f9CU4IkyQza5eJWoeyRQJS8ot4l4p+SQIFBdavkiZnClhaIU5F9sRYEr5o
 GvECinWbFciFI/Y9DWPD
 =+Xfn
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2019-06-10 11:03:08 +01:00
parent 185b7ccc11 754f1dbcf1
commit 6960005212
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sysemu/accel.h
View File

@ -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);

4
numa.c
View File

@ -470,8 +470,8 @@ void numa_cpu_pre_plug(const CPUArchId *slot, DeviceState *dev, Error **errp)
"node-id", errp);
}
} else if (node_id != slot->props.node_id) {
error_setg(errp, "node-id=%d must match numa node specified "
"with -numa option", node_id);
error_setg(errp, "invalid node-id, must be %"PRId64,
slot->props.node_id);
}
}