diff options
| author | Peter Maydell | 2016-10-18 11:33:30 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-10-18 11:33:30 +0200 |
| commit | f525c8a6cb9e445ceef6e73aeccab553866b2f36 (patch) | |
| tree | c63e2308714d68da383b6fe9b021e5e6e8ac2291 /linux-user/linuxload.c | |
| parent | Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into st... (diff) | |
| parent | hostmem-file: Register TYPE_MEMORY_BACKEND_FILE properties as class properties (diff) | |
| download | qemu-f525c8a6cb9e445ceef6e73aeccab553866b2f36.tar.gz qemu-f525c8a6cb9e445ceef6e73aeccab553866b2f36.tar.xz qemu-f525c8a6cb9e445ceef6e73aeccab553866b2f36.zip | |
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 <ehabkost@redhat.com>"
# 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 <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/linuxload.c')
0 files changed, 0 insertions, 0 deletions