| Message ID | 20190524063553.5339-3-philmd@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | hw/i386/pc: Do not restrict the fw_cfg functions to the PC machine | expand |
Philippe Mathieu-Daudé <philmd@redhat.com> 于2019年5月24日周五 下午2:37写道： > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > Reviewed-by: Li Qiang <liq3ea@gmail.com> > --- > hw/i386/pc.c | 4 ++-- > include/hw/i386/pc.h | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index fc38b59d2d..df8600ac24 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -104,7 +104,7 @@ struct e820_table { > > static struct e820_table e820_reserve; > static struct e820_entry *e820_table; > -static unsigned e820_entries; > +static size_t e820_entries; > struct hpet_fw_config hpet_cfg = {.count = UINT8_MAX}; > > /* Physical Address of PVH entry point read from kernel ELF NOTE */ > @@ -897,7 +897,7 @@ int e820_add_entry(uint64_t address, uint64_t length, > uint32_t type) > return e820_entries; > } > > -int e820_get_num_entries(void) > +size_t e820_get_num_entries(void) > { > return e820_entries; > } > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index ad3a75d8fa..28b19173b0 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -290,7 +290,7 @@ void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, > #define E820_UNUSABLE 5 > > int e820_add_entry(uint64_t, uint64_t, uint32_t); > -int e820_get_num_entries(void); > +size_t e820_get_num_entries(void); > bool e820_get_entry(unsigned int, uint32_t, uint64_t *, uint64_t *); > > extern GlobalProperty pc_compat_4_0[]; > -- > 2.20.1 > > >
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index fc38b59d2d..df8600ac24 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -104,7 +104,7 @@ struct e820_table { static struct e820_table e820_reserve; static struct e820_entry *e820_table; -static unsigned e820_entries; +static size_t e820_entries; struct hpet_fw_config hpet_cfg = {.count = UINT8_MAX}; /* Physical Address of PVH entry point read from kernel ELF NOTE */ @@ -897,7 +897,7 @@ int e820_add_entry(uint64_t address, uint64_t length, uint32_t type) return e820_entries; } -int e820_get_num_entries(void) +size_t e820_get_num_entries(void) { return e820_entries; } diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index ad3a75d8fa..28b19173b0 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -290,7 +290,7 @@ void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, #define E820_UNUSABLE 5 int e820_add_entry(uint64_t, uint64_t, uint32_t); -int e820_get_num_entries(void); +size_t e820_get_num_entries(void); bool e820_get_entry(unsigned int, uint32_t, uint64_t *, uint64_t *); extern GlobalProperty pc_compat_4_0[];
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- hw/i386/pc.c | 4 ++-- include/hw/i386/pc.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)