trivial: remove various pointless things

trivial: remove various pointless things

[Matthew Daley]

No functional changes (hopefully).

 extras/mini-os/lwip-net.c        |    2 --
 tools/libxc/xc_domain.c          |    3 +--
 tools/libxl/xl_cmdimpl.c         |    4 ++--
 xen/arch/x86/hvm/svm/nestedsvm.c |    1 -
 xen/common/device_tree.c         |    2 +-
 xen/drivers/video/arm_hdlcd.c    |    2 +-
 6 files changed, 5 insertions(+), 9 deletions(-)

[PATCH 1/6] nestedsvm: remove pointless BUG_ON

[Matthew Daley]

It's already handled just above.

Signed-off-by: Matthew Daley <mattjd@gmail.com>
---
 xen/arch/x86/hvm/svm/nestedsvm.c |    1 -
 1 file changed, 1 deletion(-)

diff --git a/xen/arch/x86/hvm/svm/nestedsvm.c b/xen/arch/x86/hvm/svm/nestedsvm.c
index e32c872..705b653 100644
--- a/xen/arch/x86/hvm/svm/nestedsvm.c
+++ b/xen/arch/x86/hvm/svm/nestedsvm.c
@@ -847,7 +847,6 @@ nsvm_vmcb_guest_intercepts_msr(unsigned long *msr_bitmap,
         /* MSR not in the permission map: Let the guest handle it. */
         return NESTEDHVM_VMEXIT_INJECT;
 
-    BUG_ON(msr_bit == NULL);
     msr &= 0x1fff;
 
     if (write)
-- 
1.7.10.4

[PATCH 2/6] xen/arm: remove pointless if subcondition

[Matthew Daley]

It's already handled just above.

Signed-off-by: Matthew Daley <mattjd@gmail.com>
---
 xen/common/device_tree.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c
index f7d0215..44253da 100644
--- a/xen/common/device_tree.c
+++ b/xen/common/device_tree.c
@@ -906,7 +906,7 @@ static int dt_translate_one(const struct dt_device_node *parent,
         dt_printk(XENLOG_ERR "DT: no ranges; cannot translate\n");
         return 1;
     }
-    if ( ranges == NULL || rlen == 0 )
+    if ( rlen == 0 )
     {
         offset = dt_read_number(addr, na);
         memset(addr, 0, pna * 4);
-- 
1.7.10.4

[PATCH 3/6] xen/video: remove pointless if subcondition

[Matthew Daley]

It's already handled just above.

Signed-off-by: Matthew Daley <mattjd@gmail.com>
---
 xen/drivers/video/arm_hdlcd.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xen/drivers/video/arm_hdlcd.c b/xen/drivers/video/arm_hdlcd.c
index dffda9a..647f22c 100644
--- a/xen/drivers/video/arm_hdlcd.c
+++ b/xen/drivers/video/arm_hdlcd.c
@@ -150,7 +150,7 @@ void __init video_init(void)
         return;
     }
 
-    if ( !hdlcd_start || !framebuffer_start )
+    if ( !framebuffer_start )
     {
         early_printk(KERN_ERR "HDLCD: framebuffer address missing from device tree, disabling driver\n");
         return;
-- 
1.7.10.4

[PATCH 4/6] libxc: remove pointless null pointer check

[Matthew Daley]

ctxt_buf is guaranteed non-null here.

Signed-off-by: Matthew Daley <mattjd@gmail.com>
---
 tools/libxc/xc_domain.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c
index 2cea6e3..1ccafc5 100644
--- a/tools/libxc/xc_domain.c
+++ b/tools/libxc/xc_domain.c
@@ -444,8 +444,7 @@ int xc_domain_hvm_getcontext_partial(xc_interface *xch,
 
     ret = do_domctl(xch, &domctl);
 
-    if ( ctxt_buf )
-        xc_hypercall_bounce_post(xch, ctxt_buf);
+    xc_hypercall_bounce_post(xch, ctxt_buf);
 
     return ret ? -1 : 0;
 }
-- 
1.7.10.4

[PATCH 5/6] xl: remove pointless null pointer check

[Matthew Daley]

poolinfo is guaranteed non-null here.

Signed-off-by: Matthew Daley <mattjd@gmail.com>
---
 tools/libxl/xl_cmdimpl.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index 40feb7d..5bd9b15 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -5095,8 +5095,8 @@ static int sched_domain_output(libxl_scheduler sched, int (*output)(int),
                 break;
         }
     }
-    if (poolinfo)
-        libxl_cpupoolinfo_list_free(poolinfo, n_pools);
+
+    libxl_cpupoolinfo_list_free(poolinfo, n_pools);
     return 0;
 }
 
