- Devel - libvirt List Archives

[libvirt] [PATCH] Fix snapshot-create-as in man page
by shyu 31 Mar '14

31 Mar '14

Fix bug https://bugzilla.redhat.com/show_bug.cgi?id=1080859 about snapshot type in man page. Snapshot type should be no, internal, or external --- tools/virsh.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 20352cb..ba2da20 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -3070,7 +3070,7 @@ is specified, the snapshot will not include vm state. The I<--memspec> option can be used to control whether a checkpoint is internal or external. The I<--memspec> flag is mandatory, followed by a B<memspec> of the form B<[file=]name[,snapshot=type]>, where -type can be B<none>, B<internal>, or B<external>. To include a literal +type can be B<no>, B<internal>, or B<external>. To include a literal comma in B<file=name>, escape it with a second comma. I<--memspec> cannot be used together with I<--disk-only>. -- 1.8.5.3

2 1

[libvirt] [PATCH 0/2] ESX: Implement virDomainScreenshot
by Dawid Zamirski 30 Mar '14

30 Mar '14

Hello, The following patches implement virDomainScreenshot for the ESX driver. The screenshot VI API call was added in version 4.0, therefore, I had to make changes to esx_vi_generator.py in order to allow VI method calls for versions newer than 2.5. This was done by adding an optional "apiVersion" token to the method header definition in the .input file. If it is not specified, "2.5" will be used so existing VI calls will work "as is" without any code updates. Regards, Dawid Zamirski (2): ESX: Allow method calls for VI version > 2.5 ESX: Implement virDomainScreenshot src/esx/esx_driver.c | 173 +++++++++++++++++++++++++++++++++++++++++ src/esx/esx_vi.c | 26 ++++++- src/esx/esx_vi.h | 2 +- src/esx/esx_vi_generator.input | 19 ++++- src/esx/esx_vi_generator.py | 20 +++-- src/esx/esx_vi_methods.c | 12 +-- 6 files changed, 238 insertions(+), 14 deletions(-) -- 1.9.0

2 4

[libvirt] Entering freeze for libvirt-1.2.3
by Daniel Veillard 30 Mar '14

30 Mar '14

I'm one day late but i have tagged the tree and pushed a release candidate 1 tarball and associated rpms to the usual place: ftp://libvirt.org/libvirt/ Being optimistic maybe we can push it on April 1st but maybe it will be safer to wait for Wed for more feedback. I gave it a bit of testing, it looks fine with my limited check, but please give it a try :-) ! thanks, Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 1

[libvirt] [PATCH] ESX: Add support for virtualHW version 10
by Dawid Zamirski 30 Mar '14

30 Mar '14

This follows the same pattern when v8 and v9 were added. I've tested this with my ESX 5.5 and seems to work fine. --- src/vmx/vmx.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 32ddd05..5dc9925 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -49,6 +49,7 @@ domain-xml <=> vmx virtualHW.version = "7" # essential for ESX 4.0 virtualHW.version = "8" # essential for ESX 5.0 virtualHW.version = "9" # essential for ESX 5.1 + virtualHW.version = "10" # essential for ESX 5.5 ??? <=> guestOS = "<value>" # essential, FIXME: not representable @@ -1316,10 +1317,11 @@ virVMXParseConfig(virVMXContext *ctx, } if (virtualHW_version != 4 && virtualHW_version != 7 && - virtualHW_version != 8 && virtualHW_version != 9) { + virtualHW_version != 8 && virtualHW_version != 9 && + virtualHW_version != 10) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Expecting VMX entry 'virtualHW.version' to be " - "4, 7, 8 or 9 but found %lld"), + "4, 7, 8, 9 or 10 but found %lld"), virtualHW_version); goto cleanup; } -- 1.9.0

2 1

[libvirt] [PATCH 0/5] Another attempt at improving virsh autocompletion
by Solly Ross 30 Mar '14

30 Mar '14

This patch set represents yet another attempt to improve the virsh autocompletion. When writing this patch, I tried to take into account the comments on the previous attempt at autocompletion by Tomas Meszaros. Specifically, it was reccomended that any completion use the existing methods that virsh has in place to parse the partial line being completed. When doing so, I found that I was duplicating a significant portion of the code in vshCommandParse. Since the comments on Tomas's code suggested refactoring common code into a separate function, I attempted to do so with vshCommandParse. One of the primary issues with simply just moving the parsing logic from vshCommandParse into a separate function was that vshCommandParse throws errors when it encounters unknown or invalid information. While this is the correct behavior for parsing a command to be executed, it is not appropriate for autocompletion. Essentially, the new function represents one iteration of the main loop from vshCommandParse. However, instead of constructing a parsed option or command object at the end, or returning errors, it returns a "state" value and sets pointers. Then, a calling function may choose to deal with the state values (like vshCommandParse) or ignore most of the state values (like the completion code, which ignores most state and errors, as it is just interested in which flags have already been used). This is perhaps the most "dangerous" and controversial part of the patch set, so I figured I'd get some feedback before progressing any further. The other significant changes in the patch set (besides richer completion support) are as follows: - completion no longer automatically falls back to readline's default filename completion. Instead, if filename completion is desired, an option may be explicitly marked as requiring filename completion. - when readline support is enable, a global vshControl object is made available by way of a macro/function. When readline support is disabled, the global is not included and the macro simply returns NULL. This global is required for smart completers. - the code which is used by the "list" command has been moved from virsh-domain-monitor to virsh-completer. This way, it is accessible to both the "list" command code and the domain completer. Note that none of the options which use the domain completer currently have flags set to indicate whether active or inactive domains should be completed. If this completion patch-set is OKed, then I will go back and add these flags. Currently, the commit is there simply to make testing out the new completion easier. Solly Ross (5): Improve virsh autocompletion (extract parser) Improve virsh autocompletion (base framework) Improve virsh autocompletion (global ctl object) Improve virsh autocompletion (domain completer) Improve virsh autocompletion (enum completer macro) outgoing/0000-cover-letter.patch | 68 + ...prove-virsh-autocompletion-extract-parser.patch | 428 ++++++ ...prove-virsh-autocompletion-base-framework.patch | 278 ++++ ...ve-virsh-autocompletion-global-ctl-object.patch | 116 ++ ...ove-virsh-autocompletion-domain-completer.patch | 1479 ++++++++++++++++++++ ...virsh-autocompletion-enum-completer-macro.patch | 131 ++ tools/Makefile.am | 3 +- tools/virsh-completer.c | 353 +++++ tools/virsh-completer.h | 86 ++ tools/virsh-domain-monitor.c | 287 +--- tools/virsh-domain.c | 72 + tools/virsh-snapshot.c | 11 + tools/virsh.c | 517 +++++-- tools/virsh.h | 13 + 14 files changed, 3447 insertions(+), 395 deletions(-) create mode 100644 outgoing/0000-cover-letter.patch create mode 100644 outgoing/0001-Improve-virsh-autocompletion-extract-parser.patch create mode 100644 outgoing/0002-Improve-virsh-autocompletion-base-framework.patch create mode 100644 outgoing/0003-Improve-virsh-autocompletion-global-ctl-object.patch create mode 100644 outgoing/0004-Improve-virsh-autocompletion-domain-completer.patch create mode 100644 outgoing/0005-Improve-virsh-autocompletion-enum-completer-macro.patch create mode 100644 tools/virsh-completer.c create mode 100644 tools/virsh-completer.h -- 1.8.3.2

2 7

[libvirt] [PATCH 0/2] Remove and prohibit Windows special chars in filenames
by Matthias Bolte 29 Mar '14

29 Mar '14

After I fixed the first problem with a : in a filename a second instance occured shortly afterwards. The first patch fixes this problem and the second patch adds a syntax-check rule to prohibit such Windows special chars in filenames. Matthias

2 4

[libvirt] [PATCH]execute netdev_del after receive DEVICE_DELETED event
by x00221466 29 Mar '14

29 Mar '14

Hi, When live detaching the virtual net device, such as virtio nic、 RTL8139、E1000, there are some problems: (1)If the Guest OS don't support the hot plugging pci device, detach the virtual network device by Libvirt, the "net device" in Qemu will still exist, but "hostnet"(tap) in Qemu will be removed. so the net device in Guest OS will be of no effect. (2)If reject the nic in Guest OS, Qemu will remove the "net device", then Qemu send DEVICE_DELETED to Libvirt, Libvirt receive the event in event-loop thread and release info of the net device in qemuDomainRemoveNetDevice func. but "hostnet" in Qemu still exist. So next live attaching virtual net device will be failed because of "Duplicate ID". #virsh attach-device win2008_st_r2_64 net.xml --live error: Failed to attach device from net.xml error: internal error: unable to execute QEMU command 'netdev_add': Duplicate ID 'hostnet0' for netdev (3)In addition, in qemuDomainDetachNetDevice, detach net device func, "netdev_del" command will be sent after sending "device_del" command at once. So it is violent to remove the tap device before the net device is completely removed. So I think it's more logical that doing the work of sending Qemu command "netdev_del" after receive the DEVICE_DELETED event. It can avoid the conflict of device info between Libvirt side and Qemu side. I create a thread in qemuDomainRemoveDevice,the handle of DEVICE_DELETED event, to execute QEMU command "netdev_del". Regards, -xie Signed-off-by: xiexiangyou <xiexiangyou(a)huawei.com> --- src/qemu/qemu_hotplug.c | 154 +++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 137 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index bf4f160..81f6a56 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2699,6 +2699,124 @@ qemuDomainRemoveChrDevice(virQEMUDriverPtr driver, virDomainChrDefFree(chr); } +typedef struct privVmDevDriver { + virQEMUDriverPtr driver; + virDomainObjPtr vm; + virDomainDeviceDefPtr dev; +}privVmDevDriver, *privVmDevDriverPtr; + +static void +qemuProcessRemoveNetDevice(void *opaque) +{ + privVmDevDriverPtr privData = opaque; + virQEMUDriverPtr driver = privData->driver; + virDomainObjPtr vm = privData->vm; + virDomainDeviceDefPtr dev = privData->dev; + + qemuDomainObjPrivatePtr priv = vm->privateData; + char mac[VIR_MAC_STRING_BUFLEN]; + int detachidx; + virDomainNetDefPtr detach = NULL; + char *hostnet_name = NULL; + int vlan; + + virObjectLock(vm); + + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) + goto cleanup; + + detachidx = virDomainNetFindIdx(vm->def, dev->data.net) + if (detachidx == -2) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("multiple devices matching mac address %s found"), + virMacAddrFormat(&dev->data.net->mac, mac)); + goto endjob; + } + else if (detachidx < 0) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("network device %s not found"), + virMacAddrFormat(&dev->data.net->mac, mac)); + goto endjob; + } + detach = vm->def->nets[detachidx]; + if (virAsprintf(&hostnet_name, "host%s", detach->info.alias) < 0) { + virReportOOMError(); + goto endjob; + } + if ((vlan = qemuDomainNetVLAN(detach)) < 0) { + virReportError(VIR_ERR_OPERATION_FAILED, + "%s", _("unable to determine original VLAN")); + goto endjob; + } + + qemuDomainObjEnterMonitor(driver, vm); + if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NETDEV) && + virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { + if (qemuMonitorRemoveNetdev(priv->mon, hostnet_name) < 0) { + qemuDomainObjExitMonitor(driver, vm); + virDomainAuditNet(vm, detach, NULL, "detach", false); + goto endjob; + } + } else { + if (qemuMonitorRemoveHostNetwork(priv->mon, vlan, hostnet_name) < 0) { + qemuDomainObjExitMonitor(driver, vm); + virDomainAuditNet(vm, detach, NULL, "detach", false); + goto endjob; + } + } + qemuDomainObjExitMonitor(driver, vm); + + qemuDomainRemoveNetDevice(driver, vm, dev->data.net) + +endjob: + if (!qemuDomainObjEndJob(driver, vm)) + vm = NULL; + +cleanup: + VIR_FREE(hostnet_name); + VIR_FREE(privData->dev); + VIR_FREE(privData); + + if (vm && virObjectUnref(vm)) + virObjectUnlock(vm); +} + +static void +qemuRemoveNetDeviceJob(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virDomainDeviceDefPtr dev) +{ + virThread th; + privVmDevDriverPtr data = NULL; + virDomainDeviceDefPtr device = NULL; + + if (VIR_ALLOC(data) < 0) { + VIR_ERROR(_("Failed to alloc VmDevDriver")); + return; + } + + if (VIR_ALLOC(device) < 0) { + VIR_ERROR(_("Failed to alloc virDomainDeviceDefPtr")); + VIR_FREE(data); + return; + } + memcpy(device, dev, sizeof(*device)); + + data->dev = device; + data->driver = driver; + data->vm = vm; + virObjectRef(vm); + if (virThreadCreate(&th, + false, + qemuProcessRemoveNetDevice, + data) < 0) { + VIR_ERROR(_("Failed to create remove net device thread")); + VIR_FREE(device); + VIR_FREE(data); + virObjectUnref(vm); + } + +} void qemuDomainRemoveDevice(virQEMUDriverPtr driver, @@ -2713,7 +2831,7 @@ qemuDomainRemoveDevice(virQEMUDriverPtr driver, qemuDomainRemoveControllerDevice(driver, vm, dev->data.controller); break; case VIR_DOMAIN_DEVICE_NET: - qemuDomainRemoveNetDevice(driver, vm, dev->data.net) + qemuRemoveNetDeviceJob(driver, vm, dev); break; case VIR_DOMAIN_DEVICE_HOSTDEV: qemuDomainRemoveHostDevice(driver, vm, dev->data.hostdev); @@ -3419,26 +3537,28 @@ qemuDomainDetachNetDevice(virQEMUDriverPtr driver, goto cleanup; } } + qemuDomainObjExitMonitor(driver, vm); - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NETDEV) && - virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { - if (qemuMonitorRemoveNetdev(priv->mon, hostnet_name) < 0) { - qemuDomainObjExitMonitor(driver, vm); - virDomainAuditNet(vm, detach, NULL, "detach", false); - goto cleanup; - } - } else { - if (qemuMonitorRemoveHostNetwork(priv->mon, vlan, hostnet_name) < 0) { - qemuDomainObjExitMonitor(driver, vm); - virDomainAuditNet(vm, detach, NULL, "detach", false); - goto cleanup; + if (!qemuDomainWaitForDeviceRemoval(vm)) { + qemuDomainObjEnterMonitor(driver, vm); + if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NETDEV) && + virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { + if (qemuMonitorRemoveNetdev(priv->mon, hostnet_name) < 0) { + qemuDomainObjExitMonitor(driver, vm); + virDomainAuditNet(vm, detach, NULL, "detach", false); + goto cleanup; + } + } else { + if (qemuMonitorRemoveHostNetwork(priv->mon, vlan, hostnet_name) < 0) { + qemuDomainObjExitMonitor(driver, vm); + virDomainAuditNet(vm, detach, NULL, "detach", false); + goto cleanup; + } } - } - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(driver, vm); - if (!qemuDomainWaitForDeviceRemoval(vm)) qemuDomainRemoveNetDevice(driver, vm, detach); - + } ret = 0; cleanup: -- 1.6.0.2

5 6

[libvirt] [PATCH] Fix virNodeDeviceListCaps always returns empty
by Jincheng Miao 29 Mar '14

29 Mar '14

virNodeDeviceListCaps will always return empty for a pci nodedevice, actually it should return 'pci'. It is because the loop variable ncaps isn't increased. https://bugzilla.redhat.com/show_bug.cgi?id=1081932 Signed-off-by: Jincheng Miao <jmiao(a)redhat.com> --- src/node_device/node_device_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index 1f3a083..6906463 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -420,7 +420,7 @@ nodeDeviceListCaps(virNodeDevicePtr dev, char **const names, int maxnames) goto cleanup; for (caps = obj->def->caps; caps && ncaps < maxnames; caps = caps->next) { - if (VIR_STRDUP(names[ncaps], virNodeDevCapTypeToString(caps->type)) < 0) + if (VIR_STRDUP(names[ncaps++], virNodeDevCapTypeToString(caps->type)) < 0) goto cleanup; } ret = ncaps; -- 1.8.2.1

2 1

[libvirt] [PATCH v5 for 2.0 0/3] ABI change: change group name of option table to match with option name
by Amos Kong 28 Mar '14

28 Mar '14

This patchset changes group names of option tables to match with option name, this breakes ABI, release note was updated. V4: fix tpmdev, add name matching test (markus) V5: adjust patch order (paolo) Amos Kong (3): only add qemu_tpmdev_opts when CONFIG_TPM is defined update names in option tables to match with actual command-line spelling abort QEMU if group name in option table doesn't match with defined option name hw/acpi/core.c | 8 ++++---- hw/nvram/fw_cfg.c | 4 ++-- include/qemu/option.h | 2 +- qemu-options.h | 12 ++++++++++++ util/qemu-config.c | 28 ++++++++++++++++++++++++++++ vl.c | 37 +++++++++++++------------------------ 6 files changed, 60 insertions(+), 31 deletions(-) -- 1.8.5.3

4 10

[libvirt] [PATCH 0/3] Improve support for mocking APIs in tests
by Daniel P. Berrange 28 Mar '14

28 Mar '14

This short series introduces some helpers for mocking tests, provides a generic DBus mock helper using them and switches the systemd test to use these helpers. This will remove much code duplication in a later firewall test. Daniel P. Berrange (3): Introduce a new set of helper macros for mocking symbols Create a re-usable DBus LD_PRELOAD mock library Switch systemd test to use generic dbus mock tests/Makefile.am | 23 +++-- tests/virmock.h | 264 +++++++++++++++++++++++++++++++++++++++++++++++++ tests/virmockdbus.c | 64 ++++++++++++ tests/virsystemdmock.c | 132 ------------------------- tests/virsystemdtest.c | 86 +++++++++++++++- 5 files changed, 422 insertions(+), 147 deletions(-) create mode 100644 tests/virmock.h create mode 100644 tests/virmockdbus.c delete mode 100644 tests/virsystemdmock.c -- 1.8.5.3

2 4

[libvirt] [PATCH tck] 300-vsitype.t: skip earlier if lldptool is not available
by Mike Latimer 28 Mar '14

28 Mar '14

Move the test for /usr/sbin/lldptool up so libvirt-tck will report the skip and reason, rather than passing the test as 'ok'. --- scripts/nwfilter/300-vsitype.t | 48 ++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/scripts/nwfilter/300-vsitype.t b/scripts/nwfilter/300-vsitype.t index 3d06803..58e8469 100644 --- a/scripts/nwfilter/300-vsitype.t +++ b/scripts/nwfilter/300-vsitype.t @@ -26,7 +26,14 @@ The test case validates that the corrrect VSI is set in the adjacent switch use strict; use warnings; -use Test::More tests => 3; +use Test::More; + +if ( ! -e '/usr/sbin/lldptool' ) { + eval "use Test::More skip_all => \"lldptool is not available\";"; +} else { + eval "use Test::More tests => 3"; +} + use Sys::Virt::TCK; use Sys::Virt::TCK::NetworkHelpers; @@ -41,34 +48,29 @@ END { $tck->cleanup if $tck; } -SKIP: { - skip "lldptool not present", 3 unless -e "/usr/sbin/lldptool"; - # creating domain - my $dom1; - my $dom_name ="tck8021Qbgtest"; +my $dom1; +my $dom_name ="tck8021Qbgtest"; # speficy mode="vepa" for a direct interface - $dom1 = prepare_test_disk_and_vm($tck, $conn, $dom_name, "vepa"); - $dom1->create(); +$dom1 = prepare_test_disk_and_vm($tck, $conn, $dom_name, "vepa"); +$dom1->create(); - ok($dom1->get_id() > 0, "running domain has an ID > 0"); - my $xml = $dom1->get_xml_description; - diag $xml; - my $mac1 = get_first_macaddress($dom1); - diag "mac is $mac1"; +ok($dom1->get_id() > 0, "running domain has an ID > 0"); +my $xml = $dom1->get_xml_description; +diag $xml; +my $mac1 = get_first_macaddress($dom1); +diag "mac is $mac1"; - sleep(30); +sleep(30); # check vsi information - diag "Verifying VSI information using lldptool"; - my $lldptool = `/usr/sbin/lldptool -t -i eth2 -V vdp mode`; - diag $lldptool; +diag "Verifying VSI information using lldptool"; +my $lldptool = `/usr/sbin/lldptool -t -i eth2 -V vdp mode`; +diag $lldptool; # check if instance is listed - ok($lldptool =~ "instance", "check instance"); - ok($lldptool =~ $mac1, "check mac as well"); - - shutdown_vm_gracefully($dom1); - exit 0; +ok($lldptool =~ "instance", "check instance"); +ok($lldptool =~ $mac1, "check mac as well"); -}; +shutdown_vm_gracefully($dom1); +exit 0; -- 1.8.4.5

2 3

[libvirt] [PATCH 0/2] Fix virHostdev with session libvirt
by Ján Tomko 28 Mar '14

28 Mar '14

Reported by Richard W.M. Jones: https://www.redhat.com/archives/libvir-list/2014-March/msg01780.html Ján Tomko (2): Remove double free in virHostdevManagerDispose Create hostdevmgr in UserRuntimeDirectory for session libvirt src/util/virhostdev.c | 42 +++++++++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 9 deletions(-) -- 1.8.3.2

2 4

[libvirt] [PATCH] Expose SLIRP attributes
by Michal Privoznik 28 Mar '14

28 Mar '14

We allow users to use SLIRP stack. However, there are some knobs which are not exposed to users, such as host network address, DNS server, smb, and others. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/formatdomain.html.in | 7 +- docs/schemas/domaincommon.rng | 23 +++++- src/conf/domain_conf.c | 88 ++++++++++++++++++++++ src/conf/domain_conf.h | 6 ++ src/qemu/qemu_command.c | 19 +++++ .../qemuxml2argvdata/qemuxml2argv-net-user-ip.args | 7 ++ .../qemuxml2argvdata/qemuxml2argv-net-user-ip.xml | 33 ++++++++ tests/qemuxml2argvtest.c | 1 + 8 files changed, 180 insertions(+), 4 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-user-ip.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-user-ip.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 7f90455..0a353ca 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3225,7 +3225,11 @@ starting from <code>10.0.2.15</code>. The default router will be <code>10.0.2.2</code> and the DNS server will be <code>10.0.2.3</code>. This networking is the only option for unprivileged users who need their - VMs to have outgoing access. + VMs to have outgoing access. <span class="since">Since 1.2.3</span> the + user network can have the <ip/> element to override the default + network of <code>10.0.2.0/24</code>. For example it can be set to + <code>192.168.2.0/24</code>. The whole element and its attributes are + optional. </p> <pre> @@ -3235,6 +3239,7 @@ ... <interface type='user'> <mac address="00:11:22:33:44:55"/> + <ip address="192.168.2.0" prefix="24" dns="192.168.2.3" dhcpstart="192.168.2.9"/> </interface> </devices> ...</pre> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index bcd8142..5745ce7 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2152,9 +2152,26 @@ </optional> <optional> <element name="ip"> - <attribute name="address"> - <ref name="ipv4Addr"/> - </attribute> + <optional> + <attribute name="address"> + <ref name="ipv4Addr"/> + </attribute> + </optional> + <optional> + <attribute name="prefix"> + <data type="integer"/> + </attribute> + </optional> + <optional> + <attribute name="dns"> + <ref name="ipv4Addr"/> + </attribute> + </optional> + <optional> + <attribute name="dhcpstart"> + <ref name="ipv4Addr"/> + </attribute> + </optional> <empty/> </element> </optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6fb216e..aec14ed 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1539,6 +1539,11 @@ void virDomainNetDefFree(virDomainNetDefPtr def) break; case VIR_DOMAIN_NET_TYPE_USER: + VIR_FREE(def->data.user.ipaddr); + VIR_FREE(def->data.user.dns); + VIR_FREE(def->data.user.dhcpstart); + break; + case VIR_DOMAIN_NET_TYPE_LAST: break; } @@ -6669,6 +6674,9 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, char *mode = NULL; char *linkstate = NULL; char *addrtype = NULL; + char *prefix = NULL; + char *dns = NULL; + char *dhcpstart = NULL; virNWFilterHashTablePtr filterparams = NULL; virDomainActualNetDefPtr actual = NULL; xmlNodePtr oldnode = ctxt->node; @@ -6750,6 +6758,13 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, def->type == VIR_DOMAIN_NET_TYPE_BRIDGE) && xmlStrEqual(cur->name, BAD_CAST "ip")) { address = virXMLPropString(cur, "address"); + } else if (!address && + def->type == VIR_DOMAIN_NET_TYPE_USER && + xmlStrEqual(cur->name, BAD_CAST "ip")) { + address = virXMLPropString(cur, "address"); + prefix = virXMLPropString(cur, "prefix"); + dns = virXMLPropString(cur, "dns"); + dhcpstart = virXMLPropString(cur, "dhcpstart"); } else if (!ifname && xmlStrEqual(cur->name, BAD_CAST "target")) { ifname = virXMLPropString(cur, "dev"); @@ -6988,6 +7003,59 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, break; case VIR_DOMAIN_NET_TYPE_USER: + if (prefix) { + if (!address) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("can't use prefix without an address")); + goto error; + } + + if (virStrToLong_i(prefix, NULL, 10, &def->data.user.prefix) < 0 || + def->data.user.prefix < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Invalid prefix: '%s'"), prefix); + goto error; + } + } else { + def->data.user.prefix = -1; + } + + if (address) { + if (virSocketAddrParse(NULL, address, AF_UNSPEC) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Invalid address: '%s'"), address); + goto error; + } + + def->data.user.ipaddr = address; + address = NULL; + } + + if (dns) { + if (virSocketAddrParse(NULL, dns, AF_UNSPEC) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Invalid dns address: '%s'"), dns); + goto error; + } + + def->data.user.dns = dns; + dns = NULL; + } + + if (dhcpstart) { + if (virSocketAddrParse(NULL, dhcpstart, AF_UNSPEC) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Invalid dhcpstart address: '%s'"), + dhcpstart); + goto error; + } + + def->data.user.dhcpstart = dhcpstart; + dhcpstart = NULL; + } + + break; + case VIR_DOMAIN_NET_TYPE_LAST: break; } @@ -7134,6 +7202,9 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, VIR_FREE(mode); VIR_FREE(linkstate); VIR_FREE(addrtype); + VIR_FREE(prefix); + VIR_FREE(dns); + VIR_FREE(dhcpstart); virNWFilterHashTableFree(filterparams); return def; @@ -15766,6 +15837,23 @@ virDomainNetDefFormat(virBufferPtr buf, break; case VIR_DOMAIN_NET_TYPE_USER: + if (def->data.user.ipaddr || + def->data.user.dns || + def->data.user.dhcpstart) { + virBufferAddLit(buf, "<ip"); + + if (def->data.user.ipaddr) { + virBufferAsprintf(buf, " address='%s'", def->data.user.ipaddr); + if (def->data.user.prefix >= 0) + virBufferAsprintf(buf, " prefix='%d'", def->data.user.prefix); + } + + virBufferEscapeString(buf, " dns='%s'", def->data.user.dns); + virBufferEscapeString(buf, " dhcpstart='%s'", def->data.user.dhcpstart); + virBufferAddLit(buf, "/>\n"); + } + break; + case VIR_DOMAIN_NET_TYPE_LAST: break; } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index f3f24c4..b5d52e9 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1046,6 +1046,12 @@ struct _virDomainNetDef { struct { virDomainHostdevDef def; } hostdev; + struct { + char *ipaddr; + int prefix; + char *dns; + char *dhcpstart; + } user; } data; /* virtPortProfile is used by network/bridge/direct/hostdev */ virNetDevVPortProfilePtr virtPortProfile; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9a314bf..f17061e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5156,6 +5156,25 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, break; case VIR_DOMAIN_NET_TYPE_USER: + virBufferAddLit(&buf, "user"); + if (net->data.user.ipaddr) { + virBufferAsprintf(&buf, "%cnet=%s", type_sep, + net->data.user.ipaddr); + type_sep = ','; + if (net->data.user.prefix >= 0) + virBufferAsprintf(&buf, "/%d", net->data.user.prefix); + } + if (net->data.user.dns) { + virBufferAsprintf(&buf, "%cdns=%s", type_sep, net->data.user.dns); + type_sep = ','; + } + if (net->data.user.dhcpstart) { + virBufferAsprintf(&buf, "%cdhcpstart=%s", type_sep, + net->data.user.dhcpstart); + type_sep = ','; + } + break; + default: virBufferAddLit(&buf, "user"); break; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-user-ip.args b/tests/qemuxml2argvdata/qemuxml2argv-net-user-ip.args new file mode 100644 index 0000000..3e355f3 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-user-ip.args @@ -0,0 +1,7 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 \ +-net nic,macaddr=00:11:22:33:44:55,vlan=0,model=rtl8139 \ +-net user,net=192.168.2.0/24,dns=192.168.2.3,dhcpstart=192.168.2.9,vlan=0 \ +-serial none -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-user-ip.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-user-ip.xml new file mode 100644 index 0000000..5c36c77 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-user-ip.xml @@ -0,0 +1,33 @@ +<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'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <interface type='user'> + <ip address='192.168.2.0' prefix='24' dns='192.168.2.3' dhcpstart='192.168.2.9'/> + <mac address='00:11:22:33:44:55'/> + <model type='rtl8139'/> + </interface> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 56854dc..02ed4ba 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -923,6 +923,7 @@ mymain(void) DO_TEST("misc-no-reboot", NONE); DO_TEST("misc-uuid", QEMU_CAPS_NAME, QEMU_CAPS_UUID); DO_TEST("net-user", NONE); + DO_TEST("net-user-ip", NONE); DO_TEST("net-virtio", NONE); DO_TEST("net-virtio-device", QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_TX_ALG); -- 1.9.0

