From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59259) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yq0dO-0007PF-H6 for qemu-devel@nongnu.org; Wed, 06 May 2015 10:49:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yq0dK-00023F-Cz for qemu-devel@nongnu.org; Wed, 06 May 2015 10:49:14 -0400 Received: from e06smtp14.uk.ibm.com ([195.75.94.110]:52034) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yq0dJ-00022g-Vi for qemu-devel@nongnu.org; Wed, 06 May 2015 10:49:10 -0400 Received: from /spool/local by e06smtp14.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 6 May 2015 15:49:06 +0100 Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by d06dlp03.portsmouth.uk.ibm.com (Postfix) with ESMTP id 1B7091B0805F for ; Wed, 6 May 2015 15:49:43 +0100 (BST) Received: from d06av11.portsmouth.uk.ibm.com (d06av11.portsmouth.uk.ibm.com [9.149.37.252]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t46En0Db2425100 for ; Wed, 6 May 2015 14:49:00 GMT Received: from d06av11.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av11.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t46EmxNJ000503 for ; Wed, 6 May 2015 08:49:00 -0600 Date: Wed, 6 May 2015 16:48:57 +0200 From: Michael Mueller Message-ID: <20150506164857.5df6a1ae@bee> In-Reply-To: <20150506123741.GH25766@thinpad.lan.raisama.net> References: <1430146411-34632-1-git-send-email-mimu@linux.vnet.ibm.com> <1430146411-34632-16-git-send-email-mimu@linux.vnet.ibm.com> <20150506123741.GH25766@thinpad.lan.raisama.net> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v6 15/17] target-s390x: Extend arch specific QMP command query-cpu-definitions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost Cc: Cornelia Huck , Gleb Natapov , qemu-devel@nongnu.org, Alexander Graf , Christian Borntraeger , "Jason J. Herne" , Daniel Hansel , Paolo Bonzini , Andreas Faerber , Richard Henderson On Wed, 6 May 2015 09:37:41 -0300 Eduardo Habkost wrote: > On Mon, Apr 27, 2015 at 04:53:29PM +0200, Michael Mueller wrote: > [...] > > #ifndef CONFIG_USER_ONLY > > +static CpuDefinitionInfoList *qmp_query_cpu_definition_host(void) > > +{ > > + CpuDefinitionInfoList *host = NULL; > > + CpuDefinitionInfo *info; > > + > > + info = g_try_new0(CpuDefinitionInfo, 1); > > + if (!info) { > > + goto out; > > + } > > + info->name = g_strdup("host"); > > + > > + host = g_try_new0(CpuDefinitionInfoList, 1); > > + if (!host) { > > + g_free(info->name); > > + g_free(info); > > + goto out; > > + } > > + host->value = info; > > +out: > > + return host; > > +} > [...] > > CpuDefinitionInfoList *arch_query_cpu_definitions(bool has_machine, > > const char *machine, > > bool has_accel, > > AccelId accel, > > Error **errp) > > { > > - CpuDefinitionInfoList *entry; > > - CpuDefinitionInfo *info; > > + S390MachineProps mach; > > + GSList *classes; > > + uint64_t *mask = NULL; > > + CpuDefinitionInfoList *list = NULL; > > + > > + if (has_machine) { > > + mask = s390_fac_list_mask_by_machine(machine); > > + if (!mask) { > > + error_set(errp, QERR_INVALID_PARAMETER_VALUE, "machine", > > + "a valid machine type"); > > + return NULL; > > + } > > + } > > I would like to understand better the meaning of "runnable" when machine > is omitted. Is it really possible to tell if a CPU model is runnable if > no machine/mask info is provided as input? Yes it is. The list of runnable CPU models is derived from the set of S390 CPU facilities available. One subset of facilities depends on the accelerator and the second on the capabilities of QEMU which is represented by the mask. In the case the no machine is specified only those of the accelerator are taken into account for the calculation. It is even possible to omit both, the accelerator and the machine, in that case only the model none is runnable and becomes the default: {"return":[{"order":3345,"name":"2964-ga1","live-migration-safe":true},{"name":"zBC12"}, {"name":"2828"},{"order":3105,"name":"2828-ga1","live-migration-safe":true},{"name":"host"}, {"name":"zEC12"},{"name":"2827"},{"order":3090,"name":"2827-ga2","live-migration-safe":true}, {"order":3089,"name":"2827-ga1","live-migration-safe":true},{"name":"z114"},{"name":"2818"}, {"order":2849,"name":"2818-ga1","live-migration-safe":true},{"name":"z196"},{"name":"2817"}, {"order":2834,"name":"2817-ga2","live-migration-safe":true},{"order":2833,"name":"2817-ga1", "live-migration-safe":true},{"name":"z10-bc"},{"name":"2098"},{"order":2594,"name":"2098-ga2", "live-migration-safe":true},{"order":2593,"name":"2098-ga1","live-migration-safe":true}, {"name":"z10-ec"},{"name":"z10"},{"name":"2097"},{"order":2579,"name":"2097-ga3", "live-migration-safe":true},{"order":2578,"name":"2097-ga2","live-migration-safe":true}, {"order":2577,"name":"2097-ga1","live-migration-safe":true},{"name":"z9-bc"},{"name":"2096"}, {"order":2338,"name":"2096-ga2","live-migration-safe":true},{"order":2337,"name":"2096-ga1", "live-migration-safe":true},{"name":"z9-ec"},{"name":"z9"},{"name":"2094"},{"order":2323, "name":"2094-ga3","live-migration-safe":true},{"order":2322,"name":"2094-ga2", "live-migration-safe":true},{"name":"z9-109"},{"order":2321,"name":"2094-ga1", "live-migration-safe":true},{"name":"z890"},{"name":"2086"},{"order":2083,"name":"2086-ga3", "live-migration-safe":true},{"order":2082,"name":"2086-ga2","live-migration-safe":true}, {"order":2081,"name":"2086-ga1","live-migration-safe":true},{"name":"z990"},{"name":"2084"}, {"order":2069,"name":"2084-ga5","live-migration-safe":true},{"order":2068,"name":"2084-ga4", "live-migration-safe":true},{"order":2067,"name":"2084-ga3","live-migration-safe":true}, {"order":2066,"name":"2084-ga2","live-migration-safe":true},{"order":2065,"name":"2084-ga1", "live-migration-safe":true},{"name":"z800"},{"name":"2066"},{"order":1825,"name":"2066-ga1", "live-migration-safe":true},{"name":"z900"},{"name":"2064"},{"order":1811,"name":"2064-ga3", "live-migration-safe":true},{"order":1810,"name":"2064-ga2","live-migration-safe":true}, {"order":1809,"name":"2064-ga1","live-migration-safe":true},{"name":"none","runnable":true, "is-default":true}],"id":"libvirt-15"} > > If machine is omitted and the command returns runnable=true, does that > mean the CPU model is runnable using any machine? Does it mean it is > runnable using some of the available machines? If so, which ones? Does > it mean something else? As it is a lower limit all machines shall be able to run it. Although a somewhat clever management interface should iterate through all accel/machine combinations. > > > > > - info = g_malloc0(sizeof(*info)); > > - info->name = g_strdup("host"); > > + memset(&mach, 0, sizeof(mach)); > > + if (has_accel) { > > + switch (accel) { > > + case ACCEL_ID_KVM: > > + kvm_s390_get_machine_props(NULL, &mach); > > + break; > > + default: > > + return qmp_query_cpu_definition_host(); > > This will return only a single element. I don't think that's correct. If > machine or accel is omitted, I believe we should just omit the > "runnable" field, but always return the full list of CPU models. That is the !KVM case where I keep the behavior currently unchanged to the existing implementation. But right for the TCG case there has to be a comparable get_machine_props() call returning whatever TCG is implementing. But that is not part of this patch series. > > > + } > > + } > > > > - entry = g_malloc0(sizeof(*entry)); > > - entry->value = info; > > + s390_setup_cpu_classes(ACCEL_TEMP, &mach, mask); > > + > > + classes = object_class_get_list(TYPE_S390_CPU, false); > > + classes = g_slist_sort(classes, s390_cpu_class_asc_order_compare); > > + g_slist_foreach(classes, qmp_query_cpu_definition_entry, &list); > > + g_slist_free(classes); > > > > - return entry; > > + return list; > > } > > #endif > > > [...] >