openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

* docs/storage.html[.in] src/storage_backend_disk.c: revert previous 

msdos patch and apply new one from Cole Robinson
daniel
This commit is contained in:
Daniel Veillard 2008-08-13 09:45:10 +00:00
parent 4ee755d641
commit 415b92101f
4 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Wed Aug 13 11:43:36 CEST 2008 Daniel Veillard <veillard@redhat.com>
* docs/storage.html[.in] src/storage_backend_disk.c: revert previous
msdos patch and apply new one from Cole Robinson
Tue Aug 12 19:37:23 CEST 2008 Jim Meyering <meyering@redhat.com>
rewrite virFileLinkPointsTo

4
docs/storage.html
View File

@ -331,7 +331,7 @@ libvirt.
the common partition table types:
</p>
<ul><li>
<code>msdos</code>
<code>dos</code>
</li><li>
<code>dvh</code>
</li><li>
@ -346,7 +346,7 @@ libvirt.
<code>sun</code>
</li></ul>
<p>
The <code>msdos</code> or <code>gpt</code> formats are recommended for
The <code>dos</code> or <code>gpt</code> formats are recommended for
best portability - the latter is needed for disks larger than 2TB.
</p>
<h3>Valid volume format types</h3>

4
docs/storage.html.in
View File

@ -258,7 +258,7 @@ libvirt.
</p>
<ul>
<li>
<code>msdos</code>
<code>dos</code>
</li>
<li>
<code>dvh</code>
@ -280,7 +280,7 @@ libvirt.
</li>
</ul>
<p>
The <code>msdos</code> or <code>gpt</code> formats are recommended for
The <code>dos</code> or <code>gpt</code> formats are recommended for
best portability - the latter is needed for disks larger than 2TB.
</p>

16
src/storage_backend_disk.c
View File

@ -29,7 +29,7 @@
#include "memory.h"
enum {
VIR_STORAGE_POOL_DISK_MSDOS = 0,
VIR_STORAGE_POOL_DISK_DOS = 0,
VIR_STORAGE_POOL_DISK_DVH,
VIR_STORAGE_POOL_DISK_GPT,
VIR_STORAGE_POOL_DISK_MAC,
@ -64,10 +64,10 @@ static int
virStorageBackendDiskPoolFormatFromString(virConnectPtr conn,
const char *format) {
if (format == NULL)
return VIR_STORAGE_POOL_DISK_MSDOS;
return VIR_STORAGE_POOL_DISK_DOS;
if (STREQ(format, "msdos"))
return VIR_STORAGE_POOL_DISK_MSDOS;
if (STREQ(format, "dos"))
return VIR_STORAGE_POOL_DISK_DOS;
if (STREQ(format, "dvh"))
return VIR_STORAGE_POOL_DISK_DVH;
if (STREQ(format, "gpt"))
@ -90,8 +90,8 @@ static const char *
virStorageBackendDiskPoolFormatToString(virConnectPtr conn,
int format) {
switch (format) {
case VIR_STORAGE_POOL_DISK_MSDOS:
return "msdos";
case VIR_STORAGE_POOL_DISK_DOS:
return "dos";
case VIR_STORAGE_POOL_DISK_DVH:
return "dvh";
case VIR_STORAGE_POOL_DISK_GPT:
@ -407,7 +407,9 @@ virStorageBackendDiskBuildPool(virConnectPtr conn,
pool->def->source.devices[0].path,
"mklabel",
"--script",
virStorageBackendDiskPoolFormatToString(conn, pool->def->source.format),
((pool->def->source.format == VIR_STORAGE_POOL_DISK_DOS) ? "msdos" :
virStorageBackendDiskPoolFormatToString(conn,
pool->def->source.format)),
NULL,
};