Message ID | 20180723201748.25573-58-mdroth@linux.vnet.ibm.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0A120112E for <patchwork-qemu-devel@patchwork.kernel.org>; Mon, 23 Jul 2018 21:11:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EEE44285A7 for <patchwork-qemu-devel@patchwork.kernel.org>; Mon, 23 Jul 2018 21:11:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ED4AB285A8; Mon, 23 Jul 2018 21:11:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6C56C285AD for <patchwork-qemu-devel@patchwork.kernel.org>; Mon, 23 Jul 2018 21:11:20 +0000 (UTC) Received: from localhost ([::1]:36661 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org>) id 1fhi6x-0007NV-GD for patchwork-qemu-devel@patchwork.kernel.org; Mon, 23 Jul 2018 17:11:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42358) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <flukshun@gmail.com>) id 1fhhJt-000397-Gp for qemu-devel@nongnu.org; Mon, 23 Jul 2018 16:20:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <flukshun@gmail.com>) id 1fhhJr-0004qU-7Q for qemu-devel@nongnu.org; Mon, 23 Jul 2018 16:20:37 -0400 Received: from mail-oi0-x22d.google.com ([2607:f8b0:4003:c06::22d]:40348) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <flukshun@gmail.com>) id 1fhhJr-0004qB-1z; Mon, 23 Jul 2018 16:20:35 -0400 Received: by mail-oi0-x22d.google.com with SMTP id w126-v6so3478066oie.7; Mon, 23 Jul 2018 13:20:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=/GJkBe1r4wQptuy97THglNYn4b/4p6mfnUmhtPMpMHI=; b=YWSRITgpCHIMTzphmcReurutL6ik2bL5EHIi/oX+Qy3dG4rnJztGdJYxSiekKHwsaM 7L0mG2x6Jw7Yv96sE/G9oOySRXQ9EnNxm7oaOLCMOB94d3sMGnTbwh5I5sI8SHEsmtLQ IWqopcPU8eeR76yg5o+idbAYFDiyF6ygB9eU0HHaVE2RjYlm0FxDsb9rqi75ggfS6FgT EWBpwHURJk6WKed/b12nY+xQqhcGOv+9ZAFbkS3Im8ukhUGW50UMUTRJehTa0rOb3DaH wCqwrY3CEG7FpP7H6+dvOJWyeM3bogt8pTuwtT/M3zhX5BJg5CQgFSuuOh3ai5EGVI9E MVcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=/GJkBe1r4wQptuy97THglNYn4b/4p6mfnUmhtPMpMHI=; b=qZNCl+sH/peEaT+12zprM5lLq9bTAocjnqSsK20WPOksp74mReVwiU8z5Hb/ySurOY /hzdm4iCNW/VGK/0thCnCcgN2tl5xyhaiH5kYtdwbHacpGImlvbMh8M4TKucNpMyNazW 9z0X4kMKdcbvVgvEFFfh9xmCuDcFPrYbEhsjzgxaPmwn6+OHf8otoadnPH2bNshoJZ5L prkffrWwUgFEbCSTU+vJxhz+mc2VeYlRRK5tk3l1gTlCTb1w+5qRLNOZ7F1eg0ECXpnq 3If+M/tS1/Mu+WuwgZ/ihNb/J4T8FRPoTr+KhIj8W86YcrlPSIQvQdRcXepJmYYS5Oon J5vg== X-Gm-Message-State: AOUpUlG0Zisby3CI+AUECjs76awCWY9vv+Wvl6JqOKbzJYMLpu7y5XTB fJN5vjUPFCZwjrooqGM0M8glCrECFUZc0w== X-Google-Smtp-Source: AAOMgpefX36DTncIZoMaiajUJoiPXoyxRN3DYGZpLDD6BhSUGfTRM6s45Qg15Jkf06W+4M2wavTrvw== X-Received: by 2002:aca:e6cd:: with SMTP id d196-v6mr324201oih.94.1532377233866; Mon, 23 Jul 2018 13:20:33 -0700 (PDT) Received: from localhost (76-251-165-188.lightspeed.austtx.sbcglobal.net. [76.251.165.188]) by smtp.gmail.com with ESMTPSA id m62-v6sm26387051oik.30.2018.07.23.13.20.32 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 23 Jul 2018 13:20:32 -0700 (PDT) From: Michael Roth <mdroth@linux.vnet.ibm.com> To: qemu-devel@nongnu.org Date: Mon, 23 Jul 2018 15:17:06 -0500 Message-Id: <20180723201748.25573-58-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180723201748.25573-1-mdroth@linux.vnet.ibm.com> References: <20180723201748.25573-1-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4003:c06::22d Subject: [Qemu-devel] [PATCH 57/99] qapi: fill in CpuInfoFast.arch in query-cpus-fast X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: Laszlo Ersek <lersek@redhat.com>, Cornelia Huck <cohuck@redhat.com>, qemu-stable@nongnu.org, Viktor VM Mihajlovski <mihajlov@linux.vnet.ibm.com>, Markus Armbruster <armbru@redhat.com> Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org> X-Virus-Scanned: ClamAV using ClamSMTP |
Series |
Patch Round-up for stable 2.12.1, freeze on 2018-07-30
|
expand
|
diff --git a/cpus.c b/cpus.c index e1d94038fd..6fa701e423 100644 --- a/cpus.c +++ b/cpus.c @@ -2218,11 +2218,25 @@ CpuInfoFastList *qmp_query_cpus_fast(Error **errp) info->value->props = props; } -#if defined(TARGET_S390X) +#if defined(TARGET_I386) + info->value->arch = CPU_INFO_ARCH_X86; +#elif defined(TARGET_PPC) + info->value->arch = CPU_INFO_ARCH_PPC; +#elif defined(TARGET_SPARC) + info->value->arch = CPU_INFO_ARCH_SPARC; +#elif defined(TARGET_MIPS) + info->value->arch = CPU_INFO_ARCH_MIPS; +#elif defined(TARGET_TRICORE) + info->value->arch = CPU_INFO_ARCH_TRICORE; +#elif defined(TARGET_S390X) s390_cpu = S390_CPU(cpu); env = &s390_cpu->env; info->value->arch = CPU_INFO_ARCH_S390; info->value->u.s390.cpu_state = env->cpu_state; +#elif defined(TARGET_RISCV) + info->value->arch = CPU_INFO_ARCH_RISCV; +#else + info->value->arch = CPU_INFO_ARCH_OTHER; #endif if (!cur_item) { head = cur_item = info; diff --git a/qapi/misc.json b/qapi/misc.json index 5636f4a149..104d013adb 100644 --- a/qapi/misc.json +++ b/qapi/misc.json @@ -573,7 +573,7 @@ 'mips': 'CpuInfoOther', 'tricore': 'CpuInfoOther', 's390': 'CpuInfoS390', - 'riscv': 'CpuInfoRISCV', + 'riscv': 'CpuInfoOther', 'other': 'CpuInfoOther' } } ##