- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: Adjust size for qcow2/qed if not on sector boundary
by John Ferlan 08 May '14

08 May '14

https://bugzilla.redhat.com/show_bug.cgi?id=1002813 If qemuDomainBlockResize() is passed a size not on a KiB boundary - that is passed a size based in bytes (VIR_DOMAIN_BLOCK_RESIZE_BYTES), then depending on the source format (qcow2 or qed), the value passed must be on a sector (or 512 byte) boundary. Since other libvirt code quietly adjusts the capacity values, then do so here as well - of course ensuring that adjustment still fits. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/qemu/qemu_driver.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 4bb4819..3e407d7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9421,6 +9421,7 @@ qemuDomainBlockResize(virDomainPtr dom, virDomainObjPtr vm; qemuDomainObjPrivatePtr priv; int ret = -1, idx; + unsigned long long size_up; char *device = NULL; virDomainDiskDefPtr disk = NULL; @@ -9441,6 +9442,12 @@ qemuDomainBlockResize(virDomainPtr dom, return -1; } size *= 1024; + size_up = size; + } else { + /* For 'qcow2' and 'qed', qemu resize blocks expects values + * on sector boundary, so round our value up to prepare + */ + size_up = VIR_ROUND_UP(size, 512); } if (!(vm = qemuDomObjFromDomain(dom))) @@ -9467,6 +9474,21 @@ qemuDomainBlockResize(virDomainPtr dom, } disk = vm->def->disks[idx]; + /* qcow2 and qed must be sized appropriately, so be sure our value + * is sized appropriately and will fit + */ + if (size != size_up && + (disk->src.format == VIR_STORAGE_FILE_QCOW2 || + disk->src.format == VIR_STORAGE_FILE_QED)) { + if (size_up > ULLONG_MAX) { + virReportError(VIR_ERR_OVERFLOW, + _("size must be less than %llu KiB"), + ULLONG_MAX / 1024); + goto endjob; + } + size = size_up; + } + if (virAsprintf(&device, "%s%s", QEMU_DRIVE_HOST_PREFIX, disk->info.alias) < 0) goto endjob; -- 1.9.0

3 6

[libvirt] LibvirtError: Operation not supported : JSON monitor is required
by xeon_feng 07 May '14

07 May '14

