- Devel - libvirt List Archives

[libvirt] [PATCH] python:remove semicolon in python code
by Guannan Ren 22 Mar '13

22 Mar '13

This breaked "make syntax-check" testing Pushed under trivial rule --- python/generator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/generator.py b/python/generator.py index fbaf797..0237374 100755 --- a/python/generator.py +++ b/python/generator.py @@ -1490,7 +1490,7 @@ def buildWrappers(module): classes.write(", %s" % arg[0]) n = n + 1 if arg[0] == "flags": - classes.write("=0"); + classes.write("=0") classes.write("):\n") writeDoc(module, name, args, ' ', classes) n = 0 -- 1.7.11.2

1 0

[libvirt] [PATCH] qemu: add support for LSI MegaRAID SAS1078 (aka megasas) SCSI controller
by Paolo Bonzini 22 Mar '13

22 Mar '13

This does nothing more than adding the new device and capability. The device is present since QEMU 1.2.0. Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com> --- docs/formatdomain.html.in | 6 ++-- docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 13 ++++++++- src/vmx/vmx.c | 3 +- tests/qemuhelptest.c | 6 ++-- .../qemuxml2argv-disk-scsi-megasas.args | 9 ++++++ .../qemuxml2argv-disk-scsi-megasas.xml | 32 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ tests/qemuxml2xmltest.c | 1 + 13 files changed, 73 insertions(+), 8 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index c2cf75f..8bf0736 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2091,9 +2091,9 @@ control how many devices can be connected through the controller. A "scsi" controller has an optional attribute <code>model</code>, which is one of "auto", "buslogic", - "ibmvscsi", "lsilogic", "lsias1068", "virtio-scsi" or "vmpvscsi". - A "usb" controller has an optional attribute <code>model</code>, - which is one of "piix3-uhci", "piix4-uhci", "ehci", + "ibmvscsi", "lsilogic", "lsisas1068", "lsisas1078", "virtio-scsi" or + "vmpvscsi". A "usb" controller has an optional attribute + <code>model</code>, which is one of "piix3-uhci", "piix4-uhci", "ehci", "ich9-ehci1", "ich9-uhci1", "ich9-uhci2", "ich9-uhci3", "vt82c686b-uhci", "pci-ohci" or "nec-xhci". Additionally, <span class="since">since 0.10.0</span>, if the USB bus needs to be diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index fae5c0d..a136ae8 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1391,6 +1391,7 @@ <value>vmpvscsi</value> <value>ibmvscsi</value> <value>virtio-scsi</value> + <value>lsisas1078</value> <value>piix3-uhci</value> <value>piix4-uhci</value> <value>ehci</value> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 159a23d..0ef67be 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -304,7 +304,8 @@ VIR_ENUM_IMPL(virDomainControllerModelSCSI, VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAS "lsisas1068", "vmpvscsi", "ibmvscsi", - "virtio-scsi"); + "virtio-scsi", + "lsisas1078"); VIR_ENUM_IMPL(virDomainControllerModelUSB, VIR_DOMAIN_CONTROLLER_MODEL_USB_LAST, "piix3-uhci", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index a750a1f..c3b2608 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -695,6 +695,7 @@ enum virDomainControllerModelSCSI { VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VMPVSCSI, VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI, VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI, + VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSISAS1078, VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST }; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 50f8084..3840b41 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -212,6 +212,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "rng-egd", "virtio-ccw", "dtb", + "megasas", ); struct _virQEMUCaps { @@ -1329,6 +1330,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "virtio-scsi-pci", QEMU_CAPS_VIRTIO_SCSI }, { "virtio-scsi-s390", QEMU_CAPS_VIRTIO_SCSI }, { "virtio-scsi-ccw", QEMU_CAPS_VIRTIO_SCSI }, + { "megasas", QEMU_CAPS_SCSI_MEGASAS }, { "spicevmc", QEMU_CAPS_DEVICE_SPICEVMC }, { "qxl-vga", QEMU_CAPS_DEVICE_QXL_VGA }, { "qxl", QEMU_CAPS_DEVICE_QXL }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index b0f8c5b..7101f67 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -173,6 +173,7 @@ enum virQEMUCapsFlags { QEMU_CAPS_OBJECT_RNG_EGD = 131, /* EGD protocol daemon for rng */ QEMU_CAPS_VIRTIO_CCW = 132, /* -device virtio-*-ccw */ QEMU_CAPS_DTB = 133, /* -dtb file */ + QEMU_CAPS_SCSI_MEGASAS = 134, /* -device megasas */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 006f83d..a0c278f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -500,7 +500,7 @@ qemuSetScsiControllerModel(virDomainDefPtr def, if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_LSI)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("This QEMU doesn't support " - "lsi scsi controller")); + "the LSI 53C895A SCSI controller")); return -1; } break; @@ -515,6 +515,14 @@ qemuSetScsiControllerModel(virDomainDefPtr def, case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI: /*TODO: need checking work here if necessary */ break; + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSISAS1078: + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_MEGASAS)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("This QEMU doesn't support " + "the LSI SAS1078 controller")); + return -1; + } + break; default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported controller model: %s"), @@ -3544,6 +3552,9 @@ qemuBuildControllerDevStr(virDomainDefPtr domainDef, case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI: virBufferAddLit(&buf, "spapr-vscsi"); break; + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSISAS1078: + virBufferAddLit(&buf, "megasas"); + break; default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported controller model: %s"), diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index c604bd2..d7eee09 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -511,7 +511,8 @@ VIR_ENUM_IMPL(virVMXControllerModelSCSI, VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST, "lsisas1068", "pvscsi", "UNUSED ibmvscsi", - "UNUSED virtio-scsi"); + "UNUSED virtio-scsi", + "UNUSED lsisas1078"); diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 059fa86..a28109a 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -912,7 +912,8 @@ mymain(void) QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_USB_SERIAL, QEMU_CAPS_DEVICE_USB_NET, - QEMU_CAPS_DTB); + QEMU_CAPS_DTB, + QEMU_CAPS_SCSI_MEGASAS); DO_TEST("qemu-kvm-1.2.0", 1002000, 1, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -1017,7 +1018,8 @@ mymain(void) QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_USB_SERIAL, QEMU_CAPS_DEVICE_USB_NET, - QEMU_CAPS_DTB); + QEMU_CAPS_DTB, + QEMU_CAPS_SCSI_MEGASAS); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args new file mode 100644 index 0000000..c4d5f87 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args @@ -0,0 +1,9 @@ +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 \ +megasas,id=scsi0,bus=pci.0,addr=0x3 -usb -drive file=/dev/HostVG/QEMUGuest1,\ +if=none,id=drive-ide0-0-0 -device ide-drive,bus=ide.0,unit=0,\ +drive=drive-ide0-0-0,id=ide0-0-0 -drive file=/tmp/scsidisk.img,if=none,\ +id=drive-scsi0-0-4-0 -device scsi-disk,bus=scsi0.0,channel=0,scsi-id=4,lun=0,\ +drive=drive-scsi0-0-4-0,id=scsi0-0-4-0 -device virtio-balloon-pci,\ +id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.xml new file mode 100644 index 0000000..9a496ae --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.xml @@ -0,0 +1,32 @@ +<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='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='file' device='disk'> + <source file='/tmp/scsidisk.img'/> + <target dev='sda' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='4' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <controller type='scsi' index='0' model='lsisas1078'/> + <controller type='usb' index='0'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 5e7adf5..38787ac 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -550,6 +550,9 @@ mymain(void) DO_TEST("disk-scsi-virtio-scsi", QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_SCSI); + DO_TEST("disk-scsi-megasas", + QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_SCSI_MEGASAS); DO_TEST("disk-sata-device", QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_ICH9_AHCI); diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 899414d..ba9aa96 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -179,6 +179,7 @@ mymain(void) DO_TEST("disk-scsi-device"); DO_TEST("disk-scsi-vscsi"); DO_TEST("disk-scsi-virtio-scsi"); + DO_TEST("disk-scsi-megasas"); DO_TEST_FULL("disk-mirror", false, WHEN_ACTIVE); DO_TEST_FULL("disk-mirror", true, WHEN_INACTIVE); DO_TEST("graphics-listen-network"); -- 1.8.1.4

