- Devel - libvirt List Archives

[libvirt] [PATCH 0/3 v3] qemu: Hotplug SCSI controllers/hostdevs
by Eric Farman 21 Nov '13

21 Nov '13

Today, hotplug of a SCSI hostdev relies on the presence of an existing SCSI controller, which can be defined in the initial domain XML. Hotplug of a SCSI controller relies on the presence of a PCI bus, which does not work in all environments. These patches correct this behavior, in order to allow hotplug (and unplug) work without incident. Changes from v2->v3: - Patch 2: Combine attach code within QEMU_CAPS_DEVICE check - Patch 2: Restructure detach to cover ..._TYPE_NONE controllers Changes from v1->v2: - Patch 2: Check for VIR_..._TYPE_NONE on controller->info.type - Patch 2: Check device address for TYPE_CCW controllers during detach - Patch 1: Fixed an indentation change that was missed Eric Farman (3): qemu: Rename controller hotplug functions to not be PCI-specific qemu: Separate calls based on controller bus type qemu: Auto-generate controller for hotplugged hostdev src/qemu/qemu_driver.c | 4 +-- src/qemu/qemu_hotplug.c | 62 +++++++++++++++++++++++++++++++++++------------ src/qemu/qemu_hotplug.h | 12 ++++----- 3 files changed, 54 insertions(+), 24 deletions(-) -- 1.7.9.5

2 4

[libvirt] [PATCH] storage: Returns earlier if source adapter of the scsi pool is a HBA
by Osier Yang 21 Nov '13

21 Nov '13

It makes no sense to go forward to get the parent host number of a HBA, and treat the HBA as a vHBA with trying to delete it. --- src/storage/storage_backend_scsi.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c index 1426121..6f86ffc 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -667,6 +667,14 @@ deleteVport(virStoragePoolSourceAdapter adapter) if (adapter.type != VIR_STORAGE_POOL_SOURCE_ADAPTER_TYPE_FC_HOST) return 0; + /* It must be a HBA instead of a vHBA as long as "parent" + * is NULL. "createVport" guaranteed "parent" for a vHBA + * cannot be NULL, it's either specified in XML, or detected + * automatically. + */ + if (!adapter.data.fchost.parent) + return 0; + if (!(virGetFCHostNameByWWN(NULL, adapter.data.fchost.wwnn, adapter.data.fchost.wwpn))) return -1; -- 1.8.1.4

2 2

[libvirt] [RESEND PATCH] qemu: Add support for virt machine type with virtio-mmio devices on armv7
by Clark Laughlin 21 Nov '13

21 Nov '13

