shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-26 14:03:49 +03:00
Code Releases Activity

Set default disk controller/bus/unit props

Browse Source 
When parsing the <disk> element specification, if no <address>
is provided for the disk, then automatically assign one based on
the <target dev='sdXX'/> device name. This provides for backwards
compatability with existing applications using libvirt, while also
allowing new apps to have complete fine grained control.

* src/conf/domain_conf.h, src/conf/domain_conf.c,
  src/libvirt_private.syms: Add virDomainDiskDefAssignAddress()
  for assigning a controller/bus/unit address based on disk target
* src/qemu/qemu_conf.c: Call virDomainDiskDefAssignAddress() after
  generating XML from ARGV
* tests/qemuxml2argvdata/*.xml: Add in drive address information
  to all XML files
This commit is contained in:
Daniel P. Berrange 2009-12-22 16:53:20 +00:00
parent a9e4ea94f1
commit 776e37e1eb
81 changed files with 147 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/conf/domain_conf.c
View File

@ -1025,7 +1025,7 @@ virDomainDeviceInfoParseXML(virConnectPtr conn,
break;
case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE:
if (virDomainDeviceDriveAddressParseXML(conn, node, &info->addr.drive) < 0)
if (virDomainDeviceDriveAddressParseXML(conn, address, &info->addr.drive) < 0)
goto cleanup;
break;
@ -1044,6 +1044,45 @@ cleanup:
}
void
virDomainDiskDefAssignAddress(virDomainDiskDefPtr def)
{
int idx = virDiskNameToIndex(def->dst);
switch (def->bus) {
case VIR_DOMAIN_DISK_BUS_SCSI:
/* For SCSI we define the default mapping to be 7 units
* per bus, 1 bus per controller, many controllers */
def->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE;
def->info.addr.drive.controller = idx / 7;
def->info.addr.drive.bus = 0;
def->info.addr.drive.unit = idx % 7;
break;
case VIR_DOMAIN_DISK_BUS_IDE:
/* For IDE we define the default mapping to be 2 units
* per bus, 2 bus per controller, many controllers */
def->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE;
def->info.addr.drive.controller = idx / 4;
def->info.addr.drive.bus = (idx % 4) / 2;
def->info.addr.drive.unit = (idx % 2);
break;
case VIR_DOMAIN_DISK_BUS_FDC:
/* For FDC we define the default mapping to be 2 units
* per bus, 1 bus per controller, many controllers */
def->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE;
def->info.addr.drive.controller = idx / 2;
def->info.addr.drive.bus = 0;
def->info.addr.drive.unit = idx % 2;
break;
default:
/* Other disk bus's aren't controller based */
break;
}
}
/* Parse the XML definition for a disk
* @param node XML nodeset to parse for disk definition
*/
@ -1271,6 +1310,9 @@ virDomainDiskDefParseXML(virConnectPtr conn,
def->serial = serial;
serial = NULL;
if (def->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE)
virDomainDiskDefAssignAddress(def);
cleanup:
VIR_FREE(bus);
VIR_FREE(type);

1
src/conf/domain_conf.h
View File

@ -773,6 +773,7 @@ int virDomainDiskInsert(virDomainDefPtr def,
virDomainDiskDefPtr disk);
void virDomainDiskInsertPreAlloced(virDomainDefPtr def,
virDomainDiskDefPtr disk);
void virDomainDiskDefAssignAddress(virDomainDiskDefPtr def);
int virDomainSaveXML(virConnectPtr conn,
const char *configDir,

1
src/libvirt_private.syms
View File

@ -129,6 +129,7 @@ virDomainDiskDefFree;
virDomainDiskDeviceTypeToString;
virDomainDiskInsert;
virDomainDiskInsertPreAlloced;
virDomainDiskDefAssignAddress;
virDomainFindByID;
virDomainFindByName;
virDomainFindByUUID;

4
src/qemu/qemu_conf.c
View File

@ -3271,6 +3271,8 @@ qemuParseCommandLineDisk(virConnectPtr conn,
else
def->dst[2] = 'a' + idx;
virDomainDiskDefAssignAddress(def);
cleanup:
for (i = 0 ; i < nkeywords ; i++) {
VIR_FREE(keywords[i]);
@ -4000,6 +4002,8 @@ virDomainDefPtr qemuParseCommandLine(virConnectPtr conn,
goto no_memory;
}
virDomainDiskDefAssignAddress(disk);
if (VIR_REALLOC_N(def->disks, def->ndisks+1) < 0) {
virDomainDiskDefFree(disk);
goto no_memory;

1
tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml
View File

@ -18,6 +18,7 @@
<source dev='/dev/cdrom'/>
<target dev='hdc' bus='ide'/>
<readonly/>
<address type='drive' controller='0' bus='1' unit='0'/>
</disk>
</devices>
</domain>

2
tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml
View File

@ -17,10 +17,12 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<disk type='file' device='floppy'>
<source file='/tmp/firmware.img'/>
<target dev='fda' bus='fdc'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
</devices>
</domain>

1
tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
</devices>
</domain>

1
tests/qemuxml2argvdata/qemuxml2argv-bootloader.xml
View File

@ -18,6 +18,7 @@
<source dev='/dev/cdrom'/>
<target dev='hdc' bus='ide'/>
<readonly/>
<address type='drive' controller='0' bus='1' unit='0'/>
</disk>
</devices>
</domain>

1
tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<channel type='pipe'>
<source path='/tmp/guestfwd'/>

1
tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
</devices>
</domain>

1
tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
</devices>
</domain>

1
tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<serial type='pty'>
<target port='0'/>

1
tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<serial type='pty'>
<target port='0'/>

2
tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml
View File

@ -17,10 +17,12 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<disk type='file' device='cdrom'>
<target dev='hdc' bus='ide'/>
<readonly/>
<address type='drive' controller='0' bus='1' unit='0'/>
</disk>
</devices>
</domain>

2
tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml
View File

@ -17,11 +17,13 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<disk type='file' device='cdrom'>
<source file='/root/boot.iso'/>
<target dev='hdc' bus='ide'/>
<readonly/>
<address type='drive' controller='0' bus='1' unit='0'/>
</disk>
</devices>
</domain>

2
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml
View File

@ -17,10 +17,12 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<disk type='block' device='cdrom'>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hdc' bus='ide'/>
<address type='drive' controller='0' bus='1' unit='0'/>
</disk>
</devices>
</domain>

2
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml
View File

@ -17,10 +17,12 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<disk type='block' device='cdrom'>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hdc' bus='ide'/>
<address type='drive' controller='0' bus='1' unit='0'/>
</disk>
</devices>
</domain>

2
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.xml
View File

@ -18,12 +18,14 @@
<driver name='qemu' type='qcow2' cache='none'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<disk type='block' device='cdrom'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hdc' bus='ide'/>
<readonly/>
<address type='drive' controller='0' bus='1' unit='0'/>
</disk>
</devices>
</domain>

2
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.xml
View File

@ -18,12 +18,14 @@
<driver name='qemu' type='qcow2' cache='writeback'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<disk type='block' device='cdrom'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hdc' bus='ide'/>
<readonly/>
<address type='drive' controller='0' bus='1' unit='0'/>
</disk>
</devices>
</domain>

2
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.xml
View File

@ -18,12 +18,14 @@
<driver name='qemu' type='qcow2' cache='writethrough'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<disk type='block' device='cdrom'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hdc' bus='ide'/>
<readonly/>
<address type='drive' controller='0' bus='1' unit='0'/>
</disk>
</devices>
</domain>

2
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.xml
View File

@ -18,12 +18,14 @@
<driver name='qemu' type='qcow2' cache='none'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<disk type='block' device='cdrom'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hdc' bus='ide'/>
<readonly/>
<address type='drive' controller='0' bus='1' unit='0'/>
</disk>
</devices>
</domain>

2
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.xml
View File

@ -18,12 +18,14 @@
<driver name='qemu' type='qcow2' cache='writeback'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<disk type='block' device='cdrom'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hdc' bus='ide'/>
<readonly/>
<address type='drive' controller='0' bus='1' unit='0'/>
</disk>
</devices>
</domain>

2
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.xml
View File

@ -18,12 +18,14 @@
<driver name='qemu' type='qcow2' cache='writethrough'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<disk type='block' device='cdrom'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hdc' bus='ide'/>
<readonly/>
<address type='drive' controller='0' bus='1' unit='0'/>
</disk>
</devices>
</domain>

1
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.xml
View File

@ -19,6 +19,7 @@
<source dir='/var/somefiles'/>
<target dev='hda' bus='ide'/>
<readonly/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
</devices>
</domain>

2
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.xml
View File

@ -18,12 +18,14 @@
<driver name='qemu' type='qcow2'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<disk type='block' device='cdrom'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hdc' bus='ide'/>
<readonly/>
<address type='drive' controller='0' bus='1' unit='0'/>
</disk>
</devices>
</domain>

2
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.xml
View File

@ -20,12 +20,14 @@
<target dev='hda' bus='ide'/>
<shareable/>
<serial>XYZXYZXYZYXXYZYZYXYZY</serial>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<disk type='block' device='cdrom'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hdc' bus='ide'/>
<readonly/>
<address type='drive' controller='0' bus='1' unit='0'/>
</disk>
</devices>
</domain>

3
tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml
View File

@ -17,14 +17,17 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<disk type='block' device='floppy'>
<source dev='/dev/fd0'/>
<target dev='fda' bus='fdc'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<disk type='file' device='floppy'>
<source file='/tmp/firmware.img'/>
<target dev='fdb' bus='fdc'/>
<address type='drive' controller='0' bus='0' unit='1'/>
</disk>
</devices>
</domain>

4
tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml
View File

@ -17,18 +17,22 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hdb' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='1'/>
</disk>
<disk type='file' device='disk'>
<source file='/tmp/data.img'/>
<target dev='hdc' bus='ide'/>
<address type='drive' controller='0' bus='1' unit='0'/>
</disk>
<disk type='file' device='disk'>
<source file='/tmp/logs.img'/>
<target dev='hdd' bus='ide'/>
<address type='drive' controller='0' bus='1' unit='1'/>
</disk>
</devices>
</domain>

1
tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<disk type='file' device='disk'>
<source file='/tmp/usbdisk.img'/>

3
tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml
View File

@ -17,10 +17,13 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<disk type='block' device='cdrom'>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hdc' bus='ide'/>
<readonly/>
<address type='drive' controller='0' bus='1' unit='0'/>
</disk>
<disk type='file' device='disk'>
<source file='/tmp/data.img'/>

2
tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml
View File

@ -17,11 +17,13 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<disk type='block' device='cdrom'>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hdc' bus='ide'/>
<readonly/>
<address type='drive' controller='0' bus='1' unit='0'/>
</disk>
<disk type='file' device='disk'>
<source file='/tmp/data.img'/>

1
tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.xml
View File

@ -19,6 +19,7 @@
<source dir='/var/somefiles'/>
<target dev='fda' bus='fdc'/>
<readonly/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
</devices>
</domain>

1
tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<input type='mouse' bus='ps2'/>
<graphics type='sdl' display=':0.1' xauth='/root/.Xauthority' fullscreen='yes'/>

1
tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<input type='mouse' bus='ps2'/>
<graphics type='sdl' display=':0.1' xauth='/root/.Xauthority'/>

1
tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<input type='mouse' bus='ps2'/>
<graphics type='vnc' port='5903' autoport='no' listen='127.0.0.1'/>

1
tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<input type='mouse' bus='ps2'/>
<graphics type='vnc' port='5903' autoport='no' listen='127.0.0.1'/>

1
tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<input type='mouse' bus='ps2'/>
<graphics type='vnc' port='5903' autoport='no' listen='127.0.0.1'/>

1
tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<hostdev mode='subsystem' type='pci' managed='yes'>
<source>

1
tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<hostdev mode='subsystem' type='usb' managed='no'>
<source>

1
tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-product.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<hostdev mode='subsystem' type='usb' managed='no'>
<source>

1
tests/qemuxml2argvdata/qemuxml2argv-hugepages.xml
View File

@ -20,6 +20,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
</devices>
</domain>

1
tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<input type='mouse' bus='usb'/>
</devices>

1
tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<input type='tablet' bus='usb'/>
</devices>

1
tests/qemuxml2argvdata/qemuxml2argv-input-xen.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<input type='mouse' bus='xen'/>
<graphics type='vnc' port='5903' autoport='no' listen='127.0.0.1'/>

1
tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
</devices>
</domain>

1
tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
</devices>
</domain>

1
tests/qemuxml2argvdata/qemuxml2argv-migrate.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
</devices>
</domain>

1
tests/qemuxml2argvdata/qemuxml2argv-minimal.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
</devices>
</domain>

1
tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml
View File

@ -20,6 +20,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
</devices>
</domain>

1
tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
</devices>
</domain>

1
tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml
View File

@ -20,6 +20,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
</devices>
</domain>

1
tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<interface type='ethernet'>
<mac address='00:11:22:33:44:55'/>

1
tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<interface type='ethernet'>
<mac address='00:11:22:33:44:55'/>

1
tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<interface type='ethernet'>
<mac address='00:11:22:33:44:55'/>

1
tests/qemuxml2argvdata/qemuxml2argv-net-user.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<interface type='user'>
<mac address='00:11:22:33:44:55'/>

1
tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<interface type='user'>
<mac address='00:11:22:33:44:55'/>

1
tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<parallel type='tcp'>
<source mode='bind' host='127.0.0.1' service='9999'/>

1
tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<parallel type='tcp'>
<source mode='bind' host='127.0.0.1' service='9999'/>

1
tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
</devices>
</domain>

1
tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
</devices>
</domain>

1
tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<serial type='dev'>
<source path='/dev/ttyS2'/>

1
tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<serial type='dev'>
<source path='/dev/ttyS2'/>

1
tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<serial type='file'>
<source path='/tmp/serial.log'/>

1
tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<serial type='file'>
<source path='/tmp/serial.log'/>

1
tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<serial type='pty'>
<target port='0'/>

1
tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<serial type='pty'>
<target port='0'/>

1
tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<serial type='pty'>
<target port='0'/>

1
tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<serial type='pty'>
<target port='0'/>

1
tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<serial type='tcp'>
<source mode='connect' host='127.0.0.1' service='9999'/>

1
tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<serial type='tcp'>
<source mode='bind' host='127.0.0.1' service='9999'/>

1
tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<serial type='tcp'>
<source mode='bind' host='127.0.0.1' service='9999'/>

1
tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<serial type='tcp'>
<source mode='connect' host='127.0.0.1' service='9999'/>

1
tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<serial type='udp'>
<source mode='bind' host='127.0.0.1' service='9999'/>

1
tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<serial type='udp'>
<source mode='bind' host='127.0.0.1' service='9999'/>

1
tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<serial type='unix'>
<source mode='connect' path='/tmp/serial.sock'/>

1
tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<serial type='unix'>
<source mode='connect' path='/tmp/serial.sock'/>

1
tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<serial type='vc'>
<target port='0'/>

1
tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<serial type='vc'>
<target port='0'/>

1
tests/qemuxml2argvdata/qemuxml2argv-sound.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<sound model='pcspk'/>
<sound model='es1370'/>

1
tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml
View File

@ -17,6 +17,7 @@
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<watchdog model='ib700' action='poweroff'/>
</devices>

1
tests/qemuxml2xmltest.c
View File

@ -98,6 +98,7 @@ mymain(int argc, char **argv)
DO_TEST("disk-many");
DO_TEST("disk-xenvbd");
DO_TEST("disk-usb");
DO_TEST("disk-virtio");
DO_TEST("floppy-drive-fat");
DO_TEST("disk-drive-fat");
DO_TEST("disk-drive-fmt-qcow");