- Devel - libvirt List Archives

[libvirt] [libvirt-php] [PATCH 1/1] Add function libvirt_domain_undefine_flags and libvirt_domain_snapshot_create_xml
by Zhensheng Yuan 20 Feb '19

20 Feb '19

Hi, I created a patch for libvirt-php to support virDomainUndefineFlags and create snapshot from XML string. The test case file is "examples/domain_undefine_flags_and_snapshot_create_xml_test_case.php". Hoping this is useful for libvirt-php. >From e753d0014e8ce8cbcafb0fbd92159a6cc9f32168 Mon Sep 17 00:00:00 2001 From: Zhensheng Yuan <yuan(a)zhensheng.im> Date: Wed, 20 Feb 2019 18:25:05 +0800 Subject: [libvirt-php PATCH] Add function libvirt_domain_undefine_flags and libvirt_domain_snapshot_create_xml --- ...lags_and_snapshot_create_xml_test_case.php | 136 ++++++++++++++++++ src/libvirt-domain.c | 23 +++ src/libvirt-domain.h | 2 + src/libvirt-php.c | 12 ++ src/libvirt-snapshot.c | 35 +++++ src/libvirt-snapshot.h | 2 + 6 files changed, 210 insertions(+) create mode 100644 examples/domain_undefine_flags_and_snapshot_create_xml_test_case.php diff --git a/examples/domain_undefine_flags_and_snapshot_create_xml_test_case.php b/examples/domain_undefine_flags_and_snapshot_create_xml_test_case.php new file mode 100644 index 0000000..e6590ae --- /dev/null +++ b/examples/domain_undefine_flags_and_snapshot_create_xml_test_case.php @@ -0,0 +1,136 @@ +<?php +/** + * Created by PhpStorm. + * Date: 19-2-20 + * Time: 下午4:57 + */ + +namespace YunInternet\Libvirt\Test\Unit; + + +use PHPUnit\Framework\TestCase; + +class Test_libvirt_domain_undefine_flags extends TestCase +{ + public function testConstants() + { + $this->assertEquals(VIR_DOMAIN_UNDEFINE_MANAGED_SAVE, 1); + $this->assertEquals(VIR_DOMAIN_UNDEFINE_SNAPSHOTS_METADATA, 2); + $this->assertEquals(VIR_DOMAIN_UNDEFINE_NVRAM, 4); + $this->assertEquals(VIR_DOMAIN_UNDEFINE_KEEP_NVRAM, 8); + } + + public function testSnapshotAndUndefineFlags() + { + $libvirtResource = libvirt_connect("test:///default", false); + $this->assertTrue(is_resource($libvirtResource)); + + $domainResource = libvirt_domain_define_xml($libvirtResource, $this->getDomainXML()); + $this->assertTrue(is_resource($domainResource)); + + // Create a snapshot named snapshot1 + $snapshotResource = libvirt_domain_snapshot_create_xml($domainResource, <<<EOF +<domainsnapshot> + <name>snapshot1</name> +</domainsnapshot> +EOF +, VIR_SNAPSHOT_CREATE_LIVE | VIR_SNAPSHOT_CREATE_ATOMIC); + $this->assertTrue(is_resource($snapshotResource)); + + // Domain with snapshot can not be undefined directly + $this->assertFalse(@libvirt_domain_undefine($domainResource)); + + // Use VIR_DOMAIN_UNDEFINE_SNAPSHOTS_METADATA flag to undefine the domain + $this->assertTrue(libvirt_domain_undefine_flags($domainResource, VIR_DOMAIN_UNDEFINE_SNAPSHOTS_METADATA)); + } + + private function getDomainXML() + { + return <<<EOF +<domain type="test"> + <name>Test</name> + <memory unit="MiB">1024</memory> + <vcpu placement="static">8</vcpu> + <cpu mode="host-passthrough"> + <topology sockets="4" cores="1" threads="2"/> + </cpu> + <os> + <type arch="i686">hvm</type> + <loader readonly='yes' type='pflash'>/usr/share/ovmf/OVMF.fd</loader> + <nvram template='/usr/share/OVMF/OVMF_VARS.fd'>/var/lib/libvirt/qemu/nvram/guest_VARS.fd</nvram> + <bootmenu enable="yes" timeout="1000"/> + <boot dev="hd"/> + <boot dev="cdrom"/> + </os> + <pm> + <suspend-to-mem enable="yes"/> + </pm> + <devices> + <memballoon model="none"/> + <disk type="volume" device="disk"> + <driver name="qemu" type="qcow2"/> + <source pool="testPool1" volume="testVolume1"/> + <target bus="virtio" dev="vda"/> + </disk> + <disk type="volume" device="disk"> + <driver name="qemu" type="qcow2"/> + <source pool="testPool2" volume="testVolume2"/> + <target bus="virtio" dev="vdb"/> + <iotune> + <total_bytes_sec>102400</total_bytes_sec> + </iotune> + </disk> + <disk type="file" device="cdrom"> + <driver name="qemu" type="raw"/> + <source file="/iso/iso.iso"/> + <target bus="ide" dev="hda"/> + </disk> + <interface type="network"> + <source network="default"/> + <mac address="52:54:00:00:00:01"/> + <model type="virtio"/> + <filterref filter="clean-traffic"> + <parameter name="IP" value="192.168.122.2"/> + </filterref> + <bandwidth> + <inbound average="10240" burst="20480" peak="20480"/> + <outbound average="10240" burst="20480" peak="20480"/> + </bandwidth> + </interface> + <input type="tablet" bus="usb"/> + <graphics type="vnc" passwd="12345678" port="-1" autoport="yes"> + <listen type="address" address="0.0.0.0"/> + </graphics> + <channel> + <source mode="bind"/> + <target type="virtio" name="org.qemu.guest_agent.0"/> + </channel> + </devices> + <clock offset="utc"/> + <features> + <pae/> + <acpi/> + <apic/> + <hyperv> + <relaxed state="on"/> + <vapic state="on"/> + <spinlocks state="on" retries="8191"/> + </hyperv> + </features> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <blkiotune> + <weight>1000</weight> + <device> + <path>/dev/sda</path> + <weight>1000</weight> + <read_bytes_sec>10240</read_bytes_sec> + <write_bytes_sec>10240</write_bytes_sec> + </device> + </blkiotune> +</domain> +EOF + ; + } +} diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 8b8bb45..e2dc33e 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -1467,6 +1467,29 @@ PHP_FUNCTION(libvirt_domain_undefine) RETURN_TRUE; } +/* + * Function name: libvirt_domain_undefine_flags + * Description: Function is used to undefine(with flags) the domain identified by it's resource + * Arguments: @res [resource]: libvirt domain resource, e.g. from libvirt_domain_lookup_by_*() + * @flags [int]: optional flags + * Returns: TRUE for success, FALSE on error + */ +PHP_FUNCTION(libvirt_domain_undefine_flags) +{ + php_libvirt_domain *domain = NULL; + zval *zdomain; + int retval; + zend_long flags = 0; + + GET_DOMAIN_FROM_ARGS("r|l", &zdomain, &flags); + + retval = virDomainUndefineFlags(domain->domain, flags); + DPRINTF("%s: virDomainUndefineFlags(%p) returned %d\n", PHPFUNC, domain->domain, retval); + if (retval != 0) + RETURN_FALSE; + RETURN_TRUE; +} + /* * Function name: libvirt_domain_reboot * Since version: 0.4.1(-1) diff --git a/src/libvirt-domain.h b/src/libvirt-domain.h index dc0ab46..6d98544 100644 --- a/src/libvirt-domain.h +++ b/src/libvirt-domain.h @@ -73,6 +73,7 @@ PHP_FE(libvirt_domain_suspend, arginfo_libvirt_conn) \ PHP_FE(libvirt_domain_managedsave, arginfo_libvirt_conn) \ PHP_FE(libvirt_domain_undefine, arginfo_libvirt_conn) \ + PHP_FE(libvirt_domain_undefine_flags, arginfo_libvirt_conn_flags) \ PHP_FE(libvirt_domain_reboot, arginfo_libvirt_conn_flags) \ PHP_FE(libvirt_domain_define_xml, arginfo_libvirt_conn_xml) \ PHP_FE(libvirt_domain_create_xml, arginfo_libvirt_conn_xml) \ @@ -163,6 +164,7 @@ PHP_FUNCTION(libvirt_domain_shutdown); PHP_FUNCTION(libvirt_domain_suspend); PHP_FUNCTION(libvirt_domain_managedsave); PHP_FUNCTION(libvirt_domain_undefine); +PHP_FUNCTION(libvirt_domain_undefine_flags); PHP_FUNCTION(libvirt_domain_reboot); PHP_FUNCTION(libvirt_domain_define_xml); PHP_FUNCTION(libvirt_domain_create_xml); diff --git a/src/libvirt-php.c b/src/libvirt-php.c index cf8fd7f..7e10b3d 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -468,6 +468,12 @@ ZEND_ARG_INFO(0, timeout) ZEND_ARG_INFO(0, flags) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_domain_snapshot_create_xml, 0, 0, 2) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, xml) +ZEND_ARG_INFO(0, flags) +ZEND_END_ARG_INFO() + static zend_function_entry libvirt_functions[] = { PHP_FE_LIBVIRT_CONNECTION PHP_FE_LIBVIRT_STREAM @@ -1491,6 +1497,12 @@ PHP_MINIT_FUNCTION(libvirt) REGISTER_LONG_CONSTANT("VIR_KEYCODE_SET_WIN32", VIR_KEYCODE_SET_WIN32, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("VIR_KEYCODE_SET_RFB", VIR_KEYCODE_SET_RFB, CONST_CS | CONST_PERSISTENT); + /* virDomainUndefineFlagsValues */ + REGISTER_LONG_CONSTANT("VIR_DOMAIN_UNDEFINE_MANAGED_SAVE", VIR_DOMAIN_UNDEFINE_MANAGED_SAVE, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("VIR_DOMAIN_UNDEFINE_SNAPSHOTS_METADATA", VIR_DOMAIN_UNDEFINE_SNAPSHOTS_METADATA, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("VIR_DOMAIN_UNDEFINE_NVRAM", VIR_DOMAIN_UNDEFINE_NVRAM, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("VIR_DOMAIN_UNDEFINE_KEEP_NVRAM", VIR_DOMAIN_UNDEFINE_KEEP_NVRAM, CONST_CS | CONST_PERSISTENT); + REGISTER_INI_ENTRIES(); /* Initialize libvirt and set up error callback */ diff --git a/src/libvirt-snapshot.c b/src/libvirt-snapshot.c index 1388d88..f7e3e2b 100644 --- a/src/libvirt-snapshot.c +++ b/src/libvirt-snapshot.c @@ -130,6 +130,41 @@ PHP_FUNCTION(libvirt_domain_snapshot_create) VIRT_REGISTER_RESOURCE(res_snapshot, le_libvirt_snapshot); } +/* + * Function name: libvirt_domain_snapshot_create_xml + * Description: This function creates the domain snapshot from XML string for the domain identified by it's resource + * Arguments: @res [resource]: libvirt domain resource + * @xml [string]: xml + * @flags [int]: libvirt snapshot flags + * Returns: domain snapshot resource + */ +PHP_FUNCTION(libvirt_domain_snapshot_create_xml) +{ + php_libvirt_domain *domain = NULL; + php_libvirt_snapshot *res_snapshot; + zval *zdomain; + char *xml; + strsize_t xml_len; + virDomainSnapshotPtr snapshot = NULL; + zend_long flags = 0; + + GET_DOMAIN_FROM_ARGS("rs|l", &zdomain, &xml, &xml_len, &flags); + + snapshot = virDomainSnapshotCreateXML(domain->domain, xml, flags); + DPRINTF("%s: virDomainSnapshotCreateXML(%p, <xml>) returned %p\n", PHPFUNC, domain->domain, snapshot); + if (snapshot == NULL) + RETURN_FALSE; + + res_snapshot = (php_libvirt_snapshot *)emalloc(sizeof(php_libvirt_snapshot)); + res_snapshot->domain = domain; + res_snapshot->snapshot = snapshot; + + DPRINTF("%s: returning %p\n", PHPFUNC, res_snapshot->snapshot); + resource_change_counter(INT_RESOURCE_SNAPSHOT, domain->conn->conn, res_snapshot->snapshot, 1 TSRMLS_CC); + + VIRT_REGISTER_RESOURCE(res_snapshot, le_libvirt_snapshot); +} + /* * Function name: libvirt_domain_snapshot_get_xml * Since version: 0.4.1(-2) diff --git a/src/libvirt-snapshot.h b/src/libvirt-snapshot.h index e6092aa..970662c 100644 --- a/src/libvirt-snapshot.h +++ b/src/libvirt-snapshot.h @@ -16,6 +16,7 @@ PHP_FE(libvirt_domain_has_current_snapshot, arginfo_libvirt_conn_optflags) \ PHP_FE(libvirt_domain_snapshot_lookup_by_name, arginfo_libvirt_domain_snapshot_lookup_by_name) \ PHP_FE(libvirt_domain_snapshot_create, arginfo_libvirt_conn_optflags) \ + PHP_FE(libvirt_domain_snapshot_create_xml, arginfo_libvirt_domain_snapshot_create_xml) \ PHP_FE(libvirt_domain_snapshot_get_xml, arginfo_libvirt_conn_optflags) \ PHP_FE(libvirt_domain_snapshot_revert, arginfo_libvirt_conn_optflags) \ PHP_FE(libvirt_domain_snapshot_delete, arginfo_libvirt_conn_optflags) \ @@ -50,6 +51,7 @@ void php_libvirt_snapshot_dtor(virt_resource *rsrc TSRMLS_DC); PHP_FUNCTION(libvirt_domain_has_current_snapshot); PHP_FUNCTION(libvirt_domain_snapshot_lookup_by_name); PHP_FUNCTION(libvirt_domain_snapshot_create); +PHP_FUNCTION(libvirt_domain_snapshot_create_xml); PHP_FUNCTION(libvirt_domain_snapshot_get_xml); PHP_FUNCTION(libvirt_domain_snapshot_revert); PHP_FUNCTION(libvirt_domain_snapshot_delete); -- 2.17.1 Regards, Zhensheng Yuan

1 0

[libvirt] [RFC PATCH] udev: Remove udev handle from main loop when udev thread stops
by Marc Hartmayer 20 Feb '19

20 Feb '19

Commit "nodedev: Move device enumumeration out of nodeStateInitialize" (9f0ae0b18e3e620) has moved the heavy task of device enumeration into a separate thread. The problem with this commit is that there is a functionality change in the cleanup when udevEnumerateDevices fails. Before commit 9f0ae0b18e3e620, the entire driver was cleaned up by calling nodeStateCleanup (defined in node_device_udev.c) which resulted in libvirtd stopping with the error message 'daemonRunStateInit:800 : Driver state initialization failed'. With the commit 9f0ae0b18e3e620 there is only a signal to the udev thread that it must stop. This means that for example the watch handle isn't removed from the main loop and this can result in the main loop consuming 100% CPU time as soon as a new udev event occurs. This patch proposes a simple solution to the described problem. In case the udev thread stops the watch handle is removed from the main loop. Fixes: 9f0ae0b18e3e620 ("nodedev: Move device enumumeration out of nodeStateInitialize") Signed-off-by: Marc Hartmayer <mhartmay(a)linux.ibm.com> --- Note: I'm not sure whether we should stop libvirtd (as it would have been done before) or if this patch is already sufficient. --- src/node_device/node_device_udev.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index b1e5f00067e8..299f55260129 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1628,6 +1628,13 @@ udevEventHandleThread(void *opaque ATTRIBUTE_UNUSED) } if (priv->threadQuit) { + if (priv->watch != -1) { + /* Since the udev thread getting stopped remove the + * watch handle from the main loop */ + virEventRemoveHandle(priv->watch); + priv->watch = -1; + } + virObjectUnlock(priv); return; } -- 2.17.0

2 8

[libvirt] [PATCH v2 0/5] virDomainXMLFlags cleanups (incremental backup saga)
by Eric Blake 20 Feb '19

20 Feb '19

Since v1: add two new patches (1, 2), improve commit message wording of patch 4/5 [Dan]. Eric Blake (5): domain: Fix unknown flags diagnosis in virDomainGetXMLDesc qemu: Use correct domain xml flag domain: Document VIR_DOMAIN_XML_MIGRATABLE domain: Define explicit flags for saved image xml snapshot: Define explicit flags for snapshot xml include/libvirt/libvirt-domain-snapshot.h | 4 ++++ include/libvirt/libvirt-domain.h | 5 +++++ src/conf/domain_conf.h | 3 +++ src/bhyve/bhyve_driver.c | 2 ++ src/conf/domain_conf.c | 2 ++ src/esx/esx_driver.c | 2 +- src/hyperv/hyperv_driver.c | 2 +- src/libvirt-domain-snapshot.c | 9 ++++----- src/libvirt-domain.c | 22 +++++++++++++--------- src/libxl/libxl_driver.c | 2 +- src/lxc/lxc_driver.c | 2 +- src/openvz/openvz_driver.c | 2 +- src/phyp/phyp_driver.c | 2 +- src/qemu/qemu_driver.c | 11 ++++++----- src/remote/remote_protocol.x | 6 +++--- src/test/test_driver.c | 4 ++-- src/vbox/vbox_common.c | 2 +- src/vmware/vmware_driver.c | 2 +- src/vz/vz_driver.c | 4 ++-- 19 files changed, 54 insertions(+), 34 deletions(-) -- 2.20.1

2 20

[libvirt] [PATCH v2 0/6] dirty-bitmaps: deprecate @status field
by John Snow 19 Feb '19

19 Feb '19

The current internal meanings of "locked", "user_locked", "qmp_locked", "frozen", "enabled", and "disabled" are all a little muddled. Deprecate the @status field in favor of two new booleans that carry very specific meanings. Then, rename and rework some of the internal semantics to help make the API a bit more clear and easier to read. Well, in my opinion. Based on my current bitmaps branch (includes Eric's patch and my documentation update patch.) V2: - All of Eric's suggestions, I hope. - Vladimir's phrasing suggestion on patch 1 - Added a sixth patch that's mostly just motion. I'm on PTO the next two days, so I didn't get to writing a test for the busy bit. I think test 223 is a good candidate, because it uses the NBD functionality. To test with push mode, I need to come up with a blockdebug configuration that will let me pause an incremental backup so I can test race-free. Maybe for V3, sorry. John Snow (6): block/dirty-bitmap: add recording and busy properties block/dirty-bitmaps: rename frozen predicate helper block/dirty-bitmap: change semantics of enabled predicate block/dirty-bitmap: explicitly lock bitmaps with successors block/dirty-bitmaps: unify qmp_locked and user_locked calls block/dirty-bitmaps: move comment block block/dirty-bitmap.c | 110 ++++++++++++++++++--------------- blockdev.c | 18 +++--- include/block/dirty-bitmap.h | 7 +-- migration/block-dirty-bitmap.c | 8 +-- nbd/server.c | 6 +- qapi/block-core.json | 10 ++- qemu-deprecated.texi | 6 ++ tests/qemu-iotests/236.out | 28 +++++++++ 8 files changed, 122 insertions(+), 71 deletions(-) -- 2.17.2

3 23

[libvirt] [PATCH] iohelper: Remove remaining newlines from error messages
by Andrea Bolognani 19 Feb '19

19 Feb '19

The iohelper is an internal program that's only supposed to be called by libvirt, and whatever output it might produce will ultimately be passed to virReportError() or similar. Since we do not want strings passed to those functions to contain newlines, we can simply not output them in the first place. This is what happens in pretty much all cases already, but in a couple instances newlines have managed to slip in. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/util/iohelper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/iohelper.c b/src/util/iohelper.c index aed7ef3184..ddc338b7c7 100644 --- a/src/util/iohelper.c +++ b/src/util/iohelper.c @@ -181,7 +181,7 @@ usage(int status) if (status) { fprintf(stderr, _("%s: try --help for more details"), program_name); } else { - printf(_("Usage: %s FILENAME FD\n"), program_name); + printf(_("Usage: %s FILENAME FD"), program_name); } exit(status); } @@ -198,7 +198,7 @@ main(int argc, char **argv) if (virGettextInitialize() < 0 || virThreadInitialize() < 0 || virErrorInitialize() < 0) { - fprintf(stderr, _("%s: initialization failed\n"), program_name); + fprintf(stderr, _("%s: initialization failed"), program_name); exit(EXIT_FAILURE); } -- 2.20.1

2 1

[libvirt] [PATCH v7 00/20] Refactor virQEMUCapsInitQMPCommand (for BaselineHypervisorCPU using QEMU QMP exchanges)
by Jiri Denemark 19 Feb '19

19 Feb '19

This series is a replacement for the refactoring part (the first 22 patches) of the "BaselineHypervisorCPU using QEMU QMP exchanges" series [1] from Chris. In a nutshell this series moves virQEMUCapsInitQMPCommand related code to qemu_process.c and refactors it so that it can be used by both the QEMU capabilities probing code and the upcoming code for calling QMP commands internally for some CPU related APIs on s390. I'm sending this refactoring part separated because it's mostly ready for being pushed. I ACKed most of the patches in v6, but some patches needed to be modified a bit or replaced by a bit different code. Thus I'm sending them for review rather than pushing this part right away. See individual patches for changes since v6. [1] https://www.redhat.com/archives/libvir-list/2019-January/msg00310.html Chris Venteicher (15): qemu_process: Move process code from qemu_capabilities qemu_process: Rename identifiers moved from qemu_capabilities qemu_process: Limit qemuProcessQMPNew to const input strings qemu_process: Refer to proc not cmd in process code qemu_process: Use consistent name for stop process function qemu_capabilities: Stop QEMU process before freeing qemu_process: Use qemuProcessQMP struct for a single process qemu_process: Introduce qemuProcessQMPStart qemu_process: Move monitor code to qemuProcessQMPConnectMonitor qemu_process: Store libDir in qemuProcessQMP struct qemu_process: Setup paths within qemuProcessQMPInit qemu_process: Stop retaining monitor config in qemuProcessQMP qemu_process: Document and cleanup qemuProcessQMPNew qemu_process: Use unique directories for QMP processes qemu_process: Enter QMP command mode when starting QEMU Process Jiri Denemark (5): qemu_capabilities: Refactor virQEMUCapsInitQMP qemu_process: Don't ignore errors in virQEMUCapsInit qemu_capabilities: Log probe failure in virQEMUCapsInitQMPSingle qemu_process: Hide qmperr inside qemuProcessQMP qemu_process: Hide qemuProcessQMPStop src/qemu/qemu_capabilities.c | 356 ++++++----------------------------- src/qemu/qemu_process.c | 324 +++++++++++++++++++++++++++++++ src/qemu/qemu_process.h | 29 +++ src/qemu/qemu_processpriv.h | 2 + tests/qemucapabilitiestest.c | 9 + 5 files changed, 419 insertions(+), 301 deletions(-) -- 2.20.1

2 41

[libvirt] [PATCH v2 0/3] qemu: Report better error on dump/migrate failure
by Andrea Bolognani 19 Feb '19

19 Feb '19

Changes from [v1]: * Use VIR_FREE() followed by VIR_ALLOC_N() instead of manually setting the last (and only) byte of the array returned by VIR_REALLOC_N() to zero. [v1] https://www.redhat.com/archives/libvir-list/2019-February/msg00156.html Andrea Bolognani (3): vircommand: Ensure buffers are NULL-terminated virfile: Report error in virFileWrapperFdFree() iohelper: Don't include newlines in error messages src/util/iohelper.c | 2 +- src/util/vircommand.c | 6 ++++-- src/util/virfile.c | 6 +++++- 3 files changed, 10 insertions(+), 4 deletions(-) -- 2.20.1

3 17

[libvirt] [jenkins-ci PATCH 0/5] Tidy up top-level directory and fix a few small issues
by Andrea Bolognani 19 Feb '19

19 Feb '19

Andrea Bolognani (5): jenkins: Move all Jenkins-related files README: Add short overview of the repository guests: Fix a small issue in README jenkins: Fix a couple small issues in README jenkins: Add YAML start of document marker README.markdown | 56 ++++--------------- guests/README.markdown | 2 +- README.markdown => jenkins/README.markdown | 18 +++--- {jobs => jenkins/jobs}/autotools.yaml | 2 +- {jobs => jenkins/jobs}/defaults.yaml | 2 +- {jobs => jenkins/jobs}/generic.yaml | 2 +- {jobs => jenkins/jobs}/go.yaml | 2 +- {jobs => jenkins/jobs}/perl-modulebuild.yaml | 2 +- {jobs => jenkins/jobs}/python-distutils.yaml | 2 +- .../projects}/libosinfo+mingw32.yaml | 2 +- .../projects}/libosinfo+mingw64.yaml | 2 +- {projects => jenkins/projects}/libosinfo.yaml | 2 +- .../projects}/libvirt+mingw32.yaml | 2 +- .../projects}/libvirt+mingw64.yaml | 2 +- .../projects}/libvirt-cim.yaml | 2 +- .../projects}/libvirt-dbus.yaml | 2 +- .../projects}/libvirt-glib+mingw32.yaml | 2 +- .../projects}/libvirt-glib+mingw64.yaml | 2 +- .../projects}/libvirt-glib.yaml | 2 +- .../projects}/libvirt-go-xml.yaml | 2 +- .../projects}/libvirt-go.yaml | 2 +- .../projects}/libvirt-ocaml.yaml | 2 +- .../projects}/libvirt-perl.yaml | 2 +- .../projects}/libvirt-python.yaml | 2 +- .../projects}/libvirt-sandbox.yaml | 2 +- .../projects}/libvirt-tck.yaml | 2 +- {projects => jenkins/projects}/libvirt.yaml | 2 +- .../projects}/osinfo-db-tools+mingw32.yaml | 2 +- .../projects}/osinfo-db-tools+mingw64.yaml | 2 +- .../projects}/osinfo-db-tools.yaml | 2 +- {projects => jenkins/projects}/osinfo-db.yaml | 2 +- .../projects}/virt-manager.yaml | 2 +- .../projects}/virt-viewer+mingw32.yaml | 2 +- .../projects}/virt-viewer+mingw64.yaml | 2 +- .../projects}/virt-viewer.yaml | 2 +- 35 files changed, 51 insertions(+), 89 deletions(-) copy README.markdown => jenkins/README.markdown (65%) rename {jobs => jenkins/jobs}/autotools.yaml (99%) rename {jobs => jenkins/jobs}/defaults.yaml (99%) rename {jobs => jenkins/jobs}/generic.yaml (99%) rename {jobs => jenkins/jobs}/go.yaml (99%) rename {jobs => jenkins/jobs}/perl-modulebuild.yaml (99%) rename {jobs => jenkins/jobs}/python-distutils.yaml (99%) rename {projects => jenkins/projects}/libosinfo+mingw32.yaml (98%) rename {projects => jenkins/projects}/libosinfo+mingw64.yaml (98%) rename {projects => jenkins/projects}/libosinfo.yaml (99%) rename {projects => jenkins/projects}/libvirt+mingw32.yaml (98%) rename {projects => jenkins/projects}/libvirt+mingw64.yaml (98%) rename {projects => jenkins/projects}/libvirt-cim.yaml (98%) rename {projects => jenkins/projects}/libvirt-dbus.yaml (99%) rename {projects => jenkins/projects}/libvirt-glib+mingw32.yaml (98%) rename {projects => jenkins/projects}/libvirt-glib+mingw64.yaml (98%) rename {projects => jenkins/projects}/libvirt-glib.yaml (99%) rename {projects => jenkins/projects}/libvirt-go-xml.yaml (99%) rename {projects => jenkins/projects}/libvirt-go.yaml (99%) rename {projects => jenkins/projects}/libvirt-ocaml.yaml (99%) rename {projects => jenkins/projects}/libvirt-perl.yaml (99%) rename {projects => jenkins/projects}/libvirt-python.yaml (99%) rename {projects => jenkins/projects}/libvirt-sandbox.yaml (99%) rename {projects => jenkins/projects}/libvirt-tck.yaml (99%) rename {projects => jenkins/projects}/libvirt.yaml (99%) rename {projects => jenkins/projects}/osinfo-db-tools+mingw32.yaml (98%) rename {projects => jenkins/projects}/osinfo-db-tools+mingw64.yaml (98%) rename {projects => jenkins/projects}/osinfo-db-tools.yaml (99%) rename {projects => jenkins/projects}/osinfo-db.yaml (99%) rename {projects => jenkins/projects}/virt-manager.yaml (99%) rename {projects => jenkins/projects}/virt-viewer+mingw32.yaml (98%) rename {projects => jenkins/projects}/virt-viewer+mingw64.yaml (98%) rename {projects => jenkins/projects}/virt-viewer.yaml (99%) -- 2.20.1

