- Devel - libvirt List Archives

[libvirt] [PATCH] maint: prohibit translations in testsuite
by Eric Blake 20 Aug '12

20 Aug '12

Nothing in the testsuite or examples directory should be translated, as it is not part of the normally installed binary. We already meet this rule, but enforcing it will make it easier to remember. Suggested by Daniel P. Berrange. * cfg.mk (sc_prohibit_useless_translation): Enhance rule. --- cfg.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cfg.mk b/cfg.mk index 224f89f..4fd3165 100644 --- a/cfg.mk +++ b/cfg.mk @@ -587,10 +587,15 @@ sc_prohibit_diagnostic_without_format: exit 1; } || : # The strings "" and "%s" should never be marked for translation. +# Files under tests/ and examples/ should not be translated. sc_prohibit_useless_translation: @prohibit='_$"(%s)?"$' \ halt='$(ME): found useless translation' \ $(_sc_search_regexp) + @prohibit='\<N?_ *\(' \ + in_vc_files='^(tests|examples)/' \ + halt='$(ME): no translations in tests or examples' \ + $(_sc_search_regexp) # Enforce recommended preprocessor indentation style. sc_preprocessor_indentation: -- 1.7.11.4

2 2

[libvirt] [PATCH] selinux: Fix incorrect object label generation.
by Viktor Mihajlovski 20 Aug '12

20 Aug '12

This is a fix for the object label generation. It uses a new flag for virSecuritySELinuxGenNewContext that specifies whether the context is for an object. If so the context role remains unchanged. Without this fix it is not possible to start domains with image file or block device backed storage when selinux is enabled. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/security/security_selinux.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 48fd78b..8cf23b7 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -141,7 +141,9 @@ cleanup: static char * -virSecuritySELinuxGenNewContext(const char *basecontext, const char *mcs) +virSecuritySELinuxGenNewContext(const char *basecontext, + const char *mcs, + bool isObjectContext) { context_t context = NULL; char *ret = NULL; @@ -176,10 +178,11 @@ virSecuritySELinuxGenNewContext(const char *basecontext, const char *mcs) goto cleanup; } - if (context_role_set(context, + if (!isObjectContext && + context_role_set(context, context_role_get(ourContext)) != 0) { virReportSystemError(errno, - _("Unable to set SELinux context user '%s'"), + _("Unable to set SELinux context role '%s'"), context_role_get(ourContext)); goto cleanup; } @@ -421,7 +424,8 @@ virSecuritySELinuxGenSecurityLabel(virSecurityManagerPtr mgr, if (!(def->seclabel.label = virSecuritySELinuxGenNewContext(def->seclabel.baselabel ? def->seclabel.baselabel : - data->domain_context, mcs))) + data->domain_context, + mcs, false))) goto cleanup; break; @@ -438,7 +442,7 @@ virSecuritySELinuxGenSecurityLabel(virSecurityManagerPtr mgr, if (!def->seclabel.norelabel) { if (!(def->seclabel.imagelabel = - virSecuritySELinuxGenNewContext(data->file_context, mcs))) + virSecuritySELinuxGenNewContext(data->file_context, mcs, true))) goto cleanup; } @@ -1639,7 +1643,8 @@ virSecuritySELinuxGenImageLabel(virSecurityManagerPtr mgr, virReportOOMError(); goto cleanup; } - if (!(label = virSecuritySELinuxGenNewContext(data->file_context, mcs))) + if (!(label = virSecuritySELinuxGenNewContext(data->file_context, + mcs, true))) goto cleanup; } } -- 1.7.0.4

2 2

[libvirt] [PATCHv5 0/2] Rework of Disk Geometry Support
by Viktor Mihajlovski 20 Aug '12

20 Aug '12

