[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/11] i386/kvm: The value passed to strerror should be positive
From: |
Laurent Vivier |
Subject: |
[PULL 02/11] i386/kvm: The value passed to strerror should be positive |
Date: |
Mon, 7 Jun 2021 20:57:21 +0200 |
From: Dmitry Voronetskiy <vda1999@yandex.ru>
Signed-off-by: Dmitry Voronetskiy <vda1999@yandex.ru>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20210519113528.12474-1-davoronetskiy@gmail.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/i386/kvm/apic.c | 2 +-
hw/i386/kvm/clock.c | 4 ++--
hw/i386/kvm/i8254.c | 10 +++++-----
hw/i386/kvm/i8259.c | 4 ++--
hw/i386/kvm/ioapic.c | 4 ++--
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/hw/i386/kvm/apic.c b/hw/i386/kvm/apic.c
index 52ff49091000..1e89ca0899c2 100644
--- a/hw/i386/kvm/apic.c
+++ b/hw/i386/kvm/apic.c
@@ -145,7 +145,7 @@ static void kvm_apic_put(CPUState *cs, run_on_cpu_data data)
ret = kvm_vcpu_ioctl(CPU(s->cpu), KVM_SET_LAPIC, &kapic);
if (ret < 0) {
- fprintf(stderr, "KVM_SET_LAPIC failed: %s\n", strerror(ret));
+ fprintf(stderr, "KVM_SET_LAPIC failed: %s\n", strerror(-ret));
abort();
}
}
diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c
index efbc1e0d12c2..df70b4a0338a 100644
--- a/hw/i386/kvm/clock.c
+++ b/hw/i386/kvm/clock.c
@@ -105,7 +105,7 @@ static void kvm_update_clock(KVMClockState *s)
ret = kvm_vm_ioctl(kvm_state, KVM_GET_CLOCK, &data);
if (ret < 0) {
- fprintf(stderr, "KVM_GET_CLOCK failed: %s\n", strerror(ret));
+ fprintf(stderr, "KVM_GET_CLOCK failed: %s\n", strerror(-ret));
abort();
}
s->clock = data.clock;
@@ -189,7 +189,7 @@ static void kvmclock_vm_state_change(void *opaque, bool
running,
data.clock = s->clock;
ret = kvm_vm_ioctl(kvm_state, KVM_SET_CLOCK, &data);
if (ret < 0) {
- fprintf(stderr, "KVM_SET_CLOCK failed: %s\n", strerror(ret));
+ fprintf(stderr, "KVM_SET_CLOCK failed: %s\n", strerror(-ret));
abort();
}
diff --git a/hw/i386/kvm/i8254.c b/hw/i386/kvm/i8254.c
index c558893961ba..fa68669e8a59 100644
--- a/hw/i386/kvm/i8254.c
+++ b/hw/i386/kvm/i8254.c
@@ -104,7 +104,7 @@ static void kvm_pit_get(PITCommonState *pit)
if (kvm_has_pit_state2()) {
ret = kvm_vm_ioctl(kvm_state, KVM_GET_PIT2, &kpit);
if (ret < 0) {
- fprintf(stderr, "KVM_GET_PIT2 failed: %s\n", strerror(ret));
+ fprintf(stderr, "KVM_GET_PIT2 failed: %s\n", strerror(-ret));
abort();
}
pit->channels[0].irq_disabled = kpit.flags & KVM_PIT_FLAGS_HPET_LEGACY;
@@ -115,7 +115,7 @@ static void kvm_pit_get(PITCommonState *pit)
*/
ret = kvm_vm_ioctl(kvm_state, KVM_GET_PIT, &kpit);
if (ret < 0) {
- fprintf(stderr, "KVM_GET_PIT failed: %s\n", strerror(ret));
+ fprintf(stderr, "KVM_GET_PIT failed: %s\n", strerror(-ret));
abort();
}
}
@@ -180,7 +180,7 @@ static void kvm_pit_put(PITCommonState *pit)
if (ret < 0) {
fprintf(stderr, "%s failed: %s\n",
kvm_has_pit_state2() ? "KVM_SET_PIT2" : "KVM_SET_PIT",
- strerror(ret));
+ strerror(-ret));
abort();
}
}
@@ -272,7 +272,7 @@ static void kvm_pit_realizefn(DeviceState *dev, Error
**errp)
}
if (ret < 0) {
error_setg(errp, "Create kernel PIC irqchip failed: %s",
- strerror(ret));
+ strerror(-ret));
return;
}
switch (s->lost_tick_policy) {
@@ -286,7 +286,7 @@ static void kvm_pit_realizefn(DeviceState *dev, Error
**errp)
if (ret < 0) {
error_setg(errp,
"Can't disable in-kernel PIT reinjection: %s",
- strerror(ret));
+ strerror(-ret));
return;
}
}
diff --git a/hw/i386/kvm/i8259.c b/hw/i386/kvm/i8259.c
index 3f8bf69e9ca4..d61bae4dc359 100644
--- a/hw/i386/kvm/i8259.c
+++ b/hw/i386/kvm/i8259.c
@@ -43,7 +43,7 @@ static void kvm_pic_get(PICCommonState *s)
chip.chip_id = s->master ? KVM_IRQCHIP_PIC_MASTER : KVM_IRQCHIP_PIC_SLAVE;
ret = kvm_vm_ioctl(kvm_state, KVM_GET_IRQCHIP, &chip);
if (ret < 0) {
- fprintf(stderr, "KVM_GET_IRQCHIP failed: %s\n", strerror(ret));
+ fprintf(stderr, "KVM_GET_IRQCHIP failed: %s\n", strerror(-ret));
abort();
}
@@ -96,7 +96,7 @@ static void kvm_pic_put(PICCommonState *s)
ret = kvm_vm_ioctl(kvm_state, KVM_SET_IRQCHIP, &chip);
if (ret < 0) {
- fprintf(stderr, "KVM_SET_IRQCHIP failed: %s\n", strerror(ret));
+ fprintf(stderr, "KVM_SET_IRQCHIP failed: %s\n", strerror(-ret));
abort();
}
}
diff --git a/hw/i386/kvm/ioapic.c b/hw/i386/kvm/ioapic.c
index 71a563181e03..ee7c8ef68bea 100644
--- a/hw/i386/kvm/ioapic.c
+++ b/hw/i386/kvm/ioapic.c
@@ -62,7 +62,7 @@ static void kvm_ioapic_get(IOAPICCommonState *s)
chip.chip_id = KVM_IRQCHIP_IOAPIC;
ret = kvm_vm_ioctl(kvm_state, KVM_GET_IRQCHIP, &chip);
if (ret < 0) {
- fprintf(stderr, "KVM_GET_IRQCHIP failed: %s\n", strerror(ret));
+ fprintf(stderr, "KVM_GET_IRQCHIP failed: %s\n", strerror(-ret));
abort();
}
@@ -95,7 +95,7 @@ static void kvm_ioapic_put(IOAPICCommonState *s)
ret = kvm_vm_ioctl(kvm_state, KVM_SET_IRQCHIP, &chip);
if (ret < 0) {
- fprintf(stderr, "KVM_SET_IRQCHIP failed: %s\n", strerror(ret));
+ fprintf(stderr, "KVM_SET_IRQCHIP failed: %s\n", strerror(-ret));
abort();
}
}
--
2.31.1
- [PULL 00/11] Trivial branch for 6.1 patches, Laurent Vivier, 2021/06/07
- [PULL 02/11] i386/kvm: The value passed to strerror should be positive,
Laurent Vivier <=
- [PULL 05/11] docs: fix broken reference, Laurent Vivier, 2021/06/07
- [PULL 06/11] target/nios2: fix page-fit instruction count, Laurent Vivier, 2021/06/07
- [PULL 11/11] vhost-vdpa: Remove redundant declaration of address_space_memory, Laurent Vivier, 2021/06/07
- [PULL 04/11] linux-user/syscall: Constify bitmask_transtbl fcntl/mmap flags_tlb[], Laurent Vivier, 2021/06/07
- [PULL 07/11] hw/display/macfb: Classify the "nubus-macfb" as display device, Laurent Vivier, 2021/06/07
- [PULL 03/11] misc: Correct relative include path, Laurent Vivier, 2021/06/07
- [PULL 09/11] target/mips: Fix 'Uncoditional' typo, Laurent Vivier, 2021/06/07
- [PULL 01/11] target/riscv: Do not include 'pmp.h' in user emulation, Laurent Vivier, 2021/06/07
- [PULL 10/11] scripts/oss-fuzz: Fix typo in documentation, Laurent Vivier, 2021/06/07
- [PULL 08/11] target/hppa: Remove unused 'memory.h' header, Laurent Vivier, 2021/06/07