- Devel - libvirt List Archives

[libvirt] [PATCH] virsh: Fix usage of header termios.h
by Peter Krempa 07 Dec '12

07 Dec '12

The termios struct exported by the termios.h header is used as an argument for vshMakeStdinRaw(). The header isn't used anywhere in tools/virsh-domain.c. This patch adds the header to the header declaring vshMakeStdinRaw() and removes other places in virsh. --- tools/console.h | 4 +++- tools/virsh-domain.c | 1 - tools/virsh.c | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/console.h b/tools/console.h index 962594c..46255b8 100644 --- a/tools/console.h +++ b/tools/console.h @@ -1,7 +1,7 @@ /* * console.c: A dumb serial console client * - * Copyright (C) 2007, 2010 Red Hat, Inc. + * Copyright (C) 2007, 2010, 2012 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -25,6 +25,8 @@ # ifndef WIN32 +# include <termios.h> + int vshRunConsole(virDomainPtr dom, const char *dev_name, const char *escape_seq, diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 1f7aff7..96e62fc 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -30,7 +30,6 @@ #include <poll.h> #include <signal.h> #include <sys/time.h> -#include <termios.h> #include <libxml/parser.h> #include <libxml/tree.h> diff --git a/tools/virsh.c b/tools/virsh.c index 322f778..b4829a3 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -42,7 +42,6 @@ #include <sys/stat.h> #include <inttypes.h> #include <strings.h> -#include <termios.h> #include <libxml/parser.h> #include <libxml/tree.h> -- 1.8.0

2 2

[libvirt] [PATCH 00/15 v5] Unprivileged SG_IO support
by Osier Yang 07 Dec '12

07 Dec '12

Hi, As a result of RFC [1], this implements the unprivleged SG_IO support. Testing is not that enough, but I'd like see the reviewing earlier, and meanwhile I'm not going to give up the further testing. v4 - v5 (5 new patches): * Set sysfs unpriv_sgio when attaching disk * Restore sysfs unpriv_sgio when detaching disk * Error out when attaching disk if it's shared by other (domains), and the disk conf conflicts. * Do not restore sysfs unpriv_sgio when detaching disk if the disk is still being used by other domain(s) * Dump the original unpriv_sgio state in status XML, so that it won't be lost after restarting or reloading libvirtd. v3 - v4: * Rebase on the top * More testing v2 - v3: * Change the XML tag name to "cdbfilter" * Maintain an internal list of shared disks for QEMU driver. Patches 1/10 ~ 4/10 are to introduce the internal list for shared disks. Osier Yang (15): qemu: Introduce a list to maintain the shared disks between domains qemu: Init/Free the list with the driver's lifecyle qemu: Add/remove the shared disk entry during domain's lifecyle qemu: Add/Remove the entry of sharedDisks when live attaching/detaching docs: Add docs and rng schema for new XML cdbfilter conf: Parse and format the new XML tag cdbfilter util: Prepare helpers for unpriv_sgio setting qemu: Manage disk's cdbfilter in domain's lifecycle qemu: Do not restore the sysfs unpriv_sgio if the disk is being shared qemu: Error out when domain starting if the cdbfilter setting conflicts qemu: Set unpriv_sgio when attaching disk qemu: Restore unpriv_sgio when detaching disk qemu: Error out if the shared disk conf conflicts with others when attaching qemu: Do not restore unpriv_sgio if the disk is shared by other domain conf: Save disk's original unpriv_sgio state into status XML docs/formatdomain.html.in | 13 ++- docs/schemas/domaincommon.rng | 52 ++++-- src/conf/domain_conf.c | 106 ++++++++++-- src/conf/domain_conf.h | 13 ++ src/libvirt_private.syms | 5 + src/qemu/qemu_conf.c | 170 ++++++++++++++++++++ src/qemu/qemu_conf.h | 30 ++++ src/qemu/qemu_driver.c | 78 +++++++++ src/qemu/qemu_process.c | 141 ++++++++++++++++- src/qemu/qemu_process.h | 4 + src/util/util.c | 145 +++++++++++++++++ src/util/util.h | 7 + ...ml2argv-disk-scsi-lun-passthrough-cdbfilter.xml | 32 ++++ tests/qemuxml2xmltest.c | 1 + 14 files changed, 761 insertions(+), 36 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough-cdbfilter.xml Regards, Osier

5 26

[libvirt] [PATCH v5] qemu: Allow the user to specify vendor and product for disk
by Osier Yang 07 Dec '12

07 Dec '12

QEMU supports setting vendor and product strings for disk since 1.2.0 (only scsi-disk, scsi-hd, scsi-cd support it), this patch exposes it with new XML elements <vendor> and <product> of disk device. v4 - v5: * Just rebasing v3 - v4: * Per Paolo's feedback, allows all printable chars. --- I think it's pretty straightforward to ACK now, any one can review it? --- docs/formatdomain.html.in | 11 +++++ docs/schemas/domaincommon.rng | 14 ++++++ src/conf/domain_conf.c | 44 ++++++++++++++++++++ src/conf/domain_conf.h | 2 + src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 29 +++++++++++++ src/util/util.c | 12 +++++ src/util/util.h | 1 + ...qemuxml2argv-disk-scsi-disk-vpd-build-error.xml | 35 ++++++++++++++++ .../qemuxml2argv-disk-scsi-disk-vpd.args | 13 ++++++ .../qemuxml2argv-disk-scsi-disk-vpd.xml | 38 +++++++++++++++++ tests/qemuxml2argvtest.c | 8 ++++ tests/qemuxml2xmltest.c | 2 + 13 files changed, 210 insertions(+), 0 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd-build-error.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 0574e68..30fb021 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1657,6 +1657,17 @@ of 16 hexadecimal digits. Since 0.10.1 </dd> + <dt><code>vendor</code></dt> + <dd>If present, this element specifies the vendor of a virtual hard + disk or CD-ROM device. It must not be longer than 8 printable + characters. + Since 1.0.1 + </dd> + <dt><code>product</code></dt> + <dd>If present, this element specifies the product of a virtual hard + disk or CD-ROM device. It must not be longer than 16 printable + Since 1.0.1 + </dd> <dt><code>host</code></dt> <dd>The <code>host</code> element supports 4 attributes, viz. "name", "port", "transport" and "socket", which specify the hostname, the port diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 0e85739..14344e2 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -905,6 +905,20 @@ <ref name="wwn"/> </element> </optional> + <optional> + <element name="vendor"> + <data type="string"> + <param name="pattern">[x20-x7E]{0,8}</param> + </data> + </element> + </optional> + <optional> + <element name="product"> + <data type="string"> + <param name="pattern">[x20-x7E]{0,16}</param> + </data> + </element> + </optional> </interleave> </define> <define name="snapshot"> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 4ffb39d..6aa5f79 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -985,6 +985,8 @@ void virDomainDiskDefFree(virDomainDiskDefPtr def) VIR_FREE(def->mirror); VIR_FREE(def->auth.username); VIR_FREE(def->wwn); + VIR_FREE(def->vendor); + VIR_FREE(def->product); if (def->auth.secretType == VIR_DOMAIN_DISK_SECRET_TYPE_USAGE) VIR_FREE(def->auth.secret.usage); virStorageEncryptionFree(def->encryption); @@ -3505,6 +3507,8 @@ cleanup: goto cleanup; } +#define VENDOR_LEN 8 +#define PRODUCT_LEN 16 /* Parse the XML definition for a disk * @param node XML nodeset to parse for disk definition @@ -3558,6 +3562,8 @@ virDomainDiskDefParseXML(virCapsPtr caps, char *logical_block_size = NULL; char *physical_block_size = NULL; char *wwn = NULL; + char *vendor = NULL; + char *product = NULL; if (VIR_ALLOC(def) < 0) { virReportOOMError(); @@ -3926,6 +3932,36 @@ virDomainDiskDefParseXML(virCapsPtr caps, if (!virValidateWWN(wwn)) goto error; + } else if (!vendor && + xmlStrEqual(cur->name, BAD_CAST "vendor")) { + vendor = (char *)xmlNodeGetContent(cur); + + if (strlen(vendor) > VENDOR_LEN) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("disk vendor is more than 8 characters")); + goto error; + } + + if (!virStrIsPrint(vendor)) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("disk vendor is not printable string")); + goto error; + } + } else if (!product && + xmlStrEqual(cur->name, BAD_CAST "product")) { + product = (char *)xmlNodeGetContent(cur); + + if (strlen(vendor) > PRODUCT_LEN) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("disk product is more than 16 characters")); + goto error; + } + + if (!virStrIsPrint(product)) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("disk product is not printable string")); + goto error; + } } else if (xmlStrEqual(cur->name, BAD_CAST "boot")) { /* boot is parsed as part of virDomainDeviceInfoParseXML */ } @@ -4222,6 +4258,10 @@ virDomainDiskDefParseXML(virCapsPtr caps, serial = NULL; def->wwn = wwn; wwn = NULL; + def->vendor = vendor; + vendor = NULL; + def->product = product; + product = NULL; if (driverType) { def->format = virStorageFileFormatTypeFromString(driverType); @@ -4296,6 +4336,8 @@ cleanup: VIR_FREE(logical_block_size); VIR_FREE(physical_block_size); VIR_FREE(wwn); + VIR_FREE(vendor); + VIR_FREE(product); ctxt->node = save_ctxt; return def; @@ -12144,6 +12186,8 @@ virDomainDiskDefFormat(virBufferPtr buf, virBufferAddLit(buf, " <transient/>\n"); virBufferEscapeString(buf, " <serial>%s</serial>\n", def->serial); virBufferEscapeString(buf, " <wwn>%s</wwn>\n", def->wwn); + virBufferEscapeString(buf, " <vendor>%s</vendor>\n", def->vendor); + virBufferEscapeString(buf, " <product>%s</product>\n", def->product); if (def->encryption) { virBufferAdjustIndent(buf, 6); if (virStorageEncryptionFormat(buf, def->encryption) < 0) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 4ab15e9..7ad5377 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -602,6 +602,8 @@ struct _virDomainDiskDef { char *serial; char *wwn; + char *vendor; + char *product; int cachemode; int error_policy; /* enum virDomainDiskErrorPolicy */ int rerror_policy; /* enum virDomainDiskErrorPolicy */ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index bc01fe5..499ab3b 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1298,6 +1298,7 @@ virSetUIDGID; virSkipSpaces; virSkipSpacesAndBackslash; virSkipSpacesBackwards; +virStrIsPrint; virStrToDouble; virStrToLong_i; virStrToLong_l; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1805625..826086c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2576,6 +2576,13 @@ qemuBuildDriveDevStr(virDomainDefPtr def, } } + if ((disk->vendor || disk->product) && + disk->bus != VIR_DOMAIN_DISK_BUS_SCSI) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Only scsi disk supports vendor and product")); + goto error; + } + if (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) { /* make sure that both the bus and the qemu binary support * type='lun' (SG_IO). @@ -2603,6 +2610,11 @@ qemuBuildDriveDevStr(virDomainDefPtr def, _("Setting wwn is not supported for lun device")); goto error; } + if (disk->vendor || disk->product) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Setting vendor or product is not supported for lun device")); + goto error; + } } switch (disk->bus) { @@ -2652,6 +2664,17 @@ qemuBuildDriveDevStr(virDomainDefPtr def, goto error; } + /* Properties wwn, vendor and product were introduced in the + * same QEMU release (1.2.0). + */ + if ((disk->vendor || disk->product) && + !qemuCapsGet(caps, QEMU_CAPS_SCSI_DISK_WWN)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Setting vendor or product for scsi disk is not " + "supported by this QEMU")); + goto error; + } + controllerModel = virDomainDiskFindControllerModel(def, disk, VIR_DOMAIN_CONTROLLER_TYPE_SCSI); @@ -2797,6 +2820,12 @@ qemuBuildDriveDevStr(virDomainDefPtr def, if (disk->wwn) virBufferAsprintf(&opt, ",wwn=%s", disk->wwn); + if (disk->vendor) + virBufferAsprintf(&opt, ",vendor=%s", disk->vendor); + + if (disk->product) + virBufferAsprintf(&opt, ",product=%s", disk->product); + if (virBufferError(&opt)) { virReportOOMError(); goto error; diff --git a/src/util/util.c b/src/util/util.c index 2fd0f2c..95b0a06 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -3113,3 +3113,15 @@ virValidateWWN(const char *wwn) { return true; } + +bool +virStrIsPrint(const char *str) +{ + int i; + + for (i = 0; str[i]; i++) + if (!c_isprint(str[i])) + return false; + + return true; +} diff --git a/src/util/util.h b/src/util/util.h index 4316ab1..6d5dd03 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -280,4 +280,5 @@ bool virIsDevMapperDevice(const char *dev_name) ATTRIBUTE_NONNULL(1); bool virValidateWWN(const char *wwn); +bool virStrIsPrint(const char *str); #endif /* __VIR_UTIL_H__ */ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd-build-error.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd-build-error.xml new file mode 100644 index 0000000..ca68275 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd-build-error.xml @@ -0,0 +1,35 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='cdrom'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='sda' bus='virtio'/> + <vendor>SEAGATE</vendor> + <product>ST3146707LC</product> + </disk> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest2'/> + <target dev='sdb' bus='scsi'/> + <vendor>SEAGATE</vendor> + <product>ST3567807GD</product> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='scsi' index='0' model='virtio-scsi'/> + <controller type='scsi' index='1' model='lsilogic'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args new file mode 100644 index 0000000..f5c1999 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args @@ -0,0 +1,13 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ +/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ +-device lsi,id=scsi1,bus=pci.0,addr=0x4 \ +-usb \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-0-0 \ +-device scsi-cd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,\ +id=scsi0-0-0-0,vendor=SEAGATE,product=ST3146707LC \ +-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-scsi1-0-0 \ +-device scsi-hd,bus=scsi1.0,scsi-id=0,drive=drive-scsi1-0-0,\ +id=scsi1-0-0,vendor=SEAGATE,product=ST3567807GD \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.xml new file mode 100644 index 0000000..96786e3 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.xml @@ -0,0 +1,38 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='cdrom'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='sda' bus='scsi'/> + <readonly/> + <vendor>SEAGATE</vendor> + <product>ST3146707LC</product> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest2'/> + <target dev='sdb' bus='scsi'/> + <readonly/> + <vendor>SEAGATE</vendor> + <product>ST3567807GD</product> + <address type='drive' controller='1' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='scsi' index='0' model='virtio-scsi'/> + <controller type='scsi' index='1' model='lsilogic'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 5822cae..bb233ed 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -507,6 +507,14 @@ mymain(void) QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI_PCI, QEMU_CAPS_SCSI_DISK_WWN); + DO_TEST("disk-scsi-disk-vpd", + QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI_PCI, + QEMU_CAPS_SCSI_DISK_WWN); + DO_TEST_FAILURE("disk-scsi-disk-vpd-build-error", + QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI_PCI, + QEMU_CAPS_SCSI_DISK_WWN); DO_TEST("disk-scsi-vscsi", QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); DO_TEST("disk-scsi-virtio-scsi", diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 3d8176c..c2d3dd3 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -239,6 +239,8 @@ mymain(void) DO_TEST("seclabel-none"); DO_TEST("numad-static-vcpu-no-numatune"); + DO_TEST("disk-scsi-disk-vpd"); + /* These tests generate different XML */ DO_TEST_DIFFERENT("balloon-device-auto"); DO_TEST_DIFFERENT("channel-virtio-auto"); -- 1.7.7.6

2 3

[libvirt] virsh list --all not showing domain
by Andy Howell 07 Dec '12

07 Dec '12

I'm running libvirt 0.9.13 on Ubuntu 12.10. I created a qemu VM from an existing image. I able to start and stop it, but networing was not working. After a reboot of my laptop, I can not long see the machine. virsh list --all Id Name State ---------------------------------------------------- The config file exists for the machine in /etc/libvirt/qemu/suse10.xml How do I get virsh to see it again? Thanks, Andy

4 5

[libvirt] [PATCH 0/5] Add API to allow TCP connection tunelling using virStreams
by Peter Krempa 07 Dec '12

07 Dec '12

This series adds ability for the qemu driver to tunnel connections to TCP ports from the host. This is useful for enabling remote VNC/SPICE sessions without the need to configure SSH tunnels or portforwards and without the need to open the ports for public. There's also an advantage for tools such as virt-viewer that have to guess the remote connection parameters and you have to hope that nothing is in your way. With spice/VNC clients that have support for read/write callbacks, this would allow also direct connection without an intermediate socket. The API and tunelling works but there's no (stable and good working) client for this API. I hacked up a dirty netcat-like terminal into virsh for testing purposes (see patch 5/5) but that isn't what I'd like to see. The client should be able to open a listening socket and when a client connects to it, it opens a stream and connects it to the remote host. For the client there are two options: 1) do all the stuff in virsh: + one tool to rule them all - i'd like to daemonize it and I don't know if that's okay in virsh 2) add a new tool "virtunnel": + less virsh pollution - separate tool ... I'd like to hear your opinion on this question. (note: this is my personal effort, I'm annoyed of opening ssh tunnels to remote displays on my server and I don't want to open the ports to public. ) After this it would be great to add support for this to virt-viewer. Peter Krempa (5): api: Add API to allow TCP tunneling through streams to the host fdstream: Add support for TCP connections of streams qemu: Add configuration options to enable TCP tunelling qemu: Implement virNodeTunnelTcp for the qemu driver NOT_TO_BE_APPLIED_UPSTREAM: quick and dirty virsh client to test the stuff include/libvirt/libvirt.h.in | 11 +++++++ src/driver.h | 8 +++++ src/fdstream.c | 73 ++++++++++++++++++++++++++++++++++++++++++++ src/fdstream.h | 5 +++ src/libvirt.c | 67 ++++++++++++++++++++++++++++++++++++++++ src/libvirt_private.syms | 1 + src/libvirt_public.syms | 1 + src/qemu/qemu.conf | 16 ++++++++++ src/qemu/qemu_conf.c | 26 ++++++++++++++++ src/qemu/qemu_conf.h | 13 ++++++++ src/qemu/qemu_driver.c | 45 +++++++++++++++++++++++++++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 9 +++++- src/remote_protocol-structs | 6 ++++ src/rpc/gendispatch.pl | 1 + tools/console.c | 66 +++++++++++++++++++++------------------ tools/console.h | 11 +++---- tools/virsh-domain.c | 18 ++++++++--- tools/virsh-host.c | 60 ++++++++++++++++++++++++++++++++++++ 19 files changed, 396 insertions(+), 42 deletions(-) -- 1.8.0

2 7

[libvirt] [test-API][PATCH] Add 2 vcpupin cases cover config and live flags
by Wayne Sun 07 Dec '12

07 Dec '12

* use pinVcpuFlags to pin domain vcpu to host cpu * 2 cases cover config and live flags * cpulist with '^', '-' and ',' is supported to give multiple host cpus * vcpus and vcpuPinInfo are used as part of the checking * a sample conf is added Signed-off-by: Wayne Sun <gsun(a)redhat.com> --- cases/vcpupin.conf | 67 +++++++++++++++ repos/setVcpus/vcpupin_config.py | 174 ++++++++++++++++++++++++++++++++++++++ repos/setVcpus/vcpupin_live.py | 166 ++++++++++++++++++++++++++++++++++++ 3 files changed, 407 insertions(+), 0 deletions(-) create mode 100644 cases/vcpupin.conf create mode 100644 repos/setVcpus/vcpupin_config.py create mode 100644 repos/setVcpus/vcpupin_live.py diff --git a/cases/vcpupin.conf b/cases/vcpupin.conf new file mode 100644 index 0000000..880247f --- /dev/null +++ b/cases/vcpupin.conf @@ -0,0 +1,67 @@ +domain:install_linux_cdrom + guestname + $defaultname + guestos + $defaultos + guestarch + $defaultarch + vcpu + 4 + memory + $defaultmem + hddriver + $defaulthd + nicdriver + $defaultnic + imageformat + qcow2 + +setVcpus:vcpupin_live + guestname + $defaultname + vcpu + 0 + cpulist + 2,4-6,^4 + +setVcpus:vcpupin_live + guestname + $defaultname + vcpu + 1 + cpulist + 3 + +domain:destroy + guestname + $defaultname + +setVcpus:vcpupin_config + guestname + $defaultname + vcpu + 2 + cpulist + 0-8,^1 + +setVcpus:vcpupin_config + guestname + $defaultname + vcpu + 3 + cpulist + ^2,0-8 + +domain:start + guestname + $defaultname + +domain:destroy + guestname + $defaultname + +domain:undefine + guestname + $defaultname + +options cleanup=enable diff --git a/repos/setVcpus/vcpupin_config.py b/repos/setVcpus/vcpupin_config.py new file mode 100644 index 0000000..12d9598 --- /dev/null +++ b/repos/setVcpus/vcpupin_config.py @@ -0,0 +1,174 @@ +#!/usr/bin/env python +# Test domain vcpu pin with flag VIR_DOMAIN_AFFECT_CONFIG, check +# domain config xml with vcpupin configuration. + +import re +from xml.dom import minidom + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('guestname', 'vcpu', 'cpulist',) +optional_params = {} + +def vcpupin_check(domobj, vcpu, cpumap): + """check domain config xml with vcpupin element + """ + guestxml = domobj.XMLDesc(2) + logger.debug("domain %s xml :\n%s" %(domobj.name(), guestxml)) + + doc = minidom.parseString(guestxml) + vcpupin = doc.getElementsByTagName('vcpupin') + if not vcpupin: + logger.error("no vcpupin element in domain xml") + return 1 + + for i in range(len(vcpupin)): + if vcpupin[i].hasAttribute('vcpu') and \ + vcpupin[i].hasAttribute('cpuset'): + vcpu_attr = vcpupin[i].getAttributeNode('vcpu') + cpu_attr = vcpupin[i].getAttributeNode('cpuset') + if int(vcpu_attr.nodeValue) == vcpu: + cpulist = cpu_attr.nodeValue + if cpulist == '': + cpumap_tmp = () + for i in range(maxcpu): + cpumap_tmp += (False,) + else: + cpumap_tmp = get_cpumap(cpulist) + + if cpumap_tmp == cpumap: + logger.info("cpuset is as expected in domain xml") + return 0 + else: + logger.error("cpuset is not as expected in domain xml") + return 1 + + if i == len(vcpupin) - 1: + logger.error("the vcpupin element with given vcpu is not found") + return 1 + +def format_cpumap(cpulist, cpumap_test): + """ format cpumap base on cpulist + """ + cpumap = () + + try: + if re.match('\^', cpulist): + unuse = int(re.split('\^', cpulist)[1]) + for i in range(maxcpu): + if i == unuse: + cpumap += (False,) + else: + cpumap += (cpumap_test[i],) + + elif '-' in cpulist: + cpu_list = re.split('-', cpulist) + if not len(cpu_list) == 2: + return False + if not int(cpu_list[1]) < maxcpu: + logger.error("cpulist: out of host cpu range") + return False + if int(cpu_list[1]) < int(cpu_list[0]): + return False + + for i in range(maxcpu): + if i in range(int(cpu_list[0]), int(cpu_list[1])+1): + cpumap += (True,) + else: + cpumap += (cpumap_test[i],) + + else: + for i in range(maxcpu): + if i == int(cpulist): + cpumap += (True,) + else: + cpumap += (cpumap_test[i],) + + return cpumap + except ValueError, e: + logger.error("ValueError: " + str(e)) + return False + +def get_cpumap(cpulist): + """get cpumap base on given cpulist + """ + cpumap_test = () + for i in range(maxcpu): + cpumap_test += (False,) + + if ',' in cpulist: + cpu_list = re.split(',', cpulist) + for i in range(len(cpu_list)): + cpumap = format_cpumap(cpu_list[i], cpumap_test) + if cpumap: + cpumap_test = cpumap + else: + return False + return cpumap + + else: + cpumap = format_cpumap(cpulist, cpumap_test) + if cpumap: + return cpumap + else: + return False + +def vcpupin_config(params): + """pin domain vcpu to host cpu with config flag + """ + global logger + logger = params['logger'] + params.pop('logger') + guestname = params['guestname'] + vcpu = int(params['vcpu']) + cpulist = params['cpulist'] + + logger.info("the name of virtual machine is %s" % guestname) + logger.info("the given vcpu is %s" % vcpu) + logger.info("the given cpulist is %s" % cpulist) + + global maxcpu + maxcpu = utils.get_host_cpus() + logger.info("%s physical cpu on host" % maxcpu) + + conn = sharedmod.libvirtobj['conn'] + + try: + domobj = conn.lookupByName(guestname) + cpumap = get_cpumap(cpulist) + if not cpumap: + logger.error("cpulist: Invalid format") + return 1 + + logger.debug("cpumap for vcpu pin is:") + logger.debug(cpumap) + + logger.info("pin domain vcpu %s to host cpulist %s with flag: %s" % + (vcpu, cpulist, libvirt.VIR_DOMAIN_AFFECT_CONFIG)) + domobj.pinVcpuFlags(vcpu, cpumap, libvirt.VIR_DOMAIN_AFFECT_CONFIG) + + logger.info("check vcpu pin info") + ret = domobj.vcpuPinInfo(libvirt.VIR_DOMAIN_AFFECT_CONFIG) + logger.debug("vcpu pin info is:") + logger.debug(ret) + if ret[vcpu] == cpumap: + logger.info("vcpu pin info is expected") + else: + logger.error("vcpu pin info is not expected") + return 1 + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + logger.info("check domain vcpupin configuration in xml") + ret = vcpupin_check(domobj, vcpu, cpumap) + if ret: + logger.error("domain vcpu pin check failed") + return 1 + else: + logger.info("domain vcpu pin check succeed") + return 0 diff --git a/repos/setVcpus/vcpupin_live.py b/repos/setVcpus/vcpupin_live.py new file mode 100644 index 0000000..09744a5 --- /dev/null +++ b/repos/setVcpus/vcpupin_live.py @@ -0,0 +1,166 @@ +#!/usr/bin/env python +# Test domain vcpu pin with flag VIR_DOMAIN_AFFECT_LIVE, check +# vcpu subprocess status under domain task list on host. + +import re + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('guestname', 'vcpu', 'cpulist',) +optional_params = {} + +def vcpupin_check(guestname, vcpu, cpumap): + """check vcpu subprocess status of the running virtual machine + grep Cpus_allowed_list /proc/PID/task/*/status + """ + tmp_str = '' + cmd = "cat /var/run/libvirt/qemu/%s.pid" % guestname + status, pid = utils.exec_cmd(cmd, shell=True) + if status: + logger.error("failed to get the pid of domain %s" % guestname) + return 1 + + cmd = "grep Cpus_allowed_list /proc/%s/task/*/status" % pid[0] + status, output = utils.exec_cmd(cmd, shell=True) + logger.debug("command '%s' output is:" % cmd) + for i in range(len(output)): + tmp_str += ''.join(output[i]) + '\n' + logger.debug(tmp_str) + + task_list = output[1:] + vcpu_task = task_list[int(vcpu)] + cpulist = vcpu_task.split('\t')[1] + ret = get_cpumap(cpulist) + if ret == cpumap: + logger.info("vcpu process cpus allowed list is expected") + return 0 + else: + logger.error("vcpu process cpus allowed list is not expected") + return 1 + +def format_cpumap(cpulist, cpumap_test): + """ format cpumap base on cpulist + """ + cpumap = () + + try: + if re.match('\^', cpulist): + unuse = int(re.split('\^', cpulist)[1]) + for i in range(maxcpu): + if i == unuse: + cpumap += (False,) + else: + cpumap += (cpumap_test[i],) + + elif '-' in cpulist: + cpu_list = re.split('-', cpulist) + if not len(cpu_list) == 2: + return False + if not int(cpu_list[1]) < maxcpu: + logger.error("cpulist: out of host cpu range") + return False + if int(cpu_list[1]) < int(cpu_list[0]): + return False + + for i in range(maxcpu): + if i in range(int(cpu_list[0]), int(cpu_list[1])+1): + cpumap += (True,) + else: + cpumap += (cpumap_test[i],) + + else: + for i in range(maxcpu): + if i == int(cpulist): + cpumap += (True,) + else: + cpumap += (cpumap_test[i],) + + return cpumap + except ValueError, e: + logger.error("ValueError: " + str(e)) + return False + +def get_cpumap(cpulist): + """get cpumap base on given cpulist + """ + cpumap_test = () + for i in range(maxcpu): + cpumap_test += (False,) + + if ',' in cpulist: + cpu_list = re.split(',', cpulist) + for i in range(len(cpu_list)): + cpumap = format_cpumap(cpu_list[i], cpumap_test) + if cpumap: + cpumap_test = cpumap + else: + return False + return cpumap + + else: + cpumap = format_cpumap(cpulist, cpumap_test) + if cpumap: + return cpumap + else: + return False + +def vcpupin_live(params): + """pin domain vcpu to host cpu with live flag + """ + global logger + logger = params['logger'] + params.pop('logger') + guestname = params['guestname'] + vcpu = int(params['vcpu']) + cpulist = params['cpulist'] + + logger.info("the name of virtual machine is %s" % guestname) + logger.info("the given vcpu is %s" % vcpu) + logger.info("the given cpulist is %s" % cpulist) + + global maxcpu + maxcpu = utils.get_host_cpus() + logger.info("%s physical cpu on host" % maxcpu) + + conn = sharedmod.libvirtobj['conn'] + + try: + domobj = conn.lookupByName(guestname) + cpumap = get_cpumap(cpulist) + if not cpumap: + logger.error("cpulist: Invalid format") + return 1 + + logger.debug("cpumap for vcpu pin is:") + logger.debug(cpumap) + + logger.info("pin domain vcpu %s to host cpu %s with flag: %s" % + (vcpu, cpulist, libvirt.VIR_DOMAIN_AFFECT_LIVE)) + domobj.pinVcpuFlags(vcpu, cpumap, libvirt.VIR_DOMAIN_AFFECT_LIVE) + + logger.info("check vcpus info") + ret = domobj.vcpus() + logger.debug("vcpus info is:") + logger.debug(ret) + if ret[1][vcpu] == cpumap: + logger.info("vcpus info is expected") + else: + logger.error("vcpus info is not expected") + return 1 + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + logger.info("check vcpu pin status on host") + ret = vcpupin_check(guestname, vcpu, cpumap) + if ret: + logger.error("domain vcpu pin failed") + return 1 + else: + logger.info("domain vcpu pin succeed") + return 0 -- 1.7.1

