68 lines
2.3 KiB
Diff
68 lines
2.3 KiB
Diff
From f6c9bb6adbee8f74172707845dcdf221e79e35d4 Mon Sep 17 00:00:00 2001
|
|
From: Peter Krempa <pkrempa@redhat.com>
|
|
Date: Tue, 23 Aug 2022 15:29:43 +0200
|
|
Subject: [PATCH 1/4] virhostcpu: Fix build with clang and newest kernel
|
|
headers
|
|
|
|
The most recent environment e.g. present in our Fedora Rawhide builds
|
|
fail to build the tree with clang with the following error:
|
|
|
|
../src/util/virhostcpu.c:1291:25: error: field 'header' with variable sized type 'struct kvm_msrs' not at the end of a struct or class is a GNU extension [-Werror,-Wgnu-variable-sized-type-not-at-end]
|
|
struct kvm_msrs header;
|
|
^
|
|
|
|
The problem seems to be that clang doesn't like the new way the
|
|
'entries' field in struct kvm_msrs is declared.
|
|
|
|
To work around the issue we can simply allocate the variable dynamically
|
|
and use the 'entries' member as it was intended to to access the
|
|
members.
|
|
|
|
origin commit: https://gitlab.com/libvirt/libvirt/-/commit/56b3ee743916c8951a32a1650616621d78afe8c7
|
|
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
|
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
|
|
Signed-off-by: Chenxi Mao <chenxi.mao@suse.com>
|
|
---
|
|
src/util/virhostcpu.c | 15 ++++++---------
|
|
1 file changed, 6 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c
|
|
index ce3da7e6ec..8c8fc3a476 100644
|
|
--- a/src/util/virhostcpu.c
|
|
+++ b/src/util/virhostcpu.c
|
|
@@ -1275,25 +1275,22 @@ virHostCPUGetMSRFromKVM(unsigned long index,
|
|
uint64_t *result)
|
|
{
|
|
VIR_AUTOCLOSE fd = -1;
|
|
- struct {
|
|
- struct kvm_msrs header;
|
|
- struct kvm_msr_entry entry;
|
|
- } msr = {
|
|
- .header = { .nmsrs = 1 },
|
|
- .entry = { .index = index },
|
|
- };
|
|
+ g_autofree struct kvm_msrs *msr = g_malloc0(sizeof(struct kvm_msrs) +
|
|
+ sizeof(struct kvm_msr_entry));
|
|
+ msr->nmsrs = 1;
|
|
+ msr->entries[0].index = index;
|
|
|
|
if ((fd = open(KVM_DEVICE, O_RDONLY)) < 0) {
|
|
virReportSystemError(errno, _("Unable to open %s"), KVM_DEVICE);
|
|
return -1;
|
|
}
|
|
|
|
- if (ioctl(fd, KVM_GET_MSRS, &msr) < 0) {
|
|
+ if (ioctl(fd, KVM_GET_MSRS, msr) < 0) {
|
|
VIR_DEBUG("Cannot get MSR 0x%lx from KVM", index);
|
|
return 1;
|
|
}
|
|
|
|
- *result = msr.entry.data;
|
|
+ *result = msr->entries[0].data;
|
|
return 0;
|
|
}
|
|
|
|
--
|
|
2.33.0
|
|
|