[Qemu-devel] [PATCH] Convert to realize()

[Qemu-devel] [PATCH] Convert to realize()

[Cao jin]

for educational PCI device

Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
---
 hw/misc/edu.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/hw/misc/edu.c b/hw/misc/edu.c
index fe50b42..43d5b18 100644
--- a/hw/misc/edu.c
+++ b/hw/misc/edu.c
@@ -327,7 +327,7 @@ static void *edu_fact_thread(void *opaque)
     return NULL;
 }
 
-static int pci_edu_init(PCIDevice *pdev)
+static void pci_edu_realize(PCIDevice *pdev, Error **errp)
 {
     EduState *edu = DO_UPCAST(EduState, pdev, pdev);
     uint8_t *pci_conf = pdev->config;
@@ -344,8 +344,6 @@ static int pci_edu_init(PCIDevice *pdev)
     memory_region_init_io(&edu->mmio, OBJECT(edu), &edu_mmio_ops, edu,
                     "edu-mmio", 1 << 20);
     pci_register_bar(pdev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, &edu->mmio);
-
-    return 0;
 }
 
 static void pci_edu_uninit(PCIDevice *pdev)
@@ -385,7 +383,7 @@ static void edu_class_init(ObjectClass *class, void *data)
 {
     PCIDeviceClass *k = PCI_DEVICE_CLASS(class);
 
-    k->init = pci_edu_init;
+    k->realize = pci_edu_realize;
     k->exit = pci_edu_uninit;
     k->vendor_id = PCI_VENDOR_ID_QEMU;
     k->device_id = 0x11e8;
-- 
2.1.0

Re: [Qemu-devel] [PATCH] Convert to realize()

[Markus Armbruster]

Copying qemu-trivial.

Cao jin <caoj.fnst@cn.fujitsu.com> writes:

> for educational PCI device
>
> Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
> ---
>  hw/misc/edu.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/hw/misc/edu.c b/hw/misc/edu.c
> index fe50b42..43d5b18 100644
> --- a/hw/misc/edu.c
> +++ b/hw/misc/edu.c
> @@ -327,7 +327,7 @@ static void *edu_fact_thread(void *opaque)
>      return NULL;
>  }
>  
> -static int pci_edu_init(PCIDevice *pdev)
> +static void pci_edu_realize(PCIDevice *pdev, Error **errp)
>  {
>      EduState *edu = DO_UPCAST(EduState, pdev, pdev);
>      uint8_t *pci_conf = pdev->config;
> @@ -344,8 +344,6 @@ static int pci_edu_init(PCIDevice *pdev)
>      memory_region_init_io(&edu->mmio, OBJECT(edu), &edu_mmio_ops, edu,
>                      "edu-mmio", 1 << 20);
>      pci_register_bar(pdev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, &edu->mmio);
> -
> -    return 0;
>  }
>  
>  static void pci_edu_uninit(PCIDevice *pdev)
> @@ -385,7 +383,7 @@ static void edu_class_init(ObjectClass *class, void *data)
>  {
>      PCIDeviceClass *k = PCI_DEVICE_CLASS(class);
>  
> -    k->init = pci_edu_init;
> +    k->realize = pci_edu_realize;
>      k->exit = pci_edu_uninit;
>      k->vendor_id = PCI_VENDOR_ID_QEMU;
>      k->device_id = 0x11e8;

Reviewed-by: Markus Armbruster <armbru@redhat.com>

Re: [Qemu-devel] [PATCH] Convert to realize()

[Cao jin]

Hi mjt,
     seems the patch is still pending in qemu-trivial, and besides, I 
have several others also pending in there，may I know how are they going?

On 12/18/2015 08:55 PM, Markus Armbruster wrote:
> Copying qemu-trivial.
>
> Cao jin <caoj.fnst@cn.fujitsu.com> writes:
>
>> for educational PCI device
>>
>> Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
>> ---
>>   hw/misc/edu.c | 6 ++----
>>   1 file changed, 2 insertions(+), 4 deletions(-)
>>
>> diff --git a/hw/misc/edu.c b/hw/misc/edu.c
>> index fe50b42..43d5b18 100644
>> --- a/hw/misc/edu.c
>> +++ b/hw/misc/edu.c
>> @@ -327,7 +327,7 @@ static void *edu_fact_thread(void *opaque)
>>       return NULL;
>>   }
>>
>> -static int pci_edu_init(PCIDevice *pdev)
>> +static void pci_edu_realize(PCIDevice *pdev, Error **errp)
>>   {
>>       EduState *edu = DO_UPCAST(EduState, pdev, pdev);
>>       uint8_t *pci_conf = pdev->config;
>> @@ -344,8 +344,6 @@ static int pci_edu_init(PCIDevice *pdev)
>>       memory_region_init_io(&edu->mmio, OBJECT(edu), &edu_mmio_ops, edu,
>>                       "edu-mmio", 1 << 20);
>>       pci_register_bar(pdev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, &edu->mmio);
>> -
>> -    return 0;
>>   }
>>
>>   static void pci_edu_uninit(PCIDevice *pdev)
>> @@ -385,7 +383,7 @@ static void edu_class_init(ObjectClass *class, void *data)
>>   {
>>       PCIDeviceClass *k = PCI_DEVICE_CLASS(class);
>>
>> -    k->init = pci_edu_init;
>> +    k->realize = pci_edu_realize;
>>       k->exit = pci_edu_uninit;
>>       k->vendor_id = PCI_VENDOR_ID_QEMU;
>>       k->device_id = 0x11e8;
>
> Reviewed-by: Markus Armbruster <armbru@redhat.com>
>
>
> .
>

-- 
Yours Sincerely,

Cao jin

Re: [Qemu-devel] [PATCH] Convert to realize()

[Michael Tokarev]

18.12.2015 11:55, Cao jin wrote:
> for educational PCI device

Applied to -trivial, adding "hw/misc/edu:" prefix to the subject line, thanks!

10.01.2016 13:14, Cao jin wrote:
> Hi mjt,
>     seems the patch is still pending in qemu-trivial, and besides, I have several others also pending in there，may I know how are they going?

I didn't process almost anything before 2.5.0 release, and next
there were Cristmas and New Year holidays.  As you can see, some
patches are now going.

Thanks,

/mjt

Re: [Qemu-devel] [PATCH] Convert to realize()

[Cao jin]

Thanks for your work:)

On 01/11/2016 02:04 AM, Michael Tokarev wrote:
> 18.12.2015 11:55, Cao jin wrote:
>> for educational PCI device
>
> Applied to -trivial, adding "hw/misc/edu:" prefix to the subject line, thanks!
>
> 10.01.2016 13:14, Cao jin wrote:
>> Hi mjt,
>>      seems the patch is still pending in qemu-trivial, and besides, I have several others also pending in there，may I know how are they going?
>
> I didn't process almost anything before 2.5.0 release, and next
> there were Cristmas and New Year holidays.  As you can see, some
> patches are now going.
>
> Thanks,
>
> /mjt
>
>
>

-- 
Yours Sincerely,

Cao jin