- Devel - libvirt List Archives

[libvirt] [libvirt-glib] API to deal with storage pool(s)
by Zeeshan Ali (Khattak) 07 Oct '11

07 Oct '11

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> Add API to fetch, list, retrieve & find storage pool(s) on a connection. --- libvirt-gobject/libvirt-gobject-connection.c | 279 ++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-connection.h | 12 +- libvirt-gobject/libvirt-gobject.sym | 6 + 3 files changed, 296 insertions(+), 1 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index 69c6956..c512e79 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -43,6 +43,7 @@ struct _GVirConnectionPrivate virConnectPtr conn; GHashTable *domains; + GHashTable *pools; }; G_DEFINE_TYPE(GVirConnection, gvir_connection, G_TYPE_OBJECT); @@ -357,6 +358,11 @@ void gvir_connection_close(GVirConnection *conn) priv->domains = NULL; } + if (priv->pools) { + g_hash_table_unref(priv->pools); + priv->pools = NULL; + } + if (priv->conn) { virConnectClose(priv->conn); priv->conn = NULL; @@ -503,6 +509,148 @@ cleanup: return ret; } +/** + * gvir_connection_fetch_storage_pools: + * @conn: the connection + * @cancellable: (allow-none)(transfer none): cancellation object + */ +gboolean gvir_connection_fetch_storage_pools(GVirConnection *conn, + GCancellable *cancellable, + GError **err) +{ + GVirConnectionPrivate *priv = conn->priv; + GHashTable *pools; + gchar **inactive = NULL; + gint ninactive = 0; + gchar **active = NULL; + gint nactive = 0; + gboolean ret = FALSE; + gint i; + virConnectPtr vconn = NULL; + + g_mutex_lock(priv->lock); + if (!priv->conn) { + *err = gvir_error_new(GVIR_CONNECTION_ERROR, + 0, + "Connection is not open"); + g_mutex_unlock(priv->lock); + goto cleanup; + } + vconn = priv->conn; + /* Stop another thread closing the connection just at the minute */ + virConnectRef(vconn); + g_mutex_unlock(priv->lock); + + if (g_cancellable_set_error_if_cancelled(cancellable, err)) + goto cleanup; + + if ((nactive = virConnectNumOfStoragePools(vconn)) < 0) { + *err = gvir_error_new(GVIR_CONNECTION_ERROR, + 0, + "Unable to count pools"); + goto cleanup; + } + if (nactive) { + if (g_cancellable_set_error_if_cancelled(cancellable, err)) + goto cleanup; + + active = g_new(gchar *, nactive); + if ((nactive = virConnectListStoragePools(vconn, + active, + nactive)) < 0) { + *err = gvir_error_new(GVIR_CONNECTION_ERROR, + 0, + "Unable to list pools"); + goto cleanup; + } + } + + if (g_cancellable_set_error_if_cancelled(cancellable, err)) + goto cleanup; + + if ((ninactive = virConnectNumOfDefinedStoragePools(vconn)) < 0) { + *err = gvir_error_new(GVIR_CONNECTION_ERROR, + 0, + "Unable to count pools"); + goto cleanup; + } + + if (ninactive) { + if (g_cancellable_set_error_if_cancelled(cancellable, err)) + goto cleanup; + + inactive = g_new(gchar *, ninactive); + if ((ninactive = virConnectListDefinedStoragePools(vconn, + inactive, + ninactive)) < 0) { + *err = gvir_error_new(GVIR_CONNECTION_ERROR, + 0, + "Unable to list pools %d", ninactive); + goto cleanup; + } + } + + pools = g_hash_table_new_full(g_str_hash, + g_str_equal, + g_free, + g_object_unref); + + for (i = 0 ; i < nactive ; i++) { + if (g_cancellable_set_error_if_cancelled(cancellable, err)) + goto cleanup; + + virStoragePoolPtr vpool; + GVirStoragePool *pool; + + vpool = virStoragePoolLookupByName(vconn, active[i]); + if (!vpool) + continue; + + pool = GVIR_STORAGE_POOL(g_object_new(GVIR_TYPE_STORAGE_POOL, + "handle", vpool, + NULL)); + + g_hash_table_insert(pools, + g_strdup(gvir_storage_pool_get_uuid(pool)), + pool); + } + + for (i = 0 ; i < ninactive ; i++) { + if (g_cancellable_set_error_if_cancelled(cancellable, err)) + goto cleanup; + + virStoragePoolPtr vpool; + GVirStoragePool *pool; + + vpool = virStoragePoolLookupByName(vconn, inactive[i]); + if (!vpool) + continue; + + pool = GVIR_STORAGE_POOL(g_object_new(GVIR_TYPE_STORAGE_POOL, + "handle", vpool, + NULL)); + + g_hash_table_insert(pools, + g_strdup(gvir_storage_pool_get_uuid(pool)), + pool); + } + + g_mutex_lock(priv->lock); + if (priv->pools) + g_hash_table_unref(priv->pools); + priv->pools = pools; + virConnectClose(vconn); + g_mutex_unlock(priv->lock); + + ret = TRUE; + +cleanup: + g_free(active); + for (i = 0 ; i < ninactive ; i++) + g_free(inactive[i]); + g_free(inactive); + return ret; +} static void gvir_connection_fetch_domains_helper(GSimpleAsyncResult *res, @@ -566,6 +714,67 @@ gboolean gvir_connection_fetch_domains_finish(GVirConnection *conn, return TRUE; } +static void +gvir_connection_fetch_pools_helper(GSimpleAsyncResult *res, + GObject *object, + GCancellable *cancellable) +{ + GVirConnection *conn = GVIR_CONNECTION(object); + GError *err = NULL; + + if (!gvir_connection_fetch_storage_pools(conn, cancellable, &err)) { + g_simple_async_result_set_from_error(res, err); + g_error_free(err); + } +} + +/** + * gvir_connection_fetch_storage_pools_async: + * @conn: the connection + * @cancellable: (allow-none)(transfer none): cancellation object + * @callback: (transfer none): completion callback + * @opaque: (transfer none)(allow-none): opaque data for callback + */ +void gvir_connection_fetch_storage_pools_async(GVirConnection *conn, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer opaque) +{ + GSimpleAsyncResult *res; + + res = g_simple_async_result_new(G_OBJECT(conn), + callback, + opaque, + gvir_connection_fetch_storage_pools); + g_simple_async_result_run_in_thread(res, + gvir_connection_fetch_pools_helper, + G_PRIORITY_DEFAULT, + cancellable); + g_object_unref(res); +} + +/** + * gvir_connection_fetch_storage_pools_finish: + * @conn: the connection + * @result: (transfer none): async method result + */ +gboolean gvir_connection_fetch_storage_pools_finish(GVirConnection *conn, + GAsyncResult *result, + GError **err) +{ + g_return_val_if_fail(GVIR_IS_CONNECTION(conn), FALSE); + g_return_val_if_fail(G_IS_ASYNC_RESULT(result), FALSE); + + if (G_IS_SIMPLE_ASYNC_RESULT(result)) { + GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT(result); + g_warn_if_fail (g_simple_async_result_get_source_tag(simple) == + gvir_connection_fetch_storage_pools); + if (g_simple_async_result_propagate_error(simple, err)) + return FALSE; + } + + return TRUE; +} const gchar *gvir_connection_get_uri(GVirConnection *conn) { @@ -595,6 +804,25 @@ GList *gvir_connection_get_domains(GVirConnection *conn) } /** + * gvir_connection_get_storage_pools: + * + * Return value: (element-type LibvirtGObject.StoragePool) (transfer full): List + * of #GVirStoragePool + */ +GList *gvir_connection_get_storage_pools(GVirConnection *conn) +{ + GVirConnectionPrivate *priv = conn->priv; + GList *pools; + + g_mutex_lock(priv->lock); + pools = g_hash_table_get_values(priv->pools); + g_list_foreach(pools, gvir_domain_ref, NULL); + g_mutex_unlock(priv->lock); + + return pools; +} + +/** * gvir_connection_get_domain: * @uuid: uuid string of the requested domain * @@ -613,6 +841,26 @@ GVirDomain *gvir_connection_get_domain(GVirConnection *conn, return dom; } +/** + * gvir_connection_get_storage_pool: + * @uuid: uuid string of the requested storage pool + * + * Return value: (transfer full): the #GVirStoragePool, or NULL + */ +GVirStoragePool *gvir_connection_get_storage_pool(GVirConnection *conn, + const gchar *uuid) +{ + GVirConnectionPrivate *priv = conn->priv; + GVirStoragePool *pool; + + g_mutex_lock(priv->lock); + pool = g_hash_table_lookup(priv->pools, uuid); + if (pool) + g_object_ref(pool); + g_mutex_unlock(priv->lock); + + return pool; +} /** * gvir_connection_find_domain_by_id: @@ -677,6 +925,37 @@ GVirDomain *gvir_connection_find_domain_by_name(GVirConnection *conn, return NULL; } +/** + * gvir_connection_find_storage_pool_by_name: + * @name: name of the requested storage pool + * + * Return value: (transfer full): the #GVirStoragePool, or NULL + */ +GVirStoragePool *gvir_connection_find_storage_pool_by_name(GVirConnection *conn, + const gchar *name) +{ + GVirConnectionPrivate *priv = conn->priv; + GHashTableIter iter; + gpointer key, value; + + g_mutex_lock(priv->lock); + g_hash_table_iter_init(&iter, priv->pools); + + while (g_hash_table_iter_next(&iter, &key, &value)) { + GVirStoragePool *pool = value; + const gchar *thisname = gvir_storage_pool_get_name(pool); + + if (strcmp(thisname, name) == 0) { + g_object_ref(pool); + g_mutex_unlock(priv->lock); + return pool; + } + } + g_mutex_unlock(priv->lock); + + return NULL; +} + static gpointer gvir_connection_handle_copy(gpointer src) { diff --git a/libvirt-gobject/libvirt-gobject-connection.h b/libvirt-gobject/libvirt-gobject-connection.h index c453bed..d05f792 100644 --- a/libvirt-gobject/libvirt-gobject-connection.h +++ b/libvirt-gobject/libvirt-gobject-connection.h @@ -141,14 +141,24 @@ GVirNodeDevice *gvir_connection_get_node_device(GVirConnection *conn, GList *gvir_connection_get_secrets(GVirConnection *conn); GVirSecret *gvir_connection_get_secret(GVirConnection *conn, const gchar *uuid); +#endif +gboolean gvir_connection_fetch_storage_pools(GVirConnection *conn, + GCancellable *cancellable, + GError **err); +void gvir_connection_fetch_storage_pools_async(GVirConnection *conn, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer opaque); +gboolean gvir_connection_fetch_storage_pools_finish(GVirConnection *conn, + GAsyncResult *result, + GError **err); GList *gvir_connection_get_storage_pools(GVirConnection *conn); GVirStoragePool *gvir_connection_get_storage_pool(GVirConnection *conn, const gchar *uuid); GVirStoragePool *gvir_connection_find_storage_pool_by_name(GVirConnection *conn, const gchar *name); -#endif GVirStream *gvir_connection_get_stream(GVirConnection *conn, gint flags); diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index eae40a2..ff2f4cf 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -14,10 +14,16 @@ LIBVIRT_GOBJECT_0.0.1 { gvir_connection_get_stream; gvir_connection_fetch_domains; + gvir_connection_fetch_storage_pools; + gvir_connection_fetch_storage_pools_async; + gvir_connection_fetch_storage_pools_finish; gvir_connection_get_domains; + gvir_connection_get_storage_pools; gvir_connection_get_domain; + gvir_connection_get_storage_pool; gvir_connection_find_domain_by_id; gvir_connection_find_domain_by_name; + gvir_connection_find_storage_pool_by_name; gvir_connection_create_domain; gvir_domain_get_type; -- 1.7.6.2

4 9

[libvirt] [PATCH] remote_driver: Avoid double free in EventControl building
by Michal Privoznik 07 Oct '11

07 Oct '11

Don't xdr_free event data as they are freed by our caller virNetClientProgramDispatch. --- src/remote/remote_driver.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 83f4f3c..2b2f41e 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -3315,7 +3315,6 @@ remoteDomainBuildEventControlError(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, return; event = virDomainEventControlErrorNewFromDom(dom); - xdr_free ((xdrproc_t) &xdr_remote_domain_event_control_error_msg, (char *) &msg); virDomainFree(dom); -- 1.7.3.4

2 2

[libvirt] [PATCH] build: fix 'make distcheck' with pdwtags installed
by Eric Blake 07 Oct '11

07 Oct '11

I am getting this failure with 'make distcheck': GEN ../../src/remote_protocol-structs /bin/sh: ../../src/remote_protocol-structs-t: Permission denied make[4]: *** [../../src/remote_protocol-structs] Error 1 since it attempts a sub-run of a VPATH 'make check' where $(srcdir) is intentionally read-only. I'm not sure which commit introduced the problem, although I suspect it was around 62dee6f when I refactored protocol struct checking to be more powerful. $(@F) is required by POSIX, and although it is not yet portable to all make implementations, we already require GNU make. * src/Makefile.am (PDWTAGS): Generate temp file into current directory, since $(srcdir) is read-only during distcheck. --- src/Makefile.am | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 738ee91..9650139 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -255,9 +255,9 @@ PDWTAGS = \ -e ' exit 8;' \ -e ' }' \ -e '}' \ - > $@-t; \ + > $(@F)-t; \ case $$? in 8) exit 0;; 0) ;; *) exit 1;; esac; \ - diff -u $@-t $@; st=$$?; rm -f $@-t; exit $$st; \ + diff -u $(@F)-t $@; st=$$?; rm -f $(@F)-t; exit $$st; \ else \ echo 'WARNING: you lack pdwtags; skipping the $@ test' >&2; \ echo 'WARNING: install the dwarves package to get pdwtags' >&2; \ -- 1.7.4.4

2 2

[libvirt] [PATCH 2/2] xenParseXM: don't dereference NULL pointer when script is empty
by Guido Günther 06 Oct '11

06 Oct '11

O.k. to apply? -- Guido --- src/xenxs/xen_xm.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c index d057043..30188e2 100644 --- a/src/xenxs/xen_xm.c +++ b/src/xenxs/xen_xm.c @@ -697,8 +697,8 @@ xenParseXM(virConfPtr conf, int xendConfigVersion, } } - if (bridge[0] || STREQ(script, "vif-bridge") || - STREQ(script, "vif-vnic")) { + if (bridge[0] || (script && (STREQ(script, "vif-bridge") || + STREQ(script, "vif-vnic")))) { net->type = VIR_DOMAIN_NET_TYPE_BRIDGE; } else { net->type = VIR_DOMAIN_NET_TYPE_ETHERNET; @@ -715,7 +715,7 @@ xenParseXM(virConfPtr conf, int xendConfigVersion, !(net->data.bridge.ipaddr = strdup(ip))) goto no_memory; } else { - if (script[0] && + if (script && script[0] && !(net->data.ethernet.script = strdup(script))) goto no_memory; if (ip[0] && -- 1.7.6.3

3 9

[libvirt] [PATCH 0/2] qemu: fix disk error_policy problems
by Laine Stump 06 Oct '11

06 Oct '11

These two patches are related to: https://bugzilla.redhat.com/show_bug.cgi?id=730909 The first removes the obvious problem of attempting to feed qemu invalid options. The second makes it possible to specify a different policy for read errors and write errors. 1/2 is written such that 2/2 will apply with minimal rewriting of existing code (that's why the qemu_command.c part may seem a bit obtuse at first).

3 10

[libvirt] [PATCH] qemu: enable multifunction for older qemu
by Eric Blake 06 Oct '11

06 Oct '11

Now that RHEL 6.2 Beta is out, it would be nice to test multifunction devices on that platform. This changes things so that the multifunction cap bit can be set in two different ways: by version comparison (needed for qemu 0.13 which lacked a -device query), and by -device query (provided by qemu.git and backported to the RHEL beta build of qemu-kvm which still claims to be a modified 0.12, and therefore needed for RHEL). * src/qemu/qemu_capabilities.c (qemuCapsParseDeviceStr): Allow second method of setting multifunction cap bit. * tests/qemuhelptest.c (mymain): Test it. * tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel62-beta: New file. * tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel62-beta-device: Likewise. --- src/qemu/qemu_capabilities.c | 2 + tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel62-beta | 230 ++++++++++++++++++++ .../qemu-kvm-0.12.1.2-rhel62-beta-device | 120 ++++++++++ tests/qemuhelptest.c | 59 +++++ 4 files changed, 411 insertions(+), 0 deletions(-) create mode 100644 tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel62-beta create mode 100644 tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel62-beta-device diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a653243..49be5a2 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1264,6 +1264,8 @@ qemuCapsParseDeviceStr(const char *str, virBitmapPtr flags) /* Features of given devices. */ if (strstr(str, "pci-assign.configfd")) qemuCapsSet(flags, QEMU_CAPS_PCI_CONFIGFD); + if (strstr(str, "pci-assign.multifunction")) + qemuCapsSet(flags, QEMU_CAPS_PCI_MULTIFUNCTION); if (strstr(str, "virtio-blk-pci.bootindex")) { qemuCapsSet(flags, QEMU_CAPS_BOOTINDEX); if (strstr(str, "pci-assign.bootindex")) diff --git a/tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel62-beta b/tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel62-beta new file mode 100644 index 0000000..d5927e6 --- /dev/null +++ b/tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel62-beta @@ -0,0 +1,230 @@ +QEMU PC emulator version 0.12.1 (qemu-kvm-0.12.1.2), Copyright (c) 2003-2008 Fabrice Bellard + +WARNING: Direct use of qemu-kvm from the command line is not recommended by Red Hat. +WARNING: Some command line options listed here may not be available in future releases. +WARNING: Red Hat recommends the use of libvirt as the stable management interface. + +usage: qemu [options] [disk_image] + +'disk_image' is a raw hard image image for IDE hard disk 0 + +Standard options: +-h or -help display this help and exit +-version display version information and exit +-M machine select emulated machine (-M ? for list) +-cpu cpu select CPU (-cpu ? for list) +-smp n[,maxcpus=cpus][,cores=cores][,threads=threads][,sockets=sockets] + set the number of CPUs to 'n' [default=1] + maxcpus= maximum number of total cpus, including + offline CPUs for hotplug etc. + cores= number of CPU cores on one socket + threads= number of threads on one CPU core + sockets= number of discrete sockets in the system +-numa node[,mem=size][,cpus=cpu[-cpu]][,nodeid=node] +-fda/-fdb file use 'file' as floppy disk 0/1 image +-hda/-hdb file use 'file' as IDE hard disk 0/1 image +-hdc/-hdd file use 'file' as IDE hard disk 2/3 image +-cdrom file use 'file' as IDE cdrom image (cdrom is ide1 master) +-drive [file=file][,if=type][,bus=n][,unit=m][,media=d][,index=i] + [,cyls=c,heads=h,secs=s[,trans=t]][,snapshot=on|off] + [,cache=writethrough|writeback|none|unsafe][,format=f] + [,serial=s][,addr=A][,id=name][,aio=threads|native] + [,readonly=on|off][,copy-on-read=on|off][,stream=on|off] + use 'file' as a drive image +-set group.id.arg=value + set <arg> parameter for item <id> of type <group> + i.e. -set drive.$id.file=/path/to/image +-global driver.property=value + set a global default for a driver property +-mtdblock file use 'file' as on-board Flash memory image +-sd file use 'file' as SecureDigital card image +-pflash file use 'file' as a parallel flash image +-boot [order=drives][,once=drives][,menu=on|off] + 'drives': floppy (a), hard disk (c), CD-ROM (d), network (n) +-snapshot write to temporary files instead of disk image files +-m megs set virtual RAM size to megs MB [default=128] +-k language use keyboard layout (for example 'fr' for French) +-audio-help print list of audio drivers and their options +-soundhw c1,... enable audio support + and only specified sound cards (comma separated list) + use -soundhw ? to get the list of supported cards + use -soundhw all to enable all of them +-usb enable the USB driver (will be the default soon) +-usbdevice name add the host or guest USB device 'name' +-device driver[,prop[=value][,...]] + add device (based on driver) + prop=value,... sets driver properties + use -device ? to print all possible drivers + use -device driver,? to print all possible properties +-name string1[,process=string2] set the name of the guest + string1 sets the window title and string2 the process name (on Linux) +-uuid %08x-%04x-%04x-%04x-%012x + specify machine UUID + +Display options: +-nographic disable graphical output and redirect serial I/Os to console +-spice <args> enable spice +-portrait rotate graphical output 90 deg left (only PXA LCD) +-vga [std|cirrus|vmware|qxl|xenfb|none] + select video card type +-full-screen start in full screen +-vnc display start a VNC server on display + +i386 target only: +-win2k-hack use it when installing Windows 2000 to avoid a disk full bug +-no-fd-bootchk disable boot signature checking for floppy disks +-no-acpi disable ACPI +-balloon none disable balloon device +-balloon virtio[,addr=str] + enable virtio balloon device (default) +-acpitable [sig=str][,rev=n][,oem_id=str][,oem_table_id=str][,oem_rev=n][,asl_compiler_id=str][,asl_compiler_rev=n][,data=file1[:file2]...] + ACPI table description +-smbios file=binary + Load SMBIOS entry from binary file +-smbios type=0[,vendor=str][,version=str][,date=str][,release=%d.%d] + Specify SMBIOS type 0 fields +-smbios type=1[,manufacturer=str][,product=str][,version=str][,serial=str] + [,uuid=uuid][,sku=str][,family=str] + Specify SMBIOS type 1 fields + +Network options: +-net nic[,vlan=n][,macaddr=mac][,model=type][,name=str][,addr=str][,vectors=v] + create a new Network Interface Card and connect it to VLAN 'n' +-net user[,vlan=n][,name=str][,net=addr[/mask]][,host=addr][,restrict=y|n] + [,hostname=host][,dhcpstart=addr][,dns=addr][,tftp=dir][,bootfile=f] + [,hostfwd=rule][,guestfwd=rule][,smb=dir[,smbserver=addr]] + connect the user mode network stack to VLAN 'n', configure its + DHCP server and enabled optional services +-net tap[,vlan=n][,name=str][,fd=h][,ifname=name][,script=file][,downscript=dfile][,sndbuf=nbytes][,vnet_hdr=on|off][,vhost=on|off][,vhostfd=h][,vhostforce=on|off] + connect the host TAP network interface to VLAN 'n' and use the + network scripts 'file' (default=/etc/qemu-ifup) + and 'dfile' (default=/etc/qemu-ifdown); + use '[down]script=no' to disable script execution; + use 'fd=h' to connect to an already opened TAP interface + use 'sndbuf=nbytes' to limit the size of the send buffer (the + default is disabled 'sndbuf=0' to enable flow control set 'sndbuf=1048576') + use vnet_hdr=off to avoid enabling the IFF_VNET_HDR tap flag; use + vnet_hdr=on to make the lack of IFF_VNET_HDR support an error condition + use vhost=on to enable experimental in kernel accelerator + (only has effect for virtio guests which use MSIX) + use vhostforce=on to force vhost on for non-MSIX virtio guests + use 'vhostfd=h' to connect to an already opened vhost net device +-net socket[,vlan=n][,name=str][,fd=h][,listen=[host]:port][,connect=host:port] + connect the vlan 'n' to another VLAN using a socket connection +-net socket[,vlan=n][,name=str][,fd=h][,mcast=maddr:port] + connect the vlan 'n' to multicast maddr and port +-net dump[,vlan=n][,file=f][,len=n] + dump traffic on vlan 'n' to file 'f' (max n bytes per packet) +-net none use it alone to have zero network devices; if no -net option + is provided, the default is '-net nic -net user' +-netdev [user|tap|socket],id=str[,option][,option][,...] + +Character device options: +-chardev null,id=id +-chardev socket,id=id[,host=host],port=host[,to=to][,ipv4][,ipv6][,nodelay] + [,server][,nowait][,telnet] (tcp) +-chardev socket,id=id,path=path[,server][,nowait][,telnet] (unix) +-chardev udp,id=id[,host=host],port=port[,localaddr=localaddr] + [,localport=localport][,ipv4][,ipv6] +-chardev msmouse,id=id +-chardev vc,id=id[[,width=width][,height=height]][[,cols=cols][,rows=rows]] +-chardev file,id=id,path=path +-chardev pipe,id=id,path=path +-chardev pty,id=id +-chardev stdio,id=id +-chardev tty,id=id,path=path +-chardev parport,id=id,path=path +-chardev spicevmc,id=id,debug=debug,name=name + +Bluetooth(R) options: +-bt hci,null dumb bluetooth HCI - doesn't respond to commands +-bt hci,host[:id] + use host's HCI with the given name +-bt hci[,vlan=n] + emulate a standard HCI in virtual scatternet 'n' +-bt vhci[,vlan=n] + add host computer to virtual scatternet 'n' using VHCI +-bt device:dev[,vlan=n] + emulate a bluetooth device 'dev' in scatternet 'n' + +Linux/Multiboot boot specific: +-kernel bzImage use 'bzImage' as kernel image +-append cmdline use 'cmdline' as kernel command line +-initrd file use 'file' as initial ram disk + +Debug/Expert options: +-serial dev redirect the serial port to char device 'dev' +-parallel dev redirect the parallel port to char device 'dev' +-monitor dev redirect the monitor to char device 'dev' +-qmp dev like -monitor but opens in 'control' mode. +-mon chardev=[name][,mode=readline|control][,default] +-pidfile file write PID to 'file' +-singlestep always run in singlestep mode +-S freeze CPU at startup (use 'c' to start execution) +-gdb dev wait for gdb connection on 'dev' +-s shorthand for -gdb tcp::1234 +-d item1,... output log to /tmp/qemu.log (use -d ? for a list of log items) +-hdachs c,h,s[,t] + force hard disk 0 physical geometry and the optional BIOS + translation (t=none or lba) (usually qemu can guess them) +-L path set the directory for the BIOS, VGA BIOS and keymaps +-bios file set the filename for the BIOS +-enable-kvm enable KVM full virtualization support +-no-reboot exit instead of rebooting +-no-shutdown stop before shutdown +-loadvm [tag|id] + start right away with a saved state (loadvm in monitor) +-daemonize daemonize QEMU after initializing +-option-rom rom load a file, rom, into the option ROM space +-clock force the use of the given methods for timer alarm. + To see what timers are available use -clock ? +-rtc [base=utc|localtime|date][,clock=host|vm][,driftfix=none|slew] + set the RTC base and clock, enable drift fix for clock ticks +-icount [N|auto] + enable virtual instruction counter with 2^N clock ticks per + instruction +-watchdog i6300esb|ib700 + enable virtual hardware watchdog [default=none] +-watchdog-action reset|shutdown|poweroff|pause|debug|none + action when watchdog fires [default=reset] +-echr chr set terminal escape character instead of ctrl-a +-virtioconsole c + set virtio console +-show-cursor show cursor +-tb-size n set TB size +-incoming p prepare for incoming migration, listen on port p +-nodefaults don't create default devices. +-chroot dir Chroot to dir just before starting the VM. +-runas user Change to user id user just before starting the VM. +-nodefconfig + do not load default config files at startup +-readconfig <file> +-writeconfig <file> + read/write config file +-no-kvm disable KVM hardware virtualization +-no-kvm-irqchip disable KVM kernel mode PIC/IOAPIC/LAPIC +-no-kvm-pit disable KVM kernel mode PIT +-no-kvm-pit-reinjection disable KVM kernel mode PIT interrupt reinjection +-pcidevice host=bus:dev.func[,dma=none][,name=string] + expose a PCI device to the guest OS. + dma=none: don't perform any dma translations (default is to use an iommu) + 'string' is used in log output. +-nvram FILE provide ia64 nvram contents +-tdf enable guest time drift compensation +-kvm-shadow-memory MEGABYTES + allocate MEGABYTES for kvm mmu shadowing +-mem-path FILE provide backing storage for guest RAM +-mem-prealloc preallocate guest memory (use with -mempath) +-redhat-disable-KSM disable KSM on guest physical memory + +During emulation, the following keys are useful: +ctrl-alt-f toggle full screen +ctrl-alt-n switch to virtual console 'n' +ctrl-alt toggle mouse and keyboard grab + +When using -nographic, press 'ctrl-a h' to get some help. + +WARNING: Direct use of qemu-kvm from the command line is not recommended by Red Hat. +WARNING: Some command line options listed here may not be available in future releases. +WARNING: Red Hat recommends the use of libvirt as the stable management interface. + diff --git a/tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel62-beta-device b/tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel62-beta-device new file mode 100644 index 0000000..ee0fd78 --- /dev/null +++ b/tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel62-beta-device @@ -0,0 +1,120 @@ +name "pci-bridge", bus PCI +name "virtio-balloon-pci", bus PCI +name "virtio-serial-pci", bus PCI, alias "virtio-serial" +name "virtio-net-pci", bus PCI +name "virtio-blk-pci", bus PCI, alias "virtio-blk" +name "i82562", bus PCI +name "i82559er", bus PCI +name "i82559c", bus PCI +name "i82559b", bus PCI +name "i82559a", bus PCI +name "i82558b", bus PCI +name "i82558a", bus PCI +name "i82557c", bus PCI +name "i82557b", bus PCI +name "i82557a", bus PCI +name "i82551", bus PCI +name "i82550", bus PCI +name "pcnet", bus PCI +name "rtl8139", bus PCI +name "e1000", bus PCI, desc "Intel Gigabit Ethernet" +name "ide-drive", bus IDE +name "isa-ide", bus ISA +name "ES1370", bus PCI, desc "ENSONIQ AudioPCI ES1370" +name "AC97", bus PCI, desc "Intel 82801AA AC97 Audio" +name "intel-hda", bus PCI, desc "Intel HD Audio Controller" +name "hda-duplex", bus HDA, desc "HDA Audio Codec, duplex" +name "hda-output", bus HDA, desc "HDA Audio Codec, output-only" +name "VGA", bus PCI +name "SUNW,fdtwo", bus System +name "sysbus-fdc", bus System +name "isa-serial", bus ISA +name "cirrus-vga", bus PCI, desc "Cirrus CLGD 54xx VGA" +name "isa-parallel", bus ISA +name "sga", bus ISA, desc "Serial Graphics Adapter" +name "ich9-usb-uhci3", bus PCI +name "ich9-usb-uhci2", bus PCI +name "ich9-usb-uhci1", bus PCI +name "piix4-usb-uhci", bus PCI +name "piix3-usb-uhci", bus PCI +name "ib700", bus ISA +name "ne2k_isa", bus ISA +name "testdev", bus ISA +name "pci-assign", bus PCI, desc "pass through host pci devices to the guest" +name "qxl", bus PCI, desc "Spice QXL GPU (secondary)" +name "qxl-vga", bus PCI, desc "Spice QXL GPU (primary, vga compatible)" +name "smbus-eeprom", bus I2C +name "usb-hub", bus USB +name "usb-host", bus USB +name "usb-kbd", bus USB +name "usb-mouse", bus USB +name "usb-tablet", bus USB +name "usb-storage", bus USB +name "scsi-disk", bus SCSI, desc "virtual SCSI disk or CD-ROM (legacy)" +name "scsi-cd", bus SCSI, desc "virtual SCSI CD-ROM" +name "scsi-hd", bus SCSI, desc "virtual SCSI disk" +name "usb-ccid", bus USB, desc "CCID Rev 1.1 smartcard reader" +name "ccid-card-passthru", bus ccid-bus, desc "passthrough smartcard" +name "virtserialport", bus virtio-serial-bus +name "virtconsole", bus virtio-serial-bus +name "ich9-usb-ehci1", bus PCI +name "usb-ehci", bus PCI +name "i6300esb", bus PCI +name "ne2k_pci", bus PCI +pci-assign.host=pci-hostaddr +pci-assign.iommu=uint32 +pci-assign.bootindex=int32 +pci-assign.configfd=string +pci-assign.addr=pci-devfn +pci-assign.romfile=string +pci-assign.rombar=uint32 +pci-assign.multifunction=on/off +virtio-blk-pci.class=hex32 +virtio-blk-pci.drive=drive +virtio-blk-pci.logical_block_size=uint16 +virtio-blk-pci.physical_block_size=uint16 +virtio-blk-pci.min_io_size=uint16 +virtio-blk-pci.opt_io_size=uint32 +virtio-blk-pci.bootindex=int32 +virtio-blk-pci.discard_granularity=uint32 +virtio-blk-pci.ioeventfd=on/off +virtio-blk-pci.vectors=uint32 +virtio-blk-pci.indirect_desc=on/off +virtio-blk-pci.event_idx=on/off +virtio-blk-pci.scsi=on/off +virtio-blk-pci.addr=pci-devfn +virtio-blk-pci.romfile=string +virtio-blk-pci.rombar=uint32 +virtio-blk-pci.multifunction=on/off +virtio-net-pci.ioeventfd=on/off +virtio-net-pci.vectors=uint32 +virtio-net-pci.indirect_desc=on/off +virtio-net-pci.event_idx=on/off +virtio-net-pci.csum=on/off +virtio-net-pci.guest_csum=on/off +virtio-net-pci.gso=on/off +virtio-net-pci.guest_tso4=on/off +virtio-net-pci.guest_tso6=on/off +virtio-net-pci.guest_ecn=on/off +virtio-net-pci.guest_ufo=on/off +virtio-net-pci.host_tso4=on/off +virtio-net-pci.host_tso6=on/off +virtio-net-pci.host_ecn=on/off +virtio-net-pci.host_ufo=on/off +virtio-net-pci.mrg_rxbuf=on/off +virtio-net-pci.status=on/off +virtio-net-pci.ctrl_vq=on/off +virtio-net-pci.ctrl_rx=on/off +virtio-net-pci.ctrl_vlan=on/off +virtio-net-pci.ctrl_rx_extra=on/off +virtio-net-pci.mac=macaddr +virtio-net-pci.vlan=vlan +virtio-net-pci.netdev=netdev +virtio-net-pci.bootindex=int32 +virtio-net-pci.x-txtimer=uint32 +virtio-net-pci.x-txburst=int32 +virtio-net-pci.tx=string +virtio-net-pci.addr=pci-devfn +virtio-net-pci.romfile=string +virtio-net-pci.rombar=uint32 +virtio-net-pci.multifunction=on/off diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 8a06568..fcee41f 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -507,6 +507,65 @@ mymain(void) QEMU_CAPS_USB_HUB, QEMU_CAPS_NO_SHUTDOWN, QEMU_CAPS_PCI_ROMBAR); + DO_TEST("qemu-kvm-0.12.1.2-rhel62-beta", 12001, 1, 0, + QEMU_CAPS_VNC_COLON, + QEMU_CAPS_NO_REBOOT, + QEMU_CAPS_DRIVE, + QEMU_CAPS_NAME, + QEMU_CAPS_UUID, + QEMU_CAPS_VNET_HDR, + QEMU_CAPS_MIGRATE_QEMU_TCP, + QEMU_CAPS_MIGRATE_QEMU_EXEC, + QEMU_CAPS_DRIVE_CACHE_V2, + QEMU_CAPS_DRIVE_CACHE_UNSAFE, + QEMU_CAPS_KVM, + QEMU_CAPS_DRIVE_FORMAT, + QEMU_CAPS_DRIVE_SERIAL, + QEMU_CAPS_DRIVE_READONLY, + QEMU_CAPS_VGA, + QEMU_CAPS_0_10, + QEMU_CAPS_PCIDEVICE, + QEMU_CAPS_MEM_PATH, + QEMU_CAPS_MIGRATE_QEMU_UNIX, + QEMU_CAPS_CHARDEV, + QEMU_CAPS_ENABLE_KVM, + QEMU_CAPS_BALLOON, + QEMU_CAPS_DEVICE, + QEMU_CAPS_SMP_TOPOLOGY, + QEMU_CAPS_RTC, + QEMU_CAPS_VHOST_NET, + QEMU_CAPS_NO_KVM_PIT, + QEMU_CAPS_TDF, + QEMU_CAPS_PCI_CONFIGFD, + QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_BOOT_MENU, + QEMU_CAPS_NAME_PROCESS, + QEMU_CAPS_SMBIOS_TYPE, + QEMU_CAPS_VGA_QXL, + QEMU_CAPS_SPICE, + QEMU_CAPS_VGA_NONE, + QEMU_CAPS_MIGRATE_QEMU_FD, + QEMU_CAPS_BOOTINDEX, + QEMU_CAPS_HDA_DUPLEX, + QEMU_CAPS_DRIVE_AIO, + QEMU_CAPS_PCI_BOOTINDEX, + QEMU_CAPS_CCID_PASSTHRU, + QEMU_CAPS_CHARDEV_SPICEVMC, + QEMU_CAPS_DEVICE_QXL_VGA, + QEMU_CAPS_PCI_MULTIFUNCTION, + QEMU_CAPS_VIRTIO_IOEVENTFD, + QEMU_CAPS_SGA, + QEMU_CAPS_VIRTIO_BLK_EVENT_IDX, + QEMU_CAPS_VIRTIO_NET_EVENT_IDX, + QEMU_CAPS_VIRTIO_TX_ALG, + QEMU_CAPS_VIRTIO_IOEVENTFD, + QEMU_CAPS_PIIX3_USB_UHCI, + QEMU_CAPS_PIIX4_USB_UHCI, + QEMU_CAPS_USB_EHCI, + QEMU_CAPS_ICH9_USB_EHCI1, + QEMU_CAPS_USB_HUB, + QEMU_CAPS_NO_SHUTDOWN, + QEMU_CAPS_PCI_ROMBAR); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 1.7.4.4

3 3

[libvirt] [PATCH] Don't send back unknown program errors for async messages
by Daniel P. Berrange 06 Oct '11

06 Oct '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> If we send back an unknown program error for async messages, we will confuse the client because they only expect replies for method calls. Just log & drop any invalid async messages * src/rpc/virnetserver.c: Don't send error for async messages --- src/rpc/virnetserver.c | 23 +++++++++++++++++++---- src/rpc/virnetserverprogram.c | 13 ++++++++++++- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index 9588077..f739743 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -134,10 +134,25 @@ static void virNetServerHandleJob(void *jobOpaque, void *opaque) srv, job->client, job->msg, job->prog); if (!job->prog) { - if (virNetServerProgramUnknownError(job->client, - job->msg, - &job->msg->header) < 0) - goto error; + /* Only send back an error for type == CALL. Other + * message types are not expecting replies, so we + * must just log it & drop them + */ + if (job->msg->header.type == VIR_NET_CALL) { + if (virNetServerProgramUnknownError(job->client, + job->msg, + &job->msg->header) < 0) + goto error; + } else { + VIR_INFO("Dropping client mesage, unknown program %d version %d type %d proc %d", + job->msg->header.prog, job->msg->header.vers, + job->msg->header.type, job->msg->header.proc); + /* Send a dummy reply to free up 'msg' & unblock client rx */ + virNetMessageClear(job->msg); + job->msg->header.type = VIR_NET_REPLY; + if (virNetServerClientSendMessage(job->client, job->msg) < 0) + goto error; + } goto cleanup; } diff --git a/src/rpc/virnetserverprogram.c b/src/rpc/virnetserverprogram.c index 334a0bf..47b7ded 100644 --- a/src/rpc/virnetserverprogram.c +++ b/src/rpc/virnetserverprogram.c @@ -314,7 +314,18 @@ int virNetServerProgramDispatch(virNetServerProgramPtr prog, return ret; error: - ret = virNetServerProgramSendReplyError(prog, client, msg, &rerr, &msg->header); + if (msg->header.type == VIR_NET_CALL) { + ret = virNetServerProgramSendReplyError(prog, client, msg, &rerr, &msg->header); + } else { + /* Send a dummy reply to free up 'msg' & unblock client rx */ + virNetMessageClear(msg); + msg->header.type = VIR_NET_REPLY; + if (virNetServerClientSendMessage(client, msg) < 0) { + ret = -1; + goto cleanup; + } + ret = 0; + } cleanup: return ret; -- 1.7.6.2

2 1

[libvirt] [PATCH] Fix deadlock when the RPC program is unknown
by Daniel P. Berrange 06 Oct '11

06 Oct '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> Commit 597fe3cee68f561a181967b59a87b4e5c5880c4c accidentally introduced a deadlock when reporting an unknown RPC program. The virNetServerDispatchNewMessage method is called with the client locked, and must therefore not attempt to send any RPC messages back to the client. Only once the incoming message is passed off to the virNetServerHandleJob worker is it safe to start sending messages back * src/rpc/virnetserver.c: Delay checking for unknown RPC program until in worker thread --- src/rpc/virnetserver.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index d71ed18..9588077 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -133,6 +133,14 @@ static void virNetServerHandleJob(void *jobOpaque, void *opaque) VIR_DEBUG("server=%p client=%p message=%p prog=%p", srv, job->client, job->msg, job->prog); + if (!job->prog) { + if (virNetServerProgramUnknownError(job->client, + job->msg, + &job->msg->header) < 0) + goto error; + goto cleanup; + } + if (virNetServerProgramDispatch(job->prog, srv, job->client, @@ -142,6 +150,8 @@ static void virNetServerHandleJob(void *jobOpaque, void *opaque) virNetServerLock(srv); virNetServerProgramFree(job->prog); virNetServerUnlock(srv); + +cleanup: virNetServerClientFree(job->client); VIR_FREE(job); return; @@ -184,18 +194,14 @@ static int virNetServerDispatchNewMessage(virNetServerClientPtr client, } } - if (!prog) { - virNetServerProgramUnknownError(client, msg, &msg->header); - goto cleanup; + if (prog) { + virNetServerProgramRef(prog); + job->prog = prog; + priority = virNetServerProgramGetPriority(prog, msg->header.proc); } - virNetServerProgramRef(prog); - job->prog = prog; - priority = virNetServerProgramGetPriority(prog, msg->header.proc); - ret = virThreadPoolSendJob(srv->workers, priority, job); -cleanup: if (ret < 0) { VIR_FREE(job); virNetServerProgramFree(prog); -- 1.7.6.2

2 1

[libvirt] [PATCH v2 00/12] Implement keepalive protocol for libvirt RPC
by Jiri Denemark 06 Oct '11

06 Oct '11

This patchset can also be found at https://gitorious.org/~jirka/libvirt/jirka-staging/commits/keepalive This allows us to detect broken connections between server and client without waiting for TCP timeout and dead deamon/client. By default a connection is considered broken after about 30 seconds of no messages received from remote party. After that period, the connection is automatically closed. The main reason for implementing this is that peer-to-peer migration can now be canceled when a connection between source and target breaks. Although this will really work only after qemu fixes migrate_cancel command so that it doesn't block when outgoing TCP buffers are full. Version 2 adds virConnectIsAlive API and uses it to detect that a connection was closed as a result of keepalive timeout. The only patch that was changed in v2 is "Add keepalive support into domain-events examples". All other patches are either new or without any change from v1. Jiri Denemark (12): Define keepalive protocol Implement common keepalive handling Introduce two public APIs for keepalive protocol Implement keepalive protocol in libvirt daemon Add support for non-blocking calls in client RPC Add support for async close of client RPC socket Implement keepalive protocol in remote driver Introduce virConnectIsAlive API Implement virConnectIsAlive in all drivers Add keepalive support into domain-events examples qemu: Add support for keepalive messages during p2p migration qemu: Cancel p2p migration when connection breaks .gitignore | 1 + daemon/libvirtd.aug | 4 + daemon/libvirtd.c | 11 + daemon/libvirtd.conf | 15 + daemon/remote.c | 38 ++ examples/domain-events/events-c/event-test.c | 13 +- examples/domain-events/events-python/event-test.py | 5 +- include/libvirt/libvirt.h.in | 6 + po/POTFILES.in | 1 + src/Makefile.am | 13 +- src/driver.h | 12 + src/esx/esx_driver.c | 18 + src/hyperv/hyperv_driver.c | 18 + src/libvirt.c | 143 ++++++ src/libvirt_internal.h | 10 +- src/libvirt_public.syms | 7 + src/libxl/libxl_driver.c | 8 + src/lxc/lxc_driver.c | 7 + src/openvz/openvz_driver.c | 7 + src/phyp/phyp_driver.c | 18 + src/qemu/libvirtd_qemu.aug | 2 + src/qemu/qemu.conf | 16 + src/qemu/qemu_conf.c | 11 + src/qemu/qemu_conf.h | 3 + src/qemu/qemu_driver.c | 6 + src/qemu/qemu_migration.c | 49 ++- src/qemu/test_libvirtd_qemu.aug | 6 + src/remote/remote_driver.c | 48 ++ src/remote/remote_protocol.x | 2 +- src/rpc/virkeepalive.c | 464 ++++++++++++++++++++ src/rpc/virkeepalive.h | 58 +++ src/rpc/virkeepaliveprotocol.x | 8 + src/rpc/virnetclient.c | 335 ++++++++++++-- src/rpc/virnetclient.h | 6 + src/rpc/virnetserver.c | 10 + src/rpc/virnetserver.h | 2 + src/rpc/virnetserverclient.c | 126 +++++- src/rpc/virnetserverclient.h | 6 + src/test/test_driver.c | 6 + src/uml/uml_driver.c | 7 + src/vbox/vbox_tmpl.c | 6 + src/vmware/vmware_driver.c | 7 + src/xen/xen_driver.c | 8 + src/xenapi/xenapi_driver.c | 12 + 44 files changed, 1483 insertions(+), 76 deletions(-) create mode 100644 src/rpc/virkeepalive.c create mode 100644 src/rpc/virkeepalive.h create mode 100644 src/rpc/virkeepaliveprotocol.x -- 1.7.6.1

3 20

[libvirt] [PATCH] Make saving domain XML more robust
by Jiri Denemark 06 Oct '11

06 Oct '11

When saving domain XML (either config or status) we just overwrite old content of the file. In case something fails during that process (e.g. disk gets full) we lose both old and new content. This patch makes the process more robust by writing the new content into a separate file and only if that succeeds the original file is atomically replaced with the new one. --- src/conf/domain_conf.c | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f9007ce..04c2b1c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11025,6 +11025,7 @@ int virDomainSaveXML(const char *configDir, const char *xml) { char *configFile = NULL; + char *newfile = NULL; int fd = -1, ret = -1; size_t towrite; @@ -11038,12 +11039,17 @@ int virDomainSaveXML(const char *configDir, goto cleanup; } - if ((fd = open(configFile, + if (virAsprintf(&newfile, "%s.new", configFile) < 0) { + virReportOOMError(); + goto cleanup; + } + + if ((fd = open(newfile, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR )) < 0) { virReportSystemError(errno, _("cannot create config file '%s'"), - configFile); + newfile); goto cleanup; } @@ -11053,14 +11059,21 @@ int virDomainSaveXML(const char *configDir, if (safewrite(fd, xml, towrite) < 0) { virReportSystemError(errno, _("cannot write config file '%s'"), - configFile); + newfile); goto cleanup; } if (VIR_CLOSE(fd) < 0) { virReportSystemError(errno, _("cannot save config file '%s'"), - configFile); + newfile); + goto cleanup; + } + + if (rename(newfile, configFile) < 0) { + virReportSystemError(errno, + _("cannot rename config file '%s' as '%s'"), + newfile, configFile); goto cleanup; } @@ -11068,6 +11081,10 @@ int virDomainSaveXML(const char *configDir, cleanup: VIR_FORCE_CLOSE(fd); + if (newfile) { + unlink(newfile); + VIR_FREE(newfile); + } VIR_FREE(configFile); return ret; } -- 1.7.7

2 1