[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/28] KVM: do not allow setting properties at runtime
From: |
Paolo Bonzini |
Subject: |
[PULL 08/28] KVM: do not allow setting properties at runtime |
Date: |
Mon, 24 May 2021 18:41:11 +0200 |
Only allow accelerator properties to be set when the
accelerator is being created.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
accel/kvm/kvm-all.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 4e0168e88b..54c0860979 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -2017,7 +2017,6 @@ static int kvm_init(MachineState *ms)
QTAILQ_INIT(&s->kvm_sw_breakpoints);
#endif
QLIST_INIT(&s->kvm_parked_vcpus);
- s->vmfd = -1;
s->fd = qemu_open_old("/dev/kvm", O_RDWR);
if (s->fd == -1) {
fprintf(stderr, "Could not access KVM kernel module: %m\n");
@@ -3112,6 +3111,11 @@ static void kvm_set_kvm_shadow_mem(Object *obj, Visitor
*v,
KVMState *s = KVM_STATE(obj);
int64_t value;
+ if (s->fd != -1) {
+ error_setg(errp, "Cannot set properties after the accelerator has been
initialized");
+ return;
+ }
+
if (!visit_type_int(v, name, &value, errp)) {
return;
}
@@ -3126,6 +3130,11 @@ static void kvm_set_kernel_irqchip(Object *obj, Visitor
*v,
KVMState *s = KVM_STATE(obj);
OnOffSplit mode;
+ if (s->fd != -1) {
+ error_setg(errp, "Cannot set properties after the accelerator has been
initialized");
+ return;
+ }
+
if (!visit_type_OnOffSplit(v, name, &mode, errp)) {
return;
}
@@ -3172,6 +3181,8 @@ static void kvm_accel_instance_init(Object *obj)
{
KVMState *s = KVM_STATE(obj);
+ s->fd = -1;
+ s->vmfd = -1;
s->kvm_shadow_mem = -1;
s->kernel_irqchip_allowed = true;
s->kernel_irqchip_split = ON_OFF_AUTO_AUTO;
--
2.31.1
- [PULL 00/28] Misc patches for 2021-05-24, Paolo Bonzini, 2021/05/24
- [PULL 08/28] KVM: do not allow setting properties at runtime,
Paolo Bonzini <=
- [PULL 10/28] KVM: Use a big lock to replace per-kml slots_lock, Paolo Bonzini, 2021/05/24
- [PULL 03/28] configure: simplify assignment to GIT_SUBMODULES, Paolo Bonzini, 2021/05/24
- [PULL 06/28] object: add more commands to preconfig mode, Paolo Bonzini, 2021/05/24
- [PULL 04/28] hw/mem/nvdimm: Use Kconfig 'imply' instead of 'depends on', Paolo Bonzini, 2021/05/24
- [PULL 21/28] remove qemu-options* from root directory, Paolo Bonzini, 2021/05/24
- [PULL 11/28] KVM: Create the KVMSlot dirty bitmap on flag changes, Paolo Bonzini, 2021/05/24
- [PULL 13/28] KVM: Provide helper to sync dirty bitmap from slot to ramblock, Paolo Bonzini, 2021/05/24
- [PULL 02/28] configure: check for submodules if --with-git-submodules=ignore, Paolo Bonzini, 2021/05/24
- [PULL 09/28] memory: Introduce log_sync_global() to memory listener, Paolo Bonzini, 2021/05/24
- [PULL 01/28] configure: Only clone softfloat-3 repositories if TCG is enabled, Paolo Bonzini, 2021/05/24