1 0

[libvirt] RFC: Enable Libvirt to handle OVA installation
by Ata Bohra 07 Dec '12

07 Dec '12

This is a proposal to enhance Libvirt library to handle OVA package installation. OVA: OVA is one of the widely accepted and consortium defined/maintained format for Virtual Machine distros. Technically it is a tar file with three main components: 1. VMX descriptor (XML file defining virtual machine specifics such as: virtual hardware etc. 2. VMDKs in a compressed format. 3. Manifest file. Proposal: 1. Expose a public API method to allow an application to invoke OVA installation with a file pointer to OVA file. 2. OVA util file: This file understands the OVA formats and rips out the given package to extract specific information: 2.1. int get_vmx(char *vmx): method can return VMX descriptor associated with a given OVA file. 2.2. int get_vmdks(struct ova_type *ova): method that seek the OVA file and populate ova_type struct which may look like; typedef struct disk_list_tag { char *file_name; off_t file_size; off_t file_offset; struct disk_list_tag *next; }; typedef struct ova_type { int num_vmdks; ova_list *head; } 2. Hypervisor specific changes: It can be done in more than one way: 2.1: Enhance hypervisor driver function to implement hypervisor specific routines to perform OVA installations. 2.2.: Append a new driver to handle OVA installation such as virOvaDriver, main routines can be: open() : parse OVA using util functions. close() list_disk(): may display disk names install() (Please suggest if there can be more routines to this driver, it can be enhanced later as well). It is possible to design this driver to handle OVA parsing as well, but I think keeping it in 'util' may make that code available for all hypervisors given OVA format does not change per hypervisor. I'm inclined more towards 2.2 design as it is more generic and provides room for furture extensions. Looking forward for comments/suggestions. Thanks!Ata

4 6

[libvirt] [PATCHv2] util: Fix virGet{User, Group}IDByName when the user/group cannot be found
by Christophe Fergeau 07 Dec '12

07 Dec '12

Here is the v2 of this patch series. Changes since v1: - return an error only for documented error values returnef from getpwnam_r/getgrnam_r instead of trying to guess what error values mean 'entry not found' - this addresses the indenting comment raised by Osier

3 6

[libvirt] libvirt current git & F18
by Gene Czarcinski 07 Dec '12

07 Dec '12

Anyone know of problems with the libvirt based on today's git and Fedora 18. Trying to rebuild some rpms which build fine on Fedora 17 fail on Fedora 18. It appears that it may be related to xen-devel. Gene

3 3

[libvirt] [PATCHv3 0/3] IPv6 enhancements; put dnsmasq parameters in conf-file
by Gene Czarcinski 07 Dec '12

07 Dec '12

Rebased 3 December 2012 These three patch files are packaged together because they serially depend on each other. This version includes updates to add the ipv6='yes' for enabling the guest-to-guest communications. The DHCPv6 support checks dnsmasq's version and requires a minimum of 2.64. Also, using dnsmasq for providing the RA service is checked against the dnsmasq version and is currently 2.64. There are separate checks for DHCPv6 and Router Advertising support by dnsmasq. As with IPv4, IPv6 DHCP is only one subnetwork on an interface. Additionally, if other IPv6 addresses are defined, a warning message is issued since the Router Advertisement service will support only state-full (DHCP) or state-less (SLAAC) addressing on a network interface (not both). Thus, the additional subnetworks will need to be manually configured to properly function. If dnsmasq provides the RA service, it also points to itself as a RDNSS (Recursive DNS Server) as part of the information is supplies. If IPv6 DHCP is not being run, then SLAAC addressing is supported for any IPv6 addresses specified. Gene Czarcinski (3): v2.0: allow guest to guest IPv6 without gateway definition v8.2 add support for DHCPv6 v7.9: put dnsmasq parameters into conf-file docs/formatnetwork.html.in | 136 ++++- docs/schemas/network.rng | 22 +- src/conf/network_conf.c | 108 ++-- src/conf/network_conf.h | 5 + src/network/bridge_driver.c | 594 ++++++++++++++------- src/network/bridge_driver.h | 7 +- src/util/dnsmasq.c | 9 +- tests/networkxml2argvdata/dhcp6-nat-network.argv | 14 + tests/networkxml2argvdata/dhcp6-nat-network.xml | 24 + tests/networkxml2argvdata/dhcp6-network.argv | 14 + tests/networkxml2argvdata/dhcp6-network.xml | 14 + .../dhcp6host-routed-network.argv | 12 + .../dhcp6host-routed-network.xml | 19 + tests/networkxml2argvdata/isolated-network.argv | 25 +- .../networkxml2argvdata/nat-network-dns-hosts.argv | 14 +- .../nat-network-dns-srv-record-minimal.argv | 34 +- .../nat-network-dns-srv-record.argv | 24 +- .../nat-network-dns-txt-record.argv | 22 +- tests/networkxml2argvdata/nat-network.argv | 22 +- tests/networkxml2argvdata/netboot-network.argv | 28 +- .../networkxml2argvdata/netboot-proxy-network.argv | 26 +- tests/networkxml2argvdata/routed-network.argv | 11 +- tests/networkxml2argvtest.c | 47 +- 23 files changed, 876 insertions(+), 355 deletions(-) create mode 100644 tests/networkxml2argvdata/dhcp6-nat-network.argv create mode 100644 tests/networkxml2argvdata/dhcp6-nat-network.xml create mode 100644 tests/networkxml2argvdata/dhcp6-network.argv create mode 100644 tests/networkxml2argvdata/dhcp6-network.xml create mode 100644 tests/networkxml2argvdata/dhcp6host-routed-network.argv create mode 100644 tests/networkxml2argvdata/dhcp6host-routed-network.xml -- 1.7.11.7

3 18

[libvirt] [jenkins@libvirt.sigxcpu.org: Build failed in Jenkins: libvirt-tck-debian-wheezy-qemu-session #227]
by Guido Günther 07 Dec '12

07 Dec '12

Hi, this commit ae2163f852448fafce3bfcb2814e823d18e394ea Only let VM drivers block libvirtd timed shutdown broke the libvirt-tck integration build with qemu:///session: http://honk.sigxcpu.org:8001/job/libvirt-tck-debian-wheezy-qemu-session/227… I won't have a chance to look into this in detail the near future but I thought I'd at least send out a notice. Cheers, -- Guido

3 6

[libvirt] [PATCH] dnsmasq: Fix parsing of the version number
by Michal Privoznik 07 Dec '12

07 Dec '12

If the debugging is enabled, the virCommand subsystem catches debug messages in the command output as well. In that case, we can't assume the string corresponding to command's stdout will start with specific prefix. But the prefix can be moved deeper in the string. This bug shows itself when parsing dnsmasq output: 2012-12-06 11:18:11.445+0000: 18491: error : dnsmasqCapsSetFromBuffer:664 : internal error cannot parse /usr/sbin/dnsmasq version number in '2012-12-06 11:11:02.232+0000: 18492: debug : virFileClose:72 : Closed fd 22' We can clearly see that the output of dnsmasq --version doesn't start with expected "Dnsmasq version " string but a libvirt debug output. --- src/util/dnsmasq.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/dnsmasq.c b/src/util/dnsmasq.c index 4f210d2..de0293a 100644 --- a/src/util/dnsmasq.c +++ b/src/util/dnsmasq.c @@ -641,9 +641,9 @@ dnsmasqCapsSetFromBuffer(dnsmasqCapsPtr caps, const char *buf) caps->noRefresh = true; - p = STRSKIP(buf, DNSMASQ_VERSION_STR); - if (!p) + if (!(p = strstr(buf, DNSMASQ_VERSION_STR))) goto fail; + p += sizeof(DNSMASQ_VERSION_STR) - 1; virSkipSpaces(&p); if (virParseVersionString(p, &caps->version, true) < 0) goto fail; -- 1.7.8.6

3 6

[libvirt] [PATCH 1/1] add vnc unix sockets to apparmor policy
by Serge Hallyn 07 Dec '12

07 Dec '12

When using vnc gaphics over a unix socket, virt-aa-helper needs to provide access for the qemu domain to access the sockfile. Signed-off-by: Serge Hallyn <serge.hallyn(a)ubuntu.com> --- src/security/virt-aa-helper.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index e480b30..c6b9903 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -1003,6 +1003,13 @@ get_files(vahControl * ctl) if (vah_add_file(&buf, ctl->def->os.loader, "r") != 0) goto clean; + for (i = 0; i < ctl->def->ngraphics; i++) { + if (ctl->def->graphics[i]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC && + ctl->def->graphics[i]->data.vnc.socket && + vah_add_file(&buf, ctl->def->graphics[i]->data.vnc.socket, "rw")) + goto clean; + } + if (ctl->def->ngraphics == 1 && ctl->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL) if (vah_add_file(&buf, ctl->def->graphics[0]->data.sdl.xauth, -- 1.7.10.4

1 0

[libvirt] add security hook for permitting hugetlbfs access (v2)
by Serge Hallyn 07 Dec '12

07 Dec '12

When a qemu domain is backed by huge pages, apparmor needs to grant the domain rw access to files under the hugetlbfs mount point. Add a hook, called in qemu_process.c, which ends up adding the read-write access through virt-aa-helper. Qemu will be creating a randomly named file under the mountpoint and unlinking it as soon as it has mmap()d it, therefore we cannot predict the full pathname, but for the same reason it is generally safe to provide access to $path/**. Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/646468 Changelog: (v2) use virBuffer in place of snprintf. Index: libvirt/src/qemu/qemu_process.c =================================================================== --- libvirt.orig/src/qemu/qemu_process.c 2012-12-06 11:50:48.354763986 -0600 +++ libvirt/src/qemu/qemu_process.c 2012-12-06 11:57:58.234773649 -0600 @@ -3475,6 +3475,15 @@ } virDomainAuditSecurityLabel(vm, true); + if (driver->hugepage_path && vm->def->mem.hugepage_backed) { + if (virSecurityManagerSetHugepages(driver->securityManager, + vm->def, driver->hugepage_path) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("Unable to set huge path in security driver")); + goto cleanup; + } + } + /* Ensure no historical cgroup for this VM is lying around bogus * settings */ VIR_DEBUG("Ensuring no historical cgroup is lying around"); Index: libvirt/src/security/security_apparmor.c =================================================================== --- libvirt.orig/src/security/security_apparmor.c 2012-12-06 11:50:48.354763986 -0600 +++ libvirt/src/security/security_apparmor.c 2012-12-06 11:58:23.286774213 -0600 @@ -840,6 +840,31 @@ } static int +ApparmorSetHugepages(virSecurityManagerPtr mgr, + virDomainDefPtr def, + const char *path) +{ + const virSecurityLabelDefPtr secdef = + virDomainDefGetSecurityLabelDef(def, SECURITY_APPARMOR_NAME); + int ret = -1; + virBuffer buf = VIR_BUFFER_INITIALIZER; + char *newpath; + + if (!secdef) + return -1; + + if (secdef->imagelabel == NULL) + return 0; + + virBufferAsprintf(&buf, "%s/**", path); + newpath = virBufferCurrentContent(&buf); + if (newpath) + ret = reload_profile(mgr, def, newpath, true); + virBufferFreeAndReset(&buf); + return ret; +} + +static int AppArmorSetFDLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, int fd) @@ -908,4 +933,6 @@ .domainSetSecurityImageFDLabel = AppArmorSetFDLabel, .domainSetSecurityTapFDLabel = AppArmorSetFDLabel, + + .domainSetSecurityHugepages = ApparmorSetHugepages, }; Index: libvirt/src/security/security_manager.c =================================================================== --- libvirt.orig/src/security/security_manager.c 2012-12-06 11:50:48.354763986 -0600 +++ libvirt/src/security/security_manager.c 2012-12-06 11:57:58.238773649 -0600 @@ -511,3 +511,13 @@ list[1] = NULL; return list; } + +int virSecurityManagerSetHugepages(virSecurityManagerPtr mgr, + virDomainDefPtr vm, + const char *path) +{ + if (mgr->drv->domainSetSecurityHugepages) + return mgr->drv->domainSetSecurityHugepages(mgr, vm, path); + + return 0; +} Index: libvirt/src/security/security_manager.h =================================================================== --- libvirt.orig/src/security/security_manager.h 2012-12-06 11:50:48.354763986 -0600 +++ libvirt/src/security/security_manager.h 2012-12-06 11:57:58.238773649 -0600 @@ -112,5 +112,8 @@ virDomainDefPtr vm); virSecurityManagerPtr* virSecurityManagerGetNested(virSecurityManagerPtr mgr); +int virSecurityManagerSetHugepages(virSecurityManagerPtr mgr, + virDomainDefPtr sec, + const char *hugepages_path); #endif /* VIR_SECURITY_MANAGER_H__ */ Index: libvirt/src/security/security_driver.h =================================================================== --- libvirt.orig/src/security/security_driver.h 2012-12-06 11:50:48.354763986 -0600 +++ libvirt/src/security/security_driver.h 2012-12-06 11:57:58.238773649 -0600 @@ -100,6 +100,9 @@ int fd); typedef char *(*virSecurityDomainGetMountOptions) (virSecurityManagerPtr mgr, virDomainDefPtr def); +typedef int (*virSecurityDomainSetHugepages) (virSecurityManagerPtr mgr, + virDomainDefPtr def, + const char *path); struct _virSecurityDriver { size_t privateDataLen; @@ -140,6 +143,7 @@ virSecurityDomainSetTapFDLabel domainSetSecurityTapFDLabel; virSecurityDomainGetMountOptions domainGetSecurityMountOptions; + virSecurityDomainSetHugepages domainSetSecurityHugepages; }; virSecurityDriverPtr virSecurityDriverLookup(const char *name, Index: libvirt/src/libvirt_private.syms =================================================================== --- libvirt.orig/src/libvirt_private.syms 2012-12-06 11:50:48.354763986 -0600 +++ libvirt/src/libvirt_private.syms 2012-12-06 11:57:58.238773649 -0600 @@ -1052,6 +1052,7 @@ virSecurityManagerStackAddNested; virSecurityManagerVerify; virSecurityManagerGetMountOptions; +virSecurityManagerSetHugepages; # sexpr.h sexpr_append; Index: libvirt/src/security/security_stack.c =================================================================== --- libvirt.orig/src/security/security_stack.c 2012-12-06 11:50:48.354763986 -0600 +++ libvirt/src/security/security_stack.c 2012-12-06 11:57:58.238773649 -0600 @@ -462,6 +462,23 @@ return rc; } +static int +virSecurityStackSetHugepages(virSecurityManagerPtr mgr, + virDomainDefPtr vm, + const char *path) +{ + virSecurityStackDataPtr priv = virSecurityManagerGetPrivateData(mgr); + virSecurityStackItemPtr item = priv->itemsHead; + int rc = 0; + + for (; item; item = item->next) { + if (virSecurityManagerSetHugepages(item->securityManager, vm, path) < 0) + rc = -1; + } + + return rc; +} + static char *virSecurityStackGetMountOptions(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, virDomainDefPtr vm ATTRIBUTE_UNUSED) { return NULL; @@ -529,4 +546,6 @@ .domainSetSecurityTapFDLabel = virSecurityStackSetTapFDLabel, .domainGetSecurityMountOptions = virSecurityStackGetMountOptions, + + .domainSetSecurityHugepages = virSecurityStackSetHugepages, };

