[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/9] target-i386: Allow short strings to be used as
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 2/9] target-i386: Allow short strings to be used as vendor ID |
Date: |
Mon, 16 Jan 2017 23:01:57 -0200 |
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 <address@hidden>
---
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 3b7fb331b6..6046cc0ced 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -1769,19 +1769,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);
}
}
--
2.11.0.259.g40922b1
- [Qemu-devel] [PATCH 0/9] i386: query-cpu-model-expansion test script, Eduardo Habkost, 2017/01/16
- [Qemu-devel] [PATCH 1/9] target-i386: Move "host" properties to base class, Eduardo Habkost, 2017/01/16
- [Qemu-devel] [PATCH 2/9] target-i386: Allow short strings to be used as vendor ID,
Eduardo Habkost <=
- [Qemu-devel] [PATCH 3/9] cpu: Support comma escaping when parsing -cpu, Eduardo Habkost, 2017/01/16
- [Qemu-devel] [PATCH 4/9] qemu.py: Make logging optional, Eduardo Habkost, 2017/01/16
- [Qemu-devel] [PATCH 5/9] qtest.py: Support QTEST_LOG environment variable, Eduardo Habkost, 2017/01/16
- [Qemu-devel] [PATCH 6/9] qtest.py: make logging optional, Eduardo Habkost, 2017/01/16
- [Qemu-devel] [PATCH 7/9] qtest.py: Make 'binary' parameter optional, Eduardo Habkost, 2017/01/16
- [Qemu-devel] [PATCH 8/9] tests: Add rules to non-gtester qtest test cases, Eduardo Habkost, 2017/01/16
- [Qemu-devel] [PATCH 9/9] tests: Test case for query-cpu-model-expansion, Eduardo Habkost, 2017/01/16