diff options
| -rw-r--r-- | block.c | 4 | ||||
| -rw-r--r-- | hw/mpcore.c | 2 | ||||
| -rw-r--r-- | usb-bsd.c | 6 |
3 files changed, 7 insertions, 5 deletions
@@ -765,7 +765,7 @@ static int guess_disk_lchs(BlockDriverState *bs, int ret, i, heads, sectors, cylinders; struct partition *p; uint32_t nr_sects; - int64_t nb_sectors; + uint64_t nb_sectors; bdrv_get_geometry(bs, &nb_sectors); @@ -805,7 +805,7 @@ void bdrv_guess_geometry(BlockDriverState *bs, int *pcyls, int *pheads, int *pse { int translation, lba_detected = 0; int cylinders, heads, secs; - int64_t nb_sectors; + uint64_t nb_sectors; /* if a geometry hint is available, use it */ bdrv_get_geometry(bs, &nb_sectors); diff --git a/hw/mpcore.c b/hw/mpcore.c index 17c8d6c6e1..914087addf 100644 --- a/hw/mpcore.c +++ b/hw/mpcore.c @@ -105,6 +105,8 @@ static uint32_t mpcore_timer_read(mpcore_timer_state *s, int offset) return s->control; case 12: /* Interrupt status. */ return s->status; + default: + return 0; } } @@ -68,7 +68,7 @@ static int ensure_ep_open(USBHostDevice *dev, int ep, int mode) ep = UE_GET_ADDR(ep); if (dev->ep_fd[ep] < 0) { -#if __FreeBSD__ +#ifdef __FreeBSD__ snprintf(buf, sizeof(buf) - 1, "%s.%d", dev->devpath, ep); #else snprintf(buf, sizeof(buf) - 1, "%s.%02d", dev->devpath, ep); @@ -321,7 +321,7 @@ USBDevice *usb_host_device_open(const char *devname) return NULL; } -#if __FreeBSD__ +#ifdef __FreeBSD__ snprintf(ctlpath, PATH_MAX, "/dev/%s", bus_info.udi_devnames[0]); #else snprintf(ctlpath, PATH_MAX, "/dev/%s.00", bus_info.udi_devnames[0]); @@ -413,7 +413,7 @@ static int usb_host_scan(void *opaque, USBScanFunc *func) if (strncmp(bus_info.udi_devnames[0], "ugen", 4) != 0) continue; -#if __FreeBSD__ +#ifdef __FreeBSD__ snprintf(devbuf, sizeof(devbuf) - 1, "/dev/%s", bus_info.udi_devnames[0]); #else snprintf(devbuf, sizeof(devbuf) - 1, "/dev/%s.00", bus_info.udi_devnames[0]); |