From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37307) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dtyTo-0006qp-If for qemu-devel@nongnu.org; Mon, 18 Sep 2017 12:01:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dtyTi-0007mC-Oz for qemu-devel@nongnu.org; Mon, 18 Sep 2017 12:01:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45628) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dtyTi-0007m2-JG for qemu-devel@nongnu.org; Mon, 18 Sep 2017 12:00:58 -0400 From: David Hildenbrand Date: Mon, 18 Sep 2017 17:59:49 +0200 Message-Id: <20170918160012.4317-5-david@redhat.com> In-Reply-To: <20170918160012.4317-1-david@redhat.com> References: <20170918160012.4317-1-david@redhat.com> Subject: [Qemu-devel] [PATCH v1 04/27] s390x: introduce and use S390_MAX_CPUS List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Richard Henderson , thuth@redhat.com, cohuck@redhat.com, david@redhat.com, borntraeger@de.ibm.com, Alexander Graf , Igor Mammedov , Aurelien Jarno , Matthew Rosato , =?UTF-8?q?Alex=20Benn=C3=A9e?= Will be handy in the next patches. Signed-off-by: David Hildenbrand --- hw/s390x/s390-virtio-ccw.c | 2 +- target/s390x/cpu.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index d5a12a2472..a57d435cbf 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -443,7 +443,7 @@ static void ccw_machine_class_init(ObjectClass *oc, void *data) mc->no_parallel = 1; mc->no_sdcard = 1; mc->use_sclp = 1; - mc->max_cpus = 248; + mc->max_cpus = S390_MAX_CPUS; mc->has_hotpluggable_cpus = true; mc->get_hotplug_handler = s390_get_hotplug_handler; mc->cpu_index_to_instance_props = s390_cpu_index_to_props; diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index f13aea3dd8..5f539b1057 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -59,6 +59,8 @@ #define PSW_MCHK_MASK 0x0004000000000000 #define PSW_IO_MASK 0x0200000000000000 +#define S390_MAX_CPUS 248 + typedef struct PSW { uint64_t mask; uint64_t addr; -- 2.13.5