- Devel - libvirt List Archives

[libvirt] [PATCH] snapshot: fix man page typos
by Eric Blake 28 Sep '11

28 Sep '11

pod2man from perl-5.8.8 (RHEL 5) errors out on ill-formed POD: *** ERROR: unterminated I<...> at line 1114 in file virsh.pod *** ERROR: unterminated I<...> at line 1851 in file virsh.pod Newer pod2man appears to be more tolerant (which is a shame, because it meant that this error is harder to detect). * tools/virsh.pod (undefine, snapshot-current): Add missing >. --- Pushing under the build-breaker rule. tools/virsh.pod | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 0e7acfa..a01d723 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1111,7 +1111,7 @@ hypervisor. Output the device used for the TTY console of the domain. If the information is not available the processes will provide an exit code of 1. -=item B<undefine> I<domain-id> [I<--managed-save>] [I<--snapshots-metadata] +=item B<undefine> I<domain-id> [I<--managed-save>] [I<--snapshots-metadata>] Undefine a domain. If the domain is running, this converts it to a transient domain, without stopping it. If the domain is inactive, @@ -1848,7 +1848,7 @@ treat the snapshot as current, and cannot revert to the snapshot unless B<snapshot-create> is later used to teach libvirt about the metadata again). This flag is incompatible with I<--print-xml>. -=item B<snapshot-current> I<domain> {[I<--name>] | [I<--security-info] +=item B<snapshot-current> I<domain> {[I<--name>] | [I<--security-info>] | [I<snapshotname>]} Without I<snapshotname>, this will output the snapshot XML for the domain's -- 1.7.4.4

1 0

[libvirt] [PATCH] qemu: add ability to set PCI device "rombar" on or off
by Laine Stump 27 Sep '11

27 Sep '11

This patch was made in response to: https://bugzilla.redhat.com/show_bug.cgi?id=738095 In short, qemu's default for the rombar setting (which makes the firmware ROM of a PCI device visible/not on the guest) was previously 0 (not visible), but they recently changed the default to 1 (visible). Unfortunately, there are some PCI devices that fail in the guest when rombar is 1, so the setting must be exposed in libvirt to prevent a regression in behavior (it will still require explicitly setting <rom bar='off'/> in the guest XML). rombar is forced on/off by adding: <rom bar='on|off'/> inside a <hostdev> element that defines a PCI device. It is currently ignored for all other types of devices. At the moment there is no clean method to determine whether or not the rombar option is supported by QEMU - this patch uses the advice of a QEMU developer to assume support for qemu-0.12+. There is currently a patch in the works to put this information in the output of "qemu-kvm -device pci-assign,?", but of course if we switch to keying off that, we would lose support for setting rombar on all the versions of qemu between 0.12 and whatever version gets that patch. --- docs/formatdomain.html.in | 12 +++++++ docs/schemas/domaincommon.rng | 10 ++++++ src/conf/domain_conf.c | 32 ++++++++++++++++++++ src/conf/domain_conf.h | 10 ++++++ src/qemu/qemu_capabilities.c | 4 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 19 ++++++++++++ tests/qemuhelptest.c | 15 ++++++--- .../qemuxml2argv-hostdev-pci-rombar.args | 5 +++ .../qemuxml2argv-hostdev-pci-rombar.xml | 29 ++++++++++++++++++ 10 files changed, 132 insertions(+), 5 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-rombar.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-rombar.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 0a7abaf..7654abf 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1371,6 +1371,7 @@ <address bus='0x06' slot='0x02' function='0x0'/> </source> <boot order='1'/> + <rom bar='0'/> </hostdev> </devices> ...</pre> @@ -1402,6 +1403,17 @@ used together with general boot elements in <a href="#elementsOSBIOS">BIOS bootloader</a> section. <span class="since">Since 0.8.8</span></dd> + <dt><code>rom</code></dt> + <dd>The <code>rom</code> element is used to change how a PCI + device's ROM is presented to the guest. The <code>bar</code> + attribute can be set to "on" or "off", and determines whether + or not the devices ROM will be visible in the guest's memory + map. (in PCI documentation, this is described as being + controlled by the "rombar" setting). If no rom bar is + specified, the qemu default will be used (older versions of + qemu used a default of "off", while newer qemus have a default + of "on"). <span class="since">Since 0.9.6</span> + </dd> <dt><code>address</code></dt> <dd>The <code>address</code> element for USB devices has a <code>bus</code> and <code>device</code> attribute to specify the diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index d0da41c..0ba35ef 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2059,6 +2059,16 @@ <optional> <ref name="address"/> </optional> + <optional> + <element name="rom"> + <attribute name="bar"> + <choice> + <value>on</value> + <value>off</value> + </choice> + </attribute> + </element> + </optional> </element> </define> <define name="usbproduct"> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7476447..d067415 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -442,6 +442,12 @@ VIR_ENUM_IMPL(virDomainHostdevSubsys, VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST, "usb", "pci") +VIR_ENUM_IMPL(virDomainPciRombarMode, + VIR_DOMAIN_PCI_ROMBAR_LAST, + "default", + "on", + "off") + VIR_ENUM_IMPL(virDomainHub, VIR_DOMAIN_HUB_TYPE_LAST, "usb") @@ -5485,6 +5491,20 @@ virDomainHostdevDefParseXML(const xmlNodePtr node, if (virDomainDeviceBootParseXML(cur, &def->bootIndex, bootMap)) goto error; + } else if (xmlStrEqual(cur->name, BAD_CAST "rom")) { + char *rombar = virXMLPropString(cur, "bar"); + if (!rombar) { + virDomainReportError(VIR_ERR_XML_ERROR, + "%s", _("missing rom bar attribute")); + goto error; + } + if ((def->rombar = virDomainPciRombarModeTypeFromString(rombar)) <= 0) { + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown rom bar value '%s'"), rombar); + VIR_FREE(rombar); + goto error; + } + VIR_FREE(rombar); } else { virDomainReportError(VIR_ERR_INTERNAL_ERROR, _("unknown node %s"), cur->name); @@ -10387,6 +10407,18 @@ virDomainHostdevDefFormat(virBufferPtr buf, if (virDomainDeviceInfoFormat(buf, &def->info, flags) < 0) return -1; + if (def->rombar) { + const char *rombar + = virDomainPciRombarModeTypeToString(def->rombar); + if (!rombar) { + virDomainReportError(VIR_ERR_INTERNAL_ERROR, + _("unexpected rom bar value %d"), + def->rombar); + return -1; + } + virBufferAsprintf(buf, " <rom bar='%s'/>\n", rombar); + } + virBufferAddLit(buf, " </hostdev>\n"); return 0; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 371f270..262c970 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -936,6 +936,14 @@ enum virDomainHostdevSubsysType { VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST }; +enum virDomainPciRombarMode { + VIR_DOMAIN_PCI_ROMBAR_DEFAULT = 0, + VIR_DOMAIN_PCI_ROMBAR_ON, + VIR_DOMAIN_PCI_ROMBAR_OFF, + + VIR_DOMAIN_PCI_ROMBAR_LAST +}; + typedef struct _virDomainHostdevDef virDomainHostdevDef; typedef virDomainHostdevDef *virDomainHostdevDefPtr; struct _virDomainHostdevDef { @@ -964,6 +972,7 @@ struct _virDomainHostdevDef { } source; int bootIndex; virDomainDeviceInfo info; /* Guest address */ + int rombar; /* rombar on/off/unspecified */ }; enum virDomainRedirdevBus { @@ -1855,6 +1864,7 @@ VIR_ENUM_DECL(virDomainWatchdogAction) VIR_ENUM_DECL(virDomainVideo) VIR_ENUM_DECL(virDomainHostdevMode) VIR_ENUM_DECL(virDomainHostdevSubsys) +VIR_ENUM_DECL(virDomainPciRombarMode) VIR_ENUM_DECL(virDomainHub) VIR_ENUM_DECL(virDomainRedirdevBus) VIR_ENUM_DECL(virDomainInput) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 36f47a9..1b9260a 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -136,6 +136,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "pci-ohci", "usb-redir", "usb-hub", + "rombar", ); struct qemu_feature_flags { @@ -1049,6 +1050,9 @@ qemuCapsComputeCmdFlags(const char *help, if (version >= 13000) qemuCapsSet(flags, QEMU_CAPS_PCI_MULTIFUNCTION); + + if (version >= 12000) + qemuCapsSet(flags, QEMU_CAPS_PCI_ROMBAR); } /* We parse the output of 'qemu -help' to get the QEMU diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 96b7a3b..3557bcb 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -110,6 +110,7 @@ enum qemuCapsFlags { QEMU_CAPS_PCI_OHCI = 71, /* -device pci-ohci */ QEMU_CAPS_USB_REDIR = 72, /* -device usb-redir */ QEMU_CAPS_USB_HUB = 73, /* -device usb-hub */ + QEMU_CAPS_PCI_ROMBAR = 74, /* -device rombar=0|1 */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index e8b1157..056927b 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2361,6 +2361,25 @@ qemuBuildPCIHostdevDevStr(virDomainHostdevDefPtr dev, const char *configfd, if (qemuBuildDeviceAddressStr(&buf, &dev->info, qemuCaps) < 0) goto error; + if (dev->rombar) { + if (!qemuCapsGet(qemuCaps, QEMU_CAPS_PCI_ROMBAR)) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", _("rombar not supported in this QEMU binary")); + goto error; + } + + switch (dev->rombar) { + case VIR_DOMAIN_PCI_ROMBAR_OFF: + virBufferAddLit(&buf, ",rombar=0"); + break; + case VIR_DOMAIN_PCI_ROMBAR_ON: + virBufferAddLit(&buf, ",rombar=1"); + break; + default: + break; + } + } + if (virBufferError(&buf)) { virReportOOMError(); goto error; diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index ffd30e2..17f160e 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -306,7 +306,8 @@ mymain(void) QEMU_CAPS_SMBIOS_TYPE, QEMU_CAPS_VGA_NONE, QEMU_CAPS_MIGRATE_QEMU_FD, - QEMU_CAPS_DRIVE_AIO); + QEMU_CAPS_DRIVE_AIO, + QEMU_CAPS_PCI_ROMBAR); DO_TEST("qemu-kvm-0.12.1.2-rhel60", 12001, 1, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -350,7 +351,8 @@ mymain(void) QEMU_CAPS_DEVICE_SPICEVMC, QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_PIIX4_USB_UHCI, - QEMU_CAPS_USB_HUB); + QEMU_CAPS_USB_HUB, + QEMU_CAPS_PCI_ROMBAR); DO_TEST("qemu-kvm-0.12.3", 12003, 1, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -387,7 +389,8 @@ mymain(void) QEMU_CAPS_SMBIOS_TYPE, QEMU_CAPS_VGA_NONE, QEMU_CAPS_MIGRATE_QEMU_FD, - QEMU_CAPS_DRIVE_AIO); + QEMU_CAPS_DRIVE_AIO, + QEMU_CAPS_PCI_ROMBAR); DO_TEST("qemu-kvm-0.13.0", 13000, 1, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -439,7 +442,8 @@ mymain(void) QEMU_CAPS_PIIX4_USB_UHCI, QEMU_CAPS_VT82C686B_USB_UHCI, QEMU_CAPS_PCI_OHCI, - QEMU_CAPS_USB_HUB); + QEMU_CAPS_USB_HUB, + QEMU_CAPS_PCI_ROMBAR); DO_TEST("qemu-kvm-0.12.1.2-rhel61", 12001, 1, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -487,7 +491,8 @@ mymain(void) QEMU_CAPS_VIRTIO_IOEVENTFD, QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_PIIX4_USB_UHCI, - QEMU_CAPS_USB_HUB); + QEMU_CAPS_USB_HUB, + QEMU_CAPS_PCI_ROMBAR); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-rombar.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-rombar.args new file mode 100644 index 0000000..1a8b14e --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-rombar.args @@ -0,0 +1,5 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ +pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor \ +unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \ +/dev/HostVG/QEMUGuest2 -usb -device pci-assign,host=06:12.5,id=hostdev0,\ +bus=pci.0,addr=0x3,rombar=0 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-rombar.xml b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-rombar.xml new file mode 100644 index 0000000..bf17cc4 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-rombar.xml @@ -0,0 +1,29 @@ +<domain type='qemu'> + <name>QEMUGuest2</name> + <uuid>c7a5fdbd-edaf-9466-926a-d65c16db1809</uuid> + <memory>219100</memory> + <currentMemory>219100</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest2'/> + <target dev='hda' bus='ide'/> + </disk> + <hostdev mode='subsystem' type='pci' managed='yes'> + <source> + <address domain='0x0000' bus='0x06' slot='0x12' function='0x5'/> + </source> + <rom bar='off'/> + </hostdev> + <memballoon model='virtio'/> + </devices> +</domain> -- 1.7.3.4

3 5

[libvirt] [PATCH 0/2] Allow to make disk optional on migration
by Michal Privoznik 27 Sep '11

27 Sep '11

If user wants to migrate a machine, it's all or nothing. Either he/she has all storage accessible under same paths, or migration will fail. But there are some cases, where allowing migration to drop some disks, may be useful. E.g. when host gets itself to a state where domains need to be migrated so host can be say rebooted. Therefore we might want to give user possibility to mark some cdroms/floppy as optional, meaning if destination cannot access them, they get ejected (on destination). This idea is implemented via <migration> element, which basically says what to do with (currently) disk on migration. Right now it contains only one attribute 'optional' accepting values 'yes' and 'no'. Then, if destination cannot access a path and corresponding disk is mared as: a) optional - it is ejected (source is free()'d) b) non-optional - migration simply fails. The default is understandably non-optional to all disks. NB, setting optional is supported only on cdrom & floppy. Michal Privoznik (2): migration: Introduce <migration> element for cdrom and floppy qemu: Implement migration optional disk docs/schemas/domaincommon.rng | 16 ++++++++ src/conf/domain_conf.c | 85 ++++++++++++++++++++++++++++++++++++++++- src/conf/domain_conf.h | 16 ++++++++ src/libvirt_private.syms | 2 + src/qemu/qemu_migration.c | 47 +++++++++++++++++++++- 5 files changed, 163 insertions(+), 3 deletions(-) -- 1.7.3.4

