[{"id":1760764,"web_url":"http://patchwork.ozlabs.org/comment/1760764/","msgid":"<782fdf4f-084e-9fcb-f788-d2f0c7f5340c@redhat.com>","list_archive_url":null,"date":"2017-08-31T09:13:40","subject":"Re: [Qemu-devel] [PATCH v1 04/11] s390x: get rid of s390-virtio.c","submitter":{"id":66152,"url":"http://patchwork.ozlabs.org/api/people/66152/","name":"Thomas Huth","email":"thuth@redhat.com"},"content":"On 30.08.2017 19:05, David Hildenbrand wrote:\n> It is a leftover from the days where we had still the !ccw virtio\n> machine. As this one is long gone, let's move everything to\n> s390-virtio-ccw.c.\n> \n> Cornelia Huck <cohuck@redhat.com>\n> Signed-off-by: David Hildenbrand <david@redhat.com>\n> ---\n[...]\n> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c\n> index ffd56af834..41a9e976dc 100644\n> --- a/hw/s390x/s390-virtio-ccw.c\n> +++ b/hw/s390x/s390-virtio-ccw.c\n[...]\n> +static int gtod_load(QEMUFile *f, void *opaque, int version_id)\n> +{\n> +    uint64_t tod_low;\n> +    uint8_t tod_high;\n> +    int r;\n> +\n> +    if (qemu_get_byte(f) == S390_TOD_CLOCK_VALUE_MISSING) {\n> +        fprintf(stderr, \"WARNING: Guest clock was not migrated. This could \"\n> +                        \"cause the guest to hang.\\n\");\n> +        return 0;\n> +    }\n> +\n> +    tod_high = qemu_get_byte(f);\n> +    tod_low = qemu_get_be64(f);\n> +\n> +    r = s390_set_clock(&tod_high, &tod_low);\n> +    if (r) {\n> +        fprintf(stderr, \"WARNING: Unable to set guest clock value. \"\n> +                        \"s390_get_clock returned error %d. This could cause \"\n> +                        \"the guest to hang.\\n\", r);\n> +    }\n> +\n> +    return 0;\n> +}\n> +\n> +\n\nNit: One empty line should be enough here.\n\nReviewed-by: Thomas Huth <thuth@redhat.com>","headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=<UNKNOWN>)","ext-mx09.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx09.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=thuth@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xjcBX5121z9sRW\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 31 Aug 2017 19:14:12 +1000 (AEST)","from localhost ([::1]:54601 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dnLYA-00005i-S3\n\tfor incoming@patchwork.ozlabs.org; Thu, 31 Aug 2017 05:14:10 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:52719)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <thuth@redhat.com>) id 1dnLXq-00005N-Es\n\tfor qemu-devel@nongnu.org; Thu, 31 Aug 2017 05:13:51 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <thuth@redhat.com>) id 1dnLXn-0006A0-5O\n\tfor qemu-devel@nongnu.org; Thu, 31 Aug 2017 05:13:50 -0400","from mx1.redhat.com ([209.132.183.28]:56016)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <thuth@redhat.com>) id 1dnLXm-00069g-VV\n\tfor qemu-devel@nongnu.org; Thu, 31 Aug 2017 05:13:47 -0400","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id C143A4A6E4;\n\tThu, 31 Aug 2017 09:13:45 +0000 (UTC)","from [10.36.116.27] (ovpn-116-27.ams2.redhat.com [10.36.116.27])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id 0F63E92B8F;\n\tThu, 31 Aug 2017 09:13:41 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com C143A4A6E4","To":"David Hildenbrand <david@redhat.com>, qemu-devel@nongnu.org","References":"<20170830170601.15855-1-david@redhat.com>\n\t<20170830170601.15855-5-david@redhat.com>","From":"Thomas Huth <thuth@redhat.com>","Message-ID":"<782fdf4f-084e-9fcb-f788-d2f0c7f5340c@redhat.com>","Date":"Thu, 31 Aug 2017 11:13:40 +0200","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101\n\tThunderbird/52.3.0","MIME-Version":"1.0","In-Reply-To":"<20170830170601.15855-5-david@redhat.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-US","Content-Transfer-Encoding":"7bit","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.11","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.38]);\n\tThu, 31 Aug 2017 09:13:45 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"Re: [Qemu-devel] [PATCH v1 04/11] s390x: get rid of s390-virtio.c","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"<qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<http://lists.nongnu.org/archive/html/qemu-devel/>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Cc":"borntraeger@de.ibm.com, cohuck@redhat.com,\n\tRichard Henderson <richard.henderson@linaro.org>,\n\tAlexander Graf <agraf@suse.de>, Aurelien Jarno <aurelien@aurel32.net>","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>"}},{"id":1760869,"web_url":"http://patchwork.ozlabs.org/comment/1760869/","msgid":"<b9aa5d55-dce4-28ee-aeba-05bdb9f8617f@de.ibm.com>","list_archive_url":null,"date":"2017-08-31T11:47:18","subject":"Re: [Qemu-devel] [PATCH v1 04/11] s390x: get rid of s390-virtio.c","submitter":{"id":590,"url":"http://patchwork.ozlabs.org/api/people/590/","name":"Christian Borntraeger","email":"borntraeger@de.ibm.com"},"content":"I have not reviewed this, but the whole idea is\nAcked-by: Christian Borntraeger <borntraeger@de.ibm.com>\n\n\nOn 08/30/2017 07:05 PM, David Hildenbrand wrote:\n> It is a leftover from the days where we had still the !ccw virtio\n> machine. As this one is long gone, let's move everything to\n> s390-virtio-ccw.c.\n> \n> Cornelia Huck <cohuck@redhat.com>\n> Signed-off-by: David Hildenbrand <david@redhat.com>\n> ---\n>  hw/s390x/Makefile.objs     |   1 -\n>  hw/s390x/s390-virtio-ccw.c | 120 ++++++++++++++++++++++++++++++++-\n>  hw/s390x/s390-virtio.c     | 163 ---------------------------------------------\n>  hw/s390x/s390-virtio.h     |  14 ----\n>  4 files changed, 119 insertions(+), 179 deletions(-)\n>  delete mode 100644 hw/s390x/s390-virtio.c\n> \n> diff --git a/hw/s390x/Makefile.objs b/hw/s390x/Makefile.objs\n> index 7ee19d3abc..dc704b57d6 100644\n> --- a/hw/s390x/Makefile.objs\n> +++ b/hw/s390x/Makefile.objs\n> @@ -1,4 +1,3 @@\n> -obj-y += s390-virtio.o\n>  obj-y += s390-virtio-hcall.o\n>  obj-y += sclp.o\n>  obj-y += event-facility.o\n> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c\n> index ffd56af834..41a9e976dc 100644\n> --- a/hw/s390x/s390-virtio-ccw.c\n> +++ b/hw/s390x/s390-virtio-ccw.c\n> @@ -2,6 +2,7 @@\n>   * virtio ccw machine\n>   *\n>   * Copyright 2012 IBM Corp.\n> + * Copyright (c) 2009 Alexander Graf <agraf@suse.de>\n>   * Author(s): Cornelia Huck <cornelia.huck@de.ibm.com>\n>   *\n>   * This work is licensed under the terms of the GNU GPL, version 2 or (at\n> @@ -31,6 +32,8 @@\n>  #include \"hw/s390x/css-bridge.h\"\n>  #include \"migration/register.h\"\n>  #include \"cpu_models.h\"\n> +#include \"qapi/qmp/qerror.h\"\n> +#include \"hw/nmi.h\"\n> \n>  S390CPU *s390_cpu_addr2state(uint16_t cpu_addr)\n>  {\n> @@ -133,7 +136,7 @@ static void virtio_ccw_register_hcalls(void)\n>                                     virtio_ccw_hcall_early_printk);\n>  }\n> \n> -void s390_memory_init(ram_addr_t mem_size)\n> +static void s390_memory_init(ram_addr_t mem_size)\n>  {\n>      MemoryRegion *sysmem = get_system_memory();\n>      MemoryRegion *ram = g_new(MemoryRegion, 1);\n> @@ -148,11 +151,104 @@ void s390_memory_init(ram_addr_t mem_size)\n>      s390_stattrib_init();\n>  }\n> \n> +#define S390_TOD_CLOCK_VALUE_MISSING    0x00\n> +#define S390_TOD_CLOCK_VALUE_PRESENT    0x01\n> +\n> +static void gtod_save(QEMUFile *f, void *opaque)\n> +{\n> +    uint64_t tod_low;\n> +    uint8_t tod_high;\n> +    int r;\n> +\n> +    r = s390_get_clock(&tod_high, &tod_low);\n> +    if (r) {\n> +        fprintf(stderr, \"WARNING: Unable to get guest clock for migration. \"\n> +                        \"Error code %d. Guest clock will not be migrated \"\n> +                        \"which could cause the guest to hang.\\n\", r);\n> +        qemu_put_byte(f, S390_TOD_CLOCK_VALUE_MISSING);\n> +        return;\n> +    }\n> +\n> +    qemu_put_byte(f, S390_TOD_CLOCK_VALUE_PRESENT);\n> +    qemu_put_byte(f, tod_high);\n> +    qemu_put_be64(f, tod_low);\n> +}\n> +\n> +static int gtod_load(QEMUFile *f, void *opaque, int version_id)\n> +{\n> +    uint64_t tod_low;\n> +    uint8_t tod_high;\n> +    int r;\n> +\n> +    if (qemu_get_byte(f) == S390_TOD_CLOCK_VALUE_MISSING) {\n> +        fprintf(stderr, \"WARNING: Guest clock was not migrated. This could \"\n> +                        \"cause the guest to hang.\\n\");\n> +        return 0;\n> +    }\n> +\n> +    tod_high = qemu_get_byte(f);\n> +    tod_low = qemu_get_be64(f);\n> +\n> +    r = s390_set_clock(&tod_high, &tod_low);\n> +    if (r) {\n> +        fprintf(stderr, \"WARNING: Unable to set guest clock value. \"\n> +                        \"s390_get_clock returned error %d. This could cause \"\n> +                        \"the guest to hang.\\n\", r);\n> +    }\n> +\n> +    return 0;\n> +}\n> +\n> +\n>  static SaveVMHandlers savevm_gtod = {\n>      .save_state = gtod_save,\n>      .load_state = gtod_load,\n>  };\n> \n> +static void s390_init_ipl_dev(const char *kernel_filename,\n> +                              const char *kernel_cmdline,\n> +                              const char *initrd_filename, const char *firmware,\n> +                              const char *netboot_fw, bool enforce_bios)\n> +{\n> +    Object *new = object_new(TYPE_S390_IPL);\n> +    DeviceState *dev = DEVICE(new);\n> +\n> +    if (kernel_filename) {\n> +        qdev_prop_set_string(dev, \"kernel\", kernel_filename);\n> +    }\n> +    if (initrd_filename) {\n> +        qdev_prop_set_string(dev, \"initrd\", initrd_filename);\n> +    }\n> +    qdev_prop_set_string(dev, \"cmdline\", kernel_cmdline);\n> +    qdev_prop_set_string(dev, \"firmware\", firmware);\n> +    qdev_prop_set_string(dev, \"netboot_fw\", netboot_fw);\n> +    qdev_prop_set_bit(dev, \"enforce_bios\", enforce_bios);\n> +    object_property_add_child(qdev_get_machine(), TYPE_S390_IPL,\n> +                              new, NULL);\n> +    object_unref(new);\n> +    qdev_init_nofail(dev);\n> +}\n> +\n> +static void s390_create_virtio_net(BusState *bus, const char *name)\n> +{\n> +    int i;\n> +\n> +    for (i = 0; i < nb_nics; i++) {\n> +        NICInfo *nd = &nd_table[i];\n> +        DeviceState *dev;\n> +\n> +        if (!nd->model) {\n> +            nd->model = g_strdup(\"virtio\");\n> +        }\n> +\n> +        qemu_check_nic_model(nd, \"virtio\");\n> +\n> +        dev = qdev_create(bus, name);\n> +        qdev_set_nic_properties(dev, nd);\n> +        qdev_init_nofail(dev);\n> +    }\n> +}\n> +\n>  static void ccw_init(MachineState *machine)\n>  {\n>      int ret;\n> @@ -216,6 +312,19 @@ static void s390_cpu_plug(HotplugHandler *hotplug_dev,\n>      g_free(name);\n>  }\n> \n> +static void s390_machine_reset(void)\n> +{\n> +    S390CPU *ipl_cpu = S390_CPU(qemu_get_cpu(0));\n> +\n> +    s390_cmma_reset();\n> +    qemu_devices_reset();\n> +    s390_crypto_reset();\n> +\n> +    /* all cpus are stopped - configure and start the ipl cpu only */\n> +    s390_ipl_prepare_cpu(ipl_cpu);\n> +    s390_cpu_set_state(CPU_STATE_OPERATING, ipl_cpu);\n> +}\n> +\n>  static void s390_machine_device_plug(HotplugHandler *hotplug_dev,\n>                                       DeviceState *dev, Error **errp)\n>  {\n> @@ -240,6 +349,15 @@ static void s390_hot_add_cpu(const int64_t id, Error **errp)\n>      s390x_new_cpu(machine->cpu_model, id, errp);\n>  }\n> \n> +static void s390_nmi(NMIState *n, int cpu_index, Error **errp)\n> +{\n> +    CPUState *cs = qemu_get_cpu(cpu_index);\n> +\n> +    if (s390_cpu_restart(S390_CPU(cs))) {\n> +        error_setg(errp, QERR_UNSUPPORTED);\n> +    }\n> +}\n> +\n>  static void ccw_machine_class_init(ObjectClass *oc, void *data)\n>  {\n>      MachineClass *mc = MACHINE_CLASS(oc);\n> diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c\n> deleted file mode 100644\n> index 464b5c71f8..0000000000\n> --- a/hw/s390x/s390-virtio.c\n> +++ /dev/null\n> @@ -1,163 +0,0 @@\n> -/*\n> - * QEMU S390 virtio target\n> - *\n> - * Copyright (c) 2009 Alexander Graf <agraf@suse.de>\n> - * Copyright IBM Corp 2012\n> - *\n> - * This library is free software; you can redistribute it and/or\n> - * modify it under the terms of the GNU Lesser General Public\n> - * License as published by the Free Software Foundation; either\n> - * version 2 of the License, or (at your option) any later version.\n> - *\n> - * This library is distributed in the hope that it will be useful,\n> - * but WITHOUT ANY WARRANTY; without even the implied warranty of\n> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n> - * Lesser General Public License for more details.\n> - *\n> - * Contributions after 2012-10-29 are licensed under the terms of the\n> - * GNU GPL, version 2 or (at your option) any later version.\n> - *\n> - * You should have received a copy of the GNU (Lesser) General Public\n> - * License along with this library; if not, see <http://www.gnu.org/licenses/>.\n> - */\n> -\n> -#include \"qemu/osdep.h\"\n> -#include \"qapi/error.h\"\n> -#include \"hw/hw.h\"\n> -#include \"qapi/qmp/qerror.h\"\n> -#include \"qemu/error-report.h\"\n> -#include \"sysemu/block-backend.h\"\n> -#include \"sysemu/blockdev.h\"\n> -#include \"sysemu/sysemu.h\"\n> -#include \"net/net.h\"\n> -#include \"hw/boards.h\"\n> -#include \"hw/loader.h\"\n> -#include \"hw/virtio/virtio.h\"\n> -#include \"exec/address-spaces.h\"\n> -#include \"sysemu/qtest.h\"\n> -\n> -#include \"hw/s390x/sclp.h\"\n> -#include \"hw/s390x/s390_flic.h\"\n> -#include \"hw/s390x/s390-virtio.h\"\n> -#include \"hw/s390x/storage-keys.h\"\n> -#include \"hw/s390x/ipl.h\"\n> -#include \"cpu.h\"\n> -\n> -#define MAX_BLK_DEVS                    10\n> -\n> -#define S390_TOD_CLOCK_VALUE_MISSING    0x00\n> -#define S390_TOD_CLOCK_VALUE_PRESENT    0x01\n> -\n> -void s390_init_ipl_dev(const char *kernel_filename,\n> -                       const char *kernel_cmdline,\n> -                       const char *initrd_filename,\n> -                       const char *firmware,\n> -                       const char *netboot_fw,\n> -                       bool enforce_bios)\n> -{\n> -    Object *new = object_new(TYPE_S390_IPL);\n> -    DeviceState *dev = DEVICE(new);\n> -\n> -    if (kernel_filename) {\n> -        qdev_prop_set_string(dev, \"kernel\", kernel_filename);\n> -    }\n> -    if (initrd_filename) {\n> -        qdev_prop_set_string(dev, \"initrd\", initrd_filename);\n> -    }\n> -    qdev_prop_set_string(dev, \"cmdline\", kernel_cmdline);\n> -    qdev_prop_set_string(dev, \"firmware\", firmware);\n> -    qdev_prop_set_string(dev, \"netboot_fw\", netboot_fw);\n> -    qdev_prop_set_bit(dev, \"enforce_bios\", enforce_bios);\n> -    object_property_add_child(qdev_get_machine(), TYPE_S390_IPL,\n> -                              new, NULL);\n> -    object_unref(new);\n> -    qdev_init_nofail(dev);\n> -}\n> -\n> -\n> -void s390_create_virtio_net(BusState *bus, const char *name)\n> -{\n> -    int i;\n> -\n> -    for (i = 0; i < nb_nics; i++) {\n> -        NICInfo *nd = &nd_table[i];\n> -        DeviceState *dev;\n> -\n> -        if (!nd->model) {\n> -            nd->model = g_strdup(\"virtio\");\n> -        }\n> -\n> -        qemu_check_nic_model(nd, \"virtio\");\n> -\n> -        dev = qdev_create(bus, name);\n> -        qdev_set_nic_properties(dev, nd);\n> -        qdev_init_nofail(dev);\n> -    }\n> -}\n> -\n> -void gtod_save(QEMUFile *f, void *opaque)\n> -{\n> -    uint64_t tod_low;\n> -    uint8_t tod_high;\n> -    int r;\n> -\n> -    r = s390_get_clock(&tod_high, &tod_low);\n> -    if (r) {\n> -        fprintf(stderr, \"WARNING: Unable to get guest clock for migration. \"\n> -                        \"Error code %d. Guest clock will not be migrated \"\n> -                        \"which could cause the guest to hang.\\n\", r);\n> -        qemu_put_byte(f, S390_TOD_CLOCK_VALUE_MISSING);\n> -        return;\n> -    }\n> -\n> -    qemu_put_byte(f, S390_TOD_CLOCK_VALUE_PRESENT);\n> -    qemu_put_byte(f, tod_high);\n> -    qemu_put_be64(f, tod_low);\n> -}\n> -\n> -int gtod_load(QEMUFile *f, void *opaque, int version_id)\n> -{\n> -    uint64_t tod_low;\n> -    uint8_t tod_high;\n> -    int r;\n> -\n> -    if (qemu_get_byte(f) == S390_TOD_CLOCK_VALUE_MISSING) {\n> -        fprintf(stderr, \"WARNING: Guest clock was not migrated. This could \"\n> -                        \"cause the guest to hang.\\n\");\n> -        return 0;\n> -    }\n> -\n> -    tod_high = qemu_get_byte(f);\n> -    tod_low = qemu_get_be64(f);\n> -\n> -    r = s390_set_clock(&tod_high, &tod_low);\n> -    if (r) {\n> -        fprintf(stderr, \"WARNING: Unable to set guest clock value. \"\n> -                        \"s390_get_clock returned error %d. This could cause \"\n> -                        \"the guest to hang.\\n\", r);\n> -    }\n> -\n> -    return 0;\n> -}\n> -\n> -void s390_nmi(NMIState *n, int cpu_index, Error **errp)\n> -{\n> -    CPUState *cs = qemu_get_cpu(cpu_index);\n> -\n> -    if (s390_cpu_restart(S390_CPU(cs))) {\n> -        error_setg(errp, QERR_UNSUPPORTED);\n> -    }\n> -}\n> -\n> -void s390_machine_reset(void)\n> -{\n> -    S390CPU *ipl_cpu = S390_CPU(qemu_get_cpu(0));\n> -\n> -    s390_cmma_reset();\n> -    qemu_devices_reset();\n> -    s390_crypto_reset();\n> -\n> -    /* all cpus are stopped - configure and start the ipl cpu only */\n> -    s390_ipl_prepare_cpu(ipl_cpu);\n> -    s390_cpu_set_state(CPU_STATE_OPERATING, ipl_cpu);\n> -}\n> diff --git a/hw/s390x/s390-virtio.h b/hw/s390x/s390-virtio.h\n> index b6660e3ae9..d984cd4115 100644\n> --- a/hw/s390x/s390-virtio.h\n> +++ b/hw/s390x/s390-virtio.h\n> @@ -12,23 +12,9 @@\n>  #ifndef HW_S390_VIRTIO_H\n>  #define HW_S390_VIRTIO_H\n> \n> -#include \"hw/nmi.h\"\n>  #include \"standard-headers/asm-s390/kvm_virtio.h\"\n>  #include \"standard-headers/asm-s390/virtio-ccw.h\"\n> \n>  typedef int (*s390_virtio_fn)(const uint64_t *args);\n>  void s390_register_virtio_hypercall(uint64_t code, s390_virtio_fn fn);\n> -\n> -void s390_init_ipl_dev(const char *kernel_filename,\n> -                       const char *kernel_cmdline,\n> -                       const char *initrd_filename,\n> -                       const char *firmware,\n> -                       const char *netboot_fw,\n> -                       bool enforce_bios);\n> -void s390_create_virtio_net(BusState *bus, const char *name);\n> -void s390_nmi(NMIState *n, int cpu_index, Error **errp);\n> -void s390_machine_reset(void);\n> -void s390_memory_init(ram_addr_t mem_size);\n> -void gtod_save(QEMUFile *f, void *opaque);\n> -int gtod_load(QEMUFile *f, void *opaque, int version_id);\n>  #endif\n>","headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=<UNKNOWN>)","Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xjgcn0s2rz9t16\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 31 Aug 2017 21:48:37 +1000 (AEST)","from localhost ([::1]:55169 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dnNxb-0005pz-Qv\n\tfor incoming@patchwork.ozlabs.org; Thu, 31 Aug 2017 07:48:35 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:33407)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <borntraeger@de.ibm.com>) id 1dnNwZ-0005T1-7D\n\tfor qemu-devel@nongnu.org; Thu, 31 Aug 2017 07:47:36 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <borntraeger@de.ibm.com>) id 1dnNwV-0006Oe-VB\n\tfor qemu-devel@nongnu.org; Thu, 31 Aug 2017 07:47:31 -0400","from mx0a-001b2d01.pphosted.com ([148.163.156.1]:37507)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <borntraeger@de.ibm.com>)\n\tid 1dnNwV-0006O1-M9\n\tfor qemu-devel@nongnu.org; Thu, 31 Aug 2017 07:47:27 -0400","from pps.filterd (m0098409.ppops.net [127.0.0.1])\n\tby mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id\n\tv7VBiAd3036147\n\tfor <qemu-devel@nongnu.org>; Thu, 31 Aug 2017 07:47:26 -0400","from e06smtp15.uk.ibm.com (e06smtp15.uk.ibm.com [195.75.94.111])\n\tby mx0a-001b2d01.pphosted.com with ESMTP id 2cpfb8rqhp-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor <qemu-devel@nongnu.org>; Thu, 31 Aug 2017 07:47:25 -0400","from localhost\n\tby e06smtp15.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use\n\tOnly! Violators will be prosecuted\n\tfor <qemu-devel@nongnu.org> from <borntraeger@de.ibm.com>;\n\tThu, 31 Aug 2017 12:47:23 +0100","from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197)\n\tby e06smtp15.uk.ibm.com (192.168.101.145) with IBM ESMTP SMTP\n\tGateway: Authorized Use Only! Violators will be prosecuted; \n\tThu, 31 Aug 2017 12:47:19 +0100","from d06av26.portsmouth.uk.ibm.com (d06av26.portsmouth.uk.ibm.com\n\t[9.149.105.62])\n\tby b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with\n\tESMTP id v7VBlJI516711802; Thu, 31 Aug 2017 11:47:19 GMT","from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id 62917AE04D;\n\tThu, 31 Aug 2017 12:42:44 +0100 (BST)","from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id 1437DAE045;\n\tThu, 31 Aug 2017 12:42:44 +0100 (BST)","from oc7330422307.ibm.com (unknown [9.152.224.49])\n\tby d06av26.portsmouth.uk.ibm.com (Postfix) with ESMTP;\n\tThu, 31 Aug 2017 12:42:44 +0100 (BST)"],"To":"David Hildenbrand <david@redhat.com>, qemu-devel@nongnu.org","References":"<20170830170601.15855-1-david@redhat.com>\n\t<20170830170601.15855-5-david@redhat.com>","From":"Christian Borntraeger <borntraeger@de.ibm.com>","Date":"Thu, 31 Aug 2017 13:47:18 +0200","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101\n\tThunderbird/52.2.0","MIME-Version":"1.0","In-Reply-To":"<20170830170601.15855-5-david@redhat.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-US","Content-Transfer-Encoding":"7bit","X-TM-AS-GCONF":"00","x-cbid":"17083111-0020-0000-0000-000003B2A566","X-IBM-AV-DETECTION":"SAVI=unused REMOTE=unused XFE=unused","x-cbparentid":"17083111-0021-0000-0000-00004242FC02","Message-Id":"<b9aa5d55-dce4-28ee-aeba-05bdb9f8617f@de.ibm.com>","X-Proofpoint-Virus-Version":"vendor=fsecure engine=2.50.10432:, ,\n\tdefinitions=2017-08-31_04:, , signatures=0","X-Proofpoint-Spam-Details":"rule=outbound_notspam policy=outbound score=0\n\tspamscore=0 suspectscore=2\n\tmalwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam\n\tadjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000\n\tdefinitions=main-1708310178","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy]","X-Received-From":"148.163.156.1","Subject":"Re: [Qemu-devel] [PATCH v1 04/11] s390x: get rid of s390-virtio.c","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"<qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<http://lists.nongnu.org/archive/html/qemu-devel/>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Cc":"thuth@redhat.com, cohuck@redhat.com,\n\tRichard Henderson <richard.henderson@linaro.org>,\n\tAlexander Graf <agraf@suse.de>, Aurelien Jarno <aurelien@aurel32.net>","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>"}},{"id":1760976,"web_url":"http://patchwork.ozlabs.org/comment/1760976/","msgid":"<4c02030a-61e2-da40-3f88-3f15aae44cb8@redhat.com>","list_archive_url":null,"date":"2017-08-31T13:13:12","subject":"Re: [Qemu-devel] [PATCH v1 04/11] s390x: get rid of s390-virtio.c","submitter":{"id":70402,"url":"http://patchwork.ozlabs.org/api/people/70402/","name":"David Hildenbrand","email":"david@redhat.com"},"content":"On 30.08.2017 19:05, David Hildenbrand wrote:\n> It is a leftover from the days where we had still the !ccw virtio\n> machine. As this one is long gone, let's move everything to\n> s390-virtio-ccw.c.\n> \n> Cornelia Huck <cohuck@redhat.com>\n\nI will add the missing Suggested-by: :)\n\n> Signed-off-by: David Hildenbrand <david@redhat.com>\n> ---","headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=<UNKNOWN>)","ext-mx05.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx05.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=david@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xjjVt3kC7z9sPt\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 31 Aug 2017 23:13:42 +1000 (AEST)","from localhost ([::1]:55751 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dnPHw-0007sm-L1\n\tfor incoming@patchwork.ozlabs.org; Thu, 31 Aug 2017 09:13:40 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:53473)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <david@redhat.com>) id 1dnPHc-0007sf-1h\n\tfor qemu-devel@nongnu.org; Thu, 31 Aug 2017 09:13:20 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <david@redhat.com>) id 1dnPHY-00084V-2k\n\tfor qemu-devel@nongnu.org; Thu, 31 Aug 2017 09:13:20 -0400","from mx1.redhat.com ([209.132.183.28]:8495)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <david@redhat.com>) id 1dnPHX-00084M-SJ\n\tfor qemu-devel@nongnu.org; Thu, 31 Aug 2017 09:13:16 -0400","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id D9BCA18C37F;\n\tThu, 31 Aug 2017 13:13:14 +0000 (UTC)","from [10.36.118.11] (unknown [10.36.118.11])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 578E392D08;\n\tThu, 31 Aug 2017 13:13:13 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com D9BCA18C37F","To":"qemu-devel@nongnu.org","References":"<20170830170601.15855-1-david@redhat.com>\n\t<20170830170601.15855-5-david@redhat.com>","From":"David Hildenbrand <david@redhat.com>","Organization":"Red Hat GmbH","Message-ID":"<4c02030a-61e2-da40-3f88-3f15aae44cb8@redhat.com>","Date":"Thu, 31 Aug 2017 15:13:12 +0200","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101\n\tThunderbird/52.2.1","MIME-Version":"1.0","In-Reply-To":"<20170830170601.15855-5-david@redhat.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-US","Content-Transfer-Encoding":"7bit","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.11","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.29]);\n\tThu, 31 Aug 2017 13:13:15 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"Re: [Qemu-devel] [PATCH v1 04/11] s390x: get rid of s390-virtio.c","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"<qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<http://lists.nongnu.org/archive/html/qemu-devel/>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Cc":"thuth@redhat.com, cohuck@redhat.com,\n\tRichard Henderson <richard.henderson@linaro.org>,\n\tAlexander Graf <agraf@suse.de>, borntraeger@de.ibm.com,\n\tAurelien Jarno <aurelien@aurel32.net>","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>"}},{"id":1760978,"web_url":"http://patchwork.ozlabs.org/comment/1760978/","msgid":"<107c8ace-952d-1453-c23d-1b3b4c404db0@redhat.com>","list_archive_url":null,"date":"2017-08-31T13:14:32","subject":"Re: [Qemu-devel] [PATCH v1 04/11] s390x: get rid of s390-virtio.c","submitter":{"id":70402,"url":"http://patchwork.ozlabs.org/api/people/70402/","name":"David Hildenbrand","email":"david@redhat.com"},"content":">> +    return 0;\n>> +}\n>> +\n>> +\n> \n> Nit: One empty line should be enough here.\n> \n> Reviewed-by: Thomas Huth <thuth@redhat.com>\n> \n\nIndeed, thanks!","headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=<UNKNOWN>)","ext-mx01.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx01.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=david@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xjjXf5wG0z9sPt\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 31 Aug 2017 23:15:14 +1000 (AEST)","from localhost ([::1]:55755 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dnPJQ-00009r-QJ\n\tfor incoming@patchwork.ozlabs.org; Thu, 31 Aug 2017 09:15:12 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:53837)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <david@redhat.com>) id 1dnPIv-00008v-Oy\n\tfor qemu-devel@nongnu.org; Thu, 31 Aug 2017 09:14:42 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <david@redhat.com>) id 1dnPIr-0008ST-OA\n\tfor qemu-devel@nongnu.org; Thu, 31 Aug 2017 09:14:41 -0400","from mx1.redhat.com ([209.132.183.28]:36240)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <david@redhat.com>) id 1dnPIr-0008SG-HG\n\tfor qemu-devel@nongnu.org; Thu, 31 Aug 2017 09:14:37 -0400","from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 8AAE580E6A;\n\tThu, 31 Aug 2017 13:14:36 +0000 (UTC)","from [10.36.118.11] (unknown [10.36.118.11])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 411F093533;\n\tThu, 31 Aug 2017 13:14:33 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 8AAE580E6A","To":"Thomas Huth <thuth@redhat.com>, qemu-devel@nongnu.org","References":"<20170830170601.15855-1-david@redhat.com>\n\t<20170830170601.15855-5-david@redhat.com>\n\t<782fdf4f-084e-9fcb-f788-d2f0c7f5340c@redhat.com>","From":"David Hildenbrand <david@redhat.com>","Organization":"Red Hat GmbH","Message-ID":"<107c8ace-952d-1453-c23d-1b3b4c404db0@redhat.com>","Date":"Thu, 31 Aug 2017 15:14:32 +0200","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101\n\tThunderbird/52.2.1","MIME-Version":"1.0","In-Reply-To":"<782fdf4f-084e-9fcb-f788-d2f0c7f5340c@redhat.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-US","Content-Transfer-Encoding":"7bit","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.15","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.25]);\n\tThu, 31 Aug 2017 13:14:36 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"Re: [Qemu-devel] [PATCH v1 04/11] s390x: get rid of s390-virtio.c","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"<qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<http://lists.nongnu.org/archive/html/qemu-devel/>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Cc":"borntraeger@de.ibm.com, cohuck@redhat.com,\n\tRichard Henderson <richard.henderson@linaro.org>,\n\tAlexander Graf <agraf@suse.de>, Aurelien Jarno <aurelien@aurel32.net>","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>"}}]