Re: [PATCH 05/11] add CONFIG_XC conditional

[Matthew Fioravante <matthew.fioravante@jhuapl.edu>]

[-- Attachment #1.1: Type: text/plain, Size: 2828 bytes --]

On 09/28/2012 07:18 AM, George Dunlap wrote:
> On Thu, Sep 27, 2012 at 6:09 PM, Matthew Fioravante
> <matthew.fioravante@jhuapl.edu> wrote:
>> This patch adds a CONFIG_XC option to mini-os, to allow conditional
>> support for libxc for mini-os domains.
>>
>> Signed-off-by: Matthew Fioravante <matthew.fioravante@jhuapl.edu>
>> Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
> Hmm... Samuel said, "Apart from that, Acked-by:", but you didn't
> address the "that" that he mentioned.  In that circumstance, I don't
> think addding the "Acked-by" to the commit message is really
> appropriate -- it implies that the patch was approved as-is, when in
> fact he was only saying that he agreed that these changes were all
> right, but that perhaps there needed to be more.
>
> Can you address his question?
I'll look into it. I assumed Acked-by in the message meant it was
officially acked. Sorry about that.
>  -George
>
>> diff --git a/extras/mini-os/Makefile b/extras/mini-os/Makefile
>> index c425f76..b4236e8 100644
>> --- a/extras/mini-os/Makefile
>> +++ b/extras/mini-os/Makefile
>> @@ -27,6 +27,7 @@ CONFIG_FBFRONT ?= y
>>  CONFIG_KBDFRONT ?= y
>>  CONFIG_CONSFRONT ?= y
>>  CONFIG_XENBUS ?= y
>> +CONFIG_XC ?=y
>>  CONFIG_LWIP ?= $(lwip)
>>
>>  # Export config items as compiler directives
>> diff --git a/extras/mini-os/lib/sys.c b/extras/mini-os/lib/sys.c
>> index 7ddbbf8..6cb97b1 100644
>> --- a/extras/mini-os/lib/sys.c
>> +++ b/extras/mini-os/lib/sys.c
>> @@ -397,6 +397,7 @@ int close(int fd)
>>             return res;
>>         }
>>  #endif
>> +#ifdef CONFIG_XC
>>         case FTYPE_XC:
>>             minios_interface_close_fd(fd);
>>             return 0;
>> @@ -406,6 +407,7 @@ int close(int fd)
>>         case FTYPE_GNTMAP:
>>             minios_gnttab_close_fd(fd);
>>             return 0;
>> +#endif
>>  #ifdef CONFIG_NETFRONT
>>         case FTYPE_TAP:
>>             shutdown_netfront(files[fd].tap.dev);
>> @@ -1195,10 +1197,13 @@ void *mmap(void *start, size_t length, int prot, int flags, int fd, off_t offset
>>
>>      if (fd == -1)
>>          return map_zero(n, 1);
>> +#ifdef CONFIG_XC
>>      else if (files[fd].type == FTYPE_XC) {
>>          unsigned long zero = 0;
>>          return map_frames_ex(&zero, n, 0, 0, 1, DOMID_SELF, NULL, 0);
>> -    } else if (files[fd].type == FTYPE_MEM) {
>> +    }
>> +#endif
>> +    else if (files[fd].type == FTYPE_MEM) {
>>          unsigned long first_mfn = offset >> PAGE_SHIFT;
>>          return map_frames_ex(&first_mfn, n, 0, 1, 1, DOMID_IO, NULL, _PAGE_PRESENT|_PAGE_RW);
>>      } else ASSERT(0);
>> --
>> 1.7.9.5
>>
>>
>> _______________________________________________
>> Xen-devel mailing list
>> Xen-devel@lists.xen.org
>> http://lists.xen.org/xen-devel



[-- Attachment #1.2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 1459 bytes --]

[-- Attachment #2: Type: text/plain, Size: 126 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel