Xen project Mailing List

Re: [PATCH v4 3/5] tools/libs/foreignmemory: Fix PAGE_SIZE redefinition error

To: Costin Lupu <costin.lupu@xxxxxxxxx>, Ian Jackson <iwj@xxxxxxxxxxxxxx>, Wei Liu <wl@xxxxxxx>

Date: Tue, 13 Jul 2021 08:47:42 +0200

Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none

Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/8aF1fBFzzq9HM3x/0tgyw8+NTiqGYnkNgO6hpnH6mg=; b=WIS8CYZK7bwU4DJFKMxhJWQCCDlvZayiMtZ41l/qlbIvlk2ilztQ+8IeAkiKwjSVTe0RqIkD//7JlKUqp9fUNEJRUxFGvxsPPYS7r+TVBoEigqwb67J1jtDQVql1szZKqh5w3upVMsl2wWKAtrBcEz7ZxKin9ecpAUO43bQ5g4MvXSK+sd0JDCqnIuAYDZp1OzpPVhvZFnB5BWgpEfYSKDbaKdOWgHKogTljf8oqBrDE0R8Ck0f0iSViWULQ75VlecJ39TTI2RgcN4Q5U5jGh6QAT1bDUFAJzYaZ0I+sy+hQmNsp9g1jLD6eQCvI1X3EGAO9Knuv5cR4s8fv+PAX4A==

Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MCLJCSyE5bEpxqg8iChOXDfA9g4NrZYHTT/cUFH+bgwR2YYQX/Sk7lk8vQ68wZGECFFh73nW2TOw5igcC1l02aZdiIM3hPz/JBUdnj8wnGGgc1/e2zY+/A2ETZBPpHw+0PT5OWa7wjMgaviH3q4CnfjeR25ilNUrMqJvHWOM1PAh4uBZM+xUu6GWCo7ASIxYY+zfR/ek5BOp+XvFHT21J4FRzD7BQwK4RRGjIUud9n23xF7FR8IU3wgtk8ZA/sl7Ye5iCIaZEO1xWzpMf0bdceH6elEA5+sP6vQn6OSp9rvZpT0/9w7FeqswL+ZNZdR94e+sDY+jHyf37Vcqt3Lsrg==

Authentication-results: lists.xenproject.org; dkim=none (message not signed) header.d=none;lists.xenproject.org; dmarc=none action=none header.from=suse.com;

Cc: xen-devel@xxxxxxxxxxxxxxxxxxxx

Delivery-date: Tue, 13 Jul 2021 06:47:54 +0000

List-id: Xen developer discussion <xen-devel.lists.xenproject.org>

