Skip to content

Commit 60b216a

Browse files
ShawnshhNanlinXie
Shawnshh
authored and
NanlinXie
committed
HV:fixed "Pointer param should be declared pointer to const"
Pointer param should be declared pointer to const if the parameter is keeped read-only. This patch changes pointer param whose name is vm. Tracked-On:#861 Signed-off-by: Huihuang Shi <huihuang.shi@intel.com> Acked-by: Eddie Dong <eddie.dong@intel.com>
1 parent 40dbdcd commit 60b216a

File tree

13 files changed

+25
-25
lines changed

13 files changed

+25
-25
lines changed

‎hypervisor/arch/x86/assign.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
static inline struct ptdev_remapping_info *
1919
ptdev_lookup_entry_by_sid(uint32_t intr_type,
20-
union source_id *sid, struct vm *vm)
20+
union source_id *sid,const struct vm *vm)
2121
{
2222
struct ptdev_remapping_info *entry;
2323
struct list_head *pos;
@@ -43,7 +43,7 @@ is_entry_active(struct ptdev_remapping_info *entry)
4343
return atomic_load32(&entry->active) == ACTIVE_FLAG;
4444
}
4545

46-
static bool ptdev_hv_owned_intx(struct vm *vm, union source_id *virt_sid)
46+
static bool ptdev_hv_owned_intx(const struct vm *vm, union source_id *virt_sid)
4747
{
4848
/* vm0 vuart pin is owned by hypervisor under debug version */
4949
if (is_vm0(vm) && (virt_sid->intx_id.pin == COM1_IRQ)) {
@@ -230,7 +230,7 @@ add_msix_remapping(struct vm *vm, uint16_t virt_bdf, uint16_t phys_bdf,
230230

231231
/* deactive & remove mapping entry of vbdf:entry_nr for vm */
232232
static void
233-
remove_msix_remapping(struct vm *vm, uint16_t virt_bdf, uint32_t entry_nr)
233+
remove_msix_remapping(const struct vm *vm, uint16_t virt_bdf, uint32_t entry_nr)
234234
{
235235
struct ptdev_remapping_info *entry;
236236
DEFINE_MSI_SID(virt_sid, virt_bdf, entry_nr);
@@ -324,7 +324,7 @@ add_intx_remapping(struct vm *vm, uint8_t virt_pin,
324324
}
325325

326326
/* deactive & remove mapping entry of vpin for vm */
327-
static void remove_intx_remapping(struct vm *vm, uint8_t virt_pin, bool pic_pin)
327+
static void remove_intx_remapping(const struct vm *vm, uint8_t virt_pin, bool pic_pin)
328328
{
329329
uint32_t phys_irq;
330330
struct ptdev_remapping_info *entry;
@@ -732,7 +732,7 @@ int ptdev_add_intx_remapping(struct vm *vm, uint8_t virt_pin, uint8_t phys_pin,
732732
/*
733733
* @pre vm != NULL
734734
*/
735-
void ptdev_remove_intx_remapping(struct vm *vm, uint8_t virt_pin, bool pic_pin)
735+
void ptdev_remove_intx_remapping(const struct vm *vm, uint8_t virt_pin, bool pic_pin)
736736
{
737737
remove_intx_remapping(vm, virt_pin, pic_pin);
738738
}
@@ -761,7 +761,7 @@ int ptdev_add_msix_remapping(struct vm *vm, uint16_t virt_bdf,
761761
/*
762762
* @pre vm != NULL
763763
*/
764-
void ptdev_remove_msix_remapping(struct vm *vm, uint16_t virt_bdf,
764+
void ptdev_remove_msix_remapping(const struct vm *vm, uint16_t virt_bdf,
765765
uint32_t vector_count)
766766
{
767767
uint32_t i;

‎hypervisor/arch/x86/guest/pm.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
#include <hypervisor.h>
88

9-
int validate_pstate(struct vm *vm, uint64_t perf_ctl)
9+
int validate_pstate(const struct vm *vm, uint64_t perf_ctl)
1010
{
11-
struct cpu_px_data *px_data;
11+
const struct cpu_px_data *px_data;
1212
int i, px_cnt;
1313

1414
if (is_vm0(vm)) {

‎hypervisor/arch/x86/guest/vlapic.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,11 +140,11 @@ static uint16_t vm_apicid2vcpu_id(struct vm *vm, uint8_t lapicid)
140140
}
141141

142142
static uint64_t
143-
vm_active_cpus(struct vm *vm)
143+
vm_active_cpus(const struct vm *vm)
144144
{
145145
uint64_t dmask = 0UL;
146146
uint16_t i;
147-
struct vcpu *vcpu;
147+
const struct vcpu *vcpu;
148148

149149
foreach_vcpu(i, vm, vcpu) {
150150
bitmap_set_lock(vcpu->vcpu_id, &dmask);

‎hypervisor/arch/x86/guest/vm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ static inline uint16_t alloc_vm_id(void)
3030
return INVALID_VM_ID;
3131
}
3232

33-
static inline void free_vm_id(struct vm *vm)
33+
static inline void free_vm_id(const struct vm *vm)
3434
{
3535
bitmap_clear_lock(vm->vm_id, &vmid_bitmap);
3636
}

‎hypervisor/common/hypercall.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ int32_t hcall_get_api_version(struct vm *vm, uint64_t param)
7272
*@pre Pointer vm shall point to VM0
7373
*/
7474
static int32_t
75-
handle_virt_irqline(struct vm *vm, uint16_t target_vmid,
75+
handle_virt_irqline(const struct vm *vm, uint16_t target_vmid,
7676
struct acrn_irqline *param, uint32_t operation)
7777
{
7878
int32_t ret = 0;
@@ -333,7 +333,7 @@ int32_t hcall_set_vcpu_regs(struct vm *vm, uint16_t vmid, uint64_t param)
333333
/**
334334
*@pre Pointer vm shall point to VM0
335335
*/
336-
int32_t hcall_set_irqline(struct vm *vm, uint16_t vmid,
336+
int32_t hcall_set_irqline(const struct vm *vm, uint16_t vmid,
337337
struct acrn_irqline_ops *ops)
338338
{
339339
struct vm *target_vm = get_vm_from_vmid(vmid);
@@ -1073,7 +1073,7 @@ int32_t hcall_vm_intr_monitor(struct vm *vm, uint16_t vmid, uint64_t param)
10731073
/**
10741074
*@pre Pointer vm shall point to VM0
10751075
*/
1076-
int32_t hcall_set_callback_vector(struct vm *vm, uint64_t param)
1076+
int32_t hcall_set_callback_vector(const struct vm *vm, uint64_t param)
10771077
{
10781078
if (!is_vm0(vm)) {
10791079
pr_err("%s: Targeting to service vm", __func__);

‎hypervisor/common/ptdev.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ release_entry(struct ptdev_remapping_info *entry)
119119

120120
/* require ptdev_lock protect */
121121
static void
122-
release_all_entries(struct vm *vm)
122+
release_all_entries(const struct vm *vm)
123123
{
124124
struct ptdev_remapping_info *entry;
125125
struct list_head *pos, *tmp;
@@ -202,7 +202,7 @@ void ptdev_init(void)
202202
register_softirq(SOFTIRQ_PTDEV, ptdev_softirq);
203203
}
204204

205-
void ptdev_release_all_entries(struct vm *vm)
205+
void ptdev_release_all_entries(const struct vm *vm)
206206
{
207207
/* VM already down */
208208
spinlock_obtain(&ptdev_lock);

‎hypervisor/dm/vioapic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ vioapic_cleanup(struct acrn_vioapic *vioapic)
523523
}
524524

525525
uint32_t
526-
vioapic_pincount(struct vm *vm)
526+
vioapic_pincount(const struct vm *vm)
527527
{
528528
if (is_vm0(vm)) {
529529
return REDIR_ENTRIES_HW;

‎hypervisor/include/arch/x86/assign.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ int ptdev_intx_pin_remap(struct vm *vm, uint8_t virt_pin,
1717
enum ptdev_vpin_source vpin_src);
1818
int ptdev_add_intx_remapping(struct vm *vm, uint8_t virt_pin, uint8_t phys_pin,
1919
bool pic_pin);
20-
void ptdev_remove_intx_remapping(struct vm *vm, uint8_t virt_pin, bool pic_pin);
20+
void ptdev_remove_intx_remapping(const struct vm *vm, uint8_t virt_pin, bool pic_pin);
2121
int ptdev_add_msix_remapping(struct vm *vm, uint16_t virt_bdf,
2222
uint16_t phys_bdf, uint32_t vector_count);
23-
void ptdev_remove_msix_remapping(struct vm *vm, uint16_t virt_bdf,
23+
void ptdev_remove_msix_remapping(const struct vm *vm, uint16_t virt_bdf,
2424
uint32_t vector_count);
2525

2626
#endif /* ASSIGN_H */

‎hypervisor/include/arch/x86/guest/guest_pm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
void vm_setup_cpu_state(struct vm *vm);
1111
int vm_load_pm_s_state(struct vm *vm);
12-
int validate_pstate(struct vm *vm, uint64_t perf_ctl);
12+
int validate_pstate(const struct vm *vm, uint64_t perf_ctl);
1313
void register_pm1ab_handler(struct vm *vm);
1414

1515
#endif /* PM_H */

‎hypervisor/include/arch/x86/guest/vioapic.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ void vioapic_set_irq(struct vm *vm, uint32_t irq, uint32_t operation);
5757
void vioapic_set_irq_nolock(struct vm *vm, uint32_t irq, uint32_t operation);
5858
void vioapic_update_tmr(struct vcpu *vcpu);
5959

60-
uint32_t vioapic_pincount(struct vm *vm);
60+
uint32_t vioapic_pincount(const struct vm *vm);
6161
void vioapic_process_eoi(struct vm *vm, uint32_t vector);
6262
void vioapic_get_rte(struct vm *vm, uint32_t pin, union ioapic_rte *rte);
6363
int vioapic_mmio_access_handler(struct vcpu *vcpu,

0 commit comments

Comments
 (0)