aboutsummaryrefslogtreecommitdiff
path: root/vl.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-09-18 20:02:00 +0100
committerPeter Maydell <peter.maydell@linaro.org>2014-09-18 20:02:01 +0100
commit10e11f4d2bf171f99c6b13883a510acfbc5dd585 (patch)
tree4a82db961f4f11df98d071450eb8b2bd47bd39fa /vl.c
parentbb26a1e80b5639d71119ff58e0ef598708993fc0 (diff)
parent438f92ee9f6a4f78f8adcc399809e252b6da72a2 (diff)
downloadqemu-10e11f4d2bf171f99c6b13883a510acfbc5dd585.zip
qemu-10e11f4d2bf171f99c6b13883a510acfbc5dd585.tar.gz
qemu-10e11f4d2bf171f99c6b13883a510acfbc5dd585.tar.bz2
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
pci, pc, virtio, misc bugfixes A bunch of bugfixes - some of these will make sense for 2.1.2 I put Cc: qemu-stable included where appropriate. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> # gpg: Signature made Thu 18 Sep 2014 19:52:18 BST using RSA key ID D28D5469 # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" # gpg: aka "Michael S. Tsirkin <mst@redhat.com>" * remotes/mst/tags/for_upstream: pc: leave more space for BIOS allocations virtio-pci: fix migration for pci bus master vhost-user: fix VIRTIO_NET_F_MRG_RXBUF negotiation virtio-pci: enable bus master for old guests Revert "virtio: don't call device on !vm_running" virtio-net: drop assert on vm stop Revert "rng-egd: remove redundant free" qdev: Move global validation to a single function qdev: Rename qdev_prop_check_global() to qdev_prop_check_globals() test-qdev-global-props: Test handling of hotpluggable and non-device types test-qdev-global-props: Initialize not_used=true for all props test-qdev-global-props: Run tests on subprocess tests: disable global props test for old glib test-qdev-global-props: Trivial comment fix hw/machine: Free old values of string properties Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'vl.c')
-rw-r--r--vl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/vl.c b/vl.c
index 5db0d08..dc792fe 100644
--- a/vl.c
+++ b/vl.c
@@ -4542,7 +4542,7 @@ int main(int argc, char **argv, char **envp)
}
}
- qdev_prop_check_global();
+ qdev_prop_check_globals();
if (vmstate_dump_file) {
/* dump and exit */
dump_vmstate_json_to_file(vmstate_dump_file);