From: Cyrill Gorcunov <gorcunov@gmail.com>
To: Pekka Enberg <penberg@kernel.org>
Cc: Sasha Levin <levinsasha928@gmail.com>,
Asias He <asias.hejun@gmail.com>, Ingo Molnar <mingo@elte.hu>,
Thomas Gleixner <tglx@linutronix.de>,
KVM-ML <kvm@vger.kernel.org>
Subject: Re: [PATCH] kvm tools: Use assert() helper to check a variable value
Date: Mon, 19 Dec 2011 12:25:45 +0400 [thread overview]
Message-ID: <20111219082545.GE17380@moon> (raw)
In-Reply-To: <CAOJsxLEq+c6_3EfvCF_NkXqg3ViKX87o0j_a5npD6NtBJBK62A@mail.gmail.com>
On Mon, Dec 19, 2011 at 10:19:43AM +0200, Pekka Enberg wrote:
> On Mon, Dec 19, 2011 at 09:13:28AM +0200, Pekka Enberg wrote:
> >> >
> >> >- BUILD_BUG_ON(i > E820_X_MAX);
> >> >+ assert(i <= E820_X_MAX);
> >>
> >> We should use BUG_ON() like tools/perf does.
>
> On Mon, Dec 19, 2011 at 9:57 AM, Cyrill Gorcunov <gorcunov@gmail.com> wrote:
> > We dont have it yet. So I'll introduce this helper later,
> > but note that we will have to cover _all_ assert() calls then,
> > so it's better to make in a separate patch. Meanwhile such fix
> > it better than bug ;)
>
> You don't need to convert all of them at the same time but we're not
> adding new assert() calls.
>
You both (Pekka and Ingo) know the way how to convince people ;)
Something like below?
Cyrill
---
kvm tools: Add BUG_ON() helper to make a run-time critical tests
Also drop useless assert.h inclusions.
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
---
tools/kvm/include/kvm/util.h | 5 ++++-
tools/kvm/ioport.c | 1 -
tools/kvm/kvm-cmd.c | 6 ++----
tools/kvm/kvm.c | 1 -
tools/kvm/pci.c | 6 ++----
tools/kvm/powerpc/kvm.c | 1 -
tools/kvm/virtio/console.c | 3 +--
tools/kvm/virtio/net.c | 1 -
tools/kvm/x86/bios.c | 2 +-
tools/kvm/x86/cpuid.c | 1 -
tools/kvm/x86/kvm.c | 1 -
11 files changed, 10 insertions(+), 18 deletions(-)
Index: linux-2.6.git/tools/kvm/include/kvm/util.h
===================================================================
--- linux-2.6.git.orig/tools/kvm/include/kvm/util.h
+++ linux-2.6.git/tools/kvm/include/kvm/util.h
@@ -9,6 +9,7 @@
* Some bits are stolen from perf tool :)
*/
+#include <assert.h>
#include <unistd.h>
#include <stdio.h>
#include <stddef.h>
@@ -50,7 +51,9 @@ extern void set_die_routine(void (*routi
__func__, __LINE__, ##__VA_ARGS__); \
} while (0)
-#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
+#
+#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
+#define BUG_ON(condition) assert(!(condition))
#define DIE_IF(cnd) \
do { \
Index: linux-2.6.git/tools/kvm/ioport.c
===================================================================
--- linux-2.6.git.orig/tools/kvm/ioport.c
+++ linux-2.6.git/tools/kvm/ioport.c
@@ -10,7 +10,6 @@
#include <linux/types.h>
#include <stdbool.h>
-#include <assert.h>
#include <limits.h>
#include <stdlib.h>
#include <stdio.h>
Index: linux-2.6.git/tools/kvm/kvm-cmd.c
===================================================================
--- linux-2.6.git.orig/tools/kvm/kvm-cmd.c
+++ linux-2.6.git/tools/kvm/kvm-cmd.c
@@ -2,8 +2,6 @@
#include <string.h>
#include <errno.h>
-#include <assert.h>
-
/* user defined header files */
#include "kvm/builtin-debug.h"
#include "kvm/builtin-pause.h"
@@ -71,14 +69,14 @@ int handle_command(struct cmd_struct *co
if (!argv || !*argv) {
p = kvm_get_command(command, "help");
- assert(p);
+ BUG_ON(!p);
return p->fn(argc, argv, prefix);
}
p = kvm_get_command(command, argv[0]);
if (!p) {
p = kvm_get_command(command, "help");
- assert(p);
+ BUG_ON(!p);
p->fn(0, NULL, prefix);
return EINVAL;
}
Index: linux-2.6.git/tools/kvm/kvm.c
===================================================================
--- linux-2.6.git.orig/tools/kvm/kvm.c
+++ linux-2.6.git/tools/kvm/kvm.c
@@ -14,7 +14,6 @@
#include <sys/ioctl.h>
#include <sys/mman.h>
#include <stdbool.h>
-#include <assert.h>
#include <limits.h>
#include <signal.h>
#include <stdarg.h>
Index: linux-2.6.git/tools/kvm/pci.c
===================================================================
--- linux-2.6.git.orig/tools/kvm/pci.c
+++ linux-2.6.git/tools/kvm/pci.c
@@ -3,8 +3,6 @@
#include "kvm/util.h"
#include "kvm/kvm.h"
-#include <assert.h>
-
#define PCI_BAR_OFFSET(b) (offsetof(struct pci_device_header, bar[b]))
static struct pci_device_header *pci_devices[PCI_MAX_DEVICES];
@@ -170,13 +168,13 @@ void pci__config_rd(struct kvm *kvm, uni
void pci__register(struct pci_device_header *dev, u8 dev_num)
{
- assert(dev_num < PCI_MAX_DEVICES);
+ BUG_ON(dev_num >= PCI_MAX_DEVICES);
pci_devices[dev_num] = dev;
}
struct pci_device_header *pci__find_dev(u8 dev_num)
{
- assert(dev_num < PCI_MAX_DEVICES);
+ BUG_ON(dev_num >= PCI_MAX_DEVICES);
return pci_devices[dev_num];
}
Index: linux-2.6.git/tools/kvm/powerpc/kvm.c
===================================================================
--- linux-2.6.git.orig/tools/kvm/powerpc/kvm.c
+++ linux-2.6.git/tools/kvm/powerpc/kvm.c
@@ -17,7 +17,6 @@
#include <sys/ioctl.h>
#include <sys/mman.h>
#include <stdbool.h>
-#include <assert.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
Index: linux-2.6.git/tools/kvm/virtio/console.c
===================================================================
--- linux-2.6.git.orig/tools/kvm/virtio/console.c
+++ linux-2.6.git/tools/kvm/virtio/console.c
@@ -21,7 +21,6 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <termios.h>
-#include <assert.h>
#include <unistd.h>
#include <fcntl.h>
@@ -136,7 +135,7 @@ static int init_vq(struct kvm *kvm, void
struct virt_queue *queue;
void *p;
- assert(vq < VIRTIO_CONSOLE_NUM_QUEUES);
+ BUG_ON(vq >= VIRTIO_CONSOLE_NUM_QUEUES);
compat__remove_message(compat_id);
Index: linux-2.6.git/tools/kvm/virtio/net.c
===================================================================
--- linux-2.6.git.orig/tools/kvm/virtio/net.c
+++ linux-2.6.git/tools/kvm/virtio/net.c
@@ -19,7 +19,6 @@
#include <net/if.h>
#include <unistd.h>
-#include <assert.h>
#include <fcntl.h>
#include <sys/socket.h>
Index: linux-2.6.git/tools/kvm/x86/bios.c
===================================================================
--- linux-2.6.git.orig/tools/kvm/x86/bios.c
+++ linux-2.6.git/tools/kvm/x86/bios.c
@@ -98,7 +98,7 @@ static void e820_setup(struct kvm *kvm)
};
}
- BUILD_BUG_ON(i > E820_X_MAX);
+ BUG_ON(i > E820_X_MAX);
e820->nr_map = i;
}
Index: linux-2.6.git/tools/kvm/x86/cpuid.c
===================================================================
--- linux-2.6.git.orig/tools/kvm/x86/cpuid.c
+++ linux-2.6.git/tools/kvm/x86/cpuid.c
@@ -5,7 +5,6 @@
#include <sys/ioctl.h>
#include <stdlib.h>
-#include <assert.h>
#define CPUID_FUNC_PERFMON 0x0A
Index: linux-2.6.git/tools/kvm/x86/kvm.c
===================================================================
--- linux-2.6.git.orig/tools/kvm/x86/kvm.c
+++ linux-2.6.git/tools/kvm/x86/kvm.c
@@ -15,7 +15,6 @@
#include <sys/mman.h>
#include <sys/stat.h>
#include <stdbool.h>
-#include <assert.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
next prev parent reply other threads:[~2011-12-19 8:25 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-18 21:35 [PATCH] kvm tools: Use assert() helper to check a variable value Cyrill Gorcunov
2011-12-19 7:13 ` Pekka Enberg
2011-12-19 7:57 ` Cyrill Gorcunov
2011-12-19 8:04 ` Ingo Molnar
2011-12-19 8:19 ` Pekka Enberg
2011-12-19 8:25 ` Cyrill Gorcunov [this message]
2011-12-19 8:48 ` Pekka Enberg
2011-12-19 10:40 ` Ingo Molnar
2011-12-19 10:49 ` Cyrill Gorcunov
2011-12-19 10:50 ` Ingo Molnar
2011-12-19 10:57 ` Pekka Enberg
2011-12-19 10:57 ` Cyrill Gorcunov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111219082545.GE17380@moon \
--to=gorcunov@gmail.com \
--cc=asias.hejun@gmail.com \
--cc=kvm@vger.kernel.org \
--cc=levinsasha928@gmail.com \
--cc=mingo@elte.hu \
--cc=penberg@kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.