From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53257) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIyyF-0000gY-2r for qemu-devel@nongnu.org; Tue, 12 Jan 2016 08:26:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aIyyB-0000rA-TL for qemu-devel@nongnu.org; Tue, 12 Jan 2016 08:26:47 -0500 Received: from e06smtp17.uk.ibm.com ([195.75.94.113]:35211) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIyyB-0000qs-Hs for qemu-devel@nongnu.org; Tue, 12 Jan 2016 08:26:43 -0500 Received: from localhost by e06smtp17.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 12 Jan 2016 13:26:41 -0000 Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id DF94C2190019 for ; Tue, 12 Jan 2016 13:26:26 +0000 (GMT) Received: from d06av05.portsmouth.uk.ibm.com (d06av05.portsmouth.uk.ibm.com [9.149.37.229]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u0CDQcPg54853714 for ; Tue, 12 Jan 2016 13:26:38 GMT Received: from d06av05.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av05.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u0CDQbLB016642 for ; Tue, 12 Jan 2016 06:26:37 -0700 References: <1452173818-13661-1-git-send-email-cornelia.huck@de.ibm.com> <1452173818-13661-4-git-send-email-cornelia.huck@de.ibm.com> <5693E27B.4040800@redhat.com> <20160111194525.15181040.cornelia.huck@de.ibm.com> From: Pierre Morel Message-ID: <5694FF0C.8030309@linux.vnet.ibm.com> Date: Tue, 12 Jan 2016 14:26:36 +0100 MIME-Version: 1.0 In-Reply-To: <20160111194525.15181040.cornelia.huck@de.ibm.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 3/9] s390x: remove s390-virtio devices List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Cornelia Huck , Thomas Huth Cc: borntraeger@de.ibm.com, jfrei@linux.vnet.ibm.com, qemu-devel@nongnu.org, agraf@suse.de On 01/11/2016 07:45 PM, Cornelia Huck wrote: > On Mon, 11 Jan 2016 18:12:27 +0100 > Thomas Huth wrote: > >> Happy new year! > To you as well :) > >> On 07.01.2016 14:36, Cornelia Huck wrote: >>> From: Pierre Morel >>> >>> The s390-virtio machine has been removed; remove the associated devices >>> as well. >>> >>> hw/s390x/s390-virtio-bus.c and hw/s390x/s390-virtio-bus.h >>> have been deleted and removed from hw/s390x/Makefile.objs >>> >>> virtio-size has no more meaning for the modern machine >>> and has been removed from helper.c and cpu.h >>> >>> virtio-serial-s390 belonging to the old machine is >>> being removed from vl.c >>> >>> Signed-off-by: Pierre Morel >>> Acked-by: Cornelia Huck >>> Signed-off-by: Cornelia Huck >>> --- >>> hw/s390x/Makefile.objs | 2 +- >>> hw/s390x/s390-virtio-bus.c | 758 --------------------------------------------- >>> hw/s390x/s390-virtio-bus.h | 186 ----------- >>> hw/s390x/s390-virtio.c | 1 - >>> target-s390x/cpu.h | 3 - >>> target-s390x/helper.c | 2 +- >>> vl.c | 7 +- >>> 7 files changed, 3 insertions(+), 956 deletions(-) >>> delete mode 100644 hw/s390x/s390-virtio-bus.c >>> delete mode 100644 hw/s390x/s390-virtio-bus.h >> [...] >>> diff --git a/target-s390x/helper.c b/target-s390x/helper.c >>> index aa58f39..e23fdeb 100644 >>> --- a/target-s390x/helper.c >>> +++ b/target-s390x/helper.c >>> @@ -133,7 +133,7 @@ int s390_cpu_handle_mmu_fault(CPUState *cs, vaddr orig_vaddr, >>> } >>> >>> /* check out of RAM access */ >>> - if (raddr > (ram_size + virtio_size)) { >>> + if (raddr > (ram_size)) { >> While you're at it, you could remove the parentheses around "ram_size" >> here ... I know, you like parentheses, Cornelia ... but here they IMHO >> look quite superfluous now... > That's more an oversight; will remove. > >>> DPRINTF("%s: raddr %" PRIx64 " > ram_size %" PRIx64 "\n", __func__, >>> (uint64_t)raddr, (uint64_t)ram_size); >>> trigger_pgm_exception(env, PGM_ADDRESSING, ILEN_LATER); >>> diff --git a/vl.c b/vl.c >>> index 5aaea77..0c69d94 100644 >>> --- a/vl.c >>> +++ b/vl.c >>> @@ -227,7 +227,6 @@ static struct { >>> { .driver = "ide-drive", .flag = &default_cdrom }, >>> { .driver = "scsi-cd", .flag = &default_cdrom }, >>> { .driver = "virtio-serial-pci", .flag = &default_virtcon }, >>> - { .driver = "virtio-serial-s390", .flag = &default_virtcon }, >>> { .driver = "virtio-serial", .flag = &default_virtcon }, >>> { .driver = "VGA", .flag = &default_vga }, >>> { .driver = "isa-vga", .flag = &default_vga }, >>> @@ -2548,11 +2547,7 @@ static int virtcon_parse(const char *devname) >>> } >>> >>> bus_opts = qemu_opts_create(device, NULL, 0, &error_abort); >>> - if (arch_type == QEMU_ARCH_S390X) { >>> - qemu_opt_set(bus_opts, "driver", "virtio-serial-s390", &error_abort); >>> - } else { >>> - qemu_opt_set(bus_opts, "driver", "virtio-serial-pci", &error_abort); >>> - } >>> + qemu_opt_set(bus_opts, "driver", "virtio-serial", &error_abort); >> Are you sure you want to change the default value for non-s390 systems >> from "virtio-serial-pci" to "virtio-serial", too? >> Also, isn't the virtio-ccw variant called "virtio-serial-ccw" instead or >> did I miss something? > That's OK, virtio-serial will point to the right driver. And I trust > Pierre to have verified it :) I verified it only on the x86_64 architecture, lack of hardware. I think that if it is not broken there, there should be no problem for others, but of course let me know if you find any issue.