Vladislav Bogdanov
5c881f35c7
qemu: pass -usb and usb hubs earlier, so USB disks with static address are handled properly
...
(cherry picked from commit 81af5336ac
)
Conflicts:
src/qemu/qemu_command.c
tests/qemuxml2argvdata/qemuxml2argv-bios.args
tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args
tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args
tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args
tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args
tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.args
tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.args
tests/qemuxml2argvdata/qemuxml2argv-cputune.args
tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args
tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args
tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args
tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args
tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args
tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args
tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args
tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args
tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args
tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.args
tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.args
tests/qemuxml2argvdata/qemuxml2argv-event_idx.args
tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args
tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args
tests/qemuxml2argvdata/qemuxml2argv-hyperv.args
tests/qemuxml2argvdata/qemuxml2argv-kvmclock+eoi-disabled.args
tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args
tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args
tests/qemuxml2argvdata/qemuxml2argv-memtune.args
tests/qemuxml2argvdata/qemuxml2argv-metadata.args
tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args
tests/qemuxml2argvdata/qemuxml2argv-minimal.args
tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args
tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args
tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args
tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args
tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args
tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-cpuset.args
tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-no-cpuset-and-placement.args
tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune.args
tests/qemuxml2argvdata/qemuxml2argv-numad-static-memory-auto-vcpu.args
tests/qemuxml2argvdata/qemuxml2argv-numad.args
tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.args
tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.args
tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.args
tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.args
tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.args
tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args
tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.args
tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.args
tests/qemuxml2argvdata/qemuxml2argv-smbios.args
tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args
2012-12-09 17:48:11 -05:00
Juerg Haefliger
bd6c46fa0c
tests: handle backspace-newline pairs in test input files
...
This patch teaches testutil how to read multi-line input files with
backspace-newline line continuation markers.
The patch also breaks up all the single-line arguments test input files into
multi-line files with lines shorter than 80 characters.
2011-01-31 11:25:34 -07:00
Eric Blake
a7666b9e38
smbios: allow () in smbios strings
...
* docs/schemas/domain.rng (sysinf-value): Expand pattern.
* tests/qemuxml2argvdata/qemuxml2argv-smbios.xml: Prefer '' over
"" for attribute values. Copy real hardware values.
* tests/qemuxml2argvdata/qemuxml2argv-smbios.args: Likewise.
2010-12-07 08:49:45 -07:00
Eric Blake
8cad56037b
smbios: support system family
...
* docs/schemas/domain.rng (sysinfo-system-name): Also allow
family.
* src/util/sysinfo.h (struct _virSysinfoDef): Add system_family.
* src/conf/domain_conf.c (virSysinfoParseXML)
(virDomainSysinfoDefFormat): Support it.
* src/util/sysinfo.c (virSysinfoDefFree, virSysinfoRead): Likewise.
* src/qemu/qemu_conf.c (qemuBuildSmbiosSystemStr): Likewise.
* tests/qemuxml2argvdata/qemuxml2argv-smbios.xml: Adjust test.
* tests/qemuxml2argvdata/qemuxml2argv-smbios.args: Likewise.
2010-12-07 08:49:45 -07:00
Eric Blake
575914cf3d
qemu: avoid adding "" in smbios arguments
...
The log lists things like -smbios type=1,vendor="Red Hat", which
is great for shell parsing, but not so great when you realize that
execve() then passes those literal "" on as part of the command
line argument, such that qemu sets SMBIOS with extra literal quotes.
The eventual addition of virCommand is needed before we have the API
to shell-quote a string representation of a command line, so that the
log can still be pasted into a shell, but without inserting extra
bytes into the execve() arguments.
* src/qemu/qemu_conf.c (qemuBuildSmbiosBiosStr)
(qemuBuildSmbiosSystemStr): Qemu doesn't like quotes around uuid
arguments, and the remaining quotes are passed literally to
smbios, making <smbios mode='host'/> inaccurate. Removing the
quotes makes the log harder to parse, but that can be fixed later
with virCommand improvements.
* tests/qemuxml2argvdata/qemuxml2argv-smbios.args: 'Fix' test; it
will need fixing again once virCommand learns how to shell-quote a
potential command line.
2010-12-07 08:35:05 -07:00
Daniel Veillard
c2000841ce
Add a new test for sysinfo and smbios handling
2010-11-08 15:14:50 +01:00