aboutsummaryrefslogtreecommitdiffstats
path: root/virt
diff options
context:
space:
mode:
authorXiubo Li <lixiubo@cmss.chinamobile.com>2015-02-26 01:58:23 -0500
committerMarcelo Tosatti <mtosatti@redhat.com>2015-03-10 09:37:44 -0400
commitf95ef0cd0257852198b31ffeb527ef2f72caa1aa (patch)
tree733c7d44c6a179589e29e19e394222223af0e278 /virt
parentee543159d5e0cfa9f3a349ac4e3da01a0ec66c78 (diff)
KVM: Missing blank line after declarations in kvm_main.c
There are many Warnings like this: WARNING: Missing a blank line after declarations + struct kvm_coalesced_mmio_zone zone; + r = -EFAULT; This patch fixes these warnings to reduce noise when checking new patches in kvm_main.c. Signed-off-by: Xiubo Li <lixiubo@cmss.chinamobile.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'virt')
-rw-r--r--virt/kvm/kvm_main.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index f9ad30727388..ba7fc2e6af01 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -1508,6 +1508,7 @@ void kvm_set_pfn_dirty(pfn_t pfn)
1508{ 1508{
1509 if (!kvm_is_reserved_pfn(pfn)) { 1509 if (!kvm_is_reserved_pfn(pfn)) {
1510 struct page *page = pfn_to_page(pfn); 1510 struct page *page = pfn_to_page(pfn);
1511
1511 if (!PageReserved(page)) 1512 if (!PageReserved(page))
1512 SetPageDirty(page); 1513 SetPageDirty(page);
1513 } 1514 }
@@ -1791,6 +1792,7 @@ void kvm_vcpu_block(struct kvm_vcpu *vcpu)
1791 start = cur = ktime_get(); 1792 start = cur = ktime_get();
1792 if (halt_poll_ns) { 1793 if (halt_poll_ns) {
1793 ktime_t stop = ktime_add_ns(ktime_get(), halt_poll_ns); 1794 ktime_t stop = ktime_add_ns(ktime_get(), halt_poll_ns);
1795
1794 do { 1796 do {
1795 /* 1797 /*
1796 * This sets KVM_REQ_UNHALT if an interrupt 1798 * This sets KVM_REQ_UNHALT if an interrupt
@@ -2126,6 +2128,7 @@ static long kvm_vcpu_ioctl(struct file *filp,
2126 /* The thread running this VCPU changed. */ 2128 /* The thread running this VCPU changed. */
2127 struct pid *oldpid = vcpu->pid; 2129 struct pid *oldpid = vcpu->pid;
2128 struct pid *newpid = get_task_pid(current, PIDTYPE_PID); 2130 struct pid *newpid = get_task_pid(current, PIDTYPE_PID);
2131
2129 rcu_assign_pointer(vcpu->pid, newpid); 2132 rcu_assign_pointer(vcpu->pid, newpid);
2130 if (oldpid) 2133 if (oldpid)
2131 synchronize_rcu(); 2134 synchronize_rcu();
@@ -2533,6 +2536,7 @@ static long kvm_vm_ioctl(struct file *filp,
2533#ifdef KVM_COALESCED_MMIO_PAGE_OFFSET 2536#ifdef KVM_COALESCED_MMIO_PAGE_OFFSET
2534 case KVM_REGISTER_COALESCED_MMIO: { 2537 case KVM_REGISTER_COALESCED_MMIO: {
2535 struct kvm_coalesced_mmio_zone zone; 2538 struct kvm_coalesced_mmio_zone zone;
2539
2536 r = -EFAULT; 2540 r = -EFAULT;
2537 if (copy_from_user(&zone, argp, sizeof(zone))) 2541 if (copy_from_user(&zone, argp, sizeof(zone)))
2538 goto out; 2542 goto out;
@@ -2541,6 +2545,7 @@ static long kvm_vm_ioctl(struct file *filp,
2541 } 2545 }
2542 case KVM_UNREGISTER_COALESCED_MMIO: { 2546 case KVM_UNREGISTER_COALESCED_MMIO: {
2543 struct kvm_coalesced_mmio_zone zone; 2547 struct kvm_coalesced_mmio_zone zone;
2548
2544 r = -EFAULT; 2549 r = -EFAULT;
2545 if (copy_from_user(&zone, argp, sizeof(zone))) 2550 if (copy_from_user(&zone, argp, sizeof(zone)))
2546 goto out; 2551 goto out;
@@ -3259,6 +3264,7 @@ struct kvm_vcpu *preempt_notifier_to_vcpu(struct preempt_notifier *pn)
3259static void kvm_sched_in(struct preempt_notifier *pn, int cpu) 3264static void kvm_sched_in(struct preempt_notifier *pn, int cpu)
3260{ 3265{
3261 struct kvm_vcpu *vcpu = preempt_notifier_to_vcpu(pn); 3266 struct kvm_vcpu *vcpu = preempt_notifier_to_vcpu(pn);
3267
3262 if (vcpu->preempted) 3268 if (vcpu->preempted)
3263 vcpu->preempted = false; 3269 vcpu->preempted = false;
3264 3270