From patchwork Fri Dec 2 21:18:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 9459253 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0595560585 for ; Fri, 2 Dec 2016 21:23:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E77702522B for ; Fri, 2 Dec 2016 21:23:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DC5B6285B2; Fri, 2 Dec 2016 21:23:50 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI 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 7E5102522B for ; Fri, 2 Dec 2016 21:23:50 +0000 (UTC) Received: from localhost ([::1]:36507 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cCvJ7-0000Bu-HO for patchwork-qemu-devel@patchwork.kernel.org; Fri, 02 Dec 2016 16:23:49 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48185) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cCvEF-0004qh-61 for qemu-devel@nongnu.org; Fri, 02 Dec 2016 16:18:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cCvEE-0003Mg-FZ for qemu-devel@nongnu.org; Fri, 02 Dec 2016 16:18:47 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58096) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cCvEE-0003MK-AV for qemu-devel@nongnu.org; Fri, 02 Dec 2016 16:18:46 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 854278B975 for ; Fri, 2 Dec 2016 21:18:45 +0000 (UTC) Received: from localhost (ovpn-116-204.phx2.redhat.com [10.3.116.204]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uB2LIidr023039; Fri, 2 Dec 2016 16:18:45 -0500 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Fri, 2 Dec 2016 19:18:09 -0200 Message-Id: <1480713496-11213-11-git-send-email-ehabkost@redhat.com> In-Reply-To: <1480713496-11213-1-git-send-email-ehabkost@redhat.com> References: <1480713496-11213-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 02 Dec 2016 21:18:45 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH for-2.9 10/17] target-i386: Allow short strings to be used as vendor ID X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP If a short string is specified, it will be padded with zeroes. Without this, "query-cpu-model-expansion model=base" would return an expansion that would never work in the command-line. Signed-off-by: Eduardo Habkost --- target-i386/cpu.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 98e1063..a584c3e 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1789,19 +1789,22 @@ static void x86_cpuid_set_vendor(Object *obj, const char *value, X86CPU *cpu = X86_CPU(obj); CPUX86State *env = &cpu->env; int i; + char buf[CPUID_VENDOR_SZ] = { 0 }; - if (strlen(value) != CPUID_VENDOR_SZ) { + if (strlen(value) > CPUID_VENDOR_SZ) { error_setg(errp, QERR_PROPERTY_VALUE_BAD, "", "vendor", value); return; } + strncpy(buf, value, sizeof(buf)); + env->cpuid_vendor1 = 0; env->cpuid_vendor2 = 0; env->cpuid_vendor3 = 0; for (i = 0; i < 4; i++) { - env->cpuid_vendor1 |= ((uint8_t)value[i ]) << (8 * i); - env->cpuid_vendor2 |= ((uint8_t)value[i + 4]) << (8 * i); - env->cpuid_vendor3 |= ((uint8_t)value[i + 8]) << (8 * i); + env->cpuid_vendor1 |= ((uint8_t)buf[i]) << (8 * i); + env->cpuid_vendor2 |= ((uint8_t)buf[i + 4]) << (8 * i); + env->cpuid_vendor3 |= ((uint8_t)buf[i + 8]) << (8 * i); } }