summaryrefslogtreecommitdiff
path: root/qemu-bridge-helper.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2019-06-10 11:03:08 +0100
committerPeter Maydell <peter.maydell@linaro.org>2019-06-10 11:03:08 +0100
commit69600052120bfe651a10b8ae07f20163d895e5da (patch)
tree9d42dff349ad99a40d2015bb1d6270b8cc2fe86d /qemu-bridge-helper.c
parent185b7ccc11354cbd69b6d53bf8d831dd964f6c88 (diff)
parent754f1dbcf1d4d543167e3212366055761c30bcf4 (diff)
downloadqemu-69600052120bfe651a10b8ae07f20163d895e5da.zip
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 'qemu-bridge-helper.c')
0 files changed, 0 insertions, 0 deletions