- Devel - libvirt List Archives

[libvirt] [PATCH 00/15] fix misuse of 'const fooPtr'
by Eric Blake 14 Oct '13

14 Oct '13

Mostly cleanup, but at least one bug fix (xen was instantiating a memballoon device too early, during the post-parse callback of the first device rather than after all devices were known). Spawned by the conversation here: https://www.redhat.com/archives/libvir-list/2013-September/thread.html#01311 Eric Blake (15): maint: avoid 'const fooPtr' in public API maint: avoid 'const fooPtr' in hashes maint: avoid 'const fooPtr' in several util files maint: avoid 'const fooPtr' in virnet files maint: avoid 'const fooPtr' in cpu files maint: avoid 'const fooPtr' in nwfilter files maint: avoid 'const fooPtr' in tests maint: avoid 'const fooPtr' in python bindings maint: fix awkward typing of virDomainChrGetDomainPtrs maint: avoid 'const fooPtr' in domain_conf maint: avoid 'const fooPtr' in conf maint: avoid 'const fooPtr' in security maint: avoid 'const fooPtr' in qemu maint: avoid 'const fooPtr' in all remaining places build: syntax check to avoid 'const fooPtr' cfg.mk | 8 ++ include/libvirt/libvirt.h.in | 6 +- python/generator.py | 11 -- python/libvirt-override.c | 4 +- src/conf/cpu_conf.c | 6 +- src/conf/cpu_conf.h | 8 +- src/conf/domain_conf.c | 164 ++++++++++++++++++------------ src/conf/domain_conf.h | 33 +++--- src/conf/interface_conf.c | 30 +++--- src/conf/interface_conf.h | 15 ++- src/conf/netdev_vlan_conf.c | 4 +- src/conf/netdev_vlan_conf.h | 4 +- src/conf/network_conf.c | 44 ++++---- src/conf/network_conf.h | 28 ++--- src/conf/node_device_conf.c | 14 +-- src/conf/node_device_conf.h | 14 +-- src/conf/nwfilter_conf.c | 6 +- src/conf/nwfilter_conf.h | 8 +- src/conf/nwfilter_params.c | 52 +++++----- src/conf/nwfilter_params.h | 32 +++--- src/conf/secret_conf.c | 8 +- src/conf/secret_conf.h | 4 +- src/conf/snapshot_conf.c | 6 +- src/conf/snapshot_conf.h | 6 +- src/cpu/cpu.c | 8 +- src/cpu/cpu.h | 16 +-- src/cpu/cpu_arm.c | 3 +- src/cpu/cpu_powerpc.c | 9 +- src/cpu/cpu_s390.c | 3 +- src/cpu/cpu_x86.c | 18 ++-- src/libxl/libxl_domain.c | 2 +- src/lxc/lxc_domain.c | 4 +- src/lxc/lxc_process.c | 4 +- src/nwfilter/nwfilter_dhcpsnoop.c | 12 +-- src/nwfilter/nwfilter_dhcpsnoop.h | 3 +- src/nwfilter/nwfilter_ebiptables_driver.c | 18 ++-- src/nwfilter/nwfilter_gentech_driver.c | 23 +++-- src/nwfilter/nwfilter_gentech_driver.h | 11 +- src/nwfilter/nwfilter_learnipaddr.c | 9 +- src/nwfilter/nwfilter_learnipaddr.h | 4 +- src/openvz/openvz_driver.c | 2 +- src/qemu/qemu_bridge_filter.c | 10 +- src/qemu/qemu_bridge_filter.h | 10 +- src/qemu/qemu_command.c | 34 +++---- src/qemu/qemu_conf.c | 2 +- src/qemu/qemu_domain.c | 5 +- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_hostdev.c | 2 +- src/qemu/qemu_monitor_json.c | 2 +- src/security/security_apparmor.c | 22 ++-- src/security/security_selinux.c | 2 +- src/uml/uml_driver.c | 15 +-- src/util/virbuffer.c | 8 +- src/util/virbuffer.h | 8 +- src/util/virebtables.c | 4 +- src/util/virebtables.h | 6 +- src/util/virhash.c | 21 ++-- src/util/virhash.h | 19 ++-- src/util/virmacaddr.c | 16 +-- src/util/virmacaddr.h | 16 +-- src/util/virnetdev.c | 20 ++-- src/util/virnetdev.h | 8 +- src/util/virnetdevbandwidth.c | 6 +- src/util/virnetdevbandwidth.h | 7 +- src/util/virnetdevmacvlan.c | 22 ++-- src/util/virnetdevmacvlan.h | 12 +-- src/util/virnetdevopenvswitch.c | 3 +- src/util/virnetdevopenvswitch.h | 3 +- src/util/virnetdevtap.c | 2 +- src/util/virnetdevtap.h | 4 +- src/util/virnetdevvlan.c | 6 +- src/util/virnetdevvlan.h | 6 +- src/util/virnetdevvportprofile.c | 28 ++--- src/util/virnetdevvportprofile.h | 10 +- src/util/virnetlink.c | 10 +- src/util/virnetlink.h | 8 +- src/util/virsocketaddr.c | 54 +++++----- src/util/virsocketaddr.h | 52 +++++----- src/xen/xen_driver.c | 12 ++- src/xen/xm_internal.c | 4 +- tests/cputest.c | 4 +- tests/qemucapabilitiestest.c | 2 +- tests/qemumonitorjsontest.c | 21 ++-- tests/virhashtest.c | 8 +- 84 files changed, 625 insertions(+), 555 deletions(-) -- 1.8.3.1

