qemu: build using --enable-linux-user fails

[luigix25]

This is due to commit coconut-svsm/qemu@06c0498. It includes confidential-guest-support.h that is included only if CONFIG_USER_ONLY is undefined. Reverting that commit fixes the issue.

[stefano-garzarella]

The patch attached here should fix the issue, but maybe @kraxel wanted to enable it independently of CONFIG_SEV. Should we take confidential-guest.c out of CONFIG_SEV?

diff --git a/target/i386/meson.build b/target/i386/meson.build
index d13392498a..d2021b83b7 100644
--- a/target/i386/meson.build
+++ b/target/i386/meson.build
@@ -5,9 +5,8 @@ i386_ss.add(files(
   'helper.c',
   'xsave_helper.c',
   'cpu-dump.c',
-  'nocc.c',
 ))
-i386_ss.add(when: 'CONFIG_SEV', if_true: files('host-cpu.c', 'confidential-guest.c'))
+i386_ss.add(when: 'CONFIG_SEV', if_true: files('host-cpu.c', 'confidential-guest.c', 'nocc.c'))
 
 # x86 cpu type
 i386_ss.add(when: 'CONFIG_KVM', if_true: files('host-cpu.c'))

[kraxel]

The patch attached here should fix the issue, but maybe @kraxel wanted to enable it independently of CONFIG_SEV.

That was the idea, yes. Although enabling it for *-user targets doesn't make much sense. Make it depend on sysemu instead?

Should we take confidential-guest.c out of CONFIG_SEV?

Either that, or reorganize the code (for example move into the igvm backend) so native mode does not require confidential-guest.c in the first place. Having a "nocc" backend for "cc" is a bit awkward anyway, even though that was the easiest way to wire up things quickly to experiment with native mode IGVM files.

[stefano-garzarella]

The patch attached here should fix the issue, but maybe @kraxel wanted to enable it independently of CONFIG_SEV.

That was the idea, yes. Although enabling it for *-user targets doesn't make much sense. Make it depend on sysemu instead?

Yeah, honestly, I didn't get why confidential-guest.c is added to i386_ss instead of i386_system_ss.

Should we take confidential-guest.c out of CONFIG_SEV?

Either that, or reorganize the code (for example move into the igvm backend) so native mode does not require confidential-guest.c in the first place. Having a "nocc" backend for "cc" is a bit awkward anyway, even though that was the easiest way to wire up things quickly to experiment with native mode IGVM files.

Yeah, I saw it was WIP, so I agree that for the final solution we can reorganize it.
Should I send #665 (comment) in our fork as temp solution, or do you prefer to reorganize the code?

[kraxel]

Yeah, I saw it was WIP, so I agree that for the final solution we can reorganize it. Should I send #665 (comment) in our fork as temp solution, or do you prefer to reorganize the code?

I think moving it to CONFIG_SEV as temporary stopgap is fine.

[stefano-garzarella]

Yeah, I saw it was WIP, so I agree that for the final solution we can reorganize it. Should I send #665 (comment) in our fork as temp solution, or do you prefer to reorganize the code?

I think moving it to CONFIG_SEV as temporary stopgap is fine.

done here: coconut-svsm/qemu#20