s390x: remove s390_get_memslot_count
PATCH 1/1 s390x: remove s390_get_memslot_count
Not needed anymore after removal of the memory hotplug code.
Signed-off-by Cornelia Huck <[email protected]>
--- include/hw/s390x/sclp.h | 1 - target/s390x/cpu.c | 9 --------- target/s390x/cpu.h | 4 ---- target/s390x/kvm-stub.c | 5 ----- target/s390x/kvm.c | 5 ----- target/s390x/kvm_s390x.h | 1 - 6 files changed, 25 deletions(-)
include/hw/s390x/sclp.h +0 -1
@@ -35,7 +35,6 @@#define SCLP_FC_ASSIGN_ATTACH_READ_STOR 0xE00000000000ULL#define SCLP_STARTING_SUBINCREMENT_ID 0x10001#define SCLP_INCREMENT_UNIT 0x10000 -#define MAX_AVAIL_SLOTS 32#define MAX_STORAGE_INCREMENTS 1020/* CPU hotplug SCLP codes */
target/s390x/cpu.c +0 -9
@@ -437,15 +437,6 @@ void s390_cmma_reset(void) } } -int s390_get_memslot_count (void ) -{ -if (kvm_enabled ()) { -return kvm_s390_get_memslot_count (); - }else { -return MAX_AVAIL_SLOTS ; - } -} -int s390_assign_subch_ioeventfd (EventNotifier *notifier,uint32_t sch_id,int vq,bool assign) {
target/s390x/cpu.h +0 -4
@@ -621,9 +621,6 @@ QEMU_BUILD_BUG_ON(sizeof(SysIB) != 4096);/* SIGP order code mask corresponding to bit positions 56-63 */ #define SIGP_ORDER_MASK 0x000000ff -/* from s390-virtio-ccw */ -#define MAX_AVAIL_SLOTS 32 -/* machine check interruption code */ /* subclasses */
@@ -695,7 +692,6 @@ int s390_get_clock(uint8_t *tod_high, uint64_t *tod_low);int s390_set_clock (uint8_t *tod_high,uint64_t *tod_low);void s390_crypto_reset (void );bool s390_get_squash_mcss (void ); -int s390_get_memslot_count (void );int s390_set_memory_limit (uint64_t new_limit,uint64_t *hw_limit);void s390_cmma_reset (void );void s390_enable_css_support (S390CPU *cpu);
target/s390x/kvm-stub.c +0 -5
@@ -84,11 +84,6 @@ void kvm_s390_cmma_reset(void) { } -int kvm_s390_get_memslot_count (void ) -{ -return MAX_AVAIL_SLOTS ; -} -void kvm_s390_reset_vcpu (S390CPU *cpu) { }
target/s390x/kvm.c +0 -5
@@ -1854,11 +1854,6 @@ int kvm_s390_assign_subch_ioeventfd(EventNotifier *notifier, uint32_t sch,return kvm_vm_ioctl (kvm_state,KVM_IOEVENTFD , &kick); } -int kvm_s390_get_memslot_count (void ) -{ -return kvm_check_extension (kvm_state,KVM_CAP_NR_MEMSLOTS ); -} -int kvm_s390_get_ri (void ) {return cap_ri;
target/s390x/kvm_s390x.h +0 -1
@@ -30,7 +30,6 @@ int kvm_s390_set_clock_ext(uint8_t *tod_high, uint64_t *tod_clock);void kvm_s390_enable_css_support (S390CPU *cpu);int kvm_s390_assign_subch_ioeventfd (EventNotifier *notifier,uint32_t sch,int vq,bool assign); -int kvm_s390_get_memslot_count (void );int kvm_s390_cmma_active (void );void kvm_s390_cmma_reset (void );void kvm_s390_reset_vcpu (S390CPU *cpu);
Signature · 1 line
2.13.6
Quoted 3 lines · Cornelia Huck
Not needed anymore after removal of the memory hotplug code.
Signed-off-by Cornelia Huck <[email protected]>
Quoted 108 lines
--- include/hw/s390x/sclp.h | 1 - target/s390x/cpu.c | 9 --------- target/s390x/cpu.h | 4 ---- target/s390x/kvm-stub.c | 5 ----- target/s390x/kvm.c | 5 ----- target/s390x/kvm_s390x.h | 1 - 6 files changed, 25 deletions(-)include/hw/s390x/sclp.h +0
-1@@ -35,7 +35,6 @@#define SCLP_FC_ASSIGN_ATTACH_READ_STOR 0xE00000000000ULL#define SCLP_STARTING_SUBINCREMENT_ID 0x10001#define SCLP_INCREMENT_UNIT 0x10000 -#define MAX_AVAIL_SLOTS 32#define MAX_STORAGE_INCREMENTS 1020/* CPU hotplug SCLP codes */ target/s390x/cpu.c +0
-9@@ -437,15 +437,6 @@ void s390_cmma_reset(void) } } -int s390_get_memslot_count (void ) -{ -if (kvm_enabled ()) { -return kvm_s390_get_memslot_count (); - }else { -return MAX_AVAIL_SLOTS ; - } -} -int s390_assign_subch_ioeventfd (EventNotifier *notifier,uint32_t sch_id,int vq,bool assign) {target/s390x/cpu.h +0
-4@@ -621,9 +621,6 @@ QEMU_BUILD_BUG_ON(sizeof(SysIB) != 4096);/* SIGP order code mask corresponding to bit positions 56-63 */ #define SIGP_ORDER_MASK 0x000000ff -/* from s390-virtio-ccw */ -#define MAX_AVAIL_SLOTS 32 -/* machine check interruption code */ /* subclasses */ @@ -695,7 +692,6 @@ int s390_get_clock(uint8_t *tod_high, uint64_t *tod_low);int s390_set_clock (uint8_t *tod_high,uint64_t *tod_low);void s390_crypto_reset (void );bool s390_get_squash_mcss (void ); -int s390_get_memslot_count (void );int s390_set_memory_limit (uint64_t new_limit,uint64_t *hw_limit);void s390_cmma_reset (void );void s390_enable_css_support (S390CPU *cpu);target/s390x/kvm-stub.c +0
-5@@ -84,11 +84,6 @@ void kvm_s390_cmma_reset(void) { } -int kvm_s390_get_memslot_count (void ) -{ -return MAX_AVAIL_SLOTS ; -} -void kvm_s390_reset_vcpu (S390CPU *cpu) { }target/s390x/kvm.c +0
-5@@ -1854,11 +1854,6 @@ int kvm_s390_assign_subch_ioeventfd(EventNotifier *notifier, uint32_t sch,return kvm_vm_ioctl (kvm_state,KVM_IOEVENTFD , &kick); } -int kvm_s390_get_memslot_count (void ) -{ -return kvm_check_extension (kvm_state,KVM_CAP_NR_MEMSLOTS ); -} -int kvm_s390_get_ri (void ) {return cap_ri;target/s390x/kvm_s390x.h +0
-1@@ -30,7 +30,6 @@ int kvm_s390_set_clock_ext(uint8_t *tod_high, uint64_t *tod_clock);void kvm_s390_enable_css_support (S390CPU *cpu);int kvm_s390_assign_subch_ioeventfd (EventNotifier *notifier,uint32_t sch,int vq,bool assign); -int kvm_s390_get_memslot_count (void );int kvm_s390_cmma_active (void );void kvm_s390_cmma_reset (void );void kvm_s390_reset_vcpu (S390CPU *cpu);
Quoted 104 lines · Cornelia Huck
Not needed anymore after removal of the memory hotplug code.
Signed-off-by Cornelia Huck <[email protected]>--- include/hw/s390x/sclp.h | 1 - target/s390x/cpu.c | 9 --------- target/s390x/cpu.h | 4 ---- target/s390x/kvm-stub.c | 5 ----- target/s390x/kvm.c | 5 ----- target/s390x/kvm_s390x.h | 1 - 6 files changed, 25 deletions(-)include/hw/s390x/sclp.h +0
-1@@ -35,7 +35,6 @@#define SCLP_FC_ASSIGN_ATTACH_READ_STOR 0xE00000000000ULL#define SCLP_STARTING_SUBINCREMENT_ID 0x10001#define SCLP_INCREMENT_UNIT 0x10000 -#define MAX_AVAIL_SLOTS 32#define MAX_STORAGE_INCREMENTS 1020/* CPU hotplug SCLP codes */ target/s390x/cpu.c +0
-9@@ -437,15 +437,6 @@ void s390_cmma_reset(void) } } -int s390_get_memslot_count (void ) -{ -if (kvm_enabled ()) { -return kvm_s390_get_memslot_count (); - }else { -return MAX_AVAIL_SLOTS ; - } -} -int s390_assign_subch_ioeventfd (EventNotifier *notifier,uint32_t sch_id,int vq,bool assign) {target/s390x/cpu.h +0
-4@@ -621,9 +621,6 @@ QEMU_BUILD_BUG_ON(sizeof(SysIB) != 4096);/* SIGP order code mask corresponding to bit positions 56-63 */ #define SIGP_ORDER_MASK 0x000000ff -/* from s390-virtio-ccw */ -#define MAX_AVAIL_SLOTS 32 -/* machine check interruption code */ /* subclasses */ @@ -695,7 +692,6 @@ int s390_get_clock(uint8_t *tod_high, uint64_t *tod_low);int s390_set_clock (uint8_t *tod_high,uint64_t *tod_low);void s390_crypto_reset (void );bool s390_get_squash_mcss (void ); -int s390_get_memslot_count (void );int s390_set_memory_limit (uint64_t new_limit,uint64_t *hw_limit);void s390_cmma_reset (void );void s390_enable_css_support (S390CPU *cpu);target/s390x/kvm-stub.c +0
-5@@ -84,11 +84,6 @@ void kvm_s390_cmma_reset(void) { } -int kvm_s390_get_memslot_count (void ) -{ -return MAX_AVAIL_SLOTS ; -} -void kvm_s390_reset_vcpu (S390CPU *cpu) { }target/s390x/kvm.c +0
-5@@ -1854,11 +1854,6 @@ int kvm_s390_assign_subch_ioeventfd(EventNotifier *notifier, uint32_t sch,return kvm_vm_ioctl (kvm_state,KVM_IOEVENTFD , &kick); } -int kvm_s390_get_memslot_count (void ) -{ -return kvm_check_extension (kvm_state,KVM_CAP_NR_MEMSLOTS ); -} -int kvm_s390_get_ri (void ) {return cap_ri;target/s390x/kvm_s390x.h +0
-0
target/s390x/kvm_s390x.h int kvm_s390_set_clock_ext(uint8_t *tod_high, uint64_t *tod_clock); · line 35
Quoted 7 lines
target/s390x/kvm_s390x.h +0
-1@@ -30,7 +30,6 @@ int kvm_s390_set_clock_ext(uint8_t *tod_high, uint64_t *tod_clock);void kvm_s390_enable_css_support (S390CPU *cpu);int kvm_s390_assign_subch_ioeventfd (EventNotifier *notifier,uint32_t sch,int vq,bool assign); -int kvm_s390_get_memslot_count (void );int kvm_s390_cmma_active (void );void kvm_s390_cmma_reset (void );void kvm_s390_reset_vcpu (S390CPU *cpu);
Reviewed-by David Hildenbrand <[email protected]>
Signature · 3 lines
Thanks, David / dhildenb
Cornelia Huck
AppliedQuoted 11 lines · On Fri, 23 Feb 2018 11:19:19 +0100 Cornelia Huck <[email protected]> wrote:
Not needed anymore after removal of the memory hotplug code.
Signed-off-by Cornelia Huck <[email protected]>--- include/hw/s390x/sclp.h | 1 - target/s390x/cpu.c | 9 --------- target/s390x/cpu.h | 4 ---- target/s390x/kvm-stub.c | 5 ----- target/s390x/kvm.c | 5 ----- target/s390x/kvm_s390x.h | 1 - 6 files changed, 25 deletions(-)
Queued to s390-next.