Revision 4f08cd0b

b/image_creator/os_type/__init__.py
255 255
            return
256 256

  
257 257
        for name, param in self.needed_sysprep_params.items():
258
            self.out.output("\t%s (%s): %s" %
258
            self.out.output("\t%s [%s]: %s" %
259 259
                            (param.description, name,
260 260
                             self.sysprep_params[name] if name in
261 261
                             self.sysprep_params else "(none)"))
b/image_creator/os_type/windows.py
119 119
        'boot_timeout', int, 300, "Boot Timeout (seconds)", _POSINT)
120 120
    @add_sysprep_param(
121 121
        'connection_retries', int, 5, "Connection Retries", _POSINT)
122
    @add_sysprep_param(
123
        'smp', int, 1, "Number of CPUs for the helper VM", _POSINT)
124
    @add_sysprep_param(
125
        'mem', int, 1024, "Virtual RAM size for the helper VM (MiB)", _POSINT)
122 126
    @add_sysprep_param('password', str, None, 'Image Administrator Password')
123 127
    def __init__(self, image, **kargs):
124 128
        super(Windows, self).__init__(image, **kargs)
......
800 804
        args.extend(needed_args)
801 805

  
802 806
        args.extend([
803
            '-smp', '1', '-m', '1024', '-drive',
804
            'file=%s,format=raw,cache=unsafe,if=virtio' % self.disk,
807
            '-smp', str(self.params['smp']), '-m', str(self.params['mem']),
808
            '-drive', 'file=%s,format=raw,cache=unsafe,if=virtio' % self.disk,
805 809
            '-netdev', 'type=user,hostfwd=tcp::445-:445,id=netdev0',
806 810
            '-device', 'virtio-net-pci,mac=%s,netdev=netdev0' % random_mac(),
807 811
            '-vnc', ':%d' % self.display, '-serial', 'file:%s' % self.serial,

Also available in: Unified diff