- Devel - libvirt List Archives

[libvirt] [PATCH V1 0/5] Various coverity fixes
by Stefan Berger 04 May '12

04 May '12

Coverity fixes from a previous post split into individual files. Regards, Stefan

3 12

[libvirt] This patch mounts tmpfs on /run iff /run directory exists in libvirt-lxc containers.
by Daniel J Walsh 04 May '12

04 May '12

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 We do not want to share /run with containers in order to prevent information leakage and applications within the containers attempting to communicate with applications outside of the container. It uses the same mount options used for /dev. We also want to bind mount over /var/run directory since this will either be a symbolic link to /run but on some installations /run is bind mounted over /var/run. If we just mount /run we are not guaranteed the /var/run will have the same content. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk+j7skACgkQrlYvE4MpobNSKQCfY2yGP/S+piUJ9VNtSjrliFTp ucAAoLJOazpcZvBRFnQUa7uqhh+tRagb =TjAb -----END PGP SIGNATURE-----

1 0

[libvirt] disable usb?
by Gerd Hoffmann 04 May '12

04 May '12

Hi, Is there some way to disable usb altogether? libvirt used to just pass in '-usb'. With the arrival of usb2 support that changed into '-device uhci,...'. Problem is that this breaks with several machine types such as isapc. '-usb' is silently ignored in case the machine type can't handle usb. '-device uhci,...' leads to an error message though and the guest doesn't start. /me tried "<controller type='usb' model='none'/>" which didn't work. Just removing the controller from the xml doesn't work too, it gets automagically readded. Suggestions? thanks, Gerd

2 1

Re: [libvirt] [Users] Host missing cpuFlags
by Itamar Heim 04 May '12

04 May '12

