From: Peter Maydell Date: Tue, 18 Oct 2016 09:33:30 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/ehabkost/tags/machine-pull-request' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f525c8a6cb9e445ceef6e73aeccab553866b2f36;p=qemu.git Merge remote-tracking branch 'remotes/ehabkost/tags/machine-pull-request' into staging machine + memory backend queue, 2016-10-17 # gpg: Signature made Mon 17 Oct 2016 18:54:57 BST # gpg: using RSA key 0x2807936F984DC5A6 # gpg: Good signature from "Eduardo Habkost " # Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6 * remotes/ehabkost/tags/machine-pull-request: hostmem-file: Register TYPE_MEMORY_BACKEND_FILE properties as class properties hostmem: Register TYPE_MEMORY_BACKEND properties as class properties pc: Register TYPE_PC_MACHINE properties as class properties machine: Register TYPE_MACHINE properties as class properties machine: Fix replacement of '_' by '-' in machine property names Signed-off-by: Peter Maydell --- f525c8a6cb9e445ceef6e73aeccab553866b2f36