Fix gcc-6 warnings

* ddb/db_elf.c (elf_db_sym_init): Turn `i' into unsigned.
* device/ds_routines.c (ds_device_open, device_writev_trap): Likewise.
* i386/i386/user_ldt.c (i386_set_ldt): Likewise for `i', `min_selector', and
`first_desc'.
(i386_get_ldt): Likewise for `ldt_count'.
(user_ldt_free): Likewise for `i'.
* i386/i386/xen.h (hyp_set_ldt): Turn `count' into unsigned long.
* i386/intel/pmap.c (pmap_bootstrap): Turn `i', `j' and 'n' into unsigned.
(pmap_clear_bootstrap_pagetable): Likewise for `i' and `j'.
* ipc/ipc_kmsg.c (ipc_msg_print): Turn `i' and `numwords' into unsigned.
* kern/boot_script.c (boot_script_parse_line): Likewise for `i'.
* kern/bootstrap.c (bootstrap_create): Likewise for `n' and `i'.
* kern/host.c (host_processors): Likewise for `i'.
* kern/ipc_tt.c (mach_ports_register): Likewise.
* kern/mach_clock.c (tickadj, bigadj): turn into unsigned.
* kern/processor.c (processor_set_things): Turn `i' into unsigned.
* kern/task.c (task_threads): Likewise.
* kern/thread.c (consider_thread_collect, stack_init): Likewise.
* kern/strings.c (memset): Turn `i' into size_t.
* vm/memory_object.c (memory_object_lock_request): Turn `i' into unsigned.
* xen/block.c (hyp_block_init): Use %u format for evt.
(device_open): Drop unused err variable.
(device_write): Turn `copy_npages', `i', `nbpages', and `j' into unsigned.
* xen/console.c (hypcnread, hypcnwrite, hypcnclose): Turn dev to dev_t.
(hypcnclose): Return void.
* xen/console.h (hypcnread, hypcnwrite, hypcnclose): Fix prototypes
accordingly.
* xen/evt.c (form_int_mask): Turn `i' into int.
* xen/net.c (hyp_net_init): Use %u format for evt.
(device_open): Remove unused `err' variable.

5 files changed, 14 insertions, 14 deletions

diff --git a/xen/block.c b/xen/block.c
index 46df3589..7d6f1ca3 100644
--- a/xen/block.c
+++ b/xen/block.c
@@ -247,7 +247,7 @@ void hyp_block_init(void) {
 			/* Allocate an event channel and give it to backend.  */
 			bd->evt = evt = hyp_event_channel_alloc(domid);
 			hyp_evt_handler(evt, hyp_block_intr, n, SPL7);
-			i = sprintf(port_name, "%lu", evt);
+			i = sprintf(port_name, "%u", evt);
 			c = hyp_store_write(t, port_name, 5, VBD_PATH, "/", vbds[n], "/", "event-channel");
 			if (!c)
 				panic("%s: couldn't store event channel (%s)", device_name, hyp_store_error);
@@ -351,7 +351,7 @@ static io_return_t
 device_open (ipc_port_t reply_port, mach_msg_type_name_t reply_port_type,
 	    dev_mode_t mode, char *name, device_t *devp /* out */)
 {
-	int i, err = 0;
+	int i;
 	ipc_port_t port, notify;
 	struct block_data *bd;
 
@@ -569,13 +569,13 @@ device_write(void *d, ipc_port_t reply_port,
   io_return_t err = 0;
   vm_map_copy_t copy = (vm_map_copy_t) data;
   vm_offset_t aligned_buffer = 0;
-  int copy_npages = atop(round_page(count));
+  unsigned copy_npages = atop(round_page(count));
   vm_offset_t phys_addrs[copy_npages];
   struct block_data *bd = d;
   blkif_request_t *req;
   grant_ref_t gref[BLKIF_MAX_SEGMENTS_PER_REQUEST];
   unsigned reqn, size;
-  int i, nbpages, j;
+  unsigned i, nbpages, j;
 
   if (!(bd->mode & D_WRITE))
     return D_READ_ONLY;
diff --git a/xen/console.c b/xen/console.c
index 313b9342..9e8db8f8 100644
--- a/xen/console.c
+++ b/xen/console.c
@@ -129,14 +129,14 @@ static void hypcnintr(int unit, spl_t spl, void *ret_addr, void *regs) {
 	simple_unlock(&inlock);
 }
 
-int hypcnread(int dev, io_req_t ior)
+int hypcnread(dev_t dev, io_req_t ior)
 {
 	struct tty *tp = &hypcn_tty;
 	tp->t_state |= TS_CARR_ON;
 	return char_read(tp, ior);
 }
 
-int hypcnwrite(int dev, io_req_t ior)
+int hypcnwrite(dev_t dev, io_req_t ior)
 {
 	return char_write(&hypcn_tty, ior);
 }
@@ -207,7 +207,7 @@ int hypcnopen(dev_t dev, int flag, io_req_t ior)
 	return (char_open(dev, tp, flag, ior));
 }
 
-int hypcnclose(int dev, int flag)
+void hypcnclose(dev_t dev, int flag)
 {
 	struct tty	*tp = &hypcn_tty;
 	spl_t s = spltty();
@@ -215,7 +215,6 @@ int hypcnclose(int dev, int flag)
 	ttyclose(tp);
 	simple_unlock(&tp->t_lock);
 	splx(s);
-	return 0;
 }
 
 int hypcnprobe(struct consdev *cp)
diff --git a/xen/console.h b/xen/console.h
index 061ba281..c129bd4a 100644
--- a/xen/console.h
+++ b/xen/console.h
@@ -40,9 +40,9 @@ extern int hypcnprobe(struct consdev *cp);
 extern int hypcninit(struct consdev *cp);
 
 extern int hypcnopen(dev_t dev, int flag, io_req_t ior);
-extern int hypcnread(int dev, io_req_t ior);
-extern int hypcnwrite(int dev, io_req_t ior);
-extern int hypcnclose(int dev, int flag);
+extern int hypcnread(dev_t dev, io_req_t ior);
+extern int hypcnwrite(dev_t dev, io_req_t ior);
+extern void hypcnclose(int dev, int flag);
 extern io_return_t hypcngetstat(dev_t dev, int flavor, int *data, unsigned int *count);
 extern io_return_t hypcnsetstat(dev_t dev, int flavor, int *data, unsigned int count);
 extern int hypcnportdeath(dev_t dev, mach_port_t port);
diff --git a/xen/evt.c b/xen/evt.c
index c62e1d59..2a84ef77 100644
--- a/xen/evt.c
+++ b/xen/evt.c
@@ -77,7 +77,8 @@ void hyp_c_callback(void *ret_addr, void *regs)
 
 void form_int_mask(void)
 {
-	unsigned int i, j, bit, mask;
+	unsigned int j, bit, mask;
+	int i;
 
 	for (i=SPL0; i < NSPL; i++) {
 		for (j=0x00, bit=0x01, mask = 0; j < NEVNT; j++, bit<<=1)
diff --git a/xen/net.c b/xen/net.c
index 7181d780..5a3f90d9 100644
--- a/xen/net.c
+++ b/xen/net.c
@@ -395,7 +395,7 @@ void hyp_net_init(void) {
 
 			/* Allocate an event channel and give it to backend.  */
 			nd->evt = evt = hyp_event_channel_alloc(domid);
-			i = sprintf(port_name, "%lu", evt);
+			i = sprintf(port_name, "%u", evt);
 			c = hyp_store_write(t, port_name, 5, VIF_PATH, "/", vifs[n], "/", "event-channel");
 			if (!c)
 				panic("eth: couldn't store event channel for VIF %s (%s)", vifs[n], hyp_store_error);
@@ -538,7 +538,7 @@ static io_return_t
 device_open (ipc_port_t reply_port, mach_msg_type_name_t reply_port_type,
 	    dev_mode_t mode, char *name, device_t *devp /* out */)
 {
-	int i, n, err = 0;
+	int i, n;
 	ipc_port_t port, notify;
 	struct net_data *nd;