kvm tools: remove redundancy between kvm_config and kvm

Remove some redundant members between struct kvm_config and struct kvm
since options are now contained within struct kvm.

Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>

builtin-run.c

@@ -1040,8 +1040,6 @@ static int kvm_cmd_run_init(int argc, const char **argv)
 	if (r)
 		goto fail;
 
-	kvm->single_step = kvm->cfg.single_step;
-
 	r = ioeventfd__init(kvm);
 	if (r < 0) {
 		pr_err("ioeventfd__init() failed with error %d\n", r);

hw/rtc.c

@@ -134,4 +134,4 @@ int rtc__exit(struct kvm *kvm)
 	ioport__unregister(0x0071);
 
 	return 0;
-}
+}

include/kvm/kvm.h

@@ -42,15 +42,12 @@ struct kvm {
 	int			nrcpus;		/* Number of cpus to run */
 
 	u32			mem_slots;	/* for KVM_SET_USER_MEMORY_REGION */
-
 	u64			ram_size;
 	void			*ram_start;
 	u64			ram_pagesize;
 
 	bool			nmi_disabled;
 
-	bool			single_step;
-
 	const char		*vmlinux;
 	struct disk_image       **disks;
 	int                     nr_disks;

kvm-cpu.c

@@ -92,7 +92,7 @@ int kvm_cpu__start(struct kvm_cpu *cpu)
 
 	kvm_cpu__reset_vcpu(cpu);
 
-	if (cpu->kvm->single_step)
+	if (cpu->kvm->cfg.single_step)
 		kvm_cpu__enable_singlestep(cpu);
 
 	while (cpu->is_running) {