[PATCH] userspace: Remove some unused variables

[PATCH] userspace: Remove some unused variables

[Jan Kiszka]

There are more warnings, but one after the other. This patch addresses
all current warnings regarding unused variables in KVM userspace.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

---
diff --git a/qemu/exec.c b/qemu/exec.c
index 7a37dfd..37c8392 100644
--- a/qemu/exec.c
+++ b/qemu/exec.c
@@ -182,7 +182,6 @@ static void io_mem_init(void);
 CPUWriteMemoryFunc *io_mem_write[IO_MEM_NB_ENTRIES][4];
 CPUReadMemoryFunc *io_mem_read[IO_MEM_NB_ENTRIES][4];
 void *io_mem_opaque[IO_MEM_NB_ENTRIES];
-static int io_mem_nb;
 char io_mem_used[IO_MEM_NB_ENTRIES];
 static int io_mem_watch;
 #endif
diff --git a/qemu/hw/device-hotplug.c b/qemu/hw/device-hotplug.c
index 3d170c5..8e2bc35 100644
--- a/qemu/hw/device-hotplug.c
+++ b/qemu/hw/device-hotplug.c
@@ -13,7 +13,6 @@
 static PCIDevice *qemu_system_hot_add_nic(const char *opts, int bus_nr)
 {
     int ret;
-    char buf[4096];
     PCIBus *pci_bus;
 
     pci_bus = pci_find_bus (bus_nr);
diff --git a/qemu/kvm-tpr-opt.c b/qemu/kvm-tpr-opt.c
index ab33ea0..d1557be 100644
--- a/qemu/kvm-tpr-opt.c
+++ b/qemu/kvm-tpr-opt.c
@@ -352,7 +352,7 @@ static void vtpr_ioport_write(void *opaque, uint32_t addr, uint32_t val)
     CPUState *env = cpu_single_env;
     struct kvm_regs regs;
     struct kvm_sregs sregs;
-    uint32_t rip, apic;
+    uint32_t rip;
 
     kvm_get_regs(kvm_context, env->cpu_index, &regs);
     rip = regs.rip - 2;
diff --git a/qemu/qemu-kvm.c b/qemu/qemu-kvm.c
index 1d07650..3466015 100644
--- a/qemu/qemu-kvm.c
+++ b/qemu/qemu-kvm.c
@@ -605,8 +605,6 @@ int kvm_main_loop(void)
 
 static int kvm_debug(void *opaque, int vcpu)
 {
-    CPUState *env = cpu_single_env;
-
     kvm_debug_stop_requested = 1;
     vcpu_info[vcpu].stopped = 1;
     return 1;

Re: [PATCH] userspace: Remove some unused variables

[Avi Kivity]

Jan Kiszka wrote:
> There are more warnings, but one after the other. This patch addresses
> all current warnings regarding unused variables in KVM userspace.
>   

Applied (as well as the next patch), thanks.

-- 
error compiling committee.c: too many arguments to function