- Devel - libvirt List Archives

[libvirt] [PATCH] API: Init conn in case of it might be used uninitialized
by Osier Yang 01 Sep '11

01 Sep '11

There is a goto before "conn" is initialized. --- src/libvirt.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 4284954..eca919a 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -15225,12 +15225,13 @@ virDomainMigrateGetMaxSpeed(virDomainPtr domain, return -1; } + conn = domain->conn; + if (!bandwidth) { virLibDomainError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto error; } - conn = domain->conn; if (conn->flags & VIR_CONNECT_RO) { virLibDomainError(VIR_ERR_OPERATION_DENIED, __FUNCTION__); goto error; -- 1.7.6

2 2

[libvirt] [test-API][PATCH 1/2] Remove cases/migrate.conf testcases and create a set of migration testcases
by Guannan Ren 01 Sep '11

01 Sep '11

*cases/migrate.conf remove it. *cases/migration/* create a new set of migraion testcases with tcp, tls and sasl combination It's huge, so I send the header of commit here. --- cases/migrate.conf | 97 ---- cases/migration/ssh_persistent_paused_no_dst.conf | 459 +++++++++++++++++++ .../migration/ssh_persistent_paused_with_dst.conf | 459 +++++++++++++++++++ cases/migration/ssh_persistent_running_no_dst.conf | 435 ++++++++++++++++++ .../migration/ssh_persistent_running_with_dst.conf | 435 ++++++++++++++++++ cases/migration/ssh_transient_paused_no_dst.conf | 403 +++++++++++++++++ cases/migration/ssh_transient_paused_with_dst.conf | 403 +++++++++++++++++ cases/migration/ssh_transient_running_no_dst.conf | 388 ++++++++++++++++ .../migration/ssh_transient_running_with_dst.conf | 382 ++++++++++++++++ cases/migration/tcp_persistent_paused_no_dst.conf | 471 ++++++++++++++++++++ .../migration/tcp_persistent_paused_with_dst.conf | 471 ++++++++++++++++++++ cases/migration/tcp_persistent_running_no_dst.conf | 447 +++++++++++++++++++ .../migration/tcp_persistent_running_with_dst.conf | 447 +++++++++++++++++++ .../tcp_sasl_persistent_paused_no_dst.conf | 167 +++++++ .../tcp_sasl_persistent_paused_with_dst.conf | 168 +++++++ .../tcp_sasl_persistent_running_no_dst.conf | 159 +++++++ .../tcp_sasl_persistent_running_with_dst.conf | 159 +++++++ .../tcp_sasl_transient_paused_no_dst.conf | 151 +++++++ .../tcp_sasl_transient_paused_with_dst.conf | 151 +++++++ .../tcp_sasl_transient_running_no_dst.conf | 143 ++++++ .../tcp_sasl_transient_running_with_dst.conf | 143 ++++++ cases/migration/tcp_transient_paused_no_dst.conf | 415 +++++++++++++++++ cases/migration/tcp_transient_paused_with_dst.conf | 415 +++++++++++++++++ cases/migration/tcp_transient_running_no_dst.conf | 400 +++++++++++++++++ .../migration/tcp_transient_running_with_dst.conf | 394 ++++++++++++++++ cases/migration/tls_persistent_paused_no_dst.conf | 471 ++++++++++++++++++++ .../migration/tls_persistent_paused_with_dst.conf | 471 ++++++++++++++++++++ cases/migration/tls_persistent_running_no_dst.conf | 447 +++++++++++++++++++ .../migration/tls_persistent_running_with_dst.conf | 447 +++++++++++++++++++ .../tls_sasl_persistent_paused_no_dst.conf | 167 +++++++ .../tls_sasl_persistent_paused_with_dst.conf | 167 +++++++ .../tls_sasl_persistent_running_no_dst.conf | 159 +++++++ .../tls_sasl_persistent_running_with_dst.conf | 159 +++++++ .../tls_sasl_transient_paused_no_dst.conf | 151 +++++++ .../tls_sasl_transient_paused_with_dst.conf | 151 +++++++ .../tls_sasl_transient_running_no_dst.conf | 143 ++++++ .../tls_sasl_transient_running_with_dst.conf | 143 ++++++ cases/migration/tls_transient_paused_no_dst.conf | 415 +++++++++++++++++ cases/migration/tls_transient_paused_with_dst.conf | 415 +++++++++++++++++ cases/migration/tls_transient_running_no_dst.conf | 400 +++++++++++++++++ .../migration/tls_transient_running_with_dst.conf | 394 ++++++++++++++++ 41 files changed, 12765 insertions(+), 97 deletions(-) delete mode 100644 cases/migrate.conf create mode 100644 cases/migration/ssh_persistent_paused_no_dst.conf create mode 100644 cases/migration/ssh_persistent_paused_with_dst.conf create mode 100644 cases/migration/ssh_persistent_running_no_dst.conf create mode 100644 cases/migration/ssh_persistent_running_with_dst.conf create mode 100644 cases/migration/ssh_transient_paused_no_dst.conf create mode 100644 cases/migration/ssh_transient_paused_with_dst.conf create mode 100644 cases/migration/ssh_transient_running_no_dst.conf create mode 100644 cases/migration/ssh_transient_running_with_dst.conf create mode 100644 cases/migration/tcp_persistent_paused_no_dst.conf create mode 100644 cases/migration/tcp_persistent_paused_with_dst.conf create mode 100644 cases/migration/tcp_persistent_running_no_dst.conf create mode 100644 cases/migration/tcp_persistent_running_with_dst.conf create mode 100644 cases/migration/tcp_sasl_persistent_paused_no_dst.conf create mode 100644 cases/migration/tcp_sasl_persistent_paused_with_dst.conf create mode 100644 cases/migration/tcp_sasl_persistent_running_no_dst.conf create mode 100644 cases/migration/tcp_sasl_persistent_running_with_dst.conf create mode 100644 cases/migration/tcp_sasl_transient_paused_no_dst.conf create mode 100644 cases/migration/tcp_sasl_transient_paused_with_dst.conf create mode 100644 cases/migration/tcp_sasl_transient_running_no_dst.conf create mode 100644 cases/migration/tcp_sasl_transient_running_with_dst.conf create mode 100644 cases/migration/tcp_transient_paused_no_dst.conf create mode 100644 cases/migration/tcp_transient_paused_with_dst.conf create mode 100644 cases/migration/tcp_transient_running_no_dst.conf create mode 100644 cases/migration/tcp_transient_running_with_dst.conf create mode 100644 cases/migration/tls_persistent_paused_no_dst.conf create mode 100644 cases/migration/tls_persistent_paused_with_dst.conf create mode 100644 cases/migration/tls_persistent_running_no_dst.conf create mode 100644 cases/migration/tls_persistent_running_with_dst.conf create mode 100644 cases/migration/tls_sasl_persistent_paused_no_dst.conf create mode 100644 cases/migration/tls_sasl_persistent_paused_with_dst.conf create mode 100644 cases/migration/tls_sasl_persistent_running_no_dst.conf create mode 100644 cases/migration/tls_sasl_persistent_running_with_dst.conf create mode 100644 cases/migration/tls_sasl_transient_paused_no_dst.conf create mode 100644 cases/migration/tls_sasl_transient_paused_with_dst.conf create mode 100644 cases/migration/tls_sasl_transient_running_no_dst.conf create mode 100644 cases/migration/tls_sasl_transient_running_with_dst.conf create mode 100644 cases/migration/tls_transient_paused_no_dst.conf create mode 100644 cases/migration/tls_transient_paused_with_dst.conf create mode 100644 cases/migration/tls_transient_running_no_dst.conf create mode 100644 cases/migration/tls_transient_running_with_dst.conf

1 1

[libvirt] [RFC] NUMA topology specification
by Bharata B Rao 01 Sep '11

01 Sep '11

Hi, qemu supports specification of NUMA topology on command line using -numa option. -numa node[,mem=size][,cpus=cpu[-cpu]][,nodeid=node] I see that there is no way to specify such NUMA topology in libvirt XML. Are there plans to add support for NUMA topology specification ? Is anybody already working on this ? If not I would like to add this support for libvirt. Currently the topology specification available in libvirt ( <topology sockets='1' cores='2' threads='1'/>) translates to "-smp sockets=1,cores=2,threads=1" option of qemu. There is not equivalent in libvirt that could generate -numa command line option of qemu. How about something like this ? (OPTION 1) <cpu> ... <numa nodeid='node' cpus='cpu[-cpu]' mem='size'> ... </cpu> And we could specify multiple such lines, one for each node. -numa and -smp options in qemu do not work all that well since they are parsed independent of each other and one could specify a cpu set with -numa option that is incompatible with sockets,cores and threads specified on -smp option. This should be fixed in qemu, but given that such a problem has been observed, should libvirt tie the specification of numa and smp (sockets,threads,cores) together so that one is forced to specify only valid combinations of nodes and cpus in libvirt ? May be something like this: (OPTION 2) <cpu> ... <topology sockets='1' cores='2' threads='1' nodeid='0' cpus='0-1' mem='size'> <topology sockets='1' cores='2' threads='1' nodeid='1' cpus='2-3' mem='size'> ... </cpu This should result in a 2 node system with each node having 1 socket with 2 cores. Comments, suggestions ? Regards, Bharata. -- http://bharata.sulekha.com/blog/posts.htm, http://raobharata.wordpress.com/

4 11

[libvirt] [PATCH] start: allow discarding managed save
by Eric Blake 01 Sep '11

01 Sep '11

There have been several instances of people having problems with a broken managed save file causing 'virsh start' to fail, and not being aware that they could use 'virsh managedsave-remove dom' to fix things. Making it possible to do this as part of starting a domain makes the same functionality easier to find, and one less API call. * include/libvirt/libvirt.h.in (VIR_DOMAIN_START_FORCE_BOOT): New flag. * src/libvirt.c (virDomainCreateWithFlags): Document it. * src/qemu/qemu_driver.c (qemuDomainObjStart): Alter signature. (qemuAutostartDomain, qemuDomainStartWithFlags): Update callers. * tools/virsh.c (cmdStart): Expose it in virsh. * tools/virsh.pod (start): Document it. --- include/libvirt/libvirt.h.in | 1 + src/libvirt.c | 3 ++ src/qemu/qemu_driver.c | 50 +++++++++++++++++++++++++---------------- tools/virsh.c | 7 +++++- tools/virsh.pod | 5 ++- 5 files changed, 43 insertions(+), 23 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 53a2f7d..c51a5b9 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -236,6 +236,7 @@ typedef enum { VIR_DOMAIN_START_PAUSED = 1 << 0, /* Launch guest in paused state */ VIR_DOMAIN_START_AUTODESTROY = 1 << 1, /* Automatically kill guest when virConnectPtr is closed */ VIR_DOMAIN_START_BYPASS_CACHE = 1 << 2, /* Avoid file system cache pollution */ + VIR_DOMAIN_START_FORCE_BOOT = 1 << 3, /* Boot, discarding any managed save */ } virDomainCreateFlags; diff --git a/src/libvirt.c b/src/libvirt.c index 65a099b..80c8b7c 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -7081,6 +7081,9 @@ error: * the file, or fail if it cannot do so for the given system; this can allow * less pressure on file system cache, but also risks slowing loads from NFS. * + * If the VIR_DOMAIN_START_FORCE_BOOT flag is set, then any managed save + * file for this domain is discarded, and the domain boots from scratch. + * * Returns 0 in case of success, -1 in case of error */ int diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f21122d..5033998 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -120,9 +120,7 @@ static int qemudShutdown(void); static int qemuDomainObjStart(virConnectPtr conn, struct qemud_driver *driver, virDomainObjPtr vm, - bool start_paused, - bool autodestroy, - bool bypass_cache); + unsigned int flags); static int qemudDomainGetMaxVcpus(virDomainPtr dom); @@ -135,11 +133,16 @@ struct qemuAutostartData { }; static void -qemuAutostartDomain(void *payload, const void *name ATTRIBUTE_UNUSED, void *opaque) +qemuAutostartDomain(void *payload, const void *name ATTRIBUTE_UNUSED, + void *opaque) { virDomainObjPtr vm = payload; struct qemuAutostartData *data = opaque; virErrorPtr err; + int flags = 0; + + if (data->driver->autoStartBypassCache) + flags |= VIR_DOMAIN_START_BYPASS_CACHE; virDomainObjLock(vm); virResetLastError(); @@ -152,9 +155,7 @@ qemuAutostartDomain(void *payload, const void *name ATTRIBUTE_UNUSED, void *opaq } else { if (vm->autostart && !virDomainObjIsActive(vm) && - qemuDomainObjStart(data->conn, data->driver, vm, - false, false, - data->driver->autoStartBypassCache) < 0) { + qemuDomainObjStart(data->conn, data->driver, vm, flags) < 0) { err = virGetLastError(); VIR_ERROR(_("Failed to autostart VM '%s': %s"), vm->def->name, @@ -4441,12 +4442,14 @@ static int qemuDomainObjStart(virConnectPtr conn, struct qemud_driver *driver, virDomainObjPtr vm, - bool start_paused, - bool autodestroy, - bool bypass_cache) + unsigned int flags) { int ret = -1; char *managed_save; + bool start_paused = (flags & VIR_DOMAIN_START_PAUSED) != 0; + bool autodestroy = (flags & VIR_DOMAIN_START_AUTODESTROY) != 0; + bool bypass_cache = (flags & VIR_DOMAIN_START_BYPASS_CACHE) != 0; + bool force_boot = (flags & VIR_DOMAIN_START_FORCE_BOOT) != 0; /* * If there is a managed saved state restore it instead of starting @@ -4458,13 +4461,22 @@ qemuDomainObjStart(virConnectPtr conn, goto cleanup; if (virFileExists(managed_save)) { - ret = qemuDomainObjRestore(conn, driver, vm, managed_save, - bypass_cache); + if (force_boot) { + if (unlink(managed_save) < 0) { + virReportSystemError(errno, + _("cannot remove managed save file %s"), + managed_save); + goto cleanup; + } + } else { + ret = qemuDomainObjRestore(conn, driver, vm, managed_save, + bypass_cache); - if ((ret == 0) && (unlink(managed_save) < 0)) - VIR_WARN("Failed to remove the managed state %s", managed_save); + if ((ret == 0) && (unlink(managed_save) < 0)) + VIR_WARN("Failed to remove the managed state %s", managed_save); - goto cleanup; + goto cleanup; + } } ret = qemuProcessStart(conn, driver, vm, NULL, start_paused, @@ -4493,7 +4505,8 @@ qemuDomainStartWithFlags(virDomainPtr dom, unsigned int flags) virCheckFlags(VIR_DOMAIN_START_PAUSED | VIR_DOMAIN_START_AUTODESTROY | - VIR_DOMAIN_START_BYPASS_CACHE, -1); + VIR_DOMAIN_START_BYPASS_CACHE | + VIR_DOMAIN_START_FORCE_BOOT, -1); qemuDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, dom->uuid); @@ -4515,10 +4528,7 @@ qemuDomainStartWithFlags(virDomainPtr dom, unsigned int flags) goto endjob; } - if (qemuDomainObjStart(dom->conn, driver, vm, - (flags & VIR_DOMAIN_START_PAUSED) != 0, - (flags & VIR_DOMAIN_START_AUTODESTROY) != 0, - (flags & VIR_DOMAIN_START_BYPASS_CACHE) != 0) < 0) + if (qemuDomainObjStart(dom->conn, driver, vm, flags) < 0) goto endjob; ret = 0; diff --git a/tools/virsh.c b/tools/virsh.c index 15b9bdd..49034ae 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1537,9 +1537,12 @@ static const vshCmdOptDef opts_start[] = { {"console", VSH_OT_BOOL, 0, N_("attach to console after creation")}, #endif {"paused", VSH_OT_BOOL, 0, N_("leave the guest paused after creation")}, - {"autodestroy", VSH_OT_BOOL, 0, N_("automatically destroy the guest when virsh disconnects")}, + {"autodestroy", VSH_OT_BOOL, 0, + N_("automatically destroy the guest when virsh disconnects")}, {"bypass-cache", VSH_OT_BOOL, 0, N_("avoid file system cache when loading")}, + {"force-boot", VSH_OT_BOOL, 0, + N_("force fresh boot by discarding any managed save")}, {NULL, 0, 0, NULL} }; @@ -1572,6 +1575,8 @@ cmdStart(vshControl *ctl, const vshCmd *cmd) flags |= VIR_DOMAIN_START_AUTODESTROY; if (vshCommandOptBool(cmd, "bypass-cache")) flags |= VIR_DOMAIN_START_BYPASS_CACHE; + if (vshCommandOptBool(cmd, "force-boot")) + flags |= VIR_DOMAIN_START_FORCE_BOOT; /* Prefer older API unless we have to pass a flag. */ if ((flags ? virDomainCreateWithFlags(dom, flags) diff --git a/tools/virsh.pod b/tools/virsh.pod index 81d7a1e..2cd0f73 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -890,7 +890,7 @@ The exact behavior of a domain when it shuts down is set by the I<on_shutdown> parameter in the domain's XML definition. =item B<start> I<domain-name> [I<--console>] [I<--paused>] [I<--autodestroy>] -[I<--bypass-cache>] +[I<--bypass-cache>] [I<--force-boot>] Start a (previously defined) inactive domain, either from the last B<managedsave> state, or via a fresh boot if no managedsave state is @@ -901,7 +901,8 @@ If I<--autodestroy> is requested, then the guest will be automatically destroyed when virsh closes its connection to libvirt, or otherwise exits. If I<--bypass-cache> is specified, and managedsave state exists, the restore will avoid the file system cache, although this may slow -down the operation. +down the operation. If I<--force-boot> is specified, then any +managedsave state is discarded and a fresh boot occurs. =item B<suspend> I<domain-id> -- 1.7.4.4

3 10

[libvirt] [PATCH] reserve slot 1 on pci bus0
by Wen Congyang 01 Sep '11

01 Sep '11

After supporting multi function pci device, we only reserve function 1 on slot 1. The user can use the other function on slot 1 in the xml config file. We should detect this wrong usage. --- src/qemu/qemu_command.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 287ad8d..4b5734c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1072,6 +1072,7 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, qemuDomainPCIAddressSetPtr addrs) int i; bool reservedIDE = false; bool reservedVGA = false; + int function; /* Host bridge */ if (qemuDomainPCIAddressReserveSlot(addrs, 0) < 0) @@ -1107,9 +1108,14 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, qemuDomainPCIAddressSetPtr addrs) /* PIIX3 (ISA bridge, IDE controller, something else unknown, USB controller) * hardcoded slot=1, multifunction device */ - if (!reservedIDE && - qemuDomainPCIAddressReserveSlot(addrs, 1) < 0) - goto error; + for (function = 0; function <= QEMU_PCI_ADDRESS_LAST_FUNCTION; function++) { + if (function == 1 && reservedIDE) + /* we have reserved this pci address */ + continue; + + if (qemuDomainPCIAddressReserveFunction(addrs, 1, function) < 0) + goto error; + } /* First VGA is hardcoded slot=2 */ if (def->nvideos > 0) { -- 1.7.1

2 4

[libvirt] [PATCH] virsh: avoid memory leak on cmdVolCreateAs
by ajia＠redhat.com 01 Sep '11

01 Sep '11

* tools/virsh.c: fix memory leak on cmdVolCreateAs function. * Detected in valgrind run: ==4746== ==4746== 48 (40 direct, 8 indirect) bytes in 1 blocks are definitely lost in loss record 26 of 52 ==4746== at 0x4A04A28: calloc (vg_replace_malloc.c:467) ==4746== by 0x4C76E51: virAlloc (memory.c:101) ==4746== by 0x4CD9418: virGetStoragePool (datatypes.c:592) ==4746== by 0x4D21367: remoteStoragePoolLookupByName (remote_driver.c:4126) ==4746== by 0x4CE42B0: virStoragePoolLookupByName (libvirt.c:10232) ==4746== by 0x40C276: vshCommandOptPoolBy (virsh.c:13660) ==4746== by 0x40CA37: cmdVolCreateAs (virsh.c:8094) ==4746== by 0x412AF2: vshCommandRun (virsh.c:13770) ==4746== by 0x422F11: main (virsh.c:15127) ==4746== ==4746== 1,011 bytes in 1 blocks are definitely lost in loss record 45 of 52 ==4746== at 0x4A05FDE: malloc (vg_replace_malloc.c:236) ==4746== by 0x4A06167: realloc (vg_replace_malloc.c:525) ==4746== by 0x4C76ECB: virReallocN (memory.c:161) ==4746== by 0x4C60319: virBufferGrow (buf.c:72) ==4746== by 0x4C606AA: virBufferAdd (buf.c:106) ==4746== by 0x40CB37: cmdVolCreateAs (virsh.c:8118) ==4746== by 0x412AF2: vshCommandRun (virsh.c:13770) ==4746== by 0x422F11: main (virsh.c:15127) ==4746== ==4746== LEAK SUMMARY: ==4746== definitely lost: 1,051 bytes in 2 blocks ==4746== indirectly lost: 8 bytes in 1 blocks ==4746== possibly lost: 0 bytes in 0 blocks ==4746== still reachable: 390,767 bytes in 1,373 blocks ==4746== suppressed: 0 bytes in 0 blocks * How to reproduce? % valgrind -v --leak-check=full virsh vol-create-as default foo.img 10M \ --allocation 0 --format qcow2 --backing-vol bar.img Notes: bar.img doesn't exist. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- tools/virsh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index f9bcd2c..44c2f1c 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -8166,7 +8166,7 @@ cmdVolCreateAs(vshControl *ctl, const vshCmd *cmd) } if (snapVol == NULL) { vshError(ctl, _("failed to get vol '%s'"), snapshotStrVol); - return false; + goto cleanup; } char *snapshotStrVolPath; -- 1.7.1

3 2

[libvirt] [PATCH] lxc: do not require 'ifconfig' or 'ipconfig' in container
by Scott Moser 01 Sep '11

01 Sep '11

Currently, the lxc implementation invokes 'ip' and 'ifconfig' commands inside a container using 'virRun'. That has the side effect of requiring those commands to be present and to function in a manner consistent with the usage. Some small roots (such as ttylinux) may not have 'ip' or 'ifconfig'. This patch replaces the use of these commands with usage of netdevice. The result is that lxc containers do not have to implement those commands, and lxc in libvirt is only dependent on the netdevice interface. I've tested this patch locally against the ubuntu libvirt version enough to verify its generally sane. I attempted to build upstream today, but failed with: /usr/bin/ld: ../src/.libs/libvirt_driver_qemu.a(libvirt_driver_qemu_la-qemu_domain.o): undefined reference to symbol 'xmlXPathRegisterNs@@LIBXML2_2.4.30 Thats probably a local issue only, but I wanted to get this patch up and see what others thought of it. This is ubuntu bug https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/828211 . diff --git a/src/lxc/veth.c b/src/lxc/veth.c index 34cb804..c24df91 100644 --- a/src/lxc/veth.c +++ b/src/lxc/veth.c @@ -12,8 +12,11 @@ #include <config.h> +#include <linux/sockios.h> +#include <net/if.h> #include <string.h> #include <stdio.h> +#include <sys/ioctl.h> #include <sys/types.h> #include <sys/wait.h> @@ -186,41 +189,49 @@ int vethDelete(const char *veth) * @veth: name of veth device * @upOrDown: 0 => down, 1 => up * - * Enables a veth device using the ifconfig command. A NULL inetAddress - * will cause it to be left off the command line. + * Enables a veth device using SIOCSIFFLAGS * - * Returns 0 on success or -1 in case of error + * Returns 0 on success, -1 on failure, with errno set */ int vethInterfaceUpOrDown(const char* veth, int upOrDown) { - int rc; - const char *argv[] = {"ifconfig", veth, NULL, NULL}; - int cmdResult = 0; + struct ifreq ifr; + int fd, ret; - if (0 == upOrDown) - argv[2] = "down"; - else - argv[2] = "up"; + if ((fd = socket(PF_PACKET, SOCK_DGRAM, 0)) == -1) + return(-1); - rc = virRun(argv, &cmdResult); + memset(&ifr, 0, sizeof(struct ifreq)); - if (rc != 0 || - (WIFEXITED(cmdResult) && WEXITSTATUS(cmdResult) != 0)) { - if (0 == upOrDown) + if (virStrcpyStatic(ifr.ifr_name, veth) == NULL) { + errno = EINVAL; + return -1; + } + + if ((ret = ioctl(fd, SIOCGIFFLAGS, &ifr)) == 0) { + if (upOrDown) + ifr.ifr_flags |= IFF_UP; + else + ifr.ifr_flags &= ~(IFF_UP | IFF_RUNNING); + + ret = ioctl(fd, SIOCSIFFLAGS, &ifr); + } + + close(fd); + if (ret == -1) + if (upOrDown == 0) /* * Prevent overwriting an error log which may be set * where an actual failure occurs. */ - VIR_DEBUG("Failed to disable '%s' (%d)", - veth, WEXITSTATUS(cmdResult)); + VIR_DEBUG("Failed to disable '%s'", veth); else vethError(VIR_ERR_INTERNAL_ERROR, - _("Failed to enable '%s' (%d)"), - veth, WEXITSTATUS(cmdResult)); - rc = -1; - } + _("Failed to enable '%s'"), veth); + else + ret = 0; - return rc; + return(ret); } /** @@ -279,17 +290,29 @@ int setMacAddr(const char* iface, const char* macaddr) * @iface: name of device * @new: new name of @iface * - * Changes the name of the given device with the - * given new name using this command: - * ip link set @iface name @new + * Changes the name of the given device. * - * Returns 0 on success or -1 in case of error + * Returns 0 on success, -1 on failure with errno set. */ int setInterfaceName(const char* iface, const char* new) { - const char *argv[] = { - "ip", "link", "set", iface, "name", new, NULL - }; + struct ifreq ifr; + int fd = socket(PF_PACKET, SOCK_DGRAM, 0); - return virRun(argv, NULL); + memset(&ifr, 0, sizeof(struct ifreq)); + + if (virStrcpyStatic(ifr.ifr_name, iface) == NULL) { + errno = EINVAL; + return -1; + } + + if (virStrcpyStatic(ifr.ifr_newname, new) == NULL) { + errno = EINVAL; + return -1; + } + + if (ioctl(fd, SIOCSIFNAME, &ifr)) + return -1; + + return 0; }

4 3

[libvirt] [RFC] Create ptmx as a device
by Serge Hallyn 01 Sep '11

01 Sep '11

Hi, I'm seeing an issue with udev and libvirt-lxc. Libvirt-lxc creates /dev/ptmx as a symlink to /dev/pts/ptmx. When udev starts up, it checks the device type, sees ptmx is 'not right', and replaces it with a 'proper' ptmx. In lxc, /dev/ptmx is bind-mounted from /dev/pts/ptmx instead of being symlinked, so udev sees the right device type and leaves it alone. A patch like the following seems to work for me. Would there be any objections to this? >From 4c5035de52de7e06a0de9c5d0bab8c87a806cba7 Mon Sep 17 00:00:00 2001 From: Ubuntu <ubuntu(a)domU-12-31-39-14-F0-B3.compute-1.internal> Date: Wed, 31 Aug 2011 18:15:54 +0000 Subject: [PATCH 1/1] make ptmx a bind mount rather than symlink udev on some systems checks the device type of /dev/ptmx, and replaces it if not as expected. The symlink created by libvirt-lxc therefore gets replaced. By creating it as a bind mount, the device type is correct and udev leaves it alone. Signed-off-by: Serge Hallyn <serge.hallyn(a)canonical.com> --- src/lxc/lxc_container.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index e425328..6991aec 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -543,18 +543,18 @@ static int lxcContainerPopulateDevices(void) } } + dev_t dev = makedev(LXC_DEV_MAJ_TTY, LXC_DEV_MIN_PTMX); + if (mknod("/dev/ptmx", S_IFCHR, dev) < 0 || + chmod("/dev/ptmx", 0666)) { + virReportSystemError(errno, "%s", + _("Failed to make device /dev/ptmx")); + return -1; + } + if (access("/dev/pts/ptmx", W_OK) == 0) { - if (symlink("/dev/pts/ptmx", "/dev/ptmx") < 0) { - virReportSystemError(errno, "%s", - _("Failed to create symlink /dev/ptmx to /dev/pts/ptmx")); - return -1; - } - } else { - dev_t dev = makedev(LXC_DEV_MAJ_TTY, LXC_DEV_MIN_PTMX); - if (mknod("/dev/ptmx", S_IFCHR, dev) < 0 || - chmod("/dev/ptmx", 0666)) { + if (mount("/dev/pts/ptmx", "/dev/ptmx", "ptmx", MS_BIND, NULL) < 0) { virReportSystemError(errno, "%s", - _("Failed to make device /dev/ptmx")); + _("Failed to bind-mount /dev/ptmx to /dev/pts/ptmx")); return -1; } } -- 1.7.5.4

4 6

[libvirt] [PATCH 1/2] BlockJob: Bandwidth parameter is in MB when using text monitor
by Adam Litke 01 Sep '11

01 Sep '11

Due to an unfortunate precedent in qemu, the units for the bandwidth parameter to block_job_set_speed are different between the text monitor and the qmp monitor. While the qmp monitor uses bytes/s, the text monitor expects MB/s. Correct the units for the text interface. Signed-off-by: Adam Litke <agl(a)us.ibm.com> --- src/qemu/qemu_monitor_text.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index f37c98c..854ee7f 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -3067,8 +3067,7 @@ int qemuMonitorTextBlockJob(qemuMonitorPtr mon, ret = virAsprintf(&cmd, "%s", cmd_name); } else if (mode == BLOCK_JOB_SPEED) { cmd_name = "block_job_set_speed"; - ret = virAsprintf(&cmd, "%s %s %llu", cmd_name, device, - bandwidth * 1024ULL * 1024ULL); + ret = virAsprintf(&cmd, "%s %s %luM", cmd_name, device, bandwidth); } else if (mode == BLOCK_JOB_PULL) { cmd_name = "block_stream"; ret = virAsprintf(&cmd, "%s %s", cmd_name, device); -- 1.7.3

3 4

[libvirt] [PATCH] BlockPull: Set initial bandwidth limit if specified
by Adam Litke 01 Sep '11

01 Sep '11

The libvirt BlockPull API supports the use of an initial bandwidth limit but the qemu block_stream API does not. To get the desired behavior we use the two APIs strung together: first BlockPull, then BlockJobSetSpeed. We can do this at the driver level to avoid duplicated code in each monitor path. Signed-off-by: Adam Litke <agl(a)us.ibm.com> --- src/qemu/qemu_driver.c | 8 +++++++- src/qemu/qemu_monitor_json.c | 4 ---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 4e8c691..7476bb4 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9418,8 +9418,14 @@ static int qemuDomainBlockPull(virDomainPtr dom, const char *path, unsigned long bandwidth, unsigned int flags) { + int ret; + virCheckFlags(0, -1); - return qemuDomainBlockJobImpl(dom, path, bandwidth, NULL, BLOCK_JOB_PULL); + ret = qemuDomainBlockJobImpl(dom, path, bandwidth, NULL, BLOCK_JOB_PULL); + if (ret == 0 && bandwidth != 0) + ret = qemuDomainBlockJobImpl(dom, path, bandwidth, NULL, + BLOCK_JOB_SPEED); + return ret; } static virDriver qemuDriver = { diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 715b26e..4ceb536 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2956,10 +2956,6 @@ int qemuMonitorJSONBlockJob(qemuMonitorPtr mon, if (ret == 0 && mode == BLOCK_JOB_INFO) ret = qemuMonitorJSONGetBlockJobInfo(reply, device, info); - if (ret == 0 && mode == BLOCK_JOB_PULL && bandwidth != 0) - ret = qemuMonitorJSONBlockJob(mon, device, bandwidth, NULL, - BLOCK_JOB_SPEED); - virJSONValueFree(cmd); virJSONValueFree(reply); return ret; -- 1.7.3

2 1