From: Sam bobroff Date: Wed, 25 Jun 2014 03:54:32 +0000 (+1000) Subject: spapr: Add RTAS sysparm SPLPAR Characteristics X-Git-Tag: qemu-xen-4.6.0-rc1~348^2~9 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=3b50d8974b979bbaa091978e70d83de939593d1f;p=qemu-upstream-4.6-testing.git spapr: Add RTAS sysparm SPLPAR Characteristics Add support for the SPLPAR Characteristics parameter to the emulated RTAS call ibm,get-system-parameter. The support provides just enough information to allow "cat /proc/powerpc/lparcfg" to succeed without generating a kernel error message. Without this patch the above command will produce the following kernel message: arch/powerpc/platforms/pseries/lparcfg.c \ parse_system_parameter_string Error calling get-system-parameter \ (0xfffffffd) Signed-off-by: Sam Bobroff Signed-off-by: Alexander Graf --- diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c index dba4e2b20..9ba1ba69f 100644 --- a/hw/ppc/spapr_rtas.c +++ b/hw/ppc/spapr_rtas.c @@ -234,6 +234,13 @@ static void rtas_ibm_get_system_parameter(PowerPCCPU *cpu, target_ulong ret = RTAS_OUT_SUCCESS; switch (parameter) { + case RTAS_SYSPARM_SPLPAR_CHARACTERISTICS: { + char *param_val = g_strdup_printf("MaxEntCap=%d,MaxPlatProcs=%d", + max_cpus, smp_cpus); + rtas_st_buffer(buffer, length, (uint8_t *)param_val, strlen(param_val)); + g_free(param_val); + break; + } case RTAS_SYSPARM_DIAGNOSTICS_RUN_MODE: { uint8_t param_val = DIAGNOSTICS_RUN_MODE_DISABLED; @@ -260,6 +267,7 @@ static void rtas_ibm_set_system_parameter(PowerPCCPU *cpu, target_ulong ret = RTAS_OUT_NOT_SUPPORTED; switch (parameter) { + case RTAS_SYSPARM_SPLPAR_CHARACTERISTICS: case RTAS_SYSPARM_DIAGNOSTICS_RUN_MODE: case RTAS_SYSPARM_UUID: ret = RTAS_OUT_NOT_AUTHORIZED; diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 46b7a7173..3b6ccd395 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -398,6 +398,7 @@ static inline int spapr_allocate_lsi(int hint) #define RTAS_TOKEN_MAX (RTAS_TOKEN_BASE + 0x21) /* RTAS ibm,get-system-parameter token values */ +#define RTAS_SYSPARM_SPLPAR_CHARACTERISTICS 20 #define RTAS_SYSPARM_DIAGNOSTICS_RUN_MODE 42 #define RTAS_SYSPARM_UUID 48