On 08.06.2021 14:35, Costin Lupu wrote: > --- a/tools/libs/foreignmemory/private.h > +++ b/tools/libs/foreignmemory/private.h > @@ -1,6 +1,7 @@ > #ifndef XENFOREIGNMEMORY_PRIVATE_H > #define XENFOREIGNMEMORY_PRIVATE_H > > +#include <xenctrl.h> > #include <xentoollog.h> > > #include <xenforeignmemory.h> At the risk of repeating what may have been discussed on irc already yesterday (which I would not have seen), this is the cause for the present smoke test failure: In file included from /home/osstest/build.163627.build-amd64/xen/stubdom/include/xen/domctl.h:39, from /home/osstest/build.163627.build-amd64/xen/tools/include/xenctrl.h:36, from private.h:4, from minios.c:29: /home/osstest/build.163627.build-amd64/xen/xen/include/public/memory.h:407:5: error: expected specifier-qualifier-list before 'XEN_GUEST_HANDLE_64' XEN_GUEST_HANDLE_64(const_uint8) buffer; ^~~~~~~~~~~~~~~~~~~ In file included from /home/osstest/build.163627.build-amd64/xen/tools/include/xenctrl.h:36, from private.h:4, from minios.c:29: /home/osstest/build.163627.build-amd64/xen/stubdom/include/xen/domctl.h:101:34: error: field 'arch' has incomplete type struct xen_arch_domainconfig arch; ^~~~ /home/osstest/build.163627.build-amd64/xen/stubdom/include/xen/domctl.h:152:34: error: field 'arch_config' has incomplete type struct xen_arch_domainconfig arch_config; ^~~~~~~~~~~ /home/osstest/build.163627.build-amd64/xen/stubdom/include/xen/domctl.h:182:5: error: expected specifier-qualifier-list before 'XEN_GUEST_HANDLE_64' XEN_GUEST_HANDLE_64(xen_pfn_t) array; ^~~~~~~~~~~~~~~~~~~ /home/osstest/build.163627.build-amd64/xen/stubdom/include/xen/domctl.h:263:5: error: expected specifier-qualifier-list before 'XEN_GUEST_HANDLE_64' XEN_GUEST_HANDLE_64(uint8) dirty_bitmap; ^~~~~~~~~~~~~~~~~~~ /home/osstest/build.163627.build-amd64/xen/stubdom/include/xen/domctl.h:280:5: error: expected specifier-qualifier-list before 'XEN_GUEST_HANDLE_64' XEN_GUEST_HANDLE_64(vcpu_guest_context_t) ctxt; /* IN/OUT */ ^~~~~~~~~~~~~~~~~~~ /home/osstest/build.163627.build-amd64/xen/stubdom/include/xen/domctl.h:301:26: error: field 'nodemap' has incomplete type struct xenctl_bitmap nodemap;/* IN */ ^~~~~~~ /home/osstest/build.163627.build-amd64/xen/stubdom/include/xen/domctl.h:337:26: error: field 'cpumap_hard' has incomplete type struct xenctl_bitmap cpumap_hard; ^~~~~~~~~~~ /home/osstest/build.163627.build-amd64/xen/stubdom/include/xen/domctl.h:338:26: error: field 'cpumap_soft' has incomplete type struct xenctl_bitmap cpumap_soft; ^~~~~~~~~~~ /home/osstest/build.163627.build-amd64/xen/stubdom/include/xen/domctl.h:418:13: error: expected specifier-qualifier-list before 'XEN_GUEST_HANDLE_64' XEN_GUEST_HANDLE_64(xen_domctl_schedparam_vcpu_t) vcpus; ^~~~~~~~~~~~~~~~~~~ /home/osstest/build.163627.build-amd64/xen/stubdom/include/xen/domctl.h:473:5: error: unknown type name 'int64_aligned_t' int64_aligned_t time_offset_seconds; /* applied to domain wallclock time */ ^~~~~~~~~~~~~~~ /home/osstest/build.163627.build-amd64/xen/stubdom/include/xen/domctl.h:480:5: error: expected specifier-qualifier-list before 'XEN_GUEST_HANDLE_64' XEN_GUEST_HANDLE_64(uint8) buffer; /* IN/OUT: data, or call ^~~~~~~~~~~~~~~~~~~ /home/osstest/build.163627.build-amd64/xen/stubdom/include/xen/domctl.h:533:13: error: expected specifier-qualifier-list before 'XEN_GUEST_HANDLE_64' XEN_GUEST_HANDLE_64(char) path; /* path to the device tree node */ ^~~~~~~~~~~~~~~~~~~ /home/osstest/build.163627.build-amd64/xen/stubdom/include/xen/domctl.h:544:5: error: expected specifier-qualifier-list before 'XEN_GUEST_HANDLE_64' XEN_GUEST_HANDLE_64(uint32) sdev_array; /* OUT */ ^~~~~~~~~~~~~~~~~~~ /home/osstest/build.163627.build-amd64/xen/stubdom/include/xen/domctl.h:685:5: error: expected specifier-qualifier-list before 'XEN_GUEST_HANDLE_64' XEN_GUEST_HANDLE_64(xen_cpuid_leaf_t) cpuid_policy; /* IN/OUT */ ^~~~~~~~~~~~~~~~~~~ /home/osstest/build.163627.build-amd64/xen/stubdom/include/xen/domctl.h:735:5: error: expected specifier-qualifier-list before 'XEN_GUEST_HANDLE_64' XEN_GUEST_HANDLE_64(uint8) buffer; /* OUT: buffer to write record into */ ^~~~~~~~~~~~~~~~~~~ /home/osstest/build.163627.build-amd64/xen/stubdom/include/xen/domctl.h:909:5: error: expected specifier-qualifier-list before 'XEN_GUEST_HANDLE_64' XEN_GUEST_HANDLE_64(uint64) buffer; ^~~~~~~~~~~~~~~~~~~ /home/osstest/build.163627.build-amd64/xen/stubdom/include/xen/domctl.h:963:5: error: expected specifier-qualifier-list before 'XEN_GUEST_HANDLE_64' XEN_GUEST_HANDLE_64(xen_domctl_vcpu_msr_t) msrs; /* IN/OUT */ ^~~~~~~~~~~~~~~~~~~ /home/osstest/build.163627.build-amd64/xen/stubdom/include/xen/domctl.h:984:5: error: expected specifier-qualifier-list before 'XEN_GUEST_HANDLE_64' XEN_GUEST_HANDLE_64(uint) vdistance; ^~~~~~~~~~~~~~~~~~~ In file included from /home/osstest/build.163627.build-amd64/xen/tools/include/xenctrl.h:38, from private.h:4, from minios.c:29: /home/osstest/build.163627.build-amd64/xen/stubdom/include/xen/sysctl.h:56:5: error: expected specifier-qualifier-list before 'XEN_GUEST_HANDLE_64' XEN_GUEST_HANDLE_64(char) buffer; ^~~~~~~~~~~~~~~~~~~ /home/osstest/build.163627.build-amd64/xen/stubdom/include/xen/sysctl.h:73:26: error: field 'cpu_mask' has incomplete type struct xenctl_bitmap cpu_mask; ^~~~~~~~ /home/osstest/build.163627.build-amd64/xen/stubdom/include/xen/sysctl.h:155:5: error: expected specifier-qualifier-list before 'XEN_GUEST_HANDLE_64' XEN_GUEST_HANDLE_64(xen_sysctl_perfc_desc_t) desc; ^~~~~~~~~~~~~~~~~~~ /home/osstest/build.163627.build-amd64/xen/stubdom/include/xen/sysctl.h:165:5: error: expected specifier-qualifier-list before 'XEN_GUEST_HANDLE_64' XEN_GUEST_HANDLE_64(xen_domctl_getdomaininfo_t) buffer; ^~~~~~~~~~~~~~~~~~~ /home/osstest/build.163627.build-amd64/xen/stubdom/include/xen/sysctl.h:174:5: error: expected specifier-qualifier-list before 'XEN_GUEST_HANDLE_64' XEN_GUEST_HANDLE_64(const_char) keys; ^~~~~~~~~~~~~~~~~~~ /home/osstest/build.163627.build-amd64/xen/stubdom/include/xen/sysctl.h:188:5: error: expected specifier-qualifier-list before 'XEN_GUEST_HANDLE_64' XEN_GUEST_HANDLE_64(xen_sysctl_cpuinfo_t) info; ^~~~~~~~~~~~~~~~~~~ /home/osstest/build.163627.build-amd64/xen/stubdom/include/xen/sysctl.h:217:5: error: expected specifier-qualifier-list before 'XEN_GUEST_HANDLE_64' XEN_GUEST_HANDLE_64(uint64) trans_pt; /* Px transition table */ ^~~~~~~~~~~~~~~~~~~ /home/osstest/build.163627.build-amd64/xen/stubdom/include/xen/sysctl.h:225:5: error: expected specifier-qualifier-list before 'XEN_GUEST_HANDLE_64' XEN_GUEST_HANDLE_64(uint64) triggers; /* Cx trigger counts */ ^~~~~~~~~~~~~~~~~~~ /home/osstest/build.163627.build-amd64/xen/stubdom/include/xen/sysctl.h:317:5: error: expected specifier-qualifier-list before 'XEN_GUEST_HANDLE_64' XEN_GUEST_HANDLE_64(uint32) affected_cpus; ^~~~~~~~~~~~~~~~~~~ /home/osstest/build.163627.build-amd64/xen/stubdom/include/xen/sysctl.h:474:5: error: expected specifier-qualifier-list before 'XEN_GUEST_HANDLE_64' XEN_GUEST_HANDLE_64(xen_sysctl_lockprof_data_t) data; ^~~~~~~~~~~~~~~~~~~ /home/osstest/build.163627.build-amd64/xen/stubdom/include/xen/sysctl.h:504:5: error: expected specifier-qualifier-list before 'XEN_GUEST_HANDLE_64' XEN_GUEST_HANDLE_64(xen_sysctl_cputopo_t) cputopo; ^~~~~~~~~~~~~~~~~~~ /home/osstest/build.163627.build-amd64/xen/stubdom/include/xen/sysctl.h:537:5: error: expected specifier-qualifier-list before 'XEN_GUEST_HANDLE_64' XEN_GUEST_HANDLE_64(xen_sysctl_meminfo_t) meminfo; ^~~~~~~~~~~~~~~~~~~ /home/osstest/build.163627.build-amd64/xen/stubdom/include/xen/sysctl.h:563:26: error: field 'cpumap' has incomplete type struct xenctl_bitmap cpumap; /* OUT: IF */ ^~~~~~ /home/osstest/build.163627.build-amd64/xen/stubdom/include/xen/sysctl.h:665:13: error: expected specifier-qualifier-list before 'XEN_GUEST_HANDLE_64' XEN_GUEST_HANDLE_64(xen_sysctl_arinc653_schedule_t) schedule; ^~~~~~~~~~~~~~~~~~~ /home/osstest/build.163627.build-amd64/xen/stubdom/include/xen/sysctl.h:707:5: error: expected specifier-qualifier-list before 'XEN_GUEST_HANDLE_64' XEN_GUEST_HANDLE_64(char) buffer; /* OUT */ ^~~~~~~~~~~~~~~~~~~ /home/osstest/build.163627.build-amd64/xen/stubdom/include/xen/sysctl.h:738:5: error: expected specifier-qualifier-list before 'XEN_GUEST_HANDLE_64' XEN_GUEST_HANDLE_64(physdev_pci_device_t) devs; ^~~~~~~~~~~~~~~~~~~ /home/osstest/build.163627.build-amd64/xen/stubdom/include/xen/sysctl.h:814:5: error: expected specifier-qualifier-list before 'XEN_GUEST_HANDLE_64' XEN_GUEST_HANDLE_64(uint32) features; /* OUT: */ ^~~~~~~~~~~~~~~~~~~ /home/osstest/build.163627.build-amd64/xen/stubdom/include/xen/sysctl.h:887:5: error: expected specifier-qualifier-list before 'XEN_GUEST_HANDLE_64' XEN_GUEST_HANDLE_64(char) name; /* IN: pointer to name. */ ^~~~~~~~~~~~~~~~~~~ /home/osstest/build.163627.build-amd64/xen/stubdom/include/xen/sysctl.h:912:5: error: expected specifier-qualifier-list before 'XEN_GUEST_HANDLE_64' XEN_GUEST_HANDLE_64(uint8) payload; /* IN, the ELF file. */ ^~~~~~~~~~~~~~~~~~~ /home/osstest/build.163627.build-amd64/xen/stubdom/include/xen/sysctl.h:975:5: error: expected specifier-qualifier-list before 'XEN_GUEST_HANDLE_64' XEN_GUEST_HANDLE_64(xen_livepatch_status_t) status; /* OUT. Must have enough ^~~~~~~~~~~~~~~~~~~ /home/osstest/build.163627.build-amd64/xen/stubdom/include/xen/sysctl.h:1059:5: error: expected specifier-qualifier-list before 'XEN_GUEST_HANDLE_64' XEN_GUEST_HANDLE_64(xen_cpuid_leaf_t) cpuid_policy; /* OUT */ ^~~~~~~~~~~~~~~~~~~ In file included from /home/osstest/build.163627.build-amd64/xen/tools/include/xenctrl.h:55, from private.h:4, from minios.c:29: /home/osstest/build.163627.build-amd64/xen/stubdom/include/xen/arch-x86/xen-mca.h:431:5: error: unknown type name 'xenctl_bitmap_t' xenctl_bitmap_t cpumap; ^~~~~~~~~~~~~~~ In file included from private.h:4, from minios.c:29: /home/osstest/build.163627.build-amd64/xen/tools/include/xenctrl.h:468:34: error: field 'arch_config' has incomplete type struct xen_arch_domainconfig arch_config; ^~~~~~~~~~~ Clearly xenctrl.h cannot be included freely right now; it expects other header to have been included first. Question is whether that's what needs fixing, or whether the new #include wants prefixing by whatever prereq headers that are needed. Or whether, considering that libxenforeignmemory.so doesn't depend on libxc.so, including xenctrl.h is inappropriate here in the first place, meaning that the tool stack's PAGE_SIZE abstraction may want to move to a separate header which is not tied to any particular library. Jan

©2013 Xen Project, A Linux Foundation Collaborative Project. All Rights Reserved.
Linux Foundation is a registered trademark of The Linux Foundation.
Xen Project is a trademark of The Linux Foundation.