- Devel - libvirt List Archives

[libvirt] [PATCH] esx: remove dead store
by Eric Blake 04 May '11

04 May '11

Detected by clang. * src/esx/esx_util.c (esxUtil_ParseDatastorePath): No need to increment. --- src/esx/esx_util.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c index 9ef947c..640e984 100644 --- a/src/esx/esx_util.c +++ b/src/esx/esx_util.c @@ -2,7 +2,7 @@ /* * esx_util.c: utility functions for the VMware ESX driver * - * Copyright (C) 2010 Red Hat, Inc. + * Copyright (C) 2010-2011 Red Hat, Inc. * Copyright (C) 2009 Matthias Bolte <matthias.bolte(a)googlemail.com> * Copyright (C) 2009 Maximilian Wilhelm <max(a)rfc2324.org> * @@ -332,7 +332,7 @@ esxUtil_ParseDatastorePath(const char *datastorePath, char **datastoreName, preliminaryFileName = strrchr(preliminaryDirectoryAndFileName, '/'); if (preliminaryFileName != NULL) { - *preliminaryFileName++ = '\0'; + *preliminaryFileName = '\0'; } if (esxVI_String_DeepCopyValue(directoryName, -- 1.7.4.4

3 4

[libvirt] [PATCH] cgroup: avoid leaking a file
by Eric Blake 04 May '11

04 May '11

Clang detected a dead store to rc. It turns out that in fixing this, I also found a FILE* leak. * src/util/cgroup.c (virCgroupKillInternal): Abort rather than resuming loop on fscanf failure, and cleanup file on error. --- As a bonus, this also fixes a decl-after-statement for fp. src/util/cgroup.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/util/cgroup.c b/src/util/cgroup.c index afe8731..62b371d 100644 --- a/src/util/cgroup.c +++ b/src/util/cgroup.c @@ -1351,7 +1351,9 @@ static int virCgroupKillInternal(virCgroupPtr group, int signum, virHashTablePtr int killedAny = 0; char *keypath = NULL; bool done = false; - VIR_DEBUG("group=%p path=%s signum=%d pids=%p", group, group->path, signum, pids); + FILE *fp = NULL; + VIR_DEBUG("group=%p path=%s signum=%d pids=%p", + group, group->path, signum, pids); rc = virCgroupPathOfController(group, -1, "tasks", &keypath); if (rc != 0) { @@ -1364,7 +1366,6 @@ static int virCgroupKillInternal(virCgroupPtr group, int signum, virHashTablePtr */ while (!done) { done = true; - FILE *fp; if (!(fp = fopen(keypath, "r"))) { rc = -errno; VIR_DEBUG("Failed to read %s: %m\n", keypath); @@ -1376,7 +1377,8 @@ static int virCgroupKillInternal(virCgroupPtr group, int signum, virHashTablePtr if (feof(fp)) break; rc = -errno; - break; + VIR_DEBUG("Failed to read %s: %m\n", keypath); + goto cleanup; } if (virHashLookup(pids, (void*)pid)) continue; @@ -1403,6 +1405,7 @@ static int virCgroupKillInternal(virCgroupPtr group, int signum, virHashTablePtr cleanup: VIR_FREE(keypath); + VIR_FORCE_FCLOSE(fp); return rc; } -- 1.7.4.4

3 5

[libvirt] [PATCH] qemu: update qemuCgroupControllerActive signature
by Eric Blake 04 May '11

04 May '11

Clang warned about a dead assignment. In the process, I noticed that we are only using the function for a bool value. I audited all other callers in qemu_{migration,cgroup,driver,hotplug), and all were making the call in a bool context. * src/qemu/qemu_cgroup.c (qemuSetupCgroup): Delete dead assignment. (qemuCgroupControllerActive): Change return type to bool. * src/qemu/qemu_cgroup.h (qemuCgroupControllerActive): Likewise. --- src/qemu/qemu_cgroup.c | 14 +++++++------- src/qemu/qemu_cgroup.h | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 7e88a67..ac1c016 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -43,16 +43,16 @@ static const char *const defaultDeviceACL[] = { #define DEVICE_PTY_MAJOR 136 #define DEVICE_SND_MAJOR 116 -int qemuCgroupControllerActive(struct qemud_driver *driver, - int controller) +bool qemuCgroupControllerActive(struct qemud_driver *driver, + int controller) { if (driver->cgroup == NULL) - return 0; + return false; if (!virCgroupMounted(driver->cgroup, controller)) - return 0; + return false; if (driver->cgroupControllers & (1 << controller)) - return 1; - return 0; + return true; + return false; } static int @@ -312,7 +312,7 @@ int qemuSetupCgroup(struct qemud_driver *driver, if (vm->def->mem.hard_limit != 0 || vm->def->mem.soft_limit != 0 || vm->def->mem.swap_hard_limit != 0) { - if ((rc = qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_MEMORY))) { + if (qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_MEMORY)) { if (vm->def->mem.hard_limit != 0) { rc = virCgroupSetMemoryHardLimit(cgroup, vm->def->mem.hard_limit); if (rc != 0) { diff --git a/src/qemu/qemu_cgroup.h b/src/qemu/qemu_cgroup.h index 299bd2d..e8abfb4 100644 --- a/src/qemu/qemu_cgroup.h +++ b/src/qemu/qemu_cgroup.h @@ -34,8 +34,8 @@ struct _qemuCgroupData { }; typedef struct _qemuCgroupData qemuCgroupData; -int qemuCgroupControllerActive(struct qemud_driver *driver, - int controller); +bool qemuCgroupControllerActive(struct qemud_driver *driver, + int controller); int qemuSetupDiskCgroup(struct qemud_driver *driver, virDomainObjPtr vm, virCgroupPtr cgroup, -- 1.7.4.4

2 2

[libvirt] [PATCH] lxc: report correct error
by Eric Blake 04 May '11

04 May '11

Clang noticed a dead assignment, which turned out to be the use of the wrong variable. rc starts life as -1, and is only ever assigned to 0 just before a successful cleanup. * src/lxc/lxc_driver.c (lxcSetupInterfaces): Don't call virReportSystemError(-1). --- src/lxc/lxc_driver.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index e905302..b94941d 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1100,10 +1100,9 @@ static int lxcSetupInterfaces(virConnectPtr conn, } if ((ret = brAddInterface(brctl, bridge, parentVeth)) != 0) { - virReportSystemError(rc, + virReportSystemError(ret, _("Failed to add %s device to %s"), parentVeth, bridge); - rc = -1; goto error_exit; } -- 1.7.4.4

2 2

[libvirt] [PATCH] util: remove dead assignment
by Eric Blake 04 May '11

04 May '11

Clang complained about this, and it was easy enough to fix. * src/util/util.c (virFileOpenAs): Drop dead assignment. --- src/util/util.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index 37472bb..9041ab6 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -1523,8 +1523,7 @@ virFileOpenAs(const char *path, int openflags, mode_t mode, if (ret < 0 && errno != EACCES) { ret = -errno; VIR_FORCE_CLOSE(pair[0]); - while ((waitret = waitpid(pid, NULL, 0) == -1) - && (errno == EINTR)); + while (waitpid(pid, NULL, 0) == -1 && errno == EINTR); goto parenterror; } else { fd = ret; -- 1.7.4.4

2 2

[libvirt] [PATCH] libxl: avoid compiler warning
by Eric Blake 04 May '11

04 May '11

Detected by gcc: libxl/libxl_driver.c: In function 'libxlDomainDestroy': libxl/libxl_drier.c:1351:30: error: variable 'priv' set but not used [-Werror=unused-but-set-variable] * src/libxl/libxl_driver.c (libxlDomainDestroy): Delete unused variable. --- Trivial, so pushing under the build-breaker rule. src/libxl/libxl_driver.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 247d78e..dec4f43 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -1348,7 +1348,6 @@ libxlDomainDestroy(virDomainPtr dom) libxlDriverPrivatePtr driver = dom->conn->privateData; virDomainObjPtr vm; int ret = -1; - libxlDomainObjPrivatePtr priv; virDomainEventPtr event = NULL; libxlDriverLock(driver); @@ -1370,7 +1369,6 @@ libxlDomainDestroy(virDomainPtr dom) event = virDomainEventNewFromObj(vm,VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED_DESTROYED); - priv = vm->privateData; if (libxlVmReap(driver, vm, 1) != 0) { libxlError(VIR_ERR_INTERNAL_ERROR, _("Failed to destroy domain '%d'"), dom->id); -- 1.7.4.4

1 0

[libvirt] [PATCH] qemu: remove dead assignment
by Eric Blake 04 May '11

04 May '11

Detected by clang. * src/qemu/qemu_migration.c (qemuMigrationToFile): Nothing later uses is_reg. --- src/qemu/qemu_migration.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 7f4b111..6c5bf66 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1311,7 +1311,6 @@ qemuMigrationToFile(struct qemud_driver *driver, virDomainObjPtr vm, if (virSecurityManagerSetFDLabel(driver->securityManager, vm, compressor ? pipeFD[1] : fd) < 0) goto cleanup; - is_reg = true; bypassSecurityDriver = true; } else { /* Phooey - we have to fall back on exec migration, where qemu -- 1.7.4.4

2 2

[libvirt] [PATCH] storage: use virCommand to avoid compiler warning
by Eric Blake 04 May '11

04 May '11

clang didn't like the last increment to nargs. But why even track nargs ourselves, when virCommand does it for us? * src/storage/storage_backend_iscsi.c (virStorageBackendISCSIConnection): Switch to virCommand to avoid a dead-store warning on nargs. --- src/storage/storage_backend_iscsi.c | 36 ++++++++-------------------------- 1 files changed, 9 insertions(+), 27 deletions(-) diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c index d86f077..ec52dbc 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/src/storage/storage_backend_iscsi.c @@ -42,6 +42,7 @@ #include "memory.h" #include "logging.h" #include "files.h" +#include "command.h" #define VIR_FROM_THIS VIR_FROM_STORAGE @@ -348,28 +349,11 @@ virStorageBackendISCSIConnection(const char *portal, "--targetname", target, NULL }; - int i; - int nargs = 0; + virCommandPtr cmd; char *ifacename = NULL; - const char **cmdargv; - - for (i = 0 ; baseargv[i] != NULL ; i++) - nargs++; - for (i = 0 ; extraargv[i] != NULL ; i++) - nargs++; - if (initiatoriqn) - nargs += 2; - - if (VIR_ALLOC_N(cmdargv, nargs+1) < 0) { - virReportOOMError(); - return -1; - } - nargs = 0; - for (i = 0 ; baseargv[i] != NULL ; i++) - cmdargv[nargs++] = baseargv[i]; - for (i = 0 ; extraargv[i] != NULL ; i++) - cmdargv[nargs++] = extraargv[i]; + cmd = virCommandNewArgs(baseargv); + virCommandAddArgSet(cmd, extraargv); if (initiatoriqn) { switch (virStorageBackendIQNFound(initiatoriqn, &ifacename)) { @@ -377,7 +361,8 @@ virStorageBackendISCSIConnection(const char *portal, VIR_DEBUG("ifacename: '%s'", ifacename); break; case IQN_MISSING: - if (virStorageBackendCreateIfaceIQN(initiatoriqn, &ifacename) != 0) { + if (virStorageBackendCreateIfaceIQN(initiatoriqn, + &ifacename) != 0) { goto cleanup; } break; @@ -385,19 +370,16 @@ virStorageBackendISCSIConnection(const char *portal, default: goto cleanup; } - - cmdargv[nargs++] = "--interface"; - cmdargv[nargs++] = ifacename; + virCommandAddArgList(cmd, "--interface", ifacename, NULL); } - cmdargv[nargs++] = NULL; - if (virRun(cmdargv, NULL) < 0) + if (virCommandRun(cmd, NULL) < 0) goto cleanup; ret = 0; cleanup: - VIR_FREE(cmdargv); + virCommandFree(cmd); VIR_FREE(ifacename); return ret; -- 1.7.4.4

2 2

[libvirt] pci device passthrough: Failed to assign irq
by guan qin 04 May '11

04 May '11

Hi, I encounter a problem that the eth can't be up in the VM by using VT-d. I boot the VM using "virsh create vt_d.xml". The VM could recongize the NIC which was assigned .then I do in VM as follows: #cat /sys/class/net/eth0/operstate down #ifconfig eth0 up #cat /sys/class/net/eth0/operstate down #ficonfig eth 10.100.0.5 #cat /sys/class/net/eth0/operstate down I look into the qemu log file ,find that : LC_ALL=C PATH=/usr/local/sbin:/usr/ local/bin:/sbin:/bin:/usr/sbin:/usr/bin HOME=/ QEMU_AUDIO_DRV=none /usr/bin/kvm -S -M pc-0.12 -enable-kvm -m 512 -smp 1,sockets=1,cores=1,threads=1 -name vt_d_5 -uuid 05f608a3-f64f-2418-a90a-d611982c8336 -nodefaults -chardev socket,id=monitor,path=/var/lib/libvirt/qemu/vt_d_5.monitor,server,nowait -mon chardev=monitor,mode=readline -rtc base=utc -boot c -drive file=/home/qinguan/exp/kvm_vtd/ubuntu_1.img,if=none,id=drive-virtio-disk0,boot=on,format=raw -device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0 -usb -device usb-mouse,id=input0 -vnc 127.0.0.1:0 -vga cirrus -device pci-assign,host=00:19.0,id=hostdev0,bus=pci.0,addr=0x4 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 Failed to assign irq for "hostdev0": Operation not permitted Perhaps you are assigning a device that shares an IRQ with another device? Failed to assign irq for "hostdev0": Operation not permitted Perhaps you are assigning a device that shares an IRQ with another device? Failed to assign irq for "hostdev0": Operation not permitted Perhaps you are assigning a device that shares an IRQ with another device? Failed to assign irq for "hostdev0": Operation not permitted Perhaps you are assigning a device that shares an IRQ with another device? Failed to assign irq for "hostdev0": Operation not permitted maybe the VM can't access to the network because of Failed to assign irg for "hostdev0"? in kern.log : May 1 12:40:07 Optiplex-780 kernel: [ 3172.784803] e1000e 0000:00:19.0: PCI INT A disabled May 1 12:40:07 Optiplex-780 kernel: [ 3172.784863] pci-stub 0000:00:19.0: claimed by stub May 1 12:40:07 Optiplex-780 kernel: [ 3173.103965] pci-stub 0000:00:19.0: PCI INT A -> GSI 21 (level, low) -> IRQ 21 May 1 12:40:07 Optiplex-780 kernel: [ 3173.204030] pci-stub 0000:00:19.0: restoring config space at offset 0x6 (was 0x1, writing 0xece1) May 1 12:40:07 Optiplex-780 kernel: [ 3173.204035] pci-stub 0000:00:19.0: restoring config space at offset 0x5 (was 0x0, writing 0xf7ad9000) May 1 12:40:07 Optiplex-780 kernel: [ 3173.204039] pci-stub 0000:00:19.0: restoring config space at offset 0x4 (was 0x0, writing 0xf7ae0000) May 1 12:40:07 Optiplex-780 kernel: [ 3173.204045] pci-stub 0000:00:19.0: restoring config space at offset 0x1 (was 0x100000, writing 0x100103) May 1 12:40:07 Optiplex-780 kernel: [ 3173.435751] assign device 0:0:19.0 May 1 12:44:24 Optiplex-780 kernel: [ 3430.568526] pci-stub 0000:00:19.0: restoring config space at offset 0x6 (was 0x1, writing 0xece1) May 1 12:44:24 Optiplex-780 kernel: [ 3430.568532] pci-stub 0000:00:19.0: restoring config space at offset 0x5 (was 0x0, writing 0xf7ad9000) May 1 12:44:24 Optiplex-780 kernel: [ 3430.568537] pci-stub 0000:00:19.0: restoring config space at offset 0x4 (was 0x0, writing 0xf7ae0000) May 1 12:44:24 Optiplex-780 kernel: [ 3430.568543] pci-stub 0000:00:19.0: restoring config space at offset 0x1 (was 0x100000, writing 0x100103) May 1 12:44:24 Optiplex-780 kernel: [ 3430.568561] pci-stub 0000:00:19.0: PCI INT A disabled root@Optiplex-780:/var/log/libvirt/qemu# cat /proc/interrupts CPU0 CPU1 CPU2 CPU3 0: 97 1 2 1 IO-APIC-edge timer 1: 2 0 0 0 IO-APIC-edge i8042 7: 0 0 0 0 IO-APIC-edge parport0 8: 1 0 0 0 IO-APIC-edge rtc0 9: 0 0 0 0 IO-APIC-fasteoi acpi 12: 1 2 1 0 IO-APIC-edge i8042 16: 0 0 0 0 IO-APIC-fasteoi uhci_hcd:usb2 17: 5822 1952 3614 2233 IO-APIC-fasteoi uhci_hcd:usb4, uhci_hcd:usb7 18: 0 0 0 0 IO-APIC-fasteoi uhci_hcd:usb8 22: 1 1 1 0 IO-APIC-fasteoi ehci_hcd:usb1, uhci_hcd:usb5 23: 1461 1299 1153 912 IO-APIC-fasteoi ehci_hcd:usb3, uhci_hcd:usb6 24: 268579 0 0 0 HPET_MSI-edge hpet2 25: 0 286310 0 0 HPET_MSI-edge hpet3 26: 0 0 210675 0 HPET_MSI-edge hpet4 27: 0 0 0 256688 HPET_MSI-edge hpet5 29: 1 0 0 0 DMAR_MSI-edge dmar1 30: 0 0 0 0 DMAR_MSI-edge dmar0 31: 0 0 0 0 DMAR_MSI-edge dmar2 35: 0 0 0 1 PCI-MSI-edge eth1 36: 1456 916 1323 1657 PCI-MSI-edge eth1-rx-0 37: 1031 772 1459 895 PCI-MSI-edge eth1-rx-1 38: 958 965 785 470 PCI-MSI-edge eth1-rx-2 39: 1319 557 1007 714 PCI-MSI-edge eth1-rx-3 40: 892 864 417 1134 PCI-MSI-edge eth1-tx-0 41: 414 749 998 606 PCI-MSI-edge eth1-tx-1 42: 307 921 375 332 PCI-MSI-edge eth1-tx-2 43: 966 693 396 502 PCI-MSI-edge eth1-tx-3 54: 7109 5755 5683 5609 PCI-MSI-edge ahci 55: 74 105 73 84 PCI-MSI-edge hda_intel 56: 1446 927 1108 870 PCI-MSI-edge i915 NMI: 0 0 0 0 Non-maskable interrupts LOC: 740 725 703 677 Local timer interrupts SPU: 0 0 0 0 Spurious interrupts PMI: 0 0 0 0 Performance monitoring interrupts PND: 0 0 0 0 Performance pending work RES: 665 679 714 547 Rescheduling interrupts CAL: 5332 408 5619 539 Function call interrupts TLB: 1880 2843 1788 3202 TLB shootdowns TRM: 0 0 0 0 Thermal event interrupts THR: 0 0 0 0 Threshold APIC interrupts MCE: 0 0 0 0 Machine check exceptions MCP: 5 5 5 5 Machine check polls ERR: 3 MIS: 0 root@Optiplex-780:/var/log/libvirt/qemu# I search the similarly problems that sharing the irg but never find a answer , and now I have no idea. How to solve the problem ,can you help me ? thanks. best regards, qinguan vt_d.xml: <domain type='kvm'> <name>test</name> <description>just test using sriov!</description> <os> <type>hvm</type> <boot dev='hd'/> </os> <memory>524288</memory> <currentMemory>524288</ currentMemory> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <features><pae/><acpi/><apic/></features> <clock offset='utc'/> <devices> <input type='mouse' bus='usb'/> <disk type='file' device='disk'> <source file='/home/qinguan/exp/ubuntu_1.img'/> <target dev='hda' bus='virtio'/> </disk> <emulator>/usr/bin/kvm</emulator> <graphics type='vnc' port='-1'/> <hostdev mode='subsystem' type='pci' managed='yes'> <source> <address bus='0x0' slot='0x19' function='0x0'/> </source> </hostdev> </devices> </domain>

1 1

[libvirt] Support for more than 32 virtio devices
by Badari Pulavarty 04 May '11

04 May '11

Hi, How can I make use of "multifunction" functionality to support more than 32 virtio devices in QEMU through libvirt ? Are there corresponding changes in libvirt ? Please let me know. Thanks, Badari

3 3