diff options
| author | Max Reitz <mreitz@redhat.com> | 2015-02-25 13:08:15 -0500 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-03-18 12:05:36 +0100 |
| commit | 453b07b13443713f6a632005977c7ccab17e135d (patch) | |
| tree | ff855d8104bd4aea79a0b0ba80835f0739a49a98 | |
| parent | 2b21233061696feed434317a70e0a8b74f956ec8 (diff) | |
| download | focaccia-qemu-453b07b13443713f6a632005977c7ccab17e135d.tar.gz focaccia-qemu-453b07b13443713f6a632005977c7ccab17e135d.zip | |
qemu-nbd: Detect unused partitions by system == 0
Unused partitions do not necessarily have a total sector count of 0 (although they should have), but they always do have the system field set to 0, so use that for testing whether a partition is in use rather than the sector count field alone. Signed-off-by: Max Reitz <mreitz@redhat.com> Message-Id: <1424887718-10800-3-git-send-email-mreitz@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | qemu-nbd.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/qemu-nbd.c b/qemu-nbd.c index 064b000b43..d8daf1d3a6 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -167,8 +167,9 @@ static int find_partition(BlockBackend *blk, int partition, for (i = 0; i < 4; i++) { read_partition(&data[446 + 16 * i], &mbr[i]); - if (!mbr[i].nb_sectors_abs) + if (!mbr[i].system || !mbr[i].nb_sectors_abs) { continue; + } if (mbr[i].system == 0xF || mbr[i].system == 0x5) { struct partition_record ext[4]; @@ -182,8 +183,9 @@ static int find_partition(BlockBackend *blk, int partition, for (j = 0; j < 4; j++) { read_partition(&data1[446 + 16 * j], &ext[j]); - if (!ext[j].nb_sectors_abs) + if (!ext[j].system || !ext[j].nb_sectors_abs) { continue; + } if ((ext_partnum + j + 1) == partition) { *offset = (uint64_t)ext[j].start_sector_abs << 9; |