[libvirt] [PATCH v2 0/2] qemu: Support for QXL heads
by Martin Kletzander
v2: don't change heads when migrating
v1: https://www.redhat.com/archives/libvir-list/2016-March/msg00410.html
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1283207
Martin Kletzander (2):
qemu: Check for qxl's max_outputs parameter
qemu: Add support to QXL's max_outputs parameter
src/qemu/qemu_capabilities.c | 4 ++
src/qemu/qemu_capabilities.h | 2 +
src/qemu/qemu_command.c | 8 ++++
src/qemu/qemu_migration.c | 50 ++++++++++++++++++++--
.../qemuxml2argv-video-qxl-heads.args | 28 ++++++++++++
.../qemuxml2argv-video-qxl-heads.xml | 47 ++++++++++++++++++++
tests/qemuxml2argvtest.c | 8 ++++
.../qemuxml2xmlout-video-qxl-heads.xml | 47 ++++++++++++++++++++
tests/qemuxml2xmltest.c | 2 +
9 files changed, 192 insertions(+), 4 deletions(-)
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-heads.args
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-heads.xml
create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-video-qxl-heads.xml
--
2.7.3
9 years, 3 months
[libvirt] [PATCH] Use vir*Error instead of VIR_ERROR in qemuStateInitialize
by Jovanka Gulicoska
---
src/qemu/qemu_driver.c | 34 ++++++++++++++++------------------
1 file changed, 16 insertions(+), 18 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index a0d6596..d39058a 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -639,7 +639,6 @@ qemuStateInitialize(bool privileged,
{
char *driverConf = NULL;
virConnectPtr conn = NULL;
- char ebuf[1024];
virQEMUDriverConfigPtr cfg;
uid_t run_uid = -1;
gid_t run_gid = -1;
@@ -683,44 +682,43 @@ qemuStateInitialize(bool privileged,
VIR_FREE(driverConf);
if (virFileMakePath(cfg->stateDir) < 0) {
- VIR_ERROR(_("Failed to create state dir '%s': %s"),
- cfg->stateDir, virStrerror(errno, ebuf, sizeof(ebuf)));
+ virReportSystemError(errno, _("Failed to create state dir %s"),
+ cfg->stateDir);
goto error;
}
if (virFileMakePath(cfg->libDir) < 0) {
- VIR_ERROR(_("Failed to create lib dir '%s': %s"),
- cfg->libDir, virStrerror(errno, ebuf, sizeof(ebuf)));
+ virReportSystemError(errno, _("Failed to create lib dir %s"),
+ cfg->libDir);
goto error;
}
if (virFileMakePath(cfg->cacheDir) < 0) {
- VIR_ERROR(_("Failed to create cache dir '%s': %s"),
- cfg->cacheDir, virStrerror(errno, ebuf, sizeof(ebuf)));
+ virReportSystemError(errno, _("Failed to create cache dir %s"),
+ cfg->cacheDir);
goto error;
}
if (virFileMakePath(cfg->saveDir) < 0) {
- VIR_ERROR(_("Failed to create save dir '%s': %s"),
- cfg->saveDir, virStrerror(errno, ebuf, sizeof(ebuf)));
+ virReportSystemError(errno, _("Failed to create save dir %s"),
+ cfg->saveDir);
goto error;
}
if (virFileMakePath(cfg->snapshotDir) < 0) {
- VIR_ERROR(_("Failed to create save dir '%s': %s"),
- cfg->snapshotDir, virStrerror(errno, ebuf, sizeof(ebuf)));
+ virReportSystemError(errno, _("Failed to create save dir %s"),
+ cfg->snapshotDir);
goto error;
}
if (virFileMakePath(cfg->autoDumpPath) < 0) {
- VIR_ERROR(_("Failed to create dump dir '%s': %s"),
- cfg->autoDumpPath, virStrerror(errno, ebuf, sizeof(ebuf)));
+ virReportSystemError(errno, _("Failed to create dump dir %s"),
+ cfg->autoDumpPath);
goto error;
}
if (virFileMakePath(cfg->channelTargetDir) < 0) {
- VIR_ERROR(_("Failed to create channel target dir '%s': %s"),
- cfg->channelTargetDir,
- virStrerror(errno, ebuf, sizeof(ebuf)));
+ virReportSystemError(errno, _("Failed to create channel target dir %s"),
+ cfg->channelTargetDir);
goto error;
}
if (virFileMakePath(cfg->nvramDir) < 0) {
- VIR_ERROR(_("Failed to create nvram dir '%s': %s"),
- cfg->nvramDir, virStrerror(errno, ebuf, sizeof(ebuf)));
+ virReportSystemError(errno, _("Failed to create nvram dir %s"),
+ cfg->nvramDir);
goto error;
}
--
2.5.0
9 years, 3 months
[libvirt] [PATCH] use virGetLastErrorMessage instead of virGetLastError to check for NULL in qemu
by Jovanka Gulicoska
---
src/qemu/qemu_capabilities.c | 18 ++++++++----------
src/qemu/qemu_driver.c | 12 +++++-------
2 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index b223837..af35f89 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3089,10 +3089,9 @@ virQEMUCapsInitCached(virQEMUCapsPtr qemuCaps, const char *cacheDir)
if (virQEMUCapsLoadCache(qemuCaps, capsfile, &qemuctime, &selfctime,
&selfvers) < 0) {
- virErrorPtr err = virGetLastError();
+ const char *err = virGetLastErrorMessage();
VIR_WARN("Failed to load cached caps from '%s' for '%s': %s",
- capsfile, qemuCaps->binary, err ? NULLSTR(err->message) :
- _("unknown error"));
+ capsfile, qemuCaps->binary, err);
virResetLastError();
ret = 0;
virQEMUCapsReset(qemuCaps);
@@ -3320,9 +3319,9 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps,
/* @mon is supposed to be locked by callee */
if (qemuMonitorSetCapabilities(mon) < 0) {
- virErrorPtr err = virGetLastError();
+ const char *err = virGetLastErrorMessage();
VIR_DEBUG("Failed to set monitor capabilities %s",
- err ? err->message : "<unknown problem>");
+ err);
ret = 0;
goto cleanup;
}
@@ -3330,9 +3329,9 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps,
if (qemuMonitorGetVersion(mon,
&major, &minor, µ,
&package) < 0) {
- virErrorPtr err = virGetLastError();
+ const char *err = virGetLastErrorMessage();
VIR_DEBUG("Failed to query monitor version %s",
- err ? err->message : "<unknown problem>");
+ err);
ret = 0;
goto cleanup;
}
@@ -3561,15 +3560,14 @@ virQEMUCapsLogProbeFailure(const char *binary)
{ .key = "LIBVIRT_QEMU_BINARY", .s = binary, .iv = 0 },
{ .key = NULL },
};
- virErrorPtr err = virGetLastError();
+ const char *err = virGetLastErrorMessage();
virLogMessage(&virLogSelf,
VIR_LOG_WARN,
__FILE__, __LINE__, __func__,
meta,
_("Failed to probe capabilities for %s: %s"),
- binary, err && err->message ? err->message :
- _("unknown failure"));
+ binary, err);
}
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 29c3bc8..85e5441 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -277,7 +277,7 @@ qemuAutostartDomain(virDomainObjPtr vm,
void *opaque)
{
struct qemuAutostartData *data = opaque;
- virErrorPtr err;
+ const char *err;
int flags = 0;
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(data->driver);
int ret = -1;
@@ -291,19 +291,17 @@ qemuAutostartDomain(virDomainObjPtr vm,
if (vm->autostart &&
!virDomainObjIsActive(vm)) {
if (qemuProcessBeginJob(data->driver, vm) < 0) {
- err = virGetLastError();
+ err = virGetLastErrorMessage();
VIR_ERROR(_("Failed to start job on VM '%s': %s"),
- vm->def->name,
- err ? err->message : _("unknown error"));
+ vm->def->name, err);
goto cleanup;
}
if (qemuDomainObjStart(data->conn, data->driver, vm, flags,
QEMU_ASYNC_JOB_START) < 0) {
- err = virGetLastError();
+ err = virGetLastErrorMessage();
VIR_ERROR(_("Failed to autostart VM '%s': %s"),
- vm->def->name,
- err ? err->message : _("unknown error"));
+ vm->def->name, err);
}
qemuProcessEndJob(data->driver, vm);
--
2.5.0
9 years, 3 months
[libvirt] [PATCH] Don't warn about nonexisting connection drivers
by Jovanka Gulicoska
---
src/driver.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/driver.c b/src/driver.c
index 2985538..1514a3b 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -62,7 +62,7 @@ virDriverLoadModule(const char *name)
return NULL;
if (access(modfile, R_OK) < 0) {
- VIR_WARN("Module %s not accessible", modfile);
+ VIR_INFO("Module %s not accessible", modfile);
goto cleanup;
}
--
2.5.0
9 years, 3 months
[libvirt] [PATCH v3 0/2] persistent live migration with specified XML
by Dmitry Andreev
v3:
- use shorter name for param and rename args
- move qemuMigrationCookieAddPersistent out from
qemuMigrationBakeCookie
- rebase to master
v2: reimplemented with new migration param
Libvirt doesn't allow to specify destination persistent domain
configuration. VIR_MIGRATE_PARAM_DEST_XML migration param is used for
active configuration and persistent configuration is taken from source
domain. The problem is mentioned in this bug:
https://bugzilla.redhat.com/show_bug.cgi?id=835300
This patch-set introduces new migration param VIR_MIGRATE_PARAM_PERSIST_XML
and implements its support in qemu driver.
Dmitry Andreev (2):
qemuMigrationCookieAddPersistent: move it out and change argument type
qemu: migration: new migration param for persistent destination XML
include/libvirt/libvirt-domain.h | 15 ++++++++++
src/qemu/qemu_driver.c | 12 +++++---
src/qemu/qemu_migration.c | 64 ++++++++++++++++++++++++----------------
src/qemu/qemu_migration.h | 2 ++
4 files changed, 63 insertions(+), 30 deletions(-)
--
1.8.3.1
9 years, 3 months
[libvirt] [PATCH v2 0/2] nodedev: Expose PCI header type information
by Martin Kletzander
v2: Removed <multifunction/> reporting.
v1: https://www.redhat.com/archives/libvir-list/2016-March/msg00645.html
Martin Kletzander (2):
nodedev: Indent PCI express for future fix
nodedev: Expose PCI header type
docs/schemas/nodedev.rng | 12 +++++++
src/conf/node_device_conf.c | 24 ++++++++++++++
src/conf/node_device_conf.h | 1 +
src/libvirt_private.syms | 3 ++
src/node_device/node_device_udev.c | 37 ++++++++++++----------
src/util/virpci.c | 33 +++++++++++++++++++
src/util/virpci.h | 12 +++++++
.../pci_0000_00_02_0_header_type.xml | 16 ++++++++++
.../pci_0000_00_1c_0_header_type.xml | 20 ++++++++++++
tests/nodedevxml2xmltest.c | 2 ++
10 files changed, 144 insertions(+), 16 deletions(-)
create mode 100644 tests/nodedevschemadata/pci_0000_00_02_0_header_type.xml
create mode 100644 tests/nodedevschemadata/pci_0000_00_1c_0_header_type.xml
--
2.7.3
9 years, 3 months
[libvirt] [PATCH v4 0/2] migration: add option to set target ndb server port
by Nikolay Shirokovskiy
Current libvirt + qemu pair lacks secure migrations in case of
VMs with non-shared disks. The only option to migrate securely
natively is to use tunneled mode and some kind of secure
destination URI. But tunelled mode does not support non-shared
disks.
The other way to make migration secure is to organize a tunnel
by external means. This is possible in case of shared disks
migration thru use of proper combination of destination URI,
migration URI and VIR_MIGRATE_PARAM_LISTEN_ADDRESS migration
param. But again this is not possible in case of non shared disks
migration as we have no option to control target nbd server port.
But fixing this much more simplier that supporting non-shared
disks in tunneled mode.
So this patch series adds option to set target ndb port.
Finally all qemu migration connections will be secured AFAIK but
even in this case this patch could be convinient if one wants
all migration traffic be put in a single connection.
difference from v3:
===================
Revert code of starting nbd server back to v2.
Nikolay Shirokovskiy (2):
migration: add target peer disks port
qemu: implement setting target disks migration port
include/libvirt/libvirt-domain.h | 10 +++++
src/qemu/qemu_driver.c | 25 +++++++----
src/qemu/qemu_migration.c | 92 +++++++++++++++++++++++++++++-----------
src/qemu/qemu_migration.h | 3 ++
tools/virsh-domain.c | 12 ++++++
tools/virsh.pod | 5 ++-
6 files changed, 113 insertions(+), 34 deletions(-)
--
1.8.3.1
9 years, 3 months
[libvirt] [PATCH] conf: Format disk pool part_separator attribute for running pool
by John Ferlan
Commit id '4f846170' added printing of a new field 'part_separator'; however,
neglected to do so when there was an "freeExtent" defined for the device
(as there would be when the disk pool was started).
This patch adjusts the logic to appropriately format the device path and
if there the part_separator attribute.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
Discovered during the validation of :
https://bugzilla.redhat.com/show_bug.cgi?id=1265694
src/conf/storage_conf.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index bfba521..497c65f 100644
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -1055,9 +1055,15 @@ virStoragePoolSourceFormat(virBufferPtr buf,
if ((options->flags & VIR_STORAGE_POOL_SOURCE_DEVICE) &&
src->ndevice) {
for (i = 0; i < src->ndevice; i++) {
+ virBufferEscapeString(buf, "<device path='%s'",
+ src->devices[i].path);
+ if (src->devices[i].part_separator !=
+ VIR_TRISTATE_SWITCH_ABSENT) {
+ virBufferAsprintf(buf, " part_separator='%s'",
+ virTristateBoolTypeToString(src->devices[i].part_separator));
+ }
if (src->devices[i].nfreeExtent) {
- virBufferEscapeString(buf, "<device path='%s'>\n",
- src->devices[i].path);
+ virBufferAddLit(buf, ">\n");
virBufferAdjustIndent(buf, 2);
for (j = 0; j < src->devices[i].nfreeExtent; j++) {
virBufferAsprintf(buf, "<freeExtent start='%llu' end='%llu'/>\n",
@@ -1067,13 +1073,6 @@ virStoragePoolSourceFormat(virBufferPtr buf,
virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</device>\n");
} else {
- virBufferEscapeString(buf, "<device path='%s'",
- src->devices[i].path);
- if (src->devices[i].part_separator !=
- VIR_TRISTATE_SWITCH_ABSENT) {
- virBufferAsprintf(buf, " part_separator='%s'",
- virTristateBoolTypeToString(src->devices[i].part_separator));
- }
virBufferAddLit(buf, "/>\n");
}
}
--
2.5.0
9 years, 3 months
[libvirt] [PATCH] docs: fix libvirt version for vram64 in formatdomain.html.in
by Pavel Hrdina
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
Pushed under trivial rule.
docs/formatdomain.html.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 41f2488..423dcdc 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -5200,7 +5200,7 @@ qemu-kvm -net nic,model=? /dev/null
two as <code>vram</code>. There is also optional attribute
<code>vgamem</code> (<span class="since">since 1.2.11</span>) to set
the size of VGA framebuffer for fallback mode of QXL device.
- Attribute <code>vram64</code> (<span class="since">since 1.3.2</span>)
+ Attribute <code>vram64</code> (<span class="since">since 1.3.3</span>)
extends secondary bar and makes it addressable as 64bit memory.
</p>
</dd>
--
2.7.3
9 years, 3 months
[libvirt] [PATCH] vz: code refactoring
by Mikhail Feoktistov
In prlsdkAddNet() Attach/DetachNet() functions
privconn should be the first argument
---
src/vz/vz_driver.c | 4 ++--
src/vz/vz_sdk.c | 16 ++++++++--------
src/vz/vz_sdk.h | 4 ++--
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index b02e59f..604e7a8 100644
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -1088,7 +1088,7 @@ static int vzDomainAttachDeviceFlags(virDomainPtr dom, const char *xml,
}
break;
case VIR_DOMAIN_DEVICE_NET:
- ret = prlsdkAttachNet(privdom, privconn, dev->data.net);
+ ret = prlsdkAttachNet(privconn, privdom, dev->data.net);
if (ret) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("network attach failed"));
@@ -1165,7 +1165,7 @@ static int vzDomainDetachDeviceFlags(virDomainPtr dom, const char *xml,
}
break;
case VIR_DOMAIN_DEVICE_NET:
- ret = prlsdkDetachNet(privdom, privconn, dev->data.net);
+ ret = prlsdkDetachNet(privconn, privdom, dev->data.net);
if (ret) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("network detach failed"));
diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
index 1473866..c0fb4fb 100644
--- a/src/vz/vz_sdk.c
+++ b/src/vz/vz_sdk.c
@@ -2608,8 +2608,8 @@ static const char * prlsdkFormatMac(virMacAddrPtr mac, char *macstr)
return macstr;
}
-static int prlsdkAddNet(PRL_HANDLE sdkdom,
- vzConnPtr privconn,
+static int prlsdkAddNet(vzConnPtr privconn,
+ PRL_HANDLE sdkdom,
virDomainNetDefPtr net,
bool isCt)
{
@@ -2865,8 +2865,8 @@ prlsdkCleanupBridgedNet(vzConnPtr privconn, virDomainNetDefPtr net)
PrlHandle_Free(vnet);
}
-int prlsdkAttachNet(virDomainObjPtr dom,
- vzConnPtr privconn,
+int prlsdkAttachNet(vzConnPtr privconn,
+ virDomainObjPtr dom,
virDomainNetDefPtr net)
{
int ret = -1;
@@ -2883,7 +2883,7 @@ int prlsdkAttachNet(virDomainObjPtr dom,
if (PRL_FAILED(waitJob(job)))
return ret;
- ret = prlsdkAddNet(privdom->sdkdom, privconn, net, IS_CT(dom->def));
+ ret = prlsdkAddNet(privconn, privdom->sdkdom, net, IS_CT(dom->def));
if (ret == 0) {
job = PrlVm_CommitEx(privdom->sdkdom, PVCF_DETACH_HDD_BUNDLE);
if (PRL_FAILED(waitJob(job)))
@@ -2930,8 +2930,8 @@ prlsdkFindNetByMAC(PRL_HANDLE sdkdom, virMacAddrPtr mac)
return adapter;
}
-int prlsdkDetachNet(virDomainObjPtr dom,
- vzConnPtr privconn,
+int prlsdkDetachNet(vzConnPtr privconn,
+ virDomainObjPtr dom,
virDomainNetDefPtr net)
{
int ret = -1;
@@ -3372,7 +3372,7 @@ prlsdkDoApplyConfig(virConnectPtr conn,
}
for (i = 0; i < def->nnets; i++) {
- if (prlsdkAddNet(sdkdom, conn->privateData, def->nets[i], IS_CT(def)) < 0)
+ if (prlsdkAddNet(conn->privateData, sdkdom, def->nets[i], IS_CT(def)) < 0)
goto error;
}
diff --git a/src/vz/vz_sdk.h b/src/vz/vz_sdk.h
index 8a38797..2f11d4f 100644
--- a/src/vz/vz_sdk.h
+++ b/src/vz/vz_sdk.h
@@ -69,9 +69,9 @@ prlsdkDetachVolume(virDomainObjPtr dom, virDomainDiskDefPtr disk);
int
prlsdkGetBlockStats(virDomainObjPtr dom, virDomainDiskDefPtr disk, virDomainBlockStatsPtr stats);
int
-prlsdkAttachNet(virDomainObjPtr dom, vzConnPtr privconn, virDomainNetDefPtr net);
+prlsdkAttachNet(vzConnPtr privconn, virDomainObjPtr dom, virDomainNetDefPtr net);
int
-prlsdkDetachNet(virDomainObjPtr dom, vzConnPtr privconn, virDomainNetDefPtr net);
+prlsdkDetachNet(vzConnPtr privconn, virDomainObjPtr dom, virDomainNetDefPtr net);
int
prlsdkGetNetStats(virDomainObjPtr dom, const char *path, virDomainInterfaceStatsPtr stats);
int
--
1.8.3.1
9 years, 3 months
