| Message ID | 1428933396-37887-10-git-send-email-mimu@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Am 13.04.2015 um 15:56 schrieb Michael Mueller: > --- a/target-s390x/cpu-models.c > +++ b/target-s390x/cpu-models.c > @@ -76,3 +87,4 @@ S390_PROC_DEF("2827-ga1", CPU_S390_2827_GA1, "IBM zEnterprise EC12 GA1") > S390_PROC_DEF("2827-ga2", CPU_S390_2827_GA2, "IBM zEnterprise EC12 GA2") > S390_PROC_DEF("2828-ga1", CPU_S390_2828_GA1, "IBM zEnterprise BC12 GA1") > S390_PROC_DEF("2964-ga1", CPU_S390_2964_GA1, "IBM z13 GA1") > + Blank line at end of file, git am also complains: Applying: target-s390x: Define S390 CPU model specific facility lists /home/cborntra/REPOS/qemu/.git/rebase-apply/patch:54: new blank line at EOF. + warning: 1 line adds whitespace errors. -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, 27 Apr 2015 10:11:40 +0200 Christian Borntraeger <borntraeger@de.ibm.com> wrote: > Am 13.04.2015 um 15:56 schrieb Michael Mueller: > > --- a/target-s390x/cpu-models.c > > +++ b/target-s390x/cpu-models.c > > > @@ -76,3 +87,4 @@ S390_PROC_DEF("2827-ga1", CPU_S390_2827_GA1, "IBM zEnterprise EC12 GA1") > > S390_PROC_DEF("2827-ga2", CPU_S390_2827_GA2, "IBM zEnterprise EC12 GA2") > > S390_PROC_DEF("2828-ga1", CPU_S390_2828_GA1, "IBM zEnterprise BC12 GA1") > > S390_PROC_DEF("2964-ga1", CPU_S390_2964_GA1, "IBM z13 GA1") > > + > > Blank line at end of file, git am also complains: > > Applying: target-s390x: Define S390 CPU model specific facility lists > /home/cborntra/REPOS/qemu/.git/rebase-apply/patch:54: new blank line at EOF. > + > warning: 1 line adds whitespace errors. I will address this here and in the next patch, checkpatch does not seem to catch that. -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/target-s390x/cpu-models.c b/target-s390x/cpu-models.c index 147e221..6cc121b 100644 --- a/target-s390x/cpu-models.c +++ b/target-s390x/cpu-models.c @@ -12,6 +12,7 @@ #include "qemu-common.h" #include "cpu-models.h" +#include "gen-facilities.h" #define S390_PROC_DEF(_name, _cpu_id, _desc) \ static void \ @@ -20,6 +21,10 @@ { \ DeviceClass *dc = DEVICE_CLASS(oc); \ S390CPUClass *cc = S390_CPU_CLASS(oc); \ + uint64_t nbits = FAC_LIST_CPU_S390_SIZE_UINT1; \ + uint64_t fac_list[FAC_LIST_CPU_S390_SIZE_UINT64] = { \ + glue(FAC_LIST_, _cpu_id) \ + }; \ \ cc->is_migration_safe = true; \ cc->mach.ga = cpu_ga(_cpu_id); \ @@ -30,6 +35,7 @@ cc->proc.id = S390_DEF_ID; \ cc->proc.type = cpu_type(_cpu_id); \ cc->proc.ibc = S390_DEF_IBC; \ + bitmap_copy(cc->proc.fac_list, fac_list, nbits); \ dc->desc = _desc; \ } \ static const TypeInfo \ @@ -46,6 +52,11 @@ } \ type_init(glue(_cpu_id, _cpu_register_types)) +/* facilities implemented by qemu */ +uint64_t qemu_s390_fac_list_mask[FAC_LIST_CPU_S390_SIZE_UINT64] = { + FAC_LIST_CPU_S390_MASK_QEMU +}; + /* define S390 CPU model classes */ S390_PROC_DEF("2064-ga1", CPU_S390_2064_GA1, "IBM zSeries 900 GA1") S390_PROC_DEF("2064-ga2", CPU_S390_2064_GA2, "IBM zSeries 900 GA2") @@ -76,3 +87,4 @@ S390_PROC_DEF("2827-ga1", CPU_S390_2827_GA1, "IBM zEnterprise EC12 GA1") S390_PROC_DEF("2827-ga2", CPU_S390_2827_GA2, "IBM zEnterprise EC12 GA2") S390_PROC_DEF("2828-ga1", CPU_S390_2828_GA1, "IBM zEnterprise BC12 GA1") S390_PROC_DEF("2964-ga1", CPU_S390_2964_GA1, "IBM z13 GA1") + diff --git a/target-s390x/cpu-models.h b/target-s390x/cpu-models.h index b02c38b..948af10 100644 --- a/target-s390x/cpu-models.h +++ b/target-s390x/cpu-models.h @@ -13,6 +13,14 @@ #ifndef TARGET_S390X_CPU_MODELS_H #define TARGET_S390X_CPU_MODELS_H +#include "cpu-facilities.h" +#include "gen-facilities.h" + +#define FAC_LIST_ARCH_S390_SIZE_UINT1 \ + (FAC_LIST_ARCH_S390_SIZE_UINT8 * BITS_PER_BYTE) +#define FAC_LIST_ARCH_S390_SIZE_UINT64 \ + (FAC_LIST_ARCH_S390_SIZE_UINT8 / sizeof(uint64_t)) + #define S390_EC 0x1 #define S390_BC 0x2 diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c index 8f49813..9232a97 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -29,6 +29,7 @@ #include "qemu/error-report.h" #include "hw/hw.h" #include "trace.h" +#include "cpu-models.h" #ifndef CONFIG_USER_ONLY #include "sysemu/arch_init.h" #endif
This patch defines S390 CPU facilities and their presence at the different CPU model levels. Beside defining a base which facilities have to be requested per CPU model, these sets are associated to the defined CPU classes and used to calculate the list of supported CPU models in context of the current hosting machine model. The also defined qemu side facility mask allows to implement and enable facilities in QEMU land. Signed-off-by: Michael Mueller <mimu@linux.vnet.ibm.com> --- target-s390x/cpu-models.c | 12 ++++++++++++ target-s390x/cpu-models.h | 8 ++++++++ target-s390x/cpu.c | 1 + 3 files changed, 21 insertions(+)