On Thu, Jan 23, 2020 at 10:04:27AM -0800, Ben Gardon wrote: ... > +#ifdef __x86_64__ > + vcpu_set_cpuid(vm, VCPU_ID, kvm_get_supported_cpuid()); > +#endif > +#ifdef __aarch64__ > + ucall_init(vm, NULL); > +#endif We don't need the #ifdef around ucall_init anymore, now that architectures that don't need it got stubs. I guess dirty_log_test.c could be cleaned up too. I'll send a patch. Thanks, drew