These changes allow the correct virtio-blk-device and virtio-net-device devices to be used for the 'virt' machine type for armv7 rather than the PCI virtio devices. A test case was added to qemuxml2argvtest for this change. Signed-off-by: Clark Laughlin <clark.laughlin(a)linaro.org> --- Resend with test case added --- src/qemu/qemu_command.c | 4 +- src/qemu/qemu_domain.c | 3 ++ .../qemuxml2argv-arm-virt-virtio.args | 14 +++++++ .../qemuxml2argv-arm-virt-virtio.xml | 45 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 5 +++ 5 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.xml diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 63e235d..901120e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1335,12 +1335,14 @@ cleanup: return ret; } + static int qemuDomainAssignARMVirtioMMIOAddresses(virDomainDefPtr def, virQEMUCapsPtr qemuCaps) { if (def->os.arch == VIR_ARCH_ARMV7L && - STRPREFIX(def->os.machine, "vexpress-") && + (STRPREFIX(def->os.machine, "vexpress-") || + STREQ(def->os.machine, "virt")) && virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_MMIO)) { qemuDomainPrimeVirtioDeviceAddresses( def, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 81d0ba9..346fec3 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -797,6 +797,9 @@ qemuDomainDefaultNetModel(const virDomainDef *def) if (STREQ(def->os.machine, "versatilepb")) return "smc91c111"; + if (STREQ(def->os.machine, "virt")) + return "virtio"; + /* Incomplete. vexpress (and a few others) use this, but not all * arm boards */ return "lan9118"; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args new file mode 100644 index 0000000..5206ad8 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args @@ -0,0 +1,14 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-arm -S -M virt -m 1024 -smp 1 -nographic \ +-nodefconfig -nodefaults -monitor unix:/tmp/test-monitor,server,nowait \ +-boot c -kernel /arm.kernel -initrd /arm.initrd -append \ +'console=ttyAMA0,115200n8 rw root=/dev/vda rootwait physmap.enabled=0' \ +-dtb /arm.dtb -device virtio-serial-device,id=virtio-serial0 -usb \ +-drive file=/arm.raw,if=none,id=drive-virtio-disk0 \ +-device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \ +-device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \ +-net user,vlan=0,name=hostnet0 -serial pty -chardev pty,id=charconsole1 \ +-device virtconsole,chardev=charconsole1,id=console1 \ +-device virtio-balloon-device,id=balloon0 \ +-object rng-random,id=rng0,filename=/dev/random \ +-device virtio-rng-device,rng=rng0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.xml b/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.xml new file mode 100644 index 0000000..913c96e --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.xml @@ -0,0 +1,45 @@ +<domain type="qemu"> + <name>armtest</name> + <uuid>496d7ea8-9739-544b-4ebd-ef08be936e6a</uuid> + <memory>1048576</memory> + <currentMemory>1048576</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch="armv7l" machine="virt">hvm</type> + <kernel>/arm.kernel</kernel> + <initrd>/arm.initrd</initrd> + <dtb>/arm.dtb</dtb> + <cmdline>console=ttyAMA0,115200n8 rw root=/dev/vda rootwait physmap.enabled=0</cmdline> + </os> + <features> + <acpi/> + <apic/> + <pae/> + </features> + <clock offset="utc"/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-arm</emulator> + <disk type='file' device='disk'> + <source file='/arm.raw'/> + <target dev='vda' bus='virtio'/> + </disk> + <interface type='user'> + <mac address='52:54:00:09:a4:37'/> + <model type='virtio'/> + </interface> + <console type='pty'/> + <console type='pty'> + <target type='virtio' port='0'/> + </console> + <memballoon model='virtio'/> +  + <rng model='virtio'> + <backend model='random'>/dev/random</backend> + </rng> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index b14e713..fde78bc 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1103,6 +1103,11 @@ mymain(void) QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); + DO_TEST("arm-virt-virtio", + QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB, + QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE_VIRTIO_MMIO, + QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); + virObjectUnref(driver.config); virObjectUnref(driver.caps); virObjectUnref(driver.xmlopt); -- 1.8.1.2

2 1

[libvirt] [PATCH 0/3 RESEND] qemu: Hotplug SCSI controllers/hostdevs
by Eric Farman 21 Nov '13

21 Nov '13

(Resending, as this has perhaps been lost during the release of 1.1.3. I've rebased this patch series onto today's git repository.) Today, hotplug of a SCSI hostdev relies on the presence of an existing SCSI controller, which can be defined in the initial domain XML. Hotplug of a SCSI controller relies on the presence of a PCI bus, which does not work in all environments. These patches correct this behavior, in order to allow hotplug (and unplug) work without incident. Reviewed-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> Eric Farman (3): qemu: Rename controller hotplug functions to not be PCI-specific qemu: Separate calls based on controller bus type qemu: Auto-generate controller for hotplugged hostdev src/qemu/qemu_driver.c | 4 +-- src/qemu/qemu_hotplug.c | 62 ++++++++++++++++++++++++++++++++--------------- src/qemu/qemu_hotplug.h | 12 ++++----- 3 files changed, 50 insertions(+), 28 deletions(-) -- 1.7.9.5

4 15

Re: [libvirt] [Users] Time keeping in Windows VM
by Dan Kenigsberg 21 Nov '13

21 Nov '13

On Tue, Nov 19, 2013 at 04:36:24PM +0000, Martin Goldstone wrote: > Hi all, > > We're currently experiencing an issue in our production oVirt 3.2.2 > environment (on CentOS 6.4) with time keeping on our Windows guests. It > seems to have appeared around the time of the recent DST change. It's taken > us a while to get to the bottom of this as some machines were created in > the wrong timezone, which muddied the waters a bit. > > It appears that when Windows automatically updated time in the VMs, this > new offset from UTC was not stored correctly, and the next time the host > was shutdown and started back up, the clock was set incorrectly. We > eventually managed to get this to be consistently reproducible: Set the > clock an hour ahead; power off VM; power it back on; set the clock an hour > back (ie return it to the original time), power off and power back on; > observe that the clock has now shifted to an hour before the original time. > This can be observed in the vm_dynamic table on the database. > > To be honest, I don't think that this an oVirt problem, as I've done some > limited testing on another host using virt-manager/libvirt. If I edit the > xml to set the clock offset to variable, using UTC as the basis and setting > the adjustment to 3600 (mimicking how it would have been before the DST > change), when I change the time in the VM back by an hour (as Windows would > do automatically at DST change), the xml shows a new offset of -3600, so it > seems when the clock is changed the offset it's putting in the XML is the > offset based on the time from when the VM was started, not the offset from > UTC. I believe that you are seeing "Bug 956741 - When RHEL VMs are powered off/on time is off by as much as 3 hrs when system comes back up". http://libvirt.org/html/libvirt-libvirt.html#virConnectDomainEventRTCChange… says that utcoffset is relative to UTC. If it's not so, it's a bug (either in the doc or in the code) so I'm copying libvir-list. Which libvirt and qemu versions do you have? > > Does anyone have any suggestions? At the moment, the only things I can > think of doing are either a) shutting down each VM and setting their offset > to 0 in the vm_dynamic table before starting the back up again or b) > setting the time forward and back an appropriate amount of time so that the > offset becomes 0, shutting the VM down and powering it back on again.

