- Devel - libvirt List Archives

[libvirt] [PATCH] Use correct error code in public VolCreateXML
by Cole Robinson 05 May '09

05 May '09

The attached patch fixes a use of an incorrect error code in libvirt.c VolCreateXML. Thanks, Cole

2 2

[libvirt] [PATCH 0/1] NPIV node device backend
by David Allan 05 May '09

05 May '09

Here is an initial implementation of the NPIV support backend using the node device API. It only implements create. Destroy should be fairly straightforward, but I want to get the patch out to the list for comment while I continue to work. The code currently requires the device name and host number to be specified in the XML, but it does not use those values. I will clean that up. The user will not be able to specify either of those values, as they are created by the system when it discovers the newly created device. <device> <name>foo</name> <parent>pci_10df_fe00_scsi_host_0</parent> <capability type='scsi_host'> <host>99999</host> <capability type='fc_host'> <wwnn>c0001b0000000018</wwnn> <wwpn>c0001b1000000018</wwpn> </capability> </capability> </device>

2 2

[libvirt] Patch: Fix build with -Werror=format-security cflag
by Frederik Himpe 05 May '09

05 May '09

This patch is needed to build libvirt with -Werror=format-security gcc cflag, which is used by default on Mandriva diff -ur libvirt-0.6.3.orig/src/virsh.c libvirt-0.6.3/src/virsh.c --- libvirt-0.6.3.orig/src/virsh.c 2009-04-15 21:43:26.000000000 +0200 +++ libvirt-0.6.3/src/virsh.c 2009-05-02 13:56:11.000000000 +0200 @@ -4463,7 +4463,7 @@ } /* Print this device */ - vshPrint(ctl, indentBuf); + vshPrint(ctl, "%s", indentBuf); vshPrint(ctl, "%s\n", devices[devid]); @@ -4487,7 +4487,7 @@ /* If there is a child device, then print another blank line */ if (nextlastdev != -1) { - vshPrint(ctl, indentBuf); + vshPrint(ctl, "%s", indentBuf); vshPrint(ctl, " |\n"); } @@ -4511,7 +4511,7 @@ /* If there was no child device, and we're the last in * a list of devices, then print another blank line */ if (nextlastdev == -1 && devid == lastdev) { - vshPrint(ctl, indentBuf); + vshPrint(ctl, "%s", indentBuf); vshPrint(ctl, "\n"); } }

2 1

[libvirt] [PATCH 0/7] Improve QEMU process startup error reporting
by Cole Robinson 04 May '09

04 May '09