With qemu it is possible to override the geometry (cylinders, heads, sectors) of disks. This series adds a new XML tag for geometry and the related support in the qemu driver. V2 Changes: Refactor into the generic domain configuration/XML support for disk geometry and a qemu specific part with the testcase V3 Changes: 1. Use virReportError instead of custom xxxReportError. 2. Moved the geometry element to diskspec, so it applies to all kind of disks. V4 Changes: Rebase for libvirt 0.10.0 freeze. V5 Changes: Corrected qemuxml2argvtest invocation. Oversight after rebase. J.B. Joret (2): Support for Disk Geometry Override qemu: Disk Geometry Override Support docs/formatdomain.html.in | 25 +++++++ docs/schemas/domaincommon.rng | 25 +++++++ src/conf/domain_conf.c | 71 ++++++++++++++++++++ src/conf/domain_conf.h | 17 +++++ src/libvirt_private.syms | 2 + src/qemu/qemu_command.c | 59 ++++++++++++++++ .../qemuxml2argv-disk-geometry.args | 4 + .../qemuxml2argv-disk-geometry.xml | 26 +++++++ tests/qemuxml2argvtest.c | 2 + 9 files changed, 231 insertions(+), 0 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.xml

2 5

[libvirt] [PATCH] fix make syntak error
by Wen Congyang 20 Aug '12

20 Aug '12

We move the macro vshStrcasecmp from tools/virsh.c to tools/virsh.h after commit c2e494cc, so we should not check strcase* in the file tools/virsh.h. Some macros are not properly indented in the file tools/virsh.h and tools/virsh-domain.h. This patch also fixes this problem. --- cfg.mk | 2 +- tools/virsh-domain.h | 2 +- tools/virsh.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cfg.mk b/cfg.mk index e9138a8..d2e54e3 100644 --- a/cfg.mk +++ b/cfg.mk @@ -727,7 +727,7 @@ $(srcdir)/src/remote/remote_client_bodies.h: $(srcdir)/src/remote/remote_protoco $(MAKE) -C src remote/remote_client_bodies.h # List all syntax-check exemptions: -exclude_file_name_regexp--sc_avoid_strcase = ^tools/virsh\.c$$ +exclude_file_name_regexp--sc_avoid_strcase = ^tools/virsh\.h$$ _src1=libvirt|fdstream|qemu/qemu_monitor|util/(command|util)|xen/xend_internal|rpc/virnetsocket|lxc/lxc_controller exclude_file_name_regexp--sc_avoid_write = \ diff --git a/tools/virsh-domain.h b/tools/virsh-domain.h index 797462f..b1b7930 100644 --- a/tools/virsh-domain.h +++ b/tools/virsh-domain.h @@ -24,7 +24,7 @@ */ #ifndef VIRSH_DOMAIN_H -#define VIRSH_DOMAIN_H +# define VIRSH_DOMAIN_H # include "virsh.h" diff --git a/tools/virsh.h b/tools/virsh.h index 69f37cc..0b1f123 100644 --- a/tools/virsh.h +++ b/tools/virsh.h @@ -23,7 +23,7 @@ */ #ifndef VIRSH_H -#define VIRSH_H +# define VIRSH_H # include <stdio.h> # include <stdlib.h> -- 1.7.1

4 3

[libvirt] [PATCHv5 0/2] Rework of Disk Geometry Support
by Viktor Mihajlovski 20 Aug '12

20 Aug '12

With qemu it is possible to override the geometry (cylinders, heads, sectors) of disks. This series adds a new XML tag for geometry and the related support in the qemu driver. V2 Changes: Refactor into the generic domain configuration/XML support for disk geometry and a qemu specific part with the testcase V3 Changes: 1. Use virReportError instead of custom xxxReportError. 2. Moved the geometry element to diskspec, so it applies to all kind of disks. V4 Changes: Rebase for libvirt 0.10.0 freeze. V5 Changes: Corrected qemuxml2argvtest invocation. Oversight after rebase. J.B. Joret (2): Support for Disk Geometry Override qemu: Disk Geometry Override Support docs/formatdomain.html.in | 25 +++++++ docs/schemas/domaincommon.rng | 25 +++++++ src/conf/domain_conf.c | 71 ++++++++++++++++++++ src/conf/domain_conf.h | 17 +++++ src/libvirt_private.syms | 2 + src/qemu/qemu_command.c | 59 ++++++++++++++++ .../qemuxml2argv-disk-geometry.args | 4 + .../qemuxml2argv-disk-geometry.xml | 26 +++++++ tests/qemuxml2argvtest.c | 2 + 9 files changed, 231 insertions(+), 0 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.xml

