diff options
| -rw-r--r-- | hw/block/xen_blkif.h | 12 | ||||
| -rw-r--r-- | hw/block/xen_disk.c | 2 | ||||
| -rw-r--r-- | hw/usb/xen-usb.c | 5 | ||||
| -rw-r--r-- | include/hw/xen/xen.h | 1 |
4 files changed, 9 insertions, 11 deletions
diff --git a/hw/block/xen_blkif.h b/hw/block/xen_blkif.h index c68487cb31..e3b133b9f8 100644 --- a/hw/block/xen_blkif.h +++ b/hw/block/xen_blkif.h @@ -79,14 +79,14 @@ static inline void blkif_get_x86_32_req(blkif_request_t *dst, blkif_x86_32_reque dst->handle = src->handle; dst->id = src->id; dst->sector_number = src->sector_number; - if (src->operation == BLKIF_OP_DISCARD) { + /* Prevent the compiler from using src->... instead. */ + barrier(); + if (dst->operation == BLKIF_OP_DISCARD) { struct blkif_request_discard *s = (void *)src; struct blkif_request_discard *d = (void *)dst; d->nr_sectors = s->nr_sectors; return; } - /* prevent the compiler from optimizing the code and using src->nr_segments instead */ - barrier(); if (n > dst->nr_segments) n = dst->nr_segments; for (i = 0; i < n; i++) @@ -102,14 +102,14 @@ static inline void blkif_get_x86_64_req(blkif_request_t *dst, blkif_x86_64_reque dst->handle = src->handle; dst->id = src->id; dst->sector_number = src->sector_number; - if (src->operation == BLKIF_OP_DISCARD) { + /* Prevent the compiler from using src->... instead. */ + barrier(); + if (dst->operation == BLKIF_OP_DISCARD) { struct blkif_request_discard *s = (void *)src; struct blkif_request_discard *d = (void *)dst; d->nr_sectors = s->nr_sectors; return; } - /* prevent the compiler from optimizing the code and using src->nr_segments instead */ - barrier(); if (n > dst->nr_segments) n = dst->nr_segments; for (i = 0; i < n; i++) diff --git a/hw/block/xen_disk.c b/hw/block/xen_disk.c index 064c116a7c..cf57814fb6 100644 --- a/hw/block/xen_disk.c +++ b/hw/block/xen_disk.c @@ -679,6 +679,8 @@ static int blk_get_request(struct XenBlkDev *blkdev, struct ioreq *ioreq, RING_I RING_GET_REQUEST(&blkdev->rings.x86_64_part, rc)); break; } + /* Prevent the compiler from accessing the on-ring fields instead. */ + barrier(); return 0; } diff --git a/hw/usb/xen-usb.c b/hw/usb/xen-usb.c index 664df04181..8fa47edd9a 100644 --- a/hw/usb/xen-usb.c +++ b/hw/usb/xen-usb.c @@ -19,13 +19,10 @@ * GNU GPL, version 2 or (at your option) any later version. */ +#include "qemu/osdep.h" #include <libusb.h> -#include <stdio.h> -#include <sys/types.h> #include <sys/mman.h> -#include <sys/time.h> -#include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/config-file.h" #include "hw/sysbus.h" diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h index 6365483473..b2cd992430 100644 --- a/include/hw/xen/xen.h +++ b/include/hw/xen/xen.h @@ -8,7 +8,6 @@ */ #include "qemu-common.h" -#include "qemu/typedefs.h" #include "exec/cpu-common.h" #include "hw/irq.h" |