3 2

[libvirt] [PATCH 00/11] enforce comma style
by Eric Blake 21 Nov '13

21 Nov '13

This series was started in part by the current attempts to split out libvirt-python (and consistently using LIBVIR_CHECK_VERSION), and in part by seeing odd spacing in storage_conf.c (which annoyed me enough on my work on gluster). Eric Blake (11): maint: fix comma style issues: nwfilter maint: fix comma style issues: conf maint: fix comma style issues: xen maint: fix comma style issues: qemu maint: fix comma style issues: tests, tools maint: fix comma style issues: util maint: fix comma style issues: python maint: fix comma style issues: vbox maint: fix comma style issues: remaining drivers maint: fix comma style issues: remaining code maint: enforce comma style usage HACKING | 25 ++++++++ build-aux/bracket-spacing.pl | 15 +++-- docs/hacking.html.in | 31 ++++++++++ python/libvirt-override.c | 12 ++-- src/conf/capabilities.c | 2 +- src/conf/domain_conf.c | 4 +- src/conf/network_conf.c | 6 +- src/conf/nwfilter_conf.c | 92 +++++++++++++++-------------- src/conf/storage_conf.c | 97 ++++++++++++++++--------------- src/libxl/libxl_driver.c | 2 +- src/lxc/lxc_container.c | 2 +- src/network/bridge_driver.c | 2 +- src/node_device/node_device_hal.c | 4 +- src/node_device/node_device_udev.c | 2 +- src/nwfilter/nwfilter_ebiptables_driver.c | 40 ++++++------- src/nwfilter/nwfilter_gentech_driver.c | 2 +- src/nwfilter/nwfilter_learnipaddr.c | 2 +- src/openvz/openvz_driver.c | 4 +- src/openvz/openvz_util.c | 3 +- src/qemu/qemu_cgroup.c | 2 +- src/qemu/qemu_command.c | 4 +- src/qemu/qemu_conf.c | 3 +- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_monitor.c | 12 ++-- src/remote/remote_driver.c | 2 +- src/storage/storage_backend_rbd.c | 2 +- src/test/test_driver.c | 12 ++-- src/util/vircommand.c | 4 +- src/util/virlog.c | 2 +- src/util/virnetdevbandwidth.c | 4 +- src/util/virnetdevmacvlan.c | 2 +- src/util/virnetdevvportprofile.c | 2 +- src/util/virnetlink.c | 2 +- src/util/virpci.c | 3 +- src/util/virsysinfo.c | 2 +- src/util/virusb.c | 2 +- src/vbox/vbox_tmpl.c | 27 ++++----- src/xen/xend_internal.c | 2 +- src/xen/xs_internal.c | 4 +- src/xenapi/xenapi_driver.c | 10 ++-- src/xenapi/xenapi_utils.c | 30 +++++----- src/xenxs/xen_sxpr.c | 2 +- src/xenxs/xen_xm.c | 2 +- tests/sysinfotest.c | 3 +- tests/viratomictest.c | 4 +- tests/vircgroupmock.c | 2 +- tools/virsh-domain.c | 2 +- tools/virsh-volume.c | 9 +-- 48 files changed, 290 insertions(+), 216 deletions(-) -- 1.8.3.1

2 23

[libvirt] [PATCH] python: Move examples to python/ for repo breakout
by Doug Goldstein 21 Nov '13

21 Nov '13

In anticipation of the python bindings moving to their own repo and in an effort to preserve history, move the examples within the python/ directory. --- Makefile.am | 3 +-- configure.ac | 2 +- {examples/python => python/examples}/Makefile.am | 1 + {examples/python => python/examples}/README | 0 {examples/python => python/examples}/consolecallback.py | 0 {examples/python => python/examples}/dominfo.py | 0 {examples/python => python/examples}/domrestore.py | 0 {examples/python => python/examples}/domsave.py | 0 {examples/python => python/examples}/domstart.py | 0 {examples/python => python/examples}/esxlist.py | 0 .../domain-events/events-python => python/examples}/event-test.py | 0 {examples/python => python/examples}/topology.py | 0 12 files changed, 3 insertions(+), 3 deletions(-) rename {examples/python => python/examples}/Makefile.am (97%) rename {examples/python => python/examples}/README (100%) rename {examples/python => python/examples}/consolecallback.py (100%) rename {examples/python => python/examples}/dominfo.py (100%) rename {examples/python => python/examples}/domrestore.py (100%) rename {examples/python => python/examples}/domsave.py (100%) rename {examples/python => python/examples}/domstart.py (100%) rename {examples/python => python/examples}/esxlist.py (100%) rename {examples/domain-events/events-python => python/examples}/event-test.py (100%) rename {examples/python => python/examples}/topology.py (100%) diff --git a/Makefile.am b/Makefile.am index 192a378..b84507d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ GENHTML = genhtml SUBDIRS = . gnulib/lib include src daemon tools docs gnulib/tests \ python tests po examples/domain-events/events-c examples/hellolibvirt \ - examples/dominfo examples/domsuspend examples/python examples/apparmor \ + examples/dominfo examples/domsuspend python/examples examples/apparmor \ examples/xml/nwfilter examples/openauth examples/systemtap ACLOCAL_AMFLAGS = -I m4 @@ -40,7 +40,6 @@ EXTRA_DIST = \ Makefile.nonreentrant \ autogen.sh \ cfg.mk \ - examples/domain-events/events-python \ run.in \ AUTHORS.in \ $(XML_EXAMPLES) diff --git a/configure.ac b/configure.ac index 6003871..05a0394 100644 --- a/configure.ac +++ b/configure.ac @@ -2614,6 +2614,7 @@ AC_CONFIG_FILES([\ po/Makefile.in \ include/libvirt/Makefile include/libvirt/libvirt.h \ python/Makefile \ + python/examples/Makefile \ daemon/Makefile \ tools/Makefile \ tests/Makefile \ @@ -2622,7 +2623,6 @@ AC_CONFIG_FILES([\ examples/domsuspend/Makefile \ examples/dominfo/Makefile \ examples/openauth/Makefile \ - examples/python/Makefile \ examples/hellolibvirt/Makefile \ examples/systemtap/Makefile \ examples/xml/nwfilter/Makefile]) diff --git a/examples/python/Makefile.am b/python/examples/Makefile.am similarity index 97% rename from examples/python/Makefile.am rename to python/examples/Makefile.am index 7823c20..0e197d0 100644 --- a/examples/python/Makefile.am +++ b/python/examples/Makefile.am @@ -18,4 +18,5 @@ EXTRA_DIST= \ README \ consolecallback.py \ topology.py \ + event-test.py \ dominfo.py domrestore.py domsave.py domstart.py esxlist.py diff --git a/examples/python/README b/python/examples/README similarity index 100% rename from examples/python/README rename to python/examples/README diff --git a/examples/python/consolecallback.py b/python/examples/consolecallback.py similarity index 100% rename from examples/python/consolecallback.py rename to python/examples/consolecallback.py diff --git a/examples/python/dominfo.py b/python/examples/dominfo.py similarity index 100% rename from examples/python/dominfo.py rename to python/examples/dominfo.py diff --git a/examples/python/domrestore.py b/python/examples/domrestore.py similarity index 100% rename from examples/python/domrestore.py rename to python/examples/domrestore.py diff --git a/examples/python/domsave.py b/python/examples/domsave.py similarity index 100% rename from examples/python/domsave.py rename to python/examples/domsave.py diff --git a/examples/python/domstart.py b/python/examples/domstart.py similarity index 100% rename from examples/python/domstart.py rename to python/examples/domstart.py diff --git a/examples/python/esxlist.py b/python/examples/esxlist.py similarity index 100% rename from examples/python/esxlist.py rename to python/examples/esxlist.py diff --git a/examples/domain-events/events-python/event-test.py b/python/examples/event-test.py similarity index 100% rename from examples/domain-events/events-python/event-test.py rename to python/examples/event-test.py diff --git a/examples/python/topology.py b/python/examples/topology.py similarity index 100% rename from examples/python/topology.py rename to python/examples/topology.py -- 1.8.3.2

1 0

[libvirt] [PATCH] python: add virConnectGetCPUModelNames to skip_impl
by Doug Goldstein 21 Nov '13

21 Nov '13

In commit de51dc9c9, we removed virConnectGetCPUModelNames from skip_impl but without this the module will always generate a symbol for libvirt_virConnectGetCPUModelNames which we don't always want. CC: Giuseppe Scrivano <gscrivan(a)redhat.com> --- I don't really understand the generator enough to know why this was removed but without this change the module will always generate the symbol. Maybe someone more knowledgable with the code can explain? I've CC'd the original author as well. --- python/generator.py | 1 + 1 file changed, 1 insertion(+) diff --git a/python/generator.py b/python/generator.py index 87ecf5a..99bf965 100755 --- a/python/generator.py +++ b/python/generator.py @@ -450,6 +450,7 @@ skip_impl = ( 'virNodeGetCPUMap', 'virDomainMigrate3', 'virDomainMigrateToURI3', + 'virConnectGetCPUModelNames', ) lxc_skip_impl = ( -- 1.8.3.2

2 2

[libvirt] [PATCH] libvirt-guests: Run only after libvirtd (bug 906009)
by Cole Robinson 21 Nov '13

21 Nov '13

Possible fix for occasional libvirt-guests failure at boot time. --- tools/libvirt-guests.service.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in index d41bf2b..8153418 100644 --- a/tools/libvirt-guests.service.in +++ b/tools/libvirt-guests.service.in @@ -1,6 +1,6 @@ [Unit] Description=Suspend Active Libvirt Guests -After=syslog.target network.target +After=syslog.target network.target libvirtd.service [Service] EnvironmentFile=-/etc/sysconfig/libvirt-guests -- 1.8.4.2

2 3

[libvirt] [PATCH] spec: fix libvirt-docs subpackage on RHEL
by Michael Chapman 20 Nov '13

20 Nov '13

RHEL's rpmbuild wipes the docdir for a (sub-)package if any %doc directives are present, prior to copying in the marked documentation. This means we can't prepopulate this directory with the HTML documentation during the %install phase. Instead, move the HTML documentation to a temporary directory during %install and mark the contents of this temporary directory with %doc. Signed-off-by: Michael Chapman <mike(a)very.puzzling.org> --- libvirt.spec.in | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 72815f4..a5b01df 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1491,8 +1491,8 @@ rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.lxc rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.uml %endif -mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version} \ - $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-docs-%{version} +# Copied into libvirt-docs subpackage eventually +mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version} libvirt-docs %if %{with_dtrace} %ifarch %{power64} s390x x86_64 ia64 alpha sparc64 @@ -1732,12 +1732,7 @@ fi %files docs %defattr(-, root, root) -%doc AUTHORS ChangeLog.gz NEWS README TODO - -# Website -%dir %{_datadir}/doc/libvirt-docs-%{version} -%dir %{_datadir}/doc/libvirt-docs-%{version}/html -%{_datadir}/doc/libvirt-docs-%{version}/html/* +%doc AUTHORS ChangeLog.gz NEWS README TODO libvirt-docs/* # API docs %dir %{_datadir}/gtk-doc/html/libvirt/ -- 1.8.4.2

2 5