mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-11-30 07:13:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Fix pr-manager-helper (Markus)

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQEcBAABAgAGBQJc986GAAoJEL/70l94x66DzmMH/0SXgEzFAaPwZEm3dxaU4EsO
 XcmvJ+z8lDDCcPXtMiG/qHWzARPW42ALY0A32c1rUfl03YPLEJWvRGnjTQnPJGFX
 6yLM4cDF63DvfCXc9b8DeiT947pt2Ia/zv7bUJh5U5GO+yoXRZk4cp0XouDmLx1Z
 2V6xi2ooJoc1V2hnPkD5s7AgXZfrK4baUY75IHRvpwOBEVdV3j6T5KFmsujO23a0
 6rIDDiug1tgB1XRXu8tj9kKySsI++ldVTWLZJl2rppzpp/QbrPqjw9uFtv6whn34
 s8pXoQ4rPriTUxP7jMPdO9646bvhW2cNj+cF/Zt1Yx4h7D/iHGTR9O7AhB0uSps=
 =OqJf
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging

* Fix pr-manager-helper (Markus)

# gpg: Signature made Wed 05 Jun 2019 15:15:34 BST
# gpg:                using RSA key BFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini/tags/for-upstream:
  vl: Document why objects are delayed
  vl: Fix -drive / -blockdev persistent reservation management

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2019-06-06 11:32:48 +01:00
commit 7ad5f33b7d
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
vl.c
View File

@ -2751,20 +2751,25 @@ static bool object_create_initial(const char *type, QemuOpts *opts)
exit(0); exit(0);
} }
if (g_str_equal(type, "rng-egd") || /*
g_str_has_prefix(type, "pr-manager-")) { * Objects should not be made "delayed" without a reason. If you
* add one, state the reason in a comment!
*/
/* Reason: rng-egd property "chardev" */
if (g_str_equal(type, "rng-egd")) {
return false; return false;
} }
#if defined(CONFIG_VHOST_USER) && defined(CONFIG_LINUX) #if defined(CONFIG_VHOST_USER) && defined(CONFIG_LINUX)
/* Reason: cryptodev-vhost-user property "chardev" */
if (g_str_equal(type, "cryptodev-vhost-user")) { if (g_str_equal(type, "cryptodev-vhost-user")) {
return false; return false;
} }
#endif #endif
/* /*
* return false for concrete netfilters since * Reason: filter-* property "netdev" etc.
* they depend on netdevs already existing
*/ */
if (g_str_equal(type, "filter-buffer") || if (g_str_equal(type, "filter-buffer") ||
g_str_equal(type, "filter-dump") || g_str_equal(type, "filter-dump") ||