Re: [libvirt] [PATCH 4/4] PowerPC : Do not allow floppy disks in domain XML.

2015-02-17 Thread Ján Tomko 
On Sun, Feb 15, 2015 at 10:02:25AM +0530, Prerna Saxena wrote:
> 
> Subject: [PATCH 4/4] PowerPC : Do not allow floppy disks in domain XML.
> 
> PowerKVM does not support floppy disks. Ensure that libvirt honours this.
> Fixes : https://bugzilla.redhat.com/show_bug.cgi?id=1180486
> 
> Signed-off-by: Prerna Saxena 
> ---
>  src/conf/domain_conf.c | 8 
>  1 file changed, 8 insertions(+)
> 
> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
> index 6a57d80..df3a768 100644
> --- a/src/conf/domain_conf.c
> +++ b/src/conf/domain_conf.c
> @@ -13892,6 +13892,14 @@ virDomainDefParseXML(xmlDocPtr xml,
>  if (!disk)
>  goto error;
>  
> +if (ARCH_IS_PPC64(def->os.arch) &&
> +STREQLEN(def->os.machine, "pseries", 7) &&

Using STRPREFIX eliminates the magic constant.

> +disk->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) {
> +virReportError(VIR_ERR_INTERNAL_ERROR,

VIR_ERR_CONFIG_UNSUPPORTED would be a better code.

> +  _("Pseries machine does not support floppy 
> device"));

This fails 'make syntax-check':
src/conf/domain_conf.c:14067: virReportError(VIR_ERR_INTERNAL_ERROR,
src/conf/domain_conf.c-14068- _("Pseries machine does not 
support floppy device"));
maint.mk: found diagnostic without %
cfg.mk:657: recipe for target 'sc_prohibit_diagnostic_without_format'failed

Jan


signature.asc
Description: Digital signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH 4/4] PowerPC : Do not allow floppy disks in domain XML.

2015-02-14 Thread Prerna Saxena 

Subject: [PATCH 4/4] PowerPC : Do not allow floppy disks in domain XML.

PowerKVM does not support floppy disks. Ensure that libvirt honours this.
Fixes : https://bugzilla.redhat.com/show_bug.cgi?id=1180486

Signed-off-by: Prerna Saxena 
---
 src/conf/domain_conf.c | 8 
 1 file changed, 8 insertions(+)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 6a57d80..df3a768 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -13892,6 +13892,14 @@ virDomainDefParseXML(xmlDocPtr xml,
 if (!disk)
 goto error;
 
+if (ARCH_IS_PPC64(def->os.arch) &&
+STREQLEN(def->os.machine, "pseries", 7) &&
+disk->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) {
+virReportError(VIR_ERR_INTERNAL_ERROR,
+  _("Pseries machine does not support floppy device"));
+goto error;
+}
+
 virDomainDiskInsertPreAlloced(def, disk);
 }
 VIR_FREE(nodes);
-- 
1.9.3

-- 
Prerna Saxena

Linux Technology Centre,
IBM Systems and Technology Lab,
Bangalore, India

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list