- Devel - libvirt List Archives

[libvirt] [PATCH] Implement virsh managedsave-remove command.
by Chris Lalancette 08 Jul '10

08 Jul '10

Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- tools/virsh.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 6 ++++++ 2 files changed, 61 insertions(+), 0 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 2d749de..8e5aa42 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1452,6 +1452,60 @@ cmdManagedSave(vshControl *ctl, const vshCmd *cmd) } /* + * "managedsave-remove" command + */ +static const vshCmdInfo info_managedsaveremove[] = { + {"help", N_("Remove managed save of a domain")}, + {"desc", N_("Remove an existing managed save state file from a domain")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_managedsaveremove[] = { + {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdManagedSaveRemove(vshControl *ctl, const vshCmd *cmd) +{ + virDomainPtr dom; + char *name; + int ret = FALSE; + int hassave; + + if (!vshConnectionUsability(ctl, ctl->conn)) + return FALSE; + + if (!(dom = vshCommandOptDomain(ctl, cmd, &name))) + return FALSE; + + hassave = virDomainHasManagedSaveImage(dom, 0); + if (hassave < 0) { + vshError(ctl, _("Failed to check for domain managed save image")); + goto cleanup; + } + + if (hassave) { + if (virDomainManagedSaveRemove(dom, 0) < 0) { + vshError(ctl, _("Failed to remove managed save image for domain %s"), + name); + goto cleanup; + } + else + vshPrint(ctl, _("Removed managedsave image for domain %s"), name); + } + else + vshPrint(ctl, _("Domain %s has no manage save image; removal skipped"), + name); + + ret = TRUE; + +cleanup: + virDomainFree(dom); + return ret; +} + +/* * "schedinfo" command */ static const vshCmdInfo info_schedinfo[] = { @@ -9273,6 +9327,7 @@ static const vshCmdDef commands[] = { {"iface-destroy", cmdInterfaceDestroy, opts_interface_destroy, info_interface_destroy}, {"managedsave", cmdManagedSave, opts_managedsave, info_managedsave}, + {"managedsave-remove", cmdManagedSaveRemove, opts_managedsaveremove, info_managedsaveremove}, {"nodeinfo", cmdNodeinfo, NULL, info_nodeinfo}, diff --git a/tools/virsh.pod b/tools/virsh.pod index 2b2227f..eb1fd04 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -380,6 +380,12 @@ Ask libvirt to save a running domain state in a place managed by libvirt. If libvirt is asked to restart the domain later on it will resume it from the saved domain state (and the state is discarded). +=item B<managedsave-remove> I<domain-id> + +Remove the managed save file for a domain if it exists. The next time the +domain is started it will not restore to its previous state but instead will +do a full boot. + =item B<migrate> optional I<--live> I<--suspend> I<domain-id> I<desturi> I<migrateuri> Migrate domain to another host. Add --live for live migration; --suspend -- 1.6.6.1

2 2

[libvirt] [PATCH] daemon: Fix compilation error of dispatch.c
by Ryota Ozaki 08 Jul '10

08 Jul '10

[error message] CC libvirtd-dispatch.o dispatch.c: In function 'remoteDispatchFormatError': dispatch.c:83: error: 'va_list' undeclared (first use in this function) dispatch.c:83: error: (Each undeclared identifier is reported only once dispatch.c:83: error: for each function it appears in.) dispatch.c:83: error: expected ';' before 'args' cc1: warnings being treated as errors dispatch.c:87: error: implicit declaration of function 'va_start' [-Wimplicit-function-declaration] dispatch.c:87: error: nested extern declaration of 'va_start' [-Wnested-externs] dispatch.c:87: error: 'args' undeclared (first use in this function) dispatch.c:88: error: implicit declaration of function 'vsnprintf' [-Wimplicit-function-declaration] dispatch.c:89: error: implicit declaration of function 'va_end' [-Wimplicit-function-declaration] dispatch.c:89: error: nested extern declaration of 'va_end' [-Wnested-externs] * daemon/dispatch.c: include stdio.h and stdarg.h --- daemon/dispatch.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/daemon/dispatch.c b/daemon/dispatch.c index 8f55eaa..966db71 100644 --- a/daemon/dispatch.c +++ b/daemon/dispatch.c @@ -23,6 +23,9 @@ #include <config.h> +#include <stdio.h> +#include <stdarg.h> + #include "dispatch.h" #include "remote.h" -- 1.6.6.1

3 11

[libvirt] [PATCH v3 0/8]: Add arbitrary qemu command-line and monitor commands
by Chris Lalancette 08 Jul '10

08 Jul '10

As we discussed previously, here is the patch series to add the ability to specify arbitrary qemu command-line parameters and environment variables, and also give arbitrary monitor commands to a guest. Because these extra arguments have a good shot at confusing libvirt, the use of them is not supported, but left available for advanced users and developers. They are also in a separate library and have a separate on-the-wire protocol. There is one bug left that I have not yet been able to fix. Because of the complicated way that virsh parses command-line arguments, it is not possible to pass through spaces and quotes when using the qemu-monitor-command. Unfortunately, the qemu monitor commands (and in particular when using QMP) depend heavily on quoting and spacing, so using virsh to send through command-lines is difficult. I'll have to think about how to better resolve this issue, but it should not hold up the rest of the series. I will point out one particular patch that could use some careful review, namely PATCH 6/8. In there, I change the remote_message_hdr to use an unsigned proc instead of a remote_procedure proc. Now, as far as I can tell the two sizes should be the same, so the wire protocol should be the same. Indeed, testing seems to show that older virsh can talk just fine to a libvirtd with this patch applied. However, the regenerated remote_protocol.c file for parsing remote_message_header has some strange bits in it that I don't quite understand. I'm hoping someone else can look at it and confirm that it is OK. Thanks to Dan Berrange and Eric Blake for their reviews already, and to DV for the Relax NG schema changes. Changes since v2 are listed in the individual patches.

4 20

[libvirt] [PATCH] cpu: Add new models from qemu's target-x86_64.conf
by Jiri Denemark 08 Jul '10

08 Jul '10

--- src/cpu/cpu_map.xml | 283 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 283 insertions(+), 0 deletions(-) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index 3ec4a7e..986c61d 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -353,5 +353,288 @@ <feature name='ssse3'/> <feature name='nx'/> </model> + + <model name='Conroe'> + <vendor>Intel</vendor> + <feature name='sse2'/> + <feature name='sse'/> + <feature name='fxsr'/> + <feature name='mmx'/> + <feature name='pat'/> + <feature name='cmov'/> + <feature name='pge'/> + <feature name='sep'/> + <feature name='apic'/> + <feature name='cx8'/> + <feature name='mce'/> + <feature name='pae'/> + <feature name='msr'/> + <feature name='tsc'/> + <feature name='pse'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='mtrr'/> + <feature name='clflush'/> + <feature name='mca'/> + <feature name='pse36'/> + <feature name='pni'/> + <feature name='ssse3'/> + <feature name='fxsr'/> + <feature name='mmx'/> + <feature name='pat'/> + <feature name='cmov'/> + <feature name='pge'/> + <feature name='apic'/> + <feature name='cx8'/> + <feature name='mce'/> + <feature name='pae'/> + <feature name='msr'/> + <feature name='tsc'/> + <feature name='pse'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='lm'/> + <feature name='syscall'/> + <feature name='nx'/> + <feature name='lahf_lm'/> + </model> + + <model name='Penryn'> + <vendor>Intel</vendor> + <feature name='sse2'/> + <feature name='sse'/> + <feature name='fxsr'/> + <feature name='mmx'/> + <feature name='pat'/> + <feature name='cmov'/> + <feature name='pge'/> + <feature name='sep'/> + <feature name='apic'/> + <feature name='cx8'/> + <feature name='mce'/> + <feature name='pae'/> + <feature name='msr'/> + <feature name='tsc'/> + <feature name='pse'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='mtrr'/> + <feature name='clflush'/> + <feature name='mca'/> + <feature name='pse36'/> + <feature name='pni'/> + <feature name='cx16'/> + <feature name='ssse3'/> + <feature name='sse4.1'/> + <feature name='fxsr'/> + <feature name='mmx'/> + <feature name='pat'/> + <feature name='cmov'/> + <feature name='pge'/> + <feature name='apic'/> + <feature name='cx8'/> + <feature name='mce'/> + <feature name='pae'/> + <feature name='msr'/> + <feature name='tsc'/> + <feature name='pse'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='lm'/> + <feature name='syscall'/> + <feature name='nx'/> + <feature name='lahf_lm'/> + </model> + + <model name='Nehalem'> + <vendor>Intel</vendor> + <feature name='sse2'/> + <feature name='sse'/> + <feature name='fxsr'/> + <feature name='mmx'/> + <feature name='pat'/> + <feature name='cmov'/> + <feature name='pge'/> + <feature name='sep'/> + <feature name='apic'/> + <feature name='cx8'/> + <feature name='mce'/> + <feature name='pae'/> + <feature name='msr'/> + <feature name='tsc'/> + <feature name='pse'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='mtrr'/> + <feature name='clflush'/> + <feature name='mca'/> + <feature name='pse36'/> + <feature name='pni'/> + <feature name='cx16'/> + <feature name='ssse3'/> + <feature name='sse4.1'/> + <feature name='sse4.2'/> + <feature name='popcnt'/> + <feature name='fxsr'/> + <feature name='mmx'/> + <feature name='pat'/> + <feature name='cmov'/> + <feature name='pge'/> + <feature name='apic'/> + <feature name='cx8'/> + <feature name='mce'/> + <feature name='pae'/> + <feature name='msr'/> + <feature name='tsc'/> + <feature name='pse'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='lm'/> + <feature name='syscall'/> + <feature name='nx'/> + <feature name='lahf_lm'/> + </model> + + <model name='Opteron_G1'> + <vendor>AMD</vendor> + <feature name='sse2'/> + <feature name='sse'/> + <feature name='fxsr'/> + <feature name='mmx'/> + <feature name='pat'/> + <feature name='cmov'/> + <feature name='pge'/> + <feature name='sep'/> + <feature name='apic'/> + <feature name='cx8'/> + <feature name='mce'/> + <feature name='pae'/> + <feature name='msr'/> + <feature name='tsc'/> + <feature name='pse'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='mtrr'/> + <feature name='clflush'/> + <feature name='mca'/> + <feature name='pse36'/> + <feature name='pni'/> + <feature name='fxsr'/> + <feature name='mmx'/> + <feature name='pat'/> + <feature name='cmov'/> + <feature name='pge'/> + <feature name='apic'/> + <feature name='cx8'/> + <feature name='mce'/> + <feature name='pae'/> + <feature name='msr'/> + <feature name='tsc'/> + <feature name='pse'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='lm'/> + <feature name='syscall'/> + <feature name='nx'/> + </model> + + <model name='Opteron_G2'> + <vendor>AMD</vendor> + <feature name='sse2'/> + <feature name='sse'/> + <feature name='fxsr'/> + <feature name='mmx'/> + <feature name='pat'/> + <feature name='cmov'/> + <feature name='pge'/> + <feature name='sep'/> + <feature name='apic'/> + <feature name='cx8'/> + <feature name='mce'/> + <feature name='pae'/> + <feature name='msr'/> + <feature name='tsc'/> + <feature name='pse'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='mtrr'/> + <feature name='clflush'/> + <feature name='mca'/> + <feature name='pse36'/> + <feature name='pni'/> + <feature name='cx16'/> + <feature name='fxsr'/> + <feature name='mmx'/> + <feature name='pat'/> + <feature name='cmov'/> + <feature name='pge'/> + <feature name='apic'/> + <feature name='cx8'/> + <feature name='mce'/> + <feature name='pae'/> + <feature name='msr'/> + <feature name='tsc'/> + <feature name='pse'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='lm'/> + <feature name='syscall'/> + <feature name='nx'/> + <feature name='rdtscp'/> + <feature name='svm'/> + <feature name='lahf_lm'/> + </model> + + <model name='Opteron_G3'> + <vendor>AMD</vendor> + <feature name='sse2'/> + <feature name='sse'/> + <feature name='fxsr'/> + <feature name='mmx'/> + <feature name='pat'/> + <feature name='cmov'/> + <feature name='pge'/> + <feature name='sep'/> + <feature name='apic'/> + <feature name='cx8'/> + <feature name='mce'/> + <feature name='pae'/> + <feature name='msr'/> + <feature name='tsc'/> + <feature name='pse'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='mtrr'/> + <feature name='clflush'/> + <feature name='mca'/> + <feature name='pse36'/> + <feature name='pni'/> + <feature name='cx16'/> + <feature name='monitor'/> + <feature name='popcnt'/> + <feature name='fxsr'/> + <feature name='mmx'/> + <feature name='pat'/> + <feature name='cmov'/> + <feature name='pge'/> + <feature name='apic'/> + <feature name='cx8'/> + <feature name='mce'/> + <feature name='pae'/> + <feature name='msr'/> + <feature name='tsc'/> + <feature name='pse'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='lm'/> + <feature name='syscall'/> + <feature name='nx'/> + <feature name='rdtscp'/> + <feature name='svm'/> + <feature name='sse4a'/> + <feature name='abm'/> + <feature name='misalignsse'/> + <feature name='lahf_lm'/> + </model> </arch> </cpus> -- 1.7.1.1

2 2

[libvirt] [PATCH] cpuBaseline: Detect empty set of common features
by Jiri Denemark 08 Jul '10

08 Jul '10

In case the set of CPUs has no features in common, report incompatible CPUs instead of returning the simplest CPU model with all features disabled. --- src/cpu/cpu_x86.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 30a2db6..0266ce9 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -233,6 +233,26 @@ x86DataSubtract(union cpuData *data1, } +static bool +x86DataIsEmpty(union cpuData *data) +{ + struct cpuX86cpuid zero = { 0, 0, 0, 0, 0 }; + unsigned int i; + + for (i = 0; i < data->x86.basic_len; i++) { + if (!x86cpuidMatch(data->x86.basic + i, &zero)) + return false; + } + + for (i = 0; i < data->x86.extended_len; i++) { + if (!x86cpuidMatch(data->x86.extended + i, &zero)) + return false; + } + + return true; +} + + static union cpuData * x86DataFromModel(const struct x86_model *model) { @@ -1363,6 +1383,12 @@ x86Baseline(virCPUDefPtr *cpus, if (!(data = x86DataFromModel(base_model))) goto no_memory; + if (x86DataIsEmpty(data)) { + virCPUReportError(VIR_ERR_OPERATION_FAILED, + "%s", _("CPUs are incompatible")); + goto error; + } + if (x86Decode(cpu, data, models, nmodels, NULL) < 0) goto error; -- 1.7.1.1

2 2

[libvirt] [PATCH] cpuBaseline: Don't mess with the CPU returned by arch driver
by Jiri Denemark 08 Jul '10

08 Jul '10

All features in the baseline CPU definition were always created with policy='require' even though an arch driver returned them with different policy settings. --- src/cpu/cpu.c | 12 +----------- src/cpu/cpu_x86.c | 2 ++ 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c index 580b767..8d6c22b 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -354,7 +354,6 @@ cpuBaseline(virCPUDefPtr *cpus, unsigned int nmodels) { struct cpuArchDriver *driver; - virCPUDefPtr cpu; unsigned int i; VIR_DEBUG("ncpus=%u, nmodels=%u", ncpus, nmodels); @@ -394,16 +393,7 @@ cpuBaseline(virCPUDefPtr *cpus, return NULL; } - if ((cpu = driver->baseline(cpus, ncpus, models, nmodels))) { - cpu->type = VIR_CPU_TYPE_GUEST; - cpu->match = VIR_CPU_MATCH_EXACT; - VIR_FREE(cpu->arch); - - for (i = 0; i < cpu->nfeatures; i++) - cpu->features[i].policy = VIR_CPU_FEATURE_REQUIRE; - } - - return cpu; + return driver->baseline(cpus, ncpus, models, nmodels); } diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index f7473bf..30a2db6 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -1366,6 +1366,8 @@ x86Baseline(virCPUDefPtr *cpus, if (x86Decode(cpu, data, models, nmodels, NULL) < 0) goto error; + VIR_FREE(cpu->arch); + cleanup: x86DataFree(data); x86ModelFree(base_model); -- 1.7.1.1

2 2

[libvirt] [PATCH] Make html docs in non-srcdir build
by Jiri Denemark 08 Jul '10

08 Jul '10

--- docs/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index c01e085..1183321 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -53,7 +53,7 @@ gif = \ architecture.gif \ node.gif -dot_html_in = $(wildcard *.html.in) +dot_html_in = $(notdir $(wildcard $(srcdir)/*.html.in)) dot_html = $(dot_html_in:%.html.in=%.html) patches = $(wildcard api_extension/*.patch) -- 1.7.1.1

2 2

[libvirt] [PATCH] esx: Allow 'pvscsi' as SCSI controller model
by Matthias Bolte 07 Jul '10

07 Jul '10

--- docs/drvesx.html.in | 13 ++++++++++++- docs/schemas/domain.rng | 1 + src/conf/domain_conf.c | 3 ++- src/conf/domain_conf.h | 1 + src/esx/esx_vmx.c | 12 +++++++----- tests/vmx2xmldata/vmx2xml-scsi-driver.vmx | 5 +++++ tests/vmx2xmldata/vmx2xml-scsi-driver.xml | 6 ++++++ tests/xml2vmxdata/xml2vmx-scsi-driver.vmx | 5 +++++ tests/xml2vmxdata/xml2vmx-scsi-driver.xml | 5 +++++ 9 files changed, 44 insertions(+), 7 deletions(-) diff --git a/docs/drvesx.html.in b/docs/drvesx.html.in index bc7e1a0..f4e7530 100644 --- a/docs/drvesx.html.in +++ b/docs/drvesx.html.in @@ -302,7 +302,13 @@ ethernet0.checkMACAddress = "false" </dd> <dt><code>lsisas1068</code></dt> <dd> - LSI Logic SAS 1068 controller. + LSI Logic SAS 1068 controller. Since 0.8.0 + </dd> + <dt><code>pvscsi</code></dt> + <dd> + Special VMware Paravirtual SCSI controller, requires VMware tools inside + the guest. See <a href="http://kb.vmware.com/kb/1010398">VMware KB1010398</a> + for details. Since 0.8.3 </dd> </dl> @@ -642,5 +648,10 @@ Enter administrator password for example-vcenter.com: VMware VMX config parameters </a> </li> + <li> + <a href="http://www.vmware.com/pdf/vsp_4_pvscsi_perf.pdf"> + VMware ESX 4.0 PVSCSI Storage Performance + </a> + </li> </ul> </body></html> diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index fd57917..b171d01 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -676,6 +676,7 @@ <value>buslogic</value> <value>lsilogic</value> <value>lsisas1068</value> + <value>pvscsi</value> </choice> </attribute> </optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 378c06e..3cd43c4 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -142,7 +142,8 @@ VIR_ENUM_IMPL(virDomainController, VIR_DOMAIN_CONTROLLER_TYPE_LAST, VIR_ENUM_IMPL(virDomainControllerModel, VIR_DOMAIN_CONTROLLER_MODEL_LAST, "buslogic", "lsilogic", - "lsisas1068") + "lsisas1068", + "pvscsi") VIR_ENUM_IMPL(virDomainFS, VIR_DOMAIN_FS_TYPE_LAST, "mount", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 01da17e..3451302 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -199,6 +199,7 @@ enum virDomainControllerModel { VIR_DOMAIN_CONTROLLER_MODEL_BUSLOGIC, VIR_DOMAIN_CONTROLLER_MODEL_LSILOGIC, VIR_DOMAIN_CONTROLLER_MODEL_LSISAS1068, + VIR_DOMAIN_CONTROLLER_MODEL_PVSCSI, VIR_DOMAIN_CONTROLLER_MODEL_LAST }; diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index e10e745..46875f3 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -740,11 +740,12 @@ esxVMX_GatherSCSIControllers(virDomainDefPtr def, int virtualDev[4], if (controller->model != -1 && controller->model != VIR_DOMAIN_CONTROLLER_MODEL_BUSLOGIC && controller->model != VIR_DOMAIN_CONTROLLER_MODEL_LSILOGIC && - controller->model != VIR_DOMAIN_CONTROLLER_MODEL_LSISAS1068) { + controller->model != VIR_DOMAIN_CONTROLLER_MODEL_LSISAS1068 && + controller->model != VIR_DOMAIN_CONTROLLER_MODEL_PVSCSI) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, _("Expecting domain XML attribute 'model' of entry " "'controller' to be 'buslogic' or 'lsilogic' or " - "'lsisas1068' but found '%s'"), + "'lsisas1068' or 'pvscsi' but found '%s'"), virDomainControllerModelTypeToString(controller->model)); return -1; } @@ -1483,11 +1484,12 @@ esxVMX_ParseSCSIController(virConfPtr conf, int controller, bool *present, if (*virtualDev == -1 || (*virtualDev != VIR_DOMAIN_CONTROLLER_MODEL_BUSLOGIC && *virtualDev != VIR_DOMAIN_CONTROLLER_MODEL_LSILOGIC && - *virtualDev != VIR_DOMAIN_CONTROLLER_MODEL_LSISAS1068)) { + *virtualDev != VIR_DOMAIN_CONTROLLER_MODEL_LSISAS1068 && + *virtualDev != VIR_DOMAIN_CONTROLLER_MODEL_PVSCSI)) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, _("Expecting VMX entry '%s' to be 'buslogic' or 'lsilogic' " - "or 'lsisas1068' but found '%s'"), virtualDev_name, - virtualDev_string); + "or 'lsisas1068' or 'pvscsi' but found '%s'"), + virtualDev_name, virtualDev_string); goto failure; } } diff --git a/tests/vmx2xmldata/vmx2xml-scsi-driver.vmx b/tests/vmx2xmldata/vmx2xml-scsi-driver.vmx index cb055f6..64d7c99 100644 --- a/tests/vmx2xmldata/vmx2xml-scsi-driver.vmx +++ b/tests/vmx2xmldata/vmx2xml-scsi-driver.vmx @@ -6,6 +6,8 @@ scsi1.present = "true" scsi1.virtualDev = "lsilogic" scsi2.present = "true" scsi2.virtualDev = "lsisas1068" +scsi3.present = "true" +scsi3.virtualDev = "pvscsi" scsi0:0.present = "true" scsi0:0.deviceType = "scsi-hardDisk" scsi0:0.fileName = "harddisk1.vmdk" @@ -15,3 +17,6 @@ scsi1:0.fileName = "harddisk2.vmdk" scsi2:0.present = "true" scsi2:0.deviceType = "scsi-hardDisk" scsi2:0.fileName = "harddisk3.vmdk" +scsi3:0.present = "true" +scsi3:0.deviceType = "scsi-hardDisk" +scsi3:0.fileName = "harddisk4.vmdk" diff --git a/tests/vmx2xmldata/vmx2xml-scsi-driver.xml b/tests/vmx2xmldata/vmx2xml-scsi-driver.xml index d39415d..f5739d9 100644 --- a/tests/vmx2xmldata/vmx2xml-scsi-driver.xml +++ b/tests/vmx2xmldata/vmx2xml-scsi-driver.xml @@ -26,8 +26,14 @@ <target dev='sdae' bus='scsi'/> <address type='drive' controller='2' bus='0' unit='0'/> </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk4.vmdk'/> + <target dev='sdat' bus='scsi'/> + <address type='drive' controller='3' bus='0' unit='0'/> + </disk> <controller type='scsi' index='0' model='buslogic'/> <controller type='scsi' index='1' model='lsilogic'/> <controller type='scsi' index='2' model='lsisas1068'/> + <controller type='scsi' index='3' model='pvscsi'/> </devices> </domain> diff --git a/tests/xml2vmxdata/xml2vmx-scsi-driver.vmx b/tests/xml2vmxdata/xml2vmx-scsi-driver.vmx index 7cceca0..a92d7fc 100644 --- a/tests/xml2vmxdata/xml2vmx-scsi-driver.vmx +++ b/tests/xml2vmxdata/xml2vmx-scsi-driver.vmx @@ -11,6 +11,8 @@ scsi1.present = "true" scsi1.virtualDev = "lsilogic" scsi2.present = "true" scsi2.virtualDev = "lsisas1068" +scsi3.present = "true" +scsi3.virtualDev = "pvscsi" scsi0:0.present = "true" scsi0:0.deviceType = "scsi-hardDisk" scsi0:0.fileName = "/vmfs/volumes/datastore/directory/harddisk1.vmdk" @@ -20,3 +22,6 @@ scsi1:0.fileName = "/vmfs/volumes/datastore/directory/harddisk2.vmdk" scsi2:0.present = "true" scsi2:0.deviceType = "scsi-hardDisk" scsi2:0.fileName = "/vmfs/volumes/datastore/directory/harddisk3.vmdk" +scsi3:0.present = "true" +scsi3:0.deviceType = "scsi-hardDisk" +scsi3:0.fileName = "/vmfs/volumes/datastore/directory/harddisk4.vmdk" diff --git a/tests/xml2vmxdata/xml2vmx-scsi-driver.xml b/tests/xml2vmxdata/xml2vmx-scsi-driver.xml index 797a26e..ae3a43c 100644 --- a/tests/xml2vmxdata/xml2vmx-scsi-driver.xml +++ b/tests/xml2vmxdata/xml2vmx-scsi-driver.xml @@ -21,5 +21,10 @@ <source file='[datastore] directory/harddisk3.vmdk'/> <target dev='sdae' bus='scsi'/> </disk> + <disk type='file' device='disk'> + <driver name='pvscsi'/> + <source file='[datastore] directory/harddisk4.vmdk'/> + <target dev='sdat' bus='scsi'/> + </disk> </devices> </domain> -- 1.7.0.4

2 1

Re: [libvirt] Get IP address of a running domain
by Camilo Aguilar 07 Jul '10

07 Jul '10

Hi Adrian, afaik, there is no a direct function to get the domain ip address if the address is acquired through DHCP regards, Camilo Aguilar On Tue, Jul 6, 2010 at 3:14 PM, adrian wyssen <wyssenadrian(a)gmail.com>wrote: > year, i can find the mac address of the machine with virDomainGetXMLDesc, > but not the ip. and since the machine is remote, the ip is not in my arp > cache. is there no other way or can i get the ip out of mac (even if this is > a "virtual" mac)? > > I must be able to contact the virtual domain via it's IP from within the > same network. > > thanks for your help! > adrian > > 2010/7/6 Camilo Aguilar <camilo(a)cloudescape.com> > > You should take a look in http://libvirt.org/formatdomain.html and >> http://libvirt.org/html/libvirt-libvirt.html#virDomainGetXMLDesc >> >> regards, >> Camilo Aguilar >> >> On Tue, Jul 6, 2010 at 2:23 PM, adrian wyssen <wyssenadrian(a)gmail.com>wrote: >> >>> Hi, >>> Sorry bothering you again, but I have another question: I did not find >>> any possibility to get the IP address of a running domain with libvirt. I >>> can get the domain pointer but I did not find any function in the API >>> returning my the IP address of the domain. I just can get other information >>> about the domain with virDomainGetInfo, but no IP. I want to be able to get >>> either a static assigned IP or a dynamically received IP from a DHCP server. >>> >>> PS: I use the ESX driver. >>> Thanks for giving me a hint. >>> Adrian >>> >>> -- >>> libvir-list mailing list >>> libvir-list(a)redhat.com >>> https://www.redhat.com/mailman/listinfo/libvir-list >>> >> >> >

1 0

[libvirt] Get IP address of a running domain
by adrian wyssen 07 Jul '10

07 Jul '10

Hi, Sorry bothering you again, but I have another question: I did not find any possibility to get the IP address of a running domain with libvirt. I can get the domain pointer but I did not find any function in the API returning my the IP address of the domain. I just can get other information about the domain with virDomainGetInfo, but no IP. I want to be able to get either a static assigned IP or a dynamically received IP from a DHCP server. PS: I use the ESX driver. Thanks for giving me a hint. Adrian

1 0