External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 04:15:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
2224989c39
libvirt/tests/qemuxml2argvdata
History
Daniel P. Berrange d78554d884 Specify bus/unit instead of index for disks with QEMU 
The current code for using -drive simply sets the -drive 'index'
parameter. QEMU internally converts this to bus/unit depending
on the type of drive. This does not give us precise control over
the bus/unit assignment though. This change switches over to make
libvirt explicitly calculate the bus/unit number.

In addition bus/unit/index are actually irrelevant for VirtIO
disks, since each virtio disk is a separate PCI device. No disk
controller is involved.

Doing the conversion to bus/unit in libvirt allows us to correctly
attach SCSI controllers when required.

* src/qemu/qemu_conf.c: Specify bus/unit instead of index for
  disks
* tests/qemuxml2argvdata/qemuxml2argv-disk*.args: Switch over from
  using index=NNNN, to bus=NN, unit=NN for SCSI/IDE/Floppy disks
2010-01-15 17:55:59 +00:00
..
qemuxml2argv-boot-cdrom.args Switch to using a unix socket for the qemu monitor 2009-07-09 20:04:09 +01:00
qemuxml2argv-boot-cdrom.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-boot-floppy.args Switch to using a unix socket for the qemu monitor 2009-07-09 20:04:09 +01:00
qemuxml2argv-boot-floppy.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-boot-network.args Switch to using a unix socket for the qemu monitor 2009-07-09 20:04:09 +01:00
qemuxml2argv-boot-network.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-bootloader.args Fix handling of Xen(ner) detection 2009-09-22 16:13:33 +01:00
qemuxml2argv-bootloader.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-channel-guestfwd.args Make QEMU driver use -chardev everywhere if available 2009-12-14 10:38:44 +01:00
qemuxml2argv-channel-guestfwd.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-clock-localtime.args Switch to using a unix socket for the qemu monitor 2009-07-09 20:04:09 +01:00
qemuxml2argv-clock-localtime.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-clock-utc.args Switch to using a unix socket for the qemu monitor 2009-07-09 20:04:09 +01:00
qemuxml2argv-clock-utc.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-console-compat-chardev.args Make QEMU driver use -chardev everywhere if available 2009-12-14 10:38:44 +01:00
qemuxml2argv-console-compat-chardev.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-console-compat.args Switch to using a unix socket for the qemu monitor 2009-07-09 20:04:09 +01:00
qemuxml2argv-console-compat.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-disk-cdrom-empty.args Specify bus/unit instead of index for disks with QEMU 2010-01-15 17:55:59 +00:00
qemuxml2argv-disk-cdrom-empty.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-disk-cdrom.args Switch to using a unix socket for the qemu monitor 2009-07-09 20:04:09 +01:00
qemuxml2argv-disk-cdrom.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-disk-drive-boot-cdrom.args Specify bus/unit instead of index for disks with QEMU 2010-01-15 17:55:59 +00:00
qemuxml2argv-disk-drive-boot-cdrom.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-disk-drive-boot-disk.args Specify bus/unit instead of index for disks with QEMU 2010-01-15 17:55:59 +00:00
qemuxml2argv-disk-drive-boot-disk.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-disk-drive-cache-v1-none.args Specify bus/unit instead of index for disks with QEMU 2010-01-15 17:55:59 +00:00
qemuxml2argv-disk-drive-cache-v1-none.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-disk-drive-cache-v1-wb.args Specify bus/unit instead of index for disks with QEMU 2010-01-15 17:55:59 +00:00
qemuxml2argv-disk-drive-cache-v1-wb.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-disk-drive-cache-v1-wt.args Specify bus/unit instead of index for disks with QEMU 2010-01-15 17:55:59 +00:00
qemuxml2argv-disk-drive-cache-v1-wt.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-disk-drive-cache-v2-none.args Specify bus/unit instead of index for disks with QEMU 2010-01-15 17:55:59 +00:00
qemuxml2argv-disk-drive-cache-v2-none.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-disk-drive-cache-v2-wb.args Specify bus/unit instead of index for disks with QEMU 2010-01-15 17:55:59 +00:00
qemuxml2argv-disk-drive-cache-v2-wb.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-disk-drive-cache-v2-wt.args Specify bus/unit instead of index for disks with QEMU 2010-01-15 17:55:59 +00:00
qemuxml2argv-disk-drive-cache-v2-wt.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-disk-drive-fat.args Specify bus/unit instead of index for disks with QEMU 2010-01-15 17:55:59 +00:00
qemuxml2argv-disk-drive-fat.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-disk-drive-fmt-qcow.args Specify bus/unit instead of index for disks with QEMU 2010-01-15 17:55:59 +00:00
qemuxml2argv-disk-drive-fmt-qcow.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-disk-drive-shared.args Specify bus/unit instead of index for disks with QEMU 2010-01-15 17:55:59 +00:00
qemuxml2argv-disk-drive-shared.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-disk-floppy.args Switch to using a unix socket for the qemu monitor 2009-07-09 20:04:09 +01:00
qemuxml2argv-disk-floppy.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-disk-many.args Switch to using a unix socket for the qemu monitor 2009-07-09 20:04:09 +01:00
qemuxml2argv-disk-many.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-disk-usb.args Switch to using a unix socket for the qemu monitor 2009-07-09 20:04:09 +01:00
qemuxml2argv-disk-usb.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-disk-virtio.args Specify bus/unit instead of index for disks with QEMU 2010-01-15 17:55:59 +00:00
qemuxml2argv-disk-virtio.xml Specify bus/unit instead of index for disks with QEMU 2010-01-15 17:55:59 +00:00
qemuxml2argv-disk-xenvbd.args Specify bus/unit instead of index for disks with QEMU 2010-01-15 17:55:59 +00:00
qemuxml2argv-disk-xenvbd.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-floppy-drive-fat.args Specify bus/unit instead of index for disks with QEMU 2010-01-15 17:55:59 +00:00
qemuxml2argv-floppy-drive-fat.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-graphics-sdl-fullscreen.args Switch to using a unix socket for the qemu monitor 2009-07-09 20:04:09 +01:00
qemuxml2argv-graphics-sdl-fullscreen.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-graphics-sdl.args Switch to using a unix socket for the qemu monitor 2009-07-09 20:04:09 +01:00
qemuxml2argv-graphics-sdl.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-graphics-vnc-sasl.args Fix QEMU test suite with new VNC env variable 2009-09-29 17:15:52 +01:00
qemuxml2argv-graphics-vnc-sasl.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-graphics-vnc-tls.args Fix QEMU test suite with new VNC env variable 2009-09-29 17:15:52 +01:00
qemuxml2argv-graphics-vnc-tls.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-graphics-vnc.args Fix QEMU test suite with new VNC env variable 2009-09-29 17:15:52 +01:00
qemuxml2argv-graphics-vnc.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-hostdev-pci-address.args Switch to using a unix socket for the qemu monitor 2009-07-09 20:04:09 +01:00
qemuxml2argv-hostdev-pci-address.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-hostdev-usb-address.args Switch to using a unix socket for the qemu monitor 2009-07-09 20:04:09 +01:00
qemuxml2argv-hostdev-usb-address.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-hostdev-usb-product.args Switch to using a unix socket for the qemu monitor 2009-07-09 20:04:09 +01:00
qemuxml2argv-hostdev-usb-product.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-hugepages.args avoid newly-introduced test failure 2010-01-09 09:25:04 +01:00
qemuxml2argv-hugepages.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-input-usbmouse.args Switch to using a unix socket for the qemu monitor 2009-07-09 20:04:09 +01:00
qemuxml2argv-input-usbmouse.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-input-usbtablet.args Switch to using a unix socket for the qemu monitor 2009-07-09 20:04:09 +01:00
qemuxml2argv-input-usbtablet.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-input-xen.args Fix QEMU test suite with new VNC env variable 2009-09-29 17:15:52 +01:00
qemuxml2argv-input-xen.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-machine-aliases1.args Test qemu machine aliases 2009-09-10 12:37:42 +01:00
qemuxml2argv-machine-aliases1.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-machine-aliases2.args Test that domain-specific qemu machine types are used correctly 2009-09-10 12:37:43 +01:00
qemuxml2argv-machine-aliases2.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-migrate.args Switch to using a unix socket for the qemu monitor 2009-07-09 20:04:09 +01:00
qemuxml2argv-migrate.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-minimal.args Switch to using a unix socket for the qemu monitor 2009-07-09 20:04:09 +01:00
qemuxml2argv-minimal.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-misc-acpi.args Switch to using a unix socket for the qemu monitor 2009-07-09 20:04:09 +01:00
qemuxml2argv-misc-acpi.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-misc-no-reboot.args Switch to using a unix socket for the qemu monitor 2009-07-09 20:04:09 +01:00
qemuxml2argv-misc-no-reboot.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-misc-uuid.args Fix handling of Xen(ner) detection 2009-09-22 16:13:33 +01:00
qemuxml2argv-misc-uuid.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-net-eth-ifname.args Switch to using a unix socket for the qemu monitor 2009-07-09 20:04:09 +01:00
qemuxml2argv-net-eth-ifname.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-net-eth-names.args Assign names to qemu NICs and network backends 2009-07-22 11:34:06 +01:00
qemuxml2argv-net-eth-names.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-net-eth.args Switch to using a unix socket for the qemu monitor 2009-07-09 20:04:09 +01:00
qemuxml2argv-net-eth.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-net-user.args Switch to using a unix socket for the qemu monitor 2009-07-09 20:04:09 +01:00
qemuxml2argv-net-user.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-net-virtio.args Switch to using a unix socket for the qemu monitor 2009-07-09 20:04:09 +01:00
qemuxml2argv-net-virtio.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-parallel-tcp-chardev.args Make QEMU driver use -chardev everywhere if available 2009-12-14 10:38:44 +01:00
qemuxml2argv-parallel-tcp-chardev.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-parallel-tcp.args Switch to using a unix socket for the qemu monitor 2009-07-09 20:04:09 +01:00
qemuxml2argv-parallel-tcp.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-restore-v1.args Switch to using a unix socket for the qemu monitor 2009-07-09 20:04:09 +01:00
qemuxml2argv-restore-v1.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-restore-v2.args Switch to using a unix socket for the qemu monitor 2009-07-09 20:04:09 +01:00
qemuxml2argv-restore-v2.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-serial-dev-chardev.args Make QEMU driver use -chardev everywhere if available 2009-12-14 10:38:44 +01:00
qemuxml2argv-serial-dev-chardev.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-serial-dev.args Switch to using a unix socket for the qemu monitor 2009-07-09 20:04:09 +01:00
qemuxml2argv-serial-dev.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-serial-file-chardev.args Make QEMU driver use -chardev everywhere if available 2009-12-14 10:38:44 +01:00
qemuxml2argv-serial-file-chardev.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-serial-file.args Switch to using a unix socket for the qemu monitor 2009-07-09 20:04:09 +01:00
qemuxml2argv-serial-file.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-serial-many-chardev.args Make QEMU driver use -chardev everywhere if available 2009-12-14 10:38:44 +01:00
qemuxml2argv-serial-many-chardev.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-serial-many.args Switch to using a unix socket for the qemu monitor 2009-07-09 20:04:09 +01:00
qemuxml2argv-serial-many.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-serial-pty-chardev.args Make QEMU driver use -chardev everywhere if available 2009-12-14 10:38:44 +01:00
qemuxml2argv-serial-pty-chardev.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-serial-pty.args Switch to using a unix socket for the qemu monitor 2009-07-09 20:04:09 +01:00
qemuxml2argv-serial-pty.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-serial-tcp-chardev.args Make QEMU driver use -chardev everywhere if available 2009-12-14 10:38:44 +01:00
qemuxml2argv-serial-tcp-chardev.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-serial-tcp-telnet-chardev.args Make QEMU driver use -chardev everywhere if available 2009-12-14 10:38:44 +01:00
qemuxml2argv-serial-tcp-telnet-chardev.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-serial-tcp-telnet.args Switch to using a unix socket for the qemu monitor 2009-07-09 20:04:09 +01:00
qemuxml2argv-serial-tcp-telnet.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-serial-tcp.args Switch to using a unix socket for the qemu monitor 2009-07-09 20:04:09 +01:00
qemuxml2argv-serial-tcp.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-serial-udp-chardev.args Make QEMU driver use -chardev everywhere if available 2009-12-14 10:38:44 +01:00
qemuxml2argv-serial-udp-chardev.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-serial-udp.args Switch to using a unix socket for the qemu monitor 2009-07-09 20:04:09 +01:00
qemuxml2argv-serial-udp.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-serial-unix-chardev.args Make QEMU driver use -chardev everywhere if available 2009-12-14 10:38:44 +01:00
qemuxml2argv-serial-unix-chardev.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-serial-unix.args Switch to using a unix socket for the qemu monitor 2009-07-09 20:04:09 +01:00
qemuxml2argv-serial-unix.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-serial-vc-chardev.args Make QEMU driver use -chardev everywhere if available 2009-12-14 10:38:44 +01:00
qemuxml2argv-serial-vc-chardev.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-serial-vc.args Switch to using a unix socket for the qemu monitor 2009-07-09 20:04:09 +01:00
qemuxml2argv-serial-vc.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-sound.args Switch to using a unix socket for the qemu monitor 2009-07-09 20:04:09 +01:00
qemuxml2argv-sound.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00
qemuxml2argv-watchdog.args Support QEMU watchdog device. 2009-10-21 16:37:44 +01:00
qemuxml2argv-watchdog.xml Set default disk controller/bus/unit props 2010-01-15 16:38:29 +00:00