2 6

[libvirt] [PATCH v4 RESEND] openvswitch: Add new port VLAN mode "dot1q-tunnel"(802.1ad double-tagged)
by 芦志朋 18 Feb '19

18 Feb '19

This patch adds functionality to allow libvirt to configure the 'dot1q-tunnel' modes(802.1ad double-tagged) on openvswitch networks. For example: <interface type='bridge'> <mac address='2c:da:41:1d:05:42'/> <source bridge='ovs0'/> <vlan> <tag id='41' nativeMode='dot1q-tunnel'/> </vlan> <virtualport type='openvswitch'> <parameters interfaceid='6401a152-0b99-40b5-92be-858810aa6d37'/> </virtualport> <model type='virtio'/> <driver name='vhost'/> <alias name='net0'/> </interface> Signed-off-by: ZhiPeng Lu <luzhipeng(a)uniudc.com> --- v1->v2: 1. Fix "make syntax-check" failure v2->v3: 1. remove other_config when updating vlan v3->v4: 1. add commit message that has a brief description of the new feature 2. add tests for 'dot1q-tunnel' vlan mode docs/formatdomain.html.in | 20 ++++++++++++++------ docs/formatnetwork.html.in | 20 +++++++++++--------- docs/schemas/networkcommon.rng | 1 + src/conf/netdev_vlan_conf.c | 2 +- src/util/virnetdevopenvswitch.c | 7 +++++++ src/util/virnetdevvlan.h | 1 + tests/networkxml2xmlin/openvswitch-net.xml | 9 +++++++++ tests/networkxml2xmlout/openvswitch-net.xml | 9 +++++++++ .../openvswitch-net-modified.xml | 9 +++++++++ .../openvswitch-net-more-portgroups.xml | 9 +++++++++ .../openvswitch-net-without-alice.xml | 9 +++++++++ 11 files changed, 80 insertions(+), 16 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 2ae5006..2a53d7c 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -6085,8 +6085,14 @@ qemu-kvm -net nic,model=? /dev/null <tag id='42'/> <tag id='123' nativeMode='untagged'/> </vlan> - ... </interface> + <interface type='bridge'> + <vlan trunk='yes'> + <tag id='42'/> + <tag id='123' nativeMode='dot1q-tunnel'/> + </vlan> + </interface> +... </devices> ...</pre> @@ -6122,11 +6128,13 @@ qemu-kvm -net nic,model=? /dev/null For network connections using Open vSwitch it is also possible - to configure 'native-tagged' and 'native-untagged' VLAN modes - Since 1.1.0. This is done with the - optional <code>nativeMode</code> attribute on - the <code><tag></code> subelement: <code>nativeMode</code> - may be set to 'tagged' or 'untagged'. The <code>id</code> + to configure 'native-tagged' and 'native-untagged' + Since 1.1.0. and 'dot1q-tunnel' + (802.1ad double-tagged) Since 5.0.0. + VLAN modes This is done with the optional <code>nativeMode</code> + attribute on the <code><tag></code> subelement: + <code>nativeMode</code> may be set to 'tagged' or 'untagged' or + 'dot1q-tunnel'. The <code>id</code> attribute of the <code><tag></code> subelement containing <code>nativeMode</code> sets which VLAN is considered to be the "native" VLAN for this interface, and diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index 509cca9..cfce4a1 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -705,16 +705,18 @@ For network connections using Open vSwitch it is also possible - to configure 'native-tagged' and 'native-untagged' VLAN modes - Since 1.1.0. This is done with the - optional <code>nativeMode</code> attribute on - the <code><tag></code> subelement: <code>nativeMode</code> - may be set to 'tagged' or 'untagged'. The <code>id</code> - attribute of the <code><tag></code> subelement - containing <code>nativeMode</code> sets which VLAN is considered - to be the "native" VLAN for this interface, and + to configure 'native-tagged' and 'native-untagged' + Since 1.1.0. + and 'dot1q-tunnel'(802.1ad double-tagged) VLAN modes. + Since 5.0.0. This is done with the + optional <code>nativeMode</code> attribute on the + <code><tag></code> subelement: <code>nativeMode</code> + may be set to 'tagged' or 'untagged' or 'dot1q-tunnel'. + The <code>id</code> attribute of the <code><tag></code> + subelement containing <code>nativeMode</code> sets which VLAN is + considered to be the "native" VLAN for this interface, and the <code>nativeMode</code> attribute determines whether or not - traffic for that VLAN will be tagged. + traffic for that VLAN will be tagged or QinQ. <code><vlan></code> elements can also be specified in diff --git a/docs/schemas/networkcommon.rng b/docs/schemas/networkcommon.rng index 2699555..11c48ff 100644 --- a/docs/schemas/networkcommon.rng +++ b/docs/schemas/networkcommon.rng @@ -223,6 +223,7 @@ <choice> <value>tagged</value> <value>untagged</value> + <value>dot1q-tunnel</value> </choice> </attribute> </optional> diff --git a/src/conf/netdev_vlan_conf.c b/src/conf/netdev_vlan_conf.c index 57d73ed..892d31c 100644 --- a/src/conf/netdev_vlan_conf.c +++ b/src/conf/netdev_vlan_conf.c @@ -25,7 +25,7 @@ #define VIR_FROM_THIS VIR_FROM_NONE VIR_ENUM_IMPL(virNativeVlanMode, VIR_NATIVE_VLAN_MODE_LAST, - "default", "tagged", "untagged", + "default", "tagged", "untagged", "dot1q-tunnel", ); int diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index 4fa3a57..dd2aeac 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -85,6 +85,11 @@ virNetDevOpenvswitchConstructVlans(virCommandPtr cmd, virNetDevVlanPtr virtVlan) virCommandAddArg(cmd, "vlan_mode=native-untagged"); virCommandAddArgFormat(cmd, "tag=%d", virtVlan->nativeTag); break; + case VIR_NATIVE_VLAN_MODE_DOT1Q_TUNNEL: + virCommandAddArg(cmd, "vlan_mode=dot1q-tunnel"); + virCommandAddArg(cmd, "other_config:qinq-ethtype=802.1q"); + virCommandAddArgFormat(cmd, "tag=%d", virtVlan->nativeTag); + break; case VIR_NATIVE_VLAN_MODE_DEFAULT: default: break; @@ -498,6 +503,8 @@ int virNetDevOpenvswitchUpdateVlan(const char *ifname, "--", "--if-exists", "clear", "Port", ifname, "tag", "--", "--if-exists", "clear", "Port", ifname, "trunk", "--", "--if-exists", "clear", "Port", ifname, "vlan_mode", + "--", "--if-exists", "remove", "Port", ifname, + "other_config", "qinq-ethtype", "--", "--if-exists", "set", "Port", ifname, NULL); if (virNetDevOpenvswitchConstructVlans(cmd, virtVlan) < 0) diff --git a/src/util/virnetdevvlan.h b/src/util/virnetdevvlan.h index 2a13759..9d0a2bd 100644 --- a/src/util/virnetdevvlan.h +++ b/src/util/virnetdevvlan.h @@ -27,6 +27,7 @@ typedef enum { VIR_NATIVE_VLAN_MODE_DEFAULT = 0, VIR_NATIVE_VLAN_MODE_TAGGED, VIR_NATIVE_VLAN_MODE_UNTAGGED, + VIR_NATIVE_VLAN_MODE_DOT1Q_TUNNEL, VIR_NATIVE_VLAN_MODE_LAST } virNativeVlanMode; diff --git a/tests/networkxml2xmlin/openvswitch-net.xml b/tests/networkxml2xmlin/openvswitch-net.xml index 2f6084d..0952859 100644 --- a/tests/networkxml2xmlin/openvswitch-net.xml +++ b/tests/networkxml2xmlin/openvswitch-net.xml @@ -30,4 +30,13 @@ <parameters profileid='native-profile'/> </virtualport> </portgroup> + <portgroup name='8021ad'> + <vlan trunk='yes'> + <tag id='555' nativeMode='dot1q-tunnel'/> + <tag id='666'/> + </vlan> + <virtualport> + <parameters profileid='8021ad-profile'/> + </virtualport> + </portgroup> </network> diff --git a/tests/networkxml2xmlout/openvswitch-net.xml b/tests/networkxml2xmlout/openvswitch-net.xml index 2f6084d..0952859 100644 --- a/tests/networkxml2xmlout/openvswitch-net.xml +++ b/tests/networkxml2xmlout/openvswitch-net.xml @@ -30,4 +30,13 @@ <parameters profileid='native-profile'/> </virtualport> </portgroup> + <portgroup name='8021ad'> + <vlan trunk='yes'> + <tag id='555' nativeMode='dot1q-tunnel'/> + <tag id='666'/> + </vlan> + <virtualport> + <parameters profileid='8021ad-profile'/> + </virtualport> + </portgroup> </network> diff --git a/tests/networkxml2xmlupdateout/openvswitch-net-modified.xml b/tests/networkxml2xmlupdateout/openvswitch-net-modified.xml index cc0c344..e5794fc 100644 --- a/tests/networkxml2xmlupdateout/openvswitch-net-modified.xml +++ b/tests/networkxml2xmlupdateout/openvswitch-net-modified.xml @@ -30,4 +30,13 @@ <parameters profileid='native-profile'/> </virtualport> </portgroup> + <portgroup name='8021ad'> + <vlan trunk='yes'> + <tag id='555' nativeMode='dot1q-tunnel'/> + <tag id='666'/> + </vlan> + <virtualport> + <parameters profileid='8021ad-profile'/> + </virtualport> + </portgroup> </network> diff --git a/tests/networkxml2xmlupdateout/openvswitch-net-more-portgroups.xml b/tests/networkxml2xmlupdateout/openvswitch-net-more-portgroups.xml index 7c19ad9..3df0b96 100644 --- a/tests/networkxml2xmlupdateout/openvswitch-net-more-portgroups.xml +++ b/tests/networkxml2xmlupdateout/openvswitch-net-more-portgroups.xml @@ -41,4 +41,13 @@ <parameters profileid='native-profile'/> </virtualport> </portgroup> + <portgroup name='8021ad'> + <vlan trunk='yes'> + <tag id='555' nativeMode='dot1q-tunnel'/> + <tag id='666'/> + </vlan> + <virtualport> + <parameters profileid='8021ad-profile'/> + </virtualport> + </portgroup> </network> diff --git a/tests/networkxml2xmlupdateout/openvswitch-net-without-alice.xml b/tests/networkxml2xmlupdateout/openvswitch-net-without-alice.xml index 4104424..38846aa 100644 --- a/tests/networkxml2xmlupdateout/openvswitch-net-without-alice.xml +++ b/tests/networkxml2xmlupdateout/openvswitch-net-without-alice.xml @@ -20,4 +20,13 @@ <parameters profileid='native-profile'/> </virtualport> </portgroup> + <portgroup name='8021ad'> + <vlan trunk='yes'> + <tag id='555' nativeMode='dot1q-tunnel'/> + <tag id='666'/> + </vlan> + <virtualport> + <parameters profileid='8021ad-profile'/> + </virtualport> + </portgroup> </network> -- 1.8.3.1

