From nobody Mon May 6 20:24:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584967853; cv=none; d=zohomail.com; s=zohoarc; b=MHRim3Ai+C4FyMZryPEus3wGljC+g0FNl9xFCWcnRkc52TBEtNQufFJH5nYiq+A+q6GhfrWK0adR1R9yvX8lLAAFvas52KK6/KTAxhfSL+IdPqOVyIcIpeikallRXY25WrI3feDtEpognGJQ8amsoy3foPrrvFkZAaVuyX5iNRU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584967853; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8VQ7BbtB+1AFo6p4ueEj9iJMoZbx51iqM2lDAspD+Uw=; b=L4WJ/DbQs4jlQ16hO38OYC8B56/J9ioAONl8JR5YsOF55CzMUUB9prmuuUXw4+6GhBMCl8DalI4EoX7rohGzZWMXYaW99m9M43fN430hz+ESsAV6LXNfVB7oLgIIzy6FOZWKSjNh/gX23wKcDbRfh6w8cSz0jTU3Bh5t6pMl1iw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584967853696795.8477102980016; Mon, 23 Mar 2020 05:50:53 -0700 (PDT) Received: from localhost ([::1]:33404 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGMXc-00051N-O4 for importer@patchew.org; Mon, 23 Mar 2020 08:50:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53365) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGMWP-0003lz-UW for qemu-devel@nongnu.org; Mon, 23 Mar 2020 08:49:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jGMWO-0000rf-Hq for qemu-devel@nongnu.org; Mon, 23 Mar 2020 08:49:37 -0400 Received: from us-smtp-delivery-74.mimecast.com ([216.205.24.74]:56282) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jGMWO-0000rO-EF for qemu-devel@nongnu.org; Mon, 23 Mar 2020 08:49:36 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-201-y3GI-rHVO9KqWXWFJ2C-Nw-1; Mon, 23 Mar 2020 08:49:33 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D4F07801E74; Mon, 23 Mar 2020 12:49:31 +0000 (UTC) Received: from localhost (ovpn-113-18.ams2.redhat.com [10.36.113.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7142210027B6; Mon, 23 Mar 2020 12:49:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584967776; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8VQ7BbtB+1AFo6p4ueEj9iJMoZbx51iqM2lDAspD+Uw=; b=BfnLXSZ4Cw2seJs+0c5UToyjsJwwc1NkiqTaCgPOHtfgY6OYjuCm8vEja953j0OCS8+jIf QZ02TfZ1/ooyNotOVI6bt35ZIeEHcgjWXGizHdOiBUaX56rJsLdnvLXUO1kyeqf0qvex7R 3iq7vG9nOghfpG1xr7Ah+ew1cE17sDk= X-MC-Unique: y3GI-rHVO9KqWXWFJ2C-Nw-1 From: Cornelia Huck To: Peter Maydell Subject: [PULL for-5.0 1/2] Documentation: create/move s390x documentation Date: Mon, 23 Mar 2020 13:49:22 +0100 Message-Id: <20200323124923.24014-2-cohuck@redhat.com> In-Reply-To: <20200323124923.24014-1-cohuck@redhat.com> References: <20200323124923.24014-1-cohuck@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 216.205.24.74 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Christian Borntraeger , qemu-s390x@nongnu.org, Cornelia Huck , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Create a subdirectory for s390x under docs/system/ and move the existing vfio-ap documentation there. Create an initial document describing s390x system emulation. Suggested-by: Peter Maydell Signed-off-by: Cornelia Huck Acked-by: Christian Borntraeger Message-Id: <20200318103940.1169-1-cohuck@redhat.com> --- MAINTAINERS | 5 +++-- docs/system/index.rst | 1 - docs/system/{ =3D> s390x}/vfio-ap.rst | 0 docs/system/target-s390x.rst | 26 ++++++++++++++++++++++++++ docs/system/targets.rst | 1 + 5 files changed, 30 insertions(+), 3 deletions(-) rename docs/system/{ =3D> s390x}/vfio-ap.rst (100%) create mode 100644 docs/system/target-s390x.rst diff --git a/MAINTAINERS b/MAINTAINERS index 2b46f3c6a831..b5c86ec4946d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -101,7 +101,8 @@ F: include/hw/watchdog/wdt_diag288.h F: pc-bios/s390-ccw/ F: pc-bios/s390-ccw.img F: target/s390x/ -F: docs/vfio-ap.txt +F: docs/system/target-s390x.rst +F: docs/system/s390x/ F: tests/migration/s390x/ K: ^Subject:.*(?i)s390x? T: git https://github.com/cohuck/qemu.git s390-next @@ -1611,7 +1612,7 @@ F: hw/s390x/ap-bridge.c F: include/hw/s390x/ap-device.h F: include/hw/s390x/ap-bridge.h F: hw/vfio/ap.c -F: docs/system/vfio-ap.rst +F: docs/system/s390x/vfio-ap.rst L: qemu-s390x@nongnu.org =20 vhost diff --git a/docs/system/index.rst b/docs/system/index.rst index 6e5f20fa1333..c0f685b818e5 100644 --- a/docs/system/index.rst +++ b/docs/system/index.rst @@ -30,7 +30,6 @@ Contents: managed-startup targets security - vfio-ap deprecated build-platforms license diff --git a/docs/system/vfio-ap.rst b/docs/system/s390x/vfio-ap.rst similarity index 100% rename from docs/system/vfio-ap.rst rename to docs/system/s390x/vfio-ap.rst diff --git a/docs/system/target-s390x.rst b/docs/system/target-s390x.rst new file mode 100644 index 000000000000..4c8b7cdd6615 --- /dev/null +++ b/docs/system/target-s390x.rst @@ -0,0 +1,26 @@ +.. _s390x-System-emulator: + +s390x System emulator +--------------------- + +QEMU can emulate z/Architecture (in particular, 64 bit) s390x systems +via the ``qemu-system-s390x`` binary. Only one machine type, +``s390-ccw-virtio``, is supported (with versioning for compatibility +handling). + +When using KVM as accelerator, QEMU can emulate CPUs up to the generation +of the host. When using the default cpu model with TCG as accelerator, +QEMU will emulate a subset of z13 cpu features that should be enough to run +distributions built for the z13. + +Device support +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +QEMU will not emulate most of the traditional devices found under LPAR or +z/VM; virtio devices (especially using virtio-ccw) make up the bulk of +the available devices. Passthrough of host devices via vfio-pci, vfio-ccw, +or vfio-ap is also available. + +.. toctree:: + s390x/vfio-ap + diff --git a/docs/system/targets.rst b/docs/system/targets.rst index eba3111247f6..0d8f91580aa5 100644 --- a/docs/system/targets.rst +++ b/docs/system/targets.rst @@ -17,3 +17,4 @@ Contents: target-arm target-m68k target-xtensa + target-s390x --=20 2.21.1 From nobody Mon May 6 20:24:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584967856; cv=none; d=zohomail.com; s=zohoarc; b=H1gdikXVOJ8KHYAGcxfx/NV6gjdD2DW9lDh53LioCLpM+6M/wahSGBNVNAGbaNH8E62rtfQo93EniTeYWQ0wU4kSfA1iw151JW5vS+b+dfQbnFCEJTdAX0KX5OsRvO9wxjqGNMwz9LcwsNbY79AMlpQbirIuQq8pwZJr0XJO190= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584967855; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fVE0rc5UgDMuPPGqt/A4H+FWifCqAZzhBTjHm2+rASY=; b=cjfwciv9XppuEmIWeSgk51QbGf+g9sQwrvZcRCPWYzmJtsuYBzHKnvNH4XGrHD9QgAtmtbS0owFhFxZNmqNkWDZVnbCK0viKd6y1J/01NZZmY0taOQkZlRMkeUTKc2J8lHHtpXnFa8xZ/qr5wNEFwolV/GI9+wwgM8TSt1RLuGc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584967855995655.1525269629717; Mon, 23 Mar 2020 05:50:55 -0700 (PDT) Received: from localhost ([::1]:33406 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGMXf-00055x-0h for importer@patchew.org; Mon, 23 Mar 2020 08:50:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53383) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGMWQ-0003mV-M6 for qemu-devel@nongnu.org; Mon, 23 Mar 2020 08:49:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jGMWP-0000t4-Kq for qemu-devel@nongnu.org; Mon, 23 Mar 2020 08:49:38 -0400 Received: from us-smtp-delivery-74.mimecast.com ([216.205.24.74]:59395) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jGMWP-0000sP-IM for qemu-devel@nongnu.org; Mon, 23 Mar 2020 08:49:37 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-413-smMkgOjrNpKV-4phGIkZcg-1; Mon, 23 Mar 2020 08:49:35 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0202B1088380; Mon, 23 Mar 2020 12:49:34 +0000 (UTC) Received: from localhost (ovpn-113-18.ams2.redhat.com [10.36.113.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 96C67BBBE5; Mon, 23 Mar 2020 12:49:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584967777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fVE0rc5UgDMuPPGqt/A4H+FWifCqAZzhBTjHm2+rASY=; b=SsP5/qoTE1ya/+rqvoAbr7PUii5cZjzZy199Ni9bYthbPFkO7MgP2hrKYlQKbuZjOr8j7y v6g7YzjmwC133IP0IlxFJRYdgsfP1uJO+a5WQaCl17j+ACmg+ji7ouv+MHJj+oYSRGRkDs eecSaiEWa/GfPaMKADaCbFXXTG+TKHE= X-MC-Unique: smMkgOjrNpKV-4phGIkZcg-1 From: Cornelia Huck To: Peter Maydell Subject: [PULL for-5.0 2/2] s390/ipl: fix off-by-one in update_machine_ipl_properties() Date: Mon, 23 Mar 2020 13:49:23 +0100 Message-Id: <20200323124923.24014-3-cohuck@redhat.com> In-Reply-To: <20200323124923.24014-1-cohuck@redhat.com> References: <20200323124923.24014-1-cohuck@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 216.205.24.74 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Halil Pasic , qemu-s390x@nongnu.org, Cornelia Huck , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Halil Pasic In update_machine_ipl_properties() the array ascii_loadparm needs to hold the 8 char loadparm and a string terminating zero char. Let's increase the size of ascii_loadparm accordingly. Signed-off-by: Halil Pasic Fixes: 0a01e082a428 ("s390/ipl: sync back loadparm") Fixes: Coverity CID 1421966 Reported-by: Peter Maydell Message-Id: <20200320143101.41764-1-pasic@linux.ibm.com> Signed-off-by: Cornelia Huck --- hw/s390x/ipl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index b81942e1e6f9..8c3e01957176 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -546,7 +546,7 @@ static void update_machine_ipl_properties(IplParameterB= lock *iplb) /* Sync loadparm */ if (iplb->flags & DIAG308_FLAGS_LP_VALID) { uint8_t *ebcdic_loadparm =3D iplb->loadparm; - char ascii_loadparm[8]; + char ascii_loadparm[9]; int i; =20 for (i =3D 0; i < 8 && ebcdic_loadparm[i]; i++) { --=20 2.21.1