Error reporting for failed QEMU processes isn't too great at the moment. A couple cases I have hit: - Trying to start a VM with a cdrom pointing to a nonexistent file. The svirt hook function choked on this and indicated as much in the domain log, but I still had to wait for the pidfile timeout (10 seconds), and the only error reported was 'Domain did not show up'. - QEMU dies quickly at startup. Happened with the pulse audio issue, or if we build cli args incorrectly. The reporting here varies: if QEMU dies before writing out the pidfile, the above case applies. If the pidfile is written, we timeout in ReadLogOutput, and it's hit or miss whether we even report the logfile output to the user. The following patches improve the above cases by ensuring we never have to wait for a timeout, and that the logfile output is always reported in the error message. Cole Robinson (7): Add documentation for __virExec and virExec virExec: Delay daemonizing as long as possible. Add helper function virExecDaemonize Report qemu log data if we fail to daemonize the process. Add pidfile argument to __virExec Check that QEMU is still alive while reading startup output. Don't throw away QEMU startup errors when migrating. src/libvirt_private.syms | 2 +- src/proxy_internal.c | 16 +-- src/qemu_conf.c | 7 - src/qemu_driver.c | 105 +++++++---- src/remote_internal.c | 15 +-- src/uml_driver.c | 11 +- src/util.c | 186 +++++++++++++++----- src/util.h | 15 ++- .../qemuxml2argvdata/qemuxml2argv-boot-cdrom.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-boot-floppy.args | 2 +- .../qemuxml2argv-boot-network.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-bootloader.args | 2 +- .../qemuxml2argv-clock-localtime.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args | 2 +- .../qemuxml2argv-console-compat.args | 2 +- .../qemuxml2argv-disk-cdrom-empty.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-cdrom.args | 2 +- .../qemuxml2argv-disk-drive-boot-cdrom.args | 2 +- .../qemuxml2argv-disk-drive-boot-disk.args | 2 +- .../qemuxml2argv-disk-drive-cache-v1-none.args | 2 +- .../qemuxml2argv-disk-drive-cache-v1-wb.args | 2 +- .../qemuxml2argv-disk-drive-cache-v1-wt.args | 2 +- .../qemuxml2argv-disk-drive-cache-v2-none.args | 2 +- .../qemuxml2argv-disk-drive-cache-v2-wb.args | 2 +- .../qemuxml2argv-disk-drive-cache-v2-wt.args | 2 +- .../qemuxml2argv-disk-drive-fmt-qcow.args | 2 +- .../qemuxml2argv-disk-drive-shared.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-floppy.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-many.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-virtio.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args | 2 +- .../qemuxml2argv-graphics-sdl-fullscreen.args | 2 +- .../qemuxml2argv-graphics-sdl.args | 2 +- .../qemuxml2argv-graphics-vnc-sasl.args | 2 +- .../qemuxml2argv-graphics-vnc-tls.args | 2 +- .../qemuxml2argv-graphics-vnc.args | 2 +- .../qemuxml2argv-hostdev-pci-address.args | 2 +- .../qemuxml2argv-hostdev-usb-address.args | 2 +- .../qemuxml2argv-hostdev-usb-product.args | 2 +- .../qemuxml2argv-input-usbmouse.args | 2 +- .../qemuxml2argv-input-usbtablet.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-input-xen.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-migrate.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-minimal.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args | 2 +- .../qemuxml2argv-misc-no-reboot.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args | 2 +- .../qemuxml2argv-net-eth-ifname.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-net-eth.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-net-user.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-net-virtio.args | 2 +- .../qemuxml2argv-parallel-tcp.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-restore-v1.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-restore-v2.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-serial-dev.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-serial-file.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-serial-many.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-serial-pty.args | 2 +- .../qemuxml2argv-serial-tcp-telnet.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-serial-tcp.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-serial-udp.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-serial-unix.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-sound.args | 2 +- 65 files changed, 288 insertions(+), 183 deletions(-)

2 18

[libvirt] Virtio Disk Drivers and Windows
by Aaron Clausen 04 May '09

04 May '09

I've imported a Windows Server 2003 as a guest using the IDE drivers. When I try to use the virtio drivers instead, Windows just blue screens. Am I stuck with the IDE drivers under Windows? -- Aaron Clausen mightymartianca(a)gmail.com

1 1

[libvirt] [PATCH] Fix a comment typo in storage_backend_fs.c
by Cole Robinson 04 May '09

04 May '09

This comment hid from my attempt to 'grep FILE_BOCHS', which is the actual name of the constant. Thanks, Cole

2 2

[libvirt] VM image running on 2 Intels
by Zvi Dubitzky 30 Apr '09

30 Apr '09

I have 2 types of hosts as below ( each is 64 bits processor . number of processor is not equal . First has 1G memory . the second 3 G memor): IBM blade HS21 with Intel Xeon L5320 (1,86Ghz) . 8 processors (blade) IBM desktop with Intel(R) Core(TM)2 Duo CPU E6550 @ 2.33GHz I have generated an Ubuntu 8.10 client image on the first . It runs smooth on the first via virsh . It runs ok on the second but not well via virsh ( define + start <xml> ). just by a direct : sudo qemu-system-x86_64 call . If I generate a similar image on the second host (using same .iso Ubuntu CD image) then it runs on the first and second host smoothly via virsh (define + start <xml>) Is there an explanation for that ? Also : please comment if the below qemu-system-x86_64 explicit image start of a VM and the same done by a virsh command by : define + start <.xml> are equivalent and if not what change should I make to the .xml file (below) 1. sudo qemu-system-x86_64 -hda <path/to/image/file> -m 512 -net nic, model=e1000 -nic tap 2. The xml file thanks Zvi Dubitzky Virtualization and System Architecture Email:dubi@il.ibm.com IBM Haifa Research Laboratory Phone: +972-4-8296182 Haifa, 31905, ISRAEL

2 1

[libvirt] [PATCH 1/2] support for multiple graphics devices
by Pritesh Kothari 30 Apr '09

30 Apr '09

Hi All, I have added support for multiple graphics devices, the patches are as below. I have checked them against current cvs head and works fine PATCH 1/2: contains changes in libvirt for multiple graphics devices PATCH 2/2: contains corresponding changes in qemu driver. Regards, Pritesh

2 1

[libvirt] libvirt will create two guest with the same name, but with different UUIDs
by Kaitlin Rupert 30 Apr '09

30 Apr '09

