Allow virtio machines to register for different diag500 function
codes and convert s390-virtio to use it.
Signed-off-by: Cornelia Huck
---
hw/s390-virtio.c | 90 +++-
hw/s390-virtio.h | 22 +++
hw/s390x/Makefile.objs | 1 +
hw/s390x/s390-virtio-hcall.c | 36 ++
target-s390x/cpu.h | 2 +-
target-s390x/kvm.c | 2 +-
target-s390x/misc_helper.c | 2 +-
7 files changed, 110 insertions(+), 45 deletions(-)
create mode 100644 hw/s390-virtio.h
create mode 100644 hw/s390x/s390-virtio-hcall.c
diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c
index 0e93cc3..bded30b 100644
--- a/hw/s390-virtio.c
+++ b/hw/s390-virtio.c
@@ -33,6 +33,7 @@
#include "hw/s390-virtio-bus.h"
#include "hw/s390x/sclp.h"
+#include "hw/s390-virtio.h"
//#define DEBUG_S390
@@ -44,10 +45,6 @@
do { } while (0)
#endif
-#define KVM_S390_VIRTIO_NOTIFY 0
-#define KVM_S390_VIRTIO_RESET 1
-#define KVM_S390_VIRTIO_SET_STATUS 2
-
#define KERN_IMAGE_START0x01UL
#define KERN_PARM_AREA 0x010480UL
#define INITRD_START0x80UL
@@ -73,56 +70,63 @@ S390CPU *s390_cpu_addr2state(uint16_t cpu_addr)
return ipi_states[cpu_addr];
}
-int s390_virtio_hypercall(CPUS390XState *env, uint64_t mem, uint64_t hypercall)
+static int s390_virtio_hcall_notify(const uint64_t *args)
{
+uint64_t mem = args[0];
int r = 0, i;
-dprintf("KVM hypercall: %ld\n", hypercall);
-switch (hypercall) {
-case KVM_S390_VIRTIO_NOTIFY:
-if (mem > ram_size) {
-VirtIOS390Device *dev = s390_virtio_bus_find_vring(s390_bus,
- mem, &i);
-if (dev) {
-virtio_queue_notify(dev->vdev, i);
-} else {
-r = -EINVAL;
-}
-} else {
-/* Early printk */
-}
-break;
-case KVM_S390_VIRTIO_RESET:
-{
-VirtIOS390Device *dev;
-
-dev = s390_virtio_bus_find_mem(s390_bus, mem);
-virtio_reset(dev->vdev);
-stb_phys(dev->dev_offs + VIRTIO_DEV_OFFS_STATUS, 0);
-s390_virtio_device_sync(dev);
-s390_virtio_reset_idx(dev);
-break;
-}
-case KVM_S390_VIRTIO_SET_STATUS:
-{
-VirtIOS390Device *dev;
-
-dev = s390_virtio_bus_find_mem(s390_bus, mem);
+if (mem > ram_size) {
+VirtIOS390Device *dev = s390_virtio_bus_find_vring(s390_bus, mem, &i);
if (dev) {
-s390_virtio_device_update_status(dev);
+virtio_queue_notify(dev->vdev, i);
} else {
r = -EINVAL;
}
-break;
+} else {
+/* Early printk */
}
-default:
+return r;
+}
+
+static int s390_virtio_hcall_reset(const uint64_t *args)
+{
+uint64_t mem = args[0];
+VirtIOS390Device *dev;
+
+dev = s390_virtio_bus_find_mem(s390_bus, mem);
+virtio_reset(dev->vdev);
+stb_phys(dev->dev_offs + VIRTIO_DEV_OFFS_STATUS, 0);
+s390_virtio_device_sync(dev);
+s390_virtio_reset_idx(dev);
+
+return 0;
+}
+
+static int s390_virtio_hcall_set_status(const uint64_t *args)
+{
+uint64_t mem = args[0];
+int r = 0;
+VirtIOS390Device *dev;
+
+dev = s390_virtio_bus_find_mem(s390_bus, mem);
+if (dev) {
+s390_virtio_device_update_status(dev);
+} else {
r = -EINVAL;
-break;
}
-
return r;
}
+static void s390_virtio_register_hcalls(void)
+{
+s390_register_virtio_hypercall(KVM_S390_VIRTIO_NOTIFY,
+ s390_virtio_hcall_notify);
+s390_register_virtio_hypercall(KVM_S390_VIRTIO_RESET,
+ s390_virtio_hcall_reset);
+s390_register_virtio_hypercall(KVM_S390_VIRTIO_SET_STATUS,
+ s390_virtio_hcall_set_status);
+}
+
/*
* The number of running CPUs. On s390 a shutdown is the state of all CPUs
* being either stopped or disabled (for interrupts) waiting. We have to
@@ -186,6 +190,9 @@ static void s390_init(QEMUMachineInitArgs *args)
s390_bus = s390_virtio_bus_init(&my_ram_size);
s390_sclp_init();
+/* register hypercalls */
+s390_virtio_register_hcalls();
+
/* allocate RAM */
memory_region_init_ram(ram, "s390.ram", my_ram_size);
vmstate_register_ram_global(ram);
@@ -339,4 +346,3 @@ static void s390_machine_init(void)
}
machine_init(s390_machine_init);
-
diff --git a/hw/s390-virtio.h b/hw/s390-virtio.h
new file mode 100644
index 000..25bb610
--- /dev/null
+++ b/hw/s390-virtio.h
@@ -0,0 +1,22 @@
+/*
+ * Virtio interfaces for s390
+ *
+ * Copyright 2012 IBM Corp.
+ * Author(s): Cornelia Huck
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or (at
+ * your option) any later version. See the COPYING file in the top-level
+ * directory.
+ */
+
+#ifndef HW_
