- Devel - libvirt List Archives

[libvirt] [PATCH] fix "make distcheck" failure
by Jim Meyering 21 Jan '10

21 Jan '10

Yet another. While testing the preceding patch, I saw a new test failure: ....../w/co/libvirt/libvirt-0.7.5/tests/qemuhelpdata/qemu-0.12.1: \ failed to open: No such file or directory ! 7 FAIL FAIL: qemuhelptest >From 2c8eb68969737a90998244abfae1a286c92f47e0 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 21 Jan 2010 15:24:15 +0100 Subject: [PATCH] fix "make distcheck" failure * tests/Makefile.am (qemuhelpdata): Add qemu-0.12.1. --- tests/Makefile.am | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 584bdb3..090b320 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -42,8 +42,9 @@ LDADDS = \ qemuhelpdata = \ kvm-74 \ kvm-86 \ - qemu-0.10.5 \ qemu-0.9.1 \ + qemu-0.10.5 \ + qemu-0.12.1 \ qemu-kvm-0.10.5 \ qemu-kvm-0.11.0-rc2 -- 1.6.6.513.g63f4c

1 0

[libvirt] another FYI [PATCH] avoid more format-related warnings
by Jim Meyering 21 Jan '10

21 Jan '10

>From d47b6e54fd2be922eaa168f149083b7c8588b218 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 21 Jan 2010 15:12:12 +0100 Subject: [PATCH] avoid more format-related warnings * src/qemu/qemu_conf.c (qemuBuildDriveStr): Use "%s". * src/qemu/qemu_monitor_json.c (qemuMonitorJSONGetGuestPCIAddress): (qemuMonitorJSONGetGuestDriveAddress): Likewise. --- src/qemu/qemu_conf.c | 2 +- src/qemu/qemu_monitor_json.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 3cdb0df..c843c6a 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1896,7 +1896,7 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, * to have > 1 bus on a SCSI controller (yet). */ if (disk->info.addr.drive.bus != 0) { qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("SCSI controller only supports 1 bus")); + "%s", _("SCSI controller only supports 1 bus")); goto error; } busid = disk->info.addr.drive.controller; diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index cfea376..57e2ad9 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1,7 +1,7 @@ /* * qemu_monitor_json.c: interaction with QEMU monitor console * - * Copyright (C) 2006-2009 Red Hat, Inc. + * Copyright (C) 2006-2010 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -1235,7 +1235,7 @@ qemuMonitorJSONGetGuestPCIAddress(virJSONValuePtr reply, } if (virJSONValueObjectGetNumberUint(addr, "function", &guestAddr->function) < 0) { - qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("pci_add reply was missing device function number")); return -1; } @@ -1531,19 +1531,19 @@ qemuMonitorJSONGetGuestDriveAddress(virJSONValuePtr reply, addr = virJSONValueObjectGet(reply, "return"); if (!addr || addr->type != VIR_JSON_TYPE_OBJECT) { - qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("drive_add reply was missing device address")); return -1; } if (virJSONValueObjectGetNumberUint(addr, "bus", &driveAddr->bus) < 0) { - qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("drive_add reply was missing device bus number")); return -1; } if (virJSONValueObjectGetNumberUint(addr, "unit", &driveAddr->unit) < 0) { - qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("drive_add reply was missing device unit number")); return -1; } -- 1.6.6.513.g63f4c

1 0

[libvirt] FYI, [PATCH] avoid format-related warnings
by Jim Meyering 21 Jan '10

21 Jan '10

Testing something unrelated, I saw these warnings: ../../src/conf/domain_conf.c: In function 'virDomainDeviceInfoParseXML': ../../src/conf/domain_conf.c:1120:9: warning: format not a string literal and no format arguments ../../src/conf/domain_conf.c:1138:9: warning: format not a string literal and no format arguments Here's the patch I'll push shortly. No ACK required. >From 885f88c513d7d5004efca4899bfbced78536f371 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 21 Jan 2010 14:39:42 +0100 Subject: [PATCH] avoid format-related warnings * src/conf/domain_conf.c (virDomainDeviceInfoParseXML): Use "%s". --- src/conf/domain_conf.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 27f6f84..74c2337 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1118,7 +1118,7 @@ virDomainDeviceInfoParseXML(virConnectPtr conn, } } else { virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("No type specified for device address")); + "%s", _("No type specified for device address")); goto cleanup; } @@ -1136,7 +1136,7 @@ virDomainDeviceInfoParseXML(virConnectPtr conn, default: /* Should not happen */ virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("Unknown device address type")); + "%s", _("Unknown device address type")); goto cleanup; } -- 1.6.6.513.g63f4c

1 0

[libvirt] [PATCH] Let make fail when XHTML validation fails
by Jiri Denemark 21 Jan '10

21 Jan '10

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- docs/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index eaac627..4df5154 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -108,7 +108,7 @@ ChangeLog.html.in: ChangeLog.xml ChangeLog.xsl @(if [ -x $(XMLLINT) -a -x $(XMLCATALOG) ] ; then \ if $(XMLCATALOG) /etc/xml/catalog "-//W3C//DTD XHTML 1.0 Strict//EN" > /dev/null ; then \ echo "Validating $@" ; \ - $(XMLLINT) --nonet --format --valid $< > $@ || : ; \ + $(XMLLINT) --nonet --format --valid $< > $@ || (rm $@ && exit 1) ; \ else echo "missing XHTML1 DTD" ; fi ; fi ); -- 1.6.6

3 5

[libvirt] [PATCH] Fix uses of virFileMakePath.
by Laine Stump 21 Jan '10

21 Jan '10

