~ubuntu-branches/ubuntu/quantal/virtinst/quantal-proposed

« back to all changes in this revision

Viewing changes to tests/xmlconfig-xml/install-windowsxp-kvm.xml

  • Committer: Bazaar Package Importer
  • Author(s): Jean-Louis Dupond
  • Date: 2010-05-05 03:32:42 UTC
  • mfrom: (1.3.13 sid)
  • Revision ID: james.westby@ubuntu.com-20100505033242-um6f6pjcc89i07m0
Tags: 0.500.3-1ubuntu1
* Merge from debian unstable. (LP: #590068)  Remaining changes:
  - debian/patches/9001_Ubuntu.patch:
     + Added lucid and maverick to OS list and enable virtio for it.
  - debian/patches/0003-Fix-patch-to-keyboard-configuration.patch: disable
    as the keyboard config in Ubuntu is still in /etc/default/console-setup
    and this was causing virt-manager to always default to a en-us
    keyboard. (LP: #524318)
  - debian/control: added acl package to depends. (LP: #533048)
  - Demote virt-viewer to Suggests, as it's in universe.
  - Recommends libvirt-bin (LP: #215084)
* debian/patches/9002-add-ca-keymap.patch: dropped, its now in upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
18
18
  <devices>
19
19
    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
20
20
    <disk type='file' device='disk'>
 
21
      <driver name='qemu' type='raw'/>
21
22
      <source file='/tmp/test.img'/>
22
23
      <target dev='hda' bus='ide'/>
23
24
    </disk>
24
25
    <disk type='block' device='disk'>
 
26
      <driver name='qemu'/>
25
27
      <source dev='/dev/loop0'/>
26
28
      <target dev='hdb' bus='ide'/>
27
29
    </disk>
28
30
    <disk type='block' device='cdrom'>
 
31
      <driver name='qemu'/>
29
32
      <source dev='/dev/loop0'/>
30
33
      <target dev='hdc' bus='ide'/>
31
34
      <readonly/>
37
40
    <input type='tablet' bus='usb'/>
38
41
    <graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
39
42
    <console type='pty'/>
 
43
    <sound model='es1370'/>
 
44
    <video>
 
45
      <model type='vga'/>
 
46
    </video>
40
47
  </devices>
41
48
</domain>