2 33

[libvirt] [PATCH] esx: Fix floppy.fileName handling in the vmx file parser
by Geoff Hickey 14 Oct '13

14 Oct '13

The vmx file parsing code was reporting errors when parsing floppy.fileName entries if the filename didn't end in .flp. There is no such restriction in ESX; even using the GUI to configure floppy filenames you can specify any arbitrary file with any extension. Fix by changing the vmx parsing code so that it uses the floppy.fileType value to determine whether floppy.fileName refers to a block device or a regular file. Also remove code that would have generated an error if no floppy.fileName was specified. This is not an error either. --- src/vmx/vmx.c | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 36bc338..48487f8 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -2250,27 +2250,14 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con goto cleanup; } } else if (device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) { - if (virFileHasSuffix(fileName, ".flp")) { - if (fileType != NULL) { - if (STRCASENEQ(fileType, "file")) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting VMX entry '%s' to be 'file' but " - "found '%s'"), fileType_name, fileType); - goto cleanup; - } - } - - (*def)->type = VIR_DOMAIN_DISK_TYPE_FILE; - (*def)->src = ctx->parseFileName(fileName, ctx->opaque); - - if ((*def)->src == NULL) { - goto cleanup; - } - } else if (fileType != NULL && STRCASEEQ(fileType, "device")) { + if (fileType != NULL && STRCASEEQ(fileType, "device")) { (*def)->type = VIR_DOMAIN_DISK_TYPE_BLOCK; (*def)->src = fileName; fileName = NULL; + } else if (fileType != NULL && STRCASEEQ(fileType, "file")) { + (*def)->type = VIR_DOMAIN_DISK_TYPE_FILE; + (*def)->src = ctx->parseFileName(fileName, ctx->opaque); } else { virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid or not yet handled value '%s' " @@ -3538,13 +3525,6 @@ virVMXFormatFloppy(virVMXContext *ctx, virDomainDiskDefPtr def, virBufferAsprintf(buffer, "floppy%d.fileType = \"file\"\n", unit); if (def->src != NULL) { - if (! virFileHasSuffix(def->src, ".flp")) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Image file for floppy '%s' has unsupported " - "suffix, expecting '.flp'"), def->dst); - return -1; - } - fileName = ctx->formatFileName(def->src, ctx->opaque); if (fileName == NULL) { -- 1.8.1.2

2 1

[libvirt] [RESEND][PATCHv5 0/4] write separate module for hostdev passthrough
by Chunyan Liu 14 Oct '13