2 1

[libvirt] [PATCH] remove remains of kqemu
by Ján Tomko 18 Feb '19

18 Feb '19

We dropped support in commit 8e91a40 (November 2015), but some occurrences still remained, even in live code. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> Reported-by: Thomas Huth <thuth(a)redhat.com> --- docs/drvqemu.html.in | 2 +- docs/formatdomain.html.in | 2 +- src/qemu/qemu.conf | 2 +- src/qemu/qemu_cgroup.c | 2 +- src/qemu/qemu_driver.c | 3 --- src/qemu/test_libvirtd_qemu.aug.in | 5 ++--- src/security/apparmor/libvirt-qemu | 1 - 7 files changed, 6 insertions(+), 11 deletions(-) diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in index 5ad956740f..0218b5a7a9 100644 --- a/docs/drvqemu.html.in +++ b/docs/drvqemu.html.in @@ -395,7 +395,7 @@ chmod o+x /path/to/directory <pre> /dev/null, /dev/full, /dev/zero, /dev/random, /dev/urandom, -/dev/ptmx, /dev/kvm, /dev/kqemu, +/dev/ptmx, /dev/kvm, /dev/rtc, /dev/hpet </pre> diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 2ae5006849..7882c54bc1 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -22,7 +22,7 @@ <a id="attributeDomainType"><code>type</code></a> specifies the hypervisor used for running the domain. The allowed values are driver specific, but - include "xen", "kvm", "qemu", "lxc" and "kqemu". The + include "xen", "kvm", "qemu" and "lxc". The second attribute is <code>id</code> which is a unique integer identifier for the running guest machine. Inactive machines have no id value. diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 7820e72dd8..334b4cd4ee 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -489,7 +489,7 @@ #cgroup_device_acl = [ # "/dev/null", "/dev/full", "/dev/zero", # "/dev/random", "/dev/urandom", -# "/dev/ptmx", "/dev/kvm", "/dev/kqemu", +# "/dev/ptmx", "/dev/kvm", # "/dev/rtc","/dev/hpet" #] # diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index e88cb8c45f..c23f0af2aa 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -45,7 +45,7 @@ VIR_LOG_INIT("qemu.qemu_cgroup"); const char *const defaultDeviceACL[] = { "/dev/null", "/dev/full", "/dev/zero", "/dev/random", "/dev/urandom", - "/dev/ptmx", "/dev/kvm", "/dev/kqemu", + "/dev/ptmx", "/dev/kvm", "/dev/rtc", "/dev/hpet", NULL, }; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 024ee5b62d..5118f4ad42 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1260,9 +1260,6 @@ qemuConnectGetMaxVcpus(virConnectPtr conn ATTRIBUTE_UNUSED, const char *type) if (STRCASEEQ(type, "kvm")) return virHostCPUGetKVMMaxVCPUs(); - if (STRCASEEQ(type, "kqemu")) - return 1; - virReportError(VIR_ERR_INVALID_ARG, _("unknown type '%s'"), type); return -1; diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index 51a7ad5892..fea1d308b7 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -60,9 +60,8 @@ module Test_libvirtd_qemu = { "5" = "/dev/urandom" } { "6" = "/dev/ptmx" } { "7" = "/dev/kvm" } - { "8" = "/dev/kqemu" } - { "9" = "/dev/rtc" } - { "10" = "/dev/hpet" } + { "8" = "/dev/rtc" } + { "9" = "/dev/hpet" } } { "save_image_format" = "raw" } { "dump_image_format" = "raw" } diff --git a/src/security/apparmor/libvirt-qemu b/src/security/apparmor/libvirt-qemu index eaa5167525..7d28faa163 100644 --- a/src/security/apparmor/libvirt-qemu +++ b/src/security/apparmor/libvirt-qemu @@ -23,7 +23,6 @@ /dev/net/tun rw, /dev/kvm rw, /dev/ptmx rw, - /dev/kqemu rw, @{PROC}/*/status r, # When qemu is signaled to terminate, it will read cmdline of signaling # process for reporting purposes. Allowing read access to a process -- 2.19.2

3 2