From 4e62b63ba343036417b227a36a28f9cbf94bdf0c Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 6 Jun 2019 12:12:44 +0200 Subject: [PATCH 9/9] vl: Fix -drive / -blockdev persistent reservation management RH-Author: Markus Armbruster Message-id: <20190606121244.23738-2-armbru@redhat.com> Patchwork-id: 88604 O-Subject: [RHEL-7.7 qemu-kvm-rhev PATCH 1/1] vl: Fix -drive / -blockdev persistent reservation management Bugzilla: 1714160 RH-Acked-by: John Snow RH-Acked-by: Stefano Garzarella RH-Acked-by: Paolo Bonzini qemu-system-FOO's main() acts on command line arguments in its own idiosyncratic order. There's not much method to its madness. Whenever we find a case where one kind of command line argument needs to refer to something created for another kind later, we rejigger the order. Recent commit cda4aa9a5a "vl: Create block backends before setting machine properties" was such a rejigger. Block backends are now created before "delayed" objects. This broke persistent reservation management. Reproducer: $ qemu-system-x86_64 -object pr-manager-helper,id=pr-helper0,path=/tmp/pr-helper0.sock-drive -drive file=/dev/mapper/crypt,file.pr-manager=pr-helper0,format=raw,if=none,id=drive-scsi0-0-0-2 qemu-system-x86_64: -drive file=/dev/mapper/crypt,file.pr-manager=pr-helper0,format=raw,if=none,id=drive-scsi0-0-0-2: No persistent reservation manager with id 'pr-helper0' The delayed pr-manager-helper object is created too late for use by -drive or -blockdev. Normal objects are still created in time. pr-manager-helper has always been a delayed object (commit 7c9e527659 "scsi, file-posix: add support for persistent reservation management"). Turns out there's no real reason for that. Make it a normal object. Fixes: cda4aa9a5a08777cf13e164c0543bd4888b8adce Signed-off-by: Markus Armbruster Message-Id: <20190604151251.9903-2-armbru@redhat.com> Reviewed-by: Michal Privoznik Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini (cherry picked from commit 9ea18ed25a36527167e9676f25d983df5e7f76e6) [Straightforward conflict resolved] Signed-off-by: Miroslav Rezanina --- vl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/vl.c b/vl.c index 61247eb..5b337e1 100644 --- a/vl.c +++ b/vl.c @@ -2926,8 +2926,7 @@ static int machine_set_property(void *opaque, */ static bool object_create_initial(const char *type) { - if (g_str_equal(type, "rng-egd") || - g_str_has_prefix(type, "pr-manager-")) { + if (g_str_equal(type, "rng-egd")) { return false; } -- 1.8.3.1