On 05/04/2012 09:23 AM, ovirt(a)qip.ru wrote: > Engine is incorrectly show cpu name (cluster compatibility is set to 3.1) > > all hosts in my cluster engine are shown as Conroe, but I have 2 hosts > from Nehalem family and 2 from SandyBridge > > this host must be SandyBridge but shown as Conroe vdsm reports the model at the end of the cpuFlags based on libvirt reporting models. cc'ing libvirt list for their thoughts. > > # vdsClient -s 0 getVdsCaps > HBAInventory = {'iSCSI': [{'InitiatorName': > 'iqn.1994-05.com.redhat:7e8ac59efbe0'}], 'FC': []} > ISCSIInitiatorName = iqn.1994-05.com.redhat:7e8ac59efbe0 > bondings = {'bond4': {'addr': '', 'cfg': {}, 'mtu': '1500', 'netmask': > '', 'slaves': [], 'hwaddr': '00:00:00:00:00:00'}, 'bond0': {'addr': '', > 'cfg': {}, 'mtu': '1500', 'netmask': '', 'slaves': [], 'hwaddr': > '00:00:00:00:00:00'}, 'bond1': {'addr': '', 'cfg': {}, 'mtu': '1500', > 'netmask': '', 'slaves': [], 'hwaddr': '00:00:00:00:00:00'}, 'bond2': > {'addr': '', 'cfg': {}, 'mtu': '1500', 'netmask': '', 'slaves': [], > 'hwaddr': '00:00:00:00:00:00'}, 'bond3': {'addr': '', 'cfg': {}, 'mtu': > '1500', 'netmask': '', 'slaves': [], 'hwaddr': '00:00:00:00:00:00'}} > clusterLevels = ['3.0', '3.1'] > cpuCores = 4 > cpuFlags = > fpu,vme,de,pse,tsc,msr,pae,mce,cx8,apic,sep,mtrr,pge,mca,cmov,pat,pse36,clflush,dts,acpi,mmx,fxsr,sse,sse2,ss,ht,tm,pbe,syscall,nx,rdtscp,lm,constant_tsc,arch_perfmon,pebs,bts,rep_good,nopl,xtopology,nonstop_tsc,aperfmperf,pni,pclmulqdq,dtes64,monitor,ds_cpl,vmx,smx,est,tm2,ssse3,cx16,xtpr,pdcm,pcid,sse4_1,sse4_2,x2apic,popcnt,tsc_deadline_timer,aes,xsave,avx,lahf_lm,ida,arat,epb,xsaveopt,pln,pts,dts,tpr_shadow,vnmi,flexpriority,ept,vpid,model_coreduo,model_Conroe > cpuModel = Intel(R) Core(TM) i5-2400 CPU @ 3.10GHz > cpuSockets = 1 > cpuSpeed = 1600.000 > emulatedMachines = ['pc-0.14', 'pc', 'fedora-13', 'pc-0.13', 'pc-0.12', > 'pc-0.11', 'pc-0.10', 'isapc', 'pc-0.14', 'pc', 'fedora-13', 'pc-0.13', > 'pc-0.12', 'pc-0.11', 'pc-0.10', 'isapc'] > guestOverhead = 65 > hooks = {} > kvmEnabled = true > lastClient = 192.168.131.42 > lastClientIface = ovirtmgmt > management_ip = > memSize = 16032 > networks = {'ovirtmgmt': {'addr': '192.168.130.73', 'cfg': {'DELAY': > '0', 'NM_CONTROLLED': 'no', 'BOOTPROTO': 'dhcp', 'DEVICE': 'ovirtmgmt', > 'TYPE': 'Bridge', 'ONBOOT': 'yes'}, 'mtu': '1500', 'netmask': > '255.255.0.0', 'stp': 'off', 'bridged': 'True', 'gateway': > '192.168.131.17', 'ports': ['p6p1']}, 'Storage': {'addr': > '172.16.0.100', 'cfg': {'IPADDR': '172.16.0.100', 'DELAY': '0', > 'NETMASK': '255.255.255.0', 'STP': 'no', 'DEVICE': 'Storage', 'TYPE': > 'Bridge', 'ONBOOT': 'yes'}, 'mtu': '1500', 'netmask': '255.255.255.0', > 'stp': 'off', 'bridged': 'True', 'gateway': '0.0.0.0', 'ports': ['p4p1']}} > nics = {'p4p1': {'hwaddr': '00:1B:21:1D:B6:E2', 'netmask': '', 'speed': > 1000, 'addr': '', 'mtu': '1500'}, 'p6p1': {'hwaddr': > '54:04:A6:A1:BA:39', 'netmask': '', 'speed': 1000, 'addr': '', 'mtu': > '1500'}} > operatingSystem = {'release': '1', 'version': '16', 'name': 'oVirt Node'} > packages2 = {'kernel': {'release': '6.fc16.x86_64', 'buildtime': > 1334997800.0, 'version': '3.3.2'}, 'spice-server': {'release': '1.fc16', > 'buildtime': '1327339129', 'version': '0.10.1'}, 'vdsm': {'release': > '0.161.git094ec00.fc16', 'buildtime': '1336045451', 'version': '4.9.6'}, > 'qemu-kvm': {'release': '4.fc16', 'buildtime': '1327954752', 'version': > '0.15.1'}, 'libvirt': {'release': '1.fc16', 'buildtime': '1336048215', > 'version': '0.9.11.3'}, 'qemu-img': {'release': '4.fc16', 'buildtime': > '1327954752', 'version': '0.15.1'}} > reservedMem = 321 > software_revision = 0 > software_version = 4.9 > supportedProtocols = ['2.2', '2.3'] > supportedRHEVMs = ['3.0'] > uuid = 1C8F4D00-5BCB-11D9-8A55-5404A6A1BA39_00:1B:21:1D:B6:E2 > version_name = Snow Man > vlans = {} > vmTypes = ['kvm'] > > > > this host must be Nehalem but shown as Conroe > > # vdsClient -s 0 getVdsCaps > HBAInventory = {'iSCSI': [{'InitiatorName': > 'iqn.1994-05.com.redhat:972b88629c1'}], 'FC': []} > ISCSIInitiatorName = iqn.1994-05.com.redhat:972b88629c1 > bondings = {'bond4': {'addr': '', 'cfg': {}, 'mtu': '1500', 'netmask': > '', 'slaves': [], 'hwaddr': '00:00:00:00:00:00'}, 'bond0': {'addr': '', > 'cfg': {}, 'mtu': '1500', 'netmask': '', 'slaves': [], 'hwaddr': > '00:00:00:00:00:00'}, 'bond1': {'addr': '', 'cfg': {}, 'mtu': '1500', > 'netmask': '', 'slaves': [], 'hwaddr': '00:00:00:00:00:00'}, 'bond2': > {'addr': '', 'cfg': {}, 'mtu': '1500', 'netmask': '', 'slaves': [], > 'hwaddr': '00:00:00:00:00:00'}, 'bond3': {'addr': '', 'cfg': {}, 'mtu': > '1500', 'netmask': '', 'slaves': [], 'hwaddr': '00:00:00:00:00:00'}} > clusterLevels = ['3.0', '3.1'] > cpuCores = 8 > cpuFlags = > fpu,vme,de,pse,tsc,msr,pae,mce,cx8,apic,sep,mtrr,pge,mca,cmov,pat,pse36,clflush,dts,acpi,mmx,fxsr,sse,sse2,ss,ht,tm,pbe,syscall,nx,pdpe1gb,rdtscp,lm,constant_tsc,arch_perfmon,pebs,bts,rep_good,nopl,xtopology,nonstop_tsc,aperfmperf,pni,dtes64,monitor,ds_cpl,vmx,smx,est,tm2,ssse3,cx16,xtpr,pdcm,pcid,dca,sse4_1,sse4_2,popcnt,lahf_lm,ida,arat,epb,dts,tpr_shadow,vnmi,flexpriority,ept,vpid,model_coreduo,model_Conroe > cpuModel = Intel(R) Xeon(R) CPU E5620 @ 2.40GHz > cpuSockets = 2 > cpuSpeed = 1600.000 > emulatedMachines = ['pc-0.14', 'pc', 'fedora-13', 'pc-0.13', 'pc-0.12', > 'pc-0.11', 'pc-0.10', 'isapc', 'pc-0.14', 'pc', 'fedora-13', 'pc-0.13', > 'pc-0.12', 'pc-0.11', 'pc-0.10', 'isapc'] > guestOverhead = 65 > hooks = {} > kvmEnabled = true > lastClient = 192.168.131.42 > lastClientIface = ovirtmgmt > management_ip = > memSize = 36200 > networks = {'ovirtmgmt': {'addr': '192.168.131.46', 'cfg': {'DELAY': > '0', 'NM_CONTROLLED': 'no', 'BOOTPROTO': 'dhcp', 'DEVICE': 'ovirtmgmt', > 'TYPE': 'Bridge', 'ONBOOT': 'yes'}, 'mtu': '1500', 'netmask': > '255.255.0.0', 'stp': 'off', 'bridged': 'True', 'gateway': > '192.168.131.17', 'ports': ['em1']}, 'Storage': {'addr': '172.16.0.104', > 'cfg': {'IPADDR': '172.16.0.104', 'DELAY': '0', 'NM_CONTROLLED': 'no', > 'NETMASK': '255.255.255.0', 'STP': 'no', 'DEVICE': 'Storage', 'TYPE': > 'Bridge', 'ONBOOT': 'yes'}, 'mtu': '1500', 'netmask': '255.255.255.0', > 'stp': 'off', 'bridged': 'True', 'gateway': '0.0.0.0', 'ports': ['em2']}} > nics = {'em1': {'hwaddr': '00:25:90:66:53:E8', 'netmask': '', 'speed': > 1000, 'addr': '', 'mtu': '1500'}, 'em2': {'hwaddr': '00:25:90:66:53:E9', > 'netmask': '', 'speed': 100, 'addr': '', 'mtu': '1500'}} > operatingSystem = {'release': '1', 'version': '16', 'name': 'oVirt Node'} > packages2 = {'kernel': {'release': '6.fc16.x86_64', 'buildtime': > 1334997800.0, 'version': '3.3.2'}, 'spice-server': {'release': '1.fc16', > 'buildtime': '1327339129', 'version': '0.10.1'}, 'vdsm': {'release': > '0.155.git457d1a0.fc16', 'buildtime': '1335883691', 'version': '4.9.6'}, > 'qemu-kvm': {'release': '4.fc16', 'buildtime': '1327954752', 'version': > '0.15.1'}, 'libvirt': {'release': '1.fc16', 'buildtime': '1335356374', > 'version': '0.9.11'}, 'qemu-img': {'release': '4.fc16', 'buildtime': > '1327954752', 'version': '0.15.1'}} > reservedMem = 321 > software_revision = 0 > software_version = 4.9 > supportedProtocols = ['2.2', '2.3'] > supportedRHEVMs = ['3.0'] > uuid = 49434D53-0200-9066-2500-66902500E853_00:25:90:66:53:E8 > version_name = Snow Man > vlans = {} > vmTypes = ['kvm'] > > > > Птн 04 Май 2012 09:14:22 +0400, Itamar Heim <iheim(a)redhat.com> написал: > > On 05/04/2012 06:49 AM, Nicholas Kesick wrote: > > I managed to get a host successfully added into oVirt Manager > (Fedora16 > > minimum install, then used the wiki RPM install method), but the > last > > event reports "Host <hostname> moved to Non-operational state as > host > > does not meet the cluster's minimum CPU level. Missing CPU features: > > CpuFlags" > > > > Can anyone shine some light on the problem? The CPU does support > > virtualization... and as far as I can tell from cat /proc/cpuinfo > does > > does have cpu flags. > > flags : fpu vme de pse tsc msr *pae* mce cx8 apic sep mtrr pge > mca cmov > > pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall > nx lm > > constant_tsc pebs bts nopl pni dtes64 monitor ds_cpl *vmx* est > cid cx16 > > xtpr pdcm lahf_lm tpr_shadow > > what is the cpu level of the cluster? > what cluster compatibility level? > what does vdsClient -s 0 getVdsCaps shows for cpu flags? > > > > > Many thanks > > - Nick > > > > > > _______________________________________________ > > Users mailing list > > Users(a)ovirt.org > > nicspellword"="">ovirt.org/mailman/listinfo/users" title="Открыть > внешнюю ссылку">http://lists.ovirt.org/mailman/listinfo/users > <http://lists.%3Cspan%20class=> > > _______________________________________________ > Users mailing list > Users(a)ovirt.org > nicspellword"="">ovirt.org/mailman/listinfo/users" title="Открыть > внешнюю ссылку">http://lists.ovirt.org/mailman/listinfo/users > <http://lists.%3Cspan%20class=> > > > > -- >