1 0

[libvirt] [PATCH] network: prevent a few invalid configuration combinations
by Laine Stump 07 Dec '12

07 Dec '12

This resolves: https://bugzilla.redhat.com/show_bug.cgi?id=767057 It was possible to define a network with <forward mode='bridge'> that had both a bridge device and a forward device defined. These two are mutually exclusive by definition (if you are using a bridge device, then this is a host bridge, and if you have a forward dev defined, this is using macvtap). It was also possible to put <ip>, <dns>, and <domain> elements in this definition, although those aren't supported by the current driver (although it's conceivable that some other driver might support that). The items that are invalid by definition, are now checked in the XML parser (since they will definitely *always* be wrong), and the others are checked in networkValidate() in the network driver (since, as mentioned, it's possible that some other network driver, or even this one, could some day support setting those). --- src/conf/network_conf.c | 9 +++++++++ src/libvirt_private.syms | 1 + src/network/bridge_driver.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 6ce2e63..06932d8 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1577,6 +1577,15 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) def->name); goto error; } + if (def->bridge && (def->nForwardIfs || nForwardPfs)) { + virReportError(VIR_ERR_XML_ERROR, + _("A network with forward mode='%s' can specify " + "a bridge name or a forward dev, but not " + "both (network '%s')"), + virNetworkForwardTypeToString(def->forwardType), + def->name); + goto error; + } break; } } diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 946bb20..bc01fe5 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -857,6 +857,7 @@ virNetworkDefParseString; virNetworkDeleteConfig; virNetworkFindByName; virNetworkFindByUUID; +virNetworkForwardTypeToString; virNetworkIpDefNetmask; virNetworkIpDefPrefix; virNetworkList; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index e8be00a..0893e9b 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2733,6 +2733,35 @@ networkValidate(struct network_driver *driver, return -1; virNetworkSetBridgeMacAddr(def); + } else { + /* They are also the only types that currently support setting + * an IP address for the host-side device (bridge) + */ + if (virNetworkDefGetIpByIndex(def, AF_UNSPEC, 0)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Unsupported <ip> element in network %s " + "with forward mode='%s'"), + def->name, + virNetworkForwardTypeToString(def->forwardType)); + return -1; + } + if (def->dns && + (def->dns->ntxtrecords || def->dns->nhosts || def->dns->nsrvrecords)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Unsupported <dns> element in network %s " + "with forward mode='%s'"), + def->name, + virNetworkForwardTypeToString(def->forwardType)); + return -1; + } + if (def->domain) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Unsupported <domain> element in network %s " + "with forward mode='%s'"), + def->name, + virNetworkForwardTypeToString(def->forwardType)); + return -1; + } } /* We only support dhcp on one IPv4 address per defined network */ -- 1.7.11.7

