[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 15/19] s390: Add s390-ccw-virtio machine.
From: |
Alexander Graf |
Subject: |
[Qemu-devel] [PATCH 15/19] s390: Add s390-ccw-virtio machine. |
Date: |
Tue, 29 Jan 2013 21:50:55 +0100 |
From: Cornelia Huck <address@hidden>
Add a new machine type, s390-ccw-virtio, making use of the
virtio-ccw transport to present virtio devices as channel
devices.
Signed-off-by: Cornelia Huck <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>
---
hw/s390x/Makefile.objs | 1 +
hw/s390x/s390-virtio-ccw.c | 134 ++++++++++++++++++++++++++++++++++++++++++++
hw/s390x/s390-virtio.h | 1 +
3 files changed, 136 insertions(+), 0 deletions(-)
create mode 100644 hw/s390x/s390-virtio-ccw.c
diff --git a/hw/s390x/Makefile.objs b/hw/s390x/Makefile.objs
index e4ee456..9f2f419 100644
--- a/hw/s390x/Makefile.objs
+++ b/hw/s390x/Makefile.objs
@@ -5,4 +5,5 @@ obj-y += event-facility.o
obj-y += sclpquiesce.o sclpconsole.o
obj-y += ipl.o
obj-y += css.o
+obj-y += s390-virtio-ccw.o
obj-y += virtio-ccw.o
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
new file mode 100644
index 0000000..6549211
--- /dev/null
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -0,0 +1,134 @@
+/*
+ * virtio ccw machine
+ *
+ * Copyright 2012 IBM Corp.
+ * Author(s): Cornelia Huck <address@hidden>
+ *
+ * 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.
+ */
+
+#include "hw/boards.h"
+#include "exec/address-spaces.h"
+#include "s390-virtio.h"
+#include "sclp.h"
+#include "ioinst.h"
+#include "css.h"
+#include "virtio-ccw.h"
+
+static int virtio_ccw_hcall_notify(const uint64_t *args)
+{
+ uint64_t subch_id = args[0];
+ uint64_t queue = args[1];
+ SubchDev *sch;
+ int cssid, ssid, schid, m;
+
+ if (ioinst_disassemble_sch_ident(subch_id, &m, &cssid, &ssid, &schid)) {
+ return -EINVAL;
+ }
+ sch = css_find_subch(m, cssid, ssid, schid);
+ if (!sch || !css_subch_visible(sch)) {
+ return -EINVAL;
+ }
+ virtio_queue_notify(virtio_ccw_get_vdev(sch), queue);
+ return 0;
+
+}
+
+static int virtio_ccw_hcall_early_printk(const uint64_t *args)
+{
+ uint64_t mem = args[0];
+
+ if (mem < ram_size) {
+ /* Early printk */
+ return 0;
+ }
+ return -EINVAL;
+}
+
+static void virtio_ccw_register_hcalls(void)
+{
+ s390_register_virtio_hypercall(KVM_S390_VIRTIO_CCW_NOTIFY,
+ virtio_ccw_hcall_notify);
+ /* Tolerate early printk. */
+ s390_register_virtio_hypercall(KVM_S390_VIRTIO_NOTIFY,
+ virtio_ccw_hcall_early_printk);
+}
+
+static void ccw_init(QEMUMachineInitArgs *args)
+{
+ ram_addr_t my_ram_size = args->ram_size;
+ MemoryRegion *sysmem = get_system_memory();
+ MemoryRegion *ram = g_new(MemoryRegion, 1);
+ int shift = 0;
+ uint8_t *storage_keys;
+ int ret;
+ VirtualCssBus *css_bus;
+
+ /* s390x ram size detection needs a 16bit multiplier + an increment. So
+ guests > 64GB can be specified in 2MB steps etc. */
+ while ((my_ram_size >> (20 + shift)) > 65535) {
+ shift++;
+ }
+ my_ram_size = my_ram_size >> (20 + shift) << (20 + shift);
+
+ /* lets propagate the changed ram size into the global variable. */
+ ram_size = my_ram_size;
+
+ /* get a BUS */
+ css_bus = virtual_css_bus_init();
+ s390_sclp_init();
+ s390_init_ipl_dev(args->kernel_filename, args->kernel_cmdline,
+ args->initrd_filename);
+
+ /* register hypercalls */
+ virtio_ccw_register_hcalls();
+
+ /* allocate RAM */
+ memory_region_init_ram(ram, "s390.ram", my_ram_size);
+ vmstate_register_ram_global(ram);
+ memory_region_add_subregion(sysmem, 0, ram);
+
+ /* allocate storage keys */
+ storage_keys = g_malloc0(my_ram_size / TARGET_PAGE_SIZE);
+
+ /* init CPUs */
+ s390_init_cpus(args->cpu_model, storage_keys);
+
+ if (kvm_enabled()) {
+ kvm_s390_enable_css_support(s390_cpu_addr2state(0));
+ }
+ /*
+ * Create virtual css and set it as default so that non mcss-e
+ * enabled guests only see virtio devices.
+ */
+ ret = css_create_css_image(VIRTUAL_CSSID, true);
+ assert(ret == 0);
+
+ /* Create VirtIO network adapters */
+ s390_create_virtio_net(BUS(css_bus), "virtio-net-ccw");
+}
+
+static QEMUMachine ccw_machine = {
+ .name = "s390-ccw-virtio",
+ .alias = "s390-ccw",
+ .desc = "VirtIO-ccw based S390 machine",
+ .init = ccw_init,
+ .block_default_type = IF_VIRTIO,
+ .no_cdrom = 1,
+ .no_floppy = 1,
+ .no_serial = 1,
+ .no_parallel = 1,
+ .no_sdcard = 1,
+ .use_sclp = 1,
+ .max_cpus = 255,
+ DEFAULT_MACHINE_OPTIONS,
+};
+
+static void ccw_machine_init(void)
+{
+ qemu_register_machine(&ccw_machine);
+}
+
+machine_init(ccw_machine_init)
diff --git a/hw/s390x/s390-virtio.h b/hw/s390x/s390-virtio.h
index 67bfd20..a6c4c19 100644
--- a/hw/s390x/s390-virtio.h
+++ b/hw/s390x/s390-virtio.h
@@ -15,6 +15,7 @@
#define KVM_S390_VIRTIO_NOTIFY 0
#define KVM_S390_VIRTIO_RESET 1
#define KVM_S390_VIRTIO_SET_STATUS 2
+#define KVM_S390_VIRTIO_CCW_NOTIFY 3
typedef int (*s390_virtio_fn)(const uint64_t *args);
void s390_register_virtio_hypercall(uint64_t code, s390_virtio_fn fn);
--
1.6.0.2
- [Qemu-devel] [PULL 00/19] s390 patch queue 2013-01-29, Alexander Graf, 2013/01/29
- [Qemu-devel] [PATCH 02/19] s390: Lowcore mapping helper., Alexander Graf, 2013/01/29
- [Qemu-devel] [PATCH 04/19] s390: Channel I/O basic definitions., Alexander Graf, 2013/01/29
- [Qemu-devel] [PATCH 03/19] s390: Add mapping helper functions., Alexander Graf, 2013/01/29
- [Qemu-devel] [PATCH 05/19] s390: I/O interrupt and machine check injection., Alexander Graf, 2013/01/29
- [Qemu-devel] [PATCH 11/19] s390: Make typeinfo const, Alexander Graf, 2013/01/29
- [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 <=
- [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, 2013/01/29
- [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