When I modified the use of virFileMakePath in my own code, I noticed that it was checking for a return < 0 to indicate error, but I had seen in virFileMakePath that it returns 0 for success, or the value of errno on failure, and errno is usually (always?) >=0. Seeing incorrect usage in one place, I investigated and found several others. --- src/lxc/lxc_container.c | 10 +++++----- src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_driver.c | 2 +- src/network/bridge_driver.c | 4 ++-- src/qemu/qemu_driver.c | 8 ++++---- src/uml/uml_driver.c | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 023d553..539a1f4 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -317,7 +317,7 @@ static int lxcContainerPivotRoot(virDomainFSDefPtr root) goto err; } - if ((rc = virFileMakePath(oldroot)) < 0) { + if ((rc = virFileMakePath(oldroot)) != 0) { virReportSystemError(NULL, rc, _("Failed to create %s"), oldroot); @@ -339,7 +339,7 @@ static int lxcContainerPivotRoot(virDomainFSDefPtr root) goto err; } - if ((rc = virFileMakePath(newroot)) < 0) { + if ((rc = virFileMakePath(newroot)) != 0) { virReportSystemError(NULL, rc, _("Failed to create %s"), newroot); @@ -407,7 +407,7 @@ static int lxcContainerMountBasicFS(virDomainFSDefPtr root) } for (i = 0 ; i < ARRAY_CARDINALITY(mnts) ; i++) { - if (virFileMakePath(mnts[i].dst) < 0) { + if (virFileMakePath(mnts[i].dst) != 0) { virReportSystemError(NULL, errno, _("Failed to mkdir %s"), mnts[i].src); @@ -421,7 +421,7 @@ static int lxcContainerMountBasicFS(virDomainFSDefPtr root) } } - if ((rc = virFileMakePath("/dev/pts") < 0)) { + if ((rc = virFileMakePath("/dev/pts") != 0)) { virReportSystemError(NULL, rc, "%s", _("Cannot create /dev/pts")); goto cleanup; @@ -510,7 +510,7 @@ static int lxcContainerMountNewFS(virDomainDefPtr vmDef) return -1; } - if (virFileMakePath(vmDef->fss[i]->dst) < 0) { + if (virFileMakePath(vmDef->fss[i]->dst) != 0) { virReportSystemError(NULL, errno, _("Failed to create %s"), vmDef->fss[i]->dst); diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 3cecdce..6304815 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -556,7 +556,7 @@ lxcControllerRun(virDomainDefPtr def, goto cleanup; } - if (virFileMakePath(devpts) < 0) { + if (virFileMakePath(devpts) != 0) { virReportSystemError(NULL, errno, _("Failed to make path %s"), devpts); diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index ec5ee6b..d78f7f7 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1193,7 +1193,7 @@ static int lxcVmStart(virConnectPtr conn, char **veths = NULL; lxcDomainObjPrivatePtr priv = vm->privateData; - if ((r = virFileMakePath(driver->logDir)) < 0) { + if ((r = virFileMakePath(driver->logDir)) != 0) { virReportSystemError(conn, r, _("Cannot create log directory '%s'"), driver->logDir); diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 4385215..08e5ee6 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -539,13 +539,13 @@ dhcpStartDhcpDaemon(virConnectPtr conn, return -1; } - if ((err = virFileMakePath(NETWORK_PID_DIR)) < 0) { + if ((err = virFileMakePath(NETWORK_PID_DIR)) != 0) { virReportSystemError(conn, err, _("cannot create directory %s"), NETWORK_PID_DIR); return -1; } - if ((err = virFileMakePath(NETWORK_STATE_DIR)) < 0) { + if ((err = virFileMakePath(NETWORK_STATE_DIR)) != 0) { virReportSystemError(conn, err, _("cannot create directory %s"), NETWORK_STATE_DIR); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 951e033..fa2e5d3 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1033,19 +1033,19 @@ qemudStartup(int privileged) { goto out_of_memory; } - if (virFileMakePath(qemu_driver->stateDir) < 0) { + if (virFileMakePath(qemu_driver->stateDir) != 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create state dir '%s': %s"), qemu_driver->stateDir, virStrerror(errno, ebuf, sizeof ebuf)); goto error; } - if (virFileMakePath(qemu_driver->libDir) < 0) { + if (virFileMakePath(qemu_driver->libDir) != 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create lib dir '%s': %s"), qemu_driver->libDir, virStrerror(errno, ebuf, sizeof ebuf)); goto error; } - if (virFileMakePath(qemu_driver->cacheDir) < 0) { + if (virFileMakePath(qemu_driver->cacheDir) != 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create cache dir '%s': %s"), qemu_driver->cacheDir, virStrerror(errno, ebuf, sizeof ebuf)); @@ -2782,7 +2782,7 @@ static int qemudStartVMDaemon(virConnectPtr conn, vm->def->graphics[0]->data.vnc.port = port; } - if (virFileMakePath(driver->logDir) < 0) { + if (virFileMakePath(driver->logDir) != 0) { virReportSystemError(conn, errno, _("cannot create log directory %s"), driver->logDir); diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index b808090..31cea5c 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -419,7 +419,7 @@ umlStartup(int privileged) { goto error; } - if (virFileMakePath(uml_driver->monitorDir) < 0) { + if (virFileMakePath(uml_driver->monitorDir) != 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create monitor directory %s: %s"), uml_driver->monitorDir, virStrerror(errno, ebuf, sizeof ebuf)); @@ -840,7 +840,7 @@ static int umlStartVMDaemon(virConnectPtr conn, return -1; } - if (virFileMakePath(driver->logDir) < 0) { + if (virFileMakePath(driver->logDir) != 0) { virReportSystemError(conn, errno, _("cannot create log directory %s"), driver->logDir); -- 1.6.6

2 2

[libvirt] [PATCH 0/4] Take 3 - Patchset to avoid uid problems in volume creation
by Laine Stump 21 Jan '10

21 Jan '10

The last iteration of this work (which is now completely obsoleted) is at https://www.redhat.com/archives/libvir-list/2010-January/msg00302.html These patches are intended in particular to deal with problems creating storage volumes on pools that are located on root-squashing NFS servers, but hopefully they are overall just "a good thing" and will solve other as-yet-unencountered/unreported problems. Differences from previous version of the patches: 1) For completeness, chmod is done inside virFileCreate and virDirCreate as well as setting uid and gid. 2) Both of those functions now take an additional flag - VIR_FILE_CREATE_ALLOW_EXIST, which does exactly what you'd think. 3) I now always attempt to set uid/gid correctly, even if not running as root (per Serge Hallyn's suggestions during the last go around) 4) I've added a patch that uses similar logic to get the uid/gid/mode of the directories for newly created pools correct as well. (Previously, we'd been ignoring the permission bits of pool definition xml).

2 13

[libvirt] [PATCH 1/3] Make sure that the vmx2xml test data files are shipped in the distribution.
by Diego Elio Pettenò 20 Jan '10

20 Jan '10

Without these files the tests will fail when ESX support is enabled. --- tests/Makefile.am | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 63 insertions(+), 1 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 335b0e5..cf51162 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -47,6 +47,67 @@ qemuhelpdata = \ qemu-kvm-0.10.5 \ qemu-kvm-0.11.0-rc2 +vmx2xmldata = \ + vmx2xml-cdrom-ide-device.vmx \ + vmx2xml-cdrom-ide-device.xml \ + vmx2xml-cdrom-ide-file.vmx \ + vmx2xml-cdrom-ide-file.xml \ + vmx2xml-cdrom-scsi-device.vmx \ + vmx2xml-cdrom-scsi-device.xml \ + vmx2xml-cdrom-scsi-file.vmx \ + vmx2xml-cdrom-scsi-file.xml \ + vmx2xml-esx-in-the-wild-1.vmx \ + vmx2xml-esx-in-the-wild-1.xml \ + vmx2xml-esx-in-the-wild-2.vmx \ + vmx2xml-esx-in-the-wild-2.xml \ + vmx2xml-esx-in-the-wild-3.vmx \ + vmx2xml-esx-in-the-wild-3.xml \ + vmx2xml-esx-in-the-wild-4.vmx \ + vmx2xml-esx-in-the-wild-4.xml \ + vmx2xml-ethernet-bridged.vmx \ + vmx2xml-ethernet-bridged.xml \ + vmx2xml-ethernet-custom.vmx \ + vmx2xml-ethernet-custom.xml \ + vmx2xml-ethernet-e1000.vmx \ + vmx2xml-ethernet-e1000.xml \ + vmx2xml-floppy-device.vmx \ + vmx2xml-floppy-device.xml \ + vmx2xml-floppy-file.vmx \ + vmx2xml-floppy-file.xml \ + vmx2xml-gsx-in-the-wild-1.vmx \ + vmx2xml-gsx-in-the-wild-1.xml \ + vmx2xml-gsx-in-the-wild-2.vmx \ + vmx2xml-gsx-in-the-wild-2.xml \ + vmx2xml-gsx-in-the-wild-3.vmx \ + vmx2xml-gsx-in-the-wild-3.xml \ + vmx2xml-gsx-in-the-wild-4.vmx \ + vmx2xml-gsx-in-the-wild-4.xml \ + vmx2xml-harddisk-ide-file.vmx \ + vmx2xml-harddisk-ide-file.xml \ + vmx2xml-harddisk-scsi-file.vmx \ + vmx2xml-harddisk-scsi-file.xml \ + vmx2xml-minimal-64bit.vmx \ + vmx2xml-minimal-64bit.xml \ + vmx2xml-minimal.vmx \ + vmx2xml-minimal.xml \ + vmx2xml-parallel-device.vmx \ + vmx2xml-parallel-device.xml \ + vmx2xml-parallel-file.vmx \ + vmx2xml-parallel-file.xml \ + vmx2xml-scsi-buslogic.vmx \ + vmx2xml-scsi-buslogic.xml \ + vmx2xml-scsi-writethrough.vmx \ + vmx2xml-scsi-writethrough.xml \ + vmx2xml-serial-device.vmx \ + vmx2xml-serial-device.xml \ + vmx2xml-serial-file.vmx \ + vmx2xml-serial-file.xml \ + vmx2xml-serial-pipe-client-app.vmx \ + vmx2xml-serial-pipe-client-vm.vmx \ + vmx2xml-serial-pipe-server-app.vmx \ + vmx2xml-serial-pipe-server-vm.vmx \ + vmx2xml-serial-pipe.xml + EXTRA_DIST = \ oomtrace.pl \ test-lib.sh \ @@ -69,7 +130,8 @@ EXTRA_DIST = \ storagevolxml2xmlin \ nodedevschematest \ nodedevschemadata \ - $(patsubst %,qemuhelpdata/%,$(qemuhelpdata)) + $(patsubst %,qemuhelpdata/%,$(qemuhelpdata)) \ + $(patsubst %,vmx2xmldata/%,$(vmx2xmldata)) noinst_PROGRAMS = virshtest conftest \ nodeinfotest statstest qparamtest -- 1.6.6.rc4

3 8

[libvirt] [PATCH] qemu: Don't allocate zero bytes
by Matthias Bolte 20 Jan '10

20 Jan '10

--- src/qemu/qemu_conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 38eb3fd..92a9348 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -836,7 +836,7 @@ qemudCapsInitGuest(virCapsPtr caps, return -1; } - if (VIR_ALLOC_N(machines, nmachines) < 0) { + if (VIR_ALLOC_N(machines, 1) < 0) { virReportOOMError(NULL); VIR_FREE(machine->name); VIR_FREE(machine); -- 1.6.3.3

2 2

[libvirt] [PATCH] node_device_linux_sysfs.c: avoid opendir/fd leak on error path
by Jim Meyering 20 Jan '10

20 Jan '10

This looks pretty clear. It calls closedir upon successful return, but not in the error case. >From 526a2bc2d87f0bf7a0c16a2a96316e5c1d5dae2e Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Wed, 20 Jan 2010 17:49:35 +0100 Subject: [PATCH] node_device_linux_sysfs.c: avoid opendir/fd leak on error path * src/node_device/node_device_linux_sysfs.c(get_virtual_functions_linux): Don't leak a DIR buffer and file descriptor on error path. --- src/node_device/node_device_linux_sysfs.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/node_device/node_device_linux_sysfs.c b/src/node_device/node_device_linux_sysfs.c index ff7aaf0..e611e1a 100644 --- a/src/node_device/node_device_linux_sysfs.c +++ b/src/node_device/node_device_linux_sysfs.c @@ -2,7 +2,7 @@ * node_device_hal_linuc.c: Linux specific code to gather device data * not available through HAL. * - * Copyright (C) 2009 Red Hat, Inc. + * Copyright (C) 2009-2010 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -371,6 +371,8 @@ int get_virtual_functions_linux(const char *sysfs_path, ret = 0; out: + if (dir) + closedir(dir); VIR_FREE(device_link); return 0; } -- 1.6.6.516.gb72f

2 4

[libvirt] [PATCH] domain_conf.c: avoid a leak and the need for "cleanup:" block
by Jim Meyering 20 Jan '10

20 Jan '10

This avoids a leak and the need for a "cleanup:" block, along with its three goto statements. While often I prefer to write functions with a single return point, this one no longer has the need, now that "addr" is freed immediately after allocation. Adding the semicolon in the "case..." stmt may look odd. It's there because the first stmt is the declaration of "port". If you'd prefer, an alternative is to put the contents of that case inside a {...} block. >From dc879b00ccf6cc451b95ca3712e647605579ee0b Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Wed, 20 Jan 2010 19:27:43 +0100 Subject: [PATCH] domain_conf.c: avoid a leak and the need for "cleanup:" block * src/conf/domain_conf.c (virDomainChrDefFormat): Plug a leak on an error path, and at the same time, eliminate the need for a "cleanup:" block. Before, the "return -1" after the switch would leak an "addr" string. Now, by reversing the port,addr- getting blocks we can free "addr" immediately and skip the goto. --- src/conf/domain_conf.c | 30 +++++++++++++----------------- 1 files changed, 13 insertions(+), 17 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6254dc8..7815805 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1,7 +1,7 @@ /* * domain_conf.c: domain XML processing * - * Copyright (C) 2006-2009 Red Hat, Inc. + * Copyright (C) 2006-2010 Red Hat, Inc. * Copyright (C) 2006-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -4831,7 +4831,6 @@ virDomainChrDefFormat(virConnectPtr conn, const char *targetName = virDomainChrTargetTypeToString(def->targetType); const char *elementName; - const char *addr = NULL; int ret = 0; switch (def->targetType) { @@ -4847,8 +4846,7 @@ virDomainChrDefFormat(virConnectPtr conn, if (!type) { virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, _("unexpected char type %d"), def->type); - ret = -1; - goto cleanup; + return -1; } /* Compat with legacy <console tty='/dev/pts/5'/> syntax */ @@ -4931,22 +4929,23 @@ virDomainChrDefFormat(virConnectPtr conn, switch (def->targetType) { case VIR_DOMAIN_CHR_TARGET_TYPE_GUESTFWD: - addr = virSocketFormatAddr(def->target.addr); - if (addr == NULL) { - virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s", - _("Unable to format guestfwd address")); - ret = -1; - goto cleanup; - } + ; /* dummy stmt, for following declaration */ int port = virSocketGetPort(def->target.addr); if (port < 0) { virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s", _("Unable to format guestfwd port")); - ret = -1; - goto cleanup; + return -1; + } + const char *addr = virSocketFormatAddr(def->target.addr); + if (addr == NULL) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s", + _("Unable to format guestfwd address")); + return -1; } - virBufferVSprintf(buf, " <target type='guestfwd' address='%s' port='%d'/>\n", + virBufferVSprintf(buf, + " <target type='guestfwd' address='%s' port='%d'/>\n", addr, port); + VIR_FREE(addr); break; case VIR_DOMAIN_CHR_TARGET_TYPE_PARALLEL: @@ -4969,9 +4968,6 @@ virDomainChrDefFormat(virConnectPtr conn, virBufferVSprintf(buf, " </%s>\n", elementName); -cleanup: - VIR_FREE(addr); - return ret; } -- 1.6.6.516.gb72f

2 3

Re: [libvirt] [PATCH] Document cpu-compare command in virsh man page
by Jiri Denemark 20 Jan '10

20 Jan '10

On Wed, Jan 20, 2010 at 16:17:32 +0100, Daniel Veillard wrote: > On Wed, Jan 20, 2010 at 03:16:29PM +0100, Jiri Denemark wrote: > > Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> > > --- > > tools/virsh.pod | 9 +++++++++ > > 1 files changed, 9 insertions(+), 0 deletions(-) > > > > diff --git a/tools/virsh.pod b/tools/virsh.pod > > index 84a8564..10f622f 100644 > > --- a/tools/virsh.pod > > +++ b/tools/virsh.pod > > @@ -213,6 +213,15 @@ crashed. > > Prints the available amount of memory on the machine or within a > > NUMA cell if I<cellno> is provided. > > > > +=item B<cpu-compare> I<FILE> > > + > > +Compare CPU definition from XML <file> with host CPU. The XML <file> may > > +contain either host or guest CPU definition. The host CPU definition is the > > +<cpu> element and its contents as printed by B<capabilities> command. The > > +guest CPU definition is the <cpu> element and its contents from domain XML > > +definition. For more information on guest CPU definition see: > > +L<http://libvirt.org/formatdomain.html#elementsCPU> > > + > > =back > > > > =head1 DOMAIN COMMANDS > > ACK, Thanks, pushed. Jirka

1 0

[libvirt] [PATCH] Document cpu-compare command in virsh man page
by Jiri Denemark 20 Jan '10

20 Jan '10

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- tools/virsh.pod | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 84a8564..10f622f 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -213,6 +213,15 @@ crashed. Prints the available amount of memory on the machine or within a NUMA cell if I<cellno> is provided. +=item B<cpu-compare> I<FILE> + +Compare CPU definition from XML <file> with host CPU. The XML <file> may +contain either host or guest CPU definition. The host CPU definition is the +<cpu> element and its contents as printed by B<capabilities> command. The +guest CPU definition is the <cpu> element and its contents from domain XML +definition. For more information on guest CPU definition see: +L<http://libvirt.org/formatdomain.html#elementsCPU> + =back =head1 DOMAIN COMMANDS -- 1.6.6

1 0

[libvirt] [PATCH] Libvirt Snapshot API
by Philip Jameson 20 Jan '10

20 Jan '10

A little while ago I submitted a patch to add a snapshot API, but I was informed that it got somewhat lost in the list. I have attached a patch that implements this API at least for the qemu driver, and it also added another function for screenshots, just because it usually is nice to get a view of the screen with the snapshot. The snapshot functions just take names, as I figure it should be up to libvirt to figure out where the snapshots go. e.g. for qemu, they just get stored with the drive using qemu's built in facilities. If someone were using LVM, then that could be managed by libvirt, just like it does for qemu monitors and such. The 'list snapshots' just returns a list of names for now, as that's all I needed, but I think it would probably be best to add a struct that would be name/time. I don't know if it's of any use at the moment, but I needed these functions implemented, so I figured I'd at least submit my changes Philip Jameson

2 3

[libvirt] XML for the "boot=on" option
by Shi Jin 20 Jan '10

20 Jan '10

Hi, there, In order to install windows 2008 using the virtio driver, I had to modify the KVM command to include the boot=on option like: -drive file=<path>/virtioWin08.raw,if=virtio,index=0,boot=on However, I haven't been able to find a corresponding libvirt XML element that can enable this "boot=on" option. Is there a way to do this? Thanks a lot. -- Shi Jin, PhD

2 1

[libvirt] [PATCH] Fix QEMU driver custom domain status XML extensions
by Daniel P. Berrange 20 Jan '10

20 Jan '10

Invoking the virConnectGetCapabilities() method causes the QEMU driver to rebuild its internal capabilities object. Unfortunately it was forgetting to register the custom domain status XML hooks again. To avoid this kind of error in the future, the code which builds capabilities is refactored into one single method, which can be called from all locations, ensuring reliable rebuilds. * src/qemu/qemu_driver.c: Fix rebuilding of capabilities XML and guarentee it is always consistent --- src/qemu/qemu_driver.c | 110 +++++++++++++++++++++++------------------------- 1 files changed, 53 insertions(+), 57 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2d80774..9a3ddfb 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -892,34 +892,6 @@ qemuReconnectDomains(struct qemud_driver *driver) static int -qemudSecurityCapsInit(virSecurityDriverPtr secdrv, - virCapsPtr caps) -{ - const char *doi, *model; - - doi = virSecurityDriverGetDOI(secdrv); - model = virSecurityDriverGetModel(secdrv); - - caps->host.secModel.model = strdup(model); - if (!caps->host.secModel.model) { - virReportOOMError(NULL); - return -1; - } - - caps->host.secModel.doi = strdup(doi); - if (!caps->host.secModel.doi) { - virReportOOMError(NULL); - return -1; - } - - VIR_DEBUG("Initialized caps for security driver \"%s\" with " - "DOI \"%s\"", model, doi); - - return 0; -} - - -static int qemudSecurityInit(struct qemud_driver *qemud_drv) { int ret; @@ -940,15 +912,52 @@ qemudSecurityInit(struct qemud_driver *qemud_drv) qemud_drv->securityDriver = security_drv; VIR_INFO("Initialized security driver %s", security_drv->name); - - /* - * Add security policy host caps now that the security driver is - * initialized. - */ - return qemudSecurityCapsInit(security_drv, qemud_drv->caps); + return 0; } +static virCapsPtr +qemuCreateCapabilities(virCapsPtr oldcaps, + virSecurityDriverPtr secDriver) +{ + virCapsPtr caps; + + /* Basic host arch / guest machine capabilities */ + if (!(caps = qemudCapsInit(oldcaps))) { + virReportOOMError(NULL); + return NULL; + } + + /* Domain XML parser hooks */ + caps->privateDataAllocFunc = qemuDomainObjPrivateAlloc; + caps->privateDataFreeFunc = qemuDomainObjPrivateFree; + caps->privateDataXMLFormat = qemuDomainObjPrivateXMLFormat; + caps->privateDataXMLParse = qemuDomainObjPrivateXMLParse; + + + /* Security driver data */ + if (secDriver) { + const char *doi, *model; + + doi = virSecurityDriverGetDOI(secDriver); + model = virSecurityDriverGetModel(secDriver); + + if (!(caps->host.secModel.model = strdup(model))) + goto no_memory; + if (!(caps->host.secModel.doi = strdup(doi))) + goto no_memory; + + VIR_DEBUG("Initialized caps for security driver \"%s\" with " + "DOI \"%s\"", model, doi); + } + + return caps; + +no_memory: + virReportOOMError(NULL); + virCapabilitiesFree(caps); + return NULL; +} /** * qemudStartup: @@ -1074,13 +1083,12 @@ qemudStartup(int privileged) { virStrerror(-rc, buf, sizeof(buf))); } - if ((qemu_driver->caps = qemudCapsInit(NULL)) == NULL) - goto out_of_memory; + if (qemudSecurityInit(qemu_driver) < 0) + goto error; - qemu_driver->caps->privateDataAllocFunc = qemuDomainObjPrivateAlloc; - qemu_driver->caps->privateDataFreeFunc = qemuDomainObjPrivateFree; - qemu_driver->caps->privateDataXMLFormat = qemuDomainObjPrivateXMLFormat; - qemu_driver->caps->privateDataXMLParse = qemuDomainObjPrivateXMLParse; + if ((qemu_driver->caps = qemuCreateCapabilities(NULL, + qemu_driver->securityDriver)) == NULL) + goto error; if ((qemu_driver->activePciHostdevs = pciDeviceListNew(NULL)) == NULL) goto error; @@ -1104,10 +1112,6 @@ qemudStartup(int privileged) { } } - if (qemudSecurityInit(qemu_driver) < 0) { - goto error; - } - /* If hugetlbfs is present, then we need to create a sub-directory within * it, since we can't assume the root mount point has permissions that * will let our spawned QEMU instances use it. @@ -3255,15 +3259,12 @@ static char *qemudGetCapabilities(virConnectPtr conn) { char *xml = NULL; qemuDriverLock(driver); - if ((caps = qemudCapsInit(qemu_driver->caps)) == NULL) - goto no_memory; - caps->privateDataAllocFunc = qemuDomainObjPrivateAlloc; - caps->privateDataFreeFunc = qemuDomainObjPrivateFree; - - if (qemu_driver->securityDriver && - qemudSecurityCapsInit(qemu_driver->securityDriver, caps) < 0) - goto no_memory; + if ((caps = qemuCreateCapabilities(qemu_driver->caps, + qemu_driver->securityDriver)) == NULL) { + virCapabilitiesFree(caps); + goto cleanup; + } virCapabilitiesFree(qemu_driver->caps); qemu_driver->caps = caps; @@ -3275,11 +3276,6 @@ cleanup: qemuDriverUnlock(driver); return xml; - -no_memory: - virCapabilitiesFree(caps); - virReportOOMError(conn); - goto cleanup; } -- 1.6.5.2

2 1

[libvirt] [PATCH] Document <cpu> elements in capabilities and domain XML
by Jiri Denemark 20 Jan '10

20 Jan '10

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- docs/formatcaps.html.in | 13 +++++- docs/formatdomain.html.in | 93 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 3 deletions(-) diff --git a/docs/formatcaps.html.in b/docs/formatcaps.html.in index 36718d9..525a331 100644 --- a/docs/formatcaps.html.in +++ b/docs/formatcaps.html.in @@ -21,6 +21,11 @@ BIOS you will see</p> <features> <vmx/> </features> + <model>core2duo</model> + <topology sockets="1" cores="2" threads="1"/> + <feature name="lahf_lm"/> + <feature name='xtpr'/> + ... </cpu> </host></span> @@ -48,15 +53,17 @@ BIOS you will see</p> <loader>/usr/lib/xen/boot/hvmloader</loader> </arch> <features> + <cpuselection/> </features> </guest></span> ... </capabilities></pre> <p>The first block (in red) indicates the host hardware capabilities, currently it is limited to the CPU properties but other information may be available, -it shows the CPU architecture, and the features of the chip (the feature -block is similar to what you will find in a Xen fully virtualized domain -description).</p> +it shows the CPU architecture, topology, model name, and additional features +which are not included in the model but the CPU provides them. Features of the +chip are shown within the feature block (the block is similar to what you will +find in a Xen fully virtualized domain description).</p> <p>The second block (in blue) indicates the paravirtualization support of the Xen support, you will see the os_type of xen to indicate a paravirtual kernel, then architecture information and potential features.</p> diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index af31699..5030b6c 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -201,6 +201,99 @@ CPUs allocated for the guest OS.</dd> </dl> + <h3><a name="elementsCPU">CPU model and topology</a></h3> + + <p> + Requirements for CPU model, its features and topology can be specified + using the following collection of elements. + <snap class="since">Since 0.7.5</span> + </p> + + <pre> + ... + <cpu match='exact'> + <model>core2duo</model> + <topology sockets='1' cores='2' threads='1'/> + <feature policy='disable' name='lahf_lm'/> + </cpu> + ...</pre> + + <p> + In case no restrictions need to be put on CPU model and its features, a + simpler <code>cpu</code> element can be used. + <span class="since">Since 0.7.6</span> + </p> + + <pre> + ... + <cpu> + <topology sockets='1' cores='2' threads='1'/> + </cpu> + ...</pre> + + <dl> + <dt><code>cpu</code><dt> + <dd>The <code>cpu</code> element is the main container for describing + guest CPU requirements. Its <code>match</code> attribute specified how + strictly has the virtual CPU provided to the guest match these + requirements. <span class="since">Since 0.7.6</span> the + <code>match</code> attribute can be omitted if <code>topology</code> + is the only element within <code>cpu</code>. Possible values for the + <code>match</code> attribute are: + + <dl> + <dt><code>minimum</code></dt> + <dd>The specified CPU model and features describes the minimum + requested CPU.</dd> + <dt><code>exact</code></dt> + <dd>The virtual CPU provided to the guest will exactly match the + specification</dd> + <dt><code>strict</code></dt> + <dd>The guest will not be created unless the host CPU does exactly + match the specification.</dd> + </dl> + </dd> + + <dt><code>model</code></dt> + <dd>The content of the <code>model</code> element specifies CPU model + requested by the guest. The list of available CPU models and their + definition can be found in <code>cpu_map.xml</code> file installed + in libvirt's data directory.</dd> + + <dt><code>topology</code></dt> + <dd>The <code>topology</code> element specifies requested topology of + virtual CPU provided to the guest. Three non-zero values have to be + given for <code>sockets</code>, <code>cores</code>, and + <code>threads</code>: total number of CPU sockets, number of cores per + socket, and number of threads per core, respectively.</dd> + + <dt><code>feature</code></dt> + <dd>The <code>cpu</code> element can contain zero or more + <code>elements</code> used to fine-tune features provided by the + selected CPU model. The list of known feature names can be found in + the same file as CPU models. The meaning of each <code>feature</code> + element depends on its <code>policy</code> attribute, which has to be + set to one of the following values: + + <dl> + <dt><code>force</code></dt> + <dd>The virtual CPU will claim the feature is supported regardless + of it being supported by host CPU.</dd> + <dt><code>require</code></dt> + <dd>Guest creation will fail unless the feature is supported by host + CPU.</dd> + <dt><code>optional</code></dt> + <dd>The feature will be supported by virtual CPU if and only if it + is supported by host CPU.</dd> + <dt><code>disable</code></dt> + <dd>The feature will not be supported by virtual CPU.</dd> + <dt><code>forbid</code></dt> + <dd>Guest creation will fail if the feature is supported by host + CPU.</dd> + </dl> + </dd> + </dl> + <h3><a name="elementsLifecycle">Lifecycle control</a></h3> <p> -- 1.6.6

2 2

[libvirt] Website contains outdated information about remote limitations
by Matthias Bolte 20 Jan '10

20 Jan '10

http://www.libvirt.org/remote.html#Remote_limitations says: Limitations * Remote storage: To be fully useful, particularly for creating new domains, it should be possible to enumerate and provision storage on the remote machine. This is currently in the design phase. * Migration: We expect libvirt will support migration, and obviously remote support is what makes migration worthwhile. This is also in the design phase. Issues to discuss include which path the migration data should follow (eg. client to client direct, or client to server to client) and security. IMHO this is outdated information, because libvirt supports both features now. So both should be removed from the website as they could misinform newbies. Matthias

3 4

[libvirt] [PATCH 0/4] Update interface xml to match netcf 0.1.5
by Laine Stump 20 Jan '10

20 Jan '10

The first two patches make minor additions to the parsing/formatting. The 3rd is a bit more intrusive, as it switches from using virInterfaceBareDef for subordinate interfaces to recursively using a full virInterfaceDef (but with guaranteed closure due to limiting the type of subordinate interface allowed based on parent interface). The final patch updates the RNG and test files accordingly.

4 18

[libvirt] hvm/x86_64 combination not allowed
by Steve Brown 20 Jan '10

20 Jan '10

I have a VM that I am able to run using qemu form a command prompt with no problems. I want to run it from within libvirt, so I converted my qemu command to XML using 'virsh domxml-from-native ...' My problem is that my libvirt does not seem to support the x86_64 architecture, so when I try to launch the VM, the kernel won't built since it was installed on x86_64. My os container is as follows (as imported by virsh): <os> <type arch='i686' machine='pc-0.11'>hvm</type> <boot dev='hd'/> </os> However, when I try to change it to this: <os> <type arch='x86_64'>hvm</type> <boot dev='hd'/> </os> I get the following message: error: internal error os type 'hvm' & arch 'x86_64' combination is not supported I've searched for a proper command line switch to build this option into libvirt, but I have not had any success. So how do I get libvirt to support the x86_64 arch? Thanks, Steve PS: $ sudo virsh capabilities <capabilities> <host> <cpu> <arch>x86_64</arch> </cpu> <migration_features> <live/> <uri_transports> <uri_transport>tcp</uri_transport> </uri_transports> </migration_features> </host> <guest> <os_type>hvm</os_type> <arch name='i686'> <wordsize>32</wordsize> <emulator>/usr/bin/qemu</emulator> <machine>pc-0.11</machine> <machine canonical='pc-0.11'>pc</machine> <machine>pc-0.10</machine> <machine>isapc</machine> <domain type='qemu'> </domain> </arch> <features> <pae/> <nonpae/> <acpi default='on' toggle='yes'/> <apic default='on' toggle='no'/> </features> </guest> </capabilities>

4 7

[libvirt] [PATCH] logging: confirm that we want to ignore a write error
by Jim Meyering 19 Jan '10

19 Jan '10

Ignoring a write failure is a big deal, so when you do that deliberately, it's worth marking in such a way that code analyzers don't report a false positive. Until a year or so ago, people thought using (void) would be enough. But newer gcc warns in spite of that (for functions marked with the warn_unused_result attribute), so now we use the ignore_value function from gnulib. A coverity warning prompted the change below, but if we declare saferead with the warn_unused_result attribute, gcc would, too. >From 62d2c7f69608407afa9a4bf38f0d29ea3eec88f5 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 18 Jan 2010 11:51:01 +0100 Subject: [PATCH] logging: confirm that we want to ignore a write error * src/util/logging.c (virLogMessage): Include "ignore-value.h". Use it to ignore the return value of safewrite. Use STDERR_FILENO, rather than "2". * bootstrap (modules): Add ignore-value. * gnulib: Update to latest, for ignore-value that is now LGPLv2+. --- .gnulib | 2 +- bootstrap | 1 + src/util/logging.c | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gnulib b/.gnulib index 4c52807..146d914 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 4c52807f41f238cf0e352317b2dc54f9ba0f0c4f +Subproject commit 146d9145073e62a2096a2d6b33f75e93908fedf3 diff --git a/bootstrap b/bootstrap index c07d851..aec5d05 100755 --- a/bootstrap +++ b/bootstrap @@ -76,6 +76,7 @@ getpass gettext gitlog-to-changelog gnumakefile +ignore-value inet_pton ioctl maintainer-makefile diff --git a/src/util/logging.c b/src/util/logging.c index 6bd8469..3b3c309 100644 --- a/src/util/logging.c +++ b/src/util/logging.c @@ -1,7 +1,7 @@ /* * logging.c: internal logging and debugging * - * Copyright (C) 2008 Red Hat, Inc. + * Copyright (C) 2008, 2010 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -34,6 +34,7 @@ #include <syslog.h> #endif +#include "ignore-value.h" #include "logging.h" #include "memory.h" #include "util.h" @@ -579,7 +580,7 @@ void virLogMessage(const char *category, int priority, const char *funcname, msg, len, virLogOutputs[i].data); } if ((virLogNbOutputs == 0) && (flags != 1)) - safewrite(2, msg, len); + ignore_value (safewrite(STDERR_FILENO, msg, len)); virLogUnlock(); VIR_FREE(msg); -- 1.6.6.638.g2bc54

2 2

[libvirt] [PATCH v2 0/2] Block assignment of PCI devices below non-ACS capable switch
by Jiri Denemark 19 Jan '10

19 Jan '10

This is a patchset for blocking assignment of PCI devices below non-ACS capable switch. In case user still wants to assign such device even though it might not be safe, she can specify 'relaxed_acs_check = 1' in qemu.conf Special thanks to Chris L. who created a standalone program the PCI check. This code is a port of that check to libvirt. Changes in version 2: - permissive attribute for <hostdev> was removed - new 'relaxed_acs_check' config option in qemu.conf for relaxing the check Jiri Denemark (2): Tests for ACS in PCIe switches Use pciDeviceIsAssignable in qemu driver src/libvirt_private.syms | 1 + src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 6 ++ src/qemu/qemu_conf.c | 4 + src/qemu/qemu_conf.h | 2 + src/qemu/qemu_driver.c | 6 ++- src/qemu/test_libvirtd_qemu.aug | 6 ++- src/util/pci.c | 151 +++++++++++++++++++++++++++++++++++++++ src/util/pci.h | 4 + 9 files changed, 179 insertions(+), 2 deletions(-)

2 6

[libvirt] [PATCH] Remove superfluous new lines from messages
by Jiri Denemark 19 Jan '10

19 Jan '10

I noticed some debug messages are printed with an empty lines after them. This patch removes these empty lines from all invocations of the following macros: VIR_DEBUG VIR_DEBUG0 VIR_ERROR VIR_ERROR0 VIR_INFO VIR_WARN VIR_WARN0 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- daemon/libvirtd.c | 10 +++--- daemon/remote.c | 8 ++-- src/lxc/lxc_driver.c | 2 +- src/network/bridge_driver.c | 10 +++--- src/node_device/node_device_hal.c | 16 ++++---- src/node_device/node_device_linux_sysfs.c | 16 ++++---- src/node_device/node_device_udev.c | 54 ++++++++++++++-------------- src/qemu/qemu_driver.c | 36 +++++++++--------- src/qemu/qemu_monitor_text.c | 14 ++++---- src/secret/secret_driver.c | 2 +- src/util/pci.c | 2 +- src/xen/proxy_internal.c | 22 ++++++------ tools/console.c | 12 +++--- 13 files changed, 102 insertions(+), 102 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index c53ef0a..551c69c 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -600,7 +600,7 @@ remoteMakeSockets (int *fds, int max_fds, int *nfds_r, const char *node, const c int e = getaddrinfo (node, service, &hints, &ai); if (e != 0) { - VIR_ERROR(_("getaddrinfo: %s\n"), gai_strerror (e)); + VIR_ERROR(_("getaddrinfo: %s"), gai_strerror (e)); return -1; } @@ -2511,7 +2511,7 @@ checkType (virConfValuePtr p, const char *filename, (var_name) = strdup (p->str); \ if ((var_name) == NULL) { \ char ebuf[1024]; \ - VIR_ERROR(_("remoteReadConfigFile: %s\n"), \ + VIR_ERROR(_("remoteReadConfigFile: %s"), \ virStrerror(errno, ebuf, sizeof ebuf)); \ goto free_and_fail; \ } \ @@ -2554,7 +2554,7 @@ static int remoteConfigGetAuth(virConfPtr conf, const char *key, int *auth, cons *auth = REMOTE_AUTH_POLKIT; #endif } else { - VIR_ERROR(_("remoteReadConfigFile: %s: %s: unsupported auth %s\n"), + VIR_ERROR(_("remoteReadConfigFile: %s: %s: unsupported auth %s"), filename, key, p->str); return -1; } @@ -2839,13 +2839,13 @@ qemudSetupPrivs (void) if (__init_daemon_priv (PU_RESETGROUPS | PU_CLEARLIMITSET, SYSTEM_UID, SYSTEM_UID, PRIV_XVM_CONTROL, NULL)) { - VIR_ERROR0(_("additional privileges are required\n")); + VIR_ERROR0(_("additional privileges are required")); return -1; } if (priv_set (PRIV_OFF, PRIV_ALLSETS, PRIV_FILE_LINK_ANY, PRIV_PROC_INFO, PRIV_PROC_SESSION, PRIV_PROC_EXEC, PRIV_PROC_FORK, NULL)) { - VIR_ERROR0(_("failed to set reduced privileges\n")); + VIR_ERROR0(_("failed to set reduced privileges")); return -1; } diff --git a/daemon/remote.c b/daemon/remote.c index 0b30131..8f8adba 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -3375,7 +3375,7 @@ remoteDispatchAuthPolkit (struct qemud_server *server, goto authfail; } if (status != 0) { - VIR_ERROR(_("Policy kit denied action %s from pid %d, uid %d, result: %d\n"), + VIR_ERROR(_("Policy kit denied action %s from pid %d, uid %d, result: %d"), action, callerPid, callerUid, status); goto authfail; } @@ -3442,7 +3442,7 @@ remoteDispatchAuthPolkit (struct qemud_server *server, if (!(pkaction = polkit_action_new())) { char ebuf[1024]; - VIR_ERROR(_("Failed to create polkit action %s\n"), + VIR_ERROR(_("Failed to create polkit action %s"), virStrerror(errno, ebuf, sizeof ebuf)); polkit_caller_unref(pkcaller); goto authfail; @@ -3452,7 +3452,7 @@ remoteDispatchAuthPolkit (struct qemud_server *server, if (!(pkcontext = polkit_context_new()) || !polkit_context_init(pkcontext, &pkerr)) { char ebuf[1024]; - VIR_ERROR(_("Failed to create polkit context %s\n"), + VIR_ERROR(_("Failed to create polkit context %s"), (pkerr ? polkit_error_get_error_message(pkerr) : virStrerror(errno, ebuf, sizeof ebuf))); if (pkerr) @@ -3484,7 +3484,7 @@ remoteDispatchAuthPolkit (struct qemud_server *server, polkit_caller_unref(pkcaller); polkit_action_unref(pkaction); if (pkresult != POLKIT_RESULT_YES) { - VIR_ERROR(_("Policy kit denied action %s from pid %d, uid %d, result: %s\n"), + VIR_ERROR(_("Policy kit denied action %s from pid %d, uid %d, result: %s"), action, callerPid, callerUid, polkit_result_to_string_representation(pkresult)); goto authfail; diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 86606c7..556359e 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1603,7 +1603,7 @@ lxcAutostartDomain(void *payload, const char *name ATTRIBUTE_UNUSED, void *opaqu int ret = lxcVmStart(data->conn, data->driver, vm); if (ret < 0) { virErrorPtr err = virGetLastError(); - VIR_ERROR(_("Failed to autostart VM '%s': %s\n"), + VIR_ERROR(_("Failed to autostart VM '%s': %s"), vm->def->name, err ? err->message : ""); } else { diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 69809b3..4385215 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -977,14 +977,14 @@ static int networkStartNetworkDaemon(virConnectPtr conn, err_delbr1: if ((err = brSetInterfaceUp(driver->brctl, network->def->bridge, 0))) { char ebuf[1024]; - VIR_WARN(_("Failed to bring down bridge '%s' : %s\n"), + VIR_WARN(_("Failed to bring down bridge '%s' : %s"), network->def->bridge, virStrerror(err, ebuf, sizeof ebuf)); } err_delbr: if ((err = brDeleteBridge(driver->brctl, network->def->bridge))) { char ebuf[1024]; - VIR_WARN(_("Failed to delete bridge '%s' : %s\n"), + VIR_WARN(_("Failed to delete bridge '%s' : %s"), network->def->bridge, virStrerror(err, ebuf, sizeof ebuf)); } @@ -998,7 +998,7 @@ static int networkShutdownNetworkDaemon(virConnectPtr conn, int err; char *stateFile; - VIR_INFO(_("Shutting down network '%s'\n"), network->def->name); + VIR_INFO(_("Shutting down network '%s'"), network->def->name); if (!virNetworkObjIsActive(network)) return 0; @@ -1017,12 +1017,12 @@ static int networkShutdownNetworkDaemon(virConnectPtr conn, char ebuf[1024]; if ((err = brSetInterfaceUp(driver->brctl, network->def->bridge, 0))) { - VIR_WARN(_("Failed to bring down bridge '%s' : %s\n"), + VIR_WARN(_("Failed to bring down bridge '%s' : %s"), network->def->bridge, virStrerror(err, ebuf, sizeof ebuf)); } if ((err = brDeleteBridge(driver->brctl, network->def->bridge))) { - VIR_WARN(_("Failed to delete bridge '%s' : %s\n"), + VIR_WARN(_("Failed to delete bridge '%s' : %s"), network->def->bridge, virStrerror(err, ebuf, sizeof ebuf)); } diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index 7cb931e..02fcbf6 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -720,22 +720,22 @@ static int halDeviceMonitorStartup(int privileged ATTRIBUTE_UNUSED) dbus_error_init(&err); hal_ctx = libhal_ctx_new(); if (hal_ctx == NULL) { - VIR_ERROR0("libhal_ctx_new returned NULL\n"); + VIR_ERROR0("libhal_ctx_new returned NULL"); goto failure; } dbus_conn = dbus_bus_get(DBUS_BUS_SYSTEM, &err); if (dbus_conn == NULL) { - VIR_ERROR0("dbus_bus_get failed\n"); + VIR_ERROR0("dbus_bus_get failed"); goto failure; } dbus_connection_set_exit_on_disconnect(dbus_conn, FALSE); if (!libhal_ctx_set_dbus_connection(hal_ctx, dbus_conn)) { - VIR_ERROR0("libhal_ctx_set_dbus_connection failed\n"); + VIR_ERROR0("libhal_ctx_set_dbus_connection failed"); goto failure; } if (!libhal_ctx_init(hal_ctx, &err)) { - VIR_ERROR0("libhal_ctx_init failed, haldaemon is probably not running\n"); + VIR_ERROR0("libhal_ctx_init failed, haldaemon is probably not running"); /* We don't want to show a fatal error here, otherwise entire libvirtd shuts down when hald isn't running */ @@ -749,7 +749,7 @@ static int halDeviceMonitorStartup(int privileged ATTRIBUTE_UNUSED) remove_dbus_watch, toggle_dbus_watch, NULL, NULL)) { - VIR_ERROR0("dbus_connection_set_watch_functions failed\n"); + VIR_ERROR0("dbus_connection_set_watch_functions failed"); goto failure; } @@ -770,13 +770,13 @@ static int halDeviceMonitorStartup(int privileged ATTRIBUTE_UNUSED) !libhal_ctx_set_device_lost_capability(hal_ctx, device_cap_lost) || !libhal_ctx_set_device_property_modified(hal_ctx, device_prop_modified) || !libhal_device_property_watch_all(hal_ctx, &err)) { - VIR_ERROR0("setting up HAL callbacks failed\n"); + VIR_ERROR0("setting up HAL callbacks failed"); goto failure; } udi = libhal_get_all_devices(hal_ctx, &num_devs, &err); if (udi == NULL) { - VIR_ERROR0("libhal_get_all_devices failed\n"); + VIR_ERROR0("libhal_get_all_devices failed"); goto failure; } for (i = 0; i < num_devs; i++) { @@ -789,7 +789,7 @@ static int halDeviceMonitorStartup(int privileged ATTRIBUTE_UNUSED) failure: if (dbus_error_is_set(&err)) { - VIR_ERROR("%s: %s\n", err.name, err.message); + VIR_ERROR("%s: %s", err.name, err.message); dbus_error_free(&err); } virNodeDeviceObjListFree(&driverState->devs); diff --git a/src/node_device/node_device_linux_sysfs.c b/src/node_device/node_device_linux_sysfs.c index b1dff10..ff7aaf0 100644 --- a/src/node_device/node_device_linux_sysfs.c +++ b/src/node_device/node_device_linux_sysfs.c @@ -245,12 +245,12 @@ static int get_sriov_function(const char *device_link, char errbuf[64]; int ret = SRIOV_ERROR; - VIR_DEBUG("Attempting to resolve device path from device link '%s'\n", + VIR_DEBUG("Attempting to resolve device path from device link '%s'", device_link); if (!virFileExists(device_link)) { - VIR_DEBUG("SR IOV function link '%s' does not exist\n", device_link); + VIR_DEBUG("SR IOV function link '%s' does not exist", device_link); /* Not an SR IOV device, not an error, either. */ ret = SRIOV_NOT_FOUND; @@ -261,24 +261,24 @@ static int get_sriov_function(const char *device_link, device_path = realpath(device_link, device_path); if (device_path == NULL) { memset(errbuf, '\0', sizeof(errbuf)); - VIR_ERROR("Failed to resolve device link '%s': '%s'\n", device_link, + VIR_ERROR("Failed to resolve device link '%s': '%s'", device_link, virStrerror(errno, errbuf, sizeof(errbuf))); goto out; } - VIR_DEBUG("SR IOV device path is '%s'\n", device_path); + VIR_DEBUG("SR IOV device path is '%s'", device_path); config_address = basename(device_path); if (VIR_ALLOC(*bdf) != 0) { - VIR_ERROR0("Failed to allocate memory for PCI device name\n"); + VIR_ERROR0("Failed to allocate memory for PCI device name"); goto out; } if (parse_pci_config_address(config_address, *bdf) != 0) { - VIR_ERROR("Failed to parse PCI config address '%s'\n", config_address); + VIR_ERROR("Failed to parse PCI config address '%s'", config_address); goto out; } - VIR_DEBUG("SR IOV function %.4x:%.2x:%.2x.%.1x/>\n", + VIR_DEBUG("SR IOV function %.4x:%.2x:%.2x.%.1x", (*bdf)->domain, (*bdf)->bus, (*bdf)->slot, @@ -341,7 +341,7 @@ int get_virtual_functions_linux(const char *sysfs_path, goto out; } - VIR_DEBUG("Number of virtual functions: %d\n", *num_funcs); + VIR_DEBUG("Number of virtual functions: %d", *num_funcs); if (VIR_REALLOC_N(d->pci_dev.virtual_functions, (*num_funcs) + 1) != 0) { virReportOOMError(NULL); diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 7a9c1e5..d0ba88e 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -52,9 +52,9 @@ static int udevStrToLong_ull(char const *s, ret = virStrToLong_ull(s, end_ptr, base, result); if (ret != 0) { - VIR_ERROR("Failed to convert '%s' to unsigned long long\n", s); + VIR_ERROR("Failed to convert '%s' to unsigned long long", s); } else { - VIR_DEBUG("Converted '%s' to unsigned long %llu\n", s, *result); + VIR_DEBUG("Converted '%s' to unsigned long %llu", s, *result); } return ret; @@ -70,9 +70,9 @@ static int udevStrToLong_ui(char const *s, ret = virStrToLong_ui(s, end_ptr, base, result); if (ret != 0) { - VIR_ERROR("Failed to convert '%s' to unsigned int\n", s); + VIR_ERROR("Failed to convert '%s' to unsigned int", s); } else { - VIR_DEBUG("Converted '%s' to unsigned int %u\n", s, *result); + VIR_DEBUG("Converted '%s' to unsigned int %u", s, *result); } return ret; @@ -87,9 +87,9 @@ static int udevStrToLong_i(char const *s, ret = virStrToLong_i(s, end_ptr, base, result); if (ret != 0) { - VIR_ERROR("Failed to convert '%s' to int\n", s); + VIR_ERROR("Failed to convert '%s' to int", s); } else { - VIR_DEBUG("Converted '%s' to int %u\n", s, *result); + VIR_DEBUG("Converted '%s' to int %u", s, *result); } return ret; @@ -363,7 +363,7 @@ static int udevTranslatePCIIds(unsigned int vendor, const char *vendor_name = NULL, *device_name = NULL; if (pci_system_init() != 0) { - VIR_ERROR0("Failed to initialize libpciaccess\n"); + VIR_ERROR0("Failed to initialize libpciaccess"); goto out; } @@ -734,7 +734,7 @@ static int udevGetSCSIType(unsigned int type, char **typestring) ret = -1; virReportOOMError(NULL); } else { - VIR_ERROR("Failed to find SCSI device type %d\n", type); + VIR_ERROR("Failed to find SCSI device type %d", type); } } @@ -799,7 +799,7 @@ static int udevProcessSCSIDevice(struct udev_device *device ATTRIBUTE_UNUSED, out: if (ret != 0) { - VIR_ERROR("Failed to process SCSI device with sysfs path '%s'\n", + VIR_ERROR("Failed to process SCSI device with sysfs path '%s'", def->sysfs_path); } return ret; @@ -957,7 +957,7 @@ static int udevProcessStorage(struct udev_device *device, devnode = udev_device_get_devnode(device); if(!devnode) { - VIR_DEBUG("No devnode for '%s'\n", udev_device_get_devpath(device)); + VIR_DEBUG("No devnode for '%s'", udev_device_get_devpath(device)); goto out; } data->storage.block = strdup(devnode); @@ -1007,7 +1007,7 @@ static int udevProcessStorage(struct udev_device *device, } else if (STREQ(def->caps->data.storage.drive_type, "disk")) { ret = udevProcessDisk(device, def); } else { - VIR_INFO("Unsupported storage type '%s'\n", + VIR_INFO("Unsupported storage type '%s'", def->caps->data.storage.drive_type); goto out; } @@ -1121,7 +1121,7 @@ static int udevGetDeviceDetails(struct udev_device *device, ret = udevProcessStorage(device, def); break; default: - VIR_ERROR("Unknown device type %d\n", def->caps->type); + VIR_ERROR("Unknown device type %d", def->caps->type); ret = -1; break; } @@ -1139,11 +1139,11 @@ static int udevRemoveOneDevice(struct udev_device *device) name = udev_device_get_syspath(device); dev = virNodeDeviceFindBySysfsPath(&driverState->devs, name); if (dev != NULL) { - VIR_DEBUG("Removing device '%s' with sysfs path '%s'\n", + VIR_DEBUG("Removing device '%s' with sysfs path '%s'", dev->def->name, name); virNodeDeviceObjRemove(&driverState->devs, dev); } else { - VIR_INFO("Failed to find device to remove that has udev name '%s'\n", + VIR_INFO("Failed to find device to remove that has udev name '%s'", name); ret = -1; } @@ -1162,14 +1162,14 @@ static int udevSetParent(struct udev_device *device, parent_device = udev_device_get_parent(device); if (parent_device == NULL) { - VIR_INFO("Could not find udev parent for device with sysfs path '%s'\n", + VIR_INFO("Could not find udev parent for device with sysfs path '%s'", udev_device_get_syspath(device)); goto out; } parent_sysfs_path = udev_device_get_syspath(parent_device); if (parent_sysfs_path == NULL) { - VIR_INFO("Could not get syspath for parent of '%s'\n", + VIR_INFO("Could not get syspath for parent of '%s'", udev_device_get_syspath(device)); goto out; } @@ -1237,7 +1237,7 @@ static int udevAddOneDevice(struct udev_device *device) dev = virNodeDeviceAssignDef(NULL, &driverState->devs, def); if (dev == NULL) { - VIR_ERROR("Failed to create device for '%s'\n", def->name); + VIR_ERROR("Failed to create device for '%s'", def->name); virNodeDeviceDefFree(def); goto out; } @@ -1263,7 +1263,7 @@ static int udevProcessDeviceListEntry(struct udev *udev, device = udev_device_new_from_syspath(udev, name); if (device != NULL) { if (udevAddOneDevice(device) != 0) { - VIR_INFO("Failed to create node device for udev device '%s'\n", + VIR_INFO("Failed to create node device for udev device '%s'", name); } udev_device_unref(device); @@ -1285,7 +1285,7 @@ static int udevEnumerateDevices(struct udev *udev) ret = udev_enumerate_scan_devices(udev_enumerate); if (0 != ret) { - VIR_ERROR("udev scan devices returned %d\n", ret); + VIR_ERROR("udev scan devices returned %d", ret); goto out; } @@ -1355,12 +1355,12 @@ static void udevEventHandleCallback(int watch ATTRIBUTE_UNUSED, device = udev_monitor_receive_device(udev_monitor); if (device == NULL) { - VIR_ERROR0("udev_monitor_receive_device returned NULL\n"); + VIR_ERROR0("udev_monitor_receive_device returned NULL"); goto out; } action = udev_device_get_action(device); - VIR_DEBUG("udev action: '%s'\n", action); + VIR_DEBUG("udev action: '%s'", action); if (STREQ(action, "add") || STREQ(action, "change")) { udevAddOneDevice(device); @@ -1406,11 +1406,11 @@ static int udevSetupSystemDev(void) udev = udev_monitor_get_udev(DRV_STATE_UDEV_MONITOR(driverState)); device = udev_device_new_from_syspath(udev, DMI_DEVPATH); if (device == NULL) { - VIR_ERROR("Failed to get udev device for syspath '%s'\n", DMI_DEVPATH); + VIR_ERROR("Failed to get udev device for syspath '%s'", DMI_DEVPATH); device = udev_device_new_from_syspath(udev, DMI_DEVPATH_FALLBACK); if (device == NULL) { - VIR_ERROR("Failed to get udev device for syspath '%s'\n", DMI_DEVPATH_FALLBACK); + VIR_ERROR("Failed to get udev device for syspath '%s'", DMI_DEVPATH_FALLBACK); goto out; } } @@ -1472,7 +1472,7 @@ static int udevSetupSystemDev(void) dev = virNodeDeviceAssignDef(NULL, &driverState->devs, def); if (dev == NULL) { - VIR_ERROR("Failed to create device for '%s'\n", def->name); + VIR_ERROR("Failed to create device for '%s'", def->name); virNodeDeviceDefFree(def); goto out; } @@ -1498,7 +1498,7 @@ static int udevDeviceMonitorStartup(int privileged ATTRIBUTE_UNUSED) } if (virMutexInit(&driverState->lock) < 0) { - VIR_ERROR0("Failed to initialize mutex for driverState\n"); + VIR_ERROR0("Failed to initialize mutex for driverState"); VIR_FREE(driverState); ret = -1; goto out; @@ -1517,7 +1517,7 @@ static int udevDeviceMonitorStartup(int privileged ATTRIBUTE_UNUSED) udev_monitor = udev_monitor_new_from_netlink(udev, "udev"); if (udev_monitor == NULL) { - VIR_ERROR0("udev_monitor_new_from_netlink returned NULL\n"); + VIR_ERROR0("udev_monitor_new_from_netlink returned NULL"); ret = -1; goto out; } @@ -1612,7 +1612,7 @@ static virStateDriver udevStateDriver = { int udevNodeRegister(void) { - VIR_DEBUG0("Registering udev node device backend\n"); + VIR_DEBUG0("Registering udev node device backend"); registerCommonNodeFuncs(&udevDeviceMonitor); if (virRegisterDeviceMonitor(&udevDeviceMonitor) < 0) { diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8817565..c7732f7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -579,7 +579,7 @@ qemuAutostartDomain(void *payload, const char *name ATTRIBUTE_UNUSED, void *opaq ret = qemudStartVMDaemon(data->conn, data->driver, vm, NULL, -1); if (ret < 0) { virErrorPtr err = virGetLastError(); - VIR_ERROR(_("Failed to autostart VM '%s': %s\n"), + VIR_ERROR(_("Failed to autostart VM '%s': %s"), vm->def->name, err ? err->message : ""); } else { @@ -819,7 +819,7 @@ qemuConnectMonitor(virDomainObjPtr vm) priv->monConfig, priv->monJSON, &monitorCallbacks)) == NULL) { - VIR_ERROR(_("Failed to connect monitor for %s\n"), vm->def->name); + VIR_ERROR(_("Failed to connect monitor for %s"), vm->def->name); return -1; } @@ -1028,19 +1028,19 @@ qemudStartup(int privileged) { if (virFileMakePath(qemu_driver->stateDir) < 0) { char ebuf[1024]; - VIR_ERROR(_("Failed to create state dir '%s': %s\n"), + VIR_ERROR(_("Failed to create state dir '%s': %s"), qemu_driver->stateDir, virStrerror(errno, ebuf, sizeof ebuf)); goto error; } if (virFileMakePath(qemu_driver->libDir) < 0) { char ebuf[1024]; - VIR_ERROR(_("Failed to create lib dir '%s': %s\n"), + VIR_ERROR(_("Failed to create lib dir '%s': %s"), qemu_driver->libDir, virStrerror(errno, ebuf, sizeof ebuf)); goto error; } if (virFileMakePath(qemu_driver->cacheDir) < 0) { char ebuf[1024]; - VIR_ERROR(_("Failed to create cache dir '%s': %s\n"), + VIR_ERROR(_("Failed to create cache dir '%s': %s"), qemu_driver->cacheDir, virStrerror(errno, ebuf, sizeof ebuf)); goto error; } @@ -1520,7 +1520,7 @@ qemudWaitForMonitor(virConnectPtr conn, "console", 3); if (close(logfd) < 0) { char ebuf[4096]; - VIR_WARN(_("Unable to close logfile: %s\n"), + VIR_WARN(_("Unable to close logfile: %s"), virStrerror(errno, ebuf, sizeof ebuf)); } @@ -1865,7 +1865,7 @@ qemuDomainReAttachHostDevices(virConnectPtr conn, if (!(pcidevs = qemuGetPciHostDeviceList(conn, def))) { virErrorPtr err = virGetLastError(); - VIR_ERROR(_("Failed to allocate pciDeviceList: %s\n"), + VIR_ERROR(_("Failed to allocate pciDeviceList: %s"), err ? err->message : ""); virResetError(err); return; @@ -1884,7 +1884,7 @@ qemuDomainReAttachHostDevices(virConnectPtr conn, if (pciResetDevice(conn, dev, driver->activePciHostdevs) < 0) { virErrorPtr err = virGetLastError(); - VIR_ERROR(_("Failed to reset PCI device: %s\n"), + VIR_ERROR(_("Failed to reset PCI device: %s"), err ? err->message : ""); virResetError(err); } @@ -1895,7 +1895,7 @@ qemuDomainReAttachHostDevices(virConnectPtr conn, if (pciDeviceGetManaged(dev) && pciReAttachDevice(NULL, dev) < 0) { virErrorPtr err = virGetLastError(); - VIR_ERROR(_("Failed to re-attach PCI device: %s\n"), + VIR_ERROR(_("Failed to re-attach PCI device: %s"), err ? err->message : ""); virResetError(err); } @@ -2475,29 +2475,29 @@ static int qemudStartVMDaemon(virConnectPtr conn, tmp = progenv; while (*tmp) { if (safewrite(logfile, *tmp, strlen(*tmp)) < 0) - VIR_WARN(_("Unable to write envv to logfile: %s\n"), + VIR_WARN(_("Unable to write envv to logfile: %s"), virStrerror(errno, ebuf, sizeof ebuf)); if (safewrite(logfile, " ", 1) < 0) - VIR_WARN(_("Unable to write envv to logfile: %s\n"), + VIR_WARN(_("Unable to write envv to logfile: %s"), virStrerror(errno, ebuf, sizeof ebuf)); tmp++; } tmp = argv; while (*tmp) { if (safewrite(logfile, *tmp, strlen(*tmp)) < 0) - VIR_WARN(_("Unable to write argv to logfile: %s\n"), + VIR_WARN(_("Unable to write argv to logfile: %s"), virStrerror(errno, ebuf, sizeof ebuf)); if (safewrite(logfile, " ", 1) < 0) - VIR_WARN(_("Unable to write argv to logfile: %s\n"), + VIR_WARN(_("Unable to write argv to logfile: %s"), virStrerror(errno, ebuf, sizeof ebuf)); tmp++; } if (safewrite(logfile, "\n", 1) < 0) - VIR_WARN(_("Unable to write argv to logfile: %s\n"), + VIR_WARN(_("Unable to write argv to logfile: %s"), virStrerror(errno, ebuf, sizeof ebuf)); if ((pos = lseek(logfile, 0, SEEK_END)) < 0) - VIR_WARN(_("Unable to seek to end of logfile: %s\n"), + VIR_WARN(_("Unable to seek to end of logfile: %s"), virStrerror(errno, ebuf, sizeof ebuf)); for (i = 0 ; i < ntapfds ; i++) @@ -5256,7 +5256,7 @@ cleanup: try_remove: if (!net->hostnet_name || net->vlan == 0) - VIR_WARN0(_("Unable to remove network backend\n")); + VIR_WARN0(_("Unable to remove network backend")); else { qemuDomainObjEnterMonitorWithDriver(driver, vm); if (qemuMonitorRemoveHostNetwork(priv->mon, net->vlan, net->hostnet_name) < 0) @@ -5270,7 +5270,7 @@ try_tapfd_close: if (tapfd_name) { qemuDomainObjEnterMonitorWithDriver(driver, vm); if (qemuMonitorCloseFileHandle(priv->mon, tapfd_name) < 0) - VIR_WARN(_("Failed to close tapfd with '%s'\n"), tapfd_name); + VIR_WARN(_("Failed to close tapfd with '%s'"), tapfd_name); qemuDomainObjExitMonitorWithDriver(driver, vm); } @@ -7639,7 +7639,7 @@ endjob: * overwrite the previous error, though, so we just throw something * to the logs and hope for the best */ - VIR_ERROR(_("Failed to resume guest %s after failure\n"), + VIR_ERROR(_("Failed to resume guest %s after failure"), vm->def->name); } qemuDomainObjExitMonitorWithDriver(driver, vm); diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 5b9ced2..aae026e 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -1301,42 +1301,42 @@ qemuMonitorTextParsePciAddReply(qemuMonitorPtr mon ATTRIBUTE_UNUSED, s += strlen("domain "); if (virStrToLong_ui(s, &e, 10, domain) == -1) { - VIR_WARN(_("Unable to parse domain number '%s'\n"), s); + VIR_WARN(_("Unable to parse domain number '%s'"), s); return -1; } if (!STRPREFIX(e, ", ")) { - VIR_WARN(_("Expected ', ' parsing pci_add reply '%s'\n"), s); + VIR_WARN(_("Expected ', ' parsing pci_add reply '%s'"), s); return -1; } s = e + 2; } if (!STRPREFIX(s, "bus ")) { - VIR_WARN(_("Expected 'bus ' parsing pci_add reply '%s'\n"), s); + VIR_WARN(_("Expected 'bus ' parsing pci_add reply '%s'"), s); return -1; } s += strlen("bus "); if (virStrToLong_ui(s, &e, 10, bus) == -1) { - VIR_WARN(_("Unable to parse bus number '%s'\n"), s); + VIR_WARN(_("Unable to parse bus number '%s'"), s); return -1; } if (!STRPREFIX(e, ", ")) { - VIR_WARN(_("Expected ', ' parsing pci_add reply '%s'\n"), s); + VIR_WARN(_("Expected ', ' parsing pci_add reply '%s'"), s); return -1; } s = e + 2; if (!STRPREFIX(s, "slot ")) { - VIR_WARN(_("Expected 'slot ' parsing pci_add reply '%s'\n"), s); + VIR_WARN(_("Expected 'slot ' parsing pci_add reply '%s'"), s); return -1; } s += strlen("slot "); if (virStrToLong_ui(s, &e, 10, slot) == -1) { - VIR_WARN(_("Unable to parse slot number '%s'\n"), s); + VIR_WARN(_("Unable to parse slot number '%s'"), s); return -1; } diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 1eef468..4478296 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -498,7 +498,7 @@ loadSecrets(virConnectPtr conn, virSecretDriverStatePtr driver, if (secret == NULL) { virErrorPtr err = virGetLastError(); - VIR_ERROR(_("Error reading secret: %s\n"), + VIR_ERROR(_("Error reading secret: %s"), err != NULL ? err->message: ""); virResetError(err); continue; diff --git a/src/util/pci.c b/src/util/pci.c index 1e003c2..109d435 100644 --- a/src/util/pci.c +++ b/src/util/pci.c @@ -440,7 +440,7 @@ pciIsParent(pciDevice *dev, pciDevice *check, void *data ATTRIBUTE_UNUSED) secondary = pciRead8(check, PCI_SECONDARY_BUS); subordinate = pciRead8(check, PCI_SUBORDINATE_BUS); - VIR_DEBUG("%s %s: found parent device %s\n", dev->id, dev->name, check->name); + VIR_DEBUG("%s %s: found parent device %s", dev->id, dev->name, check->name); /* No, it's superman! */ return (dev->bus >= secondary && dev->bus <= subordinate); diff --git a/src/xen/proxy_internal.c b/src/xen/proxy_internal.c index 73a0469..bde3eda 100644 --- a/src/xen/proxy_internal.c +++ b/src/xen/proxy_internal.c @@ -146,11 +146,11 @@ virProxyForkServer(void) const char *proxyarg[2]; if (!proxyPath) { - VIR_WARN0("failed to find libvirt_proxy\n"); + VIR_WARN0("failed to find libvirt_proxy"); return(-1); } - VIR_DEBUG("Asking to launch %s\n", proxyPath); + VIR_DEBUG("Asking to launch %s", proxyPath); proxyarg[0] = proxyPath; proxyarg[1] = NULL; @@ -158,7 +158,7 @@ virProxyForkServer(void) if (virExecDaemonize(NULL, proxyarg, NULL, NULL, &pid, -1, NULL, NULL, 0, NULL, NULL, NULL) < 0) - VIR_ERROR0("Failed to fork libvirt_proxy\n"); + VIR_ERROR0("Failed to fork libvirt_proxy"); return (0); } @@ -239,9 +239,9 @@ virProxyCloseSocket(xenUnifiedPrivatePtr priv) { ret = close(priv->proxy); if (ret != 0) - VIR_WARN(_("Failed to close socket %d\n"), priv->proxy); + VIR_WARN(_("Failed to close socket %d"), priv->proxy); else - VIR_DEBUG("Closed socket %d\n", priv->proxy); + VIR_DEBUG("Closed socket %d", priv->proxy); priv->proxy = -1; return(ret); } @@ -267,14 +267,14 @@ retry: ret = read(fd, buffer, len); if (ret < 0) { if (errno == EINTR) { - VIR_DEBUG("read socket %d interrupted\n", fd); + VIR_DEBUG("read socket %d interrupted", fd); goto retry; } - VIR_WARN("Failed to read socket %d\n", fd); + VIR_WARN("Failed to read socket %d", fd); return(-1); } - VIR_DEBUG("read %d bytes from socket %d\n", + VIR_DEBUG("read %d bytes from socket %d", ret, fd); return(ret); } @@ -296,10 +296,10 @@ virProxyWriteClientSocket(int fd, const char *data, int len) { ret = safewrite(fd, data, len); if (ret < 0) { - VIR_WARN(_("Failed to write to socket %d\n"), fd); + VIR_WARN(_("Failed to write to socket %d"), fd); return(-1); } - VIR_DEBUG("wrote %d bytes to socket %d\n", + VIR_DEBUG("wrote %d bytes to socket %d", len, fd); return(0); @@ -451,7 +451,7 @@ retry: goto error; } if (res->serial != serial) { - VIR_WARN(_("got asynchronous packet number %d\n"), res->serial); + VIR_WARN(_("got asynchronous packet number %d"), res->serial); goto retry; } diff --git a/tools/console.c b/tools/console.c index 4a1a80b..3bb97ec 100644 --- a/tools/console.c +++ b/tools/console.c @@ -73,7 +73,7 @@ int vshRunConsole(const char *tty) { /* We do not want this to become the controlling TTY */ if ((ttyfd = open(tty, O_NOCTTY | O_RDWR)) < 0) { - VIR_ERROR(_("unable to open tty %s: %s\n"), + VIR_ERROR(_("unable to open tty %s: %s"), tty, strerror(errno)); return -1; } @@ -84,7 +84,7 @@ int vshRunConsole(const char *tty) { also ensure Ctrl-C, etc is blocked, and misc other bits */ if (tcgetattr(STDIN_FILENO, &ttyattr) < 0) { - VIR_ERROR(_("unable to get tty attributes: %s\n"), + VIR_ERROR(_("unable to get tty attributes: %s"), strerror(errno)); goto closetty; } @@ -93,7 +93,7 @@ int vshRunConsole(const char *tty) { cfmakeraw(&rawattr); if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &rawattr) < 0) { - VIR_ERROR(_("unable to set tty attributes: %s\n"), + VIR_ERROR(_("unable to set tty attributes: %s"), strerror(errno)); goto closetty; } @@ -128,7 +128,7 @@ int vshRunConsole(const char *tty) { if (errno == EINTR || errno == EAGAIN) continue; - VIR_ERROR(_("failure waiting for I/O: %s\n"), strerror(errno)); + VIR_ERROR(_("failure waiting for I/O: %s"), strerror(errno)); goto cleanup; } @@ -142,7 +142,7 @@ int vshRunConsole(const char *tty) { int got, sent = 0, destfd; if ((got = read(fds[i].fd, buf, sizeof(buf))) < 0) { - VIR_ERROR(_("failure reading input: %s\n"), + VIR_ERROR(_("failure reading input: %s"), strerror(errno)); goto cleanup; } @@ -164,7 +164,7 @@ int vshRunConsole(const char *tty) { int done; if ((done = safewrite(destfd, buf + sent, got - sent)) <= 0) { - VIR_ERROR(_("failure writing output: %s\n"), + VIR_ERROR(_("failure writing output: %s"), strerror(errno)); goto cleanup; } -- 1.6.6

5 8

[libvirt] [PATCH] Make all bitfields unsigned ints to avoid unexpected values in casts
by Daniel P. Berrange 19 Jan '10

19 Jan '10

The 'int virInterfaceIsActive()' method was directly returning the value of the 'int active:1' bitfield in virIntefaceDefPtr. A bitfield with a signed integer, will hold the values 0 and -1, not 0 and +1 as might be expected. This meant that virInterfaceIsActive() was always returning -1 when the interface was active, not +1 & thus all callers thought an error had occurred. To protect against this kind of mistake again, change all bitfields to be unsigned ints * daemon/libvirtd.h, src/conf/domain_conf.h, src/conf/interface_conf.h, src/conf/network_conf.h: Change bitfields to unsigned int. --- daemon/libvirtd.h | 14 +++++++------- src/conf/domain_conf.h | 14 +++++++------- src/conf/interface_conf.h | 2 +- src/conf/network_conf.h | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/daemon/libvirtd.h b/daemon/libvirtd.h index 2f647f3..a7591fc 100644 --- a/daemon/libvirtd.h +++ b/daemon/libvirtd.h @@ -175,9 +175,9 @@ struct qemud_client { int fd; int watch; - int readonly:1; - int closing:1; - int domain_events_registered:1; + unsigned int readonly :1; + unsigned int closing :1; + unsigned int domain_events_registered :1; struct sockaddr_storage addr; socklen_t addrlen; @@ -185,7 +185,7 @@ struct qemud_client { int type; /* qemud_sock_type */ gnutls_session_t tlssession; int auth; - int handshake : 1; /* If we're in progress for TLS handshake */ + unsigned int handshake :1; /* If we're in progress for TLS handshake */ #if HAVE_SASL sasl_conn_t *saslconn; int saslSSF; @@ -244,9 +244,9 @@ struct qemud_socket { struct qemud_worker { pthread_t thread; - int hasThread :1; - int processingCall :1; - int quitRequest : 1; + unsigned int hasThread :1; + unsigned int processingCall :1; + unsigned int quitRequest :1; /* back-pointer to our server */ struct qemud_server *server; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 1413273..7be090d 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -400,8 +400,8 @@ enum virDomainVideoType { typedef struct _virDomainVideoAccelDef virDomainVideoAccelDef; typedef virDomainVideoAccelDef *virDomainVideoAccelDefPtr; struct _virDomainVideoAccelDef { - int support3d : 1; - int support2d : 1; + unsigned int support3d :1; + unsigned int support2d :1; }; @@ -432,7 +432,7 @@ struct _virDomainGraphicsDef { union { struct { int port; - int autoport : 1; + unsigned int autoport :1; char *listenAddr; char *keymap; char *passwd; @@ -445,13 +445,13 @@ struct _virDomainGraphicsDef { struct { int port; char *listenAddr; - int autoport : 1; - int replaceUser : 1; - int multiUser : 1; + unsigned int autoport :1; + unsigned int replaceUser :1; + unsigned int multiUser :1; } rdp; struct { char *display; - int fullscreen : 1; + unsigned int fullscreen :1; } desktop; } data; }; diff --git a/src/conf/interface_conf.h b/src/conf/interface_conf.h index 2683eee..5b201d3 100644 --- a/src/conf/interface_conf.h +++ b/src/conf/interface_conf.h @@ -170,7 +170,7 @@ typedef virInterfaceObj *virInterfaceObjPtr; struct _virInterfaceObj { virMutex lock; - int active:1; /* 1 if interface is active (up) */ + unsigned int active:1; /* 1 if interface is active (up) */ virInterfaceDefPtr def; /* The interface definition */ }; diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index 0214d1a..9e50659 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -65,7 +65,7 @@ struct _virNetworkDef { char *bridge; /* Name of bridge device */ char *domain; unsigned long delay; /* Bridge forward delay (ms) */ - int stp : 1; /* Spanning tree protocol */ + unsigned int stp :1; /* Spanning tree protocol */ int forwardType; /* One of virNetworkForwardType constants */ char *forwardDev; /* Destination device for forwarding */ -- 1.6.5.2

2 1

[libvirt] [PATCH] Take disabled/forced CPU features into account
by Jiri Denemark 19 Jan '10

19 Jan '10

When comparing x86 CPUs, features with 'disabled' policy were mistakenly required to be supported by the host CPU. Likewise, features with 'force' policy which were supported by host CPU would make CPUs incompatible if 'strict' match was used by guest CPU. This patch fixes both issues. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/cpu/cpu_x86.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 50c03ad..298b632 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -782,11 +782,14 @@ x86Compute(virCPUDefPtr host, if (!(cpu_forbid = x86ModelFromCPU(cpu, map, VIR_CPU_FEATURE_FORBID))) goto error; + x86ModelSubtract(cpu_require, cpu_disable); + if ((diff = x86ModelCopy(host_model)) == NULL) goto no_memory; x86ModelSubtract(diff, cpu_require); x86ModelSubtract(diff, cpu_optional); + x86ModelSubtract(diff, cpu_force); for (i = 0; i < cpu_forbid->ncpuid; i++) { const struct cpuX86cpuid *cpuid1; -- 1.6.6

3 3

[libvirt] [PATCH] Add debug messages for CPU incompatibility
by Jiri Denemark 19 Jan '10

19 Jan '10

When comparing incompatible CPUs, the reason for this incompatibility is logged as a debug message. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/cpu/cpu_x86.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 7c50261..50c03ad 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -755,8 +755,10 @@ x86Compute(virCPUDefPtr host, } } - if (!found) + if (!found) { + VIR_DEBUG("CPU arch %s does not match host arch", cpu->arch); return VIR_CPU_COMPARE_INCOMPATIBLE; + } } if ((map = x86LoadMap()) == NULL) @@ -796,6 +798,8 @@ x86Compute(virCPUDefPtr host, cpuid1->function); if (cpuid2 != NULL && x86cpuidMatchAny(cpuid2, cpuid1)) { + VIR_DEBUG("Host CPU provides forbidden features in CPUID function 0x%x", + cpuid1->function); ret = VIR_CPU_COMPARE_INCOMPATIBLE; goto out; } @@ -803,6 +807,7 @@ x86Compute(virCPUDefPtr host, result = x86ModelCompare(host_model, cpu_require); if (result == SUBSET || result == UNRELATED) { + VIR_DEBUG0("Host CPU does not provide all required features"); ret = VIR_CPU_COMPARE_INCOMPATIBLE; goto out; } @@ -819,6 +824,7 @@ x86Compute(virCPUDefPtr host, if (ret == VIR_CPU_COMPARE_SUPERSET && cpu->type == VIR_CPU_TYPE_GUEST && cpu->match == VIR_CPU_MATCH_STRICT) { + VIR_DEBUG0("Host CPU does not strictly match guest CPU"); ret = VIR_CPU_COMPARE_INCOMPATIBLE; goto out; } -- 1.6.6

3 3