Hi, libvirt allows you to create two guests with same name, but with different UUIDs. This causes some problems in the reporting though. virsh will report that a guest is running (when it isn't). This also causes some confusion for the dominfo call - virsh will only return info for one of the guests. I've seen similar issues when using the virDomainLookupByName() API. I suspect all the issues are the same bug, but I haven't had a chance to track down where. Thanks! # virsh version Compiled against library: libvir 0.6.3 Using library: libvir 0.6.3 Using API: QEMU 0.6.3 Running hypervisor: QEMU 0.9.1 # virsh list --all Id Name State ---------------------------------- 109 demo2 running - domU1 shut off - test_domain shut off # virsh dumpxml demo2 <domain type='kvm' id='109'> <name>demo2</name> <uuid>4dea24b3-1d52-d8f3-2516-782e98a23fa0</uuid> <memory>131072</memory> <currentMemory>131072</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> <on_poweroff>restart</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> <emulator>/usr/bin/qemu-kvm</emulator> <disk type='file' device='disk'> <source file='/tmp/default-kvm-dimage'/> <target dev='hda' bus='ide'/> </disk> <interface type='user'> <mac address='24:42:53:21:52:45'/> </interface> <input type='mouse' bus='ps2'/> <graphics type='vnc' port='5900' autoport='yes'/> </devices> </domain> # cat demo2 <domain type='kvm' id='55'> <name>demo2</name> <uuid>4dea24b3-1d52-d8f3-2516-782e98a23fa3</uuid> <memory>131072</memory> <currentMemory>131072</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> <on_poweroff>restart</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> <emulator>/usr/bin/qemu-kvm</emulator> <disk type='file' device='disk'> <source file='/tmp/default-kvm-dimage'/> <target dev='hda' bus='ide'/> </disk> <interface type='user'> <mac address='24:42:53:21:52:45'/> </interface> <input type='mouse' bus='ps2'/> <graphics type='vnc' port='5902' autoport='yes'/> </devices> </domain> # virsh define demo2 Domain demo2 defined from demo2 # virsh list --all Id Name State ---------------------------------- 109 demo2 running - demo2 running - domU1 shut off - test_domain shut off # ps -ef | grep qemu root 11464 1 96 09:04 ? 00:02:12 /usr/bin/qemu-kvm -S -M pc -cpu qemu32 -m 128 -smp 1 -name demo2 -uuid 4dea24b3-1d52-d8f3-2516-782e98a23fa0 -monitor pty -pidfile /var/run/libvirt/qemu//demo2.pid -no-acpi -boot c -drive file=/tmp/default-kvm-dimage,if=ide,index=0,boot=on -net nic,macaddr=24:42:53:21:52:45,vlan=0 -net user,vlan=0 -serial none -parallel none -usb -vnc 127.0.0.1:0 root 11483 27407 0 09:06 pts/1 00:00:00 grep qemu # -- Kaitlin Rupert IBM Linux Technology Center kaitlin(a)linux.vnet.ibm.com

2 1

[libvirt] PATCH: Add a new error code for invalid operations
by Daniel P. Berrange 29 Apr '09

29 Apr '09

A number of operations are only valid when the corresponding object is in a particular state. eg, you can only suspend a domain, if it is currently running. We don't have a very consistent way of reporting this problem across drivers, so this patch introduces a new error code for this situation called VIR_ERR_INVALID_OPERATION. This code is intended to be used if the operation is supported, but not applicable for the object at this time. It updates the Xen and QEMU drivers to use this error code. Daniel diff -r 2e97361b7242 include/libvirt/virterror.h --- a/include/libvirt/virterror.h Mon Apr 27 11:44:32 2009 +0100 +++ b/include/libvirt/virterror.h Mon Apr 27 12:12:23 2009 +0100 @@ -157,6 +157,7 @@ typedef enum { VIR_ERR_INVALID_NODE_DEVICE,/* invalid node device object */ VIR_ERR_NO_NODE_DEVICE,/* node device not found */ VIR_ERR_NO_SECURITY_MODEL, /* security model not found */ + VIR_ERR_OPERATION_INVALID, /* operation is not applicable at this time */ } virErrorNumber; /** diff -r 2e97361b7242 src/qemu_driver.c --- a/src/qemu_driver.c Mon Apr 27 11:44:32 2009 +0100 +++ b/src/qemu_driver.c Mon Apr 27 12:12:23 2009 +0100 @@ -1325,7 +1325,7 @@ static int qemudStartVMDaemon(virConnect FD_ZERO(&keepfd); if (virDomainIsActive(vm)) { - qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_INVALID, "%s", _("VM is already active")); return -1; } @@ -2214,7 +2214,7 @@ static int qemudDomainSuspend(virDomainP goto cleanup; } if (!virDomainIsActive(vm)) { - qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, + qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); goto cleanup; } @@ -2267,7 +2267,7 @@ static int qemudDomainResume(virDomainPt goto cleanup; } if (!virDomainIsActive(vm)) { - qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, + qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); goto cleanup; } @@ -2755,7 +2755,7 @@ static int qemudDomainSave(virDomainPtr } if (!virDomainIsActive(vm)) { - qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, + qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); goto cleanup; } @@ -2890,7 +2890,7 @@ static int qemudDomainSetVcpus(virDomain } if (virDomainIsActive(vm)) { - qemudReportError(dom->conn, dom, NULL, VIR_ERR_NO_SUPPORT, "%s", + qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_INVALID, "%s", _("cannot change vcpu count of an active domain")); goto cleanup; } @@ -2942,8 +2942,16 @@ qemudDomainPinVcpu(virDomainPtr dom, vm = virDomainFindByUUID(&driver->domains, dom->uuid); qemuDriverUnlock(driver); - if (!virDomainIsActive(vm)) { - qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_ARG, + if (!vm) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(dom->uuid, uuidstr); + qemudReportError(dom->conn, dom, NULL, VIR_ERR_NO_DOMAIN, + _("no domain with matching uuid '%s'"), uuidstr); + goto cleanup; + } + + if (!virDomainIsActive(vm)) { + qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_INVALID, "%s",_("cannot pin vcpus on an inactive domain")); goto cleanup; } @@ -3003,8 +3011,16 @@ qemudDomainGetVcpus(virDomainPtr dom, vm = virDomainFindByUUID(&driver->domains, dom->uuid); qemuDriverUnlock(driver); - if (!virDomainIsActive(vm)) { - qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_ARG, + if (!vm) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(dom->uuid, uuidstr); + qemudReportError(dom->conn, dom, NULL, VIR_ERR_NO_DOMAIN, + _("no domain with matching uuid '%s'"), uuidstr); + goto cleanup; + } + + if (!virDomainIsActive(vm)) { + qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_INVALID, "%s",_("cannot pin vcpus on an inactive domain")); goto cleanup; } @@ -3248,7 +3264,7 @@ static int qemudDomainRestore(virConnect vm = virDomainFindByName(&driver->domains, def->name); if (vm) { if (virDomainIsActive(vm)) { - qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED, + qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_INVALID, _("domain is already active as '%s'"), vm->def->name); goto cleanup; } else { @@ -3503,7 +3519,7 @@ static int qemudDomainUndefine(virDomain } if (virDomainIsActive(vm)) { - qemudReportError(dom->conn, dom, NULL, VIR_ERR_INTERNAL_ERROR, + qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_INVALID, "%s", _("cannot delete active domain")); goto cleanup; } @@ -3900,7 +3916,7 @@ static int qemudDomainAttachDevice(virDo if (!virDomainIsActive(vm)) { qemuDriverUnlock(driver); - qemudReportError(dom->conn, dom, NULL, VIR_ERR_INTERNAL_ERROR, + qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_INVALID, "%s", _("cannot attach device on inactive domain")); goto cleanup; } @@ -4052,7 +4068,7 @@ static int qemudDomainDetachDevice(virDo if (!virDomainIsActive(vm)) { qemuDriverUnlock(driver); - qemudReportError(dom->conn, dom, NULL, VIR_ERR_INTERNAL_ERROR, + qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_INVALID, "%s", _("cannot detach device on inactive domain")); goto cleanup; } @@ -4212,7 +4228,7 @@ qemudDomainBlockStats (virDomainPtr dom, goto cleanup; } if (!virDomainIsActive (vm)) { - qemudReportError (dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, + qemudReportError (dom->conn, dom, NULL, VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); goto cleanup; } @@ -4351,7 +4367,7 @@ qemudDomainInterfaceStats (virDomainPtr } if (!virDomainIsActive(vm)) { - qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, + qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); goto cleanup; } @@ -4497,7 +4513,7 @@ qemudDomainMemoryPeek (virDomainPtr dom, } if (!virDomainIsActive(vm)) { - qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, + qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); goto cleanup; } @@ -4824,7 +4840,7 @@ qemudDomainMigratePerform (virDomainPtr } if (!virDomainIsActive(vm)) { - qemudReportError (dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, + qemudReportError (dom->conn, dom, NULL, VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); goto cleanup; } diff -r 2e97361b7242 src/virterror.c --- a/src/virterror.c Mon Apr 27 11:44:32 2009 +0100 +++ b/src/virterror.c Mon Apr 27 12:12:23 2009 +0100 @@ -1018,6 +1018,12 @@ virErrorMsg(virErrorNumber error, const else errmsg = _("Security model not found: %s"); break; + case VIR_ERR_OPERATION_INVALID: + if (info == NULL) + errmsg = _("Requested operation is not valid"); + else + errmsg = _("Requested operation is not valid: %s"); + break; } return (errmsg); } diff -r 2e97361b7242 src/xen_internal.c --- a/src/xen_internal.c Mon Apr 27 11:44:32 2009 +0100 +++ b/src/xen_internal.c Mon Apr 27 12:12:23 2009 +0100 @@ -1068,9 +1068,14 @@ xenHypervisorGetSchedulerType(virDomainP } priv = (xenUnifiedPrivatePtr) domain->conn->privateData; - if (priv->handle < 0 || domain->id < 0) { + if (priv->handle < 0) { virXenErrorFunc(domain->conn, VIR_ERR_INTERNAL_ERROR, __FUNCTION__, - "priv->handle or domain->id invalid", 0); + "priv->handle invalid", 0); + return NULL; + } + if (domain->id < 0) { + virXenError(domain->conn, VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); return NULL; } @@ -1143,9 +1148,14 @@ xenHypervisorGetSchedulerParameters(virD } priv = (xenUnifiedPrivatePtr) domain->conn->privateData; - if (priv->handle < 0 || domain->id < 0) { + if (priv->handle < 0) { virXenErrorFunc(domain->conn, VIR_ERR_INTERNAL_ERROR, __FUNCTION__, - "priv->handle or domain->id invalid", 0); + "priv->handle invalid", 0); + return -1; + } + if (domain->id < 0) { + virXenError(domain->conn, VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); return -1; } @@ -1241,9 +1251,14 @@ xenHypervisorSetSchedulerParameters(virD } priv = (xenUnifiedPrivatePtr) domain->conn->privateData; - if (priv->handle < 0 || domain->id < 0) { - virXenErrorFunc (domain->conn, VIR_ERR_INTERNAL_ERROR, __FUNCTION__, - "priv->handle or domain->id invalid", 0); + if (priv->handle < 0) { + virXenErrorFunc(domain->conn, VIR_ERR_INTERNAL_ERROR, __FUNCTION__, + "priv->handle invalid", 0); + return -1; + } + if (domain->id < 0) { + virXenError(domain->conn, VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); return -1; } diff -r 2e97361b7242 src/xend_internal.c --- a/src/xend_internal.c Mon Apr 27 11:44:32 2009 +0100 +++ b/src/xend_internal.c Mon Apr 27 12:12:23 2009 +0100 @@ -2970,7 +2970,7 @@ xenDaemonDomainSuspend(virDomainPtr doma } if (domain->id < 0) { - virXendError(domain->conn, VIR_ERR_INVALID_ARG, + virXendError(domain->conn, VIR_ERR_OPERATION_INVALID, _("Domain %s isn't running."), domain->name); return(-1); } @@ -2997,7 +2997,7 @@ xenDaemonDomainResume(virDomainPtr domai } if (domain->id < 0) { - virXendError(domain->conn, VIR_ERR_INVALID_ARG, + virXendError(domain->conn, VIR_ERR_OPERATION_INVALID, _("Domain %s isn't running."), domain->name); return(-1); } @@ -3025,7 +3025,7 @@ xenDaemonDomainShutdown(virDomainPtr dom } if (domain->id < 0) { - virXendError(domain->conn, VIR_ERR_INVALID_ARG, + virXendError(domain->conn, VIR_ERR_OPERATION_INVALID, _("Domain %s isn't running."), domain->name); return(-1); } @@ -3054,7 +3054,7 @@ xenDaemonDomainReboot(virDomainPtr domai } if (domain->id < 0) { - virXendError(domain->conn, VIR_ERR_INVALID_ARG, + virXendError(domain->conn, VIR_ERR_OPERATION_INVALID, _("Domain %s isn't running."), domain->name); return(-1); } @@ -3085,7 +3085,7 @@ xenDaemonDomainDestroy(virDomainPtr doma } if (domain->id < 0) { - virXendError(domain->conn, VIR_ERR_INVALID_ARG, + virXendError(domain->conn, VIR_ERR_OPERATION_INVALID, _("Domain %s isn't running."), domain->name); return(-1); } @@ -3160,7 +3160,7 @@ xenDaemonDomainSave(virDomainPtr domain, } if (domain->id < 0) { - virXendError(domain->conn, VIR_ERR_INVALID_ARG, + virXendError(domain->conn, VIR_ERR_OPERATION_INVALID, _("Domain %s isn't running."), domain->name); return(-1); } @@ -3197,7 +3197,7 @@ xenDaemonDomainCoreDump(virDomainPtr dom } if (domain->id < 0) { - virXendError(domain->conn, VIR_ERR_INVALID_ARG, + virXendError(domain->conn, VIR_ERR_OPERATION_INVALID, _("Domain %s isn't running."), domain->name); return(-1); } -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 1