- Devel - libvirt List Archives

[libvirt] [Ruby]How to retrieve nodes in <devices> ?
by Teto 13 Jan '14

13 Jan '14

Hi, I would like to list devices (for instance I would like to retrieve the <filesystem> part in <devices><filesystem type="mount">...</filesystem></devices>) embedded in a domain via the ruby bindings ? Thanks Matt

2 3

[libvirt] traffic control on hypervisor
by yue 12 Jan '14

12 Jan '14

hi,all if we can control the bandwidth of vm at hypervisor level? i know linux tc command can control traffic, but it is at ISO level 3, vm;s network is on bridge at level 2. how libvirt implement traffic control over vm? thanks

2 3

[libvirt] [PATCH python] virStream.sendAll() fix raising an undeclared var
by Doug Goldstein 11 Jan '14

11 Jan '14

The exception is raised from the variable 'e', which was undeclared in this context. Used code that is compatible with old and new Python versions. --- libvirt-override-virStream.py | 1 + 1 file changed, 1 insertion(+) diff --git a/libvirt-override-virStream.py b/libvirt-override-virStream.py index 189d062..cd44314 100644 --- a/libvirt-override-virStream.py +++ b/libvirt-override-virStream.py @@ -76,6 +76,7 @@ try: got = handler(self, 1024*64, opaque) except: + e = sys.exc_info()[1] try: self.abort() except: -- 1.8.3.2

2 1

[libvirt] [PATCH] Exercise the ABI stability check code in test suite
by Daniel P. Berrange 10 Jan '14

10 Jan '14

