msi: Guard msi/msix_write_config with msi_present

[qemu.git] / hw / xen_blkif.h

diff --git a/hw/xen_blkif.h b/hw/xen_blkif.h
index 254a5fd50c9898855bf53eae294bc0f5c0079781..c0f4136228817d9976531ab28e7099395c19d1e0 100644 (file)
--- a/hw/xen_blkif.h
+++ b/hw/xen_blkif.h
@@ -59,8 +59,8 @@ DEFINE_RING_TYPES(blkif_x86_64, struct blkif_x86_64_request, struct blkif_x86_64
 union blkif_back_rings {
        blkif_back_ring_t        native;
        blkif_common_back_ring_t common;
-       blkif_x86_32_back_ring_t x86_32;
-       blkif_x86_64_back_ring_t x86_64;
+        blkif_x86_32_back_ring_t x86_32_part;
+        blkif_x86_64_back_ring_t x86_64_part;
 };
 typedef union blkif_back_rings blkif_back_rings_t;
 
@@ -70,7 +70,7 @@ enum blkif_protocol {
        BLKIF_PROTOCOL_X86_64 = 3,
 };
 
-static void inline blkif_get_x86_32_req(blkif_request_t *dst, blkif_x86_32_request_t *src)
+static inline void blkif_get_x86_32_req(blkif_request_t *dst, blkif_x86_32_request_t *src)
 {
        int i, n = BLKIF_MAX_SEGMENTS_PER_REQUEST;
 
@@ -85,7 +85,7 @@ static void inline blkif_get_x86_32_req(blkif_request_t *dst, blkif_x86_32_reque
                dst->seg[i] = src->seg[i];
 }
 
-static void inline blkif_get_x86_64_req(blkif_request_t *dst, blkif_x86_64_request_t *src)
+static inline void blkif_get_x86_64_req(blkif_request_t *dst, blkif_x86_64_request_t *src)
 {
        int i, n = BLKIF_MAX_SEGMENTS_PER_REQUEST;