14 Oct '13

[rebased to latest libvirt code for applying and reviewing the patches] These patches implements a separate module for hostdev passthrough so that it could be shared by different drivers and can maintain a global state of a host device. Plus, add passthrough to libxl driver, and change qemu driver and lxc driver to use hostdev common library instead of their own hostdev APIs. --- Changes to v4: * change the way checking hypervisor driver name to decide whether use pciback or pci-stub as stub driver, instead, using driver callback to handle that. * remove get active/inactive list APIs from hostdev common library since currently no code uses them. * add nodedev-detach/reattach/reset to libxl driver * other fixes to Daniel and Jim's comments v4 is here: https://www.redhat.com/archives/libvir-list/2013-August/msg00806.html Changes to v3: * fix Jim's comments v3 is here: https://www.redhat.com/archives/libvir-list/2013-August/msg00019.html Changes to v2: * add patches for qemu driver and lxc driver, use common library APIs instead of their own hostdev APIs. * add APIs for nodedev-detach and nodedev-reattach calling. * rename functions to use unified prefix 'virHostdev' * use VIR_ONCE_GLOBAL_INIT() as others instead of previous Init and Cleanup. * use VIR_STRDUP instead of strdup * rebase to latest code v2 is here: https://www.redhat.com/archives/libvir-list/2013-June/msg00263.html Chunyan Liu (4): add hostdev passthrough common library add pci passthrough to libxl driver change qemu driver to use hostdev common library change lxc driver to use hostdev common library docs/schemas/domaincommon.rng | 1 + po/POTFILES.in | 3 +- src/Makefile.am | 3 +- src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/libvirt_private.syms | 15 + src/libxl/libxl_conf.c | 63 ++ src/libxl/libxl_conf.h | 4 + src/libxl/libxl_domain.c | 9 + src/libxl/libxl_driver.c | 443 ++++++++++++++- src/lxc/lxc_conf.h | 4 - src/lxc/lxc_driver.c | 45 +- src/lxc/lxc_hostdev.c | 413 ------------- src/lxc/lxc_hostdev.h | 43 -- src/lxc/lxc_process.c | 21 +- src/qemu/qemu_command.c | 1 - src/qemu/qemu_conf.h | 9 +- src/qemu/qemu_domain.c | 9 + src/qemu/qemu_driver.c | 72 +-- src/qemu/qemu_hostdev.c | 1289 --------------------------------------- src/qemu/qemu_hostdev.h | 72 --- src/qemu/qemu_hotplug.c | 126 ++--- src/qemu/qemu_process.c | 34 +- src/util/virhostdev.c | 1335 +++++++++++++++++++++++++++++++++++++++++ src/util/virhostdev.h | 104 ++++ src/util/virpci.c | 28 +- src/util/virpci.h | 9 +- src/util/virscsi.c | 26 +- src/util/virscsi.h | 8 +- src/util/virusb.c | 27 +- src/util/virusb.h | 8 +- 31 files changed, 2195 insertions(+), 2033 deletions(-) delete mode 100644 src/lxc/lxc_hostdev.c delete mode 100644 src/lxc/lxc_hostdev.h delete mode 100644 src/qemu/qemu_hostdev.c delete mode 100644 src/qemu/qemu_hostdev.h create mode 100644 src/util/virhostdev.c create mode 100644 src/util/virhostdev.h

2 8

[libvirt] libvirt URI for "UNIX abstract namespace"?
by Philipp Hahn 14 Oct '13

14 Oct '13

Hello, while trying to reproduce a performance problem I had to fake 95 hosts with 300 VMs. My idea was to setup 95 users with each one running a session libvirtd. When adding them to our management system I had was troubled with finding the right libvirt URI, as the default session UNIX socket is in the "abstract ns", which has no file system representation. I solved that by explicitly starting the session libvirtds with a custom config only specifying a physical socket path: for ((h=0;h<95;h+=1));do su -c "/usr/sbin/libvirtd -f <(echo "unix_sock_dir=\"/home/host$h/.libvirt\"") -d" "host$h";done 1. is there a way to specify an libvirt URI using the abstract ns? 2. Does anybody know another/better way to simulate many hosts with many VMs? Thanks in advance. Philipp PS: libvirt-0.9.12 -- Philipp Hahn Open Source Software Engineer hahn(a)univention.de Univention GmbH be open. fon: +49 421 22 232- 0 Mary-Somerville-Str.1 D-28359 Bremen fax: +49 421 22 232-99 http://www.univention.de/ Director:Peter H. Ganten HRB 20755 Amtsgericht Bremen UID:DE 220 051 310

2 1

[libvirt] [PATCH 1/3] Revert "VMX: Some serial ports are not actually connected"
by Doug Goldstein 14 Oct '13

14 Oct '13

This reverts commit dba04e7fa070a79415ea16141ad2e2ebd4f23033. This change was unfortunately not correct. We should have been changing the boolean argument supplied. --- src/vmx/vmx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 38b7cc0..9906a9c 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -2718,7 +2718,7 @@ virVMXParseSerial(virVMXContext *ctx, virConfPtr conf, int port, /* vmx:fileName -> def:data.file.path */ if (virVMXGetConfigString(conf, fileName_name, &fileName, false) < 0) { - goto ignore; + goto cleanup; } /* vmx:network.endPoint -> def:data.tcp.listen */ -- 1.8.1.5

2 3

[libvirt] [PATCHv2] rpc: Retrieve peer PID via new getsockopt() for Mac
by Doug Goldstein 14 Oct '13

14 Oct '13

While LOCAL_PEERCRED on the BSDs does not return the pid information of the peer, Mac OS X 10.8 added LOCAL_PEERPID to retrieve the pid so we should use that when its available to get that information. --- v2: * Make LOCAL_PEERPID call non-fatal in case the user built the binary on a system that supports it but then runs it on a kernel that does not support it --- src/rpc/virnetsocket.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index e8cdfa6..7126c4f 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -1195,12 +1195,29 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr sock, return -1; } - /* PID and process creation time are not supported on BSDs */ + /* PID and process creation time are not supported on BSDs by + * LOCAL_PEERCRED. + */ *pid = -1; *timestamp = -1; *uid = cr.cr_uid; *gid = cr.cr_gid; +# ifdef LOCAL_PEERPID + /* Exists on Mac OS X 10.8 for retrieving the peer's PID */ + cr_len = sizeof(*pid); + + if (getsockopt(sock->fd, VIR_SOL_PEERCRED, LOCAL_PEERPID, pid, &cr_len) < 0) { + virReportSystemError(errno, "%s", + _("Failed to get client socket PID")); + /* Don't treat this as fatal, but do set the value to something sane + * in case the user built this on a system that has LOCAL_PEERPID + * defined but the kernel does not actually support it. + */ + *pid = -1; + } +# endif + virObjectUnlock(sock); return 0; } -- 1.8.1.5

2 2

[libvirt] [PATCHv3] qemu: snapshot: Add support for compressing external snapshot memory
by Peter Krempa 14 Oct '13

14 Oct '13

