1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
From 2e22df7c24dadf5e16004cd832cabca76a699d4d Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 21 Mar 2017 23:32:39 -0700
Subject: [PATCH] Avoid pointers for address of packed members
Fixes Clang warning due to -Waddress-of-packed-member
virtio/blk.c:161:37: error: taking address of packed member 'geometry' of class or structure 'virtio_blk_config' may result in an unaligned pointer value [-Werror,-Waddress-of-packed-member]
struct virtio_blk_geometry *geo = &conf->geometry;
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
virtio/blk.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/virtio/blk.c b/virtio/blk.c
index c485e4f..1f7365d 100644
--- a/virtio/blk.c
+++ b/virtio/blk.c
@@ -158,7 +158,6 @@ static void set_guest_features(struct kvm *kvm, void *dev, u32 features)
{
struct blk_dev *bdev = dev;
struct virtio_blk_config *conf = &bdev->blk_config;
- struct virtio_blk_geometry *geo = &conf->geometry;
bdev->features = features;
@@ -167,7 +166,7 @@ static void set_guest_features(struct kvm *kvm, void *dev, u32 features)
conf->seg_max = virtio_host_to_guest_u32(&bdev->vdev, conf->seg_max);
/* Geometry */
- geo->cylinders = virtio_host_to_guest_u16(&bdev->vdev, geo->cylinders);
+ conf->geometry.cylinders = virtio_host_to_guest_u16(&bdev->vdev, conf->geometry.cylinders);
conf->blk_size = virtio_host_to_guest_u32(&bdev->vdev, conf->blk_size);
conf->min_io_size = virtio_host_to_guest_u16(&bdev->vdev, conf->min_io_size);
--
2.12.0
|