3 3

[libvirt] [PATCH] maint: Sort util source file definitions in makefile
by Peter Krempa 06 Dec '12

06 Dec '12

--- src/Makefile.am | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 1a2f94f..9aff77a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -54,44 +54,37 @@ augeastest_DATA = UTIL_SOURCES = \ util/bitmap.c util/bitmap.h \ util/buf.c util/buf.h \ + util/cgroup.c util/cgroup.h \ util/command.c util/command.h \ util/conf.c util/conf.h \ - util/cgroup.c util/cgroup.h \ + util/dnsmasq.c util/dnsmasq.h \ + util/ebtables.c util/ebtables.h \ util/event.c util/event.h \ util/event_poll.c util/event_poll.h \ util/hooks.c util/hooks.h \ + util/hostusb.c util/hostusb.h \ util/iptables.c util/iptables.h \ - util/ebtables.c util/ebtables.h \ - util/dnsmasq.c util/dnsmasq.h \ util/json.c util/json.h \ util/logging.c util/logging.h \ util/memory.c util/memory.h \ util/pci.c util/pci.h \ util/processinfo.c util/processinfo.h \ - util/hostusb.c util/hostusb.h \ util/sexpr.c util/sexpr.h \ util/stats_linux.c util/stats_linux.h \ util/storage_file.c util/storage_file.h \ util/sysinfo.c util/sysinfo.h \ - util/threads.c util/threads.h \ + util/threadpool.c util/threadpool.h \ util/threads-pthread.h \ util/threads-win32.h \ - util/threadpool.c util/threadpool.h \ - util/uuid.c util/uuid.h \ + util/threads.c util/threads.h \ util/util.c util/util.h \ + util/uuid.c util/uuid.h \ util/viratomic.h util/viratomic.c \ util/viraudit.c util/viraudit.h \ util/virauth.c util/virauth.h \ util/virauthconfig.c util/virauthconfig.h \ - util/virfile.c util/virfile.h \ - util/virnodesuspend.c util/virnodesuspend.h \ - util/virobject.c util/virobject.h \ - util/virpidfile.c util/virpidfile.h \ - util/virprocess.c util/virprocess.h \ - util/virtypedparam.c util/virtypedparam.h \ - util/xml.c util/xml.h \ - util/virterror.c util/virterror_internal.h \ util/virdbus.c util/virdbus.h \ + util/virfile.c util/virfile.h \ util/virhash.c util/virhash.h \ util/virhashcode.c util/virhashcode.h \ util/virinitctl.c util/virinitctl.h \ @@ -110,11 +103,18 @@ UTIL_SOURCES = \ util/virnetdevvlan.h util/virnetdevvlan.c \ util/virnetdevvportprofile.h util/virnetdevvportprofile.c \ util/virnetlink.c util/virnetlink.h \ + util/virnodesuspend.c util/virnodesuspend.h \ + util/virobject.c util/virobject.h \ + util/virpidfile.c util/virpidfile.h \ + util/virprocess.c util/virprocess.h \ util/virrandom.h util/virrandom.c \ util/virsocketaddr.h util/virsocketaddr.c \ util/virstring.h util/virstring.c \ + util/virterror.c util/virterror_internal.h \ util/virtime.h util/virtime.c \ - util/viruri.h util/viruri.c + util/virtypedparam.c util/virtypedparam.h \ + util/viruri.h util/viruri.c \ + util/xml.c util/xml.h EXTRA_DIST += $(srcdir)/util/virkeymaps.h $(srcdir)/util/keymaps.csv \ $(srcdir)/util/virkeycode-mapgen.py -- 1.8.0

