March 2010 - Devel - Libvirt List Archives

[libvirt] [PATCH] Fix build with -Werror

by Laine Stump

A few more non-literal format strings in error log messages have crept in. Fix them in the standard way - turn the format string into "%s" with the original string as the arg. --- src/qemu/qemu_conf.c | 2 +- src/xen/xend_internal.c | 2 +- src/xen/xm_internal.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index c93baec..40ca221 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -3033,7 +3033,7 @@ qemuBuildVirtioSerialPortDevStr(virDomainChrDefPtr dev) VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL) { qemuReportError(VIR_ERR_INTERNAL_ERROR, - _("virtio serial device has invalid address type")); + "%s", _("virtio serial device has invalid address type")); goto error; } diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index cd7177b..8b4e49e 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -5848,7 +5848,7 @@ xenDaemonFormatSxpr(virConnectPtr conn, if (def->clock.offset == VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME) { if (def->clock.data.timezone) { virXendError(conn, VIR_ERR_CONFIG_UNSUPPORTED, - _("configurable timezones are not supported")); + "%s", _("configurable timezones are not supported")); goto error; } diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index 0973b43..2d0f1d5 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -2330,7 +2330,7 @@ virConfPtr xenXMDomainConfigFormat(virConnectPtr conn, if (def->clock.offset == VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME) { if (def->clock.data.timezone) { xenXMError(conn, VIR_ERR_CONFIG_UNSUPPORTED, - _("configurable timezones are not supported")); + "%s", _("configurable timezones are not supported")); goto cleanup; } -- 1.6.6.1

15 years, 2 months

2
1
0 / 0

[libvirt] [PATCH] macvtap build detection fix

by Stefan Berger

This fixes the #include's for the macvtap build detection. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com>

15 years, 2 months

2
1
0 / 0

[libvirt] [PATCH] Make virDomainGetXMLDesc output cache settings even if no special driverName is set

by Soren Hansen

If a special cache strategy for a disk has been specified in a domain definition, but no driverName has been set, virDomainGetXMLDesc will not include the <driver> tag at all. This patch makes sure that the <driver> tag is included if any of the settings it can contain has been set. Signed-off-by: Soren Hansen <soren(a)linux2go.dk> --- src/conf/domain_conf.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 96ba0b0..56c5239 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4718,8 +4718,10 @@ virDomainDiskDefFormat(virBufferPtr buf, " <disk type='%s' device='%s'>\n", type, device); - if (def->driverName) { - virBufferVSprintf(buf, " <driver name='%s'", def->driverName); + if (def->driverName || def->driverType || def->cachemode) { + virBufferVSprintf(buf, " <driver"); + if (def->driverName) + virBufferVSprintf(buf, " name='%s'", def->driverName); if (def->driverType) virBufferVSprintf(buf, " type='%s'", def->driverType); if (def->cachemode) -- 1.7.0

15 years, 2 months

3
2
0 / 0

[libvirt] Domains callbacks under mingwin

by Dev.Atom

Hi there, I trying to enable domain events callbacks under a cross compiled (mingwin under fedora12 env) libvirt 0.7.4 (I haven't been able to compile more recent versions under mingwin) dll. Here a little sample of code I'm trying to write : #include "stdafx.h" #include "windows.h" #include "libvirt.h" #include "virterror.h" static int domain_event(virConnectPtr conn, virDomainPtr dom, int evt, int detail, void *opaque) { bool test = true; return 0; } int _tmain(int argc, _TCHAR* argv[]) { virConnectPtr conn = virConnectOpen("qemu+tcp://192.168.220.198/session"); // Set Callback int cbresult = virConnectDomainEventRegister(conn, domain_event, NULL, NULL); // Lookup Domain virDomainPtr dom = virDomainLookupByName(conn, "Test1"); // Start Domain int startDom = virDomainCreate(dom); if (startDom != 0) { virErrorPtr e = virGetLastError(); bool test = true; } // Wait Sleep(60000); // Stop Domain int StopDom = virDomainDestroy(dom); if (StopDom != 0) { virErrorPtr e = virGetLastError(); bool test = true; } return 0; } I'm able to connect to the host and I'm able to start the domain, but when I enable callback with "virConnectDomainEventRegister", it fails, I have a message "unmarshalling msg" coming from the "remoteDomainReadEvent" method of remote_driver.c in libvirt. I think about a problem near __stdcall or __cdecl calls or this kind of thing, but I'm not sure. Any clues ? Best regards, Arnaud Champion

15 years, 2 months

1
0
0 / 0

[libvirt] [RFC][PATCH v2 1/2] Separate backend setup from NIC device add/remove

by Ed Swierk

This patch moves backend setup code from qemudDomainAttachNetDevice and qemudDomainDetachNetDevice into separate functions. While the intent is to allow the new functions to be called separately without affecting VM NIC devices, this is arguably a worthwhile refactoring on its own. Signed-off-by: Ed Swierk <eswierk(a)aristanetworks.com> --- Move the code that creates and destroys the network backend and connects it to qemu from the code that creates the virtual NIC. Index: libvirt-0.7.7/src/qemu/qemu_driver.c =================================================================== --- libvirt-0.7.7.orig/src/qemu/qemu_driver.c +++ libvirt-0.7.7/src/qemu/qemu_driver.c @@ -141,6 +141,16 @@ static int qemuDetectVcpuPIDs(struct qem static int qemuUpdateActivePciHostdevs(struct qemud_driver *driver, virDomainDefPtr def); +static int qemudDomainConnectNetBackend(virConnectPtr conn, + struct qemud_driver *driver, + virDomainObjPtr vm, + virDomainNetDefPtr net, + unsigned long long qemuCmdFlags); + +static int qemudDomainDisconnectNetBackend(struct qemud_driver *driver, + virDomainObjPtr vm, + virDomainNetDefPtr net); + static struct qemud_driver *qemu_driver = NULL; @@ -6231,20 +6241,17 @@ error: } -/* XXX conn required for network -> bridge resolution */ -static int qemudDomainAttachNetDevice(virConnectPtr conn, - struct qemud_driver *driver, - virDomainObjPtr vm, - virDomainNetDefPtr net, - unsigned long long qemuCmdFlags) +static int qemudDomainConnectNetBackend(virConnectPtr conn, + struct qemud_driver *driver, + virDomainObjPtr vm, + virDomainNetDefPtr net, + unsigned long long qemuCmdFlags) { qemuDomainObjPrivatePtr priv = vm->privateData; char *tapfd_name = NULL; int tapfd = -1; - char *nicstr = NULL; char *netstr = NULL; int ret = -1; - virDomainDevicePCIAddress guestAddr; int vlan; if (!(qemuCmdFlags & QEMUD_CMD_FLAG_HOST_NET_ADD)) { @@ -6253,36 +6260,84 @@ static int qemudDomainAttachNetDevice(vi return -1; } + if (priv->monConfig->type != VIR_DOMAIN_CHR_TYPE_UNIX) { + qemuReportError(VIR_ERR_NO_SUPPORT, + _("network device type '%s' cannot be attached: " + "qemu is not using a unix socket monitor"), + virDomainNetTypeToString(net->type)); + return -1; + } + + if ((vlan = qemuDomainNetVLAN(net)) < 0) { + qemuReportError(VIR_ERR_NO_SUPPORT, "%s", + _("Unable to connect network backend without vlan")); + goto out; + } + if (net->type == VIR_DOMAIN_NET_TYPE_BRIDGE || net->type == VIR_DOMAIN_NET_TYPE_NETWORK) { - if (priv->monConfig->type != VIR_DOMAIN_CHR_TYPE_UNIX) { - qemuReportError(VIR_ERR_NO_SUPPORT, - _("network device type '%s' cannot be attached: " - "qemu is not using a unix socket monitor"), - virDomainNetTypeToString(net->type)); - return -1; - } - - if ((tapfd = qemudNetworkIfaceConnect(conn, driver, net, qemuCmdFlags)) < 0) - return -1; + tapfd = qemudNetworkIfaceConnect(conn, driver, net, qemuCmdFlags); } else if (net->type == VIR_DOMAIN_NET_TYPE_DIRECT) { - if (priv->monConfig->type != VIR_DOMAIN_CHR_TYPE_UNIX) { - qemuReportError(VIR_ERR_NO_SUPPORT, - _("network device type '%s' cannot be attached: " - "qemu is not using a unix socket monitor"), - virDomainNetTypeToString(net->type)); - return -1; - } + tapfd = qemudPhysIfaceConnect(conn, driver, net, + net->data.direct.linkdev, + net->data.direct.mode, + qemuCmdFlags); + } + if (tapfd < 0) + return -1; - if ((tapfd = qemudPhysIfaceConnect(conn, driver, net, - net->data.direct.linkdev, - net->data.direct.mode, - qemuCmdFlags)) < 0) - return -1; + if (virAsprintf(&tapfd_name, "fd-%s", net->info.alias) < 0) { + virReportOOMError(); + close(tapfd); + return -1; + } + + if (!(netstr = qemuBuildHostNetStr(net, ' ', + vlan, tapfd_name))) { + VIR_FREE(tapfd_name); + close(tapfd); + return -1; + } + + qemuDomainObjEnterMonitorWithDriver(driver, vm); + + if (qemuMonitorSendFileHandle(priv->mon, tapfd_name, tapfd) < 0) + goto out; + + if (qemuMonitorAddHostNetwork(priv->mon, netstr) < 0) { + if (qemuMonitorCloseFileHandle(priv->mon, tapfd_name) < 0) + VIR_WARN(_("Failed to close tapfd with '%s'"), tapfd_name); + goto out; } - if (VIR_REALLOC_N(vm->def->nets, vm->def->nnets+1) < 0) - goto no_memory; + ret = 0; + +out: + qemuDomainObjExitMonitorWithDriver(driver, vm); + VIR_FREE(netstr); + VIR_FREE(tapfd_name); + close(tapfd); + return ret; +} + + +/* XXX conn required for network -> bridge resolution */ +static int qemudDomainAttachNetDevice(virConnectPtr conn, + struct qemud_driver *driver, + virDomainObjPtr vm, + virDomainNetDefPtr net, + unsigned long long qemuCmdFlags) +{ + qemuDomainObjPrivatePtr priv = vm->privateData; + char *nicstr = NULL; + int ret = -1; + virDomainDevicePCIAddress guestAddr; + int vlan; + + if (VIR_REALLOC_N(vm->def->nets, vm->def->nnets+1) < 0) { + virReportOOMError(); + return -1; + } if ((qemuCmdFlags & QEMUD_CMD_FLAG_NET_NAME) || (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE)) { @@ -6294,40 +6349,16 @@ static int qemudDomainAttachNetDevice(vi qemuDomainPCIAddressEnsureAddr(priv->pciaddrs, &net->info) < 0) goto cleanup; - vlan = qemuDomainNetVLAN(net); - - if (vlan < 0) { + if ((vlan = qemuDomainNetVLAN(net)) < 0) { qemuReportError(VIR_ERR_NO_SUPPORT, "%s", _("Unable to attach network devices without vlan")); goto cleanup; } - if (tapfd != -1) { - if (virAsprintf(&tapfd_name, "fd-%s", net->info.alias) < 0) - goto no_memory; - - qemuDomainObjEnterMonitorWithDriver(driver, vm); - if (qemuMonitorSendFileHandle(priv->mon, tapfd_name, tapfd) < 0) { - qemuDomainObjExitMonitorWithDriver(driver, vm); - goto cleanup; - } - qemuDomainObjExitMonitorWithDriver(driver, vm); - } - - if (!(netstr = qemuBuildHostNetStr(net, ' ', - vlan, tapfd_name))) - goto try_tapfd_close; - - qemuDomainObjEnterMonitorWithDriver(driver, vm); - if (qemuMonitorAddHostNetwork(priv->mon, netstr) < 0) { - qemuDomainObjExitMonitorWithDriver(driver, vm); - goto try_tapfd_close; + if (qemudDomainConnectNetBackend(conn, driver, vm, net, qemuCmdFlags) < 0) { + VIR_WARN0(_("Failed to connect network backend")); + goto cleanup; } - qemuDomainObjExitMonitorWithDriver(driver, vm); - - if (tapfd != -1) - close(tapfd); - tapfd = -1; if (!(nicstr = qemuBuildNicStr(net, NULL, vlan))) goto try_remove; @@ -6342,9 +6373,13 @@ static int qemudDomainAttachNetDevice(vi memcpy(&net->info.addr.pci, &guestAddr, sizeof(guestAddr)); qemuDomainObjExitMonitorWithDriver(driver, vm); + vm->def->nets[vm->def->nnets++] = net; ret = 0; + goto cleanup; - vm->def->nets[vm->def->nnets++] = net; +try_remove: + if (qemudDomainDisconnectNetBackend(driver, vm, net) < 0) + VIR_WARN0("Unable to disconnect network backend"); cleanup: if ((ret != 0) && @@ -6352,44 +6387,8 @@ cleanup: (net->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) && qemuDomainPCIAddressReleaseAddr(priv->pciaddrs, &net->info) < 0) VIR_WARN0("Unable to release PCI address on NIC"); - VIR_FREE(nicstr); - VIR_FREE(netstr); - VIR_FREE(tapfd_name); - if (tapfd != -1) - close(tapfd); - return ret; - -try_remove: - if (vlan < 0) { - VIR_WARN0(_("Unable to remove network backend")); - } else { - char *hostnet_name; - if (virAsprintf(&hostnet_name, "host%s", net->info.alias) < 0) - goto no_memory; - qemuDomainObjEnterMonitorWithDriver(driver, vm); - if (qemuMonitorRemoveHostNetwork(priv->mon, vlan, hostnet_name) < 0) - VIR_WARN(_("Failed to remove network backend for vlan %d, net %s"), - vlan, hostnet_name); - qemuDomainObjExitMonitorWithDriver(driver, vm); - VIR_FREE(hostnet_name); - } - goto cleanup; - -try_tapfd_close: - if (tapfd_name) { - qemuDomainObjEnterMonitorWithDriver(driver, vm); - if (qemuMonitorCloseFileHandle(priv->mon, tapfd_name) < 0) - VIR_WARN(_("Failed to close tapfd with '%s'"), tapfd_name); - qemuDomainObjExitMonitorWithDriver(driver, vm); - } - - goto cleanup; - -no_memory: - virReportOOMError(); - goto cleanup; } @@ -6887,18 +6886,50 @@ cleanup: return ret; } -static int -qemudDomainDetachNetDevice(struct qemud_driver *driver, - virDomainObjPtr vm, - virDomainDeviceDefPtr dev, - unsigned long long qemuCmdFlags) +static int qemudDomainDisconnectNetBackend(struct qemud_driver *driver, + virDomainObjPtr vm, + virDomainNetDefPtr detach) { - int i, ret = -1; - virDomainNetDefPtr detach = NULL; qemuDomainObjPrivatePtr priv = vm->privateData; int vlan; char *hostnet_name = NULL; + if ((vlan = qemuDomainNetVLAN(detach)) < 0) { + qemuReportError(VIR_ERR_OPERATION_FAILED, + "%s", _("unable to determine original VLAN")); + return -1; + } + + if (virAsprintf(&hostnet_name, "host%s", detach->info.alias) < 0) { + virReportOOMError(); + return -1; + } + + qemuDomainObjEnterMonitorWithDriver(driver, vm); + if (qemuMonitorRemoveHostNetwork(priv->mon, vlan, hostnet_name) < 0) + VIR_WARN0("Failed to remove host network"); + qemuDomainObjExitMonitorWithDriver(driver, vm); + +#if WITH_MACVTAP + if (detach->type == VIR_DOMAIN_NET_TYPE_DIRECT) { + if (detach->ifname) + delMacvtap(detach->ifname); + } +#endif + + VIR_FREE(hostnet_name); + return 0; +} + +static int qemudDomainDetachNetDevice(struct qemud_driver *driver, + virDomainObjPtr vm, + virDomainDeviceDefPtr dev, + unsigned long long qemuCmdFlags) +{ + int i; + virDomainNetDefPtr detach = NULL; + qemuDomainObjPrivatePtr priv = vm->privateData; + for (i = 0 ; i < vm->def->nnets ; i++) { virDomainNetDefPtr net = vm->def->nets[i]; @@ -6914,53 +6945,33 @@ qemudDomainDetachNetDevice(struct qemud_ dev->data.net->mac[0], dev->data.net->mac[1], dev->data.net->mac[2], dev->data.net->mac[3], dev->data.net->mac[4], dev->data.net->mac[5]); - goto cleanup; + return -1; } if (!virDomainDeviceAddressIsValid(&detach->info, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI)) { qemuReportError(VIR_ERR_OPERATION_FAILED, "%s", _("device cannot be detached without a PCI address")); - goto cleanup; - } - - if ((vlan = qemuDomainNetVLAN(detach)) < 0) { - qemuReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("unable to determine original VLAN")); - goto cleanup; - } - - if (virAsprintf(&hostnet_name, "host%s", detach->info.alias) < 0) { - virReportOOMError(); - goto cleanup; + return -1; } qemuDomainObjEnterMonitorWithDriver(driver, vm); if (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE) { if (qemuMonitorDelDevice(priv->mon, detach->info.alias) < 0) { - qemuDomainObjExitMonitor(vm); - goto cleanup; + qemuDomainObjExitMonitorWithDriver(driver, vm); + return -1; } } else { if (qemuMonitorRemovePCIDevice(priv->mon, &detach->info.addr.pci) < 0) { qemuDomainObjExitMonitorWithDriver(driver, vm); - goto cleanup; + return -1; } } - - if (qemuMonitorRemoveHostNetwork(priv->mon, vlan, hostnet_name) < 0) { - qemuDomainObjExitMonitorWithDriver(driver, vm); - goto cleanup; - } qemuDomainObjExitMonitorWithDriver(driver, vm); -#if WITH_MACVTAP - if (detach->type == VIR_DOMAIN_NET_TYPE_DIRECT) { - if (detach->ifname) - delMacvtap(detach->ifname); - } -#endif + if (qemudDomainDisconnectNetBackend(driver, vm, detach) < 0) + VIR_WARN0("Failed to disconnect network backend"); if ((driver->macFilter) && (detach->ifname != NULL)) { if ((errno = networkDisallowMacOnPort(driver, @@ -6987,11 +6998,7 @@ qemudDomainDetachNetDevice(struct qemud_ } virDomainNetDefFree(detach); - ret = 0; - -cleanup: - VIR_FREE(hostnet_name); - return ret; + return 0; } static int qemudDomainDetachHostPciDevice(struct qemud_driver *driver,

15 years, 2 months

1
0
0 / 0

[libvirt] (no subject)

by Luis Costa

-- Luís Carlos Moreira da Costa Eclipse RAP, RCP, GMF, OSGI, Spring-DM and Pentaho Developer Regional Communities/Brazil http://wiki.eclipse.org/Regional_Communities/Brazil Java, write once, run everywhere™

15 years, 2 months

1
0
0 / 0

[libvirt] Fix locking in qemudDomainMemoryStats

by Adam Litke

When adding domainMemoryStats API support for the qemu driver, I didn't follow the locking rules exactly. The job condition must be held when executing monitor commands. This corrects the segfaults I was seeing when calling domainMemoryStats in a multi-threaded environment. If this patch is accepted, I would also consider it a candidate for the 0.7.6 stable patch stream (if such a thing exists). Thanks. Signed-off-by: Adam Litke <agl(a)us.ibm.com> diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b8b7916..a9023da 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7526,6 +7526,9 @@ qemudDomainMemoryStats (virDomainPtr dom, goto cleanup; } + if (qemuDomainObjBeginJob(vm) < 0) + goto cleanup; + if (virDomainObjIsActive(vm)) { qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjEnterMonitor(vm); @@ -7536,6 +7539,9 @@ qemudDomainMemoryStats (virDomainPtr dom, "%s", _("domain is not running")); } + if (qemuDomainObjEndJob(vm) == 0) + vm = NULL; + cleanup: if (vm) virDomainObjUnlock(vm); -- Thanks, Adam

15 years, 2 months

3
2
0 / 0

[libvirt] Unable to start a VM with USB device

by Laurent Léonard

Hi, I just packaged libvirt 0.7.7 for Debian. But I can't start a VM with an USB device attached: # virsh start test-vm error: Failed to start domain test-vm error: unable to set security context '107:113' on '/dev/bus/usb/000/000': No such file or directory I know there were changes about USB passthrough so I suppose it's a bug. Thank you, -- Laurent Léonard

15 years, 2 months

3
4
0 / 0

[libvirt] [PATCHv2] Eliminate large stack buffer in doTunnelSendAll

by Laine Stump

doTunnelSendAll function (used by QEMU migration) uses a 64k buffer on the stack, which could be problematic. This patch replaces that with a buffer from the heap. While in the neighborhood, this patch also improves error reporting in the case that saferead fails - previously, virStreamAbort() was called (resetting errno) before reporting the error. It's been changed to report the error first. --- Eric noticed that I was inconsistent in the ordering of cleanup vs. error reporting, so I fixed that in this version. src/qemu/qemu_driver.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index bb3edde..5a18938 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8399,19 +8399,28 @@ cleanup: } +#define TUNNEL_SEND_BUF_SIZE 65536 + static int doTunnelSendAll(virStreamPtr st, int sock) { - char buffer[65536]; - int nbytes = sizeof(buffer); + char *buffer; + int nbytes = TUNNEL_SEND_BUF_SIZE; + + if (VIR_ALLOC_N(buffer, TUNNEL_SEND_BUF_SIZE) < 0) { + virReportOOMError(); + virStreamAbort(st); + return -1; + } /* XXX should honour the 'resource' parameter here */ for (;;) { nbytes = saferead(sock, buffer, nbytes); if (nbytes < 0) { - virStreamAbort(st); virReportSystemError(errno, "%s", _("tunnelled migration failed to read from qemu")); + virStreamAbort(st); + VIR_FREE(buffer); return -1; } else if (nbytes == 0) @@ -8421,10 +8430,13 @@ static int doTunnelSendAll(virStreamPtr st, if (virStreamSend(st, buffer, nbytes) < 0) { qemuReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Failed to write migration data to remote libvirtd")); + VIR_FREE(buffer); return -1; } } + VIR_FREE(buffer); + if (virStreamFinish(st) < 0) /* virStreamFinish set the error for us */ return -1; -- 1.6.6.1

15 years, 2 months

2
2
0 / 0

[libvirt] [PATCH 0/5] build: use C99 varargs

by Eric Blake

15 years, 2 months

3
7
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Devel March 2010