hw/i386/kvm/ioapic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Fix a typo in an error message for KVM_SET_IRQCHIP ioctl:
"KVM_GET_IRQCHIP" should be "KVM_SET_IRQCHIP".
Signed-off-by: Kenta Ishiguro <kentaishiguro@slowstart.org>
---
hw/i386/kvm/ioapic.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/i386/kvm/ioapic.c b/hw/i386/kvm/ioapic.c
index 4ba8e47251..c5528df942 100644
--- a/hw/i386/kvm/ioapic.c
+++ b/hw/i386/kvm/ioapic.c
@@ -97,7 +97,7 @@ static void kvm_ioapic_put(IOAPICCommonState *s)
ret = kvm_vm_ioctl(kvm_state, KVM_SET_IRQCHIP, &chip);
if (ret < 0) {
- fprintf(stderr, "KVM_GET_IRQCHIP failed: %s\n", strerror(ret));
+ fprintf(stderr, "KVM_SET_IRQCHIP failed: %s\n", strerror(ret));
abort();
}
}
--
2.17.1
On 7/17/20 2:35 PM, Kenta Ishiguro wrote: > Fix a typo in an error message for KVM_SET_IRQCHIP ioctl: > "KVM_GET_IRQCHIP" should be "KVM_SET_IRQCHIP". > > Signed-off-by: Kenta Ishiguro <kentaishiguro@slowstart.org> > --- > hw/i386/kvm/ioapic.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/i386/kvm/ioapic.c b/hw/i386/kvm/ioapic.c > index 4ba8e47251..c5528df942 100644 > --- a/hw/i386/kvm/ioapic.c > +++ b/hw/i386/kvm/ioapic.c > @@ -97,7 +97,7 @@ static void kvm_ioapic_put(IOAPICCommonState *s) > > ret = kvm_vm_ioctl(kvm_state, KVM_SET_IRQCHIP, &chip); > if (ret < 0) { > - fprintf(stderr, "KVM_GET_IRQCHIP failed: %s\n", strerror(ret)); > + fprintf(stderr, "KVM_SET_IRQCHIP failed: %s\n", strerror(ret)); > abort(); 9 years later this abort seems violent. Kenta, did it fired for you? > } > } > Fixes: a39c1d47ac ("kvm: x86: Add user space part for in-kernel IOAPIC") Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
No, it didn't. I just checked the usage of this API and I found this inconsistent error message. On Mon, Jul 20, 2020 at 6:31 PM Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > On 7/17/20 2:35 PM, Kenta Ishiguro wrote: > > Fix a typo in an error message for KVM_SET_IRQCHIP ioctl: > > "KVM_GET_IRQCHIP" should be "KVM_SET_IRQCHIP". > > > > Signed-off-by: Kenta Ishiguro <kentaishiguro@slowstart.org> > > --- > > hw/i386/kvm/ioapic.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/hw/i386/kvm/ioapic.c b/hw/i386/kvm/ioapic.c > > index 4ba8e47251..c5528df942 100644 > > --- a/hw/i386/kvm/ioapic.c > > +++ b/hw/i386/kvm/ioapic.c > > @@ -97,7 +97,7 @@ static void kvm_ioapic_put(IOAPICCommonState *s) > > > > ret = kvm_vm_ioctl(kvm_state, KVM_SET_IRQCHIP, &chip); > > if (ret < 0) { > > - fprintf(stderr, "KVM_GET_IRQCHIP failed: %s\n", strerror(ret)); > > + fprintf(stderr, "KVM_SET_IRQCHIP failed: %s\n", strerror(ret)); > > abort(); > > 9 years later this abort seems violent. Kenta, did it fired for you? > > > } > > } > > > > Fixes: a39c1d47ac ("kvm: x86: Add user space part for in-kernel IOAPIC") > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > >
Kenta Ishiguro <kentaishiguro@slowstart.org> 于2020年7月20日周一 上午11:14写道: > > Fix a typo in an error message for KVM_SET_IRQCHIP ioctl: > "KVM_GET_IRQCHIP" should be "KVM_SET_IRQCHIP". > > Signed-off-by: Kenta Ishiguro <kentaishiguro@slowstart.org> Reviewed-by: Li Qiang <liq3ea@gmail.com> > --- > hw/i386/kvm/ioapic.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/i386/kvm/ioapic.c b/hw/i386/kvm/ioapic.c > index 4ba8e47251..c5528df942 100644 > --- a/hw/i386/kvm/ioapic.c > +++ b/hw/i386/kvm/ioapic.c > @@ -97,7 +97,7 @@ static void kvm_ioapic_put(IOAPICCommonState *s) > > ret = kvm_vm_ioctl(kvm_state, KVM_SET_IRQCHIP, &chip); > if (ret < 0) { > - fprintf(stderr, "KVM_GET_IRQCHIP failed: %s\n", strerror(ret)); > + fprintf(stderr, "KVM_SET_IRQCHIP failed: %s\n", strerror(ret)); > abort(); > } > } > -- > 2.17.1 > >
Le 17/07/2020 à 14:35, Kenta Ishiguro a écrit : > Fix a typo in an error message for KVM_SET_IRQCHIP ioctl: > "KVM_GET_IRQCHIP" should be "KVM_SET_IRQCHIP". > > Signed-off-by: Kenta Ishiguro <kentaishiguro@slowstart.org> > --- > hw/i386/kvm/ioapic.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/i386/kvm/ioapic.c b/hw/i386/kvm/ioapic.c > index 4ba8e47251..c5528df942 100644 > --- a/hw/i386/kvm/ioapic.c > +++ b/hw/i386/kvm/ioapic.c > @@ -97,7 +97,7 @@ static void kvm_ioapic_put(IOAPICCommonState *s) > > ret = kvm_vm_ioctl(kvm_state, KVM_SET_IRQCHIP, &chip); > if (ret < 0) { > - fprintf(stderr, "KVM_GET_IRQCHIP failed: %s\n", strerror(ret)); > + fprintf(stderr, "KVM_SET_IRQCHIP failed: %s\n", strerror(ret)); > abort(); > } > } > Applied to my trivial-patches branch. Thanks, Laurent
+Cc qemu-trivial@nongnu.org On Fri, Jul 17, 2020 at 09:35:14PM +0900, Kenta Ishiguro wrote: > Fix a typo in an error message for KVM_SET_IRQCHIP ioctl: > "KVM_GET_IRQCHIP" should be "KVM_SET_IRQCHIP". > > Signed-off-by: Kenta Ishiguro <kentaishiguro@slowstart.org> > --- > hw/i386/kvm/ioapic.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/i386/kvm/ioapic.c b/hw/i386/kvm/ioapic.c > index 4ba8e47251..c5528df942 100644 > --- a/hw/i386/kvm/ioapic.c > +++ b/hw/i386/kvm/ioapic.c > @@ -97,7 +97,7 @@ static void kvm_ioapic_put(IOAPICCommonState *s) > > ret = kvm_vm_ioctl(kvm_state, KVM_SET_IRQCHIP, &chip); > if (ret < 0) { > - fprintf(stderr, "KVM_GET_IRQCHIP failed: %s\n", strerror(ret)); > + fprintf(stderr, "KVM_SET_IRQCHIP failed: %s\n", strerror(ret)); > abort(); > } > } > -- > 2.17.1 > > Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
© 2016 - 2024 Red Hat, Inc.