2008-01-29 18:15:54 +00:00
|
|
|
#include <config.h>
|
2007-11-26 12:03:34 +00:00
|
|
|
|
2007-07-18 21:34:22 +00:00
|
|
|
#include <stdio.h>
|
2007-11-26 12:03:34 +00:00
|
|
|
#include <stdlib.h>
|
|
|
|
#include <unistd.h>
|
2007-07-18 21:34:22 +00:00
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <fcntl.h>
|
|
|
|
|
2007-11-26 12:03:34 +00:00
|
|
|
#ifdef WITH_QEMU
|
|
|
|
|
2010-03-09 18:22:22 +00:00
|
|
|
# include "internal.h"
|
|
|
|
# include "testutils.h"
|
|
|
|
# include "qemu/qemu_conf.h"
|
2011-07-11 17:29:09 +00:00
|
|
|
# include "qemu/qemu_domain.h"
|
2010-03-09 18:22:22 +00:00
|
|
|
# include "testutilsqemu.h"
|
2007-07-18 21:34:22 +00:00
|
|
|
|
2008-01-14 14:04:33 +00:00
|
|
|
static struct qemud_driver driver;
|
2007-07-18 21:34:22 +00:00
|
|
|
|
2011-04-24 22:25:10 +00:00
|
|
|
static int
|
|
|
|
testCompareXMLToXMLFiles(const char *inxml, const char *outxml)
|
|
|
|
{
|
|
|
|
char *inXmlData = NULL;
|
|
|
|
char *outXmlData = NULL;
|
2007-07-18 21:34:22 +00:00
|
|
|
char *actual = NULL;
|
|
|
|
int ret = -1;
|
2010-07-24 22:18:18 +00:00
|
|
|
virDomainDefPtr def = NULL;
|
2007-07-18 21:34:22 +00:00
|
|
|
|
2011-04-24 22:25:10 +00:00
|
|
|
if (virtTestLoadFile(inxml, &inXmlData) < 0)
|
2010-07-24 22:18:18 +00:00
|
|
|
goto fail;
|
2011-04-24 22:25:10 +00:00
|
|
|
if (virtTestLoadFile(outxml, &outXmlData) < 0)
|
2007-07-18 21:34:22 +00:00
|
|
|
goto fail;
|
|
|
|
|
2010-07-24 22:18:18 +00:00
|
|
|
if (!(def = virDomainDefParseString(driver.caps, inXmlData,
|
2011-07-11 17:29:09 +00:00
|
|
|
QEMU_EXPECTED_VIRT_TYPES,
|
|
|
|
VIR_DOMAIN_XML_INACTIVE)))
|
2007-07-18 21:34:22 +00:00
|
|
|
goto fail;
|
|
|
|
|
2011-05-26 11:52:08 +00:00
|
|
|
if (!(actual = virDomainDefFormat(def, VIR_DOMAIN_XML_SECURE)))
|
2007-07-18 21:34:22 +00:00
|
|
|
goto fail;
|
|
|
|
|
2010-07-24 22:18:18 +00:00
|
|
|
|
|
|
|
if (STRNEQ(outXmlData, actual)) {
|
|
|
|
virtTestDifference(stderr, outXmlData, actual);
|
2007-07-18 21:34:22 +00:00
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
fail:
|
2011-04-24 22:25:10 +00:00
|
|
|
free(inXmlData);
|
|
|
|
free(outXmlData);
|
2007-07-18 21:34:22 +00:00
|
|
|
free(actual);
|
2010-07-24 22:18:18 +00:00
|
|
|
virDomainDefFree(def);
|
2007-07-18 21:34:22 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2010-07-24 22:18:18 +00:00
|
|
|
struct testInfo {
|
|
|
|
const char *name;
|
|
|
|
int different;
|
|
|
|
};
|
|
|
|
|
2011-04-24 22:25:10 +00:00
|
|
|
static int
|
|
|
|
testCompareXMLToXMLHelper(const void *data)
|
|
|
|
{
|
2010-07-24 22:18:18 +00:00
|
|
|
const struct testInfo *info = data;
|
2011-04-24 22:25:10 +00:00
|
|
|
char *xml_in = NULL;
|
|
|
|
char *xml_out = NULL;
|
|
|
|
int ret = -1;
|
2010-07-24 22:18:18 +00:00
|
|
|
|
2011-04-24 22:25:10 +00:00
|
|
|
if (virAsprintf(&xml_in, "%s/qemuxml2argvdata/qemuxml2argv-%s.xml",
|
|
|
|
abs_srcdir, info->name) < 0 ||
|
|
|
|
virAsprintf(&xml_out, "%s/qemuxml2xmloutdata/qemuxml2xmlout-%s.xml",
|
|
|
|
abs_srcdir, info->name) < 0)
|
|
|
|
goto cleanup;
|
2010-07-24 22:18:18 +00:00
|
|
|
|
|
|
|
if (info->different) {
|
|
|
|
ret = testCompareXMLToXMLFiles(xml_in, xml_out);
|
|
|
|
} else {
|
|
|
|
ret = testCompareXMLToXMLFiles(xml_in, xml_in);
|
|
|
|
}
|
|
|
|
|
2011-04-24 22:25:10 +00:00
|
|
|
cleanup:
|
|
|
|
free(xml_in);
|
|
|
|
free(xml_out);
|
2010-07-24 22:18:18 +00:00
|
|
|
return ret;
|
2007-07-18 21:34:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-05-29 15:31:49 +00:00
|
|
|
static int
|
2011-04-29 16:21:20 +00:00
|
|
|
mymain(void)
|
2007-07-18 21:34:22 +00:00
|
|
|
{
|
|
|
|
int ret = 0;
|
2008-02-27 04:35:08 +00:00
|
|
|
|
2008-05-29 15:31:49 +00:00
|
|
|
if ((driver.caps = testQemuCapsInit()) == NULL)
|
|
|
|
return (EXIT_FAILURE);
|
2008-02-27 04:35:08 +00:00
|
|
|
|
2010-07-24 22:18:18 +00:00
|
|
|
# define DO_TEST_FULL(name, is_different) \
|
|
|
|
do { \
|
|
|
|
const struct testInfo info = {name, is_different}; \
|
|
|
|
if (virtTestRun("QEMU XML-2-XML " name, \
|
|
|
|
1, testCompareXMLToXMLHelper, &info) < 0) \
|
|
|
|
ret = -1; \
|
|
|
|
} while (0)
|
|
|
|
|
2010-03-09 18:22:22 +00:00
|
|
|
# define DO_TEST(name) \
|
2010-07-24 22:18:18 +00:00
|
|
|
DO_TEST_FULL(name, 0)
|
|
|
|
|
|
|
|
# define DO_TEST_DIFFERENT(name) \
|
|
|
|
DO_TEST_FULL(name, 1)
|
|
|
|
|
|
|
|
/* Unset or set all envvars here that are copied in qemudBuildCommandLine
|
|
|
|
* using ADD_ENV_COPY, otherwise these tests may fail due to unexpected
|
|
|
|
* values for these envvars */
|
|
|
|
setenv("PATH", "/bin", 1);
|
2008-04-25 20:46:13 +00:00
|
|
|
|
|
|
|
DO_TEST("minimal");
|
|
|
|
DO_TEST("boot-cdrom");
|
|
|
|
DO_TEST("boot-network");
|
|
|
|
DO_TEST("boot-floppy");
|
2010-07-26 14:28:58 +00:00
|
|
|
DO_TEST("boot-multi");
|
|
|
|
DO_TEST("boot-menu-disable");
|
2011-01-13 10:46:43 +00:00
|
|
|
DO_TEST("boot-order");
|
2008-05-15 16:21:11 +00:00
|
|
|
DO_TEST("bootloader");
|
2008-04-25 20:46:13 +00:00
|
|
|
DO_TEST("clock-utc");
|
|
|
|
DO_TEST("clock-localtime");
|
Support configuration of huge pages in guests
Add option to domain XML for
<memoryBacking>
<hugepages/>
</memoryBacking>
* configure.in: Add check for mntent.h
* qemud/libvirtd_qemu.aug, qemud/test_libvirtd_qemu.aug, src/qemu.conf
Add 'hugetlbfs_mount' config parameter
* src/qemu_conf.c, src/qemu_conf.h: Check for -mem-path flag in QEMU,
and pass it when hugepages are requested.
Load hugetlbfs_mount config parameter, search for mount if not given.
* src/qemu_driver.c: Free hugetlbfs_mount/path parameter in driver shutdown.
Create directory for QEMU hugepage usage, chowning if required.
* docs/formatdomain.html.in: Document memoryBacking/hugepages elements
* docs/schemas/domain.rng: Add memoryBacking/hugepages elements to schema
* src/util.c, src/util.h, src/libvirt_private.syms: Add virFileFindMountPoint
helper API
* tests/qemuhelptest.c: Add -mem-path constants
* tests/qemuxml2argvtest.c, tests/qemuxml2xmltest.c: Add tests for hugepage
handling
* tests/qemuxml2argvdata/qemuxml2argv-hugepages.xml,
tests/qemuxml2argvdata/qemuxml2argv-hugepages.args: Data files for
hugepage tests
2009-08-25 14:05:18 +00:00
|
|
|
DO_TEST("hugepages");
|
2010-04-21 14:28:21 +00:00
|
|
|
DO_TEST("disk-aio");
|
2008-04-25 20:46:13 +00:00
|
|
|
DO_TEST("disk-cdrom");
|
|
|
|
DO_TEST("disk-floppy");
|
|
|
|
DO_TEST("disk-many");
|
2008-05-15 16:05:41 +00:00
|
|
|
DO_TEST("disk-xenvbd");
|
2008-08-08 15:03:00 +00:00
|
|
|
DO_TEST("disk-usb");
|
2009-12-22 16:53:20 +00:00
|
|
|
DO_TEST("disk-virtio");
|
2009-11-16 18:08:29 +00:00
|
|
|
DO_TEST("floppy-drive-fat");
|
|
|
|
DO_TEST("disk-drive-fat");
|
2009-01-23 16:22:20 +00:00
|
|
|
DO_TEST("disk-drive-fmt-qcow");
|
2009-01-30 17:15:39 +00:00
|
|
|
DO_TEST("disk-drive-cache-v1-wt");
|
|
|
|
DO_TEST("disk-drive-cache-v1-wb");
|
|
|
|
DO_TEST("disk-drive-cache-v1-none");
|
2010-07-24 22:18:18 +00:00
|
|
|
DO_TEST("disk-scsi-device");
|
2008-04-25 20:46:13 +00:00
|
|
|
DO_TEST("graphics-vnc");
|
2009-07-06 13:59:19 +00:00
|
|
|
DO_TEST("graphics-vnc-sasl");
|
|
|
|
DO_TEST("graphics-vnc-tls");
|
2008-04-25 20:46:13 +00:00
|
|
|
DO_TEST("graphics-sdl");
|
2008-12-11 11:44:30 +00:00
|
|
|
DO_TEST("graphics-sdl-fullscreen");
|
2010-03-05 17:12:52 +00:00
|
|
|
DO_TEST("graphics-spice");
|
2011-05-31 13:52:05 +00:00
|
|
|
DO_TEST("graphics-spice-compression");
|
2011-05-26 11:52:08 +00:00
|
|
|
DO_TEST("graphics-spice-timeout");
|
qemu: Support vram for video of qxl type
For qemu names the primary vga as "qxl-vga":
1) if vram is specified for 2nd qxl device:
-vga qxl -global qxl-vga.vram_size=$SIZE \
-device qxl,id=video1,vram_size=$SIZE,...
2) if vram is not specified for 2nd qxl device, (use the default
set by global):
-vga qxl -global qxl-vga.vram_size=$SIZE \
-device qxl,id=video1,...
For qemu names all qxl devices as "qxl":
1) if vram is specified for 2nd qxl device:
-vga qxl -global qxl.vram_size=$SIZE \
-device qxl,id=video1,vram_size=$SIZE ...
2) if vram is not specified for 2nd qxl device:
-vga qxl -global qxl-vga.vram_size=$SIZE \
-device qxl,id=video1,...
"-global" is the only way to define vram_size for the primary qxl
device, regardless of how qemu names it, (It's not good a good
way, as original idea of "-global" is to set a global default for
a driver property, but to specify vram for first qxl device, we
have to use it).
For other qxl devices, as they are represented by "-device", could
specify it directly and seperately for each, and it overrides the
default set by "-global" if specified.
v1 - v2:
* modify "virDomainVideoDefaultRAM" so that it returns 16M as the
default vram_size for qxl device.
* vram_size * 1024 (qemu accepts bytes for vram_size).
* apply default vram_size for qxl device for which vram_size is
not specified.
* modify "graphics-spice" tests (more sensiable vram_size)
* Add an argument of virDomainDefPtr type for qemuBuildVideoDevStr,
to use virDomainVideoDefaultRAM in qemuBuildVideoDevStr).
v2 - v3:
* Modify default video memory size for qxl device from 16M to 24M
* Update codes to be consistent with changes on qemu_capabilities.*
2011-03-06 14:00:27 +00:00
|
|
|
DO_TEST("graphics-spice-qxl-vga");
|
2008-04-25 20:46:13 +00:00
|
|
|
DO_TEST("input-usbmouse");
|
|
|
|
DO_TEST("input-usbtablet");
|
2008-05-15 16:11:40 +00:00
|
|
|
DO_TEST("input-xen");
|
2008-04-25 20:46:13 +00:00
|
|
|
DO_TEST("misc-acpi");
|
|
|
|
DO_TEST("misc-no-reboot");
|
|
|
|
DO_TEST("net-user");
|
2008-04-30 12:30:55 +00:00
|
|
|
DO_TEST("net-virtio");
|
Add txmode attribute to interface XML for virtio backend
This is in response to:
https://bugzilla.redhat.com/show_bug.cgi?id=629662
Explanation
qemu's virtio-net-pci driver allows setting the algorithm used for tx
packets to either "bh" or "timer". This is done by adding ",tx=bh" or
",tx=timer" to the "-device virtio-net-pci" commandline option.
'bh' stands for 'bottom half'; when this is set, packet tx is all done
in an iothread in the bottom half of the driver. (In libvirt, this
option is called the more descriptive "iothread".)
'timer' means that tx work is done in qemu, and if there is more tx
data than can be sent at the present time, a timer is set before qemu
moves on to do other things; when the timer fires, another attempt is
made to send more data. (libvirt retains the name "timer" for this
option.)
The resulting difference, according to the qemu developer who added
the option is:
bh makes tx more asynchronous and reduces latency, but potentially
causes more processor bandwidth contention since the cpu doing the
tx isn't necessarily the cpu where the guest generated the
packets.
Solution
This patch provides a libvirt domain xml knob to change the option on
the qemu commandline, by adding a new attribute "txmode" to the
<driver> element that can be placed inside any <interface> element in
a domain definition. It's use would be something like this:
<interface ...>
...
<model type='virtio'/>
<driver txmode='iothread'/>
...
</interface>
I chose to put this setting as an attribute to <driver> rather than as
a sub-element to <tune> because it is specific to the virtio-net
driver, not something that is generally usable by all network drivers.
(note that this is the same placement as the "driver name=..."
attribute used to choose kernel vs. userland backend for the
virtio-net driver.)
Actually adding the tx=xxx option to the qemu commandline is only done
if the version of qemu being used advertises it in the output of
qemu -device virtio-net-pci,?
If a particular txmode is requested in the XML, and the option isn't
listed in that help output, an UNSUPPORTED_CONFIG error is logged, and
the domain fails to start.
2011-02-03 20:20:01 +00:00
|
|
|
DO_TEST("net-virtio-device");
|
2009-01-30 17:17:58 +00:00
|
|
|
DO_TEST("net-eth");
|
|
|
|
DO_TEST("net-eth-ifname");
|
2008-07-11 19:34:11 +00:00
|
|
|
DO_TEST("sound");
|
2008-04-25 20:46:13 +00:00
|
|
|
|
|
|
|
DO_TEST("serial-vc");
|
|
|
|
DO_TEST("serial-pty");
|
|
|
|
DO_TEST("serial-dev");
|
|
|
|
DO_TEST("serial-file");
|
|
|
|
DO_TEST("serial-unix");
|
|
|
|
DO_TEST("serial-tcp");
|
|
|
|
DO_TEST("serial-udp");
|
|
|
|
DO_TEST("serial-tcp-telnet");
|
|
|
|
DO_TEST("serial-many");
|
|
|
|
DO_TEST("parallel-tcp");
|
|
|
|
DO_TEST("console-compat");
|
2009-11-05 14:31:03 +00:00
|
|
|
DO_TEST("channel-guestfwd");
|
2010-02-18 16:52:03 +00:00
|
|
|
DO_TEST("channel-virtio");
|
2007-07-18 21:34:22 +00:00
|
|
|
|
2008-08-08 14:27:05 +00:00
|
|
|
DO_TEST("hostdev-usb-address");
|
2009-01-12 15:09:19 +00:00
|
|
|
DO_TEST("hostdev-pci-address");
|
2008-08-08 14:27:05 +00:00
|
|
|
|
2010-04-27 10:01:32 +00:00
|
|
|
DO_TEST("encrypted-disk");
|
2010-10-12 14:43:39 +00:00
|
|
|
DO_TEST("memtune");
|
2011-02-08 06:59:38 +00:00
|
|
|
DO_TEST("blkiotune");
|
2011-03-29 13:44:14 +00:00
|
|
|
DO_TEST("cputune");
|
2010-04-27 10:01:32 +00:00
|
|
|
|
2010-09-29 21:58:47 +00:00
|
|
|
DO_TEST("smp");
|
2010-12-09 18:25:11 +00:00
|
|
|
DO_TEST("lease");
|
2010-09-29 21:58:47 +00:00
|
|
|
|
2010-07-24 22:18:18 +00:00
|
|
|
/* These tests generate different XML */
|
|
|
|
DO_TEST_DIFFERENT("balloon-device-auto");
|
|
|
|
DO_TEST_DIFFERENT("channel-virtio-auto");
|
|
|
|
DO_TEST_DIFFERENT("console-compat-auto");
|
|
|
|
DO_TEST_DIFFERENT("disk-scsi-device-auto");
|
2010-07-14 17:02:04 +00:00
|
|
|
DO_TEST_DIFFERENT("console-virtio");
|
2011-04-14 16:05:14 +00:00
|
|
|
DO_TEST_DIFFERENT("serial-target-port-auto");
|
2010-07-24 22:18:18 +00:00
|
|
|
|
2008-02-27 04:35:08 +00:00
|
|
|
virCapabilitiesFree(driver.caps);
|
2007-07-18 21:34:22 +00:00
|
|
|
|
2008-05-29 15:31:49 +00:00
|
|
|
return (ret==0 ? EXIT_SUCCESS : EXIT_FAILURE);
|
2007-07-18 21:34:22 +00:00
|
|
|
}
|
|
|
|
|
2008-05-29 15:31:49 +00:00
|
|
|
VIRT_TEST_MAIN(mymain)
|
|
|
|
|
2007-11-26 12:03:34 +00:00
|
|
|
#else
|
|
|
|
|
2009-12-15 08:43:29 +00:00
|
|
|
int main (void) { exit (EXIT_AM_SKIP); }
|
2007-11-26 12:03:34 +00:00
|
|
|
|
|
|
|
#endif /* WITH_QEMU */
|