2 2

[libvirt] [PATCH] dnsmasq: Fix parsing of the version number
by Michal Privoznik 06 Dec '12

06 Dec '12

If debugging is enabled, the debug messages are sent to stderr. Moreover, if a command has catching of stderr set, the messages gets mixed with stdout output (assuming both outputs are stored in the same variable). The resulting string then doesn't necessarily have to start with desired prefix then. This bug exposes itself when parsing dnsmasq output: 2012-12-06 11:18:11.445+0000: 18491: error : dnsmasqCapsSetFromBuffer:664 : internal error cannot parse /usr/sbin/dnsmasq version number in '2012-12-06 11:11:02.232+0000: 18492: debug : virFileClose:72 : Closed fd 22' We can clearly see that the output of dnsmasq --version doesn't start with expected "Dnsmasq version " string but a libvirt debug output. --- src/util/dnsmasq.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/util/dnsmasq.c b/src/util/dnsmasq.c index de0293a..a627ed2 100644 --- a/src/util/dnsmasq.c +++ b/src/util/dnsmasq.c @@ -715,7 +715,6 @@ dnsmasqCapsRefreshInternal(dnsmasqCapsPtr caps, bool force) cmd = virCommandNewArgList(caps->binaryPath, "--version", NULL); virCommandSetOutputBuffer(cmd, &version); - virCommandSetErrorBuffer(cmd, &version); virCommandAddEnvPassCommon(cmd); virCommandClearCaps(cmd); if (virCommandRun(cmd, NULL) < 0) { @@ -727,7 +726,6 @@ dnsmasqCapsRefreshInternal(dnsmasqCapsPtr caps, bool force) cmd = virCommandNewArgList(caps->binaryPath, "--help", NULL); virCommandSetOutputBuffer(cmd, &help); - virCommandSetErrorBuffer(cmd, &help); virCommandAddEnvPassCommon(cmd); virCommandClearCaps(cmd); if (virCommandRun(cmd, NULL) < 0) { -- 1.7.8.6

2 1

[libvirt] [PATCH 0/4] qemu: Fix leaks in handling PCI devices
by Jiri Denemark 06 Dec '12

06 Dec '12

https://bugzilla.redhat.com/show_bug.cgi?id=877095 Patch 1/4 fixes a possible double free on error path and the other patches deal with memory and file descriptor leaks in PCI device attachment code. Jiri Denemark (4): qemu: Don't free PCI device if adding it to activePciHostdevs fails util: Slightly refactor PCI list functions qemu: Fix memory (and FD) leak on PCI device detach qemu: Do not keep PCI device config file open src/libvirt_private.syms | 3 +++ src/qemu/qemu_hostdev.c | 22 ++++++++-------- src/util/pci.c | 66 ++++++++++++++++++++++++++++-------------------- src/util/pci.h | 5 ++++ 4 files changed, 58 insertions(+), 38 deletions(-) -- 1.8.0

7 20

[libvirt] virSecurity hook for hugepages?
by Serge Hallyn 06 Dec '12

06 Dec '12

Hi, Currently the hugepages support can automatically detect the hugepages mount, but it doesn't update the security information. At least for apparmor we need to be able to add permission for the domain to access the hugetlbfs mount path. There are a few ways this could be done, 1. add a virSecuritySetSecurityHugepages or virSecuritySetSecurityHugepagesFD hook which is called perhaps at qemudStartup 2. optionally add the qemu_driver->hugepage_path to the xml output, at least for the internal format (which is passed to virt-aa-helper). The concern I have with this is that it brings up the issue of what to do when defining a domain which has such an entry. 3. reproduce the logic in virt-aa-helper for detecting the hugepages mount path. Not preferred obviously. My guess would be that (1) would be preferred, but I wanted to ask here first and see if there are other suggestions. thanks, -serge

1 1

[libvirt] [PATCH] storage: Error out earlier if the volume target path already exists
by Osier Yang 06 Dec '12

06 Dec '12

https://bugzilla.redhat.com/show_bug.cgi?id=832302 It's odd to fall through to buildVol, and the existed file is removed when buildVol fails. This checks if the volume target path already exists in createVol. The reason for not using error like "Volume already exists" is that there isn't volume maintained by libvirt for the path until a operation like pool-refresh, using error like that will just cause confusion. --- BTW, It inspires me again that perhaps we should integrate things like inotify to storage. --- src/storage/storage_backend_fs.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 4e6ebbf..6cddad0 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -1000,6 +1000,13 @@ virStorageBackendFileSystemVolCreate(virConnectPtr conn ATTRIBUTE_UNUSED, return -1; } + if (virFileExists(vol->target.path)) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("volume target path '%s' already exists"), + vol->target.path); + return -1; + } + VIR_FREE(vol->key); vol->key = strdup(vol->target.path); if (vol->key == NULL) { -- 1.7.7.6

2 4

[libvirt] [PATCH 0/2] Avoid the thread race condition
by Osier Yang 06 Dec '12

06 Dec '12

https://bugzilla.redhat.com/show_bug.cgi?id=866524 The two patches are to fix the same bug in different method, 1/2 is suggested by Daniel in the bug. 2/2 is an alternative way to fix it by locking the whole virConnect object. The reason to post 2/2 is that I think 1/2 doesn't fix the root problem, though I believe it must fix the bug. A thread can get the lock before/during doRemoteClose, and it might drop into the similar situation, though it's not the case now because remoteClientCloseFunc doesn't do changes which can cause race for the later doRemoteClose. However, I'm not sure if locking the whole object will cause some unexpected result. Osier Yang (2): remote: Avoid the thread race condition Lock the whole virConnect Object when disposing to avoid the thread race src/datatypes.c | 4 ++-- src/remote/remote_driver.c | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) Regards, Osier

2 5

Re: [libvirt] [libvirt-users] NWFilter and IPv6
by Laine Stump 05 Dec '12

05 Dec '12

(No extra content from me, but I'm setting Followup-To: libvir-list(a)redhat.com for this (and setting To: to the same), since this is talking about new development, so we want to make sure as many developers as possible see it...) On 12/05/2012 09:23 AM, Guido Winkelmann wrote: > Am Dienstag, 4. Dezember 2012, 19:18:01 schrieb Stefan Berger: >> On 12/04/2012 09:39 AM, Guido Winkelmann wrote: >>> Am Montag, 26. November 2012, 12:24:11 schrieb Stefan Berger: >>>> On 11/26/2012 10:41 AM, Laine Stump wrote: > [...] >>>> One problem I want to mention, though: A bigger problem would be if a >>>> machine wanted to use IPv4 and IPv6 (dual stack) and use DHCP for both , >>>> which in effect would result in two variables that need to have values >>>> detected which in turn would require partial instantiation of filters >>>> (since one variable may not have a value assigned while the other has), >>>> which does not currently work... >>> Hm, how do you even do it with one variable? Do you leave the firewall >>> undefined until you could detect the dhcp-answer package and then pull it >>> up? >> We assume that DHCP is being used and for example put a filter in that >> only allows DHCP traffic to pass and once we grab the IP address we >> instantiate the user-provided filter. For that we use $IP. The variable >> is set once the IP address has been detected. For IPv6 we should >> probably use $IPV6 (reserved variable). > How do you control this behavior? Can you just set the $IP to a value in the > filterref instantiation to disable it? Like so: > > <filterref filter='clean-traffic-with-v6'>" > <parameter name='MAC' value='11:11:11:11:11:11'/>"; > <parameter name='IP' value='192.168.0.10'/>"; > <parameter name='IP' value='192.168.0.11'/>"; > </filterref>" > > Anyway, I think combining DHCP and DHCPv6 is going to be a minor problem in > practice, because most people will probably use stateless autoconfiguration to > set the IPv6 address on a device and use DHCPv6 only for additional > information, like DNS servers or NTP servers. > > How about this approach instead for combining DHCP and DHCPv6: > > - Instead of putting up a special network filter for the detection phase, we > put up the actual user-requested filter, but with $IP and $IPV6 unset. (except > of course when these variables are specifically set by the user as above...) > - The default-shipped filters like clean-traffic should let DHCP(v6) through > in this configuration. If the user-requested filters don't, that's just a > configuration error. > - As soon as we detect an incoming DHCP or DHCPv6 packet for the guest, we add > that address to the filter parameters, reinitialize the filter with the new > parameters and stop detecting addresses for this particular L3 protocol. > >>>> Also as I recall for IPv4 the ARP-equivalent is NDP (Neighbor Discovery >>>> Protocol based on ICMPv6), which may need support in ebtables. At least >>>> a while ago there was no support for filtering that NDP subset of ICMPv6 >>>> in ebtables. >>> According to the ebtables man-page, you've got --ip6-icmp-type, which >>> should be enough for this. Router advertisements have ICMPv6 type 134 and >>> multicast router advertisements are 153. AFAICT, you can just filter by >>> those... >> I am not the expert on IPv6, but from reading on this page here >> >> http://www.tcpipguide.com/free/t_ICMPv6NeighborAdvertisementandNeighborSolic >> itation-2.htm > BTW, I wouldn't recommend this particular guide. Not only is it cluttered with > advertisements to the point of a major annoyance, there's at least one part > where it has simply plain wrong information: On > > http://www.tcpipguide.com/free/t_IPv6InterfaceIdentifiersandPhysicalAddress… > > Bit 7 of the EUI-64 address needs to be flipped, not just set to 1. (It took > me a while to figure out why my code would arrvive at different autoconfigured > addresses than the linux kernel for virtualized machines...) > >> I get the impression that for example the target address should be >> verified for possible 'abuse'. > That's only for neighbor advertisements. Router advertisements can simply be > blocked wholesale. Normal network nodes have no business sending those under > any circumstances, and your actual routers are hopefully trusted enough to not > need their router advertisements checked for sanity... > > Then again, for neighbor advertisements, you're right. I was under the > impression that, for those, it was enough to check the source address in the > ipv6 header. Apparently I was wrong. > >> I don't think one can grab that field >> with ebtables and compare against allowed values. > No, but ip6tables has --u32, which possibly could be abused for that... > > Guido > >

1 0

[libvirt] Sophie's choice: corrupt user data (on USB disk) or cancel migration?
by David Jaša 05 Dec '12

05 Dec '12

Hi, I've encountered an interesting problem: I did a live migration through libvirt (virsh migrate --live <domain> <dst_libvirt_uri> [<dst_qemu_uri>]) with usb transfer ongoing from qemu guest through usbredir over spice to usb device plugged to the client. The spice client failed to connect to the destination qemu/spice but the migration was conducted anyway, so the data transfer was abruptly terminated. Background ---------- When performing migration with client connected, two monitor commands are issued to the qemu: (qemu) client_migrate_info spice <client connection details> main_channel_client_handle_migrate_connected: client <ID> connected: 1 seamless: 1 (qemu) migrate -d tcp:<dst_qemu_address>:<port> The first command instructs spice client to reconnect to the new machine and the reply says that if connection is successful and if it is seamless (required for migration with USB redirection active). Problem ------- The behaviour should follow "least harm" principle: 1) In "severe" scenarios when the choice is between VM migration causing potential data corruption on redirected USB and stopping of the VM, current behavior is perfectly fine 2) In "regular" scenarios (automatic load balancing, manual migration requests by administrator), refuse to migrate (unless some "I really know what I'm doing" button is pressed) is better thing to do Possible solutions? ------------------- Just one possible way to fix this occured to me: 1. libvirt gets new switch to migrate command to force migration even when client can not connect 2. if this switch is not set and client won't connect after client_migrate_info qemu command is issued, cance migration 3. management application (ovirt-engine through vdsm) or administrator sets the switch to force migration in cases like 1) above I'll file the necessary bugs but it should be IMO first agreed what the correct approach is in such situations. David -- David Jaša, RHCE SPICE QE based in Brno GPG Key: 22C33E24 Fingerprint: 513A 060B D1B4 2A72 7F0D 0278 B125 CD00 22C3 3E24

1 0

[libvirt] [PATCH] pci: Fix building of 32bit PCI command array
by Peter Krempa 05 Dec '12

05 Dec '12

The pciWrite32 function assembled the array of data to be written to the fd with a bad offset on the last byte. This issue was probably caused by a typo (14, 24). --- src/util/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/pci.c b/src/util/pci.c index cf7722d..418c83d 100644 --- a/src/util/pci.c +++ b/src/util/pci.c @@ -268,7 +268,7 @@ pciWrite16(pciDevice *dev, int cfgfd, unsigned pos, uint16_t val) static void pciWrite32(pciDevice *dev, int cfgfd, unsigned pos, uint32_t val) { - uint8_t buf[4] = { (val >> 0), (val >> 8), (val >> 16), (val >> 14) }; + uint8_t buf[4] = { (val >> 0), (val >> 8), (val >> 16), (val >> 24) }; pciWrite(dev, cfgfd, pos, &buf[0], sizeof(buf)); } -- 1.8.0

2 2

[libvirt] [PATCH] qemu: Fix error code when attaching existing device
by Jiri Denemark 05 Dec '12

05 Dec '12

An attempt to attach device that is already attached to a domain results in the following error: virsh # attach-device rhel6 pci2 --persistent error: Failed to attach device from pci2 error: invalid argument: device is already in the domain configuration The "invalid argument" error code looks wrong, we usually use "operation invalid" when the action cannot be done in current state. --- src/qemu/qemu_driver.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8e838cd..6170ded 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6249,8 +6249,8 @@ qemuDomainAttachDeviceConfig(qemuCapsPtr caps, case VIR_DOMAIN_DEVICE_DISK: disk = dev->data.disk; if (virDomainDiskIndexByName(vmdef, disk->dst, true) >= 0) { - virReportError(VIR_ERR_INVALID_ARG, - _("target %s already exists."), disk->dst); + virReportError(VIR_ERR_OPERATION_INVALID, + _("target %s already exists"), disk->dst); return -1; } if (virDomainDiskInsert(vmdef, disk)) { @@ -6280,7 +6280,7 @@ qemuDomainAttachDeviceConfig(qemuCapsPtr caps, case VIR_DOMAIN_DEVICE_HOSTDEV: hostdev = dev->data.hostdev; if (virDomainHostdevFind(vmdef, hostdev, NULL) >= 0) { - virReportError(VIR_ERR_INVALID_ARG, "%s", + virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("device is already in the domain configuration")); return -1; } @@ -6296,7 +6296,7 @@ qemuDomainAttachDeviceConfig(qemuCapsPtr caps, case VIR_DOMAIN_DEVICE_LEASE: lease = dev->data.lease; if (virDomainLeaseIndex(vmdef, lease) >= 0) { - virReportError(VIR_ERR_INVALID_ARG, + virReportError(VIR_ERR_OPERATION_INVALID, _("Lease %s in lockspace %s already exists"), lease->key, NULLSTR(lease->lockspace)); return -1; @@ -6312,7 +6312,7 @@ qemuDomainAttachDeviceConfig(qemuCapsPtr caps, controller = dev->data.controller; if (virDomainControllerFind(vmdef, controller->type, controller->idx) > 0) { - virReportError(VIR_ERR_INVALID_ARG, "%s", + virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("Target already exists")); return -1; } -- 1.8.0

2 2