[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 36/38] ivshmem: Drop ivshmem property x-memdev
From: |
Markus Armbruster |
Subject: |
Re: [Qemu-devel] [PATCH 36/38] ivshmem: Drop ivshmem property x-memdev |
Date: |
Thu, 03 Mar 2016 15:17:16 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) |
Marc-André Lureau <address@hidden> writes:
> Hi
>
> On Mon, Feb 29, 2016 at 7:40 PM, Markus Armbruster <address@hidden> wrote:
>> Use ivshmem-plain instead.
>>
>> Signed-off-by: Markus Armbruster <address@hidden>
>> ---
>> hw/misc/ivshmem.c | 15 +--------------
>> 1 file changed, 1 insertion(+), 14 deletions(-)
>>
>> diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
>> index 33b6842..f6fce15 100644
>> --- a/hw/misc/ivshmem.c
>> +++ b/hw/misc/ivshmem.c
>> @@ -1197,8 +1197,7 @@ static void ivshmem_realize(PCIDevice *dev, Error
>> **errp)
>> }
>>
>> if (!!s->server_chr + !!s->shmobj + !!s->hostmem != 1) {
>> - error_setg(errp,
>> - "You must specify either 'shm', 'chardev' or
>> 'x-memdev'");
>> + error_setg(errp, "You must specify either 'shm' or 'chardev'");
>> return;
>> }
>
> You could also get rid of hostmem checks here:
>
> - if (!!s->server_chr + !!s->shmobj + !!s->hostmem != 1) {
> + if (!!s->server_chr + !!s->shmobj > 1) {
> error_setg(errp, "You must specify either 'shm' or 'chardev'");
> return;
> }
>
> - if (s->hostmem) {
> - if (s->sizearg) {
> - g_warning("size argument ignored with hostmem");
> - }
> - } else if (s->sizearg == NULL) {
> + if (s->sizearg == NULL) {
Will do. No idea how I missed those :)
> otherwise, looks good
Thanks!