From: Anthony Liguori <anthony@codemonkey.ws>
To: Yoshiaki Tamura <tamura.yoshiaki@lab.ntt.co.jp>
Cc: qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH 2/2] exec: replace tabs by spaces.
Date: Sun, 22 Aug 2010 16:30:11 -0500 [thread overview]
Message-ID: <4C7196E3.5000509@codemonkey.ws> (raw)
In-Reply-To: <1282105813-16020-3-git-send-email-tamura.yoshiaki@lab.ntt.co.jp>
On 08/17/2010 11:30 PM, Yoshiaki Tamura wrote:
> Signed-off-by: Yoshiaki Tamura<tamura.yoshiaki@lab.ntt.co.jp>
>
Applied. Thanks.
Regards,
Anthony Liguori
> ---
> exec.c | 56 ++++++++++++++++++++++++++++----------------------------
> 1 files changed, 28 insertions(+), 28 deletions(-)
>
> diff --git a/exec.c b/exec.c
> index 8636316..4fc96cb 100644
> --- a/exec.c
> +++ b/exec.c
> @@ -1706,8 +1706,8 @@ static QLIST_HEAD(memory_client_list, CPUPhysMemoryClient) memory_client_list
> = QLIST_HEAD_INITIALIZER(memory_client_list);
>
> static void cpu_notify_set_memory(target_phys_addr_t start_addr,
> - ram_addr_t size,
> - ram_addr_t phys_offset)
> + ram_addr_t size,
> + ram_addr_t phys_offset)
> {
> CPUPhysMemoryClient *client;
> QLIST_FOREACH(client,&memory_client_list, list) {
> @@ -1716,7 +1716,7 @@ static void cpu_notify_set_memory(target_phys_addr_t start_addr,
> }
>
> static int cpu_notify_sync_dirty_bitmap(target_phys_addr_t start,
> - target_phys_addr_t end)
> + target_phys_addr_t end)
> {
> CPUPhysMemoryClient *client;
> QLIST_FOREACH(client,&memory_client_list, list) {
> @@ -1803,17 +1803,17 @@ int cpu_str_to_log_mask(const char *str)
> p1 = strchr(p, ',');
> if (!p1)
> p1 = p + strlen(p);
> - if(cmp1(p,p1-p,"all")) {
> - for(item = cpu_log_items; item->mask != 0; item++) {
> - mask |= item->mask;
> - }
> - } else {
> - for(item = cpu_log_items; item->mask != 0; item++) {
> - if (cmp1(p, p1 - p, item->name))
> - goto found;
> + if(cmp1(p,p1-p,"all")) {
> + for(item = cpu_log_items; item->mask != 0; item++) {
> + mask |= item->mask;
> + }
> + } else {
> + for(item = cpu_log_items; item->mask != 0; item++) {
> + if (cmp1(p, p1 - p, item->name))
> + goto found;
> + }
> + return 0;
> }
> - return 0;
> - }
> found:
> mask |= item->mask;
> if (*p1 != ',')
> @@ -1907,11 +1907,11 @@ static inline void tlb_flush_jmp_cache(CPUState *env, target_ulong addr)
> overlap the flushed page. */
> i = tb_jmp_cache_hash_page(addr - TARGET_PAGE_SIZE);
> memset (&env->tb_jmp_cache[i], 0,
> - TB_JMP_PAGE_SIZE * sizeof(TranslationBlock *));
> + TB_JMP_PAGE_SIZE * sizeof(TranslationBlock *));
>
> i = tb_jmp_cache_hash_page(addr);
> memset (&env->tb_jmp_cache[i], 0,
> - TB_JMP_PAGE_SIZE * sizeof(TranslationBlock *));
> + TB_JMP_PAGE_SIZE * sizeof(TranslationBlock *));
> }
>
> static CPUTLBEntry s_cputlb_empty_entry = {
> @@ -2687,16 +2687,16 @@ static long gethugepagesize(const char *path)
> int ret;
>
> do {
> - ret = statfs(path,&fs);
> + ret = statfs(path,&fs);
> } while (ret != 0&& errno == EINTR);
>
> if (ret != 0) {
> - perror(path);
> - return 0;
> + perror(path);
> + return 0;
> }
>
> if (fs.f_type != HUGETLBFS_MAGIC)
> - fprintf(stderr, "Warning: path not on HugeTLBFS: %s\n", path);
> + fprintf(stderr, "Warning: path not on HugeTLBFS: %s\n", path);
>
> return fs.f_bsize;
> }
> @@ -2715,7 +2715,7 @@ static void *file_ram_alloc(RAMBlock *block,
>
> hpagesize = gethugepagesize(path);
> if (!hpagesize) {
> - return NULL;
> + return NULL;
> }
>
> if (memory< hpagesize) {
> @@ -2728,14 +2728,14 @@ static void *file_ram_alloc(RAMBlock *block,
> }
>
> if (asprintf(&filename, "%s/qemu_back_mem.XXXXXX", path) == -1) {
> - return NULL;
> + return NULL;
> }
>
> fd = mkstemp(filename);
> if (fd< 0) {
> - perror("unable to create backing store for hugepages");
> - free(filename);
> - return NULL;
> + perror("unable to create backing store for hugepages");
> + free(filename);
> + return NULL;
> }
> unlink(filename);
> free(filename);
> @@ -2749,7 +2749,7 @@ static void *file_ram_alloc(RAMBlock *block,
> * mmap will fail.
> */
> if (ftruncate(fd, memory))
> - perror("ftruncate");
> + perror("ftruncate");
>
> #ifdef MAP_POPULATE
> /* NB: MAP_POPULATE won't exhaustively alloc all phys pages in the case
> @@ -2762,9 +2762,9 @@ static void *file_ram_alloc(RAMBlock *block,
> area = mmap(0, memory, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
> #endif
> if (area == MAP_FAILED) {
> - perror("file_ram_alloc: can't mmap RAM pages");
> - close(fd);
> - return (NULL);
> + perror("file_ram_alloc: can't mmap RAM pages");
> + close(fd);
> + return (NULL);
> }
> block->fd = fd;
> return area;
>
prev parent reply other threads:[~2010-08-22 21:30 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-18 4:30 [Qemu-devel] [PATCH 0/2] Cleanups for arch_init and exec Yoshiaki Tamura
2010-08-18 4:30 ` [Qemu-devel] [PATCH 1/2] arch_init: replace tabs by spaces Yoshiaki Tamura
2010-08-22 21:30 ` Anthony Liguori
2010-08-18 4:30 ` [Qemu-devel] [PATCH 2/2] exec: " Yoshiaki Tamura
2010-08-22 21:30 ` Anthony Liguori [this message]
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=4C7196E3.5000509@codemonkey.ws \
--to=anthony@codemonkey.ws \
--cc=qemu-devel@nongnu.org \
--cc=tamura.yoshiaki@lab.ntt.co.jp \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).