Blame SOURCES/kvm-hw-s390x-Mark-the-sclpquiesce-device-with-user_creat.patch

9bac43
From b4f105203964676facfa604594dcae3e43ee7aa0 Mon Sep 17 00:00:00 2001
9bac43
From: Thomas Huth <thuth@redhat.com>
9bac43
Date: Mon, 9 Oct 2017 12:32:45 +0200
9bac43
Subject: [PATCH 26/34] hw/s390x: Mark the "sclpquiesce" device with
9bac43
 user_creatable = false
9bac43
9bac43
RH-Author: Thomas Huth <thuth@redhat.com>
9bac43
Message-id: <1507552368-9245-10-git-send-email-thuth@redhat.com>
9bac43
Patchwork-id: 77026
9bac43
O-Subject: [RHEL-7.5 qemu-kvm-ma PATCH 09/12] hw/s390x: Mark the "sclpquiesce" device with user_creatable = false
9bac43
Bugzilla: 1492033
9bac43
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
9bac43
RH-Acked-by: David Gibson <dgibson@redhat.com>
9bac43
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
9bac43
9bac43
The "sclpquiesce" device is just an internal device that should not be
9bac43
created by the user directly. Though it currently does not seem to cause
9bac43
any obvious trouble when the user instantiates an additional device, let's
9bac43
better mark it with user_creatable = false to avoid unexpected behavior,
9bac43
e.g. because the quiesce notifier gets registered multiple times.
9bac43
9bac43
Signed-off-by: Thomas Huth <thuth@redhat.com>
9bac43
Message-Id: <1507193105-15627-1-git-send-email-thuth@redhat.com>
9bac43
Reviewed-by: Halil Pasic <pasic@linux.vnet.ibm.com>
9bac43
Reviewed-by: Claudio Imbrenda <imbrenda@linux.vnet.ibm.com>
9bac43
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
9bac43
(cherry picked from commit b923ab3112ed5ab47c2ff35776f17ab54c60d651)
9bac43
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
9bac43
---
9bac43
 hw/s390x/sclpquiesce.c | 7 ++++++-
9bac43
 1 file changed, 6 insertions(+), 1 deletion(-)
9bac43
9bac43
diff --git a/hw/s390x/sclpquiesce.c b/hw/s390x/sclpquiesce.c
9bac43
index 762cb18..0241643 100644
9bac43
--- a/hw/s390x/sclpquiesce.c
9bac43
+++ b/hw/s390x/sclpquiesce.c
9bac43
@@ -118,8 +118,13 @@ static void quiesce_class_init(ObjectClass *klass, void *data)
9bac43
     dc->reset = quiesce_reset;
9bac43
     dc->vmsd = &vmstate_sclpquiesce;
9bac43
     set_bit(DEVICE_CATEGORY_MISC, dc->categories);
9bac43
-    k->init = quiesce_init;
9bac43
+    /*
9bac43
+     * Reason: This is just an internal device - the notifier should
9bac43
+     * not be registered multiple times in quiesce_init()
9bac43
+     */
9bac43
+    dc->user_creatable = false;
9bac43
 
9bac43
+    k->init = quiesce_init;
9bac43
     k->get_send_mask = send_mask;
9bac43
     k->get_receive_mask = receive_mask;
9bac43
     k->can_handle_event = can_handle_event;
9bac43
-- 
9bac43
1.8.3.1
9bac43