[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 18/19] s390: css error codes.
From: |
Alexander Graf |
Subject: |
[Qemu-devel] [PATCH 18/19] s390: css error codes. |
Date: |
Tue, 29 Jan 2013 21:50:58 +0100 |
From: Cornelia Huck <address@hidden>
Changed error codes in the channel subsystem / virtio-ccw code
(-EOPNOTSUPP -> -ENOSYS, -ERESTART -> -EINPROGRESS).
This should hopefully fix building on mingw32.
Signed-off-by: Cornelia Huck <address@hidden>
Reviewed-by: Stefan Weil <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>
---
hw/s390x/css.c | 8 ++++----
hw/s390x/virtio-ccw.c | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/s390x/css.c b/hw/s390x/css.c
index 84efd4a..3244201 100644
--- a/hw/s390x/css.c
+++ b/hw/s390x/css.c
@@ -223,7 +223,7 @@ static int css_interpret_ccw(SubchDev *sch, hwaddr ccw_addr)
}
if (ccw.flags & CCW_FLAG_SUSPEND) {
- return -ERESTART;
+ return -EINPROGRESS;
}
check_len = !((ccw.flags & CCW_FLAG_SLI) && !(ccw.flags & CCW_FLAG_DC));
@@ -291,7 +291,7 @@ static int css_interpret_ccw(SubchDev *sch, hwaddr ccw_addr)
/* Handle device specific commands. */
ret = sch->ccw_cb(sch, ccw);
} else {
- ret = -EOPNOTSUPP;
+ ret = -ENOSYS;
}
break;
}
@@ -347,7 +347,7 @@ static void sch_handle_start_func(SubchDev *sch)
SCSW_STCTL_STATUS_PEND;
s->dstat = SCSW_DSTAT_CHANNEL_END | SCSW_DSTAT_DEVICE_END;
break;
- case -EOPNOTSUPP:
+ case -ENOSYS:
/* unsupported command, generate unit check (command reject) */
s->ctrl &= ~SCSW_ACTL_START_PEND;
s->dstat = SCSW_DSTAT_UNIT_CHECK;
@@ -372,7 +372,7 @@ static void sch_handle_start_func(SubchDev *sch)
s->ctrl &= ~SCSW_CTRL_MASK_STCTL;
s->ctrl |= SCSW_STCTL_ALERT | SCSW_STCTL_STATUS_PEND;
break;
- case -ERESTART:
+ case -EINPROGRESS:
/* channel program has been suspended */
s->ctrl &= ~SCSW_ACTL_START_PEND;
s->ctrl |= SCSW_ACTL_SUSP;
diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index 8c9b745..7d7f336 100644
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -384,7 +384,7 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw)
}
break;
default:
- ret = -EOPNOTSUPP;
+ ret = -ENOSYS;
break;
}
return ret;
--
1.6.0.2
- [Qemu-devel] [PATCH 12/19] virtio-s390: add a reset function to virtio-s390 devices, (continued)
- [Qemu-devel] [PATCH 12/19] virtio-s390: add a reset function to virtio-s390 devices, Alexander Graf, 2013/01/29
- [Qemu-devel] [PATCH 01/19] s390: Add default support for SCLP console, Alexander Graf, 2013/01/29
- [Qemu-devel] [PATCH 15/19] s390: Add s390-ccw-virtio machine., Alexander Graf, 2013/01/29
- [Qemu-devel] [PATCH 09/19] s390-virtio: Factor out some initialization code., Alexander Graf, 2013/01/29
- [Qemu-devel] [PATCH 08/19] s390: Wire up channel I/O in kvm., Alexander Graf, 2013/01/29
- [Qemu-devel] [PATCH 13/19] s390: Move hw files to hw/s390x, Alexander Graf, 2013/01/29
- [Qemu-devel] [PATCH 19/19] s390: Drop set_bit usage in virtio_ccw., Alexander Graf, 2013/01/29
- [Qemu-devel] [PATCH 14/19] s390-virtio: Check for NULL device in reset hypercall, Alexander Graf, 2013/01/29
- [Qemu-devel] [PATCH 16/19] sclpconsole: Don't instantiate sclpconsole with -nodefaults, Alexander Graf, 2013/01/29
- [Qemu-devel] [PATCH 06/19] s390: Add channel I/O instructions., Alexander Graf, 2013/01/29
- [Qemu-devel] [PATCH 18/19] s390: css error codes.,
Alexander Graf <=
- [Qemu-devel] [PATCH 17/19] s390: Use s390_cpu_physical_memory_map for tpi., Alexander Graf, 2013/01/29
- [Qemu-devel] [PATCH 10/19] s390: Add new channel I/O based virtio transport., Alexander Graf, 2013/01/29
- [Qemu-devel] [PATCH 07/19] s390: Virtual channel subsystem support., Alexander Graf, 2013/01/29