Hi Thanks for chenhanxiao(a)cn.fujitsu.com help , I have resole the problem (libvirt 1.2.4 and virt-manager 0.9.0 are not incompatible)..but when I created VM by virt-manager ,it reported : unable to complete install: 'Opertation not supported: JSON monitor is required.' Traceback(most recent call last): File "/usr/share/virt-manager/virtManager/asyncjob.py",line 44, in cb_wrapper callback(asyncjob, *args, **kwargs) ...... LibvirtError: Operation not supported : JSON monitor is required. what is wrong ? Please help me....... Tanks a lot .... Xeon.Feng last problem: libvirt 1.2.4 and virt-manager 0.9.0 are not incompatible """""""""" Hello everyone I encountered a problem when I completed the update of libvirt from 0.10 to 1.2.4 . The problem was that virt-manager(version 0.9.0) could not start and reported error : "ImportError: /usr/lib64/libvirt.so.0: version 'LIBVIRT_PRIVIATE_0.10.2' not found (required by /usr/lib64/python2.6/site-packages/libvirtmod.so)". I found the libvirt.so.0 link file just in the /usr/lib64/ directory , but it was linking to libvirt.so.0.1002.4 .not to the libvirt.so.0.10.2 I made libvirt.so.0 to link to libvirt.so.0.10.2 and restarted virt-manager , virt-manager started normally then restarted libvirtd failure, reporting error:l “ibvirtd: /usr/lib64/libvirt.so.0: version 'LIBVIRT_1.2.3' not found (require by libvirtd) .....” I made libvirt.so.0 to link to libvirt.so.0.1002.4 and restart libvirtd , libvirtd started normally again. Please help me to resolve the problem and give me some advise.... Thanks a lot.. Xeon.Feng """""""

1 0

[libvirt] [PATCH] LXC: don't doubly link /dev/console
by Dwight Engen 07 May '14

07 May '14

When a console is configured, /dev/console and /dev/tty1 are created as symlinks to the same underlying pts. This causes problems since a separate getty will be spawned for /dev/console and /dev/tty1, but they are each controlling the same device. This patch makes it so that /dev/console is the sole symlink to the first console, /dev/tty1 to the second, /dev/tty2 to the third and so on. Signed-off-by: Dwight Engen <dwight.engen(a)oracle.com> --- src/lxc/lxc_container.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index fd8ab16..dcc6b17 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1034,23 +1034,25 @@ static int lxcContainerSetupDevices(char **ttyPaths, size_t nttyPaths) } for (i = 0; i < nttyPaths; i++) { - char *tty; - if (virAsprintf(&tty, "/dev/tty%zu", i+1) < 0) - return -1; - if (symlink(ttyPaths[i], tty) < 0) { - virReportSystemError(errno, - _("Failed to symlink %s to %s"), - ttyPaths[i], tty); + if (i == 0) { + if (symlink(ttyPaths[i], "/dev/console") < 0) { + virReportSystemError(errno, + _("Failed to symlink %s to /dev/console"), + ttyPaths[i]); + return -1; + } + } else { + char *tty; + if (virAsprintf(&tty, "/dev/tty%zu", i) < 0) + return -1; + if (symlink(ttyPaths[i], tty) < 0) { + virReportSystemError(errno, + _("Failed to symlink %s to %s"), + ttyPaths[i], tty); + VIR_FREE(tty); + return -1; + } VIR_FREE(tty); - return -1; - } - VIR_FREE(tty); - if (i == 0 && - symlink(ttyPaths[i], "/dev/console") < 0) { - virReportSystemError(errno, - _("Failed to symlink %s to /dev/console"), - ttyPaths[i]); - return -1; } } return 0; -- 1.9.0

3 3

[libvirt] [PATCH 0/4] parallels: a set of fixes
by Dmitry Guryanov 07 May '14

07 May '14

Hello, I'd like to continue working on the parallels driver. So here is a set of patches, which resolves some problems. Now Parallels has a definite goal with this driver: we want OpenStack to be working with Parallels Cloud Server (PCS) over libvirt, and we a ready to implement all needed API calls in libvirt's driver and make necessary changes in PCS. P.S. I appreciate greatly effort needed to support the driver in compilable state and a lot of refactoring made by libvirt team, thanks! Dmitry Guryanov (4): parallels: fix virDomainDef.features comparison parallels: don't enable VNC when we define a new domain parallels: don't add domain to the list twice parallels: add a set of trivial functions src/parallels/parallels_driver.c | 57 ++++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 26 deletions(-) -- 1.9.0

3 13

[libvirt] [PATCH 1/5] virerror: Fix an error message typo
by Cole Robinson 07 May '14

07 May '14

--- src/util/virerror.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virerror.h b/src/util/virerror.h index 2de04f4..fe0e15e 100644 --- a/src/util/virerror.h +++ b/src/util/virerror.h @@ -99,7 +99,7 @@ void virReportSystemErrorFull(int domcode, #argname, \ NULL, \ 0, 0, \ - _("%s in %s must greater than zero"), \ + _("%s in %s must be greater than zero"), \ #argname, __FUNCTION__) # define virReportInvalidNonZeroArg(argname) \ virRaiseErrorFull(__FILE__, __FUNCTION__, __LINE__, \ -- 1.9.0

3 12

[libvirt] [PATCH 0/2] Fix bug on buildVol error path
by John Ferlan 07 May '14

07 May '14

https://bugzilla.redhat.com/show_bug.cgi?id=1092882 Changes as a result of commit id '0c2305b3', see: http://www.redhat.com/archives/libvir-list/2014-April/msg00375.html Resulted in a regression when there was a failure to buildVol the volume wasn't removed from the storage driver list because the wrong local storage pointer was passed to the DeleteInternal routine. Additionally a preexisting condition where if deleteVol didn't exist or failed, the volume would not be removed from volumes.objs[] even though it doesn't exist. This results in virsh vol-list and vol-info not finding the volume and emitting error messages. John Ferlan (2): storage: Need to ensure removal of voldef from driver list storage: Resolve issues in failure path src/storage/storage_driver.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) -- 1.9.0

2 5

[libvirt] [RESEND PATCH] Add support for timestamping QEMU logs
by Ján Tomko 07 May '14

07 May '14

QEMU commit 5e2ac51 added a boolean '-msg timestamp=[on|off]' option, which can enable timestamps on errors: $ qemu-system-x86_64 -msg timestamp=on zghhdorf 2014-04-09T13:25:46.779484Z qemu-system-x86_64: -msg timestamp=on: could not open disk image zghhdorf: Could not open 'zghhdorf': No such file or directory Enable this timestamp if the QEMU binary supports it. Add a 'log_timestamp' option to qemu.conf for disabling this behavior. --- Rebased to latest master, this time with the test files added. previous posting of the patch: https://www.redhat.com/archives/libvir-list/2014-April/msg00422.html src/qemu/libvirtd_qemu.aug | 3 ++ src/qemu/qemu.conf | 8 ++++++ src/qemu/qemu_capabilities.c | 5 ++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 4 +++ src/qemu/qemu_conf.c | 4 +++ src/qemu/qemu_conf.h | 2 ++ src/qemu/test_libvirtd_qemu.aug.in | 1 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + .../qemuxml2argv-minimal-msg-timestamp.args | 6 ++++ .../qemuxml2argv-minimal-msg-timestamp.xml | 32 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + 13 files changed, 69 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-minimal-msg-timestamp.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-minimal-msg-timestamp.xml diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index a9ff421..e985d22 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -85,6 +85,8 @@ module Libvirtd_qemu = | int_entry "migration_port_min" | int_entry "migration_port_max" + let log_entry = bool_entry "log_timestamp" + (* Each entry in the config is one of the following ... *) let entry = vnc_entry | spice_entry @@ -96,6 +98,7 @@ module Libvirtd_qemu = | device_entry | rpc_entry | network_entry + | log_entry let comment = [ label "#comment" . del /#[ \t]*/ "# " . store /([^ \t\n][^\n]*)?/ . del /\n/ "\n" ] let empty = [ label "#empty" . eol ] diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index f0e802f..42f812d 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -465,3 +465,11 @@ # #migration_port_min = 49152 #migration_port_max = 49215 + + + +# Timestamp QEMU's log messages (if QEMU supports it) +# +# Defaults to 1. +# +#log_timestamp = 0 diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 8343258..0d08e20 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -255,6 +255,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "usb-kbd", /* 165 */ "host-pci-multidomain", + "msg-timestamp", ); @@ -1146,6 +1147,9 @@ virQEMUCapsComputeCmdFlags(const char *help, if (strstr(help, "-machine")) virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_OPT); + if (strstr(help, "-msg timestamp")) + virQEMUCapsSet(qemuCaps, QEMU_CAPS_MSG_TIMESTAMP); + /* * Handling of -incoming arg with varying features * -incoming tcp (kvm >= 79, qemu >= 0.10.0) @@ -2378,6 +2382,7 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = { { "boot-opts", "strict", QEMU_CAPS_BOOT_STRICT }, { "boot-opts", "reboot-timeout", QEMU_CAPS_REBOOT_TIMEOUT }, { "spice", "disable-agent-file-xfer", QEMU_CAPS_SPICE_FILE_XFER_DISABLE }, + { "msg", "timestamp", QEMU_CAPS_MSG_TIMESTAMP }, }; static int diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 26400d2..d755caa 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -205,6 +205,7 @@ enum virQEMUCapsFlags { QEMU_CAPS_CHARDEV_SPICEPORT = 164, /* -chardev spiceport */ QEMU_CAPS_DEVICE_USB_KBD = 165, /* -device usb-kbd */ QEMU_CAPS_HOST_PCI_MULTIDOMAIN = 166, /* support domain > 0 in host pci address */ + QEMU_CAPS_MSG_TIMESTAMP = 167, /* -msg timestamp */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 29ae8e4..dd8e40a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9742,6 +9742,10 @@ qemuBuildCommandLine(virConnectPtr conn, virCommandSetMaxMemLock(cmd, memKB * 1024); } + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_MSG_TIMESTAMP) && + cfg->logTimestamp) + virCommandAddArgList(cmd, "-msg", "timestamp=on", NULL); + virObjectUnref(cfg); return cmd; diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 198ee2f..e487f5e 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -255,6 +255,8 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) cfg->keepAliveCount = 5; cfg->seccompSandbox = -1; + cfg->logTimestamp = true; + return cfg; error: @@ -576,6 +578,8 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, GET_VALUE_STR("migration_address", cfg->migrationAddress); + GET_VALUE_BOOL("log_timestamp", cfg->logTimestamp); + ret = 0; cleanup: diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index a36ea63..5d2983a 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -167,6 +167,8 @@ struct _virQEMUDriverConfig { char *migrationAddress; int migrationPortMin; int migrationPortMax; + + bool logTimestamp; }; /* Main driver state */ diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index b2328d3..30a4257 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -72,3 +72,4 @@ module Test_libvirtd_qemu = { "migration_address" = "127.0.0.1" } { "migration_port_min" = "49152" } { "migration_port_max" = "49215" } +{ "log_timestamp" = "0" } diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps index 7b86c3b..ca2c236 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps @@ -143,4 +143,5 @@ <flag name='spiceport'/> <flag name='usb-kbd'/> <flag name='host-pci-multidomain'/> + <flag name='msg-timestamp'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps index 10b8251..32bccdb 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps @@ -141,4 +141,5 @@ <flag name='spiceport'/> <flag name='usb-kbd'/> <flag name='host-pci-multidomain'/> + <flag name='msg-timestamp'/> </qemuCaps> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-minimal-msg-timestamp.args b/tests/qemuxml2argvdata/qemuxml2argv-minimal-msg-timestamp.args new file mode 100644 index 0000000..f85aae9 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-minimal-msg-timestamp.args @@ -0,0 +1,6 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-name QEMUGuest1 -S -M pc -m 214 -smp 1 -nographic -monitor \ +unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-usb -hda /dev/HostVG/QEMUGuest1 -net none -serial \ +none -parallel none -msg timestamp=on diff --git a/tests/qemuxml2argvdata/qemuxml2argv-minimal-msg-timestamp.xml b/tests/qemuxml2argvdata/qemuxml2argv-minimal-msg-timestamp.xml new file mode 100644 index 0000000..4a938b3 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-minimal-msg-timestamp.xml @@ -0,0 +1,32 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <title>A description of the test machine.</title> + <description> + A test of qemu's minimal configuration. + This test also tests the description and title elements. + </description> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index ad5e2cd..1ea7bf8 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -578,6 +578,7 @@ mymain(void) unsetenv("SDL_AUDIODRIVER"); DO_TEST("minimal", QEMU_CAPS_NAME); + DO_TEST("minimal-msg-timestamp", QEMU_CAPS_NAME, QEMU_CAPS_MSG_TIMESTAMP); DO_TEST("minimal-s390", QEMU_CAPS_NAME); DO_TEST("machine-aliases1", NONE); DO_TEST("machine-aliases2", QEMU_CAPS_KVM); -- 1.8.3.2

2 2

[libvirt] [PATCH RFC 00/22] Support for walking backing chains on remote volumes (especially gluster)
by Peter Krempa 07 May '14

07 May '14

This series adds support for waliking (detecting) of backing chain on remote storage and implements the needed callbacks for the gluster storage system via native library. The last patch in the series mocks up path canonicalization on gluster as I'm working on that but this series is getting tedious to rebase and handle so I'd like to start reviews. Peter Krempa (22): qemu: Make qemuDomainPrepareDiskChainElement aware of remote storage storage: Store gluster volume name separately storage: Rework debugging of storage file access through storage driver conf: Fix domain disk path iterator to work with networked storage storage: Add NONE protocol type for network disks storage: Add support for access to files using provided uid/gid storage: Add storage file API to read file headers storage: backend: Add unique id retrieval API storage: Add API to check accessibility of storage volumes storage: Move virStorageFileGetMetadata to the storage driver storage: Determine the local storage type right away test: storage: Initialize storage source to correct type storage: backend: Add possibility to suppress errors from backend lookup storage: Switch metadata crawler to use storage driver to get unique path storage: Switch metadata crawler to use storage driver to read headers storage: Switch metadata crawler to use storage driver file access check storage: Add infrastructure to parse remote network backing names storage: Change to new backing store parser storage: Traverse backing chains of network disks qemu: Add support for networked disks for block pull/block rebase qemu: Add support for networked disks for block commit [DO NOT APPLY UPSTREAM] storage: gluster: mock up path canonicalization cfg.mk | 2 +- src/Makefile.am | 2 + src/conf/domain_conf.c | 70 +++- src/libvirt_private.syms | 3 +- src/qemu/qemu_command.c | 21 +- src/qemu/qemu_domain.c | 10 +- src/qemu/qemu_driver.c | 116 +++++-- src/security/virt-aa-helper.c | 2 + src/storage/storage_backend.c | 16 +- src/storage/storage_backend.h | 22 +- src/storage/storage_backend_fs.c | 127 +++++++- src/storage/storage_backend_gluster.c | 141 ++++++-- src/storage/storage_driver.c | 329 ++++++++++++++++++- src/storage/storage_driver.h | 15 +- src/util/virstoragefile.c | 596 +++++++++++++++++++++------------- src/util/virstoragefile.h | 16 +- tests/Makefile.am | 7 +- tests/virstoragetest.c | 26 +- 18 files changed, 1162 insertions(+), 359 deletions(-) -- 1.9.2

2 27

[libvirt] [question]qemu: migrate and destory vm immediately on destination causes libvirt deadlock or segment fault
by Wangrui (K) 07 May '14

07 May '14

Hi everyone, I do ram migration operation in KVM environment(libvirt1.2.4 qemu1.5.1). I encountered libvirtd deadlock or segmentfault when I destroy the migration VM on destination. I got the problem by flowing steps: step 1: migrate VM. step 2: execute "virsh destroy [VMName]" to destroy the migration VM on destination immediately. step 3: the destination libvirtd will be probably deadlock or segmentfault. Deadlock stack as followed: #0 0x00007fb5c18132d4 in __lll_lock_wait () from /lib64/libpthread.so.0 #1 0x00007fb5c180e659 in _L_lock_1008 () from /lib64/libpthread.so.0 #2 0x00007fb5c180e46e in pthread_mutex_lock () from /lib64/libpthread.so.0 #3 0x00007fb5c45d175f in virMutexLock (m=0x7fb5b0066ed0) at util/virthread.c:88 #4 0x00007fb5c45b6b04 in virObjectLock (anyobj=0x7fb5b0066ec0) at util/virobject.c:323 #5 0x00007fb5b8f4842a in qemuMonitorEmitEvent (mon=0x7fb5b0066ec0, event=0x7fb5b00688d0 "SHUTDOWN", seconds=1399374472, micros=509994, details=0x0) at qemu/qemu_monitor.c:1185 #6 0x00007fb5b8f62af2 in qemuMonitorJSONIOProcessEvent (mon=0x7fb5b0066ec0, obj=0x7fb5b0069080) at qemu/qemu_monitor_json.c:158 #7 0x00007fb5b8f62d25 in qemuMonitorJSONIOProcessLine (mon=0x7fb5b0066ec0, line=0x7fb5b005bbe0 "{\"timestamp\": {\"seconds\": 1399374472, \"microseconds\": 509994}, \"event\": \"SHUTDOWN\"}",msg=0x7fb5bd873c80) at qemu/qemu_monitor_json.c:195 #8 0x00007fb5b8f62f85 in qemuMonitorJSONIOProcess (mon=0x7fb5b0066ec0, data=0x7fb5b0060770 "{\"timestamp\": {\"seconds\": 1399374472, \"microseconds\": 509994},\"event\": \"SHUTDOWN\"}\r\n", len=85, msg=0x7fb5bd873c80) at qemu/qemu_monitor_json.c:237 #9 0x00007fb5b8f49aa0 in qemuMonitorIOProcess (mon=0x7fb5b0066ec0) at qemu/qemu_monitor.c:402 #10 0x00007fb5b8f4a09b in qemuMonitorIO (watch=20, fd=24, events=0, opaque=0x7fb5b0066ec0) at qemu/qemu_monitor.c:651 #11 0x00007fb5c458c4d9 in virEventPollDispatchHandles (nfds=17, fds=0x7fb5b0068a60) at util/vireventpoll.c:510 #12 0x00007fb5c458decf in virEventPollRunOnce () at util/vireventpoll.c:659 #13 0x00007fb5c458bfcc in virEventRunDefaultImpl () at util/virevent.c:308 #14 0x00007fb5c51a17a9 in virNetServerRun (srv=0x7fb5c5411d70) at rpc/virnetserver.c:1139 #15 0x00007fb5c5157f63 in main (argc=3, argv=0x7fff7fc04f48) at libvirtd.c:150 After analysis, I found it may be caused by multithreaded simultaneously access to the global variables "vm->privateData->mon". When problems occur，there are three libvirtd threads at work on destination host，suppose： ThreadA: migration thread，do qemuProcessStart. ThreadB: destroy thread，do qemuDoaminDestroy -> qemuProcessStop. ThreadC：Monitor Thread，do IOWrite、IORead and some other operations according to the mon->msg when mon->fd change. When threadB destroy happpens, this thread would handle the SUHTDOWN event. In threadA, when it sends QMP command to Qemu, it will operate the vm->privateData->mon lock. Such as the operation "qemuDomainObjEnterMonitor -> qemuMonitorSetBalloon -> qemuDomainObjExitMonitor", but it's not an atomic operation. If "virsh destroy [VMName]" happens during this operation, threadB will set the lock vm->privateData->mon to NULL in qemuProcessStop. And then in threadA, the function qemuDomainObjExitMonitor will fail to unlock vm->privateData->mon as it's NULL. So, threadC will never acquire the vm->privateData->mon lock and the deadlock problem happened. what was worse, if qemuMonitorSetBalloon perform succeed in threadA. ThreadA will coutinue to execute till it enter the function qemuMonitorSetDomainLog, it would cause segmentfault at VIR_FORCE_CLOSE(mon->logfd) due to mon is NULL. I could not find a good way to sovle this problem. Does anyone have good ideas? Thanks. Ps: I find an easy way to reproduce this problem more probably by following steps: step 1: Fault Injection, fit into this patch and update the libvirtd on destination host: --- src/qemu/qemu_process.c 2014-05-06 19:06:00.000000000 +0800 +++ src/qemu/qemu_process.c 2014-05-06 19:07:12.000000000 +0800 @@ -4131,6 +4131,8 @@ vm->def->mem.cur_balloon); goto cleanup; } + VIR_DEBUG("Fault Injection, sleep 3 seconds."); + sleep(3); qemuDomainObjEnterMonitor(driver, vm); if (vm->def->memballoon && vm->def->memballoon->period) qemuMonitorSetMemoryStatsPeriod(priv->mon, vm->def->memballoon->period); step 2: migrate VM. step 3: execute "virsh destroy [VMName]" to destroy the migration VM on destination when log prints "Fault Injection, sleep 3 seconds." step 4: the libvirtd deadlock stack occurs as above mentioned. Regards

1 0

[libvirt] Virsh Attach Volume Fails
by Vilobh Meshram 07 May '14

07 May '14

Hi, When trying to attach a created volume to an instance using the virsh utility I am running into this error :- [] $ sudo virsh attach-device instance-00000015 disk.xml error: Failed to attach device from disk.xml error: internal error unable to execute QEMU command '__com.redhat_drive_add': Device 'drive-virtio-disk21' could not be initialized For experimental purpose I have libvirt 0.10.2 and QEMU 0.12.1. The volume to be attached is on a remote storage. Any idea what I might be missing ? Thanks, Vilobh

2 2

[libvirt] [libvirt PATCH] udev: consider the device a CDROM when ID_CDROM=1
by Giuseppe Scrivano 06 May '14

06 May '14

Some CDROM devices are reported by udev to have an ID_TYPE="generic" thus it is necessary to check if ID_CDROM is present. As a side effect, treating ID_TYPE="generic" as a missing ID_TYPE will enable checks for ID_DRIVE_FLASH_SD and ID_DRIVE_FLOPPY and the udevKludgeStorageType heuristic. Signed-off-by: Giuseppe Scrivano <gscrivan(a)redhat.com> --- src/node_device/node_device_udev.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 71b3c79..de1cc67 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1,7 +1,7 @@ /* * node_device_udev.c: node device enumeration - libudev implementation * - * Copyright (C) 2009-2013 Red Hat, Inc. + * Copyright (C) 2009-2014 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 @@ -1093,7 +1093,8 @@ static int udevProcessStorage(struct udev_device *device, if (udevGetStringProperty(device, "ID_TYPE", - &data->storage.drive_type) != PROPERTY_FOUND) { + &data->storage.drive_type) != PROPERTY_FOUND + || STREQ(def->caps->data.storage.drive_type, "generic")) { int tmp_int = 0; /* All floppy drives have the ID_DRIVE_FLOPPY prop. This is @@ -1104,6 +1105,12 @@ static int udevProcessStorage(struct udev_device *device, if (VIR_STRDUP(data->storage.drive_type, "floppy") < 0) goto out; + } else if ((udevGetIntProperty(device, "ID_CDROM", + &tmp_int, 0) == PROPERTY_FOUND) && + (tmp_int == 1)) { + + if (VIR_STRDUP(data->storage.drive_type, "cd") < 0) + goto out; } else if ((udevGetIntProperty(device, "ID_DRIVE_FLASH_SD", &tmp_int, 0) == PROPERTY_FOUND) && (tmp_int == 1)) { -- 1.9.0

3 5

[libvirt] [PATCH] docs: update README-hacking
by Chen Hanxiao 06 May '14

06 May '14

We didn't have "README-valgrind" file now. So remove related description. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- README-hacking | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README-hacking b/README-hacking index 80b022c..4e02fd8 100644 --- a/README-hacking +++ b/README-hacking @@ -15,7 +15,7 @@ Specific development tools and versions will be checked for and listed by the bootstrap script. Valgrind <http://valgrind.org/> is also highly recommended, if -Valgrind supports your architecture. See also README-valgrind. +Valgrind supports your architecture. While building from a just-cloned source tree may require installing a few prerequisites, later, a plain `git pull && make' should be sufficient. -- 1.9.0

3 2

[libvirt] [PATCH] PCI: Introduce new device binding path using pci_dev.driver_override
by Alex Williamson 06 May '14

06 May '14

The driver_override field allows us to specify the driver for a device rather than relying on the driver to provide a positive match of the device. This shortcuts the existing process of looking up the vendor and device ID, adding them to the driver new_id, binding the device, then removing the ID, but it also provides a couple advantages. First, the above existing process allows the driver to bind to any device matching the new_id for the window where it's enabled. This is often not desired, such as the case of trying to bind a single device to a meta driver like pci-stub or vfio-pci. Using driver_override we can do this deterministically using: echo pci-stub > /sys/bus/pci/devices/0000:03:00.0/driver_override echo 0000:03:00.0 > /sys/bus/pci/devices/0000:03:00.0/driver/unbind echo 0000:03:00.0 > /sys/bus/pci/drivers_probe Previously we could not invoke drivers_probe after adding a device to new_id for a driver as we get non-deterministic behavior whether the driver we intend or the standard driver will claim the device. Now it becomes a deterministic process, only the driver matching driver_override will probe the device. To return the device to the standard driver, we simply clear the driver_override and reprobe the device: echo > /sys/bus/pci/devices/0000:03:00.0/preferred_driver echo 0000:03:00.0 > /sys/bus/pci/devices/0000:03:00.0/driver/unbind echo 0000:03:00.0 > /sys/bus/pci/drivers_probe Another advantage to this approach is that we can specify a driver override to force a specific binding or prevent any binding. For instance when an IOMMU group is exposed to userspace through VFIO we require that all devices within that group are owned by VFIO. However, devices can be hot-added into an IOMMU group, in which case we want to prevent the device from binding to any driver (preferred driver = "none") or perhaps have it automatically bind to vfio-pci. With driver_override it's a simple matter for this field to be set internally when the device is first discovered to prevent driver matches. Signed-off-by: Alex Williamson <alex.williamson(a)redhat.com> --- Changes since RFC: - Add ABI documentation (gregkh) - Documentation wording clarification (Christoffer) Nobody puked on the RFC and platform folks have posted a working version of this for platform devices, so I guess the only thing left to do is formally propose this as a new driver binding mechanism. I don't see much incentive to push this into the driver core since the match ultimately needs to be done by the bus driver. I think this is therefore like new_id/remove_id where PCI and USB implement separate, but consistent interfaces. I've pruned the CC list a bit from the RFC, but I've added libvirt folks since I expect they would be the first userspace tool that would adopt this. Thanks, Alex Documentation/ABI/testing/sysfs-bus-pci | 21 ++++++++++++++++ drivers/pci/pci-driver.c | 25 +++++++++++++++++-- drivers/pci/pci-sysfs.c | 40 +++++++++++++++++++++++++++++++ include/linux/pci.h | 1 + 4 files changed, 84 insertions(+), 3 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-bus-pci b/Documentation/ABI/testing/sysfs-bus-pci index a3c5a66..898ddc4 100644 --- a/Documentation/ABI/testing/sysfs-bus-pci +++ b/Documentation/ABI/testing/sysfs-bus-pci @@ -250,3 +250,24 @@ Description: valid. For example, writing a 2 to this file when sriov_numvfs is not 0 and not 2 already will return an error. Writing a 10 when the value of sriov_totalvfs is 8 will return an error. + +What: /sys/bus/pci/devices/.../driver_override +Date: April 2014 +Contact: Alex Williamson <alex.williamson(a)redhat.com> +Description: + This file allows the driver for a device to be specified which + will override standard static and dynamic ID matching. When + specified, only a driver with a name matching the value written + to driver_override will have an opportunity to bind to the + device. The override is specified by writing a string to the + driver_override file (echo pci-stub > driver_override) and + may be cleared with an empty string (echo > driver_override). + This returns the device to standard matching rules binding. + Writing to driver_override does not automatically unbind the + device from its current driver or make any attempt to + automatically load the specified driver. If no driver with a + matching name is currently loaded in the kernel, the device + will not bind to any driver. This also allows devices to + opt-out of driver binding using a driver_override name such as + "none". Only a single driver may be specified in the override, + there is no support for parsing delimiters. diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 25f0bc6..f780eb8 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -216,6 +216,13 @@ const struct pci_device_id *pci_match_id(const struct pci_device_id *ids, return NULL; } +static const struct pci_device_id pci_device_id_any = { + .vendor = PCI_ANY_ID, + .device = PCI_ANY_ID, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, +}; + /** * pci_match_device - Tell if a PCI device structure has a matching PCI device id structure * @drv: the PCI driver to match against @@ -229,18 +236,30 @@ static const struct pci_device_id *pci_match_device(struct pci_driver *drv, struct pci_dev *dev) { struct pci_dynid *dynid; + const struct pci_device_id *found_id = NULL; + + /* When driver_override is set, only bind to the matching driver */ + if (dev->driver_override && strcmp(dev->driver_override, drv->name)) + return NULL; /* Look at the dynamic ids first, before the static ones */ spin_lock(&drv->dynids.lock); list_for_each_entry(dynid, &drv->dynids.list, node) { if (pci_match_one_device(&dynid->id, dev)) { - spin_unlock(&drv->dynids.lock); - return &dynid->id; + found_id = &dynid->id; + break; } } spin_unlock(&drv->dynids.lock); - return pci_match_id(drv->id_table, dev); + if (!found_id) + found_id = pci_match_id(drv->id_table, dev); + + /* driver_override will always match, send a dummy id */ + if (!found_id && dev->driver_override) + found_id = &pci_device_id_any; + + return found_id; } struct drv_dev_and_id { diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index 276ef9c..70cb39d 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -510,6 +510,45 @@ static struct device_attribute sriov_numvfs_attr = sriov_numvfs_show, sriov_numvfs_store); #endif /* CONFIG_PCI_IOV */ +static ssize_t driver_override_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + struct pci_dev *pdev = to_pci_dev(dev); + char *driver_override, *old = pdev->driver_override; + + if (count > PATH_MAX) + return -EINVAL; + + driver_override = kstrndup(buf, count, GFP_KERNEL); + if (!driver_override) + return -ENOMEM; + + while (strlen(driver_override) && + driver_override[strlen(driver_override) - 1] == '\n') + driver_override[strlen(driver_override) - 1] = '\0'; + + if (strlen(driver_override)) { + pdev->driver_override = driver_override; + } else { + kfree(driver_override); + pdev->driver_override = NULL; + } + + kfree(old); + + return count; +} + +static ssize_t driver_override_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct pci_dev *pdev = to_pci_dev(dev); + + return sprintf(buf, "%s\n", pdev->driver_override); +} +static DEVICE_ATTR_RW(driver_override); + static struct attribute *pci_dev_attrs[] = { &dev_attr_resource.attr, &dev_attr_vendor.attr, @@ -532,6 +571,7 @@ static struct attribute *pci_dev_attrs[] = { #if defined(CONFIG_PM_RUNTIME) && defined(CONFIG_ACPI) &dev_attr_d3cold_allowed.attr, #endif + &dev_attr_driver_override.attr, NULL, }; diff --git a/include/linux/pci.h b/include/linux/pci.h index 33aa2ca..6b666af 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -364,6 +364,7 @@ struct pci_dev { #endif phys_addr_t rom; /* Physical address of ROM if it's not from the BAR */ size_t romlen; /* Length of ROM if it's not from the BAR */ + char *driver_override; /* Driver name to force a match */ }; static inline struct pci_dev *pci_physfn(struct pci_dev *dev)

3 4

[libvirt] LSN-2014-0003: Unsafe parsing of XML documents allows arbitrary file read
by Daniel P. Berrange 06 May '14

06 May '14

Libvirt Security Notice: LSN-2014-0003 ====================================== Summary: Unsafe parsing of XML documents allows arbitrary file read Reported on: 20140411 Published on: 20140506 Fixed on: 20140506 Reported by: Daniel P. Berrange <berrange(a)redhat.com> Richard Jones <rjones(a)redhat.com> Patched by: Daniel P. Berrange <berrange(a)redhat.com> See also: CVE-2014-0179 Description ----------- When parsing XML documents, libvirt passes the XML_PARSE_NOENT flag to libxml2 which instructs it to expand all entities in the XML document during parsing. This can be used to insert the contents of host OS files in the resulting parsed content. Although the flaw was introduced in 0.0.5, it was dormant having no ill effects, since the APIs involved all required the user to authenticate with privileges equivalent to root. In version 0.7.5 or later the virConnectCompareCPU / virConnectBaselineCPU methods activate the dormant bug, allowing for denial of service. In version 1.0.0 or later, if the admin opts in to using the new fine grained access control feature, there is potential for unprivileged information disclosure. Impact ------ A malicious user can pass libvirt an XML document which contains an entity that points to an arbitrary file on the host. When libvirt parses this document, it will insert the contents of that host file, which could allow the user to read the contents of files that they otherwise do not have permission to view. It also has the potential to cause a denial of service / indefinite hang of libvirt, if the entity points to a named pipe with no writer connected or certain proc files. If the libvirt installation is not using fine grained access control then virConnectCompareCPU and virConnectBaselineCPU APIs can be used by a read-only user to inflict a denial of service attack. If the libvirt installation is using fine grained access control, then as well as the denial of service attack, one or more of the following APIs can be used for information disclosure of files: virDomainDefineXML, virNetworkCreateXML, virNetworkDefineXML, virStoragePoolCreateXML, virStoragePoolDefineXML, virStorageVolCreateXML, virDomainCreateXML, virNodeDeviceCreateXML, virInterfaceDefineXML, virStorageVolCreateXMLFrom, virConnectDomainXMLFromNative, virConnectDomainXMLToNative, virSecretDefineXML, virNWFilterDefineXML, virDomainSnapshotCreateXML, virDomainSaveImageDefineXML, virDomainCreateXMLWithFiles, virConnectCompareCPU, virConnectBaselineCPU. Workaround ---------- Stop use of the fine grained access control mechanism, and restrict access to all the libvirt TCP/UNIX sockets to only trusted authenticated users. Simply denying access to the affected APIs in the access control policy is insufficient to mitigate the bug, since the XML document typically needs to be parsed before the access control check is applied in order to extra the UUID/name of the object to check. Access to the readonly libvirt socket must also be revoked Affected product ---------------- Name: libvirt Repository: git://libvirt.org/git/libvirt.git http://libvirt.org/git/?p=libvirt.git Branch: master Broken in: v0.7.5 Broken in: v0.7.6 Broken in: v0.7.7 Broken in: v0.8.0 Broken in: v0.8.1 Broken in: v0.8.2 Broken in: v0.8.3 Broken in: v0.8.4 Broken in: v0.8.5 Broken in: v0.8.6 Broken in: v0.8.7 Broken in: v0.8.8 Broken in: v0.9.0 Broken in: v0.9.1 Broken in: v0.9.2 Broken in: v0.9.3 Broken in: v0.9.4 Broken in: v0.9.5 Broken in: v0.9.6 Broken in: v0.9.7 Broken in: v0.9.8 Broken in: v0.9.9 Broken in: v0.9.10 Broken in: v0.9.11 Broken in: v0.9.12 Broken in: v0.9.13 Broken in: v1.0.0 Broken in: v1.0.1 Broken in: v1.0.2 Broken in: v1.0.3 Broken in: v1.0.4 Broken in: v1.0.5 Broken in: v1.0.6 Broken in: v1.1.0 Broken in: v1.1.1 Broken in: v1.1.2 Broken in: v1.1.3 Broken in: v1.1.4 Broken in: v1.2.0 Broken in: v1.2.1 Broken in: v1.2.2 Broken in: v1.2.3 Broken by: 77e8b6c62c48b6346bbdb2df3e0d925852c6bf3e Broken by: 387941fb626d9362835aa216b4a871e18268f649 Broken by: 0b7d2ae653f583825f6d83bfb0744673648a9833 Broken by: ed3bac713c3cfc055ef551cbfe92a061084382c3 Fixed by: d6b27d3e4c40946efa79e91d134616b41b1666c4 Branch: v0.9.6-maint Broken in: v0.9.6.1 Broken in: v0.9.6.2 Broken in: v0.9.6.3 Broken in: v0.9.6.4 Broken by: 77e8b6c62c48b6346bbdb2df3e0d925852c6bf3e Broken by: 387941fb626d9362835aa216b4a871e18268f649 Broken by: 0b7d2ae653f583825f6d83bfb0744673648a9833 Fixed by: be7a5de9d0c406f36efae3230e1743c613ad6945 Branch: v0.9.11-maint Broken in: v0.9.11.1 Broken in: v0.9.11.2 Broken in: v0.9.11.3 Broken in: v0.9.11.4 Broken in: v0.9.11.5 Broken in: v0.9.11.6 Broken in: v0.9.11.7 Broken in: v0.9.11.8 Broken in: v0.9.11.9 Broken in: v0.9.11.10 Broken by: 77e8b6c62c48b6346bbdb2df3e0d925852c6bf3e Broken by: 387941fb626d9362835aa216b4a871e18268f649 Broken by: 0b7d2ae653f583825f6d83bfb0744673648a9833 Branch: v0.9.12-maint Broken in: v0.9.12.1 Broken in: v0.9.12.2 Broken in: v0.9.12.3 Broken by: 77e8b6c62c48b6346bbdb2df3e0d925852c6bf3e Broken by: 387941fb626d9362835aa216b4a871e18268f649 Broken by: 0b7d2ae653f583825f6d83bfb0744673648a9833 Fixed by: 022b34cee73f86b01724b5279cf626df9cca245f Branch: v1.0.5-maint Broken in: v1.0.5.1 Broken in: v1.0.5.2 Broken in: v1.0.5.3 Broken in: v1.0.5.4 Broken in: v1.0.5.5 Broken in: v1.0.5.6 Broken in: v1.0.5.7 Broken in: v1.0.5.8 Broken in: v1.0.5.9 Broken by: 77e8b6c62c48b6346bbdb2df3e0d925852c6bf3e Broken by: 387941fb626d9362835aa216b4a871e18268f649 Broken by: 0b7d2ae653f583825f6d83bfb0744673648a9833 Fixed by: 4410a83e18c1b41f1f5d3f10a0b648fc9304bc35 Branch: v1.1.0-maint Broken by: 77e8b6c62c48b6346bbdb2df3e0d925852c6bf3e Broken by: 387941fb626d9362835aa216b4a871e18268f649 Broken by: 0b7d2ae653f583825f6d83bfb0744673648a9833 Broken by: ed3bac713c3cfc055ef551cbfe92a061084382c3 Fixed by: 6f4eae73a0bf3e1c5e9597e4f9a8078cad69b1e3 Branch: v1.1.1-maint Broken by: 77e8b6c62c48b6346bbdb2df3e0d925852c6bf3e Broken by: 387941fb626d9362835aa216b4a871e18268f649 Broken by: 0b7d2ae653f583825f6d83bfb0744673648a9833 Broken by: ed3bac713c3cfc055ef551cbfe92a061084382c3 Fixed by: cfc94140e5989c9f3cce0fdbb758730818cb2572 Branch: v1.1.2-maint Broken by: 77e8b6c62c48b6346bbdb2df3e0d925852c6bf3e Broken by: 387941fb626d9362835aa216b4a871e18268f649 Broken by: 0b7d2ae653f583825f6d83bfb0744673648a9833 Broken by: ed3bac713c3cfc055ef551cbfe92a061084382c3 Fixed by: 8fd2005cc0594742dc6cfab07a62f9774798a56d Branch: v1.1.3-maint Broken in: v1.1.3.1 Broken in: v1.1.3.2 Broken in: v1.1.3.3 Broken in: v1.1.3.4 Broken by: 77e8b6c62c48b6346bbdb2df3e0d925852c6bf3e Broken by: 387941fb626d9362835aa216b4a871e18268f649 Broken by: 0b7d2ae653f583825f6d83bfb0744673648a9833 Broken by: ed3bac713c3cfc055ef551cbfe92a061084382c3 Fixed by: 46de45d079ae2622660fe147cf237ee617cc461c Branch: v1.1.4-maint Broken by: 77e8b6c62c48b6346bbdb2df3e0d925852c6bf3e Broken by: 387941fb626d9362835aa216b4a871e18268f649 Broken by: 0b7d2ae653f583825f6d83bfb0744673648a9833 Broken by: ed3bac713c3cfc055ef551cbfe92a061084382c3 Fixed by: e2b96d539f8a06e08cdf001627efe3f399db9c07 Branch: v1.2.0-maint Broken by: 77e8b6c62c48b6346bbdb2df3e0d925852c6bf3e Broken by: 387941fb626d9362835aa216b4a871e18268f649 Broken by: 0b7d2ae653f583825f6d83bfb0744673648a9833 Broken by: ed3bac713c3cfc055ef551cbfe92a061084382c3 Fixed by: 9b1d09377492a4ce92498abb7cf830d693bc661c Branch: v1.2.1-maint Broken by: 77e8b6c62c48b6346bbdb2df3e0d925852c6bf3e Broken by: 387941fb626d9362835aa216b4a871e18268f649 Broken by: 0b7d2ae653f583825f6d83bfb0744673648a9833 Broken by: ed3bac713c3cfc055ef551cbfe92a061084382c3 Fixed by: 877388678a77bacf802f97de429b2b350b02eb41 Branch: v1.2.2-maint Broken by: 77e8b6c62c48b6346bbdb2df3e0d925852c6bf3e Broken by: 387941fb626d9362835aa216b4a871e18268f649 Broken by: 0b7d2ae653f583825f6d83bfb0744673648a9833 Broken by: ed3bac713c3cfc055ef551cbfe92a061084382c3 Fixed by: ab07ebeb22b1d724999dc6eabc33cd6266de496f Branch: v1.2.3-maint Broken by: 77e8b6c62c48b6346bbdb2df3e0d925852c6bf3e Broken by: 387941fb626d9362835aa216b4a871e18268f649 Broken by: 0b7d2ae653f583825f6d83bfb0744673648a9833 Broken by: ed3bac713c3cfc055ef551cbfe92a061084382c3 Fixed by: a45368839fb898feb6b634df2bf337697155ea74 Branch: v1.2.4-maint Broken by: 77e8b6c62c48b6346bbdb2df3e0d925852c6bf3e Broken by: 387941fb626d9362835aa216b4a871e18268f649 Broken by: 0b7d2ae653f583825f6d83bfb0744673648a9833 Broken by: ed3bac713c3cfc055ef551cbfe92a061084382c3 Fixed by: a8480e2bc0d0b1c5cd98ff7424cace3e82db5ace Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [PATCH] util: changing all the "enum" structures into typedef's in "src/util/" directory.
by Julio Faracco 06 May '14

06 May '14

In "src/util/" there are many enumeration (enum) structures. Sometimes, it's better using a typedef for variable types, function types and other usages. Other enumeration will be changed to typedef's in the future. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/conf/domain_conf.c | 4 ++-- src/qemu/qemu_command.c | 12 ++++++------ src/qemu/qemu_command.h | 4 ++-- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 16 ++++++++-------- src/qemu/qemu_process.c | 2 +- src/qemu/qemu_process.h | 2 +- src/storage/storage_backend.c | 2 +- src/util/viraudit.c | 2 +- src/util/viraudit.h | 6 +++--- src/util/virfile.c | 4 ++-- src/util/virfile.h | 8 ++++---- src/util/virhook.h | 24 ++++++++++++------------ src/util/virinitctl.h | 5 ++--- src/util/virnetdevmacvlan.c | 10 +++++----- src/util/virnetdevmacvlan.h | 12 ++++++------ src/util/virnetdevvportprofile.c | 4 ++-- src/util/virnetdevvportprofile.h | 8 ++++---- src/util/virnuma.h | 4 ++-- src/util/virseclabel.h | 4 ++-- src/util/virstorageencryption.h | 4 ++-- src/util/virstoragefile.h | 28 ++++++++++++++-------------- src/util/virsysinfo.h | 4 ++-- tests/virstoragetest.c | 2 +- 24 files changed, 86 insertions(+), 87 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c655bcf..402c234 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4972,7 +4972,7 @@ virDomainDiskSourceParse(xmlNodePtr node, memset(&host, 0, sizeof(host)); - switch ((enum virStorageType)src->type) { + switch ((virStorageType)src->type) { case VIR_STORAGE_TYPE_FILE: src->path = virXMLPropString(node, "file"); break; @@ -14847,7 +14847,7 @@ virDomainDiskSourceFormat(virBufferPtr buf, startupPolicy = virDomainStartupPolicyTypeToString(policy); if (src->path || src->nhosts > 0 || src->srcpool || startupPolicy) { - switch ((enum virStorageType)src->type) { + switch ((virStorageType)src->type) { case VIR_STORAGE_TYPE_FILE: virBufferAddLit(buf, "<source"); virBufferEscapeString(buf, " file='%s'", src->path); diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6d80042..474b8db 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -163,7 +163,7 @@ qemuPhysIfaceConnect(virDomainDefPtr def, virQEMUDriverPtr driver, virDomainNetDefPtr net, virQEMUCapsPtr qemuCaps, - enum virNetDevVPortProfileOp vmop) + virNetDevVPortProfileOp vmop) { int rc; char *res_ifname = NULL; @@ -3567,7 +3567,7 @@ qemuNetworkDriveGetPort(int protocol, return ret; } - switch ((enum virStorageNetProtocol) protocol) { + switch ((virStorageNetProtocol) protocol) { case VIR_STORAGE_NET_PROTOCOL_HTTP: return 80; @@ -3618,7 +3618,7 @@ qemuBuildNetworkDriveURI(int protocol, virURIPtr uri = NULL; size_t i; - switch ((enum virStorageNetProtocol) protocol) { + switch ((virStorageNetProtocol) protocol) { case VIR_STORAGE_NET_PROTOCOL_NBD: if (nhosts != 1) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -3856,7 +3856,7 @@ qemuGetDriveSourceString(virStorageSourcePtr src, } } - switch ((enum virStorageType) actualType) { + switch ((virStorageType) actualType) { case VIR_STORAGE_TYPE_BLOCK: case VIR_STORAGE_TYPE_FILE: case VIR_STORAGE_TYPE_DIR: @@ -7509,7 +7509,7 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, virQEMUCapsPtr qemuCaps, int vlan, int bootindex, - enum virNetDevVPortProfileOp vmop, + virNetDevVPortProfileOp vmop, bool standalone) { int ret = -1; @@ -7704,7 +7704,7 @@ qemuBuildCommandLine(virConnectPtr conn, const char *migrateFrom, int migrateFd, virDomainSnapshotObjPtr snapshot, - enum virNetDevVPortProfileOp vmop, + virNetDevVPortProfileOp vmop, qemuBuildCommandLineCallbacksPtr callbacks, bool standalone) { diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 0866c6b..ecd1d45 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -75,7 +75,7 @@ virCommandPtr qemuBuildCommandLine(virConnectPtr conn, const char *migrateFrom, int migrateFd, virDomainSnapshotObjPtr current_snapshot, - enum virNetDevVPortProfileOp vmop, + virNetDevVPortProfileOp vmop, qemuBuildCommandLineCallbacksPtr callbacks, bool forXMLToArgv) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(11); @@ -195,7 +195,7 @@ int qemuPhysIfaceConnect(virDomainDefPtr def, virQEMUDriverPtr driver, virDomainNetDefPtr net, virQEMUCapsPtr qemuCaps, - enum virNetDevVPortProfileOp vmop); + virNetDevVPortProfileOp vmop); int qemuOpenVhostNet(virDomainDefPtr def, virDomainNetDefPtr net, diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ab19738..3345474 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2269,7 +2269,7 @@ qemuDomainCheckDiskPresence(virQEMUDriverPtr driver, for (i = vm->def->ndisks; i > 0; i--) { disk = vm->def->disks[i - 1]; const char *path = virDomainDiskGetSource(disk); - enum virStorageFileFormat format = virDomainDiskGetFormat(disk); + virStorageFileFormat format = virDomainDiskGetFormat(disk); if (!path) continue; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 69a7053..c87ae45 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -12307,13 +12307,13 @@ qemuDomainSnapshotPrepareDiskExternalBackingInactive(virDomainDiskDefPtr disk) { int actualType = virStorageSourceGetActualType(&disk->src); - switch ((enum virStorageType) actualType) { + switch ((virStorageType) actualType) { case VIR_STORAGE_TYPE_BLOCK: case VIR_STORAGE_TYPE_FILE: return 0; case VIR_STORAGE_TYPE_NETWORK: - switch ((enum virStorageNetProtocol) disk->src.protocol) { + switch ((virStorageNetProtocol) disk->src.protocol) { case VIR_STORAGE_NET_PROTOCOL_NBD: case VIR_STORAGE_NET_PROTOCOL_RBD: case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG: @@ -12369,13 +12369,13 @@ qemuDomainSnapshotPrepareDiskExternalOverlayActive(virDomainSnapshotDiskDefPtr d { int actualType = virStorageSourceGetActualType(&disk->src); - switch ((enum virStorageType) actualType) { + switch ((virStorageType) actualType) { case VIR_STORAGE_TYPE_BLOCK: case VIR_STORAGE_TYPE_FILE: return 0; case VIR_STORAGE_TYPE_NETWORK: - switch ((enum virStorageNetProtocol) disk->src.protocol) { + switch ((virStorageNetProtocol) disk->src.protocol) { case VIR_STORAGE_NET_PROTOCOL_GLUSTER: return 0; @@ -12417,7 +12417,7 @@ qemuDomainSnapshotPrepareDiskExternalOverlayInactive(virDomainSnapshotDiskDefPtr { int actualType = virStorageSourceGetActualType(&disk->src); - switch ((enum virStorageType) actualType) { + switch ((virStorageType) actualType) { case VIR_STORAGE_TYPE_BLOCK: case VIR_STORAGE_TYPE_FILE: return 0; @@ -12514,13 +12514,13 @@ qemuDomainSnapshotPrepareDiskInternal(virConnectPtr conn, actualType = virStorageSourceGetActualType(&disk->src); - switch ((enum virStorageType) actualType) { + switch ((virStorageType) actualType) { case VIR_STORAGE_TYPE_BLOCK: case VIR_STORAGE_TYPE_FILE: return 0; case VIR_STORAGE_TYPE_NETWORK: - switch ((enum virStorageNetProtocol) disk->src.protocol) { + switch ((virStorageNetProtocol) disk->src.protocol) { case VIR_STORAGE_NET_PROTOCOL_NBD: case VIR_STORAGE_NET_PROTOCOL_RBD: case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG: @@ -12747,7 +12747,7 @@ qemuDomainSnapshotCreateSingleDiskActive(virQEMUDriverPtr driver, VIR_STRDUP(persistSource, snap->src.path) < 0) goto cleanup; - switch ((enum virStorageType)snap->src.type) { + switch ((virStorageType)snap->src.type) { case VIR_STORAGE_TYPE_BLOCK: reuse = true; /* fallthrough */ diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 0afad9d..bfabbc5 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3606,7 +3606,7 @@ int qemuProcessStart(virConnectPtr conn, int stdin_fd, const char *stdin_path, virDomainSnapshotObjPtr snapshot, - enum virNetDevVPortProfileOp vmop, + virNetDevVPortProfileOp vmop, unsigned int flags) { int ret; diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index 4176815..d99978f 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -57,7 +57,7 @@ int qemuProcessStart(virConnectPtr conn, int stdin_fd, const char *stdin_path, virDomainSnapshotObjPtr snapshot, - enum virNetDevVPortProfileOp vmop, + virNetDevVPortProfileOp vmop, unsigned int flags); typedef enum { diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 946196b..5eec90d 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -736,7 +736,7 @@ virStorageBackendCreateQemuImgOpts(char **opts, for (i = 0; i < VIR_STORAGE_FILE_FEATURE_LAST; i++) { ignore_value(virBitmapGetBit(features, i, &b)); if (b) { - switch ((enum virStorageFileFeature) i) { + switch ((virStorageFileFeature) i) { case VIR_STORAGE_FILE_FEATURE_LAZY_REFCOUNTS: if (STREQ_NULLABLE(compat, "0.10")) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, diff --git a/src/util/viraudit.c b/src/util/viraudit.c index 33ed2f6..8023c60 100644 --- a/src/util/viraudit.c +++ b/src/util/viraudit.c @@ -82,7 +82,7 @@ void virAuditSend(virLogSourcePtr source, const char *funcname, const char *clienttty ATTRIBUTE_UNUSED, const char *clientaddr ATTRIBUTE_UNUSED, - enum virAuditRecordType type ATTRIBUTE_UNUSED, bool success, + virAuditRecordType type ATTRIBUTE_UNUSED, bool success, const char *fmt, ...) { char *str = NULL; diff --git a/src/util/viraudit.h b/src/util/viraudit.h index cf3da6c..8101e50 100644 --- a/src/util/viraudit.h +++ b/src/util/viraudit.h @@ -26,11 +26,11 @@ # include "internal.h" # include "virlog.h" -enum virAuditRecordType { +typedef enum { VIR_AUDIT_RECORD_MACHINE_CONTROL, VIR_AUDIT_RECORD_MACHINE_ID, VIR_AUDIT_RECORD_RESOURCE, -}; +} virAuditRecordType; int virAuditOpen(void); @@ -39,7 +39,7 @@ void virAuditLog(int enabled); void virAuditSend(virLogSourcePtr source, const char *filename, size_t linenr, const char *funcname, const char *clienttty, const char *clientaddr, - enum virAuditRecordType type, bool success, + virAuditRecordType type, bool success, const char *fmt, ...) ATTRIBUTE_FMT_PRINTF(9, 10); diff --git a/src/util/virfile.c b/src/util/virfile.c index da4e0a0..dc2f2b2 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -818,7 +818,7 @@ virFileNBDDeviceFindUnused(void) int virFileNBDDeviceAssociate(const char *file, - enum virStorageFileFormat fmt, + virStorageFileFormat fmt, bool readonly, char **dev) { @@ -887,7 +887,7 @@ int virFileLoopDeviceAssociate(const char *file, } int virFileNBDDeviceAssociate(const char *file, - enum virStorageFileFormat fmt ATTRIBUTE_UNUSED, + virStorageFileFormat fmt ATTRIBUTE_UNUSED, bool readonly ATTRIBUTE_UNUSED, char **dev ATTRIBUTE_UNUSED) { diff --git a/src/util/virfile.h b/src/util/virfile.h index 5d0d699..25678df 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -31,7 +31,7 @@ # include "internal.h" # include "virstoragefile.h" -typedef enum virFileCloseFlags { +typedef enum { VIR_FILE_CLOSE_PRESERVE_ERRNO = 1 << 0, VIR_FILE_CLOSE_IGNORE_EBADF = 1 << 1, VIR_FILE_CLOSE_DONT_LOG = 1 << 2, @@ -83,10 +83,10 @@ typedef virFileWrapperFd *virFileWrapperFdPtr; int virFileDirectFdFlag(void); -enum virFileWrapperFdFlags { +typedef enum { VIR_FILE_WRAPPER_BYPASS_CACHE = (1 << 0), VIR_FILE_WRAPPER_NON_BLOCKING = (1 << 1), -}; +} virFileWrapperFdFlags; virFileWrapperFdPtr virFileWrapperFdNew(int *fd, const char *name, @@ -116,7 +116,7 @@ int virFileLoopDeviceAssociate(const char *file, char **dev); int virFileNBDDeviceAssociate(const char *file, - enum virStorageFileFormat fmt, + virStorageFileFormat fmt, bool readonly, char **dev); diff --git a/src/util/virhook.h b/src/util/virhook.h index 7b09ac5..5bc0a5f 100644 --- a/src/util/virhook.h +++ b/src/util/virhook.h @@ -26,32 +26,32 @@ # include "internal.h" -enum virHookDriverType { +typedef enum { VIR_HOOK_DRIVER_DAEMON = 0, /* Daemon related events */ VIR_HOOK_DRIVER_QEMU, /* QEmu domains related events */ VIR_HOOK_DRIVER_LXC, /* LXC domains related events */ VIR_HOOK_DRIVER_NETWORK, /* network related events */ VIR_HOOK_DRIVER_LAST, -}; +} virHookDriverType; -enum virHookDaemonOpType { +typedef enum { VIR_HOOK_DAEMON_OP_START, /* daemon is about to start */ VIR_HOOK_DAEMON_OP_SHUTDOWN, /* daemon is about to shutdown */ VIR_HOOK_DAEMON_OP_RELOAD, /* driver reload with SIGHUP */ VIR_HOOK_DAEMON_OP_LAST, -}; +} virHookDaemonOpType; -enum virHookSubopType { +typedef enum { VIR_HOOK_SUBOP_NONE, /* no sub-operation */ VIR_HOOK_SUBOP_BEGIN, /* beginning of the operation */ VIR_HOOK_SUBOP_END, /* end of the operation */ VIR_HOOK_SUBOP_LAST, -}; +} virHookSubopType; -enum virHookQemuOpType { +typedef enum { VIR_HOOK_QEMU_OP_START, /* domain is about to start */ VIR_HOOK_QEMU_OP_STOPPED, /* domain has stopped */ VIR_HOOK_QEMU_OP_PREPARE, /* domain startup initiated */ @@ -62,9 +62,9 @@ enum virHookQemuOpType { VIR_HOOK_QEMU_OP_ATTACH, /* domain is being attached to be libvirt */ VIR_HOOK_QEMU_OP_LAST, -}; +} virHookQemuOpType; -enum virHookLxcOpType { +typedef enum { VIR_HOOK_LXC_OP_START, /* domain is about to start */ VIR_HOOK_LXC_OP_STOPPED, /* domain has stopped */ VIR_HOOK_LXC_OP_PREPARE, /* domain startup initiated */ @@ -73,9 +73,9 @@ enum virHookLxcOpType { VIR_HOOK_LXC_OP_RECONNECT, /* domain is being reconnected by libvirt */ VIR_HOOK_LXC_OP_LAST, -}; +} virHookLxcOpType; -enum virHookNetworkOpType { +typedef enum { VIR_HOOK_NETWORK_OP_START, /* network is about to start */ VIR_HOOK_NETWORK_OP_STARTED, /* network has start */ VIR_HOOK_NETWORK_OP_STOPPED, /* network has stopped */ @@ -83,7 +83,7 @@ enum virHookNetworkOpType { VIR_HOOK_NETWORK_OP_IFACE_UNPLUGGED, /* an interface was unplugged from the network */ VIR_HOOK_NETWORK_OP_LAST, -}; +} virHookNetworkOpType; int virHookInitialize(void); diff --git a/src/util/virinitctl.h b/src/util/virinitctl.h index 6aeb1a6..75a9a50 100644 --- a/src/util/virinitctl.h +++ b/src/util/virinitctl.h @@ -24,8 +24,7 @@ #ifndef __VIR_INITCTL_H__ # define __VIR_INITCTL_H__ -typedef enum virInitctlRunLevel virInitctlRunLevel; -enum virInitctlRunLevel { +typedef enum { VIR_INITCTL_RUNLEVEL_POWEROFF = 0, VIR_INITCTL_RUNLEVEL_1 = 1, VIR_INITCTL_RUNLEVEL_2 = 2, @@ -35,7 +34,7 @@ enum virInitctlRunLevel { VIR_INITCTL_RUNLEVEL_REBOOT = 6, VIR_INITCTL_RUNLEVEL_LAST -}; +} virInitctlRunLevel; int virInitctlSetRunLevel(virInitctlRunLevel level); diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 7bbf540..56a5f6b 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -434,7 +434,7 @@ struct virNetlinkCallbackData { char *linkdev; int vf; unsigned char vmuuid[VIR_UUID_BUFLEN]; - enum virNetDevVPortProfileOp vmOp; + virNetDevVPortProfileOp vmOp; unsigned int linkState; }; @@ -748,7 +748,7 @@ virNetDevMacVLanVPortProfileRegisterCallback(const char *ifname, const char *linkdev, const unsigned char *vmuuid, virNetDevVPortProfilePtr virtPortProfile, - enum virNetDevVPortProfileOp vmOp) + virNetDevVPortProfileOp vmOp) { virNetlinkCallbackDataPtr calld = NULL; @@ -803,13 +803,13 @@ virNetDevMacVLanVPortProfileRegisterCallback(const char *ifname, int virNetDevMacVLanCreateWithVPortProfile(const char *tgifname, const virMacAddr *macaddress, const char *linkdev, - enum virNetDevMacVLanMode mode, + virNetDevMacVLanMode mode, bool withTap, int vnet_hdr, const unsigned char *vmuuid, virNetDevVPortProfilePtr virtPortProfile, char **res_ifname, - enum virNetDevVPortProfileOp vmOp, + virNetDevVPortProfileOp vmOp, char *stateDir, virNetDevBandwidthPtr bandwidth) { @@ -1022,7 +1022,7 @@ int virNetDevMacVLanRestartWithVPortProfile(const char *cr_ifname, const char *linkdev, const unsigned char *vmuuid, virNetDevVPortProfilePtr virtPortProfile, - enum virNetDevVPortProfileOp vmOp) + virNetDevVPortProfileOp vmOp) { int rc = 0; diff --git a/src/util/virnetdevmacvlan.h b/src/util/virnetdevmacvlan.h index 225ddba..9b15a31 100644 --- a/src/util/virnetdevmacvlan.h +++ b/src/util/virnetdevmacvlan.h @@ -30,14 +30,14 @@ # include "virnetdevvportprofile.h" /* the mode type for macvtap devices */ -enum virNetDevMacVLanMode { +typedef enum { VIR_NETDEV_MACVLAN_MODE_VEPA, VIR_NETDEV_MACVLAN_MODE_PRIVATE, VIR_NETDEV_MACVLAN_MODE_BRIDGE, VIR_NETDEV_MACVLAN_MODE_PASSTHRU, VIR_NETDEV_MACVLAN_MODE_LAST, -}; +} virNetDevMacVLanMode; VIR_ENUM_DECL(virNetDevMacVLanMode) int virNetDevMacVLanCreate(const char *ifname, @@ -55,13 +55,13 @@ int virNetDevMacVLanDelete(const char *ifname) int virNetDevMacVLanCreateWithVPortProfile(const char *ifname, const virMacAddr *macaddress, const char *linkdev, - enum virNetDevMacVLanMode mode, + virNetDevMacVLanMode mode, bool withTap, int vnet_hdr, const unsigned char *vmuuid, virNetDevVPortProfilePtr virtPortProfile, char **res_ifname, - enum virNetDevVPortProfileOp vmop, + virNetDevVPortProfileOp vmop, char *stateDir, virNetDevBandwidthPtr bandwidth) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(7) @@ -81,7 +81,7 @@ int virNetDevMacVLanRestartWithVPortProfile(const char *cr_ifname, const char *linkdev, const unsigned char *vmuuid, virNetDevVPortProfilePtr virtPortProfile, - enum virNetDevVPortProfileOp vmOp) + virNetDevVPortProfileOp vmOp) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK; @@ -90,7 +90,7 @@ int virNetDevMacVLanVPortProfileRegisterCallback(const char *ifname, const char *linkdev, const unsigned char *vmuuid, virNetDevVPortProfilePtr virtPortProfile, - enum virNetDevVPortProfileOp vmOp) + virNetDevVPortProfileOp vmOp) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK; #endif /* __UTIL_MACVTAP_H__ */ diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c index 8977275..7354b2c 100644 --- a/src/util/virnetdevvportprofile.c +++ b/src/util/virnetdevvportprofile.c @@ -1139,7 +1139,7 @@ virNetDevVPortProfileAssociate(const char *macvtap_ifname, const char *linkdev, int vf, const unsigned char *vmuuid, - enum virNetDevVPortProfileOp vmOp, + virNetDevVPortProfileOp vmOp, bool setlink_only) { int rc = 0; @@ -1202,7 +1202,7 @@ virNetDevVPortProfileDisassociate(const char *macvtap_ifname, const virMacAddr *macvtap_macaddr, const char *linkdev, int vf, - enum virNetDevVPortProfileOp vmOp) + virNetDevVPortProfileOp vmOp) { int rc = 0; diff --git a/src/util/virnetdevvportprofile.h b/src/util/virnetdevvportprofile.h index 3febf3a..ad063c5 100644 --- a/src/util/virnetdevvportprofile.h +++ b/src/util/virnetdevvportprofile.h @@ -40,7 +40,7 @@ enum virNetDevVPortProfile { }; VIR_ENUM_DECL(virNetDevVPort) -enum virNetDevVPortProfileOp { +typedef enum { VIR_NETDEV_VPORT_PROFILE_OP_CREATE, VIR_NETDEV_VPORT_PROFILE_OP_SAVE, VIR_NETDEV_VPORT_PROFILE_OP_RESTORE, @@ -51,7 +51,7 @@ enum virNetDevVPortProfileOp { VIR_NETDEV_VPORT_PROFILE_OP_NO_OP, VIR_NETDEV_VPORT_PROFILE_OP_LAST -}; +} virNetDevVPortProfileOp; VIR_ENUM_DECL(virNetDevVPortProfileOp) /* profile data for macvtap (VEPA) and openvswitch */ @@ -98,7 +98,7 @@ int virNetDevVPortProfileAssociate(const char *ifname, const char *linkdev, int vf, const unsigned char *vmuuid, - enum virNetDevVPortProfileOp vmOp, + virNetDevVPortProfileOp vmOp, bool setlink_only) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(6) ATTRIBUTE_RETURN_CHECK; @@ -108,7 +108,7 @@ int virNetDevVPortProfileDisassociate(const char *ifname, const virMacAddr *macaddr, const char *linkdev, int vf, - enum virNetDevVPortProfileOp vmOp) + virNetDevVPortProfileOp vmOp) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK; diff --git a/src/util/virnuma.h b/src/util/virnuma.h index eee0225..8464b19 100644 --- a/src/util/virnuma.h +++ b/src/util/virnuma.h @@ -26,13 +26,13 @@ # include "virbitmap.h" # include "virutil.h" -enum virNumaTuneMemPlacementMode { +typedef enum { VIR_NUMA_TUNE_MEM_PLACEMENT_MODE_DEFAULT = 0, VIR_NUMA_TUNE_MEM_PLACEMENT_MODE_STATIC, VIR_NUMA_TUNE_MEM_PLACEMENT_MODE_AUTO, VIR_NUMA_TUNE_MEM_PLACEMENT_MODE_LAST -}; +} virNumaTuneMemPlacementMode; VIR_ENUM_DECL(virNumaTuneMemPlacementMode) diff --git a/src/util/virseclabel.h b/src/util/virseclabel.h index 41b90bc..9e970a5 100644 --- a/src/util/virseclabel.h +++ b/src/util/virseclabel.h @@ -22,14 +22,14 @@ #ifndef __SECLABEL_H # define __SECLABEL_H -enum virDomainSeclabelType { +typedef enum { VIR_DOMAIN_SECLABEL_DEFAULT, VIR_DOMAIN_SECLABEL_NONE, VIR_DOMAIN_SECLABEL_DYNAMIC, VIR_DOMAIN_SECLABEL_STATIC, VIR_DOMAIN_SECLABEL_LAST -}; +} virDomainSeclabelType; /* Security configuration for domain */ typedef struct _virSecurityLabelDef virSecurityLabelDef; diff --git a/src/util/virstorageencryption.h b/src/util/virstorageencryption.h index 03c38a5..bf83d34 100644 --- a/src/util/virstorageencryption.h +++ b/src/util/virstorageencryption.h @@ -29,11 +29,11 @@ # include <libxml/tree.h> -enum virStorageEncryptionSecretType { +typedef enum { VIR_STORAGE_ENCRYPTION_SECRET_TYPE_PASSPHRASE = 0, VIR_STORAGE_ENCRYPTION_SECRET_TYPE_LAST -}; +} virStorageEncryptionSecretType; VIR_ENUM_DECL(virStorageEncryptionSecretType) typedef struct _virStorageEncryptionSecret virStorageEncryptionSecret; diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index 148776e..8d6e610 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -42,7 +42,7 @@ * virStorageVolType, except we have an undetermined state, don't have * a netdir type, and add a volume type for reference through a * storage pool. */ -enum virStorageType { +typedef enum { VIR_STORAGE_TYPE_NONE, VIR_STORAGE_TYPE_FILE, VIR_STORAGE_TYPE_BLOCK, @@ -51,12 +51,12 @@ enum virStorageType { VIR_STORAGE_TYPE_VOLUME, VIR_STORAGE_TYPE_LAST -}; +} virStorageType; VIR_ENUM_DECL(virStorage) -enum virStorageFileFormat { +typedef enum { VIR_STORAGE_FILE_AUTO_SAFE = -2, VIR_STORAGE_FILE_AUTO = -1, VIR_STORAGE_FILE_NONE = 0, @@ -84,15 +84,15 @@ enum virStorageFileFormat { VIR_STORAGE_FILE_VMDK, VIR_STORAGE_FILE_LAST, -}; +} virStorageFileFormat; VIR_ENUM_DECL(virStorageFileFormat); -enum virStorageFileFeature { +typedef enum { VIR_STORAGE_FILE_FEATURE_LAZY_REFCOUNTS = 0, VIR_STORAGE_FILE_FEATURE_LAST -}; +} virStorageFileFeature; VIR_ENUM_DECL(virStorageFileFeature); @@ -117,7 +117,7 @@ struct _virStorageTimestamps { /* Information related to network storage */ -enum virStorageNetProtocol { +typedef enum { VIR_STORAGE_NET_PROTOCOL_NBD, VIR_STORAGE_NET_PROTOCOL_RBD, VIR_STORAGE_NET_PROTOCOL_SHEEPDOG, @@ -130,18 +130,18 @@ enum virStorageNetProtocol { VIR_STORAGE_NET_PROTOCOL_TFTP, VIR_STORAGE_NET_PROTOCOL_LAST -}; +} virStorageNetProtocol; VIR_ENUM_DECL(virStorageNetProtocol) -enum virStorageNetHostTransport { +typedef enum { VIR_STORAGE_NET_HOST_TRANS_TCP, VIR_STORAGE_NET_HOST_TRANS_UNIX, VIR_STORAGE_NET_HOST_TRANS_RDMA, VIR_STORAGE_NET_HOST_TRANS_LAST -}; +} virStorageNetHostTransport; VIR_ENUM_DECL(virStorageNetHostTransport) @@ -160,7 +160,7 @@ struct _virStorageNetHostDef { * Used for volume "type" disk to indicate how to represent * the disk source if the specified "pool" is of iscsi type. */ -enum virStorageSourcePoolMode { +typedef enum { VIR_STORAGE_SOURCE_POOL_MODE_DEFAULT = 0, /* Use the path as it shows up on host, e.g. @@ -174,7 +174,7 @@ enum virStorageSourcePoolMode { VIR_STORAGE_SOURCE_POOL_MODE_DIRECT, VIR_STORAGE_SOURCE_POOL_MODE_LAST -}; +} virStorageSourcePoolMode; VIR_ENUM_DECL(virStorageSourcePoolMode) @@ -190,13 +190,13 @@ struct _virStorageSourcePoolDef { typedef virStorageSourcePoolDef *virStorageSourcePoolDefPtr; -enum virStorageSecretType { +typedef enum { VIR_STORAGE_SECRET_TYPE_NONE, VIR_STORAGE_SECRET_TYPE_UUID, VIR_STORAGE_SECRET_TYPE_USAGE, VIR_STORAGE_SECRET_TYPE_LAST -}; +} virStorageSecretType; typedef struct _virStorageDriverData virStorageDriverData; typedef virStorageDriverData *virStorageDriverDataPtr; diff --git a/src/util/virsysinfo.h b/src/util/virsysinfo.h index fbb505b..6236ca6 100644 --- a/src/util/virsysinfo.h +++ b/src/util/virsysinfo.h @@ -28,11 +28,11 @@ # include "virutil.h" # include "virbuffer.h" -enum virSysinfoType { +typedef enum { VIR_SYSINFO_SMBIOS, VIR_SYSINFO_LAST -}; +} virSysinfoType; typedef struct _virSysinfoProcessorDef virSysinfoProcessorDef; typedef virSysinfoProcessorDef *virSysinfoProcessorDefPtr; diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index 018469a..d49098e 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -294,7 +294,7 @@ enum { struct testChainData { const char *start; - enum virStorageFileFormat format; + virStorageFileFormat format; const testFileData *files[4]; int nfiles; unsigned int flags; -- 1.7.10.4

2 4

[libvirt] [PATCH 1/5] conf: changing all the "enum" structures into typedef's in "src/conf/" directory.
by Julio Faracco 06 May '14

06 May '14

In "src/conf/" there are many enumeration (enum) structures like "src/util" directory. Sometimes, it's better using a typedef for variable types, function types and other usages. Other enumeration and folders will be changed to typedef's in the future. Most of the files changed in this commit included CPU (cpu_conf) enum structures. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/conf/cpu_conf.c | 2 +- src/conf/cpu_conf.h | 22 +++++++++++----------- src/conf/device_conf.h | 4 ++-- src/cpu/cpu_powerpc.c | 2 +- src/cpu/cpu_x86.c | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index a8b1b03..ebdaa19 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -176,7 +176,7 @@ virCPUDefCopy(const virCPUDef *cpu) virCPUDefPtr virCPUDefParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt, - enum virCPUType mode) + virCPUType mode) { virCPUDefPtr def; xmlNodePtr *nodes = NULL; diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h index dbe7103..8c932ce 100644 --- a/src/conf/cpu_conf.h +++ b/src/conf/cpu_conf.h @@ -32,46 +32,46 @@ # define VIR_CPU_VENDOR_ID_LENGTH 12 -enum virCPUType { +typedef enum { VIR_CPU_TYPE_HOST, VIR_CPU_TYPE_GUEST, VIR_CPU_TYPE_AUTO, VIR_CPU_TYPE_LAST -}; +} virCPUType; VIR_ENUM_DECL(virCPU) -enum virCPUMode { +typedef enum { VIR_CPU_MODE_CUSTOM, VIR_CPU_MODE_HOST_MODEL, VIR_CPU_MODE_HOST_PASSTHROUGH, VIR_CPU_MODE_LAST -}; +} virCPUMode; VIR_ENUM_DECL(virCPUMode) -enum virCPUMatch { +typedef enum { VIR_CPU_MATCH_MINIMUM, VIR_CPU_MATCH_EXACT, VIR_CPU_MATCH_STRICT, VIR_CPU_MATCH_LAST -}; +} virCPUMatch; VIR_ENUM_DECL(virCPUMatch) -enum virCPUFallback { +typedef enum { VIR_CPU_FALLBACK_ALLOW, VIR_CPU_FALLBACK_FORBID, VIR_CPU_FALLBACK_LAST -}; +} virCPUFallback; VIR_ENUM_DECL(virCPUFallback) -enum virCPUFeaturePolicy { +typedef enum { VIR_CPU_FEATURE_FORCE, VIR_CPU_FEATURE_REQUIRE, VIR_CPU_FEATURE_OPTIONAL, @@ -79,7 +79,7 @@ enum virCPUFeaturePolicy { VIR_CPU_FEATURE_FORBID, VIR_CPU_FEATURE_LAST -}; +} virCPUFeaturePolicy; VIR_ENUM_DECL(virCPUFeaturePolicy) @@ -140,7 +140,7 @@ virCPUDefCopy(const virCPUDef *cpu); virCPUDefPtr virCPUDefParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt, - enum virCPUType mode); + virCPUType mode); bool virCPUDefIsEqual(virCPUDefPtr src, diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h index 7986ca6..d66afd2 100644 --- a/src/conf/device_conf.h +++ b/src/conf/device_conf.h @@ -32,13 +32,13 @@ # include "virthread.h" # include "virbuffer.h" -enum virDeviceAddressPCIMulti { +typedef enum { VIR_DEVICE_ADDRESS_PCI_MULTI_DEFAULT = 0, VIR_DEVICE_ADDRESS_PCI_MULTI_ON, VIR_DEVICE_ADDRESS_PCI_MULTI_OFF, VIR_DEVICE_ADDRESS_PCI_MULTI_LAST -}; +} virDeviceAddressPCIMulti; typedef struct _virDevicePCIAddress virDevicePCIAddress; typedef virDevicePCIAddress *virDevicePCIAddressPtr; diff --git a/src/cpu/cpu_powerpc.c b/src/cpu/cpu_powerpc.c index 3b868bb..372272f 100644 --- a/src/cpu/cpu_powerpc.c +++ b/src/cpu/cpu_powerpc.c @@ -534,7 +534,7 @@ static int ppcUpdate(virCPUDefPtr guest, const virCPUDef *host) { - switch ((enum virCPUMode) guest->mode) { + switch ((virCPUMode) guest->mode) { case VIR_CPU_MODE_HOST_MODEL: case VIR_CPU_MODE_HOST_PASSTHROUGH: guest->match = VIR_CPU_MATCH_EXACT; diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 7328582..06fbfba 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -1615,7 +1615,7 @@ x86DecodeCPUData(virCPUDefPtr cpu, static virCPUx86Data * x86EncodePolicy(const virCPUDef *cpu, const struct x86_map *map, - enum virCPUFeaturePolicy policy) + virCPUFeaturePolicy policy) { struct x86_model *model; virCPUx86Data *data = NULL; @@ -2045,7 +2045,7 @@ static int x86Update(virCPUDefPtr guest, const virCPUDef *host) { - switch ((enum virCPUMode) guest->mode) { + switch ((virCPUMode) guest->mode) { case VIR_CPU_MODE_CUSTOM: return x86UpdateCustom(guest, host); -- 1.7.10.4

2 8

[libvirt] [PATCH] spec: Don't install nonexistent test_libvirt_lockd.aug
by Jiri Denemark 06 May '14

06 May '14

test_libvirt_lockd.aug is only generated when qemu driver is enabled. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- libvirt.spec.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 84d5bf3..ae40e0e 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1878,7 +1878,9 @@ exit 0 %{_datadir}/augeas/lenses/virtlockd.aug %{_datadir}/augeas/lenses/tests/test_virtlockd.aug %{_datadir}/augeas/lenses/libvirt_lockd.aug + %if %{with_qemu} %{_datadir}/augeas/lenses/tests/test_libvirt_lockd.aug + %endif %if %{with_polkit} %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 -- 1.9.2

2 2

[libvirt] [PATCH] spec: sanlock is x86_64 only on RHEL
by Jiri Denemark 06 May '14

06 May '14

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- libvirt.spec.in | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index aeccf4f..84d5bf3 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -262,16 +262,11 @@ %endif # Enable sanlock library for lock management with QEMU -# Sanlock is available only on i686 x86_64 for RHEL +# Sanlock is available only on x86_64 for RHEL %if 0%{?fedora} >= 16 %define with_sanlock 0%{!?_without_sanlock:%{server_drivers}} %endif -%if 0%{?rhel} == 6 - %ifarch %{ix86} x86_64 - %define with_sanlock 0%{!?_without_sanlock:%{server_drivers}} - %endif -%endif -%if 0%{?rhel} >= 7 +%if 0%{?rhel} >= 6 %ifarch x86_64 %define with_sanlock 0%{!?_without_sanlock:%{server_drivers}} %endif -- 1.9.2

2 2

[libvirt] [PATCH 0/2] qemu: support pci passthrough of devices in non-0 domain
by Laine Stump 06 May '14

06 May '14

qemu added support for this somewhere between 0.12 and 0.13, but libvirt never caught wind of it, so we've been ignoring the domain for all this time (not too surprising, since a non-0 PCI domain is very rare). Laine Stump (2): qemu: add host-pci-multidomain capability qemu: specify domain in host-side PCI addresses when needed/supported src/qemu/qemu_capabilities.c | 4 +++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 13 ++++++- tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + tests/qemuhelptest.c | 3 +- .../qemuxml2argv-hostdev-vfio-multidomain.args | 6 ++++ .../qemuxml2argv-hostdev-vfio-multidomain.xml | 33 +++++++++++++++++ .../qemuxml2argv-net-hostdev-multidomain.args | 7 ++++ .../qemuxml2argv-net-hostdev-multidomain.xml | 40 +++++++++++++++++++++ .../qemuxml2argv-net-hostdev-vfio-multidomain.args | 7 ++++ .../qemuxml2argv-net-hostdev-vfio-multidomain.xml | 41 ++++++++++++++++++++++ .../qemuxml2argv-net-hostdev-vfio.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-net-hostdev.xml | 2 +- tests/qemuxml2argvtest.c | 18 ++++++++++ 19 files changed, 179 insertions(+), 4 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio-multidomain.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio-multidomain.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-multidomain.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-multidomain.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio-multidomain.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio-multidomain.xml -- 1.9.0

3 9

[libvirt] lxc: shutdown $domain broken in 1.2.2
by Stephan Sachse 06 May '14

06 May '14

host: centos-6.5 kernel: 3.13.2-4.el6.x86_64 guest: fedora20 since libvirt-1.2.2 i can not shutdown this domain. works fine with libvirt-1.2.1 # virsh shutdown fedora2 error: Failed to shutdown domain fedora2 error: Mount namespaces are not available on this platform: Function not implemented from the logfile: 14478: error : virProcessRunInMountNamespace:982 : Mount namespaces are not available on this platform: Function not implemented the buildhost for the rpm is a centos-6.5 system with kernel 3.1.8 (dont ask! its a vserver system) and the test for "setns" failed configure:9592: checking for setns configure:9592: gcc -std=gnu99 -o conftest -g -O2 conftest.c >&5 /tmp/cchlir6v.o: In function `main': /builddir/build/BUILD/libvirt-1.2.2/conftest.c:184: undefined reference to `setns' collect2: ld returned 1 exit status setns() was added in glibc-2.14 centos6 has glibc-2.12 attached is a fix for this problem. stolen from: http://cgit.freedesktop.org/systemd/systemd/commit/src/shared/missing.h?id=… /stephan -- Software is like sex, it's better when it's free!

2 1

[libvirt] Request for Wiki editing access
by James Thornsberry 06 May '14

06 May '14

To whom it may concern, I’m just beginning to use the libvirt suite of tools and, in going through your wiki, I’ve found a couple of minor things (mostly typos) that I would immediately correct. Also, if I get my project up, I may be able to provide some less-trivial examples of network setup xml as well. Please feel free to NOT forward this email after moderation as it will likely be of little interest to the group at large. ;-) Thanks, Jim Thornsberry

2 1

[libvirt] [libvirt-python PATCH] Bump version to 1.2.5 for new dev cycle
by Martin Kletzander 06 May '14

06 May '14

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: I'm not sure whether this can be pushed automatically as there is no "release", just a tag in the repo. However, libvirt-python fails to install without this commit on my machine. setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index f4c05ca..75f30b3 100755 --- a/setup.py +++ b/setup.py @@ -309,7 +309,7 @@ class my_clean(clean): _c_modules, _py_modules = get_module_lists() setup(name = 'libvirt-python', - version = '1.2.4', + version = '1.2.5', url = 'http://www.libvirt.org', maintainer = 'Libvirt Maintainers', maintainer_email = 'libvir-list(a)redhat.com', -- 1.9.2

2 1

[libvirt] [PATCH v3 0/3] bhyve: implement PCI address allocation
by Roman Bogorodskiy 06 May '14

06 May '14

The first attempt to share PCI allocation code from qemu driver with bhyve. To this point it went pretty smooth and I didn't have to make any changes to the implementation of the extracted PCI code. The only slight change I made is extracing virDomainPCIAddressSetAlloc() from DomainPCIAddressSetCreate() to perform the actual memory allocation, just because having virDomainPCIAddressSetFree() without Alloc() felt a little inconsistent. During testing I spotted only one problem (so far): the domain defined on libvirtd without new PCI allocation doesn't start on a new version because the definition didn't have addresses auto-assigned. Also, I guess, there could be cases where bhyve code will trigger something from PCI allocation code that is not supported by bhyve (e.g.: pci bridge). I'm not sure how to properly test all the cases like that. Changes from v2: - Base on PCI allocation code from Qemu driver Changes from v1: - Reserve slot 1 for LPC PCI-ISA bridge, used by console device - Respect addresses provided by user in domain xml file - Fix tests so 'make check' passes Roman Bogorodskiy (3): qemu: extract PCI handling structs qemu: extract common PCI handling functions bhyve: implement PCI address allocation Roman Bogorodskiy (3): qemu: extract PCI handling structs qemu: extract common PCI handling functions bhyve: implement PCI address allocation po/POTFILES.in | 1 + src/Makefile.am | 6 +- src/bhyve/bhyve_command.c | 131 ++-- src/bhyve/bhyve_device.c | 174 +++++ src/bhyve/bhyve_device.h | 38 ++ src/bhyve/bhyve_domain.c | 75 +++ src/bhyve/bhyve_domain.h | 39 ++ src/bhyve/bhyve_driver.c | 9 +- src/libvirt_private.syms | 14 + src/qemu/qemu_command.c | 749 +++------------------ src/qemu/qemu_command.h | 40 +- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_domain.h | 5 +- src/qemu/qemu_hotplug.c | 8 +- src/qemu/qemu_process.c | 2 +- src/util/virpci.c | 532 +++++++++++++++ src/util/virpci.h | 121 ++++ .../bhyvexml2argvdata/bhyvexml2argv-acpiapic.args | 2 +- tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml | 2 + tests/bhyvexml2argvdata/bhyvexml2argv-base.args | 2 +- tests/bhyvexml2argvdata/bhyvexml2argv-base.xml | 2 + tests/bhyvexml2argvdata/bhyvexml2argv-console.args | 4 +- tests/bhyvexml2argvdata/bhyvexml2argv-console.xml | 2 + .../bhyvexml2argv-disk-virtio.args | 2 +- .../bhyvexml2argv-disk-virtio.xml | 2 + tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args | 2 +- tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.xml | 2 + tests/bhyvexml2argvdata/bhyvexml2argv-serial.args | 4 +- tests/bhyvexml2argvdata/bhyvexml2argv-serial.xml | 2 + tools/Makefile.am | 1 + 30 files changed, 1205 insertions(+), 770 deletions(-) create mode 100644 src/bhyve/bhyve_device.c create mode 100644 src/bhyve/bhyve_device.h create mode 100644 src/bhyve/bhyve_domain.c create mode 100644 src/bhyve/bhyve_domain.h -- 1.9.0

4 6

[libvirt] [PATCH] Fix build wihout macvtap or virtualport
by Ján Tomko 06 May '14

06 May '14

Commit 1b14c44 broke the build on FreeBSD by changing the signature of a few functions without updating the corresponding stubs that are used when WITH_MACVTAP or WITH_VIRTUALPORT is not defined. --- Pushed under the build-breaker rule. src/util/virnetdevmacvlan.c | 8 ++++---- src/util/virnetdevvportprofile.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 56a5f6b..cb85b74 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -1068,13 +1068,13 @@ int virNetDevMacVLanDelete(const char *ifname ATTRIBUTE_UNUSED) int virNetDevMacVLanCreateWithVPortProfile(const char *ifname ATTRIBUTE_UNUSED, const virMacAddr *macaddress ATTRIBUTE_UNUSED, const char *linkdev ATTRIBUTE_UNUSED, - enum virNetDevMacVLanMode mode ATTRIBUTE_UNUSED, + virNetDevMacVLanMode mode ATTRIBUTE_UNUSED, bool withTap ATTRIBUTE_UNUSED, int vnet_hdr ATTRIBUTE_UNUSED, const unsigned char *vmuuid ATTRIBUTE_UNUSED, virNetDevVPortProfilePtr virtPortProfile ATTRIBUTE_UNUSED, char **res_ifname ATTRIBUTE_UNUSED, - enum virNetDevVPortProfileOp vmop ATTRIBUTE_UNUSED, + virNetDevVPortProfileOp vmop ATTRIBUTE_UNUSED, char *stateDir ATTRIBUTE_UNUSED, virNetDevBandwidthPtr bandwidth ATTRIBUTE_UNUSED) { @@ -1100,7 +1100,7 @@ int virNetDevMacVLanRestartWithVPortProfile(const char *cr_ifname ATTRIBUTE_UNUS const char *linkdev ATTRIBUTE_UNUSED, const unsigned char *vmuuid ATTRIBUTE_UNUSED, virNetDevVPortProfilePtr virtPortProfile ATTRIBUTE_UNUSED, - enum virNetDevVPortProfileOp vmOp ATTRIBUTE_UNUSED) + virNetDevVPortProfileOp vmOp ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Cannot create macvlan devices on this platform")); @@ -1112,7 +1112,7 @@ int virNetDevMacVLanVPortProfileRegisterCallback(const char *ifname ATTRIBUTE_UN const char *linkdev ATTRIBUTE_UNUSED, const unsigned char *vmuuid ATTRIBUTE_UNUSED, virNetDevVPortProfilePtr virtPortProfile ATTRIBUTE_UNUSED, - enum virNetDevVPortProfileOp vmOp ATTRIBUTE_UNUSED) + virNetDevVPortProfileOp vmOp ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Cannot create macvlan devices on this platform")); diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c index 7354b2c..0f43b02 100644 --- a/src/util/virnetdevvportprofile.c +++ b/src/util/virnetdevvportprofile.c @@ -1248,7 +1248,7 @@ int virNetDevVPortProfileAssociate(const char *macvtap_ifname ATTRIBUTE_UNUSED, const char *linkdev ATTRIBUTE_UNUSED, int vf ATTRIBUTE_UNUSED, const unsigned char *vmuuid ATTRIBUTE_UNUSED, - enum virNetDevVPortProfileOp vmOp ATTRIBUTE_UNUSED, + virNetDevVPortProfileOp vmOp ATTRIBUTE_UNUSED, bool setlink_only ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, "%s", @@ -1261,7 +1261,7 @@ int virNetDevVPortProfileDisassociate(const char *macvtap_ifname ATTRIBUTE_UNUSE const virMacAddr *macvtap_macaddr ATTRIBUTE_UNUSED, const char *linkdev ATTRIBUTE_UNUSED, int vf ATTRIBUTE_UNUSED, - enum virNetDevVPortProfileOp vmOp ATTRIBUTE_UNUSED) + virNetDevVPortProfileOp vmOp ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Virtual port profile association not supported on this platform")); -- 1.8.3.2

1 0

[libvirt] libvirt 1.2.4 and virt-manager 0.9.0 are not incompatible
by xeon_feng 06 May '14

06 May '14

Hello everyone I encountered a problem when I completed the update of libvirt from 0.10 to 1.2.4 . The problem was that virt-manager(version 0.9.0) could not start and reported error : "ImportError: /usr/lib64/libvirt.so.0: version 'LIBVIRT_PRIVIATE_0.10.2' not found (required by /usr/lib64/python2.6/site-packages/libvirtmod.so)". I found the libvirt.so.0 link file just in the /usr/lib64/ directory , but it was linking to libvirt.so.0.1002.4 .not to the libvirt.so.0.10.2 I made libvirt.so.0 to link to libvirt.so.0.10.2 and restarted virt-manager , virt-manager started normally then restarted libvirtd failure, reporting error:l “ibvirtd: /usr/lib64/libvirt.so.0: version 'LIBVIRT_1.2.3' not found (require by libvirtd) .....” I made libvirt.so.0 to link to libvirt.so.0.1002.4 and restart libvirtd , libvirtd started normally again. Please help me to resolve the problem and give me some advise.... Thanks a lot.. Xeon.Feng

2 1

[libvirt] [PATCH] docs: fix a typo in formatdomain
by Chen Hanxiao 06 May '14

06 May '14

s/virual/virtual Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- docs/formatdomain.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index b1be724..4f19473 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -4787,7 +4787,7 @@ qemu-kvm -net nic,model=? /dev/null The nmdm device driver, available on FreeBSD, provides two - tty devices connected together by a virual null modem cable. + tty devices connected together by a virtual null modem cable. Since 1.2.4 -- 1.9.0

2 1

[libvirt] Question about QCOW2 and Libvirt Storage Pools
by Solly Ross 05 May '14

05 May '14

Hi, I'm doing some work getting libvirt storage pools into OpenStack, as they definitely make certain operations much easier for the Nova libvirt driver. However, one thing I noticed is that since storage pools automatically refresh on reboot, initial creation information gets lost. This poses a problem, since libvirt probes for file type for the filesystem-based pools (dir, fs, netfs, etc), and can erroneously detect a RAW file as another file type (for instance, QCOW2). Is there a reason libvirt doesn't have an option to persist (to disk) the unchanging parts of the volume XML? Best Regards, Solly Ross P.S. we currently deal with a similar problem in OpenStack by saving the file type to disk the first time we use the image file. However, it would be nice if libvirt could handle this for us, at some point, as it seems like it would be a good thing to have in libvirt.

2 1

[libvirt] [PATCH 1/2] virsh: Replace list element to defined variable
by Li Yang 05 May '14

05 May '14

Signed-off-by: Li Yang <liyang.fnst(a)cn.fujitsu.com> --- tools/virsh-secret.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c index 47974fe..e996c72 100644 --- a/tools/virsh-secret.c +++ b/tools/virsh-secret.c @@ -558,7 +558,7 @@ cmdSecretList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) const char *usageStr = virSecretUsageTypeTypeToString(usageType); char uuid[VIR_UUID_STRING_BUFLEN]; - if (virSecretGetUUIDString(list->secrets[i], uuid) < 0) { + if (virSecretGetUUIDString(sec, uuid) < 0) { vshError(ctl, "%s", _("Failed to get uuid of secret")); goto cleanup; } -- 1.7.1

3 3

Re: [libvirt] [virt-tools-list] [virt-manager PATCH] test: Fix tests with latest libvirt
by Cole Robinson 05 May '14

05 May '14

On 05/04/2014 10:59 PM, Chen Hanxiao wrote: > Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> > --- > tests/cli-test-xml/compare/virt-clone-clone-auto1.xml | 6 ++++++ > tests/cli-test-xml/compare/virt-clone-clone-auto2.xml | 1 + > 2 files changed, 7 insertions(+) > > diff --git a/tests/cli-test-xml/compare/virt-clone-clone-auto1.xml b/tests/cli-test-xml/compare/virt-clone-clone-auto1.xml > index b9fde61..03b7b5c 100644 > --- a/tests/cli-test-xml/compare/virt-clone-clone-auto1.xml > +++ b/tests/cli-test-xml/compare/virt-clone-clone-auto1.xml > @@ -22,16 +22,19 @@ > <disk type="block" device="floppy"> > <driver type="vmdk"/> > <source dev="/dev/disk-pool/diskvol1-clone"/> > + <backingStore/> > <target dev="fda" bus="fdc"/> > <address type="drive" controller="0" bus="0" target="0" unit="0"/> > </disk> > <disk type="block" device="disk"> > <source dev="/dev/disk-pool/diskvol2"/> > + <backingStore/> > <target dev="sda" bus="scsi"/> > <readonly/> > <address type="drive" controller="0" bus="0" target="0" unit="0"/> > </disk> > <disk type="block" device="cdrom"> > + <backingStore/> > <target dev="sdb" bus="scsi"/> > <readonly/> > <address type="drive" controller="0" bus="0" target="0" unit="1"/> > @@ -39,6 +42,7 @@ > <disk type="block" device="disk"> > <driver type="qcow2"/> > <source dev="/dev/default-pool/collidevol1.img"/> > + <backingStore/> > <target dev="sdc" bus="scsi"/> > <readonly/> > <shareable/> > @@ -46,11 +50,13 @@ > </disk> > <disk type="file" device="disk"> > <source file="/dev/default-pool/default-vol-clone"/> > + <backingStore/> > <target dev="hda" bus="ide"/> > <address type="drive" controller="0" bus="0" target="0" unit="0"/> > </disk> > <disk type="file" device="disk"> > <source file="/dev/default-pool/testvol2-clone.img"/> > + <backingStore/> > <target dev="hdb" bus="ide"/> > <address type="drive" controller="0" bus="0" target="0" unit="1"/> > </disk> > diff --git a/tests/cli-test-xml/compare/virt-clone-clone-auto2.xml b/tests/cli-test-xml/compare/virt-clone-clone-auto2.xml > index fb78434..bbbde76 100644 > --- a/tests/cli-test-xml/compare/virt-clone-clone-auto2.xml > +++ b/tests/cli-test-xml/compare/virt-clone-clone-auto2.xml > @@ -22,6 +22,7 @@ > <disk type="file" device="disk"> > <driver type="qcow2"/> > <source file="/dev/default-pool/newvm.img"/> > + <backingStore/> > <target dev="hda" bus="ide"/> > <address type="drive" controller="0" bus="0" target="0" unit="0"/> > </disk> > Hmm, what is actually going on here? I know latest libvirt added backingStore chain XML to the domain XML, but what does a bare <backingStore/> mean here? Anyone on the libvirt side know if this is intentional? - Cole

2 2

[libvirt] [PATCH V2 0/3] support flags in libxlDomain{Shutdown, Reboot}
by Jim Fehlig 05 May '14

05 May '14

This small series is a V2 of https://www.redhat.com/archives/libvir-list/2014-April/msg00837.html Patch 1 adds VIR_DOMAIN_SHUTDOWN_PARAVIRT and VIR_REBOOT_SHUTDOWN_PARAVIRT flags to the API as requested by danpb. Patch 2 makes use of the shutdown flags in libxlDomainShutdownFlags. Patch 3 does the same for libxlDomainReboot. Jim Fehlig (3): Introduce a new flag for controlling shutdown/reboot libxl: support PARAVIRT and ACPI shutdown flags libxl: support PARAVIRT and ACPI reboot flags include/libvirt/libvirt.h.in | 2 ++ src/libxl/libxl_driver.c | 64 +++++++++++++++++++++++++++++++++++--------- tools/virsh-domain.c | 14 +++++++--- tools/virsh.pod | 8 +++--- 4 files changed, 68 insertions(+), 20 deletions(-) -- 1.8.1.4

3 13

[libvirt] [PATCH 0/2] virstoragefile cleanups
by Eric Blake 05 May '14

05 May '14

I found these cleanups while trying to solve the regression that John identified, where we are losing the correct capacity read from a qcow2 header when it comes time to dump a volume's xml. I still plan to get that regression fixed before 1.2.4 goes out the door, but this was worth posting in the meantime. Eric Blake (2): conf: avoid null deref during storage probe conf: drop extra storage probe src/libvirt_private.syms | 1 - src/storage/storage_backend_fs.c | 8 -------- src/storage/storage_backend_gluster.c | 5 ----- src/util/virstoragefile.c | 37 ++++++++++++++++------------------- src/util/virstoragefile.h | 7 ++----- 5 files changed, 19 insertions(+), 39 deletions(-) -- 1.9.0

2 6

[libvirt] [PATCH] bhyve: report cpuTime in bhyveDomainGetInfo
by Roman Bogorodskiy 05 May '14

05 May '14

Add a helper function virBhyveGetDomainTotalCpuStats() to obtain process CPU time using kvm (kernel memory interface) and use it to set cpuTime field of the virDomainInfo struct in bhyveDomainGetInfo(). --- configure.ac | 7 +++++++ src/bhyve/bhyve_driver.c | 9 +++++++++ src/bhyve/bhyve_process.c | 40 ++++++++++++++++++++++++++++++++++++++++ src/bhyve/bhyve_process.h | 3 +++ 4 files changed, 59 insertions(+) diff --git a/configure.ac b/configure.ac index 12338d4..2e5fa1a 100644 --- a/configure.ac +++ b/configure.ac @@ -2684,6 +2684,13 @@ AC_CHECK_DECLS([cpuset_getaffinity], #include <sys/cpuset.h> ]) +# Check for BSD kvm (kernel memory interface) +if test $with_freebsd = yes; then + AC_CHECK_LIB([kvm], [kvm_getprocs], [], + [AC_MSG_ERROR([BSD kernel memory interface library is required to build on FreeBSD])] + ) +fi + # Check if we need to look for ifconfig if test "$want_ifconfig" = "yes"; then AC_PATH_PROG([IFCONFIG_PATH], [ifconfig]) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 6d681fd..0780e74 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -268,6 +268,15 @@ bhyveDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) if (virDomainGetInfoEnsureACL(domain->conn, vm->def) < 0) goto cleanup; + if (virDomainObjIsActive(vm)) { + if (virBhyveGetDomainTotalCpuStats(vm, &(info->cpuTime)) < 0) { + virReportError(VIR_ERR_OPERATION_FAILED, + "%s", _("Cannot read cputime for domain")); + goto cleanup; + } + } else + info->cpuTime = 0; + info->state = virDomainObjGetState(vm, NULL); info->maxMem = vm->def->mem.max_balloon; info->nrVirtCpu = vm->def->vcpus; diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index a557bc5..b6f0f2c 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -22,7 +22,11 @@ #include <config.h> #include <fcntl.h> +#include <kvm.h> +#include <sys/param.h> #include <sys/types.h> +#include <sys/sysctl.h> +#include <sys/user.h> #include <sys/ioctl.h> #include <net/if.h> #include <net/if_tap.h> @@ -246,3 +250,39 @@ virBhyveProcessStop(bhyveConnPtr driver, virCommandFree(cmd); return ret; } + +int +virBhyveGetDomainTotalCpuStats(virDomainObjPtr vm, + unsigned long long *cpustats) +{ + struct kinfo_proc *kp; + kvm_t *kd; + char errbuf[_POSIX2_LINE_MAX]; + int nprocs; + int ret = -1; + + if ((kd = kvm_openfiles(NULL, NULL, NULL, O_RDONLY, errbuf)) == NULL) { + virReportError(VIR_ERR_SYSTEM_ERROR, + _("Unable to get kvm descriptor: %s"), + errbuf); + return -1; + + } + + kp = kvm_getprocs(kd, KERN_PROC_PID, vm->pid, &nprocs); + if (kp == NULL || nprocs != 1) { + virReportError(VIR_ERR_SYSTEM_ERROR, + _("Unable to obtain information about pid: %d"), + (int)vm->pid); + goto cleanup; + } + + *cpustats = kp->ki_runtime * 1000ull; + + ret = 0; + + cleanup: + kvm_close(kd); + + return ret; +} diff --git a/src/bhyve/bhyve_process.h b/src/bhyve/bhyve_process.h index f91504e..3049ad0 100644 --- a/src/bhyve/bhyve_process.h +++ b/src/bhyve/bhyve_process.h @@ -34,6 +34,9 @@ int virBhyveProcessStop(bhyveConnPtr driver, virDomainObjPtr vm, virDomainShutoffReason reason); +int virBhyveGetDomainTotalCpuStats(virDomainObjPtr vm, + unsigned long long *cpustats); + typedef enum { VIR_BHYVE_PROCESS_START_AUTODESTROY = 1 << 0, } bhyveProcessStartFlags; -- 1.9.0

2 4

[libvirt] [PATCH v3] storageVolCreateXMLFrom: Allow multiple accesses to origvol
by Michal Privoznik 05 May '14

05 May '14

When creating a new volume, it is possible to copy data into it from another already existing volume (referred to as @origvol). Obviously, the read-only access to @origvol is required, which is thread safe (probably not performance-wise though). However, with current code both @newvol and @origvol are marked as building for the time of copying data from the @origvol to @newvol. The rationale behind is to disallow some operations on both @origvol and @newvol, e.g. vol-wipe, vol-delete, vol-download. While it makes sense to not allow such operations on partly copied mirror, but it doesn't make sense to disallow vol-create on the source (@origvol). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v2: - changed the error message if volume is in use - reworded commit message src/conf/storage_conf.h | 1 + src/storage/storage_driver.c | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h index 9ad38e1..eae959c 100644 --- a/src/conf/storage_conf.h +++ b/src/conf/storage_conf.h @@ -64,6 +64,7 @@ struct _virStorageVolDef { int type; /* enum virStorageVolType */ unsigned int building; + unsigned int in_use; virStorageVolSource source; virStorageSource target; diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 2cb8347..542b382 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1640,6 +1640,13 @@ storageVolDelete(virStorageVolPtr obj, if (virStorageVolDeleteEnsureACL(obj->conn, pool->def, vol) < 0) goto cleanup; + if (vol->in_use) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("volume '%s' is still in use."), + vol->name); + goto cleanup; + } + if (vol->building) { virReportError(VIR_ERR_OPERATION_INVALID, _("volume '%s' is still being allocated."), @@ -1912,8 +1919,8 @@ storageVolCreateXMLFrom(virStoragePoolPtr obj, /* Drop the pool lock during volume allocation */ pool->asyncjobs++; - origvol->building = 1; newvol->building = 1; + origvol->in_use++; virStoragePoolObjUnlock(pool); if (origpool) { @@ -1929,7 +1936,7 @@ storageVolCreateXMLFrom(virStoragePoolPtr obj, virStoragePoolObjLock(origpool); storageDriverUnlock(driver); - origvol->building = 0; + origvol->in_use--; newvol->building = 0; allocation = newvol->target.allocation; pool->asyncjobs--; @@ -2076,6 +2083,13 @@ storageVolUpload(virStorageVolPtr obj, if (virStorageVolUploadEnsureACL(obj->conn, pool->def, vol) < 0) goto cleanup; + if (vol->in_use) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("volume '%s' is still in use."), + vol->name); + goto cleanup; + } + if (vol->building) { virReportError(VIR_ERR_OPERATION_INVALID, _("volume '%s' is still being allocated."), @@ -2167,6 +2181,13 @@ storageVolResize(virStorageVolPtr obj, if (virStorageVolResizeEnsureACL(obj->conn, pool->def, vol) < 0) goto cleanup; + if (vol->in_use) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("volume '%s' is still in use."), + vol->name); + goto cleanup; + } + if (vol->building) { virReportError(VIR_ERR_OPERATION_INVALID, _("volume '%s' is still being allocated."), @@ -2474,6 +2495,13 @@ storageVolWipePattern(virStorageVolPtr obj, if (virStorageVolWipePatternEnsureACL(obj->conn, pool->def, vol) < 0) goto cleanup; + if (vol->in_use) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("volume '%s' is still in use."), + vol->name); + goto cleanup; + } + if (vol->building) { virReportError(VIR_ERR_OPERATION_INVALID, _("volume '%s' is still being allocated."), -- 1.9.0

2 1

[libvirt] Some odd quriks of libvirt and xen on fedora 20.
by Alvin Starr 05 May '14

05 May '14

I am using xen 4.3 on Fedora 20. For PV systems the vnc console display is on the correct port with the following call do qeum-dm libxl: debug: libxl_dm.c:1213:libxl__spawn_local_dm: -domain-name libxl: debug: libxl_dm.c:1213:libxl__spawn_local_dm: paravirt libxl: debug: libxl_dm.c:1213:libxl__spawn_local_dm: -vnc libxl: debug: libxl_dm.c:1213:libxl__spawn_local_dm: 127.0.0.1:1 but for HV systems xl is being passed libxl: debug: libxl_dm.c:1213:libxl__spawn_local_dm: -domain-name libxl: debug: libxl_dm.c:1213:libxl__spawn_local_dm: fullvirt libxl: debug: libxl_dm.c:1213:libxl__spawn_local_dm: -vnc libxl: debug: libxl_dm.c:1213:libxl__spawn_local_dm: 127.0.0.1:0 libxl: debug: libxl_dm.c:1213:libxl__spawn_local_dm: -vncunused libxl: debug: libxl_dm.c:1213:libxl__spawn_local_dm: -serial libxl: debug: libxl_dm.c:1213:libxl__spawn_local_dm: pty libxl: debug: libxl_dm.c:1213:libxl__spawn_local_dm: -videoram libxl: debug: libxl_dm.c:1213:libxl__spawn_local_dm: 8 Where would I look to correct this? -- Alvin Starr || voice: (905)513-7688 Netvel Inc. || Cell: (416)806-0133 alvin(a)netvel.net ||

3 4

[libvirt] [PATCH] typos: fix s/it/is/ where applicable
by Martin Kletzander 05 May '14

05 May '14

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: pushed as trivial docs/drvesx.html.in | 4 ++-- src/esx/esx_driver.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/drvesx.html.in b/docs/drvesx.html.in index 0816baf..d1e67d0 100644 --- a/docs/drvesx.html.in +++ b/docs/drvesx.html.in @@ -148,7 +148,7 @@ vpx://example-vcenter.com/folder1/dc1/folder2/example-esx.com </td> <td> If set to 1, this disables libcurl client checks of the server's - SSL certificate. The default value it 0. See the + SSL certificate. The default value is 0. See the <a href="#certificates">Certificates for HTTPS</a> section for details. </td> @@ -164,7 +164,7 @@ vpx://example-vcenter.com/folder1/dc1/folder2/example-esx.com If set to 1, the driver answers all <a href="#questions">questions</a> with the default answer. If set to 0, questions are reported as errors. The default - value it 0. Since 0.7.5. + value is 0. Since 0.7.5. </td> </tr> <tr> diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index d082927..5dd0a63 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -889,11 +889,11 @@ esxConnectToVCenter(esxPrivate *priv, * it. If the ESX host is not managed by a vCenter an error is reported. * * If the no_verify parameter is set to 1, this disables libcurl client checks - * of the server's certificate. The default value it 0. + * of the server's certificate. The default value is 0. * * If the auto_answer parameter is set to 1, the driver will respond to all * virtual machine questions with the default answer, otherwise virtual machine - * questions will be reported as errors. The default value it 0. + * questions will be reported as errors. The default value is 0. * * The proxy parameter allows to specify a proxy for to be used by libcurl. * The default for the optional <type> part is http and socks is synonymous for -- 1.9.2

1 0

[libvirt] [PATCH v2 0/2] bhyve: implement connectDomainXMLToNative
by Roman Bogorodskiy 04 May '14

04 May '14

Changes from v1: - Return both bhyveload and bhyve commands, not only bhyve. Roman Bogorodskiy (2): bhyve: improve bhyve_command.c testability bhyve: implement connectDomainXMLToNative src/bhyve/bhyve_command.c | 85 +++++++++++++++++++++++++---------------------- src/bhyve/bhyve_command.h | 8 +++-- src/bhyve/bhyve_driver.c | 59 ++++++++++++++++++++++++++++++++ src/bhyve/bhyve_process.c | 10 +++--- tests/bhyvexml2argvtest.c | 2 +- 5 files changed, 117 insertions(+), 47 deletions(-) -- 1.9.0

2 6

[libvirt] [PATCH] Fix vlan ID detection in udev interface driver
by Ján Tomko 04 May '14

04 May '14

Instead of guessing it from the interface name, look into /proc/net/vlan/<interface>. This works for devices not named <real_device>.<vlan ID>, avoiding an error flood when virt-manager keeps asking about them every second: https://bugzilla.redhat.com/show_bug.cgi?id=966329 --- src/interface/interface_backend_udev.c | 67 ++++++++++++++++++++++++++-------- 1 file changed, 51 insertions(+), 16 deletions(-) diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index b05ac0e..bec8c45 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -20,11 +20,13 @@ */ #include <config.h> +#include <ctype.h> #include <errno.h> #include <dirent.h> #include <libudev.h> #include "virerror.h" +#include "virfile.h" #include "c-ctype.h" #include "datatypes.h" #include "domain_conf.h" @@ -966,31 +968,64 @@ udevGetIfaceDefVlan(struct udev *udev ATTRIBUTE_UNUSED, const char *name, virInterfaceDef *ifacedef) { - const char *vid; + char *procpath = NULL; + char *buf = NULL; + char *vid_pos, *dev_pos; + size_t vid_len, dev_len; + const char *vid_prefix = "VID: "; + const char *dev_prefix = "\nDevice: "; + int ret = -1; + + if (virAsprintf(&procpath, "/proc/net/vlan/%s", name) < 0) + goto cleanup; + + if (virFileReadAll(procpath, BUFSIZ, &buf) < 0) + goto cleanup; - /* Find the DEVICE.VID again */ - vid = strrchr(name, '.'); - if (!vid) { + if ((vid_pos = strstr(buf, vid_prefix)) == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, _("failed to find the VID for the VLAN device '%s'"), name); - return -1; + goto cleanup; } + vid_pos += strlen(vid_prefix); - /* Set the VLAN specifics */ - if (VIR_STRDUP(ifacedef->data.vlan.tag, vid + 1) < 0) - goto error; - if (VIR_STRNDUP(ifacedef->data.vlan.devname, - name, (vid - name)) < 0) - goto error; + if ((vid_len = strspn(vid_pos, "0123456789")) == 0 || + !isspace(vid_pos[vid_len])) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("failed to find the VID for the VLAN device '%s'"), + name); + goto cleanup; + } - return 0; + if ((dev_pos = strstr(vid_pos + vid_len, dev_prefix)) == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("failed to find the real device for the VLAN device '%s'"), + name); + goto cleanup; + } + dev_pos += strlen(dev_prefix); - error: - VIR_FREE(ifacedef->data.vlan.tag); - VIR_FREE(ifacedef->data.vlan.devname); + if ((dev_len = strcspn(dev_pos, "\n")) == 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("failed to find the real device for the VLAN device '%s'"), + name); + goto cleanup; + } - return -1; + if (VIR_STRNDUP(ifacedef->data.vlan.tag, vid_pos, vid_len) < 0) + goto cleanup; + if (VIR_STRNDUP(ifacedef->data.vlan.devname, dev_pos, dev_len) < 0) { + VIR_FREE(ifacedef->data.vlan.tag); + goto cleanup; + } + + ret = 0; + + cleanup: + VIR_FREE(procpath); + VIR_FREE(buf); + return ret; } static virInterfaceDef * ATTRIBUTE_NONNULL(1) -- 1.8.3.2

4 6

[libvirt] [PATCH] Bump version to 1.2.5 for new dev cycle
by John Ferlan 04 May '14

04 May '14

Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Pushed already just sending note. configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 12338d4..fef99af 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU Lesser General Public dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>. -AC_INIT([libvirt], [1.2.4], [libvir-list(a)redhat.com] [], [http://libvirt.org] +AC_INIT([libvirt], [1.2.5], [libvir-list(a)redhat.com] [], [http://libvirt.org] AC_CONFIG_SRCDIR([src/libvirt.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) -- 1.9.0

1 0

[libvirt] Release of libvirt-1.2.4
by Daniel Veillard 04 May '14

04 May '14

As planned I tagged the release in git and pushed the tarball and signed rpms to the usual place: ftp://libvirt.org/libvirt/ I also generated those for python too even if the only change is a spec file update, they are in the python subdir. This is a smaller than average release, with most of the changes on code refactoring, portability and bug fixes, so no big features here but general improvements: Documentation: - Device{Attach,Detach}: Document S4 limitations (Michal Privoznik) - Add a new example to illustrate domain migration (Sahid Orentino Ferdjaoui) - update docs for setting the QEMU BIOS path (Chen Hanxiao) - document nmdm type console (Roman Bogorodskiy) - Fix typos in src/* (Nehal J Wani) - document that vfio is default for hostdev networks too (Laine Stump) - cpu: Add documentation for CPU driver APIs (Jiri Denemark) - virsh: Fix comment of vshCmdInfo (Li Yang) Portability: - Explicitly link virfirewalltest and virsystemdtest against dbus (Guido Günther) - qemuxml2argvtest: Don't use privileged mode upfront (Guido Günther) - tests: skip virfirewalltest on non-Linux systems (Roman Bogorodskiy) - tests: don't fail with newer gnutls (Martin Kletzander) - fix build with older gcc (Ján Tomko) - storage: reject negative indices (Eric Blake) - networkxml2firewalltest: fix build failure on freebsd (Pavel Hrdina) - virfirewall: fix build on freebsd (Pavel Hrdina) - Disable libvirtd by default when building on Win32 (Daniel P. Berrange) - Don't use SO_REUSEADDR on Win32 platforms (Daniel P. Berrange) - Conditionalize include of dlfcn.h in virmock.h (Daniel P. Berrange) - build: avoid 'index' as variable name (Eric Blake) - build: Don't use code with dbus_message_unref when built without dbus (Martin Kletzander) - tests: Fix systemd test with --without-driver-modules (Jiri Denemark) - Fix build on mingw32 (Ján Tomko) - build: avoid compiler warning on shadowed name (Jean-Baptiste Rouault) - tests: link against libxml2 (Guido Günther) - tests: build viridentitytest only WITH_ATTR. (Jincheng Miao) - maint: Correctly detect wether "gluster" cli tool is accessible (Peter Krempa) - libvirt-guests: avoid bashism (Guido Günther) - Use the force flag for mkfs -t xfs (Ján Tomko) Bug Fixes: - Restore skipping of setting capacity (John Ferlan) - qemu: fix crash when removing <filterref> from interface with update-device (Laine Stump) - storage: Clear all data allocated about backing store before reparsing (Peter Krempa) - nwfilter: Tear down temp. filters when tearing all filters (Stefan Berger) - Set mknod permission in device ACL for LXC USB devices (Daniel P. Berrange) - conf: avoid null deref during storage probe (Eric Blake) - qemu: properly quit migration with abort_on_error (Martin Kletzander) - qemu: don't call virFileExists() for network type disks (Martin Kletzander) - storage_backend_rbd: Correct argument order to rbd_create3 (Steven McDonald) - xen: ensure /usr/sbin/xend exists before checking status (Jim Fehlig) - Remove bogus ATTRIBUTE_NONNULL from virFirewallAddRuleFull (Daniel P. Berrange) - Make autostart of virtlockd actually work (Daniel P. Berrange) - Fix leak on OOM in virNWFilterVarValueCreateSimpleCopyValue (Daniel P. Berrange) - qemu: Avoid overflow when setting migration speed on inactive domains (Jiri Denemark) - qemu: don't check for backing chains for formats w/o snapshot support (Martin Kletzander) - Fix pci bus naming for PPC (Daniel P. Berrange) - Document behavior of setvcpus during guest boot (Ján Tomko) - Save domain status after cpu hotplug (Ján Tomko) - Fix error for out of range vcpu in qemuDomainPinVcpuFlags (Ján Tomko) - Properly free vcpupin info for unplugged CPUs (Ján Tomko) - Only set QEMU_CAPS_NO_HPET on x86 (Ján Tomko) - Fix Memory Leak in virStorageFileGetMetadataRecurse() (Nehal J Wani) - qemu: Unlock the NWFilter update lock by leaving via the cleanup label (Stefan Berger) - storage: netfs: Handle backend errors (John Ferlan) - conf: fix omission of <driver> in domain dumpxml (Eric Blake) - Fix virsystemdtest without SYSTEMD_DAEMON (Ján Tomko) - qemu: Avoid overflow when setting migration speed (Jiri Denemark) - bhyve: fix domain management (Wojciech Macek) - Check maximum startcpu value correctly (Ján Tomko) - storage: Don't update pool available/allocation if buildVol fails (John Ferlan) - LXC: Fix return code evaulation in lxcCheckNetNsSupport() (Richard Weinberger) - Fix incorrect values in redirdev ABI check error (Ján Tomko) - virNetDev{Replace,Restore}MacAddress: Fix memory leak (Wangrui K) - bhyveConnectGetCapabilities: Fix double caps unref (Michal Privoznik) - Simplify bhyveDriverGetCapabilities() (Michal Privoznik) - bhyve_capabilities: Add Semihalf to Copyright (Michal Privoznik) - tests: Don't crash when creating the config object fails (Guido Günther) - conf: avoid memleak on NULL path (Eric Blake) - lxc conf2xml: don't let current vcpus at 0: define won't like it (Cédric Bosdonnat) - QoS: make tc filters match all traffic (Antoni S. Puimedon) - NFS storage pool: Fix libvirtd crash due to refactor edit (John Ferlan) - Define CPUINFO_FILE_LEN and fix maxlen of cpuinfo file for all uses (Olivia Yin) - Fix Memory Leak in daemon/libvirtd.c (Nehal J Wani) - qemu: make sure agent returns error when required data are missing (Martin Kletzander) - Fix coverity-reported leak in virSecurityManagerGenLabel (Ján Tomko) - phyp: fix logic error on volume creation (Eric Blake) - qemu: cleanup error checking on agent replies (Martin Kletzander) Improvements - util: new stricter unsigned int parsing (Eric Blake) - util: fix uint parsing on 64-bit platforms (Eric Blake) - Misc error reporting bugs in QEMU cli builder (Daniel P. Berrange) - nwfilter: Validate rule after parsing (Stefan Berger) - Add support for QEMU migration to use SASL authentication (Sahid Orentino Ferdjaoui) - enforce sane readdir usage (Eric Blake) - network: use virDirRead in networkMigrateStateFiles (Laine Stump) - storage: use virDirRead API (Eric Blake) - drivers: use virDirRead API (Eric Blake) - util: use virDirRead API (Eric Blake) - conf: use virDirRead API (Eric Blake) - nodeinfo: use virDirRead API (Natanael Copa) - util: introduce virDirRead wrapper for readdir (Natanael Copa) - tests: remove hostdevmgr directory on cleanup (Martin Kletzander) - Use virFileFindResource to locate virtlockd daemon (Daniel P. Berrange) - Use virFileFindResource to locate libvirtd daemon (Daniel P. Berrange) - Recheck disk backing chains after snapshot (Jiri Denemark) - network: centralize check for active network during interface attach (Laine Stump) - network: set macvtap/hostdev networks active if their state file exists (Laine Stump) - network: change location of network state xml files (Laine Stump) - network: create statedir during driver initialization (Laine Stump) - network: fix virNetworkObjAssignDef and persistence (Laine Stump) - build: -avoid-version on libvirt_driver_nwfilter (Dwight Engen) - libxl: Support PV consoles (Ian Campbell) - build: add nwfilterxml2firewalldata to dist (Dwight Engen) - Add a test suite for nwfilter ebiptables tech driver (Daniel P. Berrange) - Remove last trace of direct firewall command exection (Daniel P. Berrange) - Convert ebiptablesDriverProbeStateMatch to virFirewall (Daniel P. Berrange) - Convert nwfilter ebiptablesApplyNewRules to virFirewall (Daniel P. Berrange) - Convert nwfilter ebtablesApplyDropAllRules to virFirewall (Daniel P. Berrange) - Convert nwfilter ebtablesApplyDHCPOnlyRules to virFirewall (Daniel P. Berrange) - Convert nwfilter ebtablesApplyBasicRules to virFirewall (Daniel P. Berrange) - Convert nwfilter ebiptablesTearNewRules to virFirewall (Daniel P. Berrange) - Convert nwfilter ebtablesRemoveBasicRules to virFirewall (Daniel P. Berrange) - Convert nwfilter ebiptablesTearOldRules to virFirewall (Daniel P. Berrange) - Convert nwfilter ebiptablesAllTeardown to virFirewall (Daniel P. Berrange) - Convert ebtables code over to use firewall APIs (Daniel P. Berrange) - Add test for converting network XML to iptables rules (Daniel P. Berrange) - Replace virNetworkObjPtr with virNetworkDefPtr in network platform APIs (Daniel P. Berrange) - Convert bridge driver over to use new firewall APIs (Daniel P. Berrange) - Introduce an object for managing firewall rulesets (Daniel P. Berrange) - Preserve error when tearing down nwfilter rules (Daniel P. Berrange) - Remove two-stage construction of commands in nwfilter (Daniel P. Berrange) - Merge nwfilter createRuleInstance driver into applyNewRules (Daniel P. Berrange) - Push virNWFilterRuleInstPtr out of (eb|ip)tablesCreateRuleInstance (Daniel P. Berrange) - Add helper methods for determining what protocol layer is used (Daniel P. Berrange) - Remove nwfilter tech driver 'displayRuleInstance' callback (Daniel P. Berrange) - Remove nwfilter tech driver 'removeRules' callback (Daniel P. Berrange) - Remove pointless storage of var names in virNWFilterHashTable (Daniel P. Berrange) - Remove virDomainNetType parameter from nwfilter drivers (Daniel P. Berrange) - Move virNWFilterTechDriver struct out of nwfilter_conf.h (Daniel P. Berrange) - Use virFileFindResource to locate CPU map XML (Daniel P. Berrange) - Use virFileFindResource to locate driver plugins (Daniel P. Berrange) - Use virFileFindResource to locate lock manager plugins (Daniel P. Berrange) - Use virFileFindResource to locate iohelper for fdstream (Nehal J Wani) - Use virFileFindResource to locate parthelper for storage backend (Nehal J Wani) - Use virFileFindResource to locate libvirt_lxc for capabilities (Nehal J Wani) - Use virFileFindResource to locate iohelper for virFileWrapperFdNew (Nehal J Wani) - Activate build dir overrides in libvirtd, virtlockd, virsh & tests (Daniel P. Berrange) - Add helpers for resolving path to resources in build tree (Daniel P. Berrange) - Add test suite for viralloc APIs (Daniel P. Berrange) - Add support for addressing backing stores by index (Jiri Denemark) - virStorageFileChainLookup: Return virStorageSourcePtr (Jiri Denemark) - qemuDomainBlockCommit: Track virStorageSourcePtr for base (Jiri Denemark) - qemuDomainBlockCommit: Don't track top_canon path separately (Jiri Denemark) - tests: Test backing store XML formatting and parsing (Jiri Denemark) - tests: More output options for xml2xml tests (Jiri Denemark) - conf: Format and parse backing chains in domain XML (Jiri Denemark) - conf: Output disk backing store details in domain XML (Jiri Denemark) - util: storage: Invert the way recursive metadata retrieval works (Peter Krempa) - util: virstoragefile: Don't mangle data stored about directories (Peter Krempa) - storage: Move disk->backingChain to the recursive disk->src.backingStore (Peter Krempa) - util: virstoragefile: Rename backingMeta to backingStore (Peter Krempa) - util: virstorage: Kill struct virStorageFileMetadata (Peter Krempa) - maint: Switch over from struct virStorageFileMetadata to virStorageSource (Peter Krempa) - util: storagefile: Add fields from virStorageMetadata to virStorageSource (Peter Krempa) - util: storagefile: Add function to free a virStorageSourcePtr (Peter Krempa) - virstoragefile: Kill "backingStore" field from virStorageFileMetadata (Peter Krempa) - util: virstoragefile: Don't use "backingStore" directly (Peter Krempa) - util: storagefile: Rename "canonPath" to "path" in virStorageFileMetadata (Peter Krempa) - util: storage: Rename "path" to "relPath" in virStorageFileMetadata (Peter Krempa) - storage: util: Clean up arguments of virStorageFileGetMetadataInternal (Peter Krempa) - util: storage: Move checking of the actual backing image to the worker (Peter Krempa) - util: storage: Remove obsolete argument virStorageFileGetMetadataInternal (Peter Krempa) - util: storagefile: Always store raw backing name in the metadata (Peter Krempa) - qemu: unexport qemuDiskChainCheckBroken (Peter Krempa) - bhyve: bhyveDomainDefineXML fixes (Roman Bogorodskiy) - PPC64 prefers to set pci-ohci controller as default USB controller (Li Zhang) - Make virDomainVcpuPinDel return void (Ján Tomko) - maint: update to latest gnulib (Eric Blake) - bhyve: domainCreateXML (Wojciech Macek) - Remove QEMU_CAPS_MACHINE_USB_OPT from ComputeCmdFlags (Ján Tomko) - conf: split <disk> schema into more pieces (Eric Blake) - conf: set up for per-grammar overrides in schemas (Eric Blake) - conf: restrict external snapshots to backing store formats (Eric Blake) - conf: move storage formats to common RNG file (Eric Blake) - conf: better <disk> interleaving in schema (Eric Blake) - conf: create common storage RNG grammar file (Eric Blake) - conf: delete internal directory field (Eric Blake) - conf: tweak chain lookup internals (Eric Blake) - conf: drop redundant parameter to chain lookup (Eric Blake) - conf: report error on chain lookup failure (Eric Blake) - util: new virFileRelLinkPointsTo function (Eric Blake) - conf: test backing chain lookup (Eric Blake) - Introduce --without-pm-utils to get rid of pm-is-supported dependency (Cédric Bosdonnat) - conf: delete useless backingStoreFormat field (Eric Blake) - conf: return backing information separately from metadata (Eric Blake) - conf: delete useless backingStoreIsFile field (Eric Blake) - conf: expose probe for non-local storage (Eric Blake) - conf: provide details on network backing store (Eric Blake) - conf: make virstoragetest debug easier (Eric Blake) - cpu: Properly check input parameters (Jiri Denemark) - Clean up virCgroupGetPercpuStats (Ján Tomko) - Rename id, max_id to need_cpus, total_cpus (Ján Tomko) - Extend virCgroupGetPercpuStats to fill in vcputime too (Ján Tomko) - Fix return value of virCgroupGetPercpuStats (Ján Tomko) - Don't require domain obj in qemuDomainGetPercpuStats (Ján Tomko) - conf: test for more fields (Eric Blake) - conf: start testing contents of the new backing chain fields (Eric Blake) - conf: track more fields in backing chain metadata (Eric Blake) - conf: rename some test fields (Eric Blake) - conf: earlier allocation during backing chain crawl (Eric Blake) - conf: track user vs. canonical name through full chain lookup (Eric Blake) - qemu: Unexport qemuBuildNetworkDriveURI() (Peter Krempa) - qemu: Refactor qemuGetDriveSourceString to take virStorageSourcePtr (Peter Krempa) - storage: Refactor location of metadata for storage drive access to files (Peter Krempa) - storage: Refactor storage file initialization to use virStorageSourcePtr (Peter Krempa) - conf: Refactor helpers to retrieve actual storage type (Peter Krempa) - tests: use virBhyveCapsBuild in bhyvexml2argv test (Roman Bogorodskiy) - conf: another refactor of virstoragetest (Eric Blake) - conf: interleave virstoragetest structs (Eric Blake) - conf: test for more scenarios (Eric Blake) - conf: fix detection of infinite backing loop (Eric Blake) - vmware: set the driver version (Jean-Baptiste Rouault) - tests: add bhyve xml2xml test (Roman Bogorodskiy) - bhyve: add domain metadata support (Roman Bogorodskiy) - bhyve: fix ATTRIBUTE_NONNULL usage (Roman Bogorodskiy) - Use a static initializer for static mutexes (Daniel P. Berrange) - Add syntax check to validate capitalization of abbreviations (Daniel P. Berrange) - Replace Pci with PCI throughout (Daniel P. Berrange) - Replace Usb with USB throughout (Daniel P. Berrange) - Replace Scsi with SCSI throughout (Daniel P. Berrange) - Switch systemd test to use generic dbus mock (Daniel P. Berrange) - Create a re-usable DBus LD_PRELOAD mock library (Daniel P. Berrange) - Introduce a new set of helper macros for mocking symbols (Daniel P. Berrange) - bhyve: connectCompareCPU support (Wojciech Macek) - bhyve: create capabilities submodule (Wojciech Macek) - bhyve: support for connectBaselineCPU (Wojciech Macek) - interface: dump inactive xml when interface isn't active (Laine Stump) - hash: add common utility functions (Eric Blake) - bhyve: add xml2argv tests for console (Roman Bogorodskiy) - bhyve: add console support through nmdm device (Roman Bogorodskiy) - bhyve: domain autostart support (David Shane Holden) - conf: track when storage type is still undetermined (Eric Blake) - tests: refactor virstoragetest for less stack space (Eric Blake) - tests: use C99 initialization for storage test (Eric Blake) - libxl: Set disk format for empty cdrom device (Stefan Bader) - libxl: Use id from virDomainObj inside the driver (Stefan Bader) - Add redirdevs to ABI stability check (Ján Tomko) - virsh: Make 'exit' action same as 'quit' (Li Yang) - Include PCI address in the error in virDomainNetFindIdx (Ján Tomko) - Move error reporting into virDomainNetFindIdx (Ján Tomko) - tests: simplify storage test cleanup (Eric Blake) - storage: Report error from VolOpen by default (Cole Robinson) - conf: modify tracking of encrypted images (Eric Blake) - conf: drop redundant parameters during probe (Eric Blake) - conf: track sizes directly in source struct (Eric Blake) - conf: use common struct in storage volumes (Eric Blake) - conf: move volume structs to util/ (Eric Blake) - conf: tweak volume target struct details (Eric Blake) - conf: manage disk source by struct instead of pieces (Eric Blake) - virsh: man: delete the unexpected character in snapshot-list (Shanzhi Yu) - maint: fix spelling errors in disk pools (Eric Blake) - conf: let snapshots share disk source struct (Eric Blake) - conf: move common disk source functions (Eric Blake) - util: don't support loopback and nbd when setuid (Eric Blake) - util: move detection of shared filesystems (Eric Blake) - conf: move storage source type to util/ (Eric Blake) - conf: move storage secret type to util/ (Eric Blake) - conf: move source pool type to util/ (Eric Blake) - conf: move storage encryption type to util/ (Eric Blake) - conf: move network disk protocol type to util/ (Eric Blake) - conf: move host disk type to util/ (Eric Blake) - conf: split network host structs to util/ (Eric Blake) - conf: split security label structs to util/ (Eric Blake) - maint: ensure src/ directory includes are clean (Eric Blake) - storage: gluster: Implement storage pool lookup (Peter Krempa) - storage: netfs: Support lookup of glusterfs pool sources (Peter Krempa) - storage: netfs: Split up and tidy up NFS storage pool source function (Peter Krempa) Cleanups: - tests: drop dead code from argv2xml and xml2xml (Eric Blake) - qemu: remove unneeded forward declaration (Martin Kletzander) Thanks everybody for your contributions to this release be it with ideas, report, patches, documentation or localizations ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] ANNOUNCE: libvirt 1.1.3.5 maintenance release
by Cole Robinson 03 May '14

03 May '14

libvirt 1.1.3.5 maintenance release is now available. This is libvirt 1.1.3 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-1.1.3.5.tar.gz Changes in this version: * qemu: Introduce qemuDomainDefCheckABIStability * interface: dump inactive xml when interface isn't active * interface: Introduce netcfInterfaceObjIsActive * Ignore additional fields in iscsiadm output * qemu: fix crash when removing <filterref> from interface with update- device * Only set QEMU_CAPS_NO_HPET on x86 * Fix journald PRIORITY values * qemu: make sure agent returns error when required data are missing * qemu: remove unneeded forward declaration * qemu: cleanup error checking on agent replies * Ignore char devices in storage pools by default * Ignore missing files on pool refresh * storage: reduce number of stat calls * Fix explicit usage of default video PCI slots * virNetClientSetTLSSession: Restore original signal mask * storage: use valid XML for awkward volume names * maint: fix comma style issues: conf * virNetServerRun: Notify systemd that we're accepting clients * libvirt-guests: Wait for libvirtd to initialize * virSystemdCreateMachine: Set dependencies for slices * Add Documentation fields to systemd service files * Add a mutex to serialize updates to firewall * virt-login-shell: also build virAtomic.h * Fix conflicting types of virInitctlSetRunLevel For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Thanks, Cole

1 0

[libvirt] [PATCH 1/3] tests: Don't crash when creating the config object fails
by Guido Günther 03 May '14

03 May '14

As observed when building in a chroot and QEMU_USER doesn't exist --- tests/qemuargv2xmltest.c | 3 +++ tests/qemuxml2argvtest.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index 6d7e23e..4cc3749 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -128,6 +128,9 @@ mymain(void) int ret = 0; driver.config = virQEMUDriverConfigNew(false); + if (driver.config == NULL) + return EXIT_FAILURE; + if ((driver.caps = testQemuCapsInit()) == NULL) return EXIT_FAILURE; diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 56854dc..13ed4f6 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -501,6 +501,9 @@ mymain(void) } driver.config = virQEMUDriverConfigNew(true); + if (driver.config == NULL) + return EXIT_FAILURE; + VIR_FREE(driver.config->spiceListen); VIR_FREE(driver.config->vncListen); -- 1.9.1

4 17

[libvirt] [PATCH] Explicitly link virfirewalltest and virsystemdtest against dbus
by Guido Günther 03 May '14

03 May '14

This fixes link failures like: CCLD virfirewalltest /usr/bin/ld: virfirewalltest-virfirewalltest.o: undefined reference to symbol 'dbus_message_iter_init_append' --- tests/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 7ffb44e..5ef8940 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -963,7 +963,7 @@ virmockdbus_la_LDFLAGS = -module -avoid-version \ virsystemdtest_SOURCES = \ virsystemdtest.c testutils.h testutils.c virsystemdtest_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) -virsystemdtest_LDADD = $(LDADDS) +virsystemdtest_LDADD = $(LDADDS) $(DBUS_LIBS) else ! WITH_DBUS EXTRA_DIST += virdbustest.c virmockdbus.c virsystemdtest.c @@ -1047,7 +1047,7 @@ virfiletest_LDADD = $(LDADDS) virfirewalltest_SOURCES = \ virfirewalltest.c testutils.h testutils.c -virfirewalltest_LDADD = $(LDADDS) +virfirewalltest_LDADD = $(LDADDS) $(DBUS_LIBS) virfirewalltest_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) jsontest_SOURCES = \ -- 1.9.2

2 2

[libvirt] CPU type/flags when converting a physical machine to run on libvirt
by Richard W.M. Jones 03 May '14

03 May '14

I'm in the process of rewriting virt-p2v which is our program for converting physical machines to become virtual machines, running on top of libvirt + KVM. The physical machine has certain characteristics -- eg: - number of physical cores - amount of RAM - CPU type (eg. AMD Opteron, Intel Core i7) - CPU flags (eg. ACPI, SSE4) which it might make sense to reflect in the libvirt XML of the virtual machine we create. The old version of virt-p2v is pretty simplistic about this. It generates *only* an i386 or x86-64 VM, and the only flags it considers are 'apic', 'acpi', 'pae' and 'lm' [the latter to distinguish between 32 and 64 bit x86]. What should the new version do? Particular questions: - Should we try to reflect the CPU type of the physical machine in the virtual machine? eg. If it's an Opteron, we generate an Opteron target machine. (I believe the answer is *no*, because this is not live migration, and most guests can boot on any compatible CPU). - How can I ask libvirt to give me the best possible CPU, and not some baseline? Normally I use host-model, but I think that prevents migration. - What CPU flags should be reflected in the target libvirt XML? - Is it worth modelling CPU thread layout? (I suspect this will be a lot of work with the potential to break things rather than provide any measurable benefits.) - Is there anything else I haven't thought about? However the overriding rule is: - We *must not* end up with a target virtual machine which doesn't work! Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into KVM guests. http://libguestfs.org/virt-v2v

2 4

[libvirt] Reg : failing to attach iscsi disk from virsh to running VM on xen
by Prapulla Kumar 02 May '14

02 May '14

Hi , For attaching iSCSI disk I have tried like this *iscsi target side :* * 1 created an iqn number* #tgtadm --lld iscsi --op new --mode target --tid 1 -T iqn.2009-06.com.eucalyptus.cluster1:store1 * 2. added one lun to it* #tgtadm --lld iscsi --op new --mode logicalunit --tid 1 --lun 1 -b /fs.iscsi.disk * 3.To enable the target to accept any initiators, enter:* #tgtadm --lld iscsi --op bind --mode target --tid 1 -I ALL * 4.To view the current configuration, enter:* #tgtadm --lld iscsi --op show --mode target *iscsi initaitor side (where libvirt and xen is running)* * 1. to** scan for the newly created target* * #*iscsiadm -m discovery -t sendtargets -p 192.168.53.14 * 2. created pool file * <pool type="iscsi"> <name>sample3</name> <source> <host name="192.168.53.14"/> <device path="iqn.2009-06.com.eucalyptus.cluster1:store1"/> </source> <target> <path>/dev/disk/by-path</path> </target> </pool> * 3.*#virsh pool-define sample_pool.xml #virsh pool-start sample3 then it created one link like this at */dev/disk/by-path/* *ip-192.168.53.14:3260-iscsi-iqn.2009-06.com.eucalyptus.cluster1:store1-lun-1 -> ../../sdb* 4. I have attached using virsh attach-disk #virsh attach-disk 1 /dev/sdb xvdb It is attached successfully , I console in vm I have checked . But while using with eucalyptus,It is not attching. I'm using eucalyptus 3.4.2 , libvirt 1.2.3 with xen4.3.1 to attach volume to vm . eucalyptus attaching volume is done through iscsi disk , intermediate files are created while attaching volume in xml format as below. *File 1:* <?xml version="1.0" encoding="UTF-8"?> <disk type="block"> <driver cache="none" name="phy"/> <source dev="/dev/disk/by-id/scsi-1IET_00230001"/> <target dev="sdf" bus="scsi"/> <serial>vol-759A3CDB-dev-sdf</serial> </disk> *File 2:* <?xml version="1.0" encoding="UTF-8"?> <volume> <hypervisor type="xen" capability="xen+hw" bitness="64"/> <id>vol-759A3CDB</id> <user>AIDOMCCNSP7YNR7IEZEUX</user> <instancePath>/usr/local/eucalyptus/work/AIDOMCCNSP7YNR7IEZEUX/i-ED153F84</instancePath> <os platform="linux" virtioRoot="false" virtioDisk="false" virtioNetwork="false"/> <backing> <root type="image"/> </backing> <diskPath targetDeviceType="disk" targetDeviceName="sdf" targetDeviceBus="scsi" sourceType="block" serial="vol-759A3CDB-dev-sdf">/dev/disk/by-id/scsi-1IET_00230001</diskPath> </volume> *in libvirtd.log i'm getting* *error : libxlDomainAttachDeviceDiskLive:2567 : unsupported configuration: disk bus 'scsi' cannot be hotplugged.* Can u suggest how to enable or patch to scsi hotplug from libvirt which support for xen. Can u say the meaning of PATCH 11/12 what is 11/12 means. eg ; [libvirt] [PATCH 11/12] Properly support SCSI drive hotplug With Regards Prapulla Kumar R

1 0

[libvirt] qemu: managedsave vs. save
by Richard Weinberger 02 May '14

02 May '14

Hi! My KVM hosts share the same filesystem and I'm facing an issue using managedsave. If I save vmX using managedsave on hostA and restore it later using "virsh restore" in hostB the qemu process consumes 100% CPU and makes no progress. On the other hand, if I save vmX using save the restore works fine on hostB. Why can't I restore vms saved by managedsave using restore? Or is this a known issue on libvirt-0.10.X (CentOS 6)? -- Thanks, //richard

3 9

[libvirt] [PATCHv2] storageVolCreateXMLFrom: Allow multiple accesses to origvol
by Michal Privoznik 02 May '14

02 May '14

When creating a new volume, it is possible to copy data into it from another already existing volume (referred to as @origvol). Obviously, the read-only access to @origvol is required, which is thread safe (probably not performance-wise though). However, with current code both @newvol and @origvol are marked as building for the time of copying data from the @origvol to @newvol. The rationale behind is to disallow some operations on both @origvol and @newvol, e.g. vol-wipe, vol-delete, vol-download. While it makes sense to not allow such operations on partly copied mirror, but it doesn't make sense to disallow the operations on the source (@origvol). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Diff to v1: -introduced a counter in addition to not marking origvol as building src/conf/storage_conf.h | 1 + src/storage/storage_driver.c | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h index 9ad38e1..eae959c 100644 --- a/src/conf/storage_conf.h +++ b/src/conf/storage_conf.h @@ -64,6 +64,7 @@ struct _virStorageVolDef { int type; /* enum virStorageVolType */ unsigned int building; + unsigned int in_use; virStorageVolSource source; virStorageSource target; diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 2cb8347..a953dfd 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1640,7 +1640,7 @@ storageVolDelete(virStorageVolPtr obj, if (virStorageVolDeleteEnsureACL(obj->conn, pool->def, vol) < 0) goto cleanup; - if (vol->building) { + if (vol->building || vol->in_use) { virReportError(VIR_ERR_OPERATION_INVALID, _("volume '%s' is still being allocated."), vol->name); @@ -1912,8 +1912,8 @@ storageVolCreateXMLFrom(virStoragePoolPtr obj, /* Drop the pool lock during volume allocation */ pool->asyncjobs++; - origvol->building = 1; newvol->building = 1; + origvol->in_use++; virStoragePoolObjUnlock(pool); if (origpool) { @@ -1929,7 +1929,7 @@ storageVolCreateXMLFrom(virStoragePoolPtr obj, virStoragePoolObjLock(origpool); storageDriverUnlock(driver); - origvol->building = 0; + origvol->in_use--; newvol->building = 0; allocation = newvol->target.allocation; pool->asyncjobs--; @@ -2010,7 +2010,7 @@ storageVolDownload(virStorageVolPtr obj, if (virStorageVolDownloadEnsureACL(obj->conn, pool->def, vol) < 0) goto cleanup; - if (vol->building) { + if (vol->building || vol->in_use) { virReportError(VIR_ERR_OPERATION_INVALID, _("volume '%s' is still being allocated."), vol->name); @@ -2076,7 +2076,7 @@ storageVolUpload(virStorageVolPtr obj, if (virStorageVolUploadEnsureACL(obj->conn, pool->def, vol) < 0) goto cleanup; - if (vol->building) { + if (vol->building || vol->in_use) { virReportError(VIR_ERR_OPERATION_INVALID, _("volume '%s' is still being allocated."), vol->name); @@ -2167,7 +2167,7 @@ storageVolResize(virStorageVolPtr obj, if (virStorageVolResizeEnsureACL(obj->conn, pool->def, vol) < 0) goto cleanup; - if (vol->building) { + if (vol->building || vol->in_use) { virReportError(VIR_ERR_OPERATION_INVALID, _("volume '%s' is still being allocated."), vol->name); @@ -2474,7 +2474,7 @@ storageVolWipePattern(virStorageVolPtr obj, if (virStorageVolWipePatternEnsureACL(obj->conn, pool->def, vol) < 0) goto cleanup; - if (vol->building) { + if (vol->building || vol->in_use) { virReportError(VIR_ERR_OPERATION_INVALID, _("volume '%s' is still being allocated."), vol->name); -- 1.9.0

2 1

[libvirt] [PATCH] tests: skip virfirewalltest on non-Linux systems
by Roman Bogorodskiy 02 May '14

02 May '14

Currently firewalling is supported on Linux only, so skip the virfirewalltest on other platforms. --- tests/virfirewalltest.c | 58 +++++++++++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 23 deletions(-) diff --git a/tests/virfirewalltest.c b/tests/virfirewalltest.c index 805fa44..af74d57 100644 --- a/tests/virfirewalltest.c +++ b/tests/virfirewalltest.c @@ -24,23 +24,26 @@ #define __VIR_COMMAND_PRIV_H_ALLOW__ #include "testutils.h" -#include "virbuffer.h" -#include "vircommandpriv.h" -#include "virfirewallpriv.h" -#include "virmock.h" -#include "virdbuspriv.h" -#define VIR_FROM_THIS VIR_FROM_FIREWALL +#if defined(__linux__) -#if WITH_DBUS -# include <dbus/dbus.h> -#endif +# include "virbuffer.h" +# include "vircommandpriv.h" +# include "virfirewallpriv.h" +# include "virmock.h" +# include "virdbuspriv.h" + +# define VIR_FROM_THIS VIR_FROM_FIREWALL + +# if WITH_DBUS +# include <dbus/dbus.h> +# endif static bool fwDisabled = true; static virBufferPtr fwBuf; static bool fwError; -#define TEST_FILTER_TABLE_LIST \ +# define TEST_FILTER_TABLE_LIST \ "Chain INPUT (policy ACCEPT)\n" \ "target prot opt source destination\n" \ "\n" \ @@ -50,7 +53,7 @@ static bool fwError; "Chain OUTPUT (policy ACCEPT)\n" \ "target prot opt source destination\n" -#define TEST_NAT_TABLE_LIST \ +# define TEST_NAT_TABLE_LIST \ "Chain PREROUTING (policy ACCEPT)\n" \ "target prot opt source destination\n" \ "\n" \ @@ -63,7 +66,7 @@ static bool fwError; "Chain POSTROUTING (policy ACCEPT)\n" \ "target prot opt source destination\n" -#if WITH_DBUS +# if WITH_DBUS VIR_MOCK_IMPL_RET_ARGS(dbus_connection_send_with_reply_and_block, DBusMessage *, DBusConnection *, connection, @@ -186,7 +189,7 @@ VIR_MOCK_IMPL_RET_ARGS(dbus_connection_send_with_reply_and_block, goto cleanup; } -#endif +# endif struct testFirewallData { virFirewallBackend tryBackend; @@ -1126,7 +1129,7 @@ mymain(void) { int ret = 0; -#define RUN_TEST_DIRECT(name, method) \ +# define RUN_TEST_DIRECT(name, method) \ do { \ struct testFirewallData data; \ data.tryBackend = VIR_FIREWALL_BACKEND_AUTOMATIC; \ @@ -1141,8 +1144,8 @@ mymain(void) ret = -1; \ } while (0) -#if WITH_DBUS -# define RUN_TEST_FIREWALLD(name, method) \ +# if WITH_DBUS +# define RUN_TEST_FIREWALLD(name, method) \ do { \ struct testFirewallData data; \ data.tryBackend = VIR_FIREWALL_BACKEND_AUTOMATIC; \ @@ -1157,13 +1160,13 @@ mymain(void) ret = -1; \ } while (0) -# define RUN_TEST(name, method) \ +# define RUN_TEST(name, method) \ RUN_TEST_DIRECT(name, method); \ RUN_TEST_FIREWALLD(name, method) -#else /* ! WITH_DBUS */ -# define RUN_TEST(name, method) \ +# else /* ! WITH_DBUS */ +# define RUN_TEST(name, method) \ RUN_TEST_DIRECT(name, method) -#endif /* ! WITH_DBUS */ +# endif /* ! WITH_DBUS */ RUN_TEST("single group", testFirewallSingleGroup); RUN_TEST("remove rule", testFirewallRemoveRule); @@ -1179,8 +1182,17 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -#if WITH_DBUS +# if WITH_DBUS VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virmockdbus.so") -#else +# else VIRT_TEST_MAIN(mymain) -#endif +# endif + +#else /* ! defined (__linux__) */ + +int main(void) +{ + return EXIT_AM_SKIP; +} + +#endif /* ! defined(__linux__) */ -- 1.9.0

5 8

[libvirt] [PATCH] Restore skipping of setting capacity
by John Ferlan 02 May '14

02 May '14

Commit id 'ac9a0963' refactored out the 'withCapacity' for the virStorageBackendUpdateVolInfo() API. See: http://www.redhat.com/archives/libvir-list/2014-April/msg00043.html This resulted in a difference in how 'virsh vol-info --pool <poolName> <volume>' or 'virsh vol-list vol-list --pool <poolName> --details' outputs the capacity information for a directory pool with a qcow2 sparse file. For example, using the following XML mkdir /home/TestPool cat testpool.xml <pool type='dir'> <name>TestPool</name> <uuid>6bf80895-10b6-75a6-6059-89fdea2aefb7</uuid> <source> </source> <target> <path>/home/TestPool</path> <permissions> <mode>0755</mode> <owner>0</owner> <group>0</group> </permissions> </target> </pool> virsh pool-create testpool.xml virsh vol-create-as --pool TestPool temp_vol_1 \ --capacity 1048576 --allocation 1048576 --format qcow2 virsh vol-info --pool TestPool temp_vol_1 Results in listing a Capacity value. Prior to the commit, the value would be '1.0 MiB' (1048576 bytes). However, after the commit the output would be (for example) '192.50 KiB', which for my system was the size of the volume in my file system (eg 'ls -l TestPool/temp_vol_1' results in '197120' bytes or 192.50 KiB). While perhaps technically correct, it's not necessarily what the user expected (certainly virt-test didn't expect it). This patch restores the code to not update the target capacity for this path Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/storage/storage_backend.c | 22 +++++++++++++++------- src/storage/storage_backend.h | 5 ++++- src/storage/storage_backend_disk.c | 2 +- src/storage/storage_backend_fs.c | 11 +++++++---- src/storage/storage_backend_gluster.c | 2 +- src/storage/storage_backend_logical.c | 2 +- src/storage/storage_backend_mpath.c | 2 +- src/storage/storage_backend_scsi.c | 2 +- 8 files changed, 31 insertions(+), 17 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 946196b..afedbf5 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -1403,6 +1403,7 @@ virStorageBackendVolOpen(const char *path, struct stat *sb, int virStorageBackendUpdateVolTargetInfo(virStorageSourcePtr target, + bool updateCapacity, bool withBlockVolFormat, unsigned int openflags) { @@ -1413,7 +1414,8 @@ virStorageBackendUpdateVolTargetInfo(virStorageSourcePtr target, goto cleanup; fd = ret; - if ((ret = virStorageBackendUpdateVolTargetInfoFD(target, fd, &sb)) < 0) + if ((ret = virStorageBackendUpdateVolTargetInfoFD(target, fd, &sb, + updateCapacity)) < 0) goto cleanup; if (withBlockVolFormat) { @@ -1429,18 +1431,21 @@ virStorageBackendUpdateVolTargetInfo(virStorageSourcePtr target, int virStorageBackendUpdateVolInfo(virStorageVolDefPtr vol, + bool updateCapacity, bool withBlockVolFormat, unsigned int openflags) { int ret; if ((ret = virStorageBackendUpdateVolTargetInfo(&vol->target, + updateCapacity, withBlockVolFormat, openflags)) < 0) return ret; if (vol->backingStore.path && (ret = virStorageBackendUpdateVolTargetInfo(&vol->backingStore, + updateCapacity, withBlockVolFormat, VIR_STORAGE_VOL_OPEN_DEFAULT)) < 0) return ret; @@ -1453,15 +1458,15 @@ virStorageBackendUpdateVolInfo(virStorageVolDefPtr vol, * @target: target definition ptr of volume to update * @fd: fd of storage volume to update, via virStorageBackendOpenVol*, or -1 * @sb: details about file (must match @fd, if that is provided) - * @allocation: If not NULL, updated allocation information will be stored - * @capacity: If not NULL, updated capacity info will be stored + * @updateCapacity: If true, updated capacity info will be stored * * Returns 0 for success, -1 on a legitimate error condition. */ int virStorageBackendUpdateVolTargetInfoFD(virStorageSourcePtr target, int fd, - struct stat *sb) + struct stat *sb, + bool updateCapacity) { #if WITH_SELINUX security_context_t filecon = NULL; @@ -1477,10 +1482,12 @@ virStorageBackendUpdateVolTargetInfoFD(virStorageSourcePtr target, /* Regular files may be sparse, so logical size (capacity) is not same * as actual allocation above */ - target->capacity = sb->st_size; + if (updateCapacity) + target->capacity = sb->st_size; } else if (S_ISDIR(sb->st_mode)) { target->allocation = 0; - target->capacity = 0; + if (updateCapacity) + target->capacity = 0; } else if (fd >= 0) { off_t end; /* XXX this is POSIX compliant, but doesn't work for CHAR files, @@ -1496,7 +1503,8 @@ virStorageBackendUpdateVolTargetInfoFD(virStorageSourcePtr target, return -1; } target->allocation = end; - target->capacity = end; + if (updateCapacity) + target->capacity = end; } if (!target->perms && VIR_ALLOC(target->perms) < 0) diff --git a/src/storage/storage_backend.h b/src/storage/storage_backend.h index 5997077..456b9d7 100644 --- a/src/storage/storage_backend.h +++ b/src/storage/storage_backend.h @@ -137,14 +137,17 @@ int virStorageBackendVolOpen(const char *path, struct stat *sb, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); int virStorageBackendUpdateVolInfo(virStorageVolDefPtr vol, + bool updateCapacity, bool withBlockVolFormat, unsigned int openflags); int virStorageBackendUpdateVolTargetInfo(virStorageSourcePtr target, + bool updateCapacity, bool withBlockVolFormat, unsigned int openflags); int virStorageBackendUpdateVolTargetInfoFD(virStorageSourcePtr target, int fd, - struct stat *sb); + struct stat *sb, + bool updateCapacity); char *virStorageBackendStablePath(virStoragePoolObjPtr pool, const char *devpath, diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index 9cebcca..13336fc 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -113,7 +113,7 @@ virStorageBackendDiskMakeDataVol(virStoragePoolObjPtr pool, } /* Refresh allocation/capacity/perms */ - if (virStorageBackendUpdateVolInfo(vol, false, + if (virStorageBackendUpdateVolInfo(vol, true, false, VIR_STORAGE_VOL_OPEN_DEFAULT) < 0) return -1; diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 3694c26..5a2add8 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -84,7 +84,8 @@ virStorageBackendProbeTarget(virStorageSourcePtr target, goto error; /* Take care to propagate ret, it is not always -1 */ fd = ret; - if ((ret = virStorageBackendUpdateVolTargetInfoFD(target, fd, &sb)) < 0) { + if ((ret = virStorageBackendUpdateVolTargetInfoFD(target, fd, + &sb, true)) < 0) { goto error; } @@ -913,7 +914,7 @@ virStorageBackendFileSystemRefresh(virConnectPtr conn ATTRIBUTE_UNUSED, vol->backingStore.format = backingStoreFormat; ignore_value(virStorageBackendUpdateVolTargetInfo( - &vol->backingStore, false, + &vol->backingStore, true, false, VIR_STORAGE_VOL_OPEN_DEFAULT)); /* If this failed, the backing file is currently unavailable, * the capacity, allocation, owner, group and mode are unknown. @@ -1190,8 +1191,10 @@ virStorageBackendFileSystemVolRefresh(virConnectPtr conn, { int ret; - /* Refresh allocation / permissions info in case its changed */ - ret = virStorageBackendUpdateVolInfo(vol, false, + /* Refresh allocation / permissions info in case its changed + * don't update the capacity value for this pass + */ + ret = virStorageBackendUpdateVolInfo(vol, false, false, VIR_STORAGE_VOL_FS_OPEN_FLAGS); if (ret < 0) return ret; diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_backend_gluster.c index e0a25df..28db909 100644 --- a/src/storage/storage_backend_gluster.c +++ b/src/storage/storage_backend_gluster.c @@ -267,7 +267,7 @@ virStorageBackendGlusterRefreshVol(virStorageBackendGlusterStatePtr state, if (VIR_ALLOC(vol) < 0) goto cleanup; - if (virStorageBackendUpdateVolTargetInfoFD(&vol->target, -1, st) < 0) + if (virStorageBackendUpdateVolTargetInfoFD(&vol->target, -1, st, true) < 0) goto cleanup; if (virStorageBackendGlusterSetMetadata(state, vol, name) < 0) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index ed3a012..a597e67 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -149,7 +149,7 @@ virStorageBackendLogicalMakeVol(char **const groups, if (!vol->key && VIR_STRDUP(vol->key, groups[2]) < 0) goto cleanup; - if (virStorageBackendUpdateVolInfo(vol, false, + if (virStorageBackendUpdateVolInfo(vol, true, false, VIR_STORAGE_VOL_OPEN_DEFAULT) < 0) goto cleanup; diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_backend_mpath.c index f0ed189..8c3b0df 100644 --- a/src/storage/storage_backend_mpath.c +++ b/src/storage/storage_backend_mpath.c @@ -60,7 +60,7 @@ virStorageBackendMpathNewVol(virStoragePoolObjPtr pool, if (virAsprintf(&vol->target.path, "/dev/%s", dev) < 0) goto cleanup; - if (virStorageBackendUpdateVolInfo(vol, true, + if (virStorageBackendUpdateVolInfo(vol, true, true, VIR_STORAGE_VOL_OPEN_DEFAULT) < 0) { goto cleanup; } diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c index c448d7f..71bcf56 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -199,7 +199,7 @@ virStorageBackendSCSINewLun(virStoragePoolObjPtr pool, goto free_vol; } - if (virStorageBackendUpdateVolInfo(vol, true, + if (virStorageBackendUpdateVolInfo(vol, true, true, VIR_STORAGE_VOL_OPEN_DEFAULT) < 0) { retval = -1; goto free_vol; -- 1.9.0

3 5

[libvirt] [PATCHv2 0/3] fix virstoragetest failure on 32-bit
by Eric Blake 02 May '14

02 May '14

v1 was here, but it got nacked for being ugly: https://www.redhat.com/archives/libvir-list/2014-April/msg01132.html so in this version, I improved virstring first, then used the new clean function. This is a build-breaker fix, so it deserves to be in 1.2.4; but it is large enough that it needs a review to go in. Eric Blake (3): util: fix uint parsing on 64-bit platforms util: new stricter unsigned int parsing storage: reject negative indices src/libvirt_private.syms | 3 + src/util/virstoragefile.c | 2 +- src/util/virstring.c | 98 +++++++++++++++++++++-- src/util/virstring.h | 14 +++- tests/virstringtest.c | 200 +++++++++++++++++++++++++++++++++++++++++++++- 5 files changed, 307 insertions(+), 10 deletions(-) -- 1.9.0

3 6

[libvirt] [PATCH] tests: don't fail with newer gnutls
by Martin Kletzander 02 May '14

02 May '14

gnutls-3.3.0 and newer leaves 2 FDs open in order to be backwards compatible when it comes to chrooted binaries [1]. Linking commandhelper with gnutls then leaves these two FDs open and commandtest fails thanks to that. This patch does not link commandhelper with libvirt.la, but rather only the utilities making the test pass. Based on suggestion from Daniel [2]. [1] http://lists.gnutls.org/pipermail/gnutls-help/2014-April/003429.html [2] https://www.redhat.com/archives/libvir-list/2014-April/msg01119.html Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: Pushed as a 'build-breaker'. tests/Makefile.am | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 4a5e14b..7ffb44e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -782,7 +782,13 @@ commandtest_LDADD = $(LDADDS) commandhelper_SOURCES = \ commandhelper.c -commandhelper_LDADD = $(LDADDS) +commandhelper_LDADD = \ + $(WARN_CFLAGS) \ + $(NO_INDIRECT_LDFLAGS) \ + $(PROBES_O) \ + ../src/libvirt_util.la \ + $(GNULIB_LIBS) + commandhelper_LDFLAGS = -static virnetdevbandwidthtest_SOURCES = \ -- 1.9.2

1 0