: PVH xen: turn gdb_frames/gdt_ents into union
PATCH v2 1/18 : PVH xen: turn gdb_frames/gdt_ents into union
PVH only needs gdtaddr and gdtsz, so a union is created. There is no functional code change in this patch.
Changes in V2:
- Add __XEN_INTERFACE_VERSION__
--- tools/libxc/xc_domain_restore.c | 8 ++++---- tools/libxc/xc_domain_save.c | 6 +++--- xen/arch/x86/domain.c | 12 ++++++------ xen/arch/x86/domctl.c | 12 ++++++------ xen/include/public/arch-x86/xen.h | 13 +++++++++++++ 5 files changed, 32 insertions(+), 19 deletions(-)
(quoted diff) +0 -0
b/tools/libxc/xc_domain_restore.c index a15f86a..9a22e2a 100644
tools/libxc/xc_domain_restore.c +0 -0
@@ -2020,15 +2020,15 @@ int xc_domain_restore(xc_interface *xch, int
io_fd, uint32_t dom, munmap(start_info, PAGE_SIZE);
}
/* Uncanonicalise each GDT frame number. */
- if ( GET_FIELD(ctxt, gdt_ents) > 8192 )
+ if ( GET_FIELD(ctxt, u.pv.gdt_ents) > 8192 )
{
ERROR("GDT entry count out of range");
goto out;
}- for ( j = 0; (512*j) < GET_FIELD(ctxt, gdt_ents); j++ )
+ for ( j = 0; (512*j) < GET_FIELD(ctxt, u.pv.gdt_ents); j++ )
{
- pfn = GET_FIELD(ctxt, gdt_frames[j]);
+ pfn = GET_FIELD(ctxt, u.pv.gdt_frames[j]);
if ( (pfn >= dinfo->p2m_size) ||
(pfn_type[pfn] != XEN_DOMCTL_PFINFO_NOTAB) )
{
@@ -2036,7 +2036,7 @@ int xc_domain_restore(xc_interface *xch, int
io_fd, uint32_t dom, j, (unsigned long)pfn);
goto out;
}
- SET_FIELD(ctxt, gdt_frames[j], ctx->p2m[pfn]);
+ SET_FIELD(ctxt, u.pv.gdt_frames[j], ctx->p2m[pfn]);
}
/* Uncanonicalise the page table base pointer. */
pfn = UNFOLD_CR3(GET_FIELD(ctxt, ctrlreg[3]));tools/libxc/xc_domain_save.c +0 -0
@@ -1900,15 +1900,15 @@ int xc_domain_save(xc_interface *xch, int
io_fd, uint32_t dom, uint32_t max_iter }
/* Canonicalise each GDT frame number. */
- for ( j = 0; (512*j) < GET_FIELD(&ctxt, gdt_ents); j++ )
+ for ( j = 0; (512*j) < GET_FIELD(&ctxt, u.pv.gdt_ents); j++ )
{
- mfn = GET_FIELD(&ctxt, gdt_frames[j]);
+ mfn = GET_FIELD(&ctxt, u.pv.gdt_frames[j]);
if ( !MFN_IS_IN_PSEUDOPHYS_MAP(mfn) )
{
ERROR("GDT frame is not in range of pseudophys map");
goto out;
}
- SET_FIELD(&ctxt, gdt_frames[j], mfn_to_pfn(mfn));
+ SET_FIELD(&ctxt, u.pv.gdt_frames[j], mfn_to_pfn(mfn));
}
/* Canonicalise the page table base pointer. */xen/arch/x86/domain.c +1 -2
@@ -780,8 +780,8 @@ int arch_set_info_guest( }for ( i =0 ; i <ARRAY_SIZE (v->arch.pv_vcpu.gdt_frames); ++i ) - fail |= v->arch.pv_vcpu.gdt_frames[i] !=c (gdt_frames[i]); - fail |= v->arch.pv_vcpu.gdt_ents !=c (gdt_ents); + fail |= v->arch.pv_vcpu.gdt_frames[i] !=
c(u.pv.gdt_frames[i]);
+ fail |= v->arch.pv_vcpu.gdt_ents != c(u.pv.gdt_ents);
fail |= v->arch.pv_vcpu.ldt_base != c(ldt_base);
fail |= v->arch.pv_vcpu.ldt_ents != c(ldt_ents);@@ -830,17 +830,17 @@ int arch_set_info_guest(
d->vm_assist = c(vm_assist);
if ( !compat )
- rc = (int)set_gdt(v, c.nat->gdt_frames, c.nat->gdt_ents);
+ rc = (int)set_gdt(v, c.nat->u.pv.gdt_frames,c.nat->u.pv.gdt_ents); else
{
unsigned longgdt_frames[ARRAY_SIZE(v->arch.pv_vcpu.gdt_frames)];
- unsigned int n = (c.cmp->gdt_ents + 511) / 512;
+ unsigned int n = (c.cmp->u.pv.gdt_ents + 511) / 512;
if ( n > ARRAY_SIZE(v->arch.pv_vcpu.gdt_frames) )
return -EINVAL;
for ( i = 0; i < n; ++i )
- gdt_frames[i] = c.cmp->gdt_frames[i];
- rc = (int)set_gdt(v, gdt_frames, c.cmp->gdt_ents);
+ gdt_frames[i] = c.cmp->u.pv.gdt_frames[i];
+ rc = (int)set_gdt(v, gdt_frames, c.cmp->u.pv.gdt_ents);
}
if ( rc != 0 )
return rc;xen/arch/x86/domctl.c +0 -0
@@ -1305,12 +1305,12 @@ void arch_get_info_guest(struct vcpu *v,
vcpu_guest_context_u c) c(ldt_base = v->arch.pv_vcpu.ldt_base);
c(ldt_ents = v->arch.pv_vcpu.ldt_ents);
for ( i = 0; i < ARRAY_SIZE(v->arch.pv_vcpu.gdt_frames); ++i )- c(gdt_frames[i] = v->arch.pv_vcpu.gdt_frames[i]);
- BUILD_BUG_ON(ARRAY_SIZE(c.nat->gdt_frames) !=
- ARRAY_SIZE(c.cmp->gdt_frames));
- for ( ; i < ARRAY_SIZE(c.nat->gdt_frames); ++i )
- c(gdt_frames[i] = 0);
- c(gdt_ents = v->arch.pv_vcpu.gdt_ents);
+ c(u.pv.gdt_frames[i] = v->arch.pv_vcpu.gdt_frames[i]);
+ BUILD_BUG_ON(ARRAY_SIZE(c.nat->u.pv.gdt_frames) !=
+ ARRAY_SIZE(c.cmp->u.pv.gdt_frames));
+ for ( ; i < ARRAY_SIZE(c.nat->u.pv.gdt_frames); ++i )
+ c(u.pv.gdt_frames[i] = 0);
+ c(u.pv.gdt_ents = v->arch.pv_vcpu.gdt_ents);
c(kernel_ss = v->arch.pv_vcpu.kernel_ss);
c(kernel_sp = v->arch.pv_vcpu.kernel_sp);
for ( i = 0; i < ARRAY_SIZE(v->arch.pv_vcpu.ctrlreg); ++i )(quoted diff) +0 -0
b/xen/include/public/arch-x86/xen.h index b7f6a51..ea72532 100644
xen/include/public/arch-x86/xen.h +0 -0
@@ -170,7 +170,20 @@ struct vcpu_guest_context {struct cpu_user_regs user_regs;/* User-level CPU
registers */ struct trap_info trap_ctxt[256]; /* Virtual
IDT */ unsigned long ldt_base, ldt_ents; /* LDT
(linear address, # ents) */ +#if __XEN_INTERFACE_VERSION__ < 0x00040300
unsigned long gdt_frames[16], gdt_ents; /* GDT (machine frames, #
ents) */ +#else
+ union {
+ struct {
+ /* GDT (machine frames, # ents) */
+ unsigned long gdt_frames[16], gdt_ents;
+ } pv;
+ struct {
+ /* PVH: GDTR addr and size */
+ unsigned long gdtaddr, gdtsz;
+ } pvh;
+ } u;
+#endif
unsigned long kernel_ss, kernel_sp; /* Virtual TSS (only
SS1/SP1) */ /* NB. User pagetable on x86/64 is placed in ctrlreg[1].
*/ unsigned long ctrlreg[8]; /* CR0-CR7 (control
registers) */
Signature · 1 line
1.7.2.3
Quoted 2 lines · Mukesh Rathor
PVH only needs gdtaddr and gdtsz, so a union is created. There is no functional code change in this patch.
Did you copy-n-paste this patch in? It is all malformed.
git send-email works great for the patches. You can just do:
git format-patch 6524455339349779c553af949b81d3d46f051797.. [generates the patches]
git send-email --to [email protected] --to <other people> \
--annotate --compose --subject "[PATCH v2] PVH patches." *.patch
and in your .gitconfig have:
[sendemail]
smtpserver = stbeehive.oracle.com
smtpserverport = 465
smtpencryption = tls
smtpuser = [email protected]
and it will just prompt you for your password.
Quoted 165 lines
Changes in V2:
- Add__XEN_INTERFACE_VERSION__Signed-off-by Mukesh Rathor <[email protected]>--- tools/libxc/xc_domain_restore.c | 8 ++++---- tools/libxc/xc_domain_save.c | 6 +++--- xen/arch/x86/domain.c | 12 ++++++------ xen/arch/x86/domctl.c | 12 ++++++------ xen/include/public/arch-x86/xen.h | 13 +++++++++++++ 5 files changed, 32 insertions(+), 19 deletions(-)(quoted diff) +0
-0
b/tools/libxc/xc_domain_restore.cindex a15f86a..9a22e2a 100644tools/libxc/xc_domain_restore.c +4
-4@@ -2020,15 +2020,15 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, munmap(start_info, PAGE_SIZE); }/* Uncanonicalise each GDT frame number. */ -if (GET_FIELD (ctxt, gdt_ents) >8192 ) +if (GET_FIELD (ctxt, u.pv.gdt_ents) >8192 ) {ERROR ("GDT entry count out of range" ); goto out; } -for ( j =0 ; (512 *j) <GET_FIELD (ctxt, gdt_ents); j++ ) +for ( j =0 ; (512 *j) <GET_FIELD (ctxt, u.pv.gdt_ents); j++ ) { - pfn =GET_FIELD (ctxt, gdt_frames[j]); + pfn =GET_FIELD (ctxt, u.pv.gdt_frames[j]);if ( (pfn >= dinfo->p2m_size) || (pfn_type[pfn] !=XEN_DOMCTL_PFINFO_NOTAB ) ) {@@ -2036,7 +2036,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, j, (unsigned long)pfn); goto out; } -SET_FIELD (ctxt, gdt_frames[j], ctx->p2m[pfn]); +SET_FIELD (ctxt, u.pv.gdt_frames[j], ctx->p2m[pfn]); }/* Uncanonicalise the page table base pointer. */ pfn =UNFOLD_CR3 (GET_FIELD (ctxt, ctrlreg[3 ]));tools/libxc/xc_domain_save.c +3
-3@@ -1900,15 +1900,15 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter }/* Canonicalise each GDT frame number. */ -for ( j =0 ; (512 *j) <GET_FIELD (&ctxt, gdt_ents); j++ ) +for ( j =0 ; (512 *j) <GET_FIELD (&ctxt, u.pv.gdt_ents); j++ ) { - mfn =GET_FIELD (&ctxt, gdt_frames[j]); + mfn =GET_FIELD (&ctxt, u.pv.gdt_frames[j]);if ( !MFN_IS_IN_PSEUDOPHYS_MAP (mfn) ) {ERROR ("GDT frame is not in range of pseudophys map" ); goto out; } -SET_FIELD (&ctxt, gdt_frames[j],mfn_to_pfn (mfn)); +SET_FIELD (&ctxt, u.pv.gdt_frames[j],mfn_to_pfn (mfn)); }/* Canonicalise the page table base pointer. */ xen/arch/x86/domain.c +2
-2@@ -780,8 +780,8 @@ int arch_set_info_guest( }for ( i =0 ; i <ARRAY_SIZE (v->arch.pv_vcpu.gdt_frames); ++i ) - fail |= v->arch.pv_vcpu.gdt_frames[i] !=c (gdt_frames[i]); - fail |= v->arch.pv_vcpu.gdt_ents !=c (gdt_ents); + fail |= v->arch.pv_vcpu.gdt_frames[i] !=c (u.pv.gdt_frames[i]); + fail |= v->arch.pv_vcpu.gdt_ents !=c (u.pv.gdt_ents); fail |= v->arch.pv_vcpu.ldt_base !=c (ldt_base);fail |= v->arch.pv_vcpu.ldt_ents != c(ldt_ents);xen/arch/x86/domain.c +1
-1@@ -830,17 +830,17 @@ int arch_set_info_guest( d->vm_assist =c (vm_assist);if ( !compat ) - rc = (int )set_gdt (v, c.nat->gdt_frames, c.nat->gdt_ents); + rc = (int)set_gdt(v, c.nat->u.pv.gdt_frames,
c.nat->u.pv.gdt_ents); else{ unsigned longgdt_frames[ARRAY_SIZE(v->arch.pv_vcpu.gdt_frames)];
xen/arch/x86/domain.c +3
-3-unsigned int n = (c.cmp->gdt_ents +511 ) /512 ; +unsigned int n = (c.cmp->u.pv.gdt_ents +511 ) /512 ;if ( n >ARRAY_SIZE (v->arch.pv_vcpu.gdt_frames) )return -EINVAL ;for ( i =0 ; i < n; ++i ) - gdt_frames[i] = c.cmp->gdt_frames[i]; - rc = (int )set_gdt (v, gdt_frames, c.cmp->gdt_ents); + gdt_frames[i] = c.cmp->u.pv.gdt_frames[i]; + rc = (int )set_gdt (v, gdt_frames, c.cmp->u.pv.gdt_ents); }if ( rc !=0 )return rc;xen/arch/x86/domctl.c +6
-6@@ -1305,12 +1305,12 @@ void arch_get_info_guest(struct vcpu *v, vcpu_guest_context_u c) c(ldt_base = v->arch.pv_vcpu.ldt_base);c (ldt_ents = v->arch.pv_vcpu.ldt_ents);for ( i =0 ; i <ARRAY_SIZE (v->arch.pv_vcpu.gdt_frames); ++i ) -c (gdt_frames[i] = v->arch.pv_vcpu.gdt_frames[i]); -BUILD_BUG_ON (ARRAY_SIZE (c.nat->gdt_frames) != -ARRAY_SIZE (c.cmp->gdt_frames)); -for ( ; i <ARRAY_SIZE (c.nat->gdt_frames); ++i ) -c (gdt_frames[i] =0 ); -c (gdt_ents = v->arch.pv_vcpu.gdt_ents); +c (u.pv.gdt_frames[i] = v->arch.pv_vcpu.gdt_frames[i]); +BUILD_BUG_ON (ARRAY_SIZE (c.nat->u.pv.gdt_frames) != +ARRAY_SIZE (c.cmp->u.pv.gdt_frames)); +for ( ; i <ARRAY_SIZE (c.nat->u.pv.gdt_frames); ++i ) +c (u.pv.gdt_frames[i] =0 ); +c (u.pv.gdt_ents = v->arch.pv_vcpu.gdt_ents);c (kernel_ss = v->arch.pv_vcpu.kernel_ss);c (kernel_sp = v->arch.pv_vcpu.kernel_sp);for ( i =0 ; i <ARRAY_SIZE (v->arch.pv_vcpu.ctrlreg); ++i )(quoted diff) +0
-0
b/xen/include/public/arch-x86/xen.hindex b7f6a51..ea72532 100644xen/include/public/arch-x86/xen.h +0
-0@@ -170,7 +170,20 @@ struct vcpu_guest_context {struct cpu_user_regs user_regs;/* User-level CPU registers */ struct
trap_infotrap_ctxt[256]; /* Virtual
IDT */ unsigned longldt_base,ldt_ents; /* LDT
(linear address, # ents) */ +#if__XEN_INTERFACE_VERSION__<0x00040300
unsigned long gdt_frames[16],gdt_ents; /* GDT (machine frames, #
ents) */ +#elsexen/include/public/arch-x86/xen.h +11
-0+union { +struct { +/* GDT (machine frames, # ents) */ +unsigned long gdt_frames[16 ], gdt_ents; + } pv; +struct { +/* PVH: GDTR addr and size */ +unsigned long gdtaddr, gdtsz; + } pvh; + } u; +#endif unsigned long kernel_ss, kernel_sp;/* Virtual TSS (only SS1/SP1) */ /* NB. User pagetable on x86/64 is placed in ctrlreg[1].
*/ unsigned long ctrlreg[8]; /* CR0-CR7 (control
registers) */Signature · 7 lines
1.7.2.3 _______________________________________________ Xen-devel mailing list [email protected] http://lists.xen.org/xen-devel
Quoted 7 lines · Konrad Rzeszutek Wilk
Quoted 2 lines · Mukesh Rathor
PVH only needs gdtaddr and gdtsz, so a union is created. There is no functional code change in this patch.
Did you copy-n-paste this patch in? It is all malformed.
git send-email works great for the patches.
It also chains the series as replies to each other, which for any non-trivial set of patches really is a must for reviewers and committers etc.
It's also a massive time saver, I can't imagine how long it takes to send an 18 patch series one-by-one by hand, and obviously there is much reduced scope for user error too.
[...]
Quoted 1 line
and it will just prompt you for your password.
Setting smtppass="supersekrit" avoids even that step...
Ian.
Quoted 14 lines · On Sat, 16 Mar 2013 09:46:00 -0400 Konrad Rzeszutek Wilk <[email protected]>…
Quoted 2 lines · Mukesh Rathor
PVH only needs gdtaddr and gdtsz, so a union is created. There is no functional code change in this patch.
Did you copy-n-paste this patch in? It is all malformed.
git send-email works great for the patches. You can just do:
git format-patch
6524455339349779c553af949b81d3d46f051797.. [generates the patches]git send-email --to [email protected] --to <other people> \
--annotate --compose --subject "[PATCH v2] PVH patches." *.patch
Quoted 6 lines
and in your .gitconfig have:
[sendemail]
smtpserver = stbeehive.oracle.com
smtpserverport = 465
smtpencryption = tls
Gives me "Unable to initialize SMTP properly. " error.
But changing tls to ssl works.
Ok, will use git email next version of patches.
Thanks,
Mukesh
Quoted 25 lines · Mukesh Rathor
Quoted 14 lines · On Sat, 16 Mar 2013 09:46:00 -0400 Konrad Rzeszutek Wilk <[email protected]>…
Quoted 2 lines · Mukesh Rathor
PVH only needs gdtaddr and gdtsz, so a union is created. There is no functional code change in this patch.
Did you copy-n-paste this patch in? It is all malformed.
git send-email works great for the patches. You can just do:
git format-patch
6524455339349779c553af949b81d3d46f051797.. [generates the patches]git send-email --to [email protected] --to <other people> \
--annotate --compose --subject "[PATCH v2] PVH patches." *.patchQuoted 6 lines
and in your .gitconfig have:
[sendemail]
smtpserver = stbeehive.oracle.com
smtpserverport = 465
smtpencryption = tls
Quoted 5 lines
Gives me "Unable to initialize SMTP properly. " error.
But changing tls to ssl works.
Ok, will use git email next version of patches.
Actually, could you re-post this series as-is, so more reviewers can look at the code in-situ without having to manually adjust damaged patches? I think if you make the subject prefix "PATCH v2 RESEND" it should be clear what's going on.
-George
Quoted 10 lines
Quoted 1 line
Quoted 1 line · Mukesh Rathor
xen/include/public/arch-x86/xen.h +0
-0@@ -170,7 +170,20 @@ struct vcpu_guest_context {struct cpu_user_regs user_regs;/* User-level CPU registers */ struct
trap_infotrap_ctxt[256]; /* Virtual
IDT */ unsigned longldt_base,ldt_ents; /* LDT
(linear address, # ents) */ +#if__XEN_INTERFACE_VERSION__<0x00040300
unsigned long gdt_frames[16],gdt_ents; /* GDT (machine frames, #
ents) */ +#else
xen/include/public/arch-x86/xen.h
Quoted 10 lines
xen/include/public/arch-x86/xen.h +10
-0+union { +struct { +/* GDT (machine frames, # ents) */ +unsigned long gdt_frames[16 ], gdt_ents; + } pv; +struct { +/* PVH: GDTR addr and size */ +unsigned long gdtaddr, gdtsz; + } pvh; + } u;
Leaving aside the line wrapping issue already pointed out by others, I can only repeat that I don't see why you would name the union as badly as "u" when the obvious name would be "gdt".
With that, I can further more only repeat that dropping the "gdt_" and "gdt" prefixes on the names would be much preferred.
And finally I question the usefulness of having what is currently named "gdtsz" be an "unsigned long" when this can't exceed a 16-bit quantity (the more if you used a limit value here rather than a size, just like hardware does).
Jan
Quoted 26 lines · On Mon, 18 Mar 2013 11:21:31 +0000 "Jan Beulich" <[email protected]> wrote:
Quoted 11 lines
Quoted 2 lines
Quoted 2 lines
On 16.03.13 at 01:14, Mukesh Rathor <[email protected]> wrote:
xen/include/public/arch-x86/xen.h +0
-0@@ -170,7 +170,20 @@ struct vcpu_guest_context {struct cpu_user_regs user_regs;/* User-level CPU registers */ struct
trap_infotrap_ctxt[256]; /* Virtual
IDT */ unsigned longldt_base,ldt_ents; /*
LDT (linear address, # ents) */ +#if__XEN_INTERFACE_VERSION__<0x00040300unsigned long gdt_frames[16],gdt_ents; /* GDT (machine frames, # ents) */ +#elsexen/include/public/arch-x86/xen.h
Quoted 10 lines
xen/include/public/arch-x86/xen.h +10
-0+union { +struct { +/* GDT (machine frames, # ents) */ +unsigned long gdt_frames[16 ], gdt_ents; + } pv; +struct { +/* PVH: GDTR addr and size */ +unsigned long gdtaddr, gdtsz; + } pvh; + } u;Leaving aside the line wrapping issue already pointed out by others, I can only repeat that I don't see why you would name the union as badly as "u" when the obvious name would be "gdt".
Quoted 2 lines
With that, I can further more only repeat that dropping the "
gdt_" and "gdt" prefixes on the names would be much preferred.
Ok, I thought we had resolved that in V1 when I said it was recommended during linux review to have it that way (linux patches were posted on xen-devel). But I guess it has to be your way now. So I'll change it as much as I dislike making code harder to read by naming variables that can't be easily grep'd/cscope'd.
Since gdt_frames/gdt_ents is pre-existing code, I'll just change gdtaddr to addr, and gdtsz to sz or call it limit.
Quoted 4 lines
And finally I question the usefulness of having what is currently named "gdtsz" be an "unsigned long" when this can't exceed a 16-bit quantity (the more if you used a limit value here rather than a size, just like hardware does).
Ok, I will change it to unsigned short.
thanks
Mukesh
Quoted 30 lines
Quoted 1 line
Quoted 1 line · Mukesh Rathor
Quoted 26 lines · On Mon, 18 Mar 2013 11:21:31 +0000 "Jan Beulich" <[email protected]> wrote:
Quoted 11 lines
Quoted 2 lines
Quoted 2 lines
On 16.03.13 at 01:14, Mukesh Rathor <[email protected]> wrote:
xen/include/public/arch-x86/xen.h +0
-0@@ -170,7 +170,20 @@ struct vcpu_guest_context {struct cpu_user_regs user_regs;/* User-level CPU registers */ struct
trap_infotrap_ctxt[256]; /* Virtual
IDT */ unsigned longldt_base,ldt_ents; /*
LDT (linear address, # ents) */ +#if__XEN_INTERFACE_VERSION__<0x00040300unsigned long gdt_frames[16],gdt_ents; /* GDT (machine frames, # ents) */ +#elsexen/include/public/arch-x86/xen.h
Quoted 10 lines
xen/include/public/arch-x86/xen.h +10
-0+union { +struct { +/* GDT (machine frames, # ents) */ +unsigned long gdt_frames[16 ], gdt_ents; + } pv; +struct { +/* PVH: GDTR addr and size */ +unsigned long gdtaddr, gdtsz; + } pvh; + } u;Leaving aside the line wrapping issue already pointed out by others, I can only repeat that I don't see why you would name the union as badly as "u" when the obvious name would be "gdt".
Quoted 6 lines
Quoted 2 lines
With that, I can further more only repeat that dropping the "
gdt_" and "gdt" prefixes on the names would be much preferred.Ok, I thought we had resolved that in V1 when I said it was recommended during linux review to have it that way (linux patches were posted on xen-devel).
I know you thought so, but I repeatedly said that posting the Linux side first was a mistake.
Quoted 6 lines
But I guess it has to be your way now. So I'll change it as much as I dislike making code harder to read by naming variables that can't be easily grep'd/cscope'd.
Since gdt_frames/gdt_ents is pre-existing code, I'll just change gdtaddr to addr, and gdtsz to sz or call it limit.
In the old interface version code that obviously has to be that way. But in the new interface version code, even the gdt_ prefixes should go away.
Quoted 6 lines
Quoted 4 lines
And finally I question the usefulness of having what is currently named "gdtsz" be an "unsigned long" when this can't exceed a 16-bit quantity (the more if you used a limit value here rather than a size, just like hardware does).
Ok, I will change it to unsigned short.
uint16_t please. Let's try to use types we can be certain we know the width of now and forever (and at once not make things harder for consumers of the headers we might not even be aware of).
Jan
Quoted 25 lines · Jan Beulich
Quoted 10 lines
Quoted 1 line
Quoted 1 line · Mukesh Rathor
xen/include/public/arch-x86/xen.h +0
-0@@ -170,7 +170,20 @@ struct vcpu_guest_context {struct cpu_user_regs user_regs;/* User-level CPU registers */ struct
trap_infotrap_ctxt[256]; /* Virtual
IDT */ unsigned longldt_base,ldt_ents; /* LDT
(linear address, # ents) */ +#if__XEN_INTERFACE_VERSION__<0x00040300
unsigned long gdt_frames[16],gdt_ents; /* GDT (machine frames, #
ents) */ +#elsexen/include/public/arch-x86/xen.h
Quoted 10 lines
xen/include/public/arch-x86/xen.h +10
-0+union { +struct { +/* GDT (machine frames, # ents) */ +unsigned long gdt_frames[16 ], gdt_ents; + } pv; +struct { +/* PVH: GDTR addr and size */ +unsigned long gdtaddr, gdtsz; + } pvh; + } u;Leaving aside the line wrapping issue already pointed out by others, I can only repeat that I don't see why you would name the union as badly as "u" when the obvious name would be "gdt".
Quoted 2 lines
With that, I can further more only repeat that dropping the "
gdt_" and "gdt" prefixes on the names would be much preferred.
Agreed, on both points.
Quoted 4 lines
And finally I question the usefulness of having what is currently named "gdtsz" be an "unsigned long" when this can't exceed a 16-bit quantity (the more if you used a limit value here rather than a size, just like hardware does).
And in any case, we should not be adding any more fields to the public API that aren't explicitly sized.
Tim.