2 2

[libvirt] [PATCH v2 0/6] libvirt support for userspace iSCSI initiator (libiscsi)
by Paolo Bonzini 22 Mar '13

22 Mar '13

This series adds support for the libiscsi userspace initiator. Compared to v1, logical units are now specified with IQN/LUN syntax in the name attribute. Paolo Paolo Bonzini (6): qemu: add support for libiscsi qemu: support passthrough for iscsi disks domain: make port optional for network disks secret: add iscsi to possible usage types domain: parse XML for iscsi authorization credentials qemu: pass iscsi authorization credentials docs/formatdomain.html.in | 29 +++-- docs/formatsecret.html.in | 12 ++ docs/schemas/domaincommon.rng | 9 +- docs/schemas/secret.rng | 10 ++ include/libvirt/libvirt.h.in | 1 + src/conf/domain_conf.c | 38 ++++-- src/conf/secret_conf.c | 22 +++- src/conf/secret_conf.h | 1 + src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 143 +++++++++++++++++++-- src/secret/secret_driver.c | 8 ++ tests/qemuargv2xmltest.c | 1 + .../qemuxml2argv-disk-drive-network-gluster.args | 2 +- ...qemuxml2argv-disk-drive-network-iscsi-auth.args | 1 + .../qemuxml2argv-disk-drive-network-iscsi-auth.xml | 31 +++++ .../qemuxml2argv-disk-drive-network-iscsi-lun.args | 1 + .../qemuxml2argv-disk-drive-network-iscsi-lun.xml | 28 ++++ .../qemuxml2argv-disk-drive-network-iscsi.args | 1 + .../qemuxml2argv-disk-drive-network-iscsi.xml | 7 + ...ml2argv-disk-drive-network-nbd-ipv6-export.args | 2 +- .../qemuxml2argv-disk-drive-network-nbd-ipv6.args | 2 +- tests/qemuxml2argvtest.c | 8 ++ tests/qemuxml2xmltest.c | 1 + 23 files changed, 315 insertions(+), 44 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-lun.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-lun.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.args -- 1.8.1.4

