drop patch for custom get_link_status QMP command
There doesn't seem to be any Proxmox VE code using this. Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
This commit is contained in:
		
							parent
							
								
									0e9a7bfda2
								
							
						
					
					
						commit
						a816d2969e
					
				| @ -1,98 +0,0 @@ | |||||||
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |  | ||||||
| From: Wolfgang Bumiller <w.bumiller@proxmox.com> |  | ||||||
| Date: Mon, 6 Apr 2020 12:16:37 +0200 |  | ||||||
| Subject: [PATCH] PVE: [Up] qmp: add get_link_status |  | ||||||
| 
 |  | ||||||
| Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com> |  | ||||||
| [FE: add get_link_status to command name exceptions] |  | ||||||
| Signed-off-by: Fiona Ebner <f.ebner@proxmox.com> |  | ||||||
| ---
 |  | ||||||
|  net/net.c        | 27 +++++++++++++++++++++++++++ |  | ||||||
|  qapi/net.json    | 15 +++++++++++++++ |  | ||||||
|  qapi/pragma.json |  2 ++ |  | ||||||
|  3 files changed, 44 insertions(+) |  | ||||||
| 
 |  | ||||||
| diff --git a/net/net.c b/net/net.c
 |  | ||||||
| index 6492ad530e..33e901cba8 100644
 |  | ||||||
| --- a/net/net.c
 |  | ||||||
| +++ b/net/net.c
 |  | ||||||
| @@ -1397,6 +1397,33 @@ RxFilterInfoList *qmp_query_rx_filter(const char *name, Error **errp)
 |  | ||||||
|      return filter_list; |  | ||||||
|  } |  | ||||||
|   |  | ||||||
| +int64_t qmp_get_link_status(const char *name, Error **errp)
 |  | ||||||
| +{
 |  | ||||||
| +    NetClientState *ncs[MAX_QUEUE_NUM];
 |  | ||||||
| +    NetClientState *nc;
 |  | ||||||
| +    int queues;
 |  | ||||||
| +    bool ret;
 |  | ||||||
| +
 |  | ||||||
| +    queues = qemu_find_net_clients_except(name, ncs,
 |  | ||||||
| +                                          NET_CLIENT_DRIVER__MAX,
 |  | ||||||
| +                                          MAX_QUEUE_NUM);
 |  | ||||||
| +
 |  | ||||||
| +    if (queues == 0) {
 |  | ||||||
| +        error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
 |  | ||||||
| +                  "Device '%s' not found", name);
 |  | ||||||
| +        return (int64_t) -1;
 |  | ||||||
| +    }
 |  | ||||||
| +
 |  | ||||||
| +    nc = ncs[0];
 |  | ||||||
| +    ret = ncs[0]->link_down;
 |  | ||||||
| +
 |  | ||||||
| +    if (nc->peer->info->type == NET_CLIENT_DRIVER_NIC) {
 |  | ||||||
| +      ret = ncs[0]->peer->link_down;
 |  | ||||||
| +    }
 |  | ||||||
| +
 |  | ||||||
| +    return (int64_t) ret ? 0 : 1;
 |  | ||||||
| +}
 |  | ||||||
| +
 |  | ||||||
|  void colo_notify_filters_event(int event, Error **errp) |  | ||||||
|  { |  | ||||||
|      NetClientState *nc; |  | ||||||
| diff --git a/qapi/net.json b/qapi/net.json
 |  | ||||||
| index d6eb30008b..4fe71b149d 100644
 |  | ||||||
| --- a/qapi/net.json
 |  | ||||||
| +++ b/qapi/net.json
 |  | ||||||
| @@ -36,6 +36,21 @@
 |  | ||||||
|  ## |  | ||||||
|  { 'command': 'set_link', 'data': {'name': 'str', 'up': 'bool'} } |  | ||||||
|   |  | ||||||
| +##
 |  | ||||||
| +# @get_link_status:
 |  | ||||||
| +#
 |  | ||||||
| +# Get the current link state of the nics or nic.
 |  | ||||||
| +#
 |  | ||||||
| +# @name: name of the nic you get the state of
 |  | ||||||
| +#
 |  | ||||||
| +# Return: If link is up 1
 |  | ||||||
| +#         If link is down 0
 |  | ||||||
| +#         If an error occure an empty string.
 |  | ||||||
| +#
 |  | ||||||
| +# Notes: this is an Proxmox VE extension and not offical part of Qemu.
 |  | ||||||
| +##
 |  | ||||||
| +{ 'command': 'get_link_status', 'data': {'name': 'str'} , 'returns': 'int' }
 |  | ||||||
| +
 |  | ||||||
|  ## |  | ||||||
|  # @netdev_add: |  | ||||||
|  # |  | ||||||
| diff --git a/qapi/pragma.json b/qapi/pragma.json
 |  | ||||||
| index 7f810b0e97..29233db825 100644
 |  | ||||||
| --- a/qapi/pragma.json
 |  | ||||||
| +++ b/qapi/pragma.json
 |  | ||||||
| @@ -15,6 +15,7 @@
 |  | ||||||
|          'device_add', |  | ||||||
|          'device_del', |  | ||||||
|          'expire_password', |  | ||||||
| +        'get_link_status',
 |  | ||||||
|          'migrate_cancel', |  | ||||||
|          'netdev_add', |  | ||||||
|          'netdev_del', |  | ||||||
| @@ -26,6 +27,7 @@
 |  | ||||||
|          'system_wakeup' ], |  | ||||||
|      # Commands allowed to return a non-dictionary |  | ||||||
|      'command-returns-exceptions': [ |  | ||||||
| +        'get_link_status',
 |  | ||||||
|          'human-monitor-command', |  | ||||||
|          'qom-get', |  | ||||||
|          'query-tpm-models', |  | ||||||
| @ -138,10 +138,10 @@ index 604b686e59..15f5f86683 100644 | |||||||
|  ## |  ## | ||||||
|  # @query-balloon: |  # @query-balloon: | ||||||
| diff --git a/qapi/pragma.json b/qapi/pragma.json
 | diff --git a/qapi/pragma.json b/qapi/pragma.json
 | ||||||
| index 29233db825..f2097b9020 100644
 | index 7f810b0e97..325e684411 100644
 | ||||||
| --- a/qapi/pragma.json
 | --- a/qapi/pragma.json
 | ||||||
| +++ b/qapi/pragma.json
 | +++ b/qapi/pragma.json
 | ||||||
| @@ -37,6 +37,7 @@
 | @@ -35,6 +35,7 @@
 | ||||||
|      'member-name-exceptions': [     # visible in: |      'member-name-exceptions': [     # visible in: | ||||||
|          'ACPISlotType',             # query-acpi-ospm-status |          'ACPISlotType',             # query-acpi-ospm-status | ||||||
|          'AcpiTableOptions',         # -acpitable |          'AcpiTableOptions',         # -acpitable | ||||||
| @ -441,10 +441,10 @@ index 4ec70acf95..47118bf83e 100644 | |||||||
|        'nvme-io_uring': { 'type': 'BlockdevOptionsNvmeIoUring', |        'nvme-io_uring': { 'type': 'BlockdevOptionsNvmeIoUring', | ||||||
|                           'if': 'CONFIG_BLKIO' }, |                           'if': 'CONFIG_BLKIO' }, | ||||||
| diff --git a/qapi/pragma.json b/qapi/pragma.json
 | diff --git a/qapi/pragma.json b/qapi/pragma.json
 | ||||||
| index f2097b9020..5ab1890519 100644
 | index 325e684411..b6079f6a0e 100644
 | ||||||
| --- a/qapi/pragma.json
 | --- a/qapi/pragma.json
 | ||||||
| +++ b/qapi/pragma.json
 | +++ b/qapi/pragma.json
 | ||||||
| @@ -47,6 +47,7 @@
 | @@ -45,6 +45,7 @@
 | ||||||
|          'BlockInfo',                # query-block |          'BlockInfo',                # query-block | ||||||
|          'BlockdevAioOptions',       # blockdev-add, -blockdev |          'BlockdevAioOptions',       # blockdev-add, -blockdev | ||||||
|          'BlockdevDriver',           # blockdev-add, query-blockstats, ... |          'BlockdevDriver',           # blockdev-add, query-blockstats, ... | ||||||
							
								
								
									
										79
									
								
								debian/patches/series
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										79
									
								
								debian/patches/series
									
									
									
									
										vendored
									
									
								
							| @ -19,43 +19,42 @@ pve/0003-PVE-Config-set-the-CPU-model-to-kvm64-32-instead-of-.patch | |||||||
| pve/0004-PVE-Config-ui-spice-default-to-pve-certificates.patch | pve/0004-PVE-Config-ui-spice-default-to-pve-certificates.patch | ||||||
| pve/0005-PVE-Config-glusterfs-no-default-logfile-if-daemonize.patch | pve/0005-PVE-Config-glusterfs-no-default-logfile-if-daemonize.patch | ||||||
| pve/0006-PVE-Config-rbd-block-rbd-disable-rbd_cache_writethro.patch | pve/0006-PVE-Config-rbd-block-rbd-disable-rbd_cache_writethro.patch | ||||||
| pve/0007-PVE-Up-qmp-add-get_link_status.patch | pve/0007-PVE-Up-glusterfs-allow-partial-reads.patch | ||||||
| pve/0008-PVE-Up-glusterfs-allow-partial-reads.patch | pve/0008-PVE-Up-qemu-img-return-success-on-info-without-snaps.patch | ||||||
| pve/0009-PVE-Up-qemu-img-return-success-on-info-without-snaps.patch | pve/0009-PVE-Up-qemu-img-dd-add-osize-and-read-from-to-stdin-.patch | ||||||
| pve/0010-PVE-Up-qemu-img-dd-add-osize-and-read-from-to-stdin-.patch | pve/0010-PVE-Up-qemu-img-dd-add-isize-parameter.patch | ||||||
| pve/0011-PVE-Up-qemu-img-dd-add-isize-parameter.patch | pve/0011-PVE-Up-qemu-img-dd-add-n-skip_create.patch | ||||||
| pve/0012-PVE-Up-qemu-img-dd-add-n-skip_create.patch | pve/0012-qemu-img-dd-add-l-option-for-loading-a-snapshot.patch | ||||||
| pve/0013-qemu-img-dd-add-l-option-for-loading-a-snapshot.patch | pve/0013-PVE-virtio-balloon-improve-query-balloon.patch | ||||||
| pve/0014-PVE-virtio-balloon-improve-query-balloon.patch | pve/0014-PVE-qapi-modify-query-machines.patch | ||||||
| pve/0015-PVE-qapi-modify-query-machines.patch | pve/0015-PVE-qapi-modify-spice-query.patch | ||||||
| pve/0016-PVE-qapi-modify-spice-query.patch | pve/0016-PVE-add-IOChannel-implementation-for-savevm-async.patch | ||||||
| pve/0017-PVE-add-IOChannel-implementation-for-savevm-async.patch | pve/0017-PVE-add-savevm-async-for-background-state-snapshots.patch | ||||||
| pve/0018-PVE-add-savevm-async-for-background-state-snapshots.patch | pve/0018-PVE-add-optional-buffer-size-to-QEMUFile.patch | ||||||
| pve/0019-PVE-add-optional-buffer-size-to-QEMUFile.patch | pve/0019-PVE-block-add-the-zeroinit-block-driver-filter.patch | ||||||
| pve/0020-PVE-block-add-the-zeroinit-block-driver-filter.patch | pve/0020-PVE-Add-dummy-id-command-line-parameter.patch | ||||||
| pve/0021-PVE-Add-dummy-id-command-line-parameter.patch | pve/0021-PVE-Config-Revert-target-i386-disable-LINT0-after-re.patch | ||||||
| pve/0022-PVE-Config-Revert-target-i386-disable-LINT0-after-re.patch | pve/0022-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch | ||||||
| pve/0023-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch | pve/0023-PVE-monitor-disable-oob-capability.patch | ||||||
| pve/0024-PVE-monitor-disable-oob-capability.patch | pve/0024-PVE-Compat-4.0-used-balloon-qemu-4-0-config-size-fal.patch | ||||||
| pve/0025-PVE-Compat-4.0-used-balloon-qemu-4-0-config-size-fal.patch | pve/0025-PVE-Allow-version-code-in-machine-type.patch | ||||||
| pve/0026-PVE-Allow-version-code-in-machine-type.patch | pve/0026-block-backup-move-bcs-bitmap-initialization-to-job-c.patch | ||||||
| pve/0027-block-backup-move-bcs-bitmap-initialization-to-job-c.patch | pve/0027-PVE-Backup-add-vma-backup-format-code.patch | ||||||
| pve/0028-PVE-Backup-add-vma-backup-format-code.patch | pve/0028-PVE-Backup-add-backup-dump-block-driver.patch | ||||||
| pve/0029-PVE-Backup-add-backup-dump-block-driver.patch | pve/0029-PVE-Add-sequential-job-transaction-support.patch | ||||||
| pve/0030-PVE-Add-sequential-job-transaction-support.patch | pve/0030-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch | ||||||
| pve/0031-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch | pve/0031-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch | ||||||
| pve/0032-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch | pve/0032-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch | ||||||
| pve/0033-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch | pve/0033-PVE-redirect-stderr-to-journal-when-daemonized.patch | ||||||
| pve/0034-PVE-redirect-stderr-to-journal-when-daemonized.patch | pve/0034-PVE-Migrate-dirty-bitmap-state-via-savevm.patch | ||||||
| pve/0035-PVE-Migrate-dirty-bitmap-state-via-savevm.patch | pve/0035-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch | ||||||
| pve/0036-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch | pve/0036-PVE-fall-back-to-open-iscsi-initiatorname.patch | ||||||
| pve/0037-PVE-fall-back-to-open-iscsi-initiatorname.patch | pve/0037-PVE-block-stream-increase-chunk-size.patch | ||||||
| pve/0038-PVE-block-stream-increase-chunk-size.patch | pve/0038-block-io-accept-NULL-qiov-in-bdrv_pad_request.patch | ||||||
| pve/0039-block-io-accept-NULL-qiov-in-bdrv_pad_request.patch | pve/0039-block-add-alloc-track-driver.patch | ||||||
| pve/0040-block-add-alloc-track-driver.patch | pve/0040-Revert-block-rbd-workaround-for-ceph-issue-53784.patch | ||||||
| pve/0041-Revert-block-rbd-workaround-for-ceph-issue-53784.patch | pve/0041-Revert-block-rbd-fix-handling-of-holes-in-.bdrv_co_b.patch | ||||||
| pve/0042-Revert-block-rbd-fix-handling-of-holes-in-.bdrv_co_b.patch | pve/0042-Revert-block-rbd-implement-bdrv_co_block_status.patch | ||||||
| pve/0043-Revert-block-rbd-implement-bdrv_co_block_status.patch | pve/0043-alloc-track-fix-deadlock-during-drop.patch | ||||||
| pve/0044-alloc-track-fix-deadlock-during-drop.patch | pve/0044-migration-for-snapshots-hold-the-BQL-during-setup-ca.patch | ||||||
| pve/0045-migration-for-snapshots-hold-the-BQL-during-setup-ca.patch | pve/0045-savevm-async-don-t-hold-BQL-during-setup.patch | ||||||
| pve/0046-savevm-async-don-t-hold-BQL-during-setup.patch |  | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Fiona Ebner
						Fiona Ebner