2 1

[libvirt] [PATCH v3 0/3] usb devices with same vendorID, productID hotplug support
by Guannan Ren 04 May '12

04 May '12

https://bugzilla.redhat.com/show_bug.cgi?id=815755 The set of patch tries to fix the issue when multiple usb devices with same idVendor, idProduct are availible on host, the usb device with lowest bus:device will be attached to guest if usb xml file is given like this: <hostdev mode='subsystem' type='usb' managed='yes'> <source> <vendor id='0x15e1'/> <product id='0x2007'/> </source> </hostdev> The reason is that the usb hotplug function searchs usb device in system files to match vendor and product id, the file with lowest number is always found first. After fix, in this case, libvirt will report an error like: # virsh attach-device rhel6u1 /tmp/usb.xml error: Failed to attach device from /tmp/usb.xml error: operation failed: multiple USB devices for 15e1:2007, use <address> to specify one At the same time, the usb part of domain initilization is also updated in patch 2/3 These patches also fix the problem when using the following xml, the usb device could be hotplugged in two domains without raising errors <hostdev mode='subsystem' type='usb' managed='yes'> <source> <address bus='6' device='7'/> </source> </hostdev> # virsh attach-device rhel6u12nd /tmp/usb_by_bus.xml error: Failed to attach device from /tmp/usb_by_bus.xml error: Requested operation is not valid: USB device 006:007 is in use by domain rhel6u1