1 3

[libvirt] [test-API][PATCH] utils: Update remote_exec_pexpect function and sync cases
by Wayne Sun 20 Aug '12

20 Aug '12

After delete duplicate remote_exec_pexect function, the left function with same name causes some problem with cases, so update the function and sync all cases using it. Signed-off-by: Wayne Sun <gsun(a)redhat.com> --- repos/domain/cpu_topology.py | 8 +++--- repos/domain/define.py | 7 +++-- repos/remoteAccess/tcp_setup.py | 36 +++++++++++++++++----------------- repos/remoteAccess/tls_setup.py | 41 ++++++++++++++++++++------------------- utils/utils.py | 19 ++++++++--------- 5 files changed, 56 insertions(+), 55 deletions(-) diff --git a/repos/domain/cpu_topology.py b/repos/domain/cpu_topology.py index 5f4ef52..14fe67d 100644 --- a/repos/domain/cpu_topology.py +++ b/repos/domain/cpu_topology.py @@ -126,17 +126,17 @@ def cpu_topology_chk(ip, username, password, lscpu = "lscpu" # sleep for 5 seconds time.sleep(40) - ret, output = utils.remote_exec_pexpect(ip, username, password, lscpu) + ret = utils.remote_exec_pexpect(ip, username, password, lscpu) logger.debug("lscpu:") - logger.debug(output) - if ret: + logger.debug(ret) + if ret == "TIMEOUT!!!": logger.error("failed to run lscpu on guest OS") return 1 int = 0 actual_thread = actual_core = actual_socket = '' - for item in output.strip().split('\r'): + for item in ret.split('\r'): if int == 5: actual_thread = item.split()[-1] logger.info("the actual thread in the guest is %s" % actual_thread) diff --git a/repos/domain/define.py b/repos/domain/define.py index a70ddad..2b127a7 100644 --- a/repos/domain/define.py +++ b/repos/domain/define.py @@ -44,9 +44,10 @@ def check_define_domain(guestname, virt_type, hostname, username, \ if hostname: cmd = "ls %s" % path - ret, output = utils.remote_exec_pexpect(hostname, username, \ - password, cmd) - if ret: + ret = utils.remote_exec_pexpect(hostname, username, password, cmd) + cmd = "grep 'No such file' %s" % ret + ret = utils.exec_cmd(cmd) + if ret == 0: logger.error("guest %s xml file doesn't exsits" % guestname) return False else: diff --git a/repos/remoteAccess/tcp_setup.py b/repos/remoteAccess/tcp_setup.py index ddbe333..7a963e7 100644 --- a/repos/remoteAccess/tcp_setup.py +++ b/repos/remoteAccess/tcp_setup.py @@ -26,9 +26,9 @@ def sasl_user_add(target_machine, username, password, logger): """ execute saslpasswd2 to add sasl user """ logger.info("add sasl user on server side") saslpasswd2_add = "echo %s | %s -a libvirt %s" % (password, SASLPASSWD2, username) - ret, output = utils.remote_exec_pexpect(target_machine, username, + ret = utils.remote_exec_pexpect(target_machine, username, password, saslpasswd2_add) - if ret: + if ret == "TIMEOUT!!!": logger.error("failed to add sasl user") return 1 @@ -40,18 +40,18 @@ def tcp_libvirtd_set(target_machine, username, password, logger.info("setting libvirtd.conf on libvirt server") # open libvirtd --listen option listen_open_cmd = "echo 'LIBVIRTD_ARGS=\"--listen\"' >> %s" % SYSCONFIG_LIBVIRTD - ret, output = utils.remote_exec_pexpect(target_machine, username, + ret = utils.remote_exec_pexpect(target_machine, username, password, listen_open_cmd) - if ret: + if ret == "TIMEOUT!!!": logger.error("failed to uncomment --listen in %s" % SYSCONFIG_LIBVIRTD) return 1 # set listen_tls logger.info("set listen_tls to 0 in %s" % LIBVIRTD_CONF) listen_tls_disable = "echo \"listen_tls = 0\" >> %s" % LIBVIRTD_CONF - ret, output = utils.remote_exec_pexpect(target_machine, username, + ret = utils.remote_exec_pexpect(target_machine, username, password, listen_tls_disable) - if ret: + if ret == "TIMEOUT!!!": logger.error("failed to set listen_tls to 0 in %s" % LIBVIRTD_CONF) return 1 @@ -59,27 +59,27 @@ def tcp_libvirtd_set(target_machine, username, password, if listen_tcp == 'enable': logger.info("enable listen_tcp = 1 in %s" % LIBVIRTD_CONF) listen_tcp_set = "echo 'listen_tcp = 1' >> %s" % LIBVIRTD_CONF - ret, output = utils.remote_exec_pexpect(target_machine, username, + ret = utils.remote_exec_pexpect(target_machine, username, password, listen_tcp_set) - if ret: + if ret == "TIMEOUT!!!": logger.error("failed to set listen_tcp in %s" % LIBVIRTD_CONF) return 1 # set auth_tcp logger.info("set auth_tcp to \"%s\" in %s" % (auth_tcp, LIBVIRTD_CONF)) auth_tcp_set = "echo 'auth_tcp = \"%s\"' >> %s" % (auth_tcp, LIBVIRTD_CONF) - ret, output = utils.remote_exec_pexpect(target_machine, username, + ret = utils.remote_exec_pexpect(target_machine, username, password, auth_tcp_set) - if ret: + if ret == "TIMEOUT!!!": logger.error("failed to set auth_tcp in %s" % LIBVIRTD_CONF) return 1 # restart remote libvirtd service libvirtd_restart_cmd = "service libvirtd restart" logger.info("libvirtd restart") - ret, output = utils.remote_exec_pexpect(target_machine, username, + ret = utils.remote_exec_pexpect(target_machine, username, password, libvirtd_restart_cmd) - if ret: + if ret == "TIMEOUT!!!": logger.error("failed to restart libvirtd service") return 1 @@ -187,18 +187,18 @@ def tcp_setup_clean(params): if auth_tcp == 'sasl': saslpasswd2_delete = "%s -a libvirt -d %s" % (SASLPASSWD2, username) - ret, output = utils.remote_exec_pexpect(target_machine, username, + ret = utils.remote_exec_pexpect(target_machine, username, password, saslpasswd2_delete) - if ret: + if ret == "TIMEOUT!!!": logger.error("failed to delete sasl user") libvirtd_conf_retore = "sed -i -n '/^[ #]/p' %s" % LIBVIRTD_CONF - ret, output = utils.remote_exec_pexpect(target_machine, username, + ret = utils.remote_exec_pexpect(target_machine, username, password, libvirtd_conf_retore) - if ret: + if ret == "TIMEOUT!!!": logger.error("failed to restore %s" % LIBVIRTD_CONF) sysconfig_libvirtd_restore = "sed -i -n '/^[ #]/p' %s" % SYSCONFIG_LIBVIRTD - ret, output = utils.remote_exec_pexpect(target_machine, username, + ret = utils.remote_exec_pexpect(target_machine, username, password, sysconfig_libvirtd_restore) - if ret: + if ret == "TIMEOUT!!!": logger.error("failed to restore %s" % SYSCONFIG_LIBVIRTD) diff --git a/repos/remoteAccess/tls_setup.py b/repos/remoteAccess/tls_setup.py index f8b3cea..3e614f5 100644 --- a/repos/remoteAccess/tls_setup.py +++ b/repos/remoteAccess/tls_setup.py @@ -178,8 +178,9 @@ def deliver_cert(target_machine, username, password, pkipath, logger): # mkdir /etc/pki/libvirt/private on remote host libvirt_priv_cmd = "mkdir -p %s" % PRIVATE_KEY_FOLDER - ret, output = utils.remote_exec_pexpect(target_machine, username, password, libvirt_priv_cmd) - if ret: + ret = utils.remote_exec_pexpect(target_machine, username, password, + libvirt_priv_cmd) + if ret == "TIMEOUT!!!": logger.error("failed to make /etc/pki/libvirt/private on %s" % target_machine) return 1 @@ -222,9 +223,9 @@ def sasl_user_add(target_machine, username, password, logger): """ execute saslpasswd2 to add sasl user """ logger.info("add sasl user on server side") saslpasswd2_add = "echo %s | %s -a libvirt %s" % (password, SASLPASSWD2, username) - ret, output = utils.remote_exec_pexpect(target_machine, username, + ret = utils.remote_exec_pexpect(target_machine, username, password, saslpasswd2_add) - if ret: + if ret == "TIMEOUT!!!": logger.error("failed to add sasl user") return 1 @@ -236,36 +237,36 @@ def tls_libvirtd_set(target_machine, username, password, logger.info("setting libvirtd.conf on tls server") # open libvirtd --listen option listen_open_cmd = "echo 'LIBVIRTD_ARGS=\"--listen\"' >> /etc/sysconfig/libvirtd" - ret, output = utils.remote_exec_pexpect(target_machine, username, + ret = utils.remote_exec_pexpect(target_machine, username, password, listen_open_cmd) - if ret: + if ret == "TIMEOUT!!!": logger.error("failed to uncomment --listen in /etc/sysconfig/libvirtd") return 1 if listen_tls == 'disable': logger.info("set listen_tls to 0 in %s" % LIBVIRTD_CONF) listen_tls_disable = "echo \"listen_tls = 0\" >> %s" % LIBVIRTD_CONF - ret, output = utils.remote_exec_pexpect(target_machine, username, + ret = utils.remote_exec_pexpect(target_machine, username, password, listen_tls_disable) - if ret: + if ret == "TIMEOUT!!!": logger.error("failed to set listen_tls to 0 in %s" % LIBVIRTD_CONF) return 1 if auth_tls == 'sasl': logger.info("enable auth_tls = sasl in %s" % LIBVIRTD_CONF) auth_tls_set = "echo 'auth_tls = \"sasl\"' >> %s" % LIBVIRTD_CONF - ret, output = utils.remote_exec_pexpect(target_machine, username, + ret = utils.remote_exec_pexpect(target_machine, username, password, auth_tls_set) - if ret: + if ret == "TIMEOUT!!!": logger.error("failed to set auth_tls to sasl in %s" % LIBVIRTD_CONF) return 1 # restart remote libvirtd service libvirtd_restart_cmd = "service libvirtd restart" logger.info("libvirtd restart") - ret, output = utils.remote_exec_pexpect(target_machine, username, + ret = utils.remote_exec_pexpect(target_machine, username, password, libvirtd_restart_cmd) - if ret: + if ret == "TIMEOUT!!!": logger.error("failed to restart libvirtd service") return 1 @@ -276,9 +277,9 @@ def iptables_stop(target_machine, username, password, logger): """ This is a temprory method in favor of migration """ logger.info("stop local and remote iptables temprorily") iptables_stop_cmd = "service iptables stop" - ret, output = utils.remote_exec_pexpect(target_machine, username, + ret = utils.remote_exec_pexpect(target_machine, username, password, iptables_stop_cmd) - if ret: + if ret == "TIMEOUT!!!": logger.error("failed to stop remote iptables service") return 1 @@ -423,15 +424,15 @@ def tls_setup_clean(params): auth_tls = params['auth_tls'] cacert_rm = "rm -f %s/cacert.pem" % CA_FOLDER - ret, output = utils.remote_exec_pexpect(target_machine, username, + ret = utils.remote_exec_pexpect(target_machine, username, password, cacert_rm) - if ret: + if ret == "TIMEOUT!!!": logger.error("failed to remove cacert.pem on remote machine") ca_libvirt_rm = "rm -rf %s" % CERTIFICATE_FOLDER - ret, output = utils.remote_exec_pexpect(target_machine, username, + ret = utils.remote_exec_pexpect(target_machine, username, password, ca_libvirt_rm) - if ret: + if ret == "TIMEOUT!!!": logger.error("failed to remove libvirt folder") os.remove("%s/cacert.pem" % CA_FOLDER) @@ -439,8 +440,8 @@ def tls_setup_clean(params): if auth_tls == 'sasl': saslpasswd2_delete = "%s -a libvirt -d %s" % (SASLPASSWD2, username) - ret, output = utils.remote_exec_pexpect(target_machine, username, + ret = utils.remote_exec_pexpect(target_machine, username, password, saslpasswd2_delete) - if ret: + if ret == "TIMEOUT!!!": logger.error("failed to delete sasl user") diff --git a/utils/utils.py b/utils/utils.py index b174a58..40b3724 100644 --- a/utils/utils.py +++ b/utils/utils.py @@ -431,12 +431,10 @@ def remote_exec_pexpect(hostname, username, password, cmd): child.sendline(password) elif index == 2: child.close() - return 0, child.before + return string.strip(child.before) elif index == 3: child.close() - return 1, "" - - return 0 + return "TIMEOUT!!!" def scp_file(hostname, username, password, target_path, file): """ Scp file to remote host """ @@ -535,12 +533,13 @@ def get_remote_memory(hostname, username, password): i = 0 while i < 3: i += 1 - memsize = \ - int(remote_exec_pexpect(hostname, username, password, cmd)) * 1024 - if memsize == -1: - continue - else: - break + ret = remote_exec_pexpect(hostname, username, password, cmd) + if ret != "TIMEOUT!!!": + memsize = int(ret) * 1024 + if memsize == -1: + continue + else: + break return memsize def get_remote_kernel(hostname, username, password): -- 1.7.1

1 0

[libvirt] [PATCH] selinux: Fix incorrect file label generation.
by Viktor Mihajlovski 20 Aug '12

20 Aug '12

This is an ad-hoc fix for the file label generation. It uses the base context role to determine whether to use the libvirt process context role. If this is object_r we don't touch it. It might be better to add a new flag to virSecuritySELinuxGenNewContext that specifies the context type (process or file) in the future. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/security/security_selinux.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 48fd78b..34b9aad 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -176,7 +176,9 @@ virSecuritySELinuxGenNewContext(const char *basecontext, const char *mcs) goto cleanup; } - if (context_role_set(context, + /* don't exchange role context if object_r as this is a file context */ + if (strcmp("object_r", context_role_get(context)) && + context_role_set(context, context_role_get(ourContext)) != 0) { virReportSystemError(errno, _("Unable to set SELinux context user '%s'"), -- 1.7.0.4

4 4

[libvirt] [PATCHv5 2/2] qemu: Disk Geometry Override Support
by Viktor Mihajlovski 20 Aug '12

20 Aug '12

From: J.B. Joret <jb(a)linux.vnet.ibm.com> Qemu command line generation for geometry override and testcases. V2 Changes: squashed qemu code and testcases. V3 Changes: use virReportError. V4 Changes: rebase V5 Changes: Fixed test invocation for geometry. Signed-off-by: J.B. Joret <jb(a)linux.vnet.ibm.com> Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/qemu/qemu_command.c | 59 ++++++++++++++++++++ .../qemuxml2argv-disk-geometry.args | 4 + .../qemuxml2argv-disk-geometry.xml | 26 +++++++++ tests/qemuxml2argvtest.c | 2 + 4 files changed, 91 insertions(+), 0 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.xml diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9383530..cc44015 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2073,6 +2073,8 @@ qemuBuildDriveStr(virConnectPtr conn ATTRIBUTE_UNUSED, { virBuffer opt = VIR_BUFFER_INITIALIZER; const char *bus = virDomainDiskQEMUBusTypeToString(disk->bus); + const char *trans = + virDomainDiskGeometryTransTypeToString(disk->geometry.trans); int idx = virDiskNameToIndex(disk->dst); int busid = -1, unitid = -1; @@ -2275,6 +2277,24 @@ qemuBuildDriveStr(virConnectPtr conn ATTRIBUTE_UNUSED, disk->type != VIR_DOMAIN_DISK_TYPE_DIR && qemuCapsGet(qemuCaps, QEMU_CAPS_DRIVE_FORMAT)) virBufferAsprintf(&opt, ",format=%s", disk->driverType); + + /* generate geometry command string*/ + if (disk->type == VIR_DOMAIN_DISK_TYPE_BLOCK || + disk->type == VIR_DOMAIN_DISK_TYPE_FILE) { + if (disk->geometry.cylinders > 0 && + disk->geometry.heads > 0 && + disk->geometry.sectors > 0) { + + virBufferAsprintf(&opt, ",cyls=%u,heads=%u,secs=%u", + disk->geometry.cylinders, + disk->geometry.heads, + disk->geometry.sectors); + + if (disk->geometry.trans != VIR_DOMAIN_DISK_TRANS_DEFAULT) + virBufferEscapeString(&opt, ",trans=%s", trans); + } + } + if (disk->serial && qemuCapsGet(qemuCaps, QEMU_CAPS_DRIVE_SERIAL)) { if (qemuSafeSerialParamValue(disk->serial) < 0) @@ -6691,6 +6711,7 @@ qemuParseCommandLineDisk(virCapsPtr caps, int idx = -1; int busid = -1; int unitid = -1; + int trans = VIR_DOMAIN_DISK_TRANS_DEFAULT; if ((nkeywords = qemuParseKeywords(val, &keywords, @@ -6895,6 +6916,44 @@ qemuParseCommandLineDisk(virCapsPtr caps, virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot parse io mode '%s'"), values[i]); } + } else if (STREQ(keywords[i], "cyls")) { + if (virStrToLong_ui(values[i], NULL, 10, + &(def->geometry.cylinders)) < 0) { + virDomainDiskDefFree(def); + def = NULL; + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse cylinders value'%s'"), + values[i]); + } + } else if (STREQ(keywords[i], "heads")) { + if (virStrToLong_ui(values[i], NULL, 10, + &(def->geometry.heads)) < 0) { + virDomainDiskDefFree(def); + def = NULL; + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse heads value'%s'"), + values[i]); + } + } else if (STREQ(keywords[i], "secs")) { + if (virStrToLong_ui(values[i], NULL, 10, + &(def->geometry.sectors)) < 0) { + virDomainDiskDefFree(def); + def = NULL; + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse sectors value'%s'"), + values[i]); + } + } else if (STREQ(keywords[i], "trans")) { + def->geometry.trans = + virDomainDiskGeometryTransTypeFromString(values[i]); + if ((trans < VIR_DOMAIN_DISK_TRANS_DEFAULT) || + (trans >= VIR_DOMAIN_DISK_TRANS_LAST)) { + virDomainDiskDefFree(def); + def = NULL; + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse translation value'%s'"), + values[i]); + } } } diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args new file mode 100644 index 0000000..7cd6650 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args @@ -0,0 +1,4 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ +pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi -boot c -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,cyls=16383,heads=16,secs=63,trans=lba \ +-net none -serial none -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.xml new file mode 100644 index 0000000..f0cf4ae --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.xml @@ -0,0 +1,26 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219136</memory> + <currentMemory>219136</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <geometry cyls='16383' heads='16' secs='63' trans='lba'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index f8d8db5..71513fb 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -788,6 +788,8 @@ mymain(void) QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_IDE_CD); + DO_TEST("disk-geometry", QEMU_CAPS_DRIVE); + VIR_FREE(driver.stateDir); virCapabilitiesFree(driver.caps); VIR_FREE(map); -- 1.7.0.4

1 0

[libvirt] [PATCHv4 0/2] Rework of Disk Geometry Support
by Viktor Mihajlovski 20 Aug '12

20 Aug '12

With qemu it is possible to override the geometry (cylinders, heads, sectors) of disks. This series adds a new XML tag for geometry and the related support in the qemu driver. V2 Changes: Refactor into the generic domain configuration/XML support for disk geometry and a qemu specific part with the testcase V3 Changes: 1. Use virReportError instead of custom xxxReportError. 2. Moved the geometry element to diskspec, so it applies to all kind of disks. V4 Changes: Rebase for libvirt 0.10.0 freeze. J.B. Joret (2): Support for Disk Geometry Override qemu: Disk Geometry Override Support docs/formatdomain.html.in | 25 +++++++ docs/schemas/domaincommon.rng | 25 +++++++ src/conf/domain_conf.c | 71 ++++++++++++++++++++ src/conf/domain_conf.h | 17 +++++ src/libvirt_private.syms | 2 + src/qemu/qemu_command.c | 59 ++++++++++++++++ .../qemuxml2argv-disk-geometry.args | 4 + .../qemuxml2argv-disk-geometry.xml | 26 +++++++ tests/qemuxml2argvtest.c | 2 + 9 files changed, 231 insertions(+), 0 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.xml

1 3

[libvirt] [PATCH 0/7] support guest agent general command v3
by MATSUDA, Daiki 20 Aug '12

20 Aug '12

Hi. All. I rewrote the patched. But I modified the feature for the situation @result pointer is NULL. Though before it does not forcely wait, I think it is not meanless because @result pointer is always NULL. And @timeout must be following VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK(-2) : does not block and wait forever. VIR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT(-1) : use default time for waiting VIR_DOMAIN_QEMU_AGENT_COMMAND_NOWIAT(0) : does not wait and out soon positive value : wait for pointed seconds. In addition, I added the some options for virsh command qemu-agent-command --block : it means taht @timeout is VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK. --async : it means taht @timeout is VIR_DOMAIN_QEMU_AGENT_COMMAND_NOWIAT. --timeout @seconds : @seconds must be positive value and it means that @timeout is positive value case. These upper options are exclusive. If no options are given, it means taht @timeout is IR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT. virsh # help qemu-agent-command NAME qemu-agent-command - QEMU Guest Agent Command SYNOPSIS qemu-agent-command <domain> [--timeout <number>] [--async] [--block] {[--cmd] <string>}... DESCRIPTION Run an arbitrary qemu guest agent command; use at your own risk OPTIONS [--domain] <string> domain name, id or uuid --timeout <number> timeout seconds. must be positive. --async execute command without waiting for timeout --block execute command without timeout [--cmd] <string> command virsh # qemu-agent-command RHEL58_64 '{"execute":"guest-info"}' {"return":{"version":"1.1.50","supported_commands":[{"enabled":true,"name":"guest-network-get-interfaces"},{"enabled":true,"name":"guest-suspend-hybrid"},{"enabled":true,"name":"guest-suspend-ram"},{"enabled":true,"name":"guest-suspend-disk"},{"enabled":true,"name":"guest-fsfreeze-thaw"},{"enabled":true,"name":"guest-fsfreeze-freeze"},{"enabled":true,"name":"guest-fsfreeze-status"},{"enabled":true,"name":"guest-file-flush"},{"enabled":true,"name":"guest-file-seek"},{"enabled":true,"name":"guest-file-write"},{"enabled":true,"name":"guest-file-read"},{"enabled":true,"name":"guest-file-close"},{"enabled":true,"name":"guest-file-open"},{"enabled":true,"name":"guest-shutdown"},{"enabled":true,"name":"guest-info"},{"enabled":true,"name":"guest-ping"},{"enabled":true,"name":"guest-sync"},{"enabled":true,"name":"guest-sync-delimited"}]}} virsh # qemu-agent-command --block RHEL58_64 '{"execute":"guest-sync","arguments":{"id":123}}' {"return":123}

3 17