Re: [libvirt] [PATCHv5 2/2] qemu: Disk Geometry Override Support

On Mon, Aug 20, 2012 at 01:58:25PM +0200, Viktor Mihajlovski wrote: > From: J.B. Joret <jb(a)linux.vnet.ibm.com&gt; > > Qemu command line generation for geometry override and testcases. > > V2 Changes: squashed qemu code and testcases. > > V3 Changes: use virReportError. > > V4 Changes: rebase > > V5 Changes: Fixed test invocation for geometry. > > Signed-off-by: J.B. Joret <jb(a)linux.vnet.ibm.com&gt; > Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com&gt; > > Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com&gt; > --- > src/qemu/qemu_command.c | 59 ++++++++++++++++++++ > .../qemuxml2argv-disk-geometry.args | 4 + > .../qemuxml2argv-disk-geometry.xml | 26 +++++++++ > tests/qemuxml2argvtest.c | 2 + > 4 files changed, 91 insertions(+), 0 deletions(-) > create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args > create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.xml > > diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c > index 9383530..cc44015 100644 > --- a/src/qemu/qemu_command.c > +++ b/src/qemu/qemu_command.c > @@ -2073,6 +2073,8 @@ qemuBuildDriveStr(virConnectPtr conn ATTRIBUTE_UNUSED, > { > virBuffer opt = VIR_BUFFER_INITIALIZER; > const char *bus = virDomainDiskQEMUBusTypeToString(disk->bus); > + const char *trans = > + virDomainDiskGeometryTransTypeToString(disk->geometry.trans); > int idx = virDiskNameToIndex(disk->dst); > int busid = -1, unitid = -1; > > @@ -2275,6 +2277,24 @@ qemuBuildDriveStr(virConnectPtr conn ATTRIBUTE_UNUSED, > disk->type != VIR_DOMAIN_DISK_TYPE_DIR && > qemuCapsGet(qemuCaps, QEMU_CAPS_DRIVE_FORMAT)) > virBufferAsprintf(&opt, ",format=%s", disk->driverType); > + > + /* generate geometry command string*/ > + if (disk->type == VIR_DOMAIN_DISK_TYPE_BLOCK || > + disk->type == VIR_DOMAIN_DISK_TYPE_FILE) { The cylinders/heads/sectors data is part of the guest side device model. The disk->type == block|file|network is part of the host side device model. IIUC, there should be no dependency between host and guest side data for this property, so IMHO this if() should be removed.