i386/tdx: Fix build on 32-bit host
cover i386/tdx: Fix build on 32-bit host
Hello,
Here is a little series fixing a build break on 32-bit host.
Thanks,
C.
Cédric Le Goater (2):
i386/tdx: Fix build on 32-bit host
i386/tdvf: Fix build on 32-bit host
hw/i386/tdvf.c | 6 +++--- target/i386/kvm/tdx.c | 26 +++++++++++++------------- 2 files changed, 16 insertions(+), 16 deletions(-)
Signature · 1 line
2.49.0
PATCH 1/2 i386/tdx: Fix build on 32-bit host
Use PRI formats where required and fix pointer cast.
--- target/i386/kvm/tdx.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
target/i386/kvm/tdx.c +13 -13
@@ -284,7 +284,7 @@ static void tdx_post_init_vcpus(void) hob =tdx_get_hob_entry (tdx_guest);CPU_FOREACH (cpu) { -tdx_vcpu_ioctl (cpu,KVM_TDX_INIT_VCPU ,0 , (void *)hob->address, +tdx_vcpu_ioctl (cpu,KVM_TDX_INIT_VCPU ,0 , (void *)(uintptr_t )hob->address, &error_fatal); } }
@@ -339,7 +339,7 @@ static void tdx_finalize_vm(Notifier *notifier, void *unused)uint32_t flags; region = (struct kvm_tdx_init_mem_region ) { - .source_addr = (uint64_t )entry->mem_ptr, + .source_addr = (uintptr_t )entry->mem_ptr, .gpa = entry->address, .nr_pages = entry->size >>12 , };
@@ -893,16 +893,16 @@ static int tdx_check_features(X86ConfidentialGuest *cg, CPUState *cs)static int tdx_validate_attributes (TdxGuest *tdx,Error **errp) {if ((tdx->attributes & ~tdx_caps->supported_attrs)) { -error_setg (errp,"Invalid attributes 0x%lx for TDX VM " -"(KVM supported: 0x%llx)" , tdx->attributes, - tdx_caps->supported_attrs); +error_setg (errp,"Invalid attributes 0x%" PRIx64" for TDX VM " +"(KVM supported: 0x%" PRIx64")" , tdx->attributes, + (uint64_t )tdx_caps->supported_attrs);return -1 ; }if (tdx->attributes & ~TDX_SUPPORTED_TD_ATTRS ) {error_setg (errp,"Some QEMU unsupported TD attribute bits being " -"requested: 0x%lx (QEMU supported: 0x%llx)" , - tdx->attributes,TDX_SUPPORTED_TD_ATTRS ); +"requested: 0x%" PRIx64" (QEMU supported: 0x%" PRIx64")" , + tdx->attributes, (uint64_t )TDX_SUPPORTED_TD_ATTRS );return -1 ; }
@@ -931,8 +931,8 @@ static int setup_td_xfam(X86CPU *x86cpu, Error **errp) env->features[FEAT_XSAVE_XSS_HI ];if (xfam & ~tdx_caps->supported_xfam) { -error_setg (errp,"Invalid XFAM 0x%lx for TDX VM (supported: 0x%llx))" , - xfam, tdx_caps->supported_xfam); +error_setg (errp,"Invalid XFAM 0x%" PRIx64" for TDX VM (supported: 0x%" PRIx64"))" , + xfam, (uint64_t )tdx_caps->supported_xfam);return -1 ; }
@@ -999,14 +999,14 @@ int tdx_pre_create_vcpu(CPUState *cpu, Error **errp)if (env->tsc_khz && (env->tsc_khz <TDX_MIN_TSC_FREQUENCY_KHZ || env->tsc_khz >TDX_MAX_TSC_FREQUENCY_KHZ )) { -error_setg (errp,"Invalid TSC %ld KHz, must specify cpu_frequency " +error_setg (errp,"Invalid TSC %" PRId64" KHz, must specify cpu_frequency " "between [%d, %d] kHz" , env->tsc_khz,TDX_MIN_TSC_FREQUENCY_KHZ ,TDX_MAX_TSC_FREQUENCY_KHZ );return -EINVAL ; }if (env->tsc_khz % (25 *1000 )) { -error_setg (errp,"Invalid TSC %ld KHz, it must be multiple of 25MHz" , +error_setg (errp,"Invalid TSC %" PRId64" KHz, it must be multiple of 25MHz" , env->tsc_khz);return -EINVAL ; }
@@ -1014,7 +1014,7 @@ int tdx_pre_create_vcpu(CPUState *cpu, Error **errp)/* it's safe even env->tsc_khz is 0. KVM uses host's tsc_khz in this case */ r =kvm_vm_ioctl (kvm_state,KVM_SET_TSC_KHZ , env->tsc_khz);if (r <0 ) { -error_setg_errno (errp, -r,"Unable to set TSC frequency to %ld kHz" , +error_setg_errno (errp, -r,"Unable to set TSC frequency to %" PRId64" kHz" , env->tsc_khz);return r; }
@@ -1139,7 +1139,7 @@ int tdx_handle_report_fatal_error(X86CPU *cpu, struct kvm_run *run)uint64_t gpa =-1ull ;if (error_code &0xffff ) { -error_report ("TDX: REPORT_FATAL_ERROR: invalid error code: 0x%lx" , +error_report ("TDX: REPORT_FATAL_ERROR: invalid error code: 0x%" PRIx64, error_code);return -1 ; }
Signature · 1 line
2.49.0
Quoted 1 line · Cédric Le Goater
Use PRI formats where required and fix pointer cast.
Maybe we can make 32-bit build exclusive with CONFIG_TDX? since TDX is not supported on 32-bit host.
Quoted 96 lines
Cc Xiaoyao Li <[email protected]>Signed-off-by Cédric Le Goater <[email protected]>--- target/i386/kvm/tdx.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)target/i386/kvm/tdx.c +13
-13@@ -284,7 +284,7 @@ static void tdx_post_init_vcpus(void) hob =tdx_get_hob_entry (tdx_guest);CPU_FOREACH (cpu) { -tdx_vcpu_ioctl (cpu,KVM_TDX_INIT_VCPU ,0 , (void *)hob->address, +tdx_vcpu_ioctl (cpu,KVM_TDX_INIT_VCPU ,0 , (void *)(uintptr_t )hob->address, &error_fatal); } }@@ -339,7 +339,7 @@ static void tdx_finalize_vm(Notifier *notifier, void *unused)uint32_t flags; region = (struct kvm_tdx_init_mem_region ) { - .source_addr = (uint64_t )entry->mem_ptr, + .source_addr = (uintptr_t )entry->mem_ptr, .gpa = entry->address, .nr_pages = entry->size >>12 , };@@ -893,16 +893,16 @@ static int tdx_check_features(X86ConfidentialGuest *cg, CPUState *cs)static int tdx_validate_attributes (TdxGuest *tdx,Error **errp) {if ((tdx->attributes & ~tdx_caps->supported_attrs)) { -error_setg (errp,"Invalid attributes 0x%lx for TDX VM " -"(KVM supported: 0x%llx)" , tdx->attributes, - tdx_caps->supported_attrs); +error_setg (errp,"Invalid attributes 0x%" PRIx64" for TDX VM " +"(KVM supported: 0x%" PRIx64")" , tdx->attributes, + (uint64_t )tdx_caps->supported_attrs);return -1 ; }if (tdx->attributes & ~TDX_SUPPORTED_TD_ATTRS ) {error_setg (errp,"Some QEMU unsupported TD attribute bits being " -"requested: 0x%lx (QEMU supported: 0x%llx)" , - tdx->attributes,TDX_SUPPORTED_TD_ATTRS ); +"requested: 0x%" PRIx64" (QEMU supported: 0x%" PRIx64")" , + tdx->attributes, (uint64_t )TDX_SUPPORTED_TD_ATTRS );return -1 ; }@@ -931,8 +931,8 @@ static int setup_td_xfam(X86CPU *x86cpu, Error **errp) env->features[FEAT_XSAVE_XSS_HI ];if (xfam & ~tdx_caps->supported_xfam) { -error_setg (errp,"Invalid XFAM 0x%lx for TDX VM (supported: 0x%llx))" , - xfam, tdx_caps->supported_xfam); +error_setg (errp,"Invalid XFAM 0x%" PRIx64" for TDX VM (supported: 0x%" PRIx64"))" , + xfam, (uint64_t )tdx_caps->supported_xfam);return -1 ; }@@ -999,14 +999,14 @@ int tdx_pre_create_vcpu(CPUState *cpu, Error **errp)if (env->tsc_khz && (env->tsc_khz <TDX_MIN_TSC_FREQUENCY_KHZ || env->tsc_khz >TDX_MAX_TSC_FREQUENCY_KHZ )) { -error_setg (errp,"Invalid TSC %ld KHz, must specify cpu_frequency " +error_setg (errp,"Invalid TSC %" PRId64" KHz, must specify cpu_frequency " "between [%d, %d] kHz" , env->tsc_khz,TDX_MIN_TSC_FREQUENCY_KHZ ,TDX_MAX_TSC_FREQUENCY_KHZ );return -EINVAL ; }if (env->tsc_khz % (25 *1000 )) { -error_setg (errp,"Invalid TSC %ld KHz, it must be multiple of 25MHz" , +error_setg (errp,"Invalid TSC %" PRId64" KHz, it must be multiple of 25MHz" , env->tsc_khz);return -EINVAL ; }@@ -1014,7 +1014,7 @@ int tdx_pre_create_vcpu(CPUState *cpu, Error **errp)/* it's safe even env->tsc_khz is 0. KVM uses host's tsc_khz in this case */ r =kvm_vm_ioctl (kvm_state,KVM_SET_TSC_KHZ , env->tsc_khz);if (r <0 ) { -error_setg_errno (errp, -r,"Unable to set TSC frequency to %ld kHz" , +error_setg_errno (errp, -r,"Unable to set TSC frequency to %" PRId64" kHz" , env->tsc_khz);return r; }@@ -1139,7 +1139,7 @@ int tdx_handle_report_fatal_error(X86CPU *cpu, struct kvm_run *run)uint64_t gpa =-1ull ;if (error_code &0xffff ) { -error_report ("TDX: REPORT_FATAL_ERROR: invalid error code: 0x%lx" , +error_report ("TDX: REPORT_FATAL_ERROR: invalid error code: 0x%" PRIx64, error_code);return -1 ; }
Quoted 4 lines · Xiaoyao Li
Quoted 1 line · Cédric Le Goater
Use PRI formats where required and fix pointer cast.
Maybe we can make 32-bit build exclusive with
CONFIG_TDX? since TDX is not supported on 32-bit host.
Yes please!
Quoted 6 lines
Quoted 6 lines
Cc Xiaoyao Li <[email protected]>Signed-off-by Cédric Le Goater <[email protected]>---
target/i386/kvm/tdx.c| 26 +++++++++++++-------------1 file changed, 13 insertions(+), 13 deletions(-)
Quoted 7 lines · Philippe Mathieu-Daudé
Quoted 4 lines · Xiaoyao Li
Quoted 1 line · Cédric Le Goater
Use PRI formats where required and fix pointer cast.
Maybe we can make 32-bit build exclusive with
CONFIG_TDX? since TDX is not supported on 32-bit host.Yes please!
No objections, but I'm still applying these first to fix the build.
Paolo
Quoted 10 lines · Paolo Bonzini
Quoted 7 lines · Philippe Mathieu-Daudé
Quoted 4 lines · Xiaoyao Li
Quoted 1 line · Cédric Le Goater
Use PRI formats where required and fix pointer cast.
Maybe we can make 32-bit build exclusive with
CONFIG_TDX? since TDX is not supported on 32-bit host.Yes please!
No objections, but I'm still applying these first to fix the build.
Can anyone guide how to implement it? Or directly help cook a patch?
I'm struggling to learn the 32-bit build stuff and create a 32-bit environment.
Quoted 2 lines
Paolo
Quoted 8 lines · Xiaoyao Li
Quoted 7 lines · Paolo Bonzini
Quoted 6 lines · Philippe Mathieu-Daudé
Quoted 4 lines · Xiaoyao Li
Quoted 1 line · Cédric Le Goater
Use PRI formats where required and fix pointer cast.
Maybe we can make 32-bit build exclusive with
CONFIG_TDX? since TDX is not supported on 32-bit host.
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
Yes please!
No objections, but I'm still applying these first to fix the build.
Can anyone guide how to implement it? Or directly help cook a patch?
I'm struggling to learn the 32-bit build stuff and create a 32-bit environment.
-- >8 --
hw/i386/Kconfig +1 -2
@@ -13,7 +13,7 @@ config SGX config TDX bool select X86_FW_OVMF - depends on KVM + depends on KVM && !I386 ---
Quoted 23 lines · Philippe Mathieu-Daudé
Quoted 8 lines · Xiaoyao Li
Quoted 7 lines · Paolo Bonzini
Quoted 6 lines · Philippe Mathieu-Daudé
Quoted 4 lines · Xiaoyao Li
Quoted 1 line · Cédric Le Goater
Use PRI formats where required and fix pointer cast.
Maybe we can make 32-bit build exclusive with
CONFIG_TDX? since TDX is not supported on 32-bit host.Quoted 7 lines
Quoted 3 lines
Quoted 1 line
Yes please!
No objections, but I'm still applying these first to fix the build.
Can anyone guide how to implement it? Or directly help cook a patch?
I'm struggling to learn the 32-bit build stuff and create a 32-bit environment.
-- >8 --
hw/i386/Kconfig +0
-0
hw/i386/Kconfig config SGX · line 18
Quoted 7 lines
hw/i386/Kconfig +1
-2@@ -13,7 +13,7 @@ config SGX config TDX bool select X86_FW_OVMF - depends on KVM + depends on KVM && !I386 ---
CONFIG_X86_64 selects I386 in target/i386/Kconfig, so above change will just leads to CONFIG_TDX always being 0.
config X86_64
bool
select I386Quoted 30 lines · Xiaoyao Li
Quoted 29 lines · Philippe Mathieu-Daudé
Quoted 8 lines · Xiaoyao Li
Quoted 7 lines · Paolo Bonzini
Quoted 6 lines · Philippe Mathieu-Daudé
Quoted 4 lines · Xiaoyao Li
Quoted 1 line · Cédric Le Goater
Use PRI formats where required and fix pointer cast.
Maybe we can make 32-bit build exclusive with
CONFIG_TDX? since TDX is not supported on 32-bit host.Quoted 7 lines
Quoted 3 lines
Quoted 1 line
Yes please!
No objections, but I'm still applying these first to fix the build.
Can anyone guide how to implement it? Or directly help cook a patch?
I'm struggling to learn the 32-bit build stuff and create a 32-bit environment.
-- >8 --
hw/i386/Kconfig +0
-0@@ -13,7 +13,7 @@ config SGXconfig TDX
bool
selectX86_FW_OVMF
- depends on KVM
+ depends on KVM && !I386
Quoted 7 lines
Quoted 1 line
---
CONFIG_X86_64selects I386 in target/i386/Kconfig, so above change will just leads toCONFIG_TDXalways being 0.config
X86_64
bool
select I386
Doh. We could expose TARGET_LONG_BITS to Kconfig (see commit bae3e3a5c6b, "meson: make target endianneess available to Kconfig"), but there is likely a clever way.
PATCH 2/2 i386/tdvf: Fix build on 32-bit host
In reply to Cédric Le GoaterUse PRI formats where required.
--- hw/i386/tdvf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
hw/i386/tdvf.c +3 -3
@@ -101,16 +101,16 @@ static int tdvf_parse_and_check_section_entry(const TdvfSectionEntry *src,/* sanity check */ if (entry->size < entry->data_len) { -error_report ("Broken metadata RawDataSize 0x%x MemoryDataSize 0x%lx" , +error_report ("Broken metadata RawDataSize 0x%x MemoryDataSize 0x%" PRIx64, entry->data_len, entry->size);return -1 ; }if (!QEMU_IS_ALIGNED (entry->address,TDVF_ALIGNMENT )) { -error_report ("MemoryAddress 0x%lx not page aligned" , entry->address); +error_report ("MemoryAddress 0x%" PRIx64" not page aligned" , entry->address);return -1 ; }if (!QEMU_IS_ALIGNED (entry->size,TDVF_ALIGNMENT )) { -error_report ("MemoryDataSize 0x%lx not page aligned" , entry->size); +error_report ("MemoryDataSize 0x%" PRIx64" not page aligned" , entry->size);return -1 ; }
Signature · 1 line
2.49.0
Paolo Bonzini
AppliedQueued, thanks.
Paolo