3 8

[libvirt] [PATCH 1/2] coverity: fix memory leak in error path in virnetlink.c
by Guannan Ren 04 May '12

04 May '12

--- src/util/virnetlink.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index b2e9d51..e199d62 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -340,8 +340,10 @@ virNetlinkEventServiceStart(void) goto error; } - if (virMutexInit(&srv->lock) < 0) + if (virMutexInit(&srv->lock) < 0) { + VIR_FREE(srv); goto error; + } virNetlinkEventServerLock(srv); -- 1.7.7.5

3 4

[libvirt] [PATCH 0/7] Fix resource leaks detected by coverity
by Osier Yang 04 May '12

04 May '12

RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=771021 For more details, please refer to the coverity logs attached in the BZ. There is still one error which I don't understand: Error: RESOURCE_LEAK: /builddir/build/BUILD/libvirt-0.9.10/src/uml/uml_driver.c:325: alloc_fn: Calling allocation function "virDomainEventNewFromObj". /builddir/build/BUILD/libvirt-0.9.10/src/conf/domain_event.c:723: alloc_fn: Storage is returned from allocation function "virDomainEventNewFromDef". /builddir/build/BUILD/libvirt-0.9.10/src/conf/domain_event.c:728: alloc_fn: Storage is returned from allocation function "virDomainEventNew". /builddir/build/BUILD/libvirt-0.9.10/src/conf/domain_event.c:705: alloc_fn: Storage is returned from allocation function "virDomainEventNewInternal". /builddir/build/BUILD/libvirt-0.9.10/src/conf/domain_event.c:684: alloc_arg: "virAlloc" allocates memory that is stored into "event". /builddir/build/BUILD/libvirt-0.9.10/src/util/memory.c:101: alloc_fn: Storage is returned from allocation function "calloc". /builddir/build/BUILD/libvirt-0.9.10/src/util/memory.c:101: var_assign: Assigning: "*((void **)ptrptr)" = "calloc(1UL, size)". /builddir/build/BUILD/libvirt-0.9.10/src/conf/domain_event.c:698: return_alloc: Returning allocated memory "event". /builddir/build/BUILD/libvirt-0.9.10/src/conf/domain_event.c:705: var_assign: Assigning: "event" = "virDomainEventNewInternal(0, id, name, uuid)". /builddir/build/BUILD/libvirt-0.9.10/src/conf/domain_event.c:713: return_alloc: Returning allocated memory "event". /builddir/build/BUILD/libvirt-0.9.10/src/conf/domain_event.c:728: return_alloc_fn: Directly returning storage allocated by "virDomainEventNew". /builddir/build/BUILD/libvirt-0.9.10/src/conf/domain_event.c:723: return_alloc_fn: Directly returning storage allocated by "virDomainEventNewFromDef". /builddir/build/BUILD/libvirt-0.9.10/src/uml/uml_driver.c:325: var_assign: Assigning: "event" = storage returned from "virDomainEventNewFromObj(dom, 5, 0)". /builddir/build/BUILD/libvirt-0.9.10/src/uml/uml_driver.c:325: overwrite_var: Overwriting "event" in call "event = virDomainEventNewFromObj(dom, 5, 0)" leaks the storage that "event" points to. I can't see how it's overwrote. And I'd persuade myself it's mistake of coverage. But appreciated if anybody could kill it if I blindly bypass the porblem. Osier Yang (7): Coverity: Fix the forward_null error in Python binding codes Coverity: Fix resource leaks in phyp driver Coverity: Fix resource leak in esx driver Coverity: Fix resource leak in xen driver Coverity: Fix resource leak in test driver Coverity: Fix resource leak in nodeinfo.c Coverity: Fix resource leak in virnetlink.c python/libvirt-override.c | 10 +++++----- src/esx/esx_vi.c | 4 ++++ src/nodeinfo.c | 1 + src/phyp/phyp_driver.c | 34 ++++++++++++++++++++-------------- src/test/test_driver.c | 1 + src/util/virnetlink.c | 9 +++++---- src/xen/xen_hypervisor.c | 5 +++-- src/xen/xen_inotify.c | 1 + 8 files changed, 40 insertions(+), 25 deletions(-) Regards, Osier -- 1.7.7.3

