Date: Tue, 1 Sep 2020 21:21:56 +0000 (UTC) From: Mateusz Guzik <mjg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365077 - in head/sys/xen: . interface interface/arch-x86 interface/arch-x86/hvm interface/hvm interface/io xenbus xenstore Message-ID: <202009012121.081LLuXm020180@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mjg Date: Tue Sep 1 21:21:55 2020 New Revision: 365077 URL: https://svnweb.freebsd.org/changeset/base/365077 Log: xen: clean up empty lines in .c and .h files Modified: head/sys/xen/hypervisor.h head/sys/xen/interface/arch-x86/hvm/save.h head/sys/xen/interface/arch-x86/pmu.h head/sys/xen/interface/arch-x86/xen-mca.h head/sys/xen/interface/arch-x86/xen.h head/sys/xen/interface/domctl.h head/sys/xen/interface/elfnote.h head/sys/xen/interface/errno.h head/sys/xen/interface/gcov.h head/sys/xen/interface/grant_table.h head/sys/xen/interface/hvm/ioreq.h head/sys/xen/interface/hvm/save.h head/sys/xen/interface/io/fsif.h head/sys/xen/interface/io/libxenvchan.h head/sys/xen/interface/io/tpmif.h head/sys/xen/interface/io/vscsiif.h head/sys/xen/interface/kexec.h head/sys/xen/interface/memory.h head/sys/xen/interface/physdev.h head/sys/xen/xenbus/xenbusb.c head/sys/xen/xenbus/xenbusb.h head/sys/xen/xenbus/xenbusb_back.c head/sys/xen/xenbus/xenbusb_front.c head/sys/xen/xenstore/xenstorevar.h Modified: head/sys/xen/hypervisor.h ============================================================================== --- head/sys/xen/hypervisor.h Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/hypervisor.h Tue Sep 1 21:21:55 2020 (r365077) @@ -55,7 +55,6 @@ HYPERVISOR_block( return (rc); } - static inline void HYPERVISOR_shutdown(unsigned int reason) { Modified: head/sys/xen/interface/arch-x86/hvm/save.h ============================================================================== --- head/sys/xen/interface/arch-x86/hvm/save.h Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/interface/arch-x86/hvm/save.h Tue Sep 1 21:21:55 2020 (r365077) @@ -43,7 +43,6 @@ struct hvm_save_header { DECLARE_HVM_SAVE_TYPE(HEADER, 1, struct hvm_save_header); - /* * Processor * @@ -269,7 +268,6 @@ struct hvm_hw_cpu_compat { }; static inline int _hvm_hw_fix_cpu(void *h) { - union hvm_hw_cpu_union { struct hvm_hw_cpu nat; struct hvm_hw_cpu_compat cmp; @@ -342,7 +340,6 @@ struct hvm_hw_vpic { DECLARE_HVM_SAVE_TYPE(PIC, 3, struct hvm_hw_vpic); - /* * IO-APIC */ @@ -374,7 +371,6 @@ struct hvm_hw_vioapic { DECLARE_HVM_SAVE_TYPE(IOAPIC, 4, struct hvm_hw_vioapic); - /* * LAPIC */ @@ -394,7 +390,6 @@ struct hvm_hw_lapic_regs { DECLARE_HVM_SAVE_TYPE(LAPIC_REGS, 6, struct hvm_hw_lapic_regs); - /* * IRQs */ @@ -463,7 +458,6 @@ struct hvm_hw_pit { DECLARE_HVM_SAVE_TYPE(PIT, 10, struct hvm_hw_pit); - /* * RTC */ @@ -479,7 +473,6 @@ struct hvm_hw_rtc { DECLARE_HVM_SAVE_TYPE(RTC, 11, struct hvm_hw_rtc); - /* * HPET */ @@ -509,7 +502,6 @@ struct hvm_hw_hpet { DECLARE_HVM_SAVE_TYPE(HPET, 12, struct hvm_hw_hpet); - /* * PM timer */ @@ -593,7 +585,6 @@ struct hvm_tsc_adjust { }; DECLARE_HVM_SAVE_TYPE(TSC_ADJUST, 19, struct hvm_tsc_adjust); - struct hvm_msr { uint32_t count; Modified: head/sys/xen/interface/arch-x86/pmu.h ============================================================================== --- head/sys/xen/interface/arch-x86/pmu.h Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/interface/arch-x86/pmu.h Tue Sep 1 21:21:55 2020 (r365077) @@ -164,4 +164,3 @@ DEFINE_XEN_GUEST_HANDLE(xen_pmu_arch_t); * indent-tabs-mode: nil * End: */ - Modified: head/sys/xen/interface/arch-x86/xen-mca.h ============================================================================== --- head/sys/xen/interface/arch-x86/xen-mca.h Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/interface/arch-x86/xen-mca.h Tue Sep 1 21:21:55 2020 (r365077) @@ -88,7 +88,6 @@ #define XEN_MC_NOTDELIVERED 0x10 /* Note, XEN_MC_CANNOTHANDLE and XEN_MC_NOTDELIVERED are mutually exclusive. */ - #ifndef __ASSEMBLY__ #define VIRQ_MCA VIRQ_ARCH_0 /* G. (DOM0) Machine Check Architecture */ @@ -111,7 +110,6 @@ struct mcinfo_common { uint16_t size; /* size of this struct in bytes */ }; - #define MC_FLAG_CORRECTABLE (1 << 0) #define MC_FLAG_UNCORRECTABLE (1 << 1) #define MC_FLAG_RECOVERABLE (1 << 2) @@ -149,7 +147,6 @@ struct mcinfo_bank { uint64_t mc_tsc; }; - struct mcinfo_msr { uint64_t reg; /* MSR */ uint64_t value; /* MSR value */ @@ -229,7 +226,6 @@ struct mcinfo_recovery } action_info; }; - #define MCINFO_HYPERCALLSIZE 1024 #define MCINFO_MAXSIZE 768 @@ -280,7 +276,6 @@ struct mcinfo_logical_cpu { typedef struct mcinfo_logical_cpu xen_mc_logical_cpu_t; DEFINE_XEN_GUEST_HANDLE(xen_mc_logical_cpu_t); - /* * OS's should use these instead of writing their own lookup function * each with its own bugs and drawbacks. @@ -325,7 +320,6 @@ DEFINE_XEN_GUEST_HANDLE(xen_mc_logical_cpu_t); (_ret) = found ? _mic : NULL; \ } while (0) - /* Usecase 1 * Register machine check trap callback handler * (already done via "set_trap_table" hypercall) @@ -355,7 +349,6 @@ struct xen_mc_fetch { }; typedef struct xen_mc_fetch xen_mc_fetch_t; DEFINE_XEN_GUEST_HANDLE(xen_mc_fetch_t); - /* Usecase 4 * This tells the hypervisor to notify a DomU about the machine check error Modified: head/sys/xen/interface/arch-x86/xen.h ============================================================================== --- head/sys/xen/interface/arch-x86/xen.h Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/interface/arch-x86/xen.h Tue Sep 1 21:21:55 2020 (r365077) @@ -94,7 +94,6 @@ typedef unsigned long xen_pfn_t; #define FIRST_RESERVED_GDT_BYTE (FIRST_RESERVED_GDT_PAGE * 4096) #define FIRST_RESERVED_GDT_ENTRY (FIRST_RESERVED_GDT_BYTE / 8) - /* * ` enum neg_errnoval * ` HYPERVISOR_update_descriptor(u64 pa, u64 desc); Modified: head/sys/xen/interface/domctl.h ============================================================================== --- head/sys/xen/interface/domctl.h Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/interface/domctl.h Tue Sep 1 21:21:55 2020 (r365077) @@ -118,7 +118,6 @@ struct xen_domctl_getdomaininfo { typedef struct xen_domctl_getdomaininfo xen_domctl_getdomaininfo_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_getdomaininfo_t); - /* XEN_DOMCTL_getmemlist */ struct xen_domctl_getmemlist { /* IN variables. */ @@ -133,7 +132,6 @@ struct xen_domctl_getmemlist { typedef struct xen_domctl_getmemlist xen_domctl_getmemlist_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_getmemlist_t); - /* XEN_DOMCTL_getpageframeinfo */ #define XEN_DOMCTL_PFINFO_LTAB_SHIFT 28 @@ -157,7 +155,6 @@ struct xen_domctl_getpageframeinfo3 { XEN_GUEST_HANDLE_64(xen_pfn_t) array; }; - /* * Control shadow pagetables operation */ @@ -233,7 +230,6 @@ struct xen_domctl_shadow_op { typedef struct xen_domctl_shadow_op xen_domctl_shadow_op_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_shadow_op_t); - /* XEN_DOMCTL_max_mem */ struct xen_domctl_max_mem { /* IN variables. */ @@ -242,7 +238,6 @@ struct xen_domctl_max_mem { typedef struct xen_domctl_max_mem xen_domctl_max_mem_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_max_mem_t); - /* XEN_DOMCTL_setvcpucontext */ /* XEN_DOMCTL_getvcpucontext */ struct xen_domctl_vcpucontext { @@ -252,7 +247,6 @@ struct xen_domctl_vcpucontext { typedef struct xen_domctl_vcpucontext xen_domctl_vcpucontext_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_vcpucontext_t); - /* XEN_DOMCTL_getvcpuinfo */ struct xen_domctl_getvcpuinfo { /* IN variables. */ @@ -267,7 +261,6 @@ struct xen_domctl_getvcpuinfo { typedef struct xen_domctl_getvcpuinfo xen_domctl_getvcpuinfo_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_getvcpuinfo_t); - /* Get/set the NUMA node(s) with which the guest has affinity with. */ /* XEN_DOMCTL_setnodeaffinity */ /* XEN_DOMCTL_getnodeaffinity */ @@ -277,7 +270,6 @@ struct xen_domctl_nodeaffinity { typedef struct xen_domctl_nodeaffinity xen_domctl_nodeaffinity_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_nodeaffinity_t); - /* Get/set which physical cpus a vcpu can execute on. */ /* XEN_DOMCTL_setvcpuaffinity */ /* XEN_DOMCTL_getvcpuaffinity */ @@ -313,7 +305,6 @@ struct xen_domctl_vcpuaffinity { typedef struct xen_domctl_vcpuaffinity xen_domctl_vcpuaffinity_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_vcpuaffinity_t); - /* XEN_DOMCTL_max_vcpus */ struct xen_domctl_max_vcpus { uint32_t max; /* maximum number of vcpus */ @@ -321,7 +312,6 @@ struct xen_domctl_max_vcpus { typedef struct xen_domctl_max_vcpus xen_domctl_max_vcpus_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_max_vcpus_t); - /* XEN_DOMCTL_scheduler_op */ /* Scheduler types. */ /* #define XEN_SCHEDULER_SEDF 4 (Removed) */ @@ -353,7 +343,6 @@ struct xen_domctl_scheduler_op { typedef struct xen_domctl_scheduler_op xen_domctl_scheduler_op_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_scheduler_op_t); - /* XEN_DOMCTL_setdomainhandle */ struct xen_domctl_setdomainhandle { xen_domain_handle_t handle; @@ -361,7 +350,6 @@ struct xen_domctl_setdomainhandle { typedef struct xen_domctl_setdomainhandle xen_domctl_setdomainhandle_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_setdomainhandle_t); - /* XEN_DOMCTL_setdebugging */ struct xen_domctl_setdebugging { uint8_t enable; @@ -369,7 +357,6 @@ struct xen_domctl_setdebugging { typedef struct xen_domctl_setdebugging xen_domctl_setdebugging_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_setdebugging_t); - /* XEN_DOMCTL_irq_permission */ struct xen_domctl_irq_permission { uint8_t pirq; @@ -378,7 +365,6 @@ struct xen_domctl_irq_permission { typedef struct xen_domctl_irq_permission xen_domctl_irq_permission_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_irq_permission_t); - /* XEN_DOMCTL_iomem_permission */ struct xen_domctl_iomem_permission { uint64_aligned_t first_mfn;/* first page (physical page number) in range */ @@ -388,7 +374,6 @@ struct xen_domctl_iomem_permission { typedef struct xen_domctl_iomem_permission xen_domctl_iomem_permission_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_iomem_permission_t); - /* XEN_DOMCTL_ioport_permission */ struct xen_domctl_ioport_permission { uint32_t first_port; /* first port int range */ @@ -398,7 +383,6 @@ struct xen_domctl_ioport_permission { typedef struct xen_domctl_ioport_permission xen_domctl_ioport_permission_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_ioport_permission_t); - /* XEN_DOMCTL_hypercall_init */ struct xen_domctl_hypercall_init { uint64_aligned_t gmfn; /* GMFN to be initialised */ @@ -406,7 +390,6 @@ struct xen_domctl_hypercall_init { typedef struct xen_domctl_hypercall_init xen_domctl_hypercall_init_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_hypercall_init_t); - /* XEN_DOMCTL_settimeoffset */ struct xen_domctl_settimeoffset { int64_aligned_t time_offset_seconds; /* applied to domain wallclock time */ @@ -424,7 +407,6 @@ typedef struct xen_domctl_hvmcontext { } xen_domctl_hvmcontext_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_hvmcontext_t); - /* XEN_DOMCTL_set_address_size */ /* XEN_DOMCTL_get_address_size */ typedef struct xen_domctl_address_size { @@ -432,7 +414,6 @@ typedef struct xen_domctl_address_size { } xen_domctl_address_size_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_address_size_t); - /* XEN_DOMCTL_sendtrigger */ #define XEN_DOMCTL_SENDTRIGGER_NMI 0 #define XEN_DOMCTL_SENDTRIGGER_RESET 1 @@ -446,7 +427,6 @@ struct xen_domctl_sendtrigger { typedef struct xen_domctl_sendtrigger xen_domctl_sendtrigger_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_sendtrigger_t); - /* Assign a device to a guest. Sets up IOMMU structures. */ /* XEN_DOMCTL_assign_device */ /* XEN_DOMCTL_test_assign_device */ @@ -526,7 +506,6 @@ struct xen_domctl_bind_pt_irq { typedef struct xen_domctl_bind_pt_irq xen_domctl_bind_pt_irq_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_bind_pt_irq_t); - /* Bind machine I/O address range -> HVM address range. */ /* If this returns -E2BIG lower nr_mfns value. */ /* XEN_DOMCTL_memory_mapping */ @@ -542,7 +521,6 @@ struct xen_domctl_memory_mapping { typedef struct xen_domctl_memory_mapping xen_domctl_memory_mapping_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_memory_mapping_t); - /* Bind machine I/O port range -> HVM I/O port range. */ /* XEN_DOMCTL_ioport_mapping */ struct xen_domctl_ioport_mapping { @@ -554,7 +532,6 @@ struct xen_domctl_ioport_mapping { typedef struct xen_domctl_ioport_mapping xen_domctl_ioport_mapping_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_ioport_mapping_t); - /* * Pin caching type of RAM space for x86 HVM domU. */ @@ -574,7 +551,6 @@ struct xen_domctl_pin_mem_cacheattr { typedef struct xen_domctl_pin_mem_cacheattr xen_domctl_pin_mem_cacheattr_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_pin_mem_cacheattr_t); - /* XEN_DOMCTL_set_ext_vcpucontext */ /* XEN_DOMCTL_get_ext_vcpucontext */ struct xen_domctl_ext_vcpucontext { @@ -691,7 +667,6 @@ DEFINE_XEN_GUEST_HANDLE(xen_domctl_hvmcontext_partial_ typedef struct xen_domctl_disable_migrate { uint32_t disable; /* IN: 1: disable migration and restore */ } xen_domctl_disable_migrate_t; - /* XEN_DOMCTL_gettscinfo */ /* XEN_DOMCTL_settscinfo */ Modified: head/sys/xen/interface/elfnote.h ============================================================================== --- head/sys/xen/interface/elfnote.h Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/interface/elfnote.h Tue Sep 1 21:21:55 2020 (r365077) @@ -233,7 +233,6 @@ */ #define XEN_ELFNOTE_CRASH_REGS 0x1000002 - /* * xen dump-core none note. * xm dump-core code will create one XEN_ELFNOTE_DUMPCORE_NONE Modified: head/sys/xen/interface/errno.h ============================================================================== --- head/sys/xen/interface/errno.h Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/interface/errno.h Tue Sep 1 21:21:55 2020 (r365077) @@ -4,7 +4,6 @@ #define XEN_ERRNO(name, value) XEN_##name = value, enum xen_errno { - #else /* !__ASSEMBLY__ */ #define XEN_ERRNO(name, value) .equ XEN_##name, value Modified: head/sys/xen/interface/gcov.h ============================================================================== --- head/sys/xen/interface/gcov.h Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/interface/gcov.h Tue Sep 1 21:21:55 2020 (r365077) @@ -68,7 +68,6 @@ struct xencov_file char filename[1]; }; - /** * Counters information * Prefixed with XENCOV_TAG_COUNTER(n) where n is 0..(XENCOV_COUNTERS-1) @@ -112,4 +111,3 @@ struct xencov_end }; #endif /* __XEN_PUBLIC_GCOV_H__ */ - Modified: head/sys/xen/interface/grant_table.h ============================================================================== --- head/sys/xen/interface/grant_table.h Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/interface/grant_table.h Tue Sep 1 21:21:55 2020 (r365077) @@ -429,7 +429,6 @@ struct gnttab_transfer { typedef struct gnttab_transfer gnttab_transfer_t; DEFINE_XEN_GUEST_HANDLE(gnttab_transfer_t); - /* * GNTTABOP_copy: Hypervisor based copy * source and destinations can be eithers MFNs or, for foreign domains, @@ -525,7 +524,6 @@ struct gnttab_set_version { }; typedef struct gnttab_set_version gnttab_set_version_t; DEFINE_XEN_GUEST_HANDLE(gnttab_set_version_t); - /* * GNTTABOP_get_status_frames: Get the list of frames used to store grant Modified: head/sys/xen/interface/hvm/ioreq.h ============================================================================== --- head/sys/xen/interface/hvm/ioreq.h Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/interface/hvm/ioreq.h Tue Sep 1 21:21:55 2020 (r365077) @@ -124,7 +124,6 @@ typedef struct buffered_iopage buffered_iopage_t; #define ACPI_GPE0_BLK_ADDRESS ACPI_GPE0_BLK_ADDRESS_V0 #define ACPI_GPE0_BLK_LEN ACPI_GPE0_BLK_LEN_V0 - #endif /* _IOREQ_H_ */ /* Modified: head/sys/xen/interface/hvm/save.h ============================================================================== --- head/sys/xen/interface/hvm/save.h Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/interface/hvm/save.h Tue Sep 1 21:21:55 2020 (r365077) @@ -52,7 +52,6 @@ struct hvm_save_descriptor { uint32_t length; /* In bytes, *not* including this descriptor */ }; - /* * Each entry has a datatype associated with it: for example, the CPU state * is saved as a HVM_SAVE_TYPE(CPU), which has HVM_SAVE_LENGTH(CPU), Modified: head/sys/xen/interface/io/fsif.h ============================================================================== --- head/sys/xen/interface/io/fsif.h Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/interface/io/fsif.h Tue Sep 1 21:21:55 2020 (r365077) @@ -136,7 +136,6 @@ struct fsif_sync_request { uint32_t fd; }; - /* FS operation request */ struct fsif_request { uint8_t type; /* Type of the request */ @@ -187,6 +186,5 @@ DEFINE_RING_TYPES(fsif, struct fsif_request, struct fs #define STATE_READY "ready" #define STATE_CLOSING "closing" #define STATE_CLOSED "closed" - #endif Modified: head/sys/xen/interface/io/libxenvchan.h ============================================================================== --- head/sys/xen/interface/io/libxenvchan.h Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/interface/io/libxenvchan.h Tue Sep 1 21:21:55 2020 (r365077) @@ -98,4 +98,3 @@ struct vchan_interface { */ uint32_t grants[0]; }; - Modified: head/sys/xen/interface/io/tpmif.h ============================================================================== --- head/sys/xen/interface/io/tpmif.h Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/interface/io/tpmif.h Tue Sep 1 21:21:55 2020 (r365077) @@ -102,7 +102,6 @@ enum tpmif_state { * to use atomic operations. */ - /* The shared page for vTPM request/response packets looks like: * * Offset Contents Modified: head/sys/xen/interface/io/vscsiif.h ============================================================================== --- head/sys/xen/interface/io/vscsiif.h Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/interface/io/vscsiif.h Tue Sep 1 21:21:55 2020 (r365077) @@ -247,7 +247,6 @@ typedef struct vscsiif_response vscsiif_response_t; DEFINE_RING_TYPES(vscsiif, struct vscsiif_request, struct vscsiif_response); - #endif /*__XEN__PUBLIC_IO_SCSI_H__*/ /* * Local variables: Modified: head/sys/xen/interface/kexec.h ============================================================================== --- head/sys/xen/interface/kexec.h Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/interface/kexec.h Tue Sep 1 21:21:55 2020 (r365077) @@ -27,7 +27,6 @@ #ifndef _XEN_PUBLIC_KEXEC_H #define _XEN_PUBLIC_KEXEC_H - /* This file describes the Kexec / Kdump hypercall interface for Xen. * * Kexec under vanilla Linux allows a user to reboot the physical machine @@ -83,7 +82,6 @@ #define KEXEC_TYPE_DEFAULT 0 #define KEXEC_TYPE_CRASH 1 - /* The kexec implementation for Xen allows the user to load two * types of kernels, KEXEC_TYPE_DEFAULT and KEXEC_TYPE_CRASH. * All data needed for a kexec reboot is kept in one xen_kexec_image_t @@ -92,7 +90,7 @@ * is passed to the "code page" which is one page of code that performs * the final relocations before jumping to the new kernel. */ - + typedef struct xen_kexec_image { #if defined(__i386__) || defined(__x86_64__) unsigned long page_list[KEXEC_XEN_NO_PAGES]; Modified: head/sys/xen/interface/memory.h ============================================================================== --- head/sys/xen/interface/memory.h Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/interface/memory.h Tue Sep 1 21:21:55 2020 (r365077) @@ -61,7 +61,6 @@ #endif struct xen_memory_reservation { - /* * XENMEM_increase_reservation: * OUT: MFN (*not* GMFN) bases of extents that were allocated Modified: head/sys/xen/interface/physdev.h ============================================================================== --- head/sys/xen/interface/physdev.h Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/interface/physdev.h Tue Sep 1 21:21:55 2020 (r365077) @@ -148,7 +148,7 @@ struct physdev_irq { }; typedef struct physdev_irq physdev_irq_t; DEFINE_XEN_GUEST_HANDLE(physdev_irq_t); - + #define MAP_PIRQ_TYPE_MSI 0x0 #define MAP_PIRQ_TYPE_GSI 0x1 #define MAP_PIRQ_TYPE_UNKNOWN 0x2 Modified: head/sys/xen/xenbus/xenbusb.c ============================================================================== --- head/sys/xen/xenbus/xenbusb.c Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/xenbus/xenbusb.c Tue Sep 1 21:21:55 2020 (r365077) @@ -242,7 +242,7 @@ xenbusb_delete_child(device_t dev, device_t child) xs_unregister_watch(&ivars->xd_otherend_watch); if (ivars->xd_local_watch.node != NULL) xs_unregister_watch(&ivars->xd_local_watch); - + device_delete_child(dev, child); xenbusb_free_child_ivars(ivars); } @@ -255,7 +255,6 @@ static void xenbusb_verify_device(device_t dev, device_t child) { if (xs_exists(XST_NIL, xenbus_get_node(child), "") == 0) { - /* * Device tree has been removed from Xenbus. * Tear down the device. Modified: head/sys/xen/xenbus/xenbusb.h ============================================================================== --- head/sys/xen/xenbus/xenbusb.h Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/xenbus/xenbusb.h Tue Sep 1 21:21:55 2020 (r365077) @@ -114,7 +114,6 @@ struct xenbusb_softc { * the xenbusb_softc structure. */ typedef enum { - /** * This device is contributing to the xbs_connecting_children * count of its parent bus. Modified: head/sys/xen/xenbus/xenbusb_back.c ============================================================================== --- head/sys/xen/xenbus/xenbusb_back.c Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/xenbus/xenbusb_back.c Tue Sep 1 21:21:55 2020 (r365077) @@ -58,7 +58,6 @@ __FBSDID("$FreeBSD$"); #include <xen/xenbus/xenbusvar.h> #include <xen/xenbus/xenbusb.h> - /*------------------ Private Device Attachment Functions --------------------*/ /** * \brief Probe for the existance of the XenBus back bus. @@ -293,7 +292,7 @@ static device_method_t xenbusb_back_methods[] = { DEVMETHOD(device_shutdown, bus_generic_shutdown), DEVMETHOD(device_suspend, bus_generic_suspend), DEVMETHOD(device_resume, xenbusb_resume), - + /* Bus Interface */ DEVMETHOD(bus_print_child, xenbusb_print_child), DEVMETHOD(bus_read_ivar, xenbusb_read_ivar), @@ -302,7 +301,7 @@ static device_method_t xenbusb_back_methods[] = { DEVMETHOD(bus_release_resource, bus_generic_release_resource), DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), - + /* XenBus Bus Interface */ DEVMETHOD(xenbusb_enumerate_type, xenbusb_back_enumerate_type), DEVMETHOD(xenbusb_get_otherend_node, xenbusb_back_get_otherend_node), @@ -314,6 +313,6 @@ static device_method_t xenbusb_back_methods[] = { DEFINE_CLASS_0(xenbusb_back, xenbusb_back_driver, xenbusb_back_methods, sizeof(struct xenbusb_softc)); devclass_t xenbusb_back_devclass; - + DRIVER_MODULE(xenbusb_back, xenstore, xenbusb_back_driver, xenbusb_back_devclass, 0, 0); Modified: head/sys/xen/xenbus/xenbusb_front.c ============================================================================== --- head/sys/xen/xenbus/xenbusb_front.c Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/xenbus/xenbusb_front.c Tue Sep 1 21:21:55 2020 (r365077) @@ -58,7 +58,6 @@ __FBSDID("$FreeBSD$"); #include <xen/xenbus/xenbusvar.h> #include <xen/xenbus/xenbusb.h> - /*------------------ Private Device Attachment Functions --------------------*/ /** * \brief Probe for the existance of the XenBus front bus. @@ -172,7 +171,7 @@ static device_method_t xenbusb_front_methods[] = { DEVMETHOD(device_shutdown, bus_generic_shutdown), DEVMETHOD(device_suspend, bus_generic_suspend), DEVMETHOD(device_resume, xenbusb_resume), - + /* Bus Interface */ DEVMETHOD(bus_print_child, xenbusb_print_child), DEVMETHOD(bus_read_ivar, xenbusb_read_ivar), @@ -181,7 +180,7 @@ static device_method_t xenbusb_front_methods[] = { DEVMETHOD(bus_release_resource, bus_generic_release_resource), DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), - + /* XenBus Bus Interface */ DEVMETHOD(xenbusb_enumerate_type, xenbusb_front_enumerate_type), DEVMETHOD(xenbusb_get_otherend_node, xenbusb_front_get_otherend_node), @@ -191,6 +190,6 @@ static device_method_t xenbusb_front_methods[] = { DEFINE_CLASS_0(xenbusb_front, xenbusb_front_driver, xenbusb_front_methods, sizeof(struct xenbusb_softc)); devclass_t xenbusb_front_devclass; - + DRIVER_MODULE(xenbusb_front, xenstore, xenbusb_front_driver, xenbusb_front_devclass, 0, 0); Modified: head/sys/xen/xenstore/xenstorevar.h ============================================================================== --- head/sys/xen/xenstore/xenstorevar.h Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/xenstore/xenstorevar.h Tue Sep 1 21:21:55 2020 (r365077) @@ -332,7 +332,7 @@ int xs_gather(struct xs_transaction t, const char *dir * xenbus_watch objects, to watch the same path in the XenStore. */ int xs_register_watch(struct xs_watch *watch); - + /** * Unregister a XenStore watch. * @@ -368,4 +368,3 @@ void xs_lock(void); void xs_unlock(void); #endif /* _XEN_XENSTORE_XENSTOREVAR_H */ -
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009012121.081LLuXm020180>