diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-06-17 15:31:27 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-06-17 15:31:27 +0100 |
| commit | da838dfc40cb7e12e2ae7b33236e426e029fed15 (patch) | |
| tree | 3216850d43b871b05bf0dc2674f503250f93fe77 /include/hw | |
| parent | d121fcdf4520ed59c817d7f2846128a89772d497 (diff) | |
| parent | a663fbd9e2f65fae81018d81f231ad79510cf9fb (diff) | |
| download | qemu-da838dfc40cb7e12e2ae7b33236e426e029fed15.zip | |
Merge remote-tracking branch 'remotes/ehabkost/tags/machine-pull-request' into staging
Machine queue, 2016-06-17
# gpg: Signature made Fri 17 Jun 2016 14:45:48 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:
vnc: Wrap vnc initialization code with CONFIG_VNC
qdev: Use GList for global properties
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw')
| -rw-r--r-- | include/hw/qdev-core.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 1ce02b20da..24aa0a7949 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -266,7 +266,6 @@ typedef struct GlobalProperty { const char *value; bool user_provided; bool used; - QTAILQ_ENTRY(GlobalProperty) next; } GlobalProperty; /*** Board API. This should go away once we have a machine config file. ***/ |