From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51508) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIg1F-0004pJ-4E for qemu-devel@nongnu.org; Mon, 11 Jan 2016 12:12:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aIg1B-0000B2-TT for qemu-devel@nongnu.org; Mon, 11 Jan 2016 12:12:37 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53689) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIg1B-0000Av-LY for qemu-devel@nongnu.org; Mon, 11 Jan 2016 12:12:33 -0500 References: <1452173818-13661-1-git-send-email-cornelia.huck@de.ibm.com> <1452173818-13661-4-git-send-email-cornelia.huck@de.ibm.com> From: Thomas Huth Message-ID: <5693E27B.4040800@redhat.com> Date: Mon, 11 Jan 2016 18:12:27 +0100 MIME-Version: 1.0 In-Reply-To: <1452173818-13661-4-git-send-email-cornelia.huck@de.ibm.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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 , qemu-devel@nongnu.org, Pierre Morel Cc: borntraeger@de.ibm.com, jfrei@linux.vnet.ibm.com, agraf@suse.de Happy new year! On 07.01.2016 14:36, Cornelia Huck wrote: > From: Pierre Morel >=20 > The s390-virtio machine has been removed; remove the associated devices > as well. >=20 > hw/s390x/s390-virtio-bus.c and hw/s390x/s390-virtio-bus.h > have been deleted and removed from hw/s390x/Makefile.objs >=20 > virtio-size has no more meaning for the modern machine > and has been removed from helper.c and cpu.h >=20 > virtio-serial-s390 belonging to the old machine is > being removed from vl.c >=20 > 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 o= rig_vaddr, > } > =20 > /* 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... > DPRINTF("%s: raddr %" PRIx64 " > ram_size %" PRIx64 "\n", __fu= nc__, > (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 =3D "ide-drive", .flag =3D &default_cdrom = }, > { .driver =3D "scsi-cd", .flag =3D &default_cdrom = }, > { .driver =3D "virtio-serial-pci", .flag =3D &default_virtcon = }, > - { .driver =3D "virtio-serial-s390", .flag =3D &default_virtcon = }, > { .driver =3D "virtio-serial", .flag =3D &default_virtcon = }, > { .driver =3D "VGA", .flag =3D &default_vga = }, > { .driver =3D "isa-vga", .flag =3D &default_vga = }, > @@ -2548,11 +2547,7 @@ static int virtcon_parse(const char *devname) > } > =20 > bus_opts =3D qemu_opts_create(device, NULL, 0, &error_abort); > - if (arch_type =3D=3D 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_a= bort); > - } > + 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? Thomas