]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into...
authorPeter Maydell <peter.maydell@linaro.org>
Sat, 22 Aug 2020 13:37:31 +0000 (14:37 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Sat, 22 Aug 2020 13:37:31 +0000 (14:37 +0100)
commitca489cd037e4d50dc6c40570a167504ad7e5a521
treebe8d0d9503f81bb1b3025748b5f0153bba860268
parente7b4f70e16dd558eea7511a0683e898ef6937696
parent3ff3c5d31740484b0e19007843094483fb393e80
Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging

Machine queue 2020-08-19

Regular post-release changes:
* hw: add compat machines for 5.2 (Cornelia Huck)

Features:
* qmp: Expose MachineClass::default_ram_id
  (Michal Privoznik)

Cleanups:
* qdev: Document qdev_prop_set_drive_err() return value
  (Philippe Mathieu-Daudé)

# gpg: Signature made Wed 19 Aug 2020 16:21:55 BST
# 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:
  hw: add compat machines for 5.2
  qmp: Expose MachineClass::default_ram_id
  qdev: Document qdev_prop_set_drive_err() return value

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
hw/i386/pc.c
hw/i386/pc_piix.c