Commit 2d384d7c8 broken the build when built with:
configure --without-default-devices --disable-user
The reason was the conversion of cpu->hyperv_synic to
cpu->hyperv_synic_kvm_only although the rest of the patch introduces a
feature checking mechanism. So I've fixed the KVM_EXIT_HYPERV_SYNIC in
hyperv-stub to do the same feature check as in the real hyperv.c
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Cc: Vitaly Kuznetsov <vkuznets@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Roman Kagan <rkagan@virtuozzo.com>
---
target/i386/hyperv-stub.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/target/i386/hyperv-stub.c b/target/i386/hyperv-stub.c
index fe548cbae2..0028527e79 100644
--- a/target/i386/hyperv-stub.c
+++ b/target/i386/hyperv-stub.c
@@ -15,7 +15,7 @@ int kvm_hv_handle_exit(X86CPU *cpu, struct kvm_hyperv_exit *exit)
{
switch (exit->type) {
case KVM_EXIT_HYPERV_SYNIC:
- if (!cpu->hyperv_synic) {
+ if (!hyperv_feat_enabled(cpu, HYPERV_FEAT_SYNIC)) {
return -1;
}
--
2.20.1
On 24/06/19 14:38, Alex Bennée wrote: > Commit 2d384d7c8 broken the build when built with: > > configure --without-default-devices --disable-user > > The reason was the conversion of cpu->hyperv_synic to > cpu->hyperv_synic_kvm_only although the rest of the patch introduces a > feature checking mechanism. So I've fixed the KVM_EXIT_HYPERV_SYNIC in > hyperv-stub to do the same feature check as in the real hyperv.c > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > Cc: Vitaly Kuznetsov <vkuznets@redhat.com> > Cc: Paolo Bonzini <pbonzini@redhat.com> > Cc: Roman Kagan <rkagan@virtuozzo.com> > --- > target/i386/hyperv-stub.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/target/i386/hyperv-stub.c b/target/i386/hyperv-stub.c > index fe548cbae2..0028527e79 100644 > --- a/target/i386/hyperv-stub.c > +++ b/target/i386/hyperv-stub.c > @@ -15,7 +15,7 @@ int kvm_hv_handle_exit(X86CPU *cpu, struct kvm_hyperv_exit *exit) > { > switch (exit->type) { > case KVM_EXIT_HYPERV_SYNIC: > - if (!cpu->hyperv_synic) { > + if (!hyperv_feat_enabled(cpu, HYPERV_FEAT_SYNIC)) { > return -1; > } > > Queued, thanks. Paolo
On 24/06/19 15:22, Paolo Bonzini wrote: > On 24/06/19 14:38, Alex Bennée wrote: >> Commit 2d384d7c8 broken the build when built with: >> >> configure --without-default-devices --disable-user >> >> The reason was the conversion of cpu->hyperv_synic to >> cpu->hyperv_synic_kvm_only although the rest of the patch introduces a >> feature checking mechanism. So I've fixed the KVM_EXIT_HYPERV_SYNIC in >> hyperv-stub to do the same feature check as in the real hyperv.c >> >> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> >> Cc: Vitaly Kuznetsov <vkuznets@redhat.com> >> Cc: Paolo Bonzini <pbonzini@redhat.com> >> Cc: Roman Kagan <rkagan@virtuozzo.com> >> --- >> target/i386/hyperv-stub.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/target/i386/hyperv-stub.c b/target/i386/hyperv-stub.c >> index fe548cbae2..0028527e79 100644 >> --- a/target/i386/hyperv-stub.c >> +++ b/target/i386/hyperv-stub.c >> @@ -15,7 +15,7 @@ int kvm_hv_handle_exit(X86CPU *cpu, struct kvm_hyperv_exit *exit) >> { >> switch (exit->type) { >> case KVM_EXIT_HYPERV_SYNIC: >> - if (!cpu->hyperv_synic) { >> + if (!hyperv_feat_enabled(cpu, HYPERV_FEAT_SYNIC)) { >> return -1; >> } >> >> > > Queued, thanks. Alex will queue it instead, so Acked-by: Paolo Bonzini <pbonzini@redhat.com> Paolo
On Mon, Jun 24, 2019 at 03:37:24PM +0200, Paolo Bonzini wrote: > On 24/06/19 15:22, Paolo Bonzini wrote: > > On 24/06/19 14:38, Alex Bennée wrote: > >> Commit 2d384d7c8 broken the build when built with: > >> > >> configure --without-default-devices --disable-user > >> > >> The reason was the conversion of cpu->hyperv_synic to > >> cpu->hyperv_synic_kvm_only although the rest of the patch introduces a > >> feature checking mechanism. So I've fixed the KVM_EXIT_HYPERV_SYNIC in > >> hyperv-stub to do the same feature check as in the real hyperv.c > >> > >> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > >> Cc: Vitaly Kuznetsov <vkuznets@redhat.com> > >> Cc: Paolo Bonzini <pbonzini@redhat.com> > >> Cc: Roman Kagan <rkagan@virtuozzo.com> > >> --- > >> target/i386/hyperv-stub.c | 2 +- > >> 1 file changed, 1 insertion(+), 1 deletion(-) > >> > >> diff --git a/target/i386/hyperv-stub.c b/target/i386/hyperv-stub.c > >> index fe548cbae2..0028527e79 100644 > >> --- a/target/i386/hyperv-stub.c > >> +++ b/target/i386/hyperv-stub.c > >> @@ -15,7 +15,7 @@ int kvm_hv_handle_exit(X86CPU *cpu, struct kvm_hyperv_exit *exit) > >> { > >> switch (exit->type) { > >> case KVM_EXIT_HYPERV_SYNIC: > >> - if (!cpu->hyperv_synic) { > >> + if (!hyperv_feat_enabled(cpu, HYPERV_FEAT_SYNIC)) { > >> return -1; > >> } > >> > >> > > > > Queued, thanks. > > Alex will queue it instead, so > > Acked-by: Paolo Bonzini <pbonzini@redhat.com> I was planning to send a machine + x86 pull request today, and I'll have to include to make sure builds won't fail. I don't think this should prevent the patch from being applied to other trees, though. -- Eduardo
On Mon, Jun 24, 2019 at 01:38:35PM +0100, Alex Bennée wrote: > Commit 2d384d7c8 broken the build when built with: > > configure --without-default-devices --disable-user > > The reason was the conversion of cpu->hyperv_synic to > cpu->hyperv_synic_kvm_only although the rest of the patch introduces a > feature checking mechanism. So I've fixed the KVM_EXIT_HYPERV_SYNIC in > hyperv-stub to do the same feature check as in the real hyperv.c > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > Cc: Vitaly Kuznetsov <vkuznets@redhat.com> > Cc: Paolo Bonzini <pbonzini@redhat.com> > Cc: Roman Kagan <rkagan@virtuozzo.com> > --- > target/i386/hyperv-stub.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Reviewed-by: Roman Kagan <rkagan@virtuozzo.com> > > diff --git a/target/i386/hyperv-stub.c b/target/i386/hyperv-stub.c > index fe548cbae2..0028527e79 100644 > --- a/target/i386/hyperv-stub.c > +++ b/target/i386/hyperv-stub.c > @@ -15,7 +15,7 @@ int kvm_hv_handle_exit(X86CPU *cpu, struct kvm_hyperv_exit *exit) > { > switch (exit->type) { > case KVM_EXIT_HYPERV_SYNIC: > - if (!cpu->hyperv_synic) { > + if (!hyperv_feat_enabled(cpu, HYPERV_FEAT_SYNIC)) { > return -1; > } > > -- > 2.20.1 >
> On 24 Jun 2019, at 14:38, Alex Bennée <alex.bennee@linaro.org> wrote: > > Commit 2d384d7c8 broken the build when built with: > > configure --without-default-devices --disable-user > > The reason was the conversion of cpu->hyperv_synic to > cpu->hyperv_synic_kvm_only although the rest of the patch introduces a > feature checking mechanism. So I've fixed the KVM_EXIT_HYPERV_SYNIC in > hyperv-stub to do the same feature check as in the real hyperv.c Sorry, I failed to check on the mailing list before sending an exact duplicate of this patch… > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > Cc: Vitaly Kuznetsov <vkuznets@redhat.com> > Cc: Paolo Bonzini <pbonzini@redhat.com> > Cc: Roman Kagan <rkagan@virtuozzo.com> > --- > target/i386/hyperv-stub.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/target/i386/hyperv-stub.c b/target/i386/hyperv-stub.c > index fe548cbae2..0028527e79 100644 > --- a/target/i386/hyperv-stub.c > +++ b/target/i386/hyperv-stub.c > @@ -15,7 +15,7 @@ int kvm_hv_handle_exit(X86CPU *cpu, struct kvm_hyperv_exit *exit) > { > switch (exit->type) { > case KVM_EXIT_HYPERV_SYNIC: > - if (!cpu->hyperv_synic) { > + if (!hyperv_feat_enabled(cpu, HYPERV_FEAT_SYNIC)) { > return -1; > } > > -- > 2.20.1 > >
Alex Bennée <alex.bennee@linaro.org> writes: > Commit 2d384d7c8 broken the build when built with: > > configure --without-default-devices --disable-user > > The reason was the conversion of cpu->hyperv_synic to > cpu->hyperv_synic_kvm_only although the rest of the patch introduces a > feature checking mechanism. So I've fixed the KVM_EXIT_HYPERV_SYNIC in > hyperv-stub to do the same feature check as in the real hyperv.c > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > Cc: Vitaly Kuznetsov <vkuznets@redhat.com> > Cc: Paolo Bonzini <pbonzini@redhat.com> > Cc: Roman Kagan <rkagan@virtuozzo.com> > --- > target/i386/hyperv-stub.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/target/i386/hyperv-stub.c b/target/i386/hyperv-stub.c > index fe548cbae2..0028527e79 100644 > --- a/target/i386/hyperv-stub.c > +++ b/target/i386/hyperv-stub.c > @@ -15,7 +15,7 @@ int kvm_hv_handle_exit(X86CPU *cpu, struct kvm_hyperv_exit *exit) > { > switch (exit->type) { > case KVM_EXIT_HYPERV_SYNIC: > - if (!cpu->hyperv_synic) { > + if (!hyperv_feat_enabled(cpu, HYPERV_FEAT_SYNIC)) { > return -1; > } As I just sent out exactly the same patch, this probably means the fix is uncontroversial :-) Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com> -- Vitaly
© 2016 - 2024 Red Hat, Inc.