5 14

Re: [libvirt] [PATCH] migration: Fix possible bug for migrate cancel
by Eric Blake 28 Mar '14

28 Mar '14

[adding libvirt] On 03/24/2014 09:47 AM, Paolo Bonzini wrote: > Il 24/03/2014 14:04, arei.gonglei(a)huawei.com ha scritto: >> From: zengjunliang <zengjunliang(a)huawei.com> >> >> Return error for migrate cancel, when migration status is not >> MIG_STATE_SETUP or MIG_STATE_ACTIVE. Thus, libvirt can can >> perceive the operation fails. >> >> Signed-off-by: zengjunliang <zengjunliang(a)huawei.com> >> Signed-off-by: Gonglei <arei.gonglei(a)huawei.com> > > I think this is done on purpose, because canceling migration is racy. > Instead, libvirt should do "query-migrate" and check if the migration > was completed or canceled. Can you please give more details at how you are triggering the problem with libvirt? I think Paolo is probably right - the bug is more likely to be in libvirt not expecting the race and not recovering correctly when the race occurs, than it is to be in changing qemu's state algorithm. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

4 5

[libvirt] [PATCH tck] Remove /128 from ip6tables output
by Mike Latimer 28 Mar '14

28 Mar '14

Due to iptables commit 945353a2 (in iptables v1.4.20 and higher), ip6tables no longer prints out /128. This patch removes /128 from output files, and replaces '/128' in command output with ' ' to remain compatible with older versions of ip6tables. --- scripts/nwfilter/nwfilterxml2fwallout/ah-ipv6-test.fwall | 24 +++++++++++----------- scripts/nwfilter/nwfilterxml2fwallout/all-ipv6-test.fwall | 24 +++++++++++----------- scripts/nwfilter/nwfilterxml2fwallout/comment-test.fwall | 12 +++++------ scripts/nwfilter/nwfilterxml2fwallout/esp-ipv6-test.fwall | 24 +++++++++++----------- scripts/nwfilter/nwfilterxml2fwallout/hex-data-test.fwall | 12 +++++------ scripts/nwfilter/nwfilterxml2fwallout/icmpv6-test.fwall | 14 ++++++------- scripts/nwfilter/nwfilterxml2fwallout/sctp-ipv6-test.fwall | 24 +++++++++++----------- scripts/nwfilter/nwfilterxml2fwallout/tcp-ipv6-test.fwall | 24 +++++++++++----------- scripts/nwfilter/nwfilterxml2fwallout/udp-ipv6-test.fwall | 24 +++++++++++----------- scripts/nwfilter/nwfilterxml2fwallout/udplite-ipv6-test.fwall | 24 +++++++++++----------- 10 files changed, 103 insertions(+), 103 deletions(-) diff --git a/scripts/nwfilter/nwfilterxml2fwallout/ah-ipv6-test.fwall b/scripts/nwfilter/nwfilterxml2fwallout/ah-ipv6-test.fwall index 8c10b04..64db89d 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/ah-ipv6-test.fwall +++ b/scripts/nwfilter/nwfilterxml2fwallout/ah-ipv6-test.fwall @@ -1,21 +1,21 @@ -#ip6tables -L FI-vnet0 -n +#ip6tables -L FI-vnet0 -n | sed 's/\/128/ /' Chain FI-vnet0 (1 references) target prot opt source destination -RETURN ah f:e:d::c:b:a/127 a:b:c::d:e:f/128 MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY -RETURN ah ::/0 a:b:c::/128 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL -RETURN ah ::/0 ::10.1.2.3/128 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL -#ip6tables -L FO-vnet0 -n +RETURN ah f:e:d::c:b:a/127 a:b:c::d:e:f MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY +RETURN ah ::/0 a:b:c:: DSCP match 0x21state ESTABLISHED ctdir ORIGINAL +RETURN ah ::/0 ::10.1.2.3 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL +#ip6tables -L FO-vnet0 -n | sed 's/\/128/ /' Chain FO-vnet0 (1 references) target prot opt source destination -ACCEPT ah a:b:c::d:e:f/128 f:e:d::c:b:a/127 DSCP match 0x02state ESTABLISHED ctdir ORIGINAL -ACCEPT ah a:b:c::/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21state NEW,ESTABLISHED ctdir REPLY -ACCEPT ah ::10.1.2.3/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21state NEW,ESTABLISHED ctdir REPLY -#ip6tables -L HI-vnet0 -n +ACCEPT ah a:b:c::d:e:f f:e:d::c:b:a/127 DSCP match 0x02state ESTABLISHED ctdir ORIGINAL +ACCEPT ah a:b:c:: ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21state NEW,ESTABLISHED ctdir REPLY +ACCEPT ah ::10.1.2.3 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21state NEW,ESTABLISHED ctdir REPLY +#ip6tables -L HI-vnet0 -n | sed 's/\/128/ /' Chain HI-vnet0 (1 references) target prot opt source destination -RETURN ah f:e:d::c:b:a/127 a:b:c::d:e:f/128 MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY -RETURN ah ::/0 a:b:c::/128 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL -RETURN ah ::/0 ::10.1.2.3/128 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL +RETURN ah f:e:d::c:b:a/127 a:b:c::d:e:f MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY +RETURN ah ::/0 a:b:c:: DSCP match 0x21state ESTABLISHED ctdir ORIGINAL +RETURN ah ::/0 ::10.1.2.3 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL #ip6tables -L INPUT -n --line-numbers | grep libvirt 1 libvirt-host-in all ::/0 ::/0 #ip6tables -L libvirt-host-in -n | grep vnet0 | tr -s " " diff --git a/scripts/nwfilter/nwfilterxml2fwallout/all-ipv6-test.fwall b/scripts/nwfilter/nwfilterxml2fwallout/all-ipv6-test.fwall index f053b39..c56b85a 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/all-ipv6-test.fwall +++ b/scripts/nwfilter/nwfilterxml2fwallout/all-ipv6-test.fwall @@ -1,21 +1,21 @@ -#ip6tables -L FI-vnet0 -n +#ip6tables -L FI-vnet0 -n | sed 's/\/128/ /' Chain FI-vnet0 (1 references) target prot opt source destination -RETURN all f:e:d::c:b:a/127 a:b:c::d:e:f/128 MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY -RETURN all ::/0 a:b:c::/128 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL -RETURN all ::/0 ::10.1.2.3/128 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL -#ip6tables -L FO-vnet0 -n +RETURN all f:e:d::c:b:a/127 a:b:c::d:e:f MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY +RETURN all ::/0 a:b:c:: DSCP match 0x21state ESTABLISHED ctdir ORIGINAL +RETURN all ::/0 ::10.1.2.3 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL +#ip6tables -L FO-vnet0 -n | sed 's/\/128/ /' Chain FO-vnet0 (1 references) target prot opt source destination -ACCEPT all a:b:c::d:e:f/128 f:e:d::c:b:a/127 DSCP match 0x02state ESTABLISHED ctdir ORIGINAL -ACCEPT all a:b:c::/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21state NEW,ESTABLISHED ctdir REPLY -ACCEPT all ::10.1.2.3/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21state NEW,ESTABLISHED ctdir REPLY -#ip6tables -L HI-vnet0 -n +ACCEPT all a:b:c::d:e:f f:e:d::c:b:a/127 DSCP match 0x02state ESTABLISHED ctdir ORIGINAL +ACCEPT all a:b:c:: ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21state NEW,ESTABLISHED ctdir REPLY +ACCEPT all ::10.1.2.3 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21state NEW,ESTABLISHED ctdir REPLY +#ip6tables -L HI-vnet0 -n | sed 's/\/128/ /' Chain HI-vnet0 (1 references) target prot opt source destination -RETURN all f:e:d::c:b:a/127 a:b:c::d:e:f/128 MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY -RETURN all ::/0 a:b:c::/128 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL -RETURN all ::/0 ::10.1.2.3/128 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL +RETURN all f:e:d::c:b:a/127 a:b:c::d:e:f MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY +RETURN all ::/0 a:b:c:: DSCP match 0x21state ESTABLISHED ctdir ORIGINAL +RETURN all ::/0 ::10.1.2.3 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL #ip6tables -L INPUT -n --line-numbers | grep libvirt 1 libvirt-host-in all ::/0 ::/0 #ip6tables -L libvirt-host-in -n | grep vnet0 | tr -s " " diff --git a/scripts/nwfilter/nwfilterxml2fwallout/comment-test.fwall b/scripts/nwfilter/nwfilterxml2fwallout/comment-test.fwall index 038d2cb..32c5078 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/comment-test.fwall +++ b/scripts/nwfilter/nwfilterxml2fwallout/comment-test.fwall @@ -28,24 +28,24 @@ FI-vnet0 all -- 0.0.0.0/0 0.0.0.0/0 [goto] PHYSDEV match --physdev-in vnet0 ACCEPT all -- 0.0.0.0/0 0.0.0.0/0 PHYSDEV match --physdev-in vnet0 #iptables -L libvirt-out -n | grep vnet0 | tr -s " " FO-vnet0 all -- 0.0.0.0/0 0.0.0.0/0 [goto] PHYSDEV match --physdev-out vnet0 --physdev-is-bridged -#ip6tables -L FI-vnet0 -n +#ip6tables -L FI-vnet0 -n | sed 's/\/128/ /' Chain FI-vnet0 (1 references) target prot opt source destination -RETURN tcp ::/0 a:b:c::/128 DSCP match 0x39 tcp spts:256:4369 dpts:32:33 state ESTABLISHED ctdir ORIGINAL/* tcp/ipv6 rule */ +RETURN tcp ::/0 a:b:c:: DSCP match 0x39 tcp spts:256:4369 dpts:32:33 state ESTABLISHED ctdir ORIGINAL/* tcp/ipv6 rule */ RETURN udp ::/0 ::/0 state ESTABLISHED ctdir ORIGINAL/* `ls`;${COLUMNS};$(ls);"test";&'3 spaces' */ RETURN sctp ::/0 ::/0 state ESTABLISHED ctdir ORIGINAL/* comment with lone ', `, ", `, \, $x, and two spaces */ RETURN ah ::/0 ::/0 state ESTABLISHED ctdir ORIGINAL/* tmp=`mktemp`; echo ${RANDOM} > ${tmp} ; cat < ${tmp}; rm -f ${tmp} */ -#ip6tables -L FO-vnet0 -n +#ip6tables -L FO-vnet0 -n | sed 's/\/128/ /' Chain FO-vnet0 (1 references) target prot opt source destination -ACCEPT tcp a:b:c::/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x39 tcp spts:32:33 dpts:256:4369 state NEW,ESTABLISHED ctdir REPLY/* tcp/ipv6 rule */ +ACCEPT tcp a:b:c:: ::/0 MAC 01:02:03:04:05:06 DSCP match 0x39 tcp spts:32:33 dpts:256:4369 state NEW,ESTABLISHED ctdir REPLY/* tcp/ipv6 rule */ ACCEPT udp ::/0 ::/0 state NEW,ESTABLISHED ctdir REPLY/* `ls`;${COLUMNS};$(ls);"test";&'3 spaces' */ ACCEPT sctp ::/0 ::/0 state NEW,ESTABLISHED ctdir REPLY/* comment with lone ', `, ", `, \, $x, and two spaces */ ACCEPT ah ::/0 ::/0 state NEW,ESTABLISHED ctdir REPLY/* tmp=`mktemp`; echo ${RANDOM} > ${tmp} ; cat < ${tmp}; rm -f ${tmp} */ -#ip6tables -L HI-vnet0 -n +#ip6tables -L HI-vnet0 -n | sed 's/\/128/ /' Chain HI-vnet0 (1 references) target prot opt source destination -RETURN tcp ::/0 a:b:c::/128 DSCP match 0x39 tcp spts:256:4369 dpts:32:33 state ESTABLISHED ctdir ORIGINAL/* tcp/ipv6 rule */ +RETURN tcp ::/0 a:b:c:: DSCP match 0x39 tcp spts:256:4369 dpts:32:33 state ESTABLISHED ctdir ORIGINAL/* tcp/ipv6 rule */ RETURN udp ::/0 ::/0 state ESTABLISHED ctdir ORIGINAL/* `ls`;${COLUMNS};$(ls);"test";&'3 spaces' */ RETURN sctp ::/0 ::/0 state ESTABLISHED ctdir ORIGINAL/* comment with lone ', `, ", `, \, $x, and two spaces */ RETURN ah ::/0 ::/0 state ESTABLISHED ctdir ORIGINAL/* tmp=`mktemp`; echo ${RANDOM} > ${tmp} ; cat < ${tmp}; rm -f ${tmp} */ diff --git a/scripts/nwfilter/nwfilterxml2fwallout/esp-ipv6-test.fwall b/scripts/nwfilter/nwfilterxml2fwallout/esp-ipv6-test.fwall index dbdaa36..cf3faaa 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/esp-ipv6-test.fwall +++ b/scripts/nwfilter/nwfilterxml2fwallout/esp-ipv6-test.fwall @@ -1,21 +1,21 @@ -#ip6tables -L FI-vnet0 -n +#ip6tables -L FI-vnet0 -n | sed 's/\/128/ /' Chain FI-vnet0 (1 references) target prot opt source destination -RETURN esp f:e:d::c:b:a/127 a:b:c::d:e:f/128 MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY -RETURN esp ::/0 a:b:c::/128 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL -RETURN esp ::/0 ::10.1.2.3/128 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL -#ip6tables -L FO-vnet0 -n +RETURN esp f:e:d::c:b:a/127 a:b:c::d:e:f MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY +RETURN esp ::/0 a:b:c:: DSCP match 0x21state ESTABLISHED ctdir ORIGINAL +RETURN esp ::/0 ::10.1.2.3 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL +#ip6tables -L FO-vnet0 -n | sed 's/\/128/ /' Chain FO-vnet0 (1 references) target prot opt source destination -ACCEPT esp a:b:c::d:e:f/128 f:e:d::c:b:a/127 DSCP match 0x02state ESTABLISHED ctdir ORIGINAL -ACCEPT esp a:b:c::/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21state NEW,ESTABLISHED ctdir REPLY -ACCEPT esp ::10.1.2.3/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21state NEW,ESTABLISHED ctdir REPLY -#ip6tables -L HI-vnet0 -n +ACCEPT esp a:b:c::d:e:f f:e:d::c:b:a/127 DSCP match 0x02state ESTABLISHED ctdir ORIGINAL +ACCEPT esp a:b:c:: ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21state NEW,ESTABLISHED ctdir REPLY +ACCEPT esp ::10.1.2.3 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21state NEW,ESTABLISHED ctdir REPLY +#ip6tables -L HI-vnet0 -n | sed 's/\/128/ /' Chain HI-vnet0 (1 references) target prot opt source destination -RETURN esp f:e:d::c:b:a/127 a:b:c::d:e:f/128 MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY -RETURN esp ::/0 a:b:c::/128 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL -RETURN esp ::/0 ::10.1.2.3/128 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL +RETURN esp f:e:d::c:b:a/127 a:b:c::d:e:f MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY +RETURN esp ::/0 a:b:c:: DSCP match 0x21state ESTABLISHED ctdir ORIGINAL +RETURN esp ::/0 ::10.1.2.3 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL #ip6tables -L INPUT -n --line-numbers | grep libvirt 1 libvirt-host-in all ::/0 ::/0 #ip6tables -L libvirt-host-in -n | grep vnet0 |tr -s " " diff --git a/scripts/nwfilter/nwfilterxml2fwallout/hex-data-test.fwall b/scripts/nwfilter/nwfilterxml2fwallout/hex-data-test.fwall index 2ed979e..0aaa50c 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/hex-data-test.fwall +++ b/scripts/nwfilter/nwfilterxml2fwallout/hex-data-test.fwall @@ -28,18 +28,18 @@ FI-vnet0 all -- 0.0.0.0/0 0.0.0.0/0 [goto] PHYSDEV match --physdev-in vnet0 ACCEPT all -- 0.0.0.0/0 0.0.0.0/0 PHYSDEV match --physdev-in vnet0 #iptables -L libvirt-out -n | grep vnet0 | tr -s " " FO-vnet0 all -- 0.0.0.0/0 0.0.0.0/0 [goto] PHYSDEV match --physdev-out vnet0 --physdev-is-bridged -#ip6tables -L FI-vnet0 -n +#ip6tables -L FI-vnet0 -n | sed 's/\/128/ /' Chain FI-vnet0 (1 references) target prot opt source destination -RETURN tcp ::/0 a:b:c::/128 DSCP match 0x39 tcp spts:256:4369 dpts:32:33 state ESTABLISHED ctdir ORIGINAL -#ip6tables -L FO-vnet0 -n +RETURN tcp ::/0 a:b:c:: DSCP match 0x39 tcp spts:256:4369 dpts:32:33 state ESTABLISHED ctdir ORIGINAL +#ip6tables -L FO-vnet0 -n | sed 's/\/128/ /' Chain FO-vnet0 (1 references) target prot opt source destination -ACCEPT tcp a:b:c::/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x39 tcp spts:32:33 dpts:256:4369 state NEW,ESTABLISHED ctdir REPLY -#ip6tables -L HI-vnet0 -n +ACCEPT tcp a:b:c:: ::/0 MAC 01:02:03:04:05:06 DSCP match 0x39 tcp spts:32:33 dpts:256:4369 state NEW,ESTABLISHED ctdir REPLY +#ip6tables -L HI-vnet0 -n | sed 's/\/128/ /' Chain HI-vnet0 (1 references) target prot opt source destination -RETURN tcp ::/0 a:b:c::/128 DSCP match 0x39 tcp spts:256:4369 dpts:32:33 state ESTABLISHED ctdir ORIGINAL +RETURN tcp ::/0 a:b:c:: DSCP match 0x39 tcp spts:256:4369 dpts:32:33 state ESTABLISHED ctdir ORIGINAL #ip6tables -L libvirt-host-in -n | grep vnet0 | tr -s " " HI-vnet0 all ::/0 ::/0 [goto] PHYSDEV match --physdev-in vnet0 #ip6tables -L libvirt-in -n | grep vnet0 | tr -s " " diff --git a/scripts/nwfilter/nwfilterxml2fwallout/icmpv6-test.fwall b/scripts/nwfilter/nwfilterxml2fwallout/icmpv6-test.fwall index 4749f84..b25a0e7 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/icmpv6-test.fwall +++ b/scripts/nwfilter/nwfilterxml2fwallout/icmpv6-test.fwall @@ -1,16 +1,16 @@ -#ip6tables -L FI-vnet0 -n +#ip6tables -L FI-vnet0 -n | sed 's/\/128/ /' Chain FI-vnet0 (1 references) target prot opt source destination -RETURN icmpv6 f:e:d::c:b:a/127 a:b:c::d:e:f/128 MAC 01:02:03:04:05:06 DSCP match 0x02ipv6-icmp type 12 code 11 state NEW,ESTABLISHED -#ip6tables -L FO-vnet0 -n +RETURN icmpv6 f:e:d::c:b:a/127 a:b:c::d:e:f MAC 01:02:03:04:05:06 DSCP match 0x02ipv6-icmp type 12 code 11 state NEW,ESTABLISHED +#ip6tables -L FO-vnet0 -n | sed 's/\/128/ /' Chain FO-vnet0 (1 references) target prot opt source destination -ACCEPT icmpv6 a:b:c::/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21ipv6-icmp type 255 code 255 state NEW,ESTABLISHED -ACCEPT icmpv6 ::10.1.2.3/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21ipv6-icmp type 255 code 255 state NEW,ESTABLISHED -#ip6tables -L HI-vnet0 -n +ACCEPT icmpv6 a:b:c:: ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21ipv6-icmp type 255 code 255 state NEW,ESTABLISHED +ACCEPT icmpv6 ::10.1.2.3 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21ipv6-icmp type 255 code 255 state NEW,ESTABLISHED +#ip6tables -L HI-vnet0 -n | sed 's/\/128/ /' Chain HI-vnet0 (1 references) target prot opt source destination -RETURN icmpv6 f:e:d::c:b:a/127 a:b:c::d:e:f/128 MAC 01:02:03:04:05:06 DSCP match 0x02ipv6-icmp type 12 code 11 state NEW,ESTABLISHED +RETURN icmpv6 f:e:d::c:b:a/127 a:b:c::d:e:f MAC 01:02:03:04:05:06 DSCP match 0x02ipv6-icmp type 12 code 11 state NEW,ESTABLISHED #ip6tables -L INPUT -n --line-numbers | grep libvirt 1 libvirt-host-in all ::/0 ::/0 #ip6tables -L libvirt-host-in -n | grep vnet0 | tr -s " " diff --git a/scripts/nwfilter/nwfilterxml2fwallout/sctp-ipv6-test.fwall b/scripts/nwfilter/nwfilterxml2fwallout/sctp-ipv6-test.fwall index 40d51f7..90c2284 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/sctp-ipv6-test.fwall +++ b/scripts/nwfilter/nwfilterxml2fwallout/sctp-ipv6-test.fwall @@ -1,21 +1,21 @@ -#ip6tables -L FI-vnet0 -n +#ip6tables -L FI-vnet0 -n | sed 's/\/128/ /' Chain FI-vnet0 (1 references) target prot opt source destination -RETURN sctp ::/0 a:b:c::d:e:f/128 MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY -RETURN sctp ::/0 a:b:c::/128 DSCP match 0x21sctp spts:100:1111 dpts:20:21 state ESTABLISHED ctdir ORIGINAL -RETURN sctp ::/0 ::10.1.2.3/128 DSCP match 0x3fsctp spt:65535 dpts:255:256 state ESTABLISHED ctdir ORIGINAL -#ip6tables -L FO-vnet0 -n +RETURN sctp ::/0 a:b:c::d:e:f MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY +RETURN sctp ::/0 a:b:c:: DSCP match 0x21sctp spts:100:1111 dpts:20:21 state ESTABLISHED ctdir ORIGINAL +RETURN sctp ::/0 ::10.1.2.3 DSCP match 0x3fsctp spt:65535 dpts:255:256 state ESTABLISHED ctdir ORIGINAL +#ip6tables -L FO-vnet0 -n | sed 's/\/128/ /' Chain FO-vnet0 (1 references) target prot opt source destination -ACCEPT sctp a:b:c::d:e:f/128 ::/0 DSCP match 0x02state ESTABLISHED ctdir ORIGINAL -ACCEPT sctp a:b:c::/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21sctp spts:20:21 dpts:100:1111 state NEW,ESTABLISHED ctdir REPLY -ACCEPT sctp ::10.1.2.3/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x3fsctp spts:255:256 dpt:65535 state NEW,ESTABLISHED ctdir REPLY -#ip6tables -L HI-vnet0 -n +ACCEPT sctp a:b:c::d:e:f ::/0 DSCP match 0x02state ESTABLISHED ctdir ORIGINAL +ACCEPT sctp a:b:c:: ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21sctp spts:20:21 dpts:100:1111 state NEW,ESTABLISHED ctdir REPLY +ACCEPT sctp ::10.1.2.3 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x3fsctp spts:255:256 dpt:65535 state NEW,ESTABLISHED ctdir REPLY +#ip6tables -L HI-vnet0 -n | sed 's/\/128/ /' Chain HI-vnet0 (1 references) target prot opt source destination -RETURN sctp ::/0 a:b:c::d:e:f/128 MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY -RETURN sctp ::/0 a:b:c::/128 DSCP match 0x21sctp spts:100:1111 dpts:20:21 state ESTABLISHED ctdir ORIGINAL -RETURN sctp ::/0 ::10.1.2.3/128 DSCP match 0x3fsctp spt:65535 dpts:255:256 state ESTABLISHED ctdir ORIGINAL +RETURN sctp ::/0 a:b:c::d:e:f MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY +RETURN sctp ::/0 a:b:c:: DSCP match 0x21sctp spts:100:1111 dpts:20:21 state ESTABLISHED ctdir ORIGINAL +RETURN sctp ::/0 ::10.1.2.3 DSCP match 0x3fsctp spt:65535 dpts:255:256 state ESTABLISHED ctdir ORIGINAL #ip6tables -L INPUT -n --line-numbers | grep libvirt 1 libvirt-host-in all ::/0 ::/0 #ip6tables -L libvirt-host-in -n | grep vnet0 | tr -s " " diff --git a/scripts/nwfilter/nwfilterxml2fwallout/tcp-ipv6-test.fwall b/scripts/nwfilter/nwfilterxml2fwallout/tcp-ipv6-test.fwall index 2a794b8..a294a26 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/tcp-ipv6-test.fwall +++ b/scripts/nwfilter/nwfilterxml2fwallout/tcp-ipv6-test.fwall @@ -1,21 +1,21 @@ -#ip6tables -L FI-vnet0 -n +#ip6tables -L FI-vnet0 -n | sed 's/\/128/ /' Chain FI-vnet0 (1 references) target prot opt source destination -RETURN tcp ::/0 a:b:c::d:e:f/128 MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY -RETURN tcp ::/0 a:b:c::/128 DSCP match 0x21tcp spts:100:1111 dpts:20:21 state ESTABLISHED ctdir ORIGINAL -RETURN tcp ::/0 ::10.1.2.3/128 DSCP match 0x3ftcp spt:65535 dpts:255:256 state ESTABLISHED ctdir ORIGINAL -#ip6tables -L FO-vnet0 -n +RETURN tcp ::/0 a:b:c::d:e:f MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY +RETURN tcp ::/0 a:b:c:: DSCP match 0x21tcp spts:100:1111 dpts:20:21 state ESTABLISHED ctdir ORIGINAL +RETURN tcp ::/0 ::10.1.2.3 DSCP match 0x3ftcp spt:65535 dpts:255:256 state ESTABLISHED ctdir ORIGINAL +#ip6tables -L FO-vnet0 -n | sed 's/\/128/ /' Chain FO-vnet0 (1 references) target prot opt source destination -ACCEPT tcp a:b:c::d:e:f/128 ::/0 DSCP match 0x02state ESTABLISHED ctdir ORIGINAL -ACCEPT tcp a:b:c::/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21tcp spts:20:21 dpts:100:1111 state NEW,ESTABLISHED ctdir REPLY -ACCEPT tcp ::10.1.2.3/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x3ftcp spts:255:256 dpt:65535 state NEW,ESTABLISHED ctdir REPLY -#ip6tables -L HI-vnet0 -n +ACCEPT tcp a:b:c::d:e:f ::/0 DSCP match 0x02state ESTABLISHED ctdir ORIGINAL +ACCEPT tcp a:b:c:: ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21tcp spts:20:21 dpts:100:1111 state NEW,ESTABLISHED ctdir REPLY +ACCEPT tcp ::10.1.2.3 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x3ftcp spts:255:256 dpt:65535 state NEW,ESTABLISHED ctdir REPLY +#ip6tables -L HI-vnet0 -n | sed 's/\/128/ /' Chain HI-vnet0 (1 references) target prot opt source destination -RETURN tcp ::/0 a:b:c::d:e:f/128 MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY -RETURN tcp ::/0 a:b:c::/128 DSCP match 0x21tcp spts:100:1111 dpts:20:21 state ESTABLISHED ctdir ORIGINAL -RETURN tcp ::/0 ::10.1.2.3/128 DSCP match 0x3ftcp spt:65535 dpts:255:256 state ESTABLISHED ctdir ORIGINAL +RETURN tcp ::/0 a:b:c::d:e:f MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY +RETURN tcp ::/0 a:b:c:: DSCP match 0x21tcp spts:100:1111 dpts:20:21 state ESTABLISHED ctdir ORIGINAL +RETURN tcp ::/0 ::10.1.2.3 DSCP match 0x3ftcp spt:65535 dpts:255:256 state ESTABLISHED ctdir ORIGINAL #ip6tables -L INPUT -n --line-numbers | grep libvirt 1 libvirt-host-in all ::/0 ::/0 #ip6tables -L libvirt-host-in -n | grep vnet0 | tr -s " " diff --git a/scripts/nwfilter/nwfilterxml2fwallout/udp-ipv6-test.fwall b/scripts/nwfilter/nwfilterxml2fwallout/udp-ipv6-test.fwall index 0a75421..dafaea5 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/udp-ipv6-test.fwall +++ b/scripts/nwfilter/nwfilterxml2fwallout/udp-ipv6-test.fwall @@ -1,21 +1,21 @@ -#ip6tables -L FI-vnet0 -n +#ip6tables -L FI-vnet0 -n | sed 's/\/128/ /' Chain FI-vnet0 (1 references) target prot opt source destination -RETURN udp ::/0 a:b:c::d:e:f/128 MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY -RETURN udp ::/0 ::a:b:c/128 DSCP match 0x21udp spts:100:1111 dpts:20:21 state ESTABLISHED ctdir ORIGINAL -RETURN udp ::/0 ::10.1.2.3/128 DSCP match 0x3fudp spt:65535 dpts:255:256 state ESTABLISHED ctdir ORIGINAL -#ip6tables -L FO-vnet0 -n +RETURN udp ::/0 a:b:c::d:e:f MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY +RETURN udp ::/0 ::a:b:c DSCP match 0x21udp spts:100:1111 dpts:20:21 state ESTABLISHED ctdir ORIGINAL +RETURN udp ::/0 ::10.1.2.3 DSCP match 0x3fudp spt:65535 dpts:255:256 state ESTABLISHED ctdir ORIGINAL +#ip6tables -L FO-vnet0 -n | sed 's/\/128/ /' Chain FO-vnet0 (1 references) target prot opt source destination -ACCEPT udp a:b:c::d:e:f/128 ::/0 DSCP match 0x02state ESTABLISHED ctdir ORIGINAL -ACCEPT udp ::a:b:c/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21udp spts:20:21 dpts:100:1111 state NEW,ESTABLISHED ctdir REPLY -ACCEPT udp ::10.1.2.3/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x3fudp spts:255:256 dpt:65535 state NEW,ESTABLISHED ctdir REPLY -#ip6tables -L HI-vnet0 -n +ACCEPT udp a:b:c::d:e:f ::/0 DSCP match 0x02state ESTABLISHED ctdir ORIGINAL +ACCEPT udp ::a:b:c ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21udp spts:20:21 dpts:100:1111 state NEW,ESTABLISHED ctdir REPLY +ACCEPT udp ::10.1.2.3 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x3fudp spts:255:256 dpt:65535 state NEW,ESTABLISHED ctdir REPLY +#ip6tables -L HI-vnet0 -n | sed 's/\/128/ /' Chain HI-vnet0 (1 references) target prot opt source destination -RETURN udp ::/0 a:b:c::d:e:f/128 MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY -RETURN udp ::/0 ::a:b:c/128 DSCP match 0x21udp spts:100:1111 dpts:20:21 state ESTABLISHED ctdir ORIGINAL -RETURN udp ::/0 ::10.1.2.3/128 DSCP match 0x3fudp spt:65535 dpts:255:256 state ESTABLISHED ctdir ORIGINAL +RETURN udp ::/0 a:b:c::d:e:f MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY +RETURN udp ::/0 ::a:b:c DSCP match 0x21udp spts:100:1111 dpts:20:21 state ESTABLISHED ctdir ORIGINAL +RETURN udp ::/0 ::10.1.2.3 DSCP match 0x3fudp spt:65535 dpts:255:256 state ESTABLISHED ctdir ORIGINAL #ip6tables -L INPUT -n --line-numbers | grep libvirt 1 libvirt-host-in all ::/0 ::/0 #ip6tables -L libvirt-host-in -n | grep vnet0 | tr -s " " diff --git a/scripts/nwfilter/nwfilterxml2fwallout/udplite-ipv6-test.fwall b/scripts/nwfilter/nwfilterxml2fwallout/udplite-ipv6-test.fwall index 9173222..815a8c0 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/udplite-ipv6-test.fwall +++ b/scripts/nwfilter/nwfilterxml2fwallout/udplite-ipv6-test.fwall @@ -1,21 +1,21 @@ -#ip6tables -L FI-vnet0 -n +#ip6tables -L FI-vnet0 -n | sed 's/\/128/ /' Chain FI-vnet0 (1 references) target prot opt source destination -RETURN udplite f:e:d::c:b:a/127 a:b:c::d:e:f/128 MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY -RETURN udplite ::/0 a:b:c::/128 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL -RETURN udplite ::/0 ::10.1.2.3/128 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL -#ip6tables -L FO-vnet0 -n +RETURN udplite f:e:d::c:b:a/127 a:b:c::d:e:f MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY +RETURN udplite ::/0 a:b:c:: DSCP match 0x21state ESTABLISHED ctdir ORIGINAL +RETURN udplite ::/0 ::10.1.2.3 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL +#ip6tables -L FO-vnet0 -n | sed 's/\/128/ /' Chain FO-vnet0 (1 references) target prot opt source destination -ACCEPT udplite a:b:c::d:e:f/128 f:e:d::c:b:a/127 DSCP match 0x02state ESTABLISHED ctdir ORIGINAL -ACCEPT udplite a:b:c::/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21state NEW,ESTABLISHED ctdir REPLY -ACCEPT udplite ::10.1.2.3/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21state NEW,ESTABLISHED ctdir REPLY -#ip6tables -L HI-vnet0 -n +ACCEPT udplite a:b:c::d:e:f f:e:d::c:b:a/127 DSCP match 0x02state ESTABLISHED ctdir ORIGINAL +ACCEPT udplite a:b:c:: ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21state NEW,ESTABLISHED ctdir REPLY +ACCEPT udplite ::10.1.2.3 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21state NEW,ESTABLISHED ctdir REPLY +#ip6tables -L HI-vnet0 -n | sed 's/\/128/ /' Chain HI-vnet0 (1 references) target prot opt source destination -RETURN udplite f:e:d::c:b:a/127 a:b:c::d:e:f/128 MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY -RETURN udplite ::/0 a:b:c::/128 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL -RETURN udplite ::/0 ::10.1.2.3/128 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL +RETURN udplite f:e:d::c:b:a/127 a:b:c::d:e:f MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY +RETURN udplite ::/0 a:b:c:: DSCP match 0x21state ESTABLISHED ctdir ORIGINAL +RETURN udplite ::/0 ::10.1.2.3 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL #ip6tables -L INPUT -n --line-numbers | grep libvirt 1 libvirt-host-in all ::/0 ::/0 #ip6tables -L libvirt-host-in -n | grep vnet0 | tr -s " " -- 1.8.4.5

