aboutsummaryrefslogtreecommitdiff
path: root/xen/block.c
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2016-05-18 02:25:28 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2016-05-18 02:33:30 +0200
commita7f248bf76dc0cabd1581143e9f4aa6454c91655 (patch)
tree3a11eb34d258dec0aef94b982ce870f85ca8b2ac /xen/block.c
parent6af1500b30bfdb343bbf1efe432f797cb2c03cdf (diff)
downloadgnumach-a7f248bf76dc0cabd1581143e9f4aa6454c91655.tar.gz
gnumach-a7f248bf76dc0cabd1581143e9f4aa6454c91655.tar.bz2
gnumach-a7f248bf76dc0cabd1581143e9f4aa6454c91655.zip
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.
Diffstat (limited to 'xen/block.c')
-rw-r--r--xen/block.c8
1 files changed, 4 insertions, 4 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;