-- 
1.7.10.4

[PATCH 6/6] mini-os: remove repeated statement in netfront_input

[Matthew Daley]

Signed-off-by: Matthew Daley <mattjd@gmail.com>
---
 extras/mini-os/lwip-net.c |    2 --
 1 file changed, 2 deletions(-)

diff --git a/extras/mini-os/lwip-net.c b/extras/mini-os/lwip-net.c
index 9fded11..449b70f 100644
--- a/extras/mini-os/lwip-net.c
+++ b/extras/mini-os/lwip-net.c
@@ -194,8 +194,6 @@ netfront_input(struct netif *netif, unsigned char* data, int len)
 
   /* points to packet payload, which starts with an Ethernet header */
   ethhdr = p->payload;
-
-  ethhdr = p->payload;
     
   switch (htons(ethhdr->type)) {
   /* IP packet? */
-- 
1.7.10.4

Re: [PATCH 6/6] mini-os: remove repeated statement in netfront_input

[Samuel Thibault]

Matthew Daley, le Fri 08 Nov 2013 13:45:12 +1300, a écrit :
> Signed-off-by: Matthew Daley <mattjd@gmail.com>

Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>

> ---
>  extras/mini-os/lwip-net.c |    2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/extras/mini-os/lwip-net.c b/extras/mini-os/lwip-net.c
> index 9fded11..449b70f 100644
> --- a/extras/mini-os/lwip-net.c
> +++ b/extras/mini-os/lwip-net.c
> @@ -194,8 +194,6 @@ netfront_input(struct netif *netif, unsigned char* data, int len)
>  
>    /* points to packet payload, which starts with an Ethernet header */
>    ethhdr = p->payload;
> -
> -  ethhdr = p->payload;
>      
>    switch (htons(ethhdr->type)) {
>    /* IP packet? */
> -- 
> 1.7.10.4
> 

-- 
Samuel
<studdud> what the fuck is wtf

Re: [PATCH 1/6] nestedsvm: remove pointless BUG_ON

[Boris Ostrovsky]

On 11/07/2013 07:45 PM, Matthew Daley wrote:
> It's already handled just above.
>
> Signed-off-by: Matthew Daley <mattjd@gmail.com>
> ---
>   xen/arch/x86/hvm/svm/nestedsvm.c |    1 -
>   1 file changed, 1 deletion(-)
>
> diff --git a/xen/arch/x86/hvm/svm/nestedsvm.c b/xen/arch/x86/hvm/svm/nestedsvm.c
> index e32c872..705b653 100644
> --- a/xen/arch/x86/hvm/svm/nestedsvm.c
> +++ b/xen/arch/x86/hvm/svm/nestedsvm.c
> @@ -847,7 +847,6 @@ nsvm_vmcb_guest_intercepts_msr(unsigned long *msr_bitmap,
>           /* MSR not in the permission map: Let the guest handle it. */
>           return NESTEDHVM_VMEXIT_INJECT;
>   
> -    BUG_ON(msr_bit == NULL);
>       msr &= 0x1fff;
>   
>       if (write)

  Acked-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>

Re: trivial: remove various pointless things

[Ian Campbell]

On Fri, 2013-11-08 at 13:45 +1300, Matthew Daley wrote:
> No functional changes (hopefully).

Looks like someone picked up the first and last (x86 & mini-os). The
middle 4 (arm + libxl + libxc ones) I've just acked + applied. thanks.

> 
>  extras/mini-os/lwip-net.c        |    2 --
>  tools/libxc/xc_domain.c          |    3 +--
>  tools/libxl/xl_cmdimpl.c         |    4 ++--
>  xen/arch/x86/hvm/svm/nestedsvm.c |    1 -
>  xen/common/device_tree.c         |    2 +-
>  xen/drivers/video/arm_hdlcd.c    |    2 +-
>  6 files changed, 5 insertions(+), 9 deletions(-)
> 
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel