From: Peter Maydell <peter.maydell@linaro.org>
Date: Sat, 22 Aug 2020 13:37:31 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ca489cd037e4d50dc6c40570a167504ad7e5a521;p=qemu.git

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>
---

ca489cd037e4d50dc6c40570a167504ad7e5a521
diff --cc hw/i386/pc.c
index cc616e48f3,9aa813949c..5d8d5ef8b3
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@@ -95,8 -95,11 +95,11 @@@
  #include "e820_memory_layout.h"
  #include "fw_cfg.h"
  #include "trace.h"
 +#include CONFIG_DEVICES
  
+ GlobalProperty pc_compat_5_1[] = {};
+ const size_t pc_compat_5_1_len = G_N_ELEMENTS(pc_compat_5_1);
+ 
  GlobalProperty pc_compat_5_0[] = {
  };
  const size_t pc_compat_5_0_len = G_N_ELEMENTS(pc_compat_5_0);