[libvirt] [PATCH 0/2] Check disk serial strings for uniqueness
by Peter Krempa
Peter Krempa (2):
qemu: Perform the disk WWN check only on fresh starts
conf: Reuse virDomainDefCheckDuplicateDiskWWN to check disk serial too
src/conf/domain_conf.c | 15 ++++++++++++++-
src/conf/domain_conf.h | 2 +-
src/libvirt_private.syms | 2 +-
src/qemu/qemu_process.c | 3 ++-
4 files changed, 18 insertions(+), 4 deletions(-)
--
2.4.5
9 years, 3 months
[libvirt] [PATCH tck 0/5] Getting the TCK to run against opensuse images
by Cédric Bosdonnat
Hi all,
Here are a few patches to get the TCK run properly against opensuse image.
The patch adding the opensuse images to virt-builder is still pending, but
the main issues were:
* Waiting for 30 seconds for the guest to be started is pretty fragile.
For the tests pinging the guest, wait for domifstats to report 10 sent
packets.
* The first boot of the opensuse image runs dracut and takes quite a long
time. We need to wait for the first boot to complete before shutting
down the guest to avoid inconsistent states.
* Yum isn't in all distros by default you know ;)
Cédric Bosdonnat (5):
Ping test: use domifstats to wait for dhcp to be setup in guest
Create has_disk_image from code of get_virt_builder_disk
Add DomainBuilder->rminterface function.
Make sure the image has been started properly started the first time.
240-no-arp-spoofing.t: get virt-builder install dsniff
lib/Sys/Virt/TCK.pm | 54 +++++++++++++++++++++++++++++--
lib/Sys/Virt/TCK/DomainBuilder.pm | 7 ++++
scripts/nwfilter/100-ping-still-working.t | 13 ++++++--
scripts/nwfilter/210-no-mac-spoofing.t | 13 ++++++--
scripts/nwfilter/230-no-mac-broadcast.t | 13 ++++++--
scripts/nwfilter/240-no-arp-spoofing.t | 14 ++++++--
6 files changed, 103 insertions(+), 11 deletions(-)
--
2.1.4
9 years, 3 months
[libvirt] [PATCH tck v2 0/5] Getting the TCK to run against opensuse images
by Cédric Bosdonnat
Hi all,
Here are a few patches to get the TCK run properly against opensuse image.
The patch adding the opensuse images to virt-builder is still pending, but
the main issues were:
* Waiting for 30 seconds for the guest to be started is pretty fragile.
For the tests pinging the guest, wait for domifstats to report 10 sent
packets.
* The first boot of the opensuse image runs dracut and takes quite a long
time. We need to wait for the first boot to complete before shutting
down the guest to avoid inconsistent states.
* Yum isn't in all distros by default you know ;)
diff to v1:
* set the proper email address
Cédric Bosdonnat (5):
Ping test: use domifstats to wait for dhcp to be setup in guest
Create has_disk_image from code of get_virt_builder_disk
Add DomainBuilder->rminterface function.
Make sure the image has been started properly started the first time.
240-no-arp-spoofing.t: get virt-builder install dsniff
lib/Sys/Virt/TCK.pm | 54 +++++++++++++++++++++++++++++--
lib/Sys/Virt/TCK/DomainBuilder.pm | 7 ++++
scripts/nwfilter/100-ping-still-working.t | 13 ++++++--
scripts/nwfilter/210-no-mac-spoofing.t | 13 ++++++--
scripts/nwfilter/230-no-mac-broadcast.t | 13 ++++++--
scripts/nwfilter/240-no-arp-spoofing.t | 14 ++++++--
6 files changed, 103 insertions(+), 11 deletions(-)
--
2.1.4
9 years, 3 months
[libvirt] [PATCH] qemu: Fix dynamic_ownership qemu.conf setting
by Cole Robinson
Commit 307fb904 (Sep 10) added a 'privileged' variable when creating
the DAC driver:
@@ -153,6 +157,7 @@ virSecurityManagerNewDAC(const char *virtDriver,
bool defaultConfined,
bool requireConfined,
bool dynamicOwnership,
+ bool privileged,
virSecurityManagerDACChownCallback chownCallback)
But argument order is mixed up at the caller, swapping dynamicOwnership
and privileged values. This corrects the argument order
https://bugzilla.redhat.com/show_bug.cgi?id=1266628
---
src/qemu/qemu_driver.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 7025c51..aff1915 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -431,8 +431,8 @@ qemuSecurityInit(virQEMUDriverPtr driver)
cfg->allowDiskFormatProbing,
cfg->securityDefaultConfined,
cfg->securityRequireConfined,
- virQEMUDriverIsPrivileged(driver),
cfg->dynamicOwnership,
+ virQEMUDriverIsPrivileged(driver),
qemuSecurityChownCallback)))
goto error;
if (!stack) {
--
2.5.0
9 years, 3 months
[libvirt] [PATCH] conf: Fix virtType check
by John Ferlan
Commit id '7383b8cc' changed virDomainDef 'virtType' to an enum, that
caused a build failure on some archs due to comparing an unsigned value
to < 0. Adjust the fetch of 'type' to be into temporary 'int virtType'
and then assign that virtType to the def->virtType
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
Pushed as build breaker
src/conf/domain_conf.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index cdafb14..393ece7 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -14640,7 +14640,7 @@ virDomainDefParseXML(xmlDocPtr xml,
xmlNodePtr *nodes = NULL, node = NULL;
char *tmp = NULL;
size_t i, j;
- int n;
+ int n, virtType;
long id = -1;
virDomainDefPtr def;
bool uuid_generated = false;
@@ -14678,11 +14678,12 @@ virDomainDefParseXML(xmlDocPtr xml,
goto error;
}
- if ((def->virtType = virDomainVirtTypeFromString(tmp)) < 0) {
+ if ((virtType = virDomainVirtTypeFromString(tmp)) < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("invalid domain type %s"), tmp);
goto error;
}
+ def->virtType = virtType;
VIR_FREE(tmp);
def->os.bootloader = virXPathString("string(./bootloader)", ctxt);
--
2.1.0
9 years, 3 months
[libvirt] [PATCH 0/4] improve virConnectListAllInterfaces()
by Laine Stump
There's a bit of background about this here:
https://www.redhat.com/archives/augeas-devel/2015-September/msg00001.html
In short, virt-manager is calling the virInterface APIs and that ties
up a libvirt thread (and CPU core) for a very long time on hosts that
have a large number of interfaces. These patches don't cure the
problem (I don't know that there really is a cure other than "Don't DO
that!"), but they do fix a couple of bugs I found while investigating,
and make a substantial improvement in the amount of time used by
virConnectListAllInterfaces().
One thing that I wondered about while investigating this - a big use
of CPU by virConnectListAllInterfaces() comes from the need to
retrieve the MAC address of every interface. The MAC addresses are
both
1) returned to the caller in the interface objects and
2) sent to the policykit ACL checking to decide which interfaces to include in
the list.
I'm 90% confident that
1) most callers don't really care that they're getting the MAC address
along with interface name (virt-manager, for example, follows up with
a virInterfaceGetXMLDesc() anyway)), and
2) there is not even a single host *anywhere* that is using libvirt
policykit ACLs to limit the list of host interfaces viewable by a
client.
So we could add a flag to not return MAC addresses, which would allow
cutting down the time to list all devices to something < 1
second). But this would be at the expense of no longer having the
possibility to limit the list with policykit according to MAC
address. Since all host interface information is available to all
users via the file system, for example, I don't see this as a huge
issue, but it would change behavior, so I don't feel comfortable doing
it. I don't like the idea of a single API call taking > 1 minute to
return either, though. Does anyone have an opinion about this?
Laine Stump (4):
interface: fail on OOM from virGetInterface()
interface: report correct interface count when not returning list
interface: re-use name and mac address rather than re-retrieving
interface: let netcf pre-filter for active vs. inactive
src/interface/interface_backend_netcf.c | 56 +++++++++++++++------------------
1 file changed, 25 insertions(+), 31 deletions(-)
--
2.4.3
9 years, 3 months
[libvirt] [PATCH 0/2] Add support for gic-version machine option
by Pavel Fedin
qemu now supports gic-version option for the virt machine. This patch allows
to use it in libvirt.
I decided not to add a new capability because qemu correctly complains by
itself if it does not have this option.
Pavel Fedin (2):
qemu: Add support for gic-version machine option
qemu: Add test case for gic-version option
src/qemu/qemu_command.c | 22 ++++++++----------
.../qemuxml2argv-aarch64-gicv3.args | 6 +++++
.../qemuxml2argv-aarch64-gicv3.xml | 26 ++++++++++++++++++++++
tests/qemuxml2argvtest.c | 2 ++
4 files changed, 43 insertions(+), 13 deletions(-)
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gicv3.args
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gicv3.xml
--
2.1.4
9 years, 3 months
[libvirt] [libvirt-test-API] [PATCH] Add test cases for API defineXMLFlags
by Shanzhi Yu
Signed-off-by: Shanzhi Yu <shyu(a)redhat.com>
---
cases/linux_domain.conf | 22 +++++++++
repos/domain/definewithflags.py | 104 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 126 insertions(+)
create mode 100644 repos/domain/definewithflags.py
diff --git a/cases/linux_domain.conf b/cases/linux_domain.conf
index 6315613..7dd9062 100644
--- a/cases/linux_domain.conf
+++ b/cases/linux_domain.conf
@@ -214,6 +214,28 @@ domain:define
macaddr
54:52:00:45:c3:8a
+domain:undefine
+ guestname
+ $defaultname
+
+domain:definewithflags
+ guestname
+ $defaultname
+ diskpath
+ /var/lib/libvirt/images/libvirt-test-api
+ vcpu
+ 1
+ memory
+ 1048576
+ hddriver
+ virtio
+ nicdriver
+ virtio
+ macaddr
+ 54:52:00:45:c3:8a
+ flags
+ validate
+
domain:start
guestname
$defaultname
diff --git a/repos/domain/definewithflags.py b/repos/domain/definewithflags.py
new file mode 100644
index 0000000..01a4f15
--- /dev/null
+++ b/repos/domain/definewithflags.py
@@ -0,0 +1,104 @@
+#!/usr/bin/evn python
+
+import os
+import re
+import sys
+import commands
+import string
+import pexpect
+
+import libvirt
+from libvirt import libvirtError
+
+from src import sharedmod
+from utils import utils
+
+required_params = ('guestname', 'diskpath', 'flags',)
+optional_params = {'memory': 1048576,
+ 'vcpu': 1,
+ 'imageformat' : 'raw',
+ 'hddriver' : 'virtio',
+ 'nicdriver': 'virtio',
+ 'macaddr': '52:54:00:97:e4:28',
+ 'uuid' : '05867c1a-afeb-300e-e55e-2673391ae080',
+ 'username': None,
+ 'password': None,
+ 'virt_type': 'kvm',
+ 'xml': 'xmls/kvm_guest_define.xml',
+ 'guestarch': 'x86_64',
+ 'guestmachine': 'pc',
+ }
+
+def check_define_domain(guestname, virt_type, hostname, username, \
+ password, logger):
+ """Check define domain result, if define domain is successful,
+ guestname.xml will exist under /etc/libvirt/qemu/
+ and can use virt-xml-validate tool to check the file validity
+ """
+ if "kvm" in virt_type:
+ path = "/etc/libvirt/qemu/%s.xml" % guestname
+ elif "xen" in virt_type:
+ path = "/etc/xen/%s" % guestname
+ else:
+ logger.error("unknown virt type")
+
+ if hostname:
+ cmd = "ls %s" % path
+ ret, output = utils.remote_exec_pexpect(hostname, username, \
+ password, cmd)
+ if ret:
+ logger.error("guest %s xml file doesn't exsits" % guestname)
+ return False
+ else:
+ return True
+ else:
+ if os.access(path, os.R_OK):
+ return True
+ else:
+ return False
+
+def definewithflags(params):
+ """Define a domain from xml"""
+ logger = params['logger']
+ guestname = params['guestname']
+
+ xmlstr = params['xml']
+ logger.debug("domain xml:\n%s" % xmlstr)
+
+ conn = sharedmod.libvirtobj['conn']
+ uri = conn.getURI()
+
+ hostname = utils.parse_uri(uri)[1]
+ username = params.get('username', '')
+ password = params.get('password', '')
+ virt_type = params.get('virt_type', 'kvm')
+
+ flags = params['flags']
+ logger.info("The flags are %s" % flags)
+ flags_string = flags.split("|")
+ flags = 0
+
+ logger.info("define domain on %s" % uri)
+
+ for flag in flags_string:
+ if flag == 'validate':
+ flags |= libvirt.VIR_DOMAIN_DEFINE_VALIDATE
+ else:
+ logger.error("unknow flags")
+ return 1
+
+ # Define domain from xml
+ try:
+ conn.defineXMLFlags(xmlstr, flags)
+ if check_define_domain(guestname, virt_type, hostname, \
+ username, password, logger):
+ logger.info("define a domain from xml is successful")
+ else:
+ logger.error("fail to check define domain")
+ return 1
+ except libvirtError, e:
+ logger.error("API error message: %s, error code is %s" \
+ % (e.message, e.get_error_code()))
+ return 1
+
+ return 0
--
1.8.3.1
9 years, 3 months
[libvirt] [PATCH v2] Close the source fd if the destination qemu exits during tunnelled migration
by Shivaprasad G Bhat
Tunnelled migration can hang if the destination qemu exits despite all the
ABI checks. This happens whenever the destination qemu exits before the
complete transfer is noticed by source qemu. The savevm state checks at
runtime can fail at destination and cause qemu to error out.
The source qemu cant notice it as the EPIPE is not propogated to it.
The qemuMigrationIOFunc() notices the stream being broken from virStreamSend()
and it cleans up the stream alone. The qemuMigrationWaitForCompletion() would
never get to 100% transfer completion.
The qemuMigrationWaitForCompletion() never breaks out as well since
the ssh connection to destination is healthy, and the source qemu also thinks
the migration is ongoing as the Fd to which it transfers, is never
closed or broken. So, the migration will hang forever. Even Ctrl-C on the
virsh migrate wouldn't be honoured. Close the source side FD when there is
an error in the stream. That way, the source qemu updates itself and
qemuMigrationWaitForCompletion() notices the failure.
Close the FD for all kinds of errors to be sure. The error message is not
copied for EPIPE so that the destination error is copied instead later.
Note:
Reproducible with repeated migrations between Power hosts running in different
subcores-per-core modes.
Changes from v1 -> v2:
VIR_FORCE_CLOSE() was called twice for this use case which would log
unneccessary warnings. So, move the fd close to qemuMigrationIOFunc
so that there are no unnecessary duplicate attempts.(Would this trigger
a Coverity error? I don't have a setup to check.)
Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com>
---
src/qemu/qemu_migration.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index ff89ab5..9602fb2 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -4012,6 +4012,7 @@ static void qemuMigrationIOFunc(void *arg)
if (virStreamFinish(data->st) < 0)
goto error;
+ VIR_FORCE_CLOSE(data->sock);
VIR_FREE(buffer);
return;
@@ -4029,7 +4030,11 @@ static void qemuMigrationIOFunc(void *arg)
}
error:
- virCopyLastError(&data->err);
+ /* Let the source qemu know that the transfer cant continue anymore.
+ * Don't copy the error for EPIPE as destination has the actual error. */
+ VIR_FORCE_CLOSE(data->sock);
+ if (!virLastErrorIsSystemErrno(EPIPE))
+ virCopyLastError(&data->err);
virResetLastError();
VIR_FREE(buffer);
}
@@ -4397,7 +4402,6 @@ qemuMigrationRun(virQEMUDriverPtr driver,
if (iothread && qemuMigrationStopTunnel(iothread, ret < 0) < 0)
ret = -1;
}
- VIR_FORCE_CLOSE(fd);
if (priv->job.completed) {
qemuDomainJobInfoUpdateTime(priv->job.completed);
9 years, 3 months
[libvirt] [PATCH] virDomainDiskDef: Turn @device into enum
by Michal Privoznik
It's used as enum everywhere, so why store its value in an int?
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/conf/domain_conf.c | 9 +++------
src/conf/domain_conf.h | 2 +-
src/qemu/qemu_command.c | 2 ++
src/vmx/vmx.c | 6 +++---
src/vmx/vmx.h | 2 +-
src/xenconfig/xen_sxpr.c | 4 +++-
6 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 6df1618..8ccce89 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -7211,11 +7211,13 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
device = virXMLPropString(node, "device");
if (device) {
- if ((def->device = virDomainDiskDeviceTypeFromString(device)) < 0) {
+ int dev = virDomainDiskDeviceTypeFromString(device);
+ if (dev < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown disk device '%s'"), device);
goto error;
}
+ def->device = dev;
} else {
def->device = VIR_DOMAIN_DISK_DEVICE_DISK;
}
@@ -18944,11 +18946,6 @@ virDomainDiskDefFormat(virBufferPtr buf,
_("unexpected disk type %d"), def->src->type);
return -1;
}
- if (!device) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("unexpected disk device %d"), def->device);
- return -1;
- }
if (!bus) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("unexpected disk bus %d"), def->bus);
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index f043554..fe16c78 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -686,7 +686,7 @@ struct _virDomainDiskDef {
virObjectPtr privateData;
- int device; /* enum virDomainDiskDevice */
+ virDomainDiskDevice device;
int bus; /* enum virDomainDiskBus */
char *dst;
int tray_status; /* enum virDomainDiskTray */
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 25f57f2..781fc4a 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -10135,6 +10135,8 @@ qemuBuildCommandLine(virConnectPtr conn,
bootindex = bootDisk;
bootDisk = 0;
break;
+ case VIR_DOMAIN_DISK_DEVICE_LAST:
+ break;
}
virCommandAddArg(cmd, "-drive");
diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index 70cda2a..6d519b3 100644
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -1926,8 +1926,8 @@ virVMXParseSCSIController(virConfPtr conf, int controller, bool *present,
int
virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr conf,
- int device, int busType, int controllerOrBus, int unit,
- virDomainDiskDefPtr *def, virDomainDefPtr vmdef)
+ virDomainDiskDevice device, int busType, int controllerOrBus,
+ int unit, virDomainDiskDefPtr *def, virDomainDefPtr vmdef)
{
/*
* device = {VIR_DOMAIN_DISK_DEVICE_DISK,
@@ -3251,7 +3251,7 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virDomainDe
break;
- default:
+ case VIR_DOMAIN_DISK_DEVICE_LAST:
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Unsupported disk device type '%s'"),
virDomainDiskDeviceTypeToString(def->disks[i]->device));
diff --git a/src/vmx/vmx.h b/src/vmx/vmx.h
index e986124..16b616b 100644
--- a/src/vmx/vmx.h
+++ b/src/vmx/vmx.h
@@ -88,7 +88,7 @@ int virVMXParseSCSIController(virConfPtr conf, int controller, bool *present,
int *virtualDev);
int virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt,
- virConfPtr conf, int device, int busType,
+ virConfPtr conf, virDomainDiskDevice device, int busType,
int controllerOrBus, int unit, virDomainDiskDefPtr *def,
virDomainDefPtr vmdef);
diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c
index 1d43ec1..1b2ddc6 100644
--- a/src/xenconfig/xen_sxpr.c
+++ b/src/xenconfig/xen_sxpr.c
@@ -2357,7 +2357,9 @@ xenFormatSxpr(virConnectPtr conn,
virBufferEscapeSexpr(&buf, "'%s')", src);
break;
- default:
+ case VIR_DOMAIN_DISK_DEVICE_DISK:
+ case VIR_DOMAIN_DISK_DEVICE_LUN:
+ case VIR_DOMAIN_DISK_DEVICE_LAST:
break;
}
}
--
2.4.6
9 years, 3 months
