From a38131b669253fe40eff41e17ab7d1df78adbcd8 Mon Sep 17 00:00:00 2001 From: blueswir1 Date: Fri, 5 Dec 2008 17:56:40 +0000 Subject: [PATCH] Attached patch contains warning fixes. Signed-off-by: Christoph Egger git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5888 c046a42c-6fe2-441c-8c8c-71466251a162 --- block.c | 4 ++-- hw/mpcore.c | 2 ++ usb-bsd.c | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/block.c b/block.c index 22aec97037..28d63d7e6b 100644 --- a/block.c +++ b/block.c @@ -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; } } diff --git a/usb-bsd.c b/usb-bsd.c index 567aa81d81..0e4157c58b 100644 --- a/usb-bsd.c +++ b/usb-bsd.c @@ -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]); -- 2.11.4.GIT