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

Commit a1efa9b7 authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by Paolo Bonzini
Browse files

x86/hyper-v: rename ipi_arg_{ex,non_ex} structures 



These structures are going to be used from KVM code so let's make
their names reflect their Hyper-V origin.

Signed-off-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Reviewed-by: default avatarRoman Kagan <rkagan@virtuozzo.com>
Acked-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent d264ee0c

arch/x86/hyperv/hv_apic.c

+4 −4
Original line number Diff line number Diff line
@@ -95,8 +95,8 @@ static void hv_apic_eoi_write(u32 reg, u32 val) 
 */

static bool __send_ipi_mask_ex(const struct cpumask *mask, int vector)

{

	struct ipi_arg_ex **arg;

	struct ipi_arg_ex *ipi_arg;

	struct hv_send_ipi_ex **arg;

	struct hv_send_ipi_ex *ipi_arg;

	unsigned long flags;

	int nr_bank = 0;

	int ret = 1;
@@ -105,7 +105,7 @@ static bool __send_ipi_mask_ex(const struct cpumask *mask, int vector) 
		return false;



	local_irq_save(flags);

	arg = (struct ipi_arg_ex **)this_cpu_ptr(hyperv_pcpu_input_arg);

	arg = (struct hv_send_ipi_ex **)this_cpu_ptr(hyperv_pcpu_input_arg);



	ipi_arg = *arg;

	if (unlikely(!ipi_arg))
@@ -135,7 +135,7 @@ static bool __send_ipi_mask_ex(const struct cpumask *mask, int vector) 
static bool __send_ipi_mask(const struct cpumask *mask, int vector)

{

	int cur_cpu, vcpu;

	struct ipi_arg_non_ex ipi_arg;

	struct hv_send_ipi ipi_arg;

	int ret = 1;



	trace_hyperv_send_ipi_mask(mask, vector);

arch/x86/include/asm/hyperv-tlfs.h

+9 −7
Original line number Diff line number Diff line
@@ -726,19 +726,21 @@ struct hv_enlightened_vmcs { 
#define HV_STIMER_AUTOENABLE		(1ULL << 3)

#define HV_STIMER_SINT(config)		(__u8)(((config) >> 16) & 0x0F)



struct ipi_arg_non_ex {

	u32 vector;

	u32 reserved;

	u64 cpu_mask;

};



struct hv_vpset {

	u64 format;

	u64 valid_bank_mask;

	u64 bank_contents[];

};



struct ipi_arg_ex {

/* HvCallSendSyntheticClusterIpi hypercall */

struct hv_send_ipi {

	u32 vector;

	u32 reserved;

	u64 cpu_mask;

};



/* HvCallSendSyntheticClusterIpiEx hypercall */

struct hv_send_ipi_ex {

	u32 vector;

	u32 reserved;

	struct hv_vpset vp_set;