Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51e29625 authored by Jerone Young's avatar Jerone Young Committed by Avi Kivity
Browse files

KVM: Add ifdef in irqchip struct for x86 only structures 



This patch fixes a small issue where sturctures:
	kvm_pic_state
	kvm_ioapic_state

are defined inside x86 specific code and may or may not
be defined in anyway for other architectures. The problem
caused is one cannot compile userspace apps (ex. libkvm)
for other archs since a size cannot be determined for these
structures.

Signed-off-by: default avatarJerone Young <jyoung5@us.ibm.com>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent d7e5117a

include/linux/Kbuild

+1 −1
Original line number Original line Diff line number Diff line
@@ -100,7 +100,6 @@ header-y += iso_fs.h 
header-y += ixjuser.h

header-y += ixjuser.h

header-y += jffs2.h

header-y += jffs2.h

header-y += keyctl.h

header-y += keyctl.h

header-y += kvm.h

header-y += limits.h

header-y += limits.h

header-y += lock_dlm_plock.h

header-y += lock_dlm_plock.h

header-y += magic.h

header-y += magic.h
@@ -256,6 +255,7 @@ unifdef-y += kd.h 
unifdef-y += kernelcapi.h

unifdef-y += kernelcapi.h

unifdef-y += kernel.h

unifdef-y += kernel.h

unifdef-y += keyboard.h

unifdef-y += keyboard.h

unifdef-y += kvm.h

unifdef-y += llc.h

unifdef-y += llc.h

unifdef-y += loop.h

unifdef-y += loop.h

unifdef-y += lp.h

unifdef-y += lp.h

include/linux/kvm.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -51,8 +51,10 @@ struct kvm_irqchip { 
	__u32 pad;

	__u32 pad;

        union {

        union {

		char dummy[512];  /* reserving space */

		char dummy[512];  /* reserving space */

#ifdef CONFIG_X86

		struct kvm_pic_state pic;

		struct kvm_pic_state pic;

		struct kvm_ioapic_state ioapic;

		struct kvm_ioapic_state ioapic;

#endif

	} chip;

	} chip;

};

};