NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
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> Tue Aug 12 19:37:23 CEST 2008 Jim Meyering <meyering@redhat.com>
rewrite virFileLinkPointsTo rewrite virFileLinkPointsTo

4
docs/storage.html
View File

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

4
docs/storage.html.in
View File

@@ -258,7 +258,7 @@ libvirt.
</p> </p>
<ul> <ul>
<li> <li>
<code>msdos</code> <code>dos</code>
</li> </li>
<li> <li>
<code>dvh</code> <code>dvh</code>
@@ -280,7 +280,7 @@ libvirt.
</li> </li>
</ul> </ul>
<p> <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. best portability - the latter is needed for disks larger than 2TB.
</p> </p>

16
src/storage_backend_disk.c
View File

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