| Message ID | 20190524063553.5339-2-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| 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:40写道： > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > Reviewed-by: Li Qiang <liq3ea@gmail.com> > --- > hw/i386/pc.c | 5 +++-- > include/hw/i386/pc.h | 2 +- > 2 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 2632b73f80..fc38b59d2d 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -870,7 +870,7 @@ static void handle_a20_line_change(void *opaque, int > irq, int level) > > int e820_add_entry(uint64_t address, uint64_t length, uint32_t type) > { > - int index = le32_to_cpu(e820_reserve.count); > + unsigned int index = le32_to_cpu(e820_reserve.count); > struct e820_entry *entry; > > if (type != E820_RAM) { > @@ -902,7 +902,8 @@ int e820_get_num_entries(void) > return e820_entries; > } > > -bool e820_get_entry(int idx, uint32_t type, uint64_t *address, uint64_t > *length) > +bool e820_get_entry(unsigned int idx, uint32_t type, > + uint64_t *address, uint64_t *length) > { > if (idx < e820_entries && e820_table[idx].type == cpu_to_le32(type)) { > *address = le64_to_cpu(e820_table[idx].address); > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 43df7230a2..ad3a75d8fa 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -291,7 +291,7 @@ void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, > > int e820_add_entry(uint64_t, uint64_t, uint32_t); > int e820_get_num_entries(void); > -bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); > +bool e820_get_entry(unsigned int, uint32_t, uint64_t *, uint64_t *); > > extern GlobalProperty pc_compat_4_0[]; > extern const size_t pc_compat_4_0_len; > -- > 2.20.1 > > >
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 2632b73f80..fc38b59d2d 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -870,7 +870,7 @@ static void handle_a20_line_change(void *opaque, int irq, int level) int e820_add_entry(uint64_t address, uint64_t length, uint32_t type) { - int index = le32_to_cpu(e820_reserve.count); + unsigned int index = le32_to_cpu(e820_reserve.count); struct e820_entry *entry; if (type != E820_RAM) { @@ -902,7 +902,8 @@ int e820_get_num_entries(void) return e820_entries; } -bool e820_get_entry(int idx, uint32_t type, uint64_t *address, uint64_t *length) +bool e820_get_entry(unsigned int idx, uint32_t type, + uint64_t *address, uint64_t *length) { if (idx < e820_entries && e820_table[idx].type == cpu_to_le32(type)) { *address = le64_to_cpu(e820_table[idx].address); diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 43df7230a2..ad3a75d8fa 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -291,7 +291,7 @@ void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, int e820_add_entry(uint64_t, uint64_t, uint32_t); int e820_get_num_entries(void); -bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); +bool e820_get_entry(unsigned int, uint32_t, uint64_t *, uint64_t *); extern GlobalProperty pc_compat_4_0[]; extern const size_t pc_compat_4_0_len;
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- hw/i386/pc.c | 5 +++-- include/hw/i386/pc.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)