2 1

[libvirt] [PATCH tck] Adapt network tests to changed cli tool formats
by Daniel P. Berrange 28 Mar '14

28 Mar '14

The network tests invoke various ifconfig and route commands to test network setup, and also grep for dnsmasq/radvd args. Switch to use 'ip' since ifconfig and route commands are not installed by default on recent distros any more and their output formats have also changed. Remove grepping for dnsmasq args since libvirt uses a config file now too. Also avoid looking for radvd, since we let dnsmasq handle IPv6 too now. --- .../networks/networkxml2hostout/tck-testnet-1.dat | 20 ++++----- .../networks/networkxml2hostout/tck-testnet-2.dat | 16 +++---- .../networks/networkxml2hostout/tck-testnet-3.dat | 51 +++++++--------------- 3 files changed, 33 insertions(+), 54 deletions(-) diff --git a/scripts/networks/networkxml2hostout/tck-testnet-1.dat b/scripts/networks/networkxml2hostout/tck-testnet-1.dat index da1a51e..977489f 100644 --- a/scripts/networks/networkxml2hostout/tck-testnet-1.dat +++ b/scripts/networks/networkxml2hostout/tck-testnet-1.dat @@ -1,19 +1,19 @@ #iptables -t nat -L -n | grep ' 10\.1\.2\.' +RETURN all -- 10.1.2.0/24 224.0.0.0/24 +RETURN all -- 10.1.2.0/24 255.255.255.255 MASQUERADE tcp -- 10.1.2.0/24 !10.1.2.0/24 masq ports: 1024-65535 MASQUERADE udp -- 10.1.2.0/24 !10.1.2.0/24 masq ports: 1024-65535 MASQUERADE all -- 10.1.2.0/24 !10.1.2.0/24 -#iptables -n -L FORWARD | grep ' 10\.1\.2\.' +#iptables -n -L FORWARD | grep ' 10\.1\.2\.' | sed -e 's/ctstate/state/' ACCEPT all -- 0.0.0.0/0 10.1.2.0/24 state RELATED,ESTABLISHED ACCEPT all -- 10.1.2.0/24 0.0.0.0/0 -#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$listen-address 10\.1\.2\.1*$.*|\1|p' -listen-address 10.1.2.1 -#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$dhcp-range 10\.1\.2\.2\,10\.1\.2\.254*$.*|\1|p' -dhcp-range 10.1.2.2,10.1.2.254 -#route -n | grep '10\.1\.2\.' -10.1.2.0 0.0.0.0 255.255.255.0 U 0 0 0 tck-testbr +#ip -o route show dev tck-testbr | gawk '{print $1" "$7}' +10.1.2.0/24 10.1.2.1 +#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$\/dnsmasq\/tck-testnet.conf$.*|\1|p' +/dnsmasq/tck-testnet.conf #brctl show | grep tck-testbr | gawk '{print $1" "$3}' tck-testbr yes -#ifconfig tck-testbr | grep ':10\.1\.2\.' - inet addr:10.1.2.1 Bcast:10.1.2.255 Mask:255.255.255.0 +#ip -o addr show dev tck-testbr | gawk '{print $4" "$6}' +10.1.2.1/24 10.1.2.255 #virsh net-list | grep tck-testnet -tck-testnet active no + tck-testnet active no no diff --git a/scripts/networks/networkxml2hostout/tck-testnet-2.dat b/scripts/networks/networkxml2hostout/tck-testnet-2.dat index b2f4315..72ba48b 100644 --- a/scripts/networks/networkxml2hostout/tck-testnet-2.dat +++ b/scripts/networks/networkxml2hostout/tck-testnet-2.dat @@ -2,15 +2,13 @@ ACCEPT all -- 0.0.0.0/0 10.1.2.0/24 ACCEPT all -- 10.1.2.0/24 0.0.0.0/0 #iptables -t nat -L -n | grep ' 10\.1\.2\.' -#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$listen-address 10\.1\.2\.1$.*|\1|p' -listen-address 10.1.2.1 -#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$dhcp-range 10\.1\.2\.2,10\.1\.2\.254$.*|\1|p' -dhcp-range 10.1.2.2,10.1.2.254 -#route -n | grep '10\.1\.2\.' -10.1.2.0 0.0.0.0 255.255.255.0 U 0 0 0 tck-testbr +#ip -o route show dev tck-testbr | gawk '{print $1" "$7}' +10.1.2.0/24 10.1.2.1 +#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$\/dnsmasq\/tck-testnet.conf$.*|\1|p' +/dnsmasq/tck-testnet.conf #brctl show | grep tck-testbr | gawk '{print $1" "$3}' tck-testbr yes -#ifconfig tck-testbr | grep ':10\.1\.2\.' - inet addr:10.1.2.1 Bcast:10.1.2.255 Mask:255.255.255.0 +#ip -o addr show dev tck-testbr | gawk '{print $4" "$6}' +10.1.2.1/24 10.1.2.255 #virsh net-list | grep tck-testnet -tck-testnet active no + tck-testnet active no no diff --git a/scripts/networks/networkxml2hostout/tck-testnet-3.dat b/scripts/networks/networkxml2hostout/tck-testnet-3.dat index 36c7b32..f9417fc 100644 --- a/scripts/networks/networkxml2hostout/tck-testnet-3.dat +++ b/scripts/networks/networkxml2hostout/tck-testnet-3.dat @@ -1,8 +1,10 @@ #iptables -t nat -L -n | grep ' 10\.1\.2\.' +RETURN all -- 10.1.2.0/24 224.0.0.0/24 +RETURN all -- 10.1.2.0/24 255.255.255.255 MASQUERADE tcp -- 10.1.2.0/24 !10.1.2.0/24 masq ports: 1024-65535 MASQUERADE udp -- 10.1.2.0/24 !10.1.2.0/24 masq ports: 1024-65535 MASQUERADE all -- 10.1.2.0/24 !10.1.2.0/24 -#iptables -n -L FORWARD | grep ' 10\.1\.2\.' +#iptables -n -L FORWARD | grep ' 10\.1\.2\.' | sed -e 's/ctstate/state/' ACCEPT all -- 0.0.0.0/0 10.1.2.0/24 state RELATED,ESTABLISHED ACCEPT all -- 10.1.2.0/24 0.0.0.0/0 #ip6tables -n -L FORWARD | grep ' 2001:db8:ac10' @@ -10,40 +12,19 @@ ACCEPT all ::/0 2001:db8:ac10:fd01::/64 ACCEPT all 2001:db8:ac10:fd01::/64 ::/0 ACCEPT all ::/0 2001:db8:ac10:fe01::/64 ACCEPT all 2001:db8:ac10:fe01::/64 ::/0 -#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$listen-address 10\.1\.2\.1$.*|\1|p' -listen-address 10.1.2.1 -#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$listen-address 192\.168\.123\.1$.*|\1|p' -listen-address 192.168.123.1 -#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$listen-address 172\.28\.255\.241$.*|\1|p' -listen-address 172.28.255.241 -#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$dhcp-range 10\.1\.2\.2,10\.1\.2\.254$.*|\1|p' -dhcp-range 10.1.2.2,10.1.2.254 -#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$listen-address 2001\:db8\:ac10\:fe01\:\:1$.*|\1|p' -listen-address 2001:db8:ac10:fe01::1 -#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$listen-address 2001\:db8\:ac10\:fd01\:\:1$.*|\1|p' -listen-address 2001:db8:ac10:fd01::1 -#ps aux | sed -n '/radvd --.*tck-testnet-/ s|.*$\/radvd\/tck-testnet-radvd.conf$.*|\1|p' -/radvd/tck-testnet-radvd.conf -#route -n | grep '10\.1\.2\.' -10.1.2.0 0.0.0.0 255.255.255.0 U 0 0 0 tck-testbr -#route -n | grep '192\.168\.123\.' -192.168.123.0 0.0.0.0 255.255.255.0 U 0 0 0 tck-testbr -#route -n | grep '172\.28\.255\.240' -172.28.255.240 0.0.0.0 255.255.255.240 U 0 0 0 tck-testbr +#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$\/dnsmasq\/tck-testnet.conf$.*|\1|p' +/dnsmasq/tck-testnet.conf #brctl show | grep tck-testbr | gawk '{print $1" "$3}' tck-testbr yes -#ifconfig tck-testbr | grep ':10\.1\.2\.' - inet addr:10.1.2.1 Bcast:10.1.2.255 Mask:255.255.255.0 -#ifconfig tck-testbr | grep 'inet6 addr: 2001' - inet6 addr: 2001:db8:ac10:fd01::1/64 Scope:Global - inet6 addr: 2001:db8:ac10:fe01::1/64 Scope:Global -#ip addr show tck-testbr | grep "inet " - inet 10.1.2.1/24 brd 10.1.2.255 scope global tck-testbr - inet 192.168.123.1/24 brd 192.168.123.255 scope global tck-testbr - inet 172.28.255.241/28 brd 172.28.255.255 scope global tck-testbr -#ip route show dev tck-testbr -172.28.255.240/28 proto kernel scope link src 172.28.255.241 -10.1.2.0/24 proto kernel scope link src 10.1.2.1 -192.168.123.0/24 proto kernel scope link src 192.168.123.1 +#ip -o addr show dev tck-testbr | gawk '{print $4" "$6}' +10.1.2.1/24 10.1.2.255 +192.168.123.1/24 192.168.123.255 +172.28.255.241/28 172.28.255.255 +2001:db8:ac10:fd01::1/64 global +2001:db8:ac10:fe01::1/64 global +#ip -o route show dev tck-testbr | gawk '{print $1" "$7}' +10.1.2.0/24 10.1.2.1 +172.28.255.240/28 172.28.255.241 +192.168.123.0/24 192.168.123.1 #virsh net-list | grep tck-testnet -tck-testnet active no + tck-testnet active no no -- 1.8.5.3

2 2

[libvirt] Device attach / detach problem for passthrough/SR-IOV in libvirt
by Mohsen Ghaemi 28 Mar '14

28 Mar '14

Hi all I just encountered a problem in libvirt while was trying to attach and detach a sr-iov vf to my VM The version of my libvirt is 1.1.1-0ubuntu8.5 I tried to attach the device using following xml <interface type='hostdev' managed='yes'> <mac address='5c:01:fd:12:34:58'/> <source> <address type='pci' domain='0x0000' bus='0x04' slot='0x01' function='0x1'/> </source> </interface> When i attached device it worked properly and i managed to ping another host. virsh # attach-device t5 1.xml Device attached successfully But when i detached it still i had network traffic in my VM but libvirt (virsh) said that virsh # detach-device t5 1.xml Device detached successfully The next time i tried to attach it libvirt said that virsh # attach-device t5 1.xml error: Failed to attach device from 1.xml error: Requested operation is not valid: PCI device 0000:04:01.1 is in use by domain t5 and when i continue this action after the 'domain' i receive some strange characters which might come from the memory space (memory content) like some addresses, links or some characters I tried it with different VMs and different guest OSs that the same happend. The same action was done with another host running libvirt version Installed: 1.0.2-0ubuntu11.13.04.5~cloud1 Candidate: 1.0.2-0ubuntu11.13.04.5~cloud1 and it worked pretty OK. No problem. Do you have any idea what is wrong? More information: Kernel : 3.8.0-37-generic /etc/libvirt/qemu.conf : security_driver = "none" root@compute01:~# ethtool -i eth5 driver: bnx2x version: 1.78.58 firmware-version: bc 7.4.22 phy 1.34 bus-info: 0000:04:00.1 supports-statistics: yes supports-test: yes supports-eeprom-access: yes supports-register-dump: yes

3 3

[libvirt] Segfault in libvirt.git virHostdevManagerOnceInit
by Richard W.M. Jones 27 Mar '14

27 Mar '14

