diff options
| author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2021-02-07 08:43:53 -0500 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2021-02-07 08:43:53 -0500 |
| commit | 436b60e582ec5026db82d8961477ffe94d8e2b90 (patch) | |
| tree | 88438499a40b1ef2859c4cbd9e1f1413211024da /recipes-extended/kvmtool/files/0001-Avoid-pointers-for-address-of-packed-members.patch | |
| parent | 0904b0a7788d22f32d28541197c898e032107c99 (diff) | |
| download | meta-virtualization-436b60e582ec5026db82d8961477ffe94d8e2b90.tar.gz | |
kvmtool: refresh to 5.10 version
Grabbing the latest kvmtool sources. These follow kernel numbering,
so we bump that to 5.10 to match.
We also drop one patch that is part of the main repo now, and
refresh the others to avoid fuzz warnings.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-extended/kvmtool/files/0001-Avoid-pointers-for-address-of-packed-members.patch')
| -rw-r--r-- | recipes-extended/kvmtool/files/0001-Avoid-pointers-for-address-of-packed-members.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/recipes-extended/kvmtool/files/0001-Avoid-pointers-for-address-of-packed-members.patch b/recipes-extended/kvmtool/files/0001-Avoid-pointers-for-address-of-packed-members.patch deleted file mode 100644 index 863e86a8..00000000 --- a/recipes-extended/kvmtool/files/0001-Avoid-pointers-for-address-of-packed-members.patch +++ /dev/null | |||
| @@ -1,39 +0,0 @@ | |||
| 1 | From 2e22df7c24dadf5e16004cd832cabca76a699d4d Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Tue, 21 Mar 2017 23:32:39 -0700 | ||
| 4 | Subject: [PATCH] Avoid pointers for address of packed members | ||
| 5 | |||
| 6 | Fixes Clang warning due to -Waddress-of-packed-member | ||
| 7 | |||
| 8 | 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] | ||
| 9 | struct virtio_blk_geometry *geo = &conf->geometry; | ||
| 10 | |||
| 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 12 | --- | ||
| 13 | virtio/blk.c | 3 +-- | ||
| 14 | 1 file changed, 1 insertion(+), 2 deletions(-) | ||
| 15 | |||
| 16 | diff --git a/virtio/blk.c b/virtio/blk.c | ||
| 17 | index c485e4f..1f7365d 100644 | ||
| 18 | --- a/virtio/blk.c | ||
| 19 | +++ b/virtio/blk.c | ||
| 20 | @@ -158,7 +158,6 @@ static void set_guest_features(struct kvm *kvm, void *dev, u32 features) | ||
| 21 | { | ||
| 22 | struct blk_dev *bdev = dev; | ||
| 23 | struct virtio_blk_config *conf = &bdev->blk_config; | ||
| 24 | - struct virtio_blk_geometry *geo = &conf->geometry; | ||
| 25 | |||
| 26 | bdev->features = features; | ||
| 27 | |||
| 28 | @@ -167,7 +166,7 @@ static void set_guest_features(struct kvm *kvm, void *dev, u32 features) | ||
| 29 | conf->seg_max = virtio_host_to_guest_u32(&bdev->vdev, conf->seg_max); | ||
| 30 | |||
| 31 | /* Geometry */ | ||
| 32 | - geo->cylinders = virtio_host_to_guest_u16(&bdev->vdev, geo->cylinders); | ||
| 33 | + conf->geometry.cylinders = virtio_host_to_guest_u16(&bdev->vdev, conf->geometry.cylinders); | ||
| 34 | |||
| 35 | conf->blk_size = virtio_host_to_guest_u32(&bdev->vdev, conf->blk_size); | ||
| 36 | conf->min_io_size = virtio_host_to_guest_u16(&bdev->vdev, conf->min_io_size); | ||
| 37 | -- | ||
| 38 | 2.12.0 | ||
| 39 | |||