Any test suite which involves a virDomainDefPtr should call virDomainDefCheckABIStability with itself just as a basic sanity check that the identity-comparison always succeeds. This would have caught the recent NULL pointer access crash. Make sure we cope with def->name being NULL since the VMWare config parser produces NULL names. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/conf/domain_conf.c | 2 +- tests/lxcxml2xmltest.c | 5 +++++ tests/qemuargv2xmltest.c | 5 +++++ tests/qemuxml2argvtest.c | 5 +++++ tests/qemuxml2xmltest.c | 5 +++++ tests/qemuxmlnstest.c | 5 +++++ tests/sexpr2xmltest.c | 5 +++++ tests/vmx2xmltest.c | 5 +++++ tests/xmconfigtest.c | 5 +++++ tests/xml2sexprtest.c | 5 +++++ tests/xml2vmxtest.c | 5 +++++ 11 files changed, 51 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 416d96e..c1dd598 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13761,7 +13761,7 @@ virDomainDefCheckABIStability(virDomainDefPtr src, * don't get silently re-named through the backdoor when passing * custom XML into various APIs, since this would create havoc */ - if (STRNEQ(src->name, dst->name)) { + if (STRNEQ_NULLABLE(src->name, dst->name)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target domain name '%s' does not match source '%s'"), dst->name, src->name); diff --git a/tests/lxcxml2xmltest.c b/tests/lxcxml2xmltest.c index a028e39..b7d35c1 100644 --- a/tests/lxcxml2xmltest.c +++ b/tests/lxcxml2xmltest.c @@ -41,6 +41,11 @@ testCompareXMLToXMLFiles(const char *inxml, const char *outxml, bool live) live ? 0 : VIR_DOMAIN_XML_INACTIVE))) goto fail; + if (!virDomainDefCheckABIStability(def, def)) { + fprintf(stderr, "ABI stability check failed on %s", inxml); + goto fail; + } + if (!(actual = virDomainDefFormat(def, VIR_DOMAIN_XML_SECURE))) goto fail; diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index 0bf4c37..1b13fcc 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -61,6 +61,11 @@ static int testCompareXMLToArgvFiles(const char *xml, } VIR_FREE(log); + if (!virDomainDefCheckABIStability(vmdef, vmdef)) { + fprintf(stderr, "ABI stability check failed on %s", xml); + goto fail; + } + if (!(actualxml = virDomainDefFormat(vmdef, 0))) goto fail; diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index b90f0e7..b0cfa60 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -289,6 +289,11 @@ static int testCompareXMLToArgvFiles(const char *xml, goto out; } + if (!virDomainDefCheckABIStability(vmdef, vmdef)) { + fprintf(stderr, "ABI stability check failed on %s", xml); + goto out; + } + if (virQEMUCapsGet(extraFlags, QEMU_CAPS_DOMID)) vmdef->id = 6; else diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 89de0c9..41d1904 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -41,6 +41,11 @@ testCompareXMLToXMLFiles(const char *inxml, const char *outxml, bool live) QEMU_EXPECTED_VIRT_TYPES, flags))) goto fail; + if (!virDomainDefCheckABIStability(def, def)) { + fprintf(stderr, "ABI stability check failed on %s", inxml); + goto fail; + } + if (!(actual = virDomainDefFormat(def, VIR_DOMAIN_XML_SECURE | flags))) goto fail; diff --git a/tests/qemuxmlnstest.c b/tests/qemuxmlnstest.c index 2093e1e..9426bf7 100644 --- a/tests/qemuxmlnstest.c +++ b/tests/qemuxmlnstest.c @@ -59,6 +59,11 @@ static int testCompareXMLToArgvFiles(const char *xml, VIR_DOMAIN_XML_INACTIVE))) goto fail; + if (!virDomainDefCheckABIStability(vmdef, vmdef)) { + fprintf(stderr, "ABI stability check failed on %s", xml); + goto fail; + } + /* * For test purposes, we may want to fake emulator's output by providing * our own script instead of a real emulator. For this to work we need to diff --git a/tests/sexpr2xmltest.c b/tests/sexpr2xmltest.c index f8b0661..c2710c2 100644 --- a/tests/sexpr2xmltest.c +++ b/tests/sexpr2xmltest.c @@ -60,6 +60,11 @@ testCompareFiles(const char *xml, const char *sexpr, int xendConfigVersion) if (!(def = xenParseSxprString(sexprData, xendConfigVersion, tty, vncport))) goto fail; + if (!virDomainDefCheckABIStability(def, def)) { + fprintf(stderr, "ABI stability check failed on %s", xml); + goto fail; + } + if (!(gotxml = virDomainDefFormat(def, 0))) goto fail; diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index 13515f0..5c3b60e 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -88,6 +88,11 @@ testCompareFiles(const char *vmx, const char *xml) if (!(def = virVMXParseConfig(&ctx, xmlopt, vmxData))) goto cleanup; + if (!virDomainDefCheckABIStability(def, def)) { + fprintf(stderr, "ABI stability check failed on %s", vmx); + goto cleanup; + } + if (!(formatted = virDomainDefFormat(def, VIR_DOMAIN_XML_SECURE))) goto cleanup; diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c index c8014e1..0590333 100644 --- a/tests/xmconfigtest.c +++ b/tests/xmconfigtest.c @@ -77,6 +77,11 @@ testCompareParseXML(const char *xmcfg, const char *xml, int xendConfigVersion) VIR_DOMAIN_XML_INACTIVE))) goto fail; + if (!virDomainDefCheckABIStability(def, def)) { + fprintf(stderr, "ABI stability check failed on %s", xml); + goto fail; + } + if (!(conf = xenFormatXM(conn, def, xendConfigVersion))) goto fail; diff --git a/tests/xml2sexprtest.c b/tests/xml2sexprtest.c index a4d2b14..deb2fce 100644 --- a/tests/xml2sexprtest.c +++ b/tests/xml2sexprtest.c @@ -41,6 +41,11 @@ testCompareFiles(const char *xml, const char *sexpr, int xendConfigVersion) VIR_DOMAIN_XML_INACTIVE))) goto fail; + if (!virDomainDefCheckABIStability(def, def)) { + fprintf(stderr, "ABI stability check failed on %s", xml); + goto fail; + } + if (!(gotsexpr = xenFormatSxpr(NULL, def, xendConfigVersion))) goto fail; diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c index 2f2db60..242b854 100644 --- a/tests/xml2vmxtest.c +++ b/tests/xml2vmxtest.c @@ -97,6 +97,11 @@ testCompareFiles(const char *xml, const char *vmx, int virtualHW_version) goto failure; } + if (!virDomainDefCheckABIStability(def, def)) { + fprintf(stderr, "ABI stability check failed on %s", xml); + goto failure; + } + formatted = virVMXFormatConfig(&ctx, xmlopt, def, virtualHW_version); if (formatted == NULL) { -- 1.8.4.2

2 1

[libvirt] [PATCH] schema: fix idmap validation
by Eric Blake 10 Jan '14

10 Jan '14

When idmap was added to LXC, we forgot to cover it in the testsuite. The schema was missing an <element> layer, and as a result, virt-xml-validate was failing on valid dumpxml output. Reported by Eduard - Gabriel Munteanu on IRC. * docs/schemas/domaincommon.rng (idmap): Include <idmap> element, and support interleaves. * tests/lxcxml2xmldata/lxc-idmap.xml: New file. * tests/lxcxml2xmltest.c (mymain): Test it. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Eduard, please confirm I spelled your name correctly. docs/schemas/domaincommon.rng | 58 +++++++++++++++++++++----------------- tests/lxcxml2xmldata/lxc-idmap.xml | 38 +++++++++++++++++++++++++ tests/lxcxml2xmltest.c | 1 + 3 files changed, 71 insertions(+), 26 deletions(-) create mode 100644 tests/lxcxml2xmldata/lxc-idmap.xml diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 86a60c9..a69f6b6 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -506,32 +506,38 @@ </interleave> </define> <define name="idmap"> - <zeroOrMore> - <element name="uid"> - <attribute name="start"> - <ref name="unsignedInt"/> - </attribute> - <attribute name="target"> - <ref name="unsignedInt"/> - </attribute> - <attribute name="count"> - <ref name="unsignedInt"/> - </attribute> - </element> - </zeroOrMore> - <zeroOrMore> - <element name="gid"> - <attribute name="start"> - <ref name="unsignedInt"/> - </attribute> - <attribute name="target"> - <ref name="unsignedInt"/> - </attribute> - <attribute name="count"> - <ref name="unsignedInt"/> - </attribute> - </element> - </zeroOrMore> + <element name="idmap"> + <interleave> + <zeroOrMore> + <element name="uid"> + <attribute name="start"> + <ref name="unsignedInt"/> + </attribute> + <attribute name="target"> + <ref name="unsignedInt"/> + </attribute> + <attribute name="count"> + <ref name="unsignedInt"/> + </attribute> + <empty/> + </element> + </zeroOrMore> + <zeroOrMore> + <element name="gid"> + <attribute name="start"> + <ref name="unsignedInt"/> + </attribute> + <attribute name="target"> + <ref name="unsignedInt"/> + </attribute> + <attribute name="count"> + <ref name="unsignedInt"/> + </attribute> + <empty/> + </element> + </zeroOrMore> + </interleave> + </element> </define> <!-- Resources usage defines the amount of memory (maximum and possibly diff --git a/tests/lxcxml2xmldata/lxc-idmap.xml b/tests/lxcxml2xmldata/lxc-idmap.xml new file mode 100644 index 0000000..3cced21 --- /dev/null +++ b/tests/lxcxml2xmldata/lxc-idmap.xml @@ -0,0 +1,38 @@ +<domain type='lxc'> + <name>jessie</name> + <uuid>e21987a5-e98e-9c99-0e35-803e4d9ad1fe</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <resource> + <partition>/machine</partition> + </resource> + <os> + <type arch='x86_64'>exe</type> + <init>/sbin/init</init> + </os> + <idmap> + <uid start='0' target='100000' count='100000'/> + <gid start='0' target='100000' count='100000'/> + </idmap> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/libexec/libvirt_lxc</emulator> + <filesystem type='mount' accessmode='passthrough'> + <source dir='/mach/jessie'/> + <target dir='/'/> + </filesystem> + <interface type='bridge'> + <mac address='00:16:3e:0f:ef:8a'/> + <source bridge='bri0'/> + <target dev='veth0'/> + </interface> + <console type='pty'> + <target type='lxc' port='0'/> + </console> + </devices> + <seclabel type='none'/> +</domain> diff --git a/tests/lxcxml2xmltest.c b/tests/lxcxml2xmltest.c index a028e39..c6bb706 100644 --- a/tests/lxcxml2xmltest.c +++ b/tests/lxcxml2xmltest.c @@ -138,6 +138,7 @@ mymain(void) DO_TEST("disk-formats"); DO_TEST_DIFFERENT("filesystem-ram"); DO_TEST("filesystem-root"); + DO_TEST("idmap"); virObjectUnref(caps); virObjectUnref(xmlopt); -- 1.8.4.2

2 2

[libvirt] [PATCH] conf: Always use VIR_ERR_XML_ERROR on enumFromString() failures
by Christophe Fergeau 10 Jan '14

10 Jan '14

Currently, during XML parsing, when a call to a FromString() function to get an enum value fails, the error which is reported is either VIR_ERR_CONFIG_UNSUPPORTED, VIR_ERR_INTERNAL_ERROR or VIR_ERR_XML_ERROR. This commit makes such conversion failures consistently return VIR_ERR_XML_ERROR --- src/conf/device_conf.c | 2 +- src/conf/domain_conf.c | 158 ++++++++++++++++++++++---------------------- src/conf/network_conf.c | 2 +- src/conf/node_device_conf.c | 4 +- src/conf/nwfilter_conf.c | 4 +- src/conf/snapshot_conf.c | 4 +- 6 files changed, 87 insertions(+), 87 deletions(-) diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c index f49dc21..4084133 100644 --- a/src/conf/device_conf.c +++ b/src/conf/device_conf.c @@ -92,7 +92,7 @@ virDevicePCIAddressParseXML(xmlNodePtr node, if (multi && ((addr->multi = virDeviceAddressPciMultiTypeFromString(multi)) <= 0)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_XML_ERROR, _("Unknown value '%s' for <address> 'multifunction' attribute"), multi); goto cleanup; diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 416d96e..dd1c6fa 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3566,7 +3566,7 @@ virDomainDeviceInfoParseXML(xmlNodePtr node, char *rombar = virXMLPropString(rom, "bar"); if (rombar && ((info->rombar = virDomainPciRombarModeTypeFromString(rombar)) <= 0)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_XML_ERROR, _("unknown rom bar value '%s'"), rombar); VIR_FREE(rombar); goto cleanup; @@ -3582,7 +3582,7 @@ virDomainDeviceInfoParseXML(xmlNodePtr node, if (type) { if ((info->type = virDomainDeviceAddressTypeFromString(type)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unknown address type '%s'"), type); goto cleanup; } @@ -4211,7 +4211,7 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node, if ((backendStr = virXPathString("string(./driver/@name)", ctxt)) && (((backend = virDomainHostdevSubsysPciBackendTypeFromString(backendStr)) < 0) || backend == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT)) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("Unknown PCI device <driver name='%s'/> " "has been specified"), backendStr); goto error; @@ -5058,7 +5058,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, type = virXMLPropString(node, "type"); if (type) { if ((def->type = virDomainDiskTypeFromString(type)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unknown disk type '%s'"), type); goto error; } @@ -5130,7 +5130,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, if (trans) { def->geometry.trans = virDomainDiskGeometryTransTypeFromString(trans); if (def->geometry.trans <= 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("invalid translation value '%s'"), trans); goto error; @@ -5379,7 +5379,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, device = virXMLPropString(node, "device"); if (device) { if ((def->device = virDomainDiskDeviceTypeFromString(device)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unknown disk device '%s'"), device); goto error; } @@ -5454,7 +5454,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, if (snapshot) { def->snapshot = virDomainSnapshotLocationTypeFromString(snapshot); if (def->snapshot <= 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unknown disk snapshot setting '%s'"), snapshot); goto error; @@ -5495,7 +5495,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, if (bus) { if ((def->bus = virDomainDiskBusTypeFromString(bus)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unknown disk bus type '%s'"), bus); goto error; } @@ -5570,14 +5570,14 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, if (cachetag && (def->cachemode = virDomainDiskCacheTypeFromString(cachetag)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unknown disk cache mode '%s'"), cachetag); goto error; } if (error_policy && (def->error_policy = virDomainDiskErrorPolicyTypeFromString(error_policy)) <= 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unknown disk error policy '%s'"), error_policy); goto error; } @@ -5586,7 +5586,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, (((def->rerror_policy = virDomainDiskErrorPolicyTypeFromString(rerror_policy)) <= 0) || (def->rerror_policy == VIR_DOMAIN_DISK_ERROR_POLICY_ENOSPACE))) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unknown disk read error policy '%s'"), rerror_policy); goto error; @@ -5595,7 +5595,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, if (iotag) { if ((def->iomode = virDomainDiskIoTypeFromString(iotag)) < 0 || def->iomode == VIR_DOMAIN_DISK_IO_DEFAULT) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unknown disk io mode '%s'"), iotag); goto error; } @@ -5612,7 +5612,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, } if ((val = virDomainIoEventFdTypeFromString(ioeventfd)) <= 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_XML_ERROR, _("unknown disk ioeventfd mode '%s'"), ioeventfd); goto error; @@ -5630,7 +5630,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, int idx; if ((idx = virDomainVirtioEventIdxTypeFromString(event_idx)) <= 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_XML_ERROR, _("unknown disk event_idx mode '%s'"), event_idx); goto error; @@ -5641,7 +5641,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, if (copy_on_read) { int cor; if ((cor = virDomainDiskCopyOnReadTypeFromString(copy_on_read)) <= 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_XML_ERROR, _("unknown disk copy_on_read mode '%s'"), copy_on_read); goto error; @@ -5651,7 +5651,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, if (discard) { if ((def->discard = virDomainDiskDiscardTypeFromString(discard)) <= 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_XML_ERROR, _("unknown disk discard mode '%s'"), discard); goto error; } @@ -5676,7 +5676,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, int val; if ((val = virDomainStartupPolicyTypeFromString(startupPolicy)) <= 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_XML_ERROR, _("unknown startupPolicy value '%s'"), startupPolicy); goto error; @@ -5726,7 +5726,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, if (driverType) { def->format = virStorageFileFormatTypeFromString(driverType); if (def->format <= 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_XML_ERROR, _("unknown driver format value '%s'"), driverType); goto error; @@ -5736,7 +5736,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, if (mirrorFormat) { def->mirrorFormat = virStorageFileFormatTypeFromString(mirrorFormat); if (def->mirrorFormat <= 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_XML_ERROR, _("unknown mirror format value '%s'"), driverType); goto error; @@ -5887,7 +5887,7 @@ virDomainControllerDefParseXML(xmlNodePtr node, type = virXMLPropString(node, "type"); if (type) { if ((def->type = virDomainControllerTypeFromString(type)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("Unknown controller type '%s'"), type); goto error; } @@ -5906,7 +5906,7 @@ virDomainControllerDefParseXML(xmlNodePtr node, model = virXMLPropString(node, "model"); if (model) { if ((def->model = virDomainControllerModelTypeFromString(def, model)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("Unknown model type '%s'"), model); goto error; } @@ -6081,7 +6081,7 @@ virDomainFSDefParseXML(xmlNodePtr node, type = virXMLPropString(node, "type"); if (type) { if ((def->type = virDomainFSTypeFromString(type)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unknown filesystem type '%s'"), type); goto error; } @@ -6092,7 +6092,7 @@ virDomainFSDefParseXML(xmlNodePtr node, accessmode = virXMLPropString(node, "accessmode"); if (accessmode) { if ((def->accessmode = virDomainFSAccessModeTypeFromString(accessmode)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unknown accessmode '%s'"), accessmode); goto error; } @@ -6148,7 +6148,7 @@ virDomainFSDefParseXML(xmlNodePtr node, if (fsdriver) { if ((def->fsdriver = virDomainFSDriverTypeTypeFromString(fsdriver)) <= 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_XML_ERROR, _("unknown fs driver type '%s'"), fsdriver); goto error; } @@ -6156,7 +6156,7 @@ virDomainFSDefParseXML(xmlNodePtr node, if (format) { if ((def->format = virStorageFileFormatTypeFromString(format)) <= 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_XML_ERROR, _("unknown driver format value '%s'"), format); goto error; } @@ -6164,7 +6164,7 @@ virDomainFSDefParseXML(xmlNodePtr node, if (wrpolicy) { if ((def->wrpolicy = virDomainFSWrpolicyTypeFromString(wrpolicy)) <= 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_XML_ERROR, _("unknown filesystem write policy '%s'"), wrpolicy); goto error; } @@ -6259,7 +6259,7 @@ virDomainActualNetDefParseXML(xmlNodePtr node, goto error; } if ((actual->type = virDomainNetTypeFromString(type)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unknown type '%s' in interface's <actual> element"), type); goto error; } @@ -6302,7 +6302,7 @@ virDomainActualNetDefParseXML(xmlNodePtr node, if (mode) { int m; if ((m = virNetDevMacVLanModeTypeFromString(mode)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("Unknown mode '%s' in interface <actual> element"), mode); goto error; @@ -6417,7 +6417,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, type = virXMLPropString(node, "type"); if (type != NULL) { if ((int)(def->type = virDomainNetTypeFromString(type)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unknown interface type '%s'"), type); goto error; } @@ -6684,7 +6684,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, if (mode != NULL) { int m; if ((m = virNetDevMacVLanModeTypeFromString(mode)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + virReportError(VIR_ERR_XML_ERROR, "%s", _("Unknown mode has been specified")); goto error; } @@ -6758,7 +6758,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, int name; if ((name = virDomainNetBackendTypeFromString(backend)) < 0 || name == VIR_DOMAIN_NET_BACKEND_TYPE_DEFAULT) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("Unknown interface <driver name='%s'> " "has been specified"), backend); @@ -6770,7 +6770,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, int m; if ((m = virDomainNetVirtioTxModeTypeFromString(txmode)) < 0 || m == VIR_DOMAIN_NET_VIRTIO_TX_MODE_DEFAULT) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("Unknown interface <driver txmode='%s'> " "has been specified"), txmode); @@ -6781,7 +6781,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, if (ioeventfd) { int val; if ((val = virDomainIoEventFdTypeFromString(ioeventfd)) <= 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_XML_ERROR, _("unknown interface ioeventfd mode '%s'"), ioeventfd); goto error; @@ -6791,7 +6791,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, if (event_idx) { int idx; if ((idx = virDomainVirtioEventIdxTypeFromString(event_idx)) <= 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_XML_ERROR, _("unknown interface event_idx mode '%s'"), event_idx); goto error; @@ -6813,7 +6813,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, def->linkstate = VIR_DOMAIN_NET_INTERFACE_LINK_STATE_DEFAULT; if (linkstate != NULL) { if ((def->linkstate = virDomainNetInterfaceLinkStateTypeFromString(linkstate)) <= 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_XML_ERROR, _("unknown interface link state '%s'"), linkstate); goto error; @@ -7198,7 +7198,7 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def, def->data.tcp.protocol = VIR_DOMAIN_CHR_TCP_PROTOCOL_RAW; else if ((def->data.tcp.protocol = virDomainChrTcpProtocolTypeFromString(protocol)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("Unknown protocol '%s'"), protocol); goto error; } @@ -7555,7 +7555,7 @@ virDomainTPMDefParseXML(xmlNodePtr node, model = virXMLPropString(node, "model"); if (model != NULL && (int)(def->model = virDomainTPMModelTypeFromString(model)) < 0) { - virReportError(VIR_ERR_INVALID_ARG, + virReportError(VIR_ERR_XML_ERROR, _("Unknown TPM frontend model '%s'"), model); goto error; } else { @@ -7646,14 +7646,14 @@ virDomainInputDefParseXML(const char *ostype, } if ((def->type = virDomainInputTypeFromString(type)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unknown input device type '%s'"), type); goto error; } if (bus) { if ((def->bus = virDomainInputBusTypeFromString(bus)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unknown input bus type '%s'"), bus); goto error; } @@ -7739,7 +7739,7 @@ virDomainHubDefParseXML(xmlNodePtr node, unsigned int flags) } if ((def->type = virDomainHubTypeFromString(type)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unknown hub device type '%s'"), type); goto error; } @@ -7787,7 +7787,7 @@ virDomainTimerDefParseXML(xmlNodePtr node, goto error; } if ((def->name = virDomainTimerNameTypeFromString(name)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unknown timer name '%s'"), name); goto error; } @@ -7809,7 +7809,7 @@ virDomainTimerDefParseXML(xmlNodePtr node, tickpolicy = virXMLPropString(node, "tickpolicy"); if (tickpolicy != NULL) { if ((def->tickpolicy = virDomainTimerTickpolicyTypeFromString(tickpolicy)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unknown timer tickpolicy '%s'"), tickpolicy); goto error; } @@ -7819,7 +7819,7 @@ virDomainTimerDefParseXML(xmlNodePtr node, track = virXMLPropString(node, "track"); if (track != NULL) { if ((def->track = virDomainTimerTrackTypeFromString(track)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unknown timer track '%s'"), track); goto error; } @@ -7838,7 +7838,7 @@ virDomainTimerDefParseXML(xmlNodePtr node, mode = virXMLPropString(node, "mode"); if (mode != NULL) { if ((def->mode = virDomainTimerModeTypeFromString(mode)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unknown timer mode '%s'"), mode); goto error; } @@ -7941,7 +7941,7 @@ virDomainGraphicsAuthDefParseXML(xmlNodePtr node, if (connected) { int action = virDomainGraphicsAuthConnectedTypeFromString(connected); if (action <= 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_XML_ERROR, _("unknown connected value %s"), connected); VIR_FREE(connected); @@ -8060,7 +8060,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, } if ((def->type = virDomainGraphicsTypeFromString(type)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unknown graphics device type '%s'"), type); goto error; } @@ -8186,7 +8186,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, virDomainGraphicsVNCSharePolicyTypeFromString(sharePolicy); if (policy < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_XML_ERROR, _("unknown vnc display sharing policy '%s'"), sharePolicy); VIR_FREE(sharePolicy); goto error; @@ -8332,7 +8332,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, if ((defaultMode = virXMLPropString(node, "defaultMode")) != NULL) { if ((defaultModeVal = virDomainGraphicsSpiceChannelModeTypeFromString(defaultMode)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unknown default spice channel mode %s"), defaultMode); VIR_FREE(defaultMode); @@ -8376,7 +8376,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, } if ((nameval = virDomainGraphicsSpiceChannelNameTypeFromString(name)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unknown spice channel name %s"), name); VIR_FREE(name); @@ -8384,7 +8384,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, goto error; } if ((modeval = virDomainGraphicsSpiceChannelModeTypeFromString(mode)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unknown spice channel mode %s"), mode); VIR_FREE(name); @@ -8407,7 +8407,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, if ((compressionVal = virDomainGraphicsSpiceImageCompressionTypeFromString(compression)) <= 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_XML_ERROR, _("unknown spice image compression %s"), compression); VIR_FREE(compression); @@ -8428,7 +8428,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, if ((compressionVal = virDomainGraphicsSpiceJpegCompressionTypeFromString(compression)) <= 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_XML_ERROR, _("unknown spice jpeg compression %s"), compression); VIR_FREE(compression); @@ -8449,7 +8449,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, if ((compressionVal = virDomainGraphicsSpiceZlibCompressionTypeFromString(compression)) <= 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_XML_ERROR, _("unknown spice zlib compression %s"), compression); VIR_FREE(compression); @@ -8470,7 +8470,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, if ((compressionVal = virDomainGraphicsSpicePlaybackCompressionTypeFromString(compression)) <= 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + virReportError(VIR_ERR_XML_ERROR, "%s", _("unknown spice playback compression")); VIR_FREE(compression); goto error; @@ -8490,7 +8490,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, } if ((modeVal = virDomainGraphicsSpiceStreamingModeTypeFromString(mode)) <= 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + virReportError(VIR_ERR_XML_ERROR, "%s", _("unknown spice streaming mode")); VIR_FREE(mode); goto error; @@ -8511,7 +8511,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, if ((copypasteVal = virDomainGraphicsSpiceClipboardCopypasteTypeFromString(copypaste)) <= 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unknown copypaste value '%s'"), copypaste); VIR_FREE(copypaste); goto error; @@ -8571,7 +8571,7 @@ virDomainSoundCodecDefParseXML(xmlNodePtr node) type = virXMLPropString(node, "type"); if ((def->type = virDomainSoundCodecTypeFromString(type)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unknown codec type '%s'"), type); goto error; } @@ -8604,7 +8604,7 @@ virDomainSoundDefParseXML(xmlNodePtr node, model = virXMLPropString(node, "model"); if ((def->model = virDomainSoundModelTypeFromString(model)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unknown sound model '%s'"), model); goto error; } @@ -8677,7 +8677,7 @@ virDomainWatchdogDefParseXML(xmlNodePtr node, } def->model = virDomainWatchdogModelTypeFromString(model); if (def->model < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unknown watchdog model '%s'"), model); goto error; } @@ -8688,7 +8688,7 @@ virDomainWatchdogDefParseXML(xmlNodePtr node, else { def->action = virDomainWatchdogActionTypeFromString(action); if (def->action < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unknown watchdog action '%s'"), action); goto error; } @@ -8923,7 +8923,7 @@ virSysinfoParseXML(xmlNodePtr node, goto error; } if ((def->type = virSysinfoTypeFromString(type)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unknown sysinfo type '%s'"), type); goto error; } @@ -9159,7 +9159,7 @@ virDomainVideoDefParseXML(xmlNodePtr node, if (type) { if ((def->type = virDomainVideoTypeFromString(type)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unknown video model '%s'"), type); goto error; } @@ -9245,7 +9245,7 @@ virDomainHostdevDefParseXML(virDomainXMLOptionPtr xmlopt, if (mode) { if ((def->mode = virDomainHostdevModeTypeFromString(mode)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unknown hostdev mode '%s'"), mode); goto error; } @@ -9333,7 +9333,7 @@ virDomainRedirdevDefParseXML(xmlNodePtr node, bus = virXMLPropString(node, "bus"); if (bus) { if ((def->bus = virDomainRedirdevBusTypeFromString(bus)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unknown redirdev bus '%s'"), bus); goto error; } @@ -9344,7 +9344,7 @@ virDomainRedirdevDefParseXML(xmlNodePtr node, type = virXMLPropString(node, "type"); if (type) { if ((def->source.chr.type = virDomainChrTypeFromString(type)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unknown redirdev character device type '%s'"), type); goto error; } @@ -9599,7 +9599,7 @@ virDomainEventActionParseXML(xmlXPathContextPtr ctxt, } else { *val = convFunc(tmp); if (*val < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unknown %s action: %s"), name, tmp); VIR_FREE(tmp); return -1; @@ -9619,7 +9619,7 @@ virDomainPMStateParseXML(xmlXPathContextPtr ctxt, if (tmp) { *val = virDomainPMStateTypeFromString(tmp); if (*val < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_XML_ERROR, _("unknown PM state value %s"), tmp); goto cleanup; } @@ -10619,7 +10619,7 @@ virDomainDefParseBootXML(xmlXPathContextPtr ctxt, goto cleanup; } if ((val = virDomainBootTypeFromString(dev)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unknown boot device '%s'"), dev); VIR_FREE(dev); @@ -11023,7 +11023,7 @@ virDomainDefParseXML(xmlDocPtr xml, } if ((def->virtType = virDomainVirtTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("invalid domain type %s"), tmp); goto error; } @@ -11579,7 +11579,7 @@ virDomainDefParseXML(xmlDocPtr xml, for (i = 0; i < n; i++) { int val = virDomainFeatureTypeFromString((const char *)nodes[i]->name); if (val < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unexpected feature '%s'"), nodes[i]->name); goto error; } @@ -11589,7 +11589,7 @@ virDomainDefParseXML(xmlDocPtr xml, if ((tmp = virXPathString("string(./features/apic/@eoi)", ctxt))) { int eoi; if ((eoi = virDomainFeatureStateTypeFromString(tmp)) <= 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_XML_ERROR, _("unknown value for attribute eoi: '%s'"), tmp); goto error; @@ -11612,7 +11612,7 @@ virDomainDefParseXML(xmlDocPtr xml, ctxt->node = nodes[i]; if ((tmp = virXPathString("string(./@state)", ctxt))) { if ((def->features[val] = virDomainFeatureStateTypeFromString(tmp)) == -1) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_XML_ERROR, _("unknown state attribute '%s' of feature '%s'"), tmp, virDomainFeatureTypeToString(val)); goto error; @@ -11755,7 +11755,7 @@ virDomainDefParseXML(xmlDocPtr xml, if ((tmp = virXPathString("string(./clock/@offset)", ctxt)) && (def->clock.offset = virDomainClockOffsetTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unknown clock offset '%s'"), tmp); goto error; } @@ -11799,7 +11799,7 @@ virDomainDefParseXML(xmlDocPtr xml, tmp = virXPathString("string(./clock/@basis)", ctxt); if (tmp) { if ((def->clock.data.variable.basis = virDomainClockBasisTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unknown clock basis '%s'"), tmp); goto error; } @@ -11881,7 +11881,7 @@ virDomainDefParseXML(xmlDocPtr xml, if (tmp) { def->os.arch = virArchFromString(tmp); if (!def->os.arch) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_XML_ERROR, _("Unknown architecture %s"), tmp); goto error; @@ -12686,7 +12686,7 @@ virDomainDefParseXML(xmlDocPtr xml, int mode; if ((mode = virDomainSmbiosModeTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unknown smbios mode '%s'"), tmp); goto error; } @@ -12770,7 +12770,7 @@ virDomainObjParseXML(xmlDocPtr xml, goto error; } if ((state = virDomainStateTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("invalid domain state '%s'"), tmp); VIR_FREE(tmp); goto error; @@ -12779,7 +12779,7 @@ virDomainObjParseXML(xmlDocPtr xml, if ((tmp = virXPathString("string(./@reason)", ctxt))) { if ((reason = virDomainStateReasonFromString(state, tmp)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("invalid domain state reason '%s'"), tmp); VIR_FREE(tmp); goto error; @@ -12804,7 +12804,7 @@ virDomainObjParseXML(xmlDocPtr xml, if (str) { int flag = virDomainTaintTypeFromString(str); if (flag < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("Unknown taint flag %s"), str); VIR_FREE(str); goto error; diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 481fc5b..537cc2a 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1747,7 +1747,7 @@ virNetworkForwardDefParseXML(const char *networkName, = virNetworkForwardDriverNameTypeFromString(forwardDriverName); if (driverName <= 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("Unknown forward <driver name='%s'/> " "in network %s"), forwardDriverName, networkName); diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 171cd7c..51a76ea 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -854,7 +854,7 @@ virNodeDevCapNetParseXML(xmlXPathContextPtr ctxt, int val = virNodeDevNetCapTypeFromString(tmp); VIR_FREE(tmp); if (val < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("invalid network type supplied for '%s'"), def->name); goto out; @@ -1166,7 +1166,7 @@ virNodeDevCapsDefParseXML(xmlXPathContextPtr ctxt, } if ((val = virNodeDevCapTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unknown capability type '%s'"), tmp); VIR_FREE(tmp); goto error; diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index d280df5..3ebdc1f 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2319,7 +2319,7 @@ virNWFilterRuleParse(xmlNodePtr node) } if ((ret->action = virNWFilterRuleActionTypeFromString(action)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, "%s", _("unknown rule action attribute value")); goto err_exit; @@ -2333,7 +2333,7 @@ virNWFilterRuleParse(xmlNodePtr node) } if ((ret->tt = virNWFilterRuleDirectionTypeFromString(direction)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, "%s", _("unknown rule direction attribute value")); goto err_exit; diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index c18b99b..74ffe47 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -121,7 +121,7 @@ virDomainSnapshotDiskDefParseXML(xmlNodePtr node, if (snapshot) { def->snapshot = virDomainSnapshotLocationTypeFromString(snapshot); if (def->snapshot <= 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unknown disk snapshot setting '%s'"), snapshot); goto cleanup; @@ -157,7 +157,7 @@ virDomainSnapshotDiskDefParseXML(xmlNodePtr node, if (driver) { def->format = virStorageFileFormatTypeFromString(driver); if (def->format <= 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_XML_ERROR, _("unknown disk snapshot driver '%s'"), driver); VIR_FREE(driver); -- 1.8.4.2

2 2

[libvirt] [v9 0/6] Write separate module for hostdev passthrough
by Chunyan Liu 10 Jan '14

10 Jan '14

These patches implements a separate module for hostdev passthrough so that it could be shared by different drivers and can maintain a global state of a host device. patch 1/6: extract hostdev passthrough function from qemu_hostdev.c and make it reusable by multiple drivers. patch 2/6: add a unit test for hostdev common library. patch 3/6: switch qemu driver to use the common library instead of its own hostdev passthrough APIs. patch 4/6: switch lxc driver to use the common library instead of its own hostdev passthrough APIs. patch 5/6: add a hostdev pci backend type for xen usage. patch 6/6: add pci passthrough to libxl driver. --- Changes * rebase to lasest source code * fix ioctl return value in virHostdevHostSupportsPassthroughKVM() Chunyan Liu (6): add hostdev passthrough common library add unit test for hostdev common library change qemu driver to use hostdev common library change lxc driver to use hostdev common library add hostdev pci backend type for xen add pci passthrough to libxl driver docs/schemas/domaincommon.rng | 1 + po/POTFILES.in | 3 +- src/Makefile.am | 3 +- src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/libvirt_private.syms | 21 + src/libxl/libxl_conf.c | 63 + src/libxl/libxl_conf.h | 4 + src/libxl/libxl_domain.c | 9 + src/libxl/libxl_driver.c | 448 +++++- src/lxc/lxc_conf.h | 4 - src/lxc/lxc_driver.c | 47 +- src/lxc/lxc_hostdev.c | 413 ----- src/lxc/lxc_hostdev.h | 43 - src/lxc/lxc_process.c | 24 +- src/qemu/qemu_command.c | 4 +- src/qemu/qemu_conf.h | 9 +- src/qemu/qemu_domain.c | 22 + src/qemu/qemu_driver.c | 81 +- src/qemu/qemu_hostdev.c | 1454 ----------------- src/qemu/qemu_hostdev.h | 76 - src/qemu/qemu_hotplug.c | 136 +- src/qemu/qemu_process.c | 40 +- src/util/virhostdev.c | 1703 ++++++++++++++++++++ src/util/virhostdev.h | 134 ++ src/util/virpci.c | 30 +- src/util/virpci.h | 9 +- src/util/virscsi.c | 28 +- src/util/virscsi.h | 8 +- src/util/virusb.c | 29 +- src/util/virusb.h | 8 +- tests/Makefile.am | 5 + .../qemuxml2argv-hostdev-pci-address.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-net-hostdev.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-pci-rom.xml | 2 + tests/virhostdevtest.c | 481 ++++++ tests/virpcimock.c | 23 +- 37 files changed, 3159 insertions(+), 2212 deletions(-) delete mode 100644 src/lxc/lxc_hostdev.c delete mode 100644 src/lxc/lxc_hostdev.h delete mode 100644 src/qemu/qemu_hostdev.c delete mode 100644 src/qemu/qemu_hostdev.h create mode 100644 src/util/virhostdev.c create mode 100644 src/util/virhostdev.h create mode 100644 tests/virhostdevtest.c

2 7

[libvirt] processor info gotten from 'virsh sysinfo' does match proc-cpuinfo
by yue 10 Jan '14

10 Jan '14

hi,all my environment is fc19, libvirt-1.0.5.8-1.fc19.x86_64 when systemctl start libvirtd.service , some warnning printed: Jan 09 17:53:01 localhost.localdomain libvirtd[12516]: libvirt version: 1.0.5.8, package: 1.fc19 (Fedora Project, 2013-12-14-21:10:58, buildv...ct.org) Jan 09 17:53:01 localhost.localdomain libvirtd[12516]: open("/var/run/libvirt/network/nwfilter.ltmp"): No such file or directory Jan 09 17:53:02 localhost.localdomain libvirtd[12516]: internal error Cannot find suitable CPU model for given data Jan 09 17:53:02 localhost.localdomain libvirtd[12516]: Failed to get host CPU --virsh sysinfo--- <processor> <entry name='socket_destination'>CPU 1</entry> <entry name='type'>Central Processor</entry> <entry name='family'>Other</entry> <entry name='manufacturer'>Bochs</entry> <entry name='version'>Not Specified</entry> <entry name='external_clock'>Unknown</entry> <entry name='max_speed'>2000 MHz</entry> <entry name='status'>Populated, Enabled</entry> </processor> ----proc/cpuinfo---------- processor : 0 vendor_id : GenuineIntel cpu family : 6 model : 44 model name : Westmere E56xx/L56xx/X56xx (Nehalem-C) stepping : 1 microcode : 0x1 cpu MHz : 1861.999 cache size : 4096 KB physical id : 0 siblings : 2 core id : 0 cpu cores : 2 apicid : 0 initial apicid : 0 fpu : yes fpu_exception : yes cpuid level : 11 wp : yes flags : fpu de pse tsc msr pae mce cx8 apic mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx lm constant_tsc nopl pni ssse3 cx16 sse4_1 sse4_2 x2apic popcnt aes hypervisor lahf_lm bogomips : 3723.99 clflush size : 64 cache_alignment : 64 address sizes : 44 bits physical, 48 bits virtual power management:

1 0

[libvirt] Compile time error in event-test.c
by Avanti Ajay 10 Jan '14

10 Jan '14

Hi... I am trying to compile the event-test.c code of the libvirt package. I am getting this error : I know it is a loader problem. Do I need to install any binaries? administrator@administrator-desktop:~/Desktop/libvirt/examples/domain-events/events-c$ gcc event-test.c -o event -lvirt /tmp/ccHd7ZUD.o: In function `main': event-test.c:(.text+0xac9): undefined reference to `virConnectRegisterCloseCallback' collect2: ld returned 1 exit status Thanks Avanti

2 1

[libvirt] [PATCH] test driver: Add authentication to test driver.
by Richard W.M. Jones 10 Jan '14

10 Jan '14

There is no easy way to test authentication against libvirt. This commit modifies the test driver to allow simple username/password authentication. You modify the test XML by adding: <node> ... <auth> <user password="123456">rich</user> <user>jane</user> </auth> </node> If there are any /node/auth/user elements, then authentication is required by the test driver (if none are present, then the test driver will work as before and not require authentication). In the example above, two phony users are added: rich password: 123456 jane no password required The test driver will demand a username. If the password attribute is present (or if the username entered is wrong), then the password is also asked for and checked: $ virsh -c test://$(pwd)/testnode.xml list Enter username for localhost: rich Enter rich's password for localhost: *** Id Name State ---------------------------------------------------- 1 fv0 running 2 fc4 running Signed-off-by: Richard W.M. Jones <rjones(a)redhat.com> --- src/test/test_driver.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 109 insertions(+), 1 deletion(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index cde82a1..ecad351 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -58,6 +58,7 @@ #include "virrandom.h" #include "virstring.h" #include "cpu/cpu.h" +#include "virauth.h" #define VIR_FROM_THIS VIR_FROM_TEST @@ -82,6 +83,13 @@ typedef struct _testCell *testCellPtr; #define MAX_CELLS 128 +struct _testAuth { + char *username; + char *password; +}; +typedef struct _testAuth testAuth; +typedef struct _testAuth *testAuthPtr; + struct _testConn { virMutex lock; @@ -99,6 +107,8 @@ struct _testConn { virNodeDeviceObjList devs; int numCells; testCell cells[MAX_CELLS]; + int numAuths; + testAuthPtr auths; virObjectEventStatePtr eventState; }; @@ -1355,6 +1365,44 @@ error: return ret; } +static int +testParseAuthUsers(testConnPtr privconn, + xmlXPathContextPtr ctxt) +{ + int num, ret = -1; + size_t i; + xmlNodePtr *nodes = NULL; + + num = virXPathNodeSet("/node/auth/user", ctxt, &nodes); + if (num < 0) + goto error; + + privconn->numAuths = num; + if (num && VIR_ALLOC_N(privconn->auths, num) < 0) + goto error; + + for (i = 0; i < num; i++) { + char *username, *password; + + ctxt->node = nodes[i]; + username = virXPathString("string(.)", ctxt); + if (!username || STREQ(username, "")) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("missing username in /node/auth/user field")); + goto error; + } + /* This field is optional. */ + password = virXMLPropString(nodes[i], "password"); + + privconn->auths[i].username = username; + privconn->auths[i].password = password; + } + + ret = 0; +error: + VIR_FREE(nodes); + return ret; +} /* No shared state between simultaneous test connections initialized * from a file. */ @@ -1417,6 +1465,8 @@ testOpenFromFile(virConnectPtr conn, const char *file) goto error; if (testParseNodedevs(privconn, file, ctxt) < 0) goto error; + if (testParseAuthUsers(privconn, ctxt) < 0) + goto error; xmlXPathFreeContext(ctxt); xmlFreeDoc(doc); @@ -1439,9 +1489,63 @@ testOpenFromFile(virConnectPtr conn, const char *file) return VIR_DRV_OPEN_ERROR; } +static int +testConnectAuthenticate(virConnectPtr conn, + virConnectAuthPtr auth) +{ + testConnPtr privconn = conn->privateData; + int ret = -1; + int i; + char *username = NULL, *password = NULL; + + if (privconn->numAuths == 0) + return 0; + + /* Authentication is required because the test XML contains a + * non-empty <auth/> section. First we must ask for a username. + */ + username = virAuthGetUsername(conn, auth, "test", NULL, "localhost"/*?*/); + if (!username) { + virReportError(VIR_ERR_AUTH_FAILED, "%s", + _("authentication failed when asking for username")); + goto cleanup; + } + + /* Does the username exist? */ + for (i = 0; i < privconn->numAuths; ++i) { + if (STREQ(privconn->auths[i].username, username)) + goto found_user; + } + i = -1; + +found_user: + /* Even if we didn't find the user, we still ask for a password. */ + if (i == -1 || privconn->auths[i].password != NULL) { + password = virAuthGetPassword(conn, auth, "test", + username, "localhost"); + if (password == NULL) { + virReportError(VIR_ERR_AUTH_FAILED, "%s", + _("authentication failed when asking for password")); + goto cleanup; + } + } + + if (i == -1 || + (password && STRNEQ(privconn->auths[i].password, password))) { + virReportError(VIR_ERR_AUTH_FAILED, "%s", + _("authentication failed, see test XML for the correct username/password")); + goto cleanup; + } + + ret = 0; +cleanup: + VIR_FREE(username); + VIR_FREE(password); + return ret; +} static virDrvOpenStatus testConnectOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, + virConnectAuthPtr auth, unsigned int flags) { int ret; @@ -1479,6 +1583,10 @@ static virDrvOpenStatus testConnectOpen(virConnectPtr conn, if (ret != VIR_DRV_OPEN_SUCCESS) return ret; + /* Fake authentication. */ + if (testConnectAuthenticate(conn, auth) < 0) + return VIR_DRV_OPEN_ERROR; + return VIR_DRV_OPEN_SUCCESS; } -- 1.8.4.2

3 4

[libvirt] Regression testing libvirt authentication
by Richard W.M. Jones 10 Jan '14

10 Jan '14

I'm trying to find a way to regression-test a program which uses libvirt authentication (virConnectAuth, virConnectAuthPtr). Ideally the test:/// driver would be able to fake authentication demands, but it doesn't seem to be able to do that. Any suggestions? Would this feature belong in the test driver or elsewhere? Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones libguestfs lets you edit virtual machines. Supports shell scripting, bindings from many languages. http://libguestfs.org

3 2

[libvirt] New feature discussion: Grouping multiple libvirt's in a "pool"
by Ahmed Ossama 10 Jan '14

10 Jan '14

Greetings All, I would like to say "Hi" to everyone on the list since this is my first message. I have couple of servers running CentOS and Debian with kvm and libvirt on top. Lately I've been thinking of coordinating them together in a pool like XenServer groups servers in a "Pool". I am totally aware that this feature can be achieved by installing OpenStack or any similar orchestrator on top of libvirt. But I would like to achieve this feature using libvirt alone as I don't want to install any stuff above libvirt. I was also thinking if each libvirt on every server is aware of other resources (Domains, Storage and Network), this could provide better support and view to any higher orchestrator utilizing libvirt. So I am wondering if such feature was discussed previously? And would like to hear thoughts or concerns about it. -- Regards, Ahmed Ossama

2 1

[libvirt] [PATCH] qemu: Add support for changing timeout value to open unix monitor socket
by Pavel Fux 10 Jan '14

10 Jan '14

Hi, I am talking about *Bug 987088*<https://bugzilla.redhat.com/show_bug.cgi?id=987088>, I have added a patch and a description of the fix, this is a copy of my comment on the bug: the default code behavior is wait for 3 seconds and if the socket is not opened yet, print this error and terminate. the code is in src/qemu/qemu_monitor.c in function qemuMonitorOpenUnix. In 2009 there was a patch that added the original 3 seconds retry, the patch can be found here: http://www.redhat.com/archives/libvir-list/2009-July/msg00335.html I have added a patch with this solution: the default behavior stays the same, but a user can add a configuration variable to qemu.conf and change the timeout value. every system needs a different value according to their system configuration but anyway 3 seconds is not suitable for all cases. I am attaching my patch. Pavel Fux.

3 2

[libvirt] [PATCH 0/2] v2: spice: expose the disable file transfer option
by Francesco Romani 10 Jan '14

10 Jan '14

Here it is the second version of the patch which export the spice agent disable file transfer. I followed Eric's advice and added detection of the support in QEMU in the first patch; the second builds upon the first and exports the support to libvirt. The XML format is intentionally similar to the 'clipboard' element, I thought the share enough similiarities; however, suggestions are more than welcome here. Please also feel free to suggest how to extend the testing, and if what was added here is enough. As everyone probably already noticed it's my first libvirt contribution; I tried to follow HACKING's advice caredully but I can have missed something (more). Best regards, Francesco Romani (2): spice: detect if qemu can disable file transfer spice: expose the QEMU disable file transfer option docs/formatdomain.html.in | 8 +++++ docs/schemas/domaincommon.rng | 11 ++++++ src/conf/domain_conf.c | 31 ++++++++++++++++- src/conf/domain_conf.h | 10 ++++++ src/libvirt_private.syms | 2 ++ src/qemu/qemu_capabilities.c | 5 ++- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 9 +++++ tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + ...emuxml2argv-graphics-spice-agent-file-xfer.args | 9 +++++ ...qemuxml2argv-graphics-spice-agent-file-xfer.xml | 40 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 6 ++++ 13 files changed, 132 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.xml -- 1.8.4.2

2 7

[libvirt] [PATCH] Clarify documentation on possible return values in case of errors
by Claudio Bley 10 Jan '14

10 Jan '14

Signed-off-by: Claudio Bley <cbley(a)av-test.de> --- src/libvirt.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index ffd4f8e..73972f2 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -14502,8 +14502,8 @@ virNodeDeviceGetName(virNodeDevicePtr dev) * * Accessor for the parent of the device * - * Returns the name of the device's parent, or NULL if the - * device has no parent. + * Returns the name of the device's parent, or NULL if an + * error occurred or when the device has no parent. */ const char * virNodeDeviceGetParent(virNodeDevicePtr dev) @@ -14537,7 +14537,8 @@ virNodeDeviceGetParent(virNodeDevicePtr dev) * * Accessor for the number of capabilities supported by the device. * - * Returns the number of capabilities supported by the device. + * Returns the number of capabilities supported by the device or -1 + * in case of error. */ int virNodeDeviceNumOfCaps(virNodeDevicePtr dev) @@ -14576,7 +14577,8 @@ error: * * Lists the names of the capabilities supported by the device. * - * Returns the number of capability names listed in @names. + * Returns the number of capability names listed in @names or -1 + * in case of error. */ int virNodeDeviceListCaps(virNodeDevicePtr dev, -- 1.7.9.5

3 4

[libvirt] /var/lib/libvirt/qemu permissions are wrong
by Marcelo Cerri 10 Jan '14

10 Jan '14

Hi, Any directions regarding which is the best approach to correct the bug reported in https://bugzilla.redhat.com/show_bug.cgi?id=1045040 ? Regards, Marcelo

2 3

[libvirt] [PATCH] event: don't queue NULL event on OOM
by Eric Blake 10 Jan '14

10 Jan '14

Ever since commit 61ac8ce, Coverity complained about remoteNetworkBuildEventLifecycle not checking for NULL failure to build an event, compared to other calls in the code base. But the problem is latent from copy and paste; all 17 of our remote*BuildEvent* functions in remote_driver.c have the same issue - if an OOM causes an event to not be built, we happily pass NULL to remoteEventQueue(), but that function has marked event as a nonnull parameter. We were getting lucky (the event queue's first use of the event happened to be a call to virIsObjectClass(), which acts gracefully on NULL, so there was no way to crash); but this is a latent bug waiting to bite us due to the disregard for the nonnull attribute, as well as a waste of resources in the event queue. Better is to just refuse to queue NULL. The discard is silent, since the problem only happens on OOM, and since events are already best effort - if we fail to get an event, it's not like we have any memory left to report the issue, nor any idea of who would benefit from knowing we couldn't create or queue the event. * src/remote/remote_driver.c (remoteEventQueue): Ignore NULL event. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- I don't know if this will actually shut up Coverity, or if we have to modify all 17 calls to remoteEventQueue to do the NULL check there. I'm hoping this simpler solution does the trick. src/remote/remote_driver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 64d9d92..da9c1c9 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -6801,7 +6801,8 @@ done: static void remoteEventQueue(struct private_data *priv, virObjectEventPtr event) { - virObjectEventStateQueue(priv->eventState, event); + if (event) + virObjectEventStateQueue(priv->eventState, event); } /* get_nonnull_domain and get_nonnull_network turn an on-wire -- 1.8.4.2

2 2

[libvirt] [PATCH v4 0/7] Network events API
by Cédric Bosdonnat 10 Jan '14

10 Jan '14

This patch serie include changes to respond to Eric and Daniel's comments. The event namespace part of the ID is only handled at the object event's level, though we need to strip it out of virObjectEventStateEventID to get the remote driver properly deregister. Cédric Bosdonnat (7): Added Network events API and virNetworkEventLifecycle. test driver: implemented network events Add network events unit tests Add network events to the remote driver Added network events to the bridged network driver Fixed indentation in src/conf/*_event* Added default case with error for object event dispatching daemon/libvirtd.h | 1 + daemon/remote.c | 139 +++++++++++++++++ include/libvirt/libvirt.h.in | 80 ++++++++++ src/Makefile.am | 5 + src/conf/domain_event.c | 286 ++++++++++++++++++++--------------- src/conf/domain_event.h | 271 +++++++++++++++++++-------------- src/conf/network_event.c | 154 +++++++++++++++++++ src/conf/network_event.h | 51 +++++++ src/conf/object_event.c | 50 +++--- src/conf/object_event.h | 1 + src/conf/object_event_private.h | 20 ++- src/driver.h | 14 ++ src/libvirt.c | 125 +++++++++++++++ src/libvirt_private.syms | 2 + src/libvirt_public.syms | 7 + src/network/bridge_driver.c | 90 +++++++++++ src/network/bridge_driver_platform.h | 3 + src/remote/remote_driver.c | 127 ++++++++++++++++ src/remote/remote_protocol.x | 46 +++++- src/test/test_driver.c | 62 ++++++++ tests/objecteventtest.c | 167 ++++++++++++++++++++ 21 files changed, 1444 insertions(+), 257 deletions(-) create mode 100644 src/conf/network_event.c create mode 100644 src/conf/network_event.h -- 1.8.4.4

5 19

[libvirt] [PATCHv2 0/7] lxc: honor mount namespaces
by Eric Blake 10 Jan '14

10 Jan '14

We are still awaiting a CVE number to be assigned, but Reco reported in Debian bug #732394 that a malicious guest could cause virDomainShutdown and virDomainReboot to cause the host to misbehave, if the host blindly follows symlinks in its own mount namespace instead of the guest's namespace. I have not yet tried to patch the bugs in virDomainDeviceAttach dereferencing /dev from the wrong namespace, which also suffers from the same vulnerability, but virProcessRunInMountNamespace should also be usable in that situation. While working on this series, I found several issues with virFork and virt-login-shell; since those are also related to correct namespace usage, I've bundled everything into one series; but the CVE is not fixed until patch 7/7 plus the future patch to /dev. I've done some pretty decent testing on the new virt-login-shell, but did not get as much testing on virDomainReboot. Since this series does address a CVE, and also regressions caused by our previous CVE fix in the same area of code (CVE-2013-4400 is unfortunately a poor example of shipping "fixes" without testing that the code still worked), I'd definitely appreciate a close review. Patch 6/7 is interesting: it uses virFork to use the mount namespace without impacting the parent process. However, since setns() is thread-safe, I wonder if it would be simpler to instead use pthread_create to do the callback within the same process instead of having to create a separate process, as that would make for easier coordination for passing the results back to the remaining threads that have not changed namespace. Thankfully, I think we came up with a good abstraction - I'm fairly confident that 6/7 could be rewritten to use pthread_create without changing the function signatures, in which case patch 7/7 would not need any changes to pick up the changed backend. Eric Blake (7): virt-login-shell: fix regressions in behavior virFork: simplify semantics virt-login-shell: use single instead of double fork virt-login-shell: saner exit value virsh: report exit status of failed lxc-enter-namespace lxc: add virProcessRunInMountNamespace lxc: security fix for virInitctlSetRunLevel src/internal.h | 7 +++ src/libvirt.c | 2 +- src/libvirt_private.syms | 1 + src/lxc/lxc_driver.c | 38 ++++++------ src/util/vircommand.c | 128 +++++++++++++++----------------------- src/util/vircommand.h | 2 +- src/util/virfile.c | 25 ++------ src/util/virinitctl.c | 28 ++++----- src/util/virinitctl.h | 5 +- src/util/virprocess.c | 81 ++++++++++++++++++++++-- src/util/virprocess.h | 11 ++++ tools/virsh-domain.c | 34 ++++++---- tools/virsh.pod | 3 +- tools/virt-login-shell.c | 151 ++++++++++++++++++++------------------------- tools/virt-login-shell.pod | 23 ++++++- 15 files changed, 299 insertions(+), 240 deletions(-) -- 1.8.4.2

4 18

[libvirt] [PATCH 00/24] libvirt.c error handling audit
by Eric Blake 09 Jan '14

09 Jan '14

This series is in response to: https://www.redhat.com/archives/libvir-list/2013-December/msg01101.html It turned into a much bigger cleanup project, where I ended up with a lot of changes; hopefully the division into multiple patches makes review easier, and the end result diffstat shows that the code base is more compact when all is said and done. Eric Blake (24): maint: consistent formatting in libvirt.c maint: improve debug of libvirt-{qemu,lxc} apis maint: move debug statements first in public API maint: improve error condition style in public API maint: don't leave garbage on early API exit maint: reset error on entrance to public API maint: avoid nested public calls maint: improve VIR_ERR_NO_SUPPORT usage maint: improve VIR_ERR_OPERATION_DENIED usage maint: improve VIR_ERR_INVALID_CONN usage maint: inline VIR_IS_CONNECT macro maint: improve VIR_ERR_INVALID_DOMAIN usage maint: inline VIR_IS*_DOMAIN macro maint: improve VIR_ERR_INVALID_NETWORK usage maint: improve VIR_ERR_INVALID_INTERFACE usage maint: improve VIR_ERR_INVALID_STORAGE_POOL usage maint: improve VIR_ERR_INVALID_STORAGE_VOL usage maint: improve VIR_ERR_INVALID_NODE_DEVICE usage maint: improve VIR_ERR_INVALID_SECRET usage maint: improve VIR_ERR_INVALID_STREAM usage maint: improve VIR_ERR_INVALID_NWFILTER usage maint: improve VIR_ERR_INVALID_DOMAIN_SNAPSHOT usage maint: clean up error reporting in migration maint: replace remaining virLib*Error with better names cfg.mk | 10 - docs/api_extension.html.in | 7 +- po/POTFILES.in | 1 - src/datatypes.c | 104 +- src/datatypes.h | 318 ++- src/internal.h | 9 + src/libvirt-lxc.c | 38 +- src/libvirt-qemu.c | 65 +- src/libvirt.c | 5342 +++++++++++++-------------------------- src/locking/lock_daemon.c | 16 +- src/lxc/lxc_driver.c | 2 +- src/qemu/qemu_migration.c | 10 +- src/security/security_manager.c | 46 +- src/util/virerror.c | 2 +- src/util/virerror.h | 8 + src/util/virinitctl.c | 4 +- src/util/virtypedparam.c | 14 +- src/util/viruuid.h | 20 +- src/xen/xen_driver.c | 11 +- 19 files changed, 2250 insertions(+), 3777 deletions(-) -- 1.8.4.2

2 75

[libvirt] [PATCH] storage: fix crash when listing volumes or undefining a pool
by Martin Kletzander 09 Jan '14

09 Jan '14

The commit cad3cf9a951d26da9d2ee0f5b52fb1a2dbb74af1 introduced a crash due to wrong order of parameters being passed to the function. When deleting an element, the function decreased the iterator instead of count and if listing volumes after that (or undefining the pool, NULL was being dereferenced. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/storage/storage_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index aaa0f02..85fc0f2 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1566,7 +1566,7 @@ storageVolDelete(virStorageVolPtr obj, vol->name, pool->def->name); virStorageVolDefFree(vol); - VIR_DELETE_ELEMENT(pool->volumes.objs, pool->volumes.count, i); + VIR_DELETE_ELEMENT(pool->volumes.objs, i, pool->volumes.count); break; } } -- 1.8.5.2

2 2

[libvirt] [libvirt-java] [PATCH 00/15] Refactor error handling
by Claudio Bley 09 Jan '14

09 Jan '14

The error handling in libvirt-java is sort of a mess. Each and every class contains a processError() method which just forwards to ErrorHandler.processError(jna.Libvirt). Furthermore, this processError() method is often called unnecessarily after every libvirt call, although its return code did not indicate an error at all. So, this patchset removes the cruft with the added benefit of avoiding calls into native code when possible. Patch #1 starts the refactoring. It adds a few helper methods to the ErrorHandler class which will be removed by patch #15. Patch #2 to #13 are mostly mechanical, just wrapping calls of any libvirt function into a call to processError(int) or processError<T>(T). Patch #14 removes the obsolete processError(Libvirt) method. Patch #15 cleans up patch #1. Claudio Bley (15): Start refactoring of error handling Remove processError from Device class Remove processError from Domain class Remove processError from DomainSnapshot class Remove processError from Interface class Remove processError method from Network class Remove processError method from NetworkFilter class Remove processError method from Secret class Remove processError method from StoragePool class Remove processError method from StorageVol class Remove processError method from Stream class Remove processError method from Connect class Call processError only when virInitialize signalled an error Remove ErrorHandler.processError(Libvirt) method fixup! Start refactoring of error handling src/main/java/org/libvirt/Connect.java | 69 +----- src/main/java/org/libvirt/Device.java | 49 ++-- src/main/java/org/libvirt/Domain.java | 328 +++++++++----------------- src/main/java/org/libvirt/DomainSnapshot.java | 23 +- src/main/java/org/libvirt/ErrorHandler.java | 44 +++- src/main/java/org/libvirt/Interface.java | 43 +--- src/main/java/org/libvirt/Library.java | 4 +- src/main/java/org/libvirt/Network.java | 61 ++--- src/main/java/org/libvirt/NetworkFilter.java | 43 +--- src/main/java/org/libvirt/Secret.java | 61 ++--- src/main/java/org/libvirt/StoragePool.java | 95 +++----- src/main/java/org/libvirt/StorageVol.java | 56 ++--- src/main/java/org/libvirt/Stream.java | 64 ++--- 13 files changed, 297 insertions(+), 643 deletions(-) -- 1.8.5.2.msysgit.0

1 15

[libvirt] [PATCH RESEND] qemuBuildNicDevStr: Set vectors= on Multiqueue
by Michal Privoznik 09 Jan '14

09 Jan '14

Yet another advice appeared on the Multiqueue wiki page: http://www.linux-kvm.org/page/Multiqueue#Enable_MQ_feature We should add vectors=N onto the qemu command line, where N = 2 * (number of queues) + 1. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_command.c | 13 +++++++------ src/qemu/qemu_command.h | 2 +- src/qemu/qemu_hotplug.c | 4 +--- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 35b7c67..81486df 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4980,7 +4980,7 @@ qemuBuildNicDevStr(virDomainDefPtr def, virDomainNetDefPtr net, int vlan, int bootindex, - bool multiqueue, + int vhostfdSize, virQEMUCapsPtr qemuCaps) { virBuffer buf = VIR_BUFFER_INITIALIZER; @@ -5035,8 +5035,11 @@ qemuBuildNicDevStr(virDomainDefPtr def, virDomainVirtioEventIdxTypeToString(net->driver.virtio.event_idx)); } } - if (usingVirtio && multiqueue) - virBufferAddLit(&buf, ",mq=on"); + if (usingVirtio && vhostfdSize > 1) { + /* As advised at http://www.linux-kvm.org/page/Multiqueue + * we should add vectors=2*N+1 where N is the vhostfdSize */ + virBufferAsprintf(&buf, ",mq=on,vectors=%d", 2 * vhostfdSize + 1); + } if (vlan == -1) virBufferAsprintf(&buf, ",netdev=host%s", net->info.alias); else @@ -7591,10 +7594,8 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, virCommandAddArgList(cmd, "-netdev", host, NULL); } if (qemuDomainSupportsNicdev(def, qemuCaps, net)) { - bool multiqueue = tapfdSize > 1 || vhostfdSize > 1; - if (!(nic = qemuBuildNicDevStr(def, net, vlan, bootindex, - multiqueue, qemuCaps))) + vhostfdSize, qemuCaps))) goto cleanup; virCommandAddArgList(cmd, "-device", nic, NULL); } else { diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 66c23cc..de7683d 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -105,7 +105,7 @@ char * qemuBuildNicDevStr(virDomainDefPtr def, virDomainNetDefPtr net, int vlan, int bootindex, - bool multiqueue, + int vhostfdSize, virQEMUCapsPtr qemuCaps); char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk, diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 7a8caf1..4315df2 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -998,10 +998,8 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, } if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { - bool multiqueue = tapfdSize > 1 || vhostfdSize > 1; - if (!(nicstr = qemuBuildNicDevStr(vm->def, net, vlan, 0, - multiqueue, priv->qemuCaps))) + vhostfdSize, priv->qemuCaps))) goto try_remove; } else { if (!(nicstr = qemuBuildNicStr(net, NULL, vlan))) -- 1.8.5.1

2 1

[libvirt] [PATCH] Add Documentation fields to systemd service files
by Guido Günther 09 Jan '14

09 Jan '14

We point to the manpages where available and redirect to libvirt's homepage as a last resort. --- daemon/libvirtd.service.in | 2 ++ src/locking/virtlockd.service.in | 2 ++ tools/libvirt-guests.service.in | 2 ++ 3 files changed, 6 insertions(+) diff --git a/daemon/libvirtd.service.in b/daemon/libvirtd.service.in index 25979ef..dc2433a 100644 --- a/daemon/libvirtd.service.in +++ b/daemon/libvirtd.service.in @@ -9,6 +9,8 @@ Before=libvirt-guests.service After=network.target After=dbus.service After=iscsid.service +Documentation=man:libvirtd(8) +Documentation=http://libvirt.org [Service] EnvironmentFile=-/etc/sysconfig/libvirtd diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in index a1298a3..57089b0 100644 --- a/src/locking/virtlockd.service.in +++ b/src/locking/virtlockd.service.in @@ -1,6 +1,8 @@ [Unit] Description=Virtual machine lock manager Requires=virtlockd.socket +Documentation=man:virtlockd(8) +Documentation=http://libvirt.org [Service] EnvironmentFile=-/etc/sysconfig/virtlockd diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in index d48d4b8..d8d7adf 100644 --- a/tools/libvirt-guests.service.in +++ b/tools/libvirt-guests.service.in @@ -1,6 +1,8 @@ [Unit] Description=Suspend Active Libvirt Guests After=network.target libvirtd.service +Documentation=man:libvirtd(8) +Documentation=http://libvirt.org [Service] EnvironmentFile=-/etc/sysconfig/libvirt-guests -- 1.8.5.2

2 2

[libvirt] [libvirt-java] [PATCH 0/2] Fixes for Device.listCapabilities
by Claudio Bley 09 Jan '14

09 Jan '14

Let the Device.listCapabilities method return an array filled with non-null string objects. Furthermore, the decoding of the character data does no longer depend upon the default JVM charset. This also fixes a memleak because the allocated memory was not freed in the old code. Patch #2 just adds a unit test which simply uses this function. Claudio Bley (2): Make Device.listCapabilities return only valid array elements test: ensure the Device.listCapabilities method works src/main/java/org/libvirt/Device.java | 10 +++++++--- src/main/java/org/libvirt/jna/Libvirt.java | 2 +- src/test/java/org/libvirt/TestJavaBindings.java | 14 ++++++++++++++ 3 files changed, 22 insertions(+), 4 deletions(-) -- 1.8.5.2.msysgit.0

1 2

Re: [libvirt] [PATCH] libxl: Fix devid init in libxlMakeNicList
by Jim Fehlig 09 Jan '14

09 Jan '14

Stefan Bader wrote: > This basically reverts commit ba64b97134a6129a48684f22f31be92c3b6eef96 > "libxl: Allow libxl to set NIC devid". However assigning devid's > before calling libxlMakeNic does not work as that is calling > libxl_device_nic_init which sets it back to -1. > Right now auto-assignment only works in the hotplug case. But even if > that would be fixed at some point (if that is possible at all), this > would add a weird dependency between Xen and libvirt versions. Yeah, I had numerous inquires and bugs come my way even after fixing vfb and vkb devid initialization in libxl with xen.git commit 5420f265. It took some time for the fix to make its way to downstream users. Since there is not yet a fix in Xen, it only makes sense to do the nic devid initialization in libvirt to fix PXE booting HVM domains. > The change here should accept any auto-assignment that makes it into > libxl_device_nic_init. My understanding is that a caller always is > allowed to make the devid choice itself. And assuming libxlMakeNicList > is only used on domain creation, a sequential numbering should be ok. > > Signed-off-by: Stefan Bader <stefan.bader(a)canonical.com> > --- > src/libxl/libxl_conf.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c > index 04d01af..4cefadf 100644 > --- a/src/libxl/libxl_conf.c > +++ b/src/libxl/libxl_conf.c > @@ -918,6 +918,13 @@ libxlMakeNicList(virDomainDefPtr def, > libxl_domain_config *d_config) > for (i = 0; i < nnics; i++) { > if (libxlMakeNic(def, l_nics[i], &x_nics[i])) > goto error; > + /* > + * The devid (at least right now) will not get initialized by > + * libxl in the setup case but is required for starting the > + * device-model. > + */ > + if (x_nics[i].devid < 0) > + x_nics[i].devid = i; I think this is a better approach than the original code removed by ba64b971. I've pushed this since it is clearly a bug fix and appropriate for 1.2.1. Regards, Jim > } > > d_config->nics = x_nics;

1 0

Re: [libvirt] [v8 1/6] add hostdev passthrough common library
by Jim Fehlig 09 Jan '14

09 Jan '14

Chunyan Liu wrote: > Extract code from qemu_hostdev.c and make it reusable for multiple drivers, > meanwhile maintain a global hostdev state to solve conflict between > different > drivers. > > Signed-off-by: Chunyan Liu <cyliu(a)suse.com> > --- > po/POTFILES.in | 1 + > src/Makefile.am | 1 + > src/libvirt_private.syms | 21 + > src/lxc/lxc_hostdev.c | 11 +- > src/qemu/qemu_driver.c | 4 +- > src/qemu/qemu_hostdev.c | 42 +- > src/util/virhostdev.c | 1691 > ++++++++++++++++++++++++++++++++++++++++++++++ > src/util/virhostdev.h | 134 ++++ > src/util/virpci.c | 30 +- > src/util/virpci.h | 9 +- > src/util/virscsi.c | 28 +- > src/util/virscsi.h | 8 +- > src/util/virusb.c | 29 +- > src/util/virusb.h | 8 +- > 14 files changed, 1969 insertions(+), 48 deletions(-) > create mode 100644 src/util/virhostdev.c > create mode 100644 src/util/virhostdev.h > > diff --git a/po/POTFILES.in b/po/POTFILES.in > index 49dfc9c..ba63428 100644 > --- a/po/POTFILES.in > +++ b/po/POTFILES.in > @@ -161,6 +161,7 @@ src/util/vireventpoll.c > src/util/virfile.c > src/util/virhash.c > src/util/virhook.c > +src/util/virhostdev.c > src/util/viridentity.c > src/util/virinitctl.c > src/util/viriptables.c > diff --git a/src/Makefile.am b/src/Makefile.am > index 57e163f..98233cd 100644 > --- a/src/Makefile.am > +++ b/src/Makefile.am > @@ -104,6 +104,7 @@ UTIL_SOURCES = \ > util/virhash.c util/virhash.h \ > util/virhashcode.c util/virhashcode.h \ > util/virhook.c util/virhook.h \ > + util/virhostdev.c util/virhostdev.h \ > util/viridentity.c util/viridentity.h \ > util/virinitctl.c util/virinitctl.h \ > util/viriptables.c util/viriptables.h \ > diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms > index 2dbb8f8..dcb0a3e 100644 > --- a/src/libvirt_private.syms > +++ b/src/libvirt_private.syms > @@ -1264,6 +1264,27 @@ virHookInitialize; > virHookPresent; > > > +#util/virhostdev.h > +virHostdevHostSupportsPassthroughKVM; > +virHostdevHostSupportsPassthroughVFIO; > +virHostdevManagerGetDefault; > +virHostdevPciNodeDeviceDetach; > +virHostdevPciNodeDeviceReAttach; > +virHostdevPciNodeDeviceReset; > +virHostdevPrepareDomainHostdevs; > +virHostdevPreparePciHostdevs; > +virHostdevPrepareScsiHostdevs; > +virHostdevPrepareUsbHostdevs; > +virHostdevReAttachDomainHostdevs; > +virHostdevReAttachPciHostdevs; > +virHostdevReAttachScsiHostdevs; > +virHostdevReAttachUsbHostdevs; > +virHostdevUpdateActiveHostdevs; > +virHostdevUpdateActivePciHostdevs; > +virHostdevUpdateActiveScsiHostdevs; > +virHostdevUpdateActiveUsbHostdevs; > + > + > # util/viridentity.h > virIdentityGetAttr; > virIdentityGetCurrent; > diff --git a/src/lxc/lxc_hostdev.c b/src/lxc/lxc_hostdev.c > index 3b371fc..77ce965 100644 > --- a/src/lxc/lxc_hostdev.c > +++ b/src/lxc/lxc_hostdev.c > @@ -60,7 +60,7 @@ virLXCUpdateActiveUsbHostdevs(virLXCDriverPtr driver, > continue; > } > > - virUSBDeviceSetUsedBy(usb, def->name); > + virUSBDeviceSetUsedBy(usb, "QEMU", def->name); > > virObjectLock(driver->activeUsbHostdevs); > if (virUSBDeviceListAdd(driver->activeUsbHostdevs, usb) < 0) { > @@ -90,7 +90,9 @@ virLXCPrepareHostdevUSBDevices(virLXCDriverPtr driver, > for (i = 0; i < count; i++) { > virUSBDevicePtr usb = virUSBDeviceListGet(list, i); > if ((tmp = virUSBDeviceListFind(driver->activeUsbHostdevs, usb))) { > - const char *other_name = virUSBDeviceGetUsedBy(tmp); > + const char *other_name = NULL; > + const char *other_drvname = NULL; > + virUSBDeviceGetUsedBy(tmp, &other_drvname, &other_name); > > if (other_name) > virReportError(VIR_ERR_OPERATION_INVALID, > @@ -103,7 +105,7 @@ virLXCPrepareHostdevUSBDevices(virLXCDriverPtr driver, > goto error; > } > > - virUSBDeviceSetUsedBy(usb, name); > + virUSBDeviceSetUsedBy(usb, "QEMU", name); > VIR_DEBUG("Adding %03d.%03d dom=%s to activeUsbHostdevs", > virUSBDeviceGetBus(usb), virUSBDeviceGetDevno(usb), > name); > /* > @@ -352,6 +354,7 @@ virLXCDomainReAttachHostUsbDevices(virLXCDriverPtr > driver, > virDomainHostdevDefPtr hostdev = hostdevs[i]; > virUSBDevicePtr usb, tmp; > const char *used_by = NULL; > + const char *used_by_drvname = NULL; > > if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) > continue; > @@ -389,7 +392,7 @@ virLXCDomainReAttachHostUsbDevices(virLXCDriverPtr > driver, > continue; > } > > - used_by = virUSBDeviceGetUsedBy(tmp); > + virUSBDeviceGetUsedBy(tmp, &used_by_drvname, &used_by); > if (STREQ_NULLABLE(used_by, name)) { > VIR_DEBUG("Removing %03d.%03d dom=%s from activeUsbHostdevs", > hostdev->source.subsys.u.usb.bus, > diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c > index 45d11cd..90820ab 100644 > --- a/src/qemu/qemu_driver.c > +++ b/src/qemu/qemu_driver.c > @@ -10885,7 +10885,9 @@ qemuNodeDeviceReAttach(virNodeDevicePtr dev) > virObjectLock(driver->inactivePciHostdevs); > other = virPCIDeviceListFind(driver->activePciHostdevs, pci); > if (other) { > - const char *other_name = virPCIDeviceGetUsedBy(other); > + const char *other_name = NULL; > + const char *other_drvname = NULL; > + virPCIDeviceGetUsedBy(other, &other_drvname, &other_name); > > if (other_name) > virReportError(VIR_ERR_OPERATION_INVALID, > diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c > index dee61e7..1dc652b 100644 > --- a/src/qemu/qemu_hostdev.c > +++ b/src/qemu/qemu_hostdev.c > @@ -177,7 +177,7 @@ qemuUpdateActivePciHostdevs(virQEMUDriverPtr driver, > goto cleanup; > > } > - virPCIDeviceSetUsedBy(dev, def->name); > + virPCIDeviceSetUsedBy(dev, "QEMU", def->name); > > /* Setup the original states for the PCI device */ > virPCIDeviceSetUnbindFromStub(dev, > hostdev->origstates.states.pci.unbind_from_stub); > @@ -230,7 +230,7 @@ qemuUpdateActiveUsbHostdevs(virQEMUDriverPtr driver, > continue; > } > > - virUSBDeviceSetUsedBy(usb, def->name); > + virUSBDeviceSetUsedBy(usb, "QEMU", def->name); > > if (virUSBDeviceListAdd(driver->activeUsbHostdevs, usb) < 0) { > virUSBDeviceFree(usb); > @@ -270,7 +270,7 @@ qemuUpdateActiveScsiHostdevs(virQEMUDriverPtr driver, > hostdev->readonly))) > goto cleanup; > > - virSCSIDeviceSetUsedBy(scsi, def->name); > + virSCSIDeviceSetUsedBy(scsi, "QEMU", def->name); > > if (virSCSIDeviceListAdd(driver->activeScsiHostdevs, scsi) < 0) { > virSCSIDeviceFree(scsi); > @@ -683,7 +683,9 @@ qemuPrepareHostdevPCIDevices(virQEMUDriverPtr driver, > * the dev is in list driver->activePciHostdevs. > */ > if ((other = virPCIDeviceListFind(driver->activePciHostdevs, dev))) { > - const char *other_name = virPCIDeviceGetUsedBy(other); > + const char *other_name = NULL; > + const char *other_drvname = NULL; > + virPCIDeviceGetUsedBy(other, &other_drvname, &other_name); > > if (other_name) > virReportError(VIR_ERR_OPERATION_INVALID, > @@ -756,7 +758,7 @@ qemuPrepareHostdevPCIDevices(virQEMUDriverPtr driver, > activeDev = virPCIDeviceListFind(driver->activePciHostdevs, dev); > > if (activeDev) > - virPCIDeviceSetUsedBy(activeDev, name); > + virPCIDeviceSetUsedBy(activeDev, "QEMU", name); > } > > /* Loop 8: Now set the original states for hostdev def */ > @@ -847,7 +849,9 @@ qemuPrepareHostdevUSBDevices(virQEMUDriverPtr driver, > for (i = 0; i < count; i++) { > virUSBDevicePtr usb = virUSBDeviceListGet(list, i); > if ((tmp = virUSBDeviceListFind(driver->activeUsbHostdevs, usb))) { > - const char *other_name = virUSBDeviceGetUsedBy(tmp); > + const char *other_name = NULL; > + const char *other_drvname = NULL; > + virUSBDeviceGetUsedBy(tmp, &other_drvname, &other_name); > > if (other_name) > virReportError(VIR_ERR_OPERATION_INVALID, > @@ -860,7 +864,7 @@ qemuPrepareHostdevUSBDevices(virQEMUDriverPtr driver, > goto error; > } > > - virUSBDeviceSetUsedBy(usb, name); > + virUSBDeviceSetUsedBy(usb, "QEMU", name); > VIR_DEBUG("Adding %03d.%03d dom=%s to activeUsbHostdevs", > virUSBDeviceGetBus(usb), virUSBDeviceGetDevno(usb), > name); > /* > @@ -1116,7 +1120,9 @@ qemuPrepareHostdevSCSIDevices(virQEMUDriverPtr driver, > for (i = 0; i < count; i++) { > virSCSIDevicePtr scsi = virSCSIDeviceListGet(list, i); > if ((tmp = virSCSIDeviceListFind(driver->activeScsiHostdevs, scsi))) > { > - const char *other_name = virSCSIDeviceGetUsedBy(tmp); > + const char *other_name = NULL; > + const char *other_drvname = NULL; > + virSCSIDeviceGetUsedBy(tmp, &other_drvname, &other_name); > > if (other_name) > virReportError(VIR_ERR_OPERATION_INVALID, > @@ -1129,7 +1135,7 @@ qemuPrepareHostdevSCSIDevices(virQEMUDriverPtr driver, > goto error; > } > > - virSCSIDeviceSetUsedBy(scsi, name); > + virSCSIDeviceSetUsedBy(scsi, "QEMU", name); > VIR_DEBUG("Adding %s to activeScsiHostdevs", > virSCSIDeviceGetName(scsi)); > > if (virSCSIDeviceListAdd(driver->activeScsiHostdevs, scsi) < 0) > @@ -1258,10 +1264,14 @@ qemuDomainReAttachHostdevDevices(virQEMUDriverPtr > driver, > * been used by this domain. > */ > activeDev = virPCIDeviceListFind(driver->activePciHostdevs, dev); > - if (activeDev && > - STRNEQ_NULLABLE(name, virPCIDeviceGetUsedBy(activeDev))) { > - virPCIDeviceListDel(pcidevs, dev); > - continue; > + if (activeDev) { > + const char *tmp_name = NULL; > + const char *tmp_drvname = NULL; > + virPCIDeviceGetUsedBy(activeDev, &tmp_drvname, &tmp_name); > + if (STRNEQ_NULLABLE(name, tmp_name)) { > + virPCIDeviceListDel(pcidevs, dev); > + continue; > + } > } > > virPCIDeviceListDel(driver->activePciHostdevs, dev); > @@ -1316,6 +1326,7 @@ qemuDomainReAttachHostUsbDevices(virQEMUDriverPtr > driver, > virDomainHostdevDefPtr hostdev = hostdevs[i]; > virUSBDevicePtr usb, tmp; > const char *used_by = NULL; > + const char *used_by_drvname = NULL; > > if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) > continue; > @@ -1353,7 +1364,7 @@ qemuDomainReAttachHostUsbDevices(virQEMUDriverPtr > driver, > continue; > } > > - used_by = virUSBDeviceGetUsedBy(tmp); > + virUSBDeviceGetUsedBy(tmp, &used_by_drvname, &used_by); > if (STREQ_NULLABLE(used_by, name)) { > VIR_DEBUG("Removing %03d.%03d dom=%s from activeUsbHostdevs", > hostdev->source.subsys.u.usb.bus, > @@ -1380,6 +1391,7 @@ qemuDomainReAttachHostScsiDevices(virQEMUDriverPtr > driver, > virDomainHostdevDefPtr hostdev = hostdevs[i]; > virSCSIDevicePtr scsi, tmp; > const char *used_by = NULL; > + const char *used_by_drvname = NULL; > virDomainDeviceDef dev; > > dev.type = VIR_DOMAIN_DEVICE_HOSTDEV; > @@ -1421,7 +1433,7 @@ qemuDomainReAttachHostScsiDevices(virQEMUDriverPtr > driver, > continue; > } > > - used_by = virSCSIDeviceGetUsedBy(tmp); > + virSCSIDeviceGetUsedBy(tmp, &used_by_drvname, &used_by); > if (STREQ_NULLABLE(used_by, name)) { > VIR_DEBUG("Removing %s:%d:%d:%d dom=%s from > activeScsiHostdevs", > hostdev->source.subsys.u.scsi.adapter, > diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c > new file mode 100644 > index 0000000..63690b7 > --- /dev/null > +++ b/src/util/virhostdev.c > @@ -0,0 +1,1691 @@ > +/* virhostdev.c: hostdev management > + * > + * Copyright (C) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. > + * Copyright (C) 2006-2007, 2009-2013 Red Hat, Inc. > + * Copyright (C) 2006 Daniel P. Berrange > + * > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library. If not, see > + * <http://www.gnu.org/licenses/>. > + * > + * Author: Chunyan Liu <cyliu(a)suse.com> > + * Author: Daniel P. Berrange <berrange(a)redhat.com> > + */ > + > +#include <config.h> > + > +#include <dirent.h> > +#include <fcntl.h> > +#include <sys/ioctl.h> > +#include <sys/types.h> > +#include <sys/stat.h> > +#include <unistd.h> > +#include <stdlib.h> > +#include <stdio.h> > + > +#include "virhostdev.h" > +#include "viralloc.h" > +#include "virstring.h" > +#include "virfile.h" > +#include "virerror.h" > +#include "virlog.h" > +#include "virnetdev.h" > +#include "virutil.h" > +#include "configmake.h" > + > +#define VIR_FROM_THIS VIR_FROM_NONE > + > +#define HOSTDEV_STATE_DIR LOCALSTATEDIR "/run/libvirt/hostdevmgr" > + > +/* for upgrade, may need to find netconfig file in old qemu state dir */ > +#define QEMU_STATE_DIR LOCALSTATEDIR "/run/libvirt/qemu" > + > +static virHostdevManagerPtr hostdevMgr; > + > +static void > +virHostdevManagerCleanup(void) > +{ > + if (!hostdevMgr) > + return; > + > + virObjectUnref(hostdevMgr->activePciHostdevs); > + virObjectUnref(hostdevMgr->inactivePciHostdevs); > + virObjectUnref(hostdevMgr->activeUsbHostdevs); > + VIR_FREE(hostdevMgr->stateDir); > + > + VIR_FREE(hostdevMgr); > +} > + > +static int > +virHostdevOnceInit(void) > +{ > + if (VIR_ALLOC(hostdevMgr) < 0) > + goto error; > + > + if ((hostdevMgr->activePciHostdevs = virPCIDeviceListNew()) == NULL) > + goto error; > + > + if ((hostdevMgr->activeUsbHostdevs = virUSBDeviceListNew()) == NULL) > + goto error; > + > + if ((hostdevMgr->inactivePciHostdevs = virPCIDeviceListNew()) == NULL) > + goto error; > + > + if ((hostdevMgr->activeScsiHostdevs = virSCSIDeviceListNew()) == NULL) > + goto error; > + > + if (VIR_STRDUP(hostdevMgr->stateDir, HOSTDEV_STATE_DIR) < 0) > + goto error; > + > + if (virFileMakePath(hostdevMgr->stateDir) < 0) { > + virReportError(VIR_ERR_OPERATION_FAILED, > + _("Failed to create state dir '%s'"), > + hostdevMgr->stateDir); > + goto error; > + } > + > + return 0; > + > +error: > + virHostdevManagerCleanup(); > + return -1; > +} > + > +VIR_ONCE_GLOBAL_INIT(virHostdev) > + > +virHostdevManagerPtr > +virHostdevManagerGetDefault(void) > +{ > + if (virHostdevInitialize() < 0) > + return NULL; > + return hostdevMgr; > +} > + > +static int > +virHostdevPciSysfsPath(virDomainHostdevDefPtr hostdev, char **sysfs_path) > +{ > + virPCIDeviceAddress config_address; > + > + config_address.domain = hostdev->source.subsys.u.pci.addr.domain; > + config_address.bus = hostdev->source.subsys.u.pci.addr.bus; > + config_address.slot = hostdev->source.subsys.u.pci.addr.slot; > + config_address.function = hostdev->source.subsys.u.pci.addr.function; > + > + return virPCIDeviceAddressGetSysfsFile(&config_address, sysfs_path); > +} > + > +static int > +virHostdevIsVirtualFunction(virDomainHostdevDefPtr hostdev) > +{ > + char *sysfs_path = NULL; > + int ret = -1; > + > + if (virHostdevPciSysfsPath(hostdev, &sysfs_path) < 0) > + return ret; > + > + ret = virPCIIsVirtualFunction(sysfs_path); > + > + VIR_FREE(sysfs_path); > + > + return ret; > +} > + > +static int > +virHostdevNetDevice(virDomainHostdevDefPtr hostdev, > + char **linkdev, > + int *vf) > +{ > + int ret = -1; > + char *sysfs_path = NULL; > + > + if (virHostdevPciSysfsPath(hostdev, &sysfs_path) < 0) > + return ret; > + > + if (virPCIIsVirtualFunction(sysfs_path) == 1) { > + if (virPCIGetVirtualFunctionInfo(sysfs_path, linkdev, vf) < 0) > + goto cleanup; > + } else { > + if (virPCIGetNetName(sysfs_path, linkdev) < 0) > + goto cleanup; > + *vf = -1; > + } > + > + ret = 0; > + > +cleanup: > + VIR_FREE(sysfs_path); > + > + return ret; > +} > + > +static int > +virHostdevNetConfigVirtPortProfile(const char *linkdev, int vf, > + virNetDevVPortProfilePtr virtPort, > + const virMacAddr *macaddr, > + const unsigned char *uuid, > + int associate) > +{ > + int ret = -1; > + > + if (!virtPort) > + return ret; > + > + switch (virtPort->virtPortType) { > + case VIR_NETDEV_VPORT_PROFILE_NONE: > + case VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH: > + case VIR_NETDEV_VPORT_PROFILE_8021QBG: > + case VIR_NETDEV_VPORT_PROFILE_LAST: > + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, > + _("virtualport type %s is " > + "currently not supported on interfaces of type " > + "hostdev"), > + virNetDevVPortTypeToString(virtPort->virtPortType)); > + break; > + > + case VIR_NETDEV_VPORT_PROFILE_8021QBH: > + if (associate) > + ret = virNetDevVPortProfileAssociate(NULL, virtPort, macaddr, > + linkdev, vf, uuid, > + > VIR_NETDEV_VPORT_PROFILE_OP_CREATE, false); > + else > + ret = virNetDevVPortProfileDisassociate(NULL, virtPort, > + macaddr, linkdev, vf, > + > VIR_NETDEV_VPORT_PROFILE_OP_DESTROY); > + break; > + } > + > + return ret; > +} > + > +static int > +virHostdevNetConfigReplace(virDomainHostdevDefPtr hostdev, > + const unsigned char *uuid, > + char *stateDir) > +{ > + char *linkdev = NULL; > + virNetDevVlanPtr vlan; > + virNetDevVPortProfilePtr virtPort; > + int ret = -1; > + int vf = -1; > + int vlanid = -1; > + int port_profile_associate = 1; > + int isvf; > + > + isvf = virHostdevIsVirtualFunction(hostdev); > + if (isvf <= 0) { > + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", > + _("Interface type hostdev is currently supported on > " > + "SR-IOV Virtual Functions only")); > + return ret; > + } > + > + if (virHostdevNetDevice(hostdev, &linkdev, &vf) < 0) > + return ret; > + > + vlan = virDomainNetGetActualVlan(hostdev->parent.data.net) > + virtPort = > virDomainNetGetActualVirtPortProfile(hostdev->parent.data.net) > + if (virtPort) { > + if (vlan) { > + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, > + _("direct setting of the vlan tag is not allowed > " > + "for hostdev devices using %s mode"), > + > virNetDevVPortTypeToString(virtPort->virtPortType)); > + goto cleanup; > + } > + ret = virHostdevNetConfigVirtPortProfile(linkdev, vf, > + virtPort, > + &hostdev->parent.data.net->mac, > + uuid, > + port_profile_associate); > + } else { > + /* Set only mac and vlan */ > + if (vlan) { > + if (vlan->nTags != 1 || vlan->trunk) { > + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", > + _("vlan trunking is not supported " > + "by SR-IOV network devices")); > + goto cleanup; > + } > + if (vf == -1) { > + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, > + _("vlan can only be set for SR-IOV VFs, but " > + "%s is not a VF"), linkdev); > + goto cleanup; > + } > + vlanid = vlan->tag[0]; > + } else if (vf >= 0) { > + vlanid = 0; /* assure any current vlan tag is reset */ > + } > + > + ret = virNetDevReplaceNetConfig(linkdev, vf, > + &hostdev->parent.data.net->mac, > + vlanid, stateDir); > + } > +cleanup: > + VIR_FREE(linkdev); > + return ret; > +} > + > +/* oldStateDir: > + * For upgrade, if there is an existing VM on QEMU, the hostdev netconfig > file > + * is previously stored in /var/run/libvirt/qemu. With new version, it > tries to > + * find in hostdevManager->stateDir location but certainly it cannot find it. > + * In this case, we should find in the old state dir. > + */ > +static int > +virHostdevNetConfigRestore(virDomainHostdevDefPtr hostdev, > + char *stateDir, > + char *oldStateDir) > +{ > + char *linkdev = NULL; > + virNetDevVPortProfilePtr virtPort; > + int ret = -1; > + int vf = -1; > + int port_profile_associate = 0; > + int isvf; > + > + /* This is only needed for PCI devices that have been defined > + * using <interface type='hostdev'>. For all others, it is a NOP. > + */ > + if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS || > + hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI || > + hostdev->parent.type != VIR_DOMAIN_DEVICE_NET || > + !hostdev->parent.data.net) > + return 0; > + > + isvf = virHostdevIsVirtualFunction(hostdev); > + if (isvf <= 0) { > + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", > + _("Interface type hostdev is currently supported on > " > + "SR-IOV Virtual Functions only")); > + return ret; > + } > + > + if (virHostdevNetDevice(hostdev, &linkdev, &vf) < 0) > + return ret; > + > + virtPort = > virDomainNetGetActualVirtPortProfile(hostdev->parent.data.net) > + if (virtPort) > + ret = virHostdevNetConfigVirtPortProfile(linkdev, vf, virtPort, > + &hostdev->parent.data.net->mac, > + NULL, > port_profile_associate); > + else { > + ret = virNetDevRestoreNetConfig(linkdev, vf, stateDir); > + if (ret < 0 && oldStateDir != NULL) > + ret = virNetDevRestoreNetConfig(linkdev, vf, oldStateDir); > + } > + > + VIR_FREE(linkdev); > + > + return ret; > +} > + > +static virPCIDeviceListPtr > +virHostdevGetPciHostDeviceList(virDomainHostdevDefPtr *hostdevs, int > nhostdevs) > +{ > + virPCIDeviceListPtr list; > + size_t i; > + > + if (!(list = virPCIDeviceListNew())) > + return NULL; > + > + for (i = 0; i < nhostdevs; i++) { > + virDomainHostdevDefPtr hostdev = hostdevs[i]; > + virPCIDevicePtr dev; > + > + if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) > + continue; > + if (hostdev->source.subsys.type != > VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) > + continue; > + > + dev = virPCIDeviceNew(hostdev->source.subsys.u.pci.addr.domain, > + hostdev->source.subsys.u.pci.addr.bus, > + hostdev->source.subsys.u.pci.addr.slot, > + hostdev->source.subsys.u.pci.addr.function); > + if (!dev) { > + virObjectUnref(list); > + return NULL; > + } > + > + if (virPCIDeviceListAdd(list, dev) < 0) { > + virPCIDeviceFree(dev); > + virObjectUnref(list); > + return NULL; > + } > + > + virPCIDeviceSetManaged(dev, hostdev->managed); > + > + switch (hostdev->source.subsys.u.pci.backend) { > + case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO: > + if (virPCIDeviceSetStubDriver(dev, "vfio-pci") < 0) { > + virObjectUnref(list); > + return NULL; > + } > + break; > + > + case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_KVM : > + case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT: > + if (virPCIDeviceSetStubDriver(dev, "pci-stub") < 0) { > + virObjectUnref(list); > + return NULL; > + } > + break; > + } > + } > + > + return list; > +} > + > +bool > +virHostdevHostSupportsPassthroughVFIO(void) > +{ > + DIR *iommuDir = NULL; > + struct dirent *iommuGroup = NULL; > + bool ret = false; > + > + /* condition 1 - /sys/kernel/iommu_groups/ contains entries */ > + if (!(iommuDir = opendir("/sys/kernel/iommu_groups/"))) > + goto cleanup; > + > + while ((iommuGroup = readdir(iommuDir))) { > + /* skip ./ ../ */ > + if (STRPREFIX(iommuGroup->d_name, ".")) > + continue; > + > + /* assume we found a group */ > + break; > + } > + > + if (!iommuGroup) > + goto cleanup; > + /* okay, iommu is on and recognizes groups */ > + > + /* condition 2 - /dev/vfio/vfio exists */ > + if (!virFileExists("/dev/vfio/vfio")) > + goto cleanup; > + > + ret = true; > + > +cleanup: > + if (iommuDir) > + closedir(iommuDir); > + > + return ret; > +} > + > + > +#if HAVE_LINUX_KVM_H > +# include <linux/kvm.h> > +bool > +virHostdevHostSupportsPassthroughKVM(void) > +{ > + int kvmfd = -1; > + bool ret = false; > + > + if ((kvmfd = open("/dev/kvm", O_RDONLY)) < 0) > + goto cleanup; > + > +# ifdef KVM_CAP_IOMMU > + if ((ioctl(kvmfd, KVM_CHECK_EXTENSION, KVM_CAP_IOMMU)) < 0) Like the original code in qemu_hostdev.c, this needs to be <= 0. Otherwise, if intel_iommu=off, the ioctl returns 0, the function returns true, and we attempt to start a domain that is destined to fail. I've been doing a fair bit of testing of this series and with the exception of the above issue, haven't noticed any problems thus far. Unfortunately, you will need to rebase the series and post a v9, but I'm confident we can get this pushed after the 1.2.1 freeze. Thanks! Regards, Jim > + goto cleanup; > + > + ret = true; > +# endif > + > +cleanup: > + VIR_FORCE_CLOSE(kvmfd); > + > + return ret; > +} > +#else > +bool > +virHostdevHostSupportsPassthroughKVM(void) > +{ > + return false; > +} > +#endif > + > +static bool > +virHostdevPCICheckSupport(virDomainHostdevDefPtr *hostdevs, > + size_t nhostdevs) > +{ > + bool supportsPassthroughVFIO = virHostdevHostSupportsPassthroughVFIO(); > + bool supportsPassthroughKVM = virHostdevHostSupportsPassthroughKVM(); > + size_t i; > + > + /* assign defaults for hostdev passthrough */ > + for (i = 0; i < nhostdevs; i++) { > + virDomainHostdevDefPtr hostdev = hostdevs[i]; > + int *backend = &hostdev->source.subsys.u.pci.backend; > + > + if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) > + continue; > + if (hostdev->source.subsys.type != > VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) > + continue; > + > + switch ((virDomainHostdevSubsysPciBackendType) *backend) { > + case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO: > + if (!supportsPassthroughVFIO) { > + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", > + _("host doesn't support VFIO PCI > passthrough")); > + return false; > + } > + break; > + > + case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT: > + case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_KVM: > + if (!supportsPassthroughKVM) { > + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", > + _("host doesn't support legacy PCI > passthrough")); > + return false; > + } > + > + break; > + > + default: > + break; > + } > + } > + > + return true; > +} > +int > +virHostdevPreparePciHostdevs(virHostdevManagerPtr mgr, > + const char *drv_name, > + const char *dom_name, > + const unsigned char *uuid, > + virDomainHostdevDefPtr *hostdevs, > + int nhostdevs, > + unsigned int flags) > +{ > + virPCIDeviceListPtr pcidevs = NULL; > + int last_processed_hostdev_vf = -1; > + size_t i; > + int ret = -1; > + > + if (!nhostdevs) > + return 0; > + if (mgr == NULL) > + return -1; > + > + virObjectLock(mgr->activePciHostdevs); > + virObjectLock(mgr->inactivePciHostdevs); > + > + if (!virHostdevPCICheckSupport(hostdevs, nhostdevs)) > + goto cleanup; > + > + if (!(pcidevs = virHostdevGetPciHostDeviceList(hostdevs, nhostdevs))) > + goto cleanup; > + > + /* We have to use 9 loops here. *All* devices must > + * be detached before we reset any of them, because > + * in some cases you have to reset the whole PCI, > + * which impacts all devices on it. Also, all devices > + * must be reset before being marked as active. > + */ > + > + /* Loop 1: validate that non-managed device isn't in use, eg > + * by checking that device is either un-bound, or bound > + * to stub driver > + */ > + > + for (i = 0; i < virPCIDeviceListCount(pcidevs); i++) { > + virPCIDevicePtr dev = virPCIDeviceListGet(pcidevs, i); > + virPCIDevicePtr other; > + bool strict_acs_check = !!(flags & VIR_STRICT_ACS_CHECK); > + > + if (!virPCIDeviceIsAssignable(dev, strict_acs_check)) { > + virReportError(VIR_ERR_OPERATION_INVALID, > + _("PCI device %s is not assignable"), > + virPCIDeviceGetName(dev)); > + goto cleanup; > + } > + /* The device is in use by other active domain if > + * the dev is in list activePciHostdevs. > + */ > + if ((other = virPCIDeviceListFind(mgr->activePciHostdevs, dev))) { > + const char *other_drvname; > + const char *other_domname; > + > + virPCIDeviceGetUsedBy(other, &other_drvname, &other_domname); > + if (other_drvname && other_domname) > + virReportError(VIR_ERR_OPERATION_INVALID, > + _("PCI device %s is in use by driver > %s,domain %s"), > + virPCIDeviceGetName(dev), other_drvname, > + other_domname); > + else > + virReportError(VIR_ERR_OPERATION_INVALID, > + _("PCI device %s is already in use"), > + virPCIDeviceGetName(dev)); > + goto cleanup; > + } > + } > + > + /* Loop 2: detach managed devices */ > + for (i = 0; i < virPCIDeviceListCount(pcidevs); i++) { > + virPCIDevicePtr dev = virPCIDeviceListGet(pcidevs, i); > + if (virPCIDeviceGetManaged(dev) && > + virPCIDeviceDetach(dev, mgr->activePciHostdevs, NULL) < 0) > + goto reattachdevs; > + } > + > + /* Loop 3: Now that all the PCI hostdevs have been detached, we > + * can safely reset them */ > + for (i = 0; i < virPCIDeviceListCount(pcidevs); i++) { > + virPCIDevicePtr dev = virPCIDeviceListGet(pcidevs, i); > + if (virPCIDeviceReset(dev, mgr->activePciHostdevs, > + mgr->inactivePciHostdevs) < 0) > + goto reattachdevs; > + } > + > + /* Loop 4: For SRIOV network devices, Now that we have detached the > + * the network device, set the netdev config */ > + for (i = 0; i < nhostdevs; i++) { > + virDomainHostdevDefPtr hostdev = hostdevs[i]; > + if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) > + continue; > + if (hostdev->source.subsys.type != > VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) > + continue; > + if (hostdev->parent.type == VIR_DOMAIN_DEVICE_NET && > + hostdev->parent.data.net) { > + if (virHostdevNetConfigReplace(hostdev, uuid, mgr->stateDir) < 0) > + goto resetvfnetconfig; > + } > + last_processed_hostdev_vf = i; > + } > + > + /* Loop 5: Now mark all the devices as active */ > + for (i = 0; i < virPCIDeviceListCount(pcidevs); i++) { > + virPCIDevicePtr dev = virPCIDeviceListGet(pcidevs, i); > + if (virPCIDeviceListAdd(mgr->activePciHostdevs, dev) < 0) > + goto inactivedevs; > + } > + > + /* Loop 6: Now remove the devices from inactive list. */ > + for (i = 0; i < virPCIDeviceListCount(pcidevs); i++) { > + virPCIDevicePtr dev = virPCIDeviceListGet(pcidevs, i); > + virPCIDeviceListDel(mgr->inactivePciHostdevs, dev); > + } > + > + /* Loop 7: Now set the used_by_domain of the device in > + * driver->activePciHostdevs as domain name. > + */ > + for (i = 0; i < virPCIDeviceListCount(pcidevs); i++) { > + virPCIDevicePtr dev, activeDev; > + > + dev = virPCIDeviceListGet(pcidevs, i); > + activeDev = virPCIDeviceListFind(mgr->activePciHostdevs, dev); > + > + if (activeDev) > + virPCIDeviceSetUsedBy(activeDev, drv_name, dom_name); > + } > + > + /* Loop 8: Now set the original states for hostdev def */ > + for (i = 0; i < nhostdevs; i++) { > + virPCIDevicePtr dev; > + virPCIDevicePtr pcidev; > + virDomainHostdevDefPtr hostdev = hostdevs[i]; > + > + if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) > + continue; > + if (hostdev->source.subsys.type != > VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) > + continue; > + > + dev = virPCIDeviceNew(hostdev->source.subsys.u.pci.addr.domain, > + hostdev->source.subsys.u.pci.addr.bus, > + hostdev->source.subsys.u.pci.addr.slot, > + hostdev->source.subsys.u.pci.addr.function); > + > + /* original states "unbind_from_stub", "remove_slot", > + * "reprobe" were already set by pciDettachDevice in > + * loop 2. > + */ > + if ((pcidev = virPCIDeviceListFind(pcidevs, dev))) { > + hostdev->origstates.states.pci.unbind_from_stub = > + virPCIDeviceGetUnbindFromStub(pcidev); > + hostdev->origstates.states.pci.remove_slot = > + virPCIDeviceGetRemoveSlot(pcidev); > + hostdev->origstates.states.pci.reprobe = > + virPCIDeviceGetReprobe(pcidev); > + } > + > + virPCIDeviceFree(dev); > + } > + > + /* Loop 9: Now steal all the devices from pcidevs */ > + while (virPCIDeviceListCount(pcidevs) > 0) > + virPCIDeviceListStealIndex(pcidevs, 0); > + > + ret = 0; > + goto cleanup; > + > +inactivedevs: > + /* Only steal all the devices from driver->activePciHostdevs. We will > + * free them in virObjectUnref(). > + */ > + while (virPCIDeviceListCount(pcidevs) > 0) { > + virPCIDevicePtr dev = virPCIDeviceListGet(pcidevs, 0); > + virPCIDeviceListSteal(mgr->activePciHostdevs, dev); > + } > + > +resetvfnetconfig: > + for (i = 0; > + last_processed_hostdev_vf != -1 && i < last_processed_hostdev_vf; i++) > + virHostdevNetConfigRestore(hostdevs[i], mgr->stateDir, NULL); > + > +reattachdevs: > + for (i = 0; i < virPCIDeviceListCount(pcidevs); i++) { > + virPCIDevicePtr dev = virPCIDeviceListGet(pcidevs, i); > + virPCIDeviceReattach(dev, mgr->activePciHostdevs, NULL); > + } > + > +cleanup: > + virObjectUnlock(mgr->activePciHostdevs); > + virObjectUnlock(mgr->inactivePciHostdevs); > + virObjectUnref(pcidevs); > + return ret; > +} > + > +static int > +virHostdevFindUSBDevice(virDomainHostdevDefPtr hostdev, > + bool mandatory, > + virUSBDevicePtr *usb) > +{ > + unsigned vendor = hostdev->source.subsys.u.usb.vendor; > + unsigned product = hostdev->source.subsys.u.usb.product; > + unsigned bus = hostdev->source.subsys.u.usb.bus; > + unsigned device = hostdev->source.subsys.u.usb.device; > + bool autoAddress = hostdev->source.subsys.u.usb.autoAddress; > + int rc; > + > + *usb = NULL; > + > + if (vendor && bus) { > + rc = virUSBDeviceFind(vendor, product, bus, device, > + NULL, > + autoAddress ? false : mandatory, > + usb); > + if (rc < 0) { > + return -1; > + } else if (!autoAddress) { > + goto out; > + } else { > + VIR_INFO("USB device %x:%x could not be found at previous" > + " address (bus:%u device:%u)", > + vendor, product, bus, device); > + } > + } > + > + /* When vendor is specified, its USB address is either unspecified or > the > + * device could not be found at the USB device where it had been > + * automatically found before. > + */ > + if (vendor) { > + virUSBDeviceListPtr devs; > + > + rc = virUSBDeviceFindByVendor(vendor, product, NULL, mandatory, > &devs); > + if (rc < 0) > + return -1; > + > + if (rc == 1) { > + *usb = virUSBDeviceListGet(devs, 0); > + virUSBDeviceListSteal(devs, *usb); > + } > + virObjectUnref(devs); > + > + if (rc == 0) { > + goto out; > + } else if (rc > 1) { > + if (autoAddress) { > + virReportError(VIR_ERR_OPERATION_FAILED, > + _("Multiple USB devices for %x:%x were > found, " > + "but none of them is at bus:%u > device:%u"), > + vendor, product, bus, device); > + } else { > + virReportError(VIR_ERR_OPERATION_FAILED, > + _("Multiple USB devices for %x:%x, " > + "use <address> to specify one"), > + vendor, product); > + } > + return -1; > + } > + > + hostdev->source.subsys.u.usb.bus = virUSBDeviceGetBus(*usb); > + hostdev->source.subsys.u.usb.device = virUSBDeviceGetDevno(*usb); > + hostdev->source.subsys.u.usb.autoAddress = true; > + > + if (autoAddress) { > + VIR_INFO("USB device %x:%x found at bus:%u device:%u (moved" > + " from bus:%u device:%u)", > + vendor, product, > + hostdev->source.subsys.u.usb.bus, > + hostdev->source.subsys.u.usb.device, > + bus, device); > + } > + } else if (!vendor && bus) { > + if (virUSBDeviceFindByBus(bus, device, NULL, mandatory, usb) < 0) > + return -1; > + } > + > +out: > + if (!*usb) > + hostdev->missing = true; > + return 0; > +} > + > +static int > +virHostdevMarkUsbHostdevs(virHostdevManagerPtr mgr, > + const char *drv_name, > + const char *dom_name, > + virUSBDeviceListPtr list) > +{ > + size_t i, j; > + unsigned int count; > + virUSBDevicePtr tmp; > + > + virObjectLock(mgr->activeUsbHostdevs); > + count = virUSBDeviceListCount(list); > + > + for (i = 0; i < count; i++) { > + virUSBDevicePtr usb = virUSBDeviceListGet(list, i); > + if ((tmp = virUSBDeviceListFind(mgr->activeUsbHostdevs, usb))) { > + const char *other_drvname; > + const char *other_domname; > + > + virUSBDeviceGetUsedBy(tmp, &other_drvname, &other_domname); > + if (other_drvname && other_domname) > + virReportError(VIR_ERR_OPERATION_INVALID, > + _("USB device %s is in use by " > + "driver %s,domain %s"), > + virUSBDeviceGetName(tmp), > + other_drvname, other_domname); > + else > + virReportError(VIR_ERR_OPERATION_INVALID, > + _("USB device %s is already in use"), > + virUSBDeviceGetName(tmp)); > + goto error; > + } > + > + virUSBDeviceSetUsedBy(usb, drv_name, dom_name); > + VIR_DEBUG("Adding %03d.%03d driver= %s dom=%s to > activeUsbHostdevs", > + virUSBDeviceGetBus(usb), virUSBDeviceGetDevno(usb), > + drv_name, dom_name); > + /* > + * The caller is responsible to steal these usb devices > + * from the virUSBDeviceList that passed in on success, > + * perform rollback on failure. > + */ > + if (virUSBDeviceListAdd(mgr->activeUsbHostdevs, usb) < 0) > + goto error; > + } > + > + virObjectUnlock(mgr->activeUsbHostdevs); > + return 0; > + > +error: > + for (j = 0; j < i; j++) { > + tmp = virUSBDeviceListGet(list, j); > + virUSBDeviceListSteal(mgr->activeUsbHostdevs, tmp); > + } > + virObjectUnlock(mgr->activeUsbHostdevs); > + return -1; > +} > + > +int > +virHostdevPrepareUsbHostdevs(virHostdevManagerPtr mgr, > + const char *drv_name, > + const char *dom_name, > + virDomainHostdevDefPtr *hostdevs, > + int nhostdevs, > + bool coldBoot) > +{ > + size_t i; > + int ret = -1; > + virUSBDeviceListPtr list; > + virUSBDevicePtr tmp; > + > + if (!nhostdevs) > + return 0; > + if (mgr == NULL) > + return -1; > + > + /* To prevent situation where USB device is assigned to two domains > + * we need to keep a list of currently assigned USB devices. > + * This is done in several loops which cannot be joined into one > + * big loop. > + */ > + if (!(list = virUSBDeviceListNew())) > + goto cleanup; > + > + /* Loop 1: build temporary list > + */ > + for (i = 0; i < nhostdevs; i++) { > + virDomainHostdevDefPtr hostdev = hostdevs[i]; > + bool required = true; > + virUSBDevicePtr usb; > + > + if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) > + continue; > + if (hostdev->source.subsys.type != > VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB) > + continue; > + > + if (hostdev->startupPolicy == VIR_DOMAIN_STARTUP_POLICY_OPTIONAL || > + (hostdev->startupPolicy == VIR_DOMAIN_STARTUP_POLICY_REQUISITE && > + !coldBoot)) > + required = false; > + > + if (virHostdevFindUSBDevice(hostdev, required, &usb) < 0) > + goto cleanup; > + > + if (usb && virUSBDeviceListAdd(list, usb) < 0) { > + virUSBDeviceFree(usb); > + goto cleanup; > + } > + } > + > + /* Mark devices in temporary list as used by @name > + * and add them do active list. However, if something goes > + * wrong, perform rollback. > + */ > + if (virHostdevMarkUsbHostdevs(mgr, drv_name, dom_name, list) < 0) > + goto cleanup; > + > + /* Loop 2: Temporary list was successfully merged with > + * active list, so steal all items to avoid freeing them > + * in cleanup label. > + */ > + while (virUSBDeviceListCount(list) > 0) { > + tmp = virUSBDeviceListGet(list, 0); > + virUSBDeviceListSteal(list, tmp); > + } > + > + ret = 0; > + > +cleanup: > + virObjectUnref(list); > + return ret; > +} > + > +int > +virHostdevPrepareScsiHostdevs(virHostdevManagerPtr mgr, > + const char *drv_name, > + const char *dom_name, > + virDomainHostdevDefPtr *hostdevs, > + int nhostdevs) > +{ > + size_t i, j; > + int count; > + virSCSIDeviceListPtr list; > + virSCSIDevicePtr tmp; > + > + if (!nhostdevs) > + return 0; > + if (mgr == NULL) > + return -1; > + > + /* To prevent situation where SCSI device is assigned to two domains > + * we need to keep a list of currently assigned SCSI devices. > + */ > + if (!(list = virSCSIDeviceListNew())) > + goto cleanup; > + > + /* Loop 1: build temporary list */ > + for (i = 0; i < nhostdevs; i++) { > + virDomainHostdevDefPtr hostdev = hostdevs[i]; > + virSCSIDevicePtr scsi; > + > + if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS || > + hostdev->source.subsys.type != > VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI) > + continue; > + > + if (hostdev->managed) { > + virReportError(VIR_ERR_XML_ERROR, "%s", > + _("SCSI host device doesn't support managed > mode")); > + goto cleanup; > + } > + > + if (!(scsi = virSCSIDeviceNew(hostdev->source.subsys.u.scsi.adapter, > + hostdev->source.subsys.u.scsi.bus, > + hostdev->source.subsys.u.scsi.target, > + hostdev->source.subsys.u.scsi.unit, > + hostdev->readonly))) > + goto cleanup; > + > + if (scsi && virSCSIDeviceListAdd(list, scsi) < 0) { > + virSCSIDeviceFree(scsi); > + goto cleanup; > + } > + } > + > + /* Loop 2: Mark devices in temporary list as used by > + * and add them to driver list. However, if something goes > + * wrong, perform rollback. > + */ > + virObjectLock(mgr->activeScsiHostdevs); > + count = virSCSIDeviceListCount(list); > + > + for (i = 0; i < count; i++) { > + virSCSIDevicePtr scsi = virSCSIDeviceListGet(list, i); > + if ((tmp = virSCSIDeviceListFind(mgr->activeScsiHostdevs, scsi))) { > + const char *other_drvname; > + const char *other_domname; > + > + virSCSIDeviceGetUsedBy(tmp, &other_drvname, &other_domname); > + if (other_drvname && other_domname) > + virReportError(VIR_ERR_OPERATION_INVALID, > + _("SCSI device %s is in use by " > + "driver %s domain %s"), > + virSCSIDeviceGetName(tmp), > + other_drvname, other_domname); > + else > + virReportError(VIR_ERR_OPERATION_INVALID, > + _("SCSI device %s is already in use"), > + virSCSIDeviceGetName(tmp)); > + goto error; > + } > + > + virSCSIDeviceSetUsedBy(scsi, drv_name, dom_name); > + VIR_DEBUG("Adding %s to activeScsiHostdevs", > virSCSIDeviceGetName(scsi)); > + > + if (virSCSIDeviceListAdd(mgr->activeScsiHostdevs, scsi) < 0) > + goto error; > + } > + > + virObjectUnlock(mgr->activeScsiHostdevs); > + > + /* Loop 3: Temporary list was successfully merged with > + * driver list, so steal all items to avoid freeing them > + * when freeing temporary list. > + */ > + while (virSCSIDeviceListCount(list) > 0) { > + tmp = virSCSIDeviceListGet(list, 0); > + virSCSIDeviceListSteal(list, tmp); > + } > + > + virObjectUnref(list); > + return 0; > + > +error: > + for (j = 0; j < i; j++) { > + tmp = virSCSIDeviceListGet(list, j); > + virSCSIDeviceListSteal(mgr->activeScsiHostdevs, tmp); > + } > + virObjectUnlock(mgr->activeScsiHostdevs); > +cleanup: > + virObjectUnref(list); > + return -1; > +} > + > +int > +virHostdevPrepareDomainHostdevs(virHostdevManagerPtr mgr, > + const char *driver, > + virDomainDefPtr def, > + unsigned int flags) > +{ > + if (!def->nhostdevs) > + return 0; > + > + if (mgr == NULL) > + return -1; > + > + if (flags & VIR_SP_PCI_HOSTDEV) { > + if (virHostdevPreparePciHostdevs(mgr, driver, > + def->name, def->uuid, > + def->hostdevs, > + def->nhostdevs, > + flags) < 0) > + return -1; > + } > + > + if (flags & VIR_SP_USB_HOSTDEV) { > + bool coldBoot = !!(flags & VIR_COLD_BOOT); > + if (virHostdevPrepareUsbHostdevs(mgr, driver, def->name, > + def->hostdevs, def->nhostdevs, > + coldBoot) < 0) > + return -1; > + } > + > + if (flags & VIR_SP_SCSI_HOSTDEV) { > + if (virHostdevPrepareScsiHostdevs(mgr, driver, def->name, > + def->hostdevs, def->nhostdevs) < 0) > + return -1; > + } > + > + return 0; > +} > + > +/* > + * Pre-condition: mgr->inactivePciHostdevs & mgr->activePciHostdevs > + * are locked > + */ > +static void > +virHostdevReAttachPciDevice(virHostdevManagerPtr mgr, virPCIDevicePtr dev) > +{ > + /* If the device is not managed and was attached to guest > + * successfully, it must have been inactive. > + */ > + if (!virPCIDeviceGetManaged(dev)) { > + if (virPCIDeviceListAdd(mgr->inactivePciHostdevs, dev) < 0) > + virPCIDeviceFree(dev); > + return; > + } > + > + /* Wait for device cleanup if it is qemu/kvm */ > + if (STREQ(virPCIDeviceGetStubDriver(dev), "pci-stub")) { > + int retries = 100; > + while (virPCIDeviceWaitForCleanup(dev, "kvm_assigned_device") > + && retries) { > + usleep(100*1000); > + retries--; > + } > + } > + > + if (virPCIDeviceReattach(dev, mgr->activePciHostdevs, > + mgr->inactivePciHostdevs) < 0) { > + virErrorPtr err = virGetLastError(); > + VIR_ERROR(_("Failed to re-attach PCI device: %s"), > + err ? err->message : _("unknown error")); > + virResetError(err); > + } > + virPCIDeviceFree(dev); > +} > + > +/* > + * Pre-condition: mgr->activePciHostdevs is locked > + */ > +static virPCIDeviceListPtr > +virHostdevGetActivePciHostDeviceList(virHostdevManagerPtr mgr, > + virDomainHostdevDefPtr *hostdevs, > + int nhostdevs) > +{ > + virPCIDeviceListPtr list; > + size_t i; > + > + if (!(list = virPCIDeviceListNew())) > + return NULL; > + > + for (i = 0; i < nhostdevs; i++) { > + virDomainHostdevDefPtr hostdev = hostdevs[i]; > + virPCIDevicePtr dev; > + virPCIDevicePtr activeDev; > + > + if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) > + continue; > + if (hostdev->source.subsys.type != > VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) > + continue; > + > + dev = virPCIDeviceNew(hostdev->source.subsys.u.pci.addr.domain, > + hostdev->source.subsys.u.pci.addr.bus, > + hostdev->source.subsys.u.pci.addr.slot, > + hostdev->source.subsys.u.pci.addr.function); > + if (!dev) { > + virObjectUnref(list); > + return NULL; > + } > + > + if ((activeDev = virPCIDeviceListFind(mgr->activePciHostdevs, dev))) > { > + if (virPCIDeviceListAdd(list, activeDev) < 0) { > + virPCIDeviceFree(dev); > + virObjectUnref(list); > + return NULL; > + } > + } > + > + virPCIDeviceFree(dev); > + } > + > + return list; > +} > + > +int > +virHostdevUpdateActivePciHostdevs(virHostdevManagerPtr mgr, > + virDomainHostdevDefPtr *hostdevs, > + int nhostdevs, > + const char *drv_name, > + const char *dom_name) > +{ > + virDomainHostdevDefPtr hostdev = NULL; > + virPCIDevicePtr dev = NULL; > + size_t i; > + int ret = -1; > + > + if (!nhostdevs) > + return 0; > + > + if (!mgr) > + return -1; > + > + virObjectLock(mgr->activePciHostdevs); > + virObjectLock(mgr->inactivePciHostdevs); > + > + for (i = 0; i < nhostdevs; i++) { > + hostdev = hostdevs[i]; > + > + if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) > + continue; > + if (hostdev->source.subsys.type != > VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) > + continue; > + > + dev = virPCIDeviceNew(hostdev->source.subsys.u.pci.addr.domain, > + hostdev->source.subsys.u.pci.addr.bus, > + hostdev->source.subsys.u.pci.addr.slot, > + hostdev->source.subsys.u.pci.addr.function); > + > + if (!dev) > + goto cleanup; > + > + virPCIDeviceSetManaged(dev, hostdev->managed); > + switch (hostdev->source.subsys.u.pci.backend) { > + case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO: > + if (virPCIDeviceSetStubDriver(dev, "vfio-pci") < 0) > + goto cleanup; > + break; > + > + case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_KVM : > + case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT: > + if (virPCIDeviceSetStubDriver(dev, "pci-stub") < 0) > + goto cleanup; > + break; > + } > + virPCIDeviceSetUsedBy(dev, drv_name, dom_name); > + > + /* Setup the original states for the PCI device */ > + virPCIDeviceSetUnbindFromStub(dev, > hostdev->origstates.states.pci.unbind_from_stub); > + virPCIDeviceSetRemoveSlot(dev, > hostdev->origstates.states.pci.remove_slot); > + virPCIDeviceSetReprobe(dev, hostdev->origstates.states.pci.reprobe); > + > + if (virPCIDeviceListAdd(mgr->activePciHostdevs, dev) < 0) > + goto cleanup; > + dev = NULL; > + } > + > + ret = 0; > +cleanup: > + virPCIDeviceFree(dev); > + virObjectUnlock(mgr->activePciHostdevs); > + virObjectUnlock(mgr->inactivePciHostdevs); > + return ret; > +} > + > + > +int > +virHostdevUpdateActiveUsbHostdevs(virHostdevManagerPtr mgr, > + virDomainHostdevDefPtr *hostdevs, > + int nhostdevs, > + const char *drv_name, > + const char *dom_name) > +{ > + virDomainHostdevDefPtr hostdev = NULL; > + size_t i; > + int ret = -1; > + > + if (!nhostdevs) > + return 0; > + > + if (!mgr) > + return -1; > + > + virObjectLock(mgr->activeUsbHostdevs); > + for (i = 0; i < nhostdevs; i++) { > + virUSBDevicePtr usb = NULL; > + hostdev = hostdevs[i]; > + > + if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) > + continue; > + if (hostdev->source.subsys.type != > VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB) > + continue; > + > + usb = virUSBDeviceNew(hostdev->source.subsys.u.usb.bus, > + hostdev->source.subsys.u.usb.device, > + NULL); > + if (!usb) { > + VIR_WARN("Unable to reattach USB device %03d.%03d " > + "on driver %s domain %s", > + hostdev->source.subsys.u.usb.bus, > + hostdev->source.subsys.u.usb.device, > + drv_name, dom_name); > + continue; > + } > + > + virUSBDeviceSetUsedBy(usb, drv_name, dom_name); > + > + if (virUSBDeviceListAdd(mgr->activeUsbHostdevs, usb) < 0) { > + virUSBDeviceFree(usb); > + goto cleanup; > + } > + } > + ret = 0; > +cleanup: > + virObjectUnlock(mgr->activeUsbHostdevs); > + return ret; > +} > + > +int > +virHostdevUpdateActiveScsiHostdevs(virHostdevManagerPtr mgr, > + virDomainHostdevDefPtr *hostdevs, > + int nhostdevs, > + const char *drv_name, > + const char *dom_name) > +{ > + virDomainHostdevDefPtr hostdev = NULL; > + size_t i; > + int ret = -1; > + > + if (!nhostdevs) > + return 0; > + > + if (!mgr) > + return -1; > + > + virObjectLock(mgr->activeScsiHostdevs); > + for (i = 0; i < nhostdevs; i++) { > + virSCSIDevicePtr scsi = NULL; > + hostdev = hostdevs[i]; > + > + if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS || > + hostdev->source.subsys.type != > VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI) > + continue; > + > + if (!(scsi = virSCSIDeviceNew(hostdev->source.subsys.u.scsi.adapter, > + hostdev->source.subsys.u.scsi.bus, > + hostdev->source.subsys.u.scsi.target, > + hostdev->source.subsys.u.scsi.unit, > + hostdev->readonly))) > + goto cleanup; > + > + virSCSIDeviceSetUsedBy(scsi, drv_name, dom_name); > + > + if (virSCSIDeviceListAdd(mgr->activeScsiHostdevs, scsi) < 0) { > + virSCSIDeviceFree(scsi); > + goto cleanup; > + } > + } > + ret = 0; > + > +cleanup: > + virObjectUnlock(mgr->activeScsiHostdevs); > + return ret; > +} > + > +int > +virHostdevUpdateActiveHostdevs(virHostdevManagerPtr mgr, > + const char *driver, > + virDomainDefPtr def, > + unsigned int flags) > +{ > + if (!def->nhostdevs) > + return 0; > + > + if (flags & VIR_SP_PCI_HOSTDEV) { > + if (virHostdevUpdateActivePciHostdevs(mgr, > + def->hostdevs, > + def->nhostdevs, > + driver, def->name) < 0) > + return -1; > + } > + > + if (flags & VIR_SP_USB_HOSTDEV) { > + if (virHostdevUpdateActiveUsbHostdevs(mgr, > + def->hostdevs, > + def->nhostdevs, > + driver, def->name) < 0) > + return -1; > + } > + > + if (flags & VIR_SP_SCSI_HOSTDEV) { > + if (virHostdevUpdateActiveScsiHostdevs(mgr, > + def->hostdevs, > + def->nhostdevs, > + driver, def->name) < 0) > + return -1; > + } > + > + return 0; > +} > + > + > +void > +virHostdevReAttachPciHostdevs(virHostdevManagerPtr mgr, > + const char *drv_name, > + const char *dom_name, > + virDomainHostdevDefPtr *hostdevs, > + int nhostdevs) > +{ > + virPCIDeviceListPtr pcidevs; > + size_t i; > + char *oldStateDir = NULL; > + > + if (!nhostdevs || !mgr) > + return; > + > + virObjectLock(mgr->activePciHostdevs); > + virObjectLock(mgr->inactivePciHostdevs); > + > + /* for upgrade, if netconfig file is not found in mgr->stateDir, > + * find in old state dir */ > + if (VIR_STRDUP(oldStateDir, QEMU_STATE_DIR) < 0) > + goto cleanup; > + > + if (!(pcidevs = virHostdevGetActivePciHostDeviceList(mgr, > + hostdevs, > + nhostdevs))) { > + virErrorPtr err = virGetLastError(); > + VIR_ERROR(_("Failed to allocate PCI device list: %s"), > + err ? err->message : _("unknown error")); > + virResetError(err); > + goto cleanup; > + } > + > + /* Again 4 loops; mark all devices as inactive before reset > + * them and reset all the devices before re-attach. > + * Attach mac and port profile parameters to devices > + */ > + for (i = 0; i < virPCIDeviceListCount(pcidevs); i++) { > + virPCIDevicePtr dev = virPCIDeviceListGet(pcidevs, i); > + virPCIDevicePtr activeDev = NULL; > + const char *usedby_drvname; > + const char *usedby_domname; > + > + /* Never delete the dev from list driver->activePciHostdevs > + * if it's used by other domain. > + */ > + activeDev = virPCIDeviceListFind(mgr->activePciHostdevs, dev); > + if (activeDev) { > + virPCIDeviceGetUsedBy(activeDev, &usedby_drvname, > &usedby_domname); > + if (STRNEQ_NULLABLE(drv_name, usedby_drvname) || > + STRNEQ_NULLABLE(dom_name, usedby_domname)) { > + virPCIDeviceListSteal(pcidevs, dev); > + continue; > + } > + } > + > + virPCIDeviceListSteal(mgr->activePciHostdevs, dev); > + } > + > + /* > + * For SRIOV net host devices, unset mac and port profile before > + * reset and reattach device > + */ > + for (i = 0; i < nhostdevs; i++) > + virHostdevNetConfigRestore(hostdevs[i], mgr->stateDir, oldStateDir); > + > + for (i = 0; i < virPCIDeviceListCount(pcidevs); i++) { > + virPCIDevicePtr dev = virPCIDeviceListGet(pcidevs, i); > + if (virPCIDeviceReset(dev, mgr->activePciHostdevs, > + mgr->inactivePciHostdevs) < 0) { > + virErrorPtr err = virGetLastError(); > + VIR_ERROR(_("Failed to reset PCI device: %s"), > + err ? err->message : _("unknown error")); > + virResetError(err); > + } > + } > + > + while (virPCIDeviceListCount(pcidevs) > 0) { > + virPCIDevicePtr dev = virPCIDeviceListStealIndex(pcidevs, 0); > + virHostdevReAttachPciDevice(mgr, dev); > + } > + > + virObjectUnref(pcidevs); > +cleanup: > + VIR_FREE(oldStateDir); > + virObjectUnlock(mgr->activePciHostdevs); > + virObjectUnlock(mgr->inactivePciHostdevs); > +} > + > +void > +virHostdevReAttachUsbHostdevs(virHostdevManagerPtr mgr, > + const char *drv_name, > + const char *dom_name, > + virDomainHostdevDefPtr *hostdevs, > + int nhostdevs) > +{ > + size_t i; > + > + if (!nhostdevs || !mgr) > + return; > + > + virObjectLock(mgr->activeUsbHostdevs); > + for (i = 0; i < nhostdevs; i++) { > + virDomainHostdevDefPtr hostdev = hostdevs[i]; > + virUSBDevicePtr usb, tmp; > + const char *usedby_drvname; > + const char *usedby_domname; > + > + if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) > + continue; > + if (hostdev->source.subsys.type != > VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB) > + continue; > + if (hostdev->missing) > + continue; > + > + usb = virUSBDeviceNew(hostdev->source.subsys.u.usb.bus, > + hostdev->source.subsys.u.usb.device, > + NULL); > + > + if (!usb) { > + VIR_WARN("Unable to reattach USB device %03d.%03d " > + "on driver %s domain %s", > + hostdev->source.subsys.u.usb.bus, > + hostdev->source.subsys.u.usb.device, > + drv_name, dom_name); > + continue; > + } > + > + /* Delete only those USB devices which belongs > + * to domain. Therefore we want to steal only > + * those devices from the list which were taken > + * by domain */ > + > + tmp = virUSBDeviceListFind(mgr->activeUsbHostdevs, usb); > + virUSBDeviceFree(usb); > + > + if (!tmp) { > + VIR_WARN("Unable to find device %03d.%03d " > + "in list of active USB devices", > + hostdev->source.subsys.u.usb.bus, > + hostdev->source.subsys.u.usb.device); > + continue; > + } > + > + virUSBDeviceGetUsedBy(tmp, &usedby_drvname, &usedby_domname); > + if (STREQ_NULLABLE(drv_name, usedby_drvname) && > + STREQ_NULLABLE(dom_name, usedby_domname)) { > + VIR_DEBUG("Removing %03d.%03d dom=%s:%s", > + hostdev->source.subsys.u.usb.bus, > + hostdev->source.subsys.u.usb.device, > + drv_name, dom_name); > + virUSBDeviceListDel(mgr->activeUsbHostdevs, tmp); > + } > + > + } > + > + virObjectUnlock(mgr->activeUsbHostdevs); > +} > + > +void > +virHostdevReAttachScsiHostdevs(virHostdevManagerPtr mgr, > + const char *drv_name, > + const char *dom_name, > + virDomainHostdevDefPtr *hostdevs, > + int nhostdevs) > +{ > + size_t i; > + > + if (!nhostdevs || !mgr) > + return; > + > + virObjectLock(mgr->activeScsiHostdevs); > + for (i = 0; i < nhostdevs; i++) { > + virDomainHostdevDefPtr hostdev = hostdevs[i]; > + virSCSIDevicePtr scsi, tmp; > + const char *usedby_drvname; > + const char *usedby_domname; > + > + if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS || > + hostdev->source.subsys.type != > VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI) > + continue; > + > + if (!(scsi = virSCSIDeviceNew(hostdev->source.subsys.u.scsi.adapter, > + hostdev->source.subsys.u.scsi.bus, > + hostdev->source.subsys.u.scsi.target, > + hostdev->source.subsys.u.scsi.unit, > + hostdev->readonly))) { > + VIR_WARN("Unable to reattach SCSI device %s:%d:%d:%d on driver > %s domain %s", > + hostdev->source.subsys.u.scsi.adapter, > + hostdev->source.subsys.u.scsi.bus, > + hostdev->source.subsys.u.scsi.target, > + hostdev->source.subsys.u.scsi.unit, > + drv_name, dom_name); > + continue; > + } > + > + tmp = virSCSIDeviceListFind(mgr->activeScsiHostdevs, scsi); > + virSCSIDeviceFree(scsi); > + > + if (!tmp) { > + VIR_WARN("Unable to find device %s:%d:%d:%d " > + "in list of active SCSI devices", > + hostdev->source.subsys.u.scsi.adapter, > + hostdev->source.subsys.u.scsi.bus, > + hostdev->source.subsys.u.scsi.target, > + hostdev->source.subsys.u.scsi.unit); > + continue; > + } > + > + virSCSIDeviceGetUsedBy(tmp, &usedby_drvname, &usedby_domname); > + if (STREQ_NULLABLE(usedby_drvname, drv_name) && > + STREQ_NULLABLE(usedby_domname, dom_name)) { > + VIR_DEBUG("Removing %s:%d:%d:%d driver:%s dom:%s from > activeScsiHostdevs", > + hostdev->source.subsys.u.scsi.adapter, > + hostdev->source.subsys.u.scsi.bus, > + hostdev->source.subsys.u.scsi.target, > + hostdev->source.subsys.u.scsi.unit, > + drv_name, dom_name); > + virSCSIDeviceListDel(mgr->activeScsiHostdevs, tmp); > + } > + } > + > + virObjectUnlock(mgr->activeScsiHostdevs); > +} > + > +void > +virHostdevReAttachDomainHostdevs(virHostdevManagerPtr mgr, > + const char *driver, > + virDomainDefPtr def, > + unsigned int flags) > +{ > + if (!def->nhostdevs || !mgr) > + return; > + > + if (flags & VIR_SP_PCI_HOSTDEV) { > + virHostdevReAttachPciHostdevs(mgr, driver, def->name, > + def->hostdevs, def->nhostdevs); > + } > + > + if (flags & VIR_SP_USB_HOSTDEV) { > + virHostdevReAttachUsbHostdevs(mgr, driver, def->name, > + def->hostdevs, def->nhostdevs); > + } > + > + if (flags & VIR_SP_SCSI_HOSTDEV) { > + virHostdevReAttachScsiHostdevs(mgr, driver, def->name, > + def->hostdevs, def->nhostdevs); > + } > +} > + > +/* following functions are used by NodeDevDetach/Reattach/Reset */ > +int > +virHostdevPciNodeDeviceDetach(virHostdevManagerPtr mgr, > + virPCIDevicePtr pci) > +{ > + int ret; > + > + if (!mgr || !pci) > + return -1; > + > + virObjectLock(mgr->activePciHostdevs); > + virObjectLock(mgr->inactivePciHostdevs); > + if (virPCIDeviceDetach(pci, mgr->activePciHostdevs, > + mgr->inactivePciHostdevs) < 0) > + ret = -1; > + else > + ret = 0; > + > + virObjectUnlock(mgr->inactivePciHostdevs); > + virObjectUnlock(mgr->activePciHostdevs); > + return ret; > +} > + > +int > +virHostdevPciNodeDeviceReAttach(virHostdevManagerPtr mgr, > + virPCIDevicePtr pci) > +{ > + int ret = -1; > + virPCIDevicePtr other; > + > + if (!mgr || !pci) > + return -1; > + > + virObjectLock(mgr->activePciHostdevs); > + virObjectLock(mgr->inactivePciHostdevs); > + other = virPCIDeviceListFind(mgr->activePciHostdevs, pci); > + if (other) { > + const char *other_drvname; > + const char *other_domname; > + > + virPCIDeviceGetUsedBy(other, &other_drvname, &other_domname); > + if (other_drvname && other_domname) > + virReportError(VIR_ERR_OPERATION_INVALID, > + _("PCI device %s is still in use by driver %s, > domain %s"), > + virPCIDeviceGetName(pci), other_drvname, > other_domname); > + else > + virReportError(VIR_ERR_OPERATION_INVALID, > + _("PCI device %s is still in use"), > + virPCIDeviceGetName(pci)); > + goto out; > + } > + > + virPCIDeviceReattachInit(pci); > + > + if (virPCIDeviceReattach(pci, mgr->activePciHostdevs, > + mgr->inactivePciHostdevs) < 0) > + goto out; > + > + ret = 0; > +out: > + virObjectUnlock(mgr->inactivePciHostdevs); > + virObjectUnlock(mgr->activePciHostdevs); > + return ret; > +} > + > +int > +virHostdevPciNodeDeviceReset(virHostdevManagerPtr mgr, > + virPCIDevicePtr pci) > +{ > + int ret; > + > + if (!mgr || !pci) > + return -1; > + > + virObjectLock(mgr->activePciHostdevs); > + virObjectLock(mgr->inactivePciHostdevs); > + if (virPCIDeviceReset(pci, mgr->activePciHostdevs, > + mgr->inactivePciHostdevs) < 0) > + ret = -1; > + else > + ret = 0; > + > + virObjectUnlock(mgr->inactivePciHostdevs); > + virObjectUnlock(mgr->activePciHostdevs); > + return ret; > +} > diff --git a/src/util/virhostdev.h b/src/util/virhostdev.h > new file mode 100644 > index 0000000..fc69540 > --- /dev/null > +++ b/src/util/virhostdev.h > @@ -0,0 +1,134 @@ > +/* virhostdev.h: hostdev management > + * > + * Copyright (C) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. > + * Copyright (C) 2006-2007, 2009-2013 Red Hat, Inc. > + * Copyright (C) 2006 Daniel P. Berrange > + * > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library. If not, see > + * <http://www.gnu.org/licenses/>. > + * > + * Author: Chunyan Liu <cyliu(a)suse.com> > + * Author: Daniel P. Berrange <berrange(a)redhat.com> > + */ > + > +#ifndef __VIR_HOSTDEV_H__ > +# define __VIR_HOSTDEV_H__ > + > +# include "internal.h" > + > +# include "domain_conf.h" > +# include "virpci.h" > +# include "virusb.h" > +# include "virscsi.h" > + > +typedef enum { > + VIR_SP_PCI_HOSTDEV = (1 << 0), /* support pci passthrough */ > + VIR_SP_USB_HOSTDEV = (1 << 1), /* support usb passthrough */ > + VIR_SP_SCSI_HOSTDEV = (1 << 2), /* support scsi passthrough */ > + > + VIR_COLD_BOOT = (1 << 8), /* cold boot */ > + VIR_STRICT_ACS_CHECK = (1 << 9), /* strict acs check */ > +} virHostdevManagerFlag; > + > +typedef struct _virHostdevManager virHostdevManager; > +typedef virHostdevManager *virHostdevManagerPtr; > +struct _virHostdevManager{ > + char *stateDir; > + > + virPCIDeviceListPtr activePciHostdevs; > + virPCIDeviceListPtr inactivePciHostdevs; > + virUSBDeviceListPtr activeUsbHostdevs; > + virSCSIDeviceListPtr activeScsiHostdevs; > +}; > + > +virHostdevManagerPtr virHostdevManagerGetDefault(void); > + > +bool virHostdevHostSupportsPassthroughVFIO(void); > +bool virHostdevHostSupportsPassthroughKVM(void); > + > +/* functions used to prepare/unprepare hostdevs for domain */ > +int virHostdevPrepareDomainHostdevs(virHostdevManagerPtr mgr, > + const char *driver, > + virDomainDefPtr def, > + unsigned int flags); > +void virHostdevReAttachDomainHostdevs(virHostdevManagerPtr mgr, > + const char *driver, > + virDomainDefPtr def, > + unsigned int flags); > +int virHostdevPreparePciHostdevs(virHostdevManagerPtr mgr, > + const char *drv_name, > + const char *dom_name, > + const unsigned char *uuid, > + virDomainHostdevDefPtr *hostdevs, > + int nhostdevs, > + unsigned int flags); > +int virHostdevPrepareUsbHostdevs(virHostdevManagerPtr mgr, > + const char *drv_name, > + const char *dom_name, > + virDomainHostdevDefPtr *hostdevs, > + int nhostdevs, > + bool coldBoot); > +int virHostdevPrepareScsiHostdevs(virHostdevManagerPtr mgr, > + const char *drv_name, > + const char *dom_name, > + virDomainHostdevDefPtr *hostdevs, > + int nhostdevs); > +void virHostdevReAttachPciHostdevs(virHostdevManagerPtr mgr, > + const char *drv_name, > + const char *dom_name, > + virDomainHostdevDefPtr *hostdevs, > + int nhostdevs); > +void virHostdevReAttachUsbHostdevs(virHostdevManagerPtr mgr, > + const char *drv_name, > + const char *dom_name, > + virDomainHostdevDefPtr *hostdevs, > + int nhostdevs); > +void virHostdevReAttachScsiHostdevs(virHostdevManagerPtr mgr, > + const char *drv_name, > + const char *dom_name, > + virDomainHostdevDefPtr *hostdevs, > + int nhostdevs); > +int > +virHostdevUpdateActivePciHostdevs(virHostdevManagerPtr mgr, > + virDomainHostdevDefPtr *hostdevs, > + int nhostdevs, > + const char *drv_name, > + const char *dom_name); > +int > +virHostdevUpdateActiveUsbHostdevs(virHostdevManagerPtr mgr, > + virDomainHostdevDefPtr *hostdevs, > + int nhostdevs, > + const char *drv_name, > + const char *dom_name); > +int > +virHostdevUpdateActiveScsiHostdevs(virHostdevManagerPtr mgr, > + virDomainHostdevDefPtr *hostdevs, > + int nhostdevs, > + const char *drv_name, > + const char *dom_name); > +int > +virHostdevUpdateActiveHostdevs(virHostdevManagerPtr mgr, > + const char *driver, > + virDomainDefPtr def, > + unsigned int flags); > + > +/* functions used by NodeDevDetach/Reattach/Reset */ > +int virHostdevPciNodeDeviceDetach(virHostdevManagerPtr mgr, > + virPCIDevicePtr pci); > +int virHostdevPciNodeDeviceReAttach(virHostdevManagerPtr mgr, > + virPCIDevicePtr pci); > +int virHostdevPciNodeDeviceReset(virHostdevManagerPtr mgr, > + virPCIDevicePtr pci); > + > +#endif /* __VIR_HOSTDEV_H__ */ > diff --git a/src/util/virpci.c b/src/util/virpci.c > index 8ec642f..7402898 100644 > --- a/src/util/virpci.c > +++ b/src/util/virpci.c > @@ -58,7 +58,10 @@ struct _virPCIDevice { > char name[PCI_ADDR_LEN]; /* domain:bus:slot.function */ > char id[PCI_ID_LEN]; /* product vendor */ > char *path; > - const char *used_by; /* The domain which uses the device */ > + > + /* The driver:domain which uses the device */ > + char *used_by_drvname; > + char *used_by_domname; > > unsigned int pcie_cap_pos; > unsigned int pci_pm_cap_pos; > @@ -1562,6 +1565,8 @@ virPCIDeviceFree(virPCIDevicePtr dev) > VIR_DEBUG("%s %s: freeing", dev->id, dev->name); > VIR_FREE(dev->path); > VIR_FREE(dev->stubDriver); > + VIR_FREE(dev->used_by_drvname); > + VIR_FREE(dev->used_by_domname); > VIR_FREE(dev); > } > > @@ -1631,16 +1636,27 @@ virPCIDeviceSetReprobe(virPCIDevicePtr dev, bool > reprobe) > dev->reprobe = reprobe; > } > > -void > -virPCIDeviceSetUsedBy(virPCIDevicePtr dev, const char *name) > +int > +virPCIDeviceSetUsedBy(virPCIDevicePtr dev, > + const char *drv_name, > + const char *dom_name) > { > - dev->used_by = name; > + if (VIR_STRDUP(dev->used_by_drvname, drv_name) < 0) > + return -1; > + > + if (VIR_STRDUP(dev->used_by_domname, dom_name) < 0) > + return -1; > + > + return 0; > } > > -const char * > -virPCIDeviceGetUsedBy(virPCIDevicePtr dev) > +void > +virPCIDeviceGetUsedBy(virPCIDevicePtr dev, > + const char **drv_name, > + const char **dom_name) > { > - return dev->used_by; > + *drv_name = dev->used_by_drvname; > + *dom_name = dev->used_by_domname; > } > > void virPCIDeviceReattachInit(virPCIDevicePtr pci) > diff --git a/src/util/virpci.h b/src/util/virpci.h > index 0479f0b..2347b95 100644 > --- a/src/util/virpci.h > +++ b/src/util/virpci.h > @@ -65,9 +65,12 @@ unsigned int virPCIDeviceGetManaged(virPCIDevice *dev); > int virPCIDeviceSetStubDriver(virPCIDevicePtr dev, > const char *driver); > const char *virPCIDeviceGetStubDriver(virPCIDevicePtr dev); > -void virPCIDeviceSetUsedBy(virPCIDevice *dev, > - const char *used_by); > -const char *virPCIDeviceGetUsedBy(virPCIDevice *dev); > +int virPCIDeviceSetUsedBy(virPCIDevice *dev, > + const char *drv_name, > + const char *dom_name); > +void virPCIDeviceGetUsedBy(virPCIDevice *dev, > + const char **drv_name, > + const char **dom_name); > unsigned int virPCIDeviceGetUnbindFromStub(virPCIDevicePtr dev); > void virPCIDeviceSetUnbindFromStub(virPCIDevice *dev, > bool unbind); > diff --git a/src/util/virscsi.c b/src/util/virscsi.c > index 7aca9e6..062e8bd 100644 > --- a/src/util/virscsi.c > +++ b/src/util/virscsi.c > @@ -55,7 +55,10 @@ struct _virSCSIDevice { > char *name; /* adapter:bus:target:unit */ > char *id; /* model:vendor */ > char *sg_path; /* e.g. /dev/sg2 */ > - const char *used_by; /* name of the domain using this dev */ > + > + /* driver:domain using this dev */ > + char *used_by_drvname; > + char *used_by_domname; > > bool readonly; > }; > @@ -259,20 +262,31 @@ virSCSIDeviceFree(virSCSIDevicePtr dev) > VIR_FREE(dev->id); > VIR_FREE(dev->name); > VIR_FREE(dev->sg_path); > + VIR_FREE(dev->used_by_drvname); > + VIR_FREE(dev->used_by_domname); > VIR_FREE(dev); > } > > -void > +int > virSCSIDeviceSetUsedBy(virSCSIDevicePtr dev, > - const char *name) > + const char *drvname, > + const char *domname) > { > - dev->used_by = name; > + if (VIR_STRDUP(dev->used_by_drvname, drvname) < 0) > + return -1; > + if (VIR_STRDUP(dev->used_by_domname, domname) < 0) > + return -1; > + > + return 0; > } > > -const char * > -virSCSIDeviceGetUsedBy(virSCSIDevicePtr dev) > +void > +virSCSIDeviceGetUsedBy(virSCSIDevicePtr dev, > + const char **drvname, > + const char **domname) > { > - return dev->used_by; > + *drvname = dev->used_by_drvname; > + *domname = dev->used_by_domname; > } > > const char * > diff --git a/src/util/virscsi.h b/src/util/virscsi.h > index cce5df4..263b175 100644 > --- a/src/util/virscsi.h > +++ b/src/util/virscsi.h > @@ -49,8 +49,12 @@ virSCSIDevicePtr virSCSIDeviceNew(const char *adapter, > bool readonly); > > void virSCSIDeviceFree(virSCSIDevicePtr dev); > -void virSCSIDeviceSetUsedBy(virSCSIDevicePtr dev, const char *name); > -const char *virSCSIDeviceGetUsedBy(virSCSIDevicePtr dev); > +int virSCSIDeviceSetUsedBy(virSCSIDevicePtr dev, > + const char *drvname, > + const char *domname); > +void virSCSIDeviceGetUsedBy(virSCSIDevicePtr dev, > + const char **drvname, > + const char **domname); > const char *virSCSIDeviceGetName(virSCSIDevicePtr dev); > unsigned int virSCSIDeviceGetAdapter(virSCSIDevicePtr dev); > unsigned int virSCSIDeviceGetBus(virSCSIDevicePtr dev); > diff --git a/src/util/virusb.c b/src/util/virusb.c > index 3c82200..7b17b0a 100644 > --- a/src/util/virusb.c > +++ b/src/util/virusb.c > @@ -55,7 +55,10 @@ struct _virUSBDevice { > char name[USB_ADDR_LEN]; /* domain:bus:slot.function */ > char id[USB_ID_LEN]; /* product vendor */ > char *path; > - const char *used_by; /* name of the domain using this dev > */ > + > + /* driver:domain using this dev */ > + char *used_by_drvname; > + char *used_by_domname; > }; > > struct _virUSBDeviceList { > @@ -375,19 +378,31 @@ virUSBDeviceFree(virUSBDevicePtr dev) > return; > VIR_DEBUG("%s %s: freeing", dev->id, dev->name); > VIR_FREE(dev->path); > + VIR_FREE(dev->used_by_drvname); > + VIR_FREE(dev->used_by_domname); > VIR_FREE(dev); > } > > - > -void virUSBDeviceSetUsedBy(virUSBDevicePtr dev, > - const char *name) > +int > +virUSBDeviceSetUsedBy(virUSBDevicePtr dev, > + const char *drv_name, > + const char *dom_name) > { > - dev->used_by = name; > + if (VIR_STRDUP(dev->used_by_drvname, drv_name) < 0) > + return -1; > + if (VIR_STRDUP(dev->used_by_domname, dom_name) < 0) > + return -1; > + > + return 0; > } > > -const char * virUSBDeviceGetUsedBy(virUSBDevicePtr dev) > +void > +virUSBDeviceGetUsedBy(virUSBDevicePtr dev, > + const char **drv_name, > + const char **dom_name) > { > - return dev->used_by; > + *drv_name = dev->used_by_drvname; > + *dom_name = dev->used_by_domname; > } > > const char *virUSBDeviceGetName(virUSBDevicePtr dev) > diff --git a/src/util/virusb.h b/src/util/virusb.h > index aa59d12..41e680f 100644 > --- a/src/util/virusb.h > +++ b/src/util/virusb.h > @@ -60,8 +60,12 @@ int virUSBDeviceFind(unsigned int vendor, > virUSBDevicePtr *usb); > > void virUSBDeviceFree(virUSBDevicePtr dev); > -void virUSBDeviceSetUsedBy(virUSBDevicePtr dev, const char *name); > -const char *virUSBDeviceGetUsedBy(virUSBDevicePtr dev); > +int virUSBDeviceSetUsedBy(virUSBDevicePtr dev, > + const char *drv_name, > + const char *dom_name); > +void virUSBDeviceGetUsedBy(virUSBDevicePtr dev, > + const char **drv_name, > + const char **dom_name); > const char *virUSBDeviceGetName(virUSBDevicePtr dev); > > unsigned int virUSBDeviceGetBus(virUSBDevicePtr dev);

1 0

[libvirt] ANNOUNCE: ruby-libvirt 0.5.2
by Chris Lalancette 09 Jan '14

09 Jan '14

All, This is a release notification for ruby-libvirt 0.5.2. ruby-libvirt is a ruby wrapper around the libvirt API. The changelog between 0.5.1 and 0.5.2 is: * Fix to make sure we don't free more entries than retrieved (potential crash) Version 0.5.2 is available from http://libvirt.org/ruby: Tarball: http://libvirt.org/ruby/download/ruby-libvirt-0.5.2.tgz Gem: http://libvirt.org/ruby/download/ruby-libvirt-0.5.2.gem It is also available from rubygems.org; to get the latest version, run: $ gem install ruby-libvirt As usual, if you run into questions, problems, or bugs, please feel free to mail me (clalancette gmail com) and the libvirt mailing list. Thanks to Guido Günther for the patch to fix this problem.

1 0

[libvirt] [PATCHv2] test driver: Add authentication to test driver.
by Richard W.M. Jones 08 Jan '14

08 Jan '14

There is no easy way to test authentication against libvirt. This commit modifies the test driver to allow simple username/password authentication. You modify the test XML by adding: <node> ... <auth> <user password="123456">rich</user> <user>jane</user> </auth> </node> If there are any /node/auth/user elements, then authentication is required by the test driver (if none are present, then the test driver will work as before and not require authentication). In the example above, two phony users are added: rich password: 123456 jane no password required The test driver will demand a username. If the password attribute is present (or if the username entered is wrong), then the password is also asked for and checked: $ virsh -c test://$(pwd)/testnode.xml list Enter username for localhost: rich Enter rich's password for localhost: *** Id Name State ---------------------------------------------------- 1 fv0 running 2 fc4 running Signed-off-by: Richard W.M. Jones <rjones(a)redhat.com> --- src/test/test_driver.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 110 insertions(+), 1 deletion(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index cde82a1..b724f82 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -58,6 +58,7 @@ #include "virrandom.h" #include "virstring.h" #include "cpu/cpu.h" +#include "virauth.h" #define VIR_FROM_THIS VIR_FROM_TEST @@ -82,6 +83,13 @@ typedef struct _testCell *testCellPtr; #define MAX_CELLS 128 +struct _testAuth { + char *username; + char *password; +}; +typedef struct _testAuth testAuth; +typedef struct _testAuth *testAuthPtr; + struct _testConn { virMutex lock; @@ -99,6 +107,8 @@ struct _testConn { virNodeDeviceObjList devs; int numCells; testCell cells[MAX_CELLS]; + size_t numAuths; + testAuthPtr auths; virObjectEventStatePtr eventState; }; @@ -1355,6 +1365,45 @@ error: return ret; } +static int +testParseAuthUsers(testConnPtr privconn, + xmlXPathContextPtr ctxt) +{ + int num, ret = -1; + size_t i; + xmlNodePtr *nodes = NULL; + + num = virXPathNodeSet("/node/auth/user", ctxt, &nodes); + if (num < 0) + goto error; + + privconn->numAuths = num; + if (num && VIR_ALLOC_N(privconn->auths, num) < 0) + goto error; + + for (i = 0; i < num; i++) { + char *username, *password; + + ctxt->node = nodes[i]; + username = virXPathString("string(.)", ctxt); + if (!username || STREQ(username, "")) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("missing username in /node/auth/user field")); + VIR_FREE(username); + goto error; + } + /* This field is optional. */ + password = virXMLPropString(nodes[i], "password"); + + privconn->auths[i].username = username; + privconn->auths[i].password = password; + } + + ret = 0; +error: + VIR_FREE(nodes); + return ret; +} /* No shared state between simultaneous test connections initialized * from a file. */ @@ -1417,6 +1466,8 @@ testOpenFromFile(virConnectPtr conn, const char *file) goto error; if (testParseNodedevs(privconn, file, ctxt) < 0) goto error; + if (testParseAuthUsers(privconn, ctxt) < 0) + goto error; xmlXPathFreeContext(ctxt); xmlFreeDoc(doc); @@ -1439,9 +1490,63 @@ testOpenFromFile(virConnectPtr conn, const char *file) return VIR_DRV_OPEN_ERROR; } +static int +testConnectAuthenticate(virConnectPtr conn, + virConnectAuthPtr auth) +{ + testConnPtr privconn = conn->privateData; + int ret = -1; + ssize_t i; + char *username = NULL, *password = NULL; + + if (privconn->numAuths == 0) + return 0; + + /* Authentication is required because the test XML contains a + * non-empty <auth/> section. First we must ask for a username. + */ + username = virAuthGetUsername(conn, auth, "test", NULL, "localhost"/*?*/); + if (!username) { + virReportError(VIR_ERR_AUTH_FAILED, "%s", + _("authentication failed when asking for username")); + goto cleanup; + } + + /* Does the username exist? */ + for (i = 0; i < privconn->numAuths; ++i) { + if (STREQ(privconn->auths[i].username, username)) + goto found_user; + } + i = -1; + +found_user: + /* Even if we didn't find the user, we still ask for a password. */ + if (i == -1 || privconn->auths[i].password != NULL) { + password = virAuthGetPassword(conn, auth, "test", + username, "localhost"); + if (password == NULL) { + virReportError(VIR_ERR_AUTH_FAILED, "%s", + _("authentication failed when asking for password")); + goto cleanup; + } + } + + if (i == -1 || + (password && STRNEQ(privconn->auths[i].password, password))) { + virReportError(VIR_ERR_AUTH_FAILED, "%s", + _("authentication failed, see test XML for the correct username/password")); + goto cleanup; + } + + ret = 0; +cleanup: + VIR_FREE(username); + VIR_FREE(password); + return ret; +} static virDrvOpenStatus testConnectOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, + virConnectAuthPtr auth, unsigned int flags) { int ret; @@ -1479,6 +1584,10 @@ static virDrvOpenStatus testConnectOpen(virConnectPtr conn, if (ret != VIR_DRV_OPEN_SUCCESS) return ret; + /* Fake authentication. */ + if (testConnectAuthenticate(conn, auth) < 0) + return VIR_DRV_OPEN_ERROR; + return VIR_DRV_OPEN_SUCCESS; } -- 1.8.4.2

2 2

[libvirt] [PATCH] event: clean up client side RPC code
by Eric Blake 08 Jan '14

08 Jan '14

Commit cfd62c1 was incomplete; I found more cases where error messages were being overwritten, and where the code between the three registration/deregistration APIs was not consistent. Since it is fairly easy to trigger an attempt to register an unregistered object, I also changed the error message from VIR_ERR_INTERNAL_ERROR to VIR_ERR_INVALID_ARG. * src/conf/object_event.c (virObjectEventCallbackListEventID): Inline... (virObjectEventStateEventID): ...into lone caller, and report error on failure. (virObjectEventCallbackListAddID, virObjectEventStateCallbackID) (virObjectEventCallbackListRemoveID) (virObjectEventCallbackListMarkDeleteID): Tweak error category. * src/remote/remote_driver.c (remoteConnectDomainEventRegister): Don't leak registration on failure. (remoteConnectDomainEventDeregisterAny) (remoteConnectNetworkEventDeregisterAny): Don't overwrite error. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- src/conf/object_event.c | 57 ++++++++++++++++++++++------------------------ src/remote/remote_driver.c | 56 ++++++++++++++++++++++----------------------- 2 files changed, 55 insertions(+), 58 deletions(-) diff --git a/src/conf/object_event.c b/src/conf/object_event.c index b01ffe5..b69387a 100644 --- a/src/conf/object_event.c +++ b/src/conf/object_event.c @@ -210,8 +210,9 @@ virObjectEventCallbackListRemoveID(virConnectPtr conn, } } - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("could not find event callback for removal")); + virReportError(VIR_ERR_INVALID_ARG, + _("could not find event callback %d for deletion"), + callbackID); return -1; } @@ -233,8 +234,9 @@ virObjectEventCallbackListMarkDeleteID(virConnectPtr conn, } } - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("could not find event callback for deletion")); + virReportError(VIR_ERR_INVALID_ARG, + _("could not find event callback %d for deletion"), + callbackID); return -1; } @@ -357,7 +359,7 @@ virObjectEventCallbackListAddID(virConnectPtr conn, if (virObjectEventCallbackLookup(conn, cbList, uuid, klass, eventID, callback, !callbackID) != -1) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + virReportError(VIR_ERR_INVALID_ARG, "%s", _("event callback already tracked")); return -1; } @@ -398,27 +400,6 @@ cleanup: } -static int -virObjectEventCallbackListEventID(virConnectPtr conn, - virObjectEventCallbackListPtr cbList, - int callbackID) -{ - size_t i; - - for (i = 0; i < cbList->count; i++) { - virObjectEventCallbackPtr cb = cbList->callbacks[i]; - - if (cb->deleted) - continue; - - if (cb->callbackID == callbackID && cb->conn == conn) - return cb->eventID; - } - - return -1; -} - - /** * virObjectEventQueueClear: * @queue: pointer to the queue @@ -897,7 +878,7 @@ virObjectEventStateCallbackID(virConnectPtr conn, virObjectEventStateUnlock(state); if (ret < 0) - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_INVALID_ARG, _("event callback function %p not registered"), callback); return ret; @@ -920,11 +901,27 @@ virObjectEventStateEventID(virConnectPtr conn, virObjectEventStatePtr state, int callbackID) { - int ret; + int ret = -1; + size_t i; + virObjectEventCallbackListPtr cbList = state->callbacks; virObjectEventStateLock(state); - ret = virObjectEventCallbackListEventID(conn, - state->callbacks, callbackID); + for (i = 0; i < cbList->count; i++) { + virObjectEventCallbackPtr cb = cbList->callbacks[i]; + + if (cb->deleted) + continue; + + if (cb->callbackID == callbackID && cb->conn == conn) { + ret = cb->eventID; + break; + } + } virObjectEventStateUnlock(state); + + if (ret < 0) + virReportError(VIR_ERR_INVALID_ARG, + _("event callback id %d not registered"), + callbackID); return ret; } diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index fecb9b2..64d9d92 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -2911,6 +2911,7 @@ done: return rv; } + static int remoteConnectNetworkEventRegisterAny(virConnectPtr conn, virNetworkPtr net, @@ -2968,16 +2969,12 @@ remoteConnectNetworkEventDeregisterAny(virConnectPtr conn, remoteDriverLock(priv); if ((eventID = virObjectEventStateEventID(conn, priv->eventState, - callbackID)) < 0) { - virReportError(VIR_ERR_RPC, _("unable to find callback ID %d"), callbackID); + callbackID)) < 0) goto done; - } if ((count = virObjectEventStateDeregisterID(conn, priv->eventState, - callbackID)) < 0) { - virReportError(VIR_ERR_RPC, _("unable to find callback ID %d"), callbackID); + callbackID)) < 0) goto done; - } /* If that was the last callback for this eventID, we need to disable * events on the server */ @@ -2997,6 +2994,7 @@ done: return rv; } + static int remoteConnectListAllInterfaces(virConnectPtr conn, virInterfacePtr **ifaces, @@ -4405,10 +4403,11 @@ out: #endif /* WITH_POLKIT */ /*----------------------------------------------------------------------*/ -static int remoteConnectDomainEventRegister(virConnectPtr conn, - virConnectDomainEventCallback callback, - void *opaque, - virFreeCallback freecb) +static int +remoteConnectDomainEventRegister(virConnectPtr conn, + virConnectDomainEventCallback callback, + void *opaque, + virFreeCallback freecb) { int rv = -1; struct private_data *priv = conn->privateData; @@ -4421,11 +4420,13 @@ static int remoteConnectDomainEventRegister(virConnectPtr conn, goto done; if (count == 1) { - /* Tell the server when we are the first callback deregistering */ + /* Tell the server when we are the first callback registering */ if (call(conn, priv, 0, REMOTE_PROC_CONNECT_DOMAIN_EVENT_REGISTER, (xdrproc_t) xdr_void, (char *) NULL, - (xdrproc_t) xdr_void, (char *) NULL) == -1) + (xdrproc_t) xdr_void, (char *) NULL) == -1) { + virDomainEventStateDeregister(conn, priv->eventState, callback); goto done; + } } rv = 0; @@ -4435,8 +4436,9 @@ done: return rv; } -static int remoteConnectDomainEventDeregister(virConnectPtr conn, - virConnectDomainEventCallback callback) +static int +remoteConnectDomainEventDeregister(virConnectPtr conn, + virConnectDomainEventCallback callback) { struct private_data *priv = conn->privateData; int rv = -1; @@ -5205,12 +5207,13 @@ static virStreamDriver remoteStreamDrv = { }; -static int remoteConnectDomainEventRegisterAny(virConnectPtr conn, - virDomainPtr dom, - int eventID, - virConnectDomainEventGenericCallback callback, - void *opaque, - virFreeCallback freecb) +static int +remoteConnectDomainEventRegisterAny(virConnectPtr conn, + virDomainPtr dom, + int eventID, + virConnectDomainEventGenericCallback callback, + void *opaque, + virFreeCallback freecb) { int rv = -1; struct private_data *priv = conn->privateData; @@ -5248,8 +5251,9 @@ done: } -static int remoteConnectDomainEventDeregisterAny(virConnectPtr conn, - int callbackID) +static int +remoteConnectDomainEventDeregisterAny(virConnectPtr conn, + int callbackID) { struct private_data *priv = conn->privateData; int rv = -1; @@ -5260,16 +5264,12 @@ static int remoteConnectDomainEventDeregisterAny(virConnectPtr conn, remoteDriverLock(priv); if ((eventID = virObjectEventStateEventID(conn, priv->eventState, - callbackID)) < 0) { - virReportError(VIR_ERR_RPC, _("unable to find callback ID %d"), callbackID); + callbackID)) < 0) goto done; - } if ((count = virObjectEventStateDeregisterID(conn, priv->eventState, - callbackID)) < 0) { - virReportError(VIR_ERR_RPC, _("unable to find callback ID %d"), callbackID); + callbackID)) < 0) goto done; - } /* If that was the last callback for this eventID, we need to disable * events on the server */ -- 1.8.4.2

2 2

[libvirt] [PATCH] Make sure AC_ARG_WITH is always executed
by Guido Günther 08 Jan '14

08 Jan '14

--- I'm not sure whether it's good autoconf style to have AC_ARG_WITH in a conditional so this patch moves it out. Cheers, -- Guido configure.ac | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 97752f4..d02b9d2 100644 --- a/configure.ac +++ b/configure.ac @@ -1418,13 +1418,12 @@ elif test "with_secdriver_apparmor" != "no" ; then fi AM_CONDITIONAL([WITH_SECDRIVER_APPARMOR], [test "$with_secdriver_apparmor" != "no"]) -if test "$with_apparmor" != "no"; then AC_ARG_WITH([apparmor-profiles], [AS_HELP_STRING([--with-apparmor-profiles], [install apparmor profiles @<:@default=no@:>@])], [with_apparmor_profiles=yes], [with_apparmor_profiles=no]) -else +if test "$with_apparmor" = "no"; then with_apparmor_profiles="no" fi AM_CONDITIONAL([WITH_APPARMOR_PROFILES], [test "$with_apparmor_profiles" != "no"]) -- 1.8.5.2

2 2

[libvirt] [libvirt-java] [PATCH 0/3] Make the Java wrapper more fun to use
by Claudio Bley 08 Jan '14

08 Jan '14

This patchset first implements the ByteChannel interface for the Stream class which makes it readily usable with any standard Java library. Note, that this changes the wrapping of the virStreamRecv and virStreamSend function of the jna.Libvirt interface (which also makes this more efficient because a ByteBuffer is used instead of an Array). However, this interface should not be considered part of the public interface of the library, as with all classes part of the org.libvirt.jna package. In order to put this new functionality to use, the virDomainScreenshot function is wrapped and a unit test added to exercise it a bit. Claudio Bley (3): Implement interface ByteChannel for Stream class Domain: add screenshot method test: add testDomainScreenshot JUnit test src/main/java/org/libvirt/Domain.java | 11 ++ src/main/java/org/libvirt/Stream.java | 175 +++++++++++++++++++++++- src/main/java/org/libvirt/jna/Libvirt.java | 7 +- src/test/java/org/libvirt/TestJavaBindings.java | 38 +++++ 4 files changed, 226 insertions(+), 5 deletions(-) -- 1.8.5.2.msysgit.0

1 3

[libvirt] [PATCH] qemu: Add support for changing timeout value to open unix monitor socket
by Pavel Fux 08 Jan '14

08 Jan '14

I have fixed all comments except: "We prefer passing the driver as an argument instead". I thought of it at first but I looked at the function call graph and it's not that easy. and you did the same in src/qemu/qemu_process.c:115

4 6

[libvirt] [libvirt-java] [PATCH] Avoid calling processError for functions that cannot fail
by Claudio Bley 08 Jan '14

08 Jan '14

The libvirt functions virNodeDeviceNumOfCaps, virNodeDeviceGetParent and virNodeDeviceListCaps never indicate an error because they do not fail. --- src/main/java/org/libvirt/Device.java | 19 ++++++------------- src/main/java/org/libvirt/jna/Libvirt.java | 2 +- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/libvirt/Device.java b/src/main/java/org/libvirt/Device.java index fe49ce9..5492b69 100644 --- a/src/main/java/org/libvirt/Device.java +++ b/src/main/java/org/libvirt/Device.java @@ -98,23 +98,19 @@ public class Device { /** * Returns the number of capabilities which the instance has. * - * @throws LibvirtException + * @throws LibvirtException never */ public int getNumberOfCapabilities() throws LibvirtException { - int num = libvirt.virNodeDeviceNumOfCaps(VDP); - processError(); - return num; + return libvirt.virNodeDeviceNumOfCaps(VDP); } /** * Returns the parent of the device * - * @throws LibvirtException + * @throws LibvirtException never */ public String getParent() throws LibvirtException { - String parent = libvirt.virNodeDeviceGetParent(VDP); - processError(); - return parent; + return libvirt.virNodeDeviceGetParent(VDP); } /** @@ -123,15 +119,13 @@ public class Device { * @throws LibvirtException */ public String getXMLDescription() throws LibvirtException { - String desc = libvirt.virNodeDeviceGetXMLDesc(VDP); - processError(); - return desc; + return processError(libvirt.virNodeDeviceGetXMLDesc(VDP)); } /** * List the capabilities of the device * - * @throws LibvirtException + * @throws LibvirtException never */ public String[] listCapabilities() throws LibvirtException { int maxCaps = getNumberOfCapabilities(); @@ -139,7 +133,6 @@ public class Device { if (maxCaps > 0) { libvirt.virNodeDeviceListCaps(VDP, names, maxCaps); - processError(); } return names; } diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index b026b04..a2bf42e 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -281,7 +281,7 @@ public interface Libvirt extends Library { String virNodeDeviceGetName(DevicePointer virDevicePointer); String virNodeDeviceGetParent(DevicePointer virDevicePointer); int virNodeDeviceNumOfCaps(DevicePointer virDevicePointer); - int virNodeDeviceListCaps(DevicePointer virDevicePointer, String[] names, int maxNames); + int virNodeDeviceListCaps(DevicePointer virDevicePointer, Pointer[] names, int maxNames); String virNodeDeviceGetXMLDesc(DevicePointer virDevicePointer); int virNodeDeviceFree(DevicePointer virDevicePointer); int virNodeDeviceDettach(DevicePointer virDevicePointer); -- 1.8.5.2.msysgit.0

1 2

[libvirt] [libvirt-java] [PATCH] Use virFree in order to release memory acquired from libvirt
by Claudio Bley 08 Jan '14

08 Jan '14

When JNA is linked to a different runtime library than libvirt, using JNA's Native.free will probably lead to crashes as witnessed on Windows: # A fatal error has been detected by the Java Runtime Environment: # # EXCEPTION_ACCESS_VIOLATION (0xc0000005) at pc=0x0000000077363290, pid=10180, tid=9908 # # JRE version: 7.0_25-b16 # Java VM: Java HotSpot(TM) 64-Bit Server VM (23.25-b01 mixed mode windows-amd64 compressed oops) # Problematic frame: # C [ntdll.dll+0x53290] RtlFreeHeap+0xd0 The root cause is that the libvirt DLL uses MSVCRT as its runtime library, whereas the jnidispatch DLL of JNA uses a different one. At runtime, when calling org.sun.com.jna.Native.free() the OS function RtlFreeHeap is called with an invalid Pointer that was actually allocated by MSVCRT's malloc. Basically, we cannot simply mix and match memory allocation functions from different runtime libraries, but have to call virFree for pointers orignating from libvirt itself. So, this patch re-adds and uses the virFree method which had been removed in commit 3220de292990bed71828fba2f3700bc846d440f2. Signed-off-by: Claudio Bley <cbley(a)av-test.de> --- src/main/java/org/libvirt/Library.java | 4 ++-- src/main/java/org/libvirt/jna/Libvirt.java | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/libvirt/Library.java b/src/main/java/org/libvirt/Library.java index 0136095..33d3042 100644 --- a/src/main/java/org/libvirt/Library.java +++ b/src/main/java/org/libvirt/Library.java @@ -4,6 +4,7 @@ import org.libvirt.jna.Libvirt; import com.sun.jna.Native; import com.sun.jna.Pointer; +import com.sun.jna.ptr.PointerByReference; /** * This class represents an instance of the JNA mapped libvirt @@ -38,8 +39,7 @@ final class Library { * Free memory pointed to by ptr. */ static void free(Pointer ptr) { - Native.free(Pointer.nativeValue(ptr)); - Pointer.nativeValue(ptr, 0L); + libvirt.virFree(new PointerByReference(ptr)); } /** diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index 813f09b..b026b04 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -7,6 +7,7 @@ import com.sun.jna.NativeLong; import com.sun.jna.Pointer; import com.sun.jna.ptr.IntByReference; import com.sun.jna.ptr.LongByReference; +import com.sun.jna.ptr.PointerByReference; /** * The libvirt interface which is exposed via JNA. The complete API is @@ -171,6 +172,7 @@ public interface Libvirt extends Library { int virGetVersion(LongByReference libVer, String type, LongByReference typeVer); int virInitialize(); int virCopyLastError(virError error); + void virFree(PointerByReference ptr); virError virGetLastError(); void virResetLastError(); void virSetErrorFunc(Pointer userData, VirErrorCallback callback); -- 1.8.5.2.msysgit.0

1 0

[libvirt] [PATCH] util: Use new array management macros
by Osier Yang 08 Jan '14

08 Jan '14

Like commit 94a26c7e from Eric Blake, the old fuzzy code should be replaced by the new array management macros now. And the type of scsi->count should be changed into "size_t", and thus virSCSIDeviceListCount should return size_t instead, similar for vir{PCI,USB}DeviceListCount. --- src/util/virpci.c | 2 +- src/util/virpci.h | 2 +- src/util/virscsi.c | 35 ++++++++++------------------------- src/util/virscsi.h | 2 +- src/util/virusb.c | 2 +- src/util/virusb.h | 2 +- 6 files changed, 15 insertions(+), 30 deletions(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index 8ec642f..ea93771 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -1721,7 +1721,7 @@ virPCIDeviceListGet(virPCIDeviceListPtr list, return list->devs[idx]; } -int +size_t virPCIDeviceListCount(virPCIDeviceListPtr list) { return list->count; diff --git a/src/util/virpci.h b/src/util/virpci.h index 0479f0b..08bf4c3 100644 --- a/src/util/virpci.h +++ b/src/util/virpci.h @@ -86,7 +86,7 @@ int virPCIDeviceListAdd(virPCIDeviceListPtr list, int virPCIDeviceListAddCopy(virPCIDeviceListPtr list, virPCIDevicePtr dev); virPCIDevicePtr virPCIDeviceListGet(virPCIDeviceListPtr list, int idx); -int virPCIDeviceListCount(virPCIDeviceListPtr list); +size_t virPCIDeviceListCount(virPCIDeviceListPtr list); virPCIDevicePtr virPCIDeviceListSteal(virPCIDeviceListPtr list, virPCIDevicePtr dev); virPCIDevicePtr virPCIDeviceListStealIndex(virPCIDeviceListPtr list, diff --git a/src/util/virscsi.c b/src/util/virscsi.c index 7aca9e6..f12a2a5 100644 --- a/src/util/virscsi.c +++ b/src/util/virscsi.c @@ -62,7 +62,7 @@ struct _virSCSIDevice { struct _virSCSIDeviceList { virObjectLockable parent; - unsigned int count; + size_t count; virSCSIDevicePtr *devs; }; @@ -356,12 +356,7 @@ virSCSIDeviceListAdd(virSCSIDeviceListPtr list, return -1; } - if (VIR_REALLOC_N(list->devs, list->count + 1) < 0) - return -1; - - list->devs[list->count++] = dev; - - return 0; + return VIR_APPEND_ELEMENT(list->devs, list->count, dev); } virSCSIDevicePtr @@ -373,7 +368,7 @@ virSCSIDeviceListGet(virSCSIDeviceListPtr list, int idx) return list->devs[idx]; } -int +size_t virSCSIDeviceListCount(virSCSIDeviceListPtr list) { return list->count; @@ -387,24 +382,14 @@ virSCSIDeviceListSteal(virSCSIDeviceListPtr list, size_t i; for (i = 0; i < list->count; i++) { - if (list->devs[i]->adapter != dev->adapter || - list->devs[i]->bus != dev->bus || - list->devs[i]->target != dev->target || - list->devs[i]->unit != dev->unit) - continue; - - ret = list->devs[i]; - - if (i != list->count--) - memmove(&list->devs[i], - &list->devs[i+1], - sizeof(*list->devs) * (list->count - i)); - - if (VIR_REALLOC_N(list->devs, list->count) < 0) { - ; /* not fatal */ + if (list->devs[i]->adapter == dev->adapter || + list->devs[i]->bus == dev->bus || + list->devs[i]->target == dev->target || + list->devs[i]->unit == dev->unit) { + ret = list->devs[i]; + VIR_DELETE_ELEMENT(list->devs, i, list->count); + break; } - - break; } return ret; diff --git a/src/util/virscsi.h b/src/util/virscsi.h index cce5df4..4c461f8 100644 --- a/src/util/virscsi.h +++ b/src/util/virscsi.h @@ -77,7 +77,7 @@ int virSCSIDeviceListAdd(virSCSIDeviceListPtr list, virSCSIDevicePtr dev); virSCSIDevicePtr virSCSIDeviceListGet(virSCSIDeviceListPtr list, int idx); -int virSCSIDeviceListCount(virSCSIDeviceListPtr list); +size_t virSCSIDeviceListCount(virSCSIDeviceListPtr list); virSCSIDevicePtr virSCSIDeviceListSteal(virSCSIDeviceListPtr list, virSCSIDevicePtr dev); void virSCSIDeviceListDel(virSCSIDeviceListPtr list, diff --git a/src/util/virusb.c b/src/util/virusb.c index 3c82200..bb5980d 100644 --- a/src/util/virusb.c +++ b/src/util/virusb.c @@ -464,7 +464,7 @@ virUSBDeviceListGet(virUSBDeviceListPtr list, return list->devs[idx]; } -int +size_t virUSBDeviceListCount(virUSBDeviceListPtr list) { return list->count; diff --git a/src/util/virusb.h b/src/util/virusb.h index aa59d12..e0a7c4c 100644 --- a/src/util/virusb.h +++ b/src/util/virusb.h @@ -86,7 +86,7 @@ int virUSBDeviceListAdd(virUSBDeviceListPtr list, virUSBDevicePtr dev); virUSBDevicePtr virUSBDeviceListGet(virUSBDeviceListPtr list, int idx); -int virUSBDeviceListCount(virUSBDeviceListPtr list); +size_t virUSBDeviceListCount(virUSBDeviceListPtr list); virUSBDevicePtr virUSBDeviceListSteal(virUSBDeviceListPtr list, virUSBDevicePtr dev); void virUSBDeviceListDel(virUSBDeviceListPtr list, -- 1.8.1.4

2 2

[libvirt] [libvirt-java] [PATCH] Fix wrapping of virStreamSend
by Claudio Bley 08 Jan '14

08 Jan '14

The native virStreamSend function is meant to be used to transfer byte data. Wrapping the function to use a Java String as the data depends on the default charset of the JVM and might impose further problems transferring \0 characters. Use a byte Array as the parameter type instead, as for virStreamRecv. Add the Stream.receive(byte[]) method which should be used instead of the legacy Stream.receive(String) method. The old method is kept for backward compatibility, but marked as deprecated. --- src/main/java/org/libvirt/Stream.java | 27 +++++++++++++++++++++++++-- src/main/java/org/libvirt/jna/Libvirt.java | 2 +- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/libvirt/Stream.java b/src/main/java/org/libvirt/Stream.java index bd8e87f..404c9a0 100644 --- a/src/main/java/org/libvirt/Stream.java +++ b/src/main/java/org/libvirt/Stream.java @@ -142,6 +142,27 @@ public class Stream { } /** + * Write the data of the given string to a stream. + * + * @param data + * the string data to write + * @return the number of bytes written, -1 on error, -2 if the buffer is + * full + * @throws LibvirtException + * + * @deprecated This libvirt API was previously wrapped incorrectly, since + * the native function is meant to transfer bytes, not string + * data. + * Its effect depends on the default Charset on your platform + * which is determined on JVM startup. + * Use the {@link #send(byte[])} method instead. + */ + @Deprecated + public int send(String data) throws LibvirtException { + return send(data.getBytes(java.nio.charset.Charset.defaultCharset())); + } + + /** * Write a series of bytes to the stream. * * @param data @@ -149,9 +170,11 @@ public class Stream { * @return the number of bytes written, -1 on error, -2 if the buffer is * full * @throws LibvirtException + * + * @since 1.5.2 */ - public int send(String data) throws LibvirtException { - int returnValue = libvirt.virStreamSend(VSP, data, new NativeLong(data.length())); + public int send(byte[] data) throws LibvirtException { + int returnValue = libvirt.virStreamSend(VSP, data, new NativeLong(data.length)); processError(); return returnValue; } diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index 813f09b..98f2125 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -368,7 +368,7 @@ public interface Libvirt extends Library { int virStreamFinish(StreamPointer virStreamPtr) ; int virStreamFree(StreamPointer virStreamPtr) ; StreamPointer virStreamNew(ConnectionPointer virConnectPtr, int flags) ; - int virStreamSend(StreamPointer virStreamPtr, String data, NativeLong size); + int virStreamSend(StreamPointer virStreamPtr, byte[] data, NativeLong size); int virStreamSendAll(StreamPointer virStreamPtr, Libvirt.VirStreamSourceFunc handler, Pointer opaque); int virStreamRecv(StreamPointer virStreamPtr, byte[] data, NativeLong length); int virStreamRecvAll(StreamPointer virStreamPtr, Libvirt.VirStreamSinkFunc handler, Pointer opaque); -- 1.8.5.2.msysgit.0

1 0

[libvirt] [libvirt-java] [PATCH] Fix javadoc comments
by Claudio Bley 08 Jan '14

08 Jan '14

Correct some typos and paste the right documentation from virInterfaceCreate, virInterfaceDestroy to the Interface.create and Interface.destroy doc comments. --- Pushing under the trivial rule. src/main/java/org/libvirt/Domain.java | 2 +- .../java/org/libvirt/DomainInterfaceStats.java | 2 +- src/main/java/org/libvirt/DomainSnapshot.java | 2 +- src/main/java/org/libvirt/Interface.java | 22 ++++++++++++++++++---- src/main/java/org/libvirt/Stream.java | 4 ++-- 5 files changed, 23 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/libvirt/Domain.java b/src/main/java/org/libvirt/Domain.java index e4c45f6..2f70bf2 100644 --- a/src/main/java/org/libvirt/Domain.java +++ b/src/main/java/org/libvirt/Domain.java @@ -370,7 +370,7 @@ public class Domain { } /** - * Provides a boolean value indicating whether the network is configured to + * Provides a boolean value indicating whether the domain is configured to * be automatically started when the host machine boots. * * @return the result diff --git a/src/main/java/org/libvirt/DomainInterfaceStats.java b/src/main/java/org/libvirt/DomainInterfaceStats.java index 0e948d5..eab5c44 100644 --- a/src/main/java/org/libvirt/DomainInterfaceStats.java +++ b/src/main/java/org/libvirt/DomainInterfaceStats.java @@ -3,7 +3,7 @@ package org.libvirt; import org.libvirt.jna.virDomainInterfaceStats; /** - * The Domain.interfaceStats method returns th network counters in this object + * The Domain.interfaceStats method returns the network counters in this object. * * @author stoty * diff --git a/src/main/java/org/libvirt/DomainSnapshot.java b/src/main/java/org/libvirt/DomainSnapshot.java index b58fd20..9409fef 100644 --- a/src/main/java/org/libvirt/DomainSnapshot.java +++ b/src/main/java/org/libvirt/DomainSnapshot.java @@ -27,7 +27,7 @@ public class DomainSnapshot { * href="http://www.libvirt.org/html/libvirt-libvirt.html#virDomainSnapshotDelete">Libvirt * Documentation</a> * @param flags - * controls teh deletion + * controls the deletion * @return 0 if the selected snapshot(s) were successfully deleted, -1 on error. * @throws LibvirtException */ diff --git a/src/main/java/org/libvirt/Interface.java b/src/main/java/org/libvirt/Interface.java index 7782fb9..6ea21b6 100644 --- a/src/main/java/org/libvirt/Interface.java +++ b/src/main/java/org/libvirt/Interface.java @@ -40,8 +40,13 @@ public class Interface { } /** - * Create and start a defined network. If the call succeed the network moves - * from the defined to the running networks pools. + * Activate an interface (i.e. call "ifup"). + * + * If there was an open network config transaction at the time + * this interface was defined (that is, if + * virInterfaceChangeBegin() had been called), the interface will + * be brought back down (and then undefined) if + * virInterfaceChangeRollback() is called. * * @throws LibvirtException */ @@ -52,8 +57,17 @@ public class Interface { } /** - * Destroy the network object. The running instance is shutdown if not down - * already and all resources used by it are given back to the hypervisor. + * Deactivate an interface (i.e. call "ifdown"). + * + * This does not remove the interface from the config, and does + * not free the associated virInterfacePtr object. + * + * If there is an open network config transaction at the time this + * interface is destroyed (that is, if virInterfaceChangeBegin() + * had been called), and if the interface is later undefined and + * then virInterfaceChangeRollback() is called, the restoral of + * the interface definition will also bring the interface back + * up. * * @throws LibvirtException */ diff --git a/src/main/java/org/libvirt/Stream.java b/src/main/java/org/libvirt/Stream.java index 84e300c..bd8e87f 100644 --- a/src/main/java/org/libvirt/Stream.java +++ b/src/main/java/org/libvirt/Stream.java @@ -100,10 +100,10 @@ public class Stream { } /** - * Receieves data from teh stream into the buffer provided. + * Receives data from the stream into the buffer provided. * * @param data - * the put the sata into + * buffer to put the data into * @return the number of bytes read, -1 on error, -2 if the buffer is empty * @throws LibvirtException */ -- 1.8.5.2.msysgit.0

1 0

[libvirt] [libvirt-java] [PATCH] Fix javadoc warning about snapshotCreateXML(int)
by Claudio Bley 08 Jan '14

08 Jan '14

Javadoc complains about: [javadoc] x:\src\libvirt-java1\src\main\java\org\libvirt\Domain.java:1212: warning - Tag @see: can't find snapshotCreateXML(int) in org.libvirt.Domain There is no such method, snapshotCreateXML(String, int) was intended. --- Pushing under the trivial rule. src/main/java/org/libvirt/Domain.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/libvirt/Domain.java b/src/main/java/org/libvirt/Domain.java index ee26a95..e4c45f6 100644 --- a/src/main/java/org/libvirt/Domain.java +++ b/src/main/java/org/libvirt/Domain.java @@ -1189,7 +1189,7 @@ public class Domain { * This is just a convenience method, it has the same effect * as calling {@code snapshotCreateXML(xmlDesc, 0);}. * - * @see #snapshotCreateXML(int) + * @see #snapshotCreateXML(String, int) * @see <a * href="http://www.libvirt.org/html/libvirt-libvirt.html#virDomainSnapshotCreateXML">Libvirt * Documentation</a> -- 1.8.5.2.msysgit.0

1 0

[libvirt] [PATCH] conf: trivial typo fix
by Martin Kletzander 08 Jan '14

08 Jan '14

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: Pushed as trivial. src/conf/domain_conf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e65f3e3..416d96e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1,7 +1,7 @@ /* * domain_conf.c: domain XML processing * - * Copyright (C) 2006-2013 Red Hat, Inc. + * Copyright (C) 2006-2014 Red Hat, Inc. * Copyright (C) 2006-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -2692,7 +2692,7 @@ virDomainDeviceInfoIterateInternal(virDomainDefPtr def, /* This switch statement is here to trigger compiler warning when adding * a new device type. When you are adding a new field to the switch you - * also have to add a iteration statement above. Otherwise the switch + * also have to add an iteration statement above. Otherwise the switch * statement has no real function here and should be optimized out by the * compiler. */ i = VIR_DOMAIN_DEVICE_LAST; -- 1.8.5.2

1 0

[libvirt] Redefining the XML of VM
by kangta123 08 Jan '14

08 Jan '14

Hi, I'm a newbie to Libvirt, i want to know if i can change the vm definition xml dynamically. like change cpu, network value. I found the hook in Libvirt, and i can get the xml from standard input. but i change it and out put to standard output, it no effect. I was try to execute “virsh define” shell command in python script on hook, but it was blocked and unabled to execute another Libvirt command. Is there create vm hook in Libvirt? Any help is appreciated. Regards,

2 1

[libvirt] Redefining the XML of VM
by kangta123 08 Jan '14

08 Jan '14

Hi, I'm a newbie to Libvirt, i want to know if i can change the vm definition xml dynamically. like change cpu, network value. I found the hook in Libvirt, and i can get the xml from standard input. but i change it and out put to standard output, it no effect. I was try to execute “virsh define” shell command in python script on hook, but it was blocked and unabled to execute another Libvirt command. Is there create vm hook in Libvirt? Any help is appreciated. Regards,

3 2

[libvirt] [sandbox PATCH v2] Fix FSF address on bin/virt-sandbox-service
by Cédric Bosdonnat 08 Jan '14

08 Jan '14

--- Use the URLized version bin/virt-sandbox-service | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/virt-sandbox-service b/bin/virt-sandbox-service index 2dcbfb8..884acac 100755 --- a/bin/virt-sandbox-service +++ b/bin/virt-sandbox-service @@ -15,8 +15,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# along with this library. If not, see <http://www.gnu.org/licenses/>. # from gi.repository import LibvirtGObject -- 1.8.5.2

2 1

[libvirt] [PATCH] libxl: Fix devid init in libxlMakeNicList
by Stefan Bader 08 Jan '14

08 Jan '14

This basically reverts commit ba64b97134a6129a48684f22f31be92c3b6eef96 "libxl: Allow libxl to set NIC devid". However assigning devid's before calling libxlMakeNic does not work as that is calling libxl_device_nic_init which sets it back to -1. Right now auto-assignment only works in the hotplug case. But even if that would be fixed at some point (if that is possible at all), this would add a weird dependency between Xen and libvirt versions. The change here should accept any auto-assignment that makes it into libxl_device_nic_init. My understanding is that a caller always is allowed to make the devid choice itself. And assuming libxlMakeNicList is only used on domain creation, a sequential numbering should be ok. Signed-off-by: Stefan Bader <stefan.bader(a)canonical.com> --- src/libxl/libxl_conf.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 04d01af..4cefadf 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -918,6 +918,13 @@ libxlMakeNicList(virDomainDefPtr def, libxl_domain_config *d_config) for (i = 0; i < nnics; i++) { if (libxlMakeNic(def, l_nics[i], &x_nics[i])) goto error; + /* + * The devid (at least right now) will not get initialized by + * libxl in the setup case but is required for starting the + * device-model. + */ + if (x_nics[i].devid < 0) + x_nics[i].devid = i; } d_config->nics = x_nics; -- 1.7.9.5

2 3

[libvirt] [PATCH 1/1] virsh nodecpustats erroneously returns stats for offline cpus on Linux
by Pradipta Kr. Banerjee 08 Jan '14

08 Jan '14

From: "Pradipta Kr. Banerjee" <bpradip(a)in.ibm.com> virsh nodecpustats erroneously returns stats for offline cpus on Linux To retrieve node cpu statistics on Linux system, the linuxNodeGetCPUstats function performs a minimal match of the input cpuid with the cpuid read from /proc/cpustat. On systems with larger cpus this can result in erroneous data. For eg if /proc/stat has similar data cpu 3645648 485 361475 3691194868 176595 40645 69850 0 1526172 0 cpu0 494045 62 42763 138516619 16107 2339 2431 0 248345 0 cpu4 402646 59 34745 138617562 17738 1413 1196 0 193948 0 cpu8 318662 32 32119 138715131 7903 927 982 0 115429 0 cpu12 247004 33 30465 138791438 5251 759 913 0 51938 0 and cpu 1,2 are offline, then 'virsh nodecpustats 1' displays data for cpu12 whereas virsh nodecpustats 2 correctly throws the following error "error: Unable to get node cpu stats error: Invalid cpuNum in linuxNodeGetCPUStats" This patch fixes the above mentioned problem Signed-off-by: Pradipta Kr. Banerjee <bpradip(a)in.ibm.com> --- src/nodeinfo.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 1838547..c9e5ff1 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -614,6 +614,8 @@ linuxNodeGetCPUStats(FILE *procstat, unsigned long long usr, ni, sys, idle, iowait; unsigned long long irq, softirq, steal, guest, guest_nice; char cpu_header[3 + INT_BUFSIZE_BOUND(cpuNum)]; + char cpu_header_read[3 + INT_BUFSIZE_BOUND(cpuNum)]; + char cpu_header_fmt[8]; if ((*nparams) == 0) { /* Current number of cpu stats supported by linux */ @@ -631,8 +633,11 @@ linuxNodeGetCPUStats(FILE *procstat, if (cpuNum == VIR_NODE_CPU_STATS_ALL_CPUS) { strcpy(cpu_header, "cpu"); + snprintf(cpu_header_fmt, sizeof(cpu_header_fmt), "%%%ds", 3); } else { snprintf(cpu_header, sizeof(cpu_header), "cpu%d", cpuNum); + snprintf(cpu_header_fmt, sizeof(cpu_header_fmt), "%%%ds", + (int)(3 + INT_BUFSIZE_BOUND(cpuNum))); } while (fgets(line, sizeof(line), procstat) != NULL) { @@ -649,6 +654,14 @@ linuxNodeGetCPUStats(FILE *procstat, continue; } + /* + * Process with stats gathering only if the cpuid from /proc/stat + * matches exactly with the input cpuid + */ + sscanf(buf, cpu_header_fmt, cpu_header_read); + if (STRNEQ(cpu_header, cpu_header_read)) + continue; + for (i = 0; i < *nparams; i++) { virNodeCPUStatsPtr param = &params[i]; -- 1.8.3.1

5 6

[libvirt] [PATCH] docs: add LXC multi console command docs and a example
by Chen Hanxiao 08 Jan '14

08 Jan '14

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- docs/drvlxc.html.in | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/docs/drvlxc.html.in b/docs/drvlxc.html.in index 7494eb3..0f3efb0 100644 --- a/docs/drvlxc.html.in +++ b/docs/drvlxc.html.in @@ -659,16 +659,25 @@ running, this will turn it into a "transient" guest. The <code>virsh console</code> command can be used to connect -to the text console associated with a container. If the container -has been configured with multiple console devices, then the -<code>--devname</code> argument can be used to choose the -console to connect to +to the text console associated with a container. <pre> # virsh -c lxc:/// console myguest </pre> + +If the container has been configured with multiple console devices, +then the <code>--devname</code> argument can be used to choose the +console to connect to. +In LXC, multiple consoles will be named +as 'console0', 'console1', 'console2', etc. + + +<pre> +# virsh -c lxc:/// console myguest --devname console1 +</pre> + <h3><a name="usageEnter">Running commands in a container</a></h3> -- 1.8.2.1

3 2

[libvirt] [PATCH] LXC: create monitor socket under selinux context of domain
by Gao feng 08 Jan '14

08 Jan '14

the unix socket /var/run/libvirt/lxc/domain.sock is not created under the selinux context which configured by <seclabel>. If we try to connect the domain.sock under the selinux context of domain in virtLXCProcessConnectMonitor,selinux will deny this connect operation. type=AVC msg=audit(1387953696.067:662): avc: denied { connectto } for pid=21206 comm="libvirtd" path="/usr/local/var/run/libvirt/lxc/systemd.sock" scontext=unconfined_u:system_r:svirt_lxc_net_t:s0:c770,c848 tcontext=unconfined_u:system_r:unconfined_t:s0-s0:c0.c1023 tclass=unix_stream_socket fix this problem by creating socket under selinux context of domain. Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- src/lxc/lxc_controller.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index a2ae599..5ca960f 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -745,6 +745,9 @@ static int virLXCControllerSetupServer(virLXCControllerPtr ctrl) ctrl))) goto error; + if (virSecurityManagerSetSocketLabel(ctrl->securityManager, ctrl->def) < 0) + goto error; + if (!(svc = virNetServerServiceNewUNIX(sockpath, 0700, 0, @@ -757,6 +760,9 @@ static int virLXCControllerSetupServer(virLXCControllerPtr ctrl) 5))) goto error; + if (virSecurityManagerClearSocketLabel(ctrl->securityManager, ctrl->def) < 0) + goto error; + if (virNetServerAddService(ctrl->server, svc, NULL) < 0) goto error; virObjectUnref(svc); -- 1.8.4.2

2 1

[libvirt] [PATCH 0/2] virsh: Fix mishandling of inactive configuration on device hotplug
by Peter Krempa 08 Jan '14

08 Jan '14

Peter Krempa (2): virsh: Don't use legacy API if --current is used on device hot(un)plug virsh: Use inactive definition when removing disk from config tools/virsh-domain.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) -- 1.8.5.2

2 5

[libvirt] [PATCH] virConnectUnregisterCloseCallback: Unlock @conn prior to error dispatch
by Michal Privoznik 08 Jan '14

08 Jan '14

The function checks for @conn to be valid and locks its mutex. Then, it checks if callee is unregistering the same callback that he registered previously. If this fails an error is reported and the control jumps to 'error' label. Here, if @conn has some errors (and it certainly does - the one that's been just reported) the conn->mutex is locked again - without any previous unlock: Thread 1 (Thread 0x7fb500ef1800 (LWP 18982)): #0 __lll_lock_wait () at ../nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S:135 #1 0x00007fb4fd99ce56 in _L_lock_918 () from /lib64/libpthread.so.0 #2 0x00007fb4fd99ccaa in __GI___pthread_mutex_lock (mutex=0x7fb50153b670) at pthread_mutex_lock.c:64 #3 0x00007fb5007e574d in virMutexLock (m=m@entry=0x7fb50153b670) at util/virthreadpthread.c:85 #4 0x00007fb5007b198e in virDispatchError (conn=conn@entry=0x7fb50153b5e0) at util/virerror.c:594 #5 0x00007fb5008a3735 in virConnectUnregisterCloseCallback (conn=0x7fb50153b5e0, cb=cb@entry=0x7fb500f588e0 <vshCatchDisconnect>) at libvirt.c:21025 #6 0x00007fb500f5d690 in vshReconnect (ctl=ctl@entry=0x7fffff60e710) at virsh.c:328 #7 0x00007fb500f5dc50 in vshCommandRun (ctl=ctl@entry=0x7fffff60e710, cmd=0x7fb50152ca80) at virsh.c:1755 #8 0x00007fb500f5861b in main (argc=<optimized out>, argv=<optimized out>) at virsh.c:3393 And since the conn's mutex is not recursive, the virDispatchError will never ever lock it successfully. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/libvirt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libvirt.c b/src/libvirt.c index 2f5f023..71c9d8c 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -21022,9 +21022,9 @@ virConnectUnregisterCloseCallback(virConnectPtr conn, return 0; error: - virDispatchError(conn); virObjectUnlock(conn->closeCallback); virMutexUnlock(&conn->lock); + virDispatchError(conn); return -1; } -- 1.8.5.1

2 2

[libvirt] [ruby-libvirt] Don't free more entries than we retrieved
by Guido Günther 08 Jan '14

08 Jan '14

The vir*List* functions return the number of fetched entries. We mustn't free more, otherwise we'll crash like #0 0xb779d424 in __kernel_vsyscall () #1 0xb733981f in __GI_raise (sig=sig@entry=6) at ../nptl/sysdeps/unix/sysv/linux/raise.c:56 #2 0xb733ccd3 in __GI_abort () at abort.c:90 #3 0xb7376275 in __libc_message (do_abort=do_abort@entry=2, fmt=fmt@entry=0xb74767d0 "*** Error in `%s': %s: 0x%s ***\n") at ../sysdeps/unix/sysv/linux/libc_fatal.c:199 #4 0xb7380e52 in malloc_printerr (action=<optimized out>, str=<optimized out>, ptr=0xb7087000) at malloc.c:4923 #5 0xb7381b90 in _int_free (av=0xb74b7440 <main_arena>, p=0xb7086ff8, have_lock=0) at malloc.c:3779 #6 0xb75c059f in ruby_xfree () from /usr/lib/libruby-1.9.1.so.1.9 #7 0xb7076448 in ruby_libvirt_generate_list () from /usr/lib/ruby/vendor_ruby/1.9.1/i486-linux/_libvirt.so ... since we're trying to free random addresses. --- ext/libvirt/connect.c | 4 ++-- ext/libvirt/domain.c | 2 +- ext/libvirt/nodedevice.c | 2 +- ext/libvirt/storage.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ext/libvirt/connect.c b/ext/libvirt/connect.c index 36cac20..1af64a1 100644 --- a/ext/libvirt/connect.c +++ b/ext/libvirt/connect.c @@ -67,7 +67,7 @@ names = alloca(sizeof(char *) * num); \ r = virConnectList##objs(ruby_libvirt_connect_get(c), names, num); \ ruby_libvirt_raise_error_if(r < 0, e_RetrieveError, "virConnectList" # objs, ruby_libvirt_connect_get(c)); \ - return ruby_libvirt_generate_list(num, names); \ + return ruby_libvirt_generate_list(r < 0 ? 0 : r, names); \ } while(0) static VALUE c_connect; @@ -1508,7 +1508,7 @@ static VALUE libvirt_connect_list_nodedevices(int argc, VALUE *argv, VALUE c) ruby_libvirt_raise_error_if(r < 0, e_RetrieveError, "virNodeListDevices", ruby_libvirt_connect_get(c)); - return ruby_libvirt_generate_list(num, names); + return ruby_libvirt_generate_list(r < 0 ? 0 : r, names); } /* diff --git a/ext/libvirt/domain.c b/ext/libvirt/domain.c index ddce2d8..bc46753 100644 --- a/ext/libvirt/domain.c +++ b/ext/libvirt/domain.c @@ -1532,7 +1532,7 @@ static VALUE libvirt_domain_list_snapshots(int argc, VALUE *argv, VALUE d) "virDomainSnapshotListNames", ruby_libvirt_connect_get(d)); - return ruby_libvirt_generate_list(num, names); + return ruby_libvirt_generate_list(r < 0 ? 0 : r, names); } /* diff --git a/ext/libvirt/nodedevice.c b/ext/libvirt/nodedevice.c index 98b3715..041cda2 100644 --- a/ext/libvirt/nodedevice.c +++ b/ext/libvirt/nodedevice.c @@ -124,7 +124,7 @@ static VALUE libvirt_nodedevice_list_caps(VALUE c) "virNodeDeviceListCaps", ruby_libvirt_connect_get(c)); - return ruby_libvirt_generate_list(num, names); + return ruby_libvirt_generate_list(r < 0 ? 0 : r, names); } /* diff --git a/ext/libvirt/storage.c b/ext/libvirt/storage.c index 4b96d2e..008410a 100644 --- a/ext/libvirt/storage.c +++ b/ext/libvirt/storage.c @@ -340,7 +340,7 @@ static VALUE libvirt_storage_pool_list_volumes(VALUE p) "virStoragePoolListVolumes", ruby_libvirt_connect_get(p)); - return ruby_libvirt_generate_list(num, names); + return ruby_libvirt_generate_list(r < 0 ? 0 : r, names); } /* -- 1.8.5.2

2 6