4 19

[libvirt] [PATCH 2/2] Modify interface qemuDefaultScsiControllerModel().
by Li Zhang 04 May '12

04 May '12

Now, the libvirt sets the default module as 'ibmvscsi' for pseries, and 'lsi' for other platforms.The controller model should be set according to controller type, not only just the platform, otherwise, it will have to set controller's model externally to select right model for specific controller type. This patch is to modify the qemuDefaultScsiControllerModel() interface to set right controller model according to the controller's type. For pseries guest, PCI scsi controller is also supported. So the default scsi controller model is set according to the contrller type. If it is PCI scsi controller, the default model is set as lsi, and if it is VSCSI controller, the default model is set as ibmvscsi. Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- src/conf/domain_conf.c | 4 ++-- src/qemu/qemu_command.c | 51 +++++++++++++++++++++++++++++++---------------- src/qemu/qemu_command.h | 3 +-- src/qemu/qemu_hotplug.c | 2 +- 4 files changed, 38 insertions(+), 22 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 99005b7..44130c7 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4097,7 +4097,7 @@ virDomainControllerDefParseXML(xmlNodePtr node, def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO && def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Controllers must use the 'pci' address type")); + _("Controllers must use the 'pci' or 'spapr-vio' address type")); goto error; } @@ -4549,7 +4549,7 @@ virDomainNetDefParseXML(virCapsPtr caps, def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO && def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Network interfaces must use 'pci' address type")); + _("Network interfaces must use 'pci' or 'spapr-vio' address type")); goto error; } diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index bb3be17..d31dae2 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -463,9 +463,8 @@ static int qemuAssignDeviceDiskAliasFixed(virDomainDiskDefPtr disk) } static int -qemuDefaultScsiControllerModel(virDomainDefPtr def) { - if (STREQ(def->os.arch, "ppc64") && - STREQ(def->os.machine, "pseries")) { +qemuDefaultScsiControllerModel(int ctlType) { + if (ctlType == VIR_DOMAIN_CONTROLLER_TYPE_VSCSI) { return VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI; } else { return VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC; @@ -479,19 +478,30 @@ qemuAssignDeviceDiskAliasCustom(virDomainDefPtr def, { const char *prefix = virDomainDiskBusTypeToString(disk->bus); int controllerModel = -1; + int controllerType = -1; if (disk->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE) { if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI) { - controllerModel = - virDomainDiskFindControllerModel(def, disk, - VIR_DOMAIN_CONTROLLER_TYPE_SCSI); + controllerType = VIR_DOMAIN_CONTROLLER_TYPE_SCSI; + } else if (disk->bus == VIR_DOMAIN_DISK_BUS_VSCSI) { + controllerType = VIR_DOMAIN_CONTROLLER_TYPE_VSCSI; + } else { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Unsupported disk bus type '%s'"), + virDomainDiskBusTypeToString(disk->bus)); + return -1; } + controllerModel = + virDomainDiskFindControllerModel(def, disk, + controllerType); + if (controllerModel == -1 || controllerModel == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_AUTO) - controllerModel = qemuDefaultScsiControllerModel(def); + controllerModel = qemuDefaultScsiControllerModel(controllerType); - if (disk->bus != VIR_DOMAIN_DISK_BUS_SCSI || + if ((disk->bus != VIR_DOMAIN_DISK_BUS_SCSI && + disk->bus != VIR_DOMAIN_DISK_BUS_VSCSI) || controllerModel == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC) { if (virAsprintf(&disk->info.alias, "%s%d-%d-%d", prefix, disk->info.addr.drive.controller, @@ -2173,6 +2183,7 @@ qemuBuildDriveDevStr(virDomainDefPtr def, const char *bus = virDomainDiskQEMUBusTypeToString(disk->bus); int idx = virDiskNameToIndex(disk->dst); int controllerModel; + int controllerType; if (idx < 0) { qemuReportError(VIR_ERR_INTERNAL_ERROR, @@ -2236,12 +2247,18 @@ qemuBuildDriveDevStr(virDomainDefPtr def, } } - controllerModel = - virDomainDiskFindControllerModel(def, disk, - VIR_DOMAIN_CONTROLLER_TYPE_SCSI); + if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI) + controllerType = VIR_DOMAIN_CONTROLLER_TYPE_SCSI; + else + controllerType = VIR_DOMAIN_CONTROLLER_TYPE_VSCSI; + + controllerModel = + virDomainDiskFindControllerModel(def, disk, + controllerType); + if (controllerModel == -1 || controllerModel == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_AUTO) - controllerModel = qemuDefaultScsiControllerModel(def); + controllerModel = qemuDefaultScsiControllerModel(controllerType); if (controllerModel == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC) { if (disk->info.addr.drive.target != 0) { @@ -2547,8 +2564,7 @@ qemuBuildUSBControllerDevStr(virDomainControllerDefPtr def, } char * -qemuBuildControllerDevStr(virDomainDefPtr domainDef, - virDomainControllerDefPtr def, +qemuBuildControllerDevStr(virDomainControllerDefPtr def, virBitmapPtr qemuCaps, int *nusbcontroller) { @@ -2557,10 +2573,11 @@ qemuBuildControllerDevStr(virDomainDefPtr domainDef, switch (def->type) { case VIR_DOMAIN_CONTROLLER_TYPE_SCSI: + case VIR_DOMAIN_CONTROLLER_TYPE_VSCSI: model = def->model; if (model == -1 || model == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_AUTO) { - model = qemuDefaultScsiControllerModel(domainDef); + model = qemuDefaultScsiControllerModel(def->type); } switch (model) { case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI: @@ -4551,7 +4568,7 @@ qemuBuildCommandLine(virConnectPtr conn, char *devstr; virCommandAddArg(cmd, "-device"); - if (!(devstr = qemuBuildControllerDevStr(def, cont, qemuCaps, NULL))) + if (!(devstr = qemuBuildControllerDevStr(cont, qemuCaps, NULL))) goto error; virCommandAddArg(cmd, devstr); @@ -4570,7 +4587,7 @@ qemuBuildCommandLine(virConnectPtr conn, virCommandAddArg(cmd, "-device"); char *devstr; - if (!(devstr = qemuBuildControllerDevStr(def, def->controllers[i], qemuCaps, + if (!(devstr = qemuBuildControllerDevStr(def->controllers[i], qemuCaps, &usbcontroller))) goto error; diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 1eafeb3..13d9cb8 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -97,8 +97,7 @@ char * qemuBuildDriveDevStr(virDomainDefPtr def, char * qemuBuildFSDevStr(virDomainFSDefPtr fs, virBitmapPtr qemuCaps); /* Current, best practice */ -char * qemuBuildControllerDevStr(virDomainDefPtr domainDef, - virDomainControllerDefPtr def, +char * qemuBuildControllerDevStr(virDomainControllerDefPtr def, virBitmapPtr qemuCaps, int *nusbcontroller); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 7cf7b90..5b1dee2 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -340,7 +340,7 @@ int qemuDomainAttachPciControllerDevice(struct qemud_driver *driver, goto cleanup; } - if (!(devstr = qemuBuildControllerDevStr(vm->def, controller, priv->qemuCaps, NULL))) { + if (!(devstr = qemuBuildControllerDevStr(controller, priv->qemuCaps, NULL))) { goto cleanup; } } -- 1.7.9.5

1 0

[libvirt] [PATCH 1/1] Correct indent errors in the function qemuDomainNetsRestart
by Li Zhang 04 May '12

04 May '12

There are three spapces for a indent every line in the function qemuDomainNetsRestart. This patch is to correct it. Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- src/qemu/qemu_driver.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 86e82d6..bed8edb 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -420,28 +420,28 @@ static void qemuDomainNetsRestart(void *payload, const void *name ATTRIBUTE_UNUSED, void *data ATTRIBUTE_UNUSED) { - int i; - virDomainObjPtr vm = (virDomainObjPtr)payload; - virDomainDefPtr def = vm->def; - - virDomainObjLock(vm); - - for (i = 0; i < def->nnets; i++) { - virDomainNetDefPtr net = def->nets[i]; - if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_DIRECT && - virDomainNetGetActualDirectMode(net) == VIR_NETDEV_MACVLAN_MODE_VEPA) { - VIR_DEBUG("VEPA mode device %s active in domain %s. Reassociating.", - net->ifname, def->name); - ignore_value(virNetDevMacVLanRestartWithVPortProfile(net->ifname, - net->mac, - virDomainNetGetActualDirectDev(net), - def->uuid, - virDomainNetGetActualVirtPortProfile(net), - VIR_NETDEV_VPORT_PROFILE_OP_CREATE)); - } - } + int i; + virDomainObjPtr vm = (virDomainObjPtr)payload; + virDomainDefPtr def = vm->def; + + virDomainObjLock(vm); - virDomainObjUnlock(vm); + for (i = 0; i < def->nnets; i++) { + virDomainNetDefPtr net = def->nets[i]; + if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_DIRECT && + virDomainNetGetActualDirectMode(net) == VIR_NETDEV_MACVLAN_MODE_VEPA) { + VIR_DEBUG("VEPA mode device %s active in domain %s. Reassociating.", + net->ifname, def->name); + ignore_value(virNetDevMacVLanRestartWithVPortProfile(net->ifname, + net->mac, + virDomainNetGetActualDirectDev(net), + def->uuid, + virDomainNetGetActualVirtPortProfile(net), + VIR_NETDEV_VPORT_PROFILE_OP_CREATE)); + } + } + + virDomainObjUnlock(vm); } /** -- 1.7.9.5

3 3

[libvirt] [PATCH] qemu: avoid 32-bit compiler warning
by Eric Blake 04 May '12

04 May '12

On 32-bit platforms, gcc warns that the comparison between a long and (ULLONG_MAX/1024/1024) is always false; throwing in a type conversion shuts up the warning. * src/qemu/qemu_monitor.c (qemuMonitorBlockJob): Shut gcc up. --- Pushing under the build-breaker rule. src/qemu/qemu_monitor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index ca1c7aa..0d4319d 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2785,7 +2785,7 @@ int qemuMonitorBlockJob(qemuMonitorPtr mon, modern); /* Convert bandwidth MiB to bytes */ - if (bandwidth > ULLONG_MAX / 1024 / 1024) { + if (bandwidth * 1ULL > ULLONG_MAX / 1024 / 1024) { qemuReportError(VIR_ERR_OVERFLOW, _("bandwidth must be less than %llu"), ULLONG_MAX / 1024 / 1024); -- 1.7.7.6

1 0