The regular save image code has the support to compress images using a specified algorithm. This was not implemented for external checkpoints although it shares most of the backend code. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1017227 --- Notes: Version 3: - added changes for augeas (and installed augeas to avoid such problems) src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 6 ++++++ src/qemu/qemu_conf.c | 2 ++ src/qemu/qemu_conf.h | 1 + src/qemu/qemu_driver.c | 23 +++++++++++++++++++++-- src/qemu/test_libvirtd_qemu.aug.in | 1 + 6 files changed, 32 insertions(+), 2 deletions(-) diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index 591d78d..32db983 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -58,6 +58,7 @@ module Libvirtd_qemu = let save_entry = str_entry "save_image_format" | str_entry "dump_image_format" + | str_entry "snapshot_image_format" | str_entry "auto_dump_path" | bool_entry "auto_dump_bypass_cache" | bool_entry "auto_start_bypass_cache" diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 3032aa6..bf57b9c 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -278,8 +278,14 @@ # the requested compression program can't be found, this falls # back to "raw" compression. # +# snapshot_image_format specifies the compression algorithm of the memory save +# image when an external snapshot of a domain is taken. This does not apply +# on disk image format. It is an error if the specified format isn't valid, +# or the requested compression program can't be found. +# #save_image_format = "raw" #dump_image_format = "raw" +#snapshot_image_format = "raw" # When a domain is configured to be auto-dumped when libvirtd receives a # watchdog event from qemu guest, libvirtd will save dump files in directory diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 16a0b92..295f1eb 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -521,6 +521,8 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, GET_VALUE_STR("save_image_format", cfg->saveImageFormat); GET_VALUE_STR("dump_image_format", cfg->dumpImageFormat); + GET_VALUE_STR("snapshot_image_format", cfg->snapshotImageFormat); + GET_VALUE_STR("auto_dump_path", cfg->autoDumpPath); GET_VALUE_BOOL("auto_dump_bypass_cache", cfg->autoDumpBypassCache); GET_VALUE_BOOL("auto_start_bypass_cache", cfg->autoStartBypassCache); diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 40adfce..ea3c691 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -144,6 +144,7 @@ struct _virQEMUDriverConfig { char *saveImageFormat; char *dumpImageFormat; + char *snapshotImageFormat; char *autoDumpPath; bool autoDumpBypassCache; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 80285ff..69086c2 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -12128,6 +12128,8 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn, bool transaction = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_TRANSACTION); int thaw = 0; /* 1 if freeze succeeded, -1 if freeze failed */ bool pmsuspended = false; + virQEMUDriverConfigPtr cfg = NULL; + int compressed = QEMU_SAVE_FORMAT_RAW; if (qemuDomainObjBeginAsyncJob(driver, vm, QEMU_ASYNC_JOB_SNAPSHOT) < 0) goto cleanup; @@ -12189,12 +12191,28 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn, JOB_MASK(QEMU_JOB_SUSPEND) | JOB_MASK(QEMU_JOB_MIGRATION_OP)); + cfg = virQEMUDriverGetConfig(driver); + if (cfg->snapshotImageFormat) { + compressed = qemuSaveCompressionTypeFromString(cfg->snapshotImageFormat); + if (compressed < 0) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("Invalid snapshot image format specified " + "in configuration file")); + goto cleanup; + } + if (!qemuCompressProgramAvailable(compressed)) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("Compression program for image format " + "in configuration file isn't available")); + goto cleanup; + } + } + if (!(xml = qemuDomainDefFormatLive(driver, vm->def, true, true))) goto endjob; if ((ret = qemuDomainSaveMemory(driver, vm, snap->def->file, - xml, QEMU_SAVE_FORMAT_RAW, - resume, 0, + xml, compressed, resume, 0, QEMU_ASYNC_JOB_SNAPSHOT)) < 0) goto endjob; @@ -12283,6 +12301,7 @@ endjob: cleanup: VIR_FREE(xml); + virObjectUnref(cfg); if (memory_unlink && ret < 0) unlink(snap->def->file); diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index 4b27db1..7af3f64 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -49,6 +49,7 @@ module Test_libvirtd_qemu = } { "save_image_format" = "raw" } { "dump_image_format" = "raw" } +{ "snapshot_image_format" = "raw" } { "auto_dump_path" = "/var/lib/libvirt/qemu/dump" } { "auto_dump_bypass_cache" = "0" } { "auto_start_bypass_cache" = "0" } -- 1.8.3.2

2 2

[libvirt] [PATCH 0/3] Misc LXC errore reporting improvements
by Daniel P. Berrange 14 Oct '13

