[libvirt] [PATCH] Fix off-by-one printing month in logging code
by Daniel P. Berrange
From: "Daniel P. Berrange" <berrange(a)redhat.com>
The field 'mon' in 'struct tm' gives months 0-11, where as
humans tend to expect months 1-12. Thus the month number
needing adjusting by 1
* src/util/logging.c: Use human friendly month number
---
src/util/logging.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/util/logging.c b/src/util/logging.c
index 9df9003..17c7e84 100644
--- a/src/util/logging.c
+++ b/src/util/logging.c
@@ -628,6 +628,7 @@ virLogFormatTimestamp(void)
gettimeofday(&cur_time, NULL);
localtime_r(&cur_time.tv_sec, &time_info);
time_info.tm_year += 1900;
+ time_info.tm_mon += 1;
if (virAsprintf(&str, "%4d-%02d-%02d %02d:%02d:%02d.%03d",
time_info.tm_year, time_info.tm_mon, time_info.tm_mday,
--
1.7.6.4
13 years, 5 months
[libvirt] [PATCH V2 0/4] Support for multiple IP addresses using lists
by Stefan Berger
This patch series builds on the previously posted patch series
https://www.redhat.com/archives/libvir-list/2011-October/msg00912.html
and introduces the capability to assign a list to a variable and
have multiple rules instantiated, one for each item in the list.
This means, that if for example a variable like IP has been assigned
the following values
IP = [1.2.3.4, 5.6.7.8, 10.0.0.1]
it will generate 3 rules, which then in turn allows us to build filters
that can evaluate multiple possible values per field, i.e., allow
the filtering for multiple IP addresses (per interface).
It would then need David Steven's patch for support of 'RETURN' (and
'CONTINUE') target(s).
v2:
- reimplementation of iterator
- other nits
Regards,
Stefan
13 years, 5 months
[libvirt] [PATCH] storage: Fix error message on vol-create-from failure
by Ryota Ozaki
If vol-create-from is failed due to 'input volume not found',
virsh outputs like this:
$ sudo virsh vol-create-from testpool test-vol.xml test.img
error: failed to get vol 'test.img', specifying --pool might help
error: Storage volume not found: no storage vol with matching path
However, '--pool' is incorrect because it is already specified as
second argument ('testpool' in this case). It should be "--inputpool".
The patch fixes this by using pooloptname, which will be "inputpool"
in this case and "pool" in other cases, as error message.
---
tools/virsh.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/virsh.c b/tools/virsh.c
index 72344f0..5544a41 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -15216,8 +15216,8 @@ vshCommandOptVolBy(vshControl *ctl, const vshCmd *cmd,
if (pool)
vshError(ctl, _("failed to get vol '%s'"), n);
else
- vshError(ctl, _("failed to get vol '%s', specifying --pool "
- "might help"), n);
+ vshError(ctl, _("failed to get vol '%s', specifying --%s "
+ "might help"), n, pooloptname);
}
if (pool)
--
1.7.4.1
13 years, 5 months
[libvirt] [PATCH] qemu: Forbid specify target path for disk vol
by Osier Yang
target path for disk vol is just meaningless, and it's never used
but free()ed silently when creating the volume.
---
src/conf/storage_conf.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index e893b2d..5f4f264 100644
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -1052,6 +1052,12 @@ virStorageVolDefParseXML(virStoragePoolDefPtr pool,
}
ret->target.path = virXPathString("string(./target/path)", ctxt);
+ if (ret->target.path && (pool->type == VIR_STORAGE_POOL_DISK)) {
+ virStorageReportError(VIR_ERR_XML_ERROR, "%s",
+ _("target path for disk vol is just meaningless"));
+ goto cleanup;
+ }
+
if (options->formatFromString) {
char *format = virXPathString("string(./target/format/@type)", ctxt);
if (format == NULL)
--
1.7.6
13 years, 5 months
[libvirt] Expose qemu monitor command query_block?
by Osier Yang
Command "query-block" is only used internally for medium's
checking before migration currently. Should we expose it
as a public API, such as virDomainQueryBlock (or a qemu
specific API, virDomainQemuQueryBlock)?
It has enough useful infomation which user may care out,
such as "io-status", "locked", "removable", "inserted". And
perhaps more info in future.
Osier
13 years, 5 months
[libvirt] [PATCH][Take2] virsh: Fix vol-info's 'Type' output
by Ryota Ozaki
We have a new vol type "dir" in addition to "file" and "block", but
virsh doesn't know it. Fix it.
Additionally, the patch lets virsh output "unknown" if not matched
any of them.
---
tools/virsh.c | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/tools/virsh.c b/tools/virsh.c
index 42f62d7..72344f0 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -9540,9 +9540,22 @@ cmdVolInfo(vshControl *ctl, const vshCmd *cmd)
if (virStorageVolGetInfo(vol, &info) == 0) {
double val;
const char *unit;
- vshPrint(ctl, "%-15s %s\n", _("Type:"),
- info.type == VIR_STORAGE_VOL_FILE ?
- _("file") : _("block"));
+ switch(info.type) {
+ case VIR_STORAGE_VOL_FILE:
+ vshPrint(ctl, "%-15s %s\n", _("Type:"), _("file"));
+ break;
+
+ case VIR_STORAGE_VOL_BLOCK:
+ vshPrint(ctl, "%-15s %s\n", _("Type:"), _("block"));
+ break;
+
+ case VIR_STORAGE_VOL_DIR:
+ vshPrint(ctl, "%-15s %s\n", _("Type:"), _("dir"));
+ break;
+
+ default:
+ vshPrint(ctl, "%-15s %s\n", _("Type:"), _("unknown"));
+ }
val = prettyCapacity(info.capacity, &unit);
vshPrint(ctl, "%-15s %2.2lf %s\n", _("Capacity:"), val, unit);
--
1.7.4.1
13 years, 5 months
[libvirt] [PATCH v2] pci address conflict when virtio disk with drive type
by Xu He Jie
When using the xml as below:
------------------------------------------------------
<devices>
<emulator>/home/soulxu/data/work-code/qemu-kvm/x86_64-softmmu/qemu-system-x86_64</emulator>
<disk type='file' device='disk'>
<driver name='qemu' type='qcow2'/>
<source file='/home/soulxu/data/VM/images/linux.img'/>
<target dev='vda' bus='virtio'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
<video>
<model type='cirrus' vram='9216' heads='1'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
</video>
<memballoon model='virtio'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
</memballoon>
</devices>
------------------------------------------------------
Then can't startup qemu, the error message as below:
virsh # start test-vm
error: Failed to start domain test-vm
error: internal error process exited while connecting to monitor: qemu-system-x86_64: -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3: PCI: slot 3 function 0 not available for virtio-balloon-pci, in use by virtio-blk-pci
qemu-system-x86_64: -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3: Device 'virtio-balloon-pci' could not be initialized
So adding check for bus type and address type. Only the address of pci type support by virtio bus.
Signed-off-by: Xu He Jie <xuhj(a)linux.vnet.ibm.com>
---
src/qemu/qemu_command.c | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 30c0be6..7c4bc0a 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -1321,13 +1321,17 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, qemuDomainPCIAddressSetPtr addrs)
/* Disks (VirtIO only for now */
for (i = 0; i < def->ndisks ; i++) {
- if (def->disks[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE)
- continue;
-
/* Only VirtIO disks use PCI addrs */
if (def->disks[i]->bus != VIR_DOMAIN_DISK_BUS_VIRTIO)
continue;
+ if ((def->disks[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) &&
+ (def->disks[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE)) {
+ qemuReportError(VIR_ERR_INTERNAL_ERROR,
+ _("virtio only support device address type 'PCI' "));
+ goto error;
+ }
+
if (qemuDomainPCIAddressSetNextAddr(addrs, &def->disks[i]->info) < 0)
goto error;
}
--
1.7.4.1
13 years, 5 months
[libvirt] [PATCH V1 0/4] Support for multiple IP addresses using lists
by Stefan Berger
This patch series builds on the previously posted patch series
https://www.redhat.com/archives/libvir-list/2011-October/msg00912.html
and introduces the capability to assign a list to a variable and
have multiple rules instantiated, one for each item in the list.
This means, that if for example a variable like IP has been assigned
the following values
IP = [1.2.3.4, 5.6.7.8, 10.0.0.1]
it will generate 3 rules, which then in turn allows us to build filters
that can evaluate multiple possible values per field, i.e., allow
the filtering for multiple IP addresses (per interface).
It would then need David Steven's patch for support of 'RETURN' (and
'CONTINUE') target(s).
Regards,
Stefan
13 years, 5 months
[libvirt] [PATCH] virsh: Fix vol-info's 'Type' output
by Ryota Ozaki
We have a new type "dir" in addition to "file" and "block", but
virsh doen't know it. Fix it.
Additionally, the patch lets virsh output "unknown" if not matched
any of them.
---
tools/virsh.c | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/tools/virsh.c b/tools/virsh.c
index 42f62d7..72344f0 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -9540,9 +9540,22 @@ cmdVolInfo(vshControl *ctl, const vshCmd *cmd)
if (virStorageVolGetInfo(vol, &info) == 0) {
double val;
const char *unit;
- vshPrint(ctl, "%-15s %s\n", _("Type:"),
- info.type == VIR_STORAGE_VOL_FILE ?
- _("file") : _("block"));
+ switch(info.type) {
+ case VIR_STORAGE_VOL_FILE:
+ vshPrint(ctl, "%-15s %s\n", _("Type:"), _("file"));
+ break;
+
+ case VIR_STORAGE_VOL_BLOCK:
+ vshPrint(ctl, "%-15s %s\n", _("Type:"), _("block"));
+ break;
+
+ case VIR_STORAGE_VOL_DIR:
+ vshPrint(ctl, "%-15s %s\n", _("Type:"), _("dir"));
+ break;
+
+ default:
+ vshPrint(ctl, "%-15s %s\n", _("Type:"), _("unknown"));
+ }
val = prettyCapacity(info.capacity, &unit);
vshPrint(ctl, "%-15s %2.2lf %s\n", _("Capacity:"), val, unit);
--
1.7.4.1
13 years, 5 months
[libvirt] [PATCH] docs: Document filesystem type='block' for LXC
by Ryota Ozaki
Commit 77791dc0e allows LXC to use a host block device as a guest
filesystem, but it isn't documented yet.
---
docs/formatdomain.html.in | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 95d33c0..dc6b152 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -1196,7 +1196,9 @@
</dd>
<dt><code>type='block'</code></dt>
<dd>
- Currently unused.
+ A host block device to mount in the guest. The filesystem
+ format will be autodetected. Only used by LXC driver
+ <span class="since">(since 0.9.5)</span>.
</dd>
</dl>
--
1.7.4.1
13 years, 5 months