Current libvirt.git: $ ~/d/libvirt/run gdb --args ~/d/libvirt/daemon/libvirtd --timeout=30 [...] 2014-03-27 18:44:21.816+0000: 11868: info : libvirt version: 1.2.3 2014-03-27 18:44:21.816+0000: 11868: error : virHostdevManagerNew:116 : operation failed: Failed to create state dir '/var/run/libvirt/hostdevmgr' Program received signal SIGSEGV, Segmentation fault. [Switching to Thread 0x7fffdabc6700 (LWP 11868)] virObjectUnref (anyobj=anyobj@entry=0x7fffd412cc70) at util/virobject.c:270 270 memset(obj, 0, obj->klass->objectSize); Missing separate debuginfos, use: debuginfo-install audit-libs-2.3.3-1.fc20.x86_64 augeas-libs-1.1.0-2.fc20.x86_64 avahi-libs-0.6.31-21.fc20.x86_64 boost-system-1.54.0-9.fc20.x86_64 boost-thread-1.54.0-9.fc20.x86_64 bzip2-libs-1.0.6-9.fc20.x86_64 ceph-libs-0.67.3-2.fc20.x86_64 cryptopp-5.6.2-3.fc20.x86_64 cyrus-sasl-gssapi-2.1.26-14.fc20.x86_64 cyrus-sasl-lib-2.1.26-14.fc20.x86_64 cyrus-sasl-md5-2.1.26-14.fc20.x86_64 cyrus-sasl-plain-2.1.26-14.fc20.x86_64 cyrus-sasl-scram-2.1.26-14.fc20.x86_64 dbus-libs-1.6.12-8.fc20.x86_64 device-mapper-libs-1.02.82-5.fc20.x86_64 fuse-libs-2.9.3-2.fc20.x86_64 glibc-2.18-12.fc20.x86_64 glusterfs-api-3.4.2-1.fc20.x86_64 glusterfs-libs-3.4.2-1.fc20.x86_64 gmp-5.1.2-2.fc20.x86_64 gnome-keyring-3.10.1-1.fc20.x86_64 gnutls-3.1.20-3.fc20.x86_64 keyutils-libs-1.5.8-1.fc20.x86_64 krb5-libs-1.11.5-2.fc20.x86_64 leveldb-1.12.0-5.fc20.x86_64 libblkid-2.24.1-1.fc20.x86_64 libcap-ng-0.7.3-6.fc20.x86_64 libcom_err-1.42.8-3.fc20.x86_64 libcurl-7.32.0-4.fc20.x86_64 libdb-5.3.28-1.fc20.x86_64 libffi-3.0.13-5.fc20.x86_64 libgcc-4.8.2-7.fc20.x86_64 libgcrypt-1.5.3-2.fc20.x86_64 libgpg-error-1.12-1.fc20.x86_64 libidn-1.28-2.fc20.x86_64 libnl3-3.2.24-1.fc20.x86_64 libpcap-1.5.3-1.fc20.x86_64 libpciaccess-0.13.2-1.fc20.x86_64 libselinux-2.2.1-6.fc20.x86_64 libsepol-2.1.9-2.fc20.x86_64 libssh2-1.4.3-8.fc20.x86_64 libstdc++-4.8.2-7.fc20.x86_64 libtasn1-3.3-2.fc20.x86_64 libuuid-2.24.1-1.fc20.x86_64 libwsman1-2.4.3-1.fc20.x86_64 libxml2-2.9.1-2.fc20.x86_64 libxslt-1.1.28-5.fc20.x86_64 netcf-libs-0.2.3-5.fc20.x86_64 nettle-2.7.1-3.fc20.x86_64 nspr-4.10.2-1.fc20.x86_64 nss-3.15.4-1.fc20.x86_64 nss-softokn-freebl-3.15.4-1.fc20.x86_64 nss-util-3.15.4-1.fc20.x86_64 numactl-libs-2.0.9-1.fc20.x86_64 openldap-2.4.39-2.fc20.x86_64 openssl-libs-1.0.1e-37.fc20.x86_64 p11-kit-0.20.2-1.fc20.x86_64 p11-kit-trust-0.20.2-1.fc20.x86_64 pcre-8.33-4.fc20.x86_64 snappy-1.1.0-2.fc20.x86_64 systemd-libs-208-14.fc20.x86_64 trousers-0.3.11.2-1.fc20.x86_64 xen-libs-4.3.1-9.fc20.x86_64 xz-libs-5.1.2-6alpha.fc20.x86_64 yajl-2.0.4-3.fc20.x86_64 zlib-1.2.8-3.fc20.x86_64 (gdb) bt #0 virObjectUnref (anyobj=anyobj@entry=0x7fffd412cc70) at util/virobject.c:270 #1 0x00007ffff747eeb0 in virHostdevManagerNew () at util/virhostdev.c:123 #2 virHostdevManagerOnceInit () at util/virhostdev.c:65 #3 virHostdevManagerOnce () at util/virhostdev.c:71 #4 0x00007ffff44e9200 in pthread_once () from /lib64/libpthread.so.0 #5 0x00007ffff74aeabd in virOnce (once=<optimized out>, init=<optimized out>) at util/virthread.c:47 #6 0x00007ffff747ef07 in virHostdevManagerInitialize () at util/virhostdev.c:71 #7 virHostdevManagerGetDefault () at util/virhostdev.c:130 #8 0x00007fffdca2285d in qemuStateInitialize (privileged=<optimized out>, callback=<optimized out>, opaque=<optimized out>) at qemu/qemu_driver.c:698 #9 0x00007ffff753f83f in virStateInitialize (privileged=false, callback=callback@entry=0x55555556bf20 <daemonInhibitCallback>, opaque=opaque@entry=0x55555584a100) at libvirt.c:743 #10 0x000055555556bfcb in daemonRunStateInit ( opaque=opaque@entry=0x55555584a100) at libvirtd.c:919 #11 0x00007ffff74aea0e in virThreadHelper (data=<optimized out>) at util/virthread.c:197 #12 0x00007ffff44e3f33 in start_thread () from /lib64/libpthread.so.0 #13 0x00007ffff3e0aded in clone () from /lib64/libc.so.6 Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones libguestfs lets you edit virtual machines. Supports shell scripting, bindings from many languages. http://libguestfs.org

1 0

[libvirt] [PATCH tck] Fix 202-numa-set-parameters.t test querying numa params
by Daniel P. Berrange 27 Mar '14

27 Mar '14

The 202-numa-set-parameters.t test would attempt to fetch NUMA parameters while the guest is shutoff using the VIR_DOMAIN_AFFECT_LIVE parameter. Change it to use the param AFFECT_CONFIG instead, and add a separate test for AFFECT_LIVE after the guest has been started again. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- scripts/domain/202-numa-set-parameters.t | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/domain/202-numa-set-parameters.t b/scripts/domain/202-numa-set-parameters.t index c0baf0b..886a979 100644 --- a/scripts/domain/202-numa-set-parameters.t +++ b/scripts/domain/202-numa-set-parameters.t @@ -28,7 +28,7 @@ after the API call to set NUMA parameters for a domain. use strict; use warnings; -use Test::More tests => 10; +use Test::More tests => 12; use Sys::Virt::TCK; use Test::Exception; @@ -80,7 +80,7 @@ diag "Set numa parameters, affects next boot"; lives_ok(sub {$dom->set_numa_parameters(\%params, Sys::Virt::Domain::AFFECT_CONFIG)}, "set_numa_parameters"); diag "Get numa parameters"; -my $params = $dom->get_numa_parameters(Sys::Virt::Domain::AFFECT_LIVE); +$params = $dom->get_numa_parameters(Sys::Virt::Domain::AFFECT_CONFIG); ok($params->{Sys::Virt::Domain::NUMA_MODE} == Sys::Virt::Domain::NUMATUNE_MEM_STRICT, 'Check mode'); ok($params->{Sys::Virt::Domain::NUMA_NODESET} eq '0', 'Check nodeset'); @@ -88,6 +88,11 @@ diag "Make sure the domain can be started after setting numa parameters"; $dom->create; ok($dom->get_id > 0, "running domain with ID > 0"); +diag "Get numa parameters"; +$params = $dom->get_numa_parameters(Sys::Virt::Domain::AFFECT_LIVE); +ok($params->{Sys::Virt::Domain::NUMA_MODE} == Sys::Virt::Domain::NUMATUNE_MEM_STRICT, 'Check mode'); +ok($params->{Sys::Virt::Domain::NUMA_NODESET} eq '0', 'Check nodeset'); + diag "Destroying the persistent domain"; $dom->destroy; $dom->undefine; -- 1.8.5.3

2 1

[libvirt] [PATCH tck] Change 'Sys::Virt::TCK::generic_domain' to take named params
by Daniel P. Berrange 27 Mar '14

27 Mar '14

