- Devel - libvirt List Archives

[libvirt] [test-API][PATCH] Fix the missing ret variable problem
by Wayne Sun 26 Aug '11

26 Aug '11

--- repos/remoteAccess/tls_setup.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/repos/remoteAccess/tls_setup.py b/repos/remoteAccess/tls_setup.py index 80d6b42..4e7f24e 100644 --- a/repos/remoteAccess/tls_setup.py +++ b/repos/remoteAccess/tls_setup.py @@ -343,6 +343,7 @@ def request_credentials(credentials, user_data): def hypervisor_connecting_test(uri, auth_tls, username, password, logger, expected_result): """ connect remote server """ + ret = 0 try: conn = connectAPI.ConnectAPI() if auth_tls == 'none': @@ -355,6 +356,7 @@ def hypervisor_connecting_test(uri, auth_tls, username, except LibvirtAPI, e: logger.error("API error message: %s, error code is %s" % \ (e.response()['message'], e.response()['code'])) + ret = 1 conn.close() -- 1.7.1

2 1

[libvirt] problem of escaped scancodes
by Lai Jiangshan 26 Aug '11

26 Aug '11

Hi, Daniel P. Berrange, Our user found that some keycode can not be handled well when they try to map other keycode to xt_kbd keycode, when xt_kbd keycode is an escaped scancode. The xt_kbd keycode http://git.gnome.org/browse/gtk-vnc/plain/src/keymaps.csv are come from x86_keycodes[] of linux/drivers/char/keyboard.c. And x86_keycodes[] are: static const unsigned short x86_keycodes[256] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,118, 86, 87, 88,115,120,119,121,112,123, 92, 284,285,309, 0,312, 91,327,328,329,331,333,335,336,337,338,339, 367,288,302,304,350, 89,334,326,267,126,268,269,125,347,348,349, 360,261,262,263,268,376,100,101,321,316,373,286,289,102,351,355, 103,104,105,275,287,279,258,106,274,107,294,364,358,363,362,361, 291,108,381,281,290,272,292,305,280, 99,112,257,306,359,113,114, 264,117,271,374,379,265,266, 93, 94, 95, 85,259,375,260, 90,116, 377,109,111,277,278,282,283,295,296,297,299,300,301,293,303,307, 308,310,313,314,315,317,318,319,320,357,322,323,324,325,276,330, 332,340,365,342,343,344,345,346,356,270,341,368,369,370,371,372 }; There is no keycode in range [128, 256] in this table, which means all escaped scancode "e0 ??" are encoded as "0x100 | ??" in this table. Example, LeftCtrl is 0x1d, and RightCtrl is escaped: "e0 1d", RightCtrl is encoded as "0x100 | 0x1d"(=0x11d=285) in this table. The code also tell me the same information: code = x86_keycodes[keycode]; if (!code) return -1; if (code & 0x100) put_queue(vc, 0xe0); put_queue(vc, (code & 0x7f) | up_flag); But some other place, escaped scancode "e0 ??" are encoded as "0x80 | ??", this encoding is more commonly used, and qemu uses this encoding, RightCtrl is encoded as "0x80 | 0x1d"(=0x9d=157) in qemu: { 0x9d, "ctrl_r" }, keycode = keycodes[i]; if (keycode & 0x80) kbd_put_keycode(0xe0); kbd_put_keycode(keycode & 0x7f); The problem: keymaps.csv uses the first encoding while qemu uses the second one, it causes "virsh send-key" command can't work when it sends escaped scancodes. Example: When do "virsh send-key domain KEY_RIGHTCTRL", qemu will receive keycode=285 which is not expected. So I suggest to change keymaps.csv. Covert the old KEY_RIGHTCTRL,97,RightControl,0x3e,,,88,,285,228,VK_RCONTROL,0xa3,0x65,0x65 to new KEY_RIGHTCTRL,97,RightControl,0x3e,,,88,,157,228,VK_RCONTROL,0xa3,0x65,0x65 (ditto for other escaped scancodes) Or just add the new line to keymaps.csv followed by the old line, and make 285 and 157 can work at the same time. Thought? Thanks, Lai.

3 4

[libvirt] XML files
by Derek 26 Aug '11

26 Aug '11

Hi Folks, I'm running KVM on Debian squeeze. I have some requirements on a new VM to provide customised BIOS vendor/product strings, from my experience so far this is accomplish with the sysinfo/smbios support. So I have added these to the XML file for my VM. I found 'virsh edit' is the recommended way to make changes to a VM configuration, I find the XML file is not referenced at boot, it is only saved to with 'virsh dumpxml'. 'virsh edit' will update both areas - hypervisor and XML file. Unfortunately the changes I make for smbios and sysinfo (as below) while editing don't appear to be accepted when saving with 'virsh edit'. After saving I receive "Domain HMC XML configuration edited." but the XML file remains unmodified. I wonder if they are perhaps not supported with virsh edit yet? <sysinfo type='smbios'> <bios> <entry name='vendor'>xxx xxx</entry> <entry name='version'>xxx</entry> </bios> <system> <entry name='product'>xxx</entry> <entry name='version'>xxx</entry> <entry name='manufacturer'>xxx xxx</entry> </system> </sysinfo> <os> <type arch='x86_64' machine='pc-0.12'>hvm</type> <boot dev='cdrom'/> <smbios mode='sysinfo'/> </os> Thanks in advance, Derek

2 2

[libvirt] [libvirt-virshcmdref 01/14] update documentation for command attach-device
by Hu Tao 26 Aug '11

26 Aug '11

--- source/attach-device.xml | 143 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 137 insertions(+), 6 deletions(-) diff --git a/source/attach-device.xml b/source/attach-device.xml index efa46f0..18e3262 100644 --- a/source/attach-device.xml +++ b/source/attach-device.xml @@ -5,20 +5,151 @@ <description> <text> - Attach device from an XML file + Attach a device from an XML file </text> </description> - <options /> + <options> + <parameter requirement="required"> + <keyword requirement="optional">--domain</keyword> + <value type="string" requirement="required">domain</value> + <description> + <text> + domain name, id or uuid + </text> + <text> + "--domain" itself is optional + </text> + </description> + </parameter> + <parameter requirement="required"> + <keyword requirement="optional">--file</keyword> + <value type="string" requirement="required">file</value> + <description> + <text> + the XML file describing the device to be attached + </text> + <text> + "--file" itself is optional + </text> + </description> + </parameter> + <parameter requirement="optional"> + <keyword requirement="required">--persistent</keyword> + <description> + <text> + with this option, the XML file of domain will be updated + </text> + </description> + </parameter> + </options> <availability from="0.2.3" /> <notes /> - <examples type="usage" /> + <examples type="usage"> + <example> + <terminal> +virsh # <bold>attach-device</bold> <value>example-domain</value> <value>/tmp/new-nic.xml</value></terminal> + <text> + Attaches a NIC which is defined by <value>/tmp/new-nic.xml</value> to domain <value>example-domain</value>. + </text> + </example> + </examples> - <examples type="fullcontext" /> - - <reference type="seealso" /> + <examples type="fullcontext"> + <example> + <text> + In this example we will attach a NIC to a running domain which doesn't have a NIC. + The domain is defined as: + </text> + <terminal> +<domain type='kvm'> + <name>example-domain</name> + <uuid>6853c36f-af03-4968-a31d-1f3a9c3f699a</uuid> + <memory>1048576</memory> + <currentMemory>1048576</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='x86_64' machine='pc-0.12'>hvm</type> + <boot dev='hd'/> + </os> + <features> + <acpi/> + <apic/> + <pae/> + </features> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/local/bin/qemu-system-x86_64</emulator> + <disk type='file' device='disk'> + <driver name='qemu' type='raw' cache='writeback'/> + <source file='/mnt/data/libvirt-images/vm2.img'/> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </disk> + <input type='mouse' bus='ps2'/> + <graphics type='vnc' port='-1' autoport='yes'/> + <video> + <model type='cirrus' vram='9216' heads='1'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </video> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </memballoon> + </devices> +</domain></terminal> + <text> + Bring up the domain. From the output of <value>lspci</value> we can see that there is no NIC + present. + </text> + <terminal>00:00.0 Host bridge: Intel Corporation 440FX - 82441FX PMC [Natoma] (rev 02) +00:01.0 ISA bridge: Intel Corporation 82371SB PIIX3 ISA [Natoma/Triton II] +00:01.1 IDE interface: Intel Corporation 82371SB PIIX3 IDE [Natoma/Triton II] +00:01.2 USB Controller: Intel Corporation 82371SB PIIX3 USB [Natoma/Triton II] (rev 01) +00:01.3 Bridge: Intel Corporation 82371AB/EB/MB PIIX4 ACPI (rev 03) +00:02.0 VGA compatible controller: Cirrus Logic GD 5446 +00:03.0 RAM memory: Red Hat, Inc Virtio memory balloon +00:04.0 SCSI storage controller: Red Hat, Inc Virtio block device</terminal> + <text> + Now we attach a NIC to the domain: + </text> + <terminal>virsh # <bold>attach-device</bold> <value>example-domain</value> <value>/tmp/new-nic.xml</value></terminal> + <text> + the content of <value>/tmp/new-nic.xml</value> is: + </text> + <terminal> +<interface type='network'> + <source network='default'/> +</interface></terminal> + <text> + We can see that the attached NIC is listed by <value>lspci</value>: + </text> + <terminal>00:00.0 Host bridge: Intel Corporation 440FX - 82441FX PMC [Natoma] (rev 02) +00:01.0 ISA bridge: Intel Corporation 82371SB PIIX3 ISA [Natoma/Triton II] +00:01.1 IDE interface: Intel Corporation 82371SB PIIX3 IDE [Natoma/Triton II] +00:01.2 USB Controller: Intel Corporation 82371SB PIIX3 USB [Natoma/Triton II] (rev 01) +00:01.3 Bridge: Intel Corporation 82371AB/EB/MB PIIX4 ACPI (rev 03) +00:02.0 VGA compatible controller: Cirrus Logic GD 5446 +00:03.0 RAM memory: Red Hat, Inc Virtio memory balloon +00:04.0 SCSI storage controller: Red Hat, Inc Virtio block device +00:05.0 Ethernet controller: Realtek Semiconductor Co., Ltd. RTL-8139/8139C/8139C+ (rev 20)</terminal> + </example> + </examples> + <reference type="seealso"> + <item> + <link type="internal" href="detach-device" /> + <name> + detach-device + </name> + <description> + Detach a device from an XML file + </description> + </item> + </reference> </command> -- 1.7.3.1

3 31

[libvirt] [PATCH 1/3] virt-manager: Add controller model in details
by Marc-André Lureau 26 Aug '11

26 Aug '11

--- src/virtManager/details.py | 5 +++++ src/vmm-details.glade | 29 +++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/src/virtManager/details.py b/src/virtManager/details.py index 1fb7d3a..fd6cc3a 100644 --- a/src/virtManager/details.py +++ b/src/virtManager/details.py @@ -3019,7 +3019,12 @@ class vmmDetails(vmmGObjectUI): return type_label = virtinst.VirtualController.pretty_type(dev.type) + model_label = dev.model + if not model_label: + model_label = _("Default") + self.widget("controller-type").set_text(type_label) + self.widget("controller-model").set_text(model_label) def refresh_filesystem_page(self): dev = self.get_hw_selection(HW_LIST_COL_DEVICE) diff --git a/src/vmm-details.glade b/src/vmm-details.glade index 0e2d631..8ab386b 100644 --- a/src/vmm-details.glade +++ b/src/vmm-details.glade @@ -5553,6 +5553,7 @@ I/O:</property> <widget class="GtkTable" id="table14"> <property name="visible">True</property> <property name="n_columns">2</property> + <property name="n_rows">2</property> <property name="column_spacing">6</property> <property name="row_spacing">6</property> <child> @@ -5577,6 +5578,34 @@ I/O:</property> <property name="y_options">GTK_FILL</property> </packing> </child> + <child> + <widget class="GtkLabel" id="mlabel48"> + <property name="visible">True</property> + <property name="label" translatable="yes">Model:</property> + </widget> + <packing> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="controller-model"> + <property name="visible">True</property> + <property name="label">foo</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> </widget> </child> </widget> -- 1.7.6

1 2

[libvirt] [PATCH 0/4] python-virtinst USB improvements
by Marc-André Lureau 26 Aug '11

26 Aug '11

Hi, Here are a few patches that go with the libvirt series to improve USB support. It adds --controller and --usbredir, as well as providing some new API for virt-manager. The last patch default USB controller to ich9/usb2 on Windows 7 guest. More OS probably support it, since it's been around since early 2007. Marc-André Lureau (4): Fix typo s/type/managed Add advanced --controller support, augmenting VirtualController Add --usbredir server:port device RFC: Default to ICH9 USB2 controller for Win7 man/en/virt-clone.1 | 6 ++- man/en/virt-image.1 | 45 +++++++-------- man/en/virt-install.1 | 52 ++++++++++++++++- man/en/virt-install.pod.in | 59 ++++++++++++++++++- tests/cli-test-xml/compare/many-devices.xml | 30 ++++++++++ tests/clitest.py | 50 ++++++++++++++++ tests/utils.py | 8 +- tests/xmlparse-xml/change-controllers-in.xml | 4 + tests/xmlparse-xml/change-controllers-out.xml | 4 + tests/xmlparse.py | 9 +++ virt-install | 2 + virtinst/Guest.py | 26 ++++++++ virtinst/VirtualController.py | 78 +++++++++++++++++++++++-- virtinst/VirtualDevice.py | 49 +++++++++++++++- virtinst/VirtualHostDevice.py | 67 +++++++++++++++++++++- virtinst/XMLBuilderDomain.py | 10 +++ virtinst/__init__.py | 5 +- virtinst/cli.py | 78 +++++++++++++++++++++++++ virtinst/osdict.py | 3 + virtinst/support.py | 6 ++ 20 files changed, 547 insertions(+), 44 deletions(-) -- 1.7.6

1 4

[libvirt] [PATCH 1/2] qemu: avoid dead store in doPeer2PeerMigrate3
by ajia＠redhat.com 25 Aug '11

25 Aug '11

* src/qemu/qemu_migration.c: avoid dead 'ret' assignment and silence clang warning. Detected by ccc-analyzer: CC libvirt_driver_qemu_la-qemu_migration.lo qemu/qemu_migration.c:2046:5: warning: Value stored to 'ret' is never read ret = qemuMigrationConfirm(driver, sconn, vm, ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- src/qemu/qemu_migration.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 5510493..469bb4a 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2050,6 +2050,9 @@ finish: * do, but fortunately worst case is that there is a * domain left in 'paused' state on source. */ + if (ret < 0) + VIR_WARN("Guest %s probably left in 'paused' state on source", + vm->def->name); cleanup: if (ddomain) { -- 1.7.1

4 5

[libvirt] [PATCH] qemu: Correctly label migration TCP socket passed to qemu
by Jiri Denemark 25 Aug '11

25 Aug '11

--- src/qemu/qemu_migration.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index a84faf6..d787a09 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1484,9 +1484,12 @@ qemuMigrationRun(struct qemud_driver *driver, case MIGRATION_DEST_FD: if (spec->fwdType != MIGRATION_FWD_DIRECT) fd = spec->dest.fd.local; - ret = qemuMonitorMigrateToFd(priv->mon, migrate_flags, - spec->dest.fd.qemu); - VIR_FORCE_CLOSE(spec->dest.fd.qemu); + if (virSecurityManagerSetImageFDLabel(driver->securityManager, vm, + spec->dest.fd.qemu) == 0) { + ret = qemuMonitorMigrateToFd(priv->mon, migrate_flags, + spec->dest.fd.qemu); + VIR_FORCE_CLOSE(spec->dest.fd.qemu); + } break; } qemuDomainObjExitMonitorWithDriver(driver, vm); -- 1.7.6.1

4 7

[libvirt] [PATCH v2] remote: Refuse connecting to remote socket
by Michal Privoznik 25 Aug '11

25 Aug '11

If users wants to connect to remote unix socket, e.g. 'qemu+unix://<remote>/system' currently the <remote> part is ignored, ending up connecting to localhost. Connecting to remote socket is not supported and user should have used TLS/TCP/SSH instead. --- src/remote/remote_driver.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 28f333b..563ccf4 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -325,9 +325,16 @@ doRemoteOpen (virConnectPtr conn, } else { if (STRCASEEQ (transport_str, "tls")) transport = trans_tls; - else if (STRCASEEQ (transport_str, "unix")) - transport = trans_unix; - else if (STRCASEEQ (transport_str, "ssh")) + else if (STRCASEEQ (transport_str, "unix")) { + if (conn->uri->server) { + remoteError(VIR_ERR_INVALID_ARG, "%s", + _("rempte_open: using unix socket and " + "remote server is not supported.")); + return VIR_DRV_OPEN_ERROR; + } else { + transport = trans_unix; + } + } else if (STRCASEEQ (transport_str, "ssh")) transport = trans_ssh; else if (STRCASEEQ (transport_str, "ext")) transport = trans_ext; -- 1.7.3.4

2 3

[libvirt] [PATCH] Fix command test wrt gnutls initialize & fix debugging
by Daniel P. Berrange 25 Aug '11

25 Aug '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> The VIR_TEST_DEBUG and VIR_TEST_VERBOSE env vars did not work because we replaced 'environ' with 'newenv'. Simply calling virTestGetDebug/Verbose() before replacing the 'environ' ensures we have processed the env variables. The gnutls initialization code opens /dev/urandom and keeps that FD around for later use. We have code which kills off FDs 3-5 to avoid interfereing with our test case. Move the virInitialize call before this point, so it kills off the gnutls /dev/urandom FD which is irrelevant for testing purposes * tests/commandtest.c: Fix test debugging & make it robust against opened FDs --- tests/commandtest.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/commandtest.c b/tests/commandtest.c index 4a798fc..dd6c248 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -773,6 +773,13 @@ mymain(void) setpgid(0, 0); setsid(); + + /* Prime the debug/verbose settings from the env vars, + * since we're about to reset 'environ' */ + virTestGetDebug(); + virTestGetVerbose(); + + virInitialize(); /* Kill off any inherited fds that might interfere with our * testing. */ fd = 3; @@ -782,8 +789,6 @@ mymain(void) fd = 5; VIR_FORCE_CLOSE(fd); - virInitialize(); - environ = (char **)newenv; # define DO_TEST(NAME) \ -- 1.7.6

2 1

[libvirt] ALERT Virtualization Automatic Builder
by berrange＠redhat.com 25 Aug '11

25 Aug '11

Overall status: failed Start date: Thu Aug 25 2011 Start time: 11:05:02 UTC / 07:05:02 EDT Build counter: 1314270302 Build timestamp: 1314270302 URL: http://builder.virt-tools.org/index.html Module: libvirt Status: failed URL: http://builder.virt-tools.org/module-libvirt.html

1 0

[libvirt] Libvirt 0.9.4rc2 + qemu 0.15 : shutdown domain
by Radek Hladik 25 Aug '11

25 Aug '11

Hi again, while experimenting with new libvirt and qemu I discovered different behavior than with my previous versions. When I shutdown machine with shutdown (virsh) or virDomainShutdown (via php) the domain is shutdown but it ends up paused instead of destroyed. The OS is shut down, CPU probably stopped and I can connect to VNC. I would suppose its because of the new reboot feature and the -no-shutdown option for qemu. I am curious whether it is a bug or expected behavior. It would make perfect sense to be able to "semi"shutdown machine like this. But I was not able to reboot the machine from this state by any means. The best I could do was to resume (unpause) the CPU. Radek

1 0

[libvirt] Libvirt 0.9.4rc2 + qemu 0.15 VNC/TLS not working
by Radek Hladik 25 Aug '11

25 Aug '11

Hi all, I am trying new versions of software for my libvirt/qemu farm. I upgraded libvirt to 0.9.3 and I had problems with loading certificates for libvirt itself (probably GNUTLS related). Upgrade to 0.9.4rc2 solved the problem. Now I am trying to upgrade qemu (from 0.12.5) to 0.15. I compiled the SRPM from rawhide for Fedora 13 (OS on my farms) and I copied the binary to one farm, so I can choose qemu version by <emulator> element in guest XML. I had problem with booting off virtio disk, but upgrade of seabios to 0.6.2 solved it (I had to make a wrapper for qemu to be able to add -bios option though). But main issue that I am not able to solve is that VNC is not using TLS. I've found out these: * qemu 0.12.5 is working without problems * there is no error in libvirt or qemu machine log * If I copy the command from libvirt log, remove the network and monitor definition and start it under root, TLS works as expected * the vnc definition on command line is quite simple: -vnc 0.0.0.0:0,password,tls,x509=/etc/pki/libvirt/pki-vnc -k en-us I am thinking whether there is not a problem with monitor setting something after the machine starts. Libvirt does the same with password, so maybe it does something with TLS. Unfortunately I do not know whether there is any option how to debug the monitor libvirt<->qemu communication. And I have one other question. Is there any way how to interact directly with monitor? Qemu has new guest agent that seems to provide some nice functions and expose them via monitor and I would like to test it. Radek

3 3

[libvirt] Automated builds of libvirt
by Daniel P. Berrange 24 Aug '11

24 Aug '11

You may have seen references to the libvirt automated builder with various patches sent to the list. Previously this was running on one of my own private machines, but I've now got it in a dedicated virtual machine, and have it rsyncing its results to a publically visible site: http://builder.virt-tools.org/ It is currently configure to run every 4 hours to build latest GIT master for all the apps listed. It won't rebuild if the source code hasn't changed since the last build, unless one of the dependant modules has changed. If it finds a build failure, it will spam libvir-list with an ALERT message The build logs for the failure can be found on the libvirt status page http://builder.virt-tools.org/module-libvirt.html It will only alert on the first failed build. Until a later build attempt is successfull it will avoid sending further alerts. This should avoid any out of control spamming of the list. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [PATCH 2/3] qemu: When reserving all functions on a slot don't reserve function 0 on the next slot.
by Shradha Shah 24 Aug '11

24 Aug '11

Signed-off-by: Steve Hodgson <shodgson(a)solarflare.com> --- src/qemu/qemu_command.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index dbfc7d9..12adcc0 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -878,7 +878,7 @@ int qemuDomainPCIAddressReserveSlot(qemuDomainPCIAddressSetPtr addrs, { int function; - for (function = 0; function <= QEMU_PCI_ADDRESS_LAST_FUNCTION; function++) { + for (function = 0; function < QEMU_PCI_ADDRESS_LAST_FUNCTION; function++) { if (qemuDomainPCIAddressReserveFunction(addrs, slot, function) < 0) goto cleanup; } @@ -956,7 +956,7 @@ int qemuDomainPCIAddressReleaseSlot(qemuDomainPCIAddressSetPtr addrs, int slot) dev.addr.pci.bus = 0; dev.addr.pci.slot = slot; - for (*function = 0; *function <= QEMU_PCI_ADDRESS_LAST_FUNCTION; (*function)++) { + for (*function = 0; *function < QEMU_PCI_ADDRESS_LAST_FUNCTION; (*function)++) { addr = qemuPCIAddressAsString(&dev); if (!addr) return -1; -- 1.7.4.4

2 1

[libvirt] [PATCH 1/3] pci: Fix callers of pciDeviceListSteal() when there's more than one device
by Shradha Shah 24 Aug '11

24 Aug '11

pciDeviceListSteal(pcidevs, dev) removes dev from pcidevs reducing the length of pcidevs, so moving onto what was the next dev is wrong. Instead callers should pop entry 0 repeatedly until pcidevs is empty. Signed-off-by: Steve Hodgson <shodgson(a)solarflare.com> Signed-off-by: Shradha Shah <sshah(a)solarflare.com> --- src/qemu/qemu_hostdev.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index 7f5ad51..6f77717 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -74,7 +74,6 @@ int qemuUpdateActivePciHostdevs(struct qemud_driver *driver, virDomainDefPtr def) { pciDeviceList *pcidevs; - int i; int ret = -1; if (!def->nhostdevs) @@ -83,8 +82,8 @@ int qemuUpdateActivePciHostdevs(struct qemud_driver *driver, if (!(pcidevs = qemuGetPciHostDeviceList(def->hostdevs, def->nhostdevs))) return -1; - for (i = 0; i < pciDeviceListCount(pcidevs); i++) { - pciDevice *dev = pciDeviceListGet(pcidevs, i); + while (pciDeviceListCount(pcidevs) > 0) { + pciDevice *dev = pciDeviceListGet(pcidevs, 0); pciDeviceListSteal(pcidevs, dev); if (pciDeviceListAdd(driver->activePciHostdevs, dev) < 0) { pciFreeDevice(dev); @@ -152,8 +151,8 @@ int qemuPrepareHostdevPCIDevices(struct qemud_driver *driver, } /* Now steal all the devices from pcidevs */ - for (i = 0; i < pciDeviceListCount(pcidevs); i++) { - pciDevice *dev = pciDeviceListGet(pcidevs, i); + while (pciDeviceListCount(pcidevs) > 0) { + pciDevice *dev = pciDeviceListGet(pcidevs, 0); pciDeviceListSteal(pcidevs, dev); } @@ -164,8 +163,8 @@ inactivedevs: /* Only steal all the devices from driver->activePciHostdevs. We will * free them in pciDeviceListFree(). */ - for (i = 0; i < pciDeviceListCount(pcidevs); i++) { - pciDevice *dev = pciDeviceListGet(pcidevs, i); + while (pciDeviceListCount(pcidevs) > 0) { + pciDevice *dev = pciDeviceListGet(pcidevs, 0); pciDeviceListSteal(driver->activePciHostdevs, dev); } -- 1.7.4.4

2 1

[libvirt] [PATCH v2] daemon: Move TLS initialization to virInitialize
by Michal Privoznik 24 Aug '11

24 Aug '11

My previous patch 74c75671331d284e1f777f9692b72e9737520bf0 introduced a regression by removing TLS initialization from client. --- diff to v1: -remove virNetTLSDeinit() daemon/libvirtd.c | 2 -- src/libvirt.c | 3 +++ src/rpc/virnettlscontext.c | 8 -------- src/rpc/virnettlscontext.h | 1 - 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 5969a82..423c3d7 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -1516,7 +1516,6 @@ int main(int argc, char **argv) { virHookCall(VIR_HOOK_DRIVER_DAEMON, "-", VIR_HOOK_DAEMON_OP_START, 0, "start", NULL); - virNetTLSInit(); if (daemonSetupNetworking(srv, config, sock_file, sock_file_ro, ipsock, privileged) < 0) { @@ -1555,7 +1554,6 @@ cleanup: virNetServerProgramFree(qemuProgram); virNetServerClose(srv); virNetServerFree(srv); - virNetTLSDeinit(); if (statuswrite != -1) { if (ret != 0) { /* Tell parent of daemon what failed */ diff --git a/src/libvirt.c b/src/libvirt.c index c8af3e1..fdf3923 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -40,6 +40,7 @@ #include "memory.h" #include "configmake.h" #include "intprops.h" +#include "rpc/virnettlscontext.h" #ifndef WITH_DRIVER_MODULES # ifdef WITH_TEST @@ -409,6 +410,8 @@ virInitialize(void) virLogSetFromEnv(); + virNetTLSInit(); + VIR_DEBUG("register drivers"); #if HAVE_WINSOCK2_H diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index 8482eaf..e901b63 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -1410,11 +1410,3 @@ void virNetTLSInit(void) { gnutls_global_init(); } - -/* - * See virNetTLSInit - */ -void virNetTLSDeinit(void) -{ - gnutls_global_deinit(); -} diff --git a/src/rpc/virnettlscontext.h b/src/rpc/virnettlscontext.h index 99f31b9..fdfce6d 100644 --- a/src/rpc/virnettlscontext.h +++ b/src/rpc/virnettlscontext.h @@ -31,7 +31,6 @@ typedef virNetTLSSession *virNetTLSSessionPtr; void virNetTLSInit(void); -void virNetTLSDeinit(void); virNetTLSContextPtr virNetTLSContextNewServerPath(const char *pkipath, bool tryUserPkiPath, -- 1.7.3.4

2 1

[libvirt] [PATCH] util: only fchown newly created files in virFileOpenAs
by Laine Stump 24 Aug '11

24 Aug '11

virFileOpenAs takes desired uid:gid as arguments, and not only uses them for a fork/setuid/setgid when retrying failed open operations, but additionally always forces the opened file to be owned by the given uid:gid. One example of the problems this causes is that, when restoring a domain from a file that is owned by the qemu user, opening the file chowns it to root. if dynamic_ownership=1 this is coincidentally expected, but if dynamic_ownership=0, no existing file should ever have its ownership changed. This patch adds an extra check before calling fchown() - it only does it if O_CREAT was passed to virFileOpenAs() in the openflags. --- src/util/util.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index b278165..9556bdb 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -697,6 +697,7 @@ virFileOpenAsNoFork(const char *path, int openflags, mode_t mode, goto error; } if (((st.st_uid != uid) || (st.st_gid != gid)) + && (openflags & O_CREAT) && (fchown(fd, uid, gid) < 0)) { ret = -errno; virReportSystemError(errno, _("cannot chown '%s' to (%u, %u)"), -- 1.7.3.4

2 1

[libvirt] [PATCH 3/3] If VIR_MIGRATE_PERSIST_DEF is set then make the live configuration transient
by Shradha Shah 24 Aug '11

24 Aug '11

Make the migrated VM config as transient. Ensures transient hotplug operations do not persist past shutdown. Currently the running VM config is transient but that of a migrated VM is persistent. Signed-off-by: Steve Hodgson <shodgson(a)solarflare.com> Signed-off-by: Shradha Shah <sshah(a)solarflare.com> --- src/qemu/qemu_migration.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index a84faf6..aa458c3 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2509,6 +2509,9 @@ qemuMigrationFinish(struct qemud_driver *driver, goto endjob; } + /* Make the VM transient again to match qemuProcessStart */ + virDomainObjSetDefTransient(driver->caps, vm, true); + event = virDomainEventNewFromObj(vm, VIR_DOMAIN_EVENT_DEFINED, newVM ? -- 1.7.4.4

1 0

[libvirt] [PATCH] daemon: Move TLS initialization to virInitialize
by Michal Privoznik 24 Aug '11

24 Aug '11

My previous patch 74c75671331d284e1f777f9692b72e9737520bf0 introduced a regression by removing TLS initialization from client. --- daemon/libvirtd.c | 1 - src/libvirt.c | 3 +++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 5969a82..8f04a99 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -1516,7 +1516,6 @@ int main(int argc, char **argv) { virHookCall(VIR_HOOK_DRIVER_DAEMON, "-", VIR_HOOK_DAEMON_OP_START, 0, "start", NULL); - virNetTLSInit(); if (daemonSetupNetworking(srv, config, sock_file, sock_file_ro, ipsock, privileged) < 0) { diff --git a/src/libvirt.c b/src/libvirt.c index c8af3e1..fdf3923 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -40,6 +40,7 @@ #include "memory.h" #include "configmake.h" #include "intprops.h" +#include "rpc/virnettlscontext.h" #ifndef WITH_DRIVER_MODULES # ifdef WITH_TEST @@ -409,6 +410,8 @@ virInitialize(void) virLogSetFromEnv(); + virNetTLSInit(); + VIR_DEBUG("register drivers"); #if HAVE_WINSOCK2_H -- 1.7.3.4

3 4

[libvirt] [PATCHv2 00/26] revised round of snapshot patches
by Eric Blake 24 Aug '11

24 Aug '11

Many, but not all, of these patches have been previously submitted. I've rebased the series, and added in some additional patches throughout. It still isn't complete, and could probably use more testing after about patch 20 or so, but I'd like to get reviews on some of these to start getting these off the queue. Eric Blake (26): virsh: concatenate qemu-monitor-command arguments snapshot: better event when reverting qemu to paused snapshot snapshot: improve reverting to qemu paused snapshots snapshot: properly revert qemu to offline snapshots snapshot: one less point of failure in qemu snapshot: only pass snapshot to qemu command line when reverting snapshot: track current snapshot across restarts snapshot: allow deletion of just snapshot metadata snapshot: avoid crash when deleting qemu snapshots snapshot: simplify acting on just children snapshot: let qemu discard only snapshot metadata snapshot: identify which snapshots have metadata snapshot: identify qemu snapshot roots snapshot: prevent stranding snapshot data on domain destruction snapshot: refactor some qemu code snapshot: cache qemu-img location snapshot: support new undefine flags in qemu snapshot: teach virsh about new undefine flags snapshot: prevent migration from stranding snapshot data snapshot: refactor domain xml output snapshot: allow full domain xml in snapshot snapshot: update rng to support full domain in xml snapshot: store qemu domain details in xml snapshot: add 2 attributes to domain xml for disks snapshot: reject transient disks where code is not ready snapshot: wire up new qemu monitor command docs/formatdomain.html.in | 40 +- docs/formatsnapshot.html.in | 45 +- docs/schemas/Makefile.am | 1 + docs/schemas/domain.rng | 2555 +----------------------- docs/schemas/{domain.rng => domaincommon.rng} | 25 +- docs/schemas/domainsnapshot.rng | 19 +- include/libvirt/libvirt.h.in | 40 +- src/conf/domain_conf.c | 503 ++++-- src/conf/domain_conf.h | 41 +- src/esx/esx_driver.c | 35 +- src/libvirt.c | 91 +- src/libvirt_private.syms | 4 + src/libxl/libxl_conf.c | 5 + src/qemu/qemu_command.c | 12 +- src/qemu/qemu_conf.h | 1 + src/qemu/qemu_driver.c | 839 +++++--- src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_monitor.c | 24 + src/qemu/qemu_monitor.h | 4 + src/qemu/qemu_monitor_json.c | 33 + src/qemu/qemu_monitor_json.h | 4 + src/qemu/qemu_monitor_text.c | 40 + src/qemu/qemu_monitor_text.h | 4 + src/qemu/qemu_process.c | 10 +- src/qemu/qemu_process.h | 1 + src/vbox/vbox_tmpl.c | 40 +- src/xenxs/xen_sxpr.c | 5 + src/xenxs/xen_xm.c | 5 + tests/domainsnapshotxml2xmlout/full_domain.xml | 35 + tools/virsh.c | 419 ++++- tools/virsh.pod | 42 +- 31 files changed, 1780 insertions(+), 3144 deletions(-) copy docs/schemas/{domain.rng => domaincommon.rng} (99%) create mode 100644 tests/domainsnapshotxml2xmlout/full_domain.xml -- 1.7.4.4

3 71

[libvirt] RFC: managing "pci passthrough" usage of sriov VFs via a new network forward type
by Laine Stump 24 Aug '11

24 Aug '11

For some reason beyond my comprehension, the designers of SRIOV ethernet cards decided that the virtual functions (VF) of the card (each VF corresponds to an ethernet device, e.g. "eth10") should each be given a new+different+random MAC address each time the hardware is rebooted. Normally, udev keeps a persistent table that associates each known MAC address with an ethernet device name - any time an ethernet device with a previously-unknown MAC address is found, a new device name is allocated ("eth11", etc) and the newly found MAC address is associated with that device name. When an ethernet device is an SRIOV VF, though, udev doesn't persist the MAC address, so at each boot a device is found with a new MAC addres, but the device name from the previous boot is "unused" so magically the device ends up with the same name even though the MAC address has changed. When this device is assigned to a guest via PCI passthrough, though, the guest doesn't have the necessary information to realize that it's actually an SRIOV VF, so the guest's udev persists the MAC address - on the first boot of host+guest, the guest will see it has, e.g., mac address 11:22:33:44:55:66 and udev will add an entry to its persistent table remembering that 11:22:33:44:55:66="eth0". If the host reboots, though, the VF will get a new MAC address, and when the guest boots, it will see a new MAC address (e.g. "66:55:44:33:22:11") and think that there's a different card, so it will create a new device (and a new udev entry - 66:55:44:33:22:11="eth1"). This will repeat each time the host reboots, with the obvious undesired consequences. This makes using SRIOV VFs via PCI passthrough very unpalatable. The problem can be solved by setting the MAC address of the ethernet device prior to assigning it to the guest, but of course the <hostdev> element used to assign PCI devices to guests has no place to specify a MAC address (and I'm not sure it would be appropriate to add something that function-specific to <hostdev>). Dave Allan and I have discussed a different possible method of eliminating this problem (using a new forward type for libvirt networks) that I've outlined below. Please let me know what you think - is this reasonable in general? If so, what about the details? If not, any counter-proposals to solve the problem? Providing Predictable/Configurable MAC Addresses for SRIOV VFs used via PCI Passthrough: 1) <network> will have a new forward type='hardware'. When forward type='hardware', a pool of ethernet interfaces can be specified, just as for the forward types "bridge", "vepa", "private", and "passthrough". At this point, that's the only thing that I've determined is needed in the network definition. 2) In a domain's <interface> definition, when type='network', if the network has a forward type='hardware', the domain code will request an unused ethernet device from the network driver, then do the following: 3) save the ethernet device name in interface/actual so that it can be easily retrieved if libvirtd is restarted 4) Set the MAC address of the given ethernet device according to the domain <interface> config. 5) Use the NodeDevice API to learn all the necessary PCI domain/slot/bus/function and add a (non-persisting) <hostdev> element to the guest's config before starting it up. 6) When the guest is eventually destroyed, the ethernet device will be free'd back to the network pool for use by another guest. One problem this doesn't solve is that when a guest is migrated, the PCI info for the allocated ethernet device on the destination host will almost surely be different. Is there any provision for dealing with this in the device passthrough code? If not, then migration will still not be possible. Although I realize that many people are predisposed to not like the idea of PCI passthrough of ethernet devices (including me), it seems that it's going to be used, so we may as well provide the management tools to do it in a sane manner.

4 7

[libvirt] [PATCH] libvirt: log all flags parameters
by Eric Blake 24 Aug '11

24 Aug '11

I was testing a virsh patch, and wanted to see if I had passed the flags I thought. But with LIBVIRT_DEBUG in the environment, I just saw: 14:24:52.359: 15022: debug : virDomainSnapshotNum:15586 : dom=0xc9c180, (VM: name=rhel_6-64, uuid=48f8e8e7-e14f-0e14-02f0-ce71997bdcab), including a trailing space. This fixes the issues. * src/libvirt.c: Log flag parameters, even if currently unused. (VIR_DOMAIN_DEBUG_0): Drop trailing comma in log. (VIR_DOMAIN_DEBUG_1): Split guts into... (VIR_DOMAIN_DEBUG_2): ...new macro. --- src/libvirt.c | 58 +++++++++++++++++++++++++++++++------------------------- 1 files changed, 32 insertions(+), 26 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index c8af3e1..a1197e0 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -333,10 +333,14 @@ static struct gcry_thread_cbs virTLSThreadImpl = { /* Internal use only, when VIR_DOMAIN_DEBUG has one argument. */ #define VIR_DOMAIN_DEBUG_0(dom) \ - VIR_DOMAIN_DEBUG_1(dom, "%s", "") + VIR_DOMAIN_DEBUG_2(dom, "%s", "") /* Internal use only, when VIR_DOMAIN_DEBUG has three or more arguments. */ -#define VIR_DOMAIN_DEBUG_1(dom, fmt, ...) \ +#define VIR_DOMAIN_DEBUG_1(dom, fmt, ...) \ + VIR_DOMAIN_DEBUG_2(dom, ", " fmt, __VA_ARGS__) + +/* Internal use only, with final format. */ +#define VIR_DOMAIN_DEBUG_2(dom, fmt, ...) \ do { \ char _uuidstr[VIR_UUID_STRING_BUFLEN]; \ const char *_domname = NULL; \ @@ -348,7 +352,7 @@ static struct gcry_thread_cbs virTLSThreadImpl = { _domname = (dom)->name; \ } \ \ - VIR_DEBUG("dom=%p, (VM: name=%s, uuid=%s), " fmt, \ + VIR_DEBUG("dom=%p, (VM: name=%s, uuid=%s)" fmt, \ dom, NULLSTR(_domname), _uuidstr, __VA_ARGS__); \ } while (0) @@ -1615,7 +1619,7 @@ error: char * virConnectGetSysinfo (virConnectPtr conn, unsigned int flags) { - VIR_DEBUG("conn=%p", conn); + VIR_DEBUG("conn=%p, flags=%x", conn, flags); virResetLastError(); @@ -2098,7 +2102,7 @@ virDomainDestroyFlags(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain); + VIR_DOMAIN_DEBUG(domain, "flags=%x", flags); virResetLastError(); @@ -2386,7 +2390,7 @@ virDomainSaveFlags(virDomainPtr domain, const char *to, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "to=%s dxml=%s flags=%x", + VIR_DOMAIN_DEBUG(domain, "to=%s, dxml=%s, flags=%x", to, NULLSTR(dxml), flags); virResetLastError(); @@ -2816,7 +2820,7 @@ virDomainScreenshot(virDomainPtr domain, unsigned int screen, unsigned int flags) { - VIR_DOMAIN_DEBUG(domain, "stream=%p flags=%x", stream, flags); + VIR_DOMAIN_DEBUG(domain, "stream=%p, flags=%x", stream, flags); virResetLastError(); @@ -3292,7 +3296,7 @@ virDomainSetMemoryFlags(virDomainPtr domain, unsigned long memory, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "memory=%lu flags=%x", memory, flags); + VIR_DOMAIN_DEBUG(domain, "memory=%lu, flags=%x", memory, flags); virResetLastError(); @@ -3635,7 +3639,8 @@ virDomainGetState(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "state=%p, reason=%p", state, reason); + VIR_DOMAIN_DEBUG(domain, "state=%p, reason=%p, flags=%x", + state, reason, flags); virResetLastError(); @@ -3682,7 +3687,7 @@ virDomainGetControlInfo(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "info=%p", info); + VIR_DOMAIN_DEBUG(domain, "info=%p, flags=%x", info, flags); virResetLastError(); @@ -3791,7 +3796,7 @@ char *virConnectDomainXMLFromNative(virConnectPtr conn, const char *nativeConfig, unsigned int flags) { - VIR_DEBUG("conn=%p, format=%s config=%s flags=%x", + VIR_DEBUG("conn=%p, format=%s, config=%s, flags=%x", conn, nativeFormat, nativeConfig, flags); virResetLastError(); @@ -3844,7 +3849,7 @@ char *virConnectDomainXMLToNative(virConnectPtr conn, const char *domainXml, unsigned int flags) { - VIR_DEBUG("conn=%p, format=%s xml=%s flags=%x", + VIR_DEBUG("conn=%p, format=%s, xml=%s, flags=%x", conn, nativeFormat, domainXml, flags); virResetLastError(); @@ -3913,7 +3918,7 @@ virDomainMigrateVersion1 (virDomainPtr domain, int cookielen = 0, ret; virDomainInfo info; VIR_DOMAIN_DEBUG(domain, - "dconn=%p flags=%lx, dname=%s, uri=%s, bandwidth=%lu", + "dconn=%p, flags=%lx, dname=%s, uri=%s, bandwidth=%lu", dconn, flags, NULLSTR(dname), NULLSTR(uri), bandwidth); ret = virDomainGetInfo (domain, &info); @@ -4006,7 +4011,7 @@ virDomainMigrateVersion2 (virDomainPtr domain, virErrorPtr orig_err = NULL; int cancelled; VIR_DOMAIN_DEBUG(domain, - "dconn=%p flags=%lx, dname=%s, uri=%s, bandwidth=%lu", + "dconn=%p, flags=%lx, dname=%s, uri=%s, bandwidth=%lu", dconn, flags, NULLSTR(dname), NULLSTR(uri), bandwidth); /* Prepare the migration. @@ -6458,7 +6463,8 @@ int virDomainMemoryStats (virDomainPtr dom, virDomainMemoryStatPtr stats, virConnectPtr conn; unsigned long nr_stats_ret = 0; - VIR_DOMAIN_DEBUG(dom, "stats=%p, nr_stats=%u", stats, nr_stats); + VIR_DOMAIN_DEBUG(dom, "stats=%p, nr_stats=%u, flags=%x", + stats, nr_stats, flags); virResetLastError(); @@ -6539,8 +6545,8 @@ virDomainBlockPeek (virDomainPtr dom, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(dom, "path=%s, offset=%lld, size=%zi, buffer=%p", - path, offset, size, buffer); + VIR_DOMAIN_DEBUG(dom, "path=%s, offset=%lld, size=%zi, buffer=%p, flags=%x", + path, offset, size, buffer, flags); virResetLastError(); @@ -6712,7 +6718,7 @@ virDomainGetBlockInfo(virDomainPtr domain, const char *path, virDomainBlockInfoP { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "info=%p flags=%x", info, flags); + VIR_DOMAIN_DEBUG(domain, "info=%p, flags=%x", info, flags); virResetLastError(); @@ -10343,7 +10349,7 @@ virStoragePoolCreateXML(virConnectPtr conn, const char *xmlDesc, unsigned int flags) { - VIR_DEBUG("conn=%p, xmlDesc=%s", conn, xmlDesc); + VIR_DEBUG("conn=%p, xmlDesc=%s, flags=%x", conn, xmlDesc, flags); virResetLastError(); @@ -10392,7 +10398,7 @@ virStoragePoolDefineXML(virConnectPtr conn, const char *xml, unsigned int flags) { - VIR_DEBUG("conn=%p, xml=%s", conn, xml); + VIR_DEBUG("conn=%p, xml=%s, flags=%x", conn, xml, flags); virResetLastError(); @@ -10527,7 +10533,7 @@ virStoragePoolCreate(virStoragePoolPtr pool, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("pool=%p", pool); + VIR_DEBUG("pool=%p, flags=%x", pool, flags); virResetLastError(); @@ -10731,7 +10737,7 @@ virStoragePoolRefresh(virStoragePoolPtr pool, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("pool=%p flags=%x", pool, flags); + VIR_DEBUG("pool=%p, flags=%x", pool, flags); virResetLastError(); @@ -11491,7 +11497,7 @@ virStorageVolDownload(virStorageVolPtr vol, unsigned long long length, unsigned int flags) { - VIR_DEBUG("vol=%p stream=%p offset=%llu length=%llu flags=%x", + VIR_DEBUG("vol=%p, stream=%p, offset=%llu, length=%llu, flags=%x", vol, stream, offset, length, flags); virResetLastError(); @@ -11562,7 +11568,7 @@ virStorageVolUpload(virStorageVolPtr vol, unsigned long long length, unsigned int flags) { - VIR_DEBUG("vol=%p stream=%p offset=%llu length=%llu flags=%x", + VIR_DEBUG("vol=%p, stream=%p, offset=%llu, length=%llu, flags=%x", vol, stream, offset, length, flags); virResetLastError(); @@ -12043,7 +12049,7 @@ error: */ char *virNodeDeviceGetXMLDesc(virNodeDevicePtr dev, unsigned int flags) { - VIR_DEBUG("dev=%p, conn=%p", dev, dev ? dev->conn : NULL); + VIR_DEBUG("dev=%p, conn=%p, flags=%x", dev, dev ? dev->conn : NULL, flags); virResetLastError(); @@ -15537,7 +15543,7 @@ virDomainSnapshotNum(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain); + VIR_DOMAIN_DEBUG(domain, "flags=%x", flags); virResetLastError(); -- 1.7.4.4

2 2

Re: [libvirt] [virt-tools-list] [PATCH] virt-manager: Show if the shut off vm has a saved image
by Eric Blake 24 Aug '11

24 Aug '11

[adding libvirt, for a virsh idea] On 08/01/2011 02:19 PM, Cole Robinson wrote: > On 07/30/2011 04:15 PM, Miklos Vajna wrote: >> Hi, >> >> So far in virt-manager one had to click on a shut off vm in the >> "Shutoff" state to see if it has a saved image: once the item is >> selected then the "play" icon will be "Run" or "Restore". This means >> that in case one has a lot of VMs, it's hard to get an overview of what >> VM has a saved image and what not. >> >> The attached patch changes the "Shutoff" status message to "Saved" in >> case the vm has a saved image. >> > > Good idea, I've pushed your patch: Awesome idea; in fact, I think 'virsh list --all' should probably also be enhanced to do something similar (show "saved" instead of "shutoff", and perhaps requiring a new --managed-save flag so as not to break back-compat). Note that virsh 0.9.4 is gaining 'virsh dominfo' as a way of querying whether a managed save image exists (previously virsh had no way to expose that information), but 'virsh dominfo' on a single domain at a time is much slower than doing it in bulk in 'virsh list'. Alas, we've missed the deadline for getting a patch like that into libvirt 0.9.4. -- Eric Blake eblake(a)redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org

3 5

[libvirt] [PATCH] qemu: Allow graceful domain destroy
by Michal Privoznik 24 Aug '11

24 Aug '11

This patch introduces support for domain destroying via 'quit' monitor command which gives qemu time to flush caches and therefore prevent disks corruption. However, qemu can be unresponsive and to prevent waiting indefinitely, execute command in a separate thread and wait reasonable time (QEMU_QUIT_WAIT_SECONDS) on a condition. If we hit timeout, qemu is qemuProcessKill'ed which causes monitor close and therefore also thread being terminable. The synchronization between qemu driver and monitor-quit thread is done through mutex and condition. However, this alone is not enough. If a condition is signalized but without anybody listening signal is lost. To prevent this a boolean variable is used that is set iff nobody is listening but condition would be signalized, or iff driver is waiting on given condition. --- include/libvirt/libvirt.h.in | 11 ++- src/qemu/qemu_driver.c | 132 +++++++++++++++++++++++++++++++++++++++-- src/qemu/qemu_monitor.c | 13 ++++ src/qemu/qemu_monitor.h | 2 + src/qemu/qemu_monitor_json.c | 22 +++++++ src/qemu/qemu_monitor_json.h | 1 + src/qemu/qemu_monitor_text.c | 20 ++++++ src/qemu/qemu_monitor_text.h | 1 + tools/virsh.c | 8 ++- 9 files changed, 198 insertions(+), 12 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index aa29fb6..fa98b8d 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -919,10 +919,13 @@ virConnectPtr virDomainGetConnect (virDomainPtr domain); * Domain creation and destruction */ -/* - * typedef enum { - * } virDomainDestroyFlagsValues; - */ + +typedef enum { + VIR_DOMAIN_DESTROY_MONITOR = 1 << 0, /* In hypervisors supporting this, + try to send 'quit' command prior + to killing hypervisor */ +} virDomainDestroyFlagsValues; + virDomainPtr virDomainCreateXML (virConnectPtr conn, const char *xmlDesc, unsigned int flags); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 421a98e..6585cb4 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1564,6 +1564,42 @@ cleanup: return ret; } +struct qemuDomainDestroyHelperData { + struct qemud_driver *driver; + virDomainObjPtr vm; + qemuDomainObjPrivatePtr priv; + virMutex lock; + virCond cond; + bool guard; +}; + +static void +qemuDomainDestroyHelper(void *opaque) +{ + struct qemuDomainDestroyHelperData *data = opaque; + struct qemud_driver *driver = data->driver; + virDomainObjPtr vm = data->vm; + qemuDomainObjPrivatePtr priv = data->priv; + + /* Job was already obtained by caller */ + qemuDomainObjEnterMonitorWithDriver(driver, vm); + qemuMonitorQuit(priv->mon); + qemuDomainObjExitMonitorWithDriver(driver, vm); + + /* To avoid loosing signal, we need to remember + * we tried to send one, but nobody was waiting + * for it. + */ + virMutexLock(&data->lock); + if (data->guard) { + virCondSignal(&data->cond); + } else { + data->guard = true; + } + virMutexUnlock(&data->lock); +} + +#define QEMU_QUIT_WAIT_SECONDS 5 static int qemuDomainDestroyFlags(virDomainPtr dom, @@ -1574,8 +1610,13 @@ qemuDomainDestroyFlags(virDomainPtr dom, int ret = -1; virDomainEventPtr event = NULL; qemuDomainObjPrivatePtr priv; + bool use_thread = false; + bool use_kill = false; + virThread destroy_thread; + struct qemuDomainDestroyHelperData data; + unsigned long long then; - virCheckFlags(0, -1); + virCheckFlags(VIR_DOMAIN_DESTROY_MONITOR, -1); qemuDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, dom->uuid); @@ -1590,12 +1631,14 @@ qemuDomainDestroyFlags(virDomainPtr dom, priv = vm->privateData; priv->fakeReboot = false; - /* Although qemuProcessStop does this already, there may - * be an outstanding job active. We want to make sure we - * can kill the process even if a job is active. Killing - * it now means the job will be released - */ - qemuProcessKill(vm); + if (!flags) { + /* Although qemuProcessStop does this already, there may + * be an outstanding job active. We want to make sure we + * can kill the process even if a job is active. Killing + * it now means the job will be released + */ + qemuProcessKill(vm); + } if (qemuDomainObjBeginJobWithDriver(driver, vm, QEMU_JOB_DESTROY) < 0) goto cleanup; @@ -1606,6 +1649,70 @@ qemuDomainDestroyFlags(virDomainPtr dom, goto endjob; } + if (flags & VIR_DOMAIN_DESTROY_MONITOR) { + /* Try to shutdown domain gracefully. + * Send 'quit' to qemu. However, qemu can be unresponsive. + * Therefore create a separate thread in which we execute + * that monitor comand. Wait max QEMU_QUIT_WAIT_SECONDS. + */ + if (virMutexInit(&data.lock) < 0) { + virReportOOMError(); + goto endjob; + } + + if (virCondInit(&data.cond) < 0) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("cannot initialize thread condition")); + virMutexDestroy(&data.lock); + goto endjob; + } + + data.driver = driver; + data.vm = vm; + data.priv = priv; + data.guard = false; + + if (virThreadCreate(&destroy_thread, true, + qemuDomainDestroyHelper, &data) < 0) { + virReportSystemError(errno, "%s", + _("unable to create destroy thread")); + ignore_value(virCondDestroy(&data.cond)); + virMutexDestroy(&data.lock); + goto endjob; + } + use_thread = true; + + if (virTimeMs(&then) < 0) + goto endjob; + + then += QEMU_QUIT_WAIT_SECONDS * 1000; + + /* How synchronization with destroy thread works: + * Basically wait on data.cond. But because conditions + * does not 'remember' that they have been signalized + * data.guard is used. Practically, data.guard says + * to destroy thread if we are waiting on condition + * and to us whether we should even try. + */ + virMutexLock(&data.lock); + if (!data.guard) { + data.guard = true; + if (virCondWaitUntil(&data.cond, &data.lock, then) < 0) { + if (errno == ETIMEDOUT) { + use_kill = true; + data.guard = false; + } else { + virMutexUnlock(&data.lock); + goto endjob; + } + } + } + virMutexUnlock(&data.lock); + + if (use_kill) + qemuProcessKill(vm); + } + qemuProcessStop(driver, vm, 0, VIR_DOMAIN_SHUTOFF_DESTROYED); event = virDomainEventNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, @@ -1626,6 +1733,17 @@ endjob: vm = NULL; cleanup: + if (use_thread) { + virMutexLock(&data.lock); + if (!data.guard) { + data.guard = true; + ignore_value(virCondWait(&data.cond, &data.lock)); + } + virMutexUnlock(&data.lock); + ignore_value(virCondDestroy(&data.cond)); + virMutexDestroy(&data.lock); + virThreadJoin(&destroy_thread); + } if (vm) virDomainObjUnlock(vm); if (event) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index db6107c..41b9c5c 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2475,3 +2475,16 @@ int qemuMonitorBlockJob(qemuMonitorPtr mon, ret = qemuMonitorTextBlockJob(mon, device, bandwidth, info, mode); return ret; } + +int qemuMonitorQuit(qemuMonitorPtr mon) +{ + int ret; + + VIR_DEBUG("mon=%p", mon); + + if (mon->json) + ret = qemuMonitorJSONQuit(mon); + else + ret = qemuMonitorTextQuit(mon); + return ret; +} diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index f241c9e..3fe6bb9 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -475,6 +475,8 @@ int qemuMonitorBlockJob(qemuMonitorPtr mon, virDomainBlockJobInfoPtr info, int mode); +int qemuMonitorQuit(qemuMonitorPtr mon); + /** * When running two dd process and using <> redirection, we need a * shell that will not truncate files. These two strings serve that diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 7adfb26..1f078cd 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2956,3 +2956,25 @@ int qemuMonitorJSONBlockJob(qemuMonitorPtr mon, virJSONValueFree(reply); return ret; } + + +int qemuMonitorJSONQuit(qemuMonitorPtr mon) +{ + int ret = -1; + virJSONValuePtr cmd = NULL; + virJSONValuePtr reply = NULL; + + cmd = qemuMonitorJSONMakeCommand("quit", NULL); + + if (!cmd) + return -1; + + ret =qemuMonitorJSONCommand(mon, cmd, &reply); + + if (ret == 0) + ret = qemuMonitorJSONCheckError(cmd, reply); + + virJSONValueFree(cmd); + virJSONValueFree(reply); + return ret; +} diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index 9512793..2a7df76 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -231,4 +231,5 @@ int qemuMonitorJSONBlockJob(qemuMonitorPtr mon, virDomainBlockJobInfoPtr info, int mode); +int qemuMonitorJSONQuit(qemuMonitorPtr mon); #endif /* QEMU_MONITOR_JSON_H */ diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 335e39e..19c2690 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -3046,3 +3046,23 @@ cleanup: VIR_FREE(reply); return ret; } + + +int qemuMonitorTextQuit(qemuMonitorPtr mon) +{ + const char *cmd = "quit"; + char *reply = NULL; + int ret = -1; + + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("cannot run monitor command")); + goto cleanup; + } + + ret = 0; + +cleanup: + VIR_FREE(reply); + return ret; +} diff --git a/src/qemu/qemu_monitor_text.h b/src/qemu/qemu_monitor_text.h index b250738..9ade938 100644 --- a/src/qemu/qemu_monitor_text.h +++ b/src/qemu/qemu_monitor_text.h @@ -224,4 +224,5 @@ int qemuMonitorTextBlockJob(qemuMonitorPtr mon, virDomainBlockJobInfoPtr info, int mode); +int qemuMonitorTextQuit(qemuMonitorPtr mon); #endif /* QEMU_MONITOR_TEXT_H */ diff --git a/tools/virsh.c b/tools/virsh.c index f1eb4ca..0c18d8b 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2565,6 +2565,7 @@ static const vshCmdInfo info_destroy[] = { static const vshCmdOptDef opts_destroy[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, + {"monitor", VSH_OT_BOOL, 0, N_("try graceful destroy via monitor first")}, {NULL, 0, 0, NULL} }; @@ -2574,6 +2575,7 @@ cmdDestroy(vshControl *ctl, const vshCmd *cmd) virDomainPtr dom; bool ret = true; const char *name; + int flags = 0; if (!vshConnectionUsability(ctl, ctl->conn)) return false; @@ -2581,7 +2583,11 @@ cmdDestroy(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, &name))) return false; - if (virDomainDestroy(dom) == 0) { + if (vshCommandOptBool(cmd, "monitor")) + flags |= VIR_DOMAIN_DESTROY_MONITOR; + + if ((!flags && virDomainDestroy(dom) == 0) || + virDomainDestroyFlags(dom, flags) == 0) { vshPrint(ctl, _("Domain %s destroyed\n"), name); } else { vshError(ctl, _("Failed to destroy domain %s"), name); -- 1.7.3.4

5 14