14 Oct '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> A few more LXC fixes to improve error reporting Instead of # virsh -c lxc:/// start shell error: Failed to start domain shell error: internal error: guest failed to start: PATH=/bin:/sbin TERM=linux container=lxc-libvirt container_uuid=95449419-f969-d649-d996-2566ec42af7d LIBVIRT_LXC_UUID=95449419-f969-d649-d996-2566ec42af7d LIBVIRT_LXC_NAME=shell /bin/sh error receiving signal from container: Input/output error we now get # virsh -c lxc:/// start shell error: Failed to start domain shell error: internal error: guest failed to start: Failed to access '/mnt/btr/does/not/exist': No such file or directory Daniel P. Berrange (3): Ensure lxcContainerMain reports errors on stderr Ensure lxcContainerResolveSymlinks reports errors Improve log filtering in virLXCProcessReadLogOutputData src/lxc/lxc_container.c | 18 ++++++++++++++---- src/lxc/lxc_process.c | 16 +++++++++++++++- 2 files changed, 29 insertions(+), 5 deletions(-) -- 1.8.3.1

2 6

[libvirt] [PATCHv2 0/2] Enable compression of external snapshots and managed save images
by Peter Krempa 14 Oct '13

14 Oct '13

Version 2 treats save images and managed save images as same, using the same config option. Peter Krempa (2): qemu: managedsave: Add support for compressing managed save images qemu: snapshot: Add support for compressing external snapshot memory src/qemu/qemu.conf | 12 +++++++++--- src/qemu/qemu_conf.c | 2 ++ src/qemu/qemu_conf.h | 1 + src/qemu/qemu_driver.c | 46 ++++++++++++++++++++++++++++++++++++++++++---- 4 files changed, 54 insertions(+), 7 deletions(-) -- 1.8.3.2

2 6

[libvirt] [PATCH]virsh: support readonly in attach-disk command
by Chen Hanxiao 14 Oct '13

14 Oct '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> support readonly in attach-disk virsh command with option --readonly Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- tools/virsh-domain.c | 7 +++++++ tools/virsh.pod | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 3479a1c..d334ebe 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -315,6 +315,10 @@ static const vshCmdOptDef opts_attach_disk[] = { .type = VSH_OT_BOOL, .help = N_("shareable between domains") }, + {.name = "readonly", + .type = VSH_OT_BOOL, + .help = N_("allow guest read-only access to disk") + }, {.name = "rawio", .type = VSH_OT_BOOL, .help = N_("needs rawio capability") @@ -612,6 +616,9 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool(cmd, "shareable")) virBufferAddLit(&buf, " <shareable/>\n"); + if (vshCommandOptBool(cmd, "readonly")) + virBufferAddLit(&buf, " <readonly/>\n"); + if (straddr) { if (str2DiskAddress(straddr, &diskAddr) != 0) { vshError(ctl, _("Invalid address.")); diff --git a/tools/virsh.pod b/tools/virsh.pod index 0ae5178..91b4429 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1908,8 +1908,8 @@ expected. [[[I<--live>] [I<--config>] | [I<--current>]] | [I<--persistent>]] [I<--driver driver>] [I<--subdriver subdriver>] [I<--cache cache>] [I<--type type>] [I<--mode mode>] [I<--config>] [I<--sourcetype soucetype>] -[I<--serial serial>] [I<--wwn wwn>] [I<--shareable>] [I<--rawio>] -[I<--address address>] [I<--multifunction>] [I<--print-xml>] +[I<--serial serial>] [I<--wwn wwn>] [I<--shareable>] [I<--readonly>] +[I<--rawio>] [I<--address address>] [I<--multifunction>] [I<--print-xml>] Attach a new disk device to the domain. I<source> is path for the files and devices. I<target> controls the bus or @@ -1931,6 +1931,7 @@ I<cache> can be one of "default", "none", "writethrough", "writeback", "directsync" or "unsafe". I<serial> is the serial of disk device. I<wwn> is the wwn of disk device. I<shareable> indicates the disk device is shareable between domains. +I<readonly> indicates the disk device is read-only. I<rawio> indicates the disk needs rawio capability. I<address> is the address of disk device in the form of pci:domain.bus.slot.function, scsi:controller.bus.unit or ide:controller.bus.unit. -- 1.8.2.1

3 5