3 15

[libvirt] [PATCH] Link libvirt_util with numa library
by prasadjoshi.linux＠gmail.com 22 Mar '13

22 Mar '13

From: Prasad Joshi <prasadjoshi.linux(a)gmail.com> When the libvirt is configured with numactl, the virt-aa-helper compilation fails with following errors CCLD virt-aa-helper libvirt_util.a(...): In function `virNumaSetupMemoryPolicy': virnuma.c:109: undefined reference to `numa_available' virnuma.c:115: undefined reference to `numa_max_node' libvirt_util.a(libvirt_util_la-virnuma.o): .. `nodemask_zero_compat': /usr/include/numa.h:80: undefined reference to `numa_bitmask_clearall' /libvirt_util.a(libvirt_util_la-virnuma.o): `virNumaSetupMemoryPolicy': virnuma.c:136: undefined reference to `numa_set_bind_policy' libvirt_util.a(libvirt_util_la-virnuma.o): `numa_set_membind_compat': /usr/include/numa.h:360: undefined reference to `numa_set_membind' libvirt_util.a(libvirt_util_la-virnuma.o): `virNumaSetupMemoryPolicy': virnuma.c:138: undefined reference to `numa_set_bind_policy' libvirt_util.a(): `numa_set_interleave_mask_compat': /usr/include/numa.h:330: undefined reference to `numa_set_interleave_mask' libvirt_util.a(libvirt_util_la-virnuma.o): `virNumaSetupMemoryPolicy': virnuma.c:155: undefined reference to `numa_set_bind_policy' virnuma.c:156: undefined reference to `numa_set_preferred' collect2: error: ld returned 1 exit status make[3]: *** [virt-aa-helper] Error 1 make[3]: Leaving directory `/home/prasad/KVM/libvirt/src' The patch fixes this problem by adding numa library to the list of libraries to be linked with libvirt_util Signed-off-by: Prasad Joshi <prasadjoshi.linux(a)gmail.com> --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 21f8882..5e8e062 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -772,7 +772,7 @@ libvirt_util_la_CFLAGS = $(CAPNG_CFLAGS) $(YAJL_CFLAGS) $(LIBNL_CFLAGS) \ libvirt_util_la_LIBADD = $(CAPNG_LIBS) $(YAJL_LIBS) $(LIBNL_LIBS) \ $(THREAD_LIBS) $(AUDIT_LIBS) $(DEVMAPPER_LIBS) \ $(LIB_CLOCK_GETTIME) $(DBUS_LIBS) $(MSCOM_LIBS) $(LIBXML_LIBS) \ - $(SECDRIVER_LIBS) + $(SECDRIVER_LIBS) $(NUMACTL_LIBS) noinst_LTLIBRARIES += libvirt_conf.la -- 1.7.10.4

2 1

[libvirt] [PATCH 1/2] python: treat flags as default argument with value 0
by Guannan Ren 22 Mar '13

22 Mar '13

