gcc 4.6 compile fixes for xen-unstable

diff -r f531ed84b066 -r f1cb18c064c9 tools/libxc/xc_tmem.c
@@ -390,7 +390,7 @@ static int xc_tmem_restore_new_pool(
 
 int xc_tmem_restore(xc_interface *xch, int dom, int io_fd)
 {
-    uint32_t save_max_pools, save_version;
+    uint32_t save_version;
     uint32_t this_max_pools, this_version;
     uint32_t pool_id;
     uint32_t minusone;

@@ -400,7 +400,6 @@ int xc_tmem_restore(xc_interface *xch, i
     save_version = xc_tmem_control(xch,0,TMEMC_SAVE_GET_VERSION,dom,0,0,0,NULL);
     if ( save_version == -1 )
         return -1; /* domain doesn't exist */
-    save_max_pools = xc_tmem_control(xch,0,TMEMC_SAVE_GET_MAXPOOLS,0,0,0,0,NULL);
     if ( read_exact(io_fd, &this_version, sizeof(this_version)) )
         return -1;
     if ( read_exact(io_fd, &this_max_pools, sizeof(this_max_pools)) )

diff -r f1cb18c064c9 -r 9c492ce99bbe tools/libxc/xc_domain_restore.c
@@ -1087,7 +1087,6 @@ int xc_domain_restore(xc_interface *xch,
     int vcpuextstate = 0;
     uint32_t vcpuextstate_size = 0;
     unsigned long mfn, pfn;
-    unsigned int prev_pc;
     int nraces = 0;
 
     /* The new domain's shared-info frame number. */

@@ -1255,7 +1254,6 @@ int xc_domain_restore(xc_interface *xch,
      * Now simply read each saved frame into its new machine frame.
      * We uncanonicalise page tables as we go.
      */
-    prev_pc = 0;
 
     n = m = 0;
  loadpages:

diff -r 9c492ce99bbe -r cb0ed92e451d tools/xenstore/xenstored_core.c
@@ -130,7 +130,7 @@ void trace(const char *fmt, ...)
 	va_list arglist;
 	char *str;
 	char sbuf[1024];
-	int ret, dummy;
+	int ret;
 
 	if (tracefd < 0)
 		return;

@@ -141,7 +141,10 @@ void trace(const char *fmt, ...)
 	va_end(arglist);
 
 	if (ret <= 1024) {
-		dummy = write(tracefd, sbuf, ret);
+		if (write(tracefd, sbuf, ret) < 0) {
+			close(tracefd);
+			tracefd = -1;
+		}
 		return;
 	}
 

@@ -149,7 +152,10 @@ void trace(const char *fmt, ...)
 	va_start(arglist, fmt);
 	str = talloc_vasprintf(NULL, fmt, arglist);
 	va_end(arglist);
-	dummy = write(tracefd, str, strlen(str));
+	if (write(tracefd, str, strlen(str)) < 0) {
+		close(tracefd);
+		tracefd = -1;
+	}
 	talloc_free(str);
 }
 

@@ -200,8 +206,12 @@ void trace_destroy(const void *data, con
 static void trigger_reopen_log(int signal __attribute__((unused)))
 {
 	char c = 'A';
-	int dummy;
-	dummy = write(reopen_log_pipe[1], &c, 1);
+	if (reopen_log_pipe[1] < 0)
+		return;
+	if (write(reopen_log_pipe[1], &c, 1) < 0) {
+		close(reopen_log_pipe[1]);
+		reopen_log_pipe[1] = -1;
+	}
 }

diff -r cb0ed92e451d -r cc966312031c tools/misc/gtraceview.c
@@ -622,8 +622,7 @@ void crt_init(void)
 void nr_addch(int nr, int ch)
 {
     int i;
-    int y, x;
-    getyx(stdscr, y, x);
+    int x = getcurx(stdscr);
     for (i = 0; i < nr; i++) {
         if (x == COLS-1)
             break;

diff -r cc966312031c -r d30215ff28c8 tools/xcutils/xc_restore.c
@@ -19,7 +19,7 @@ int
 main(int argc, char **argv)
 {
     unsigned int domid, store_evtchn, console_evtchn;
-    unsigned int hvm, pae, apic;
+    unsigned int hvm, pae;
     xc_interface *xch;
     int io_fd, ret;
     int superpages;

@@ -39,7 +39,6 @@ main(int argc, char **argv)
     console_evtchn = atoi(argv[4]);
     hvm  = atoi(argv[5]);
     pae  = atoi(argv[6]);
-    apic = atoi(argv[7]);
     if ( argc == 9 )
 	    superpages = atoi(argv[8]);
     else

diff -r d30215ff28c8 -r 6f3f57bd82e4 tools/firmware/rombios/32bit/tcgbios/tcgbios.c
@@ -1064,7 +1064,6 @@ uint32_t HashLogEvent32(struct hlei *hle
 	uint32_t rc = 0;
 	uint16_t size;
 	uint32_t logdataptr;
-	uint32_t logdatalen;
 	uint32_t hashdataptr;
 	uint32_t hashdatalen;
 

@@ -1084,7 +1083,6 @@ uint32_t HashLogEvent32(struct hlei *hle
 	if (rc == 0) {
 		struct pcpes *pcpes;
 		logdataptr = hlei->logdataptr;
-		logdatalen = hlei->logdatalen;
 		pcpes = (struct pcpes *)logdataptr;
 		if (pcpes->pcrindex != hlei->pcrindex) {
 			rc = (TCG_PC_TPMERROR |

diff -r 6f3f57bd82e4 -r 82703d3639a6 tools/console/client/main.c
@@ -277,7 +277,7 @@ int main(int argc, char **argv)
 
 	};
 	char *dom_path = NULL, *path = NULL;
-	int spty, xsfd;
+	int spty;
 	struct xs_handle *xs;
 	char *end;
 	console_type type = CONSOLE_INVAL;

@@ -371,7 +371,6 @@ int main(int argc, char **argv)
 	/* Set a watch on this domain's console pty */
 	if (!xs_watch(xs, path, ""))
 		err(errno, "Can't set watch for console pty");
-	xsfd = xs_fileno(xs);
 
 	/* Wait a little bit for tty to appear.  There is a race
 	   condition that occurs after xend creates a domain.  This code

diff -r 82703d3639a6 -r c6ae952c7f40 tools/xenstat/xentop/xentop.c
@@ -272,17 +272,13 @@ static void fail(const char *str)
 /* Return the row containing the cursor. */
 static int current_row(void)
 {
-	int y, x;
-	getyx(stdscr, y, x);
-	return y;
+	return getcury(stdscr);
 }
 
 /* Return the number of lines on the screen. */
 static int lines(void)
 {
-	int y, x;
-	getmaxyx(stdscr, y, x);
-	return y;
+	return getmaxy(stdscr);
 }
 
 /* printf-style print function which calls printw, but only if the cursor is

diff -r c6ae952c7f40 -r aa460b276cea tools/libxl/xl_cmdimpl.c
@@ -2877,7 +2877,7 @@ int main_migrate(int argc, char **argv)
     const char *ssh_command = "ssh";
     char *rune = NULL;
     char *host;
-    int opt, daemonize = 1, monitor = 1, debug = 0;
+    int opt, daemonize = 1, debug = 0;
 
     while ((opt = def_getopt(argc, argv, "FC:s:ed", "migrate", 2)) != -1) {
         switch (opt) {

@@ -2894,7 +2894,6 @@ int main_migrate(int argc, char **argv)
             break;
         case 'e':
             daemonize = 0;
-            monitor = 0;
             break;
         case 'd':
             debug = 1;

@@ -4865,7 +4864,6 @@ int main_cpupoollist(int argc, char **ar
         {"cpus", 0, 0, 'c'},
         {0, 0, 0, 0}
     };
-    int opt_long = 0;
     int opt_cpus = 0;
     const char *pool = NULL;
     libxl_cpupoolinfo *poolinfo;

@@ -4884,7 +4882,6 @@ int main_cpupoollist(int argc, char **ar
             help("cpupool-list");
             return 0;
         case 'l':
-            opt_long = 1;
             break;
         case 'c':
             opt_cpus = 1;

diff -r aa460b276cea -r e4c2a83d9d30 tools/libxl/libxlu_cfg.c
@@ -349,7 +349,7 @@ char *xlu__cfgl_dequote(CfgParseContext 
 
 #define NUMERIC_CHAR(minlen,maxlen,base,basetext) do{                        \
                 char numbuf[(maxlen)+1], *ep;                                \
-                unsigned long val;                                           \
+                unsigned long val __attribute__((unused));                   \
                                                                              \
                 strncpy(numbuf,p,(maxlen));                                  \
                 numbuf[(maxlen)]= 0;                                         \

diff -r e4c2a83d9d30 -r da1b3aa3abf4 tools/libxl/libxl.c
@@ -262,7 +262,7 @@ int libxl_domain_resume(libxl_ctx *ctx, 
     }
 out:
     libxl__free_all(&gc);
-    return 0;
+    return rc;
 }
 
 /*

@@ -1336,7 +1336,7 @@ libxl_nicinfo *libxl_list_nics(libxl_ctx
 {
     libxl__gc gc = LIBXL_INIT_GC(ctx);
     char *dompath, *nic_path_fe;
-    char **l, **list;
+    char **l;
     char *val, *tok;
     unsigned int nb_nics, i;
     libxl_nicinfo *res, *nics;

@@ -1344,7 +1344,7 @@ libxl_nicinfo *libxl_list_nics(libxl_ctx
     dompath = libxl__xs_get_dompath(&gc, domid);
     if (!dompath)
         goto err;
-    list = l = libxl__xs_directory(&gc, XBT_NULL,
+    l = libxl__xs_directory(&gc, XBT_NULL,
                            libxl__sprintf(&gc, "%s/device/vif", dompath), &nb_nics);
     if (!l)
         goto err;

diff -r da1b3aa3abf4 -r a096a1358c6c tools/libxl/libxl_pci.c
@@ -269,7 +269,7 @@ out:
         flexarray_free(back);
     if (front)
         flexarray_free(front);
-    return 0;
+    return ret;
 }
 
 static int libxl__device_pci_add_xenstore(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev, int starting)

diff -r a096a1358c6c -r 2a87e67af2c8 tools/libxl/libxl_dom.c
@@ -281,7 +281,7 @@ int libxl__build_hvm(libxl__gc *gc, uint
               libxl_domain_build_info *info, libxl__domain_build_state *state)
 {
     libxl_ctx *ctx = libxl__gc_owner(gc);
-    int ret, rc = ERROR_INVAL;
+    int ret, rc;
 
     rc = ERROR_FAIL;
     ret = xc_hvm_build_target_mem(

@@ -302,7 +302,7 @@ int libxl__build_hvm(libxl__gc *gc, uint
     }
     rc = 0;
 out:
-    return 0;
+    return rc;
 }
 
 int libxl__domain_restore_common(libxl__gc *gc, uint32_t domid,

diff -r 2a87e67af2c8 -r 14b06ce705e3 tools/libxl/libxl_utils.c
@@ -532,7 +532,7 @@ int libxl_devid_to_device_disk(libxl_ctx
     libxl__gc gc = LIBXL_INIT_GC(ctx);
     char *endptr, *val;
     char *dompath, *diskpath, *be_path;
-    unsigned int devid_n;
+    unsigned int devid_n __attribute__((unused));
     int rc = ERROR_INVAL;
 
     devid_n = strtoul(devid, &endptr, 10);

diff -r 14b06ce705e3 -r b1d2f51888e9 tools/debugger/gdbsx/gx/gx_comm.c
@@ -163,13 +163,11 @@ readchar(void)
     static char buf[BUFSIZ];
     static int bufcnt = 0;
     static char *bufp;
-    uint64_t ll;
 
     if (bufcnt-- > 0)
         return *bufp++ & 0x7f;
 
     bufcnt = read(remote_fd, buf, sizeof (buf));
-    ll = *(uint64_t *)buf;
     if (bufcnt <= 0) {
         if (bufcnt == 0)
             gxprt("readchar: Got EOF\n");

diff -r b1d2f51888e9 -r 166afe5e1410 tools/python/xen/lowlevel/checkpoint/libcheckpoint.c
@@ -820,12 +820,10 @@ static int create_suspend_thread(checkpo
 
 static void stop_suspend_thread(checkpoint_state* s)
 {
-  int err;
-
   s->done = 1;
 
-  err = sem_post(&s->resumed_sem);
+  sem_post(&s->resumed_sem);
 
-  err = pthread_join(s->suspend_thr, NULL);
+  pthread_join(s->suspend_thr, NULL);
   s->suspend_thr = 0;
 }

diff -r 166afe5e1410 -r 0ef116beb380 tools/python/xen/lowlevel/netlink/libnetlink.c
@@ -433,7 +433,7 @@ int rtnl_from_file(FILE *rtnl, rtnl_filt
        nladdr.nl_groups = 0;
 
        while (1) {
-               int err, len, type;
+               int err, len;
                int l;
 
                status = fread(&buf, 1, sizeof(*h), rtnl);

@@ -448,7 +448,6 @@ int rtnl_from_file(FILE *rtnl, rtnl_filt
                        return 0;
 
                len = h->nlmsg_len;
-               type= h->nlmsg_type;
                l = len - sizeof(*h);
 
                if (l<0 || len>sizeof(buf)) {

diff -r 0ef116beb380 -r 982cc1330a16 xen/common/cpupool.c
@@ -35,7 +35,7 @@ static DEFINE_SPINLOCK(cpupool_lock);
 
 DEFINE_PER_CPU(struct cpupool *, cpupool);
 
-#define cpupool_dprintk(x...) ((void)0)
+#define cpupool_dprintk(fmt, args...) { if (0) printk(fmt, ##args); }
 
 static struct cpupool *alloc_cpupool_struct(void)
 {

diff -r 982cc1330a16 -r 5516ec1f996e xen/common/grant_table.c
@@ -765,7 +765,6 @@ __gnttab_unmap_common(
     struct domain   *ld, *rd;
     struct active_grant_entry *act;
     s16              rc = 0;
-    u32              old_pin;
 
     ld = current->domain;
 

@@ -811,7 +810,6 @@ __gnttab_unmap_common(
     spin_lock(&rd->grant_table->lock);
 
     act = &active_entry(rd->grant_table, op->map->ref);
-    old_pin = act->pin;
 
     if ( op->frame == 0 )
     {

diff -r 5516ec1f996e -r 3317bd7aa915 xen/common/kexec.c
@@ -588,7 +588,7 @@ static int kexec_exec(XEN_GUEST_HANDLE(v
         break;
     }
 
-    return -EINVAL; /* never reached */
+    return ret; /* never reached */
 }
 
 int do_kexec_op_internal(unsigned long op, XEN_GUEST_HANDLE(void) uarg,

diff -r 3317bd7aa915 -r 215451b4be8e xen/common/sched_credit2.c
@@ -1880,7 +1880,7 @@ static void deactivate_runqueue(struct c
 
 static void init_pcpu(const struct scheduler *ops, int cpu)
 {
-    int rqi, old_rqi, flags;
+    int rqi, flags;
     struct csched_private *prv = CSCHED_PRIV(ops);
     struct csched_runqueue_data *rqd;
     spinlock_t *old_lock;

@@ -1894,8 +1894,6 @@ static void init_pcpu(const struct sched
         return;
     }
 
-    old_rqi = prv->runq_map[cpu];
-
     /* Figure out which runqueue to put it in */
     rqi = 0;

diff -r 215451b4be8e -r 0f8146a56c8e xen/common/unlzo.c
@@ -68,7 +68,6 @@ static int INIT parse_header(u8 *input, 
 {
 	int l;
 	u8 *parse = input;
-	u8 level = 0;
 	u16 version;
 
 	/* read magic: 9 first bits */

@@ -82,7 +81,7 @@ static int INIT parse_header(u8 *input, 
 	version = get_unaligned_be16(parse);
 	parse += 7;
 	if (version >= 0x0940)
-		level = *parse++;
+		parse += 1; /* skip level */
 	if (get_unaligned_be32(parse) & HEADER_HAS_FILTER)
 		parse += 8; /* flags + filter info */
 	else

diff -r 0f8146a56c8e -r 452ca03a7181 xen/drivers/passthrough/vtd/intremap.c
@@ -367,7 +367,6 @@ unsigned int io_apic_read_remap_rte(
     unsigned int ioapic_pin = (reg - 0x10) / 2;
     int index;
     struct IO_xAPIC_route_entry old_rte = { 0 };
-    struct IO_APIC_route_remap_entry *remap_rte;
     int rte_upper = (reg & 1) ? 1 : 0;
     struct iommu *iommu = ioapic_to_iommu(IO_APIC_ID(apic));
     struct ir_ctrl *ir_ctrl = iommu_ir_ctrl(iommu);

@@ -389,8 +388,6 @@ unsigned int io_apic_read_remap_rte(
     *IO_APIC_BASE(apic) = reg + 1;
     *(((u32 *)&old_rte) + 1) = *(IO_APIC_BASE(apic)+4);
 
-    remap_rte = (struct IO_APIC_route_remap_entry *) &old_rte;
-
     if ( remap_entry_to_ioapic_rte(iommu, index, &old_rte) )
     {
         *IO_APIC_BASE(apic) = rte_upper ? (reg + 1) : reg;

@@ -850,10 +847,7 @@ int iommu_enable_x2apic_IR(void)
 
     for_each_drhd_unit ( drhd )
     {
-        struct qi_ctrl *qi_ctrl = NULL;
-
         iommu = drhd->iommu;
-        qi_ctrl = iommu_qi_ctrl(iommu);
 
         /* Clear previous faults */
         clear_fault_bits(iommu);

diff -r 452ca03a7181 -r d657cd6182d5 xen/arch/x86/msi.c
@@ -745,17 +745,8 @@ static int __pci_enable_msi(struct msi_i
 static void __pci_disable_msi(struct msi_desc *entry)
 {
     struct pci_dev *dev;
-    int pos;
-    u16 control;
-    u8 bus, slot, func;
 
     dev = entry->dev;
-    bus = dev->bus;
-    slot = PCI_SLOT(dev->devfn);
-    func = PCI_FUNC(dev->devfn);
-
-    pos = pci_find_cap_offset(bus, slot, func, PCI_CAP_ID_MSI);
-    control = pci_conf_read16(bus, slot, func, msi_control_reg(pos));
     msi_set_enable(dev, 0);
 
     BUG_ON(list_empty(&dev->msi_list));

diff -r d657cd6182d5 -r a7329b4e30a3 xen/arch/x86/microcode_amd.c
@@ -164,7 +164,6 @@ static int apply_microcode(int cpu)
 static int get_next_ucode_from_buffer_amd(void *mc, const void *buf,
                                          size_t size, unsigned long *offset)
 {
-    struct microcode_header_amd *mc_header;
     size_t total_size;
     const uint8_t *bufp = buf;
     unsigned long off;

@@ -182,8 +181,6 @@ static int get_next_ucode_from_buffer_am
         return -EINVAL;
     }
 
-    mc_header = (struct microcode_header_amd *)(&bufp[off+8]);
-
     total_size = (unsigned long) (bufp[off+4] + (bufp[off+5] << 8));
 
     printk(KERN_INFO "microcode: size %lu, total_size %lu, offset %ld\n",

diff -r a7329b4e30a3 -r c8f5b4743f9a xen/arch/x86/time.c
@@ -1052,14 +1052,15 @@ static void local_time_calibration(void)
     curr_master_stime = c->stime_master_stamp;
     local_irq_enable();
 
-#if 0
+    if ( 0 )
+    {
     printk("PRE%d: tsc=%"PRIu64" stime=%"PRIu64" master=%"PRIu64"\n",
            smp_processor_id(), prev_tsc, prev_local_stime, prev_master_stime);
     printk("CUR%d: tsc=%"PRIu64" stime=%"PRIu64" master=%"PRIu64
            " -> %"PRId64"\n",
            smp_processor_id(), curr_tsc, curr_local_stime, curr_master_stime,
            curr_master_stime - curr_local_stime);
-#endif
+    }
 
     /* Local time warps forward if it lags behind master time. */
     if ( curr_local_stime < curr_master_stime )

diff -r c8f5b4743f9a -r 90160f32dbae xen/arch/x86/acpi/cpu_idle.c
@@ -273,7 +273,7 @@ static void acpi_processor_ffh_cstate_en
 
 static void acpi_idle_do_entry(struct acpi_processor_cx *cx)
 {
-    int unused;
+    int unused __attribute__((unused));
 
     switch ( cx->entry_method )
     {

diff -r 90160f32dbae -r c8e4a190705b xen/arch/x86/cpu/amd.c
@@ -329,7 +329,6 @@ static void check_syscfg_dram_mod_en(voi
 static void __devinit init_amd(struct cpuinfo_x86 *c)
 {
 	u32 l, h;
-	int r;
 
 #ifdef CONFIG_SMP
 	unsigned long long value;

@@ -375,8 +374,6 @@ static void __devinit init_amd(struct cp
 	}
 #endif
 
-	r = get_model_name(c);
-
 	switch(c->x86)
 	{
 	case 6: /* An Athlon/Duron */

diff -r c8e4a190705b -r 30c6a8c61c90 xen/arch/x86/cpu/intel.c
@@ -33,8 +33,6 @@ struct movsl_mask movsl_mask __read_most
  */
 static void __devinit set_cpuidmask(const struct cpuinfo_x86 *c)
 {
-	const char *extra = "";
-
 	if (!~(opt_cpuid_mask_ecx & opt_cpuid_mask_edx &
 	       opt_cpuid_mask_ext_ecx & opt_cpuid_mask_ext_edx))
 		return;

@@ -51,7 +49,6 @@ static void __devinit set_cpuidmask(cons
 		      opt_cpuid_mask_edx);
 		if (!~(opt_cpuid_mask_ext_ecx & opt_cpuid_mask_ext_edx))
 			return;
-		extra = "extended ";
 		break;
 /* 
  * CPU supports this feature if the processor signature meets the following:

diff -r 30c6a8c61c90 -r 284f38a196bf xen/arch/x86/cpu/intel_cacheinfo.c
@@ -170,7 +170,6 @@ unsigned int __cpuinit init_intel_cachei
 	unsigned int trace = 0, l1i = 0, l1d = 0, l2 = 0, l3 = 0; /* Cache sizes */
 	unsigned int new_l1d = 0, new_l1i = 0; /* Cache sizes from cpuid(4) */
 	unsigned int new_l2 = 0, new_l3 = 0, i; /* Cache sizes from cpuid(4) */
-	unsigned int l2_id = 0, l3_id = 0, num_threads_sharing, index_msb;
 
 	if (c->cpuid_level > 3) {
 		static int is_initialized;

@@ -203,15 +202,9 @@ unsigned int __cpuinit init_intel_cachei
 					break;
 				    case 2:
 					new_l2 = this_leaf.size/1024;
-					num_threads_sharing = 1 + this_leaf.eax.split.num_threads_sharing;
-					index_msb = get_count_order(num_threads_sharing);
-					l2_id = c->apicid >> index_msb;
 					break;
 				    case 3:
 					new_l3 = this_leaf.size/1024;
-					num_threads_sharing = 1 + this_leaf.eax.split.num_threads_sharing;
-					index_msb = get_count_order(num_threads_sharing);
-					l3_id = c->apicid >> index_msb;
 					break;
 				    default:
 					break;

diff -r 284f38a196bf -r c3b532f1954b xen/arch/x86/cpu/mcheck/mce.c
@@ -162,19 +162,19 @@ void mce_need_clearbank_register(mce_nee
     mc_need_clearbank_scan = cbfunc;
 }
 
-static struct mcinfo_bank *mca_init_bank(enum mca_source who,
+static void mca_init_bank(enum mca_source who,
                                          struct mc_info *mi, int bank)
 {
     struct mcinfo_bank *mib;
 
     if (!mi)
-        return NULL;
+        return;
 
     mib = x86_mcinfo_reserve(mi, sizeof(struct mcinfo_bank));
     if (!mib)
     {
         mi->flags |= MCINFO_FLAGS_UNCOMPLETE;
-        return NULL;
+        return;
     }
 
     memset(mib, 0, sizeof (struct mcinfo_bank));

@@ -207,8 +207,6 @@ static struct mcinfo_bank *mca_init_bank
         mib->mc_ctrl2 = mca_rdmsr(MSR_IA32_MC0_CTL2 + bank);
         rdtscll(mib->mc_tsc);
     }
-
-    return mib;
 }
 
 static int mca_init_global(uint32_t flags, struct mcinfo_global *mig)

@@ -297,8 +295,6 @@ mctelem_cookie_t mcheck_mca_logout(enum 
     recover = (mc_recoverable_scan)? 1: 0;
 
     for (i = 0; i < nr_mce_banks; i++) {
-        struct mcinfo_bank *mib;  /* on stack */
-
         /* Skip bank if corresponding bit in bankmask is clear */
         if (!mcabanks_test(i, bankmask))
             continue;

@@ -353,7 +349,7 @@ mctelem_cookie_t mcheck_mca_logout(enum 
              */
             recover = mc_recoverable_scan(status);
 
-        mib = mca_init_bank(who, mci, i);
+        mca_init_bank(who, mci, i);
 
         if (mc_callback_bank_extended)
             mc_callback_bank_extended(mci, i, status);

@@ -1226,13 +1222,10 @@ static void x86_mc_msrinject(void *data)
 {
     struct xen_mc_msrinject *mci = data;
     struct mcinfo_msr *msr;
-    struct cpuinfo_x86 *c;
     uint64_t hwcr = 0;
     int intpose;
     int i;
 
-    c = &cpu_data[smp_processor_id()];
-
     if (mci->mcinj_flags & _MC_MSRINJ_F_REQ_HWCR_WREN)
         hwcr = x86_mc_hwcr_wren();

diff -r c3b532f1954b -r afab96a155bc xen/arch/x86/hvm/emulate.c
@@ -59,11 +59,10 @@ static int hvmemul_do_io(
     ioreq_t *p = get_ioreq(curr);
     unsigned long ram_gfn = paddr_to_pfn(ram_gpa);
     p2m_type_t p2mt;
-    mfn_t ram_mfn;
     int rc;
 
     /* Check for paged out page */
-    ram_mfn = gfn_to_mfn_unshare(p2m, ram_gfn, &p2mt, 0);
+    gfn_to_mfn_unshare(p2m, ram_gfn, &p2mt, 0);
     if ( p2m_is_paging(p2mt) )
     {
         p2m_mem_paging_populate(p2m, ram_gfn);

diff -r afab96a155bc -r 15f2822f4efd xen/arch/x86/hvm/hvm.c
@@ -255,7 +255,7 @@ void hvm_migrate_timers(struct vcpu *v)
 
 void hvm_migrate_pirqs(struct vcpu *v)
 {
-    int pirq, irq;
+    int pirq, irq __attribute__ ((unused));
     struct irq_desc *desc;
     struct domain *d = v->domain;
     struct hvm_irq_dpci *hvm_irq_dpci = d->arch.hvm_domain.irq.dpci;

@@ -3750,8 +3750,7 @@ long do_hvm_op(unsigned long op, XEN_GUE
         {
             p2m_type_t t;
             p2m_type_t nt;
-            mfn_t mfn;
-            mfn = gfn_to_mfn_unshare(p2m, pfn, &t, 0);
+            gfn_to_mfn_unshare(p2m, pfn, &t, 0);
             if ( p2m_is_paging(t) )
             {
                 p2m_mem_paging_populate(p2m, pfn);

diff -r 15f2822f4efd -r 2aa144e0963a xen/arch/x86/hvm/viridian.c
@@ -270,7 +270,6 @@ int rdmsr_viridian_regs(uint32_t idx, ui
 int viridian_hypercall(struct cpu_user_regs *regs)
 {
     int mode = hvm_guest_x86_mode(current);
-    unsigned long input_params_gpa, output_params_gpa;
     uint16_t status = HV_STATUS_SUCCESS;
 
     union hypercall_input {

@@ -302,14 +301,10 @@ int viridian_hypercall(struct cpu_user_r
 #ifdef __x86_64__
     case 8:
         input.raw = regs->rcx;
-        input_params_gpa = regs->rdx;
-        output_params_gpa = regs->r8;
         break;
 #endif
     case 4:
         input.raw = ((uint64_t)regs->edx << 32) | regs->eax;
-        input_params_gpa = ((uint64_t)regs->ebx << 32) | regs->ecx;
-        output_params_gpa = ((uint64_t)regs->edi << 32) | regs->esi;
         break;
     default:
         goto out;

diff -r 2aa144e0963a -r ac80525a292a xen/arch/x86/mm/p2m-pod.c
@@ -1098,7 +1098,6 @@ guest_physmap_mark_populate_on_demand(st
     struct p2m_domain *p2m = p2m_get_hostp2m(d);
     unsigned long i;
     p2m_type_t ot;
-    mfn_t omfn;
     int pod_count = 0;
     int rc = 0;
 

@@ -1116,7 +1115,7 @@ guest_physmap_mark_populate_on_demand(st
     /* Make sure all gpfns are unused */
     for ( i = 0; i < (1UL << order); i++ )
     {
-        omfn = gfn_to_mfn_query(p2m, gfn + i, &ot);
+        gfn_to_mfn_query(p2m, gfn + i, &ot);
         if ( p2m_is_ram(ot) )
         {
             printk("%s: gfn_to_mfn returned type %d!\n",

diff -r ac80525a292a -r 535fce9f4de3 xen/arch/x86/mm/mem_sharing.c
@@ -376,10 +376,8 @@ int mem_sharing_debug_gfn(struct domain 
 {
     p2m_type_t p2mt;
     mfn_t mfn;
-    struct page_info *page;
 
     mfn = gfn_to_mfn(p2m_get_hostp2m(d), gfn, &p2mt);
-    page = mfn_to_page(mfn);
 
     printk("Debug for domain=%d, gfn=%lx, ", 
             d->domain_id, 

diff -r 535fce9f4de3 -r 305d1c98f6f8 xen/arch/x86/x86_64/mm.c
@@ -437,7 +437,7 @@ void destroy_m2p_mapping(struct mem_hota
 static int setup_compat_m2p_table(struct mem_hotadd_info *info)
 {
     unsigned long i, va, smap, emap, rwva, epfn = info->epfn;
-    unsigned int n, memflags;
+    unsigned int n;
     l3_pgentry_t *l3_ro_mpt = NULL;
     l2_pgentry_t *l2_ro_mpt = NULL;
     struct page_info *l1_pg;

@@ -489,8 +489,6 @@ static int setup_compat_m2p_table(struct
         if ( n == CNT )
             continue;
 
-        memflags = MEMF_node(phys_to_nid(i << PAGE_SHIFT));
-
         l1_pg = mfn_to_page(alloc_hotadd_mfn(info));
         err = map_pages_to_xen(rwva, page_to_mfn(l1_pg),
                                1UL << PAGETABLE_ORDER,

diff -r 305d1c98f6f8 -r ce00a34fc0a3 xen/arch/x86/mm.c
@@ -4976,7 +4976,7 @@ static int ptwr_emulated_update(
 {
     unsigned long mfn;
     unsigned long unaligned_addr = addr;
-    struct page_info *page;
+    struct page_info *page __attribute__((unused));
     l1_pgentry_t pte, ol1e, nl1e, *pl1e;
     struct vcpu *v = current;
     struct domain *d = v->domain;

diff -r ce00a34fc0a3 -r a00c741e827f xen/arch/x86/cpu/mcheck/vmce.c
@@ -576,7 +576,7 @@ int is_vmce_ready(struct mcinfo_bank *ba
  */
 int unmmap_broken_page(struct domain *d, mfn_t mfn, unsigned long gfn)
 {
-    mfn_t r_mfn;
+    mfn_t r_mfn __attribute__ ((unused));
     struct p2m_domain *p2m;
     p2m_type_t pt;

diff -r a00c741e827f -r fcc266b4dcc5 xen/common/tmem.c
@@ -1346,7 +1346,7 @@ obj_unlock:
 static int tmem_evict(void)
 {
     client_t *client = tmh_client_from_current();
-    pgp_t *pgp = NULL, *pgp2, *pgp_del;
+    pgp_t *pgp = NULL, *pgp2, *pgp_del __attribute__((unused));
     obj_t *obj;
     pool_t *pool;
     int ret = 0;

@@ -1583,7 +1583,7 @@ static NOINLINE int do_tmem_put(pool_t *
               pagesize_t pfn_offset, pagesize_t len, void *cva)
 {
     obj_t *obj = NULL, *objfound = NULL, *objnew = NULL;
-    pgp_t *pgp = NULL, *pgpdel = NULL;
+    pgp_t *pgp = NULL, *pgpdel __attribute__((unused));
     client_t *client = pool->client;
     int ret = client->frozen ? -EFROZEN : -ENOMEM;

diff -r fcc266b4dcc5 -r 881c89e72ed5 xen/common/tmem_xen.c
@@ -177,7 +177,7 @@ EXPORT int tmh_copy_from_client(pfp_t *p
 EXPORT int tmh_compress_from_client(tmem_cli_mfn_t cmfn,
     void **out_va, size_t *out_len, void *cli_va)
 {
-    int ret = 0;
+    int ret __attribute__ ((unused));
     unsigned char *dmem = this_cpu(dstmem);
     unsigned char *wmem = this_cpu(workmem);
     pfp_t *cli_pfp = NULL;

@@ -237,7 +237,7 @@ EXPORT int tmh_decompress_to_client(tmem
     pfp_t *cli_pfp = NULL;
     size_t out_len = PAGE_SIZE;
     bool_t tmemc = cli_va != NULL; /* if true, cli_va is control-op buffer */
-    int ret;
+    int ret __attribute__ ((unused));
 
     if ( !tmemc )
     {

@@ -366,15 +366,17 @@ static void tmh_persistent_pool_page_put
 EXPORT tmh_client_t *tmh_client_init(cli_id_t cli_id)
 {
     tmh_client_t *tmh;
+#ifndef __i386__
     char name[5];
     int i, shift;
+#endif
 
     if ( (tmh = xmalloc(tmh_client_t)) == NULL )
         return NULL;
+#ifndef __i386__
     for (i = 0, shift = 12; i < 4; shift -=4, i++)
         name[i] = (((unsigned short)cli_id >> shift) & 0xf) + '0';
     name[4] = '\0';
-#ifndef __i386__
     tmh->persistent_pool = xmem_pool_create(name, tmh_persistent_pool_page_get,
         tmh_persistent_pool_page_put, PAGE_SIZE, 0, PAGE_SIZE);
     if ( tmh->persistent_pool == NULL )

diff -r 881c89e72ed5 -r 2e6175d09966 xen/arch/x86/mm/p2m.c
@@ -321,7 +321,7 @@ p2m_remove_page(struct p2m_domain *p2m, 
                 unsigned int page_order)
 {
     unsigned long i;
-    mfn_t mfn_return;
+    mfn_t mfn_return __attribute__ ((unused));
     p2m_type_t t;
     p2m_access_t a;

diff -r 2e6175d09966 -r f64bb486b83c xen/arch/x86/mm/shadow/multi.c
@@ -124,7 +124,7 @@ set_shadow_status(struct vcpu *v, mfn_t 
 /* Put a shadow into the hash table */
 {
     struct domain *d = v->domain;
-    int res;
+    int res __attribute__((unused));
 
     SHADOW_PRINTK("d=%d, v=%d, gmfn=%05lx, type=%08x, smfn=%05lx\n",
                    d->domain_id, v->vcpu_id, mfn_x(gmfn),

@@ -4431,7 +4431,7 @@ sh_update_cr3(struct vcpu *v, int do_loc
 int sh_rm_write_access_from_sl1p(struct vcpu *v, mfn_t gmfn, 
                                  mfn_t smfn, unsigned long off)
 {
-    int r;
+    int r __attribute__((unused));
     shadow_l1e_t *sl1p, sl1e;
     struct page_info *sp;

diff -r f64bb486b83c -r 9c4ff8016970 xen/arch/x86/traps.c
@@ -1739,7 +1739,9 @@ static int emulate_privileged_op(struct 
     struct vcpu *v = current;
     unsigned long *reg, eip = regs->eip;
     u8 opcode, modrm_reg = 0, modrm_rm = 0, rep_prefix = 0, lock = 0, rex = 0;
+#ifdef CONFIG_X86_64
     enum { lm_seg_none, lm_seg_fs, lm_seg_gs } lm_ovr = lm_seg_none;
+#endif
     int rc;
     unsigned int port, i, data_sel, ar, data, bpmatch = 0;
     unsigned int op_bytes, op_default, ad_bytes, ad_default, opsize_prefix= 0;

@@ -1795,11 +1797,15 @@ static int emulate_privileged_op(struct 
             continue;
         case 0x64: /* FS override */
             data_sel = read_sreg(regs, fs);
+#ifdef CONFIG_X86_64
             lm_ovr = lm_seg_fs;
+#endif
             continue;
         case 0x65: /* GS override */
             data_sel = read_sreg(regs, gs);
+#ifdef CONFIG_X86_64
             lm_ovr = lm_seg_gs;
+#endif
             continue;
         case 0x36: /* SS override */
             data_sel = regs->ss;

@@ -1846,7 +1852,9 @@ static int emulate_privileged_op(struct 
         if ( !(opcode & 2) )
         {
             data_sel = read_sreg(regs, es);
+#ifdef CONFIG_X86_64
             lm_ovr = lm_seg_none;
+#endif
         }
 
         if ( !(ar & _SEGMENT_L) )

diff -r 9c4ff8016970 -r aa545d1b4f1c xen/arch/x86/domain_build.c
@@ -302,7 +302,10 @@ int __init construct_dom0(
     void *(*bootstrap_map)(const module_t *),
     char *cmdline)
 {
-    int i, cpu, rc, compatible, compat32, order, machine;
+    int i, cpu, rc, compatible, order, machine;
+#if defined(__x86_64__)
+    int compat32 = 0;
+#endif
     struct cpu_user_regs *regs;
     unsigned long pfn, mfn;
     unsigned long nr_pages;

@@ -377,7 +380,6 @@ int __init construct_dom0(
 
     /* compatibility check */
     compatible = 0;
-    compat32   = 0;
     machine = elf_uval(&elf, elf.ehdr, e_machine);
     switch (CONFIG_PAGING_LEVELS) {
     case 3: /* x86_32p */

@@ -393,7 +395,9 @@ int __init construct_dom0(
             parms.pae = PAEKERN_extended_cr3;
         if (elf_32bit(&elf) && parms.pae && machine == EM_386)
         {
+#if defined(__x86_64__)
             compat32 = 1;
+#endif
             compatible = 1;
         }
         if (elf_64bit(&elf) && machine == EM_X86_64)