diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/libxc/xc_cpuid_x86.c | 3 | ||||
| -rw-r--r-- | tools/python/xen/lowlevel/xc/xc.c | 2 | ||||
| -rw-r--r-- | tools/python/xen/xm/create.py | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/tools/libxc/xc_cpuid_x86.c b/tools/libxc/xc_cpuid_x86.c index f59618236e..2317b4d38d 100644 --- a/tools/libxc/xc_cpuid_x86.c +++ b/tools/libxc/xc_cpuid_x86.c @@ -385,7 +385,10 @@ int xc_cpuid_set( for ( i = 0; i < 4; i++ ) { if ( config[i] == NULL ) + { + regs[i] = polregs[i]; continue; + } config_transformed[i] = alloc_str(); diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index 709bbba62b..136634a59b 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -696,7 +696,7 @@ static PyObject *pyxc_dom_set_cpuid(XcObject *self, unsigned int input[2]; char *regs[4], *regs_transform[4]; - if ( !PyArg_ParseTuple(args, "iiOO", &domid, + if ( !PyArg_ParseTuple(args, "IIOO", &domid, &input[0], &sub_input, &config) ) return NULL; diff --git a/tools/python/xen/xm/create.py b/tools/python/xen/xm/create.py index 7dc83f59b3..6c1b5c049c 100644 --- a/tools/python/xen/xm/create.py +++ b/tools/python/xen/xm/create.py @@ -856,7 +856,9 @@ def preprocess_cpuid(vals, attr_name): if not vals.cpuid: return cpuid = {} for cpuid_input in getattr(vals, attr_name): - cpuid_match = re.match(r"(?P<input>(0x)?[0-9A-Fa-f]+):(?P<regs>.*)", cpuid_input) + input_re = "(0x)?[0-9A-Fa-f]+(,(0x)?[0-9A-Fa-f]+)?" + cpuid_match = re.match(r'(?P<input>%s):(?P<regs>.*)' % \ + input_re, cpuid_input) if cpuid_match != None: res_cpuid = cpuid_match.groupdict() input = res_cpuid['input'] |