From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:33357) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtW3r-0000Q8-Q9 for qemu-devel@nongnu.org; Tue, 12 Feb 2019 06:17:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtW3j-0004OV-IM for qemu-devel@nongnu.org; Tue, 12 Feb 2019 06:17:11 -0500 Date: Tue, 12 Feb 2019 12:16:15 +0100 From: Cornelia Huck Message-ID: <20190212121615.65bef23e.cohuck@redhat.com> In-Reply-To: <20190212093023.32466-1-david@redhat.com> References: <20190212093023.32466-1-david@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v1] s390x: add zPCI feature to "qemu" CPU model List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Hildenbrand Cc: qemu-devel@nongnu.org, qemu-s390x@nongnu.org, Thomas Huth , Halil Pasic , Christian Borntraeger , Janosch Frank , Richard Henderson On Tue, 12 Feb 2019 10:30:23 +0100 David Hildenbrand wrote: > As we now always have PCI support, let's add it to the "qemu" CPU model, > taking care of backwards compatibility. > > Signed-off-by: David Hildenbrand > --- > hw/s390x/s390-virtio-ccw.c | 3 +++ > target/s390x/gen-features.c | 8 ++++++-- > 2 files changed, 9 insertions(+), 2 deletions(-) > > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index 3fb5c88af9..7f0d394fbe 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -657,7 +657,10 @@ DEFINE_CCW_MACHINE(4_0, "4.0", true); > > static void ccw_machine_3_1_instance_options(MachineState *machine) > { > + static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V3_1 }; > ccw_machine_4_0_instance_options(machine); > + > + s390_set_qemu_cpu_model(0x2064, 7, 1, qemu_cpu_feat); Hm, don't we emulate a (stripped-down) z12 (2827)? Or am I misunderstanding? > } > > static void ccw_machine_3_1_class_options(MachineClass *mc)