2 3

[libvirt] [PATCH] spec: F15 still uses cgconfig
by Eric Blake 27 Sep '11

27 Sep '11

Commit ecd8725c dropped attempts to probe the cgconfig service on new enough Fedora where systemd took over that aspect of the system, but mistakenly used F14 instead of F15 as the cutoff point. https://bugzilla.redhat.com/show_bug.cgi?id=741358 * libvirt.spec.in (with_cgconfig): Check cgconfig service in F15. --- libvirt.spec.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index c0ea898..03d6f1f 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -894,9 +894,9 @@ done %endif %if %{with_cgconfig} -# Starting with Fedora 15, systemd automounts all cgroups, and cgconfig is +# Starting with Fedora 16, systemd automounts all cgroups, and cgconfig is # no longer a necessary service. -%if 0%{?fedora} <= 14 || 0%{?rhel} <= 6 +%if 0%{?fedora} <= 15 || 0%{?rhel} <= 6 if [ "$1" -eq "1" ]; then /sbin/chkconfig cgconfig on fi -- 1.7.4.4

3 7

[libvirt] [PATCH] qemu: Relax -no-shutdown check to [0.14.0, 0.15.50)
by Jiri Denemark 27 Sep '11

27 Sep '11

SIGTERM handling for -no-shutdown is already fixed in qemu git and libvirt can safely use it. The downside is that 0.15.50 version of qemu can be any qemu compiled from git, even that without the fix for SIGTERM. However, I think this patch is worth it since someone using qemu from git should expect their data can get corrupted and excluding 0.15.50 from the check makes testing current qemu with libvirt much easier. --- src/qemu/qemu_capabilities.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 8e20e3f..4325f77 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1017,9 +1017,9 @@ qemuCapsComputeCmdFlags(const char *help, /* Do not use -no-shutdown if qemu doesn't support it or SIGTERM handling * is most likely buggy when used with -no-shutdown (which applies for qemu - * 0.14.* and 0.15.*) + * 0.14.* and <0.15.50) */ - if (strstr(help, "-no-shutdown") && (version < 14000 || version > 15999)) + if (strstr(help, "-no-shutdown") && (version < 14000 || version >= 15050)) qemuCapsSet(flags, QEMU_CAPS_NO_SHUTDOWN); /* -- 1.7.6.1

2 2

[libvirt] [PATCH] virsh: Better document --copy-storage migrate options
by Jiri Denemark 27 Sep '11

27 Sep '11

Both --copy-storage-{all,inc} options require disk images to be present on destination host. --- tools/virsh.pod | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index fbde57f..0e7acfa 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -727,9 +727,12 @@ and I<--suspend> leaves the domain paused on the destination host. I<--copy-storage-all> indicates migration with non-shared storage with full disk copy, I<--copy-storage-inc> indicates migration with non-shared storage with incremental copy (same base image shared between source and destination). -I<--change-protection> enforces that no incompatible configuration changes -will be made to the domain while the migration is underway; this flag is -implicitly enabled when supported by the hypervisor, but can be explicitly +In both cases the disk images have to exist on destination host, the +I<--copy-storage-...> options only tell libvirt to transfer data from the +images on source host to the images found at the same place on the destination +host. I<--change-protection> enforces that no incompatible configuration +changes will be made to the domain while the migration is underway; this flag +is implicitly enabled when supported by the hypervisor, but can be explicitly used to reject the migration if the hypervisor lacks change protection support. I<--verbose> displays the progress of migration. -- 1.7.6.1

2 2

[libvirt] [PATCH 00/14] snapshot: improve dumpxml output
by Eric Blake 27 Sep '11

27 Sep '11

This series fixes 'virsh snapshot-dumpxml' to use nicer formatting. Patch 1 adds some nice helper routines, patches 2-13 are mostly mechanical conversions to use the helpers and pass indentation levels through the entire call chain, and patch 14 adds a test which uncovered a couple minor issues in how formatting was done. Eric Blake (14): snapshot: indent domain xml when nesting, round 1 snapshot: indent domain xml when nesting, round 2 snapshot: indent domain xml when nesting, round 3 snapshot: indent domain xml when nesting, round 4 snapshot: indent domain xml when nesting, round 5 snapshot: indent domain xml when nesting, round 6 snapshot: indent domain xml when nesting, round 7 snapshot: indent domain xml when nesting, round 8 snapshot: indent domain xml when nesting, round 9 snapshot: indent domain xml when nesting, round 10 snapshot: indent domain xml when nesting, round 11 snapshot: indent domain xml when nesting, round 12 snapshot: indent domain xml when nesting, round 13 snapshot: test domainsnapshot indentation .gitignore | 1 + src/conf/capabilities.c | 6 +- src/conf/capabilities.h | 6 +- src/conf/cpu_conf.c | 43 +- src/conf/cpu_conf.h | 7 +- src/conf/domain_conf.c | 778 +++++++++++---------- src/conf/domain_conf.h | 6 +- src/conf/network_conf.c | 8 +- src/conf/nwfilter_conf.c | 16 +- src/conf/nwfilter_params.c | 41 +- src/conf/nwfilter_params.h | 8 +- src/conf/storage_encryption_conf.c | 4 +- src/cpu/cpu.c | 2 +- src/libvirt_private.syms | 3 + src/qemu/qemu_domain.c | 39 +- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_migration.c | 23 +- src/util/buf.c | 70 ++- src/util/buf.h | 19 +- src/util/network.c | 49 +- src/util/network.h | 9 +- src/util/sysinfo.c | 407 ++++------- src/util/sysinfo.h | 4 +- tests/Makefile.am | 14 +- tests/cputest.c | 2 +- tests/domainsnapshotxml2xmlout/all_parameters.xml | 2 +- tests/domainsnapshotxml2xmlout/disk_snapshot.xml | 102 ++-- tests/domainsnapshotxml2xmlout/full_domain.xml | 52 +- tests/domainsnapshotxml2xmltest.c | 128 ++++ tests/testutils.c | 2 +- tests/virbuftest.c | 32 +- 31 files changed, 1033 insertions(+), 852 deletions(-) create mode 100644 tests/domainsnapshotxml2xmltest.c -- 1.7.4.4

4 27

[libvirt] [PATCH] virsh: Enhance documentation of commands starting jobs
by Jiri Denemark 27 Sep '11

27 Sep '11

Some virsh commands start a (long-running) job that can be monitored using domjobinfo and aborted with domjobabort. Let's be explicit about this in virsh man page. --- tools/virsh.pod | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 43ed1ea..fbde57f 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -627,30 +627,35 @@ named by I<format> to a domain XML format. Convert the file I<xml> in domain XML format to the native guest configuration format named by I<format>. =item B<dump> I<domain-id> I<corefilepath> [I<--live>] [I<--crash>] [I<--bypass-cache>] Dumps the core of a domain to a file for analysis. If I<--live> is specified, the domain continues to run until the core dump is complete, rather than pausing up front. If I<--crash> is specified, the domain is halted with a crashed status, rather than merely left in a paused state. If I<--bypass-cache> is specified, the save will avoid the file system cache, although this may slow down the operation. +The progress may be monitored using B<domjobinfo> virsh command and canceled +with B<domjobabort> command (sent by another virsh instance). Interrupting +(usually with C<Ctrl-C>) the virsh process which runs B<dump> command is not +enough to actually cancel the operation. + NOTE: Some hypervisors may require the user to manually ensure proper permissions on file and path specified by argument I<corefilepath>. =item B<dumpxml> I<domain-id> [I<--inactive>] [I<--security-info>] [I<--update-cpu>] Output the domain information as an XML dump to stdout, this format can be used by the B<create> command. Additional options affecting the XML dump may be used. I<--inactive> tells virsh to dump domain configuration that will be used on next start of the domain as opposed to the current domain configuration. Using I<--security-info> will also include security sensitive information in the XML dump. I<--update-cpu> updates domain CPU requirements according to host CPU. =item B<echo> [I<--shell>] [I<--xml>] [I<arg>...] @@ -672,30 +677,35 @@ This is equivalent to: except that it does some error checking. The editor used can be supplied by the C<$VISUAL> or C<$EDITOR> environment variables, and defaults to C<vi>. =item B<managedsave> I<domain-id> [I<--bypass-cache>] [{I<--running> | I<--paused>}] Save and destroy (stop) a running domain, so it can be restarted from the same state at a later time. When the virsh B<start> command is next run for the domain, it will automatically be started from this saved state. If I<--bypass-cache> is specified, the save will avoid the file system cache, although this may slow down the operation. +The progress may be monitored using B<domjobinfo> virsh command and canceled +with B<domjobabort> command (sent by another virsh instance). Interrupting +(usually with C<Ctrl-C>) the virsh process which runs B<managedsave> command +is not enough to actually cancel the operation. + Normally, starting a managed save will decide between running or paused based on the state the domain was in when the save was done; passing either the I<--running> or I<--paused> flag will allow overriding which state the B<start> should use. The B<dominfo> command can be used to query whether a domain currently has any managed save image. =item B<managedsave-remove> I<domain-id> Remove the B<managedsave> state file for a domain, if it exists. This ensures the domain will do a full boot the next time it is started. =item B<maxvcpus> [I<type>] @@ -724,30 +734,33 @@ used to reject the migration if the hypervisor lacks change protection support. I<--verbose> displays the progress of migration. The I<desturi> is the connection URI of the destination host, and I<migrateuri> is the migration URI, which usually can be omitted. I<dname> is used for renaming the domain to new name during migration, which also usually can be omitted. Likewise, I<--xml> B<file> is usually omitted, but can be used to supply an alternative XML file for use on the destination to supply a larger set of changes to any host-specific portions of the domain XML, such as accounting for naming differences between source and destination in accessing underlying storage. I<--timeout> B<seconds> forces guest to suspend when live migration exceeds that many seconds, and then the migration will complete offline. It can only be used with I<--live>. +Running migration can be canceled by interrupting virsh (usually using +C<Ctrl-C>) or by B<domjobabort> command sent from another virsh instance. + B<Note>: The I<desturi> parameter for normal migration and peer2peer migration has different semantics: =over 4 =item * normal migration: the I<desturi> is an address of the target host as seen from the client machine. =item * peer2peer migration: the I<desturi> is an address of the target host as seen from the source machine. =back =item B<migrate-setmaxdowntime> I<domain-id> I<downtime> @@ -797,30 +810,35 @@ B<Note>: To avoid corrupting file system contents within the domain, you should not reuse the saved state file for a second B<restore> unless you have also reverted all storage volumes back to the same contents as when the state file was created. =item B<save> I<domain-id> I<state-file> [I<--bypass-cache>] [I<--xml> B<file>] [{I<--running> | I<--paused>}] Saves a running domain (RAM, but not disk state) to a state file so that it can be restored later. Once saved, the domain will no longer be running on the system, thus the memory allocated for the domain will be free for other domains to use. B<virsh restore> restores from this state file. If I<--bypass-cache> is specified, the save will avoid the file system cache, although this may slow down the operation. +The progress may be monitored using B<domjobinfo> virsh command and canceled +with B<domjobabort> command (sent by another virsh instance). Interrupting +(usually with C<Ctrl-C>) the virsh process which runs B<save> command is not +enough to actually cancel the operation. + This is roughly equivalent to doing a hibernate on a running computer, with all the same limitations. Open network connections may be severed upon restore, as TCP timeouts may have expired. I<--xml> B<file> is usually omitted, but can be used to supply an alternative XML file for use on the restored guest with changes only in the host-specific portions of the domain XML. For example, it can be used to account for file naming differences that are planned to be made via disk snapshots of underlying storage after the guest is saved. Normally, restoring a saved image will decide between running or paused based on the state the domain was in when the save was done; passing either the I<--running> or I<--paused> flag will allow overriding which state the B<restore> should use. -- 1.7.6.1

2 2

[libvirt] [libvirt-glib] Ability to create new domains
by Zeeshan Ali (Khattak) 27 Sep '11

27 Sep '11

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gobject/libvirt-gobject-connection.c | 38 ++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-connection.h | 3 ++ libvirt-gobject/libvirt-gobject.sym | 1 + 3 files changed, 42 insertions(+), 0 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index 32f749c..072484e 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -720,3 +720,41 @@ GVirStream *gvir_connection_get_stream(GVirConnection *self, return klass->stream_new(self, st); } + +/** + * gvir_connection_create_domain: + * @conn: the connection on which to create the dmain + * @conf: the configuration for the new domain + * Returns: (transfer full): the newly created domain + */ +GVirDomain *gvir_connection_create_domain(GVirConnection *conn, + GVirConfigDomain *conf, + GError **err) +{ + const gchar *xml; + virDomainPtr handle; + GVirConnectionPrivate *priv = conn->priv; + + xml = gvir_config_object_get_doc(GVIR_CONFIG_OBJECT(conf)); + + g_return_val_if_fail(xml != NULL, NULL); + + if (!(handle = virDomainDefineXML(priv->conn, xml))) { + *err = gvir_error_new_literal(GVIR_CONNECTION_ERROR, + 0, + "Failed to create domain"); + return NULL; + } + + GVirDomain *domain; + + domain = GVIR_DOMAIN(g_object_new(GVIR_TYPE_DOMAIN, + "handle", handle, + NULL)); + + g_hash_table_insert(priv->domains, + g_strdup(gvir_domain_get_uuid(domain)), + domain); + + return domain; +} diff --git a/libvirt-gobject/libvirt-gobject-connection.h b/libvirt-gobject/libvirt-gobject-connection.h index 0172d02..c453bed 100644 --- a/libvirt-gobject/libvirt-gobject-connection.h +++ b/libvirt-gobject/libvirt-gobject-connection.h @@ -107,6 +107,9 @@ GVirDomain *gvir_connection_find_domain_by_id(GVirConnection *conn, GVirDomain *gvir_connection_find_domain_by_name(GVirConnection *conn, const gchar *name); +GVirDomain *gvir_connection_create_domain(GVirConnection *conn, + GVirConfigDomain *conf, + GError **err); #if 0 GList *gvir_connection_get_interfaces(GVirConnection *conn); diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index a68db4b..eae40a2 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -18,6 +18,7 @@ LIBVIRT_GOBJECT_0.0.1 { gvir_connection_get_domain; gvir_connection_find_domain_by_id; gvir_connection_find_domain_by_name; + gvir_connection_create_domain; gvir_domain_get_type; gvir_domain_handle_get_type; -- 1.7.6.2

2 3

[libvirt] [PATCH] virLockManagerNopInit: Rename flags to unused_flags
by Michal Privoznik 27 Sep '11

27 Sep '11

As these might be not used and make syntax-check complains about checking them via virCheckFlags. --- pushing under build-breaker rule src/locking/lock_driver_nop.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locking/lock_driver_nop.c b/src/locking/lock_driver_nop.c index 570b7e7..2ca6c4d 100644 --- a/src/locking/lock_driver_nop.c +++ b/src/locking/lock_driver_nop.c @@ -29,10 +29,10 @@ static int virLockManagerNopInit(unsigned int version ATTRIBUTE_UNUSED, const char *configFile ATTRIBUTE_UNUSED, - unsigned int flags ATTRIBUTE_UNUSED) + unsigned int flags_unused ATTRIBUTE_UNUSED) { VIR_DEBUG("version=%u configFile=%s flags=%x", - version, NULLSTR(configFile), flags); + version, NULLSTR(configFile), flags_unused); return 0; } -- 1.7.3.4

1 0