The following four functions have not changed because default arguments have to come after positional arguments. Changing them will break the the binding APIs. migrate(self, dconn, flags, dname, uri, bandwidth): migrate2(self, dconn, dxml, flags, dname, uri, bandwidth): migrateToURI(self, duri, flags, dname, bandwidth): migrateToURI2(self, dconnuri, miguri, dxml, flags, dname, bandwidth): --- python/generator.py | 2 ++ python/libvirt-override-virConnect.py | 14 +++++++------- python/libvirt-override-virDomain.py | 2 +- python/libvirt-override-virDomainSnapshot.py | 2 +- python/libvirt-override-virStoragePool.py | 2 +- python/libvirt-override.py | 2 +- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/python/generator.py b/python/generator.py index d269e88..bb53fcf 100755 --- a/python/generator.py +++ b/python/generator.py @@ -1487,6 +1487,8 @@ def buildWrappers(module): if n != index: classes.write(", %s" % arg[0]) n = n + 1 + if arg[0] == "flags": + classes.write("=0"); classes.write("):\n") writeDoc(module, name, args, ' ', classes) n = 0 diff --git a/python/libvirt-override-virConnect.py b/python/libvirt-override-virConnect.py index 121ef6f..5495b70 100644 --- a/python/libvirt-override-virConnect.py +++ b/python/libvirt-override-virConnect.py @@ -204,7 +204,7 @@ self.domainEventCallbackID[ret] = opaque return ret - def listAllDomains(self, flags): + def listAllDomains(self, flags=0): """List all domains and returns a list of domain objects""" ret = libvirtmod.virConnectListAllDomains(self._o, flags) if ret is None: @@ -216,7 +216,7 @@ return retlist - def listAllStoragePools(self, flags): + def listAllStoragePools(self, flags=0): """Returns a list of storage pool objects""" ret = libvirtmod.virConnectListAllStoragePools(self._o, flags) if ret is None: @@ -228,7 +228,7 @@ return retlist - def listAllNetworks(self, flags): + def listAllNetworks(self, flags=0): """Returns a list of network objects""" ret = libvirtmod.virConnectListAllNetworks(self._o, flags) if ret is None: @@ -240,7 +240,7 @@ return retlist - def listAllInterfaces(self, flags): + def listAllInterfaces(self, flags=0): """Returns a list of interface objects""" ret = libvirtmod.virConnectListAllInterfaces(self._o, flags) if ret is None: @@ -252,7 +252,7 @@ return retlist - def listAllDevices(self, flags): + def listAllDevices(self, flags=0): """Returns a list of host node device objects""" ret = libvirtmod.virConnectListAllNodeDevices(self._o, flags) if ret is None: @@ -264,7 +264,7 @@ return retlist - def listAllNWFilters(self, flags): + def listAllNWFilters(self, flags=0): """Returns a list of network filter objects""" ret = libvirtmod.virConnectListAllNWFilters(self._o, flags) if ret is None: @@ -276,7 +276,7 @@ return retlist - def listAllSecrets(self, flags): + def listAllSecrets(self, flags=0): """Returns a list of secret objects""" ret = libvirtmod.virConnectListAllSecrets(self._o, flags) if ret is None: diff --git a/python/libvirt-override-virDomain.py b/python/libvirt-override-virDomain.py index ccc4d5f..142b1d4 100644 --- a/python/libvirt-override-virDomain.py +++ b/python/libvirt-override-virDomain.py @@ -1,4 +1,4 @@ - def listAllSnapshots(self, flags): + def listAllSnapshots(self, flags=0): """List all snapshots and returns a list of snapshot objects""" ret = libvirtmod.virDomainListAllSnapshots(self._o, flags) if ret is None: diff --git a/python/libvirt-override-virDomainSnapshot.py b/python/libvirt-override-virDomainSnapshot.py index bf708a5..ec53358 100644 --- a/python/libvirt-override-virDomainSnapshot.py +++ b/python/libvirt-override-virDomainSnapshot.py @@ -6,7 +6,7 @@ """Get the domain that a snapshot was created for""" return self.domain() - def listAllChildren(self, flags): + def listAllChildren(self, flags=0): """List all child snapshots and returns a list of snapshot objects""" ret = libvirtmod.virDomainSnapshotListAllChildren(self._o, flags) if ret is None: diff --git a/python/libvirt-override-virStoragePool.py b/python/libvirt-override-virStoragePool.py index ffe160c..325e403 100644 --- a/python/libvirt-override-virStoragePool.py +++ b/python/libvirt-override-virStoragePool.py @@ -1,4 +1,4 @@ - def listAllVolumes(self, flags): + def listAllVolumes(self, flags=0): """List all storage volumes and returns a list of storage volume objects""" ret = libvirtmod.virStoragePoolListAllVolumes(self._o, flags) if ret is None: diff --git a/python/libvirt-override.py b/python/libvirt-override.py index 82d7dcb..ccfec48 100644 --- a/python/libvirt-override.py +++ b/python/libvirt-override.py @@ -85,7 +85,7 @@ def registerErrorHandler(f, ctx): Returns 1 in case of success.""" return libvirtmod.virRegisterErrorHandler(f,ctx) -def openAuth(uri, auth, flags): +def openAuth(uri, auth, flags=0): ret = libvirtmod.virConnectOpenAuth(uri, auth, flags) if ret is None:raise libvirtError('virConnectOpenAuth() failed') return virConnect(_obj=ret) -- 1.7.11.2

3 9

[libvirt] [PATCH] nwfilter: probe for inverted ctdir
by Stefan Berger 22 Mar '13

22 Mar '13

Linux netfilter at some point inverted the meaning of the '--ctdir reply' and newer netfilter implementations now expect '--ctdir original' instread and vice-versa. We probe for this netfilter change via a UDP message over loopback and 3 filtering rules applied to INPUT. If the sent byte arrives, the newer netfilter implementation has been detected. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- src/nwfilter/nwfilter_ebiptables_driver.c | 123 ++++++++++++++++++++++++++++++ 1 file changed, 123 insertions(+) Index: libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_ebiptables_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c @@ -27,6 +27,10 @@ #include <string.h> #include <sys/stat.h> #include <fcntl.h> +#include <arpa/inet.h> +#include <sys/select.h> +#include <sys/time.h> +#include <unistd.h> #include "internal.h" @@ -85,6 +89,12 @@ static char *iptables_cmd_path; static char *ip6tables_cmd_path; static char *grep_cmd_path; +/* + * --ctdir original vs. reply's meaning was inverted in the netfilter + * at some point. We probe for it. + */ +static bool iptables_ctdir_corrected = false; + #define PRINT_ROOT_CHAIN(buf, prefix, ifname) \ snprintf(buf, sizeof(buf), "libvirt-%c-%s", prefix, ifname) #define PRINT_CHAIN(buf, prefix, ifname, suffix) \ @@ -1262,6 +1272,9 @@ iptablesEnforceDirection(int directionIn virNWFilterRuleDefPtr rule, virBufferPtr buf) { + if (iptables_ctdir_corrected) + directionIn = !directionIn; + if (rule->tt != VIR_NWFILTER_RULE_DIRECTION_INOUT) virBufferAsprintf(buf, " -m conntrack --ctdir %s", (directionIn) ? "Original" @@ -4304,6 +4317,113 @@ ebiptablesDriverTestCLITools(void) return ret; } +static void +ebiptablesDriverProbeCtdir(void) +{ + virBuffer buf = VIR_BUFFER_INITIALIZER; + static const char cmdline[] = + "$IPT -%c INPUT %c -i lo -p udp --dport %hu " + "-m state --state ESTABLISHED -j ACCEPT " CMD_SEPARATOR + "$IPT -%c INPUT %c -i lo -p udp --dport %hu " + "-m conntrack --ctdir original -j ACCEPT " CMD_SEPARATOR + "$IPT -%c INPUT %c -i lo -p udp --dport %hu -j DROP"; + /* + * Above '--ctdir original' gets this test to receive a message on + * 'fixed' netfilter. + */ + unsigned short port; + int ssockfd = -1, csockfd = -1; + struct sockaddr_in serveraddr = { + .sin_family = AF_INET, + }; + fd_set readfds; + struct timeval timeout = { + .tv_sec = 0, + .tv_usec = 1000 * 200, + }; + int n; + + if (inet_aton("127.0.0.1", &serveraddr.sin_addr) == 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + "inet_aton failed"); + goto cleanup; + } + + if ((ssockfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0 || + (csockfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { + VIR_ERROR(_("Could not open UDP socket")); + goto cleanup; + } + + for (port = 0xffff; port > 1024; port--) { + serveraddr.sin_port = htons(port); + if (bind(ssockfd, (struct sockaddr *)&serveraddr, + sizeof(serveraddr)) == 0) + break; + } + if (port == 1024) { + VIR_ERROR(_("Could not bind to any UDP socket")); + goto cleanup; + } + + NWFILTER_SET_IPTABLES_SHELLVAR(&buf); + virBufferAsprintf(&buf, cmdline, + 'I', '1', port, + 'I', '2', port, + 'I', '3', port); + + if (virBufferError(&buf)) { + virReportOOMError(); + goto cleanup; + } + + if (ebiptablesExecCLI(&buf, NULL, NULL) < 0) { + VIR_ERROR(_("Could not apply iptables rules")); + goto cleanup_iptables; + } + + if (sendto(csockfd, cmdline, 1, 0, (struct sockaddr *)&serveraddr, + sizeof(serveraddr)) < 0) { + VIR_ERROR(_("Could not send to UDP socket")); + goto cleanup_iptables; + } + + FD_ZERO(&readfds); + FD_SET(ssockfd, &readfds); + + while (true) { + n = select(ssockfd + 1, &readfds, NULL, NULL, &timeout); + if (n < 0) { + if (errno == EINTR) + continue; + VIR_ERROR(_("Select failed")); + goto cleanup_iptables; + } + if (n == 0) { + VIR_INFO("Ctdir probing received no data -- 'old' netfilter"); + goto cleanup_iptables; + } + VIR_INFO("Ctdir probing received data -- 'fixed' netfilter"); + iptables_ctdir_corrected = true; + break; + } + +cleanup_iptables: + virBufferFreeAndReset(&buf); + + NWFILTER_SET_IPTABLES_SHELLVAR(&buf); + virBufferAsprintf(&buf, cmdline, + 'D', ' ', port, + 'D', ' ', port, + 'D', ' ', port); + ebiptablesExecCLI(&buf, NULL, NULL); + +cleanup: + virBufferFreeAndReset(&buf); + VIR_FORCE_CLOSE(ssockfd); + VIR_FORCE_CLOSE(csockfd); +} + static int ebiptablesDriverInit(bool privileged) { @@ -4341,6 +4461,9 @@ ebiptablesDriverInit(bool privileged) return -ENOTSUP; } + if (iptables_cmd_path) + ebiptablesDriverProbeCtdir(); + ebiptables_driver.flags = TECHDRV_FLAG_INITIALIZED; return 0;

2 3

[libvirt] [PATCH] Fix parsing of bond interface XML
by Jim Fehlig 22 Mar '13

22 Mar '13

Noticed that parsing bond interface XML containing the miimon element fails <interface type="bond" name="bond0"> ... <bond mode="active-backup"> <miimon freq="100" carrier="netif"/> ... </bond> </interface> This configuration does not contain the optional updelay and downdelay attributes, but parsing will fail due to returning the result of virXPathULong (a -1 when the attribute doesn't exist) from virInterfaceDefParseBond after examining the updelay attribute. I considered just adding a ret = 0; near the bottom of virInterfaceDefParseBond, but see there is no cleanup in the error label. Instead, just return failure where failure occurs and return success if the end of the function is reached. --- src/conf/interface_conf.c | 56 +++++++++++++++++++++-------------------------- 1 file changed, 25 insertions(+), 31 deletions(-) diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index 9301ec0..3d45d5c 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -572,61 +572,58 @@ error: static int virInterfaceDefParseBond(virInterfaceDefPtr def, xmlXPathContextPtr ctxt) { - int ret = -1; + int res; unsigned long tmp; def->data.bond.mode = virInterfaceDefParseBondMode(ctxt); if (def->data.bond.mode < 0) - goto error; + return -1; - ret = virInterfaceDefParseBondItfs(def, ctxt); - if (ret != 0) - goto error; + if (virInterfaceDefParseBondItfs(def, ctxt) != 0) + return -1; if (virXPathNode("./miimon[1]", ctxt) != NULL) { def->data.bond.monit = VIR_INTERFACE_BOND_MONIT_MII; - ret = virXPathULong("string(./miimon/@freq)", ctxt, &tmp); - if ((ret == -2) || (ret == -1)) { + res = virXPathULong("string(./miimon/@freq)", ctxt, &tmp); + if ((res == -2) || (res == -1)) { virReportError(VIR_ERR_XML_ERROR, "%s", _("bond interface miimon freq missing or invalid")); - goto error; + return -1; } def->data.bond.frequency = (int) tmp; - ret = virXPathULong("string(./miimon/@downdelay)", ctxt, &tmp); - if (ret == -2) { + res = virXPathULong("string(./miimon/@downdelay)", ctxt, &tmp); + if (res == -2) { virReportError(VIR_ERR_XML_ERROR, "%s", _("bond interface miimon downdelay invalid")); - goto error; - } else if (ret == 0) { + return -1; + } else if (res == 0) { def->data.bond.downdelay = (int) tmp; } - ret = virXPathULong("string(./miimon/@updelay)", ctxt, &tmp); - if (ret == -2) { + res = virXPathULong("string(./miimon/@updelay)", ctxt, &tmp); + if (res == -2) { virReportError(VIR_ERR_XML_ERROR, "%s", _("bond interface miimon updelay invalid")); - goto error; - } else if (ret == 0) { + return -1; + } else if (res == 0) { def->data.bond.updelay = (int) tmp; } def->data.bond.carrier = virInterfaceDefParseBondMiiCarrier(ctxt); - if (def->data.bond.carrier < 0) { - ret = -1; - goto error; - } + if (def->data.bond.carrier < 0) + return -1; } else if (virXPathNode("./arpmon[1]", ctxt) != NULL) { def->data.bond.monit = VIR_INTERFACE_BOND_MONIT_ARP; - ret = virXPathULong("string(./arpmon/@interval)", ctxt, &tmp); - if ((ret == -2) || (ret == -1)) { + res = virXPathULong("string(./arpmon/@interval)", ctxt, &tmp); + if ((res == -2) || (res == -1)) { virReportError(VIR_ERR_XML_ERROR, "%s", _("bond interface arpmon interval missing or invalid")); - goto error; + return -1; } def->data.bond.interval = (int) tmp; @@ -635,18 +632,15 @@ virInterfaceDefParseBond(virInterfaceDefPtr def, if (def->data.bond.target == NULL) { virReportError(VIR_ERR_XML_ERROR, "%s", _("bond interface arpmon target missing")); - ret = -1; - goto error; + return -1; } def->data.bond.validate = virInterfaceDefParseBondArpValid(ctxt); - if (def->data.bond.validate < 0) { - ret = -1; - goto error; - } + if (def->data.bond.validate < 0) + return -1; } -error: - return ret; + + return 0; } static int -- 1.8.0.1

2 2

[libvirt] [PATCH] Correct invalid RNG schemas.
by Martin Kletzander 21 Mar '13

21 Mar '13

The 'trang' utility, which is able to transform '.rng' files into '.rnc' files, reported some errors in our schemas that weren't caught by the tools we use in the build. I haven't added a test for this, but the validity can be checked by the following command: trang -I rng -O rnc domain.rng domain.rnc There were unescaped minuses in regular expressions and we were constraining int (which is by default in the range of [-2^31;2^31-1] to maximum of 2^32. But what we wanted was exactly an unsignedInt. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Thanks to that, the '.rnc' files can be used by nxml-mode which makes editing libvirt xml files a *lot* easier. docs/schemas/domaincommon.rng | 2 +- docs/schemas/nwfilter.rng | 19 ++++++++----------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index c4e7b7a..3240e1c 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -3929,7 +3929,7 @@ </define> <define name='aliasName'> <data type="string"> - <param name="pattern">[a-zA-Z0-9_-]+</param> + <param name="pattern">[a-zA-Z0-9_\-]+</param> </data> </define> <define name='alias'> diff --git a/docs/schemas/nwfilter.rng b/docs/schemas/nwfilter.rng index cfd9ba5..f1aa699 100644 --- a/docs/schemas/nwfilter.rng +++ b/docs/schemas/nwfilter.rng @@ -308,25 +308,25 @@ <choice> <value>root</value> <data type="string"> - <param name="pattern">mac[a-zA-Z0-9_\.:-]{0,9}</param> + <param name="pattern">mac[a-zA-Z0-9_\.:\-]{0,9}</param> </data> <data type="string"> - <param name="pattern">stp[a-zA-Z0-9_\.:-]{0,9}</param> + <param name="pattern">stp[a-zA-Z0-9_\.:\-]{0,9}</param> </data> <data type="string"> - <param name="pattern">vlan[a-zA-Z0-9_\.:-]{0,8}</param> + <param name="pattern">vlan[a-zA-Z0-9_\.:\-]{0,8}</param> </data> <data type="string"> - <param name="pattern">arp[a-zA-Z0-9_\.:-]{0,9}</param> + <param name="pattern">arp[a-zA-Z0-9_\.:\-]{0,9}</param> </data> <data type="string"> - <param name="pattern">rarp[a-zA-Z0-9_\.:-]{0,8}</param> + <param name="pattern">rarp[a-zA-Z0-9_\.:\-]{0,8}</param> </data> <data type="string"> - <param name="pattern">ipv4[a-zA-Z0-9_\.:-]{0,8}</param> + <param name="pattern">ipv4[a-zA-Z0-9_\.:\-]{0,8}</param> </data> <data type="string"> - <param name="pattern">ipv6[a-zA-Z0-9_\.:-]{0,8}</param> + <param name="pattern">ipv6[a-zA-Z0-9_\.:\-]{0,8}</param> </data> </choice> </attribute> @@ -950,10 +950,7 @@ <param name="pattern">0x[0-9a-fA-F]{1,8}</param> </data> - <data type="int"> - <param name="minInclusive">0</param> - <param name="maxInclusive">4294967295</param> - </data> + <data type="unsignedInt"/> </choice> </define> -- 1.8.1.5

2 2

[libvirt] [PATCH RFC] virsh: Fix semantics of --config for "update-device" command
by Peter Krempa 21 Mar '13

21 Mar '13

The man page states that with --config the next boot is affected. This can be understood as if _only_ the next bood was affected. This isn't true if the machine is running. This patch adds the full --live, --config, --current infrastructure and tweaks stuff to correctly support the obsolete --persistent flag. --- Notes: - This patch will be greatly simplified with macros from: http://www.redhat.com/archives/libvir-list/2013-March/msg00268.html - There are multiple places like this in virsh that will need update too. (detach-device for example) - https://bugzilla.redhat.com/show_bug.cgi?id=921398 tools/virsh-domain.c | 53 +++++++++++++++++++++++++++++++++++++++++----------- tools/virsh.pod | 22 +++++++++++++++------- 2 files changed, 57 insertions(+), 18 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index e9da11f..33545f6 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9304,13 +9304,21 @@ static const vshCmdOptDef opts_update_device[] = { .help = N_("XML file") }, {.name = "persistent", - .type = VSH_OT_ALIAS, - .help = "config" + .type = VSH_OT_BOOL, + .help = N_("make live change persistent") }, {.name = "config", .type = VSH_OT_BOOL, .help = N_("affect next boot") }, + {.name = "live", + .type = VSH_OT_BOOL, + .help = N_("affect running domain") + }, + {.name = "current", + .type = VSH_OT_BOOL, + .help = N_("affect current domain") + }, {.name = "force", .type = VSH_OT_BOOL, .help = N_("force device update") @@ -9325,7 +9333,34 @@ cmdUpdateDevice(vshControl *ctl, const vshCmd *cmd) const char *from = NULL; char *buffer = NULL; bool ret = false; - unsigned int flags; + unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; + bool current = vshCommandOptBool(cmd, "current"); + bool config = vshCommandOptBool(cmd, "config"); + bool live = vshCommandOptBool(cmd, "live"); + bool persistent = vshCommandOptBool(cmd, "persistent"); + + if (persistent) { + if (current || config || live) { + vshError(ctl, "%s", _("--persistent is incompatible with " + "--current, --live or --config")); + return false; + } + + flags = VIR_DOMAIN_AFFECT_CONFIG; + } else { + if (current) { + if (live || config) { + vshError(ctl, "%s", _("--current must be specified " + "exclusively")); + return false; + } + } else { + if (config) + flags |= VIR_DOMAIN_AFFECT_CONFIG; + if (live) + flags |= VIR_DOMAIN_AFFECT_LIVE; + } + } if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; @@ -9333,19 +9368,15 @@ cmdUpdateDevice(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) goto cleanup; + if (persistent && + virDomainIsActive(dom) == 1) + flags |= VIR_DOMAIN_AFFECT_LIVE; + if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0) { vshReportError(ctl); goto cleanup; } - if (vshCommandOptBool(cmd, "config")) { - flags = VIR_DOMAIN_AFFECT_CONFIG; - if (virDomainIsActive(dom) == 1) - flags |= VIR_DOMAIN_AFFECT_LIVE; - } else { - flags = VIR_DOMAIN_AFFECT_LIVE; - } - if (vshCommandOptBool(cmd, "force")) flags |= VIR_DOMAIN_DEVICE_MODIFY_FORCE; diff --git a/tools/virsh.pod b/tools/virsh.pod index 7fb89e4..8bb0490 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1887,18 +1887,26 @@ If I<--config> is specified, alter persistent configuration, effect observed on next boot, for compatibility purposes, I<--persistent> is alias of I<--config>. -=item B<update-device> I<domain> I<file> [I<--config>] [I<--force>] +=item B<update-device> I<domain> I<file> [I<--force>] +[[[I<--live>] [I<--config>] | [I<--current>]] | [I<--persistent>]] Update the characteristics of a device associated with I<domain>, -based on the device definition in an XML I<file>. If the I<--config> -option is used, the changes will take affect the next time libvirt -starts the domain. For compatibility purposes, I<--persistent> is -alias of I<--config>. The I<--force> option can be used to force -device update, e.g., to eject a CD-ROM even if it is locked/mounted in -the domain. See the documentation at +based on the device definition in an XML I<file>. The I<--force> option +can be used to force device update, e.g., to eject a CD-ROM even if it is +locked/mounted in the domain. See the documentation at L<http://libvirt.org/formatdomain.html#elementsDevices> to learn about libvirt XML format for a device. +If I<--live> is specified, affect a running domain. +If I<--config> is specified, affect the next startup of a persistent domain. +If I<--current> is specified, affect the current domain state. +Both I<--live> and I<--config> flags may be given, but I<--current> is +exclusive. Not specifying any flag is the same as specifying I<--current>. + +For compatibility purposes, I<--persistent> is alias of I<--config> and +I<--live> if the domain is running. This flag isn't compatible with the +other domain status flags. + =item B<change-media> I<domain> I<path> [I<--eject>] [I<--insert>] [I<--update>] [I<source>] [I<--force>] [[I<--live>] [I<--config>] | [I<--current>]] -- 1.8.1.5

3 2

[libvirt] [PATCH v9 0/3] DEVICE_DELETED event
by Michael S. Tsirkin 21 Mar '13

21 Mar '13

libvirt has a long-standing bug: when removing the device, it can request removal but does not know when the removal completes. Add an event so we can fix this in a robust way. First patch only adds the event with ID, second patch adds a path field. Split this way for ease of backport (stable downstreams without QOM would want to only take the first patch). Event without fields is still useful as management can use it to poll device list to figure out which device was removed. Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com> If there are no more comments I'll stick this on my pci branch. Changes from v8: - reorder qom destruction so no need to change unparent Changes from v7: - none, v7 was malformed series sent by mistake Changes from v6: - make empty event use data: {}, Markus prefers this Changes from v5: - Emit an empty event on unnamed devices in patch 1/3, as suggested by Markus Changes from v4: - Add extra triggers and extra fields as requested by Markus Changes from v3: - Document that we only emit events for devices with and ID, as suggested by Markus Changes from v2: - move event toward the end of device_unparent, so that parents are reported after their children, as suggested by Paolo Changes from v1: - move to device_unparent - address comments by Andreas and Eric -- Anthony Liguori Michael S. Tsirkin (3): qdev: DEVICE_DELETED event qom: call class destructor before unparent qmp: add path to device_deleted event QMP/qmp-events.txt | 18 ++++++++++++++++++ hw/qdev.c | 14 ++++++++++++++ include/monitor/monitor.h | 1 + monitor.c | 1 + qapi-schema.json | 4 +++- qom/object.c | 6 +++--- 6 files changed, 40 insertions(+), 4 deletions(-) -- MST

4 9