To make it easier to add more optional parameters to the Sys::Virt::TCK::generic_domain method, change it to take named parameters instead of positional parameters. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- docs/writing-tests.pod | 6 ++--- lib/Sys/Virt/TCK.pm | 37 +++++++++++++++----------- lib/Sys/Virt/TCK/NetworkHelpers.pm | 2 +- scripts/domain/050-transient-lifecycle.t | 2 +- scripts/domain/051-transient-autostart.t | 2 +- scripts/domain/060-persistent-lifecycle.t | 2 +- scripts/domain/061-persistent-autostart.t | 2 +- scripts/domain/065-persistent-redefine.t | 2 +- scripts/domain/070-transient-to-persistent.t | 2 +- scripts/domain/080-unique-id-define.t | 8 +++--- scripts/domain/081-unique-id-create.t | 8 +++--- scripts/domain/082-unique-id-caching.t | 4 +-- scripts/domain/090-invalid-ops-when-inactive.t | 2 +- scripts/domain/100-transient-save-restore.t | 2 +- scripts/domain/101-persistent-save-restore.t | 2 +- scripts/domain/102-broken-save-restore.t | 2 +- scripts/domain/103-blockdev-save-restore.t | 2 +- scripts/domain/120-disks-stats.t | 2 +- scripts/domain/121-block-info.t | 2 +- scripts/domain/130-cpu-hotplug.t | 2 +- scripts/domain/180-interface-parameters.t | 2 +- scripts/domain/200-disk-hotplug.t | 2 +- scripts/domain/202-numa-set-parameters.t | 2 +- scripts/domain/205-disk-hotplug-ordering.t | 2 +- scripts/domain/207-disk-media-change.t | 2 +- scripts/domain/210-nic-hotplug.t | 2 +- scripts/domain/215-nic-hotplug-many.t | 2 +- scripts/domain/240-usb-host-hotplug.t | 2 +- scripts/domain/250-pci-host-hotplug.t | 2 +- scripts/domain/300-migration.t | 2 +- scripts/domain/301-migration-max-speed.t | 2 +- scripts/hooks/052-domain-hook.t | 2 +- scripts/qemu/100-disk-encryption.t | 2 +- scripts/qemu/200-qcow2-single-backing-file.t | 2 +- scripts/qemu/205-qcow2-double-backing-file.t | 2 +- scripts/qemu/210-qcow2-auto-probing.t | 2 +- scripts/qemu/400-save-image-xml.t | 2 +- scripts/selinux/050-dynamic-relabel-yes.t | 2 +- scripts/selinux/055-dynamic-base-label.t | 2 +- scripts/selinux/100-static-relabel-no.t | 2 +- scripts/selinux/105-static-relabel-fail.t | 2 +- scripts/selinux/110-static-relabel-yes.t | 2 +- 42 files changed, 71 insertions(+), 66 deletions(-) diff --git a/docs/writing-tests.pod b/docs/writing-tests.pod index 3bc70b0..171166c 100644 --- a/docs/writing-tests.pod +++ b/docs/writing-tests.pod @@ -159,7 +159,7 @@ the exact config, just wanting a minimal generic domain config that is highly likely to work without error. For such cases, a nice simple API is provided: - my $xml = $tck->generic_domain("test")->as_xml; + my $xml = $tck->generic_domain(name => "test")->as_xml; This creates an XML document for a guest that is of the correct OS and domain type to be able to run on the current hypervisor, with a name @@ -167,7 +167,7 @@ of 'test', and a single disk. It is possible to set further parameters if required. For example, to set an explicit UUID, give 3 virtual CPUs and turn on ACPI: - my $xml = $tck->generic_domain("test")->vcpus(3) + my $xml = $tck->generic_domain(name => "test")->vcpus(3) ->uuid("11111111-1111-2222-3333-444444444444") ->with_acpi()->as_xml() @@ -357,7 +357,7 @@ Taking this into account, the complete example script looks like END { $tck->cleanup if $tck; } - my $xml = $tck->generic_domain("test")->as_xml; + my $xml = $tck->generic_domain(name => "test")->as_xml; my $dom; diag "Defining inactive domain config again"; diff --git a/lib/Sys/Virt/TCK.pm b/lib/Sys/Virt/TCK.pm index a3a2732..57eb08c 100644 --- a/lib/Sys/Virt/TCK.pm +++ b/lib/Sys/Virt/TCK.pm @@ -607,14 +607,14 @@ sub get_kernel { sub generic_machine_domain { my $self = shift; - my $name = shift; - my $caps = shift; - my $ostype = shift; - my $conn = @_ ? shift : $self->conn; + my %params = @_; + my $name = exists $params{name} ? $params{name} : "tck"; + my $ostype = exists $params{ostype} ? $params{ostype} : "hvm"; + my $caps = exists $params{caps} ? $params{caps} : die "caps parameter is required"; my %config = $self->get_kernel($caps, $ostype); - my $b = Sys::Virt::TCK::DomainBuilder->new(conn => $conn, + my $b = Sys::Virt::TCK::DomainBuilder->new(conn => $self->conn, name => $name, domain => $config{domain}, ostype => $config{ostype}); @@ -652,14 +652,14 @@ sub best_container_domain { sub generic_container_domain { my $self = shift; - my $name = shift; - my $caps = shift; - my $domain = shift; - my $conn = @_ ? shift : $self->conn; + my %params = @_; + my $name = exists $params{name} ? $params{name} : "tck"; + my $caps = exists $params{caps} ? $params{caps} : die "caps parameter is required"; + my $domain = exists $params{domain} ? $params{domain} : die "domain parameter is required"; my $bucket = "os-exe"; - my $b = Sys::Virt::TCK::DomainBuilder->new(conn => $conn, + my $b = Sys::Virt::TCK::DomainBuilder->new(conn => $self->conn, name => $name, domain => $domain, ostype => "exe"); @@ -679,11 +679,12 @@ sub generic_container_domain { sub generic_domain { my $self = shift; - my $name = @_ ? shift : "tck"; - my $ostype = @_ ? shift : undef; - my $conn = shift || $self->conn; + my %params = @_; + + my $name = exists $params{name} ? $params{name} : "tck"; + my $ostype = exists $params{ostype} ? $params{ostype} : "hvm"; - my $caps = Sys::Virt::TCK::Capabilities->new(xml => $conn->get_capabilities); + my $caps = Sys::Virt::TCK::Capabilities->new(xml => $self->conn->get_capabilities); my $container; @@ -691,9 +692,13 @@ sub generic_domain { unless $ostype && $ostype ne "exe"; if ($container) { - return $self->generic_container_domain($name, $caps, $container); + return $self->generic_container_domain(name => $name, + caps => $caps, + domain => $container); } else { - return $self->generic_machine_domain($name, $caps, $ostype); + return $self->generic_machine_domain(name => $name, + caps => $caps, + ostype => $ostype); } } diff --git a/lib/Sys/Virt/TCK/NetworkHelpers.pm b/lib/Sys/Virt/TCK/NetworkHelpers.pm index 5e1bac1..a2a8251 100644 --- a/lib/Sys/Virt/TCK/NetworkHelpers.pm +++ b/lib/Sys/Virt/TCK/NetworkHelpers.pm @@ -58,7 +58,7 @@ sub build_domain{ my ($cdrom, $ksurl) = build_cdrom_ks_image($tck); - my $guest = $tck->generic_domain($domain_name); + my $guest = $tck->generic_domain(name => $domain_name); # change the type of network connection for 802.1Qbg tests if ($mode eq "vepa") { diff --git a/scripts/domain/050-transient-lifecycle.t b/scripts/domain/050-transient-lifecycle.t index 94c6bea..d9e9ecb 100644 --- a/scripts/domain/050-transient-lifecycle.t +++ b/scripts/domain/050-transient-lifecycle.t @@ -40,7 +40,7 @@ BAIL_OUT "failed to setup test harness: $@" if $@; END { $tck->cleanup if $tck; } -my $xml = $tck->generic_domain("tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck")->as_xml; diag "Creating a new transient domain"; my $dom; diff --git a/scripts/domain/051-transient-autostart.t b/scripts/domain/051-transient-autostart.t index 26ca82b..0368365 100644 --- a/scripts/domain/051-transient-autostart.t +++ b/scripts/domain/051-transient-autostart.t @@ -38,7 +38,7 @@ BAIL_OUT "failed to setup test harness: $@" if $@; END { $tck->cleanup if $tck; } -my $xml = $tck->generic_domain("tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck")->as_xml; diag "Creating a new transient domain"; my $dom; diff --git a/scripts/domain/060-persistent-lifecycle.t b/scripts/domain/060-persistent-lifecycle.t index ffcb7c9..01867f9 100644 --- a/scripts/domain/060-persistent-lifecycle.t +++ b/scripts/domain/060-persistent-lifecycle.t @@ -39,7 +39,7 @@ BAIL_OUT "failed to setup test harness: $@" if $@; END { $tck->cleanup if $tck; } -my $xml = $tck->generic_domain("tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck")->as_xml; diag "Defining an inactive domain config"; my $dom; diff --git a/scripts/domain/061-persistent-autostart.t b/scripts/domain/061-persistent-autostart.t index 030515c..5f63270 100644 --- a/scripts/domain/061-persistent-autostart.t +++ b/scripts/domain/061-persistent-autostart.t @@ -39,7 +39,7 @@ BAIL_OUT "failed to setup test harness: $@" if $@; END { $tck->cleanup if $tck; } -my $xml = $tck->generic_domain("tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck")->as_xml; diag "Defining an inactive domain config"; my $dom; diff --git a/scripts/domain/065-persistent-redefine.t b/scripts/domain/065-persistent-redefine.t index af13af2..c743c6a 100644 --- a/scripts/domain/065-persistent-redefine.t +++ b/scripts/domain/065-persistent-redefine.t @@ -38,7 +38,7 @@ BAIL_OUT "failed to setup test harness: $@" if $@; END { $tck->cleanup if $tck; } -my $cfg = $tck->generic_domain("tck")->uuid("11111111-1111-1111-1111-111111111111"); +my $cfg = $tck->generic_domain(name => "tck")->uuid("11111111-1111-1111-1111-111111111111"); $cfg->on_reboot("restart"); my $xml1 = $cfg->as_xml; $cfg->on_reboot("destroy"); diff --git a/scripts/domain/070-transient-to-persistent.t b/scripts/domain/070-transient-to-persistent.t index 6fea959..4ce98b9 100644 --- a/scripts/domain/070-transient-to-persistent.t +++ b/scripts/domain/070-transient-to-persistent.t @@ -39,7 +39,7 @@ BAIL_OUT "failed to setup test harness: $@" if $@; END { $tck->cleanup if $tck; } -my $xml = $tck->generic_domain("tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck")->as_xml; diag "Creating a new transient domain"; my $dom; diff --git a/scripts/domain/080-unique-id-define.t b/scripts/domain/080-unique-id-define.t index 7bf23c3..7b5f2a1 100644 --- a/scripts/domain/080-unique-id-define.t +++ b/scripts/domain/080-unique-id-define.t @@ -54,13 +54,13 @@ my $uuid1 = "11111111-1111-1111-1111-111111111111"; my $uuid2 = "22222222-1111-1111-1111-111111111111"; # The initial config -my $xml = $tck->generic_domain($name1)->uuid($uuid1)->as_xml; +my $xml = $tck->generic_domain(name => $name1)->uuid($uuid1)->as_xml; # One with a different UUID, matching name -my $xml_diffuuid = $tck->generic_domain($name1)->uuid($uuid2)->as_xml; +my $xml_diffuuid = $tck->generic_domain(name => $name1)->uuid($uuid2)->as_xml; # One with a matching UUID, different name -my $xml_diffname = $tck->generic_domain($name2)->uuid($uuid1)->as_xml; +my $xml_diffname = $tck->generic_domain(name => $name2)->uuid($uuid1)->as_xml; # One with a different UUID, different name -my $xml_diffboth = $tck->generic_domain($name2)->uuid($uuid2)->as_xml; +my $xml_diffboth = $tck->generic_domain(name => $name2)->uuid($uuid2)->as_xml; diag "Defining persistent domain config"; diff --git a/scripts/domain/081-unique-id-create.t b/scripts/domain/081-unique-id-create.t index 68f29c7..07143a5 100644 --- a/scripts/domain/081-unique-id-create.t +++ b/scripts/domain/081-unique-id-create.t @@ -54,13 +54,13 @@ my $uuid1 = "11111111-1111-1111-1111-111111111111"; my $uuid2 = "22222222-1111-1111-1111-111111111111"; # The initial config -my $xml = $tck->generic_domain($name1)->uuid($uuid1)->as_xml; +my $xml = $tck->generic_domain(name => $name1)->uuid($uuid1)->as_xml; # One with a different UUID, matching name -my $xml_diffuuid = $tck->generic_domain($name1)->uuid($uuid2)->as_xml; +my $xml_diffuuid = $tck->generic_domain(name => $name1)->uuid($uuid2)->as_xml; # One with a matching UUID, different name -my $xml_diffname = $tck->generic_domain($name2)->uuid($uuid1)->as_xml; +my $xml_diffname = $tck->generic_domain(name => $name2)->uuid($uuid1)->as_xml; # One with a different UUID, different name -my $xml_diffboth = $tck->generic_domain($name2)->uuid($uuid2)->as_xml; +my $xml_diffboth = $tck->generic_domain(name => $name2)->uuid($uuid2)->as_xml; diag "Defining persistent domain config"; my ($dom, $dom1); diff --git a/scripts/domain/082-unique-id-caching.t b/scripts/domain/082-unique-id-caching.t index 5ea13ed..7e0096d 100644 --- a/scripts/domain/082-unique-id-caching.t +++ b/scripts/domain/082-unique-id-caching.t @@ -64,9 +64,9 @@ my $uuid1 = "11111111-1111-1111-1111-111111111111"; my $uuid2 = "22222222-1111-1111-1111-111111111111"; # The initial config -my $xml1 = $tck->generic_domain($name)->uuid($uuid1)->as_xml; +my $xml1 = $tck->generic_domain(name => $name)->uuid($uuid1)->as_xml; # One with a different UUID, matching name -my $xml2 = $tck->generic_domain($name)->uuid($uuid2)->as_xml; +my $xml2 = $tck->generic_domain(name => $name)->uuid($uuid2)->as_xml; diag "Creating & destroying initial guest with $name, $uuid1"; my $dom1; diff --git a/scripts/domain/090-invalid-ops-when-inactive.t b/scripts/domain/090-invalid-ops-when-inactive.t index 38dd744..2daeee5 100644 --- a/scripts/domain/090-invalid-ops-when-inactive.t +++ b/scripts/domain/090-invalid-ops-when-inactive.t @@ -40,7 +40,7 @@ BAIL_OUT "failed to setup test harness: $@" if $@; END { $tck->cleanup if $tck; } -my $xml = $tck->generic_domain("tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck")->as_xml; diag "Creating a new persistent domain"; my $dom; diff --git a/scripts/domain/100-transient-save-restore.t b/scripts/domain/100-transient-save-restore.t index 9860fee..6ab6752 100644 --- a/scripts/domain/100-transient-save-restore.t +++ b/scripts/domain/100-transient-save-restore.t @@ -42,7 +42,7 @@ END { } -my $xml = $tck->generic_domain("tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck")->as_xml; diag "Creating a new transient domain"; my $dom; diff --git a/scripts/domain/101-persistent-save-restore.t b/scripts/domain/101-persistent-save-restore.t index 5423edd..9384c23 100644 --- a/scripts/domain/101-persistent-save-restore.t +++ b/scripts/domain/101-persistent-save-restore.t @@ -42,7 +42,7 @@ END { } -my $xml = $tck->generic_domain("tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck")->as_xml; diag "Creating a new transient domain"; my $dom; diff --git a/scripts/domain/102-broken-save-restore.t b/scripts/domain/102-broken-save-restore.t index a8c5d48..4a05705 100644 --- a/scripts/domain/102-broken-save-restore.t +++ b/scripts/domain/102-broken-save-restore.t @@ -43,7 +43,7 @@ END { } -my $xml = $tck->generic_domain("tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck")->as_xml; diag "Creating a new transient domain"; my $dom; diff --git a/scripts/domain/103-blockdev-save-restore.t b/scripts/domain/103-blockdev-save-restore.t index 70d680c..db73e32 100644 --- a/scripts/domain/103-blockdev-save-restore.t +++ b/scripts/domain/103-blockdev-save-restore.t @@ -42,7 +42,7 @@ END { } -my $xml = $tck->generic_domain("tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck")->as_xml; my $dev = $tck->get_host_block_device(); diff --git a/scripts/domain/120-disks-stats.t b/scripts/domain/120-disks-stats.t index fc18c29..b9d7be1 100644 --- a/scripts/domain/120-disks-stats.t +++ b/scripts/domain/120-disks-stats.t @@ -39,7 +39,7 @@ BAIL_OUT "failed to setup test harness: $@" if $@; END { $tck->cleanup if $tck; } -my $xml = $tck->generic_domain("tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck")->as_xml; diag "Defining an inactive domain config"; my $dom; diff --git a/scripts/domain/121-block-info.t b/scripts/domain/121-block-info.t index 0cf6500..6fa7780 100644 --- a/scripts/domain/121-block-info.t +++ b/scripts/domain/121-block-info.t @@ -85,7 +85,7 @@ my $disktype = "raw"; my $dst = "vda"; my $dst2 = "vdb"; my $dst3 = "vdc"; -my $guest = $tck->generic_domain("tck"); +my $guest = $tck->generic_domain(name => "tck"); $guest->rmdisk(); $guest->disk(format => { name => "qemu", type => $disktype }, type => "file", src => $path, dst => $dst); diff --git a/scripts/domain/130-cpu-hotplug.t b/scripts/domain/130-cpu-hotplug.t index 0ff1fc5..f735e73 100644 --- a/scripts/domain/130-cpu-hotplug.t +++ b/scripts/domain/130-cpu-hotplug.t @@ -41,7 +41,7 @@ BAIL_OUT "failed to setup test harness: $@" if $@; END { $tck->cleanup if $tck; } -my $xml = $tck->generic_domain("tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck")->as_xml; diag "Creating a new transient domain"; diff --git a/scripts/domain/180-interface-parameters.t b/scripts/domain/180-interface-parameters.t index cfe6cdb..d7866c0 100644 --- a/scripts/domain/180-interface-parameters.t +++ b/scripts/domain/180-interface-parameters.t @@ -47,7 +47,7 @@ END { my $live = $conn->is_alive(); ok($live > 0, "Connection is alive"); -my $xml = $tck->generic_domain("tck") +my $xml = $tck->generic_domain(name => "tck") ->interface(type => "network", source => "default", model => "virtio", mac => "52:54:00:22:22:22") ->as_xml; diff --git a/scripts/domain/200-disk-hotplug.t b/scripts/domain/200-disk-hotplug.t index fe12d72..4c54b6b 100644 --- a/scripts/domain/200-disk-hotplug.t +++ b/scripts/domain/200-disk-hotplug.t @@ -41,7 +41,7 @@ END { } -my $xml = $tck->generic_domain("tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck")->as_xml; diag "Creating a new transient domain"; my $dom; diff --git a/scripts/domain/202-numa-set-parameters.t b/scripts/domain/202-numa-set-parameters.t index fd96866..c0baf0b 100644 --- a/scripts/domain/202-numa-set-parameters.t +++ b/scripts/domain/202-numa-set-parameters.t @@ -42,7 +42,7 @@ END { } -my $xml = $tck->generic_domain("tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck")->as_xml; diag "Creating a new persistent domain"; my $dom; diff --git a/scripts/domain/205-disk-hotplug-ordering.t b/scripts/domain/205-disk-hotplug-ordering.t index be0487a..bc4990f 100644 --- a/scripts/domain/205-disk-hotplug-ordering.t +++ b/scripts/domain/205-disk-hotplug-ordering.t @@ -41,7 +41,7 @@ END { } -my $xml = $tck->generic_domain("tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck")->as_xml; diag "Creating a new transient domain"; my $dom; diff --git a/scripts/domain/207-disk-media-change.t b/scripts/domain/207-disk-media-change.t index ad1756d..dfef7c9 100644 --- a/scripts/domain/207-disk-media-change.t +++ b/scripts/domain/207-disk-media-change.t @@ -46,7 +46,7 @@ my $path2 = $tck->create_sparse_disk("207-disk-media-change", "extra2.img", 100) my $xml; eval { - $xml = $tck->generic_domain("tck", "hvm") + $xml = $tck->generic_domain(name => "tck", ostype => "hvm") ->disk(src => $path1, dst => "hdc", type => "file", device => "cdrom") ->as_xml; }; diff --git a/scripts/domain/210-nic-hotplug.t b/scripts/domain/210-nic-hotplug.t index 593a92d..ac9048e 100644 --- a/scripts/domain/210-nic-hotplug.t +++ b/scripts/domain/210-nic-hotplug.t @@ -41,7 +41,7 @@ END { } -my $xml = $tck->generic_domain("tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck")->as_xml; diag "Creating a new transient domain"; my $dom; diff --git a/scripts/domain/215-nic-hotplug-many.t b/scripts/domain/215-nic-hotplug-many.t index 5b935cc..0270054 100644 --- a/scripts/domain/215-nic-hotplug-many.t +++ b/scripts/domain/215-nic-hotplug-many.t @@ -41,7 +41,7 @@ END { } -my $xml = $tck->generic_domain("tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck")->as_xml; diag "Creating a new transient domain"; my $dom; diff --git a/scripts/domain/240-usb-host-hotplug.t b/scripts/domain/240-usb-host-hotplug.t index 6e74434..a840298 100644 --- a/scripts/domain/240-usb-host-hotplug.t +++ b/scripts/domain/240-usb-host-hotplug.t @@ -43,7 +43,7 @@ END { } -my $xml = $tck->generic_domain("tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck")->as_xml; diag "Creating a new transient domain"; my $dom; diff --git a/scripts/domain/250-pci-host-hotplug.t b/scripts/domain/250-pci-host-hotplug.t index a9fe422..4579477 100644 --- a/scripts/domain/250-pci-host-hotplug.t +++ b/scripts/domain/250-pci-host-hotplug.t @@ -47,7 +47,7 @@ END { } -my $xml = $tck->generic_domain("tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck")->as_xml; diag "Creating a new transient domain"; my $dom; diff --git a/scripts/domain/300-migration.t b/scripts/domain/300-migration.t index 9cbdd8f..4e91668 100644 --- a/scripts/domain/300-migration.t +++ b/scripts/domain/300-migration.t @@ -100,7 +100,7 @@ my ($conn, $otherconn) = eval { $tck->setup(dualhost => 1); }; BAIL_OUT "failed to setup test harness: $@" if $@; END { $tck->cleanup if $tck; } -my $xml = $tck->generic_domain("tck")->uuid("050072e8-7bce-3515-992a-8431d74f371f")->as_xml; +my $xml = $tck->generic_domain(name => "tck")->uuid("050072e8-7bce-3515-992a-8431d74f371f")->as_xml; use Sys::Virt::Domain; use IO::File; diff --git a/scripts/domain/301-migration-max-speed.t b/scripts/domain/301-migration-max-speed.t index cd029c2..6aac931 100644 --- a/scripts/domain/301-migration-max-speed.t +++ b/scripts/domain/301-migration-max-speed.t @@ -42,7 +42,7 @@ END { $tck->cleanup if $tck; } -my $xml = $tck->generic_domain("tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck")->as_xml; my $dom; ok_domain(sub { $dom = $conn->create_domain($xml) }, "Create domain"); diff --git a/scripts/hooks/052-domain-hook.t b/scripts/hooks/052-domain-hook.t index 90b8a48..294b30d 100644 --- a/scripts/hooks/052-domain-hook.t +++ b/scripts/hooks/052-domain-hook.t @@ -49,7 +49,7 @@ SKIP: { skip 12, "Not using QEMU/LXC driver" unless $uri eq "qemu:///system" or $uri eq "lxc:///"; - my $xml = $tck->generic_domain("tck")->as_xml; + my $xml = $tck->generic_domain(name => "tck")->as_xml; diag "Creating a new persistent domain"; my $dom; diff --git a/scripts/qemu/100-disk-encryption.t b/scripts/qemu/100-disk-encryption.t index 5fb6fc8..8a0fd5e 100644 --- a/scripts/qemu/100-disk-encryption.t +++ b/scripts/qemu/100-disk-encryption.t @@ -84,7 +84,7 @@ my $vol; diag "Creating volume $volXML"; lives_ok(sub { $vol = $pool->create_volume($volXML) }, "volume created"); -my $xml = $tck->generic_domain("tck") +my $xml = $tck->generic_domain(name => "tck") ->disk(format => { name => "qemu", type => "qcow2" }, secret => $secretUUID, type => "file", diff --git a/scripts/qemu/200-qcow2-single-backing-file.t b/scripts/qemu/200-qcow2-single-backing-file.t index 1cc665f..28d27c2 100644 --- a/scripts/qemu/200-qcow2-single-backing-file.t +++ b/scripts/qemu/200-qcow2-single-backing-file.t @@ -107,7 +107,7 @@ SKIP: { # We point the guest at a qcow2 image, but tell it that is # is raw. Thus *nothing* should ever try to open the backing # store in this qcow2 image. - $xml = $tck->generic_domain("tck") + $xml = $tck->generic_domain(name => "tck") ->disk(format => { name => "qemu", type => "raw" }, type => "file", src => $pathmain, diff --git a/scripts/qemu/205-qcow2-double-backing-file.t b/scripts/qemu/205-qcow2-double-backing-file.t index ad54c7c..485b6f7 100644 --- a/scripts/qemu/205-qcow2-double-backing-file.t +++ b/scripts/qemu/205-qcow2-double-backing-file.t @@ -132,7 +132,7 @@ SKIP: { # We point the guest at a qcow2 image, but tell it that is # is raw. Thus *nothing* should ever try to open the backing # store in this qcow2 image. - $xml = $tck->generic_domain("tck") + $xml = $tck->generic_domain(name => "tck") ->disk(format => { name => "qemu", type => "qcow2" }, type => "file", src => $pathmain, diff --git a/scripts/qemu/210-qcow2-auto-probing.t b/scripts/qemu/210-qcow2-auto-probing.t index bf3de32..5ed4761 100644 --- a/scripts/qemu/210-qcow2-auto-probing.t +++ b/scripts/qemu/210-qcow2-auto-probing.t @@ -129,7 +129,7 @@ SKIP: { # We point the guest at a qcow2 image, but tell it that is # is raw. Thus *nothing* should ever try to open the backing # store in this qcow2 image. - $xml = $tck->generic_domain("tck") + $xml = $tck->generic_domain(name => "tck") ->disk(type => "file", src => $pathmain, dst => "vdb") diff --git a/scripts/qemu/400-save-image-xml.t b/scripts/qemu/400-save-image-xml.t index df87666..e7b96b7 100644 --- a/scripts/qemu/400-save-image-xml.t +++ b/scripts/qemu/400-save-image-xml.t @@ -47,7 +47,7 @@ SKIP:{ skip "Only relevant to QEMU driver", 10 unless $conn->get_type() eq "QEMU"; # scenario 1 - get/define xml from transient domain save image - my $xml = $tck->generic_domain("tck")->as_xml; + my $xml = $tck->generic_domain(name => "tck")->as_xml; diag "Creating a new transient domain"; my $dom; ok_domain(sub { $dom = $conn->create_domain($xml) }, "created transient domain object"); diff --git a/scripts/selinux/050-dynamic-relabel-yes.t b/scripts/selinux/050-dynamic-relabel-yes.t index 6a75f92..2fb6866 100644 --- a/scripts/selinux/050-dynamic-relabel-yes.t +++ b/scripts/selinux/050-dynamic-relabel-yes.t @@ -51,7 +51,7 @@ SKIP: { my $origlabel = selinux_restore_file_context($disk); diag "Original $origlabel"; - my $xml = $tck->generic_domain("tck") + my $xml = $tck->generic_domain(name => "tck") ->seclabel(model => "selinux", type => "dynamic", relabel => "yes") ->disk(src => $disk, dst => "vdb", type => "file") ->as_xml; diff --git a/scripts/selinux/055-dynamic-base-label.t b/scripts/selinux/055-dynamic-base-label.t index 271c2e9..ba07c09 100644 --- a/scripts/selinux/055-dynamic-base-label.t +++ b/scripts/selinux/055-dynamic-base-label.t @@ -51,7 +51,7 @@ SKIP: { my $origlabel = selinux_restore_file_context($disk); - my $xml = $tck->generic_domain("tck") + my $xml = $tck->generic_domain(name => "tck") ->seclabel(model => "selinux", type => "dynamic", relabel => "yes", baselabel => $SELINUX_OTHER_CONTEXT) ->disk(src => $disk, dst => "vdb", type => "file") ->as_xml; diff --git a/scripts/selinux/100-static-relabel-no.t b/scripts/selinux/100-static-relabel-no.t index 30db172..36eae47 100644 --- a/scripts/selinux/100-static-relabel-no.t +++ b/scripts/selinux/100-static-relabel-no.t @@ -53,7 +53,7 @@ SKIP: { selinux_set_file_context($disk, $origimagelabel); - my $xml = $tck->generic_domain("tck") + my $xml = $tck->generic_domain(name => "tck") ->seclabel(model => "selinux", type => "static", relabel => "no", label => $origdomainlabel) ->disk(src => $disk, dst => "vdb", type => "file") ->as_xml; diff --git a/scripts/selinux/105-static-relabel-fail.t b/scripts/selinux/105-static-relabel-fail.t index 08ef429..20b576e 100644 --- a/scripts/selinux/105-static-relabel-fail.t +++ b/scripts/selinux/105-static-relabel-fail.t @@ -53,7 +53,7 @@ SKIP: { my $origdomainlabel = $SELINUX_DOMAIN_CONTEXT . $origmcs; my $origimagelabel = selinux_restore_file_context($disk); - my $xml = $tck->generic_domain("tck") + my $xml = $tck->generic_domain(name => "tck") ->seclabel(model => "selinux", type => "static", relabel => "no", label => $origdomainlabel) ->disk(src => $disk, dst => "vdb", type => "file") ->as_xml; diff --git a/scripts/selinux/110-static-relabel-yes.t b/scripts/selinux/110-static-relabel-yes.t index deba314..dc4e1ec 100644 --- a/scripts/selinux/110-static-relabel-yes.t +++ b/scripts/selinux/110-static-relabel-yes.t @@ -52,7 +52,7 @@ SKIP: { my $origdomainlabel = $SELINUX_DOMAIN_CONTEXT . $origmcs; my $origimagelabel = selinux_restore_file_context($disk); - my $xml = $tck->generic_domain("tck") + my $xml = $tck->generic_domain(name => "tck") ->seclabel(model => "selinux", type => "static", relabel => "yes", label => $origdomainlabel) ->disk(src => $disk, dst => "vdb", type => "file") ->as_xml; -- 1.8.5.3

2 1

[libvirt] [PATCH] Do not truncate output of nwfilter2vmtest.sh
by Daniel P. Berrange 27 Mar '14

27 Mar '14

When printing test results, nwfilter2vmtest.sh, truncates the output at 66 or 70 characters. This is very unhelpful when debugging problems where you want to see the full output Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- scripts/nwfilter/nwfilter2vmtest.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/nwfilter/nwfilter2vmtest.sh b/scripts/nwfilter/nwfilter2vmtest.sh index f44f299..a68c771 100644 --- a/scripts/nwfilter/nwfilter2vmtest.sh +++ b/scripts/nwfilter/nwfilter2vmtest.sh @@ -68,7 +68,7 @@ EOF tap_fail() { - txt=$(echo "$2" | gawk '{print substr($0,1,66)}') + txt=$(echo "$2") echo "not ok $1 - ${txt}" TAP_FAIL_LIST="$TAP_FAIL_LIST $1 " TAP_FAIL_CTR=$(($TAP_FAIL_CTR + 1)) @@ -76,7 +76,7 @@ tap_fail() { } tap_pass() { - txt=$(echo "$2" | gawk '{print substr($0,1,70)}') + txt=$(echo "$2") echo "ok $1 - ${txt}" TAP_TOT_CTR=$(($TAP_TOT_CTR + 1)) } -- 1.8.5.3

3 4

[libvirt] [PATCH] Added example script on how to convert LXC container config
by Cédric Bosdonnat 27 Mar '14

27 Mar '14

--- Makefile.am | 2 +- configure.ac | 1 + examples/lxcconvert/Makefile.am | 19 ++++++++++ examples/lxcconvert/virt-lxc-convert | 67 ++++++++++++++++++++++++++++++++++++ 4 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 examples/lxcconvert/Makefile.am create mode 100644 examples/lxcconvert/virt-lxc-convert diff --git a/Makefile.am b/Makefile.am index 9847ff0..0ef983f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,7 +23,7 @@ SUBDIRS = . gnulib/lib include src daemon tools docs gnulib/tests \ tests po examples/object-events examples/hellolibvirt \ examples/dominfo examples/domsuspend examples/apparmor \ examples/xml/nwfilter examples/openauth examples/systemtap \ - tools/wireshark + examples/lxcconvert tools/wireshark ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index 62b74c5..f970de0 100644 --- a/configure.ac +++ b/configure.ac @@ -2695,6 +2695,7 @@ AC_CONFIG_FILES([\ examples/hellolibvirt/Makefile \ examples/systemtap/Makefile \ examples/xml/nwfilter/Makefile \ + examples/lxcconvert/Makefile \ tools/wireshark/Makefile \ tools/wireshark/src/Makefile]) AC_OUTPUT diff --git a/examples/lxcconvert/Makefile.am b/examples/lxcconvert/Makefile.am new file mode 100644 index 0000000..c5ae537 --- /dev/null +++ b/examples/lxcconvert/Makefile.am @@ -0,0 +1,19 @@ +## Copyright (C) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +## +## This library is free software; you can redistribute it and/or +## modify it under the terms of the GNU Lesser General Public +## License as published by the Free Software Foundation; either +## version 2.1 of the License, or (at your option) any later version. +## +## This library is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## Lesser General Public License for more details. +## +## You should have received a copy of the GNU Lesser General Public +## License along with this library. If not, see +## <http://www.gnu.org/licenses/>. + +EXTRA_DIST= \ + virt-lxc-convert + diff --git a/examples/lxcconvert/virt-lxc-convert b/examples/lxcconvert/virt-lxc-convert new file mode 100644 index 0000000..ea32ff4 --- /dev/null +++ b/examples/lxcconvert/virt-lxc-convert @@ -0,0 +1,67 @@ +#!/usr/bin/env sh + +function show_help() +{ + cat << EOF +$0 /path/to/lxc/config/file + +Wrapper around virsh domxml-from-native to ease conversion of LXC +containers configuration to libvirt domain XML. +EOF +} + +if test "$#" != 1; then + show_help + exit 1 +fi + +conf=$1 + + +conf_new=/tmp/config-$$ +domain_new=/tmp/config-$$.xml + +cp $conf $conf_new + +# Do we have lxc.mount, and is it pointing to a readable file? +fstab=`grep 'lxc.mount[[:space:]]*=' $conf_new | sed -e 's/[[:space:]]\+=[[:space:]]\+/=/' | cut -f 2 -d '='` +if test $ -n "$fstab" $ -a $ -r "$fstab" $; then + sed -i -e 's/^lxc.mount[[:space:]]*=.*$//' $conf_new + sed -e 's/^$[^#]$/lxc.mount.entry = \1/' $fstab | cat $conf_new - >${conf_new}.tmp + mv ${conf_new}.tmp $conf_new +fi + +memory=`free | grep 'Mem:' | sed -e 's: \+: :g' | cut -f 2 -d ' '` +default_tmpfs="size=$((memory/2))" + +# Do we have tmpfs without size param? +grep -e 'lxc.mount.entry[[:space:]]*=[[:space:]]*tmpfs[[:space:]]' $conf_new | while read line; do + has_size=`echo $line | grep -v -e 'size='` + # Add the default size here (50%) if no size is given + if test -n "$has_size"; then + sed -i -e "\;$line;s/$[[:space:]]\+[0-9][[:space:]]\+[0-9][::space::]*$$/,$default_tmpfs\1/" $conf_new + fi + # Convert relative sizes + has_rel_size=`echo $line | grep -e 'size=[0-9]\+%'` + if test -n "$has_rel_size"; then + percent=`echo "$line" | sed -e 's:size=$[0-9]\+$%:\n\1%\n:' | grep '\%' | sed -e 's/%//'` + size="$((memory*percent/100))" + sed -i -e "\;$line;s/size=[0-9]\+%/size=${size}/" $conf_new + fi +done + +# Do we have any memory limit set? +mem_limit=`grep 'lxc.cgroup.memory.limit_in_bytes[[:space:]]*=' $conf_new` +if test -z "$mem_limit"; then + sed -i -e "1s:^:lxc.cgroup.memory.limit_in_bytes = $memory\n:" $conf_new +fi + +virsh -c lxc:/// domxml-from-native lxc-tools $conf_new >$domain_new + +cat $domain_new + +# Remove the temporary config +rm $conf_new +rm $domain_new + +exit 0 -- 1.9.0

3 2

[libvirt] [PATCH tck] Avoid assumptions about selinux contexts
by Daniel P. Berrange 27 Mar '14

27 Mar '14

The current SELinux tests assume a context system_u:system_r or system_u:object_r, which is not true if running against a libvirtd from the source tree. --- lib/Sys/Virt/TCK/SELinux.pm | 30 +++++++++++++++++++++++++++--- scripts/selinux/050-dynamic-relabel-yes.t | 10 ++++++---- scripts/selinux/055-dynamic-base-label.t | 10 ++++++---- scripts/selinux/100-static-relabel-no.t | 2 +- scripts/selinux/110-static-relabel-yes.t | 11 +++++++---- 5 files changed, 47 insertions(+), 16 deletions(-) diff --git a/lib/Sys/Virt/TCK/SELinux.pm b/lib/Sys/Virt/TCK/SELinux.pm index 9f7c0c1..c117fca 100644 --- a/lib/Sys/Virt/TCK/SELinux.pm +++ b/lib/Sys/Virt/TCK/SELinux.pm @@ -18,19 +18,43 @@ use warnings; use base qw(Exporter); use vars qw($SELINUX_GENERIC_CONTEXT $SELINUX_DOMAIN_CONTEXT - $SELINUX_IMAGE_CONTEXT $SELINUX_OTHER_CONTEXT); + $SELINUX_IMAGE_CONTEXT $SELINUX_OTHER_CONTEXT + $SELINUX_GENERIC_TYPE $SELINUX_DOMAIN_TYPE + $SELINUX_IMAGE_TYPE $SELINUX_OTHER_TYPE); our @EXPORT = qw(selinux_get_file_context selinux_set_file_context selinux_restore_file_context + selinux_get_type + selinux_get_mcs $SELINUX_GENERIC_CONTEXT $SELINUX_DOMAIN_CONTEXT - $SELINUX_IMAGE_CONTEXT $SELINUX_OTHER_CONTEXT); + $SELINUX_IMAGE_CONTEXT $SELINUX_OTHER_CONTEXT + $SELINUX_GENERIC_TYPE $SELINUX_DOMAIN_TYPE + $SELINUX_IMAGE_TYPE $SELINUX_OTHER_TYPE); -$SELINUX_OTHER_CONTEXT = "system_u:object_r:virt_t:s0"; +$SELINUX_OTHER_TYPE = "svirt_tcg_t"; +$SELINUX_GENERIC_TYPE = "virt_image_t"; +$SELINUX_DOMAIN_TYPE = "svirt_t"; +$SELINUX_IMAGE_TYPE = "svirt_image_t"; + +$SELINUX_OTHER_CONTEXT = "system_u:system_r:svirt_tcg_t:s0"; $SELINUX_GENERIC_CONTEXT = "system_u:object_r:virt_image_t:s0"; $SELINUX_DOMAIN_CONTEXT = "system_u:system_r:svirt_t:s0"; $SELINUX_IMAGE_CONTEXT = "system_u:object_r:svirt_image_t:s0"; +sub selinux_get_type { + my $context = shift; + + my @bits = split /:/, $context; + return $bits[2]; +} + +sub selinux_get_mcs { + my $context = shift; + + my @bits = split /:/, $context; + return $bits[4]; +} sub selinux_get_file_context { my $path = shift; diff --git a/scripts/selinux/050-dynamic-relabel-yes.t b/scripts/selinux/050-dynamic-relabel-yes.t index 2fb6866..5a53b9d 100644 --- a/scripts/selinux/050-dynamic-relabel-yes.t +++ b/scripts/selinux/050-dynamic-relabel-yes.t @@ -64,12 +64,14 @@ SKIP: { diag "domainlabel $domainlabel"; my $imagelabel = xpath($dom, "string(/domain/seclabel/imagelabel)"); diag "imagelabel $imagelabel"; + my $domaintype = selinux_get_type($domainlabel); + my $imagetype = selinux_get_type($imagelabel); - is(index($domainlabel, $SELINUX_DOMAIN_CONTEXT), 0, "dynamic domain label prefix is $SELINUX_DOMAIN_CONTEXT"); - is(index($imagelabel, $SELINUX_IMAGE_CONTEXT), 0, "dynamic image label prefix is $SELINUX_IMAGE_CONTEXT"); + is($domaintype, $SELINUX_DOMAIN_TYPE, "dynamic domain label type is $SELINUX_DOMAIN_TYPE"); + is($imagetype, $SELINUX_IMAGE_TYPE, "dynamic image label type is $SELINUX_IMAGE_TYPE"); - my $domainmcs = substr $domainlabel, length($SELINUX_DOMAIN_CONTEXT); - my $imagemcs = substr $imagelabel, length($SELINUX_IMAGE_CONTEXT); + my $domainmcs = selinux_get_mcs($domainlabel); + my $imagemcs = selinux_get_mcs($imagelabel); is($domainmcs, $imagemcs, "Domain MCS $domainmcs == Image MCS $imagemcs"); diff --git a/scripts/selinux/055-dynamic-base-label.t b/scripts/selinux/055-dynamic-base-label.t index ba07c09..646c50d 100644 --- a/scripts/selinux/055-dynamic-base-label.t +++ b/scripts/selinux/055-dynamic-base-label.t @@ -64,12 +64,14 @@ SKIP: { diag "domainlabel $domainlabel"; my $imagelabel = xpath($dom, "string(/domain/seclabel/imagelabel)"); diag "imagelabel $imagelabel"; + my $domaintype = selinux_get_type($domainlabel); + my $imagetype = selinux_get_type($imagelabel); - is(index($domainlabel, $SELINUX_OTHER_CONTEXT), 0, "dynamic domain label prefix is $SELINUX_OTHER_CONTEXT"); - is(index($imagelabel, $SELINUX_IMAGE_CONTEXT), 0, "dynamic image label prefix is $SELINUX_IMAGE_CONTEXT"); + is($domaintype, $SELINUX_OTHER_TYPE, "dynamic domain label type is $SELINUX_OTHER_TYPE"); + is($imagetype, $SELINUX_IMAGE_TYPE, "dynamic image label type is $SELINUX_IMAGE_TYPE"); - my $domainmcs = substr $domainlabel, length($SELINUX_OTHER_CONTEXT); - my $imagemcs = substr $imagelabel, length($SELINUX_IMAGE_CONTEXT); + my $domainmcs = selinux_get_mcs($domainlabel); + my $imagemcs = selinux_get_mcs($imagelabel); is($domainmcs, $imagemcs, "Domain MCS $domainmcs == Image MCS $imagemcs"); diff --git a/scripts/selinux/100-static-relabel-no.t b/scripts/selinux/100-static-relabel-no.t index 36eae47..8d9fda8 100644 --- a/scripts/selinux/100-static-relabel-no.t +++ b/scripts/selinux/100-static-relabel-no.t @@ -51,8 +51,8 @@ SKIP: { my $origdomainlabel = $SELINUX_DOMAIN_CONTEXT . $origmcs; my $origimagelabel = $SELINUX_IMAGE_CONTEXT . $origmcs; + diag "Setting image '$disk' to '$origimagelabel'"; selinux_set_file_context($disk, $origimagelabel); - my $xml = $tck->generic_domain(name => "tck") ->seclabel(model => "selinux", type => "static", relabel => "no", label => $origdomainlabel) ->disk(src => $disk, dst => "vdb", type => "file") diff --git a/scripts/selinux/110-static-relabel-yes.t b/scripts/selinux/110-static-relabel-yes.t index dc4e1ec..f558cc9 100644 --- a/scripts/selinux/110-static-relabel-yes.t +++ b/scripts/selinux/110-static-relabel-yes.t @@ -28,7 +28,7 @@ and files can be relabelled use strict; use warnings; -use Test::More tests => 5; +use Test::More tests => 6; use Sys::Virt::TCK; use Sys::Virt::TCK::SELinux; @@ -48,8 +48,8 @@ SKIP: { my $disk = $tck->create_sparse_disk("selinux", "tck", 50); - my $origmcs = ":c1,c2"; - my $origdomainlabel = $SELINUX_DOMAIN_CONTEXT . $origmcs; + my $origmcs = "c1,c2"; + my $origdomainlabel = $SELINUX_DOMAIN_CONTEXT . ":" . $origmcs; my $origimagelabel = selinux_restore_file_context($disk); my $xml = $tck->generic_domain(name => "tck") @@ -66,9 +66,12 @@ SKIP: { diag "domainlabel $domainlabel"; my $imagelabel = xpath($dom, "string(/domain/seclabel/imagelabel)"); diag "imagelabel $imagelabel"; + my $imagetype = selinux_get_type($imagelabel); + my $imagemcs = selinux_get_mcs($imagelabel); is($origdomainlabel, $domainlabel, "static label is $domainlabel"); - is($imagelabel, $SELINUX_IMAGE_CONTEXT . $origmcs, "image label is $SELINUX_DOMAIN_CONTEXT$origmcs"); + is($imagetype, $SELINUX_IMAGE_TYPE, "image label type is $SELINUX_DOMAIN_TYPE"); + is($imagemcs, $origmcs, "image label mcs is $origmcs"); is(selinux_get_file_context($disk), $imagelabel, "$disk label is $imagelabel"); -- 1.8.5.3

1 0

[libvirt] Crash when using python-libvirt setSchedulerParameters
by Brian Rak 27 Mar '14

27 Mar '14

I'm seeing a very weird (and somewhat reproducable) crash in setSchedulerParameters. The backtrace looks like this: *** glibc detected *** python2.7: free(): invalid pointer: 0x000000000152bc48 *** ======= Backtrace: ========= /lib64/libc.so.6(+0x76166)[0x7faa9e991166] /usr/lib64/python2.7/site-packages/libvirtmod.so(virFree+0x29)[0x7faa9887bfe9] /lib/libvirt.so.0(virTypedParamsClear+0x54)[0x7faa98342fe4] /lib/libvirt.so.0(virTypedParamsFree+0x1e)[0x7faa9834302e] /usr/lib64/python2.7/site-packages/libvirtmod.so(+0x1b4dc)[0x7faa9886c4dc] /usr/lib64/libpython2.7.so.1.0(PyEval_EvalFrameEx+0x5629)[0x7faa9f63a129] /usr/lib64/libpython2.7.so.1.0(PyEval_EvalFrameEx+0x68e8)[0x7faa9f63b3e8] /usr/lib64/libpython2.7.so.1.0(PyEval_EvalCodeEx+0x8ae)[0x7faa9f63bd5e] /usr/lib64/libpython2.7.so.1.0(PyEval_EvalCode+0x32)[0x7faa9f63be72] /usr/lib64/libpython2.7.so.1.0(+0xff25c)[0x7faa9f65625c] /usr/lib64/libpython2.7.so.1.0(PyRun_FileExFlags+0x90)[0x7faa9f656330] /usr/lib64/libpython2.7.so.1.0(PyRun_SimpleFileExFlags+0xef)[0x7faa9f6578cf] /usr/lib64/libpython2.7.so.1.0(Py_Main+0xc56)[0x7faa9f6693f6] /lib64/libc.so.6(__libc_start_main+0xfd)[0x7faa9e939d1d] python2.7[0x400649] I am using: Python2.7 Python-Libvirt 1.2.2 with the "[PATCH libvirt-python 1/2] setPyVirTypedParameter: Copy full field name" patch. Libvirt 1.2.1 A quick example: import libvirt for i in range(0,40): conn = libvirt.open(None) for domid in conn.listDomainsID(): dom = conn.lookupByID(domid) print dom.name() params = {} params['vcpu_period'] = 50000 params['vcpu_quota'] = 100000 dom.setSchedulerParameters(params) This will crash frequently (over 80% of the time), but not all the time. Interestingly, if I add 'dom = None' before 'conn = libvirt.open(None)', the crashes seem to stop. This is just a simple test case from my actual application though, so applying that workaround may be tough (and it seems like it shouldn't crash, even without that.

2 5

[libvirt] [PATCH v2] Fix apparmor profile to make vfio pci passthrough work
by Cédric Bosdonnat 27 Mar '14

27 Mar '14

See lp#1276719 for the bug description. As virt-aa-helper doesn't know the VFIO groups to use for the guest, allow access to all /dev/vfio/[0-9]* and /dev/vfio/vfio files if there is a potential need for vfio --- examples/apparmor/libvirt-qemu | 1 + examples/apparmor/usr.sbin.libvirtd | 3 +++ src/security/virt-aa-helper.c | 12 ++++++++++++ 3 files changed, 16 insertions(+) diff --git a/examples/apparmor/libvirt-qemu b/examples/apparmor/libvirt-qemu index e1980b7..83814ec 100644 --- a/examples/apparmor/libvirt-qemu +++ b/examples/apparmor/libvirt-qemu @@ -110,6 +110,7 @@ /usr/bin/qemu-sparc32plus rmix, /usr/bin/qemu-sparc64 rmix, /usr/bin/qemu-x86_64 rmix, + /usr/lib/qemu/block-curl.so mr, # for save and resume /bin/dash rmix, diff --git a/examples/apparmor/usr.sbin.libvirtd b/examples/apparmor/usr.sbin.libvirtd index fd6def1..3011eff 100644 --- a/examples/apparmor/usr.sbin.libvirtd +++ b/examples/apparmor/usr.sbin.libvirtd @@ -25,6 +25,9 @@ capability fsetid, capability audit_write, + # Needed for vfio + capability sys_resource, + network inet stream, network inet dgram, network inet6 stream, diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 59de517..998dc53 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -927,6 +927,7 @@ get_files(vahControl * ctl) size_t i; char *uuid; char uuidstr[VIR_UUID_STRING_BUFLEN]; + bool needsVfio = false; /* verify uuid is same as what we were given on the command line */ virUUIDFormat(ctl->def->uuid, uuidstr); @@ -1068,6 +1069,12 @@ get_files(vahControl * ctl) dev->source.subsys.u.pci.addr.slot, dev->source.subsys.u.pci.addr.function); + virDomainHostdevSubsysPciBackendType backend = dev->source.subsys.u.pci.backend; + if (backend == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO || + backend == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT) { + needsVfio = true; + } + if (pci == NULL) continue; @@ -1096,6 +1103,11 @@ get_files(vahControl * ctl) } } + if (needsVfio) { + virBufferAsprintf(&buf, " /dev/vfio/vfio rw,\n"); + virBufferAsprintf(&buf, " /dev/vfio/[0-9]* rw,\n"); + } + if (ctl->newfile) if (vah_add_file(&buf, ctl->newfile, "rw") != 0) goto cleanup; -- 1.9.0

4 4

[libvirt] [PATCH 0/2] apparmor fixes
by Cédric Bosdonnat 27 Mar '14

27 Mar '14

Fixes a regression I brough in virt-aa-helper with the lxc apparmor profiles. And makes vfio work even with apparmor enforced on libvirtd Cédric Bosdonnat (2): Fixed regression in apparmor profiles for qemu brought by 43c030f Fix apparmor profile to make vfio pci passthrough work examples/apparmor/libvirt-qemu | 5 +++++ examples/apparmor/usr.sbin.libvirtd | 3 +++ src/security/virt-aa-helper.c | 4 +++- 3 files changed, 11 insertions(+), 1 deletion(-) -- 1.9.0

4 5

[libvirt] is there a way to convert vm's filter into comandline
by bigclouds 27 Mar '14

27 Mar '14

hi,all is there a way to convert vm's filter into comandline, i think it is useful. if there is the functionality, so you think it is worthy to be done. thanks

5 8

[libvirt] VM host name
by Vikas Kokare 27 Mar '14

27 Mar '14

Is there a way using LibVirt (java) API to find out the DNS host name of a virtual machine, if already configured? -Vikas

1 0

[libvirt] [PATCH 0/3] ABI change: change group name of option table to match with option name
by Amos Kong 27 Mar '14

27 Mar '14

This patchset changes group names of option tables to match with option name, this breakes ABI, release note was updated. Amos Kong (3): only add qemu_tpmdev_opts when CONFIG_TPM is defined abort QEMU if group name in option table doesn't match with defined option name update names in option tables to match with actual command-line spelling hw/acpi/core.c | 8 ++++---- hw/nvram/fw_cfg.c | 4 ++-- include/qemu/option.h | 2 +- qemu-options.h | 12 ++++++++++++ util/qemu-config.c | 28 ++++++++++++++++++++++++++++ vl.c | 37 +++++++++++++------------------------ 6 files changed, 60 insertions(+), 31 deletions(-) -- 1.8.5.3

2 5

[libvirt] [PATCHv3] Fix Memory Leak in virQEMUCapsInitGuestFromBinary()
by Nehal J Wani 27 Mar '14

27 Mar '14

While running qemucaps2xmltest, it was found that valgrind pointed out the following memory leaks: ==29896== 0 bytes in 1 blocks are definitely lost in loss record 1 of 65 ==29896== at 0x4A0577B: calloc (vg_replace_malloc.c:593) ==29896== by 0x4C6B45E: virAllocN (viralloc.c:191) ==29896== by 0x4232A9: virQEMUCapsGetMachineTypesCaps (qemu_capabilities.c:1999) ==29896== by 0x4234E7: virQEMUCapsInitGuestFromBinary (qemu_capabilities.c:789) ==29896== by 0x41F10B: testQemuCapsXML (qemucaps2xmltest.c:118) ==29896== by 0x41FFD1: virtTestRun (testutils.c:201) ==29896== by 0x41EE7A: mymain (qemucaps2xmltest.c:203) ==29896== by 0x42074D: virtTestMain (testutils.c:789) ==29896== by 0x3E6CE1ED1C: (below main) (libc-start.c:226) ==29896== ==29896== 0 bytes in 1 blocks are definitely lost in loss record 2 of 65 ==29896== at 0x4A0577B: calloc (vg_replace_malloc.c:593) ==29896== by 0x4C6B45E: virAllocN (viralloc.c:191) ==29896== by 0x4232A9: virQEMUCapsGetMachineTypesCaps (qemu_capabilities.c:1999) ==29896== by 0x4234E7: virQEMUCapsInitGuestFromBinary (qemu_capabilities.c:789) ==29896== by 0x41F10B: testQemuCapsXML (qemucaps2xmltest.c:118) ==29896== by 0x41FFD1: virtTestRun (testutils.c:201) ==29896== by 0x41EEA3: mymain (qemucaps2xmltest.c:204) ==29896== by 0x42074D: virtTestMain (testutils.c:789) ==29896== by 0x3E6CE1ED1C: (below main) (libc-start.c:226) --- Based on Daniel's comments. v2: https://www.redhat.com/archives/libvir-list/2014-March/msg01672.html v1: https://www.redhat.com/archives/libvir-list/2014-March/msg01667.html src/qemu/qemu_capabilities.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 7673592..e4c1cbd 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1996,10 +1996,12 @@ int virQEMUCapsGetMachineTypesCaps(virQEMUCapsPtr qemuCaps, *nmachines = 0; *machines = NULL; - if (VIR_ALLOC_N(*machines, qemuCaps->nmachineTypes) < 0) - goto error; *nmachines = qemuCaps->nmachineTypes; + if (*nmachines && + VIR_ALLOC_N(*machines, qemuCaps->nmachineTypes) < 0) + goto error; + for (i = 0; i < qemuCaps->nmachineTypes; i++) { virCapsGuestMachinePtr mach; if (VIR_ALLOC(mach) < 0) -- 1.7.1

2 2

[libvirt] [PATCH] util: fix a typo in virprocess.c
by Hongwei Bi 27 Mar '14

27 Mar '14

s/forcably/forcibly Signed-off-by: Hongwei Bi <hwbi2008(a)gmail.com> --- src/util/virprocess.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 405ad06..9179d73 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -283,7 +283,7 @@ int virProcessKill(pid_t pid, int sig) * Try to kill the process and verify it has exited * * Returns 0 if it was killed gracefully, 1 if it - * was killed forcably, -1 if it is still alive, + * was killed forcibly, -1 if it is still alive, * or another error occurred. */ int -- 1.7.9.5

2 1

[libvirt] [PATCH] Modify help information of virsh list command
by Li Yang 27 Mar '14

27 Mar '14

Use 'virsh list domain --title' option can get domain's title, not description, the original help information 'show short domain description' will confuse users, so modify it to 'show domain title' Signed-off-by: Li Yang <liyang.fnst(a)cn.fujitsu.com> --- tools/virsh-domain-monitor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index de4afbb..5d19388 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -1753,7 +1753,7 @@ static const vshCmdOptDef opts_list[] = { }, {.name = "title", .type = VSH_OT_BOOL, - .help = N_("show short domain description") + .help = N_("show domain title") }, {.name = NULL} }; -- 1.7.1

2 1

[libvirt] [PATCH] docs: cgroups: fix typo about LXC cgroups
by Jean-Baptiste Rouault 27 Mar '14

27 Mar '14

--- docs/cgroups.html.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/cgroups.html.in b/docs/cgroups.html.in index f7c2450..33de453 100644 --- a/docs/cgroups.html.in +++ b/docs/cgroups.html.in @@ -33,9 +33,9 @@ <p> The LXC driver is capable of using the <code>cpuset</code>, - <code>cpu</code>, <code>cpuset</code>, <code>freezer</code>, + <code>cpu</code>, <code>cpuacct</code>, <code>freezer</code>, <code>memory</code>, <code>blkio</code> and <code>devices</code> - controllers. The <code>cpuset</code>, <code>devices</code> + controllers. The <code>cpuacct</code>, <code>devices</code> and <code>memory</code> controllers are compulsory. Without them mounted, no containers can be started. If any of the other controllers are not mounted, the resource management APIs -- 1.8.5.3

2 1

[libvirt] [PATCH] libvirt-tck: 052-domain-hook.t - reload after hook cleanup
by Mike Latimer 27 Mar '14

27 Mar '14

Reload libvirtd after hook testing has completed. Otherwise, libvirtd is still expecting hook test scripts to exist. --- scripts/hooks/052-domain-hook.t | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/hooks/052-domain-hook.t b/scripts/hooks/052-domain-hook.t index 90b8a48..d1070b5 100644 --- a/scripts/hooks/052-domain-hook.t +++ b/scripts/hooks/052-domain-hook.t @@ -180,4 +180,8 @@ SKIP: { Sys::Virt::Error::ERR_NO_DOMAIN); $hook->cleanup(); + + diag "reload libvirtd after hook cleanup"; + $hook->action('reload'); + $hook->service_libvirtd(); }; -- 1.8.4.5

3 3

[libvirt] question for qemu migrate fail by virDomainMigrate API
by Wangrui (K) 27 Mar '14

27 Mar '14

Hi everyone， when I use the API virDomainMigrate to do migration operation in KVM environment(libvirt1.1.0 qemu1.5.1), I encountered with some problems. I found that If the connection to source side is disconnected in the BEGIN phase of a migration, the migration job would fail. Further more, the following-up migration of the same VM would not be successful until restart libvirtd. The error log: libvirtd : 8406: error : virQEMUCloseCallbacksSet:781 : internal error Close callback for domain myvm1 already registered with another connection 0x7f023801a900 libvirt: Domain Config error : Requested operation is not valid: domain is already active as 'myvm1' I got the above error by following steps： step 1 : migrate VM. step 2 : disconnect the client connection to source libvirtd at once ,such as ctrl+c. step 3 : the migrate API returns fail. step 4 : migrate this VM again , fails and reports above error. The reason causing this problem may be: In the BEGIN phase of a migraion, it registers a close callback through virQEMUCloseCallbacksSet function. In the normal flow of migration, the registered callback is cleanup in the PERFORM and CONFIRM phase. But if the connection to source side is disconnected before PERFORM phase or between PERFORM phase and CONFIRM phase, the close callback will not be cleanup, and the problem mentioned above occurs. I have test it on libvirt1.2.2, it also happens. I tried, but could not find a good way to solve this problem. Does anyone have any good ideas? Thanks!

1 0

[libvirt] libvirt Wiki account creation request
by Sophoklis Goumas 27 Mar '14

27 Mar '14

> ... > > We still welcome contributions from anyone interested in updating > content. Simply send an email to the main libvirt development list > asking for an account and one will be created for you with as little > delay as practical. > > ... Hence, Sophoklis

2 1

[libvirt] [PATCH] Remove illegal values in nwfilter test XML/firewall files
by Daniel P. Berrange 27 Mar '14

27 Mar '14

A number of the nwfilter XML files have attribute values which are out of range. Previously the libvirt nwfilter XML parser would silently ignore illegal values, causing them to default to 0. This resulted in creating incorrect iptables rules, which the TCK suite then validated as correct. Current libvirt returns a hard error for illegal XML values. To address this we either change the attribute values to be valid, or delete the bogus rules entirely if they are duplicates of other existing valid rules. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- scripts/nwfilter/nwfilterxml2fwallout/arp-test.fwall | 1 - scripts/nwfilter/nwfilterxml2fwallout/comment-test.fwall | 6 +++--- scripts/nwfilter/nwfilterxml2fwallout/hex-data-test.fwall | 6 +++--- scripts/nwfilter/nwfilterxml2fwallout/icmp-test.fwall | 3 --- scripts/nwfilter/nwfilterxml2fwallout/icmpv6-test.fwall | 4 +--- scripts/nwfilter/nwfilterxml2fwallout/ip-test.fwall | 4 +--- scripts/nwfilter/nwfilterxml2fwallout/mac-test.fwall | 1 - scripts/nwfilter/nwfilterxml2fwallout/rarp-test.fwall | 1 - scripts/nwfilter/nwfilterxml2fwallout/udp-ipv6-test.fwall | 6 +++--- scripts/nwfilter/nwfilterxml2fwallout/vlan-test.fwall | 1 - scripts/nwfilter/nwfilterxml2xmlin/ah-ipv6-test.xml | 2 +- scripts/nwfilter/nwfilterxml2xmlin/all-ipv6-test.xml | 2 +- scripts/nwfilter/nwfilterxml2xmlin/arp-test.xml | 5 ----- scripts/nwfilter/nwfilterxml2xmlin/comment-test.xml | 2 +- scripts/nwfilter/nwfilterxml2xmlin/esp-ipv6-test.xml | 2 +- scripts/nwfilter/nwfilterxml2xmlin/hex-data-test.xml | 2 +- scripts/nwfilter/nwfilterxml2xmlin/icmp-test.xml | 5 ----- scripts/nwfilter/nwfilterxml2xmlin/icmpv6-test.xml | 4 ++-- scripts/nwfilter/nwfilterxml2xmlin/ip-test.xml | 8 +------- scripts/nwfilter/nwfilterxml2xmlin/ipv6-test.xml | 2 +- scripts/nwfilter/nwfilterxml2xmlin/mac-test.xml | 4 ---- scripts/nwfilter/nwfilterxml2xmlin/rarp-test.xml | 5 ----- scripts/nwfilter/nwfilterxml2xmlin/sctp-ipv6-test.xml | 4 ++-- scripts/nwfilter/nwfilterxml2xmlin/sctp-test.xml | 2 +- scripts/nwfilter/nwfilterxml2xmlin/tcp-ipv6-test.xml | 4 ++-- scripts/nwfilter/nwfilterxml2xmlin/tcp-test.xml | 2 +- scripts/nwfilter/nwfilterxml2xmlin/udp-ipv6-test.xml | 6 +++--- scripts/nwfilter/nwfilterxml2xmlin/udp-test.xml | 2 +- scripts/nwfilter/nwfilterxml2xmlin/udplite-ipv6-test.xml | 2 +- scripts/nwfilter/nwfilterxml2xmlin/vlan-test.xml | 7 ------- 30 files changed, 31 insertions(+), 74 deletions(-) diff --git a/scripts/nwfilter/nwfilterxml2fwallout/arp-test.fwall b/scripts/nwfilter/nwfilterxml2fwallout/arp-test.fwall index 6ff4eb9..34174a0 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/arp-test.fwall +++ b/scripts/nwfilter/nwfilterxml2fwallout/arp-test.fwall @@ -3,7 +3,6 @@ -p ARP -s 1:2:3:4:5:6 --arp-op Request --arp-htype 255 --arp-ptype 0xff -j ACCEPT -p ARP -s 1:2:3:4:5:6 --arp-op 11 --arp-htype 256 --arp-ptype 0x100 -j ACCEPT -p ARP -s 1:2:3:4:5:6 --arp-op 65535 --arp-htype 65535 --arp-ptype 0xffff -j ACCEPT --p ARP -s 1:2:3:4:5:6 -j ACCEPT #ebtables -t nat -L libvirt-O-vnet0 | grep -v "^Bridge" | grep -v "^$" -p ARP --arp-gratuitous -j ACCEPT #ebtables -t nat -L PREROUTING | grep vnet0 diff --git a/scripts/nwfilter/nwfilterxml2fwallout/comment-test.fwall b/scripts/nwfilter/nwfilterxml2fwallout/comment-test.fwall index 6ef30a5..842f3bb 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/comment-test.fwall +++ b/scripts/nwfilter/nwfilterxml2fwallout/comment-test.fwall @@ -31,21 +31,21 @@ FO-vnet0 all -- 0.0.0.0/0 0.0.0.0/0 [goto] PHYSDEV match --physdev-out vnet0 --p #ip6tables -L FI-vnet0 -n Chain FI-vnet0 (1 references) target prot opt source destination -RETURN tcp ::/0 a:b:c::/128 tcp spts:256:4369 dpts:32:33 state ESTABLISHED ctdir ORIGINAL/* tcp/ipv6 rule */ +RETURN tcp ::/0 a:b:c::/128 DSCP match 0x39 tcp spts:256:4369 dpts:32:33 state ESTABLISHED ctdir ORIGINAL/* tcp/ipv6 rule */ RETURN udp ::/0 ::/0 state ESTABLISHED ctdir ORIGINAL/* `ls`;${COLUMNS};$(ls);"test";&'3 spaces' */ RETURN sctp ::/0 ::/0 state ESTABLISHED ctdir ORIGINAL/* comment with lone ', `, ", `, \, $x, and two spaces */ RETURN ah ::/0 ::/0 state ESTABLISHED ctdir ORIGINAL/* tmp=`mktemp`; echo ${RANDOM} > ${tmp} ; cat < ${tmp}; rm -f ${tmp} */ #ip6tables -L FO-vnet0 -n Chain FO-vnet0 (1 references) target prot opt source destination -ACCEPT tcp a:b:c::/128 ::/0 MAC 01:02:03:04:05:06 tcp spts:32:33 dpts:256:4369 state NEW,ESTABLISHED ctdir REPLY/* tcp/ipv6 rule */ +ACCEPT tcp a:b:c::/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x39 tcp spts:32:33 dpts:256:4369 state NEW,ESTABLISHED ctdir REPLY/* tcp/ipv6 rule */ ACCEPT udp ::/0 ::/0 state NEW,ESTABLISHED ctdir REPLY/* `ls`;${COLUMNS};$(ls);"test";&'3 spaces' */ ACCEPT sctp ::/0 ::/0 state NEW,ESTABLISHED ctdir REPLY/* comment with lone ', `, ", `, \, $x, and two spaces */ ACCEPT ah ::/0 ::/0 state NEW,ESTABLISHED ctdir REPLY/* tmp=`mktemp`; echo ${RANDOM} > ${tmp} ; cat < ${tmp}; rm -f ${tmp} */ #ip6tables -L HI-vnet0 -n Chain HI-vnet0 (1 references) target prot opt source destination -RETURN tcp ::/0 a:b:c::/128 tcp spts:256:4369 dpts:32:33 state ESTABLISHED ctdir ORIGINAL/* tcp/ipv6 rule */ +RETURN tcp ::/0 a:b:c::/128 DSCP match 0x39 tcp spts:256:4369 dpts:32:33 state ESTABLISHED ctdir ORIGINAL/* tcp/ipv6 rule */ RETURN udp ::/0 ::/0 state ESTABLISHED ctdir ORIGINAL/* `ls`;${COLUMNS};$(ls);"test";&'3 spaces' */ RETURN sctp ::/0 ::/0 state ESTABLISHED ctdir ORIGINAL/* comment with lone ', `, ", `, \, $x, and two spaces */ RETURN ah ::/0 ::/0 state ESTABLISHED ctdir ORIGINAL/* tmp=`mktemp`; echo ${RANDOM} > ${tmp} ; cat < ${tmp}; rm -f ${tmp} */ diff --git a/scripts/nwfilter/nwfilterxml2fwallout/hex-data-test.fwall b/scripts/nwfilter/nwfilterxml2fwallout/hex-data-test.fwall index 66b0b71..2ed979e 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/hex-data-test.fwall +++ b/scripts/nwfilter/nwfilterxml2fwallout/hex-data-test.fwall @@ -31,15 +31,15 @@ FO-vnet0 all -- 0.0.0.0/0 0.0.0.0/0 [goto] PHYSDEV match --physdev-out vnet0 --p #ip6tables -L FI-vnet0 -n Chain FI-vnet0 (1 references) target prot opt source destination -RETURN tcp ::/0 a:b:c::/128 tcp spts:256:4369 dpts:32:33 state ESTABLISHED ctdir ORIGINAL +RETURN tcp ::/0 a:b:c::/128 DSCP match 0x39 tcp spts:256:4369 dpts:32:33 state ESTABLISHED ctdir ORIGINAL #ip6tables -L FO-vnet0 -n Chain FO-vnet0 (1 references) target prot opt source destination -ACCEPT tcp a:b:c::/128 ::/0 MAC 01:02:03:04:05:06 tcp spts:32:33 dpts:256:4369 state NEW,ESTABLISHED ctdir REPLY +ACCEPT tcp a:b:c::/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x39 tcp spts:32:33 dpts:256:4369 state NEW,ESTABLISHED ctdir REPLY #ip6tables -L HI-vnet0 -n Chain HI-vnet0 (1 references) target prot opt source destination -RETURN tcp ::/0 a:b:c::/128 tcp spts:256:4369 dpts:32:33 state ESTABLISHED ctdir ORIGINAL +RETURN tcp ::/0 a:b:c::/128 DSCP match 0x39 tcp spts:256:4369 dpts:32:33 state ESTABLISHED ctdir ORIGINAL #ip6tables -L libvirt-host-in -n | grep vnet0 | tr -s " " HI-vnet0 all ::/0 ::/0 [goto] PHYSDEV match --physdev-in vnet0 #ip6tables -L libvirt-in -n | grep vnet0 | tr -s " " diff --git a/scripts/nwfilter/nwfilterxml2fwallout/icmp-test.fwall b/scripts/nwfilter/nwfilterxml2fwallout/icmp-test.fwall index e5f84e5..afdd95b 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/icmp-test.fwall +++ b/scripts/nwfilter/nwfilterxml2fwallout/icmp-test.fwall @@ -2,17 +2,14 @@ Chain FI-vnet0 (1 references) target prot opt source destination RETURN icmp -- 0.0.0.0/0 10.1.2.3 MAC 01:02:03:04:05:06 DSCP match 0x02icmp type 12 code 11 state NEW,ESTABLISHED -RETURN icmp -- 0.0.0.0/0 10.1.0.0/22 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL #iptables -L FO-vnet0 -n Chain FO-vnet0 (1 references) target prot opt source destination ACCEPT icmp -- 10.1.0.0/22 0.0.0.0/0 MAC 01:02:03:04:05:06 DSCP match 0x21icmp type 255 code 255 state NEW,ESTABLISHED -ACCEPT icmp -- 10.1.0.0/22 0.0.0.0/0 MAC 01:02:03:04:05:06 DSCP match 0x21state NEW,ESTABLISHED ctdir REPLY #iptables -L HI-vnet0 -n Chain HI-vnet0 (1 references) target prot opt source destination RETURN icmp -- 0.0.0.0/0 10.1.2.3 MAC 01:02:03:04:05:06 DSCP match 0x02icmp type 12 code 11 state NEW,ESTABLISHED -RETURN icmp -- 0.0.0.0/0 10.1.0.0/22 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL #iptables -L libvirt-host-in -n | grep vnet0 | tr -s " " HI-vnet0 all -- 0.0.0.0/0 0.0.0.0/0 [goto] PHYSDEV match --physdev-in vnet0 #iptables -L libvirt-in -n | grep vnet0 | tr -s " " diff --git a/scripts/nwfilter/nwfilterxml2fwallout/icmpv6-test.fwall b/scripts/nwfilter/nwfilterxml2fwallout/icmpv6-test.fwall index ed8eee0..4749f84 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/icmpv6-test.fwall +++ b/scripts/nwfilter/nwfilterxml2fwallout/icmpv6-test.fwall @@ -2,17 +2,15 @@ Chain FI-vnet0 (1 references) target prot opt source destination RETURN icmpv6 f:e:d::c:b:a/127 a:b:c::d:e:f/128 MAC 01:02:03:04:05:06 DSCP match 0x02ipv6-icmp type 12 code 11 state NEW,ESTABLISHED -RETURN icmpv6 ::/0 ::10.1.2.3/128 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL #ip6tables -L FO-vnet0 -n Chain FO-vnet0 (1 references) target prot opt source destination ACCEPT icmpv6 a:b:c::/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21ipv6-icmp type 255 code 255 state NEW,ESTABLISHED -ACCEPT icmpv6 ::10.1.2.3/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21state NEW,ESTABLISHED ctdir REPLY +ACCEPT icmpv6 ::10.1.2.3/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21ipv6-icmp type 255 code 255 state NEW,ESTABLISHED #ip6tables -L HI-vnet0 -n Chain HI-vnet0 (1 references) target prot opt source destination RETURN icmpv6 f:e:d::c:b:a/127 a:b:c::d:e:f/128 MAC 01:02:03:04:05:06 DSCP match 0x02ipv6-icmp type 12 code 11 state NEW,ESTABLISHED -RETURN icmpv6 ::/0 ::10.1.2.3/128 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL #ip6tables -L INPUT -n --line-numbers | grep libvirt 1 libvirt-host-in all ::/0 ::/0 #ip6tables -L libvirt-host-in -n | grep vnet0 | tr -s " " diff --git a/scripts/nwfilter/nwfilterxml2fwallout/ip-test.fwall b/scripts/nwfilter/nwfilterxml2fwallout/ip-test.fwall index f3cd49b..dbd6497 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/ip-test.fwall +++ b/scripts/nwfilter/nwfilterxml2fwallout/ip-test.fwall @@ -5,8 +5,6 @@ #ebtables -t nat -L libvirt-I-vnet0 | grep -v "^Bridge" | grep -v "^$" -p IPv4 -s 1:2:3:4:5:6 -d aa:bb:cc:dd:ee:ff --ip-src 10.1.2.3 --ip-dst 10.1.2.3 --ip-proto udp --ip-sport 20:22 --ip-dport 100:101 -j ACCEPT -p IPv4 --ip-src 10.1.0.0/17 --ip-dst 10.1.2.0/24 --ip-tos 0x3F --ip-proto udp -j ACCEPT --p IPv4 --ip-src 10.1.2.2/31 --ip-dst 10.1.2.3 -j ACCEPT #ebtables -t nat -L libvirt-O-vnet0 | grep -v "^Bridge" | grep -v "^$" --p IPv4 --ip-src 10.1.2.2/31 --ip-dst 10.1.2.0/25 --ip-proto 255 -j ACCEPT --p IPv4 --ip-src 10.1.2.3 --ip-dst 10.1.2.2/31 -j ACCEPT +-p IPv4 --ip-src 10.1.2.2/31 --ip-dst 10.1.2.0/25 --ip-tos 0x3F --ip-proto 255 -j ACCEPT diff --git a/scripts/nwfilter/nwfilterxml2fwallout/mac-test.fwall b/scripts/nwfilter/nwfilterxml2fwallout/mac-test.fwall index 2dd7952..bb00629 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/mac-test.fwall +++ b/scripts/nwfilter/nwfilterxml2fwallout/mac-test.fwall @@ -7,6 +7,5 @@ #ebtables -t nat -L libvirt-O-vnet0 | grep -v "^Bridge" | grep -v "^$" -p IPv4 -d aa:bb:cc:dd:ee:ff -j ACCEPT -p 0x600 -d aa:bb:cc:dd:ee:ff -j ACCEPT --d aa:bb:cc:dd:ee:ff -j ACCEPT -p 0xffff -d aa:bb:cc:dd:ee:ff -j ACCEPT diff --git a/scripts/nwfilter/nwfilterxml2fwallout/rarp-test.fwall b/scripts/nwfilter/nwfilterxml2fwallout/rarp-test.fwall index 77d9806..e0d9c8c 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/rarp-test.fwall +++ b/scripts/nwfilter/nwfilterxml2fwallout/rarp-test.fwall @@ -3,7 +3,6 @@ -p RARP -s 1:2:3:4:5:6 --arp-op Request --arp-htype 255 --arp-ptype 0xff -j ACCEPT -p RARP -s 1:2:3:4:5:6 --arp-op 11 --arp-htype 256 --arp-ptype 0x100 -j ACCEPT -p RARP -s 1:2:3:4:5:6 --arp-op 65535 --arp-htype 65535 --arp-ptype 0xffff -j ACCEPT --p RARP -s 1:2:3:4:5:6 -j ACCEPT #ebtables -t nat -L PREROUTING | grep vnet0 -i vnet0 -j libvirt-I-vnet0 diff --git a/scripts/nwfilter/nwfilterxml2fwallout/udp-ipv6-test.fwall b/scripts/nwfilter/nwfilterxml2fwallout/udp-ipv6-test.fwall index dd7b19c..0a75421 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/udp-ipv6-test.fwall +++ b/scripts/nwfilter/nwfilterxml2fwallout/udp-ipv6-test.fwall @@ -2,19 +2,19 @@ Chain FI-vnet0 (1 references) target prot opt source destination RETURN udp ::/0 a:b:c::d:e:f/128 MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY -RETURN udp ::/0 ::/0 DSCP match 0x21udp spts:100:1111 dpts:20:21 state ESTABLISHED ctdir ORIGINAL +RETURN udp ::/0 ::a:b:c/128 DSCP match 0x21udp spts:100:1111 dpts:20:21 state ESTABLISHED ctdir ORIGINAL RETURN udp ::/0 ::10.1.2.3/128 DSCP match 0x3fudp spt:65535 dpts:255:256 state ESTABLISHED ctdir ORIGINAL #ip6tables -L FO-vnet0 -n Chain FO-vnet0 (1 references) target prot opt source destination ACCEPT udp a:b:c::d:e:f/128 ::/0 DSCP match 0x02state ESTABLISHED ctdir ORIGINAL -ACCEPT udp ::/0 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21udp spts:20:21 dpts:100:1111 state NEW,ESTABLISHED ctdir REPLY +ACCEPT udp ::a:b:c/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21udp spts:20:21 dpts:100:1111 state NEW,ESTABLISHED ctdir REPLY ACCEPT udp ::10.1.2.3/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x3fudp spts:255:256 dpt:65535 state NEW,ESTABLISHED ctdir REPLY #ip6tables -L HI-vnet0 -n Chain HI-vnet0 (1 references) target prot opt source destination RETURN udp ::/0 a:b:c::d:e:f/128 MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY -RETURN udp ::/0 ::/0 DSCP match 0x21udp spts:100:1111 dpts:20:21 state ESTABLISHED ctdir ORIGINAL +RETURN udp ::/0 ::a:b:c/128 DSCP match 0x21udp spts:100:1111 dpts:20:21 state ESTABLISHED ctdir ORIGINAL RETURN udp ::/0 ::10.1.2.3/128 DSCP match 0x3fudp spt:65535 dpts:255:256 state ESTABLISHED ctdir ORIGINAL #ip6tables -L INPUT -n --line-numbers | grep libvirt 1 libvirt-host-in all ::/0 ::/0 diff --git a/scripts/nwfilter/nwfilterxml2fwallout/vlan-test.fwall b/scripts/nwfilter/nwfilterxml2fwallout/vlan-test.fwall index 603f470..a2fbfd3 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/vlan-test.fwall +++ b/scripts/nwfilter/nwfilterxml2fwallout/vlan-test.fwall @@ -7,7 +7,6 @@ -p 802_1Q -s 1:2:3:4:5:6 -d aa:bb:cc:dd:ee:ff --vlan-id 291 -j CONTINUE -p 802_1Q -s 1:2:3:4:5:6 -d aa:bb:cc:dd:ee:ff --vlan-id 1234 -j RETURN -p 802_1Q -s 1:2:3:4:5:6 -d aa:bb:cc:dd:ee:ff --vlan-id 291 -j DROP --p 802_1Q -s 1:2:3:4:5:6 -d aa:bb:cc:dd:ee:ff -j ACCEPT #ebtables -t nat -L PREROUTING | grep vnet0 -i vnet0 -j libvirt-I-vnet0 #ebtables -t nat -L POSTROUTING | grep vnet0 diff --git a/scripts/nwfilter/nwfilterxml2xmlin/ah-ipv6-test.xml b/scripts/nwfilter/nwfilterxml2xmlin/ah-ipv6-test.xml index 07d1ffe..95ebbc9 100644 --- a/scripts/nwfilter/nwfilterxml2xmlin/ah-ipv6-test.xml +++ b/scripts/nwfilter/nwfilterxml2xmlin/ah-ipv6-test.xml @@ -13,7 +13,7 @@ </rule> <rule action='accept' direction='in'> <ah-ipv6 srcmacaddr='1:2:3:4:5:6' - srcipaddr='::10.1.2.3' srcipmask='129' + srcipaddr='::10.1.2.3' srcipmask='128' dscp='33'/> </rule> </filter> diff --git a/scripts/nwfilter/nwfilterxml2xmlin/all-ipv6-test.xml b/scripts/nwfilter/nwfilterxml2xmlin/all-ipv6-test.xml index eb39bc3..5cf3519 100644 --- a/scripts/nwfilter/nwfilterxml2xmlin/all-ipv6-test.xml +++ b/scripts/nwfilter/nwfilterxml2xmlin/all-ipv6-test.xml @@ -13,7 +13,7 @@ </rule> <rule action='accept' direction='in'> <all-ipv6 srcmacaddr='1:2:3:4:5:6' - srcipaddr='::10.1.2.3' srcipmask='129' + srcipaddr='::10.1.2.3' srcipmask='128' dscp='33'/> </rule> </filter> diff --git a/scripts/nwfilter/nwfilterxml2xmlin/arp-test.xml b/scripts/nwfilter/nwfilterxml2xmlin/arp-test.xml index 2e08b32..d0abf94 100644 --- a/scripts/nwfilter/nwfilterxml2xmlin/arp-test.xml +++ b/scripts/nwfilter/nwfilterxml2xmlin/arp-test.xml @@ -26,11 +26,6 @@ opcode='65535' hwtype='65535' protocoltype='65535' /> </rule> - <rule action='accept' direction='out'> - <arp srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:ff' - opcode='65536' hwtype='65536' protocoltype='65536' /> - </rule> - <rule action='accept' direction='in'> <arp gratuitous='true'/> </rule> diff --git a/scripts/nwfilter/nwfilterxml2xmlin/comment-test.xml b/scripts/nwfilter/nwfilterxml2xmlin/comment-test.xml index af5c5cc..a154a17 100644 --- a/scripts/nwfilter/nwfilterxml2xmlin/comment-test.xml +++ b/scripts/nwfilter/nwfilterxml2xmlin/comment-test.xml @@ -50,7 +50,7 @@ <rule action='accept' direction='in'> <tcp-ipv6 srcmacaddr='1:2:3:4:5:6' srcipaddr='a:b:c::' srcipmask='128' - dscp='0x40' + dscp='0x39' srcportstart='0x20' srcportend='0x21' dstportstart='0x100' dstportend='0x1111' comment='tcp/ipv6 rule'/> diff --git a/scripts/nwfilter/nwfilterxml2xmlin/esp-ipv6-test.xml b/scripts/nwfilter/nwfilterxml2xmlin/esp-ipv6-test.xml index 4dd9b98..295d0f9 100644 --- a/scripts/nwfilter/nwfilterxml2xmlin/esp-ipv6-test.xml +++ b/scripts/nwfilter/nwfilterxml2xmlin/esp-ipv6-test.xml @@ -13,7 +13,7 @@ </rule> <rule action='accept' direction='in'> <esp-ipv6 srcmacaddr='1:2:3:4:5:6' - srcipaddr='::10.1.2.3' srcipmask='129' + srcipaddr='::10.1.2.3' srcipmask='128' dscp='33'/> </rule> </filter> diff --git a/scripts/nwfilter/nwfilterxml2xmlin/hex-data-test.xml b/scripts/nwfilter/nwfilterxml2xmlin/hex-data-test.xml index d2da079..45df451 100644 --- a/scripts/nwfilter/nwfilterxml2xmlin/hex-data-test.xml +++ b/scripts/nwfilter/nwfilterxml2xmlin/hex-data-test.xml @@ -48,7 +48,7 @@ <rule action='accept' direction='in'> <tcp-ipv6 srcmacaddr='1:2:3:4:5:6' srcipaddr='a:b:c::' srcipmask='128' - dscp='0x40' + dscp='0x39' srcportstart='0x20' srcportend='0x21' dstportstart='0x100' dstportend='0x1111'/> </rule> diff --git a/scripts/nwfilter/nwfilterxml2xmlin/icmp-test.xml b/scripts/nwfilter/nwfilterxml2xmlin/icmp-test.xml index 90f852b..fff5d42 100644 --- a/scripts/nwfilter/nwfilterxml2xmlin/icmp-test.xml +++ b/scripts/nwfilter/nwfilterxml2xmlin/icmp-test.xml @@ -10,9 +10,4 @@ srcipaddr='10.1.2.3' srcipmask='22' dscp='33' type='255' code='255'/> </rule> - <rule action='accept' direction='in'> - <icmp srcmacaddr='1:2:3:4:5:6' - srcipaddr='10.1.2.3' srcipmask='22' - dscp='33' type='256' code='256'/> - </rule> </filter> diff --git a/scripts/nwfilter/nwfilterxml2xmlin/icmpv6-test.xml b/scripts/nwfilter/nwfilterxml2xmlin/icmpv6-test.xml index 01dc6e2..9d24826 100644 --- a/scripts/nwfilter/nwfilterxml2xmlin/icmpv6-test.xml +++ b/scripts/nwfilter/nwfilterxml2xmlin/icmpv6-test.xml @@ -13,7 +13,7 @@ </rule> <rule action='accept' direction='in'> <icmpv6 srcmacaddr='1:2:3:4:5:6' - srcipaddr='::10.1.2.3' srcipmask='129' - dscp='33' type='256' code='256'/> + srcipaddr='::10.1.2.3' srcipmask='128' + dscp='33' type='255' code='255'/> </rule> </filter> diff --git a/scripts/nwfilter/nwfilterxml2xmlin/ip-test.xml b/scripts/nwfilter/nwfilterxml2xmlin/ip-test.xml index 0a744a2..da362a1 100644 --- a/scripts/nwfilter/nwfilterxml2xmlin/ip-test.xml +++ b/scripts/nwfilter/nwfilterxml2xmlin/ip-test.xml @@ -21,14 +21,8 @@ <rule action='accept' direction='in'> <ip srcipaddr='10.1.2.3' srcipmask='255.255.255.254' dstipaddr='10.1.2.3' dstipmask='255.255.255.128' - protocol='255' dscp='64' + protocol='255' dscp='63' /> </rule> - <rule action='accept' direction='inout'> - <ip srcipaddr='10.1.2.3' srcipmask='255.255.255.127' - dstipaddr='10.1.2.3' dstipmask='255.255.255.254' - protocol='256' dscp='64' - /> - </rule> </filter> diff --git a/scripts/nwfilter/nwfilterxml2xmlin/ipv6-test.xml b/scripts/nwfilter/nwfilterxml2xmlin/ipv6-test.xml index 7fa7181..9f67bea 100644 --- a/scripts/nwfilter/nwfilterxml2xmlin/ipv6-test.xml +++ b/scripts/nwfilter/nwfilterxml2xmlin/ipv6-test.xml @@ -28,7 +28,7 @@ dstipmask='ffff:ffff:ffff:ffff:8000::' protocol='6' srcportstart='255' srcportend='256' - dstportstart='65535' dstportend='65536' + dstportstart='65535' dstportend='65535' /> </rule> diff --git a/scripts/nwfilter/nwfilterxml2xmlin/mac-test.xml b/scripts/nwfilter/nwfilterxml2xmlin/mac-test.xml index 8f9565c..2aec935 100644 --- a/scripts/nwfilter/nwfilterxml2xmlin/mac-test.xml +++ b/scripts/nwfilter/nwfilterxml2xmlin/mac-test.xml @@ -14,10 +14,6 @@ </rule> <rule action='accept' direction='in'> <mac dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:ff' - protocolid='15'/> - </rule> - <rule action='accept' direction='in'> - <mac dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:ff' protocolid='65535'/> </rule> </filter> diff --git a/scripts/nwfilter/nwfilterxml2xmlin/rarp-test.xml b/scripts/nwfilter/nwfilterxml2xmlin/rarp-test.xml index 7b99df0..77c1127 100644 --- a/scripts/nwfilter/nwfilterxml2xmlin/rarp-test.xml +++ b/scripts/nwfilter/nwfilterxml2xmlin/rarp-test.xml @@ -25,9 +25,4 @@ <rarp srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:ff' opcode='65535' hwtype='65535' protocoltype='65535' /> </rule> - - <rule action='accept' direction='out'> - <rarp srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:ff' - opcode='65536' hwtype='65536' protocoltype='65536' /> - </rule> </filter> diff --git a/scripts/nwfilter/nwfilterxml2xmlin/sctp-ipv6-test.xml b/scripts/nwfilter/nwfilterxml2xmlin/sctp-ipv6-test.xml index 99bf349..d1a57b8 100644 --- a/scripts/nwfilter/nwfilterxml2xmlin/sctp-ipv6-test.xml +++ b/scripts/nwfilter/nwfilterxml2xmlin/sctp-ipv6-test.xml @@ -14,9 +14,9 @@ </rule> <rule action='accept' direction='in'> <sctp-ipv6 srcmacaddr='1:2:3:4:5:6' - srcipaddr='::10.1.2.3' srcipmask='129' + srcipaddr='::10.1.2.3' srcipmask='128' dscp='63' srcportstart='255' srcportend='256' - dstportstart='65535' dstportend='65536'/> + dstportstart='65535' dstportend='65535'/> </rule> </filter> diff --git a/scripts/nwfilter/nwfilterxml2xmlin/sctp-test.xml b/scripts/nwfilter/nwfilterxml2xmlin/sctp-test.xml index c2f635b..c3c1000 100644 --- a/scripts/nwfilter/nwfilterxml2xmlin/sctp-test.xml +++ b/scripts/nwfilter/nwfilterxml2xmlin/sctp-test.xml @@ -17,6 +17,6 @@ srcipaddr='10.1.2.3' srcipmask='32' dscp='63' srcportstart='255' srcportend='256' - dstportstart='65535' dstportend='65536'/> + dstportstart='65535' dstportend='65535'/> </rule> </filter> diff --git a/scripts/nwfilter/nwfilterxml2xmlin/tcp-ipv6-test.xml b/scripts/nwfilter/nwfilterxml2xmlin/tcp-ipv6-test.xml index ecc1d30..d4f24f4 100644 --- a/scripts/nwfilter/nwfilterxml2xmlin/tcp-ipv6-test.xml +++ b/scripts/nwfilter/nwfilterxml2xmlin/tcp-ipv6-test.xml @@ -14,9 +14,9 @@ </rule> <rule action='accept' direction='in'> <tcp-ipv6 srcmacaddr='1:2:3:4:5:6' - srcipaddr='::10.1.2.3' srcipmask='129' + srcipaddr='::10.1.2.3' srcipmask='128' dscp='63' srcportstart='255' srcportend='256' - dstportstart='65535' dstportend='65536'/> + dstportstart='65535' dstportend='65535'/> </rule> </filter> diff --git a/scripts/nwfilter/nwfilterxml2xmlin/tcp-test.xml b/scripts/nwfilter/nwfilterxml2xmlin/tcp-test.xml index fc77683..14ebd35 100644 --- a/scripts/nwfilter/nwfilterxml2xmlin/tcp-test.xml +++ b/scripts/nwfilter/nwfilterxml2xmlin/tcp-test.xml @@ -17,7 +17,7 @@ srcipaddr='10.1.2.3' srcipmask='32' dscp='63' srcportstart='255' srcportend='256' - dstportstart='65535' dstportend='65536'/> + dstportstart='65535' dstportend='65535'/> </rule> <rule action='accept' direction='in'> <tcp state='NONE' flags='SYN/ALL'/> diff --git a/scripts/nwfilter/nwfilterxml2xmlin/udp-ipv6-test.xml b/scripts/nwfilter/nwfilterxml2xmlin/udp-ipv6-test.xml index e8c6ba6..fd4f135 100644 --- a/scripts/nwfilter/nwfilterxml2xmlin/udp-ipv6-test.xml +++ b/scripts/nwfilter/nwfilterxml2xmlin/udp-ipv6-test.xml @@ -7,16 +7,16 @@ </rule> <rule action='accept' direction='in'> <udp-ipv6 srcmacaddr='1:2:3:4:5:6' - srcipaddr='a:b:c' srcipmask='128' + srcipaddr='::a:b:c' srcipmask='128' dscp='33' srcportstart='20' srcportend='21' dstportstart='100' dstportend='1111'/> </rule> <rule action='accept' direction='in'> <udp-ipv6 srcmacaddr='1:2:3:4:5:6' - srcipaddr='::10.1.2.3' srcipmask='129' + srcipaddr='::10.1.2.3' srcipmask='128' dscp='63' srcportstart='255' srcportend='256' - dstportstart='65535' dstportend='65536'/> + dstportstart='65535' dstportend='65535'/> </rule> </filter> diff --git a/scripts/nwfilter/nwfilterxml2xmlin/udp-test.xml b/scripts/nwfilter/nwfilterxml2xmlin/udp-test.xml index 10ce53d..359dfa2 100644 --- a/scripts/nwfilter/nwfilterxml2xmlin/udp-test.xml +++ b/scripts/nwfilter/nwfilterxml2xmlin/udp-test.xml @@ -17,6 +17,6 @@ srcipaddr='10.1.2.3' srcipmask='32' dscp='63' srcportstart='255' srcportend='256' - dstportstart='65535' dstportend='65536'/> + dstportstart='65535' dstportend='65535'/> </rule> </filter> diff --git a/scripts/nwfilter/nwfilterxml2xmlin/udplite-ipv6-test.xml b/scripts/nwfilter/nwfilterxml2xmlin/udplite-ipv6-test.xml index 0763a7d..5b941a2 100644 --- a/scripts/nwfilter/nwfilterxml2xmlin/udplite-ipv6-test.xml +++ b/scripts/nwfilter/nwfilterxml2xmlin/udplite-ipv6-test.xml @@ -13,7 +13,7 @@ </rule> <rule action='accept' direction='in'> <udplite-ipv6 srcmacaddr='1:2:3:4:5:6' - srcipaddr='::10.1.2.3' srcipmask='129' + srcipaddr='::10.1.2.3' srcipmask='128' dscp='33'/> </rule> </filter> diff --git a/scripts/nwfilter/nwfilterxml2xmlin/vlan-test.xml b/scripts/nwfilter/nwfilterxml2xmlin/vlan-test.xml index 65ee04b..a5e7b38 100644 --- a/scripts/nwfilter/nwfilterxml2xmlin/vlan-test.xml +++ b/scripts/nwfilter/nwfilterxml2xmlin/vlan-test.xml @@ -21,13 +21,6 @@ /> </rule> - <rule action='accept' direction='in'> - <vlan srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:ff' - dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:ff' - vlanid='0xffff' - /> - </rule> - <rule action='drop' direction='out'> <vlan srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:ff' dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:ff' -- 1.8.5.3

2 2

[libvirt] [PATCH] Cope with newer ebtables tools in testvm.fwall.dat
by Daniel P. Berrange 27 Mar '14

27 Mar '14

Newer ebtables tools turn 0x8035 into RARP, so our test file must expect this. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- scripts/nwfilter/nwfilterxml2fwallout/testvm.fwall.dat | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/nwfilter/nwfilterxml2fwallout/testvm.fwall.dat b/scripts/nwfilter/nwfilterxml2fwallout/testvm.fwall.dat index b540509..1b5f3ce 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/testvm.fwall.dat +++ b/scripts/nwfilter/nwfilterxml2fwallout/testvm.fwall.dat @@ -2,20 +2,20 @@ -i vnet0 -j libvirt-I-vnet0 #ebtables -t nat -L POSTROUTING | grep vnet0 | grep -v "^Bridge" | grep -v "^$" -o vnet0 -j libvirt-O-vnet0 -#ebtables -t nat -L libvirt-I-vnet0 | grep -v "^Bridge" | grep -v "^$" +#ebtables -t nat -L libvirt-I-vnet0 | sed s/0x8035/RARP/g | grep -v "^Bridge" | grep -v "^$" -j I-vnet0-mac -p IPv4 -j I-vnet0-ipv4-ip -p IPv4 -j ACCEPT -p ARP -j I-vnet0-arp-mac -p ARP -j I-vnet0-arp-ip -p ARP -j ACCEPT --p 0x8035 -j I-vnet0-rarp +-p RARP -j I-vnet0-rarp -p 0x835 -j ACCEPT -j DROP -#ebtables -t nat -L libvirt-O-vnet0 | grep -v "^Bridge" | grep -v "^$" +#ebtables -t nat -L libvirt-O-vnet0 | sed s/0x8035/RARP/g | grep -v "^Bridge" | grep -v "^$" -p IPv4 -j O-vnet0-ipv4 -p ARP -j ACCEPT --p 0x8035 -j O-vnet0-rarp +-p RARP -j O-vnet0-rarp -j DROP #ebtables -t nat -L I-vnet0-ipv4-ip | grep -v "^Bridge" | grep -v "^$" -p IPv4 --ip-src 0.0.0.0 --ip-proto udp -j RETURN -- 1.8.5.3

2 1

[libvirt] [PATCH v2] libvirt-tck: prefer kvm domains if multiple domain types exist
by Mike Latimer 27 Mar '14

27 Mar '14

When matching capabilities of a guest, if multiple domain types exist (for example, 'qemu' and 'kvm') the order in which they are returned can change. To avoid unpredictable test results, this patch prefers kvm if that domain type exists. If not, the behavior matches what existed before, and the first domain type is returned. --- lib/Sys/Virt/TCK.pm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/Sys/Virt/TCK.pm b/lib/Sys/Virt/TCK.pm index b2c16e7..a3a2732 100644 --- a/lib/Sys/Virt/TCK.pm +++ b/lib/Sys/Virt/TCK.pm @@ -502,9 +502,12 @@ sub match_kernel { my @domains = $caps->guest_domain_types($i); next unless int(@domains); - return ($domains[0], - $caps->guest_domain_emulator($i, $domains[0]), - $caps->guest_domain_loader($i, $domains[0])); + # Prefer kvm if multiple domain types are returned + my $domain = (grep /^kvm$/, @domains) ? "kvm" : $domains[0]; + + return ($domain, + $caps->guest_domain_emulator($i, $domain), + $caps->guest_domain_loader($i, $domain)); } } -- 1.8.4.5

2 2

[libvirt] [PATCH v2] Fix Memory Leak in virQEMUCapsInitGuestFromBinary()
by Nehal J Wani 27 Mar '14

27 Mar '14

While running qemucaps2xmltest, it was found that valgrind pointed out the following memory leaks: ==29896== 0 bytes in 1 blocks are definitely lost in loss record 1 of 65 ==29896== at 0x4A0577B: calloc (vg_replace_malloc.c:593) ==29896== by 0x4C6B45E: virAllocN (viralloc.c:191) ==29896== by 0x4232A9: virQEMUCapsGetMachineTypesCaps (qemu_capabilities.c:1999) ==29896== by 0x4234E7: virQEMUCapsInitGuestFromBinary (qemu_capabilities.c:789) ==29896== by 0x41F10B: testQemuCapsXML (qemucaps2xmltest.c:118) ==29896== by 0x41FFD1: virtTestRun (testutils.c:201) ==29896== by 0x41EE7A: mymain (qemucaps2xmltest.c:203) ==29896== by 0x42074D: virtTestMain (testutils.c:789) ==29896== by 0x3E6CE1ED1C: (below main) (libc-start.c:226) ==29896== ==29896== 0 bytes in 1 blocks are definitely lost in loss record 2 of 65 ==29896== at 0x4A0577B: calloc (vg_replace_malloc.c:593) ==29896== by 0x4C6B45E: virAllocN (viralloc.c:191) ==29896== by 0x4232A9: virQEMUCapsGetMachineTypesCaps (qemu_capabilities.c:1999) ==29896== by 0x4234E7: virQEMUCapsInitGuestFromBinary (qemu_capabilities.c:789) ==29896== by 0x41F10B: testQemuCapsXML (qemucaps2xmltest.c:118) ==29896== by 0x41FFD1: virtTestRun (testutils.c:201) ==29896== by 0x41EEA3: mymain (qemucaps2xmltest.c:204) ==29896== by 0x42074D: virtTestMain (testutils.c:789) ==29896== by 0x3E6CE1ED1C: (below main) (libc-start.c:226) --- src/qemu/qemu_capabilities.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 7673592..aef8bc1 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -789,6 +789,10 @@ virQEMUCapsInitGuestFromBinary(virCapsPtr caps, if (virQEMUCapsGetMachineTypesCaps(qemubinCaps, &nmachines, &machines) < 0) goto cleanup; + /* Free unneeded memory given by malloc(0) */ + if (!nmachines) + VIR_FREE(machines); + /* We register kvm as the base emulator too, since we can * just give -no-kvm to disable acceleration if required */ if ((guest = virCapabilitiesAddGuest(caps, -- 1.7.1

2 3

[libvirt] [TCK] nwfilter tests and libvirt commit 4f209434
by Mike Latimer 27 Mar '14

27 Mar '14

Hi, As I've been looking through libvirt-tck tests, I found that commit 4f209434 (in libvirt) changes a condition that the nwfilter/050-apply-verify-host.t relies on. Specifically, the 050-apply-verify-host.t test creates a number of filters with invalid values (such as dscp='64', and protocol='256'). Without commit 4f209434, these invalid values are silently dropped off the end of the rule, as in the following example: #virsh nwfilter-define <xml with illegal value:> <filter name='tck-testcase'> <uuid>5c6d49af-b071-6127-b4ec-6f8ed4b55335</uuid> <rule action='accept' direction='in'> <ip srcipaddr='10.1.2.3' srcipmask='255.255.255.254' dstipaddr='10.1.2.3' dstipmask='255.255.255.128' protocol='255' dscp='64' /> </rule> #virsh nwfilter-dumpxml tck-testcase <rule action='accept' direction='in' priority='500'> <ip srcipaddr='10.1.2.3' srcipmask='31' dstipaddr='10.1.2.3' dstipmask='25' protocol='255'/> </rule> With commit 4f209434 in place, the entire filter is rejected with the following error: 'internal error: dscp has illegal value 64'. As the filter is not created, the testing of that filter by the 050-apply-verify-host test fails. I agree that the change is the right thing to do, but I'm wondering how best to handle the now failing tests. This test (050-apply-verify-host.t) runs ~1200 subtests, and about 10% of those tests fail due to the change. I'm thinking that the illegal options (and only those illegal options) should be removed from the now broken tests, and a few new tests added to specifically test for the failure to add the entire rule when illegal data is passed. Thoughts? BTW - Is anyone else running the full libvirt-tck suite against recent versions of libvirt? There are quite a few issues (such as this one) which should be easily seen... Thanks, Mike

3 2

[libvirt] [PATCH v4 0/2] fix query-command-line-options
by Amos Kong 27 Mar '14

27 Mar '14

This patchset fixed some issues of query-command-line-options: * some new options that haven't argument can't be queried. (eg: -enable-fips) * some legacy options that have argument can't be queried. (eg: -vnc display) More discussion: http://marc.info/?l=qemu-devel&m=139081830416684&w=2 V2: remove duplicate option tables, update schema (eric) V3: fix typo in commitlog and export qemu_options talbe (eric) V4: avoid the duplicate static table (eric) Amos Kong (2): qmp: rename query_option_descs() to get_param_infolist() query-command-line-options: query all the options in qemu-options.hx qapi-schema.json | 8 ++++++-- qemu-options.h | 10 ++++++++++ util/qemu-config.c | 50 +++++++++++++++++++++++++++++++++++++++++--------- vl.c | 15 --------------- 4 files changed, 57 insertions(+), 26 deletions(-) -- 1.8.5.3

3 17

[libvirt] [PATCH] bhyve: add domainLookupByID
by Wojciech Macek 27 Mar '14

27 Mar '14

Implement domainLookupByID as required by OpenStack stuff. Wojciech Macek (1): bhyve: add domainLookupByID src/bhyve/bhyve_driver.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) -- 1.9.0

2 2

[libvirt] [RFC PATCH] Behaviour of topology, vcpus and maxcpus
by Nikunj A Dadhania 27 Mar '14

27 Mar '14

I have observed the following with libvirt xml: <vcpu>6</vcpu> <cpu> <topology sockets='1' cores='4' threads='2'/> </cpu> So according to the topology maximum supported is 8 vcpus, while the libvirt sets that to 6 - specified in <vcpu> tag. Shouldn't libvirt error this out as the mismatch between the topology definition and the vcpu count? There is an upper bound check already in place where if we have maxcpu > topology-supported cpus, that errors out. For eg. <vcpu>12</vcpu> <cpu> <topology sockets='1' cores='4' threads='2'/> </cpu> The below patch make sures that libvirt does the lower bound check as well. Regards Nikunj diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f96110b..aa25940 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -12933,6 +12933,14 @@ virDomainDefParseXML(xmlDocPtr xml, goto error; } + if (def->cpu->sockets && + def->maxvcpus < + def->cpu->sockets * def->cpu->cores * def->cpu->threads) { + virReportError(VIR_ERR_XML_DETAIL, "%s", + _("CPUs provided is less than topology")); + goto error; + } + if (def->cpu->cells_cpus > def->maxvcpus) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Number of CPUs in <numa> exceeds the"

1 1

[libvirt] [PATCH v6 0/3] fix query-command-line-options
by Amos Kong 27 Mar '14

27 Mar '14

This patchset fixed some issues of query-command-line-options: * some new options that haven't argument can't be queried. (eg: -enable-fips) * some legacy options that have argument can't be queried. (eg: -vnc display) More discussion: http://marc.info/?l=qemu-devel&m=139081830416684&w=2 https://www.redhat.com/archives/libvir-list/2014-March/msg00318.html V2: remove duplicate option tables, update schema (eric) V3: fix typo in commitlog and export qemu_options talbe (eric) V4: avoid the duplicate static table (eric) V5: rename new field, other fix (markus) V6: add implied-name (eric, markus) Thanks for your review! Amos Kong (3): qmp: rename query_option_descs() to get_param_info() query-command-line-options: expose implicit parameter name query-command-line-options: query all the options in qemu-options.hx qapi-schema.json | 16 +++++++++++++--- qemu-options.h | 12 ++++++++++++ util/qemu-config.c | 52 ++++++++++++++++++++++++++++++++++++++-------------- vl.c | 19 ++----------------- 4 files changed, 65 insertions(+), 34 deletions(-) -- 1.8.5.3

1 4

[libvirt] [PATCH] Fix Memory Leak in testGetCaps()
by Nehal J Wani 27 Mar '14

27 Mar '14

While running qemucaps2xmltest, it was found that valgrind pointed out the following memory leaks: ==27045== 160 (112 direct, 48 indirect) bytes in 1 blocks are definitely lost in loss record 51 of 65 ==27045== at 0x4A0577B: calloc (vg_replace_malloc.c:593) ==27045== by 0x4C6BACD: virAllocVar (viralloc.c:560) ==27045== by 0x4CAF095: virObjectNew (virobject.c:193) ==27045== by 0x421453: virQEMUCapsNew (qemu_capabilities.c:1805) ==27045== by 0x41F04F: testQemuCapsXML (qemucaps2xmltest.c:72) ==27045== by 0x41FFD1: virtTestRun (testutils.c:201) ==27045== by 0x41EE7A: mymain (qemucaps2xmltest.c:203) ==27045== by 0x42074D: virtTestMain (testutils.c:789) ==27045== by 0x3E6CE1ED1C: (below main) (libc-start.c:226) ==27045== ==27045== 160 (112 direct, 48 indirect) bytes in 1 blocks are definitely lost in loss record 52 of 65 ==27045== at 0x4A0577B: calloc (vg_replace_malloc.c:593) ==27045== by 0x4C6BACD: virAllocVar (viralloc.c:560) ==27045== by 0x4CAF095: virObjectNew (virobject.c:193) ==27045== by 0x421453: virQEMUCapsNew (qemu_capabilities.c:1805) ==27045== by 0x41F04F: testQemuCapsXML (qemucaps2xmltest.c:72) ==27045== by 0x41FFD1: virtTestRun (testutils.c:201) ==27045== by 0x41EEA3: mymain (qemucaps2xmltest.c:204) ==27045== by 0x42074D: virtTestMain (testutils.c:789) ==27045== by 0x3E6CE1ED1C: (below main) (libc-start.c:226) --- tests/qemucaps2xmltest.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index 8bf6738..cef5735 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -125,6 +125,7 @@ testGetCaps(char *capsData, const testQemuData *data) goto error; } + virObjectUnref(qemuCaps); return caps; error: -- 1.7.1

2 1

[libvirt] [PATCH v3 0/2] bhyve: add xml2args unittest
by Roman Bogorodskiy 27 Mar '14

27 Mar '14

Changes from v2: - Make virBhyveTapGetRealDeviceName a stub on non-FreeBSD - Add bhyvexml2argvdata and bhyvexml2argvmock.c to EXTRA_DIST - Include bhyve headers in tests only if WITH_BHYVE is defined - Don't use 'util/' for #include when not needed Changes from v1: - Chase MAC address support by adding virMacAddrGenerate() mock, so we can get a constant MAC address - Add a test for the case when MAC address is specified in the domain xml Roman Bogorodskiy (2): Move virBhyveTapGetRealDeviceName to virnetdevtap bhyve: add xml2args unittest src/bhyve/bhyve_command.c | 74 +--------- src/libvirt_private.syms | 1 + src/util/virnetdevtap.c | 87 ++++++++++++ src/util/virnetdevtap.h | 3 + tests/Makefile.am | 26 ++++ .../bhyvexml2argvdata/bhyvexml2argv-acpiapic.args | 3 + tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml | 24 ++++ tests/bhyvexml2argvdata/bhyvexml2argv-base.args | 3 + tests/bhyvexml2argvdata/bhyvexml2argv-base.xml | 20 +++ .../bhyvexml2argv-disk-virtio.args | 3 + .../bhyvexml2argv-disk-virtio.xml | 20 +++ tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args | 3 + tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.xml | 21 +++ tests/bhyvexml2argvmock.c | 49 +++++++ tests/bhyvexml2argvtest.c | 153 +++++++++++++++++++++ 15 files changed, 417 insertions(+), 73 deletions(-) create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-base.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-base.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.xml create mode 100644 tests/bhyvexml2argvmock.c create mode 100644 tests/bhyvexml2argvtest.c -- 1.8.4.2

2 6

[libvirt] [PATCH v3 for 2.0] update names in option tables to match with actual command-line spelling
by Amos Kong 27 Mar '14

27 Mar '14

We want to establish a mapping between option name and option table, then we can search related option table by option name. This patch makes all the member name of QemuOptsList to match with actual command-line spelling(option name). [ Important Note ] The QemuOptsList member name values are ABI, changing them can break existing -readconfig configuration files. This patch changes: from to introduced in acpi acpitable 0c764a9 v1.5.0 boot-opts boot 3d3b830 v1.0 smp-opts smp 12b7f57 v1.6.0 All three have calcified into ABI already. I have updated the release note of 2.0 http://wiki.qemu.org/ChangeLog/2.0#ABI_breaking Signed-off-by: Amos Kong <akong(a)redhat.com> --- V2: fix name in acpi option table V3: mention ABI break in commitlog (Markus) --- hw/acpi/core.c | 8 ++++---- hw/nvram/fw_cfg.c | 4 ++-- include/qemu/option.h | 2 +- vl.c | 14 +++++++------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/hw/acpi/core.c b/hw/acpi/core.c index 79414b4..12e9ae8 100644 --- a/hw/acpi/core.c +++ b/hw/acpi/core.c @@ -54,16 +54,16 @@ static const char unsigned dfl_hdr[ACPI_TABLE_HDR_SIZE - ACPI_TABLE_PFX_SIZE] = char unsigned *acpi_tables; size_t acpi_tables_len; -static QemuOptsList qemu_acpi_opts = { - .name = "acpi", +static QemuOptsList qemu_acpitable_opts = { + .name = "acpitable", .implied_opt_name = "data", - .head = QTAILQ_HEAD_INITIALIZER(qemu_acpi_opts.head), + .head = QTAILQ_HEAD_INITIALIZER(qemu_acpitable_opts.head), .desc = { { 0 } } /* validated with OptsVisitor */ }; static void acpi_register_config(void) { - qemu_add_opts(&qemu_acpi_opts); + qemu_add_opts(&qemu_acpitable_opts); } machine_init(acpi_register_config); diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 282341a..3e6b048 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -125,7 +125,7 @@ static void fw_cfg_bootsplash(FWCfgState *s) const char *temp; /* get user configuration */ - QemuOptsList *plist = qemu_find_opts("boot-opts"); + QemuOptsList *plist = qemu_find_opts("boot"); QemuOpts *opts = QTAILQ_FIRST(&plist->head); if (opts != NULL) { temp = qemu_opt_get(opts, "splash"); @@ -191,7 +191,7 @@ static void fw_cfg_reboot(FWCfgState *s) const char *temp; /* get user configuration */ - QemuOptsList *plist = qemu_find_opts("boot-opts"); + QemuOptsList *plist = qemu_find_opts("boot"); QemuOpts *opts = QTAILQ_FIRST(&plist->head); if (opts != NULL) { temp = qemu_opt_get(opts, "reboot-timeout"); diff --git a/include/qemu/option.h b/include/qemu/option.h index 8c0ac34..96b7c29 100644 --- a/include/qemu/option.h +++ b/include/qemu/option.h @@ -102,7 +102,7 @@ typedef struct QemuOptDesc { } QemuOptDesc; struct QemuOptsList { - const char *name; + const char *name; /* option name */ const char *implied_opt_name; bool merge_lists; /* Merge multiple uses of option into a single list? */ QTAILQ_HEAD(, QemuOpts) head; diff --git a/vl.c b/vl.c index 02bf8ec..c8002ea 100644 --- a/vl.c +++ b/vl.c @@ -388,7 +388,7 @@ static QemuOptsList qemu_machine_opts = { }; static QemuOptsList qemu_boot_opts = { - .name = "boot-opts", + .name = "boot", .implied_opt_name = "order", .merge_lists = true, .head = QTAILQ_HEAD_INITIALIZER(qemu_boot_opts.head), @@ -1357,7 +1357,7 @@ static void numa_add(const char *optarg) } static QemuOptsList qemu_smp_opts = { - .name = "smp-opts", + .name = "smp", .implied_opt_name = "cpus", .merge_lists = true, .head = QTAILQ_HEAD_INITIALIZER(qemu_smp_opts.head), @@ -3245,7 +3245,7 @@ int main(int argc, char **argv, char **envp) drive_add(IF_DEFAULT, 2, optarg, CDROM_OPTS); break; case QEMU_OPTION_boot: - opts = qemu_opts_parse(qemu_find_opts("boot-opts"), optarg, 1); + opts = qemu_opts_parse(qemu_find_opts("boot"), optarg, 1); if (!opts) { exit(1); } @@ -3614,7 +3614,7 @@ int main(int argc, char **argv, char **envp) break; } case QEMU_OPTION_acpitable: - opts = qemu_opts_parse(qemu_find_opts("acpi"), optarg, 1); + opts = qemu_opts_parse(qemu_find_opts("acpitable"), optarg, 1); if (!opts) { exit(1); } @@ -3681,7 +3681,7 @@ int main(int argc, char **argv, char **envp) } break; case QEMU_OPTION_smp: - if (!qemu_opts_parse(qemu_find_opts("smp-opts"), optarg, 1)) { + if (!qemu_opts_parse(qemu_find_opts("smp"), optarg, 1)) { exit(1); } break; @@ -4006,7 +4006,7 @@ int main(int argc, char **argv, char **envp) data_dir[data_dir_idx++] = CONFIG_QEMU_DATADIR; } - smp_parse(qemu_opts_find(qemu_find_opts("smp-opts"), NULL)); + smp_parse(qemu_opts_find(qemu_find_opts("smp"), NULL)); machine->max_cpus = machine->max_cpus ?: 1; /* Default to UP */ if (smp_cpus > machine->max_cpus) { @@ -4190,7 +4190,7 @@ int main(int argc, char **argv, char **envp) bios_name = qemu_opt_get(machine_opts, "firmware"); boot_order = machine->default_boot_order; - opts = qemu_opts_find(qemu_find_opts("boot-opts"), NULL); + opts = qemu_opts_find(qemu_find_opts("boot"), NULL); if (opts) { char *normal_boot_order; const char *order, *once; -- 1.8.5.3

3 4

[libvirt] how libvirt know the hostname of vm
by bigclouds 27 Mar '14

27 Mar '14

hi,all i recently notice that virt-manager show the hostname of vm, i am curious about that, that is the implementation? thanks

2 1

[libvirt] [PATCH] Fix Memory Leak in virQEMUCapsInitGuestFromBinary()
by Nehal J Wani 26 Mar '14

26 Mar '14

While running qemucaps2xmltest, it was found that valgrind pointed out the following memory leaks: ==29896== 0 bytes in 1 blocks are definitely lost in loss record 1 of 65 ==29896== at 0x4A0577B: calloc (vg_replace_malloc.c:593) ==29896== by 0x4C6B45E: virAllocN (viralloc.c:191) ==29896== by 0x4232A9: virQEMUCapsGetMachineTypesCaps (qemu_capabilities.c:1999) ==29896== by 0x4234E7: virQEMUCapsInitGuestFromBinary (qemu_capabilities.c:789) ==29896== by 0x41F10B: testQemuCapsXML (qemucaps2xmltest.c:118) ==29896== by 0x41FFD1: virtTestRun (testutils.c:201) ==29896== by 0x41EE7A: mymain (qemucaps2xmltest.c:203) ==29896== by 0x42074D: virtTestMain (testutils.c:789) ==29896== by 0x3E6CE1ED1C: (below main) (libc-start.c:226) ==29896== ==29896== 0 bytes in 1 blocks are definitely lost in loss record 2 of 65 ==29896== at 0x4A0577B: calloc (vg_replace_malloc.c:593) ==29896== by 0x4C6B45E: virAllocN (viralloc.c:191) ==29896== by 0x4232A9: virQEMUCapsGetMachineTypesCaps (qemu_capabilities.c:1999) ==29896== by 0x4234E7: virQEMUCapsInitGuestFromBinary (qemu_capabilities.c:789) ==29896== by 0x41F10B: testQemuCapsXML (qemucaps2xmltest.c:118) ==29896== by 0x41FFD1: virtTestRun (testutils.c:201) ==29896== by 0x41EEA3: mymain (qemucaps2xmltest.c:204) ==29896== by 0x42074D: virtTestMain (testutils.c:789) ==29896== by 0x3E6CE1ED1C: (below main) (libc-start.c:226) --- src/qemu/qemu_capabilities.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 7673592..a28816d 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -800,6 +800,7 @@ virQEMUCapsInitGuestFromBinary(virCapsPtr caps, machines)) == NULL) goto cleanup; + virCapabilitiesFreeMachines(machines, nmachines); machines = NULL; nmachines = 0; @@ -852,6 +853,7 @@ virQEMUCapsInitGuestFromBinary(virCapsPtr caps, goto cleanup; } + virCapabilitiesFreeMachines(machines, nmachines); machines = NULL; nmachines = 0; -- 1.7.1

2 1